Fix building with OpenSSL >= 1.0.0 wrt #326879 by Diego E. Pettenò.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 35 insertions, 5 deletions

diff --git a/sys-block/partimage/ChangeLog b/sys-block/partimage/ChangeLog
index 6e20fe90c8ab..716c9caff044 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.43 2010/07/07 22:53:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/ChangeLog,v 1.44 2010/07/11 02:53:05 ssuominen Exp $
+
+  11 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
+  partimage-0.6.8.ebuild, +files/partimage-0.6.8-openssl-1.patch:
+  Fix building with OpenSSL >= 1.0.0 wrt #326879 by Diego E. Pettenò.
 
 *partimage-0.6.8 (07 Jul 2010)
 
diff --git a/sys-block/partimage/Manifest b/sys-block/partimage/Manifest
index 68045406d152..33343b15f6cd 100644
--- a/sys-block/partimage/Manifest
+++ b/sys-block/partimage/Manifest
@@ -6,6 +6,7 @@ AUX partimage-0.6.7-chown.patch 1888 RMD160 0db2de481cddd206eb47fa8ef4ee37c01c6f
 AUX partimage-0.6.7-datadir-path.patch 673 RMD160 4ba52dcfc6857026864a5fc460dd978164d0b967 SHA1 03e485c794a9ca24fb85e41d8dba2af8a9cc0abb SHA256 84bbb66c69cbd183bb326e17da2a0b7540690c5f1435903d9e5e7ae4c4cbc820
 AUX partimage-0.6.7-gcc43.patch 1299 RMD160 1541906226f8000eb140bd76c553ab3257e80441 SHA1 e717c7ce64f4e3e06a0f03a26e39e2e0ddaee41a SHA256 91dd330641d28f1bcb5a22a57618249a4f4e5350b0837b2636ef48abfa64443f
 AUX partimage-0.6.8-destdir.patch 562 RMD160 24cf252d35451474a90da88f4dc5354f33979965 SHA1 6825cb3015b3d271110d99686324d83f5333047d SHA256 ba51a0397ae9e220da4a76d2f441c96e1327e9bf6a696f44b6d01baf31e4603a
+AUX partimage-0.6.8-openssl-1.patch 464 RMD160 9275319a2b0b6925685d63da6069e8b223b1ea27 SHA1 b87e9ec441278e7d8695edb28b0948da25e81b4b SHA256 b9f21dc7e330a1159d033b26a9e12a46af87202035cc4970acf01f651ae76354
 AUX partimage.1 4492 RMD160 6d35af437de84b7825d089aa7883593bd93124ef SHA1 1b9514e8e8b13a7e4a3dc1b497008e79fc295a48 SHA256 9c6f726dd4e873271765c402d6b1d971532d0c3540fb78a09ed4ddf8d06ba2e6
 AUX partimaged.8 1448 RMD160 8cd38ac1b519f805b43fea713f15067c1ae4eec9 SHA1 8d370d024934b416d2ad8ed4c297e78acabe3679 SHA256 f82674fb2956836afacc440b03703fb7a48339abad7d1e8573f208adf8fffa51
 AUX partimaged.conf 424 RMD160 e1dbe5dd5a3eec01b3061cce992f1fbee4bec167 SHA1 f571f19bf872f43df9c086162aed96992a073db3 SHA256 f794f539051e0f2e5f3ce357c4683c4a22a9e87b31f1ae113fcf58cd8bda43cf
@@ -16,6 +17,6 @@ AUX servercert.cnf 1096 RMD160 8786b07466c5330254eb96e1de6f754e8a68e77f SHA1 64f
 DIST partimage-0.6.7.tar.bz2 628214 RMD160 e01315fe6073653c89f2dea3c19483853960d59e SHA1 c02e0db728e72277a78a1fb4140171ba8a9336cf SHA256 0b3ed41ab71a73f83a41fc12e61cd874f5d2799cbfbd1db8e39730ba8a3d6d9e
 DIST partimage-0.6.8.tar.bz2 631193 RMD160 93262d84c69719451ad82b7cbb7e07f8dced61bc SHA1 e88c22e8ba67545dc9d836c12ec56c89c0c11663 SHA256 98f91bf6baa108e390989ce963f75bc30f40ba9c6eb4e953abeedca9a6e6e4b4
 EBUILD partimage-0.6.7.ebuild 4619 RMD160 273de0a60a7c421cbb3b6b46409e9265f59ab65c SHA1 b81931dc6ff45f346408b084270b935daeca7a14 SHA256 c3a7c92e63cab0037abd54d69e24dee83a56808789e6e870b7f7bce6fad3079c
-EBUILD partimage-0.6.8.ebuild 3678 RMD160 355e233cecfaaefebe7287c07e4d9a978452daae SHA1 f41a0c63a9280c69f25385b13feed72759d741ed SHA256 15f79e17bb8e2fa0174309b533ebe532f66901cff0b4661bf0d45914f9885e67
-MISC ChangeLog 11979 RMD160 94fa5513b8e8ab0fd0425702163d1a0697056dd9 SHA1 0eb94b4b6a90e467d08e1d104bc8f40fb1e02682 SHA256 8c0a6d8cd33678e74441ae40698b4e3a710934e02d9f80071ea3f450ddd05349
+EBUILD partimage-0.6.8.ebuild 3717 RMD160 f83866f2a0ad7ceb651bc02b746327fb4c9b05c4 SHA1 4ded8a5071d0238ebc3db733b5cc8e3812ee0f8c SHA256 6d76c9914e1d2786d3441d5cdd57304d4912066968657fe706e159db9c3d9695
+MISC ChangeLog 12171 RMD160 6dedbeb1ee7c04460521c8030c4fbb1439ec1f1e SHA1 8d1941fd52208f776b910709e0053bef12860c1b SHA256 70cb976518783fda565e7957f38f0b1dd44031fd9375a65cec687e2b7c8e52c1
 MISC metadata.xml 263 RMD160 f6a0896b330530ad4354f3d145b000d57dafb95a SHA1 cd64d6abb8aff2ed3503c5695884453506e3d952 SHA256 1067ab0115fc08e2b71da0707f6cacd6a229d6f1ce5ea3a57c24dc1c171948f5
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
new file mode 100644
index 000000000000..a4ebeb9aac60
--- /dev/null
+++ b/sys-block/partimage/files/partimage-0.6.8-openssl-1.patch
@@ -0,0 +1,24 @@
+http://bugs.gentoo.org/326879
+
+--- src/client/netclient.h
++++ src/client/netclient.h
+@@ -35,7 +35,7 @@
+ #ifdef HAVE_SSL
+   SSL_CTX * ctx;
+   X509 * server_cert;
+-  SSL_METHOD * meth;
++  const SSL_METHOD * meth;
+ #endif
+   bool m_bUseSSL;
+   bool m_bMustLogin;
+--- src/server/netserver.h
++++ src/server/netserver.h
+@@ -41,7 +41,7 @@
+ #ifdef HAVE_SSL
+   SSL_CTX * ctx;
+   X509 * client_cert;
+-  SSL_METHOD * meth; 
++  const SSL_METHOD * meth; 
+   int err;
+ #endif
+ 
diff --git a/sys-block/partimage/partimage-0.6.8.ebuild b/sys-block/partimage/partimage-0.6.8.ebuild
index aeef7465ac87..fb5f88b604d4 100644
--- a/sys-block/partimage/partimage-0.6.8.ebuild
+++ b/sys-block/partimage/partimage-0.6.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/partimage-0.6.8.ebuild,v 1.2 2010/07/07 22:58:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/partimage-0.6.8.ebuild,v 1.3 2010/07/11 02:53:05 ssuominen Exp $
 
 EAPI=3
 inherit autotools eutils flag-o-matic pam
@@ -32,7 +32,8 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-destdir.patch
+	epatch "${FILESDIR}"/${P}-destdir.patch \
+		"${FILESDIR}"/${P}-openssl-1.patch
 	eautoreconf
 }