main/openssl: remove c_rehash

the users of this should be using now libressl's certhash. and
c_rehash is planned to be moved to ca-certificates so it can
avoid dependency on libressl main package.

1 files changed, 7 insertions, 32 deletions

diff --git a/main/openssl/APKBUILD b/main/openssl/APKBUILD
index c3c6e61896..1fee0a31ce 100644
--- a/main/openssl/APKBUILD
+++ b/main/openssl/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Timo Teras <timo.teras@iki.fi>
 pkgname=openssl
 pkgver=1.0.2j
-pkgrel=1
+pkgrel=2
 pkgdesc="Toolkit for SSL v2/v3 and TLS v1"
 url="http://openssl.org"
 depends=
@@ -20,7 +20,6 @@ source="http://www.openssl.org/source/${pkgname}-${pkgver}.tar.gz
 	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-no-rpath.patch
 	0010-ssl-env-zlib.patch
@@ -53,26 +52,11 @@ source="http://www.openssl.org/source/${pkgname}-${pkgver}.tar.gz
 #     - CVE-2016-6304
 #     - CVE-2016-6306
 
-_builddir="$srcdir"/$pkgname-$pkgver
-
-prepare() {
-        cd "$_builddir"
-        for patch in $source; do
-                case $patch in
-                *.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
-}
+builddir="$srcdir"/$pkgname-$pkgver
 
 build() {
 	local _target _optflags
-	cd "$_builddir"
+	cd "$builddir"
 
 	# openssl will prepend crosscompile always core CC et al
 	CC=${CC#${CROSS_COMPILE}}
@@ -102,30 +86,24 @@ build() {
 		|| return 1
 
 	make && make build-shared || return 1
-
-	# Build standalone version c_rehash app, so the huge openssl
-	# binary is not mandatory requirement of ca-certificates
-	${CROSS_COMPILE}$CC $CPPFLAGS $CFLAGS $LDFLAGS -I . -I include -L . "$_builddir"/apps/c_rehash.c -o c_rehash -lcrypto || return 1
 }
 
 package() {
-	cd "$_builddir"
+	cd "$builddir"
 	make INSTALL_PREFIX="$pkgdir" MANDIR=/usr/share/man MANSUFFIX=ssl install || return 1
-
-	# c_rehash standalone app
-	install c_rehash "$pkgdir"/usr/bin/c_rehash || return 1
+	# remove the script c_rehash
+	rm "$pkgdir"/usr/bin/c_rehash
 }
 
 libcrypto() {
 	pkgdesc="Crypto library from openssl"
 
-	mkdir -p "$subpkgdir"/lib "$subpkgdir"/usr/lib "$subpkgdir"/usr/bin
+	mkdir -p "$subpkgdir"/lib "$subpkgdir"/usr/lib
 	for i in "$pkgdir"/usr/lib/libcrypto*; do
 		mv $i "$subpkgdir"/lib/
 		ln -s ../../lib/${i##*/} "$subpkgdir"/usr/lib/${i##*/}
 	done
 	mv "$pkgdir"/usr/lib/engines "$subpkgdir"/usr/lib/ || return 1
-	mv "$pkgdir"/usr/bin/c_rehash "$subpkgdir"/usr/bin/ || return 1
 }
 
 libssl() {
@@ -144,7 +122,6 @@ md5sums="96322138f0b69e61b7212bc53d5e912b  openssl-1.0.2j.tar.gz
 9bb9dffdd871eeccc945494771302cc3  0004-fix-default-ca-path-for-apps.patch
 ed6e779e9799aeb7e029929a5719e631  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
 28e89dd715fc4ed85e747bd7306f2970  0009-no-rpath.patch
 742ee13d88b13414248f329a09f9a92d  0010-ssl-env-zlib.patch
@@ -157,7 +134,6 @@ c3e6a9710726dac72e3eeffd78961d3bae67a480f6bde7890e066547da25cdfd  0003-use-termi
 1f022ccab9b2e5850f32d2ac75cb617c8ce7b803a4548ce71e82776fe5b15b67  0004-fix-default-ca-path-for-apps.patch
 aa1fed25880313bd77fe06fc8a42ac65e02ac944eb4052480de2abbde7867380  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
 6b7ac5c9db430d9d3e8aaf87e0e95aa8a0ef460517d6563cca24014d4d890fbc  0009-no-rpath.patch
 fa2e3101ca7c6daed7ea063860d586424be7590b1cec4302bc2beee1a3c6039f  0010-ssl-env-zlib.patch
@@ -170,7 +146,6 @@ sha512sums="7d6ccae4aa3ccec3a5d128da29c68401cdb1210cba6d212d55235fc3bc63d7085e2f
 c67472879a31b5dbdd313892df6d37e7c93e8c0237d406c30d50b1016c2618ead3c13277f5dc723ef1ceed092d36e3c15a9777daa844f59b9fa2b0a4f04fd9ae  0004-fix-default-ca-path-for-apps.patch
 5d4191482f8bbf62c75fe6bc2d9587388022c3310703c2a913788a983b1d1406e706cf3916a5792604f0b0f220a87432d3b82b442cea9915f2abb6fdd8478fcb  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
 5dbbc01985190ae1254350fb12565beb6abb916b6a7bb1f0f22d9762b1e575d124aaf9aa4cfe5f908e420978f691072d48c61a72660f09dfd6d9a2f83f862bc1  0009-no-rpath.patch
 5febe20948e3f12d981e378e1f4ea538711657aacb6865a1aa91339d4a04277e250f490a1f2abc2c6f290bdc2b1bffdba1d00983b4c09f7ea983eef8163f9420  0010-ssl-env-zlib.patch