Author: glen Date: Mon Oct 26 09:12:28 2009 GMT Module: packages Tag: HEAD ---- Log message: - -ldflags.patch, -parallel-build.patch from gentoo; rel 3
---- Files affected: packages/openssl: openssl.spec (1.205 -> 1.206) , openssl-ldflags.patch (NONE -> 1.1) (NEW), openssl-parallel-build.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/openssl/openssl.spec diff -u packages/openssl/openssl.spec:1.205 packages/openssl/openssl.spec:1.206 --- packages/openssl/openssl.spec:1.205 Tue Jul 28 17:44:54 2009 +++ packages/openssl/openssl.spec Mon Oct 26 10:12:22 2009 @@ -16,7 +16,7 @@ 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 @@ -34,6 +34,8 @@ 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 @@ -204,6 +206,8 @@ %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" *` @@ -455,6 +459,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.206 2009/10/26 09:12:22 glen +- -ldflags.patch, -parallel-build.patch from gentoo; rel 3 + Revision 1.205 2009/07/28 15:44:54 arekm - rel 2; fixes CVE-2009-1377 CVE-2009-1378 CVE-2009-1379; enable tlsext and rfc3779 ================================================================ Index: packages/openssl/openssl-ldflags.patch diff -u /dev/null packages/openssl/openssl-ldflags.patch:1.1 --- /dev/null Mon Oct 26 10:12:28 2009 +++ packages/openssl/openssl-ldflags.patch Mon Oct 26 10:12:22 2009 @@ -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 ================================================================ Index: packages/openssl/openssl-parallel-build.patch diff -u /dev/null packages/openssl/openssl-parallel-build.patch:1.1 --- /dev/null Mon Oct 26 10:12:28 2009 +++ packages/openssl/openssl-parallel-build.patch Mon Oct 26 10:12:22 2009 @@ -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 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssl/openssl.spec?r1=1.205&r2=1.206&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
