[csw-devel] SF.net SVN: gar:[19691] csw/mgar/pkg/logrotate/trunk
igalic at users.sourceforge.net
igalic at users.sourceforge.net
Wed Nov 14 11:58:53 CET 2012
Revision: 19691
http://gar.svn.sourceforge.net/gar/?rev=19691&view=rev
Author: igalic
Date: 2012-11-14 10:58:53 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
logrotate/trunk: bump version, accomodate for changes in gar
bumping version to 2.8.3
revmogin CATEGORIES and PLATFORMS
Disabling tests for now, because the acl tests fail on ZFS
adding 64bit build
Modified Paths:
--------------
csw/mgar/pkg/logrotate/trunk/Makefile
csw/mgar/pkg/logrotate/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/logrotate/trunk/files/0001-default-locations.patch
csw/mgar/pkg/logrotate/trunk/files/0001-make-this-overridable.patch
Removed Paths:
-------------
csw/mgar/pkg/logrotate/trunk/files/003-test.patch
csw/mgar/pkg/logrotate/trunk/files/005-gzippath.patch
csw/mgar/pkg/logrotate/trunk/files/006-mbrtowc_empty.patch
Modified: csw/mgar/pkg/logrotate/trunk/Makefile
===================================================================
--- csw/mgar/pkg/logrotate/trunk/Makefile 2012-11-14 10:47:29 UTC (rev 19690)
+++ csw/mgar/pkg/logrotate/trunk/Makefile 2012-11-14 10:58:53 UTC (rev 19691)
@@ -3,8 +3,7 @@
# $Id$
NAME = logrotate
-VERSION = 3.8.1
-GARTYPE = v2
+VERSION = 3.8.3
DESCRIPTION = Rotates, compresses, and mails system logs
@@ -17,32 +16,38 @@
SPKG_SOURCEURL = https://fedorahosted.org/logrotate/
MASTER_SITES = https://fedorahosted.org/releases/l/o/logrotate/
-PATCHFILES += 003-test.patch
-PATCHFILES += 005-gzippath.patch
-PATCHFILES += 006-mbrtowc_empty.patch
+PATCHFILES += 0001-default-locations.patch
+PATCHFILES += 0001-make-this-overridable.patch
DISTFILES = $(NAME)-$(VERSION).tar.gz
-DISTFILES += 003-test.patch
-DISTFILES += 005-gzippath.patch
-DISTFILES += 006-mbrtowc_empty.patch
-RUNTIME_DEP_PKGS = CSWlibpopt
-BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS)
+RUNTIME_DEP_PKGS = CSWlibpopt0
+BUILD_DEP_PKGS = CSWlibpopt-dev
CONFIGURE_SCRIPTS =
-TEST_TARGET = test
+# TEST_ENV_PATH = $(prefix)/gnu:$(PATH)
+# TEST_TARGET = test
+# Currently tests are failing. The reason being that setfacl doesn't seem to work on ZFS
+# I don't know how to disable specific tests, so I'm disabling them all
+TEST_TARGET =
-PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+BUILD64 = 1
+ISAEXEC = 1
include gar/category.mk
-export EXTRA_CFLAGS := $(CFLAGS) $(CPPFLAGS)
-export EXTRA_LDFLAGS := $(LDFLAGS)
-export PREFIX = $(DESTDIR)
-export BASEDIR = $(prefix)
-export MANDIR = $(mandir)
+EXTRA_INSTALL_EXPORTS = PREFIX BASEDIR MANDIR BINDIR
+INSTALL_ENV_PREFIX = $(DESTDIR)
+INSTALL_ENV_BASEDIR = $(prefix)
+INSTALL_ENV_MANDIR = $(mandir)
+INSTALL_ENV_BINDIR = $(sbindir)
+EXTRA_BUILD_EXPORTS = EXTRA_CFLAGS EXTRA_CPPFLAGS EXTRA_LDFLAGS
+BUILD_ENV_EXTRA_CFLAGS =$(CFLAGS)
+BUILD_ENV_EXTRA_CPPFLAGS = $(CPPFLAGS)
+BUILD_ENV_EXTRA_LDFLAGS = $(LDFLAGS)
+
# This is a hack, as I have no idea what's going wrong.
pre-test-modulated:
@( cd $(WORKSRC) ; \
@@ -55,3 +60,4 @@
pre-build-modulated:
@( cd $(WORKSRC) ; \
rm -f .depend )
+
Modified: csw/mgar/pkg/logrotate/trunk/checksums
===================================================================
--- csw/mgar/pkg/logrotate/trunk/checksums 2012-11-14 10:47:29 UTC (rev 19690)
+++ csw/mgar/pkg/logrotate/trunk/checksums 2012-11-14 10:58:53 UTC (rev 19691)
@@ -1,4 +1 @@
-bd2e20d8dc644291b08f9215397d28a5 logrotate-3.8.1.tar.gz
-02f36862d4e190a7eb920bd816ca4927 003-test.patch
-d6232a06412a2302a582abdc51607518 005-gzippath.patch
-4b1205a3056b38d175a5a7cb3ddd27df 006-mbrtowc_empty.patch
+df67c8bda9139131d919931da443794d logrotate-3.8.3.tar.gz
Added: csw/mgar/pkg/logrotate/trunk/files/0001-default-locations.patch
===================================================================
--- csw/mgar/pkg/logrotate/trunk/files/0001-default-locations.patch (rev 0)
+++ csw/mgar/pkg/logrotate/trunk/files/0001-default-locations.patch 2012-11-14 10:58:53 UTC (rev 19691)
@@ -0,0 +1,28 @@
+From 177f8b902b1edd57e01adaef5103850343996bee Mon Sep 17 00:00:00 2001
+From: Igor Galic <igalic at opencsw.org>
+Date: Wed, 14 Nov 2012 11:14:37 +0100
+Subject: [PATCH] default locations
+
+---
+ config.h | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/config.h b/config.h
+index d715c5a..b0469c1 100644
+--- a/config.h
++++ b/config.h
+@@ -13,7 +13,10 @@
+
+ #ifdef SunOS
+ #define DEFAULT_MAIL_COMMAND "/usr/bin/mailx"
+-#define STATEFILE "/var/log/logrotate.status"
++#define STATEFILE "/var/opt/csw/log/logrotate.status"
++#define COMPRESS_COMMAND "/opt/csw/bin/gzip"
++#define UNCOMPRESS_COMMAND "/opt/csw/bin/gunzip"
++#define STATEFILE "/var/opt/csw/log/logrotate.status"
+ #endif
+
+ #ifdef __NetBSD__
+--
+1.8.0
+
Added: csw/mgar/pkg/logrotate/trunk/files/0001-make-this-overridable.patch
===================================================================
--- csw/mgar/pkg/logrotate/trunk/files/0001-make-this-overridable.patch (rev 0)
+++ csw/mgar/pkg/logrotate/trunk/files/0001-make-this-overridable.patch 2012-11-14 10:58:53 UTC (rev 19691)
@@ -0,0 +1,25 @@
+From 72b018b52df6425771b0d4834e849e9755c1df62 Mon Sep 17 00:00:00 2001
+From: Igor Galic <igalic at opencsw.org>
+Date: Wed, 14 Nov 2012 11:38:28 +0100
+Subject: [PATCH] make this overridable
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index d65a3f3..e00b237 100644
+--- a/Makefile
++++ b/Makefile
+@@ -80,7 +80,7 @@ ifneq ($(STATEFILE),)
+ CFLAGS += -DSTATEFILE=\"$(STATEFILE)\"
+ endif
+
+-BINDIR = $(BASEDIR)/sbin
++BINDIR ?= $(BASEDIR)/sbin
+ MANDIR ?= $(BASEDIR)/man
+
+ #--------------------------------------------------------------------------
+--
+1.8.0
+
Deleted: csw/mgar/pkg/logrotate/trunk/files/003-test.patch
===================================================================
--- csw/mgar/pkg/logrotate/trunk/files/003-test.patch 2012-11-14 10:47:29 UTC (rev 19690)
+++ csw/mgar/pkg/logrotate/trunk/files/003-test.patch 2012-11-14 10:58:53 UTC (rev 19691)
@@ -1,117 +0,0 @@
-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
-@@ -17,7 +17,7 @@
- input=test-config.$1.in
- output=test-config.$1
- sed "s,&DIR&,$PWD,g" < $input > $output
-- config_crc=$(md5sum $output)
-+ config_crc=$(gmd5sum $output)
- }
-
- 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
-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
-@@ -11,7 +11,7 @@
-
- postrotate
- 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
-@@ -8,7 +8,7 @@
-
- postrotate
- 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
-@@ -9,7 +9,7 @@
-
- postrotate
- 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
-@@ -9,7 +9,7 @@
-
- postrotate
- 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
-@@ -10,7 +10,7 @@
-
- postrotate
- 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
-@@ -10,7 +10,7 @@
-
- postrotate
- 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
-@@ -11,7 +11,7 @@
-
- postrotate
- 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
-@@ -11,7 +11,7 @@
-
- postrotate
- touch scriptout
-- echo $(cat scriptout) foo > foo
-+ echo `cat scriptout` foo > foo
- mv foo scriptout
- endscript
- }
Deleted: csw/mgar/pkg/logrotate/trunk/files/005-gzippath.patch
===================================================================
--- csw/mgar/pkg/logrotate/trunk/files/005-gzippath.patch 2012-11-14 10:47:29 UTC (rev 19690)
+++ csw/mgar/pkg/logrotate/trunk/files/005-gzippath.patch 2012-11-14 10:58:53 UTC (rev 19691)
@@ -1,16 +0,0 @@
-diff -ur logrotate-3.8.0/config.h logrotate-3.8.0-sol10fix/config.h
---- logrotate-3.8.0/config.h 2011-06-21 10:12:02.000000000 +0200
-+++ logrotate-3.8.0-sol10fix/config.h 2011-07-22 01:37:57.603640585 +0200
-@@ -13,9 +13,9 @@
-
- #ifdef SunOS
- #define DEFAULT_MAIL_COMMAND "/usr/bin/mailx"
--#define COMPRESS_COMMAND "/usr/local/bin/gzip"
--#define UNCOMPRESS_COMMAND "/usr/local/bin/gunzip"
--#define STATEFILE "/var/log/logrotate.status"
-+#define COMPRESS_COMMAND "/opt/csw/bin/gzip"
-+#define UNCOMPRESS_COMMAND "/opt/csw/bin/gunzip"
-+#define STATEFILE "/var/opt/csw/log/logrotate.status"
- #endif
-
- #ifdef __NetBSD__
Deleted: csw/mgar/pkg/logrotate/trunk/files/006-mbrtowc_empty.patch
===================================================================
--- csw/mgar/pkg/logrotate/trunk/files/006-mbrtowc_empty.patch 2012-11-14 10:47:29 UTC (rev 19690)
+++ csw/mgar/pkg/logrotate/trunk/files/006-mbrtowc_empty.patch 2012-11-14 10:58:53 UTC (rev 19691)
@@ -1,12 +0,0 @@
-diff -ur logrotate-3.8.1/config.c logrotate-3.8.1-sol10fix/config.c
---- logrotate-3.8.1/config.c 2011-08-31 14:39:04.000000000 +0200
-+++ logrotate-3.8.1-sol10fix/config.c 2011-09-04 01:56:47.797271345 +0200
-@@ -190,7 +190,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);
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