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

(Portage version: 2.2.0_alpha89/cvs/Linux x86_64)

3 files changed, 58 insertions, 18 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/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
 }