Accepting request 81344 from home:vitezslav_cizek:branches:Base:System

- allow whitespace separated options in compressoptions (bnc#711780)

OBS-URL: https://build.opensuse.org/request/show/81344
OBS-URL: https://build.opensuse.org/package/show/Base:System/logrotate?expand=0&rev=16

logrotate-3.7.9-compressoptions.patch

@@ -0,0 +1,15 @@
+Index: logrotate-3.7.9/config.c
+===================================================================
+--- logrotate-3.7.9.orig/config.c
++++ logrotate-3.7.9/config.c
+@@ -101,7 +139,9 @@ static char *readPath(const char *config
+ 	chptr = start;
+ 
+ 	while( (len = mbrtowc(&pwc, chptr, strlen(chptr), NULL)) != 0 ) {
+-		if( len == (size_t)(-1) || len == (size_t)(-2) || !iswprint(pwc) || iswblank(pwc) ) {
++		if( len == (size_t)(-1) || len == (size_t)(-2) || !iswprint(pwc) ||
++		    /* allow more compress options separated by whitespace */
++		    ( strcmp(key, "compressoptions") && iswblank(pwc) ) ) {
+ 		    message(MESS_ERROR, "%s:%d bad %s path %s\n",
+ 			    configFile, lineNum, key, start);
+ 		    return NULL;

logrotate.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep  7 12:51:41 UTC 2011 - vcizek@suse.com
+
+- allow whitespace separated options in compressoptions (bnc#711780)
+
 -------------------------------------------------------------------
 Mon Jul 25 10:25:56 UTC 2011 - jengelh@medozas.de
 

logrotate.spec

@@ -34,6 +34,7 @@ Patch4:         logrotate-3.7.8-mess_err.patch
 Patch5:         logrotate-CVE-2011-1098.patch
 Patch6:         logrotate-shred-CVE-2011-1154.patch
 Patch7:         logrotate-CVE-2011-1155.patch
+Patch8:         logrotate-3.7.9-compressoptions.patch
 BuildRequires:  libselinux-devel
 BuildRequires:  popt-devel
 PreReq:         %fillup_prereq
@@ -61,6 +62,7 @@ daily cron job.
 %patch5 -p1
 %patch6
 %patch7
+%patch8 -p1
 
 %build
 make %{?_smp_mflags} RPM_OPT_FLAGS="%{optflags}" WITH_SELINUX=yes