[cronie/f14/master] Apply correct patch and change release number.

Marcela Mašláňová mmaslano at fedoraproject.org
Fri Aug 13 14:07:58 UTC 2010


commit 3b2124531e639f032798877b3fa6721a3c935bcd
Author: Marcela Mašláňová <mmaslano at redhat.com>
Date:   Fri Aug 13 16:06:05 2010 +0200

    Apply correct patch and change release number.
    
    Conflicts:
    
    	cronie-anacron-closefd.patch
    	cronie.spec

 cronie-anacron-closefd.patch |   11 +++++++++++
 cronie.spec                  |    9 +++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)
---
diff --git a/cronie-anacron-closefd.patch b/cronie-anacron-closefd.patch
new file mode 100644
index 0000000..be70966
--- /dev/null
+++ b/cronie-anacron-closefd.patch
@@ -0,0 +1,11 @@
+diff -up cronie-1.4.5/anacron/main.c.fd cronie-1.4.5/anacron/main.c
+--- cronie-1.4.5/anacron/main.c.fd	2010-07-12 09:04:21.000000000 +0200
++++ cronie-1.4.5/anacron/main.c	2010-08-13 15:11:10.175529431 +0200
+@@ -493,6 +493,7 @@ main(int argc, char *argv[])
+ 
+     record_start_time();
+     read_tab(cwd);
++    close(cwd);
+     arrange_jobs();
+ 
+     if (testing_only)
diff --git a/cronie.spec b/cronie.spec
index 136eb66..6bacd37 100644
--- a/cronie.spec
+++ b/cronie.spec
@@ -6,7 +6,7 @@
 Summary: Cron daemon for executing programs at set times
 Name: cronie
 Version: 1.4.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT and BSD and ISC and GPLv2
 Group: System Environment/Base
 URL: https://fedorahosted.org/cronie
@@ -14,7 +14,6 @@ Source0: https://fedorahosted.org/releases/c/r/cronie/%{name}-%{version}.tar.gz
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: syslog, bash >= 2.0
-Requires: /usr/sbin/sendmail
 Conflicts: sysklogd < 1.4.1
 Provides: vixie-cron = 4:4.4
 Obsoletes: vixie-cron <= 4:4.3
@@ -194,6 +193,12 @@ cp -a /var/lock/subsys/crond /var/lock/subsys/cronie > /dev/null 2>&1 ||:
 %attr(0644,root,root) %{_sysconfdir}/cron.d/dailyjobs
 
 %changelog
+* Fri Aug 13 2010 Marcela Mašláňová <mmaslano at redhat.com> - 1.4.5-2
+- 623908 fix fd leak in anacron, which caused denail of prelink 
+  and others
+- remove sendmail from requirements. If it's not installed, it will
+ log into (r)syslog.
+
 * Mon Aug  2 2010 Marcela Mašláňová <mmaslano at redhat.com> - 1.4.5-1
 - update to new release
 


More information about the scm-commits mailing list