Update to 0.9.7k

This commit is contained in:
Tom G. Christensen 2006-09-11 07:37:30 +00:00 committed by tgc
parent 9d9c480784
commit 42dda22df3
2 changed files with 19 additions and 6 deletions

View File

@ -8,11 +8,11 @@
# #
# Check the following 4 variables before running the script # Check the following 4 variables before running the script
topdir=openssl topdir=openssl
version=0.9.7d version=0.9.7k
pkgver=4 pkgver=1
source[0]=$topdir-$version.tar.gz source[0]=$topdir-$version.tar.gz
# If there are no patches, simply comment this # If there are no patches, simply comment this
patch[0]=openssl-0.9.7c-shlib.patch patch[0]=openssl-0.9.7k-shlib.patch
patch[1]=openssl-0.9.7c-Configure.patch patch[1]=openssl-0.9.7c-Configure.patch
# Source function library # Source function library
@ -20,7 +20,7 @@ patch[1]=openssl-0.9.7c-Configure.patch
# shared library binary compatibility is not guaranteed # shared library binary compatibility is not guaranteed
# Play it safe and up the soversion with each release # Play it safe and up the soversion with each release
sover=4 # d = 4 sover=11 # k = 11
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')
@ -34,6 +34,8 @@ reg prep
prep() prep()
{ {
generic_prep generic_prep
sed -e '/^SHELL/s/sh/ksh/' Makefile.org > Makefile.org.ksh
mv Makefile.org.ksh Makefile.org
} }
reg build reg build
@ -65,7 +67,7 @@ install()
$MAKE_PROG CC="gcc -static-libgcc" INSTALL_PREFIX=$stagedir LIBSSL="-Wl,-R,$prefix/lib -L.. -lssl" LIBCRYPTO="-Wl,-R,$prefix/lib -L.. -lcrypto" install $MAKE_PROG CC="gcc -static-libgcc" INSTALL_PREFIX=$stagedir LIBSSL="-Wl,-R,$prefix/lib -L.. -lssl" LIBCRYPTO="-Wl,-R,$prefix/lib -L.. -lcrypto" install
setdir $stagedir$prefix/lib setdir $stagedir$prefix/lib
chmod a+x pkgconfig chmod a+x pkgconfig
rmdir $stagedir$prefix/ssl/lib #rmdir $stagedir$prefix/ssl/lib
$MV $stagedir$prefix/ssl/man $stagedir$prefix $MV $stagedir$prefix/ssl/man $stagedir$prefix
setdir $stagedir$prefix/man setdir $stagedir$prefix/man
for j in $(ls -1d man?) for j in $(ls -1d man?)
@ -85,9 +87,10 @@ install()
done done
# A few stupid manpages left that pkgproto can't deal with # A few stupid manpages left that pkgproto can't deal with
setdir $stagedir$prefix/man/man7 setdir $stagedir$prefix/man/man7
mv "Modes of DES.7ssl" "Modes_of_DES.7ssl" #mv "Modes of DES.7ssl" "Modes_of_DES.7ssl"
# Make .sos writable # Make .sos writable
chmod 755 ${stagedir}${prefix}/${_libdir}/*.so.* chmod 755 ${stagedir}${prefix}/${_libdir}/*.so.*
rm -f ${stagedir}${prefix}/${_libdir}/fips_premain.c*
custom_install=1 custom_install=1
generic_install generic_install
} }

View File

@ -0,0 +1,10 @@
--- openssl-0.9.7k/Makefile.org.shlib 2006-09-08 10:57:26.078030000 +0200
+++ openssl-0.9.7k/Makefile.org 2006-09-08 10:58:33.888821000 +0200
@@ -432,6 +432,7 @@
MINUSZ='-z '; \
(${CC} -v 2>&1 | grep gcc) > /dev/null && MINUSZ='-Wl,-z,'; \
set -x; $${FIPSLD:-${CC}} ${SHARED_LDFLAGS} \
+ -Wl,-R,@LIBDIR@ \
-o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
-h lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
-Wl,-Bsymbolic \