SHA256
3
0
forked from pool/openssl

Accepting request 40913 from Base:System

Copy from Base:System/openssl based on submit request 40913 from user msmeissn

OBS-URL: https://build.opensuse.org/request/show/40913
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openssl?expand=0&rev=36
This commit is contained in:
OBS User autobuild 2010-06-02 16:07:27 +00:00 committed by Git OBS Bridge
parent c5cd5769ed
commit 8b3a3dc1bb
3 changed files with 23 additions and 1 deletions

14
bug610223.patch Normal file
View File

@ -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 (<IN>)
}
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";
}

View File

@ -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

View File

@ -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