diff --git a/cronie-1.5.7-increase_crontab_limit.patch b/cronie-1.5.7-increase_crontab_limit.patch deleted file mode 100644 index da29a33..0000000 --- a/cronie-1.5.7-increase_crontab_limit.patch +++ /dev/null @@ -1,25 +0,0 @@ -From ec8b5e5569b7f95a71ceca224fb4662f5799833e Mon Sep 17 00:00:00 2001 -From: Danilo Spinella -Date: Tue, 13 Jul 2021 17:08:36 +0200 -Subject: [PATCH] Increase the maximum number of crontab entries - -Old limit is considered too low for users with edge cases. - -Fixes #91. ---- - src/macros.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/macros.h b/src/macros.h -index cba5fb2..d50e981 100644 ---- a/src/macros.h -+++ b/src/macros.h -@@ -59,7 +59,7 @@ - #define ROOT_UID 0 /* don't change this, it really must be root */ - #define ROOT_USER "root" /* ditto */ - #define MAX_USER_ENVS 1000 /* maximum environment variables in user's crontab */ --#define MAX_USER_ENTRIES 1000 /* maximum crontab entries in user's crontab */ -+#define MAX_USER_ENTRIES 10000 /* maximum crontab entries in user's crontab */ - #define MAX_GARBAGE 32768 /* max num of chars of comments and whitespaces between entries */ - #define MAX_CLOSE_FD 10000 /* max fd num to close when spawning a child process */ - diff --git a/cronie-1.5.7.tar.gz b/cronie-1.5.7.tar.gz deleted file mode 100644 index 366514d..0000000 --- a/cronie-1.5.7.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:30190b791c79bd72a43eb7cd6fced00be850e2e27e60852dec6dbacb82ecf21e -size 148739 diff --git a/cronie-1.6.0.tar.gz b/cronie-1.6.0.tar.gz new file mode 100644 index 0000000..f145f3b --- /dev/null +++ b/cronie-1.6.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:019473a6387e65db46e1b3aeaff69d130cd7bd2e6ce480764aba20279577ddfa +size 149859 diff --git a/cronie-crond_pid.diff b/cronie-crond_pid.diff index b027ad1..f2458ed 100644 --- a/cronie-crond_pid.diff +++ b/cronie-crond_pid.diff @@ -3,8 +3,8 @@ Index: cronie-1.4.4/src/pathnames.h --- cronie-1.4.4.orig/src/pathnames.h +++ cronie-1.4.4/src/pathnames.h @@ -41,7 +41,7 @@ - #else - # define PIDDIR SYSCONFDIR "/" + # define PIDDIR SYSCONFDIR "/" + # endif #endif -#define PIDFILE "crond.pid" +#define PIDFILE "cron.pid" diff --git a/cronie-nheader_lines.diff b/cronie-nheader_lines.diff index 2dbd376..e101005 100644 --- a/cronie-nheader_lines.diff +++ b/cronie-nheader_lines.diff @@ -9,8 +9,8 @@ Index: src/crontab.c -#define NHEADER_LINES 0 +#define NHEADER_LINES 3 - #define COMMENT_COLOR "\x1B[34m" - #define ERROR_COLOR "\x1B[31m" + #define COMMENT_COLOR "\x1B[34;1m" + #define ERROR_COLOR "\x1B[31;1m" @@ -418,7 +418,7 @@ static void parse_args(int argc, char *a static void list_cmd(void) { char n[MAX_FNAME]; diff --git a/cronie-piddir.patch b/cronie-piddir.patch deleted file mode 100644 index 7865c7e..0000000 --- a/cronie-piddir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- cronie-1.4.8.orig/src/pathnames.h -+++ cronie-1.4.8/src/pathnames.h -@@ -37,7 +37,7 @@ - * (Don't ask why the default is "/etc/".) - */ - #ifdef _PATH_VARRUN --# define PIDDIR _PATH_VARRUN -+# define PIDDIR "/run/" - #else - # define PIDDIR SYSCONFDIR "/" - #endif diff --git a/cronie.changes b/cronie.changes index 8605e78..8e7402c 100644 --- a/cronie.changes +++ b/cronie.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Tue Mar 29 13:08:02 UTC 2022 - Danilo Spinella + +- Update to 1.6.0: + * Add switch -f for foreground mode + * Fix regression in handling */x crontab entries + * Add random within range '~' operator + * Fix RandomScale calculation + * crond: Fix description of '-P' option + * Increase the maximum number of crontab entries + * crontab: use bold colors +- Remove upstreamed patches: + * cronie-1.5.7-increase_crontab_limit.patch + * cronie-piddir.patch +- Refresh patches: + * cronie-nheader_lines.diff + * cronie-cron_pid.diff + ------------------------------------------------------------------- Wed Sep 15 12:00:14 UTC 2021 - Danilo Spinella diff --git a/cronie.spec b/cronie.spec index d7bc67f..5d8efc3 100644 --- a/cronie.spec +++ b/cronie.spec @@ -1,7 +1,7 @@ # # spec file for package cronie # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ %define _fillupdir %{_localstatedir}/adm/fillup-templates %endif Name: cronie -Version: 1.5.7 +Version: 1.6.0 Release: 0 Summary: Cron Daemon License: BSD-3-Clause AND GPL-2.0-only AND MIT @@ -43,12 +43,9 @@ Patch3: cronie-pam_config.diff Patch4: cronie-nheader_lines.diff # we use cron.pid instead of crond.pid Patch5: cronie-crond_pid.diff -Patch12: cronie-piddir.patch # PATCH-FIX-SUSE the first occurance of "/etc/anacrontab" was replaced by "/etc/crontab" # in manpage file because the /etc/crontab is still used in SUSE. Patch13: fix-manpage-replace-anacrontab-with-crontab.patch -# PATCH-FIX-UPSTREAM Increase the maximum number of crontab entries bsc#1187508 -Patch14: cronie-1.5.7-increase_crontab_limit.patch BuildRequires: audit-devel BuildRequires: autoconf BuildRequires: automake @@ -106,9 +103,7 @@ overloaded in settings. %patch4 %patch5 -p1 cp %{SOURCE7} ./cron_to_cronie.README -%patch12 -p1 %patch13 -p1 -%patch14 -p1 %build # fill macro CRON_VERSION it is used in top three lines of crontab file,should be reworked