Browse Source

logrotate: update to 3.7.9, add patches from fedora

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@3438 ec354946-7b23-47d6-9f5a-488ba84defc7
daisuke 13 years ago
parent
commit
a3060dc5d6
1 changed files with 37 additions and 2 deletions
  1. 37 2
      l/logrotate/logrotate-vl.spec

+ 37 - 2
l/logrotate/logrotate-vl.spec

@@ -1,13 +1,25 @@
 Summary: Rotates, compresses, removes and mails system log files.
 Summary(ja): システムのログファイルを圧縮/削除するプログラム
 Name: logrotate
-Version: 3.7.7
+Version: 3.7.9
 Release: 1%{?_dist_release}
 License: GPL
 Group: System Environment/Base
+Url: https://fedorahosted.org/logrotate/
+
 Source: https://fedorahosted.org/releases/l/o/logrotate/logrotate-%{version}.tar.gz
+Patch1: logrotate-3.7.8-man-authors.patch
+Patch2: logrotate-3.7.9-man-size.patch
+Patch3: logrotate-3.7.9-man-page.patch
+Patch4: logrotate-3.7.9-config.patch
+Patch5: logrotate-3.7.9-acl.patch
+Patch6: logrotate-3.7.9-tabooext.patch
+Patch7: logrotate-3.7.9-shred.patch
+Patch8: logrotate-3.7.9-statefile.patch
+Patch9: logrotate-3.7.9-atomic-create.patch 
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: popt
+BuildRequires: popt-devel
 Requires: coreutils >= 5.92
 Requires: popt
 
@@ -37,6 +49,16 @@ logrotate パッケージをインストールして下さい.
 %prep
 %setup -q
 
+%patch1 -p2
+%patch2
+%patch3 -p1
+%patch4
+%patch5 -p2
+%patch6 -p1
+%patch7
+%patch8
+%patch9 -p1
+
 %build
 make %{?_smp_mflags} RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
 
@@ -59,12 +81,25 @@ rm -rf $RPM_BUILD_ROOT
 %doc CHANGES
 %attr(0755, root, root) %{_sbindir}/logrotate
 %attr(0644, root, root) %{_mandir}/man8/logrotate.8*
+%attr(0644, root, root) %{_mandir}/man5/logrotate.conf.5*
 %attr(0755, root, root) %{_sysconfdir}/cron.daily/logrotate
 %attr(0644, root, root) %config(noreplace) %{_sysconfdir}/logrotate.conf
 %attr(0755, root, root) %dir %{_sysconfdir}/logrotate.d
 %attr(0644, root, root) %verify(not size md5 mtime) %config(noreplace) %{_localstatedir}/lib/logrotate.status
 
 %changelog
+* Wed Apr 13 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 3.7.9-1
+- new upstream release
+- add Url
+- add patches from fedora
+  - fix #688520 - fixed CVE-2011-1154, CVE-2011-1155 and CVE-2011-1098
+  - fix #671926 - fixed crash when tabooext is used in config file
+  - fix #661181 - fixed SIGBUS when config file is empty or 4096 bytes
+  - fix #666677 - preserve ACLs when rotating files
+  - fix #644309 - mention all logrotate params in man page
+  - fix #638629 - better size directive description
+  - fixed AUTHORS in man page
+
 * Sun Jun 15 2008 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.7.7-1
 - new upstream release
 - spec in UTF-8