rpms/logrotate/devel logrotate-3.7.2-fix_free_segfaults3.patch, NONE, 1.1 logrotate.spec, 1.37, 1.38

[fedora-cvs-commits at redhat.com]

Author: pvrabec

Update of /cvs/dist/rpms/logrotate/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7256

Modified Files:
	logrotate.spec 
Added Files:
	logrotate-3.7.2-fix_free_segfaults3.patch 
Log Message:
fix_free_segfaults (#172918)


logrotate-3.7.2-fix_free_segfaults3.patch:
 config.c    |   21 ++++++++++++---------
 logrotate.c |    2 --
 2 files changed, 12 insertions(+), 11 deletions(-)

--- NEW FILE logrotate-3.7.2-fix_free_segfaults3.patch ---
--- logrotate-3.7.2/config.c.fix_free_segfaults3	2005-11-11 15:47:22.000000000 -0500
+++ logrotate-3.7.2/config.c	2005-11-11 15:57:56.000000000 -0500
@@ -343,22 +343,25 @@
 		       int * numLogsPtr) {
     int i;
     const char ** file;
-    logInfo defConfig = { NULL, NULL, 0, NULL, ROT_SIZE, 
+    logInfo defConfig = { /* pattern */ NULL,
+			  /* files, numFiles */ NULL, 0,
+			  /* oldDir */ NULL,
+			  /* criterium */ ROT_SIZE, 
 			  /* threshHold */ 1024 * 1024,
-			  /* rotateCount */ 0,
-			  /* rotateAge */ 0,
+			  /* rotateCount/Age */ 0, 0,
 			  /* log start */ -1,
 			  /* pre, post */ NULL, NULL,
 			  /* first, last */ NULL, NULL,
 			  /* logAddress */ NULL, 
 			  /* extension */ NULL, 
-			  /* compression command */ NULL,
-			  /* uncompression command */ NULL,
-			  /* compression extension */ NULL,
+			  /* compress_prog */ NULL,
+			  /* uncompress_prog */ NULL,
+			  /* compress_ext */ NULL,
 			  /* rotate pattern */ NULL,
 			  /* flags */ LOG_FLAG_IFEMPTY,
-			  /* createMode */ NO_MODE, NO_UID, NO_GID };
-    
+   			  /* createMode/Uid/Gid */ NO_MODE, NO_UID, NO_GID,
+			  /* compress_options_list/count */ NULL, 0 };
+ 
     tabooExts = malloc(sizeof(*tabooExts) * defTabooCount);
     for (i = 0; i < defTabooCount; i++) {
         if ( (tabooExts[i] = (char *) malloc(strlen(defTabooExts[i]) + 1)) ) {
@@ -983,7 +986,7 @@
 		return 1;
 	    }
 
-	    /* If no compression options were not found in config file,
+	    /* If no compression options were found in config file,
 	     * set default values using allocated strings, that can be
 	     * free()ed by free_logInfo() */
 	    if (!newlog->compress_prog)
--- logrotate-3.7.2/logrotate.c.fix_free_segfaults3	2005-11-11 15:47:22.000000000 -0500
+++ logrotate-3.7.2/logrotate.c	2005-11-11 15:49:59.000000000 -0500
@@ -97,8 +97,6 @@
 	    free(log->files[j]);
         free(log->files);
 
-        for (j = 0; j < log->compress_options_count; j++)
-	    free((char *) log->compress_options_list[j]);
         free(log->compress_options_list);
     }
     free(*logsPtr);


Index: logrotate.spec
===================================================================
RCS file: /cvs/dist/rpms/logrotate/devel/logrotate.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- logrotate.spec	7 Nov 2005 13:30:22 -0000	1.37
+++ logrotate.spec	11 Nov 2005 15:18:21 -0000	1.38
@@ -5,7 +5,7 @@
 Summary: Rotates, compresses, removes and mails system log files.
 Name: logrotate
 Version: 3.7.2
-Release: 11
+Release: 12
 License: GPL
 Group: System Environment/Base
 Source: logrotate-%{PACKAGE_VERSION}.tar.gz
@@ -19,7 +19,8 @@
 Patch7: logrotate-3.7.2-fixLeaks_tabooExts.patch
 Patch8: logrotate-3.7.2-fix_free_segfaults2.patch
 Patch9: logrotate-3.7.2-cleanUp2.patch
-Patch10: logrotate-3.7.2-patternAndNodataext.patch
+Patch10: logrotate-3.7.2-rotateDateext.patch
+Patch11: logrotate-3.7.2-fix_free_segfaults3.patch
 
 %description
 The logrotate utility is designed to simplify the administration of
@@ -43,7 +44,8 @@
 %patch7 -p1 -b .fixLeaks_tabooExts
 %patch8 -p1 -b .fix_free_segfaults2
 %patch9 -p1 -b .cleanUp2
-%patch10 -p1 -b .patternAndNodataext
+%patch10 -p1 -b .rotateDateext
+%patch11 -p1 -b .fix_free_segfaults3
 
 %build
 make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -g" \
@@ -76,9 +78,11 @@
 %attr(0644, root, root) %verify(not size md5 mtime) %config(noreplace) /var/lib/logrotate.status
 
 %changelog
-* Mon Nov 07 2005 Peter Vrabec <pvrabec at redhat.com> 3.7.2-11
-- man description for "nodateext" option (#171577)
-- remove not working "pattern" option (#171577)
+* Fri Nov 11 2005 Peter Vrabec <pvrabec at redhat.com> 3.7.2-12
+- fix_free_segfaults (#172918)
+
+* Wed Nov 03 2005 Peter Vrabec <pvrabec at redhat.com> 3.7.2-11
+- ignore "rotate count" when "dateext" option is used(#170639)
 
 * Tue Oct 25 2005 Peter Vrabec <pvrabec at redhat.com> 3.7.2-10
 - some more clean up (#171587)