summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2012-12-23 12:49:38 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2012-12-23 12:49:38 +0000
commit849c989653604885972868b557ce16f864aac82b (patch)
tree3dba968ff64e04428f5e3ba3ca29a08c534b3099 /sys-process/fcron/files
parentVersion bump. (diff)
downloadgentoo-2-849c989653604885972868b557ce16f864aac82b.tar.gz
gentoo-2-849c989653604885972868b557ce16f864aac82b.tar.bz2
gentoo-2-849c989653604885972868b557ce16f864aac82b.zip
Version bump; remove old version. This closes bug #375287, incidentally.
(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 1CD13C8AD4301342)
Diffstat (limited to 'sys-process/fcron/files')
-rw-r--r--sys-process/fcron/files/check_system_crontabs.fcron-config-file.patch47
-rw-r--r--sys-process/fcron/files/fcron-3.0.5-gentoo.patch24
2 files changed, 0 insertions, 71 deletions
diff --git a/sys-process/fcron/files/check_system_crontabs.fcron-config-file.patch b/sys-process/fcron/files/check_system_crontabs.fcron-config-file.patch
deleted file mode 100644
index 5a757e3fe2bd..000000000000
--- a/sys-process/fcron/files/check_system_crontabs.fcron-config-file.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- script/check_system_crontabs.orig 2008-07-18 15:56:49.110205300 +0200
-+++ script/check_system_crontabs 2008-07-18 16:00:46.303783312 +0200
-@@ -74,7 +74,7 @@
- DEFAULT_CROND_DIR=/etc/cron.d
- DEFAULT_CRONTAB_FILE=/etc/crontab
- DEFAULT_FCRONTAB_FILE=/etc/fcrontab
--
-+DEFAULT_FCRON_CONFIG_FILE=/etc/fcron/fcron.conf
- FCRONTAB_PROG=/usr/bin/fcrontab
- FCRONTABS_DIR=/var/spool/fcron
-
-@@ -117,6 +117,7 @@
- -i Interactive use with no delay; same as -s 0.
- -p PATHNAME Full path to or filename of the fcrontab binary; use this
- only if it cannot be found automatically.
-+ -c FILE Full path to fcron config file (default $DEFAULT_FCRON_CONFIG_FILE).
- -F FILE System fcrontab file (default $DEFAULT_FCRONTAB_FILE).
- -C FILE System crontab file (default $DEFAULT_CRONTAB_FILE).
- -D DIR System crontab directory (default $DEFAULT_CROND_DIR).
-@@ -127,6 +128,7 @@
-
- SLEEP_TIME_BEFORE_REBUILD="$DEFAULT_SLEEP_TIME_BEFORE_REBUILD"
- CROND_DIR="$DEFAULT_CROND_DIR"
-+FCRON_CONFIG_FILE="$DEFAULT_FCRON_CONFIG_FILE"
- CRONTAB_FILE="$DEFAULT_CRONTAB_FILE"
- FCRONTAB_FILE="$DEFAULT_FCRONTAB_FILE"
- FCRONTAB_PROG=
-@@ -153,6 +155,10 @@
- FCRONTAB_PROG="$2"
- shift
- ;;
-+ -c)
-+ FCRON_CONFIG_FILE="$2"
-+ shift
-+ ;;
- -F)
- FCRONTAB_FILE="$2"
- shift
-@@ -247,7 +253,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 -c $FCRON_CONFIG_FILE $FCRONTAB_FILE_TMP -u systab
- }
-
- NEED_REBUILD=0
diff --git a/sys-process/fcron/files/fcron-3.0.5-gentoo.patch b/sys-process/fcron/files/fcron-3.0.5-gentoo.patch
deleted file mode 100644
index bb9fbf01958c..000000000000
--- a/sys-process/fcron/files/fcron-3.0.5-gentoo.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: fcron-3.0.5/fcrontab.c
-===================================================================
---- fcron-3.0.5.orig/fcrontab.c
-+++ fcron-3.0.5/fcrontab.c
-@@ -391,7 +391,7 @@ list_file(char *file)
-
- explain("listing %s's fcrontab", user);
-
-- fd = open_as_user(file, useruid, fcrontab_uid, O_RDONLY);
-+ fd = open_as_user(file, useruid, fcrontab_gid, O_RDONLY);
- if ( fd < 0 ) {
- if ( errno == ENOENT ) {
- explain("user %s has no fcrontab.", user);
-@@ -1038,8 +1038,8 @@ main(int argc, char **argv)
- /* Open PAM session for the user and obtain any security
- credentials we might need */
-
-- debug("username: %s", user);
-- retcode = pam_start("fcrontab", user, &apamconv, &pamh);
-+ debug("username: %s runas: %s", user, runas);
-+ retcode = pam_start("fcrontab", runas, &apamconv, &pamh);
- if (retcode != PAM_SUCCESS) die_pame(pamh, retcode, "Could not start PAM");
- retcode = pam_authenticate(pamh, 0); /* is user really user? */
- if (retcode != PAM_SUCCESS)