From 356b432c0c4a215caebb5f8801739f515d2ade57 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Sat, 20 Mar 2021 23:37:13 +0100 Subject: [PATCH] Rediff patch. --- cronie.spec | 4 ++-- inotify-nosys.patch | 43 +++++++++++++++++++++++-------------------- 2 files changed, 25 insertions(+), 22 deletions(-) diff --git a/cronie.spec b/cronie.spec index e53d90c..087a2be 100644 --- a/cronie.spec +++ b/cronie.spec @@ -17,12 +17,12 @@ Summary: Cron daemon for executing programs at set times Summary(pl.UTF-8): Demon cron do uruchamiania programów o zadanym czasie Name: cronie -Version: 1.5.5 +Version: 1.5.6 Release: 1 License: MIT and BSD and GPL v2 Group: Daemons Source0: https://github.com/cronie-crond/cronie/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz -# Source0-md5: 351a37d0b5bd0144816724b4482747ad +# Source0-md5: ab781ac078c46dded86405c18ed56e8c Source1: %{name}.init Source3: cron.sysconfig Source4: %{name}.crontab diff --git a/inotify-nosys.patch b/inotify-nosys.patch index 556176d..f18bb16 100644 --- a/inotify-nosys.patch +++ b/inotify-nosys.patch @@ -1,20 +1,7 @@ ---- cronie-1.4.1/src/cron.c~ 2009-06-01 10:46:08.000000000 +0300 -+++ cronie-1.4.1/src/cron.c 2009-08-13 13:32:40.909067818 +0300 -@@ -41,7 +41,11 @@ - #include - - #ifdef WITH_INOTIFY -+#ifdef SYS_INOTIFY_H_EXISTS_AND_WORKS - # include -+#else -+#include "inotify-nosys.h" -+#endif - #endif - - #ifdef HAVE_SYS_FCNTL_H ---- cronie-1.4.1/configure.ac~ 2009-08-13 13:56:08.000000000 +0300 -+++ cronie-1.4.1/configure.ac 2009-08-13 13:56:11.295316050 +0300 -@@ -27,7 +27,6 @@ +diff -urNp -x '*.orig' cronie-1.5.6.org/configure.ac cronie-1.5.6/configure.ac +--- cronie-1.5.6.org/configure.ac 2021-03-17 16:34:06.000000000 +0100 ++++ cronie-1.5.6/configure.ac 2021-03-20 23:36:43.706964317 +0100 +@@ -30,7 +30,6 @@ AC_CHECK_HEADERS( \ stddef.h \ stdint.h \ sys/audit.h \ @@ -22,7 +9,7 @@ sys/stat.h \ sys/stream.h \ sys/stropts.h \ -@@ -106,9 +105,16 @@ +@@ -119,9 +118,16 @@ AC_SUBST(DAEMON_GROUPNAME) AC_ARG_WITH(inotify, [AS_HELP_STRING([--with-inotify], [ Enable inotify support])], [ if test "x$withval" != "xno" ; then @@ -41,8 +28,24 @@ fi ] ) ---- /dev/null 2008-11-04 20:33:38.146691408 +0200 -+++ cronie-1.4.1/src/inotify-nosys.h 2007-12-30 10:50:22.000000000 +0200 +diff -urNp -x '*.orig' cronie-1.5.6.org/src/cron.c cronie-1.5.6/src/cron.c +--- cronie-1.5.6.org/src/cron.c 2021-01-22 12:29:39.000000000 +0100 ++++ cronie-1.5.6/src/cron.c 2021-03-20 23:36:43.706964317 +0100 +@@ -43,7 +43,11 @@ + #include + + #ifdef WITH_INOTIFY ++#ifdef SYS_INOTIFY_H_EXISTS_AND_WORKS + # include ++#else ++#include "inotify-nosys.h" ++#endif + #endif + + #include "cronie_common.h" +diff -urNp -x '*.orig' cronie-1.5.6.org/src/inotify-nosys.h cronie-1.5.6/src/inotify-nosys.h +--- cronie-1.5.6.org/src/inotify-nosys.h 1970-01-01 01:00:00.000000000 +0100 ++++ cronie-1.5.6/src/inotify-nosys.h 2021-03-20 23:36:43.706964317 +0100 @@ -0,0 +1,167 @@ +/* + * This header is used if cannot be found. -- 2.43.0