[gentoo-commits] gentoo-x86 commit in sys-block/partimage: ChangeLog partimage-0.6.6.ebuild partimage-0.6.4-r4.ebuild partimage-0.6.4-r3.ebuild partimage-0.6.7.ebuild

[Christian Zoffoli (xmerlin)]

xmerlin     08/02/26 19:08:06

  Modified:             ChangeLog partimage-0.6.6.ebuild
                        partimage-0.6.4-r4.ebuild partimage-0.6.4-r3.ebuild
  Added:                partimage-0.6.7.ebuild
  Log:
  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)

Revision  Changes    Path
1.33                 sys-block/partimage/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-block/partimage/ChangeLog?rev=1.33&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-block/partimage/ChangeLog?rev=1.33&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-block/partimage/ChangeLog?r1=1.32&r2=1.33

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-block/partimage/ChangeLog,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ChangeLog	9 Feb 2008 13:03:26 -0000	1.32
+++ ChangeLog	26 Feb 2008 19:08:06 -0000	1.33
@@ -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@g.o>
+  +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@g.o> partimage-0.6.6.ebuild:
   Fix partimage to work with slang 2.1.3.



1.3                  sys-block/partimage/partimage-0.6.6.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-block/partimage/partimage-0.6.6.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-block/partimage/partimage-0.6.6.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-block/partimage/partimage-0.6.6.ebuild?r1=1.2&r2=1.3

Index: partimage-0.6.6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-block/partimage/partimage-0.6.6.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- partimage-0.6.6.ebuild	9 Feb 2008 13:03:26 -0000	1.2
+++ partimage-0.6.6.ebuild	26 Feb 2008 19:08:06 -0000	1.3
@@ -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 @@
 	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



1.17                 sys-block/partimage/partimage-0.6.4-r4.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-block/partimage/partimage-0.6.4-r4.ebuild?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-block/partimage/partimage-0.6.4-r4.ebuild?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-block/partimage/partimage-0.6.4-r4.ebuild?r1=1.16&r2=1.17

Index: partimage-0.6.4-r4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-block/partimage/partimage-0.6.4-r4.ebuild,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- partimage-0.6.4-r4.ebuild	15 Jan 2008 12:05:20 -0000	1.16
+++ partimage-0.6.4-r4.ebuild	26 Feb 2008 19:08:06 -0000	1.17
@@ -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 @@
 	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



1.23                 sys-block/partimage/partimage-0.6.4-r3.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-block/partimage/partimage-0.6.4-r3.ebuild?rev=1.23&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-block/partimage/partimage-0.6.4-r3.ebuild?rev=1.23&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-block/partimage/partimage-0.6.4-r3.ebuild?r1=1.22&r2=1.23

Index: partimage-0.6.4-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-block/partimage/partimage-0.6.4-r3.ebuild,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- partimage-0.6.4-r3.ebuild	15 Jan 2008 12:05:20 -0000	1.22
+++ partimage-0.6.4-r3.ebuild	26 Feb 2008 19:08:06 -0000	1.23
@@ -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 @@
 	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



1.1                  sys-block/partimage/partimage-0.6.7.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-block/partimage/partimage-0.6.7.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-block/partimage/partimage-0.6.7.ebuild?rev=1.1&content-type=text/plain

Index: partimage-0.6.7.ebuild
===================================================================
# 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
}



-- 
gentoo-commits@l.g.o mailing list