From f78108598211053d41752a83e0345441bb9014ae Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 11 Feb 2018 16:09:52 +0000 Subject: gentoo resync : 11.02.2018 --- sys-process/fcron/Manifest | 5 +- sys-process/fcron/fcron-3.2.1-r2.ebuild | 257 -------------------- sys-process/fcron/fcron-3.2.1-r3.ebuild | 258 +++++++++++++++++++++ sys-process/fcron/fcron-3.3.0_beta-r1.ebuild | 3 +- .../files/fcron-3.2.1-musl-getopt-order.patch | 24 ++ 5 files changed, 287 insertions(+), 260 deletions(-) delete mode 100644 sys-process/fcron/fcron-3.2.1-r2.ebuild create mode 100644 sys-process/fcron/fcron-3.2.1-r3.ebuild create mode 100644 sys-process/fcron/files/fcron-3.2.1-musl-getopt-order.patch (limited to 'sys-process/fcron') diff --git a/sys-process/fcron/Manifest b/sys-process/fcron/Manifest index 74332f3a5978..b58af3cca2d2 100644 --- a/sys-process/fcron/Manifest +++ b/sys-process/fcron/Manifest @@ -1,6 +1,7 @@ AUX crontab.2 1098 BLAKE2B f7fe284c580292df08c7591c61802d0df1fa496e79a11d1c67bb37249f8548b5b2073ff8e94de02ed4dfcccf07c11443a1d1a1b08697115f311bf77536921704 SHA512 5e1a23ad70fb79275c8a29137284ccb13f1fbb4387ba61875065e003aafe03aeb1709819bf2803a70494f15c42a69883c9c5272219f625e7c5ff53c4459e5d42 AUX fcron-3.1.1-noreadline.patch 716 BLAKE2B 766336a43f54b067073c3a9c6def5ebd2d3f3280324bcb63f50c0c85de20d753b82693f6a8886b321c54fedd866cade90dacee69e28a132488ac14c65c8f7902 SHA512 152aaa299abd8ec546dc73ca7527d3162c14cec47cc670d82c7312f0fe64545a2c0c9ed82ae79ee4fe028ca009d37f6f4843e4c2ec6e6ee7cf7e8b97dc61ec71 AUX fcron-3.2.1-configure-fix-audit-parameter-check.patch 815 BLAKE2B 2e1a592702ff4e6c702d49390dbbeb0d5b6a16658f59f2719918f238a382d0dd81ddf2dc049a077e1e29f5f748b4772b5fdb4ec5446be5887356d9ab46200f6c SHA512 c2942a729d584dc72936695b19844951675a98c2783836e7ff3a8e4ea63fe470dc0dadedb83c9737b78978f2c8d4a4af62191ffb27e4ba6817ea4c70c9c2a8b8 +AUX fcron-3.2.1-musl-getopt-order.patch 1420 BLAKE2B 69da87a05cae2e750eb1cf09a4a716aad900b1109db8fc9c94da87193e04fb640d14d9d369894db93caa18acd1e8934fc2ffcf708b982ed17ed8bb825a40d4cc SHA512 684e921840deccb7f0bda56ba39304d7637d03ac61d9d80669b09501b86f5867e37fca0d88ae0710c175cea3d978533e4a8d8bfcfbfa6b1f7aefc6e29e3827c5 AUX fcron.confd 134 BLAKE2B 3ab11ae5641f1c2f049da2aec3d1561fa3b10b7fe5d29701e5fb1e8b75a613c110924999ed0afed3b7118196636c1c3198b4499127e4065200791d821ab737ce SHA512 58a66cd495fcb6a9b49f1d244357dfd61188a0c09d2c02a93c9250b8d77d9b89aff41d947e25fd4c1248f39b6a97f045e760b52cdf2f065145a8bfe74b7bf25e AUX fcron.init-r5 2633 BLAKE2B 3e3a1991f67f9e9ed2021c8ed0f7442032feb88af89088caad2fd0c090e8c588a8621b45a7b320309065f1a5bef743aa00bf9cb2e531ddb55104ccdba43c9350 SHA512 bf53158d6326a742fc3af0cdf196f76a2930f61e58c8a7f4488d3a17aa18bdbd12a3258034f649ae9998627caec7c55bf4c392265525a8fa7c6614cc38f2d0e0 AUX fcron.init.4 2589 BLAKE2B e84ffd9d1b5a3cd1ee60c426cde67a3e7bd5a853d2cbdd943ffd382280675cec07c83191231d22b98aaffbd2966fcbf39e9856051d3e248331b4a6bc04d138eb SHA512 6f5197e979333eabe6fbe7c3c44488db6e82067037d2de37b28c791467ecd27c3df7b4fda0b04f1d04929e7a643d76c42f5d0af64256b9dff7848ef892775e0d @@ -8,6 +9,6 @@ AUX fcrontab.2 226 BLAKE2B 4fc55d14c44797b1dcc34000de1a9ffa43b1a52037db5dcec7685 DIST fcron-3.2.1.src.tar.gz 601142 BLAKE2B 184b74f9d64186b7d3aae87d48ed0107525fd0c73bb8db86408bd246592ff4fbcbc04f8ca0064868a8555d7c6be2f183172d62daeed75275cd836517da504d0f SHA512 ddfd3e3a297b843c924aacccffaa5c1c6b300497f39daa1cdb90dc4cf4bc757042b0b2c1f055c119c8128c64d830ee0e8757091610432f5ffcacca25d369e5cd DIST fcron-3.3.0_beta.tar.gz 592481 BLAKE2B b862dac8e70621e299ec2fbbc75a0e8843e7a085190fa7a18f9444f6f41f28cf55ef0dcd7234a388b9b3e6689f25019a581ded2ae6002643bb3dc472a59207bb SHA512 e5b76e23af774997d9ee1ef58d17009cea95d10b19a2d22b550b178a39bb7c439c055b440eb99c4286db6622901e5deb029318e4425e8cd098766452ffc15bc6 EBUILD fcron-3.2.1-r1.ebuild 6952 BLAKE2B 1b47fad42d9a420746fb053a0044d5d409bc3c4ae3430e151f384ab2aa66feeb3197bfa9a3a892ceb0acccdcea8016de7db59c302a2aa285d287099bf667accf SHA512 79304f14e5cfad7741fd9cb467bd80da28f5bea49b019b849412f931a9edbdf2a54444bf534ef2a48e150def03ce1fea666ca4041cae5b645bc884513dd3d572 -EBUILD fcron-3.2.1-r2.ebuild 7004 BLAKE2B 21db3b4e8a2da2dc3171d0f4697379e20f19e79ac6bc0200d2d8dd6cac656ab1aeceab6c64a513031fa781acd572d621f66838ddce9ad43d30ead6905873101b SHA512 aa53fe077985dcc8bc9f86f06ba0897d4f46c1a9725f702a519e0dec4ddcd1d792ef8ce0cd1a38c56aa0a4453a76ba5c0e614766e001d4e09eb6afc8dde9b02b -EBUILD fcron-3.3.0_beta-r1.ebuild 7023 BLAKE2B 068472be889f7eb0c3db4e6ca84f62e01c1bce2c759b8c1f60855e98d343316afc35e8ae45dbb825c50af53be9d4ea33158034b4746f393364f6578f2df4c793 SHA512 8de93d73933bcbd232083d2a498f2d90e3c6c026a32566489cb7a8347e992170cf79dd65f373185eef71f3575194716e0b884233f138a8fc34cebbe47c5492db +EBUILD fcron-3.2.1-r3.ebuild 7055 BLAKE2B bbde5773441644b87eb0bd3b33413f887587ac6e812272f696a2b89d054148d620b2d37b55dc6add9a6a13f53a3bd10e953530641e2190b69c347ea131349a37 SHA512 6ceb99b7e198b91ef1228a47764b90e46dc87a3068e75d853e77e85102aae3942ec444e3fccdc20679db5202c6c9dde3f4760eaa2d0617f9d2bafaf90890a686 +EBUILD fcron-3.3.0_beta-r1.ebuild 7074 BLAKE2B 7bc0e9cb9923bad03c0b2f5842c0af7b45fb847c3b0b09a3599b0c3eb17d865a8850275aec27279f15c91abd6d45b9638e57462d5b0a0a6986dc3c9a6677c7ae SHA512 2a14df2de11e12d6e31ed709ca20d0868231192c5e3d65735979b4349cd93e3cdc3aaa85de15e93338b134cbfdb0c19b08d41e5cbcfcc93ccb9165038c67916a MISC metadata.xml 1276 BLAKE2B 8cc80ae3ae21b829b950e45eecb14fa88b709ec0c52c5d08bb1b05797852dcdfd16d7041ea716dcb63a204abe5fa6dbacf9c49035352a60a074e35123cdfa893 SHA512 2c697d3ab08cbdd0fb8baab0478c8bb36de4afb1753e070ebb9a67a40159b945b066cb9479585189b20ca7dfe57ba83cf6d23d507888d73d8a8fbd4432e52222 diff --git a/sys-process/fcron/fcron-3.2.1-r2.ebuild b/sys-process/fcron/fcron-3.2.1-r2.ebuild deleted file mode 100644 index 604e9afb710b..000000000000 --- a/sys-process/fcron/fcron-3.2.1-r2.ebuild +++ /dev/null @@ -1,257 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -WANT_AUTOMAKE=none - -inherit cron pam flag-o-matic user autotools versionator systemd - -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" -KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="audit debug pam selinux l10n_fr +mta +system-crontab readline" - -DEPEND="audit? ( sys-process/audit ) - pam? ( virtual/pam ) - readline? ( sys-libs/readline:= ) - selinux? ( sys-libs/libselinux )" - -RDEPEND="${DEPEND} - app-misc/editor-wrapper - mta? ( virtual/mta ) - pam? ( sys-auth/pambase )" - -PATCHES=( - "${FILESDIR}"/${PN}-3.1.1-noreadline.patch - "${FILESDIR}"/${PN}-3.2.1-configure-fix-audit-parameter-check.patch -) - -pkg_setup() { - enewgroup fcron - enewuser fcron -1 -1 -1 fcron - rootuser=$(egetent passwd 0 | cut -d ':' -f 1) - [[ ${rootuser} ]] || rootuser=root - rootgroup=$(egetent group 0 | cut -d ':' -f 1) - [[ ${rootgroup} ]] || rootgroup=root -} - -src_prepare() { - default - - # respect LDFLAGS - sed -i "s:\(@LIBS@\):\$(LDFLAGS) \1:" Makefile.in || die "sed failed" - - # Adjust fcrontab path - sed -i -e 's:/etc/fcrontab:/etc/fcron/fcrontab:' script/check_system_crontabs.sh || die - - mv configure.in configure.ac || die - - cp "${FILESDIR}"/crontab.2 "${WORKDIR}"/crontab || die - - eautoconf -} - -src_configure() { - # Don't try to pass --with-debug as it'll play with cflags as - # well, and run foreground which is a _very_ nasty idea for - # Gentoo. - use debug && append-cppflags -DDEBUG - - # bindir is used just for calling fcronsighup - econf \ - --with-cflags="${CFLAGS}" \ - --bindir=/usr/libexec \ - --sbindir=/usr/libexec \ - $(use_with audit) \ - $(use_with mta sendmail) \ - $(use_with pam) \ - $(use_with readline) \ - $(use_with selinux) \ - --sysconfdir=/etc/fcron \ - --with-username=fcron \ - --with-groupname=fcron \ - --with-piddir=/run \ - --with-spooldir=/var/spool/fcron \ - --with-fifodir=/run \ - --with-fcrondyn=yes \ - --disable-checks \ - --with-editor=/usr/libexec/editor \ - --with-shell=/bin/sh \ - --without-db2man \ - --without-dsssl-dir \ - --with-rootname=${rootuser} \ - --with-rootgroup=${rootgroup} \ - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" -} - -src_compile() { - default - - # bug #216460 - sed -i \ - -e 's:/usr/local/etc/fcron:/etc/fcron/fcron:g' \ - -e 's:/usr/local/etc:/etc:g' \ - -e 's:/usr/local/:/usr/:g' \ - doc/*/*/*.{txt,1,5,8,html} \ - || die "unable to fix documentation references" -} - -src_install() { - keepdir /var/spool/fcron - - exeinto /usr/libexec - doexe fcron fcronsighup - - dobin fcrondyn fcrontab - - insinto /etc/fcron - doins files/fcron.{allow,deny,conf} - - if use system-crontab; then - dosym fcrontab /usr/bin/crontab - - exeinto /usr/libexec - newexe script/check_system_crontabs.sh check_system_crontabs - - insinto /etc/fcron - newins "${FILESDIR}"/fcrontab.2 fcrontab - - fowners ${rootuser}:fcron /etc/fcron/fcrontab - fperms 0640 /etc/fcron/fcrontab - - insinto /etc - newins "${FILESDIR}"/crontab.2 crontab - fi - - fowners fcron:fcron \ - /var/spool/fcron \ - /usr/bin/fcron{dyn,tab} - - # fcronsighup needs to be suid root, because it sends a HUP to the - # running fcron daemon, but only has to be called by the fcron group - # anyway - fowners ${rootuser}:fcron \ - /usr/libexec/fcronsighup \ - /etc/fcron/fcron.{allow,deny,conf} \ - /etc/fcron - - fperms 6770 /var/spool/fcron - fperms 6775 /usr/bin/fcron{dyn,tab} - - fperms 4710 /usr/libexec/fcronsighup - - fperms 0750 /etc/fcron - fperms 0640 /etc/fcron/fcron.{allow,deny,conf} - - pamd_mimic system-services fcron auth account session - cat > "${T}"/fcrontab.pam <<- EOF - # Don't ask for the user's password; fcrontab will only allow to - # change user if running as root. - auth sufficient pam_permit.so - - # Still use the system-auth stack for account and session as the - # sysadmin might have set up stuff properly, and also avoids - # sidestepping limits (since fcrontab will run \$EDITOR). - account include system-auth - session include system-auth - EOF - newpamd "${T}"/fcrontab.pam fcrontab - - newinitd "${FILESDIR}"/fcron.init-r5 fcron - systemd_newunit "${S}/script/fcron.init.systemd" fcron.service - - newconfd "${FILESDIR}"/fcron.confd fcron - - local DOCS=( MANIFEST VERSION "${WORKDIR}/crontab") - DOCS+=( doc/en/txt/{readme,thanks,faq,todo,relnotes,changes}.txt ) - - local HTML_DOCS=( doc/en/HTML/. ) - - einstalldocs - - newdoc files/fcron.conf fcron.conf.sample - doman doc/en/man/*.{1,5,8} - - for lang in fr; do - use l10n_${lang} || continue - - doman -i18n=${lang} doc/${lang}/man/*.{1,5,8} - - docinto html/${lang} - dodoc -r doc/${lang}/HTML/. - done -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - elog "Make sure you execute" - elog "" - elog " # emerge --config ${CATEGORY}/${PN}" - elog "" - elog "to install the default systab on this system." - else - local v - for v in ${REPLACING_VERSIONS}; do - if ! version_is_at_least "3.2.1" ${v}; then - # This is an upgrade - - elog "fcron's default systab was updated since your last installation." - elog "You can use" - elog "" - elog " # emerge --config ${CATEGORY}/${PN}" - elog "" - elog "to re-install systab (do not call this command before you" - elog "have merged your configuration files)." - - # Show this elog only once - break - fi - done - fi - - if ! use system-crontab; then - echo "" - ewarn "Remember that fcron will *not* use /etc/cron.d in this configuration" - ewarn "due to USE=-system-crontab!" - echo "" - fi -} - -pkg_config() { - if [[ $(fcrontab -l -u systab 2>/dev/null) ]]; then - eerror "We're not going to make any change to your systab as long as" - eerror "it contains data; please clear it before proceeding." - eerror "You can do that with" - eerror "" - eerror " # fcrontab -u systab -r" - eerror "" - eerror "However you are advised to do this by hand to review existing" - eerror "systab just in case." - return 1 - fi - - if use system-crontab; then - elog "This is going to set up fcron to execute check_system_crontabs." - elog "In this configuration, /etc/crontab and /etc/cron.d are respected." - elog "Per default fcron will check for modifications every 10 minutes." - /usr/libexec/check_system_crontabs -v -i -f - else - elog "This is going to set up fcron to set up a default systab that" - elog "executes /etc/cron.{hourly,daily,weekly,monthly} but will ignore" - elog "/etc/crontab and /etc/cron.d." - fcrontab -u systab - <<- EOF - !serial(true) - 00 * * * * /bin/rm -f /var/spool/cron/lastrun/cron.hourly - 00 00 * * * /bin/rm -f /var/spool/cron/lastrun/cron.daily - 00 00 * * 6 /bin/rm -f /var/spool/cron/lastrun/cron.weekly - 00 00 1 * * /bin/rm -f /var/spool/cron/lastrun/cron.monthly - */10 * * * * /usr/bin/test -x /usr/sbin/run-crons && /usr/sbin/run-crons - !serial(false) - EOF - fi -} diff --git a/sys-process/fcron/fcron-3.2.1-r3.ebuild b/sys-process/fcron/fcron-3.2.1-r3.ebuild new file mode 100644 index 000000000000..fe5f30de4ec0 --- /dev/null +++ b/sys-process/fcron/fcron-3.2.1-r3.ebuild @@ -0,0 +1,258 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +WANT_AUTOMAKE=none + +inherit cron pam flag-o-matic user autotools versionator systemd + +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" +KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="audit debug pam selinux l10n_fr +mta +system-crontab readline" + +DEPEND="audit? ( sys-process/audit ) + pam? ( virtual/pam ) + readline? ( sys-libs/readline:= ) + selinux? ( sys-libs/libselinux )" + +RDEPEND="${DEPEND} + app-misc/editor-wrapper + mta? ( virtual/mta ) + pam? ( sys-auth/pambase )" + +PATCHES=( + "${FILESDIR}"/${PN}-3.1.1-noreadline.patch + "${FILESDIR}"/${PN}-3.2.1-configure-fix-audit-parameter-check.patch + "${FILESDIR}"/${PN}-3.2.1-musl-getopt-order.patch +) + +pkg_setup() { + enewgroup fcron + enewuser fcron -1 -1 -1 fcron + rootuser=$(egetent passwd 0 | cut -d ':' -f 1) + [[ ${rootuser} ]] || rootuser=root + rootgroup=$(egetent group 0 | cut -d ':' -f 1) + [[ ${rootgroup} ]] || rootgroup=root +} + +src_prepare() { + default + + # respect LDFLAGS + sed -i "s:\(@LIBS@\):\$(LDFLAGS) \1:" Makefile.in || die "sed failed" + + # Adjust fcrontab path + sed -i -e 's:/etc/fcrontab:/etc/fcron/fcrontab:' script/check_system_crontabs.sh || die + + mv configure.in configure.ac || die + + cp "${FILESDIR}"/crontab.2 "${WORKDIR}"/crontab || die + + eautoconf +} + +src_configure() { + # Don't try to pass --with-debug as it'll play with cflags as + # well, and run foreground which is a _very_ nasty idea for + # Gentoo. + use debug && append-cppflags -DDEBUG + + # bindir is used just for calling fcronsighup + econf \ + --with-cflags="${CFLAGS}" \ + --bindir=/usr/libexec \ + --sbindir=/usr/libexec \ + $(use_with audit) \ + $(use_with mta sendmail) \ + $(use_with pam) \ + $(use_with readline) \ + $(use_with selinux) \ + --sysconfdir=/etc/fcron \ + --with-username=fcron \ + --with-groupname=fcron \ + --with-piddir=/run \ + --with-spooldir=/var/spool/fcron \ + --with-fifodir=/run \ + --with-fcrondyn=yes \ + --disable-checks \ + --with-editor=/usr/libexec/editor \ + --with-shell=/bin/sh \ + --without-db2man \ + --without-dsssl-dir \ + --with-rootname=${rootuser} \ + --with-rootgroup=${rootgroup} \ + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" +} + +src_compile() { + default + + # bug #216460 + sed -i \ + -e 's:/usr/local/etc/fcron:/etc/fcron/fcron:g' \ + -e 's:/usr/local/etc:/etc:g' \ + -e 's:/usr/local/:/usr/:g' \ + doc/*/*/*.{txt,1,5,8,html} \ + || die "unable to fix documentation references" +} + +src_install() { + keepdir /var/spool/fcron + + exeinto /usr/libexec + doexe fcron fcronsighup + + dobin fcrondyn fcrontab + + insinto /etc/fcron + doins files/fcron.{allow,deny,conf} + + if use system-crontab; then + dosym fcrontab /usr/bin/crontab + + exeinto /usr/libexec + newexe script/check_system_crontabs.sh check_system_crontabs + + insinto /etc/fcron + newins "${FILESDIR}"/fcrontab.2 fcrontab + + fowners ${rootuser}:fcron /etc/fcron/fcrontab + fperms 0640 /etc/fcron/fcrontab + + insinto /etc + newins "${FILESDIR}"/crontab.2 crontab + fi + + fowners fcron:fcron \ + /var/spool/fcron \ + /usr/bin/fcron{dyn,tab} + + # fcronsighup needs to be suid root, because it sends a HUP to the + # running fcron daemon, but only has to be called by the fcron group + # anyway + fowners ${rootuser}:fcron \ + /usr/libexec/fcronsighup \ + /etc/fcron/fcron.{allow,deny,conf} \ + /etc/fcron + + fperms 6770 /var/spool/fcron + fperms 6775 /usr/bin/fcron{dyn,tab} + + fperms 4710 /usr/libexec/fcronsighup + + fperms 0750 /etc/fcron + fperms 0640 /etc/fcron/fcron.{allow,deny,conf} + + pamd_mimic system-services fcron auth account session + cat > "${T}"/fcrontab.pam <<- EOF + # Don't ask for the user's password; fcrontab will only allow to + # change user if running as root. + auth sufficient pam_permit.so + + # Still use the system-auth stack for account and session as the + # sysadmin might have set up stuff properly, and also avoids + # sidestepping limits (since fcrontab will run \$EDITOR). + account include system-auth + session include system-auth + EOF + newpamd "${T}"/fcrontab.pam fcrontab + + newinitd "${FILESDIR}"/fcron.init-r5 fcron + systemd_newunit "${S}/script/fcron.init.systemd" fcron.service + + newconfd "${FILESDIR}"/fcron.confd fcron + + local DOCS=( MANIFEST VERSION "${WORKDIR}/crontab") + DOCS+=( doc/en/txt/{readme,thanks,faq,todo,relnotes,changes}.txt ) + + local HTML_DOCS=( doc/en/HTML/. ) + + einstalldocs + + newdoc files/fcron.conf fcron.conf.sample + doman doc/en/man/*.{1,5,8} + + for lang in fr; do + use l10n_${lang} || continue + + doman -i18n=${lang} doc/${lang}/man/*.{1,5,8} + + docinto html/${lang} + dodoc -r doc/${lang}/HTML/. + done +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]]; then + # This is a new installation + elog "Make sure you execute" + elog "" + elog " # emerge --config ${CATEGORY}/${PN}" + elog "" + elog "to install the default systab on this system." + else + local v + for v in ${REPLACING_VERSIONS}; do + if ! version_is_at_least "3.2.1" ${v}; then + # This is an upgrade + + elog "fcron's default systab was updated since your last installation." + elog "You can use" + elog "" + elog " # emerge --config ${CATEGORY}/${PN}" + elog "" + elog "to re-install systab (do not call this command before you" + elog "have merged your configuration files)." + + # Show this elog only once + break + fi + done + fi + + if ! use system-crontab; then + echo "" + ewarn "Remember that fcron will *not* use /etc/cron.d in this configuration" + ewarn "due to USE=-system-crontab!" + echo "" + fi +} + +pkg_config() { + if [[ $(fcrontab -l -u systab 2>/dev/null) ]]; then + eerror "We're not going to make any change to your systab as long as" + eerror "it contains data; please clear it before proceeding." + eerror "You can do that with" + eerror "" + eerror " # fcrontab -u systab -r" + eerror "" + eerror "However you are advised to do this by hand to review existing" + eerror "systab just in case." + return 1 + fi + + if use system-crontab; then + elog "This is going to set up fcron to execute check_system_crontabs." + elog "In this configuration, /etc/crontab and /etc/cron.d are respected." + elog "Per default fcron will check for modifications every 10 minutes." + /usr/libexec/check_system_crontabs -v -i -f + else + elog "This is going to set up fcron to set up a default systab that" + elog "executes /etc/cron.{hourly,daily,weekly,monthly} but will ignore" + elog "/etc/crontab and /etc/cron.d." + fcrontab -u systab - <<- EOF + !serial(true) + 00 * * * * /bin/rm -f /var/spool/cron/lastrun/cron.hourly + 00 00 * * * /bin/rm -f /var/spool/cron/lastrun/cron.daily + 00 00 * * 6 /bin/rm -f /var/spool/cron/lastrun/cron.weekly + 00 00 1 * * /bin/rm -f /var/spool/cron/lastrun/cron.monthly + */10 * * * * /usr/bin/test -x /usr/sbin/run-crons && /usr/sbin/run-crons + !serial(false) + EOF + fi +} diff --git a/sys-process/fcron/fcron-3.3.0_beta-r1.ebuild b/sys-process/fcron/fcron-3.3.0_beta-r1.ebuild index 10f03c92f516..f842946849e1 100644 --- a/sys-process/fcron/fcron-3.3.0_beta-r1.ebuild +++ b/sys-process/fcron/fcron-3.3.0_beta-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -31,6 +31,7 @@ RDEPEND="${DEPEND} PATCHES=( "${FILESDIR}"/${PN}-3.1.1-noreadline.patch "${FILESDIR}"/${PN}-3.2.1-configure-fix-audit-parameter-check.patch + "${FILESDIR}"/${PN}-3.2.1-musl-getopt-order.patch ) S="${WORKDIR}/${MY_P}" diff --git a/sys-process/fcron/files/fcron-3.2.1-musl-getopt-order.patch b/sys-process/fcron/files/fcron-3.2.1-musl-getopt-order.patch new file mode 100644 index 000000000000..801baad91710 --- /dev/null +++ b/sys-process/fcron/files/fcron-3.2.1-musl-getopt-order.patch @@ -0,0 +1,24 @@ +diff -Naur fcron-3.2.1.orig/script/check_system_crontabs.bash fcron-3.2.1/script/check_system_crontabs.bash +--- fcron-3.2.1.orig/script/check_system_crontabs.bash 2015-03-28 04:45:42.000000000 -0400 ++++ fcron-3.2.1/script/check_system_crontabs.bash 2018-02-05 17:47:04.735425134 -0500 +@@ -256,7 +256,7 @@ + sed -i -e "s/@yearly/0 0 1 1 */g" -e "s/@annually/0 0 1 1 */g" -e "s/@monthly/0 0 1 * */g" -e "s/@weekly/0 0 * * 0/g" -e "s/@daily/0 0 * * */g" -e "s/@midnight/0 0 * * */g" -e "s/@hourly/0 * * * */g" $FCRONTAB_FILE_TMP + + # notify fcron about the updated file +- $FCRONTAB_PROG $FCRONTAB_FILE_TMP -u systab ++ $FCRONTAB_PROG -u systab $FCRONTAB_FILE_TMP + } + + NEED_REBUILD=0 +diff -Naur fcron-3.2.1.orig/script/check_system_crontabs.sh fcron-3.2.1/script/check_system_crontabs.sh +--- fcron-3.2.1.orig/script/check_system_crontabs.sh 2015-03-28 04:45:42.000000000 -0400 ++++ fcron-3.2.1/script/check_system_crontabs.sh 2018-02-05 17:45:48.673612299 -0500 +@@ -265,7 +265,7 @@ + sed -i -e "s/@yearly/0 0 1 1 */g" -e "s/@annually/0 0 1 1 */g" -e "s/@monthly/0 0 1 * */g" -e "s/@weekly/0 0 * * 0/g" -e "s/@daily/0 0 * * */g" -e "s/@midnight/0 0 * * */g" -e "s/@hourly/0 * * * */g" "$FCRONTAB_FILE_TMP" + + # notify fcron about the updated file +- "$FCRONTAB_PROG" -c "$FCRON_CONFIG_FILE" "$FCRONTAB_FILE_TMP" -u systab ++ "$FCRONTAB_PROG" -c "$FCRON_CONFIG_FILE" -u systab "$FCRONTAB_FILE_TMP" + } + + NEED_REBUILD=0 -- cgit v1.2.3