[csw-devel] SF.net SVN: gar:[18444] csw/mgar/pkg/cfengine3/trunk
guengel at users.sourceforge.net
guengel at users.sourceforge.net
Sun Jun 17 14:17:32 CEST 2012
Revision: 18444
http://gar.svn.sourceforge.net/gar/?rev=18444&view=rev
Author: guengel
Date: 2012-06-17 12:17:32 +0000 (Sun, 17 Jun 2012)
Log Message:
-----------
cfengine3/trunk: New upstream release CFEngine 3.3.3. Support for Sol9 was dropped. Tokyocabinet used as replacement for BDB.
Modified Paths:
--------------
csw/mgar/pkg/cfengine3/trunk/Makefile
csw/mgar/pkg/cfengine3/trunk/checksums
csw/mgar/pkg/cfengine3/trunk/files/README.CSW
csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW
Added Paths:
-----------
csw/mgar/pkg/cfengine3/trunk/files/0000-Avoid-passing-NULL-pointer-to-CfOut-in-FnCallHostInN.patch
csw/mgar/pkg/cfengine3/trunk/files/0000-Do-not-perform-acceptance-test.patch
csw/mgar/pkg/cfengine3/trunk/files/0000-Optimization-debug-flags-adjusted-for-use-with-SunSt.patch
csw/mgar/pkg/cfengine3/trunk/files/0001-Remove-unsupported-compiler-options.patch
csw/mgar/pkg/cfengine3/trunk/files/0002-Add-include-alloca.h-in-gcov-stub.c.patch
Modified: csw/mgar/pkg/cfengine3/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cfengine3/trunk/Makefile 2012-06-17 08:19:04 UTC (rev 18443)
+++ csw/mgar/pkg/cfengine3/trunk/Makefile 2012-06-17 12:17:32 UTC (rev 18444)
@@ -4,7 +4,10 @@
VERSION = 3.3.3
CATEGORIES = utils
GARTYPE = v2
+GARCOMPILER = SOS12U1
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+
DESCRIPTION = Open source configuration management system
define BLURB
CFEngine Community is the Open Source foundation of CFEngine's innovative
@@ -27,10 +30,6 @@
UFILES_REGEX = cfengine-(\d+(?:\.\d+)*).tar.gz
-# Cfengine probes for Solaris 10 specific functionality (i.e. zones),
-# so a we build it for Sol9 and Sol10
-PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 solaris9-sparc solaris9-i386
-
# File name regex to get notifications about upstream software releases
# NOTE: Use this only if the automatic regex creation
# does not work for your package
@@ -40,6 +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-Optimization-debug-flags-adjusted-for-use-with-SunSt.patch
+# See comment in patch
+PATCHFILES += 0000-Do-not-perform-acceptance-test.patch
+
#
# CUSTOM VARIABLES
#
@@ -51,9 +57,9 @@
# Catch all
CATALOGNAME_CSW$(NAME)utils = $(NAME)_utils
SPKG_DESC_CSW$(NAME)utils = CFEngine 3 utilities and documentation
-RUNTIME_DEP_PKGS_CSW$(NAME)utils += CSWbdb48
-RUNTIME_DEP_PKGS_CSW$(NAME)utils += CSWosslrt
-RUNTIME_DEP_PKGS_CSW$(NAME)utils += CSWlibpcre0
+RUNTIME_DEP_PKGS_CSW$(NAME)utils += CSWlibtokyocabinet9
+RUNTIME_DEP_PKGS_CSW$(NAME)utils += CSWlibssl1-0-0
+RUNTIME_DEP_PKGS_CSW$(NAME)utils += CSWlibpcre1
CHECKPKG_OVERRIDES_CSW$(NAME)utils += catalogname-does-not-match-pkgname|pkgname=CSW$(NAME)utils|catalogname=$(NAME)_utils|expected-catalogname=$(NAME)utils
OBSOLETED_BY_CSW$(NAME)utils = CSWlibpromises1 CSW$(NAME)rt
CATALOGNAME_CSWlibpromises1 = libpromises1_stub
@@ -62,9 +68,9 @@
PACKAGES += CSW$(NAME)server
CATALOGNAME_CSW$(NAME)server = $(NAME)_server
SPKG_DESC_CSW$(NAME)server = CFEngine 3 server binary
-RUNTIME_DEP_PKGS_CSW$(NAME)server += CSWbdb48
-RUNTIME_DEP_PKGS_CSW$(NAME)server += CSWosslrt
-RUNTIME_DEP_PKGS_CSW$(NAME)server += CSWlibpcre0
+RUNTIME_DEP_PKGS_CSW$(NAME)server += CSWlibtokyocabinet9
+RUNTIME_DEP_PKGS_CSW$(NAME)server += CSWlibssl1-0-0
+RUNTIME_DEP_PKGS_CSW$(NAME)server += CSWlibpcre1
RUNTIME_DEP_PKGS_CSW$(NAME)server += CSW$(NAME)utils
PKGFILES_CSW$(NAME)server += $(sbindir)/cf-serverd
PKGFILES_CSW$(NAME)server += $(sbindir)/cf-runagent
@@ -77,9 +83,9 @@
PACKAGES += CSW$(NAME)client
CATALOGNAME_CSW$(NAME)client = $(NAME)_client
SPKG_DESC_CSW$(NAME)client = CFEngine 3 client binaries
-RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWbdb48
-RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWosslrt
-RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibpcre0
+RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibtokyocabinet9
+RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibssl1-0-0
+RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibpcre1
RUNTIME_DEP_PKGS_CSW$(NAME)client += CSW$(NAME)utils
PKGFILES_CSW$(NAME)client += $(sbindir)/cf-agent
PKGFILES_CSW$(NAME)client += $(sbindir)/cf-execd
@@ -107,30 +113,25 @@
# the server and client component
PRESERVECONF = $(sysconfdir)/$(NAME)rc
-BUILD64_LIBS_ONLY = 1
-
-BUILD_DEP_PKGS = CSWbdb48devel
+BUILD_DEP_PKGS = CSWlibssl-dev
BUILD_DEP_PKGS += CSWlibpcre-dev
-BUILD_DEP_PKGS += CSWossldevel
+BUILD_DEP_PKGS += CSWlibtokyocabinet-dev
BUILD_DEP_PKGS += CSWflex
BUILD_DEP_PKGS += CSWbison
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --disable-silent-rules
-CONFIGURE_ARGS += --with-berkeleydb=$(prefix)/bdb48
+CONFIGURE_ARGS += --with-tokyocabinet=$(prefix)
CONFIGURE_ARGS += --with-openssl=$(prefix)
CONFIGURE_ARGS += --with-pcre=$(prefix)
CONFIGURE_ARGS += --with-workdir=$(cfengine_workdir)
-CONFIGURE_ARGS += --without-sqlite3
CONFIGURE_ARGS += --without-qdbm
CONFIGURE_ARGS += --without-postgresql
CONFIGURE_ARGS += --without-mysql
-EXTRA_INC = $(prefix)/bdb48/include
+EXTRA_CPPFLAGS = -xc99=all
+EXTRA_CFLAGS = -xc99=all
-EXTRA_RUNPATH_DIRS = $(prefix)/bdb48/lib
-EXTRA_RUNPATH_ISALIST = $(EXTRA_RUNPATH_DIRS)
-EXTRA_LDFLAGS = -L$(prefix)/bdb48/lib/$(MM_LIBDIR)
# We use this because libpromises will be moved to this private
# directory (see also move-libpromises:)
EXTRA_LDFLAGS += -R$(libdir)/$(NAME)
@@ -140,16 +141,17 @@
include gar/category.mk
-post-install-modulated: rename-cfengine-dir make-cfengine-workdir install-cfengine-links install-smf-manifests install-cfengine3rc install-cfengine3-csw-doc fix-paths-in-files move-libpromises
+post-install-modulated: rename-cfengine-dir make-cfengine-workdir install-cfengine-links install-smf-manifests install-cfengine3rc install-cfengine3-csw-doc fix-paths-in-files move-libpromises move-binaries
@$(MAKECOOKIE)
rename-cfengine-dir:
- if test -d $(DESTDIR)$(datadir)/cfengine ; then \
- mv $(DESTDIR)$(datadir)/cfengine $(DESTDIR)$(datadir)/$(NAME) ;\
+ ginstall -d $(DESTDIR)$(docdir)/$(NAME)_utils
+ if [ -d $(DESTDIR)$(datadir)/CoreBase ] ; then \
+ mv $(DESTDIR)$(datadir)/CoreBase $(DESTDIR)$(docdir)/$(NAME)_utils ; \
fi
- if test -d $(DESTDIR)$(docdir)/cfengine ; then \
- mv $(DESTDIR)$(docdir)/cfengine $(DESTDIR)$(docdir)/$(NAME) ;\
- fi
+ for f in example_config README ChangeLog examples ; do \
+ mv $(DESTDIR)$(docdir)/$$f $(DESTDIR)$(docdir)/$(NAME)_utils/ || echo "Unable to move $$f" ; \
+ done
install-smf-manifests:
ginstall -d $(DESTDIR)$(initddir)
@@ -177,10 +179,10 @@
ginstall $(WORKDIR)/$(NAME)rc $(DESTDIR)$(sysconfdir)/$(NAME)rc.CSW
install-cfengine3-csw-doc: rename-cfengine-dir
- ginstall $(WORKDIR)/README.CSW $(DESTDIR)$(docdir)/$(NAME)
+ ginstall -m 644 $(WORKDIR)/README.CSW $(DESTDIR)$(docdir)/$(NAME)_utils/
fix-paths-in-files: rename-cfengine-dir
- for d in $(DESTDIR)$(docdir)/$(NAME)/example_config $(DESTDIR)$(docdir)/$(NAME)/examples $(DESTDIR)$(datadir)/$(NAME)/masterfiles ; do \
+ for d in $(DESTDIR)$(docdir)/$(NAME)_utils/example_config $(DESTDIR)$(docdir)/$(NAME)_utils/examples $(DESTDIR)$(docdir)/$(NAME)_utils/CoreBase; do \
if test -d $$d ; then \
for f in $${d}/*.cf ; do \
sed -e 's|/var/cfengine/|/var/opt/csw/$(NAME)/|g' \
@@ -196,9 +198,21 @@
# available API. Please note, the rpath has to be set appropriately
move-libpromises:
ginstall -d $(DESTDIR)$(libdir)/$(NAME)
- mv $(DESTDIR)$(libdir)/libpromises.* $(DESTDIR)$(libdir)/$(NAME)/
+ if test -f $(DESTDIR)$(libdir)/libpromises.so.1.0.0 ; then \
+ mv $(DESTDIR)$(libdir)/libpromises.* $(DESTDIR)$(libdir)/$(NAME)/ ; \
+ fi
+# The cfengine guys decided to put binaries into $(prefix)/bin starting
+# with 3.3.0. I don't see the point and keep the binaries in $(prefix)/sbin
+move-binaries:
+ ginstall -d $(DESTDIR)$(prefix)/sbin
+ if test -f $(DESTDIR)$(prefix)/bin/cf-agent ; then \
+ mv $(DESTDIR)$(prefix)/bin/* $(DESTDIR)$(prefix)/sbin/ ; \
+ rmdir $(DESTDIR)$(prefix)/bin ; \
+ fi
+
post-merge:
# Get rid of the .so files. Since there are no header files provided,
# .so files are pretty much useless
find $(PKGROOT)$(libdir) -name libpromises.so -exec rm \{\} \;
+
Modified: csw/mgar/pkg/cfengine3/trunk/checksums
===================================================================
--- csw/mgar/pkg/cfengine3/trunk/checksums 2012-06-17 08:19:04 UTC (rev 18443)
+++ csw/mgar/pkg/cfengine3/trunk/checksums 2012-06-17 12:17:32 UTC (rev 18444)
@@ -1 +1 @@
-be118dd95537221da38008845fc0d84a cfengine-3.2.3.tar.gz
+f80c7002eae0c4b832f814529babe3f9 cfengine-3.3.3.tar.gz
Added: csw/mgar/pkg/cfengine3/trunk/files/0000-Avoid-passing-NULL-pointer-to-CfOut-in-FnCallHostInN.patch
===================================================================
--- csw/mgar/pkg/cfengine3/trunk/files/0000-Avoid-passing-NULL-pointer-to-CfOut-in-FnCallHostInN.patch (rev 0)
+++ csw/mgar/pkg/cfengine3/trunk/files/0000-Avoid-passing-NULL-pointer-to-CfOut-in-FnCallHostInN.patch 2012-06-17 12:17:32 UTC (rev 18444)
@@ -0,0 +1,34 @@
+From 52fbe289f9e86c525aae84eba5035b581c04c712 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <raos at opencsw.org>
+Date: Sun, 17 Jun 2012 10:31:12 +0200
+Subject: [PATCH] Avoid passing NULL pointer to CfOut in
+ FnCallHostInNetgroup()
+
+---
+ src/evalfunction.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/evalfunction.c b/src/evalfunction.c
+index f310d7c..92d8bd5 100644
+--- a/src/evalfunction.c
++++ b/src/evalfunction.c
+@@ -2183,14 +2183,14 @@ FnCallResult FnCallHostInNetgroup(FnCall *fp, Rlist *finalargs)
+ {
+ if (host == NULL || strcmp(host, VUQNAME) == 0)
+ {
+- CfOut(cf_verbose, "", "Matched %s in netgroup %s\n", host, ScalarValue(finalargs));
++ CfOut(cf_verbose, "", "Matched %s in netgroup %s\n", host == NULL ? "(nil)" : host, ScalarValue(finalargs));
+ strcpy(buffer, "any");
+ break;
+ }
+
+ if (host == NULL || strcmp(host, VFQNAME) == 0)
+ {
+- CfOut(cf_verbose, "", "Matched %s in netgroup %s\n", host, ScalarValue(finalargs));
++ CfOut(cf_verbose, "", "Matched %s in netgroup %s\n", host == NULL ? "(nil)" : host, ScalarValue(finalargs));
+ strcpy(buffer, "any");
+ break;
+ }
+--
+1.7.10.3
+
Added: csw/mgar/pkg/cfengine3/trunk/files/0000-Do-not-perform-acceptance-test.patch
===================================================================
--- csw/mgar/pkg/cfengine3/trunk/files/0000-Do-not-perform-acceptance-test.patch (rev 0)
+++ csw/mgar/pkg/cfengine3/trunk/files/0000-Do-not-perform-acceptance-test.patch 2012-06-17 12:17:32 UTC (rev 18444)
@@ -0,0 +1,37 @@
+From b90694842d4649a191c43dd004e4052786389fda Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <raos at opencsw.org>
+Date: Sun, 17 Jun 2012 11:30:48 +0200
+Subject: [PATCH] Do not perform acceptance test
+
+Why? Accpetance tests are using CFEngine's $(WORKDIR) which is set to /var/opt/csw/cfengine3 and regular users, i.e. the guy who is building CFEngine does not have rw access to it, nor can it be created by non-root users. Thus, all tests fail.
+
+Having CFEngine running on several Sol10 machines, I guess this counts as test.
+---
+ tests/Makefile.am | 2 +-
+ tests/Makefile.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 7e9bf2c..ed152e7 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -1 +1 @@
+-SUBDIRS = unit load acceptance
+\ No newline at end of file
++SUBDIRS = unit load
+diff --git a/tests/Makefile.in b/tests/Makefile.in
+index 8f67654..76974c4 100644
+--- a/tests/Makefile.in
++++ b/tests/Makefile.in
+@@ -276,7 +276,7 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ workdir = @workdir@
+-SUBDIRS = unit load acceptance
++SUBDIRS = unit load
+ all: all-recursive
+
+ .SUFFIXES:
+--
+1.7.10.3
+
Added: csw/mgar/pkg/cfengine3/trunk/files/0000-Optimization-debug-flags-adjusted-for-use-with-SunSt.patch
===================================================================
--- csw/mgar/pkg/cfengine3/trunk/files/0000-Optimization-debug-flags-adjusted-for-use-with-SunSt.patch (rev 0)
+++ csw/mgar/pkg/cfengine3/trunk/files/0000-Optimization-debug-flags-adjusted-for-use-with-SunSt.patch 2012-06-17 12:17:32 UTC (rev 18444)
@@ -0,0 +1,28 @@
+From 4ab202a1367d352937b101c7994cd99100950822 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <raos at opencsw.org>
+Date: Sun, 17 Jun 2012 10:46:20 +0200
+Subject: [PATCH] Optimization/debug flags adjusted for use with SunStudio
+
+---
+ configure | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index d8df74d..c929f0a 100755
+--- a/configure
++++ b/configure
+@@ -13685,9 +13685,9 @@ fi
+
+
+ if test x"$debug" = x"yes"; then
+- CFLAGS="$CFLAGS -g3 -O0"
++ CFLAGS="$CFLAGS -g -xO0"
+ else
+- CFLAGS="$CFLAGS -O2 -DNDEBUG"
++ CFLAGS="$CFLAGS -xO3 -DNDEBUG"
+ fi
+
+
+--
+1.7.10.3
+
Added: csw/mgar/pkg/cfengine3/trunk/files/0001-Remove-unsupported-compiler-options.patch
===================================================================
--- csw/mgar/pkg/cfengine3/trunk/files/0001-Remove-unsupported-compiler-options.patch (rev 0)
+++ csw/mgar/pkg/cfengine3/trunk/files/0001-Remove-unsupported-compiler-options.patch 2012-06-17 12:17:32 UTC (rev 18444)
@@ -0,0 +1,39 @@
+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/0002-Add-include-alloca.h-in-gcov-stub.c.patch
===================================================================
--- csw/mgar/pkg/cfengine3/trunk/files/0002-Add-include-alloca.h-in-gcov-stub.c.patch (rev 0)
+++ csw/mgar/pkg/cfengine3/trunk/files/0002-Add-include-alloca.h-in-gcov-stub.c.patch 2012-06-17 12:17:32 UTC (rev 18444)
@@ -0,0 +1,23 @@
+From 9063c218bfd3fcdeeeab7a2f40d46312bb3d5f23 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <raos at opencsw.org>
+Date: Sat, 16 Jun 2012 21:15:44 +0200
+Subject: [PATCH] Add include alloca.h in gcov-stub.c
+
+---
+ tests/unit/gcov-stub.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tests/unit/gcov-stub.c b/tests/unit/gcov-stub.c
+index 39cfd00..241b92a 100644
+--- a/tests/unit/gcov-stub.c
++++ b/tests/unit/gcov-stub.c
+@@ -1,5 +1,6 @@
+ #include "cf3.defs.h"
+ #include "cf3.extern.h"
++#include <alloca.h>
+
+ /*
+ * Stubs which allow CFEngine compiled with gcov support to link against unit
+--
+1.7.10.3
+
Modified: csw/mgar/pkg/cfengine3/trunk/files/README.CSW
===================================================================
--- csw/mgar/pkg/cfengine3/trunk/files/README.CSW 2012-06-17 08:19:04 UTC (rev 18443)
+++ csw/mgar/pkg/cfengine3/trunk/files/README.CSW 2012-06-17 12:17:32 UTC (rev 18444)
@@ -23,3 +23,6 @@
lead to the service going in maintenance mode when using SMF (or
just not having the daemon started when using legacy startup
scritps). This is due to the locking mechanism used by CFEngine.
+
+* Starting with CFEngine 3.3.0, support for Berkeley DB was dropped by
+ CFEngine, and Tokyocabinet is used instead.
\ No newline at end of file
Modified: csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW 2012-06-17 08:19:04 UTC (rev 18443)
+++ csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW 2012-06-17 12:17:32 UTC (rev 18444)
@@ -1,3 +1,15 @@
+cfengine3 (3.3.3,REV=2012.06.17)
+
+ * New upstream release 3.3.3.
+
+ * Starting with CFEngine 3.3.0, Berkeley DB support was
+ dropped. Tokyocabinet is used instead.
+
+ * Dropped support for Solaris 9.
+
+ -- Rafael Ostertag <raos at opencsw.org> Sun, 17 Jun 2012 14:09:15 +0200
+
+
cfengine3 (3.2.3,REV=2012.01.06)
* Obsoleted CSWlibpromises1.
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