* [gentoo-commits] repo/gentoo:master commit in: sys-process/fcron/files/, sys-process/fcron/
@ 2016-11-19 18:56 Thomas Deutschmann
0 siblings, 0 replies; 4+ messages in thread
From: Thomas Deutschmann @ 2016-11-19 18:56 UTC (permalink / raw
To: gentoo-commits
commit: d493c1ced55419c1b3a1b40e3a16d824c6d33f26
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 19 18:55:42 2016 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Nov 19 18:56:04 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d493c1ce
sys-process/fcron: Bashism in runscript removed
With the previous bump 531e27c45e1 I have accidentally introduced bashisms into
the runscript which are now removed. (Bug #600228)
This revision also introduces a sanity check for multi instances to make sure
that they don't use the default values so that they don't clash with the default
instance.
Gentoo-Bug: https://bugs.gentoo.org/600228
Package-Manager: portage-2.3.2
.../{fcron-3.2.1.ebuild => fcron-3.2.1-r1.ebuild} | 0
sys-process/fcron/files/fcron.init.4 | 36 +++++++++++++++++++---
2 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/sys-process/fcron/fcron-3.2.1.ebuild b/sys-process/fcron/fcron-3.2.1-r1.ebuild
similarity index 100%
rename from sys-process/fcron/fcron-3.2.1.ebuild
rename to sys-process/fcron/fcron-3.2.1-r1.ebuild
diff --git a/sys-process/fcron/files/fcron.init.4 b/sys-process/fcron/files/fcron.init.4
index e2441ee..25fafc1 100644
--- a/sys-process/fcron/files/fcron.init.4
+++ b/sys-process/fcron/files/fcron.init.4
@@ -5,7 +5,7 @@
FCRON_INSTANCE="${SVCNAME##*.}"
-if [[ -n "${FCRON_INSTANCE}" && "${SVCNAME}" != "fcron" ]]; then
+if [ -n "${FCRON_INSTANCE}" -a "${SVCNAME}" != "fcron" ]; then
FCRON_CONFIGFILE="/etc/fcron/fcron.${FCRON_INSTANCE}.conf"
else
FCRON_CONFIGFILE="/etc/fcron/fcron.conf"
@@ -20,11 +20,11 @@ getconfig() {
value="$(service_get_value ${key})"
fi
- if [[ -z "${value}" && -r "${FCRON_CONFIGFILE}" ]]; then
+ if [ -z "${value}" -a -r "${FCRON_CONFIGFILE}" ]; then
value="$(sed -n -e 's:^'"${key}"'[ \t]*=[ \t]*::p' "${FCRON_CONFIGFILE}")"
fi
- if [[ -z "${value}" ]]; then
+ if [ -z "${value}" ]; then
# Value not explicitly set in the configfile or configfile does not exist
# or is not readable
echo "${value_default}"
@@ -42,7 +42,7 @@ depend() {
need hostname
# provide the cron service if we are the main instance
- [[ "${SVCNAME}" == "fcron" ]] && provide cron
+ [ "${SVCNAME}" = "fcron" ] && provide cron
}
command="/usr/libexec/fcron"
@@ -50,6 +50,7 @@ command_args="-c \"${FCRON_CONFIGFILE}\""
start_stop_daemon_args=${FCRON_SSDARGS:-"--wait 1000"}
pidfile="$(getconfig pidfile /run/fcron.pid)"
fcrontabs="$(getconfig fcrontabs /var/spool/fcron)"
+fifofile="$(getconfig fifofile /run/fcron.fifo)"
required_files="${FCRON_CONFIGFILE}"
extra_started_commands="reload"
@@ -59,9 +60,33 @@ reload() {
}
start_pre() {
+ if [ "${SVCNAME}" != "fcron" ]; then
+ local _has_invalid_instance_cfg=0
+
+ if [ "${pidfile}" = "/run/fcron.pid" ]; then
+ eerror "You cannot use the same pidfile like the default instance!"
+ eerror "Please adjust your 'pidfile' setting in '${FCRON_CONFIGFILE}'."
+ _has_invalid_instance_cfg=1
+ fi
+
+ if [ "${fcrontabs}" = "/var/spool/fcron" ]; then
+ eerror "You cannot use the same fcrontabs location like the default instance!"
+ eerror "Please adjust your 'fcrontabs' setting in '${FCRON_CONFIGFILE}'."
+ _has_invalid_instance_cfg=1
+ fi
+
+ if [ "${fifofile}" = "/run/fcron.fifo" ]; then
+ eerror "You cannot use the same fifo file like the default instance!"
+ eerror "Please adjust your 'fifofile' setting in '${FCRON_CONFIGFILE}'."
+ _has_invalid_instance_cfg=1
+ fi
+
+ [ ${_has_invalid_instance_cfg} -ne 0 ] && return 1
+ fi
+
checkpath --file "${FCRON_CONFIGFILE}" --owner root:fcron --mode 0640
- if [[ ! -d "${fcrontabs}" ]]; then
+ if [ ! -d "${fcrontabs}" ]; then
ebegin "Creating missing spooldir '${fcrontabs}'"
${command} --newspooldir "${fcrontabs}"
eend $?
@@ -70,4 +95,5 @@ start_pre() {
start_post() {
service_set_value fcrontabs "${fcrontabs}"
+ service_set_value fifofile "${fifofile}"
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-process/fcron/files/, sys-process/fcron/
@ 2017-07-25 12:51 Thomas Deutschmann
0 siblings, 0 replies; 4+ messages in thread
From: Thomas Deutschmann @ 2017-07-25 12:51 UTC (permalink / raw
To: gentoo-commits
commit: dc1afc0e320e959cbf212b4e5f1f0bfae87778f2
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 25 12:51:20 2017 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jul 25 12:51:54 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc1afc0e
sys-process/fcron: Add support for /etc/conf.d/fcron (bug #622990)
Package-Manager: Portage-2.3.5, Repoman-2.3.2
...ron-3.3.0_beta.ebuild => fcron-3.2.1-r2.ebuild} | 13 ++-
....3.0_beta.ebuild => fcron-3.3.0_beta-r1.ebuild} | 4 +-
sys-process/fcron/files/fcron.confd | 7 ++
sys-process/fcron/files/fcron.init-r5 | 100 +++++++++++++++++++++
4 files changed, 115 insertions(+), 9 deletions(-)
diff --git a/sys-process/fcron/fcron-3.3.0_beta.ebuild b/sys-process/fcron/fcron-3.2.1-r2.ebuild
similarity index 96%
copy from sys-process/fcron/fcron-3.3.0_beta.ebuild
copy to sys-process/fcron/fcron-3.2.1-r2.ebuild
index 0ec297cae21..604e9afb710 100644
--- a/sys-process/fcron/fcron-3.3.0_beta.ebuild
+++ b/sys-process/fcron/fcron-3.2.1-r2.ebuild
@@ -7,15 +7,12 @@ WANT_AUTOMAKE=none
inherit cron pam flag-o-matic user autotools versionator systemd
-MY_PV=${PV/_beta/}
-MY_P=${PN}-${MY_PV}
-
DESCRIPTION="A command scheduler with extended capabilities over cron and anacron"
HOMEPAGE="http://fcron.free.fr/"
-SRC_URI="http://fcron.free.fr/archives/${MY_P}.src.tar.gz -> ${P}.tar.gz"
+SRC_URI="http://fcron.free.fr/archives/${P}.src.tar.gz"
LICENSE="GPL-2"
-KEYWORDS=""
+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 )
@@ -33,8 +30,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.2.1-configure-fix-audit-parameter-check.patch
)
-S="${WORKDIR}/${MY_P}"
-
pkg_setup() {
enewgroup fcron
enewuser fcron -1 -1 -1 fcron
@@ -166,9 +161,11 @@ src_install() {
EOF
newpamd "${T}"/fcrontab.pam fcrontab
- newinitd "${FILESDIR}"/fcron.init.4 fcron
+ 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 )
diff --git a/sys-process/fcron/fcron-3.3.0_beta.ebuild b/sys-process/fcron/fcron-3.3.0_beta-r1.ebuild
similarity index 98%
rename from sys-process/fcron/fcron-3.3.0_beta.ebuild
rename to sys-process/fcron/fcron-3.3.0_beta-r1.ebuild
index 0ec297cae21..10f03c92f51 100644
--- a/sys-process/fcron/fcron-3.3.0_beta.ebuild
+++ b/sys-process/fcron/fcron-3.3.0_beta-r1.ebuild
@@ -166,9 +166,11 @@ src_install() {
EOF
newpamd "${T}"/fcrontab.pam fcrontab
- newinitd "${FILESDIR}"/fcron.init.4 fcron
+ 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 )
diff --git a/sys-process/fcron/files/fcron.confd b/sys-process/fcron/files/fcron.confd
new file mode 100644
index 00000000000..ea907d8e80b
--- /dev/null
+++ b/sys-process/fcron/files/fcron.confd
@@ -0,0 +1,7 @@
+# /etc/conf.d/fcron
+
+# Options to fcron
+# See fcron(8) for more details
+# Notes:
+# * Do not specify another CONFIGFILE
+#FCRON_OPTS=""
diff --git a/sys-process/fcron/files/fcron.init-r5 b/sys-process/fcron/files/fcron.init-r5
new file mode 100644
index 00000000000..4021cb2fbb3
--- /dev/null
+++ b/sys-process/fcron/files/fcron.init-r5
@@ -0,0 +1,100 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+FCRON_INSTANCE="${SVCNAME##*.}"
+FCRON_OPTS=${FCRON_OPTS:-""}
+
+if [ -n "${FCRON_INSTANCE}" ] && [ "${SVCNAME}" != "fcron" ]; then
+ FCRON_CONFIGFILE="/etc/fcron/fcron.${FCRON_INSTANCE}.conf"
+else
+ FCRON_CONFIGFILE="/etc/fcron/fcron.conf"
+fi
+
+getconfig() {
+ local key="$1"
+ local value_default="$2"
+ local value=
+
+ if service_started; then
+ value="$(service_get_value "${key}")"
+ fi
+
+ if [ -z "${value}" ] && [ -r "${FCRON_CONFIGFILE}" ]; then
+ value="$(sed -n -e 's:^'"${key}"'[ \t]*=[ \t]*::p' "${FCRON_CONFIGFILE}")"
+ fi
+
+ if [ -z "${value}" ]; then
+ # Value not explicitly set in the configfile or configfile does not exist
+ # or is not readable
+ echo "${value_default}"
+ else
+ echo "${value}"
+ fi
+
+ return 0
+}
+
+depend() {
+ config "${FCRON_CONFIGFILE}"
+
+ use clock logger
+ need hostname
+
+ # provide the cron service if we are the main instance
+ [ "${SVCNAME}" = "fcron" ] && provide cron
+}
+
+
+command="/usr/libexec/fcron"
+command_args="${FCRON_OPTS} -c \"${FCRON_CONFIGFILE}\""
+start_stop_daemon_args=${FCRON_SSDARGS:-"--wait 1000"}
+pidfile="$(getconfig pidfile /run/fcron.pid)"
+fcrontabs="$(getconfig fcrontabs /var/spool/fcron)"
+fifofile="$(getconfig fifofile /run/fcron.fifo)"
+required_files="${FCRON_CONFIGFILE}"
+
+extra_started_commands="reload"
+
+reload() {
+ start-stop-daemon --signal HUP --pidfile "${pidfile}"
+}
+
+start_pre() {
+ if [ "${SVCNAME}" != "fcron" ]; then
+ local _has_invalid_instance_cfg=0
+
+ if [ "${pidfile}" = "/run/fcron.pid" ]; then
+ eerror "You cannot use the same pidfile like the default instance!"
+ eerror "Please adjust your 'pidfile' setting in '${FCRON_CONFIGFILE}'."
+ _has_invalid_instance_cfg=1
+ fi
+
+ if [ "${fcrontabs}" = "/var/spool/fcron" ]; then
+ eerror "You cannot use the same fcrontabs location like the default instance!"
+ eerror "Please adjust your 'fcrontabs' setting in '${FCRON_CONFIGFILE}'."
+ _has_invalid_instance_cfg=1
+ fi
+
+ if [ "${fifofile}" = "/run/fcron.fifo" ]; then
+ eerror "You cannot use the same fifo file like the default instance!"
+ eerror "Please adjust your 'fifofile' setting in '${FCRON_CONFIGFILE}'."
+ _has_invalid_instance_cfg=1
+ fi
+
+ [ ${_has_invalid_instance_cfg} -ne 0 ] && return 1
+ fi
+
+ checkpath --file "${FCRON_CONFIGFILE}" --owner root:fcron --mode 0640
+
+ if [ ! -d "${fcrontabs}" ]; then
+ ebegin "Creating missing spooldir '${fcrontabs}'"
+ ${command} --newspooldir "${fcrontabs}"
+ eend $?
+ fi
+}
+
+start_post() {
+ service_set_value fcrontabs "${fcrontabs}"
+ service_set_value fifofile "${fifofile}"
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-process/fcron/files/, sys-process/fcron/
@ 2018-02-05 22:53 Anthony G. Basile
0 siblings, 0 replies; 4+ messages in thread
From: Anthony G. Basile @ 2018-02-05 22:53 UTC (permalink / raw
To: gentoo-commits
commit: 542ea24d025c589074ca91c1d71c75a93f9b278e
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 5 22:53:01 2018 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Feb 5 22:53:22 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=542ea24d
sys-process/fcron: make check_system_crontabs musl friendly
Package-Manager: Portage-2.3.19, Repoman-2.3.6
...fcron-3.2.1-r2.ebuild => fcron-3.2.1-r3.ebuild} | 3 ++-
sys-process/fcron/fcron-3.3.0_beta-r1.ebuild | 3 ++-
.../files/fcron-3.2.1-musl-getopt-order.patch | 24 ++++++++++++++++++++++
3 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/sys-process/fcron/fcron-3.2.1-r2.ebuild b/sys-process/fcron/fcron-3.2.1-r3.ebuild
similarity index 98%
rename from sys-process/fcron/fcron-3.2.1-r2.ebuild
rename to sys-process/fcron/fcron-3.2.1-r3.ebuild
index 604e9afb710..fe5f30de4ec 100644
--- a/sys-process/fcron/fcron-3.2.1-r2.ebuild
+++ b/sys-process/fcron/fcron-3.2.1-r3.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"
@@ -28,6 +28,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
)
pkg_setup() {
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 10f03c92f51..f842946849e 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 00000000000..801baad9171
--- /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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-process/fcron/files/, sys-process/fcron/
@ 2024-12-15 16:16 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2024-12-15 16:16 UTC (permalink / raw
To: gentoo-commits
commit: 7a5d20a3db18fb21588937fb04b247da1a101e5a
Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Fri Dec 13 19:29:30 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 15 16:15:37 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a5d20a3
sys-process/fcron: fix build with gcc 15
Closes: https://bugs.gentoo.org/944230
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Closes: https://github.com/gentoo/gentoo/pull/39708
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-process/fcron/fcron-3.3.1-r2.ebuild | 271 +++++++++++++++++++++
.../fcron/files/fcron-3.3.1-gcc15-bool.patch | 71 ++++++
2 files changed, 342 insertions(+)
diff --git a/sys-process/fcron/fcron-3.3.1-r2.ebuild b/sys-process/fcron/fcron-3.3.1-r2.ebuild
new file mode 100644
index 000000000000..dd7b74892519
--- /dev/null
+++ b/sys-process/fcron/fcron-3.3.1-r2.ebuild
@@ -0,0 +1,271 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WANT_AUTOMAKE="none"
+
+inherit autotools cron flag-o-matic pam systemd user-info
+
+MY_PV="${PV/_beta/}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="A command scheduler with extended capabilities over cron and anacron"
+HOMEPAGE="http://fcron.free.fr/"
+SRC_URI="http://fcron.free.fr/archives/${MY_P}.src.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="audit debug pam selinux l10n_fr +mta +system-crontab readline"
+
+DEPEND="
+ acct-group/fcron
+ acct-user/fcron
+ virtual/libcrypt:=
+ audit? ( sys-process/audit )
+ pam? ( sys-libs/pam )
+ readline? ( sys-libs/readline:= )
+ selinux? ( sys-libs/libselinux )
+"
+
+RDEPEND="
+ ${DEPEND}
+ app-misc/editor-wrapper
+ mta? ( virtual/mta )
+ pam? ( sys-auth/pambase )
+"
+
+PATCHES=(
+ "${FILESDIR}"/fcron-3.1.1-noreadline.patch
+ "${FILESDIR}"/fcron-3.2.1-musl-getopt-order.patch
+ "${FILESDIR}"/fcron-3.3.1-gcc15-bool.patch
+)
+
+pkg_setup() {
+ 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 "s:\(@LIBS@\):\$(LDFLAGS) \1:" -i Makefile.in || die "sed failed"
+
+ # Adjust fcrontab path
+ sed -e 's:/etc/fcrontab:/etc/fcron/fcrontab:' -i 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
+ local myeconfargs=(
+ --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)"
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ default
+
+ # bug #216460
+ sed \
+ -e 's:/usr/local/etc/fcron:/etc/fcron/fcron:g' \
+ -e 's:/usr/local/etc:/etc:g' \
+ -e 's:/usr/local/:/usr/:g' \
+ -i 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 6755 /usr/bin/fcron{dyn,tab}
+
+ fperms 4710 /usr/libexec/fcronsighup
+
+ fperms 0750 /etc/fcron
+ fperms 0640 /etc/fcron/fcron.{allow,deny,conf}
+
+ use pam && 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
+ use pam && 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 ver_test "3.2.1" -gt ${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/files/fcron-3.3.1-gcc15-bool.patch b/sys-process/fcron/files/fcron-3.3.1-gcc15-bool.patch
new file mode 100644
index 000000000000..838f7977bfa3
--- /dev/null
+++ b/sys-process/fcron/files/fcron-3.3.1-gcc15-bool.patch
@@ -0,0 +1,71 @@
+Fix for GCC 15
+
+Fixed upstream in a larger https://github.com/yo8192/fcron/commit/2b18ac9cd8647dd32367fdf07eafa24c51cbe410#diff-9fc4ab3ff6d27d1cb665e161fac24bc5d31ce38c12c6653fb8a63640033691d4
+
+--- a/fcrondyn_svr.c
++++ b/fcrondyn_svr.c
+@@ -250,7 +250,7 @@ auth_client_so_peercred(struct fcrondyn_cl *client)
+ * Sets client->fcl_user on success, don't do anything on failure
+ * so that the client stays unauthenticated */
+ {
+- const int true = 1;
++ const int value = 1;
+ /* There is no ucred.h (or equivalent) on linux to define struct ucred (!!)
+ * so we do it here */
+ #if ! ( defined(HAVE_CRED_H) && defined(HAVE_UCRED_H) \
+@@ -265,8 +265,8 @@ auth_client_so_peercred(struct fcrondyn_cl *client)
+ socklen_t cred_size = sizeof(cred);
+ struct passwd *p_entry = NULL;
+
+- setsockopt(client->fcl_sock_fd, SOL_SOCKET, SO_PASSCRED, &true,
+- sizeof(true));
++ setsockopt(client->fcl_sock_fd, SOL_SOCKET, SO_PASSCRED, &value,
++ sizeof(value));
+ if (getsockopt
+ (client->fcl_sock_fd, SOL_SOCKET, SO_PEERCRED, &cred,
+ &cred_size) != 0) {
+--- a/fileconf.c
++++ b/fileconf.c
+@@ -464,34 +464,34 @@ get_bool(char *ptr, int *i)
+ * return NULL on error */
+ {
+ if (*ptr == '1')
+- goto true;
++ goto conf_true;
+ else if (*ptr == '0')
+- goto false;
++ goto conf_false;
+ else if (strncmp(ptr, "true", 4) == 0) {
+ ptr += 3;
+- goto true;
++ goto conf_true;
+ }
+ else if (strncmp(ptr, "yes", 3) == 0) {
+ ptr += 2;
+- goto true;
++ goto conf_true;
+ }
+ else if (strncmp(ptr, "false", 5) == 0) {
+ ptr += 4;
+- goto false;
++ goto conf_false;
+ }
+ else if (strncmp(ptr, "no", 2) == 0) {
+ ptr += 1;
+- goto false;
++ goto conf_false;
+ }
+ else
+ return NULL;
+
+- true:
++ conf_true:
+ *i = 1;
+ ptr++;
+ return ptr;
+
+- false:
++ conf_false:
+ *i = 0;
+ ptr++;
+ return ptr;
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-12-15 16:16 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-02-05 22:53 [gentoo-commits] repo/gentoo:master commit in: sys-process/fcron/files/, sys-process/fcron/ Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2024-12-15 16:16 Sam James
2017-07-25 12:51 Thomas Deutschmann
2016-11-19 18:56 Thomas Deutschmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox