From: Elan Ruusamäe <glen@delfi.ee>
Date: Sat, 3 Dec 2016 14:26:00 +0000 (+0200)
Subject: up to 3.11.0 (2016-12-02)
X-Git-Tag: auto/th/logrotate-3.11.0-1
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=59870e99af75ef03d23599eaf57b25833097475e;p=packages%2Flogrotate.git

up to 3.11.0 (2016-12-02)

  - Add 'taboopat' configuration directive to exclude configuration files
    based on globing patterns.
  - Allow to change default state path at build time (via the
    --with-state-file-path option of the configure script).
  - Automatically determine resulting file suffix based on the compression
    program in use.
  - Preserve SELinux context with 'compress' and 'sharedscripts' properly.
  - Rename already existing output files to avoid collisions.
  - Import systemd service and timer for logrotate from openSUSE.
  - Introduce the 'addextension' configuration directive.
  - Create 'CONTRIBUTING.md' with instructions for logrotate contributors.
  - Maintain ChangeLog.md instead of the legacy CHANGES file.
  - Make 'createolddir' configuration directive preserve sticky bit.
  - Add 'minage' configuration directive to specify minimum file age to rotate.
  - Avoid using local implementation of strndup() and asprintf() if these
    functions are available at build time.
  - Fix parsing of 'su' directive to accept usernames starting with numeric
    symbols.
  - Make sure that 64-bit file offsets are used on 32-bit systems.
---

diff --git a/logrotate-largefile.patch b/logrotate-largefile.patch
deleted file mode 100644
index f9745fb..0000000
--- a/logrotate-largefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- logrotate-3.8.8/configure.ac~	2014-10-16 13:12:35.000000000 +0200
-+++ logrotate-3.8.8/configure.ac	2014-12-11 12:17:56.206325620 +0100
-@@ -8,6 +8,8 @@
- AC_PROG_CC
- AC_PROG_CC_STDC
- 
-+AC_SYS_LARGEFILE
-+
- AC_CHECK_LIB([popt],[poptParseArgvString],,
-   AC_MSG_ERROR([libpopt required but not found]))
- 
diff --git a/logrotate-man.patch b/logrotate-man.patch
index 10afb6d..8f7d48a 100644
--- a/logrotate-man.patch
+++ b/logrotate-man.patch
@@ -1,11 +1,11 @@
---- logrotate-3.8.5/logrotate.8~	2013-08-29 17:03:00.000000000 +0300
-+++ logrotate-3.8.5/logrotate.8	2013-08-29 17:05:44.974064909 +0300
-@@ -59,7 +59,7 @@
+--- logrotate/logrotate.8.in~	2016-12-03 16:23:33.744988966 +0200
++++ logrotate/logrotate.8.in	2016-12-03 16:34:50.502613948 +0200
+@@ -65,7 +65,7 @@
  \fB\-s\fR, \fB\-\-state <statefile>\fR
  Tells \fBlogrotate\fR to use an alternate state file.  This is useful
  if logrotate is being run as a different user for various sets of
 -log files.  The default state file is \fI/var/lib/logrotate.status\fR.
-+log files.  The default state file is \fI/var/lib/misc/logrotate.status\fR.
++log files.  The default state file is \fI@STATE_FILE_PATH@\fR.
  
  .TP
  \fB\-\-usage\fR
@@ -27,12 +27,3 @@
  night.
  
  .TP
-@@ -459,7 +459,7 @@
- .SH FILES
- .PD 0
- .TP 27
--\fI/var/lib/logrotate.status\fR
-+\fI/var/lib/misc/logrotate.status\fR
- Default state file.
- .TP 27
- \fI/etc/logrotate.conf\fR
diff --git a/logrotate.spec b/logrotate.spec
index a32ca0d..91033e7 100644
--- a/logrotate.spec
+++ b/logrotate.spec
@@ -19,19 +19,18 @@ Summary(ru.UTF-8):	Ротирует, компрессирует, удаляет
 Summary(tr.UTF-8):	Sistem günlüklerini yönlendirir, sıkıştırır ve mektup olarak yollar
 Summary(uk.UTF-8):	Ротує, компресує, видаляє та відправляє поштою лог-файли
 Name:		logrotate
-Version:	3.10.0
+Version:	3.11.0
 Release:	1
-License:	GPL v2
+License:	GPL v2+
 Group:		Applications/System
 Source0:	https://github.com/logrotate/logrotate/releases/download/%{version}/%{name}-%{version}.tar.xz
-# Source0-md5:	812705ff58ad308c82b1a6fac1031949
+# Source0-md5:	3a9280e4caeb837427a2d54518fbcdac
 Source1:	%{name}.conf
 Source2:	%{name}.sysconfig
 Source3:	%{name}.cron
 Source4:	%{name}.crontab
+Patch0:		tabooext.patch
 Patch1:		%{name}-man.patch
-Patch2:		tabooext.patch
-Patch3:		%{name}-largefile.patch
 URL:		https://github.com/logrotate/logrotate
 %{?with_acl:BuildRequires:	acl-devel}
 BuildRequires:	autoconf >= 2.50
@@ -121,14 +120,8 @@ Logrotate призначений для полегшення адміністр
 
 %prep
 %setup -q
+%patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-
-echo '
-#undef STATEFILE
-#define STATEFILE "%{statdir}/logrotate.status"
-' >> config.h
 
 %build
 %{__aclocal}
@@ -139,6 +132,7 @@ echo '
 	--disable-silent-rules \
 	--with%{!?with_acl:out}-acl \
 	--with%{!?with_selinux:out}-selinux \
+	--with-state-file-path=%{statdir}/logrotate.status
 
 %{__make}
 
@@ -184,7 +178,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGES
+%doc README.md ChangeLog.md
 %attr(755,root,root) %{_sbindir}/logrotate
 %attr(755,root,root) %{_libexecdir}/logrotate
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.conf