[csw-devel] SF.net SVN: gar:[19868] csw/mgar/pkg/cfengine3/trunk
guengel at users.sourceforge.net
guengel at users.sourceforge.net
Sun Dec 9 15:28:42 CET 2012
Revision: 19868
http://gar.svn.sourceforge.net/gar/?rev=19868&view=rev
Author: guengel
Date: 2012-12-09 14:28:41 +0000 (Sun, 09 Dec 2012)
Log Message:
-----------
cfengine3/trunk: New upstream release 3.4.1
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/0001-Fix-preprocessor-macro-FUNC_DEPRECATED-to-avoid-synt.patch
csw/mgar/pkg/cfengine3/trunk/files/0002-Remove-unsupported-compiler-flags.patch
csw/mgar/pkg/cfengine3/trunk/files/0003-Fix-empty-initializer.-Add-mkdtemp.patch
csw/mgar/pkg/cfengine3/trunk/files/0003-Remove-unsupported-compiler-flags.-Add-z-interpose-w.patch
Removed Paths:
-------------
csw/mgar/pkg/cfengine3/trunk/files/0000-Avoid-passing-NULL-pointer-to-CfOut-in-FnCallHostInN.patch
csw/mgar/pkg/cfengine3/trunk/files/0000-Optimization-debug-flags-adjusted-for-use-with-SunSt.patch
csw/mgar/pkg/cfengine3/trunk/files/0002-Add-include-alloca.h-in-gcov-stub.c.patch
csw/mgar/pkg/cfengine3/trunk/files/0005-Remove-unsupported-compiler-options.patch
csw/mgar/pkg/cfengine3/trunk/files/0006-Fix-empty-initializer.-Add-mkdtemp.patch
Modified: csw/mgar/pkg/cfengine3/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cfengine3/trunk/Makefile 2012-12-09 14:10:05 UTC (rev 19867)
+++ csw/mgar/pkg/cfengine3/trunk/Makefile 2012-12-09 14:28:41 UTC (rev 19868)
@@ -1,9 +1,9 @@
# $Id$
#
NAME = cfengine3
-VERSION = 3.3.9
+VERSION = 3.4.1
GARTYPE = v2
-GARCOMPILER = SOS12U1
+GARCOMPILER = SOS12U2
PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
@@ -38,14 +38,12 @@
# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES
# UPSTREAM_MASTER_SITES =
-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
-PATCHFILES += 0006-Fix-empty-initializer.-Add-mkdtemp.patch
+# Make build and tests work
+PATCHFILES += 0001-Fix-preprocessor-macro-FUNC_DEPRECATED-to-avoid-synt.patch
+PATCHFILES += 0003-Fix-empty-initializer.-Add-mkdtemp.patch
+PATCHFILES += 0003-Remove-unsupported-compiler-flags.-Add-z-interpose-w.patch
#
# CUSTOM VARIABLES
@@ -62,6 +60,8 @@
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
+CHECKPKG_OVERRIDES_CSW$(NAME)utils += file-with-bad-content|/usr/local|root/opt/csw/share/doc/$(NAME)_utils/CoreBase/failsafe/failsafe.cf
+CHECKPKG_OVERRIDES_CSW$(NAME)utils += file-with-bad-content|/usr/local|root/opt/csw/share/doc/$(NAME)_utils/ChangeLog
OBSOLETED_BY_CSW$(NAME)utils = CSWlibpromises1 CSW$(NAME)rt
CATALOGNAME_CSWlibpromises1 = libpromises1_stub
CATALOGNAME_CSW$(NAME)rt = $(NAME)_rt_stub
@@ -84,6 +84,8 @@
SPKG_DESC_CSW$(NAME)client = CFEngine 3 client binaries
RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibssl1-0-0
RUNTIME_DEP_PKGS_CSW$(NAME)client += CSW$(NAME)utils
+RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibpcre1
+RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibxml2-2
PKGFILES_CSW$(NAME)client += $(sbindir)/cf-agent
PKGFILES_CSW$(NAME)client += $(sbindir)/cf-execd
PKGFILES_CSW$(NAME)client += $(sbindir)/cf-monitord
@@ -112,6 +114,7 @@
BUILD_DEP_PKGS = CSWlibssl-dev
BUILD_DEP_PKGS += CSWlibpcre-dev
+BUILD_DEP_PKGS += CSWlibxml2-dev
BUILD_DEP_PKGS += CSWlibtokyocabinet-dev
BUILD_DEP_PKGS += CSWflex
BUILD_DEP_PKGS += CSWbison
@@ -127,7 +130,8 @@
CONFIGURE_ARGS += --without-mysql
EXTRA_CPPFLAGS = -xc99=all
-EXTRA_CFLAGS = -xc99=all
+# -features=extensions is needed since some void functions return values...
+EXTRA_CFLAGS = -xc99=all -features=extensions
# We use this because libpromises will be moved to this private
# directory (see also move-libpromises:)
Modified: csw/mgar/pkg/cfengine3/trunk/checksums
===================================================================
--- csw/mgar/pkg/cfengine3/trunk/checksums 2012-12-09 14:10:05 UTC (rev 19867)
+++ csw/mgar/pkg/cfengine3/trunk/checksums 2012-12-09 14:28:41 UTC (rev 19868)
@@ -1 +1 @@
-1df1365264a88770a84e18df3e688dbe cfengine-3.3.9.tar.gz
+96e2221ca0e1341f4abacde81df41ac2 cfengine-3.4.1.tar.gz
Deleted: 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 2012-12-09 14:10:05 UTC (rev 19867)
+++ csw/mgar/pkg/cfengine3/trunk/files/0000-Avoid-passing-NULL-pointer-to-CfOut-in-FnCallHostInN.patch 2012-12-09 14:28:41 UTC (rev 19868)
@@ -1,34 +0,0 @@
-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
-
Deleted: 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 2012-12-09 14:10:05 UTC (rev 19867)
+++ csw/mgar/pkg/cfengine3/trunk/files/0000-Optimization-debug-flags-adjusted-for-use-with-SunSt.patch 2012-12-09 14:28:41 UTC (rev 19868)
@@ -1,28 +0,0 @@
-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-Fix-preprocessor-macro-FUNC_DEPRECATED-to-avoid-synt.patch
===================================================================
--- csw/mgar/pkg/cfengine3/trunk/files/0001-Fix-preprocessor-macro-FUNC_DEPRECATED-to-avoid-synt.patch (rev 0)
+++ csw/mgar/pkg/cfengine3/trunk/files/0001-Fix-preprocessor-macro-FUNC_DEPRECATED-to-avoid-synt.patch 2012-12-09 14:28:41 UTC (rev 19868)
@@ -0,0 +1,26 @@
+From 6301179ba982f8a6f4d0f28e8dd70952d449ca54 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <raos at opencsw.org>
+Date: Sun, 9 Dec 2012 12:23:07 +0100
+Subject: [PATCH] Fix preprocessor macro FUNC_DEPRECATED to avoid syntax
+ errors
+
+---
+ src/compiler.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/compiler.h b/src/compiler.h
+index 16987c7..32db658 100644
+--- a/src/compiler.h
++++ b/src/compiler.h
+@@ -49,7 +49,7 @@
+ # define FUNC_DEPRECATED \
+ __attribute__((deprecated))
+ #else
+-# define FUNC_DEPRECATED(warning_text)
++# define FUNC_DEPRECATED
+ #endif
+
+ #endif
+--
+1.8.0
+
Deleted: 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 2012-12-09 14:10:05 UTC (rev 19867)
+++ csw/mgar/pkg/cfengine3/trunk/files/0002-Add-include-alloca.h-in-gcov-stub.c.patch 2012-12-09 14:28:41 UTC (rev 19868)
@@ -1,23 +0,0 @@
-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
-
Added: csw/mgar/pkg/cfengine3/trunk/files/0002-Remove-unsupported-compiler-flags.patch
===================================================================
--- csw/mgar/pkg/cfengine3/trunk/files/0002-Remove-unsupported-compiler-flags.patch (rev 0)
+++ csw/mgar/pkg/cfengine3/trunk/files/0002-Remove-unsupported-compiler-flags.patch 2012-12-09 14:28:41 UTC (rev 19868)
@@ -0,0 +1,39 @@
+From c7e663d95a14ce859c5475d36db52127ffdc75f4 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <raos at opencsw.org>
+Date: Sun, 9 Dec 2012 13:15:36 +0100
+Subject: [PATCH] Remove unsupported compiler flags
+
+---
+ 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 a136082..a29890d 100644
+--- a/tests/unit/Makefile.am
++++ b/tests/unit/Makefile.am
+@@ -88,7 +88,7 @@ xml_writer_test_LDADD = libtest.la libstr.la
+ # instrumentation code uses fclose(3).
+ #
+ file_writer_test_SOURCES = file_writer_test.c gcov-stub.c
+-file_writer_test_CFLAGS = $(AM_CFLAGS) -fno-profile-arcs -fno-test-coverage
++file_writer_test_CFLAGS = $(AM_CFLAGS)
+ file_writer_test_LDADD = libstr.la
+ file_writer_test_LDLFAGS =
+
+diff --git a/tests/unit/Makefile.in b/tests/unit/Makefile.in
+index 59b91dd..77df470 100644
+--- a/tests/unit/Makefile.in
++++ b/tests/unit/Makefile.in
+@@ -601,7 +601,7 @@ xml_writer_test_LDADD = libtest.la libstr.la
+ # instrumentation code uses fclose(3).
+ #
+ file_writer_test_SOURCES = file_writer_test.c gcov-stub.c
+-file_writer_test_CFLAGS = $(AM_CFLAGS) -fno-profile-arcs -fno-test-coverage
++file_writer_test_CFLAGS = $(AM_CFLAGS)
+ file_writer_test_LDADD = libstr.la
+ file_writer_test_LDLFAGS =
+ db_test_SOURCES = db_test.c
+--
+1.8.0
+
Added: csw/mgar/pkg/cfengine3/trunk/files/0003-Fix-empty-initializer.-Add-mkdtemp.patch
===================================================================
--- csw/mgar/pkg/cfengine3/trunk/files/0003-Fix-empty-initializer.-Add-mkdtemp.patch (rev 0)
+++ csw/mgar/pkg/cfengine3/trunk/files/0003-Fix-empty-initializer.-Add-mkdtemp.patch 2012-12-09 14:28:41 UTC (rev 19868)
@@ -0,0 +1,330 @@
+From 8e25bfc31a6342071ba7a483ca333211491160c0 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <raos at opencsw.org>
+Date: Sun, 9 Dec 2012 13:49:49 +0100
+Subject: [PATCH] Fix empty initializer. Add mkdtemp().
+
+---
+ tests/load/db_load.c | 20 ++++++++++++++++++--
+ tests/load/lastseen_load.c | 22 +++++++++++++++++++---
+ tests/unit/db_test.c | 20 ++++++++++++++++++--
+ tests/unit/dbm_migration_bundles_test.c | 20 ++++++++++++++++++--
+ tests/unit/files_interfaces_test.c | 16 ++++++++++++++++
+ tests/unit/files_lib_test.c | 16 ++++++++++++++++
+ tests/unit/lastseen_migration_test.c | 22 +++++++++++++++++++---
+ tests/unit/lastseen_test.c | 22 +++++++++++++++++++---
+ tests/unit/persistent_lock_test.c | 16 ++++++++++++++++
+ 9 files changed, 159 insertions(+), 15 deletions(-)
+
+diff --git a/tests/load/db_load.c b/tests/load/db_load.c
+index 1860ae6..8998bff 100644
+--- a/tests/load/db_load.c
++++ b/tests/load/db_load.c
+@@ -2,6 +2,22 @@
+ #include "dbm_api.h"
+ #include <assert.h>
+
++#include <sys/stat.h>
++#include <stdlib.h>
++
++static char* mkdtemp(char *template) {
++ char *tmp;
++ int retval;
++
++ tmp = mktemp(template);
++ if (tmp == NULL) return NULL;
++
++ if ( !(retval = mkdir(tmp, S_IRWXU)) )
++ return NULL;
++
++ return tmp;
++}
++
+ #define MAX_THREADS 10000
+ #define DB_ID dbid_classes
+
+@@ -347,5 +363,5 @@ int ThreadUnlock(pthread_mutex_t *t)
+ pthread_mutex_t *cft_dbhandle;
+ #endif
+
+-const char *DAY_TEXT[] = {};
+-const char *MONTH_TEXT[] = {};
++const char *DAY_TEXT[] = {NULL};
++const char *MONTH_TEXT[] = {NULL};
+diff --git a/tests/load/lastseen_load.c b/tests/load/lastseen_load.c
+index 22d4cf3..07c718d 100644
+--- a/tests/load/lastseen_load.c
++++ b/tests/load/lastseen_load.c
+@@ -2,6 +2,22 @@
+ #include "dbm_api.h"
+ #include "lastseen.h"
+
++#include <sys/stat.h>
++#include <stdlib.h>
++
++static char* mkdtemp(char *template) {
++ char *tmp;
++ int retval;
++
++ tmp = mktemp(template);
++ if (tmp == NULL) return NULL;
++
++ if ( !(retval = mkdir(tmp, S_IRWXU)) )
++ return NULL;
++
++ return tmp;
++}
++
+ char CFWORKDIR[CF_BUFSIZE] = "/tmp";
+
+
+@@ -59,9 +75,9 @@ void CfOut(enum cfreport level, const char *errstr, const char *fmt, ...)
+ }
+
+ enum cfhashes CF_DEFAULT_DIGEST;
+-const char *DAY_TEXT[] = {};
+-const char *MONTH_TEXT[] = {};
+-const char *SHIFT_TEXT[] = {};
++const char *DAY_TEXT[] = {NULL};
++const char *MONTH_TEXT[] = {NULL};
++const char *SHIFT_TEXT[] = {NULL};
+ pthread_mutex_t *cft_output;
+ char VIPADDRESS[18];
+ RSA *PUBKEY;
+diff --git a/tests/unit/db_test.c b/tests/unit/db_test.c
+index 40c8957..c94a3a7 100644
+--- a/tests/unit/db_test.c
++++ b/tests/unit/db_test.c
+@@ -3,6 +3,22 @@
+ #include "cf3.defs.h"
+ #include "dbm_api.h"
+
++#include <sys/stat.h>
++#include <stdlib.h>
++
++static char* mkdtemp(char *template) {
++ char *tmp;
++ int retval;
++
++ tmp = mktemp(template);
++ if (tmp == NULL) return NULL;
++
++ if ( !(retval = mkdir(tmp, S_IRWXU)) )
++ return NULL;
++
++ return tmp;
++}
++
+ char CFWORKDIR[CF_BUFSIZE];
+
+ void tests_setup(void)
+@@ -148,6 +164,6 @@ void CfOut(enum cfreport level, const char *errstr, const char *fmt, ...)
+ fprintf(stderr, "\n");
+ }
+
+-const char *DAY_TEXT[] = {};
+-const char *MONTH_TEXT[] = {};
++const char *DAY_TEXT[] = {NULL};
++const char *MONTH_TEXT[] = {NULL};
+
+diff --git a/tests/unit/dbm_migration_bundles_test.c b/tests/unit/dbm_migration_bundles_test.c
+index 279ce45..c7afc92 100644
+--- a/tests/unit/dbm_migration_bundles_test.c
++++ b/tests/unit/dbm_migration_bundles_test.c
+@@ -6,6 +6,22 @@
+ #include <setjmp.h>
+ #include <cmockery.h>
+
++#include <sys/stat.h>
++#include <stdlib.h>
++
++static char* mkdtemp(char *template) {
++ char *tmp;
++ int retval;
++
++ tmp = mktemp(template);
++ if (tmp == NULL) return NULL;
++
++ if ( !(retval = mkdir(tmp, S_IRWXU)) )
++ return NULL;
++
++ return tmp;
++}
++
+ char CFWORKDIR[CF_BUFSIZE];
+
+ static void tests_setup(void)
+@@ -166,8 +182,8 @@ int main()
+ }
+
+ /* STUBS */
+-const char *DAY_TEXT[] = {};
+-const char *MONTH_TEXT[] = {};
++const char *DAY_TEXT[] = {NULL};
++const char *MONTH_TEXT[] = {NULL};
+
+ void FatalError(char *s, ...)
+ {
+diff --git a/tests/unit/files_interfaces_test.c b/tests/unit/files_interfaces_test.c
+index c2f5266..605f42a 100644
+--- a/tests/unit/files_interfaces_test.c
++++ b/tests/unit/files_interfaces_test.c
+@@ -1,6 +1,22 @@
+ #include "test.h"
+ #include "files_interfaces.h"
+
++#include <sys/stat.h>
++#include <stdlib.h>
++
++static char* mkdtemp(char *template) {
++ char *tmp;
++ int retval;
++
++ tmp = mktemp(template);
++ if (tmp == NULL) return NULL;
++
++ if ( !(retval = mkdir(tmp, S_IRWXU)) )
++ return NULL;
++
++ return tmp;
++}
++
+ #define FILE_SIZE (sizeof(FILE_CONTENTS) - 1)
+ #define FILE_LINE "some garbage!"
+ #define FILE_CORRUPTED_LINE "some \0 , gar\0bage!"
+diff --git a/tests/unit/files_lib_test.c b/tests/unit/files_lib_test.c
+index 642d073..0f24d71 100644
+--- a/tests/unit/files_lib_test.c
++++ b/tests/unit/files_lib_test.c
+@@ -6,6 +6,22 @@
+ #include <cmockery.h>
+ #include <stdarg.h>
+
++#include <sys/stat.h>
++#include <stdlib.h>
++
++static char* mkdtemp(char *template) {
++ char *tmp;
++ int retval;
++
++ tmp = mktemp(template);
++ if (tmp == NULL) return NULL;
++
++ if ( !(retval = mkdir(tmp, S_IRWXU)) )
++ return NULL;
++
++ return tmp;
++}
++
+ #define FILE_CONTENTS "8aysd9a8ydhsdkjnaldn12lk\njndl1jndljewnbfdhwjebfkjhbnkjdn1lkdjn1lkjn38aysd9a8ydhsdkjnaldn12lkjndl1jndljewnbfdhwjebfkjhbnkjdn1lkdjn1lkjn38aysd9a8ydhsdkjnaldn12lkjndl1jndljewnbfdhwjebfkjhbnkjdn1lkdjn1lkjn38aysd9a8ydhsdkjnaldn12lkjndl1jndljewnbfdhwjebfkjhbnkjdn1lkdjn1lkjn38aysd9a8ydhsdkjnaldn12lkjndl1jndljew\nnbfdhwjebfkjhbnkjdn1lkdjn1lkjn38aysd9a8ydhsdkjnaldn12lkjndl1jndljewnbfdhwjebfkjhbnkjdn1lkdjn1l\rkjn38aysd9a8ydhsdkjnaldn12lkjndl1jndljewnbfdhwjebfkjhbnkjdn1lkdjn1\r\nlkjn38aysd9a8ydhsdkjnaldn12lkjndl1jndljewnbfdhwjebfkjhbnkjdn1lkdjn1lkjn38aysd9a8ydhsdkjnaldn12lkjndl1jndljewnbfdhwjebfkjhbnkjdn1lkdjn1lkjn3"
+ #define FILE_SIZE (sizeof(FILE_CONTENTS) - 1)
+
+diff --git a/tests/unit/lastseen_migration_test.c b/tests/unit/lastseen_migration_test.c
+index f0f285f..79c0f42 100644
+--- a/tests/unit/lastseen_migration_test.c
++++ b/tests/unit/lastseen_migration_test.c
+@@ -6,6 +6,22 @@
+ #include <setjmp.h>
+ #include <cmockery.h>
+
++#include <sys/stat.h>
++#include <stdlib.h>
++
++static char* mkdtemp(char *template) {
++ char *tmp;
++ int retval;
++
++ tmp = mktemp(template);
++ if (tmp == NULL) return NULL;
++
++ if ( !(retval = mkdir(tmp, S_IRWXU)) )
++ return NULL;
++
++ return tmp;
++}
++
+ typedef struct
+ {
+ char address[128];
+@@ -258,9 +274,9 @@ void CfOut(enum cfreport level, const char *errstr, const char *fmt, ...)
+ }
+
+ enum cfhashes CF_DEFAULT_DIGEST;
+-const char *DAY_TEXT[] = {};
+-const char *MONTH_TEXT[] = {};
+-const char *SHIFT_TEXT[] = {};
++const char *DAY_TEXT[] = {NULL};
++const char *MONTH_TEXT[] = {NULL};
++const char *SHIFT_TEXT[] = {NULL};
+ pthread_mutex_t *cft_output;
+ char VIPADDRESS[18];
+ RSA *PUBKEY;
+diff --git a/tests/unit/lastseen_test.c b/tests/unit/lastseen_test.c
+index 27f7b96..e91d675 100644
+--- a/tests/unit/lastseen_test.c
++++ b/tests/unit/lastseen_test.c
+@@ -6,6 +6,22 @@
+ #include <setjmp.h>
+ #include <cmockery.h>
+
++#include <sys/stat.h>
++#include <stdlib.h>
++
++static char* mkdtemp(char *template) {
++ char *tmp;
++ int retval;
++
++ tmp = mktemp(template);
++ if (tmp == NULL) return NULL;
++
++ if ( !(retval = mkdir(tmp, S_IRWXU)) )
++ return NULL;
++
++ return tmp;
++}
++
+ char CFWORKDIR[CF_BUFSIZE];
+
+ void UpdateLastSawHost(const char *hostkey, const char *address,
+@@ -200,9 +216,9 @@ void CfOut(enum cfreport level, const char *errstr, const char *fmt, ...)
+ }
+
+ enum cfhashes CF_DEFAULT_DIGEST;
+-const char *DAY_TEXT[] = {};
+-const char *MONTH_TEXT[] = {};
+-const char *SHIFT_TEXT[] = {};
++const char *DAY_TEXT[] = {NULL};
++const char *MONTH_TEXT[] = {NULL};
++const char *SHIFT_TEXT[] = {NULL};
+ pthread_mutex_t *cft_output;
+ char VIPADDRESS[18];
+ RSA *PUBKEY;
+diff --git a/tests/unit/persistent_lock_test.c b/tests/unit/persistent_lock_test.c
+index 71219e8..b556555 100644
+--- a/tests/unit/persistent_lock_test.c
++++ b/tests/unit/persistent_lock_test.c
+@@ -5,6 +5,22 @@
+ #include <setjmp.h>
+ #include <cmockery.h>
+
++#include <sys/stat.h>
++#include <stdlib.h>
++
++static char* mkdtemp(char *template) {
++ char *tmp;
++ int retval;
++
++ tmp = mktemp(template);
++ if (tmp == NULL) return NULL;
++
++ if ( !(retval = mkdir(tmp, S_IRWXU)) )
++ return NULL;
++
++ return tmp;
++}
++
+ static void tests_setup(void)
+ {
+ snprintf(CFWORKDIR, CF_BUFSIZE, "/tmp/persistent_lock_test.XXXXXX");
+--
+1.8.0
+
Added: csw/mgar/pkg/cfengine3/trunk/files/0003-Remove-unsupported-compiler-flags.-Add-z-interpose-w.patch
===================================================================
--- csw/mgar/pkg/cfengine3/trunk/files/0003-Remove-unsupported-compiler-flags.-Add-z-interpose-w.patch (rev 0)
+++ csw/mgar/pkg/cfengine3/trunk/files/0003-Remove-unsupported-compiler-flags.-Add-z-interpose-w.patch 2012-12-09 14:28:41 UTC (rev 19868)
@@ -0,0 +1,58 @@
+From d90241098cefd342803b862c301757e222883404 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <raos at opencsw.org>
+Date: Sun, 9 Dec 2012 14:49:02 +0100
+Subject: [PATCH] Remove unsupported compiler flags. Add -z interpose where
+ necessary
+
+---
+ tests/unit/Makefile.am | 2 +-
+ tests/unit/Makefile.in | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
+index a136082..a29890d 100644
+--- a/tests/unit/Makefile.am
++++ b/tests/unit/Makefile.am
+@@ -88,7 +88,7 @@ xml_writer_test_LDADD = libtest.la libstr.la
+ # instrumentation code uses fclose(3).
+ #
+ file_writer_test_SOURCES = file_writer_test.c gcov-stub.c
+-file_writer_test_CFLAGS = $(AM_CFLAGS) -fno-profile-arcs -fno-test-coverage
++file_writer_test_CFLAGS = $(AM_CFLAGS)
+ file_writer_test_LDADD = libstr.la
+ file_writer_test_LDLFAGS =
+
+diff --git a/tests/unit/Makefile.in b/tests/unit/Makefile.in
+index 59b91dd..926d960 100644
+--- a/tests/unit/Makefile.in
++++ b/tests/unit/Makefile.in
+@@ -151,7 +151,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
+ file_name_test_SOURCES = file_name_test.c
+ file_name_test_OBJECTS = file_name_test.$(OBJEXT)
+@@ -199,7 +199,7 @@ lastseen_test_OBJECTS = $(am_lastseen_test_OBJECTS)
+ lastseen_test_DEPENDENCIES = libdb.la
+ logging_test_SOURCES = logging_test.c
+ logging_test_OBJECTS = logging_test.$(OBJEXT)
+-logging_test_LDADD = $(LDADD)
++logging_test_LDADD = $(LDADD) -z interpose
+ logging_test_DEPENDENCIES = ../../src/libpromises.la libtest.la
+ map_test_SOURCES = map_test.c
+ map_test_OBJECTS = map_test.$(OBJEXT)
+@@ -601,7 +601,7 @@ xml_writer_test_LDADD = libtest.la libstr.la
+ # instrumentation code uses fclose(3).
+ #
+ file_writer_test_SOURCES = file_writer_test.c gcov-stub.c
+-file_writer_test_CFLAGS = $(AM_CFLAGS) -fno-profile-arcs -fno-test-coverage
++file_writer_test_CFLAGS = $(AM_CFLAGS)
+ file_writer_test_LDADD = libstr.la
+ file_writer_test_LDLFAGS =
+ db_test_SOURCES = db_test.c
+--
+1.8.0
+
Deleted: csw/mgar/pkg/cfengine3/trunk/files/0005-Remove-unsupported-compiler-options.patch
===================================================================
--- csw/mgar/pkg/cfengine3/trunk/files/0005-Remove-unsupported-compiler-options.patch 2012-12-09 14:10:05 UTC (rev 19867)
+++ csw/mgar/pkg/cfengine3/trunk/files/0005-Remove-unsupported-compiler-options.patch 2012-12-09 14:28:41 UTC (rev 19868)
@@ -1,49 +0,0 @@
-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
-
Deleted: csw/mgar/pkg/cfengine3/trunk/files/0006-Fix-empty-initializer.-Add-mkdtemp.patch
===================================================================
--- csw/mgar/pkg/cfengine3/trunk/files/0006-Fix-empty-initializer.-Add-mkdtemp.patch 2012-12-09 14:10:05 UTC (rev 19867)
+++ csw/mgar/pkg/cfengine3/trunk/files/0006-Fix-empty-initializer.-Add-mkdtemp.patch 2012-12-09 14:28:41 UTC (rev 19868)
@@ -1,211 +0,0 @@
-From d6836425f064562bb968f63b455c2442f12ad2f8 Mon Sep 17 00:00:00 2001
-From: Rafael Ostertag <raos at opencsw.org>
-Date: Sat, 10 Nov 2012 14:19:38 +0100
-Subject: [PATCH] Fix empty initializer. Add mkdtemp().
-
----
- tests/load/db_load.c | 21 +++++++++++++++++++--
- tests/load/lastseen_load.c | 22 +++++++++++++++++++---
- tests/unit/db_test.c | 21 +++++++++++++++++++--
- tests/unit/lastseen_migration_test.c | 23 ++++++++++++++++++++---
- tests/unit/lastseen_test.c | 23 ++++++++++++++++++++---
- 5 files changed, 97 insertions(+), 13 deletions(-)
-
-diff --git a/tests/load/db_load.c b/tests/load/db_load.c
-index 69f2cf8..a330140 100644
---- a/tests/load/db_load.c
-+++ b/tests/load/db_load.c
-@@ -3,6 +3,23 @@
- #include "dbm_api.h"
- #include <assert.h>
-
-+#include <sys/stat.h>
-+#include <stdlib.h>
-+
-+static char* mkdtemp(char *template) {
-+ char *tmp;
-+ int retval;
-+
-+ tmp = mktemp(template);
-+ if (tmp == NULL) return NULL;
-+
-+ if ( !(retval = mkdir(tmp, S_IRWXU)) )
-+ return NULL;
-+
-+ return tmp;
-+}
-+
-+
- #define MAX_THREADS 10000
- #define DB_ID dbid_classes
-
-@@ -348,5 +365,5 @@ int ThreadUnlock(pthread_mutex_t *t)
- pthread_mutex_t *cft_dbhandle;
- #endif
-
--const char *DAY_TEXT[] = {};
--const char *MONTH_TEXT[] = {};
-+const char *DAY_TEXT[] = { NULL };
-+const char *MONTH_TEXT[] = { NULL };
-diff --git a/tests/load/lastseen_load.c b/tests/load/lastseen_load.c
-index 6a39fa0..950f2bc 100644
---- a/tests/load/lastseen_load.c
-+++ b/tests/load/lastseen_load.c
-@@ -2,6 +2,22 @@
- #include "dbm_api.h"
- #include "lastseen.h"
-
-+#include <sys/stat.h>
-+#include <stdlib.h>
-+
-+static char* mkdtemp(char *template) {
-+ char *tmp;
-+ int retval;
-+
-+ tmp = mktemp(template);
-+ if (tmp == NULL) return NULL;
-+
-+ if ( !(retval = mkdir(tmp, S_IRWXU)) )
-+ return NULL;
-+
-+ return tmp;
-+}
-+
- char CFWORKDIR[CF_BUFSIZE] = "/tmp";
-
-
-@@ -59,9 +75,9 @@ void CfOut(enum cfreport level, const char *errstr, const char *fmt, ...)
- }
-
- enum cfhashes CF_DEFAULT_DIGEST;
--const char *DAY_TEXT[] = {};
--const char *MONTH_TEXT[] = {};
--const char *SHIFT_TEXT[] = {};
-+const char *DAY_TEXT[] = { NULL };
-+const char *MONTH_TEXT[] = { NULL };
-+const char *SHIFT_TEXT[] = { NULL };
- pthread_mutex_t *cft_output;
- char VIPADDRESS[18];
- RSA *PUBKEY;
-diff --git a/tests/unit/db_test.c b/tests/unit/db_test.c
-index df98a3c..95f29cc 100644
---- a/tests/unit/db_test.c
-+++ b/tests/unit/db_test.c
-@@ -4,6 +4,23 @@
- #include <setjmp.h>
- #include <cmockery.h>
-
-+#include <sys/stat.h>
-+#include <stdlib.h>
-+
-+static char* mkdtemp(char *template) {
-+ char *tmp;
-+ int retval;
-+
-+ tmp = mktemp(template);
-+ if (tmp == NULL) return NULL;
-+
-+ if ( !(retval = mkdir(tmp, S_IRWXU)) )
-+ return NULL;
-+
-+ return tmp;
-+}
-+
-+
- char CFWORKDIR[CF_BUFSIZE];
-
- void tests_setup(void)
-@@ -148,6 +165,6 @@ void CfOut(enum cfreport level, const char *errstr, const char *fmt, ...)
- fprintf(stderr, "\n");
- }
-
--const char *DAY_TEXT[] = {};
--const char *MONTH_TEXT[] = {};
-+const char *DAY_TEXT[] = { NULL };
-+const char *MONTH_TEXT[] = { NULL };
-
-diff --git a/tests/unit/lastseen_migration_test.c b/tests/unit/lastseen_migration_test.c
-index b58e1de..9e580ee 100644
---- a/tests/unit/lastseen_migration_test.c
-+++ b/tests/unit/lastseen_migration_test.c
-@@ -6,6 +6,23 @@
- #include <setjmp.h>
- #include <cmockery.h>
-
-+#include <sys/stat.h>
-+#include <stdlib.h>
-+
-+static char* mkdtemp(char *template) {
-+ char *tmp;
-+ int retval;
-+
-+ tmp = mktemp(template);
-+ if (tmp == NULL) return NULL;
-+
-+ if ( !(retval = mkdir(tmp, S_IRWXU)) )
-+ return NULL;
-+
-+ return tmp;
-+}
-+
-+
- typedef struct
- {
- char address[128];
-@@ -257,9 +274,9 @@ void CfOut(enum cfreport level, const char *errstr, const char *fmt, ...)
- }
-
- enum cfhashes CF_DEFAULT_DIGEST;
--const char *DAY_TEXT[] = {};
--const char *MONTH_TEXT[] = {};
--const char *SHIFT_TEXT[] = {};
-+const char *DAY_TEXT[] = { NULL };
-+const char *MONTH_TEXT[] = { NULL };
-+const char *SHIFT_TEXT[] = { NULL };
- pthread_mutex_t *cft_output;
- char VIPADDRESS[18];
- RSA *PUBKEY;
-diff --git a/tests/unit/lastseen_test.c b/tests/unit/lastseen_test.c
-index 8bfc6f8..183285f 100644
---- a/tests/unit/lastseen_test.c
-+++ b/tests/unit/lastseen_test.c
-@@ -6,6 +6,23 @@
- #include <setjmp.h>
- #include <cmockery.h>
-
-+#include <sys/stat.h>
-+#include <stdlib.h>
-+
-+static char* mkdtemp(char *template) {
-+ char *tmp;
-+ int retval;
-+
-+ tmp = mktemp(template);
-+ if (tmp == NULL) return NULL;
-+
-+ if ( !(retval = mkdir(tmp, S_IRWXU)) )
-+ return NULL;
-+
-+ return tmp;
-+}
-+
-+
- char CFWORKDIR[CF_BUFSIZE];
-
- void UpdateLastSawHost(const char *hostkey, const char *address,
-@@ -199,9 +216,9 @@ void CfOut(enum cfreport level, const char *errstr, const char *fmt, ...)
- }
-
- enum cfhashes CF_DEFAULT_DIGEST;
--const char *DAY_TEXT[] = {};
--const char *MONTH_TEXT[] = {};
--const char *SHIFT_TEXT[] = {};
-+const char *DAY_TEXT[] = { NULL };
-+const char *MONTH_TEXT[] = { NULL };
-+const char *SHIFT_TEXT[] = { NULL };
- pthread_mutex_t *cft_output;
- char VIPADDRESS[18];
- RSA *PUBKEY;
---
-1.8.0
-
Modified: csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW 2012-12-09 14:10:05 UTC (rev 19867)
+++ csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW 2012-12-09 14:28:41 UTC (rev 19868)
@@ -1,3 +1,10 @@
+cfengine3 (3.4.1,REV=2012.12.09)
+
+ * New upstream release 3.4.1.
+
+ -- Rafael Ostertag <raos at opencsw.org> Sun, 09 Dec 2012 10:12:11 +0100
+
+
cfengine3 (3.3.9,REV=2012.11.10)
* New upstream release 3.3.9.
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