summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-07-11 04:25:58 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-07-11 04:25:58 +0000
commit8b8ce47ff12a2d7d8a53344b54bfdfdf4b269111 (patch)
tree74da5bc0694cefc88ed5b621bfd59462c05227d9
parentMissing #ifdef in patch, thanks to Michael Sterrett for noticing. (diff)
downloadgentoo-2-8b8ce47ff12a2d7d8a53344b54bfdfdf4b269111.tar.gz
gentoo-2-8b8ce47ff12a2d7d8a53344b54bfdfdf4b269111.tar.bz2
gentoo-2-8b8ce47ff12a2d7d8a53344b54bfdfdf4b269111.zip
Missing #ifdef in patch, thanks to Michael Sterrett for noticing.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
-rw-r--r--sys-block/partimage/ChangeLog6
-rw-r--r--sys-block/partimage/files/partimage-0.6.8-openssl-1.patch16
2 files changed, 16 insertions, 6 deletions
diff --git a/sys-block/partimage/ChangeLog b/sys-block/partimage/ChangeLog
index 716c9caff044..65743a02b5c0 100644
--- a/sys-block/partimage/ChangeLog
+++ b/sys-block/partimage/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-block/partimage
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/ChangeLog,v 1.44 2010/07/11 02:53:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/ChangeLog,v 1.45 2010/07/11 04:25:58 ssuominen Exp $
+
+ 11 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
+ files/partimage-0.6.8-openssl-1.patch:
+ Missing #ifdef in patch, thanks to Michael Sterrett for noticing.
11 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
partimage-0.6.8.ebuild, +files/partimage-0.6.8-openssl-1.patch:
diff --git a/sys-block/partimage/files/partimage-0.6.8-openssl-1.patch b/sys-block/partimage/files/partimage-0.6.8-openssl-1.patch
index a4ebeb9aac60..69268a99ff36 100644
--- a/sys-block/partimage/files/partimage-0.6.8-openssl-1.patch
+++ b/sys-block/partimage/files/partimage-0.6.8-openssl-1.patch
@@ -2,23 +2,29 @@ http://bugs.gentoo.org/326879
--- src/client/netclient.h
+++ src/client/netclient.h
-@@ -35,7 +35,7 @@
+@@ -35,7 +35,11 @@
#ifdef HAVE_SSL
SSL_CTX * ctx;
X509 * server_cert;
-- SSL_METHOD * meth;
++ #if OPENSSL_VERSION_NUMBER >= 0x10000000L
+ const SSL_METHOD * meth;
++ #else
+ SSL_METHOD * meth;
++ #endif
#endif
bool m_bUseSSL;
bool m_bMustLogin;
--- src/server/netserver.h
+++ src/server/netserver.h
-@@ -41,7 +41,7 @@
+@@ -41,7 +41,11 @@
#ifdef HAVE_SSL
SSL_CTX * ctx;
X509 * client_cert;
-- SSL_METHOD * meth;
-+ const SSL_METHOD * meth;
++ #if OPENSSL_VERSION_NUMBER >= 0x10000000L
++ const SSL_METHOD * meth;
++ #else
+ SSL_METHOD * meth;
++ #endif
int err;
#endif