- -ldflags.patch, -parallel-build.patch from gentoo; rel 3

Changed files:
    openssl-ldflags.patch -> 1.1
    openssl-parallel-build.patch -> 1.1
    openssl.spec -> 1.206

diff --git a/openssl-ldflags.patch b/openssl-ldflags.patch
new file mode 100644 (file)
index 0000000..4658c85
--- /dev/null
+++ b/openssl-ldflags.patch
@@ -0,0 +1,25 @@
+http://bugs.gentoo.org/181438
+
+make sure we respect LDFLAGS
+
+--- openssl-0.9.8h/Makefile
++++ openssl-0.9.8h/Makefile
+@@ -180,6 +181,7 @@
+               MAKEDEPEND='$$$${TOP}/util/domd $$$${TOP} -MD ${MAKEDEPPROG}' \
+               DEPFLAG='-DOPENSSL_NO_DEPRECATED ${DEPFLAG}'    \
+               MAKEDEPPROG='${MAKEDEPPROG}'                    \
++              LDFLAGS='${LDFLAGS}'            \
+               SHARED_LDFLAGS='${SHARED_LDFLAGS}'              \
+               KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}'   \
+               EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}'       \
+--- openssl-0.9.8h/Makefile.shared
++++ openssl-0.9.8h/Makefile.shared
+@@ -153,7 +153,7 @@
+       NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
+       SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
+ 
+-DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
++DO_GNU_APP=LDFLAGS="$(LDFLAGS) $(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
+ 
+ #This is rather special.  It's a special target with which one can link
+ #applications without bothering with any features that have anything to

diff --git a/openssl-parallel-build.patch b/openssl-parallel-build.patch
new file mode 100644 (file)
index 0000000..eace0f4
--- /dev/null
+++ b/openssl-parallel-build.patch
@@ -0,0 +1,24 @@
+diff -uNr openssl-0.9.8j.ORIG/Makefile.org openssl-0.9.8j/Makefile.org
+--- openssl-0.9.8j.ORIG/Makefile.org   2009-01-07 18:06:31.000000000 +0000
++++ openssl-0.9.8j/Makefile.org        2009-01-07 18:08:38.000000000 +0000
+@@ -333,15 +333,15 @@
+               dir=crypto; target=all; $(BUILD_ONE_CMD)
+ build_fips:
+       @dir=fips; target=all; [ -z "$(FIPSCANLIB)" ] || $(BUILD_ONE_CMD)
+-build_ssl:
++build_ssl: build_crypto
+       @dir=ssl; target=all; $(BUILD_ONE_CMD)
+-build_engines:
++build_engines: build_crypto
+       @dir=engines; target=all; $(BUILD_ONE_CMD)
+-build_apps:
++build_apps: build_libs
+       @dir=apps; target=all; $(BUILD_ONE_CMD)
+-build_tests:
++build_tests: build_libs
+       @dir=test; target=all; $(BUILD_ONE_CMD)
+-build_tools:
++build_tools: build_libs
+       @dir=tools; target=all; $(BUILD_ONE_CMD)
+ 
+ all_testapps: build_libs build_testapps

diff --git a/openssl.spec b/openssl.spec
index a4a6041fd7faa837a349723d27c18f9a0df56220..f78f260f03aa7875060afae2ba46398b0657d380 100644 (file)
--- a/openssl.spec
+++ b/openssl.spec
@@ -15,7 +15,7 @@ Summary(ru.UTF-8):    Библиотеки и утилиты для соедине
 Summary(uk.UTF-8):     Бібліотеки та утиліти для з'єднань через Secure Sockets Layer
 Name:          openssl
 Version:       0.9.8k
-Release:       2
+Release:       3
 License:       Apache-like
 Group:         Libraries
 Source0:       ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
@@ -33,6 +33,8 @@ Patch6:               %{name}-asflag.patch
 Patch7:                %{name}-ca-certificates.patch
 Patch8:                %{name}-fips_install.patch
 Patch9:                %{name}-CVE-2009-1377-1378-1379.patch
+Patch10:       %{name}-ldflags.patch
+Patch11:       %{name}-parallel-build.patch
 URL:           http://www.openssl.org/
 BuildRequires: bc
 BuildRequires: perl-devel >= 1:5.6.1
@@ -203,6 +205,8 @@ RC4, RSA и SSL. Включает статические библиотеки д
 %patch7 -p1
 %patch8 -p0
 %patch9 -p1
+%patch10 -p1
+%patch11 -p1
 
 %{__perl} -pi -e 's#%{_prefix}/local/bin/perl#%{__perl}#g' \
        `grep -l -r "%{_prefix}/local/bin/perl" *`