diff --git a/.gitignore b/.gitignore index 76e90a4..cf8289b 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ logrotate-3.7.9.tar.gz /logrotate-3.8.2.tar.gz /logrotate-3.8.3.tar.gz /logrotate-3.8.4.tar.gz +/logrotate-3.8.5.tar.gz diff --git a/logrotate-3.8.4-big-config.patch b/logrotate-3.8.4-big-config.patch deleted file mode 100644 index a01ce79..0000000 --- a/logrotate-3.8.4-big-config.patch +++ /dev/null @@ -1,18 +0,0 @@ -Index: config.c -=================================================================== ---- a/config.c (revision 415) -+++ b/config.c (working copy) -@@ -695,6 +695,13 @@ - - length = sb.st_size; - -+ if (length > 0xffffff) { -+ message(MESS_ERROR, "file %s too large, probably not a config file.\n", -+ configFile); -+ close(fd); -+ return 1; -+ } -+ - /* We can't mmap empty file... */ - if (length == 0) { - message(MESS_DEBUG, diff --git a/logrotate.spec b/logrotate.spec index 5193b4c..8c1b26a 100644 --- a/logrotate.spec +++ b/logrotate.spec @@ -1,12 +1,11 @@ Summary: Rotates, compresses, removes and mails system log files Name: logrotate -Version: 3.8.4 -Release: 2%{?dist} +Version: 3.8.5 +Release: 1%{?dist} License: GPL+ Group: System Environment/Base Url: https://fedorahosted.org/logrotate/ Source: https://fedorahosted.org/releases/l/o/logrotate/logrotate-%{version}.tar.gz -Patch0: logrotate-3.8.4-big-config.patch Requires: coreutils >= 5.92 popt BuildRequires: libselinux-devel popt-devel libacl-devel acl @@ -25,7 +24,6 @@ log files on your system. %prep %setup -q -%patch0 -p1 -b .bigconfig %build make %{?_smp_mflags} RPM_OPT_FLAGS="$RPM_OPT_FLAGS" WITH_SELINUX=yes WITH_ACL=yes @@ -59,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT %attr(0644, root, root) %verify(not size md5 mtime) %config(noreplace) %{_localstatedir}/lib/logrotate.status %changelog +* Mon Jun 10 2013 Jan Kaluza - 3.8.5-1 +- new upstream version 3.8.5 + * Tue May 14 2013 Jan Kaluza - 3.8.4-2 - do not try to parse config files bigger than 16MB - remove unused patches diff --git a/sources b/sources index 7e4439f..791aaf1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7be7f1eabea33a1d0483438a6e33d634 logrotate-3.8.4.tar.gz +d3c13e2a963a55c584cfaa83e96b173d logrotate-3.8.5.tar.gz