From 20e19070fe8d1ed38eea3657b6b05ecb72015313 Mon Sep 17 00:00:00 2001 From: Tomáš Mráz Date: Nov 16 2005 21:45:59 +0000 Subject: - don't set -rpath for openssl binary --- diff --git a/openssl-0.9.8a-no-rpath.patch b/openssl-0.9.8a-no-rpath.patch new file mode 100644 index 0000000..8f8fb91 --- /dev/null +++ b/openssl-0.9.8a-no-rpath.patch @@ -0,0 +1,11 @@ +--- openssl-0.9.8a/Makefile.shared.no-rpath 2005-06-23 22:47:54.000000000 +0200 ++++ openssl-0.9.8a/Makefile.shared 2005-11-16 22:35:37.000000000 +0100 +@@ -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="$(CFLAGS)" + + #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.spec b/openssl.spec index 1dd623e..67c049c 100644 --- a/openssl.spec +++ b/openssl.spec @@ -23,7 +23,7 @@ Summary: The OpenSSL toolkit. Name: openssl Version: 0.9.8a -Release: 1 +Release: 2 Source: openssl-%{version}-usa.tar.bz2 Source1: hobble-openssl Source2: Makefile.certificate @@ -42,6 +42,7 @@ Patch1: openssl-0.9.8a-defaults.patch Patch2: openssl-0.9.8a-link-krb5.patch Patch3: openssl-0.9.8a-soversion.patch Patch4: openssl-0.9.8a-enginesdir.patch +Patch5: openssl-0.9.8a-no-rpath.patch Patch6: openssl-0.9.7a-libica-autoconf.patch # Added engines Patch20: libica-1.3.4-urandom.patch @@ -100,6 +101,7 @@ from other formats to the formats used by the OpenSSL toolkit. %patch2 -p1 -b .krb5 %patch3 -p1 -b .soversion %patch4 -p1 -b .enginesdir +%patch5 -p1 -b .no-rpath %patch6 -p1 -b .libica-autoconf pushd libica-%{libicaversion} @@ -386,6 +388,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libssl.so.%{soversion} %postun -p /sbin/ldconfig %changelog +* Wed Nov 16 2005 Tomas Mraz 0.9.8a-2 +- don't set -rpath for openssl binary + * Tue Nov 8 2005 Tomas Mraz 0.9.8a-1 - new upstream version - patches partially renumbered