aboutsummaryrefslogtreecommitdiffstats
path: root/main/zip
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2018-02-16 17:12:23 +0000
committerWilliam Pitcock <nenolod@dereferenced.org>2018-02-16 17:12:23 +0000
commit0d72273a6ae5e5770064854cd761b895fd318abd (patch)
tree93cf817ec8c1e8b21b6dbdfc1238c27c0c80c729 /main/zip
parent4c04396cfb5122619d0fa40a8f455e9542b02181 (diff)
downloadaports-0d72273a6ae5e5770064854cd761b895fd318abd.tar.gz
aports-0d72273a6ae5e5770064854cd761b895fd318abd.tar.bz2
aports-0d72273a6ae5e5770064854cd761b895fd318abd.tar.xz
main/zip: fix patches to work with default_prepare
Diffstat (limited to 'main/zip')
-rw-r--r--main/zip/10-zip-3.0-build.patch4
-rw-r--r--main/zip/20-zip-3.0-exec-stack.patch8
-rw-r--r--main/zip/30-zip-3.0-pic.patch4
-rw-r--r--main/zip/APKBUILD6
4 files changed, 11 insertions, 11 deletions
diff --git a/main/zip/10-zip-3.0-build.patch b/main/zip/10-zip-3.0-build.patch
index 5ddad23b95..1deab6a4cf 100644
--- a/main/zip/10-zip-3.0-build.patch
+++ b/main/zip/10-zip-3.0-build.patch
@@ -1,7 +1,7 @@
respect build environment settings
---- unix/configure Wed Jan 28 22:22:13 2009
-+++ unix/configure Wed Jan 28 22:23:54 2009
+--- a/unix/configure Wed Jan 28 22:22:13 2009
++++ b/unix/configure Wed Jan 28 22:23:54 2009
@@ -18,7 +18,7 @@
CC=${1-cc}
diff --git a/main/zip/20-zip-3.0-exec-stack.patch b/main/zip/20-zip-3.0-exec-stack.patch
index d85fb117b0..5bf78d7da9 100644
--- a/main/zip/20-zip-3.0-exec-stack.patch
+++ b/main/zip/20-zip-3.0-exec-stack.patch
@@ -1,7 +1,7 @@
add proper GNU stack markings so we dont get the default: executable
---- crc_i386.S Wed Jan 28 22:22:13 2009
-+++ crc_i386.S Wed Jan 28 22:27:04 2009
+--- a/crc_i386.S Wed Jan 28 22:22:13 2009
++++ b/crc_i386.S Wed Jan 28 22:27:04 2009
@@ -302,3 +302,7 @@
#endif /* i386 || _i386 || _I386 || __i386 */
@@ -10,8 +10,8 @@ add proper GNU stack markings so we dont get the default: executable
+#if defined __ELF__ && defined __linux__
+.section .note.GNU-stack,"",@progbits
+#endif
---- match.S Wed Jan 28 22:22:13 2009
-+++ match.S Wed Jan 28 22:27:04 2009
+--- a/match.S Wed Jan 28 22:22:13 2009
++++ b/match.S Wed Jan 28 22:27:04 2009
@@ -405,3 +405,7 @@
#endif /* i386 || _I386 || _i386 || __i386 */
diff --git a/main/zip/30-zip-3.0-pic.patch b/main/zip/30-zip-3.0-pic.patch
index 14a8821b04..23707f3861 100644
--- a/main/zip/30-zip-3.0-pic.patch
+++ b/main/zip/30-zip-3.0-pic.patch
@@ -1,8 +1,8 @@
if our toolchain generates PIC by default, then do not use the hand written
assembly files as none of it is PIC friendly.
---- unix/configure Wed Jan 28 22:23:54 2009
-+++ unix/configure Wed Jan 28 22:29:51 2009
+--- a/unix/configure Wed Jan 28 22:23:54 2009
++++ b/unix/configure Wed Jan 28 22:29:51 2009
@@ -228,6 +228,9 @@
echo Check if we can use asm code
OBJA=""
diff --git a/main/zip/APKBUILD b/main/zip/APKBUILD
index a4e335a831..550300d987 100644
--- a/main/zip/APKBUILD
+++ b/main/zip/APKBUILD
@@ -29,6 +29,6 @@ package() {
}
sha512sums="642ea6768d79adc1499251a3fb7bfc7ddc8d708699cbf9e0cfe849deda94165cb93e21dc2606bea1166ae5d8531e1e2cb056a7246bf2ab86ea7587bd4712d8d8 zip30.zip
-43b748461a1f015c8a90d7bac0466b274f3cd722ebba208f01849ada670300cfdc8f10f0a4771658750f78fe25459591537c9cac1d3539e0156ee61dac28ac06 10-zip-3.0-build.patch
-84392facb6bf7aeaef0423591ad7005528afb471348c7f46ba18390cf9a08156bb711dadee238ffceb30228d70059c1bdad60def21bcc9b6ba4ffacfb22ceb65 20-zip-3.0-exec-stack.patch
-c6086bcf598c171586e32bf98adf14f6adbb4aa63fa8c26202de8a249ab8ec4edd72acb89aa725001c5f111e1b41c8871ee0ee7e828cd29401cb882ce794ec23 30-zip-3.0-pic.patch"
+e71f7c6f6dd6f8f576018581b155f324eaf6810a2f7c5c402843bdfc3ce6772f09be166b33ff34dcb703774694b18584c8de1763f29895c1d563661679f43d71 10-zip-3.0-build.patch
+2a6824066543684e02731bd36930e0ffa6ab48162c61d5e7af08e8ea0795401271ef28bdd0f6ace865d91fdb1a05b643813cdd458a9fdf554f1ca298ea7f50e3 20-zip-3.0-exec-stack.patch
+fcb2d728d79160128064af90eb17a9c03e980d9619c4d930c4dbf79cb13842c7bb694036dcbf5cd9b412efc6fc0b86bb94a88b3f110b6b63bf6bda2b97fe0568 30-zip-3.0-pic.patch"