# 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.38 2004/11/17 00:49:52 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fcron/ChangeLog,v 1.39 2004/11/17 13:46:24 ka0ttic Exp $
+
+ 17 Nov 2004; Aaron Walker <ka0ttic@gentoo.org>
+ -files/fcron-2.0.0-gcc34.diff, -files/fcron-2.9.4-selinuxupdate.diff,
+ -files/fcron.conf-2.9.4, -files/fcron.conf-2.9.5, -fcron-2.0.0-r4.ebuild,
+ -fcron-2.0.1.ebuild, fcron-2.0.2.ebuild, -fcron-2.9.4.ebuild,
+ -fcron-2.9.5.ebuild:
+ Marked 2.0.2 stable on hppa for bug 71311; removed vulnerable versions and
+ respective patches.
16 Nov 2004; Hardave Riar <hardave@gentoo.org> fcron-2.0.2.ebuild:
Stable on mips, bug #71311
-MD5 ac3eeedc9816cd658681bb2b2f4ca32c fcron-2.0.1.ebuild 2408
-MD5 df0ac43022acdd5cded9cdf086312719 fcron-2.9.4.ebuild 2956
-MD5 b5c41f2544257e3bd03989bddab9bea9 fcron-2.0.2.ebuild 2885
-MD5 bf70b2d5bfca86650565d966109dcdab fcron-2.0.0-r4.ebuild 2392
-MD5 ae26f2f2d02d77ea2a5bd83fbc25a57b fcron-2.9.5.ebuild 2895
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 13237002aa9975569ca676327c4d26f4 fcron-2.0.2.ebuild 2884
MD5 62b6f26e119e6050f49e0e1f559c690c fcron-2.9.5.1.ebuild 3281
-MD5 5f511fd279d9de62003f5e112257c2d9 ChangeLog 5901
+MD5 f41a37d6f76c6d24062ce38fb6513dc9 ChangeLog 6285
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 7e9a6dd8e9a4e482d7b6bf33d1f9881b files/fcron.conf 747
MD5 d450e99144dc943526cd370c2b3a87e1 files/fcron.deny 377
-MD5 fdf5c18f2b46001e9a6c1bf561e49676 files/digest-fcron-2.0.1 67
MD5 d18b499ccc7338a352ccc5111a23e224 files/digest-fcron-2.0.2 67
-MD5 068bd306e10da92d3c159ee12be338bb files/digest-fcron-2.9.4 67
-MD5 36ac9fab5fd89ba7f8f9a1900d5562fc files/digest-fcron-2.9.5 67
-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 42d8a93754df65def4a3746bbc68e494 files/digest-fcron-2.9.5.1 69
MD5 583200a8686cf8bdd59e970ad8a55d21 files/fcron.conf-2.9.5.1 800
-MD5 4ca5f2b70a7519c6390c5b23c9d058b4 files/digest-fcron-2.0.0-r4 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBm1Y5EZCkKN40op4RAvqUAKCzzW5fXccMSQYism3mK9S/k2pDgQCglNDc
+6hI5G1YCG/xgbYLZSuc5P18=
+=hvUv
+-----END PGP SIGNATURE-----
+++ /dev/null
-# 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.8 2004/10/11 14:19:17 ka0ttic Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="A command scheduler with extended capabilities over cron and anacron"
-HOMEPAGE="http://fcron.free.fr/"
-SRC_URI="http://fcron.free.fr/archives/${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc mips hppa amd64"
-IUSE=""
-
-DEPEND="virtual/editor"
-RDEPEND="!virtual/cron
- >=sys-apps/cronbase-0.2.1-r3
- virtual/mta"
-PROVIDE="virtual/cron"
-
-src_unpack() {
- unpack ${A}
- cd ${S}
- 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 \
- --with-piddir=/var/run \
- --with-etcdir=/etc/fcron \
- --with-spooldir=/var/spool/cron \
- --with-sendmail=/usr/sbin/sendmail \
- --with-editor="${EDITOR}" \
- --with-cflags="${CFLAGS}" \
- || die "bad ./configure"
-
- emake || die "compile problem"
-}
-
-src_install() {
- insinto /usr/sbin
- insopts -o root -g root -m 0110 ; doins fcron
- insinto /usr/bin
- insopts -o cron -g cron -m 6110 ; doins fcrontab
- insopts -o root -g cron -m 6110 ; doins fcronsighup
-
- dosym fcrontab /usr/bin/crontab
-
- doman doc/*.{1,3,5,8}
-
- dodoc MANIFEST VERSION doc/{CHANGES,README,FAQ,INSTALL,THANKS}
- newdoc ${FILESDIR}/fcron.conf fcron.conf.sample
- docinto html ; dohtml doc/*.html
- dodoc ${FILESDIR}/crontab
-
- insinto /etc/fcron
- insopts -m 640 -o root -g cron
- doins ${FILESDIR}/{fcron.allow,fcron.deny,fcron.conf}
-
- exeinto /etc/init.d
- newexe ${FILESDIR}/fcron.rc6 fcron
-
- dodir /etc
- install -o root -g root -m 0644 ${FILESDIR}/crontab ${D}/etc/crontab
-}
-
-pkg_postinst() {
- # empty dir
- install -m0770 -o cron -g cron -d ${ROOT}/var/spool/cron/fcrontabs
-
- einfo
- einfo "To activate /etc/cron.{hourly|daily|weekly|montly} please run: "
- einfo "crontab /etc/crontab"
- einfo
- einfo "!!! That will replace root's current crontab !!!"
- einfo
-}
+++ /dev/null
-# 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.4 2004/11/13 03:18:49 gustavoz Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="A command scheduler with extended capabilities over cron and anacron"
-HOMEPAGE="http://fcron.free.fr/"
-SRC_URI="http://fcron.free.fr/archives/${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc sparc ~mips ~hppa ~amd64"
-IUSE=""
-
-DEPEND="virtual/editor"
-RDEPEND="!virtual/cron
- >=sys-apps/cronbase-0.2.1-r3
- virtual/mta"
-PROVIDE="virtual/cron"
-
-src_unpack() {
- unpack ${A}
- cd ${S}
- 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 \
- --with-piddir=/var/run \
- --with-etcdir=/etc/fcron \
- --with-spooldir=/var/spool/cron \
- --with-sendmail=/usr/sbin/sendmail \
- --with-editor="${EDITOR}" \
- --with-cflags="${CFLAGS}" \
- || die "bad ./configure"
-
- emake || die "compile problem"
-}
-
-src_install() {
- insinto /usr/sbin
- insopts -o root -g root -m 0110 ; doins fcron
- insinto /usr/bin
- insopts -o cron -g cron -m 6110 ; doins fcrontab
- insopts -o root -g cron -m 6110 ; doins fcronsighup
-
- dosym fcrontab /usr/bin/crontab
-
- doman doc/*.{1,3,5,8}
-
- dodoc MANIFEST VERSION doc/{CHANGES,README,FAQ,INSTALL,THANKS}
- newdoc ${FILESDIR}/fcron.conf fcron.conf.sample
- docinto html ; dohtml doc/*.html
- dodoc ${FILESDIR}/crontab
-
- insinto /etc/fcron
- insopts -m 640 -o root -g cron
- doins ${FILESDIR}/{fcron.allow,fcron.deny,fcron.conf}
-
- exeinto /etc/init.d
- newexe ${FILESDIR}/fcron.rc6 fcron
-
- dodir /etc
- install -o root -g root -m 0644 ${FILESDIR}/crontab ${D}/etc/crontab
-}
-
-pkg_postinst() {
- # empty dir
- install -m0770 -o cron -g cron -d ${ROOT}/var/spool/cron/fcrontabs
-
- einfo
- einfo "To activate /etc/cron.{hourly|daily|weekly|montly} please run: "
- einfo "crontab /etc/crontab"
- einfo
- einfo "!!! That will replace root's current crontab !!!"
- einfo
-}
# 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.2.ebuild,v 1.5 2004/11/17 00:49:52 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fcron/fcron-2.0.2.ebuild,v 1.6 2004/11/17 13:46:24 ka0ttic Exp $
inherit eutils flag-o-matic
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="x86 ppc sparc mips ~hppa amd64"
+KEYWORDS="x86 ppc sparc mips hppa amd64"
IUSE=""
DEPEND="virtual/editor"
+++ /dev/null
-# 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.5 2004/10/11 14:19:17 ka0ttic Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="A command scheduler with extended capabilities over cron and anacron"
-HOMEPAGE="http://fcron.free.fr/"
-SRC_URI="http://fcron.free.fr/archives/${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ppc ~sparc ~mips ~hppa ~amd64"
-IUSE="pam doc selinux"
-
-DEPEND="virtual/editor
- doc? ( >=app-text/docbook-dsssl-stylesheets-1.77 )
- selinux? ( sys-libs/libselinux )
- pam? ( >=sys-libs/pam-0.77 )"
-RDEPEND="!virtual/cron
- >=sys-apps/cronbase-0.2.1-r3
- virtual/mta"
-PROVIDE="virtual/cron"
-
-src_unpack() {
- unpack ${A}
- cd ${S}
-
- 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 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 \
- --with-etcdir=/etc/fcron \
- --with-spooldir=/var/spool/cron \
- --with-fifodir=/var/run \
- --with-sendmail=/usr/sbin/sendmail \
- --with-fcrondyn=yes \
- --with-editor=${EDITOR} \
- --with-cflags="${CFLAGS}" \
- ${myconf} \
- || die "Configure problem"
-
- emake || die "Compile problem"
-}
-
-src_install() {
- dodir /var/spool
- diropts -m 0770 -o cron -g cron
- keepdir /var/spool/cron/fcrontabs
-
- insinto /usr/sbin
- insopts -o root -g root -m0110 ; doins fcron
- insinto /usr/bin
- insopts -o cron -g cron -m6110 ; doins fcrontab fcrondyn
- insopts -o root -g cron -m6110 ; doins fcronsighup
- dosym fcrontab /usr/bin/crontab
-
- insinto /etc/fcron
- insopts -m 640 -o root -g cron
- doins ${FILESDIR}/{fcron.allow,fcron.deny,fcron.conf}
-
- insopts -m 644 -o root -g root
- if use pam ; then
- insinto /etc/pam.d
- newins ${FILESDIR}/fcron.pam fcron
- newins ${FILESDIR}/fcrontab.pam fcrontab
- fi
- insinto /etc
- doins ${FILESDIR}/crontab
-
- exeinto /etc/init.d
- newexe ${FILESDIR}/fcron.rc6 fcron
-
- dodoc MANIFEST VERSION doc/txt/*.txt
- newdoc ${FILESDIR}/fcron.conf-${PV} fcron.conf.sample
- if use doc ; then
- docinto html ; dohtml doc/HTML/*.html
- fi
- dodoc ${FILESDIR}/crontab
-
- doman doc/man/*.{1,3,5,8}
-}
-
-pkg_postinst() {
- einfo "Each user who uses fcron should be added to the cron group"
- einfo "in /etc/group and also be added in /etc/fcron/fcron.allow"
- einfo
- einfo "To activate /etc/cron.{hourly|daily|weekly|montly} please run: "
- einfo "crontab /etc/crontab"
- einfo
- einfo "!!! That will replace root's current crontab !!!"
- einfo
-}
+++ /dev/null
-# 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.2 2004/10/11 14:19:17 ka0ttic Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="A command scheduler with extended capabilities over cron and anacron"
-HOMEPAGE="http://fcron.free.fr/"
-SRC_URI="http://fcron.free.fr/archives/${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~hppa ~amd64"
-IUSE="pam doc selinux"
-
-DEPEND="virtual/editor
- doc? ( >=app-text/docbook-dsssl-stylesheets-1.77 )
- selinux? ( sys-libs/libselinux )
- pam? ( >=sys-libs/pam-0.77 )"
-RDEPEND="!virtual/cron
- >=sys-apps/cronbase-0.2.1-r3
- virtual/mta"
-PROVIDE="virtual/cron"
-
-src_unpack() {
- unpack ${A}
- cd ${S}
- 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 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 \
- --with-etcdir=/etc/fcron \
- --with-spooldir=/var/spool/cron \
- --with-fifodir=/var/run \
- --with-sendmail=/usr/sbin/sendmail \
- --with-fcrondyn=yes \
- --with-editor=${EDITOR} \
- --with-cflags="${CFLAGS}" \
- ${myconf} \
- || die "Configure problem"
-
- emake || die "Compile problem"
-}
-
-src_install() {
- dodir /var/spool
- diropts -m 0770 -o cron -g cron
- keepdir /var/spool/cron/fcrontabs
-
- insinto /usr/sbin
- insopts -o root -g root -m0110 ; doins fcron
- insinto /usr/bin
- insopts -o cron -g cron -m6110 ; doins fcrontab fcrondyn
- insopts -o root -g cron -m6110 ; doins fcronsighup
- dosym fcrontab /usr/bin/crontab
-
- insinto /etc/fcron
- insopts -m 640 -o root -g cron
- doins ${FILESDIR}/{fcron.allow,fcron.deny,fcron.conf}
-
- insopts -m 644 -o root -g root
- if use pam ; then
- insinto /etc/pam.d
- newins ${FILESDIR}/fcron.pam fcron
- newins ${FILESDIR}/fcrontab.pam fcrontab
- fi
- insinto /etc
- doins ${FILESDIR}/crontab
-
- exeinto /etc/init.d
- newexe ${FILESDIR}/fcron.rc6 fcron
-
- dodoc MANIFEST VERSION doc/txt/*.txt
- newdoc ${FILESDIR}/fcron.conf-${PV} fcron.conf.sample
- if use doc ; then
- docinto html ; dohtml doc/HTML/*.html
- fi
- dodoc ${FILESDIR}/crontab
-
- doman doc/man/*.{1,3,5,8}
-}
-
-pkg_postinst() {
- einfo "Each user who uses fcron should be added to the cron group"
- einfo "in /etc/group and also be added in /etc/fcron/fcron.allow"
- einfo
- einfo "To activate /etc/cron.{hourly|daily|weekly|montly} please run: "
- einfo "crontab /etc/crontab"
- einfo
- einfo "!!! That will replace root's current crontab !!!"
- einfo
-}
+++ /dev/null
-MD5 b20c6bc5d9435a790e5500ecb7990df8 fcron-2.0.0.src.tar.gz 144069
+++ /dev/null
-MD5 8a5652f025ee81627f289162270a5bd0 fcron-2.0.1.src.tar.gz 145324
+++ /dev/null
-MD5 4bfcff1002a7231f374591511bacadb2 fcron-2.9.4.src.tar.gz 378987
+++ /dev/null
-MD5 73042f2666dff27444789d542bbcd607 fcron-2.9.5.src.tar.gz 396421
+++ /dev/null
-diff -ur fcron-2.0.0-orig/conf.c fcron-2.0.0/conf.c
---- fcron-2.0.0-orig/conf.c 2004-09-04 17:15:47.996231778 -0400
-+++ fcron-2.0.0/conf.c 2004-09-04 17:16:07.589818602 -0400
-@@ -1084,5 +1084,6 @@
- break ;
-
- next_file:
-+ ;
- }
- }
+++ /dev/null
---- fcron-2.9.4.orig/job.c
-+++ fcron-2.9.4/job.c
-@@ -41,7 +41,7 @@
- char env_shell[PATH_LEN];
- #endif
-
--#ifdef CONFIG_FLASK
-+#ifdef WITH_SELINUX
- extern char **environ;
- #endif
-
-@@ -249,8 +249,8 @@
- int to_stdout = foreground && is_stdout(line->cl_option);
- int pipe_fd[2];
- short int mailpos = 0; /* 'empty mail file' size */
--#ifdef CONFIG_FLASK
-- int flask_enabled = is_flask_enabled();
-+#ifdef WITH_SELINUX
-+ int flask_enabled = is_selinux_enabled();
- #endif
-
- /* */
-@@ -352,10 +352,9 @@
- debug("Execing \"%s -c %s\"", curshell, line->cl_shell);
- #endif /* CHECKJOBS */
-
--#ifdef CONFIG_FLASK
-- if(flask_enabled)
-- execle_secure(shell, line->cl_file->cf_user_sid, shell, "-c", line->cl_shell, NULL, environ);
-- else
-+#ifdef WITH_SELINUX
-+ if(flask_enabled && setexeccon(line->cl_file->cf_user_context) )
-+ die_e("Can't set execute context \"%s\".", line->cl_file->cf_user_context);
- #endif
- execl(curshell, curshell, "-c", line->cl_shell, NULL);
- /* execl returns only on error */
---- fcron-2.9.4.orig/configure.in
-+++ fcron-2.9.4/configure.in
-@@ -44,7 +44,6 @@
- AC_CHECK_HEADERS(sys/types.h sys/socket.h sys/un.h)
- AC_CHECK_HEADERS(security/pam_appl.h pam/pam_appl.h crypt.h shadow.h)
- AC_CHECK_HEADERS(sys/resource.h)
--AC_CHECK_HEADERS(flask_util.h)
-
- dnl Checks for typedefs, structures, and compiler characteristics.
- AC_C_CONST
-@@ -61,7 +60,7 @@
- AC_FUNC_STRFTIME
- AC_FUNC_WAIT3
- AC_CHECK_LIB(xnet, shutdown)
--AC_CHECK_LIB(secure, getsecsid, [flaskavail=1], [flaskavail=0])
-+AC_CHECK_LIB(selinux, getcon, [selinuxavail=1], [selinuxavail=0])
- AC_CHECK_FUNC(getloadavg, [getloadavg=1], [getloadavg=0])
- AC_CHECK_LIB(kstat, kstat_open, [kstat=1], [kstat=0])
- if test $getloadavg -eq 1; then
-@@ -925,7 +924,7 @@
- AC_MSG_RESULT(no)
- ;;
- yes)
-- if test "$flaskavail" -eq 1; then
-+ if test "$selinuxavail" -eq 1; then
- useselinux=1
- AC_MSG_RESULT(yes)
- else
-@@ -940,7 +939,7 @@
- AC_MSG_ERROR(Must be set to either "yes" or "no".)
- ;;
- esac ],
-- if test "$useselinux" != "0" && test "$flaskavail" -eq 1; then
-+ if test "$useselinux" != "0" && test "$selinuxavail" -eq 1; then
- useselinux=1
- AC_MSG_RESULT(yes)
- else
-@@ -949,8 +948,9 @@
- fi
- )
- if test "$useselinux" -eq 1; then
-- LIBS="$LIBS -lsecure"
-- AC_DEFINE(CONFIG_FLASK)
-+ LIBS="$LIBS -lselinux"
-+ AC_DEFINE(WITH_SELINUX)
-+ CFLAGS="$CFLAGS -I/usr/include/selinux"
- fi
-
-
-@@ -1149,4 +1149,5 @@
- echo
- echo "You can now run 'make' to compile"
- echo "and then (as root) 'make install' to install fcron."
--echo
-\ No newline at end of file
-+echo
-+
---- fcron-2.9.4.orig/global.h
-+++ fcron-2.9.4/global.h
-@@ -43,12 +43,11 @@
- #include <errno.h>
- #endif
-
--#ifdef CONFIG_FLASK
--#include <flask_util.h>
--#include <fs_secure.h>
--#include <ss.h>
--#include <linux/flask/av_permissions.h>
--#include <get_sid_list.h>
-+#ifdef WITH_SELINUX
-+#include <selinux.h>
-+#include <get_context_list.h>
-+#include <selinux/flask.h>
-+#include <selinux/av_permissions.h>
- #endif
-
- #ifdef HAVE_GETOPT_H
-@@ -167,9 +166,9 @@
- struct env_t *cf_env_base; /* list of all env variables to set */
- int cf_running; /* number of jobs running */
- signed char cf_tzdiff; /* time diff between system and local hour */
--#ifdef CONFIG_FLASK
-- security_id_t cf_user_sid;
-- security_id_t cf_file_sid;
-+#ifdef WITH_SELINUX
-+ security_context_t cf_user_context;
-+ security_context_t cf_file_context;
- #endif
- } cf_t;
-
---- fcron-2.9.4.orig/conf.c
-+++ fcron-2.9.4/conf.c
-@@ -437,11 +437,10 @@
- struct passwd *pass = NULL;
- short int type = 0, size = 0;
- int rc;
--#ifdef CONFIG_FLASK
-- int flask_enabled = is_flask_enabled();
-- struct security_query qry;
-- struct security_response rsp;
-+#ifdef WITH_SELINUX
-+ int flask_enabled = is_selinux_enabled();
- int retval;
-+ struct av_decision avd;
- const char *user_name;
- #endif
-
-@@ -453,16 +452,18 @@
-
- /* check if this file is owned by root : otherwise, all runas fields
- * of this field should be set to the owner */
--#ifdef CONFIG_FLASK
-- if(flask_enabled)
-- rc = fstat_secure(fileno(ff), &file_stat, &cf->cf_file_sid);
-- else
--#endif
- rc = fstat(fileno(ff), &file_stat);
- if ( rc != 0 ) {
- error_e("Could not stat %s", file_name);
- goto err;
- }
-+#ifdef WITH_SELINUX
-+ if(flask_enabled && fgetfilecon(fileno(ff), &cf->cf_file_context) < 0 )
-+ {
-+ error_e("Could not get context of %s", file_name);
-+ goto err;
-+ }
-+#endif
-
- if ( strncmp(file_name,"new.", 4) == 0 ) {
- if ( file_stat.st_uid == ROOTUID ) {
-@@ -495,7 +496,7 @@
- }
- }
-
--#ifdef CONFIG_FLASK
-+#ifdef WITH_SELINUX
- /*
- * Since crontab files are not directly executed,
- * crond must ensure that the crontab file has
-@@ -507,17 +508,19 @@
- user_name = "system_u";
- else
- user_name = cf->cf_user;
-- if(get_default_sid(user_name, 0, &cf->cf_user_sid))
-- error_e("NO SID for user \"%s\"", cf->cf_user_sid);
-- qry.ssid = cf->cf_user_sid;
-- qry.tsid = cf->cf_file_sid;
-- qry.tclass = SECCLASS_FILE;
-- qry.requested = FILE__ENTRYPOINT;
-- retval = security_compute_av(&qry, &rsp);
-- if(retval || ((qry.requested & rsp.allowed) != qry.requested)) {
-- syslog(LOG_ERR, "ENTRYPOINT FAILED for \"%s\" (SID %u) for file SID %u"
-- , cf->cf_user, cf->cf_user_sid, cf->cf_file_sid);
-- goto err;
-+ if(flask_enabled)
-+ {
-+ if(get_default_context(user_name, NULL, &cf->cf_user_context))
-+ error_e("NO CONTEXT for user \"%s\"", cf->cf_user_context);
-+ retval = security_compute_av(cf->cf_user_context, cf->cf_file_context
-+ , SECCLASS_FILE, FILE__ENTRYPOINT, &avd);
-+
-+ if(retval || ((FILE__ENTRYPOINT & avd.allowed) != FILE__ENTRYPOINT))
-+ {
-+ syslog(LOG_ERR, "ENTRYPOINT FAILED for user \"%s\" (CONTEXT %s) for file CONTEXT %s"
-+ , cf->cf_user, cf->cf_user_context, cf->cf_file_context);
-+ goto err;
-+ }
- }
- #endif
-
---- fcron-2.9.4.orig/config.h.in
-+++ fcron-2.9.4/config.h.in
-@@ -393,7 +393,7 @@
- #undef HAVE_LIBSHADOW
-
- /* Have SE Linux support */
--#undef CONFIG_FLASK
-+#undef WITH_SELINUX
-
- /* Define if you have the xnet library (-lxnet). */
- #undef HAVE_LIBXNET
---- fcron-2.9.4.orig/save.c
-+++ fcron-2.9.4/save.c
-@@ -298,12 +298,18 @@
- int fd;
-
- /* open file */
--#ifdef CONFIG_FLASK
-- if ( is_flask_enabled() )
-- fd = open_secure(filename, O_WRONLY | O_CREAT | O_TRUNC | O_SYNC, S_IRUSR | S_IWUSR, file->cf_file_sid);
-- else
-+#ifdef WITH_SELINUX
-+ if ( is_selinux_enabled() && setfscreatecon(file->cf_file_context) )
-+ {
-+ error_e("Could not set create context for file %s", filename);
-+ return ERR;
-+ }
- #endif
- fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC | O_SYNC, S_IRUSR|S_IWUSR);
-+#ifdef WITH_SELINUX
-+ if ( is_selinux_enabled() )
-+ setfscreatecon(NULL);
-+#endif
- if ( fd == -1 ) {
- error_e("Could not open %s", filename);
- return ERR;
+++ /dev/null
-# 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
+++ /dev/null
-# 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
projects / gentoo.git / commitdiff