main/openssl: upgrade to 1.0.2 and rebase all patches

1 files changed, 60 insertions, 76 deletions

diff --git a/main/openssl/APKBUILD b/main/openssl/APKBUILD
index 72425403aa..7e53cc8421 100644
--- a/main/openssl/APKBUILD
+++ b/main/openssl/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Timo Teras <timo.teras@iki.fi>
 pkgname=openssl
-pkgver=1.0.1l
+pkgver=1.0.2
 pkgrel=0
 pkgdesc="Toolkit for SSL v2/v3 and TLS v1"
 url="http://openssl.org"
@@ -15,19 +15,18 @@ license="openssl"
 subpackages="$pkgname-dev $pkgname-doc libcrypto1.0:libcrypto libssl1.0:libssl"
 
 source="http://www.openssl.org/source/${pkgname}-${pkgver}.tar.gz
-	fix-manpages.patch
-	openssl-bb-basename.patch
-	0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch
-	0002-engines-e_padlock-backport-cvs-head-changes.patch
-	0003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch
-	0004-crypto-engine-autoload-padlock-dynamic-engine.patch
-	0005-s_client-ircv3-starttls.patch
-	openssl-1.0.1-version-eglibc.patch
-	openssl-use-termios.patch
-	fix-default-apps-capath.patch
-	c_rehash.c
-	openssl-1.0.1-parallel-build.patch
-	abi-compat-no-freelists.patch
+	0001-fix-manpages.patch
+	0002-busybox-basename.patch
+	0003-use-termios.patch
+	0004-fix-default-ca-path-for-apps.patch
+	0005-fix-parallel-build.patch
+	0006-add-ircv3-tls-3.1-extension-support-to-s_client.patch
+	0007-reimplement-c_rehash-in-C.patch
+	0008-maintain-abi-compat-with-no-freelist-and-regular-bui.patch
+	0009-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch
+	0010-backport-changes-from-upstream-padlock-module.patch
+	0011-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch
+	0012-crypto-engine-autoload-padlock-dynamic-engine.patch
 	"
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -36,27 +35,15 @@ prepare() {
         cd "$_builddir"
         for patch in $source; do
                 case $patch in
-                # we concider patches with uclibc in its name
-                # only usefull on uclibc install
-                *uclibc*.patch)
-                        if [ "$ALPINE_LIBC" != "eglibc" ]; then
-                                msg "Applying patch $patch"
-                                patch -p1 -i "$srcdir"/$patch || return 1
-                        fi
-                        ;;
-                # same applied to eglibc
-                *eglibc*.patch)
-                        if [ "$ALPINE_LIBC" = "eglibc" ]; then
-                                msg "Applying patch $patch"
-                                patch -p1 -i "$srcdir"/$patch || return 1
-                        fi
-                        ;;
                 *.patch)
                         msg "Applying patch $patch"
                         patch -p1 -i "$srcdir"/$patch || return 1
                         ;;
                 esac
         done
+
+	# force generate apps, due to c_rehash patch
+	rm -rf "$_builddir"/apps/progs.h
 }
 
 build() {
@@ -90,15 +77,15 @@ build() {
 		|| return 1
 
 	make && make build-shared || return 1
-
-	# replace the c_rehash perl script with our C-version
-	$CC $CFLAGS -I include -L . "$srcdir"/c_rehash.c -o tools/c_rehash -lcrypto || return 1
 }
 
 package() {
 	cd "$_builddir"
 	make INSTALL_PREFIX="$pkgdir" MANDIR=/usr/share/man install || return 1
 
+	# c_rehash compat link
+	ln -sf openssl "$pkgdir"/usr/bin/c_rehash
+
 	# rename man pages that conflict with man-pages
 	local m
 	for m in rand.3 err.3 threads.3 passwd.1; do
@@ -110,7 +97,7 @@ package() {
 
 libcrypto() {
 	pkgdesc="Crypto library from openssl"
-	replaces="openssl libcrypto"
+
 	mkdir -p "$subpkgdir"/lib "$subpkgdir"/usr/lib
 	for i in "$pkgdir"/usr/lib/libcrypto*; do
 		mv $i "$subpkgdir"/lib/
@@ -121,7 +108,7 @@ libcrypto() {
 
 libssl() {
 	pkgdesc="SSL shared libraries"
-	replaces="openssl"
+
 	mkdir -p "$subpkgdir"/lib "$subpkgdir"/usr/lib
 	for i in "$pkgdir"/usr/lib/libssl*; do
 		mv $i "$subpkgdir"/lib/
@@ -129,45 +116,42 @@ libssl() {
 	done
 }
 
-md5sums="cdb22925fc9bc97ccbf1e007661f2aa6  openssl-1.0.1l.tar.gz
-f75151bfdd0e1f5191e0d0e7147e1638  fix-manpages.patch
-c6a9857a5dbd30cead0404aa7dd73977  openssl-bb-basename.patch
-ddb5fc155145d5b852425adaec32234d  0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch
-a7717dd564ef876d4923a80751714d63  0002-engines-e_padlock-backport-cvs-head-changes.patch
-cef4633142031b59960200e87ce3bb18  0003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch
-c32f42451a07267ee5dfb3781fa40c00  0004-crypto-engine-autoload-padlock-dynamic-engine.patch
-c5b1042a3acaf3591f3f5620b7086e12  0005-s_client-ircv3-starttls.patch
-d1f3aaad7c36590f21355682983cd14e  openssl-1.0.1-version-eglibc.patch
-2681796363085d01db8a81c249cd2d7b  openssl-use-termios.patch
-efec1bce615256961b1756e575ee1d0a  fix-default-apps-capath.patch
-05ad806219cef6fa5692ac727af7fab6  c_rehash.c
-60ca340e32944e4825747e3681ccd553  openssl-1.0.1-parallel-build.patch
-b7f2421187ae2b4c7e424cda2022d41d  abi-compat-no-freelists.patch"
-sha256sums="b2cf4d48fe5d49f240c61c9e624193a6f232b5ed0baf010681e725963c40d1d4  openssl-1.0.1l.tar.gz
-92296c9e121af10ecc1e302695bf2ceacaa9b00702e580504fc0ed04a9fba86e  fix-manpages.patch
-82863c2fed659a7186c7f3905a1853b8bd8060350ad101ce159fa7e7d2ba27e8  openssl-bb-basename.patch
-18dd81fefb39b3328a444774ed10871ed50348ca171d2da9f826f916127b2dae  0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch
-30fbadf31dc13d9bcc758741f5560f6e13dd66c067f62d1b9066fb656f6aaaf2  0002-engines-e_padlock-backport-cvs-head-changes.patch
-cbb2493ec9157e78035e9cc02be17655996ee9cd0a71b79507fc19f3862f452b  0003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch
-157ec6d17add25b96956abc7c44259c91eebe8a6c1026cdb976b895bf42ec56f  0004-crypto-engine-autoload-padlock-dynamic-engine.patch
-44b553d92e33c48f854a8e15b23830375bc400e987505c74956ac196266f0d46  0005-s_client-ircv3-starttls.patch
-51146851d8454dcb73138f794ced8bd629658b4a0524c466f61b653fff536c93  openssl-1.0.1-version-eglibc.patch
-05266a671143cf17367dee8d409ad6d0857201392c99731d7ebb8f8cdcdc32f7  openssl-use-termios.patch
-1e11d6b8cdcdd6957c69d33ab670c5918fc96c12fdb9b76b4287cb8f69c3545d  fix-default-apps-capath.patch
-7b0947fd09ad1e8d9cea360b883090025b40193d0fc8a631f2e3bb42db28d76b  c_rehash.c
-bd56e5fe1b6fe594ab93f34d25fef0b7372633bad8532f81da998f3e6655d221  openssl-1.0.1-parallel-build.patch
-41c7c1e5bea7f7e0ccc59203a48f097948627d72fcf87f943fcfe8c14b4069a2  abi-compat-no-freelists.patch"
-sha512sums="27fe42f33815a3aafff75f2b9a5604c328fe5945c5cecaca74e5d2c2a1e066d64ddcc1fdb14b54fc7523cc730ab8a57d7d56b2879c289e86673f91fee0cca65e  openssl-1.0.1l.tar.gz
-b0eda7e9b53195b0855da68617201c3c7026eb7464ab58f0bc9923013663ec6b826d1868fe88b87118d3134114cbd9ac15d2c8389c85ef9c1bb4d18575b68a5b  fix-manpages.patch
-6c4f4b0c1b606b3e5a8175618c4398923392f9c25ad8d3f5b65b0424fe51e104c4f456d2da590d9f572382225ab320278e88db1585790092450cad60a02819a5  openssl-bb-basename.patch
-ea282b09d4692a29e5a554e19b0798fa921717d4892decc68cba92cad11e85e4064d8ac78d98f6fa8bb45c65fdd1a5d1a6f6755e53102d520e9d8b807c3a7822  0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch
-c86694b1931ef16eb467f5228a7ea2c36c90570daedb405bb24e7915b2e29f9ba20386cdef0ebea6af23ca04839d713bd05f0c8f3b7f6377331a6ab96c505f44  0002-engines-e_padlock-backport-cvs-head-changes.patch
-b019320869d215014ad46e0b29aa239e31243571c4d45256b3ce6449a67fdc106a381c1cf3abd55ddbfd6a0e9ffa3e3167377317cbc72b254b1f9bcc0e22b8b6  0003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch
-3bedc326ca3e5945bc4ec4dccfe596042ee87aaeaf90b5063110a99cc8e38584838d68289907e4a3fcdb8e04635052ad0759c94e1d7070bb317c2066e2506bbe  0004-crypto-engine-autoload-padlock-dynamic-engine.patch
-70cd257bbd5a86685dc2508399e67746b60ed5d581eb84fe4d4fc6af214f31b71e2a58ad758d572976a61f67bf64c37a935a9788db160f75bced75397b9bcce3  0005-s_client-ircv3-starttls.patch
-6db9d9ee62048d27f80e392eda99a46712ee85f1c8fd49f4931be73c880da8b84844a72657f7bceddb7db0026daddd31870d9c5065494f8d359ee8560284fd4a  openssl-1.0.1-version-eglibc.patch
-22261ad902ad4826db889fa0e6196b57d6cb389c1707f5827ba48a4630097e590979257f16f4a36fe611199fa33ba32d5f412c8b93beb84001865c2501b288da  openssl-use-termios.patch
-f2e737146a473d55b99f27457718ca299a02a0c74009026a30c3d1347c575bc264962b5708995e02ef7d68521b8366ccea7320523efb87b1ab2632d73fec5658  fix-default-apps-capath.patch
-17b5ecda9c51a4a6b7a2b5fea65abc90091ae9c8d43527546148769d8fcfd87450075830b874fcff21b9ad0c31366213b4bfb8665e09cbd2559a8f3688b9aebd  c_rehash.c
-7255b3315133e415631b2ecadc8f5c50a705b9db507c46efded0190363ce9eb31ffbfe01c500669c060878e5202f858b1d2475c64948426fbf70820b4c798ba1  openssl-1.0.1-parallel-build.patch
-38156d183ebf80de0a39c046b1dddaf99ae64286214f3ee9de51d28212933b5f16c23908aef0aa3d71188306b064969b99da2a0a75693b6bba1bc32884c78b31  abi-compat-no-freelists.patch"
+md5sums="38373013fc85c790aabf8837969c5eba  openssl-1.0.2.tar.gz
+db1615f3b629122961da110f9080d522  0001-fix-manpages.patch
+67bdfe450143a41042d2c318003e963a  0002-busybox-basename.patch
+84c03f201f55ca7fbfde364cfdfc9cf4  0003-use-termios.patch
+451efb6471e55a57064b73bfe6edddee  0004-fix-default-ca-path-for-apps.patch
+845393e180a88d0faf3cb5588d228c1b  0005-fix-parallel-build.patch
+5a5753f52b9f54f769f1ad915d0119bd  0006-add-ircv3-tls-3.1-extension-support-to-s_client.patch
+106b2c7590d49a28c782cf3f5d623543  0007-reimplement-c_rehash-in-C.patch
+7a2f9c883ecdfca3087062df4a68150a  0008-maintain-abi-compat-with-no-freelist-and-regular-bui.patch
+25091afb907de2b504f8bad6bf70002c  0009-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch
+aa16c89b283faf0fe546e3f897279c44  0010-backport-changes-from-upstream-padlock-module.patch
+57cca845e22c178c3b317010be56edf0  0011-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch
+2ac874d1249f5f68d8c7cd58d157d29a  0012-crypto-engine-autoload-padlock-dynamic-engine.patch"
+sha256sums="8c48baf3babe0d505d16cfc0cf272589c66d3624264098213db0fb00034728e9  openssl-1.0.2.tar.gz
+77427264dcdbac4b9aa22557203aa6e49a7b8b8bc9bbb6eb2d1f6f7afeb64efc  0001-fix-manpages.patch
+b449fb998b5f60a3a1779ac2f432b2c7f08ae52fc6dfa98bca37d735f863d400  0002-busybox-basename.patch
+c3e6a9710726dac72e3eeffd78961d3bae67a480f6bde7890e066547da25cdfd  0003-use-termios.patch
+d438a36b2b0adf342ebef4b5e9793bcdae3b3027061100f660749c322acbe93d  0004-fix-default-ca-path-for-apps.patch
+068f81c138da7987d2f0227c9904b3feb98127a3717bb4e399d4d98d0a77d189  0005-fix-parallel-build.patch
+9baecc8024bd5004ef045c6c53537f7453029c1e273874ce639834145564ca6d  0006-add-ircv3-tls-3.1-extension-support-to-s_client.patch
+c934b5d1a2cb58b5235da2dfee423f0f66bb83e1d479f511b444751899637c37  0007-reimplement-c_rehash-in-C.patch
+1030f885dc76f352854a7a95d73e68cfd1479c5f9ee198d6afef6b0755ee1c81  0008-maintain-abi-compat-with-no-freelist-and-regular-bui.patch
+2eddcb7ab342285cb637ce6b6be143cca835f449f35dd9bb8c7b9167ba2117a7  0009-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch
+aee88a24622ce9d71e38deeb874e58435dcf8ff5690f56194f0e4a00fb09b260  0010-backport-changes-from-upstream-padlock-module.patch
+c10b8aaf56a4f4f79ca195fc587e0bb533f643e777d7a3e6fb0350399a6060ea  0011-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch
+2f7c850af078a3ae71b2dd38d5d0b3964ea4262e52673e36ff33498cc6223e6c  0012-crypto-engine-autoload-padlock-dynamic-engine.patch"
+sha512sums="dea46225a5445edc4986b02b99fbc90153819374b9a9bfdd892b60cd18ac7fefaf21a7e9d2bb05d0e3bfa4d2704e0ee24b06cc8e7081a542d7598cc9e73c67c5  openssl-1.0.2.tar.gz
+c7a45d92fe1527b00bb8e5731e1a86deb33c08afa9277f24b4996d53a9748b03c78ed9800fd3b7f00cd5718bf23a4717be5bf22d452de4e0b1f2dda4aac7af42  0001-fix-manpages.patch
+2244f46cb18e6b98f075051dd2446c47f7590abccd108fbab707f168a20cad8d32220d704635973f09e3b2879f523be5160f1ffbc12ab3900f8a8891dc855c5c  0002-busybox-basename.patch
+58e42058a0c8086c49d681b1e226da39a8cf8cb88c51cf739dec2ff12e1bb5d7208ac5033264b186d58e9bdfe992fe9ddb95701d01caf1824396b2cefe30c0a4  0003-use-termios.patch
+82340da695de51a8df9e76289ea1cbb9b3ad2f10d3b793b0d2155ddfce573d497ed1e35e68fdfea8e3b6c1007908698e1a5354041f9567175f2d480920d86f63  0004-fix-default-ca-path-for-apps.patch
+94dc38b340f60ea90b8019aacb0e4982bbf2add83f6131f9082a91c0683bedee5577cee31bd830015f3639055f6d287d5a85fb8d56978955b33546ab91f09398  0005-fix-parallel-build.patch
+820d4ce1c222696fe3f1dd0d11815c06262ec230fdb174532fd507286667a0aefbf858ea5edac4245a54b950cd0556545ecd0c5cf494692a2ba131c667e7bcd5  0006-add-ircv3-tls-3.1-extension-support-to-s_client.patch
+fc4e383ec85c6543e4e82520904122a5a5601c68042ece1e95a0cae95e02d89174f06f78ba2f8aacae8df16052df6ec628b568519a41706428a3fa07984cc8e3  0007-reimplement-c_rehash-in-C.patch
+17ad683bb91a3a3c5bcc456c8aed7f0b42414c6de06ebafa4753af93c42d9827c9978a43d4d53d741a45df7f7895c6f6163172af57cc7b391cfd15f45ce6c351  0008-maintain-abi-compat-with-no-freelist-and-regular-bui.patch
+8c181760d7a149aa18d246d50f1c0438ffb63c98677b05306dfc00400ad0429b47d31e7c8d85126005c67f743d23e7a8a81174ffe98556f4caf9cf6b04d9ff17  0009-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch
+a3555440b5f544bfd6b9ad97557d8f4c1d673f6a35219f65056a72035d186be5f354717ddf9784899b602464d48657b090ade24379552d43af97609c0f48c389  0010-backport-changes-from-upstream-padlock-module.patch
+6353c7a94016c20db5d683dde37775f6780952ecdb1a5f39f878d04ba37f6ad79ae10fb6d65d181d912505a5d1e22463004cd855d548b364c00b120da2b0fdbc  0011-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch
+b72436eb8d4dac42d8da76a51d46cfc03e92e162f692a7a1761201221b9c6d66b738c08270b2260f02ce47b42043538474df73a7185dd4a809dd3b14cc8af7c3  0012-crypto-engine-autoload-padlock-dynamic-engine.patch"