Bump to version 4.1, package.masked for now. I've probably screwed up porting some of the patches forward, and I can't test the selinux patch at all. Feedback to bug #61961.

6 files changed, 193 insertions, 17 deletions

diff --git a/sys-apps/vixie-cron/ChangeLog b/sys-apps/vixie-cron/ChangeLog
index d401b2f88d01..a7fe1a83347f 100644
--- a/sys-apps/vixie-cron/ChangeLog
+++ b/sys-apps/vixie-cron/ChangeLog
@@ -1,6 +1,15 @@
 # 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.21 2004/08/27 05:05:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/vixie-cron/ChangeLog,v 1.22 2004/08/27 22:38:53 ciaranm Exp $
+
+*vixie-cron-4.1 (27 Aug 2004)
+
+  27 Aug 2004; Ciaran McCreesh <ciaranm@gentoo.org>
+  +files/vixie-cron-4.1-pam.patch, +files/vixie-cron-4.1-selinux.diff.bz2,
+  +vixie-cron-4.1.ebuild:
+  Bump to version 4.1, package.masked for now. I've probably screwed up porting
+  some of the patches forward, and I can't test the selinux patch at all.
+  Feedback to bug #61961.
 
   27 Aug 2004; Mike Frysinger <vapier@gentoo.org> files/vixie-cron.rc6:
   Dont need logger, use logger #57787 by Paul Varner.
diff --git a/sys-apps/vixie-cron/Manifest b/sys-apps/vixie-cron/Manifest
index 6c2dcbe59de5..bafeeb0f223a 100644
--- a/sys-apps/vixie-cron/Manifest
+++ b/sys-apps/vixie-cron/Manifest
@@ -1,28 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 5ea0fa84d3b5130882b0fb0f20565cea ChangeLog 6762
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 d10023b4b9a77bfed92e4f98710a0a90 ChangeLog 7128
 MD5 141bf296f623dc44f4bfa4d856dc21fa vixie-cron-3.0.1-r1.ebuild 1502
-MD5 dd33c1120b51b3d049054c798c20d5fa vixie-cron-3.0.1-r3.ebuild 1748
-MD5 9b1abcc74121e11f8f1224a43eea3577 vixie-cron-3.0.1-r4.ebuild 1853
 MD5 24476402c35e5f41a226a179e629a6f5 vixie-cron-3.0.1-r5.ebuild 2036
-MD5 5eab102dfecfc35810ab8cf50f95d0d3 files/cron.pam.d 123
-MD5 f9c762005dc744193babe199ba3fb297 files/crontab 604
-MD5 90b7dda2ca0ecdd2f4dcd9764eaa2358 files/crontab-3.0.1-r4 617
+MD5 9b1abcc74121e11f8f1224a43eea3577 vixie-cron-3.0.1-r4.ebuild 1853
+MD5 c50e5ccbfaa68944eed1fa2e9a158e39 vixie-cron-4.1.ebuild 2014
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 dd33c1120b51b3d049054c798c20d5fa vixie-cron-3.0.1-r3.ebuild 1748
 MD5 041d9eec86f3869f6613b876ada841a1 files/digest-vixie-cron-3.0.1-r1 144
+MD5 620b10c2982aed3071acd92d52e76d8e files/vixie-cron-4.1-pam.patch 1714
+MD5 b7bb9c09c189426ce50e45673324a2f7 files/digest-vixie-cron-4.1 140
+MD5 041d9eec86f3869f6613b876ada841a1 files/digest-vixie-cron-3.0.1-r5 144
+MD5 2790891d7be3833a500e5af547546b0d files/vixie-cron.rc6 526
+MD5 1915f29deae7e87c569877f1dbbbec67 files/vixie-cron-3.0.1-selinux.diff.bz2 1853
+MD5 de84c3326555349db053b4aa13c0805f files/crontab.5.diff 772
 MD5 041d9eec86f3869f6613b876ada841a1 files/digest-vixie-cron-3.0.1-r3 144
-MD5 041d9eec86f3869f6613b876ada841a1 files/digest-vixie-cron-3.0.1-r4 144
+MD5 5eab102dfecfc35810ab8cf50f95d0d3 files/cron.pam.d 123
 MD5 9d66b761d15afae9471d33509b712fe9 files/vixie-cron-3.0.1-close_stdin.diff 810
+MD5 d761c119dd9d5273737a1f0b7714be01 files/vixie-cron-4.1-selinux.diff.bz2 1739
+MD5 041d9eec86f3869f6613b876ada841a1 files/digest-vixie-cron-3.0.1-r4 144
 MD5 cec7bf697ed66fa43aedb973b2ad5362 files/vixie-cron-3.0.1-pam.patch 1854
-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 041d9eec86f3869f6613b876ada841a1 files/digest-vixie-cron-3.0.1-r5 144
+MD5 90b7dda2ca0ecdd2f4dcd9764eaa2358 files/crontab-3.0.1-r4 617
+MD5 f9c762005dc744193babe199ba3fb297 files/crontab 604
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
+Version: GnuPG v1.2.4 (GNU/Linux)
 
-iD8DBQFBLsEDHTu7gpaalycRAhBvAJ9WpLwiQAZyu+52pojwbaeA+6ODPACgzPpE
-NmzdxDbDcGyPK0K1aOXSSvI=
-=gx+u
+iD8DBQFBL7dXLLFUmVNQ7rkRApkPAKDUfgubgEPGoWTLz9lGMYTSF5iiggCdGCYV
+UMobKDCuftiG9HuKciDjR+Y=
+=dEdS
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/vixie-cron/files/digest-vixie-cron-4.1 b/sys-apps/vixie-cron/files/digest-vixie-cron-4.1
new file mode 100644
index 000000000000..49bfe5227c5f
--- /dev/null
+++ b/sys-apps/vixie-cron/files/digest-vixie-cron-4.1
@@ -0,0 +1,2 @@
+MD5 09dc04f9879684d27c64c910174a9536 vixie-cron-4.1.tar.bz2 54246
+MD5 b9354b9ac3d755e10151f36131cba133 vixie-cron-4.1-gentoo.patch.bz2 3791
diff --git a/sys-apps/vixie-cron/files/vixie-cron-4.1-pam.patch b/sys-apps/vixie-cron/files/vixie-cron-4.1-pam.patch
new file mode 100644
index 000000000000..64bf67138e70
--- /dev/null
+++ b/sys-apps/vixie-cron/files/vixie-cron-4.1-pam.patch
@@ -0,0 +1,67 @@
+--- vixie-cron-3.0.1.orig/Makefile	Thu May 30 19:47:00 2002
++++ vixie-cron-3.0.1/Makefile	Thu May 30 20:54:46 2002
+@@ -55,7 +55,7 @@
+ INCLUDE		=	-I.
+ #INCLUDE	=
+ #<<need getopt()>>
+-LIBS		=
++LIBS		=	-lpam
+ #<<optimize or debug?>>
+ OPTIM		=	$(RPM_OPT_FLAGS)
+ #OPTIM		=	-g
+--- vixie-cron-3.0.1.orig/do_command.c	Thu May 30 19:47:00 2002
++++ vixie-cron-3.0.1/do_command.c	Thu May 30 20:55:50 2002
+@@ -25,6 +25,18 @@
+ 
+ #include "cron.h"
+ 
++#include <security/pam_appl.h>
++static pam_handle_t *pamh = NULL;
++static const struct pam_conv conv = {
++	NULL
++};
++#define PAM_FAIL_CHECK if (retcode != PAM_SUCCESS) { \
++	fprintf(stderr,"\n%s\n",pam_strerror(pamh, retcode)); \
++	syslog(LOG_ERR,"%s",pam_strerror(pamh, retcode)); \
++	pam_end(pamh, retcode); exit(1); \
++	}
++
++
+ static void		child_process(entry *, user *);
+ static int		safe_p(const char *, const char *);
+
+@@ -65,6 +77,7 @@
+ 	int stdin_pipe[2], stdout_pipe[2];
+ 	char *input_data, *usernm, *mailto;
+ 	int children = 0;
++	int retcode = 0;
+ 
+ 	Debug(DPROC, ("[%ld] child_process('%s')\n", (long)getpid(), e->cmd))
+ 
+@@ -134,6 +147,16 @@
+ 		*p = '\0';
+ 	}
+ 
++ 
++	retcode = pam_start("cron", usernm, &conv, &pamh);
++	PAM_FAIL_CHECK;
++	retcode = pam_acct_mgmt(pamh, PAM_SILENT);
++	PAM_FAIL_CHECK;
++	retcode = pam_open_session(pamh, PAM_SILENT);
++	PAM_FAIL_CHECK;
++	retcode = pam_setcred(pamh, PAM_ESTABLISH_CRED | PAM_SILENT);
++	PAM_FAIL_CHECK;
++
+ 	/* fork again, this time so we can exec the user's command.
+ 	 */
+ 	switch (vfork()) {
+@@ -507,6 +530,9 @@
+ 			Debug(DPROC, (", dumped core"))
+ 		Debug(DPROC, ("\n"))
+ 	}
++	pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT);
++	retcode = pam_close_session(pamh, PAM_SILENT);
++	pam_end(pamh, retcode);
+ }
+ 
+ static int
diff --git a/sys-apps/vixie-cron/files/vixie-cron-4.1-selinux.diff.bz2 b/sys-apps/vixie-cron/files/vixie-cron-4.1-selinux.diff.bz2
new file mode 100644
index 000000000000..e20640730097
--- /dev/null
+++ b/sys-apps/vixie-cron/files/vixie-cron-4.1-selinux.diff.bz2
diff --git a/sys-apps/vixie-cron/vixie-cron-4.1.ebuild b/sys-apps/vixie-cron/vixie-cron-4.1.ebuild
new file mode 100644
index 000000000000..dd0e9d3faf66
--- /dev/null
+++ b/sys-apps/vixie-cron/vixie-cron-4.1.ebuild
@@ -0,0 +1,94 @@
+# 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.ebuild,v 1.1 2004/08/27 22:38:53 ciaranm Exp $
+
+inherit eutils
+
+IUSE="selinux pam"
+
+SELINUX_PATCH="${P}-selinux.diff.bz2"
+
+DESCRIPTION="The Vixie cron daemon"
+HOMEPAGE="http://www.vix.com/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	mirror://gentoo/${P}-gentoo.patch.bz2"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~ia64 ~amd64 ~ppc64"
+
+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.patch
+	epatch ${FILESDIR}/crontab.5.diff
+
+	use pam && epatch ${FILESDIR}/${P}-pam.patch
+	use selinux && epatch ${FILESDIR}/${SELINUX_PATCH}
+
+	sed -i "s:gcc \(-Wall.*\):${CC:-gcc} \1 ${CFLAGS}:" Makefile
+}
+
+src_compile() {
+	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 MANIFEST 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
+
+	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
+}