aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ0WI <J0WI@users.noreply.github.com>2020-08-10 20:41:28 +0200
committerJ0WI <J0WI@users.noreply.github.com>2020-08-10 20:41:28 +0200
commit5fe88feee77fd3ce9f2345e8c13b6391f3f071fe (patch)
tree8006c6492bb97e20467da4c3b0e1ebea49839f29
parentd1a72af7863516e1e467f3acf5fdd44d390f679c (diff)
downloadaports-5fe88feee77fd3ce9f2345e8c13b6391f3f071fe.tar.gz
aports-5fe88feee77fd3ce9f2345e8c13b6391f3f071fe.tar.bz2
aports-5fe88feee77fd3ce9f2345e8c13b6391f3f071fe.tar.xz
community/openjdk7: fix cherry-pick
-rw-r--r--community/openjdk7/APKBUILD12
1 files changed, 1 insertions, 11 deletions
diff --git a/community/openjdk7/APKBUILD b/community/openjdk7/APKBUILD
index 7882ea9fe4..0d011c7ba4 100644
--- a/community/openjdk7/APKBUILD
+++ b/community/openjdk7/APKBUILD
@@ -82,12 +82,8 @@ source="https://icedtea.classpath.org/download/source/icedtea-$_icedteaversrc.ta
icedtea-jdk-fix-ipv6-init.patch
icedtea-jdk-musl.patch
icedtea-jdk-no-soname.patch
-<<<<<<< HEAD
-=======
icedtea-jdk-revert-7fdd0d6ef2d3.patch
icedtea-jdk-revert-a32dc7400435.patch
- icedtea-jdk-xattr.patch
->>>>>>> 312c0a386e... community/openjdk7: security upgrade to 7.231.2.6.19
icedtea-cpio.patch
"
@@ -335,12 +331,6 @@ e7a2c1771bb582d427041f8d22e48c0daf8f20d7c0926cbce3549d49c4e949359ee25a35682b486e
48533f87fc2cf29d26b259be0df51087d2fe5b252e72d00c6ea2f4add7b0fb113141718c116279c5905e03f64a1118082e719393786811367cf4d472b5d36774 icedtea-jdk-fix-ipv6-init.patch
44a35941c80f408d0607e32763b3b6ccee21e1d39886309327d3d74d2900117e4346ef59e77c663fd022fec10ee8f365eeb46c1260014d5765d226ce175ce3c5 icedtea-jdk-musl.patch
bf4b184e170f7b0ff64ab30d2162784fe2bd5460d1fa31973259f7065fd4c511c46f97724fe2bd72bb94e9006cb568d0e0c87d1a9c90819e65880f8f44830bb1 icedtea-jdk-no-soname.patch
-<<<<<<< HEAD
-a54c79c82afa1bc95265397b274260584c8b8c6be1651ddfb907d9523a809ea4581409e0d3fb0bbb63ef5a204e8ce29b7940e78cd640af1f490ae938c59129b6 icedtea-cpio.patch"
-=======
9a14c023662c25fc3338c60ba9e6ece625bf2db774776e0c633e5cc866d5c6daf160e90b164832b12eb304fcf65bf30b5d38f20cb7f97f01f6736bfa572ef4fc icedtea-jdk-revert-7fdd0d6ef2d3.patch
f4ee0ede2b62e81971e79bd7d382c09847488656bfa27a7346cd5a92f478bcf67cd10aa632989836a49e87ee435c3de831ad4c71f824113f55c61361895a7af8 icedtea-jdk-revert-a32dc7400435.patch
-e703e5f68e63f130e758b3fa813872363090c08eee6a6366f4784cf6a191a90a3642ec71e016bd05e48a66ad0ae56db8b0e318b101aca5d0885af8705423b770 icedtea-jdk-xattr.patch
-a54c79c82afa1bc95265397b274260584c8b8c6be1651ddfb907d9523a809ea4581409e0d3fb0bbb63ef5a204e8ce29b7940e78cd640af1f490ae938c59129b6 icedtea-cpio.patch
-4c874f0e9f3f54f688a1faf64fa3734e31f139f465ce77d12aac87558764ef66055de6cfac5b60efef2833c64256136c70f3cf5dc2712de62fc5dbebe3a8fbcd fix-xattr-include.patch"
->>>>>>> 312c0a386e... community/openjdk7: security upgrade to 7.231.2.6.19
+a54c79c82afa1bc95265397b274260584c8b8c6be1651ddfb907d9523a809ea4581409e0d3fb0bbb63ef5a204e8ce29b7940e78cd640af1f490ae938c59129b6 icedtea-cpio.patch"