[csw-devel] SF.net SVN: gar:[19398] csw/mgar/pkg/cfengine3/trunk
guengel at users.sourceforge.net
guengel at users.sourceforge.net
Tue Oct 9 14:53:10 CEST 2012
Revision: 19398
http://gar.svn.sourceforge.net/gar/?rev=19398&view=rev
Author: guengel
Date: 2012-10-09 12:53:10 +0000 (Tue, 09 Oct 2012)
Log Message:
-----------
cfengine3/trunk: New upstream release
Modified Paths:
--------------
csw/mgar/pkg/cfengine3/trunk/Makefile
csw/mgar/pkg/cfengine3/trunk/checksums
csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW
Added Paths:
-----------
csw/mgar/pkg/cfengine3/trunk/files/0005-Remove-unsupported-compiler-options.patch
Removed Paths:
-------------
csw/mgar/pkg/cfengine3/trunk/files/0001-Remove-unsupported-compiler-options.patch
csw/mgar/pkg/cfengine3/trunk/files/map.cfengine3
Modified: csw/mgar/pkg/cfengine3/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cfengine3/trunk/Makefile 2012-10-09 12:22:46 UTC (rev 19397)
+++ csw/mgar/pkg/cfengine3/trunk/Makefile 2012-10-09 12:53:10 UTC (rev 19398)
@@ -1,7 +1,7 @@
# $Id$
#
NAME = cfengine3
-VERSION = 3.3.5
+VERSION = 3.3.7
CATEGORIES = utils
GARTYPE = v2
GARCOMPILER = SOS12U1
@@ -26,7 +26,6 @@
DISTFILES += csw$(NAME)-cfserverd
DISTFILES += README.CSW
DISTFILES += changelog.CSW
-DISTFILES += map.cfengine3
VENDOR_URL = http://www.cfengine.com/community
UFILES_REGEX = cfengine-(\d+(?:\.\d+)*).tar.gz
@@ -40,12 +39,13 @@
# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES
# UPSTREAM_MASTER_SITES =
-PATCHFILES += 0001-Remove-unsupported-compiler-options.patch
-PATCHFILES += 0002-Add-include-alloca.h-in-gcov-stub.c.patch
-PATCHFILES += 0000-Avoid-passing-NULL-pointer-to-CfOut-in-FnCallHostInN.patch
+PATCHFILES = 0000-Avoid-passing-NULL-pointer-to-CfOut-in-FnCallHostInN.patch
+#PATCHFILES += 0001-Remove-unsupported-compiler-options.patch
PATCHFILES += 0000-Optimization-debug-flags-adjusted-for-use-with-SunSt.patch
# See comment in patch
PATCHFILES += 0000-Do-not-perform-acceptance-test.patch
+PATCHFILES += 0002-Add-include-alloca.h-in-gcov-stub.c.patch
+PATCHFILES += 0005-Remove-unsupported-compiler-options.patch
#
# CUSTOM VARIABLES
@@ -131,7 +131,7 @@
# We use this because libpromises will be moved to this private
# directory (see also move-libpromises:)
-EXTRA_LDFLAGS += -R$(libdir)/$(NAME) -z ignore -Bdirect -M "$(abspath $(WORKDIR)/map.cfengine3)"
+EXTRA_LDFLAGS += -R$(libdir)/$(NAME)
# Those libs are used by configure to detect getaddrinfo()
EXTRA_CONFIGURE_ENV = LIBS="-lsocket -lnsl"
Modified: csw/mgar/pkg/cfengine3/trunk/checksums
===================================================================
--- csw/mgar/pkg/cfengine3/trunk/checksums 2012-10-09 12:22:46 UTC (rev 19397)
+++ csw/mgar/pkg/cfengine3/trunk/checksums 2012-10-09 12:53:10 UTC (rev 19398)
@@ -1 +1 @@
-a26eaa18f475de07f8ce122e4a4521d4 cfengine-3.3.5.tar.gz
+26c28a86c7385b7ace51fb2ce6b10dba cfengine-3.3.7.tar.gz
Deleted: csw/mgar/pkg/cfengine3/trunk/files/0001-Remove-unsupported-compiler-options.patch
===================================================================
--- csw/mgar/pkg/cfengine3/trunk/files/0001-Remove-unsupported-compiler-options.patch 2012-10-09 12:22:46 UTC (rev 19397)
+++ csw/mgar/pkg/cfengine3/trunk/files/0001-Remove-unsupported-compiler-options.patch 2012-10-09 12:53:10 UTC (rev 19398)
@@ -1,39 +0,0 @@
-From 39d1ba5a51f4308a135265690988e91af536ea0a Mon Sep 17 00:00:00 2001
-From: Rafael Ostertag <raos at opencsw.org>
-Date: Sat, 16 Jun 2012 20:20:27 +0200
-Subject: [PATCH] Remove unsupported compiler options
-
----
- tests/unit/Makefile.am | 2 +-
- tests/unit/Makefile.in | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
-index 86f52d0..176ccfc 100644
---- a/tests/unit/Makefile.am
-+++ b/tests/unit/Makefile.am
-@@ -68,7 +68,7 @@ xml_writer_test_LDADD = libtest.la
- #
- file_writer_test_SOURCES = file_writer_test.c gcov-stub.c \
- ../../src/writer.c
--file_writer_test_CFLAGS = $(AM_CFLAGS) -fno-profile-arcs -fno-test-coverage
-+file_writer_test_CFLAGS = $(AM_CFLAGS)
- file_writer_test_LDADD = libtest.la
- file_writer_test_LDLFAGS =
-
-diff --git a/tests/unit/Makefile.in b/tests/unit/Makefile.in
-index 36e04fb..884df9d 100644
---- a/tests/unit/Makefile.in
-+++ b/tests/unit/Makefile.in
-@@ -445,7 +445,7 @@ xml_writer_test_LDADD = libtest.la
- file_writer_test_SOURCES = file_writer_test.c gcov-stub.c \
- ../../src/writer.c
-
--file_writer_test_CFLAGS = $(AM_CFLAGS) -fno-profile-arcs -fno-test-coverage
-+file_writer_test_CFLAGS = $(AM_CFLAGS)
- file_writer_test_LDADD = libtest.la
- file_writer_test_LDLFAGS =
- db_test_SOURCES = db_test.c
---
-1.7.10.3
-
Added: csw/mgar/pkg/cfengine3/trunk/files/0005-Remove-unsupported-compiler-options.patch
===================================================================
--- csw/mgar/pkg/cfengine3/trunk/files/0005-Remove-unsupported-compiler-options.patch (rev 0)
+++ csw/mgar/pkg/cfengine3/trunk/files/0005-Remove-unsupported-compiler-options.patch 2012-10-09 12:53:10 UTC (rev 19398)
@@ -0,0 +1,49 @@
+From 008e0369d158cb20703097a4e1e5239048e9d7f8 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <raos at opencsw.org>
+Date: Tue, 9 Oct 2012 14:29:23 +0200
+Subject: [PATCH] Remove unsupported compiler options
+
+Remove unsupported compiler options. Also set -z interpose on evalfunction_test, since it overwrites functions.
+---
+ tests/unit/Makefile.am | 2 +-
+ tests/unit/Makefile.in | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
+index 86f52d0..176ccfc 100644
+--- a/tests/unit/Makefile.am
++++ b/tests/unit/Makefile.am
+@@ -68,7 +68,7 @@ xml_writer_test_LDADD = libtest.la
+ #
+ file_writer_test_SOURCES = file_writer_test.c gcov-stub.c \
+ ../../src/writer.c
+-file_writer_test_CFLAGS = $(AM_CFLAGS) -fno-profile-arcs -fno-test-coverage
++file_writer_test_CFLAGS = $(AM_CFLAGS)
+ file_writer_test_LDADD = libtest.la
+ file_writer_test_LDLFAGS =
+
+diff --git a/tests/unit/Makefile.in b/tests/unit/Makefile.in
+index 71e500e..b972a4d 100644
+--- a/tests/unit/Makefile.in
++++ b/tests/unit/Makefile.in
+@@ -123,7 +123,7 @@ domainname_test_LDADD = $(LDADD)
+ domainname_test_DEPENDENCIES = ../../src/libpromises.la libtest.la
+ evalfunction_test_SOURCES = evalfunction_test.c
+ evalfunction_test_OBJECTS = evalfunction_test.$(OBJEXT)
+-evalfunction_test_LDADD = $(LDADD)
++evalfunction_test_LDADD = $(LDADD) -z interpose
+ evalfunction_test_DEPENDENCIES = ../../src/libpromises.la libtest.la
+ am_file_writer_test_OBJECTS = \
+ file_writer_test-file_writer_test.$(OBJEXT) \
+@@ -467,7 +467,7 @@ xml_writer_test_LDADD = libtest.la
+ file_writer_test_SOURCES = file_writer_test.c gcov-stub.c \
+ ../../src/writer.c
+
+-file_writer_test_CFLAGS = $(AM_CFLAGS) -fno-profile-arcs -fno-test-coverage
++file_writer_test_CFLAGS = $(AM_CFLAGS)
+ file_writer_test_LDADD = libtest.la
+ file_writer_test_LDLFAGS =
+ db_test_SOURCES = db_test.c
+--
+1.7.12
+
Modified: csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW 2012-10-09 12:22:46 UTC (rev 19397)
+++ csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW 2012-10-09 12:53:10 UTC (rev 19398)
@@ -1,3 +1,10 @@
+cfengine3 (3.3.7,REV=2012.10.09)
+
+ * New upstream release 3.3.7.
+
+ -- Rafael Ostertag <raos at opencsw.org> Tue, 09 Oct 2012 14:48:49 +0200
+
+
cfengine3 (3.3.5,REV=2012.08.21)
* New upstream release 3.3.5.
Deleted: csw/mgar/pkg/cfengine3/trunk/files/map.cfengine3
===================================================================
--- csw/mgar/pkg/cfengine3/trunk/files/map.cfengine3 2012-10-09 12:22:46 UTC (rev 19397)
+++ csw/mgar/pkg/cfengine3/trunk/files/map.cfengine3 2012-10-09 12:53:10 UTC (rev 19398)
@@ -1 +0,0 @@
-libc.so - SUNW_1.22.5 SUNWprivate_1.1;
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