openssl: make it parallel installable with openssl 3.0.x

openssl/build.sh

@@ -7,7 +7,7 @@
 # Check the following 4 variables before running the script
 topdir=openssl
 version=1.0.2u
-pkgver=6
+pkgver=7
 source[0]=https://openssl.org/source/$topdir-$version.tar.gz
 # If there are no patches, simply comment this
 #patch[0]=
@@ -19,11 +19,12 @@ source[0]=https://openssl.org/source/$topdir-$version.tar.gz
 . ${BUILDPKG_BASE}/gcc/build.sh.gcc.cpu
 
 # Global settings
-abbrev_ver=$(echo $version|${__sed} -e 's/\.//g')
-baseversion=$(echo $version|${__sed} -e 's/[a-zA-Z]//g')
+sover=1.0.0
+shortver=102
+pname=openssl${shortver}
 make_check_target="test"
 __configure="./Configure"
-configure_args=(--prefix=$prefix --openssldir=${prefix}/${_sharedir}/ssl zlib-dynamic shared)
+configure_args=(--prefix=$prefix --openssldir=${prefix}/${_sharedir}/ssl zlib shared)
 if [ "$arch" = "sparc" ]; then
     configure_args+=(solaris-sparc${gcc_arch}-gcc)
 else
@@ -58,11 +59,11 @@ prep()
 reg build
 build()
 {
+    setdir source
+
     echo $__configure "${configure_args[@]}"
     $__configure "${configure_args[@]}"
 
-    setdir source
-
     ${__make} SHARED_LDFLAGS="-shared -R${prefix}/${_libdir}" depend
     ${__make} SHARED_LDFLAGS="-shared -R${prefix}/${_libdir}"
 }
@@ -79,21 +80,36 @@ install()
     clean stage
     setdir source
     ${__make} INSTALL_PREFIX=$stagedir MANDIR=${prefix}/${_mandir} install
-    setdir ${stagedir}${prefix}/${_mandir}
-    for j in $(${__ls} -1d man?)
+    # Relocate
+    mkdir -p ${stagedir}${prefix}/{${_includedir},${_libdir}}/$pname
+    ${__mv} ${stagedir}${prefix}/${_includedir}/{openssl,$pname/openssl}
+    ${__mv} ${stagedir}${prefix}/${_bindir}/{openssl,$pname}
+    ${__rm} -rf ${stagedir}${prefix}/{${_sharedir}/ssl/misc,{${_bindir},${_mandir}/man1}/{CA.pl,c_rehash,*tsget}*}
+    ${__rm} -f ${stagedir}${prefix}/${_sharedir}/ssl/openssl.cnf
+    ${__rm} -f ${stagedir}${prefix}/${_libdir}/*.so
+    ln -s ../libcrypto.so.${sover} ${stagedir}${prefix}/${_libdir}/${pname}/libcrypto.so
+    ln -s ../libssl.so.${sover} ${stagedir}${prefix}/${_libdir}/${pname}/libssl.so
+    for pc in libcrypto libssl openssl
     do
-	cd $j
-	for manpage in *
-	do
-	    if [ -L "${manpage}" ]; then
-                TARGET=$(${__ls} -l "${manpage}" | ${__awk} '{ print $NF }')
-                ${__ln} -snf "${TARGET}"ssl "${manpage}"ssl
-                ${__rm} -f "${manpage}"
-	    else
-		${__mv} "$manpage" "$manpage""ssl"
-	    fi
+	${__sed} -e "s@\(Libs: -L\${libdir}\)@\1 -L\${libdir}/$pname@" \
+	         -e "s@\(Cflags: -I\${includedir}\)@\1 -I\${includedir}/$pname@" \
+		 -e "s@\(Requires.*:.*\)\(libssl\)@\1\2$shortver@g" \
+		 -e "s@\(Requires.*:.*\)\(libcrypto\)@\1\2$shortver@g" \
+		 ${stagedir}${prefix}/${_libdir}/pkgconfig/${pc}.pc > ${stagedir}${prefix}/${_libdir}/pkgconfig/${pc}${shortver}.pc
+	rm -f ${stagedir}${prefix}/${_libdir}/pkgconfig/${pc}.pc
     done
-	cd ..
+    setdir ${stagedir}${prefix}/${_mandir}
+    ${__mv} man1/{openssl.1,${pname}.1}
+    for manpage in man*/*
+    do
+	[ "${manpage}" = "man1/${pname}.1" ] && continue
+	if [ -L "${manpage}" ]; then
+	    TARGET=$(${__ls} -l ${manpage} | ${__awk} '{ print $NF }')
+	    ${__ln} -snf ${TARGET}ssl${shortver} ${manpage}ssl${shortver}
+	    ${__rm} -f ${manpage}
+	else
+	    ${__mv} $manpage ${manpage}ssl${shortver}
+	fi
     done
     # Make .sos writable
     chmod 755 ${stagedir}${prefix}/${_libdir}/*.so.*
@@ -112,6 +128,7 @@ install()
     compat openssl 1.0.2o 1 3
     compat openssl 1.0.2p 1 4
     compat openssl 1.0.2r 1 5
+    compat openssl 1.0.2u 1 6
 }
 
 reg pack

openssl/meta/ChangeLog

@@ -1,5 +1,9 @@
 CHANGELOG
 ---------
+* Sat Nov 20 2021 Tom G. Christensen <swpkg@jupiterrise.com> - 1.0.2u-7
+- Rebuild as parallel installable with OpenSSL 3.0
+- Move utils into their own package
+
 * Tue Jan 28 2020 Tom G. Christensen <swpkg@jupiterrise.com> - 1.0.2u-6
 - Update to 1.0.2u
 

openssl/meta/depend

@@ -1 +1,3 @@
 TGCossl TGCprngd auto
+TGCossld openssl auto
+TGCosslu openssl auto

openssl/meta/pkgdef

@@ -1,28 +1,37 @@
 [openssl]
 pkgname="${pkgprefix}ossl"
-name="openssl - Secure Sockets Layer"
+name="openssl - OpenSSL shared libraries"
 pkgcat="system"
 pkgvendor="https://www.openssl.org"
 pkgdesc="Cryptography and SSL/TLS Toolkit"
 pkgver="$pkgver"
 files(-,root,bin)
 default_docs
-$_bindir
 $_libdir/*.so.*
 $_libdir/engines/*.so
-$_mandir/man{1,5,7}
 $_sharedir/ssl
 
+[openssl-utils]
+pkgname="${pkgprefix}osslu"
+name="openssl-utils - OpenSSL utilities and manpages"
+pkgcat="system"
+pkgvendor="https://www.openssl.org"
+pkgdesc="Cryptography and SSL/TLS Toolkit"
+pkgver="$pkgver"
+files(-,root,bin)
+$_bindir
+$_mandir/man{1,5,7}
+
 [openssl-devel]
 pkgname="${pkgprefix}ossld"
-name="openssl-devel - Development support for openssl"
+name="openssl-devel - Development support for OpenSSL"
 pkgcat="system"
-pkgvendor="http://www.openssl.org"
-pkgdesc="Files needed for developing with openssl"
+pkgvendor="https://www.openssl.org"
+pkgdesc="Files needed for developing with OpenSSL"
 pkgver="$pkgver"
 files(-,root,bin)
-$_includedir
-$_libdir/*.so
+$_includedir/$pname
+$_libdir/$pname/*.so
 $_libdir/pkgconfig
 
 [openssl-devel-manpages]

openssl/meta/relnotes

@@ -25,8 +25,7 @@ KNOWN DEPENDENCIES
 
 ERRORS/MISCELLANEOUS
 --------------------
-Note that all manpages has had 'ssl' added to their name.
+Note that all manpages has had 'ssl102' added to their name.
 This means that you might have to specify the whole name
 if there's another manpage by the same name.
-ie. man x509 vs man x509.1ssl
-
+ie. man x509 vs man x509.1ssl102