summaryrefslogtreecommitdiffstats
path: root/abs/extra-testing/zip/zip-3.0-no-crypt.patch
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2008-11-08 19:55:52 (GMT)
committerJames Meyer <james.meyer@operamail.com>2008-11-08 19:55:52 (GMT)
commit62a85af977dfdaa2c5650611e92d165ff96c39af (patch)
tree988016870332e5339954b085cc679e085f0f6057 /abs/extra-testing/zip/zip-3.0-no-crypt.patch
parent562074d2036106b5cd46505fe9823c939c1e7ff1 (diff)
downloadlinhes_pkgbuild-62a85af977dfdaa2c5650611e92d165ff96c39af.zip
linhes_pkgbuild-62a85af977dfdaa2c5650611e92d165ff96c39af.tar.gz
linhes_pkgbuild-62a85af977dfdaa2c5650611e92d165ff96c39af.tar.bz2
fixes for zip.
These were taken from gentoo.
Diffstat (limited to 'abs/extra-testing/zip/zip-3.0-no-crypt.patch')
-rw-r--r--abs/extra-testing/zip/zip-3.0-no-crypt.patch51
1 files changed, 51 insertions, 0 deletions
diff --git a/abs/extra-testing/zip/zip-3.0-no-crypt.patch b/abs/extra-testing/zip/zip-3.0-no-crypt.patch
new file mode 100644
index 0000000..301c289
--- /dev/null
+++ b/abs/extra-testing/zip/zip-3.0-no-crypt.patch
@@ -0,0 +1,51 @@
+--- zip.c
++++ zip.c
+@@ -3452,6 +3452,9 @@ char **argv; /* command line tokens */
+
+ /* Key not yet specified. If needed, get/verify it now. */
+ if (key_needed) {
++#if !CRYPT
++ ZIPERR(ZE_PARMS, "encryption not supported");
++#else /* CRYPT */
+ if ((key = malloc(IZ_PWLEN+1)) == NULL) {
+ ZIPERR(ZE_MEM, "was getting encryption password");
+ }
+@@ -3478,6 +3481,7 @@ char **argv; /* command line tokens */
+ if (r) {
+ ZIPERR(ZE_PARMS, "password verification failed");
+ }
++#endif
+ }
+ if (key) {
+ /* if -P "" could get here */
+--- zipcloak.c
++++ zipcloak.c
+@@ -744,6 +744,28 @@ struct option_struct far options[] = {
+
+ int main OF((void));
+
++void zipmessage_nl(a, nl)
++ZCONST char *a;
++int nl;
++{
++}
++
++void zipmessage(a, b)
++ZCONST char *a, *b;
++{
++}
++
++int set_filetype(out_path)
++ char *out_path;
++{
++}
++
++int rename_split(temp_name, out_path)
++ char *temp_name;
++ char *out_path;
++{
++}
++
+ void zipwarn(msg1, msg2)
+ ZCONST char *msg1, *msg2;
+ {