Version bump.

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

4 files changed, 159 insertions, 2 deletions

diff --git a/sys-block/partimage/ChangeLog b/sys-block/partimage/ChangeLog
index edfd567e0540..6e20fe90c8ab 100644
--- a/sys-block/partimage/ChangeLog
+++ b/sys-block/partimage/ChangeLog
@@ -1,6 +1,12 @@
 # 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.42 2010/06/02 06:24:04 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/ChangeLog,v 1.43 2010/07/07 22:53:12 ssuominen Exp $
+
+*partimage-0.6.8 (07 Jul 2010)
+
+  07 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +partimage-0.6.8.ebuild, +files/partimage-0.6.8-destdir.patch:
+  Version bump.
 
   02 Jun 2010; Torsten Veller <tove@gentoo.org> metadata.xml:
   Remove xmerlin from metadata.xml (#69210)
diff --git a/sys-block/partimage/Manifest b/sys-block/partimage/Manifest
index db94ab469a8d..9adc5aebf6e1 100644
--- a/sys-block/partimage/Manifest
+++ b/sys-block/partimage/Manifest
@@ -5,6 +5,7 @@ AUX partimage-0.6.7+glibc-2.10.patch 508 RMD160 5ca573128b60940635e0dcfcb8e4c312
 AUX partimage-0.6.7-chown.patch 1888 RMD160 0db2de481cddd206eb47fa8ef4ee37c01c6fe777 SHA1 b66ab9d3a28400a0fe2329ec38c9b9ab4b814784 SHA256 4e07de0f3b8f182bd16d5f45f0f56be2158524492936cf47891db8714cdb0f4e
 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.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
@@ -13,6 +14,8 @@ AUX partimaged.pam 266 RMD160 07b472d4ffdf3f5c10e7b04ba0c1df87e3e1cf9d SHA1 8955
 AUX partimagedusers.5 1263 RMD160 6416fd7f013e637b99f10c32607994e11728bdd0 SHA1 56afebd408dc14d3270a9a43702d335fa598998e SHA256 6037d086ddcdebd76b2f2477252173e8242ac528bc7025a391364a4da174f0f3
 AUX servercert.cnf 1096 RMD160 8786b07466c5330254eb96e1de6f754e8a68e77f SHA1 64fc34b0fbb8a07dc90ea6be932c4e51a6839721 SHA256 9a9cae8cd6c7bbc6f71cd619829b7a6a47d6aae34831cc44a6cc3bf3e7917953
 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
-MISC ChangeLog 11806 RMD160 6948de3a55fb36f81bd391aeb5c6d1e60d4fd135 SHA1 c3b42e02149e0aa6350f8a34a02e55d0b9053a14 SHA256 dfe0d2da91815aefccfd05bb9615bd84220586a08a186d7a145ac02e6a0ee27d
+EBUILD partimage-0.6.8.ebuild 3579 RMD160 025ba36b0d4afea1a0ae1563b53f66bb0af575d1 SHA1 34052052a3fcbc9f3ecd32c12120ef45f1bc01ba SHA256 92bc913d0da05ee887933b37414e176417d7430b1e037fd5474e74eaf318ed76
+MISC ChangeLog 11979 RMD160 94fa5513b8e8ab0fd0425702163d1a0697056dd9 SHA1 0eb94b4b6a90e467d08e1d104bc8f40fb1e02682 SHA256 8c0a6d8cd33678e74441ae40698b4e3a710934e02d9f80071ea3f450ddd05349
 MISC metadata.xml 236 RMD160 792e23524f149a663c9647f206c1a92526c7af4f SHA1 be3cd178e173524f23e11facc564c69332d6d7a2 SHA256 e25fe580c4855de9b289d981fe5de49de9f08ad26e06d5db0cee976bee45a357
diff --git a/sys-block/partimage/files/partimage-0.6.8-destdir.patch b/sys-block/partimage/files/partimage-0.6.8-destdir.patch
new file mode 100644
index 000000000000..12eb8c43c5a6
--- /dev/null
+++ b/sys-block/partimage/files/partimage-0.6.8-destdir.patch
@@ -0,0 +1,11 @@
+--- Makefile.am
++++ Makefile.am
+@@ -48,7 +48,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.8.ebuild b/sys-block/partimage/partimage-0.6.8.ebuild
new file mode 100644
index 000000000000..1138133557dd
--- /dev/null
+++ b/sys-block/partimage/partimage-0.6.8.ebuild
@@ -0,0 +1,137 @@
+# 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.1 2010/07/07 22:53:12 ssuominen Exp $
+
+EAPI=3
+inherit autotools eutils flag-o-matic pam
+
+DESCRIPTION="Console-based application to efficiently save raw partition data to an image file"
+HOMEPAGE="http://www.partimage.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="nls pam ssl static"
+
+LIBS_DEPEND="app-arch/bzip2
+	>=dev-libs/newt-0.52
+	>=sys-libs/slang-2
+	sys-libs/zlib
+	ssl? ( dev-libs/openssl )"
+PAM_DEPEND="!static? ( pam? ( virtual/pam ) )"
+RDEPEND="${PAM_DEPEND}
+	!static? ( ${LIBS_DEPEND} )"
+DEPEND="${PAM_DEPEND}
+	${LIBS_DEPEND}
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	enewgroup partimag 91
+	enewuser partimag 91 -1 /var/log/partimage partimag
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-destdir.patch
+	eautoreconf
+}
+
+src_configure() {
+	# XXX: Do we still need these?
+	filter-flags -fno-exceptions
+	use ppc && append-flags -fsigned-char
+
+	local myconf
+	if use pam && ! use static; then
+		myconf="--enable-pam"
+	fi
+
+	econf \
+		--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) \
+		--with-log-dir="${EPREFIX}"/var/log/partimage \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc BOOT-ROOT.txt FORMAT FUTURE THANKS
+	prepalldocs
+
+	keepdir /var/log/partimage
+
+	insinto /etc/partimaged
+	doins "${FILESDIR}"/servercert.cnf || die
+
+	newinitd "${FILESDIR}"/partimaged.init partimaged || die
+	newconfd "${FILESDIR}"/partimaged.conf partimaged || die
+
+	if use pam; then
+		newpamd "${FILESDIR}"/partimaged.pam partimaged || die
+	fi
+}
+
+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}"
+		partimagesslperms
+		return 0
+	fi
+	chown partimag:0 "${ROOT}"etc/partimaged/partimagedusers || die
+}