New revision. Includes a fix for the -q options (thanks to Christophe Saout <christophe at saout.de> in bug #65398), secure ldflags (bug #66348) and updated HOMEPAGE (bug #65898)

5 files changed, 148 insertions, 20 deletions

diff --git a/sys-apps/vixie-cron/ChangeLog b/sys-apps/vixie-cron/ChangeLog
index 1a782bb2a0be..58c140eafe62 100644
--- a/sys-apps/vixie-cron/ChangeLog
+++ b/sys-apps/vixie-cron/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/vixie-cron
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/vixie-cron/ChangeLog,v 1.28 2004/10/07 15:10:46 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/vixie-cron/ChangeLog,v 1.29 2004/10/08 15:39:33 ciaranm Exp $
+
+*vixie-cron-4.1-r2 (08 Oct 2004)
+
+  08 Oct 2004; Ciaran McCreesh <ciaranm@gentoo.org>
+  +files/vixie-cron-4.1-commandline.patch, +vixie-cron-4.1-r2.ebuild:
+  New revision. Includes a fix for the -q options (thanks to Christophe Saout
+  <christophe at saout.de> in bug #65398), secure ldflags (bug #66348) and
+  updated HOMEPAGE (bug #65898)
 
   07 Oct 2004; Aaron Walker <ka0ttic@gentoo.org> metadata.xml:
   Updated metadata info.
diff --git a/sys-apps/vixie-cron/Manifest b/sys-apps/vixie-cron/Manifest
index bc65b8297c04..5daa796c614d 100644
--- a/sys-apps/vixie-cron/Manifest
+++ b/sys-apps/vixie-cron/Manifest
@@ -1,33 +1,36 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 3ff8b5eb733d9a828e916a46eabfa6ca vixie-cron-3.0.1-r4.ebuild 1852
-MD5 141bf296f623dc44f4bfa4d856dc21fa vixie-cron-3.0.1-r1.ebuild 1502
 MD5 dd33c1120b51b3d049054c798c20d5fa vixie-cron-3.0.1-r3.ebuild 1748
+MD5 3ff8b5eb733d9a828e916a46eabfa6ca vixie-cron-3.0.1-r4.ebuild 1852
+MD5 e34635c3cff5f42f1c6beb0f8cc50744 ChangeLog 8494
 MD5 ab3b7df1ed3ce81f23a9050de83ca101 vixie-cron-3.0.1-r5.ebuild 2035
-MD5 f549dbe7eb1698337c2a8ab0abdb9295 ChangeLog 8152
-MD5 0fcc78652b11c683f3fe76d614934379 metadata.xml 288
 MD5 dfd6ea62f7a18c13729d8c240f7692af vixie-cron-4.1-r1.ebuild 2062
-MD5 8692002451e69ee31d667eb2d0dc904d files/vixie-cron-4.1-cron.deny 220
-MD5 90b7dda2ca0ecdd2f4dcd9764eaa2358 files/crontab-3.0.1-r4 617
-MD5 f9c762005dc744193babe199ba3fb297 files/crontab 604
-MD5 de84c3326555349db053b4aa13c0805f files/crontab.5.diff 772
-MD5 5eab102dfecfc35810ab8cf50f95d0d3 files/cron.pam.d 123
-MD5 620b10c2982aed3071acd92d52e76d8e files/vixie-cron-4.1-pam.patch 1714
+MD5 141bf296f623dc44f4bfa4d856dc21fa vixie-cron-3.0.1-r1.ebuild 1502
+MD5 3071aa570a1d805760cfad412b01f39a vixie-cron-4.1-r2.ebuild 2608
+MD5 0fcc78652b11c683f3fe76d614934379 metadata.xml 288
 MD5 4c35adb745265e3008fe1999d6a18952 files/vixie-cron-4.1-selinux.diff 3557
-MD5 2790891d7be3833a500e5af547546b0d files/vixie-cron.rc6 526
+MD5 90b7dda2ca0ecdd2f4dcd9764eaa2358 files/crontab-3.0.1-r4 617
+MD5 1915f29deae7e87c569877f1dbbbec67 files/vixie-cron-3.0.1-selinux.diff.bz2 1853
+MD5 041d9eec86f3869f6613b876ada841a1 files/digest-vixie-cron-3.0.1-r5 144
 MD5 9d66b761d15afae9471d33509b712fe9 files/vixie-cron-3.0.1-close_stdin.diff 810
-MD5 041d9eec86f3869f6613b876ada841a1 files/digest-vixie-cron-3.0.1-r1 144
-MD5 041d9eec86f3869f6613b876ada841a1 files/digest-vixie-cron-3.0.1-r3 144
+MD5 f9c762005dc744193babe199ba3fb297 files/crontab 604
 MD5 041d9eec86f3869f6613b876ada841a1 files/digest-vixie-cron-3.0.1-r4 144
-MD5 041d9eec86f3869f6613b876ada841a1 files/digest-vixie-cron-3.0.1-r5 144
+MD5 041d9eec86f3869f6613b876ada841a1 files/digest-vixie-cron-3.0.1-r1 144
+MD5 f1c3dce98a19679e79606650336e6aca files/vixie-cron-4.1-commandline.patch 360
+MD5 de8a7ebb15e58d9c6496378ff64c5137 files/digest-vixie-cron-4.1-r2 143
 MD5 cec7bf697ed66fa43aedb973b2ad5362 files/vixie-cron-3.0.1-pam.patch 1854
+MD5 620b10c2982aed3071acd92d52e76d8e files/vixie-cron-4.1-pam.patch 1714
 MD5 de8a7ebb15e58d9c6496378ff64c5137 files/digest-vixie-cron-4.1-r1 143
-MD5 1915f29deae7e87c569877f1dbbbec67 files/vixie-cron-3.0.1-selinux.diff.bz2 1853
+MD5 2790891d7be3833a500e5af547546b0d files/vixie-cron.rc6 526
+MD5 de84c3326555349db053b4aa13c0805f files/crontab.5.diff 772
+MD5 5eab102dfecfc35810ab8cf50f95d0d3 files/cron.pam.d 123
+MD5 8692002451e69ee31d667eb2d0dc904d files/vixie-cron-4.1-cron.deny 220
+MD5 041d9eec86f3869f6613b876ada841a1 files/digest-vixie-cron-3.0.1-r3 144
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.2.4 (GNU/Linux)
 
-iD8DBQFBZVyAEZCkKN40op4RAnZgAJ9r4P9npScEQtn5+zIHLQjWHBG0+ACZAfOT
-rbRoKqZIkJcB789er1Bc5DA=
-=RMGz
+iD8DBQFBZrO9LLFUmVNQ7rkRAv08AJ9qhJBZEs6APqmUCX4tYlFKQ6wJOQCgonfs
+zC7f6eu4zPX/JPhrFswuMB0=
+=R9B1
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/vixie-cron/files/digest-vixie-cron-4.1-r2 b/sys-apps/vixie-cron/files/digest-vixie-cron-4.1-r2
new file mode 100644
index 000000000000..44721524e50e
--- /dev/null
+++ b/sys-apps/vixie-cron/files/digest-vixie-cron-4.1-r2
@@ -0,0 +1,2 @@
+MD5 09dc04f9879684d27c64c910174a9536 vixie-cron-4.1.tar.bz2 54246
+MD5 6629da19f6ddd41288d41894a0f663ed vixie-cron-4.1-gentoo-r1.patch.bz2 3782
diff --git a/sys-apps/vixie-cron/files/vixie-cron-4.1-commandline.patch b/sys-apps/vixie-cron/files/vixie-cron-4.1-commandline.patch
new file mode 100644
index 000000000000..15133c7e0f8f
--- /dev/null
+++ b/sys-apps/vixie-cron/files/vixie-cron-4.1-commandline.patch
@@ -0,0 +1,12 @@
+--- entry.c	2004-08-27 20:09:34.000000000 +0200
++++ /root/entry.c	2004-09-26 14:41:46.929137000 +0200
+@@ -336,7 +336,8 @@
+ 
+ 	/* If the first character of the command is '-' it is a cron option.
+ 	 */
+-	while ((ch = get_char(file)) == '-') {
++	ch = get_char(file);
++	while (ch == '-') {
+ 		switch (ch = get_char(file)) {
+ 		case 'q':
+ 			e->flags |= DONT_LOG;
diff --git a/sys-apps/vixie-cron/vixie-cron-4.1-r2.ebuild b/sys-apps/vixie-cron/vixie-cron-4.1-r2.ebuild
new file mode 100644
index 000000000000..f777da39469d
--- /dev/null
+++ b/sys-apps/vixie-cron/vixie-cron-4.1-r2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/vixie-cron/vixie-cron-4.1-r2.ebuild,v 1.1 2004/10/08 15:39:33 ciaranm Exp $
+
+inherit eutils flag-o-matic
+
+# no useful homepage, bug #65898
+HOMEPAGE="ftp://ftp.isc.org/isc/cron/"
+DESCRIPTION="Paul Vixie's cron daemon, a fully featured crond implementation"
+
+SELINUX_PATCH="${P}-selinux.diff"
+GENTOO_PATCH_REV="r1"
+
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	mirror://gentoo/${P}-gentoo-${GENTOO_PATCH_REV}.patch.bz2"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~ia64 ~amd64 ~ppc64"
+IUSE="selinux pam"
+
+DEPEND=">=sys-apps/portage-2.0.47-r10
+	>=sys-apps/sed-4.0.5
+	selinux? ( sys-libs/libselinux )
+	pam? ( sys-libs/pam )"
+
+RDEPEND="!virtual/cron
+	>=sys-apps/cronbase-0.2.1-r3
+	 virtual/mta
+	 selinux? ( sys-libs/libselinux )
+	 pam? ( sys-libs/pam )"
+
+PROVIDE="virtual/cron"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	epatch ${WORKDIR}/${P}-gentoo-${GENTOO_PATCH_REV}.patch
+	epatch ${FILESDIR}/crontab.5.diff
+	epatch ${FILESDIR}/${P}-commandline.patch
+
+	use pam && epatch ${FILESDIR}/${P}-pam.patch
+	use selinux && epatch ${FILESDIR}/${SELINUX_PATCH}
+}
+
+src_compile() {
+	# we need to tinker with ldflags since we're installing as setuid. see
+	# "[gentoo-core] Heads up changes in suid handing with portage >=51_pre21"
+	# for details. Note that we do the sed fixes here rather than in unpack so
+	# that our changes to LDFLAGS are picked up.
+
+	append-ldflags -Wl,-z,now
+	sed -i "s:gcc \(-Wall.*\):${CC:-gcc} \1 ${CFLAGS}:" Makefile
+	sed -i "s:^\(LDFLAGS[ \t]\+=\).*:\1 ${LDFLAGS}:" Makefile
+
+	emake || die
+}
+
+src_install() {
+	# this does not work if the directory exists already
+	diropts -m0750 -o root -g cron
+	dodir /var/spool/cron/crontabs
+	keepdir /var/spool/cron/crontabs/
+
+	doman crontab.1 crontab.5 cron.8
+
+	dodoc CHANGES CONVERSION FEATURES MAIL README THANKS
+
+	diropts -m0755 ; dodir /etc/cron.d
+	keepdir /etc/cron.d/
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/vixie-cron.rc6 vixie-cron
+
+	insinto /etc
+	insopts -o root -g root -m 0644
+	newins  ${FILESDIR}/crontab-3.0.1-r4 crontab
+	newins ${FILESDIR}/${P}-cron.deny cron.deny
+
+	dodoc ${FILESDIR}/crontab
+
+	insinto /usr/sbin
+	insopts -o root -g root -m 0750 ; doins cron
+
+	insinto /usr/bin
+	insopts -o root -g cron -m 4750 ; doins crontab
+
+	if use pam ; then
+		insinto /etc/pam.d
+		newins ${FILESDIR}/cron.pam.d cron
+	fi
+}
+
+pkg_postinst() {
+	if [ -f ${ROOT}/etc/init.d/vcron ]
+	then
+		ewarn "Please run:"
+		ewarn "rc-update del vcron"
+		ewarn "rc-update add vixie-cron default"
+	fi
+}