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:
parent
c5cd5769ed
commit
8b3a3dc1bb
14
bug610223.patch
Normal file
14
bug610223.patch
Normal 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";
|
||||||
|
}
|
@ -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
|
Mon May 10 16:11:54 UTC 2010 - aj@suse.de
|
||||||
|
|
||||||
|
@ -32,7 +32,7 @@ Obsoletes: openssl-64bit
|
|||||||
%endif
|
%endif
|
||||||
#
|
#
|
||||||
Version: 1.0.0
|
Version: 1.0.0
|
||||||
Release: 3
|
Release: 4
|
||||||
Summary: Secure Sockets and Transport Layer Security
|
Summary: Secure Sockets and Transport Layer Security
|
||||||
Url: http://www.openssl.org/
|
Url: http://www.openssl.org/
|
||||||
Source: http://www.%{name}.org/source/%{name}-%{version}.tar.bz2
|
Source: http://www.%{name}.org/source/%{name}-%{version}.tar.bz2
|
||||||
@ -42,6 +42,7 @@ Source2: baselibs.conf
|
|||||||
Source10: README.SuSE
|
Source10: README.SuSE
|
||||||
Patch0: merge_from_0.9.8k.patch
|
Patch0: merge_from_0.9.8k.patch
|
||||||
Patch1: openssl-1.0.0-c_rehash-compat.diff
|
Patch1: openssl-1.0.0-c_rehash-compat.diff
|
||||||
|
Patch2: bug610223.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -170,6 +171,7 @@ Authors:
|
|||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
|
%patch2 -p1
|
||||||
cp -p %{S:10} .
|
cp -p %{S:10} .
|
||||||
echo "adding/overwriting some entries in the 'table' hash in Configure"
|
echo "adding/overwriting some entries in the 'table' hash in Configure"
|
||||||
# $dso_scheme:$shared_target:$shared_cflag:$shared_ldflag:$shared_extension:$ranlib:$arflags
|
# $dso_scheme:$shared_target:$shared_cflag:$shared_ldflag:$shared_extension:$ranlib:$arflags
|
||||||
|
Loading…
Reference in New Issue
Block a user