[gentoo-commits] repo/gentoo:master commit in: sys-process/fcron/files/

[gentoo-commits] repo/gentoo:master commit in: sys-process/fcron/files/

[Thomas Deutschmann]

commit:     9dcd5b2da7816a3c5431bddd28a926f135a85fe2
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 19 20:48:49 2016 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Nov 19 20:49:15 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dcd5b2d

sys-process/fcron: runscript: Make shellcheck happy

Further POSIX improvements.

Package-Manager: portage-2.3.2

 sys-process/fcron/files/fcron.init.4 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys-process/fcron/files/fcron.init.4 b/sys-process/fcron/files/fcron.init.4
index 25fafc1..9b7765f 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}" -a "${SVCNAME}" != "fcron" ]; then
+if [ -n "${FCRON_INSTANCE}" ] && [ "${SVCNAME}" != "fcron" ]; then
 	FCRON_CONFIGFILE="/etc/fcron/fcron.${FCRON_INSTANCE}.conf"
 else
 	FCRON_CONFIGFILE="/etc/fcron/fcron.conf"
@@ -17,10 +17,10 @@ getconfig() {
 	local value=
 
 	if service_started; then
-		value="$(service_get_value ${key})"
+		value="$(service_get_value "${key}")"
 	fi
 
-	if [ -z "${value}" -a -r "${FCRON_CONFIGFILE}" ]; then
+	if [ -z "${value}" ] && [ -r "${FCRON_CONFIGFILE}" ]; then
 		value="$(sed -n -e 's:^'"${key}"'[ \t]*=[ \t]*::p' "${FCRON_CONFIGFILE}")"
 	fi
 

[gentoo-commits] repo/gentoo:master commit in: sys-process/fcron/files/

[Conrad Kostecki]

commit:     bc99d30840a1f0530b16eba3fa2c6bfd1e0059b1
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Dec  3 16:41:18 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Dec  5 21:45:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc99d308

sys-process/fcron: remove unused file

Closes: https://github.com/gentoo/gentoo/pull/23170
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 sys-process/fcron/files/fcron.init.4 | 98 ------------------------------------
 1 file changed, 98 deletions(-)

diff --git a/sys-process/fcron/files/fcron.init.4 b/sys-process/fcron/files/fcron.init.4
deleted file mode 100644
index e253e5bffcfe..000000000000
--- a/sys-process/fcron/files/fcron.init.4
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-FCRON_INSTANCE="${SVCNAME##*.}"
-
-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="-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}"
-}

[gentoo-commits] repo/gentoo:master commit in: sys-process/fcron/files/

[Joonas Niilola]

commit:     589c0b411c93c840fc7a5d220ce76e3547fed6d8
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Mar  1 16:21:16 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Mar  1 16:44:35 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=589c0b41

sys-process/fcron: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/29872
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 ...3.2.1-configure-fix-audit-parameter-check.patch | 30 ----------------------
 1 file changed, 30 deletions(-)

diff --git a/sys-process/fcron/files/fcron-3.2.1-configure-fix-audit-parameter-check.patch b/sys-process/fcron/files/fcron-3.2.1-configure-fix-audit-parameter-check.patch
deleted file mode 100644
index b4166ff9d7e3..000000000000
--- a/sys-process/fcron/files/fcron-3.2.1-configure-fix-audit-parameter-check.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From cc7a684862fee31c442c49d6a537d86979c23220 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Thu, 17 Nov 2016 17:19:35 +0100
-Subject: [PATCH] configure: Fix --with-audit parameter check
-
-Due to a missing "$" the variable "$useaudit" was never checked for
-0 value with the result that you cannot disable building against
-libaudit.
-
-Gentoo-Bug: https://bugs.gentoo.org/540446
----
- configure.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.in b/configure.in
-index 7e7634f..708d1dd 100644
---- a/configure.in
-+++ b/configure.in
-@@ -822,7 +822,7 @@ AC_ARG_WITH(audit,
-     ;;
-   esac ]
- )
--if test useaudit = "0"; then
-+if test "$useaudit" = 0; then
-   AC_MSG_RESULT(no)
- elif test "$useaudit" = "1" && test "$auditavail" != 1; then
-   useaudit=0
--- 
-2.10.2
-