[alpine/el6] allow use of el6's openssl-1.0.0 too

Rex Dieter rdieter at fedoraproject.org
Fri Nov 8 15:45:55 UTC 2013


commit 0f2c6e22091156c0afff8e080135c49e85d933f5
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Nov 8 09:45:51 2013 -0600

    allow use of el6's openssl-1.0.0 too
    
    ... like alpine-2.10 did.

 alpine-2.11-openssl_version.patch |   33 +++++++++++++++++++++++++++++++++
 alpine.spec                       |    5 +++++
 2 files changed, 38 insertions(+), 0 deletions(-)
---
diff --git a/alpine-2.11-openssl_version.patch b/alpine-2.11-openssl_version.patch
new file mode 100644
index 0000000..536136a
--- /dev/null
+++ b/alpine-2.11-openssl_version.patch
@@ -0,0 +1,33 @@
+diff -up alpine-2.11/configure.ac.openssl alpine-2.11/configure.ac
+diff -up alpine-2.11/configure.openssl alpine-2.11/configure
+--- alpine-2.11/configure.openssl	2013-08-14 23:36:22.000000000 -0500
++++ alpine-2.11/configure	2013-11-08 09:30:00.000000000 -0600
+@@ -16722,8 +16722,8 @@ if test "$ac_res" != no; then :
+ 
+       LIBS="$LIBS -lssl"
+ 
+-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking Openssl library version >= 1.0.0c" >&5
+-$as_echo_n "checking Openssl library version >= 1.0.0c... " >&6; }
++     { $as_echo "$as_me:${as_lineno-$LINENO}: checking Openssl library version >= 1.0.0" >&5
++$as_echo_n "checking Openssl library version >= 1.0.0... " >&6; }
+      if test "$cross_compiling" = yes; then :
+ 
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: not checking" >&5
+@@ -16738,7 +16738,7 @@ else
+ #include <openssl/ssl.h>
+ int main(void) {
+ 
+-	if (OPENSSL_VERSION_NUMBER >= 0x1000003f)
++	if (OPENSSL_VERSION_NUMBER >= 0x10000003L)
+ 		exit(0);
+ 
+ 	exit(2);
+@@ -16752,7 +16752,7 @@ $as_echo "yes" >&6; }
+ 
+ else
+ 
+-		as_fn_error $? "Install openssl version >= 1.0.1c" "$LINENO" 5
++		as_fn_error $? "Install openssl version >= 1.0.0" "$LINENO" 5
+ 		exit 1
+ 
+ fi
diff --git a/alpine.spec b/alpine.spec
index 58a74e8..62382ae 100644
--- a/alpine.spec
+++ b/alpine.spec
@@ -30,6 +30,9 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Provides: re-alpine = %{version}-%{release}
 
+# allow use of el6's openssl-1.0.0 too (like alpine-2.10 did)
+Patch1: alpine-2.11-openssl_version.patch
+
 #BuildRequires: automake libtool
 BuildRequires: gettext
 BuildRequires: hunspell
@@ -72,6 +75,8 @@ GNU Build System's autotools.
 
 install -m644 -p %{SOURCE1} .
 
+%patch1 -p1 -b .openssl_version
+
 #autoreconf -f -i
 
 


More information about the scm-commits mailing list