[csw-devel] SF.net SVN: gar:[15474] csw/mgar/pkg/logrotate/trunk
igalic at users.sourceforge.net
igalic at users.sourceforge.net
Wed Aug 31 23:21:35 CEST 2011
Revision: 15474
http://gar.svn.sourceforge.net/gar/?rev=15474&view=rev
Author: igalic
Date: 2011-08-31 21:21:35 +0000 (Wed, 31 Aug 2011)
Log Message:
-----------
Update of logrotate to 3.8.1:
- remove now obsolete patches
- Fix platforms (Sol10 only)
Tests are still failing - but differently:
https://fedorahosted.org/logrotate/ticket/17
Modified Paths:
--------------
csw/mgar/pkg/logrotate/trunk/Makefile
csw/mgar/pkg/logrotate/trunk/checksums
csw/mgar/pkg/logrotate/trunk/files/003-test.patch
Removed Paths:
-------------
csw/mgar/pkg/logrotate/trunk/files/001-makefu.patch
csw/mgar/pkg/logrotate/trunk/files/002-strndup.patch
csw/mgar/pkg/logrotate/trunk/files/004-alloca.patch
csw/mgar/pkg/logrotate/trunk/files/006-mbrtowc_empty.patch
csw/mgar/pkg/logrotate/trunk/files/007-warn-unreached.patch
Modified: csw/mgar/pkg/logrotate/trunk/Makefile
===================================================================
--- csw/mgar/pkg/logrotate/trunk/Makefile 2011-08-31 17:17:45 UTC (rev 15473)
+++ csw/mgar/pkg/logrotate/trunk/Makefile 2011-08-31 21:21:35 UTC (rev 15474)
@@ -3,7 +3,7 @@
# $Id$
NAME = logrotate
-VERSION = 3.8.0
+VERSION = 3.8.1
CATEGORIES = apps
DESCRIPTION = rotates, compresses, and mails system logs
@@ -17,21 +17,12 @@
SPKG_SOURCEURL = https://fedorahosted.org/logrotate/
MASTER_SITES = https://fedorahosted.org/releases/l/o/logrotate/
-PATCHFILES = 001-makefu.patch
-PATCHFILES += 002-strndup.patch
PATCHFILES += 003-test.patch
-PATCHFILES += 004-alloca.patch
PATCHFILES += 005-gzippath.patch
-PATCHFILES += 006-mbrtowc_empty.patch
-PATCHFILES += 007-warn-unreached.patch
DISTFILES = $(NAME)-$(VERSION).tar.gz
-DISTFILES += 001-makefu.patch
-DISTFILES += 002-strndup.patch
DISTFILES += 003-test.patch
DISTFILES += 005-gzippath.patch
-DISTFILES += 006-mbrtowc_empty.patch
-DISTFILES += 007-warn-unreached.patch
RUNTIME_DEP_PKGS = CSWlibpopt
BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS)
@@ -42,6 +33,8 @@
# "optimize"
NOISALIST = 1
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+
# Don't ask, it doesn't work otherwise.
export EXTRA_CFLAGS = -I$(includedir)
export EXTRA_LDFLAGS = -L$(libdir)
@@ -53,13 +46,13 @@
# This is a hack, as I have no idea what's going wrong.
pre-test-modulated:
- @( cd $(WORKSRC) ; \
- rm -f .depend )
+ @( cd $(WORKSRC) ; \
+ rm -f .depend )
pre-install-modulated:
- @( cd $(WORKSRC) ; \
- rm -f .depend )
+ @( cd $(WORKSRC) ; \
+ rm -f .depend )
pre-build-modulated:
- @( cd $(WORKSRC) ; \
- rm -f .depend )
+ @( cd $(WORKSRC) ; \
+ rm -f .depend )
Modified: csw/mgar/pkg/logrotate/trunk/checksums
===================================================================
--- csw/mgar/pkg/logrotate/trunk/checksums 2011-08-31 17:17:45 UTC (rev 15473)
+++ csw/mgar/pkg/logrotate/trunk/checksums 2011-08-31 21:21:35 UTC (rev 15474)
@@ -1,8 +1,3 @@
-590f77c13077a4c384dbec7ca9c5f242 logrotate-3.8.0.tar.gz
-59ed81c960568f086b9e59388807f6a3 001-makefu.patch
-5603f2be02e6fd4bbd8d57a4f3e9dcd4 002-strndup.patch
+bd2e20d8dc644291b08f9215397d28a5 logrotate-3.8.1.tar.gz
02f36862d4e190a7eb920bd816ca4927 003-test.patch
-e98fb00c0ea9c7c0102e2029292308dd 004-alloca.patch
d6232a06412a2302a582abdc51607518 005-gzippath.patch
-27ac9259ade93a47f71779d396c6a096 006-mbrtowc_empty.patch
-384b011461b8aef679a884051dc25015 007-warn-unreached.patch
Deleted: csw/mgar/pkg/logrotate/trunk/files/001-makefu.patch
===================================================================
--- csw/mgar/pkg/logrotate/trunk/files/001-makefu.patch 2011-08-31 17:17:45 UTC (rev 15473)
+++ csw/mgar/pkg/logrotate/trunk/files/001-makefu.patch 2011-08-31 21:21:35 UTC (rev 15474)
@@ -1,40 +0,0 @@
---- logrotate-3.8.0/Makefile 2011-06-21 08:12:03.000000000 +0000
-+++ logrotate-3.8.0-solfix/Makefile 2011-06-27 01:08:10.876632251 +0000
-@@ -41,16 +41,14 @@
-
- # Solaris using gcc
- ifeq ($(OS_NAME),SunOS)
-- CFLAGS = -I/opt/baw/include -D_GNU_SOURCE -D$(OS_NAME) -DVERSION=\"$(VERSION)\" $(RPM_OPT_FLAGS) $(LFS)
-+ CFLAGS = -D_GNU_SOURCE -D$(OS_NAME) -DVERSION=\"$(VERSION)\" $(RPM_OPT_FLAGS) $(LFS)
- CC ?= gcc
- CPP = $(CC) -E -M
- INSTALL = /usr/ucb/install
- ifeq ($(CC),cc)
- CPP = cc -xM
- endif
-- ifeq ($(BASEDIR),)
-- BASEDIR = /usr/local
-- endif
-+ BASEDIR ?= /usr/local
- endif
-
- # Red Hat Linux
-@@ -83,7 +81,7 @@
- endif
-
- BINDIR = $(BASEDIR)/sbin
--MANDIR = $(BASEDIR)/man
-+MANDIR ?= $(BASEDIR)/man
-
- #--------------------------------------------------------------------------
-
-@@ -95,6 +93,9 @@
- LDFLAGS = -g
- endif
-
-+LDFLAGS += $(EXTRA_LDFLAGS) $(EXTRA_LIBS)
-+CFLAGS += $(EXTRA_CPPFLAGS) $(EXTRA_CFLAGS)
-+
- ifeq (.depend,$(wildcard .depend))
- TARGET=$(PROG)
- else
Deleted: csw/mgar/pkg/logrotate/trunk/files/002-strndup.patch
===================================================================
--- csw/mgar/pkg/logrotate/trunk/files/002-strndup.patch 2011-08-31 17:17:45 UTC (rev 15473)
+++ csw/mgar/pkg/logrotate/trunk/files/002-strndup.patch 2011-08-31 21:21:35 UTC (rev 15474)
@@ -1,32 +0,0 @@
---- logrotate-3.8.0/config.c Tue Jun 21 08:12:02 2011
-+++ logrotate-3.8.0-solfix/config.c Sun Jun 26 22:54:39 2011
-@@ -74,6 +74,29 @@
-
- #endif
-
-+#if !defined(strndup)
-+char *strndup(const char *s, size_t n)
-+{
-+ size_t nAvail;
-+ char *p;
-+
-+ if(!s)
-+ return NULL;
-+
-+ /* min() */
-+ nAvail = strlen(s) + 1;
-+ if ( (n + 1) < nAvail)
-+ nAvail = n + 1;
-+
-+ p = malloc(nAvail);
-+ if (!p)
-+ return NULL;
-+ memcpy(p, s, nAvail);
-+ p[nAvail - 1] = 0;
-+ return p;
-+}
-+#endif
-+
- enum {
- STATE_DEFAULT = 2,
- STATE_SKIP_LINE = 4,
Modified: csw/mgar/pkg/logrotate/trunk/files/003-test.patch
===================================================================
--- csw/mgar/pkg/logrotate/trunk/files/003-test.patch 2011-08-31 17:17:45 UTC (rev 15473)
+++ csw/mgar/pkg/logrotate/trunk/files/003-test.patch 2011-08-31 21:21:35 UTC (rev 15474)
@@ -1,6 +1,6 @@
diff -ur logrotate-3.8.0/test/test logrotate-3.8.0-solfix/test/test
---- logrotate-3.8.0/test/test Tue Jun 21 08:12:02 2011
-+++ logrotate-3.8.0-solfix/test/test Sun Jun 26 23:08:30 2011
+--- logrotate-3.8.0/test/test Tue Jun 21 08:12:02 2011
++++ logrotate-3.8.0-solfix/test/test Sun Jun 26 23:08:30 2011
@@ -17,7 +17,7 @@
input=test-config.$1.in
output=test-config.$1
@@ -11,107 +11,107 @@
createlog() {
@@ -118,7 +118,7 @@
- echo expected: \'$expected\'
- exit 2
- fi
-- echo "$config_crc" | md5sum -c - 2>&1 > /dev/null
-+ echo "$config_crc" | gmd5sum -c - 2>&1 > /dev/null
- if [ $? != 0 ]; then
- echo "config file $output has been altered: MD5 sum mismatch"
- exit 3
+ echo expected: \'$expected\'
+ exit 2
+ fi
+- echo "$config_crc" | md5sum -c - 2>&1 > /dev/null
++ echo "$config_crc" | gmd5sum -c - 2>&1 > /dev/null
+ if [ $? != 0 ]; then
+ echo "config file $output has been altered: MD5 sum mismatch"
+ exit 3
diff -ur logrotate-3.8.0/test/test-config.11.in logrotate-3.8.0-solfix/test/test-config.11.in
---- logrotate-3.8.0/test/test-config.11.in Tue Jun 21 08:12:02 2011
-+++ logrotate-3.8.0-solfix/test/test-config.11.in Sun Jun 26 23:02:28 2011
+--- logrotate-3.8.0/test/test-config.11.in Tue Jun 21 08:12:02 2011
++++ logrotate-3.8.0-solfix/test/test-config.11.in Sun Jun 26 23:02:28 2011
@@ -11,7 +11,7 @@
postrotate
- touch scriptout
-- echo $(cat scriptout) foo > foo
-+ echo `cat scriptout` foo > foo
- mv foo scriptout
+ touch scriptout
+- echo $(cat scriptout) foo > foo
++ echo `cat scriptout` foo > foo
+ mv foo scriptout
endscript
}
diff -ur logrotate-3.8.0/test/test-config.3.in logrotate-3.8.0-solfix/test/test-config.3.in
---- logrotate-3.8.0/test/test-config.3.in Tue Jun 21 08:12:02 2011
-+++ logrotate-3.8.0-solfix/test/test-config.3.in Sun Jun 26 23:03:29 2011
+--- logrotate-3.8.0/test/test-config.3.in Tue Jun 21 08:12:02 2011
++++ logrotate-3.8.0-solfix/test/test-config.3.in Sun Jun 26 23:03:29 2011
@@ -8,7 +8,7 @@
postrotate
- touch scriptout
-- echo $(cat scriptout) foo > foo
-+ echo `cat scriptout` foo > foo
- mv foo scriptout
+ touch scriptout
+- echo $(cat scriptout) foo > foo
++ echo `cat scriptout` foo > foo
+ mv foo scriptout
endscript
}
diff -ur logrotate-3.8.0/test/test-config.4.in logrotate-3.8.0-solfix/test/test-config.4.in
---- logrotate-3.8.0/test/test-config.4.in Tue Jun 21 08:12:02 2011
-+++ logrotate-3.8.0-solfix/test/test-config.4.in Sun Jun 26 23:03:39 2011
+--- logrotate-3.8.0/test/test-config.4.in Tue Jun 21 08:12:02 2011
++++ logrotate-3.8.0-solfix/test/test-config.4.in Sun Jun 26 23:03:39 2011
@@ -9,7 +9,7 @@
postrotate
- touch scriptout
-- echo $(cat scriptout) foo > foo
-+ echo `cat scriptout` foo > foo
- mv foo scriptout
+ touch scriptout
+- echo $(cat scriptout) foo > foo
++ echo `cat scriptout` foo > foo
+ mv foo scriptout
endscript
}
diff -ur logrotate-3.8.0/test/test-config.5.in logrotate-3.8.0-solfix/test/test-config.5.in
---- logrotate-3.8.0/test/test-config.5.in Tue Jun 21 08:12:02 2011
-+++ logrotate-3.8.0-solfix/test/test-config.5.in Sun Jun 26 23:03:51 2011
+--- logrotate-3.8.0/test/test-config.5.in Tue Jun 21 08:12:02 2011
++++ logrotate-3.8.0-solfix/test/test-config.5.in Sun Jun 26 23:03:51 2011
@@ -9,7 +9,7 @@
postrotate
- touch scriptout
-- echo $(cat scriptout) foo > foo
-+ echo `cat scriptout` foo > foo
- mv foo scriptout
+ touch scriptout
+- echo $(cat scriptout) foo > foo
++ echo `cat scriptout` foo > foo
+ mv foo scriptout
endscript
}
diff -ur logrotate-3.8.0/test/test-config.6.in logrotate-3.8.0-solfix/test/test-config.6.in
---- logrotate-3.8.0/test/test-config.6.in Tue Jun 21 08:12:02 2011
-+++ logrotate-3.8.0-solfix/test/test-config.6.in Sun Jun 26 23:04:09 2011
+--- logrotate-3.8.0/test/test-config.6.in Tue Jun 21 08:12:02 2011
++++ logrotate-3.8.0-solfix/test/test-config.6.in Sun Jun 26 23:04:09 2011
@@ -10,7 +10,7 @@
postrotate
- touch scriptout
-- echo $(cat scriptout) foo > foo
-+ echo `cat scriptout` foo > foo
- mv foo scriptout
+ touch scriptout
+- echo $(cat scriptout) foo > foo
++ echo `cat scriptout` foo > foo
+ mv foo scriptout
endscript
}
diff -ur logrotate-3.8.0/test/test-config.7.in logrotate-3.8.0-solfix/test/test-config.7.in
---- logrotate-3.8.0/test/test-config.7.in Tue Jun 21 08:12:02 2011
-+++ logrotate-3.8.0-solfix/test/test-config.7.in Sun Jun 26 23:04:23 2011
+--- logrotate-3.8.0/test/test-config.7.in Tue Jun 21 08:12:02 2011
++++ logrotate-3.8.0-solfix/test/test-config.7.in Sun Jun 26 23:04:23 2011
@@ -10,7 +10,7 @@
postrotate
- touch scriptout
-- echo $(cat scriptout) foo > foo
-+ echo `cat scriptout` foo > foo
- mv foo scriptout
+ touch scriptout
+- echo $(cat scriptout) foo > foo
++ echo `cat scriptout` foo > foo
+ mv foo scriptout
endscript
}
diff -ur logrotate-3.8.0/test/test-config.8.in logrotate-3.8.0-solfix/test/test-config.8.in
---- logrotate-3.8.0/test/test-config.8.in Tue Jun 21 08:12:02 2011
-+++ logrotate-3.8.0-solfix/test/test-config.8.in Sun Jun 26 23:04:36 2011
+--- logrotate-3.8.0/test/test-config.8.in Tue Jun 21 08:12:02 2011
++++ logrotate-3.8.0-solfix/test/test-config.8.in Sun Jun 26 23:04:36 2011
@@ -11,7 +11,7 @@
postrotate
- touch scriptout
-- echo $(cat scriptout) foo > foo
-+ echo `cat scriptout` foo > foo
- mv foo scriptout
+ touch scriptout
+- echo $(cat scriptout) foo > foo
++ echo `cat scriptout` foo > foo
+ mv foo scriptout
endscript
}
diff -ur logrotate-3.8.0/test/test-config.9.in logrotate-3.8.0-solfix/test/test-config.9.in
---- logrotate-3.8.0/test/test-config.9.in Tue Jun 21 08:12:02 2011
-+++ logrotate-3.8.0-solfix/test/test-config.9.in Sun Jun 26 23:04:47 2011
+--- logrotate-3.8.0/test/test-config.9.in Tue Jun 21 08:12:02 2011
++++ logrotate-3.8.0-solfix/test/test-config.9.in Sun Jun 26 23:04:47 2011
@@ -11,7 +11,7 @@
postrotate
- touch scriptout
-- echo $(cat scriptout) foo > foo
-+ echo `cat scriptout` foo > foo
- mv foo scriptout
+ touch scriptout
+- echo $(cat scriptout) foo > foo
++ echo `cat scriptout` foo > foo
+ mv foo scriptout
endscript
}
Deleted: csw/mgar/pkg/logrotate/trunk/files/004-alloca.patch
===================================================================
--- csw/mgar/pkg/logrotate/trunk/files/004-alloca.patch 2011-08-31 17:17:45 UTC (rev 15473)
+++ csw/mgar/pkg/logrotate/trunk/files/004-alloca.patch 2011-08-31 21:21:35 UTC (rev 15474)
@@ -1,18 +0,0 @@
---- logrotate-3.8.0/config.c Tue Jun 21 08:12:02 2011
-+++ logrotate-3.8.0-solfix/config.c Sun Jun 26 23:54:28 2011
-@@ -1,5 +1,5 @@
- #include <sys/queue.h>
--#ifdef _ALLOCA_H
-+#ifndef _ALLOCA_H
- #include <alloca.h>
- #else
- #include <limits.h>
---- logrotate-3.8.0/logrotate.c Tue Jun 21 08:12:02 2011
-+++ logrotate-3.8.0-solfix/logrotate.c Sun Jun 26 23:35:19 2011
-@@ -1,5 +1,5 @@
- #include <sys/queue.h>
--#ifdef _ALLOCA_H
-+#ifndef _ALLOCA_H
- #include <alloca.h>
- #else
- #include <limits.h>
Deleted: csw/mgar/pkg/logrotate/trunk/files/006-mbrtowc_empty.patch
===================================================================
--- csw/mgar/pkg/logrotate/trunk/files/006-mbrtowc_empty.patch 2011-08-31 17:17:45 UTC (rev 15473)
+++ csw/mgar/pkg/logrotate/trunk/files/006-mbrtowc_empty.patch 2011-08-31 21:21:35 UTC (rev 15474)
@@ -1,11 +0,0 @@
---- logrotate-3.8.0/config.c Tue Jun 21 08:12:02 2011
-+++ logrotate-3.8.0-solfix/config.c Mon Jun 27 20:57:53 2011
-@@ -166,7 +166,7 @@
-
- chptr = start;
-
-- while( (len = mbrtowc(&pwc, chptr, strlen(chptr), NULL)) != 0 ) {
-+ while( (len = mbrtowc(&pwc, chptr, strlen(chptr), NULL)) != 0 && strlen(chptr) != 0) {
- if( len == (size_t)(-1) || len == (size_t)(-2) || !iswprint(pwc) || iswblank(pwc) ) {
- message(MESS_ERROR, "%s:%d bad %s path %s\n",
- configFile, lineNum, key, start);
Deleted: csw/mgar/pkg/logrotate/trunk/files/007-warn-unreached.patch
===================================================================
--- csw/mgar/pkg/logrotate/trunk/files/007-warn-unreached.patch 2011-08-31 17:17:45 UTC (rev 15473)
+++ csw/mgar/pkg/logrotate/trunk/files/007-warn-unreached.patch 2011-08-31 21:21:35 UTC (rev 15474)
@@ -1,35 +0,0 @@
---- logrotate-3.8.0/config.c Tue Jun 21 08:12:02 2011
-+++ logrotate-3.8.0-solfix/config.c Mon Jun 27 20:29:25 2011
-@@ -1133,5 +1133,5 @@
- }
- }
-- else continue;
-+
- #if 0
- if (stat(newlog->oldDir, &sb)) {
-@@ -1178,5 +1178,4 @@
- }
- }
-- else continue;
-
- if (access(newlog->compress_prog, X_OK)) {
-@@ -1209,5 +1208,4 @@
- }
- }
-- else continue;
-
- if (access(newlog->uncompress_prog, X_OK)) {
-@@ -1245,5 +1243,5 @@
- goto error;
- }
-- } else continue;
-+ }
-
- if (poptParseArgvString(options,
-@@ -1278,5 +1276,5 @@
- goto error;
- }
-- } else continue;
-+ }
-
- message(MESS_DEBUG, "compress_ext is now %s\n",
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list