Accepting request 121256 from Base:System

- Update to version 1.0.1c for the complete list of changes see NEWS, this only list packaging changes. - Drop aes-ni patch, no longer needed as it is builtin in openssl now. - Define GNU_SOURCE and use -std=gnu99 to build the package. - Use LFS_CFLAGS in platforms where it matters. (forwarded request 120643 from elvigia) OBS-URL: https://build.opensuse.org/request/show/121256 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openssl?expand=0&rev=78
2012-05-21 08:00:42 +00:00 · 2012-05-21 08:00:42 +00:00 · 05940ba9a1
commit 05940ba9a1
parent 036b19de96
7 changed files with 45 additions and 2462 deletions
--- a/merge_from_0.9.8k.patch
+++ b/merge_from_0.9.8k.patch
@ -1,8 +1,6 @@
-Index: openssl-1.0.0/Configure
-===================================================================
--- openssl-1.0.0.orig/Configure
-+++ openssl-1.0.0/Configure
-@@ -866,7 +866,7 @@ PROCESS_ARGS:
+--- openssl-1.0.1c.orig/Configure
+++ openssl-1.0.1c/Configure
+@@ -931,7 +931,7 @@ PROCESS_ARGS:
 			}
 		else
 			{
@ -11,7 +9,7 @@ Index: openssl-1.0.0/Configure
 			$target=$_;
 			}
 
-@@ -1105,7 +1105,7 @@ else				{ $lflags=$prelflags; undef $pre
+@@ -1204,7 +1204,7 @@ if ($target =~ /^mingw/ && `$cc --target
 my $no_shared_warn=0;
 my $no_user_cflags=0;
 
@ -20,13 +18,11 @@ Index: openssl-1.0.0/Configure
 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" ;;
+--- openssl-1.0.1c.orig/config
+++ openssl-1.0.1c/config
+@@ -573,7 +573,8 @@ case "$GUESSOS" in
+ 	options="$options -arch%20${MACHINE}"
+ 	OUT="iphoneos-cross" ;;
   alpha-*-linux2)
 -        ISA=`awk '/cpu model/{print$4;exit(0);}' /proc/cpuinfo`
 +        #ISA=`awk '/cpu model/{print$4;exit(0);}' /proc/cpuinfo`
@ -34,7 +30,7 @@ Index: openssl-1.0.0/config
 	case ${ISA:-generic} in
 	*[678])	OUT="linux-alpha+bwx-$CC" ;;
 	*)	OUT="linux-alpha-$CC" ;;
-@@ -580,7 +581,8 @@ case "$GUESSOS" in
+@@ -593,7 +594,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
@ -43,8 +39,8 @@ Index: openssl-1.0.0/config
 +	OUT="linux-ppc64"
 	;;
   ppc-*-linux2) OUT="linux-ppc" ;;
-   ia64-*-linux?) OUT="linux-ia64" ;;
-@@ -596,10 +598,10 @@ case "$GUESSOS" in
+   ppc60x-*-vxworks*) OUT="vxworks-ppc60x" ;;
+@@ -614,10 +616,10 @@ case "$GUESSOS" in
   sparc-*-linux2)
 	KARCH=`awk '/^type/{print$3;exit(0);}' /proc/cpuinfo`
 	case ${KARCH:-sun4} in
@ -59,7 +55,7 @@ Index: openssl-1.0.0/config
 	esac ;;
   parisc*-*-linux2)
 	# 64-bit builds under parisc64 linux are not supported and
-@@ -618,7 +620,11 @@ case "$GUESSOS" in
+@@ -636,7 +638,11 @@ case "$GUESSOS" in
 	#         PA8500   -> 8000   (2.0)
 	#         PA8600   -> 8000   (2.0)
 
--- a/openssl-1.0.0b-aesni.patch
+++ b/openssl-1.0.0b-aesni.patch
--- a/openssl-1.0.0i.tar.bz2
+++ b/openssl-1.0.0i.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:41cc7688650540f918c151eff5676e19b819121065bfe4abf0247f3f022cf49a
-size 3241560
--- a/openssl-1.0.1c.tar.gz
+++ b/openssl-1.0.1c.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2a9eb3cd4e8b114eb9179c0d3884d61658e7d8e8bf4984798a5f5bd48e325ebe
+size 4457113
--- a/openssl-call-engine-reg-comp.patch
+++ b/openssl-call-engine-reg-comp.patch
@ -1,24 +0,0 @@
-Add call to ENGINE_register_all_complete() to ENGINE_load_builtin_engines(), this means that some implementations will be used automatically, e.g. aesni,
-Setup cpuid in ENGINE_load_builtin_engines() too as some ENGINEs use it.
-Origin: UPSTREAM
-URL: http://cvs.openssl.org/chngview?cn=19781
-
--- crypto/engine/eng_all.c.orig
-+++ crypto/engine/eng_all.c
-@@ -61,6 +61,8 @@
- 
- void ENGINE_load_builtin_engines(void)
- 	{
-+   /* Some ENGINEs need this */
-+   OPENSSL_cpuid_setup();
- #if 0
- 	/* There's no longer any need for an "openssl" ENGINE unless, one day,
- 	 * it is the *only* way for standard builtin implementations to be be
-@@ -115,6 +117,7 @@ void ENGINE_load_builtin_engines(void)
- 	ENGINE_load_capi();
- #endif
- #endif
-+    ENGINE_register_all_complete();
- 	}
- 
- #if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)
--- a/openssl.changes
+++ b/openssl.changes
@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu May 10 19:18:06 UTC 2012 - crrodriguez@opensuse.org
+
+- Update to version 1.0.1c for the complete list of changes see
+  NEWS, this only list packaging changes.
+- Drop aes-ni patch, no longer needed as it is builtin in openssl
+  now.
+- Define GNU_SOURCE and use -std=gnu99 to build the package.
+- Use LFS_CFLAGS in platforms where it matters.
+
 -------------------------------------------------------------------
 Fri May  4 12:09:57 UTC 2012 - lnussel@suse.de

--- a/openssl.spec
+++ b/openssl.spec
@ -15,26 +15,30 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #

-# norootforbuild

+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#

 Name:           openssl
-BuildRequires:  bc ed pkg-config zlib-devel
+BuildRequires:  bc
+BuildRequires:  ed
+BuildRequires:  pkg-config
+BuildRequires:  zlib-devel
 %define ssletcdir %{_sysconfdir}/ssl
-%define num_version %(echo "%{version}" | sed -e "s+[a-zA-Z]++g; s+_.*++g")
-License:        OpenSSL
-Group:          Productivity/Networking/Security
+#%define num_version %(echo "%{version}" | sed -e "s+[a-zA-Z]++g; s+_.*++g")
+%define num_version 1.0.0
 Provides:       ssl
-AutoReqProv:    on
 # bug437293
 %ifarch ppc64
 Obsoletes:      openssl-64bit
 %endif
-Version:        1.0.0i
-Release:        1
+Version:        1.0.1c
+Release:        0
 Summary:        Secure Sockets and Transport Layer Security
+License:        OpenSSL
+Group:          Productivity/Networking/Security
 Url:            http://www.openssl.org/
-Source:         http://www.%{name}.org/source/%{name}-%{version}.tar.bz2
+Source:         http://www.%{name}.org/source/%{name}-%{version}.tar.gz
 # to get mtime of file:
 Source1:        openssl.changes
 Source2:        baselibs.conf
@ -42,19 +46,6 @@ Source10:       README.SuSE
 Patch0:         merge_from_0.9.8k.patch
 Patch1:         openssl-1.0.0-c_rehash-compat.diff
 Patch2:         bug610223.patch
-#Patch3:         CVE-2010-1633_and_CVE-2010-0742.patch
-#Patch4:         patchset-19727.diff
-#Patch5:         CVE-2010-2939.patch
-#Patch6:         CVE-2010-3864.patch
-Patch7:         openssl-1.0.0b-aesni.patch
-#Patch8:         CVE-2011-0014.patch
-Patch10:        openssl-call-engine-reg-comp.patch
-#Patch11:        Bug748738_Tolerate_bad_MIME_headers.patch
-#Patch12:        bug749213-Free-headers-after-use.patch
-#Patch13:        bug749210-Symmetric-crypto-errors-in-PKCS7_decrypt.patch
-#Patch14:        CVE-2012-1165.patch
-#Patch15:        CVE-2012-0884.patch
-#Patch16:        bug749735.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

 %description
@ -87,7 +78,6 @@ Authors:
    Paul C. Sutton <paul@openssl.org>

 %package -n libopenssl1_0_0
-License:        OpenSSL
 Summary:        Secure Sockets and Transport Layer Security
 Group:          Productivity/Networking/Security
 Recommends:     openssl-certs
@ -127,12 +117,12 @@ Authors:
    Paul C. Sutton <paul@openssl.org>

 %package -n libopenssl-devel
-License:        OpenSSL
 Summary:        Include Files and Libraries mandatory for Development
 Group:          Development/Libraries/C and C++
 Obsoletes:      openssl-devel < %{version}
-Requires:       libopenssl1_0_0 = %{version} zlib-devel
 Requires:       %name = %version
+Requires:       libopenssl1_0_0 = %{version}
+Requires:       zlib-devel
 Provides:       openssl-devel = %{version}
 # bug437293
 %ifarch ppc64
@ -158,7 +148,6 @@ Authors:
    Paul C. Sutton <paul@openssl.org>

 %package doc
-License:        OpenSSL
 Summary:        Additional Package Documentation
 Group:          Productivity/Networking/Security
 BuildArch:      noarch
@ -185,19 +174,6 @@ Authors:
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-#%patch3 -p1
-#%patch4 -p1
-#%patch5 -p1
-#%patch6 -p1
-%patch7
-#%patch8 -p1
-%patch10
-#%patch11 -p1
-#%patch12 -p1
-#%patch13 -p1
-#%patch14 -p1
-#%patch15 -p1
-#%patch16 -p1
 cp -p %{S:10} .
 echo "adding/overwriting some entries in the 'table' hash in Configure"
 # $dso_scheme:$shared_target:$shared_cflag:$shared_ldflag:$shared_extension:$ranlib:$arflags
@ -219,7 +195,7 @@ i
 "linux-elf-arm","gcc:-DL_ENDIAN			::-D_REENTRANT::-ldl:BN_LLONG:\${no_asm}:							$DSO_SCHEME:",
 "linux-mips",   "gcc:-DB_ENDIAN			::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:\${no_asm}:		$DSO_SCHEME:",
 "linux-sparcv7","gcc:-DB_ENDIAN			::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:\${no_asm}:			$DSO_SCHEME:",
-"linux-sparcv8","gcc:-DB_ENDIAN -DBN_DIV2W -mv8	::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::asm/sparcv8.o:::::::::::::	$DSO_SCHEME:",
+#"linux-sparcv8","gcc:-DB_ENDIAN -DBN_DIV2W -mv8	::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::asm/sparcv8.o:::::::::::::	$DSO_SCHEME:",
 #"linux-x86_64", "gcc:-DL_ENDIAN -DNO_ASM -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG:\${no_asm}:						$DSO_SCHEME:64",
 #"linux-s390",   "gcc:-DB_ENDIAN			::(unknown):   :-ldl:BN_LLONG:\${no_asm}:							$DSO_SCHEME:",
 #"linux-s390x",  "gcc:-DB_ENDIAN -DNO_ASM -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG:\${no_asm}:					$DSO_SCHEME:64",
@ -242,12 +218,14 @@ zlib \
 --prefix=%{_prefix} \
 --libdir=%{_lib} \
 --openssldir=%{ssletcdir} \
-$RPM_OPT_FLAGS \
+$RPM_OPT_FLAGS -std=gnu99 \
 -Wa,--noexecstack \
 -fomit-frame-pointer \
 -DTERMIO \
 -DPURIFY \
 -DSSL_FORBID_ENULL \
+-D_GNU_SOURCE \
+$(getconf LFS_CFLAGS) \
 %ifnarch hppa
 -Wall \
 -fstack-protector "