Hello community,
here is the log from the commit of package openssl for openSUSE:Factory
checked in at Wed Apr 14 15:14:17 CEST 2010.
--------
--- openssl/openssl.changes 2010-03-25 04:05:23.000000000 +0100
+++ openssl/openssl.changes 2010-04-12 16:19:13.000000000 +0200
@@ -1,0 +2,33 @@
+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.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
merge_from_0_9_8k.patch
openssl-0.9.8m.tar.bz2
openssl-CVE-2010-0740.patch
New:
----
merge_from_0.9.8k.patch
openssl-1.0.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openssl.spec ++++++
--- /var/tmp/diff_new_pack.PUNQfW/_old 2010-04-14 15:13:11.000000000 +0200
+++ /var/tmp/diff_new_pack.PUNQfW/_new 2010-04-14 15:13:11.000000000 +0200
@@ -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 @@
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 @@
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 @@
%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 @@
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
@@ -168,37 +166,32 @@
%prep
%setup -q
%patch0 -p1
-%patch1 -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 < merge_from_0.9.8k.patch ++++++
--- openssl/merge_from_0_9_8k.patch 2010-03-25 04:05:20.000000000 +0100
+++ openssl/merge_from_0.9.8k.patch 2010-04-12 08:54:30.000000000 +0200
@@ -1,50 +1,50 @@
-Index: openssl-0.9.8m/Configure
+Index: openssl-1.0.0/Configure
===================================================================
---- openssl-0.9.8m.orig/Configure
-+++ openssl-0.9.8m/Configure
-@@ -874,7 +874,7 @@ PROCESS_ARGS:
+--- 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 "");
++ warn "target already defined - $target (offending arg: $_)\n" if ($target ne "");
$target=$_;
}
-@@ -1123,7 +1123,7 @@ else { $lflags=$prelflags; undef $pre
+@@ -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"; }
++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
+Index: openssl-1.0.0/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" ;;
+--- 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
++ #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
+@@ -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"
++ # 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
+@@ -596,10 +598,10 @@ case "$GUESSOS" in
sparc-*-linux2)
KARCH=`awk '/^type/{print$3;exit(0);}' /proc/cpuinfo`
case ${KARCH:-sun4} in
@@ -52,14 +52,14 @@
- 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" ;;
++# 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
+@@ -618,7 +620,11 @@ case "$GUESSOS" in
# PA8500 -> 8000 (2.0)
# PA8600 -> 8000 (2.0)
@@ -72,28 +72,3 @@
# 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
++++++ openssl-0.9.8m.tar.bz2 -> openssl-1.0.0.tar.bz2 ++++++
++++ 207095 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org