openssl: update to 1.0.1e

This commit is contained in:
Tom G. Christensen 2013-11-16 20:39:33 +01:00
parent 7fee2b5185
commit 4f78e11550
2 changed files with 23 additions and 17 deletions

View File

@ -6,8 +6,8 @@
########################################################### ###########################################################
# Check the following 4 variables before running the script # Check the following 4 variables before running the script
topdir=openssl topdir=openssl
version=1.0.0e version=1.0.1e
pkgver=4 pkgver=1
source[0]=http://openssl.org/source/$topdir-$version.tar.gz source[0]=http://openssl.org/source/$topdir-$version.tar.gz
# If there are no patches, simply comment this # If there are no patches, simply comment this
#patch[0]= #patch[0]=
@ -15,21 +15,23 @@ source[0]=http://openssl.org/source/$topdir-$version.tar.gz
# Source function library # Source function library
. ${BUILDPKG_SCRIPTS}/buildpkg.functions . ${BUILDPKG_SCRIPTS}/buildpkg.functions
# For cpu settings
. ${BUILDPKG_BASE}/gcc/build.sh.gcc.cpu
# Global settings # Global settings
abbrev_ver=$(echo $version|${__sed} -e 's/\.//g') abbrev_ver=$(echo $version|${__sed} -e 's/\.//g')
baseversion=$(echo $version|${__sed} -e 's/[a-zA-Z]//g') baseversion=$(echo $version|${__sed} -e 's/[a-zA-Z]//g')
make_check_target="test" make_check_target="test"
__configure="./Configure" __configure="./Configure"
configure_args=(--prefix=$prefix --openssldir=${prefix}/${_sharedir}/ssl zlib shared) configure_args=(--prefix=$prefix --openssldir=${prefix}/${_sharedir}/ssl zlib-dynamic shared)
if [ "$arch" = "sparc" ]; then if [ "$arch" = "sparc" ]; then
# For Solaris > 7 we default to sparcv8 ISA configure_args+=(solaris-sparc${gcc_arch}-gcc)
configure_args+=(solaris-sparcv8-gcc)
# Solaris < 8 supports sparcv7 hardware
[ "$_os" = "sunos56" -o "$_os" = "sunos57" ] && configure_args+=(solaris-sparcv7-gcc)
else else
configure_args+=(386 solaris-x86-gcc) configure_args+=(386 solaris-x86-gcc)
fi fi
ignore_deps="LWperl"
# Buildsystem is non-standard so we take the easy way out
export LD_OPTIONS="-R$prefix/lib"
reg prep reg prep
prep() prep()
@ -45,14 +47,16 @@ build()
${__gsed} -i "s;@LIBDIR@;${prefix}/lib;g" Makefile.org ${__gsed} -i "s;@LIBDIR@;${prefix}/lib;g" Makefile.org
if [ "$arch" = "i386" ]; then if [ "$arch" = "i386" ]; then
# openssl defaults to --march=pentium which should be changed to --march=i386 --mtune=i686 # openssl defaults to --march=pentium which should be changed
${__sed} -e 's/-march=pentium/-march=i386 -mtune=i686/' Configure > Configure.myflags ${__gsed} -i "/solaris-x86-gcc/ s;-march=pentium;-march=$gcc_arch;" Configure
${__mv} Configure.myflags Configure # There is no reason to disable inline asm
chmod 755 Configure ${__gsed} -i "/solaris-x86-gcc/ s; -DOPENSSL_NO_INLINE_ASM;;" Configure
fi fi
# The -mv8 alias is not supported with newer gcc
${__gsed} -i 's/mv8/mcpu=v8/g' Configure
echo $__configure $configure_args echo $__configure "${configure_args[@]}"
$__configure $configure_args $__configure "${configure_args[@]}"
${__gsed} -i "/^CFLAG=/s;CFLAG=;CFLAG=-I${prefix}/include;" Makefile ${__gsed} -i "/^CFLAG=/s;CFLAG=;CFLAG=-I${prefix}/include;" Makefile
${__gsed} -i "/EX_LIBS/s;-lz;-L${prefix}/lib -R${prefix}/lib -lz;" Makefile ${__gsed} -i "/EX_LIBS/s;-lz;-L${prefix}/lib -R${prefix}/lib -lz;" Makefile
@ -75,7 +79,7 @@ install()
setdir ${stagedir}${prefix}/${_mandir} setdir ${stagedir}${prefix}/${_mandir}
for j in $(${__ls} -1d man?) for j in $(${__ls} -1d man?)
do do
cd $j cd $j
for manpage in * for manpage in *
do do
if [ -L "${manpage}" ]; then if [ -L "${manpage}" ]; then
@ -103,8 +107,7 @@ install()
setdir $prefix/${_libdir} setdir $prefix/${_libdir}
${__tar} -cf - libcrypto.so.0.9.8 libssl.so.0.9.8 | (cd ${stagedir}${prefix}/${_libdir}; ${__tar} -xf -) ${__tar} -cf - libcrypto.so.0.9.8 libssl.so.0.9.8 | (cd ${stagedir}${prefix}/${_libdir}; ${__tar} -xf -)
compat ossl 0.9.8g 1 2 compat ossl 0.9.8g 1 2
compat ossl 1.0.0 1 1 # It *might* be compatible with 1.0.0 but I'm not going to risk it
compat ossl 1.0.0a 1 2
} }
reg pack reg pack

View File

@ -1,5 +1,8 @@
CHANGELOG CHANGELOG
--------- ---------
* Sat Nov 16 2013 Tom G. Christensen <swpkg@jupiterrise.com> - 1.0.1e-1
- Update to 1.0.1e
* Sun Sep 18 2011 Tom G. Christensen <swpkg@jupiterrise.com> - 1.0.0e-4 * Sun Sep 18 2011 Tom G. Christensen <swpkg@jupiterrise.com> - 1.0.0e-4
- Update to 1.0.0e - Update to 1.0.0e