[packages/fcron] - up to 3.1.2

[baggins]

commit 7e164612f058d627cd17affcd290f66c72f1df1b
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Jan 28 23:40:49 2014 +0100

    - up to 3.1.2

 fcron-Makefile.patch                   |  2 +-
 fcron-accept_readable_fcron.conf.patch | 22 +++++++++++-----------
 fcron-configure.patch                  | 13 -------------
 fcron.spec                             | 15 ++++++++-------
 4 files changed, 20 insertions(+), 32 deletions(-)
---
diff --git a/fcron.spec b/fcron.spec
index f2cac1e..86edbe9 100644
--- a/fcron.spec
+++ b/fcron.spec
@@ -1,12 +1,12 @@
 Summary:	A periodical command scheduler which aims at replacing Vixie Cron
 Summary(pl.UTF-8):	Serwer okresowego uruchamiania poleceń zastępujący Vixie Crona
 Name:		fcron
-Version:	3.0.6
-Release:	3
+Version:	3.1.2
+Release:	1
 License:	GPL v2+
 Group:		Daemons
 Source0:	http://fcron.free.fr/archives/%{name}-%{version}.src.tar.gz
-# Source0-md5:	69ebcb41921e2a282f41ebecb3a27053
+# Source0-md5:	36bf213e15f3a480f2274f8e46cced0a
 Source1:	%{name}.init
 Source2:	cron.logrotate
 Source3:	cron.sysconfig
@@ -15,7 +15,6 @@ Source5:	%{name}.pam
 Source6:	%{name}.conf
 Source7:	%{name}tab.pam
 Source8:	%{name}.systab
-Patch0:		%{name}-configure.patch
 Patch1:		%{name}-Makefile.patch
 Patch2:		%{name}-accept_readable_fcron.conf.patch
 URL:		http://fcron.free.fr/
@@ -64,7 +63,6 @@ uruchamianie go w zależności od obciążenia systemu i dużo więcej.
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
 %patch2 -p0
 
@@ -131,6 +129,8 @@ cat > $RPM_BUILD_ROOT%{_sysconfdir}/cron/cron.deny << 'EOF'
 #		NOT allowed to use the local cron daemon
 EOF
 
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -217,8 +217,9 @@ fi
 %attr(644,root,crontab) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/fcrontab
 %attr(754,root,root) /etc/rc.d/init.d/crond
 %config(noreplace) %verify(not md5 mtime size) %attr(640,root,root) /etc/logrotate.d/cron
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fcron.*
-%attr(640,root,crontab) %config(noreplace) %{_sysconfdir}/fcron.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fcron.allow
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fcron.deny
+%attr(640,root,crontab) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fcron.conf
 %attr(755,root,root) %{_sbindir}/crond
 %attr(6111,crontab,crontab) %{_bindir}/fcrontab
 %attr(6111,crontab,crontab) %{_bindir}/crontab
diff --git a/fcron-Makefile.patch b/fcron-Makefile.patch
index a025f09..7044ead 100644
--- a/fcron-Makefile.patch
+++ b/fcron-Makefile.patch
@@ -4,7 +4,7 @@
  	-DFCRON_EDITOR="\"${FCRON_EDITOR}\"" -DBINDIREX="\"${DESTBIN}\"" \
  	-c $<
  
--install: install-staged strip perms
+-install: install-staged strip perms 
 +install: install-staged strip
  ifeq ($(BOOTINSTALL), 1)
  	$(SRCDIR)/script/boot-install "$(INSTALL) -o $(ROOTNAME)" $(DESTSBIN) $(DEBUG) $(FCRONTABS) $(ANSWERALL) $(SRCDIR)
diff --git a/fcron-accept_readable_fcron.conf.patch b/fcron-accept_readable_fcron.conf.patch
index 4f0fd5a..1dfcf08 100644
--- a/fcron-accept_readable_fcron.conf.patch
+++ b/fcron-accept_readable_fcron.conf.patch
@@ -1,15 +1,15 @@
---- subs.c.orig	2007-01-15 22:41:06.000000000 +0100
-+++ subs.c	2007-02-07 10:45:31.000000000 +0100
+--- fcronconf.c.orig	2007-01-15 22:41:06.000000000 +0100
++++ fcronconf.c	2007-02-07 10:45:31.000000000 +0100
 @@ -222,10 +222,9 @@
      /* check if the file is secure : owner:root, group:fcron,
       * writable only by owner */
-     if ( fstat(fileno(f), &st) != 0 
--	 || st.st_uid != rootuid || st.st_gid != fcrongid
- 	 || st.st_mode & S_IWGRP || st.st_mode & S_IWOTH ) {
--	error("Conf file (%s) must be owned by root:" GROUPNAME 
--	      " and (no more than) 644 : ignored", fcronconf, GROUPNAME);
-+	error("Conf file (%s) must not have more perms than 644 : ignored", 
-+		fcronconf);
- 	fclose(f);
- 	return;
+     if (fstat(fileno(f), &st) != 0
+-        || st.st_uid != rootuid || st.st_gid != fcrongid
+         || st.st_mode & S_IWGRP || st.st_mode & S_IWOTH) {
+-        error("Conf file (%s) must be owned by root:" GROUPNAME
+-              " and (no more than) 644 : ignored", fcronconf, GROUPNAME);
++        error("Conf file (%s) must not have more perms than 644 : ignored",
++              fcronconf);
+         xfclose_check(&f, fcronconf);
+         return;
      }
diff --git a/fcron-configure.patch b/fcron-configure.patch
deleted file mode 100644
index a4fd42c..0000000
--- a/fcron-configure.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- fcron-3.0.3/configure.in~	2007-06-03 23:24:08.000000000 +0200
-+++ fcron-3.0.3/configure.in	2007-06-18 00:30:02.000000000 +0200
-@@ -199,10 +199,6 @@
-     ;;
-   *)
-     SENDMAIL=$withval
--    if test $fcron_enable_checks = 'yes' -a ! -x "$withval"; then
--      AC_MSG_ERROR([
--File $withval is not an executable file])
--    fi
-     ;;
-   esac ]
- )
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/fcron.git/commitdiff/7e164612f058d627cd17affcd290f66c72f1df1b