From 667981bbf243b600925273d5fa497242dc86554e Mon Sep 17 00:00:00 2001 From: "Tom G. Christensen" Date: Thu, 25 Oct 2007 07:51:47 +0000 Subject: [PATCH] Update to 0.9.8g Remove all patches as they are obsolete. --- openssl/build.sh | 19 +++-------- openssl/meta/pkgdef | 2 ++ openssl/src/openssl-0.9.6k-Configure.patch | 11 ------- openssl/src/openssl-0.9.6k-soversion.patch | 21 ------------ openssl/src/openssl-0.9.7c-Configure.patch | 11 ------- .../src/openssl-0.9.7c-can-2004-0079.patch | 19 ----------- .../src/openssl-0.9.7c-can-2004-0112.patch | 32 ------------------- openssl/src/openssl-0.9.7c-doc.patch | 11 ------- openssl/src/openssl-0.9.7c-shlib.patch | 10 ------ openssl/src/openssl-0.9.7k-shlib.patch | 10 ------ 10 files changed, 6 insertions(+), 140 deletions(-) delete mode 100644 openssl/src/openssl-0.9.6k-Configure.patch delete mode 100644 openssl/src/openssl-0.9.6k-soversion.patch delete mode 100644 openssl/src/openssl-0.9.7c-Configure.patch delete mode 100644 openssl/src/openssl-0.9.7c-can-2004-0079.patch delete mode 100644 openssl/src/openssl-0.9.7c-can-2004-0112.patch delete mode 100644 openssl/src/openssl-0.9.7c-doc.patch delete mode 100644 openssl/src/openssl-0.9.7c-shlib.patch delete mode 100644 openssl/src/openssl-0.9.7k-shlib.patch diff --git a/openssl/build.sh b/openssl/build.sh index 7a17271..51e87b5 100755 --- a/openssl/build.sh +++ b/openssl/build.sh @@ -9,19 +9,15 @@ ########################################################### # Check the following 4 variables before running the script topdir=openssl -version=0.9.7l +version=0.9.8g pkgver=1 source[0]=$topdir-$version.tar.gz # If there are no patches, simply comment this -patch[0]=openssl-0.9.7k-shlib.patch -patch[1]=openssl-0.9.7c-Configure.patch +#patch[0]= # Source function library . ${BUILDPKG_BASE}/scripts/buildpkg.functions -# shared library binary compatibility is not guaranteed -# Play it safe and up the soversion with each release -sover=12 # l = 12 abbrev_ver=$(echo $version|$SED -e 's/\.//g') baseversion=$(echo $version|$SED -e 's/[a-zA-Z]//g') @@ -29,6 +25,7 @@ reg prep prep() { generic_prep + setdir source sed -e '/^SHELL/s/sh/ksh/' Makefile.org > Makefile.org.ksh mv Makefile.org.ksh Makefile.org } @@ -42,14 +39,6 @@ build() ./config --prefix=$prefix --openssldir=$prefix/ssl shared - major=$(grep ^SHLIB_MAJOR Makefile) - minor=$(grep ^SHLIB_MINOR Makefile) - $SED -e "s;${major};SHLIB_MAJOR=${baseversion};g" \ - -e "s;${minor};SHLIB_MINOR=${sover};g" Makefile > Makefile.new - $MV Makefile.new Makefile - $SED -e "s;${major};SHLIB_MAJOR=${baseversion};g" \ - -e "s;${minor};SHLIB_MINOR=${sover};g" Makefile.ssl > Makefile.new - $MV Makefile.new Makefile.ssl $MAKE_PROG CC="gcc -static-libgcc" LIBSSL="-Wl,-R,$prefix/lib -L.. -lssl" LIBCRYPTO="-Wl,-R,$prefix/lib -L.. -lcrypto" all build-shared $MAKE_PROG CC="gcc -static-libgcc" LIBSSL="-Wl,-R,$prefix/lib -L.. -lssl" LIBCRYPTO="-Wl,-R,$prefix/lib -L.. -lcrypto" all link-shared do_solaris-shared } @@ -85,9 +74,9 @@ install() #mv "Modes of DES.7ssl" "Modes_of_DES.7ssl" # Make .sos writable chmod 755 ${stagedir}${prefix}/${_libdir}/*.so.* + chmod 755 ${stagedir}${prefix}/${_libdir}/engines/*.so.* # Nuke static libraries - they just take up space rm -f ${stagedir}${prefix}/${_libdir}/*.a - rm -f ${stagedir}${prefix}/${_libdir}/fips_premain.c* custom_install=1 generic_install } diff --git a/openssl/meta/pkgdef b/openssl/meta/pkgdef index 40eaa33..b670c21 100644 --- a/openssl/meta/pkgdef +++ b/openssl/meta/pkgdef @@ -24,7 +24,9 @@ pkgdesc="Toolkit implementing SSL v2/v3 and TLS v1" pkgver="$pkgver" files(-,root,bin) $_libdir/*.so.* +$_libdir/engines/*.so dir $_libdir +dir $_libdir/engines [openssl-dman] pkgname="${pkgprefix}ossl${abbrev_ver}" diff --git a/openssl/src/openssl-0.9.6k-Configure.patch b/openssl/src/openssl-0.9.6k-Configure.patch deleted file mode 100644 index 02aa846..0000000 --- a/openssl/src/openssl-0.9.6k-Configure.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- openssl-0.9.6k/Configure.orig 2003-10-02 10:59:28.409538000 +0200 -+++ openssl-0.9.6k/Configure 2003-10-02 11:01:48.521291000 +0200 -@@ -1006,7 +1006,7 @@ - elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/) - { - my $sotmp = $1; -- s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/; -+ s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_SOVER) .s$sotmp/; - } - elsif ($shared_extension ne "" && $shared_extension =~ /^\.[^\.]*\.[^\.]*\.dylib$/) - { diff --git a/openssl/src/openssl-0.9.6k-soversion.patch b/openssl/src/openssl-0.9.6k-soversion.patch deleted file mode 100644 index 47c980a..0000000 --- a/openssl/src/openssl-0.9.6k-soversion.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- openssl-0.9.6k/Makefile.org.orig 2003-10-15 14:32:32.535403000 +0200 -+++ openssl-0.9.6k/Makefile.org 2003-10-15 15:06:34.108563000 +0200 -@@ -10,6 +10,7 @@ - SHLIB_MAJOR= - SHLIB_MINOR= - SHLIB_EXT= -+SHLIB_SOVER= - PLATFORM=dist - OPTIONS= - CONFIGURE_ARGS= -@@ -351,8 +352,9 @@ - libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \ - ( PATH=/usr/ccs/bin:$$PATH ; export PATH; \ - set -x; ${CC} ${SHARED_LDFLAGS} \ -+ -R${INSTALLTOP}/lib \ - -G -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ -- -h lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ -+ -h lib$$i.so.${SHLIB_SOVER} \ - -z allextract lib$$i.a $$libs ${EX_LIBS} -lc ) || exit 1; \ - libs="$$libs -l$$i"; \ - done; \ diff --git a/openssl/src/openssl-0.9.7c-Configure.patch b/openssl/src/openssl-0.9.7c-Configure.patch deleted file mode 100644 index b00b614..0000000 --- a/openssl/src/openssl-0.9.7c-Configure.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- openssl-0.9.7c/Configure.orig 2003-12-27 20:24:05.940000000 +0100 -+++ openssl-0.9.7c/Configure 2003-12-27 20:25:42.690000000 +0100 -@@ -1259,7 +1259,7 @@ - elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/) - { - my $sotmp = $1; -- s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/; -+ s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp/; - } - elsif ($shared_extension ne "" && $shared_extension =~ /^\.[^\.]*\.[^\.]*\.dylib$/) - { diff --git a/openssl/src/openssl-0.9.7c-can-2004-0079.patch b/openssl/src/openssl-0.9.7c-can-2004-0079.patch deleted file mode 100644 index 90f0056..0000000 --- a/openssl/src/openssl-0.9.7c-can-2004-0079.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -ur -x CVS openssl7/ssl/s3_pkt.c ossl7/ssl/s3_pkt.c ---- openssl7/ssl/s3_pkt.c 2003-02-19 12:04:16.000000000 +0000 -+++ ossl7/ssl/s3_pkt.c 2004-02-02 01:10:12.000000000 +0000 -@@ -1085,6 +1085,14 @@ - goto err; - } - -+ /* Check we have a cipher to change to */ -+ if (s->s3->tmp.new_cipher == NULL) -+ { -+ i=SSL_AD_UNEXPECTED_MESSAGE; -+ SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_CCS_RECEIVED_EARLY); -+ goto err; -+ } -+ - rr->length=0; - - if (s->msg_callback) - diff --git a/openssl/src/openssl-0.9.7c-can-2004-0112.patch b/openssl/src/openssl-0.9.7c-can-2004-0112.patch deleted file mode 100644 index 29b419a..0000000 --- a/openssl/src/openssl-0.9.7c-can-2004-0112.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -ur -x CVS openssl7/ssl/s3_srvr.c ossl7/ssl/s3_srvr.c ---- openssl7/ssl/s3_srvr.c 2004-01-14 23:02:49.000000000 +0000 -+++ ossl7/ssl/s3_srvr.c 2004-02-19 13:22:16.000000000 +0000 -@@ -1588,11 +1591,27 @@ - - n2s(p,i); - enc_ticket.length = i; -+ -+ if (n < enc_ticket.length + 6) -+ { -+ SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, -+ SSL_R_DATA_LENGTH_TOO_LONG); -+ goto err; -+ } -+ - enc_ticket.data = (char *)p; - p+=enc_ticket.length; - - n2s(p,i); - authenticator.length = i; -+ -+ if (n < enc_ticket.length + authenticator.length + 6) -+ { -+ SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, -+ SSL_R_DATA_LENGTH_TOO_LONG); -+ goto err; -+ } -+ - authenticator.data = (char *)p; - p+=authenticator.length; - - diff --git a/openssl/src/openssl-0.9.7c-doc.patch b/openssl/src/openssl-0.9.7c-doc.patch deleted file mode 100644 index 1693df7..0000000 --- a/openssl/src/openssl-0.9.7c-doc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- openssl-0.9.7c/doc/crypto/EVP_BytesToKey.pod.orig 2003-12-28 01:17:33.560000000 +0100 -+++ openssl-0.9.7c/doc/crypto/EVP_BytesToKey.pod 2003-12-28 01:17:42.310000000 +0100 -@@ -2,7 +2,7 @@ - - =head1 NAME - -- EVP_BytesToKey - password based encryption routine -+EVP_BytesToKey - password based encryption routine - - =head1 SYNOPSIS - diff --git a/openssl/src/openssl-0.9.7c-shlib.patch b/openssl/src/openssl-0.9.7c-shlib.patch deleted file mode 100644 index 14a1cf8..0000000 --- a/openssl/src/openssl-0.9.7c-shlib.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- openssl-0.9.7c/Makefile.org.origc 2004-01-06 15:20:40.890005000 +0100 -+++ openssl-0.9.7c/Makefile.org 2004-01-06 15:22:02.059996000 +0100 -@@ -390,6 +390,7 @@ - MINUSZ='-z '; \ - (${CC} -v 2>&1 | grep gcc) > /dev/null && MINUSZ='-Wl,-z,'; \ - set -x; ${CC} ${SHARED_LDFLAGS} -G -dy -z text \ -+ -Wl,-R,@LIBDIR@ \ - -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ - -h lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ - $${MINUSZ}allextract lib$$i.a $${MINUSZ}defaultextract \ diff --git a/openssl/src/openssl-0.9.7k-shlib.patch b/openssl/src/openssl-0.9.7k-shlib.patch deleted file mode 100644 index 5f15896..0000000 --- a/openssl/src/openssl-0.9.7k-shlib.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 \