From 3b1b27c59e70a84eb7a64df5626610168469772a Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Wed, 3 Aug 2016 13:11:39 +0200 Subject: [PATCH] new upstream version 3.10.0 --- .gitignore | 14 +------------- logrotate-3.9.1-fix-indents.patch | 20 -------------------- logrotate.spec | 21 +++++++++------------ sources | 2 +- 4 files changed, 11 insertions(+), 46 deletions(-) delete mode 100644 logrotate-3.9.1-fix-indents.patch diff --git a/.gitignore b/.gitignore index 4fdeef3..71bf3ec 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1 @@ -logrotate-3.7.9.tar.gz -/logrotate-3.8.0.tar.gz -/logrotate-3.8.1.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 -/logrotate-3.8.6.tar.gz -/logrotate-3.8.7.tar.gz -/logrotate-3.8.8.tar.gz -/logrotate-3.8.9.tar.gz -/logrotate-3.9.1.tar.gz -/logrotate-3.9.2.tar.gz +/logrotate-[0-9.]*.tar.xz diff --git a/logrotate-3.9.1-fix-indents.patch b/logrotate-3.9.1-fix-indents.patch deleted file mode 100644 index c771a40..0000000 --- a/logrotate-3.9.1-fix-indents.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- logrotate-3.9.2/logrotate.c.orig 2016-02-16 09:54:23.360000000 +0100 -+++ logrotate-3.9.2/logrotate.c 2016-02-16 09:54:26.328000000 +0100 -@@ -1784,7 +1784,7 @@ - if (!state->doRotate) - return 0; - -- if (!hasErrors && log->flags & LOG_FLAG_TMPFILENAME) { -+ if (!hasErrors && log->flags & LOG_FLAG_TMPFILENAME) { - char *tmpFilename = NULL; - if (asprintf(&tmpFilename, "%s%s", log->files[logNum], ".tmp") < 0) { - message(MESS_FATAL, "could not allocate tmpFilename memory\n"); -@@ -1821,7 +1821,7 @@ - hasErrors = removeLogFile(rotNames->disposeName, log); - - #ifdef WITH_SELINUX -- if (selinux_enabled) { -+ if (selinux_enabled) { - setfscreatecon_raw(prev_context); - freecon(prev_context); - prev_context = NULL; diff --git a/logrotate.spec b/logrotate.spec index 801bd05..40e525d 100644 --- a/logrotate.spec +++ b/logrotate.spec @@ -1,20 +1,18 @@ Summary: Rotates, compresses, removes and mails system log files Name: logrotate -Version: 3.9.2 -Release: 5%{?dist} +Version: 3.10.0 +Release: 1%{?dist} License: GPL+ Group: System Environment/Base -Url: https://fedorahosted.org/logrotate/ -Source: https://github.com/logrotate/logrotate/archive/logrotate-%{version}.tar.gz +Url: https://github.com/logrotate/logrotate +Source: https://github.com/logrotate/logrotate/releases/download/%{version}/logrotate-%{version}.tar.xz Source1: rwtab + # Change the location of status file Patch0: logrotate-3.9.1-statusfile.patch -# Fix indents which ends in warnings which ends in errors with gcc6 -Patch1: logrotate-3.9.1-fix-indents.patch Requires: coreutils >= 5.92 popt BuildRequires: libselinux-devel popt-devel libacl-devel acl -BuildRequires: autoconf automake libtool BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -31,17 +29,13 @@ log files on your system. %prep %setup -q %patch0 -p1 -b .statusfile -%patch1 -p1 %build -export CFLAGS="$RPM_OPT_FLAGS" - -./autogen.sh %configure make %{?_smp_mflags} %check -make test +make check %install rm -rf $RPM_BUILD_ROOT @@ -87,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/rwtab.d/logrotate %changelog +* Wed Aug 03 2016 Kamil Dudka - 3.10.0-1 +- new upstream version 3.10.0 + * Wed Jul 20 2016 Kamil Dudka - 3.9.2-5 - do not log to syslog by default (#1304828) diff --git a/sources b/sources index 7010a71..fee39ca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -584bca013dcceeb23b06b27d6d0342fb logrotate-3.9.2.tar.gz +812705ff58ad308c82b1a6fac1031949 logrotate-3.10.0.tar.xz