From d5008eade749f4c4695924b5f812571e29bf085f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D1=80=D0=B0=D1=86=D0=B5=D0=B2=D1=81=D0=BA=D0=B8?= =?UTF-8?q?=D0=B9=20=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80?= Date: Tue, 1 Sep 2020 17:21:51 +0300 Subject: [PATCH] remove sys-process/vixie-cron --- profiles/default/package.mask | 10 - sys-process/vixie-cron/Manifest | 2 - sys-process/vixie-cron/files/crontab | 15 -- sys-process/vixie-cron/files/crontab-3.0.1-r4 | 14 -- sys-process/vixie-cron/files/crontab.5.diff | 35 --- sys-process/vixie-cron/files/pamd.compatible | 7 - .../files/vixie-cron-4.1-basename.diff | 20 -- .../files/vixie-cron-4.1-commandline.patch | 13 - .../vixie-cron/files/vixie-cron-4.1-cron.deny | 4 - .../files/vixie-cron-4.1-crontabrace.patch | 29 --- .../files/vixie-cron-4.1-hardlink.patch | 11 - .../vixie-cron/files/vixie-cron-4.1-pam.patch | 67 ------ .../files/vixie-cron-4.1-selinux-2.patch | 225 ------------------ .../files/vixie-cron-4.1-setuid_check.patch | 29 --- sys-process/vixie-cron/files/vixie-cron.rc7 | 12 - .../vixie-cron/files/vixie-cron.service | 11 - sys-process/vixie-cron/metadata.xml | 5 - .../vixie-cron/vixie-cron-4.1-r15.ebuild | 126 ---------- 18 files changed, 635 deletions(-) delete mode 100644 sys-process/vixie-cron/Manifest delete mode 100644 sys-process/vixie-cron/files/crontab delete mode 100644 sys-process/vixie-cron/files/crontab-3.0.1-r4 delete mode 100644 sys-process/vixie-cron/files/crontab.5.diff delete mode 100644 sys-process/vixie-cron/files/pamd.compatible delete mode 100644 sys-process/vixie-cron/files/vixie-cron-4.1-basename.diff delete mode 100644 sys-process/vixie-cron/files/vixie-cron-4.1-commandline.patch delete mode 100644 sys-process/vixie-cron/files/vixie-cron-4.1-cron.deny delete mode 100644 sys-process/vixie-cron/files/vixie-cron-4.1-crontabrace.patch delete mode 100644 sys-process/vixie-cron/files/vixie-cron-4.1-hardlink.patch delete mode 100644 sys-process/vixie-cron/files/vixie-cron-4.1-pam.patch delete mode 100644 sys-process/vixie-cron/files/vixie-cron-4.1-selinux-2.patch delete mode 100644 sys-process/vixie-cron/files/vixie-cron-4.1-setuid_check.patch delete mode 100644 sys-process/vixie-cron/files/vixie-cron.rc7 delete mode 100644 sys-process/vixie-cron/files/vixie-cron.service delete mode 100644 sys-process/vixie-cron/metadata.xml delete mode 100644 sys-process/vixie-cron/vixie-cron-4.1-r15.ebuild diff --git a/profiles/default/package.mask b/profiles/default/package.mask index b0260af1b..0266eadd9 100644 --- a/profiles/default/package.mask +++ b/profiles/default/package.mask @@ -2,22 +2,12 @@ sci-libs/blas-reference sci-libs/cblas-reference sci-libs/lapack-reference -# deprecated -sys-process/vixie-cron - # mask portage wgetpaste >app-text/wgetpaste-2.25-r4 # prevent automagic depends sys-libs/db:6.0 -=net-dns/bind-9.14.12 - =dev-python/PyQt5-5.14.2-r1 =dev-python/PyQt5-sip-4.19.22-r1 =dev-python/sip-4.19.22-r1 - -# not supported gnome-extra/libgda-5.2.8-r1 -=dev-libs/libxml2-2.9.10 -=dev-libs/libxml2-2.9.10-r1 -=dev-libs/libxslt-1.1.34 diff --git a/sys-process/vixie-cron/Manifest b/sys-process/vixie-cron/Manifest deleted file mode 100644 index 9e580f49e..000000000 --- a/sys-process/vixie-cron/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST vixie-cron-4.1-gentoo-r4.patch.bz2 4204 BLAKE2B 1e276ade20e61ae17e45c10145532e3f32dfa74e32b6cbecde22863de82afb280e97d3b380626451524cfc7fc0663934657509b228a51b3b5ad42e26e5cceb3d SHA512 eec8f89a97927a3557bd1350ed7e9baa0ec133e2c49f8f0fbf51adf62c377451dc48867ca6affcc7576833a5b6b749613c9b99641b1b658853f91d8071c3411b -DIST vixie-cron-4.1.tar.bz2 54246 BLAKE2B 920bf5d95b24cd41677f4a748da02231ed75713ff280acafdf476ad0a71e73068bbad9070fc57d3b0cb39a9539da24182aa2dbc9eb9dfe241adaf9a46f9c5db2 SHA512 1db9a246243dbd4934438ce70bf022215ccffed4b899a77b076d5a7679a7b98a23ef67344e329fc7a836df90685581e10b1c95709db40601c33d2052ce561e04 diff --git a/sys-process/vixie-cron/files/crontab b/sys-process/vixie-cron/files/crontab deleted file mode 100644 index 15622cb83..000000000 --- a/sys-process/vixie-cron/files/crontab +++ /dev/null @@ -1,15 +0,0 @@ -# for vixie cron -# - -# Global variables -SHELL=/bin/bash -PATH=/sbin:/bin:/usr/sbin:/usr/bin -MAILTO=root -HOME=/ - -# check scripts in cron.hourly, cron.daily, cron.weekly and cron.monthly -*/15 * * * * root test -x /usr/sbin/run-crons && /usr/sbin/run-crons -0 * * * * root rm -f /var/spool/cron/lastrun/cron.hourly -0 3 * * * root rm -f /var/spool/cron/lastrun/cron.daily -15 4 * * 6 root rm -f /var/spool/cron/lastrun/cron.weekly -30 5 1 * * root rm -f /var/spool/cron/lastrun/cron.monthly diff --git a/sys-process/vixie-cron/files/crontab-3.0.1-r4 b/sys-process/vixie-cron/files/crontab-3.0.1-r4 deleted file mode 100644 index d1720d494..000000000 --- a/sys-process/vixie-cron/files/crontab-3.0.1-r4 +++ /dev/null @@ -1,14 +0,0 @@ -# for vixie cron - -# Global variables -SHELL=/bin/bash -PATH=/sbin:/bin:/usr/sbin:/usr/bin -MAILTO=root -HOME=/ - -# check scripts in cron.hourly, cron.daily, cron.weekly and cron.monthly -59 * * * * root rm -f /var/spool/cron/lastrun/cron.hourly -9 3 * * * root rm -f /var/spool/cron/lastrun/cron.daily -19 4 * * 6 root rm -f /var/spool/cron/lastrun/cron.weekly -29 5 1 * * root rm -f /var/spool/cron/lastrun/cron.monthly -*/10 * * * * root test -x /usr/sbin/run-crons && /usr/sbin/run-crons diff --git a/sys-process/vixie-cron/files/crontab.5.diff b/sys-process/vixie-cron/files/crontab.5.diff deleted file mode 100644 index f50db3dc7..000000000 --- a/sys-process/vixie-cron/files/crontab.5.diff +++ /dev/null @@ -1,35 +0,0 @@ ---- crontab.5.orig 2004-02-19 20:40:04.954132624 +0000 -+++ crontab.5 2004-02-19 20:45:27.033169168 +0000 -@@ -153,6 +153,32 @@ - ``30 4 1,15 * 5'' - would cause a command to be run at 4:30 am on the 1st and 15th of each - month, plus every Friday. -+.PP -+Instead of the first five fields, one of eight special strings may -+appear: -+.IP -+.ta 1.5i -+string meaning -+.br -+------ ------- -+.br -+@reboot Run once, at startup. -+.br -+@yearly Run once a year, "0 0 1 1 *". -+.br -+@annually (same as @yearly) -+.br -+@monthly Run once a month, "0 0 1 * *". -+.br -+@weekly Run once a week, "0 0 * * 0". -+.br -+@daily Run once a day, "0 0 * * *". -+.br -+@midnight (same as @daily) -+.br -+@hourly Run once an hour, "0 * * * *". -+.br -+.fi - .SH EXAMPLE CRON FILE - .nf - diff --git a/sys-process/vixie-cron/files/pamd.compatible b/sys-process/vixie-cron/files/pamd.compatible deleted file mode 100644 index 62eb029ea..000000000 --- a/sys-process/vixie-cron/files/pamd.compatible +++ /dev/null @@ -1,7 +0,0 @@ -#%PAM-1.0 - -account required pam_unix.so - -auth required pam_unix.so - -session optional pam_limits.so diff --git a/sys-process/vixie-cron/files/vixie-cron-4.1-basename.diff b/sys-process/vixie-cron/files/vixie-cron-4.1-basename.diff deleted file mode 100644 index c7930ddc4..000000000 --- a/sys-process/vixie-cron/files/vixie-cron-4.1-basename.diff +++ /dev/null @@ -1,20 +0,0 @@ -diff --exclude='*~' -urN vixie-cron-4.1.orig/cron.c vixie-cron-4.1/cron.c ---- vixie-cron-4.1.orig/cron.c 2005-02-23 02:05:30.730975808 -0500 -+++ vixie-cron-4.1/cron.c 2005-02-23 02:07:13.233393072 -0500 -@@ -25,6 +25,7 @@ - - #define MAIN_PROGRAM - -+#include - #include "cron.h" - - enum timejump { negative, small, medium, large }; -@@ -61,7 +62,7 @@ - cron_db database; - int fd; - -- ProgramName = argv[0]; -+ ProgramName = basename(argv[0]); - - setlocale(LC_ALL, ""); - diff --git a/sys-process/vixie-cron/files/vixie-cron-4.1-commandline.patch b/sys-process/vixie-cron/files/vixie-cron-4.1-commandline.patch deleted file mode 100644 index d204ad882..000000000 --- a/sys-process/vixie-cron/files/vixie-cron-4.1-commandline.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- entry.c.orig 2004-08-27 20:09:34.000000000 +0200 -+++ entry.c 2004-12-01 22:16:10.992268200 +0100 -@@ -336,7 +336,9 @@ - - /* If the first character of the command is '-' it is a cron option. - */ -- while ((ch = get_char(file)) == '-') { -+ ch = get_char(file); -+ Skip_Blanks(ch, file) -+ while (ch == '-') { - switch (ch = get_char(file)) { - case 'q': - e->flags |= DONT_LOG; diff --git a/sys-process/vixie-cron/files/vixie-cron-4.1-cron.deny b/sys-process/vixie-cron/files/vixie-cron-4.1-cron.deny deleted file mode 100644 index f703d5846..000000000 --- a/sys-process/vixie-cron/files/vixie-cron-4.1-cron.deny +++ /dev/null @@ -1,4 +0,0 @@ -# If for any reason you have users in the 'cron' group who should not -# be allowed to run crontab, add them to this file (one username per -# line) - diff --git a/sys-process/vixie-cron/files/vixie-cron-4.1-crontabrace.patch b/sys-process/vixie-cron/files/vixie-cron-4.1-crontabrace.patch deleted file mode 100644 index 5109554e1..000000000 --- a/sys-process/vixie-cron/files/vixie-cron-4.1-crontabrace.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- vixie-cron-4.1/crontab.c -+++ vixie-cron-4.1/crontab.c -@@ -314,8 +314,6 @@ - perror("fstat"); - goto fatal; - } -- utimebuf.actime = statbuf.st_atime; -- utimebuf.modtime = statbuf.st_mtime; - - /* Turn off signals. */ - (void)signal(SIGHUP, SIG_IGN); -@@ -374,6 +372,17 @@ - perror(Filename); - exit(ERROR_EXIT); - } -+ if (swap_uids() < OK) { -+ perror("swapping uids"); -+ exit(ERROR_EXIT); -+ } -+ utimebuf.actime = statbuf.st_atime; -+ utimebuf.modtime = statbuf.st_mtime; -+ utime(Filename, &utimebuf); -+ if (swap_uids_back() < OK) { -+ perror("swapping uids back"); -+ exit(ERROR_EXIT); -+ } - utime(Filename, &utimebuf); - again: - rewind(NewCrontab); diff --git a/sys-process/vixie-cron/files/vixie-cron-4.1-hardlink.patch b/sys-process/vixie-cron/files/vixie-cron-4.1-hardlink.patch deleted file mode 100644 index cabdef02e..000000000 --- a/sys-process/vixie-cron/files/vixie-cron-4.1-hardlink.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- database.c.orig 2007-04-08 21:06:16.913019387 +0200 -+++ database.c 2007-04-08 21:06:29.489736093 +0200 -@@ -251,7 +251,7 @@ - log_it(fname, getpid(), "WRONG FILE OWNER", tabname); - goto next_crontab; - } -- if (statbuf->st_nlink != 1) { -+ if (statbuf->st_nlink != 1 && pw != NULL) { - log_it(fname, getpid(), "BAD LINK COUNT", tabname); - goto next_crontab; - } diff --git a/sys-process/vixie-cron/files/vixie-cron-4.1-pam.patch b/sys-process/vixie-cron/files/vixie-cron-4.1-pam.patch deleted file mode 100644 index 64bf67138..000000000 --- a/sys-process/vixie-cron/files/vixie-cron-4.1-pam.patch +++ /dev/null @@ -1,67 +0,0 @@ ---- vixie-cron-3.0.1.orig/Makefile Thu May 30 19:47:00 2002 -+++ vixie-cron-3.0.1/Makefile Thu May 30 20:54:46 2002 -@@ -55,7 +55,7 @@ - INCLUDE = -I. - #INCLUDE = - #<> --LIBS = -+LIBS = -lpam - #<> - OPTIM = $(RPM_OPT_FLAGS) - #OPTIM = -g ---- vixie-cron-3.0.1.orig/do_command.c Thu May 30 19:47:00 2002 -+++ vixie-cron-3.0.1/do_command.c Thu May 30 20:55:50 2002 -@@ -25,6 +25,18 @@ - - #include "cron.h" - -+#include -+static pam_handle_t *pamh = NULL; -+static const struct pam_conv conv = { -+ NULL -+}; -+#define PAM_FAIL_CHECK if (retcode != PAM_SUCCESS) { \ -+ fprintf(stderr,"\n%s\n",pam_strerror(pamh, retcode)); \ -+ syslog(LOG_ERR,"%s",pam_strerror(pamh, retcode)); \ -+ pam_end(pamh, retcode); exit(1); \ -+ } -+ -+ - static void child_process(entry *, user *); - static int safe_p(const char *, const char *); - -@@ -65,6 +77,7 @@ - int stdin_pipe[2], stdout_pipe[2]; - char *input_data, *usernm, *mailto; - int children = 0; -+ int retcode = 0; - - Debug(DPROC, ("[%ld] child_process('%s')\n", (long)getpid(), e->cmd)) - -@@ -134,6 +147,16 @@ - *p = '\0'; - } - -+ -+ retcode = pam_start("cron", usernm, &conv, &pamh); -+ PAM_FAIL_CHECK; -+ retcode = pam_acct_mgmt(pamh, PAM_SILENT); -+ PAM_FAIL_CHECK; -+ retcode = pam_open_session(pamh, PAM_SILENT); -+ PAM_FAIL_CHECK; -+ retcode = pam_setcred(pamh, PAM_ESTABLISH_CRED | PAM_SILENT); -+ PAM_FAIL_CHECK; -+ - /* fork again, this time so we can exec the user's command. - */ - switch (vfork()) { -@@ -507,6 +530,9 @@ - Debug(DPROC, (", dumped core")) - Debug(DPROC, ("\n")) - } -+ pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT); -+ retcode = pam_close_session(pamh, PAM_SILENT); -+ pam_end(pamh, retcode); - } - - static int diff --git a/sys-process/vixie-cron/files/vixie-cron-4.1-selinux-2.patch b/sys-process/vixie-cron/files/vixie-cron-4.1-selinux-2.patch deleted file mode 100644 index 2341d0923..000000000 --- a/sys-process/vixie-cron/files/vixie-cron-4.1-selinux-2.patch +++ /dev/null @@ -1,225 +0,0 @@ -diff -ur vixie-cron-4.1/Makefile vixie-cron-4.1-selinux/Makefile ---- vixie-cron-4.1/Makefile 2004-08-28 02:09:33.000000000 +0800 -+++ vixie-cron-4.1-selinux/Makefile 2017-04-26 22:16:53.321394815 +0800 -@@ -68,7 +68,8 @@ - #<> - CC = gcc -Wall -Wno-unused -Wno-comment - #<> --DEFS = -+DEFS = -s -DWITH_SELINUX -+LIBS += -lselinux - #(SGI IRIX systems need this) - #DEFS = -D_BSD_SIGNALS -Dconst= - #<> -diff -ur vixie-cron-4.1/database.c vixie-cron-4.1-selinux/database.c ---- vixie-cron-4.1/database.c 2004-08-28 02:09:34.000000000 +0800 -+++ vixie-cron-4.1-selinux/database.c 2017-04-27 01:31:34.757942605 +0800 -@@ -28,6 +28,15 @@ - - #include "cron.h" - -+#ifdef WITH_SELINUX -+#include -+#include -+#include -+#define SYSUSERNAME "system_u" -+#else -+#define SYSUSERNAME "*system*" -+#endif -+ - #define TMAX(a,b) ((a)>(b)?(a):(b)) - - static void process_crontab(const char *, const char *, -@@ -183,7 +192,7 @@ - if (fname == NULL) { - /* must be set to something for logging purposes. - */ -- fname = "*system*"; -+ fname = SYSUSERNAME; - } else if ((pw = getpwnam(uname)) == NULL) { - /* file doesn't have a user in passwd file. - */ -@@ -245,6 +254,117 @@ - free_user(u); - log_it(fname, getpid(), "RELOAD", tabname); - } -+#ifdef WITH_SELINUX -+ if (is_selinux_enabled()) { -+ security_context_t file_context=NULL; -+ security_context_t user_context=NULL; -+ context_t current_context = NULL; -+ char *current_context_str = NULL; -+ struct av_decision avd; -+ int retval=0; -+ char *seuser=NULL; -+ char *level=NULL; -+ int sys_user = 0; -+ -+ sys_user = strcmp(SYSUSERNAME, fname); -+ -+ if (fgetfilecon(crontab_fd, &file_context) < OK) { -+ log_it(fname, getpid(), "getfilecon FAILED", tabname); -+ goto next_crontab; -+ } -+ -+ if (sys_user != 0) { -+ if (getseuserbyname(fname, &seuser, &level) < 0) { -+ log_it(fname, getpid(), "NO SEUSER", tabname); -+ goto next_crontab; -+ } -+ } else { -+ if (getcon(¤t_context_str) < 0) { -+ log_it(fname, getpid(), "getcon FAILED", tabname); -+ goto next_crontab; -+ } -+ -+ current_context = context_new(current_context_str); -+ if (current_context == 0) { -+ log_it(fname, getpid(), "context new FAILED", tabname); -+ freecon(current_context_str); -+ goto next_crontab; -+ } -+ -+ seuser = context_user_get(current_context); -+ level = context_range_get(current_context); -+ } -+ -+ if (get_default_context_with_level(seuser, level, NULL, &user_context) < 0) { -+ log_it(fname, getpid(), "NO CONTEXT", tabname); -+ freecon(file_context); -+ if (sys_user != 0) { -+ free(seuser); -+ free(level); -+ } -+ freecon(current_context_str); -+ context_free(current_context); -+ goto next_crontab; -+ } -+ -+ /* -+ * Since crontab files are not directly executed, -+ * crond must ensure that the crontab file has -+ * a context that is appropriate for the context of -+ * the user cron job. It performs an entrypoint -+ * permission check for this purpose. -+ */ -+ security_class_t file_class; -+ access_vector_t entrypoint_bit; -+ file_class = string_to_security_class("file"); -+ if (file_class == 0) { -+ log_it(fname, getpid(), "file CLASS NOT DEFINED", tabname); -+ freecon(current_context_str); -+ context_free(current_context); -+ freecon(user_context); -+ freecon(file_context); -+ if (sys_user != 0) { -+ free(seuser); -+ free(level); -+ } -+ goto next_crontab; -+ } -+ -+ entrypoint_bit = string_to_av_perm(file_class, "entrypoint"); -+ if (entrypoint_bit == 0) { -+ log_it(fname, getpid(), "file:entrypoint AV NOT DEFINED", tabname); -+ freecon(current_context_str); -+ context_free(current_context); -+ freecon(user_context); -+ freecon(file_context); -+ if (sys_user != 0) { -+ free(seuser); -+ free(level); -+ } -+ goto next_crontab; -+ } -+ -+ retval = security_compute_av_raw(user_context, -+ file_context, -+ file_class, -+ entrypoint_bit, -+ &avd); -+ -+ freecon(user_context); -+ freecon(file_context); -+ if (sys_user != 0) { -+ free(seuser); -+ free(level); -+ } -+ context_free(current_context); -+ freecon(current_context_str); -+ -+ if (retval || ((entrypoint_bit & avd.allowed) != entrypoint_bit)) { -+ log_it(fname, getpid(), "ENTRYPOINT FAILED", tabname); -+ goto next_crontab; -+ } -+ } -+#endif - u = load_user(crontab_fd, pw, fname); - if (u != NULL) { - u->mtime = statbuf->st_mtime; -diff -ur vixie-cron-4.1/do_command.c vixie-cron-4.1-selinux/do_command.c ---- vixie-cron-4.1/do_command.c 2004-08-28 02:09:34.000000000 +0800 -+++ vixie-cron-4.1-selinux/do_command.c 2017-04-27 01:30:49.045144698 +0800 -@@ -25,6 +25,12 @@ - - #include "cron.h" - -+#ifdef WITH_SELINUX -+#include -+#include -+#include -+#endif -+ - static void child_process(entry *, user *); - static int safe_p(const char *, const char *); - -@@ -265,6 +271,49 @@ - _exit(OK_EXIT); - } - # endif /*DEBUGGING*/ -+#ifdef WITH_SELINUX -+ if (is_selinux_enabled()) { -+ char *seuser = NULL; -+ char *level = NULL; -+ char *current_context_str = NULL; -+ security_context_t scontext; -+ context_t current_context = NULL; -+ -+ if (strcmp("system_u", u->name) != 0) { -+ if (getseuserbyname(u->name, &seuser, &level) < 0) { -+ fprintf(stderr, "getseuserbyname: Could not determine seuser for user %s\n", u->name); -+ _exit(ERROR_EXIT); -+ } -+ } else { -+ if (getcon(¤t_context_str) < 0) { -+ fprintf(stderr, "getcon FAILED\n"); -+ _exit(ERROR_EXIT); -+ } -+ -+ current_context = context_new(current_context_str); -+ if (current_context == NULL) { -+ fprintf(stderr, "failed to create new context: %s\n", current_context_str); -+ freecon(current_context_str); -+ _exit(ERROR_EXIT); -+ } -+ -+ seuser = context_user_get(current_context); -+ } -+ -+ if (get_default_context_with_level(seuser, level, NULL, &scontext) < 0) { -+ fprintf(stderr, "get_default_context_with_level: could not get security context for user %s, seuser %s\n", u->name, seuser); -+ _exit(ERROR_EXIT); -+ } -+ -+ if (setexeccon(scontext) < 0) { -+ fprintf(stderr, "setexeccon: Could not set exec context to %s for user %s\n", scontext, u->name); -+ _exit(ERROR_EXIT); -+ } -+ free(seuser); -+ free(level); -+ freecon(scontext); -+ } -+#endif - execle(shell, shell, "-c", e->cmd, (char *)0, e->envp); - fprintf(stderr, "execl: couldn't exec `%s'\n", shell); - perror("execl"); diff --git a/sys-process/vixie-cron/files/vixie-cron-4.1-setuid_check.patch b/sys-process/vixie-cron/files/vixie-cron-4.1-setuid_check.patch deleted file mode 100644 index 42fd8e13e..000000000 --- a/sys-process/vixie-cron/files/vixie-cron-4.1-setuid_check.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- vixie-cron-4.1/do_command.c 2006-05-25 16:44:26.000000000 +0400 -+++ vixie-cron-4.1.lk/do_command.c 2006-05-25 16:42:25.000000000 +0400 -@@ -240,12 +240,23 @@ - } - } - #else -- setgid(e->pwd->pw_gid); -+ - initgroups(usernm, e->pwd->pw_gid); - #if (defined(BSD)) && (BSD >= 199103) - setlogin(usernm); - #endif /* BSD */ -- setuid(e->pwd->pw_uid); /* we aren't root after this... */ -+ // setuid(e->pwd->pw_uid); /* we aren't root after this... */ -+ -+ if ( setgid(e->pwd->pw_gid) == -1 ) { -+ fprintf(stderr,"can't set gid for %s\n", e->pwd->pw_name); -+ _exit(1); -+ } -+ -+ if ( setuid(e->pwd->pw_uid) == -1 ) { -+ fprintf(stderr,"can't set uid for %s\n", e->pwd->pw_name); -+ _exit(1); -+ } -+ - - #endif /* LOGIN_CAP */ - chdir(env_get("HOME", e->envp)); - diff --git a/sys-process/vixie-cron/files/vixie-cron.rc7 b/sys-process/vixie-cron/files/vixie-cron.rc7 deleted file mode 100644 index 0bb47f4af..000000000 --- a/sys-process/vixie-cron/files/vixie-cron.rc7 +++ /dev/null @@ -1,12 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -command=/usr/sbin/cron -pidfile=/var/run/cron.pid - -depend() { - use clock logger - need localmount - provide cron -} diff --git a/sys-process/vixie-cron/files/vixie-cron.service b/sys-process/vixie-cron/files/vixie-cron.service deleted file mode 100644 index 66c3862e4..000000000 --- a/sys-process/vixie-cron/files/vixie-cron.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Vixie Cron Daemon - -[Service] -Type=forking -ExecStart=/usr/sbin/cron -ExecStop=/bin/kill -TERM $MAINPID -IgnoreSIGPIPE=false - -[Install] -WantedBy=multi-user.target diff --git a/sys-process/vixie-cron/metadata.xml b/sys-process/vixie-cron/metadata.xml deleted file mode 100644 index 7a38bb900..000000000 --- a/sys-process/vixie-cron/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/sys-process/vixie-cron/vixie-cron-4.1-r15.ebuild b/sys-process/vixie-cron/vixie-cron-4.1-r15.ebuild deleted file mode 100644 index 5b0ba4eca..000000000 --- a/sys-process/vixie-cron/vixie-cron-4.1-r15.ebuild +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=0 - -inherit cron toolchain-funcs pam eutils flag-o-matic user systemd - -# no useful homepage, bug #65898 -HOMEPAGE="ftp://ftp.isc.org/isc/cron/" -DESCRIPTION="Paul Vixie's cron daemon, a fully featured crond implementation" - -SELINUX_PATCH="${P}-selinux-2.patch" -GENTOO_PATCH_REV="r4" - -SRC_URI="mirror://gentoo/${P}.tar.bz2 - mirror://gentoo/${P}-gentoo-${GENTOO_PATCH_REV}.patch.bz2" - -LICENSE="ISC BSD-2 BSD" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="selinux pam debug" - -DEPEND="selinux? ( sys-libs/libselinux ) - pam? ( virtual/pam )" - -RDEPEND="selinux? ( sys-libs/libselinux ) - pam? ( virtual/pam )" - -#vixie-cron supports /etc/crontab -CRON_SYSTEM_CRONTAB="yes" - -pkg_setup() { - enewgroup crontab -} - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${WORKDIR}"/${P}-gentoo-${GENTOO_PATCH_REV}.patch - epatch "${FILESDIR}"/crontab.5.diff - epatch "${FILESDIR}"/${P}-commandline.patch - epatch "${FILESDIR}"/${P}-basename.diff - epatch "${FILESDIR}"/${P}-setuid_check.patch - epatch "${FILESDIR}"/${P}-hardlink.patch - epatch "${FILESDIR}"/${P}-crontabrace.patch - use pam && epatch "${FILESDIR}"/${P}-pam.patch - use selinux && epatch "${FILESDIR}"/${SELINUX_PATCH} -} - -src_compile() { - use debug && append-flags -DDEBUGGING - - sed -i -e "s:gcc \(-Wall.*\):$(tc-getCC) \1 ${CFLAGS}:" \ - -e "s:^\(LDFLAGS[ \t]\+=\).*:\1 ${LDFLAGS}:" Makefile \ - || die "sed Makefile failed" - - emake || die "emake failed" -} - -src_install() { - docrondir -m 1730 -o root -g crontab - docron - docrontab -m 2755 -o root -g crontab - - # /etc stuff - insinto /etc - newins "${FILESDIR}"/crontab-3.0.1-r4 crontab - newins "${FILESDIR}"/${P}-cron.deny cron.deny - - keepdir /etc/cron.d - newpamd "${FILESDIR}"/pamd.compatible cron - newinitd "${FILESDIR}"/vixie-cron.rc7 vixie-cron - - # doc stuff - doman crontab.1 crontab.5 cron.8 - dodoc "${FILESDIR}"/crontab - dodoc CHANGES CONVERSION FEATURES MAIL README THANKS - - systemd_dounit "${FILESDIR}/${PN}.service" -} - -pkg_preinst() { - has_version "<${CATEGORY}/${PN}-4.1-r10" - fix_spool_dir_perms=$? -} - -pkg_postinst() { - if [[ -f ${ROOT}/etc/init.d/vcron ]] - then - ewarn "Please run:" - ewarn "rc-update del vcron" - ewarn "rc-update add vixie-cron default" - fi - - # bug 71326 - if [[ -u ${ROOT}/etc/pam.d/cron ]] ; then - echo - ewarn "Warning: previous ebuilds didn't reset permissions prior" - ewarn "to installing crontab, resulting in /etc/pam.d/cron being" - ewarn "installed with the SUID and executable bits set." - ewarn - ewarn "Run the following as root to set the proper permissions:" - ewarn " chmod 0644 /etc/pam.d/cron" - echo - fi - - # bug 164466 - if [[ $fix_spool_dir_perms = 0 ]] ; then - echo - ewarn "Previous ebuilds didn't correctly set permissions on" - ewarn "the crontabs spool directory. Proper permissions are" - ewarn "now being set on ${ROOT}var/spool/cron/crontabs/" - ewarn "Look at this directory if you have a specific configuration" - ewarn "that needs special ownerships or permissions." - echo - chmod 1730 "${ROOT}/var/spool/cron/crontabs" || die "chmod failed" - chgrp -R crontab "${ROOT}/var/spool/cron/crontabs" || die "chgrp failed" - cd "${ROOT}/var/spool/cron/crontabs/" - for cronfile in * ; do - [[ ! -f $cronfile ]] || chown "$cronfile:crontab" "$cronfile" \ - || ewarn "chown failed on $cronfile, you probably have an orphan file." - done - fi - - cron_pkg_postinst -}