/[gentoo-x86]/app-arch/zip/files/zip-3.0-no-crypt.patch
Gentoo

Contents of /app-arch/zip/files/zip-3.0-no-crypt.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download) (as text)
Thu Sep 25 00:29:08 2008 UTC (12 years ago) by vapier
Branch: MAIN
CVS Tags: HEAD
File MIME type: text/x-diff
Fix building with USE=-crypt #238398 by Nils Larsson.
(Portage version: 2.2_rc8/cvs/Linux 2.6.26.2 x86_64)

1 fix building when NO_CRYPT is used
2
3 forward ported from zip-2.32
4
5 http://bugs.gentoo.org/238398
6
7 --- zip.c
8 +++ zip.c
9 @@ -3452,6 +3452,9 @@ char **argv; /* command line tokens */
10
11 /* Key not yet specified. If needed, get/verify it now. */
12 if (key_needed) {
13 +#if !CRYPT
14 + ZIPERR(ZE_PARMS, "encryption not supported");
15 +#else /* CRYPT */
16 if ((key = malloc(IZ_PWLEN+1)) == NULL) {
17 ZIPERR(ZE_MEM, "was getting encryption password");
18 }
19 @@ -3478,6 +3481,7 @@ char **argv; /* command line tokens */
20 if (r) {
21 ZIPERR(ZE_PARMS, "password verification failed");
22 }
23 +#endif
24 }
25 if (key) {
26 /* if -P "" could get here */
27 --- zipcloak.c
28 +++ zipcloak.c
29 @@ -744,6 +744,28 @@ struct option_struct far options[] = {
30
31 int main OF((void));
32
33 +void zipmessage_nl(a, nl)
34 +ZCONST char *a;
35 +int nl;
36 +{
37 +}
38 +
39 +void zipmessage(a, b)
40 +ZCONST char *a, *b;
41 +{
42 +}
43 +
44 +int set_filetype(out_path)
45 + char *out_path;
46 +{
47 +}
48 +
49 +int rename_split(temp_name, out_path)
50 + char *temp_name;
51 + char *out_path;
52 +{
53 +}
54 +
55 void zipwarn(msg1, msg2)
56 ZCONST char *msg1, *msg2;
57 {

  ViewVC Help
Powered by ViewVC 1.1.20