[arch-commits] Commit in openssl/trunk (PKGBUILD)

[Pierre Schmitz]

    Date: Saturday, December 12, 2020 @ 06:41:25
  Author: pierre
Revision: 404003

upgpkg: openssl 1.1.1.i-2: FS#54887: Revert split package

Modified:
  openssl/trunk/PKGBUILD

----------+
 PKGBUILD |   60 +++++++++++++++++-------------------------------------------
 1 file changed, 17 insertions(+), 43 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-12-12 04:27:42 UTC (rev 404002)
+++ PKGBUILD	2020-12-12 06:41:25 UTC (rev 404003)
@@ -1,25 +1,29 @@
 # Maintainer: Pierre Schmitz <pierre at archlinux.de>
 
-pkgbase=openssl
-pkgname=(openssl openssl-doc openssl-perl)
+pkgname=openssl
 _ver=1.1.1i
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
-pkgrel=1
+pkgrel=2
+pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security'
 arch=('x86_64')
 url='https://www.openssl.org'
 license=('custom:BSD')
+depends=('glibc')
 makedepends=('perl')
+optdepends=('ca-certificates' 'perl')
+replaces=('openssl-perl' 'openssl-doc')
+backup=('etc/ssl/openssl.cnf')
 source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz"{,.asc}
-        'ca-dir.patch')
+	'ca-dir.patch')
 sha256sums=('e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242'
-            'SKIP'
-            '75aa8c2c638c8a3ebfd9fa146fc61c7ff878fc997dc6aa10d39e4b2415d669b2')
+	'SKIP'
+	'75aa8c2c638c8a3ebfd9fa146fc61c7ff878fc997dc6aa10d39e4b2415d669b2')
 validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491'
-              '7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C')
+	'7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C')
 
 prepare() {
-	cd "$srcdir/$pkgbase-$_ver"
+	cd "$srcdir/$pkgname-$_ver"
 
 	# set ca dir to /etc/ssl by default
 	patch -p0 -i "$srcdir/ca-dir.patch"
@@ -26,7 +30,7 @@
 }
 
 build() {
-	cd "$srcdir/$pkgbase-$_ver"
+	cd "$srcdir/$pkgname-$_ver"
 
 	# mark stack as non-executable: http://bugs.archlinux.org/task/12434
 	./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
@@ -45,46 +49,16 @@
 	patch -p0 -R -i "$srcdir/ca-dir.patch"
 
 	make test
-	
+
 	patch -p0 -i "$srcdir/ca-dir.patch"
 	# re-run make to re-generate CA.pl from th patched .in file.
 	make apps/CA.pl
 }
 
-package_openssl() {
-	pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security'
-	depends=('glibc')
-	optdepends=('ca-certificates')
-	backup=('etc/ssl/openssl.cnf')
+package() {
+	cd "$srcdir/$pkgname-$_ver"
 
-	cd "$srcdir/$pkgbase-$_ver"
+	make DESTDIR=$pkgdir MANDIR=/usr/share/man MANSUFFIX=ssl install_sw install_ssldirs install_man_docs
 
-	make DESTDIR=$pkgdir MANDIR=/usr/share/man MANSUFFIX=ssl install_sw install_ssldirs
-
-	rm -rf $pkgdir/etc/ssl/misc $pkgdir/usr/bin/c_rehash
 	install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }
-
-package_openssl-doc() {
-	pkgdesc='Documentation provided with OpenSSL'
-	depends=('openssl')
-
-	cd "$srcdir/$pkgbase-$_ver"
-
-	make DESTDIR=$pkgdir MANDIR=/usr/share/man MANSUFFIX=ssl install_man_docs
-
-	install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
-}
-
-package_openssl-perl() {
-	pkgdesc='Perl scripts provided with OpenSSL'
-	depends=('openssl' 'perl')
-
-	cd "$srcdir/$pkgbase-$_ver"
-
-	make DESTDIR=$pkgdir MANDIR=/usr/share/man MANSUFFIX=ssl install_programs install_ssldirs
-
-	install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
-	mv $pkgdir/etc/ssl/misc/* $pkgdir/usr/bin/
-	rm -rf $pkgdir/{etc,usr/lib} $pkgdir/usr/bin/openssl
-}