All versions now respect LDFLAGS, which leads to all versions now appending -Wl,-z,now for the setuid QA notice. Removed duplicate patches. Added missing sample config for 2.9.5. Also, updated metadata to reflect new cron herd.

11 files changed, 106 insertions, 89 deletions

diff --git a/sys-apps/fcron/ChangeLog b/sys-apps/fcron/ChangeLog
index 440676c89cdc..a7a9a04953e7 100644
--- a/sys-apps/fcron/ChangeLog
+++ b/sys-apps/fcron/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-apps/fcron
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/fcron/ChangeLog,v 1.30 2004/10/09 07:53:50 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fcron/ChangeLog,v 1.31 2004/10/11 14:19:17 ka0ttic Exp $
+
+  11 Oct 2004; Aaron Walker <ka0ttic@gentoo.org> metadata.xml,
+  -files/2.9.4-braindead-configure-check.patch,
+  +files/fcron-2.0.0-configure.diff, -files/fcron-2.0.0-gentoo.diff,
+  -files/fcron-2.9.5-configure.diff, +files/fcron.conf-2.9.5,
+  fcron-2.0.0-r4.ebuild, fcron-2.0.1.ebuild, fcron-2.9.4.ebuild,
+  fcron-2.9.5.ebuild:
+  All versions now respect LDFLAGS, which leads to all versions now appending
+  -Wl,-z,now for the setuid QA notice. Removed duplicate patches. Added missing
+  sample config for 2.9.5. Also, updated metadata to reflect new cron herd.
 
 *fcron-2.9.5 (09 Oct 2004)
 
diff --git a/sys-apps/fcron/Manifest b/sys-apps/fcron/Manifest
index 9e63a30c29f8..0e546dbaac07 100644
--- a/sys-apps/fcron/Manifest
+++ b/sys-apps/fcron/Manifest
@@ -1,23 +1,22 @@
-MD5 f1473e29d6627b7440ebe83124ff3512 fcron-2.0.0-r4.ebuild 2134
-MD5 65f2376d0c7376a23e37396fb3bdfdaf fcron-2.0.1.ebuild 2149
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 1d2217d4cb545987ea3729bdfbfa34a7 fcron-2.9.5.ebuild 2784
-MD5 020a8397134cfcfbc8057d5060e607cb fcron-2.9.4.ebuild 2869
-MD5 82d970b15c6050280074c2b973f001aa ChangeLog 4273
-MD5 618ee227782ad9a3939c89e932eb2d2e files/fcron.pam 296
-MD5 f659349d3f24fa1b57684af8f495efe6 files/fcrontab.pam 506
-MD5 f5fbd4d1733d97b08034756b0e9bf3c2 files/fcron-2.0.0-gentoo.diff 492
-MD5 2d4d092f7a76917183b5d8086d871e67 files/fcron.allow 375
-MD5 7e9a6dd8e9a4e482d7b6bf33d1f9881b files/fcron.conf 747
-MD5 068bd306e10da92d3c159ee12be338bb files/digest-fcron-2.9.4 67
-MD5 4ca5f2b70a7519c6390c5b23c9d058b4 files/digest-fcron-2.0.0-r4 67
-MD5 fdf5c18f2b46001e9a6c1bf561e49676 files/digest-fcron-2.0.1 67
+MD5 ed773dd00f7c13e19c1ae50389d811d7 fcron-2.0.1.ebuild 2408
+MD5 854e85b63478c454aac8efb1e8343938 fcron-2.9.4.ebuild 2957
+MD5 0eb672cbf8046e3ac98e6af0aad0b7bc fcron-2.0.0-r4.ebuild 2393
+MD5 be94e59c2e71f41108d7ee7849229a28 fcron-2.9.5.ebuild 2894
+MD5 1802b5c0d0f39dbd9c900d7797e8da9d ChangeLog 4837
+MD5 9c8fdf815ce980c230d763b496d4d088 metadata.xml 158
+MD5 8331ba4de4f67517afa3af7c269bab22 files/fcron.conf-2.9.4 681
+MD5 8331ba4de4f67517afa3af7c269bab22 files/fcron.conf-2.9.5 681
 MD5 52572ff759db2d68e16f8cbc46fc6cd9 files/crontab 833
-MD5 54d34efc5c1c41481d4605e38ddba3a8 files/fcron.rc6 705
+MD5 7e9a6dd8e9a4e482d7b6bf33d1f9881b files/fcron.conf 747
 MD5 d450e99144dc943526cd370c2b3a87e1 files/fcron.deny 377
+MD5 fdf5c18f2b46001e9a6c1bf561e49676 files/digest-fcron-2.0.1 67
+MD5 068bd306e10da92d3c159ee12be338bb files/digest-fcron-2.9.4 67
 MD5 36ac9fab5fd89ba7f8f9a1900d5562fc files/digest-fcron-2.9.5 67
-MD5 f74287027182d448b6022db116d87d24 files/2.9.4-braindead-configure-check.patch 366
-MD5 f74287027182d448b6022db116d87d24 files/fcron-2.9.5-configure.diff 366
 MD5 b53d17ddba7360bc230a94a0537b4395 files/fcron-2.0.0-gcc34.diff 251
+MD5 618ee227782ad9a3939c89e932eb2d2e files/fcron.pam 296
+MD5 54d34efc5c1c41481d4605e38ddba3a8 files/fcron.rc6 705
+MD5 bebebfe6bc1ce39b1703b624f2be567e files/fcron-2.0.0-configure.diff 390
+MD5 2d4d092f7a76917183b5d8086d871e67 files/fcron.allow 375
+MD5 f659349d3f24fa1b57684af8f495efe6 files/fcrontab.pam 506
 MD5 d69c448b972f28fe669f2d70b7bf4c5b files/fcron-2.9.4-selinuxupdate.diff 6902
-MD5 8331ba4de4f67517afa3af7c269bab22 files/fcron.conf-2.9.4 681
+MD5 4ca5f2b70a7519c6390c5b23c9d058b4 files/digest-fcron-2.0.0-r4 67
diff --git a/sys-apps/fcron/fcron-2.0.0-r4.ebuild b/sys-apps/fcron/fcron-2.0.0-r4.ebuild
index 0c32b23238e0..f1dfaa23aeb2 100644
--- a/sys-apps/fcron/fcron-2.0.0-r4.ebuild
+++ b/sys-apps/fcron/fcron-2.0.0-r4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/fcron/fcron-2.0.0-r4.ebuild,v 1.7 2004/09/04 21:31:29 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fcron/fcron-2.0.0-r4.ebuild,v 1.8 2004/10/11 14:19:17 ka0ttic Exp $
 
-inherit eutils
+inherit eutils flag-o-matic
 
 DESCRIPTION="A command scheduler with extended capabilities over cron and anacron"
 HOMEPAGE="http://fcron.free.fr/"
@@ -22,14 +22,20 @@ PROVIDE="virtual/cron"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.diff
+	epatch ${FILESDIR}/${P}-configure.diff
 	epatch ${FILESDIR}/${P}-gcc34.diff
 	# fix LIBOBJS vs AC_LIBOBJ problem
 	sed -i -e 's|LIBOBJS|AC_LIBOBJ|g' configure.in
+	# respect LDFLAGS
+	sed -i "s:\(@LIBS@\):\$(LDFLAGS) \1:" Makefile.in || die "sed failed"
 	autoconf || die "autoconf problem"
 }
 
 src_compile() {
+	# QA security notice fix; see "[gentoo-core] Heads up changes in suid
+	# handing with portage >=51_pre21" for more details.
+	append-ldflags -Wl,-z,now
+
 	econf \
 		--with-username=cron \
 		--with-groupname=cron \
diff --git a/sys-apps/fcron/fcron-2.0.1.ebuild b/sys-apps/fcron/fcron-2.0.1.ebuild
index 4d98042027f8..e3c8b2366d38 100644
--- a/sys-apps/fcron/fcron-2.0.1.ebuild
+++ b/sys-apps/fcron/fcron-2.0.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/fcron/fcron-2.0.1.ebuild,v 1.1 2004/10/09 07:53:50 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fcron/fcron-2.0.1.ebuild,v 1.2 2004/10/11 14:19:17 ka0ttic Exp $
 
-inherit eutils
+inherit eutils flag-o-matic
 
 DESCRIPTION="A command scheduler with extended capabilities over cron and anacron"
 HOMEPAGE="http://fcron.free.fr/"
@@ -22,14 +22,20 @@ PROVIDE="virtual/cron"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${PN}-2.0.0-gentoo.diff
+	epatch ${FILESDIR}/${PN}-2.0.0-configure.diff
 	epatch ${FILESDIR}/${PN}-2.0.0-gcc34.diff
 	# fix LIBOBJS vs AC_LIBOBJ problem
 	sed -i -e 's|LIBOBJS|AC_LIBOBJ|g' configure.in
+	# respect LDFLAGS
+	sed -i "s:\(@LIBS@\):\$(LDFLAGS) \1:" Makefile.in || die "sed failed"
 	autoconf || die "autoconf problem"
 }
 
 src_compile() {
+	# QA security notice fix; see "[gentoo-core] Heads up changes in suid
+	# handing with portage >=51_pre21" for more details.
+	append-ldflags -Wl,-z,now
+
 	econf \
 		--with-username=cron \
 		--with-groupname=cron \
diff --git a/sys-apps/fcron/fcron-2.9.4.ebuild b/sys-apps/fcron/fcron-2.9.4.ebuild
index f6d0d826f0f4..257fd1bc2307 100644
--- a/sys-apps/fcron/fcron-2.9.4.ebuild
+++ b/sys-apps/fcron/fcron-2.9.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/fcron/fcron-2.9.4.ebuild,v 1.4 2004/09/03 21:03:23 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fcron/fcron-2.9.4.ebuild,v 1.5 2004/10/11 14:19:17 ka0ttic Exp $
 
-inherit eutils
+inherit eutils flag-o-matic
 
 DESCRIPTION="A command scheduler with extended capabilities over cron and anacron"
 HOMEPAGE="http://fcron.free.fr/"
@@ -25,21 +25,28 @@ PROVIDE="virtual/cron"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${PV}-braindead-configure-check.patch
-	use selinux && epatch ${FILESDIR}/fcron-2.9.4-selinuxupdate.diff
+
+	epatch ${FILESDIR}/${PN}-2.0.0-configure.diff
+	use selinux && epatch ${FILESDIR}/${P}-selinuxupdate.diff
+
+	# respect LDFLAGS
+	sed -i "s:\(@LIBS@\):\$(LDFLAGS) \1:" Makefile.in || die "sed failed"
+
 	autoconf || die "autoconf failed"
 }
 
 src_compile() {
 	local myconf=
-	use pam \
-		&& myconf="${myconf} --with-pam=yes" \
-		|| myconf="${myconf} --with-pam=no"
-	use doc && myconf="${myconf} --with-dsssl-dir=/usr/share/sgml/stylesheets/dsssl/docbook"
-	use selinux \
-		&& myconf="${myconf} --with-selinux=yes" \
-		|| myconf="${myconf} --with-selinux=no"
+	use doc && \
+		myconf="--with-dsssl-dir=/usr/share/sgml/stylesheets/dsssl/docbook"
+
+	# QA security notice fix; see "[gentoo-core] Heads up changes in suid
+	# handing with portage >=51_pre21" for more details.
+	append-ldflags -Wl,-z,now
+
 	econf \
+		$(use_with pam) \
+		$(use_with selinux) \
 		--with-username=cron \
 		--with-groupname=cron \
 		--with-piddir=/var/run \
diff --git a/sys-apps/fcron/fcron-2.9.5.ebuild b/sys-apps/fcron/fcron-2.9.5.ebuild
index b3bbe647bdb4..d3c0650c9bae 100644
--- a/sys-apps/fcron/fcron-2.9.5.ebuild
+++ b/sys-apps/fcron/fcron-2.9.5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/fcron/fcron-2.9.5.ebuild,v 1.1 2004/10/09 07:53:50 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fcron/fcron-2.9.5.ebuild,v 1.2 2004/10/11 14:19:17 ka0ttic Exp $
 
-inherit eutils
+inherit eutils flag-o-matic
 
 DESCRIPTION="A command scheduler with extended capabilities over cron and anacron"
 HOMEPAGE="http://fcron.free.fr/"
@@ -25,20 +25,24 @@ PROVIDE="virtual/cron"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${P}-configure.diff
+	epatch ${FILESDIR}/${PN}-2.0.0-configure.diff
+	# respect LDFLAGS
+	sed -i "s:\(@LIBS@\):\$(LDFLAGS) \1:" Makefile.in || die "sed failed"
 	autoconf || die "autoconf failed"
 }
 
 src_compile() {
 	local myconf=
-	use pam \
-		&& myconf="${myconf} --with-pam=yes" \
-		|| myconf="${myconf} --with-pam=no"
-	use doc && myconf="${myconf} --with-dsssl-dir=/usr/share/sgml/stylesheets/dsssl/docbook"
-	use selinux \
-		&& myconf="${myconf} --with-selinux=yes" \
-		|| myconf="${myconf} --with-selinux=no"
+	use doc && \
+		myconf="--with-dsssl-dir=/usr/share/sgml/stylesheets/dsssl/docbook"
+
+	# QA security notice fix; see "[gentoo-core] Heads up changes in suid
+	# handing with portage >=51_pre21" for more details.
+	append-ldflags -Wl,-z,now
+
 	econf \
+		$(use_with pam) \
+		$(use_with selinux) \
 		--with-username=cron \
 		--with-groupname=cron \
 		--with-piddir=/var/run \
diff --git a/sys-apps/fcron/files/2.9.4-braindead-configure-check.patch b/sys-apps/fcron/files/fcron-2.0.0-configure.diff
index f12273022f72..096bc1a4ab30 100644
--- a/sys-apps/fcron/files/2.9.4-braindead-configure-check.patch
+++ b/sys-apps/fcron/files/fcron-2.0.0-configure.diff
@@ -1,12 +1,12 @@
---- configure.in.orig	2004-04-18 18:14:37.944027760 -0400
-+++ configure.in	2004-04-18 18:14:57.447062848 -0400
-@@ -254,13 +254,8 @@
+--- fcron-2.0.0.orig/configure.in	2004-10-11 08:37:50.840101374 -0400
++++ fcron-2.0.0/configure.in	2004-10-11 09:47:14.310439574 -0400
+@@ -202,13 +202,7 @@
      fi
      ;;
    *)
 -    if test -d "$withval"; then
        etcdir="$withval"
-       AC_MSG_RESULT($withval)
+-      AC_MSG_RESULT($withval)
 -    else
 -      AC_MSG_ERROR([
 -Directory $withval does not exist])
diff --git a/sys-apps/fcron/files/fcron-2.0.0-gentoo.diff b/sys-apps/fcron/files/fcron-2.0.0-gentoo.diff
deleted file mode 100644
index aa6c0362f6e1..000000000000
--- a/sys-apps/fcron/files/fcron-2.0.0-gentoo.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- configure.in.orig	Sun Jul  8 07:32:17 2001
-+++ configure.in	Sat Aug 25 14:36:05 2001
-@@ -201,13 +201,13 @@
-     fi
-     ;;
-   *)
--    if test -d "$withval"; then
-+#    if test -d "$withval"; then
-       etcdir="$withval"
--      AC_MSG_RESULT($withval)
--    else
--      AC_MSG_ERROR([
--Directory $withval does not exist])
--    fi
-+#      AC_MSG_RESULT($withval)
-+#    else
-+#      AC_MSG_ERROR([
-+#Directory $withval does not exist])
-+#    fi
-     ;;
-   esac ],
-   if test -d "/etc"; then
diff --git a/sys-apps/fcron/files/fcron-2.9.5-configure.diff b/sys-apps/fcron/files/fcron-2.9.5-configure.diff
deleted file mode 100644
index f12273022f72..000000000000
--- a/sys-apps/fcron/files/fcron-2.9.5-configure.diff
+++ /dev/null
@@ -1,16 +0,0 @@
---- configure.in.orig	2004-04-18 18:14:37.944027760 -0400
-+++ configure.in	2004-04-18 18:14:57.447062848 -0400
-@@ -254,13 +254,8 @@
-     fi
-     ;;
-   *)
--    if test -d "$withval"; then
-       etcdir="$withval"
-       AC_MSG_RESULT($withval)
--    else
--      AC_MSG_ERROR([
--Directory $withval does not exist])
--    fi
-     ;;
-   esac ],
-   if test -d "/etc"; then
diff --git a/sys-apps/fcron/files/fcron.conf-2.9.5 b/sys-apps/fcron/files/fcron.conf-2.9.5
new file mode 100644
index 000000000000..24bb86a81b48
--- /dev/null
+++ b/sys-apps/fcron/files/fcron.conf-2.9.5
@@ -0,0 +1,23 @@
+# fcron.conf - Configuration file for fcron(8) and fcrontab(1).
+#	See fcron.conf(5) for syntax and explanations.
+#
+# WARNING : this file must be owned by root:cron and 640.
+#
+
+# The spool directory where fcron stores its files
+fcrontabs	=	/var/spool/cron/fcrontabs
+
+# The locations of the pid file and the fifo file
+pidfile		=	/var/run/fcron.pid
+fifofile	=	/var/run/fcron.fifo
+
+# allow/deny files to determine which users are allowed to use fcrontab
+fcronallow	=	/etc/fcron/fcron.allow
+fcrondeny	=	/etc/fcron/fcron.deny
+
+# Location of the programs used by fcron
+shell		=	/bin/sh
+sendmail	=	/usr/sbin/sendmail
+
+# Location of the default editor for "fcrontab -e"
+editor		=	/bin/nano
diff --git a/sys-apps/fcron/metadata.xml b/sys-apps/fcron/metadata.xml
index 96a2d586367d..3f399e92bcff 100644
--- a/sys-apps/fcron/metadata.xml
+++ b/sys-apps/fcron/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+	<herd>cron</herd>
 </pkgmetadata>