diff --git a/bug610223.patch b/bug610223.patch new file mode 100644 index 0000000..957125e --- /dev/null +++ b/bug610223.patch @@ -0,0 +1,14 @@ +Index: openssl-1.0.0/Configure +=================================================================== +--- openssl-1.0.0.orig/Configure ++++ openssl-1.0.0/Configure +@@ -1673,7 +1673,8 @@ while () + } + elsif (/^#define\s+ENGINESDIR/) + { +- my $foo = "$prefix/$libdir/engines"; ++ #my $foo = "$prefix/$libdir/engines"; ++ my $foo = "/$libdir/engines"; + $foo =~ s/\\/\\\\/g; + print OUT "#define ENGINESDIR \"$foo\"\n"; + } diff --git a/openssl.changes b/openssl.changes index 700906f..fa4892d 100644 --- a/openssl.changes +++ b/openssl.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon May 31 03:06:39 UTC 2010 - gjhe@novell.com + +- fix bnc #610223,change Configure to tell openssl to load engines + from /%{_lib} instead of %{_libdir} + ------------------------------------------------------------------- Mon May 10 16:11:54 UTC 2010 - aj@suse.de diff --git a/openssl.spec b/openssl.spec index c952a2c..4b555dd 100644 --- a/openssl.spec +++ b/openssl.spec @@ -32,7 +32,7 @@ Obsoletes: openssl-64bit %endif # Version: 1.0.0 -Release: 3 +Release: 4 Summary: Secure Sockets and Transport Layer Security Url: http://www.openssl.org/ Source: http://www.%{name}.org/source/%{name}-%{version}.tar.bz2 @@ -42,6 +42,7 @@ Source2: baselibs.conf Source10: README.SuSE Patch0: merge_from_0.9.8k.patch Patch1: openssl-1.0.0-c_rehash-compat.diff +Patch2: bug610223.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -170,6 +171,7 @@ Authors: %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -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