[csw-devel] SF.net SVN: gar:[19599] csw/mgar/pkg/cfengine3/trunk

guengel at users.sourceforge.net guengel at users.sourceforge.net
Sat Nov 10 14:54:55 CET 2012


Revision: 19599
          http://gar.svn.sourceforge.net/gar/?rev=19599&view=rev
Author:   guengel
Date:     2012-11-10 13:54:54 +0000 (Sat, 10 Nov 2012)
Log Message:
-----------
Made some tests build.

Modified Paths:
--------------
    csw/mgar/pkg/cfengine3/trunk/Makefile
    csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW

Added Paths:
-----------
    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-11-10 12:14:08 UTC (rev 19598)
+++ csw/mgar/pkg/cfengine3/trunk/Makefile	2012-11-10 13:54:54 UTC (rev 19599)
@@ -17,7 +17,7 @@
 endef
 
 DISTNAME = cfengine-$(VERSION)
-MASTER_SITES = http://www.cfengine.com/source-code/download?file=
+MASTER_SITES = http://www.cfengine.com/source-code/download/
 DISTFILES  = $(DISTNAME).tar.gz
 DISTFILES += $(NAME)rc
 DISTFILES += CSW$(NAME)utils.postinstall
@@ -46,6 +46,7 @@
 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
 
 #
 # CUSTOM VARIABLES

Added: 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	                        (rev 0)
+++ csw/mgar/pkg/cfengine3/trunk/files/0006-Fix-empty-initializer.-Add-mkdtemp.patch	2012-11-10 13:54:54 UTC (rev 19599)
@@ -0,0 +1,211 @@
+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-11-10 12:14:08 UTC (rev 19598)
+++ csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW	2012-11-10 13:54:54 UTC (rev 19599)
@@ -1,9 +1,10 @@
-cfengine3 (3.3.9,REV=2012.10.28)
+cfengine3 (3.3.9,REV=2012.11.10)
 
   * New upstream release 3.3.9.
 
- -- Rafael Ostertag <raos at opencsw.org>  Sun, 28 Oct 2012 14:56:36 +0100
+ -- Rafael Ostertag <raos at opencsw.org>  Sat, 10 Nov 2012 14:52:46 +0100
 
+
 cfengine3 (3.3.7,REV=2012.10.09)
 
   * New upstream release 3.3.7.

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