[Gsrc-commit] /srv/bzr/gsrc/trunk r1276: fix cfengine build

[Brandon Invergo]

------------------------------------------------------------
revno: 1276
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Thu 2012-11-22 21:07:58 +0100
message:
  fix cfengine build
added:
  gnu/cfengine/files/
  gnu/cfengine/files/cfengine-2.0.6-fix-build.diff
modified:
  gnu/cfengine/Makefile
  gnu/cfengine/sha256sums

=== modified file 'gnu/cfengine/Makefile'
--- a/gnu/cfengine/Makefile     2012-10-27 23:43:13 +0000
+++ b/gnu/cfengine/Makefile     2012-11-22 20:07:58 +0000
@@ -10,6 +10,7 @@
 MASTER_SUBDIR = cfengine/
 DISTFILES = $(DISTNAME).tar.gz
 SIGFILES = 
+PATCHFILES = $(DISTNAME)-fix-build.diff
 
 BUILDDEPS = 
 LIBDEPS = 

=== added directory 'gnu/cfengine/files'
=== added file 'gnu/cfengine/files/cfengine-2.0.6-fix-build.diff'
--- a/gnu/cfengine/files/cfengine-2.0.6-fix-build.diff  1970-01-01 00:00:00 
+0000
+++ b/gnu/cfengine/files/cfengine-2.0.6-fix-build.diff  2012-11-22 20:07:58 
+0000
@@ -0,0 +1,42 @@
+diff -x config.log -x config.status -ru work/cfengine-2.0.6/src/cf.extern.h 
work/cfengine-2.0.6/src/cf.extern.h
+--- work/cfengine-2.0.6/src/cf.extern.h        2003-03-06 21:17:34.000000000 
+0100
++++ work/cfengine-2.0.6/src/cf.extern.h        2012-11-22 21:00:13.734047252 
+0100
+@@ -46,7 +46,7 @@
+ extern char *tzname[2];
+ extern char *optarg;
+ extern int optind;
+-extern struct option OPTIONS[];
++extern struct option *OPTIONS;
+ extern int CFSIGNATURE;
+ extern char CFDES1[8];
+ extern char CFDES2[8];
+diff -x config.log -x config.status -ru work/cfengine-2.0.6/src/cfenvd.c 
work/cfengine-2.0.6/src/cfenvd.c
+--- work/cfengine-2.0.6/src/cfenvd.c   2003-03-20 10:18:33.000000000 +0100
++++ work/cfengine-2.0.6/src/cfenvd.c   2012-11-22 21:05:59.670796373 +0100
+@@ -73,7 +73,7 @@
+ char BATCHFILE[bufsize];
+ char STATELOG[bufsize];
+ char ENV_NEW[bufsize];
+-char ENV[bufsize];
++char ENV_CUR[bufsize];
+ 
+ struct Averages LOCALAV;
+ struct Item *ALL_INCOMING = NULL;
+@@ -293,7 +293,7 @@
+ snprintf(AVDB,bufsize,"%s/state/%s",WORKDIR,AVDB_FILE);
+ snprintf(STATELOG,bufsize,"%s/state/%s",WORKDIR,STATELOG_FILE);
+ snprintf(ENV_NEW,bufsize,"%s/state/%s",WORKDIR,ENV_NEW_FILE);
+-snprintf(ENV,bufsize,"%s/state/%s",WORKDIR,ENV_FILE);
++snprintf(ENV_CUR,bufsize,"%s/state/%s",WORKDIR,ENV_FILE);
+ 
+ if (!BATCH_MODE)
+    {
+@@ -989,7 +989,7 @@
+ Debug("\n\n");  
+ fclose(fp);
+ 
+-rename(ENV_NEW,ENV);
++rename(ENV_NEW,ENV_CUR);
+ }
+ 
+ /*********************************************************************/

=== modified file 'gnu/cfengine/sha256sums'
--- a/gnu/cfengine/sha256sums   2010-06-11 09:39:08 +0000
+++ b/gnu/cfengine/sha256sums   2012-11-22 20:07:58 +0000
@@ -1,1 +1,2 @@
 c5e308a30e004b505c3f948bad774bb837581ad1edab1885e9c05f60fe723d79  
download/cfengine-2.0.6.tar.gz
+c669fbc642426920e2461847bf4f884753de3bef30555424aa3b922ec5c3eb39  
download/cfengine-2.0.6-fix-build.diff