diff --git a/openssl/build.sh b/openssl/build.sh index 739072d..9872da4 100755 --- a/openssl/build.sh +++ b/openssl/build.sh @@ -6,9 +6,9 @@ ########################################################### # Check the following 4 variables before running the script topdir=openssl -version=1.0.2r -pkgver=5 -source[0]=http://openssl.org/source/$topdir-$version.tar.gz +version=1.0.2u +pkgver=6 +source[0]=https://openssl.org/source/$topdir-$version.tar.gz # If there are no patches, simply comment this #patch[0]= @@ -37,29 +37,32 @@ reg prep prep() { generic_prep -} -reg build -build() -{ setdir source ${__gsed} -i '/^SHELL/s/sh/ksh/' Makefile.org ${__gsed} -i "s;@LIBDIR@;${prefix}/lib;g" Makefile.org if [ "$arch" = "i386" ]; then - # openssl defaults to --march=pentium which should be changed + # Override the default gcc march ${__gsed} -i "/solaris-x86-gcc/ s;-march=pentium;-march=$gcc_arch;" Configure - # There is no reason to disable inline asm + # With GNU as there is no need to disable inline assembler ${__gsed} -i "/solaris-x86-gcc/ s; -DOPENSSL_NO_INLINE_ASM;;" Configure fi # The -mv8 alias is not supported with newer gcc ${__gsed} -i 's/mv8/mcpu=v8/g' Configure + ${__gsed} -i "/^CFLAG=/s;CFLAG=;CFLAG=-I${prefix}/include;" Makefile + ${__gsed} -i "/EX_LIBS/s;-lz;-L${prefix}/lib -R${prefix}/lib -lz;" Makefile +} + +reg build +build() +{ echo $__configure "${configure_args[@]}" $__configure "${configure_args[@]}" - ${__gsed} -i "/^CFLAG=/s;CFLAG=;CFLAG=-I${prefix}/include;" Makefile - ${__gsed} -i "/EX_LIBS/s;-lz;-L${prefix}/lib -R${prefix}/lib -lz;" Makefile + setdir source + ${__make} SHARED_LDFLAGS="-shared -R${prefix}/${_libdir}" depend ${__make} SHARED_LDFLAGS="-shared -R${prefix}/${_libdir}" } @@ -108,6 +111,7 @@ install() compat openssl 1.0.2k 1 2 compat openssl 1.0.2o 1 3 compat openssl 1.0.2p 1 4 + compat openssl 1.0.2r 1 5 } reg pack diff --git a/openssl/meta/ChangeLog b/openssl/meta/ChangeLog index 59b798d..61a792d 100644 --- a/openssl/meta/ChangeLog +++ b/openssl/meta/ChangeLog @@ -1,5 +1,8 @@ CHANGELOG --------- +* Tue Jan 28 2020 Tom G. Christensen - 1.0.2u-6 +- Update to 1.0.2u + * Sat Mar 23 2019 Tom G. Christensen - 1.0.2r-5 - Update to 1.0.2r diff --git a/openssl/meta/pkgdef b/openssl/meta/pkgdef index 94b722a..2275cc1 100644 --- a/openssl/meta/pkgdef +++ b/openssl/meta/pkgdef @@ -2,8 +2,8 @@ pkgname="${pkgprefix}ossl" name="openssl - Secure Sockets Layer" pkgcat="system" -pkgvendor="http://www.openssl.org" -pkgdesc="Toolkit implementing SSL v2/v3 and TLS v1" +pkgvendor="https://www.openssl.org" +pkgdesc="Cryptography and SSL/TLS Toolkit" pkgver="$pkgver" files(-,root,bin) default_docs @@ -24,5 +24,14 @@ files(-,root,bin) $_includedir $_libdir/*.so $_libdir/pkgconfig + +[openssl-devel-manpages] +pkgname="${pkgprefix}osslm" +name="openssl-devel-manpages - Development documentation for OpenSSL" +pkgcat="system" +pkgvendor="https://www.openssl.org" +pkgdesc="Developement manpages for OpenSSL" +pkgver="$pkgver" +files(-,root,bin) $_mandir/man3