diff --git a/baselibs.conf b/baselibs.conf index 17aae9e..300061b 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,2 +1,2 @@ -libopenssl0_9_8 +libopenssl1_0_0 obsoletes "openssl- <= " diff --git a/merge_from_0.9.8k.patch b/merge_from_0.9.8k.patch new file mode 100644 index 0000000..58c861e --- /dev/null +++ b/merge_from_0.9.8k.patch @@ -0,0 +1,74 @@ +Index: openssl-1.0.0/Configure +=================================================================== +--- openssl-1.0.0.orig/Configure ++++ openssl-1.0.0/Configure +@@ -866,7 +866,7 @@ PROCESS_ARGS: + } + else + { +- die "target already defined - $target (offending arg: $_)\n" if ($target ne ""); ++ warn "target already defined - $target (offending arg: $_)\n" if ($target ne ""); + $target=$_; + } + +@@ -1105,7 +1105,7 @@ else { $lflags=$prelflags; undef $pre + my $no_shared_warn=0; + my $no_user_cflags=0; + +-if ($flags ne "") { $cflags="$flags$cflags"; } ++if ($flags ne "") { $cflags="$cflags $flags"; } + else { $no_user_cflags=1; } + + # Kerberos settings. The flavor must be provided from outside, either through +Index: openssl-1.0.0/config +=================================================================== +--- openssl-1.0.0.orig/config ++++ openssl-1.0.0/config +@@ -560,7 +560,8 @@ case "$GUESSOS" in + fi + OUT="darwin-i386-cc" ;; + alpha-*-linux2) +- ISA=`awk '/cpu model/{print$4;exit(0);}' /proc/cpuinfo` ++ #ISA=`awk '/cpu model/{print$4;exit(0);}' /proc/cpuinfo` ++ ISA=EV56 + case ${ISA:-generic} in + *[678]) OUT="linux-alpha+bwx-$CC" ;; + *) OUT="linux-alpha-$CC" ;; +@@ -580,7 +581,8 @@ case "$GUESSOS" in + echo " You have about 5 seconds to press Ctrl-C to abort." + (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1 + fi +- OUT="linux-ppc" ++ # we have the target and force it here ++ OUT="linux-ppc64" + ;; + ppc-*-linux2) OUT="linux-ppc" ;; + ia64-*-linux?) OUT="linux-ia64" ;; +@@ -596,10 +598,10 @@ case "$GUESSOS" in + sparc-*-linux2) + KARCH=`awk '/^type/{print$3;exit(0);}' /proc/cpuinfo` + case ${KARCH:-sun4} in +- sun4u*) OUT="linux-sparcv9" ;; +- sun4m) OUT="linux-sparcv8" ;; +- sun4d) OUT="linux-sparcv8" ;; +- *) OUT="linux-generic32"; options="$options -DB_ENDIAN" ;; ++# sun4u*) OUT="linux-sparcv9" ;; ++# sun4m) OUT="linux-sparcv8" ;; ++# sun4d) OUT="linux-sparcv8" ;; ++ *) OUT="linux-sparcv8" ;; + esac ;; + parisc*-*-linux2) + # 64-bit builds under parisc64 linux are not supported and +@@ -618,7 +620,11 @@ case "$GUESSOS" in + # PA8500 -> 8000 (2.0) + # PA8600 -> 8000 (2.0) + +- CPUSCHEDULE=`echo $CPUSCHEDULE|sed -e 's/7300LC/7100LC/' -e 's/8.00/8000/'` ++ # CPUSCHEDULE=`echo $CPUSCHEDULE|sed -e 's/7300LC/7100LC/' -e 's/8?00/8000/'` ++ # lets have CPUSCHEDULE for 1.1: ++ CPUSCHEDULE=7100LC ++ # we want to support 1.1 CPUs as well: ++ CPUARCH=1.1 + # Finish Model transformations + + options="$options -DB_ENDIAN -mschedule=$CPUSCHEDULE -march=$CPUARCH" diff --git a/merge_from_0_9_8k.patch b/merge_from_0_9_8k.patch deleted file mode 100644 index 8ac481a..0000000 --- a/merge_from_0_9_8k.patch +++ /dev/null @@ -1,99 +0,0 @@ -Index: openssl-0.9.8m/Configure -=================================================================== ---- openssl-0.9.8m.orig/Configure -+++ openssl-0.9.8m/Configure -@@ -874,7 +874,7 @@ PROCESS_ARGS: - } - else - { -- die "target already defined - $target (offending arg: $_)\n" if ($target ne ""); -+ warn "target already defined - $target (offending arg: $_)\n" if ($target ne ""); - $target=$_; - } - -@@ -1123,7 +1123,7 @@ else { $lflags=$prelflags; undef $pre - my $no_shared_warn=0; - my $no_user_cflags=0; - --if ($flags ne "") { $cflags="$flags$cflags"; } -+if ($flags ne "") { $cflags="$cflags $flags"; } - else { $no_user_cflags=1; } - - # Kerberos settings. The flavor must be provided from outside, either through -Index: openssl-0.9.8m/config -=================================================================== ---- openssl-0.9.8m.orig/config -+++ openssl-0.9.8m/config -@@ -526,7 +526,8 @@ case "$GUESSOS" in - ppc-apple-darwin*) OUT="darwin-ppc-cc" ;; - i386-apple-darwin*) OUT="darwin-i386-cc" ;; - alpha-*-linux2) -- ISA=`awk '/cpu model/{print$4;exit(0);}' /proc/cpuinfo` -+ #ISA=`awk '/cpu model/{print$4;exit(0);}' /proc/cpuinfo` -+ ISA=EV56 - case ${ISA:-generic} in - *[678]) OUT="linux-alpha+bwx-$CC" ;; - *) OUT="linux-alpha-$CC" ;; -@@ -546,7 +547,8 @@ case "$GUESSOS" in - echo " You have about 5 seconds to press Ctrl-C to abort." - (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1 - fi -- OUT="linux-ppc" -+ # we have the target and force it here -+ OUT="linux-ppc64" - ;; - ppc-*-linux2) OUT="linux-ppc" ;; - ia64-*-linux?) OUT="linux-ia64" ;; -@@ -562,10 +564,10 @@ case "$GUESSOS" in - sparc-*-linux2) - KARCH=`awk '/^type/{print$3;exit(0);}' /proc/cpuinfo` - case ${KARCH:-sun4} in -- sun4u*) OUT="linux-sparcv9" ;; -- sun4m) OUT="linux-sparcv8" ;; -- sun4d) OUT="linux-sparcv8" ;; -- *) OUT="linux-generic32"; options="$options -DB_ENDIAN" ;; -+# sun4u*) OUT="linux-sparcv9" ;; -+# sun4m) OUT="linux-sparcv8" ;; -+# sun4d) OUT="linux-sparcv8" ;; -+ *) OUT="linux-sparcv8" ;; - esac ;; - parisc*-*-linux2) - # 64-bit builds under parisc64 linux are not supported and -@@ -584,7 +586,11 @@ case "$GUESSOS" in - # PA8500 -> 8000 (2.0) - # PA8600 -> 8000 (2.0) - -- CPUSCHEDULE=`echo $CPUSCHEDULE|sed -e 's/7300LC/7100LC/' -e 's/8.00/8000/'` -+ # CPUSCHEDULE=`echo $CPUSCHEDULE|sed -e 's/7300LC/7100LC/' -e 's/8?00/8000/'` -+ # lets have CPUSCHEDULE for 1.1: -+ CPUSCHEDULE=7100LC -+ # we want to support 1.1 CPUs as well: -+ CPUARCH=1.1 - # Finish Model transformations - - options="$options -DB_ENDIAN -mschedule=$CPUSCHEDULE -march=$CPUARCH" -Index: openssl-0.9.8m/crypto/camellia/cmll_locl.h -=================================================================== ---- openssl-0.9.8m.orig/crypto/camellia/cmll_locl.h -+++ openssl-0.9.8m/crypto/camellia/cmll_locl.h -@@ -97,7 +97,7 @@ extern "C" { - (ct)[2] = (u8)((st) >> 8); \ - (ct)[3] = (u8)(st); } - --#if (defined (__GNUC__) && (defined(__x86_64__) || defined(__x86_64))) -+#if (defined (__GNUC__) && (defined(__x86_64__) || defined(__x86_64) || defined(i386))) - #define CAMELLIA_SWAP4(x) \ - do{\ - asm("bswap %1" : "+r" (x));\ -Index: openssl-0.9.8m/crypto/perlasm/x86unix.pl -=================================================================== ---- openssl-0.9.8m.orig/crypto/perlasm/x86unix.pl -+++ openssl-0.9.8m/crypto/perlasm/x86unix.pl -@@ -557,6 +557,7 @@ sub main'file_end - push(@out,$const); - $const=""; - } -+ push(@out, ".section .note.GNU-stack,\"\",\@progbits"); - } - - sub main'data_byte diff --git a/openssl-0.9.8m.tar.bz2 b/openssl-0.9.8m.tar.bz2 deleted file mode 100644 index a427209..0000000 --- a/openssl-0.9.8m.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4752c8fb0de6225d0a714183f23e23fd57752bcb908cba93f0adf15d4319cd80 -size 2968475 diff --git a/openssl-1.0.0.tar.bz2 b/openssl-1.0.0.tar.bz2 new file mode 100644 index 0000000..51743f4 --- /dev/null +++ b/openssl-1.0.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:164d74696522f4758c383ba16e544ecd16c94c93df87cadc940b2fc3e0a8ce5a +size 3195261 diff --git a/openssl-CVE-2010-0740.patch b/openssl-CVE-2010-0740.patch deleted file mode 100644 index 9815b8d..0000000 --- a/openssl-CVE-2010-0740.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: openssl-0.9.8m/ssl/s3_pkt.c -=================================================================== ---- openssl-0.9.8m.orig/ssl/s3_pkt.c -+++ openssl-0.9.8m/ssl/s3_pkt.c -@@ -291,9 +291,9 @@ again: - if (version != s->version) - { - SSLerr(SSL_F_SSL3_GET_RECORD,SSL_R_WRONG_VERSION_NUMBER); -- /* Send back error using their -- * version number :-) */ -- s->version=version; -+ if ((s->version & 0xFF00) == (version & 0xFF00)) -+ /* Send back error using their minor version number :-) */ -+ s->version = (unsigned short)version; - al=SSL_AD_PROTOCOL_VERSION; - goto f_err; - } diff --git a/openssl.changes b/openssl.changes index cf51f2b..2f8ed9f 100644 --- a/openssl.changes +++ b/openssl.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Mon Apr 12 16:12:08 CEST 2010 - meissner@suse.de + +- Disable our own build targets, instead use the openSSL provided ones + as they are now good (or should be good at least). + +- add -Wa,--noexecstack to the Configure call, this is the upstream + approved way to avoid exec-stack marking + +------------------------------------------------------------------- +Mon Apr 12 04:57:17 UTC 2010 - gjhe@novell.com + +- update to 1.0.0 + Merge the following patches from 0.9.8k: + openssl-0.9.6g-alpha.diff + openssl-0.9.7f-ppc64.diff + openssl-0.9.8-flags-priority.dif + openssl-0.9.8-sparc.dif + openssl-allow-arch.diff + openssl-hppa-config.diff + +------------------------------------------------------------------- +Fri Apr 9 11:42:51 CEST 2010 - meissner@suse.de + +- fixed "exectuable stack" for libcrypto.so issue on i586 by + adjusting the assembler output during MMX builds. + +------------------------------------------------------------------- +Wed Apr 7 14:08:05 CEST 2010 - meissner@suse.de + +- Openssl is now partially converted to libdir usage upstream, + merge that in to fix lib64 builds. + ------------------------------------------------------------------- Thu Mar 25 02:18:22 UTC 2010 - gjhe@novell.com diff --git a/openssl.spec b/openssl.spec index 19eb77f..f5ad820 100644 --- a/openssl.spec +++ b/openssl.spec @@ -1,5 +1,5 @@ # -# spec file for package openssl (Version 0.9.8m) +# spec file for package openssl (Version 1.0.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -31,15 +31,14 @@ AutoReqProv: on Obsoletes: openssl-64bit %endif # -Version: 0.9.8m +Version: 1.0.0 Release: 1 Summary: Secure Sockets and Transport Layer Security Url: http://www.openssl.org/ Source: http://www.%{name}.org/source/%{name}-%{version}.tar.bz2 Source2: baselibs.conf Source10: README.SuSE -Patch0: merge_from_0_9_8k.patch -Patch1: openssl-CVE-2010-0740.patch +Patch0: merge_from_0.9.8k.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -71,7 +70,7 @@ Authors: Holger Reif Paul C. Sutton -%package -n libopenssl0_9_8 +%package -n libopenssl1_0_0 License: BSD3c(or similar) Summary: Secure Sockets and Transport Layer Security Group: Productivity/Networking/Security @@ -82,7 +81,7 @@ Obsoletes: openssl-64bit %endif # -%description -n libopenssl0_9_8 +%description -n libopenssl1_0_0 The OpenSSL Project is a collaborative effort to develop a robust, commercial-grade, full-featured, and open source toolkit implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS @@ -115,10 +114,9 @@ Authors: License: BSD3c(or similar) Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/C and C++ -# openssl-devel last used in openSUSE 10.2 -Obsoletes: openssl-devel <= 0.9.8e-8 -Requires: libopenssl0_9_8 = %{version} zlib-devel -Provides: openssl-devel = 0.9.8e-8 +Obsoletes: openssl-devel < %{version} +Requires: libopenssl1_0_0 = %{version} zlib-devel +Provides: openssl-devel = %{version} # bug437293 %ifarch ppc64 Obsoletes: openssl-devel-64bit @@ -167,38 +165,33 @@ Authors: %prep %setup -q -%patch0 -p1 -%patch1 -p1 +%patch0 -p1 cp -p %{S:10} . -# lib64 installation fixes -for i in Makefile.org engines/Makefile; do -sed -e "s+\(\$(INSTALL_PREFIX)\$(INSTALLTOP)\)/lib+\1/%_lib+g" \ - -e "s+libdir=\$\${exec_prefix}/lib+libdir=\$\${exec_prefix}/%_lib+g" \ - $i > $i.t - diff -u $i $i.t ||: - mv $i.t $i -done echo "adding/overwriting some entries in the 'table' hash in Configure" # $dso_scheme:$shared_target:$shared_cflag:$shared_ldflag:$shared_extension:$ranlib:$arflags -export DSO_SCHEME='dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):' +export DSO_SCHEME='dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::' cat <