Hello community, here is the log from the commit of package logrotate for openSUSE:Factory checked in at 2016-10-20 23:05:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/logrotate (Old) and /work/SRC/openSUSE:Factory/.logrotate.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "logrotate" Changes: -------- --- /work/SRC/openSUSE:Factory/logrotate/logrotate.changes 2015-07-05 17:57:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.logrotate.new/logrotate.changes 2016-10-20 23:05:15.000000000 +0200 @@ -1,0 +2,19 @@ +Wed Oct 5 11:38:13 UTC 2016 - [email protected] + +- Version update to 3.10.0: + * Update url to point to github +- Remove upstreamed patch: + * logrotate-3.7.8-mess_err.patch +- Rebase patches: + * logrotate-3.7.8-suse.patch + * logrotate-addextension.patch + * logrotate-autoext.patch + * logrotate-fix-test62_with_bash-4.4.patch + +------------------------------------------------------------------- +Mon Oct 3 14:46:34 UTC 2016 - [email protected] + +- Add logrotate-fix-test62_with_bash-4.4.patch: Fix the test suite + when running with bash 4.4 (gh#logrotate/logrotate#66). + +------------------------------------------------------------------- Old: ---- logrotate-3.7.8-mess_err.patch logrotate-3.9.1.tar.gz New: ---- logrotate-3.10.0.tar.xz logrotate-fix-test62_with_bash-4.4.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ logrotate.spec ++++++ --- /var/tmp/diff_new_pack.DxsQLt/_old 2016-10-20 23:05:16.000000000 +0200 +++ /var/tmp/diff_new_pack.DxsQLt/_new 2016-10-20 23:05:16.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package logrotate # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,13 @@ Name: logrotate -Version: 3.9.1 +Version: 3.10.0 Release: 0 Summary: Rotate, compress, remove, and mail system log files License: GPL-2.0+ Group: System/Base -Url: https://fedorahosted.org/releases/l/o/logrotate -Source: https://fedorahosted.org/releases/l/o/%{name}/%{name}-%{version}.tar.gz +Url: https://github.com/logrotate/logrotate +Source0: https://github.com/logrotate/logrotate/releases/download/%{version}/logrotate-%{version}.tar.xz Source100: %{name}-rpmlintrc Source101: %{name}.service Source102: %{name}.timer @@ -31,11 +31,13 @@ Patch1: logrotate-conf.patch Patch2: logrotate-autoext.patch Patch3: logrotate-addextension.patch -Patch4: logrotate-3.7.8-mess_err.patch Patch5: logrotate-manpage_config_clarification.patch +# PATCH-FIX-UPSTREAM logrotate-fix-test62_with_bash-4.4.patch gh#logrotate/logrotate#66 [email protected] -- Fix test suite in combination with bash 4.4 +Patch6: logrotate-fix-test62_with_bash-4.4.patch BuildRequires: acl BuildRequires: libacl-devel BuildRequires: libselinux-devel +BuildRequires: pkgconfig BuildRequires: popt-devel BuildRequires: pkgconfig(systemd) >= 197 Requires: xz @@ -56,25 +58,24 @@ %patch1 %patch2 %patch3 -%patch4 %patch5 -p1 +%patch6 -p1 %build -make %{?_smp_mflags} CC="gcc" RPM_OPT_FLAGS="%{optflags}" \ - WITH_SELINUX=yes \ - WITH_ACL=yes +%configure +make %{?_smp_mflags} %check -make %{?_smp_mflags} test +make %{?_smp_mflags} check %install -make PREFIX=%{buildroot} install -mkdir -p %{buildroot}%{_sysconfdir}/{logrotate.d,cron.daily} -mkdir -p %{buildroot}%{_prefix}/sbin +%make_install +mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d install -m 644 examples/logrotate-default %{buildroot}%{_sysconfdir}/logrotate.conf install -m 644 examples/logrotate.wtmp %{buildroot}%{_sysconfdir}/logrotate.d/wtmp install -D -m 0644 %{SOURCE101} %{buildroot}%{_unitdir}/%{name}.service install -D -m 0644 %{SOURCE102} %{buildroot}%{_unitdir}/%{name}.timer +ln -s service %{buildroot}%{_sbindir}/rc%{name} %pre #only the timer can be enabled/disabled/masked ! @@ -99,6 +100,7 @@ %defattr(-,root,root) %doc CHANGES COPYING %{_sbindir}/logrotate +%{_sbindir}/rc%{name} %{_mandir}/man8/logrotate.8* %{_mandir}/man5/logrotate.conf.5* %config %{_sysconfdir}/logrotate.conf ++++++ logrotate-3.7.8-suse.patch ++++++ --- /var/tmp/diff_new_pack.DxsQLt/_old 2016-10-20 23:05:16.000000000 +0200 +++ /var/tmp/diff_new_pack.DxsQLt/_new 2016-10-20 23:05:16.000000000 +0200 @@ -1,16 +1,3 @@ -Index: Makefile -=================================================================== ---- Makefile.orig -+++ Makefile -@@ -81,7 +81,7 @@ ifneq ($(STATEFILE),) - endif - - BINDIR = $(BASEDIR)/sbin --MANDIR ?= $(BASEDIR)/man -+MANDIR ?= $(BASEDIR)/share/man - - #-------------------------------------------------------------------------- - Index: examples/logrotate.cron =================================================================== --- examples/logrotate.cron.orig ++++++ logrotate-addextension.patch ++++++ --- /var/tmp/diff_new_pack.DxsQLt/_old 2016-10-20 23:05:16.000000000 +0200 +++ /var/tmp/diff_new_pack.DxsQLt/_new 2016-10-20 23:05:16.000000000 +0200 @@ -2,9 +2,9 @@ =================================================================== --- test/test.orig +++ test/test -@@ -1599,4 +1599,27 @@ test.log 0 - test.log.1 0 zero - EOF +@@ -1746,5 +1746,28 @@ EOF + rm -rf testdir adir + rm -rf testdir bdir +# check rotation with extension appended to the filename +cleanup 100 @@ -30,6 +30,7 @@ + + cleanup + Index: config.c =================================================================== --- config.c.orig @@ -42,7 +43,7 @@ .compress_prog = NULL, .uncompress_prog = NULL, .compress_ext = NULL, -@@ -1220,6 +1221,19 @@ static int readConfigFile(const char *co +@@ -1224,6 +1225,19 @@ static int readConfigFile(const char *co message(MESS_DEBUG, "extension is now %s\n", newlog->extension); @@ -66,7 +67,7 @@ =================================================================== --- logrotate.8.orig +++ logrotate.8 -@@ -283,6 +283,15 @@ configured to be run by cron daily. You +@@ -284,6 +284,15 @@ configured to be run by cron daily. You and run \fIlogrotate\fR hourly to be able to really rotate logs hourly. .TP @@ -86,7 +87,7 @@ =================================================================== --- logrotate.c.orig +++ logrotate.c -@@ -1216,6 +1216,24 @@ int prerotateSingleLog(struct logInfo *l +@@ -1219,6 +1219,24 @@ int prerotateSingleLog(struct logInfo *l rotNames->baseName = strdup(ourBaseName(log->files[logNum])); ++++++ logrotate-autoext.patch ++++++ --- /var/tmp/diff_new_pack.DxsQLt/_old 2016-10-20 23:05:16.000000000 +0200 +++ /var/tmp/diff_new_pack.DxsQLt/_new 2016-10-20 23:05:16.000000000 +0200 @@ -1,8 +1,8 @@ Index: config.c =================================================================== ---- config.c.orig 2013-06-10 14:02:36.000000000 +0200 -+++ config.c 2013-07-25 15:42:42.465060702 +0200 -@@ -712,6 +712,7 @@ +--- config.c.orig ++++ config.c +@@ -716,6 +716,7 @@ static int readConfigFile(const char *co char **scriptDest = NULL; struct logInfo *newlog = defConfig; char *start, *chptr; @@ -10,7 +10,7 @@ char *dirName; struct passwd *pw = NULL; int rc; -@@ -1245,6 +1246,20 @@ static int readConfigFile(const char *co +@@ -1242,6 +1243,20 @@ static int readConfigFile(const char *co message(MESS_DEBUG, "compress_prog is now %s\n", newlog->compress_prog); @@ -33,9 +33,9 @@ Index: logrotate.c =================================================================== ---- logrotate.c.orig 2013-06-10 14:02:36.000000000 +0200 -+++ logrotate.c 2013-07-25 15:30:36.687434418 +0200 -@@ -85,6 +85,16 @@ unsigned int hashSize; +--- logrotate.c.orig ++++ logrotate.c +@@ -104,6 +104,16 @@ unsigned int hashSize; int numLogs = 0; int debug = 0; char *mailCommand = DEFAULT_MAIL_COMMAND; @@ -54,9 +54,9 @@ static gid_t save_egid; Index: logrotate.h =================================================================== ---- logrotate.h.orig 2013-06-10 14:02:36.000000000 +0200 -+++ logrotate.h 2013-07-25 15:30:36.687434418 +0200 -@@ -66,6 +66,9 @@ TAILQ_HEAD(logInfoHead, logInfo) logs; +--- logrotate.h.orig ++++ logrotate.h +@@ -79,6 +79,9 @@ TAILQ_HEAD(logInfoHead, logInfo) logs; extern int numLogs; extern int debug; @@ -68,9 +68,9 @@ int asprintf(char **string_ptr, const char *format, ...); Index: test/test =================================================================== ---- test/test.orig 2013-07-25 15:30:36.687434418 +0200 -+++ test/test 2013-07-25 16:16:11.992044805 +0200 -@@ -536,19 +536,6 @@ checkoutput <<EOF +--- test/test.orig ++++ test/test +@@ -577,32 +577,6 @@ checkoutput <<EOF test.log 0 zero EOF @@ -78,7 +78,7 @@ - -# ------------------------------- Test 18 ------------------------------------ -preptest test.log 18 1 --$RLR test-config.18 --force +-$RLR test-config.18 -l syslog --force - -checkoutput <<EOF -test.log 0 @@ -86,6 +86,19 @@ -EOF - -(echo "gzip -f -9") | diff -u - compress-args +-egrep -q '^LOGROTATE_COMPRESSED_FILENAME=.+/test/test.log.1$' compress-env +-if [ $? != 0 ]; then +- echo "LOGROTATE_COMPRESSED_FILENAME environment variable not found." +- cat compress-env++ exit 3 +-fi +- +-if [ $SYSLOG_TESTS = 1 ]; then +- journalctl -n 50 2>/dev/null|grep $PWD/test.log.1 2>/dev/null >/dev/null +- if [ $? != 0 ]; then +- echo "syslog message not found" +- exit 1 +- fi +-fi - cleanup 19 ++++++ logrotate-fix-test62_with_bash-4.4.patch ++++++ >From 61f22b1eb2bd441bce998240701b0acd03265a47 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger <[email protected]> Date: Mon, 3 Oct 2016 16:43:00 +0200 Subject: [PATCH] Fix test suite in combination with bash 4.4 Until bash 4.4, variables were silently stripped of NUL bytes; with Bash 4.4 this results now for every single 0-byte that is being stripped in a warning: ./test: line 170: warning: command substitution: ignored null byte in input We now simply strip the NUL bytes before we have bash assign the values to a variable. The result is the same. --- test/test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: logrotate-3.10.0/test/test =================================================================== --- logrotate-3.10.0.orig/test/test +++ logrotate-3.10.0/test/test @@ -183,7 +183,7 @@ checkoutput() { if [ -n "$co_compressed" ] && [ "$co_compressed" != 0 ]; then contents=`gunzip -c $file` else - contents=`cat $file` + contents=`cat $file | tr -d '\000'` fi if [ "$contents" != "$expected" ]; then echo "file $file does not contain expected results (compressed $co_compressed, args $*)" >&2
