0.6.6 marked stable, version bump 0.6.7, ebuild cleanup (removed already merged patches).

0.6.6 and the amd64 patch will be removed soon (when 0.6.7 will be marked stable).
(Portage version: 2.1.4.4)

7 files changed, 234 insertions, 11 deletions

diff --git a/sys-block/partimage/ChangeLog b/sys-block/partimage/ChangeLog
index 01e8835a5606..079ae3e28566 100644
--- a/sys-block/partimage/ChangeLog
+++ b/sys-block/partimage/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-block/partimage
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/ChangeLog,v 1.32 2008/02/09 13:03:26 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/ChangeLog,v 1.33 2008/02/26 19:08:06 xmerlin Exp $
+
+*partimage-0.6.7 (26 Feb 2008)
+
+  26 Feb 2008; Christian Zoffoli <xmerlin@gentoo.org>
+  +files/partimage-0.6.7-chown.patch,
+  +files/partimage-0.6.7-datadir-path.patch, partimage-0.6.4-r3.ebuild,
+  partimage-0.6.4-r4.ebuild, partimage-0.6.6.ebuild,
+  +partimage-0.6.7.ebuild:
+  0.6.6 marked stable, version bump 0.6.7, ebuild cleanup (removed already merged patches).
 
   09 Feb 2008; Samuli Suominen <drac@gentoo.org> partimage-0.6.6.ebuild:
   Fix partimage to work with slang 2.1.3.
diff --git a/sys-block/partimage/files/partimage-0.6.7-chown.patch b/sys-block/partimage/files/partimage-0.6.7-chown.patch
new file mode 100644
index 000000000000..e28d18fcb05b
--- /dev/null
+++ b/sys-block/partimage/files/partimage-0.6.7-chown.patch
@@ -0,0 +1,38 @@
+--- partimage-0.6.7/Makefile.in.orig	2008-02-26 19:56:15.000000000 +0100
++++ partimage-0.6.7/Makefile.in	2008-02-26 19:56:25.000000000 +0100
+@@ -708,8 +708,6 @@
+ 	rm -f $(DESTDIR)${sysconfdir}/partimaged/partimaged.csr ;\
+ 	chmod 600 $(DESTDIR)${sysconfdir}/partimaged/partimaged.key || true;\
+ 	chmod 600 $(DESTDIR)${sysconfdir}/partimaged/partimaged.cert || true;\
+-	chown partimag:root $(DESTDIR)${sysconfdir}/partimaged/partimaged.key || true;\
+-	chown partimag:root $(DESTDIR)${sysconfdir}/partimaged/partimaged.cert || true;\
+ 	else \
+ 	echo "SSL disabled, no certificate will be generated." ;\
+ 	fi
+@@ -741,7 +739,6 @@
+ 	echo "#sample # user 'sample' is allowed to connect partimaged" >> \
+            $(DESTDIR)${sysconfdir}/partimaged/partimagedusers ;\
+ 	chmod 600 $(DESTDIR)${sysconfdir}/partimaged/partimagedusers || true;\
+-	chown partimag:root $(DESTDIR)${sysconfdir}/partimaged/partimagedusers || true ;\
+ 	fi 
+ 
+ distclean-local:
+--- partimage-0.6.7/Makefile.am.orig	2008-02-26 19:55:53.000000000 +0100
++++ partimage-0.6.7/Makefile.am	2008-02-26 19:56:11.000000000 +0100
+@@ -21,8 +21,6 @@
+ 	rm -f $(DESTDIR)${sysconfdir}/partimaged/partimaged.csr ;\
+ 	chmod 600 $(DESTDIR)${sysconfdir}/partimaged/partimaged.key || true;\
+ 	chmod 600 $(DESTDIR)${sysconfdir}/partimaged/partimaged.cert || true;\
+-	chown partimag:root $(DESTDIR)${sysconfdir}/partimaged/partimaged.key || true;\
+-	chown partimag:root $(DESTDIR)${sysconfdir}/partimaged/partimaged.cert || true;\
+ 	else \
+ 	echo "SSL disabled, no certificate will be generated." ;\
+ 	fi
+@@ -55,7 +53,6 @@
+ 	echo "#sample # user 'sample' is allowed to connect partimaged" >> \
+            $(DESTDIR)${sysconfdir}/partimaged/partimagedusers ;\
+ 	chmod 600 $(DESTDIR)${sysconfdir}/partimaged/partimagedusers || true;\
+-	chown partimag:root $(DESTDIR)${sysconfdir}/partimaged/partimagedusers || true ;\
+ 	fi 
+ 
+ distclean-local:
diff --git a/sys-block/partimage/files/partimage-0.6.7-datadir-path.patch b/sys-block/partimage/files/partimage-0.6.7-datadir-path.patch
new file mode 100644
index 000000000000..f9c315f91dd9
--- /dev/null
+++ b/sys-block/partimage/files/partimage-0.6.7-datadir-path.patch
@@ -0,0 +1,11 @@
+--- partimage-0.6.7/Makefile.in.orig	2008-02-26 19:59:54.000000000 +0100
++++ partimage-0.6.7/Makefile.in	2008-02-26 20:00:16.000000000 +0100
+@@ -732,7 +732,7 @@
+           $(DESTDIR)${sysconfdir}/partimaged/partimagedusers ;\
+ 	echo -n "#add only users allowed to " >>  \
+            $(DESTDIR)${sysconfdir}/partimaged/partimagedusers ;\
+-	echo "connect partimaged" >> ${sysconfdir}/partimaged/partimagedusers ;\
++	echo "connect partimaged" >> $(DESTDIR)${sysconfdir}/partimaged/partimagedusers ;\
+ 	echo "# (only one login per line)" >> \
+            $(DESTDIR)${sysconfdir}/partimaged/partimagedusers ;\
+ 	echo "" >> $(DESTDIR)${sysconfdir}/partimaged/partimagedusers ;\
diff --git a/sys-block/partimage/partimage-0.6.4-r3.ebuild b/sys-block/partimage/partimage-0.6.4-r3.ebuild
index a13607cd1825..f451d9235490 100644
--- a/sys-block/partimage/partimage-0.6.4-r3.ebuild
+++ b/sys-block/partimage/partimage-0.6.4-r3.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/partimage-0.6.4-r3.ebuild,v 1.22 2008/01/15 12:05:20 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/partimage-0.6.4-r3.ebuild,v 1.23 2008/02/26 19:08:06 xmerlin Exp $
 
 WANT_AUTOMAKE="1.8"
 
 inherit eutils flag-o-matic autotools
 
-DESCRIPTION="Console-based application to efficiently save raw partition data to an image file. Optional encryption/compression support."
+DESCRIPTION="Console-based application to efficiently save raw partition data to an image file."
 HOMEPAGE="http://www.partimage.org/"
 SRC_URI="mirror://sourceforge/partimage/${P}.tar.bz2"
 LICENSE="GPL-2"
@@ -82,7 +82,7 @@ src_install() {
 	newconfd "${FILESDIR}"/${PN}d.conf ${PN}d || die
 
 	doman debian/partimage.1 debian/partimaged.8 "${FILESDIR}"/partimagedusers.5 || die
-	dodoc AUTHORS BUGS COPYING ChangeLog INSTALL README* TODO partimage.lsm
+	dodoc AUTHORS BUGS ChangeLog INSTALL README* TODO partimage.lsm
 }
 
 # vars for SSL stuff
diff --git a/sys-block/partimage/partimage-0.6.4-r4.ebuild b/sys-block/partimage/partimage-0.6.4-r4.ebuild
index 6f9bdf32408b..859ee985860f 100644
--- a/sys-block/partimage/partimage-0.6.4-r4.ebuild
+++ b/sys-block/partimage/partimage-0.6.4-r4.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/partimage-0.6.4-r4.ebuild,v 1.16 2008/01/15 12:05:20 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/partimage-0.6.4-r4.ebuild,v 1.17 2008/02/26 19:08:06 xmerlin Exp $
 
 WANT_AUTOMAKE="1.8"
 
 inherit eutils flag-o-matic pam autotools
 
 MY_P="${PN}-${PV}-1"
-DESCRIPTION="Console-based application to efficiently save raw partition data to an image file. Optional encryption/compression support."
+DESCRIPTION="Console-based application to efficiently save raw partition data to an image file."
 HOMEPAGE="http://www.partimage.org/"
 SRC_URI="mirror://sourceforge/partimage/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
@@ -113,7 +113,7 @@ src_install() {
 	newconfd "${FILESDIR}"/${PN}d.conf ${PN}d || die
 
 	doman debian/partimage.1 debian/partimaged.8 "${FILESDIR}"/partimagedusers.5 || die
-	dodoc AUTHORS BUGS COPYING ChangeLog INSTALL README* TODO partimage.lsm
+	dodoc AUTHORS BUGS ChangeLog INSTALL README* TODO partimage.lsm
 
 	# pam
 	if use pam
diff --git a/sys-block/partimage/partimage-0.6.6.ebuild b/sys-block/partimage/partimage-0.6.6.ebuild
index 516e87d73d1b..1f33cea12138 100644
--- a/sys-block/partimage/partimage-0.6.6.ebuild
+++ b/sys-block/partimage/partimage-0.6.6.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/partimage-0.6.6.ebuild,v 1.2 2008/02/09 13:03:26 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/partimage-0.6.6.ebuild,v 1.3 2008/02/26 19:08:06 xmerlin Exp $
 
 WANT_AUTOMAKE="1.10"
 
 inherit eutils flag-o-matic pam autotools
 
-DESCRIPTION="Console-based application to efficiently save raw partition data to an image file. Optional encryption/compression support."
+DESCRIPTION="Console-based application to efficiently save raw partition data to an image file."
 HOMEPAGE="http://www.partimage.org/"
 SRC_URI="mirror://sourceforge/partimage/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc"
+KEYWORDS="x86 ~amd64 ~ppc ~sparc"
 IUSE="ssl nologin nls pam static"
 
 DEPEND="virtual/libc
@@ -103,7 +103,7 @@ src_install() {
 	newconfd "${FILESDIR}"/${PN}d.conf ${PN}d || die
 
 	doman doc/en/man/partimage.1 doc/en/man/partimaged.8 doc/en/man/partimagedusers.5
-	dodoc AUTHORS BUGS COPYING ChangeLog INSTALL README* TODO partimage.lsm
+	dodoc AUTHORS BUGS ChangeLog INSTALL README* TODO partimage.lsm
 
 	# pam
 	if use pam
diff --git a/sys-block/partimage/partimage-0.6.7.ebuild b/sys-block/partimage/partimage-0.6.7.ebuild
new file mode 100644
index 000000000000..61ffab4f89d5
--- /dev/null
+++ b/sys-block/partimage/partimage-0.6.7.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/partimage-0.6.7.ebuild,v 1.1 2008/02/26 19:08:06 xmerlin Exp $
+
+WANT_AUTOMAKE="1.10"
+
+inherit eutils flag-o-matic pam autotools
+
+DESCRIPTION="Console-based application to efficiently save raw partition data to an image file."
+HOMEPAGE="http://www.partimage.org/"
+SRC_URI="mirror://sourceforge/partimage/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc ~sparc"
+IUSE="ssl nologin nls pam static"
+
+DEPEND="virtual/libc
+	>=sys-libs/zlib-1.1.4
+	>=dev-libs/newt-0.51.6
+	app-arch/bzip2
+	>=sys-libs/slang-1.4
+	nls? ( sys-devel/gettext )
+	ssl? ( >=dev-libs/openssl-0.9.6g )"
+
+RDEPEND="!static? ( virtual/libc
+		>=sys-libs/zlib-1.1.4
+		>=dev-libs/lzo-1.08
+		>=dev-libs/newt-0.51.6
+		app-arch/bzip2
+		>=sys-libs/slang-1.4
+		nls? ( sys-devel/gettext )		ssl? ( >=dev-libs/openssl-0.9.6g )
+		pam? ( virtual/pam )
+	)"
+
+PARTIMAG_GROUP_GID=91
+PARTIMAG_USER_UID=91
+PARTIMAG_GROUP_NAME=partimag
+PARTIMAG_USER_NAME=partimag
+PARTIMAG_USER_SH=-1
+PARTIMAG_USER_HOMEDIR=/var/log/partimage
+PARTIMAG_USER_GROUPS=partimag
+
+pkg_setup() {
+	# Now add users if needed
+	enewgroup ${PARTIMAG_GROUP_NAME} ${PARTIMAG_GROUP_GID}
+	enewuser ${PARTIMAG_USER_NAME} ${PARTIMAG_USER_UID} ${PARTIMAG_USER_SH} ${PARTIMAG_USER_HOMEDIR} ${PARTIMAG_USER_GROUPS}
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-0.6.4-save_file_and_rest_file_actions.patch || die
+	#epatch "${FILESDIR}"/${PN}-0.6.6-not_install_info.patch || die
+	epatch "${FILESDIR}"/${P}-chown.patch || die
+	epatch "${FILESDIR}"/${PN}-0.6.6-disable_header_check.patch || die
+	epatch "${FILESDIR}"/${P}-datadir-path.patch || die
+}
+
+src_compile() {
+	filter-flags -fno-exceptions
+	use ppc && append-flags -fsigned-char
+
+	local myconf
+	use nologin && myconf="${myconf} --disable-login"
+	if use static
+	then
+		use pam && ewarn "pam and static compilation are mutually exclusive - using static and ignoring pam"
+	else
+		myconf="${myconf} `use_enable pam`"
+	fi
+	econf \
+		${myconf} \
+		--sysconfdir=/etc \
+		`use_enable ssl` \
+		`use_enable nls` \
+		`use_enable static all-static` \
+		|| die "econf failed"
+
+	emake || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		MKINSTALLDIRS=/usr/share/automake-1.10/mkinstalldirs install || die
+
+	keepdir /var/log/partimage
+
+	insinto /etc/partimaged; doins "${FILESDIR}"/servercert.cnf || die
+
+	# init.d / conf.d
+	newinitd "${FILESDIR}"/${PN}d.init ${PN}d || die
+	newconfd "${FILESDIR}"/${PN}d.conf ${PN}d || die
+
+	doman doc/en/man/partimage.1 doc/en/man/partimaged.8 doc/en/man/partimagedusers.5
+	dodoc AUTHORS BUGS ChangeLog INSTALL README* TODO partimage.lsm
+
+	# pam
+	if use pam
+	then
+		newpamd "${FILESDIR}"/partimaged.pam partimaged || die
+	fi
+}
+
+# vars for SSL stuff
+confdir="${ROOT}etc/partimaged"
+privkey="${confdir}/partimaged.key"
+cnf="${confdir}/servercert.cnf"
+csr="${confdir}/partimaged.csr"
+cert="${confdir}/partimaged.cert"
+
+pkg_config() {
+	if use ssl; then
+		ewarn "Please customize /etc/partimaged/servercert.cnf before you continue!"
+		ewarn "Press Ctrl-C to break now for it, or press enter to continue."
+		read
+		if [ ! -f ${privkey} ]; then
+			einfo "Generating unencrypted private key: ${privkey}"
+			openssl genrsa -out ${privkey} 1024  || die "Failed!"
+		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!"
+		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!"
+		else
+			einfo "Self-signed certifcate already exists: ${cert}"
+		fi
+		einfo "Setting permissions"
+		partimagesslperms || die "Failed!"
+		einfo "Done"
+	else
+		einfo "SSL is disabled, not building certificates"
+	fi
+}
+
+partimagesslperms() {
+	local ret=0
+	chmod 600 ${privkey} 2>/dev/null
+	ret=$((${ret}+$?))
+	chown partimag:0 ${privkey} 2>/dev/null
+	ret=$((${ret}+$?))
+	chmod 644 ${cert} ${csr} 2>/dev/null
+	ret=$((${ret}+$?))
+	chown root:0 ${cert} ${csr} 2>/dev/null
+	ret=$((${ret}+$?))
+	return $ret
+}
+
+pkg_postinst() {
+	if use ssl; then
+		einfo "To create the required SSL certificates, please do:"
+		einfo "emerge  --config =${PF}"
+		# force a permmissions fixup
+		partimagesslperms
+		return 0
+	fi
+	chown partimag:0 /etc/partimaged/partimagedusers || die
+}