pool/logrotate
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 432966 from home:dimstar:Factory

Browse Source 
- Add logrotate-fix-test62_with_bash-4.4.patch: Fix the test suite
  when running with bash 4.4 (gh#logrotate/logrotate#66).

OBS-URL: https://build.opensuse.org/request/show/432966
OBS-URL: https://build.opensuse.org/package/show/Base:System/logrotate?expand=0&rev=47
This commit is contained in:
Dirk Mueller 2016-10-04 11:00:37 +00:00 committed by Git OBS Bridge
parent e3491e0b97
commit e408d24b71
3 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
logrotate-fix-test62_with_bash-4.4.patch Normal file
View File

@ -0,0 +1,29 @@
From 61f22b1eb2bd441bce998240701b0acd03265a47 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
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.9.1/test/test
===================================================================
--- logrotate-3.9.1.orig/test/test
+++ logrotate-3.9.1/test/test
@@ -167,7 +167,7 @@ checkoutput() {
if [ -n "$co_compressed" -a "$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

6
logrotate.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Oct 3 14:46:34 UTC 2016 - dimstar@opensuse.org
- Add logrotate-fix-test62_with_bash-4.4.patch: Fix the test suite
when running with bash 4.4 (gh#logrotate/logrotate#66).
-------------------------------------------------------------------
Mon Jun 22 12:53:44 UTC 2015 - kstreitova@suse.com

5
logrotate.spec
View File

@ -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
@ -33,6 +33,8 @@ 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 dimstar@opensuse.org -- 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
@ -58,6 +60,7 @@ daily cron job.
%patch3
%patch4
%patch5 -p1
%patch6 -p1
%build
make %{?_smp_mflags} CC="gcc" RPM_OPT_FLAGS="%{optflags}" \