Fix building with zlib >= 1.2.5.2 wrt #405323 by Xavier Miller and Manfred Knick

Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64

4 files changed, 69 insertions, 24 deletions

diff --git a/sys-block/partimage/ChangeLog b/sys-block/partimage/ChangeLog
index c12efca8c8a9..927c35c7a599 100644
--- a/sys-block/partimage/ChangeLog
+++ b/sys-block/partimage/ChangeLog
@@ -1,6 +1,11 @@
 # 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.49 2010/11/19 19:36:33 flameeyes Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/ChangeLog,v 1.50 2012/03/04 09:57:05 ssuominen Exp $
+
+  04 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> partimage-0.6.9.ebuild,
+  +files/partimage-0.6.9-zlib-1.2.5.2.patch:
+  Fix building with zlib >= 1.2.5.2 wrt #405323 by Xavier Miller and Manfred
+  Knick
 
 *partimage-0.6.9 (19 Nov 2010)
 
diff --git a/sys-block/partimage/Manifest b/sys-block/partimage/Manifest
index 88c65f7384f3..ed88f96dfdd6 100644
--- a/sys-block/partimage/Manifest
+++ b/sys-block/partimage/Manifest
@@ -3,6 +3,7 @@ Hash: SHA1
 
 AUX partimage-0.6.8-destdir.patch 562 RMD160 24cf252d35451474a90da88f4dc5354f33979965 SHA1 6825cb3015b3d271110d99686324d83f5333047d SHA256 ba51a0397ae9e220da4a76d2f441c96e1327e9bf6a696f44b6d01baf31e4603a
 AUX partimage-0.6.8-openssl-1.patch 593 RMD160 df47fd0d19baf3fccffd654f82667f3ca5f73f3f SHA1 5faeab46525557247f21cb3f629dcd33e58050fb SHA256 179e0876c29bc619d3bec50565122681f36396cc68cce563679e82d04b31671e
+AUX partimage-0.6.9-zlib-1.2.5.2.patch 975 RMD160 96669e7d6b41f736b1070ff19d2570ed0e682c31 SHA1 e5007cfd7bdd7486a6d79305ee0c4cb61adfd6a1 SHA256 b8bd5502ec538031ad48082915507274a0001ac7412a2cd04b8cc888b807ba5a
 AUX partimaged.conf 424 RMD160 e1dbe5dd5a3eec01b3061cce992f1fbee4bec167 SHA1 f571f19bf872f43df9c086162aed96992a073db3 SHA256 f794f539051e0f2e5f3ce357c4683c4a22a9e87b31f1ae113fcf58cd8bda43cf
 AUX partimaged.init 760 RMD160 21e18889534c4714ae90db869fbae4c5774d2228 SHA1 8b804b97391469811b29d2a2a84d11c7ca0090f5 SHA256 43d774892dac80d07052f8cbc2b2223e6d29c763ccaa8162e04b3b534a361aff
 AUX partimaged.init.2 748 RMD160 5139309e959992774d8d1ef492932f0e2825552a SHA1 4c268f4cfe0ff34578d9c17811f55197aa6dd204 SHA256 d6249338b5450de5ee4c8d101cbfe49ff465de18cec6eafdcc488079bc4300cc
@@ -12,13 +13,17 @@ AUX servercert.cnf 1096 RMD160 8786b07466c5330254eb96e1de6f754e8a68e77f SHA1 64f
 DIST partimage-0.6.8.tar.bz2 631193 RMD160 93262d84c69719451ad82b7cbb7e07f8dced61bc SHA1 e88c22e8ba67545dc9d836c12ec56c89c0c11663 SHA256 98f91bf6baa108e390989ce963f75bc30f40ba9c6eb4e953abeedca9a6e6e4b4
 DIST partimage-0.6.9.tar.bz2 666522 RMD160 b3678ddb8de4adb55a522df0d2ce110944517554 SHA1 3b9804b2289d7876835042a144d5fd1949aef1a4 SHA256 753a6c81f4be18033faed365320dc540fe5e58183eaadcd7a5b69b096fec6635
 EBUILD partimage-0.6.8.ebuild 3711 RMD160 26d0bb51cd5de844f9581a35e91e4d56b02a6d8c SHA1 98b8a541c5786a51ddca6db3b9661c9a01bd1654 SHA256 2e79f5741e51f7b528be65a8d5e731a1087f6a6e3c34b395ae5ed5fd84ac9584
-EBUILD partimage-0.6.9.ebuild 3610 RMD160 93308e9a851f64cf18e971a3c1bb60ac34f35f60 SHA1 ee15cabd8e1619fe6a8308148dc0f55ca759e094 SHA256 0411b529ea6f4d76e3379aa33b1af9f0330c414839d6391848d04d4806a6faa2
-MISC ChangeLog 13030 RMD160 9cd08143e9de0013c453c55847f6e225f7c71e71 SHA1 320da354dcac235ec02843774ba880bb3092d33e SHA256 20ad86dd14c3d4bc9df695df28260a3fc6ac0ec44166ba0acd356300a677c979
+EBUILD partimage-0.6.9.ebuild 3514 RMD160 b159cda33ae5a3cab7a7cdc74cd26cf0681065ec SHA1 9bf4c57ab8682634d359fccf4d4c8b371e6bc605 SHA256 f349a0c80e0910dc662e89c649acf1cd9e4d959e5c0d7b8da4dc1742991028a6
+MISC ChangeLog 13239 RMD160 01ffad365ebe0888a140db31d5f4bdf552754fe3 SHA1 fcaeeda886e72e7873e610f00fdfb875f9546d18 SHA256 fc14ec278410933138308bb9f3dede1bcc3bf644bae88b5a48169ae0a9af8f57
 MISC metadata.xml 263 RMD160 f6a0896b330530ad4354f3d145b000d57dafb95a SHA1 cd64d6abb8aff2ed3503c5695884453506e3d952 SHA256 1067ab0115fc08e2b71da0707f6cacd6a229d6f1ce5ea3a57c24dc1c171948f5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAkzm0YEACgkQAiZjviIA2XipQQCbBiwCJyLqm3Dasvg3IXJJOpxY
-614AoOTUwBGRW0pR0Ti/CXV86FuyQgXe
-=gb5W
+iQEcBAEBAgAGBQJPUzw5AAoJEEdUh39IaPFNyU0IAJrQKUGmNDxzCZwns2WvJJ1/
+p4UGkkmW+D257cRIuzVBAqdeCR382oddySF5jC58eNMqyAXqZjYsFHYhKeVQX7Vh
+5wNGBUID/iNTGWjSpSW8GoLFGY+tJFpl8ARVFzIaLwUjR2VZHjOXr0zRzdvNoTU6
+9gPa0H7er/qk83lZg2lsWNhfXXM+yZpt4uy5OcA7c7I6H5S9Fztu3C2qtu6Ixw2q
+9OJgV4EYeIQs28NfYsya5VzhY09RQvSMYfFGLXhsDGXi1JfvQnr8+NrlUTLp1f4K
+lenv0YBavv3dsRwPXxJRQWW2kV/OIEBSXk6UieoaUOfD0azOORqp5OVgiVDqSo8=
+=tY3f
 -----END PGP SIGNATURE-----
diff --git a/sys-block/partimage/files/partimage-0.6.9-zlib-1.2.5.2.patch b/sys-block/partimage/files/partimage-0.6.9-zlib-1.2.5.2.patch
new file mode 100644
index 000000000000..57f87a5d5225
--- /dev/null
+++ b/sys-block/partimage/files/partimage-0.6.9-zlib-1.2.5.2.patch
@@ -0,0 +1,33 @@
+http://bugs.gentoo.org/405323
+
+--- src/client/imagefile.cpp
++++ src/client/imagefile.cpp
+@@ -783,7 +783,7 @@
+   else if (m_options.dwCompression == COMPRESS_GZIP) // Gzip compression
+     {
+       showDebug(1, "open gzip\n");
+-      m_gzImageFile = (gzFile *) gzdopen(m_nFdImage, "wb"); //"wb1h");
++      m_gzImageFile = gzdopen(m_nFdImage, "wb"); //"wb1h");
+       if (m_gzImageFile == NULL)
+ 	{
+ 	  showDebug(1, "error:%d %s\n", errno, strerror(errno));
+@@ -1098,7 +1098,7 @@
+     }
+   else if (m_options.dwCompression == COMPRESS_GZIP) // Gzip compression
+     {
+-      m_gzImageFile = (gzFile *) gzdopen(m_nFdImage, "rb");
++      m_gzImageFile = gzdopen(m_nFdImage, "rb");
+       if (m_gzImageFile == NULL)
+         THROW(ERR_ERRNO, errno);
+       else
+--- src/client/imagefile.h
++++ src/client/imagefile.h
+@@ -41,7 +41,7 @@
+   COptions m_options;
+ 
+   FILE *m_fImageFile;
+-  gzFile *m_gzImageFile;
++  gzFile m_gzImageFile;
+   BZFILE *m_bzImageFile;
+ 
+   int m_nFdImage;
diff --git a/sys-block/partimage/partimage-0.6.9.ebuild b/sys-block/partimage/partimage-0.6.9.ebuild
index c818f31e8718..fa9f38150c77 100644
--- a/sys-block/partimage/partimage-0.6.9.ebuild
+++ b/sys-block/partimage/partimage-0.6.9.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/partimage-0.6.9.ebuild,v 1.1 2010/11/19 19:36:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/partimage-0.6.9.ebuild,v 1.2 2012/03/04 09:57:05 ssuominen Exp $
 
-EAPI=3
+EAPI=4
 inherit eutils flag-o-matic pam
 
 DESCRIPTION="Console-based application to efficiently save raw partition data to an image file"
@@ -31,6 +31,10 @@ pkg_setup() {
 	enewuser partimag 91 -1 /var/lib/partimage partimag
 }
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-zlib-1.2.5.2.patch #405323
+}
+
 src_configure() {
 	# XXX: Do we still need these?
 	filter-flags -fno-exceptions
@@ -48,7 +52,6 @@ src_configure() {
 		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		--sysconfdir="${EPREFIX}"/etc \
 		$(use_enable nls) \
-		--disable-dependency-tracking \
 		$(use_enable ssl) \
 		--disable-pam \
 		$(use_enable static all-static) \
@@ -57,26 +60,25 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc BOOT-ROOT.txt FORMAT FUTURE THANKS
+	default
 
 	keepdir /var/lib/partimage
 	keepdir /var/log/partimage
 
-	newinitd "${FILESDIR}"/partimaged.init.2 partimaged || die
-	newconfd "${FILESDIR}"/partimaged.conf partimaged || die
+	newinitd "${FILESDIR}"/partimaged.init.2 partimaged
+	newconfd "${FILESDIR}"/partimaged.conf partimaged
 
 	if use ssl; then
 		insinto /etc/partimaged
-		doins "${FILESDIR}"/servercert.cnf || die
+		doins "${FILESDIR}"/servercert.cnf
 	fi
 
 	if use pam; then
-		newpamd "${FILESDIR}"/partimaged.pam.2 partimaged || die
+		newpamd "${FILESDIR}"/partimaged.pam.2 partimaged
 	fi
 }
 
-confdir=${ROOT}etc/partimaged
+confdir=${EROOT}/etc/partimaged
 privkey=${confdir}/partimaged.key
 cnf=${confdir}/servercert.cnf
 csr=${confdir}/partimaged.csr
@@ -89,24 +91,24 @@ pkg_config() {
 		read
 		if [ ! -f ${privkey} ]; then
 			einfo "Generating unencrypted private key: ${privkey}"
-			openssl genrsa -out ${privkey} 1024  || die "Failed!"
+			openssl genrsa -out ${privkey} 1024 || die
 		else
 			einfo "Private key already exists: ${privkey}"
 		fi
 		if [ ! -f ${csr} ]; then
 			einfo "Generating certificate request: ${csr}"
-			openssl req -new -x509 -outform PEM -out ${csr} -key ${privkey} -config ${cnf} || die "Failed!"
+			openssl req -new -x509 -outform PEM -out ${csr} -key ${privkey} -config ${cnf} || die
 		else
 			einfo "Certificate request already exists: ${csr}"
 		fi
 		if [ ! -f ${cert} ]; then
 			einfo "Generating self-signed certificate: ${cert}"
-			openssl x509 -in ${csr} -out ${cert} -signkey ${privkey} || die "Failed!"
+			openssl x509 -in ${csr} -out ${cert} -signkey ${privkey} || die
 		else
 			einfo "Self-signed certifcate already exists: ${cert}"
 		fi
 		einfo "Setting permissions"
-		partimagesslperms || die "Failed!"
+		partimagesslperms || die
 		einfo "Done"
 	else
 		einfo "SSL is disabled, not building certificates"
@@ -133,5 +135,5 @@ pkg_postinst() {
 		partimagesslperms
 		return 0
 	fi
-	chown partimag:0 "${ROOT}"etc/partimaged/partimagedusers || die
+	chown partimag:0 "${EROOT}"/etc/partimaged/partimagedusers || die
 }