cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 2.1.15, from William Yodlowsky (maintainer).

Browse Source 
inputs and ok naddy@
This commit is contained in:
aanriot 2005-07-21 15:16:46 +00:00
parent b7024df5be
commit 2ab61c64c1
44 changed files with 1073 additions and 695 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sysutils/cfengine/Makefile
View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.22 2005/01/12 21:31:06 sturm Exp $
# $OpenBSD: Makefile,v 1.23 2005/07/21 15:16:46 aanriot Exp $
COMMENT= "GNU system administration tool for networks"
V= 2.1.10
DISTNAME= cfengine-2.1.10
PKGNAME= ${DISTNAME}p1
V= 2.1.15
DISTNAME= cfengine-${V}
CATEGORIES= sysutils
HOMEPAGE= http://www.cfengine.org/

8
sysutils/cfengine/distinfo
View File

@ -1,4 +1,4 @@
MD5 (cfengine-2.1.10.tar.gz) = 7a867c74ca3ad806a41b6f7339e67fa3
RMD160 (cfengine-2.1.10.tar.gz) = 0b9f8f805f0ff8abed2468249b86399228d10291
SHA1 (cfengine-2.1.10.tar.gz) = 01e80f12881b35704896757d338548dddc44883c
SIZE (cfengine-2.1.10.tar.gz) = 3100323
MD5 (cfengine-2.1.15.tar.gz) = f03de82709f84c3d6d916b6e557321f9
RMD160 (cfengine-2.1.15.tar.gz) = a7cc0d301ed6fa7d7a7352b99423fb35f0e3293d
SHA1 (cfengine-2.1.15.tar.gz) = 4a86034df637de914b9f1a23875d407e3c09e20c
SIZE (cfengine-2.1.15.tar.gz) = 3555495

17
sysutils/cfengine/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.2 2004/10/01 21:22:15 sturm Exp $
--- configure.orig Thu Aug 12 00:52:34 2004
+++ configure Fri Oct 1 23:14:46 2004
@@ -9128,6 +9128,7 @@ cat confdefs.h >>conftest.$ac_ext
$OpenBSD: patch-configure,v 1.3 2005/07/21 15:16:46 aanriot Exp $
--- configure.orig Fri Jun 10 16:01:44 2005
+++ configure Tue Jul 19 11:19:58 2005
@@ -9135,6 +9135,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@ -9,3 +9,12 @@ $OpenBSD: patch-configure,v 1.2 2004/10/01 21:22:15 sturm Exp $
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -15958,7 +15959,7 @@ echo $ECHO_N "checking Checking for GCC
if test x"$GCC" = "xyes"; then
- GCC_CFLAG="-g -O2 -Wreturn-type -Wmissing-prototypes -Wuninitialized"
+ GCC_CFLAG="";
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6

22
sysutils/cfengine/patches/patch-doc_Makefile_in
View File

@ -1,27 +1,25 @@
$OpenBSD: patch-doc_Makefile_in,v 1.1 2004/06/17 11:21:42 sturm Exp $
--- doc/Makefile.in.orig 2004-05-05 17:20:31.000000000 +0200
+++ doc/Makefile.in 2004-06-15 16:25:20.000000000 +0200
@@ -70,7 +70,7 @@ MANS = $(man_MANS)
$OpenBSD: patch-doc_Makefile_in,v 1.2 2005/07/21 15:16:46 aanriot Exp $
--- doc/Makefile.in.orig Fri Jun 10 16:01:42 2005
+++ doc/Makefile.in Mon Jul 18 14:31:00 2005
@@ -79,7 +79,7 @@ am__vpath_adj = case $$p in \
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
docDATA_INSTALL = $(INSTALL_DATA)
htmlDATA_INSTALL = $(INSTALL_DATA)
psDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(doc_DATA) $(html_DATA) $(ps_DATA)
-DATA = $(doc_DATA) $(html_DATA)
+DATA =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
@@ -708,8 +708,8 @@ info: info-am
@@ -704,7 +704,7 @@ info: info-am
info-am: $(INFO_DEPS)
-install-data-am: install-docDATA install-htmlDATA install-info-am \
- install-man install-psDATA
+install-data-am: install-docDATA install-info-am \
+ install-man
+install-data-am: install-info-am \
install-man
install-exec-am:
@@ -774,7 +774,7 @@ uninstall-am: uninstall-docDATA uninstal
@@ -770,7 +770,7 @@ uninstall-am: uninstall-docDATA uninstal
uninstall-man: uninstall-man8
.PHONY: all all-am check check-am clean clean-generic dist-info \

58
sysutils/cfengine/patches/patch-src_cfagent_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_cfagent_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
--- src/cfagent.c.orig Sat Aug 14 00:14:19 2004
+++ src/cfagent.c Fri Oct 1 23:14:46 2004
@@ -217,7 +217,7 @@ void Initialize(int argc,char *argv[])
$OpenBSD: patch-src_cfagent_c,v 1.4 2005/07/21 15:16:46 aanriot Exp $
--- src/cfagent.c.orig Thu Apr 7 15:29:49 2005
+++ src/cfagent.c Fri Jul 15 12:24:00 2005
@@ -206,7 +206,7 @@ void Initialize(int argc,char *argv[])
unsigned char s[16];
char ebuff[CF_EXPANDSIZE];
@ -10,7 +10,7 @@ $OpenBSD: patch-src_cfagent_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
PreLockState();
@@ -231,7 +231,7 @@ VDEFAULTROUTE[0] = '\0';
@@ -219,7 +219,7 @@ VMAILSERVER[0] = '\0';
ALLCLASSBUFFER[0] = '\0';
VREPOSITORY = strdup("\0");
@ -19,7 +19,7 @@ $OpenBSD: patch-src_cfagent_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
METHODREPLYTO[0] = '\0';
METHODFOR[0] = '\0';
@@ -239,8 +239,8 @@ METHODFOR[0] = '\0';
@@ -227,8 +227,8 @@ METHODFOR[0] = '\0';
re_syntax_options |= RE_INTERVALS;
#endif
@ -30,26 +30,42 @@ $OpenBSD: patch-src_cfagent_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
IDClasses();
@@ -281,15 +281,15 @@ for (i = 1; i < argc; i++)
VIFELAPSED = VDEFAULTIFELAPSED;
TRAVLINKS = false;
@@ -271,27 +271,28 @@ for (i = 1; i < argc; i++)
- sprintf(ebuff,"%s/state/cf_procs",WORKDIR);
+ (void)snprintf(ebuff,sizeof(ebuff),"%s/state/cf_procs",WORKDIR);
/* XXX Initialize workdir for non privileged users */
- strcpy(CFWORKDIR,WORKDIR);
+ (void)strlcpy(CFWORKDIR,WORKDIR,sizeof(CFWORKDIR));
if (getuid() > 0)
{
char *homedir;
if ((homedir = getenv("HOME")) != NULL)
{
- strcpy(CFWORKDIR,homedir);
- strcat(CFWORKDIR,"/.cfagent");
+ (void)strlcpy(CFWORKDIR,homedir,sizeof(CFWORKDIR));
+ (void)strlcat(CFWORKDIR,"/.cfagent",sizeof(CFWORKDIR));
}
}
- sprintf(ebuff,"%s/state/cf_procs",CFWORKDIR);
+ (void)snprintf(ebuff,sizeof(ebuff),"%s/state/cf_procs",CFWORKDIR);
if (stat(ebuff,&statbuf) == -1)
{
CreateEmptyFile(ebuff);
}
- strcpy(VLOGDIR,WORKDIR);
- strcpy(VLOGDIR,CFWORKDIR);
- strcpy(VLOCKDIR,VLOGDIR); /* Same since 2.0.a8 */
+ (void)strlcpy(VLOGDIR,WORKDIR,CF_BUFSIZE);
+ (void)strlcpy(VLOGDIR,CFWORKDIR,CF_BUFSIZE);
+ (void)strlcpy(VLOCKDIR,VLOGDIR,CF_BUFSIZE); /* Same since 2.0.a8 */
+
OpenSSL_add_all_algorithms();
ERR_load_crypto_strings();
@@ -318,8 +318,8 @@ if (NOPRECONFIG)
@@ -324,8 +325,8 @@ if (NOPRECONFIG)
return;
}
@ -60,7 +76,7 @@ $OpenBSD: patch-src_cfagent_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
if ((sp=getenv(CF_INPUTSVAR)) != NULL)
{
@@ -605,8 +605,8 @@ if (strlen(ebuff) != 0)
@@ -618,8 +619,8 @@ if (strlen(ebuff) != 0)
}
else
{
@ -71,7 +87,7 @@ $OpenBSD: patch-src_cfagent_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
p2 = SortItemListNames(VHEAP);
@@ -747,7 +747,7 @@ if (VACTIONSEQ == NULL)
@@ -766,7 +767,7 @@ if (VACTIONSEQ == NULL)
Warning("perhaps cfagent.conf/update.conf have not yet been set up?");
}
@ -80,7 +96,7 @@ $OpenBSD: patch-src_cfagent_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
if (VACCESSLIST != NULL && !IsItemIn(VACCESSLIST,id))
{
@@ -897,7 +897,7 @@ if (OptionIs(CONTEXTID,"DryRun",true))
@@ -921,7 +922,7 @@ if (OptionIs(CONTEXTID,"DryRun",true))
if (GetMacroValue(CONTEXTID,"BinaryPaddingChar"))
{
@ -89,7 +105,7 @@ $OpenBSD: patch-src_cfagent_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
if (ebuff[0] == '\\')
{
@@ -1075,7 +1075,7 @@ if ((tloc = time((time_t *)NULL)) == -1)
@@ -1106,7 +1107,7 @@ if ((tloc = time((time_t *)NULL)) == -1)
CFSTARTTIME = tloc;
@ -98,7 +114,7 @@ $OpenBSD: patch-src_cfagent_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
Verbose("Reference time set to %s\n",ctime(&tloc));
@@ -1438,7 +1438,7 @@ while (*sp != '\0')
@@ -1491,7 +1492,7 @@ while (*sp != '\0')
{
VIFELAPSED = VDEFAULTIFELAPSED;
VEXPIREAFTER = VDEFAULTEXPIREAFTER;
@ -107,7 +123,7 @@ $OpenBSD: patch-src_cfagent_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
continue;
}
else
@@ -1859,8 +1859,8 @@ for (ip = VHEAP; ip != NULL; ip=ip->next
@@ -1926,8 +1927,8 @@ for (ip = VHEAP; ip != NULL; ip=ip->next
else
{
size++; /* Allow for : separator */
@ -118,7 +134,7 @@ $OpenBSD: patch-src_cfagent_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
fprintf(fp,"%s\n",ip->name);
@@ -1879,8 +1879,8 @@ for (ip = VHEAP; ip != NULL; ip=ip->next
@@ -1946,8 +1947,8 @@ for (ip = VHEAP; ip != NULL; ip=ip->next
else
{
size++; /* Allow for : separator */

93
sysutils/cfengine/patches/patch-src_cfenvd_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_cfenvd_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
--- src/cfenvd.c.orig Wed Aug 11 22:46:48 2004
+++ src/cfenvd.c Fri Oct 1 23:14:46 2004
@@ -188,10 +188,10 @@ void CheckOptsAndInit(int argc,char **ar
$OpenBSD: patch-src_cfenvd_c,v 1.4 2005/07/21 15:16:46 aanriot Exp $
--- src/cfenvd.c.orig Wed May 25 07:38:54 2005
+++ src/cfenvd.c Fri Jul 15 12:24:00 2005
@@ -187,10 +187,10 @@ void CheckOptsAndInit(int argc,char **ar
int c, i,j,k;
umask(077);
@ -14,49 +14,62 @@ $OpenBSD: patch-src_cfenvd_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
IGNORELOCK = false;
OUTPUT[0] = '\0';
@@ -242,18 +242,18 @@ while ((c=getopt_long(argc,argv,"d:vhHFV
@@ -243,30 +243,30 @@ LOGGING = true; /* Do
LOGGING = true; /* Do output to syslog */
/* XXX Initialize workdir for non privileged users */
-sprintf(VBUFF,"%s/test",WORKDIR);
+(void)snprintf(VBUFF,sizeof(VBUFF),"%s/test",WORKDIR);
-strcpy(CFWORKDIR,WORKDIR);
+(void)strlcpy(CFWORKDIR,WORKDIR,sizeof(CFWORKDIR));
if (getuid() > 0)
{
char *homedir;
if ((homedir = getenv("HOME")) != NULL)
{
- strcpy(CFWORKDIR,homedir);
- strcat(CFWORKDIR,"/.cfagent");
+ (void)strlcpy(CFWORKDIR,homedir,sizeof(CFWORKDIR));
+ (void)strlcat(CFWORKDIR,"/.cfagent",sizeof(CFWORKDIR));
}
}
-sprintf(VBUFF,"%s/test",CFWORKDIR);
+(void)snprintf(VBUFF,sizeof(VBUFF),"%s/test",CFWORKDIR);
MakeDirectoriesFor(VBUFF,'y');
-sprintf(VBUFF,"%s/state/test",WORKDIR);
+(void)snprintf(VBUFF,sizeof(VBUFF),"%s/state/test",WORKDIR);
-sprintf(VBUFF,"%s/state/test",CFWORKDIR);
+(void)snprintf(VBUFF,sizeof(VBUFF),"%s/state/test",CFWORKDIR);
MakeDirectoriesFor(VBUFF,'y');
strncpy(VLOCKDIR,WORKDIR,CF_BUFSIZE-1);
strncpy(VLOGDIR,WORKDIR,CF_BUFSIZE-1);
strncpy(VLOCKDIR,CFWORKDIR,CF_BUFSIZE-1);
strncpy(VLOGDIR,CFWORKDIR,CF_BUFSIZE-1);
for (i = 0; i < ATTR; i++)
{
- sprintf(VBUFF,"%s/state/cf_incoming.%s",WORKDIR,ECGSOCKS[i][1]);
+ (void)snprintf(VBUFF,sizeof(VBUFF),"%s/state/cf_incoming.%s",WORKDIR,ECGSOCKS[i][1]);
- sprintf(VBUFF,"%s/state/cf_incoming.%s",CFWORKDIR,ECGSOCKS[i][1]);
+ (void)snprintf(VBUFF,sizeof(VBUFF),"%s/state/cf_incoming.%s",CFWORKDIR,ECGSOCKS[i][1]);
CreateEmptyFile(VBUFF);
- sprintf(VBUFF,"%s/state/cf_outgoing.%s",WORKDIR,ECGSOCKS[i][1]);
+ (void)snprintf(VBUFF,sizeof(VBUFF),"%s/state/cf_outgoing.%s",WORKDIR,ECGSOCKS[i][1]);
- sprintf(VBUFF,"%s/state/cf_outgoing.%s",CFWORKDIR,ECGSOCKS[i][1]);
+ (void)snprintf(VBUFF,sizeof(VBUFF),"%s/state/cf_outgoing.%s",CFWORKDIR,ECGSOCKS[i][1]);
CreateEmptyFile(VBUFF);
}
@@ -263,13 +263,13 @@ for (i = 0; i < CF_NETATTR; i++)
@@ -276,7 +276,7 @@ for (i = 0; i < CF_NETATTR; i++)
NETOUT_DIST[i] = NULL;
}
-sprintf(VBUFF,"%s/state/cf_users",WORKDIR);
+(void)snprintf(VBUFF,sizeof(VBUFF),"%s/state/cf_users",WORKDIR);
-sprintf(VBUFF,"%s/state/cf_users",CFWORKDIR);
+(void)snprintf(VBUFF,sizeof(VBUFF),"%s/state/cf_users",CFWORKDIR);
CreateEmptyFile(VBUFF);
-snprintf(AVDB,CF_BUFSIZE,"%s/state/%s",WORKDIR,CF_AVDB_FILE);
-snprintf(STATELOG,CF_BUFSIZE,"%s/state/%s",WORKDIR,CF_STATELOG_FILE);
-snprintf(ENV_NEW,CF_BUFSIZE,"%s/state/%s",WORKDIR,CF_ENVNEW_FILE);
-snprintf(ENV,CF_BUFSIZE,"%s/state/%s",WORKDIR,CF_ENV_FILE);
+snprintf(AVDB,sizeof(AVDB),"%s/state/%s",WORKDIR,CF_AVDB_FILE);
+snprintf(STATELOG,sizeof(AVDB),"%s/state/%s",WORKDIR,CF_STATELOG_FILE);
+snprintf(ENV_NEW,sizeof(AVDB),"%s/state/%s",WORKDIR,CF_ENVNEW_FILE);
+snprintf(ENV,sizeof(AVDB),"%s/state/%s",WORKDIR,CF_ENV_FILE);
snprintf(AVDB,CF_MAXVARSIZE,"%s/state/%s",CFWORKDIR,CF_AVDB_FILE);
@@ -284,6 +284,7 @@ snprintf(STATELOG,CF_BUFSIZE,"%s/state/%
snprintf(ENV_NEW,CF_BUFSIZE,"%s/state/%s",CFWORKDIR,CF_ENVNEW_FILE);
snprintf(ENV,CF_BUFSIZE,"%s/state/%s",CFWORKDIR,CF_ENV_FILE);
+
if (!BATCH_MODE)
{
@@ -459,7 +459,7 @@ void StartServer(int argc,char **argv)
GetDatabaseAge();
@@ -472,7 +473,7 @@ void StartServer(int argc,char **argv)
if ((!NO_FORK) && (fork() != 0))
{
@ -65,7 +78,7 @@ $OpenBSD: patch-src_cfenvd_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
CfLog(cfinform,OUTPUT,"");
exit(0);
}
@@ -625,7 +625,7 @@ if ((now = time((time_t *)NULL)) == -1)
@@ -646,7 +647,7 @@ if ((now = time((time_t *)NULL)) == -1)
exit(1);
}
@ -74,7 +87,7 @@ $OpenBSD: patch-src_cfenvd_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
return ConvTimeKey(str);
}
@@ -791,14 +791,14 @@ SetVariable("loadavg",LOADAVG,av.expect_
@@ -812,14 +813,14 @@ SetVariable("loadavg",LOADAVG,av.expect_
for (i = 0; i < ATTR; i++)
{
char name[256];
@ -93,7 +106,7 @@ $OpenBSD: patch-src_cfenvd_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
sig = SetClasses(name,OUTGOING[i],av.expect_outgoing[i],av.var_outgoing[i],LOCALAV.expect_outgoing[i],LOCALAV.var_outgoing[i],&classlist,timekey);
SetVariable(name,OUTGOING[i],av.expect_outgoing[i],sig,&classlist);
@@ -818,13 +818,13 @@ for (i = 0; i < PH_LIMIT; i++)
@@ -839,13 +840,13 @@ for (i = 0; i < PH_LIMIT; i++)
for (i = 0; i < CF_NETATTR; i++)
{
char name[256];
@ -111,7 +124,7 @@ $OpenBSD: patch-src_cfenvd_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
sig = SetClasses(name,NETOUT[i],av.expect_netout[i],av.var_netout[i],LOCALAV.expect_netout[i],LOCALAV.var_netout[i],&classlist,timekey);
SetVariable(name,NETOUT[i],av.expect_netout[i],sig,&classlist);
}
@@ -1141,7 +1141,7 @@ if (ALL_OUTGOING != NULL)
@@ -1162,7 +1163,7 @@ if (ALL_OUTGOING != NULL)
sscanf(VNETSTAT[VSYSTEMHARDCLASS],"%s",comm);
@ -120,7 +133,7 @@ $OpenBSD: patch-src_cfenvd_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
if ((pp = cfpopen(comm,"r")) == NULL)
{
@@ -1472,7 +1472,7 @@ struct Averages *GetCurrentAverages(char
@@ -1491,7 +1492,7 @@ struct Averages *GetCurrentAverages(char
if ((errno = db_create(&dbp,NULL,0)) != 0)
{
@ -129,7 +142,7 @@ $OpenBSD: patch-src_cfenvd_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
CfLog(cferror,OUTPUT,"db_open");
return NULL;
}
@@ -1483,7 +1483,7 @@ if ((errno = dbp->open(dbp,AVDB,NULL,DB_
@@ -1502,7 +1503,7 @@ if ((errno = dbp->open(dbp,AVDB,NULL,DB_
if ((errno = dbp->open(dbp,NULL,AVDB,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
#endif
{
@ -138,7 +151,7 @@ $OpenBSD: patch-src_cfenvd_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
CfLog(cferror,OUTPUT,"db_open");
return NULL;
}
@@ -1533,7 +1533,7 @@ void UpdateAverages(char *timekey,struct
@@ -1552,7 +1553,7 @@ void UpdateAverages(char *timekey,struct
if ((errno = db_create(&dbp,NULL,0)) != 0)
{
@ -147,7 +160,7 @@ $OpenBSD: patch-src_cfenvd_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
CfLog(cferror,OUTPUT,"db_open");
return;
}
@@ -1544,7 +1544,7 @@ if ((errno = dbp->open(dbp,AVDB,NULL,DB_
@@ -1563,7 +1564,7 @@ if ((errno = dbp->open(dbp,AVDB,NULL,DB_
if ((errno = dbp->open(dbp,NULL,AVDB,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
#endif
{
@ -156,7 +169,7 @@ $OpenBSD: patch-src_cfenvd_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
CfLog(cferror,OUTPUT,"db_open");
return;
}
@@ -1771,27 +1771,27 @@ if (fabs(delta) < cf_noise_threshold) /*
@@ -1790,27 +1791,27 @@ if (fabs(delta) < cf_noise_threshold) /*
Debug(" Sensitivity too high ..\n");
buffer[0] = '\0';
@ -190,7 +203,7 @@ $OpenBSD: patch-src_cfenvd_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
AppendItem(classlist,buffer2,"2");
AddPersistentClass(buffer2,40,cfpreserve);
}
@@ -1801,33 +1801,33 @@ if (fabs(delta) < cf_noise_threshold) /*
@@ -1820,33 +1821,33 @@ if (fabs(delta) < cf_noise_threshold) /*
else
{
buffer[0] = '\0';
@ -232,7 +245,7 @@ $OpenBSD: patch-src_cfenvd_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
AppendItem(classlist,buffer2,"0");
}
@@ -1837,16 +1837,16 @@ if (fabs(delta) < cf_noise_threshold) /*
@@ -1856,16 +1857,16 @@ if (fabs(delta) < cf_noise_threshold) /*
if (dev > 2.0*sqrt(2.0))
{
@ -253,7 +266,7 @@ $OpenBSD: patch-src_cfenvd_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
AppendItem(classlist,buffer2,"3");
AddPersistentClass(buffer2,40,cfpreserve);
}
@@ -1861,13 +1861,13 @@ void SetVariable(char *name,double value
@@ -1880,13 +1881,13 @@ void SetVariable(char *name,double value
{ char var[CF_BUFSIZE];

81
sysutils/cfengine/patches/patch-src_cfenvgraph_c
View File

@ -1,25 +1,25 @@
$OpenBSD: patch-src_cfenvgraph_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
--- src/cfenvgraph.c.orig Wed Aug 11 22:47:25 2004
+++ src/cfenvgraph.c Fri Oct 1 23:14:46 2004
@@ -171,7 +171,7 @@ fgets(line,CF_BUFSIZE,pp);
fgets(line,CF_BUFSIZE,pp);
line[0] = '\0';
fgets(line,CF_BUFSIZE,pp);
$OpenBSD: patch-src_cfenvgraph_c,v 1.4 2005/07/21 15:16:46 aanriot Exp $
--- src/cfenvgraph.c.orig Wed May 25 10:17:00 2005
+++ src/cfenvgraph.c Fri Jul 15 12:24:00 2005
@@ -177,7 +177,7 @@ for (sp = line; *sp != '\0'; sp++)
}
}
-strcpy(VFQNAME,line);
+(void)strlcpy(VFQNAME,line,CF_MAXVARSIZE);
+(void)strlcpy(VFQNAME,line,sizeof(VFQNAME));
if (strlen(VFQNAME) == 0)
{
@@ -181,7 +181,7 @@ if (strlen(VFQNAME) == 0)
@@ -187,7 +187,7 @@ if (strlen(VFQNAME) == 0)
perror("uname ");
exit(0);
}
- strcpy(VFQNAME,sys.sysname);
+ (void)strlcpy(VFQNAME,sys.sysname,CF_MAXVARSIZE);
+ (void)strlcpy(VFQNAME,sys.sysname,sizeof(VFQNAME));
}
else
{
@@ -279,7 +279,7 @@ for (NOW = CF_MONDAY_MORNING; NOW < CF_M
@@ -285,7 +285,7 @@ for (NOW = CF_MONDAY_MORNING; NOW < CF_M
memset(&value,0,sizeof(value));
memset(&ENTRY,0,sizeof(ENTRY));
@ -28,7 +28,7 @@ $OpenBSD: patch-src_cfenvgraph_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
key.data = TIMEKEY;
key.size = strlen(TIMEKEY)+1;
@@ -548,7 +548,7 @@ if (TIMESTAMPS)
@@ -554,7 +554,7 @@ if (TIMESTAMPS)
printf("Couldn't read system clock\n");
}
@ -37,7 +37,7 @@ $OpenBSD: patch-src_cfenvgraph_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
for (sp = FLNAME; *sp != '\0'; sp++)
{
@@ -560,7 +560,7 @@ if (TIMESTAMPS)
@@ -566,7 +566,7 @@ if (TIMESTAMPS)
}
else
{
@ -46,7 +46,7 @@ $OpenBSD: patch-src_cfenvgraph_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
printf("Creating sub-directory %s\n",FLNAME);
@@ -582,7 +582,7 @@ if (chdir(FLNAME))
@@ -588,7 +588,7 @@ if (chdir(FLNAME))
printf("Writing data to sub-directory %s: \n x,y1,y2,y3...\n ",FLNAME);
@ -55,7 +55,7 @@ $OpenBSD: patch-src_cfenvgraph_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
if ((FPAV = fopen(FLNAME,"w")) == NULL)
{
@@ -590,7 +590,7 @@ if ((FPAV = fopen(FLNAME,"w")) == NULL)
@@ -596,7 +596,7 @@ if ((FPAV = fopen(FLNAME,"w")) == NULL)
exit(1);
}
@ -64,7 +64,7 @@ $OpenBSD: patch-src_cfenvgraph_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
if ((FPVAR = fopen(FLNAME,"w")) == NULL)
{
@@ -603,31 +603,31 @@ if ((FPVAR = fopen(FLNAME,"w")) == NULL)
@@ -609,31 +609,31 @@ if ((FPVAR = fopen(FLNAME,"w")) == NULL)
if (SEPARATE)
{
@ -101,7 +101,7 @@ $OpenBSD: patch-src_cfenvgraph_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
if ((FPLOAD = fopen(FLNAME,"w")) == NULL)
{
perror("fopen");
@@ -636,14 +636,14 @@ if (SEPARATE)
@@ -642,14 +642,14 @@ if (SEPARATE)
for (i = 0; i < ATTR; i++)
{
@ -118,7 +118,7 @@ $OpenBSD: patch-src_cfenvgraph_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
if ((FPOUT[i] = fopen(FLNAME,"w")) == NULL)
{
perror("fopen");
@@ -653,14 +653,14 @@ if (SEPARATE)
@@ -659,14 +659,14 @@ if (SEPARATE)
for (i = 0; i < CF_NETATTR; i++)
{
@ -135,7 +135,7 @@ $OpenBSD: patch-src_cfenvgraph_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
if ((FPNETOUT[i] = fopen(FLNAME,"w")) == NULL)
{
perror("fopen");
@@ -675,7 +675,7 @@ if (SEPARATE)
@@ -681,7 +681,7 @@ if (SEPARATE)
continue;
}
@ -144,7 +144,7 @@ $OpenBSD: patch-src_cfenvgraph_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
if ((FPPH[i] = fopen(FLNAME,"w")) == NULL)
{
perror("fopen");
@@ -765,7 +765,7 @@ while (NOW < CF_MONDAY_MORNING+CF_WEEK)
@@ -771,7 +771,7 @@ while (NOW < CF_MONDAY_MORNING+CF_WEEK)
memset(&key,0,sizeof(key));
memset(&value,0,sizeof(value));
@ -153,16 +153,16 @@ $OpenBSD: patch-src_cfenvgraph_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
key.data = TIMEKEY;
key.size = strlen(TIMEKEY)+1;
@@ -1017,7 +1017,7 @@ for (i = 0; i < 7; i++)
@@ -1023,7 +1023,7 @@ for (i = 0; i < 7; i++)
int position,day;
int weekly[CF_NETATTR*2+ATTR*2+5+PH_LIMIT][CF_GRAINS];
- snprintf(FLNAME,CF_BUFSIZE,"%s/state/histograms",WORKDIR);
+ snprintf(FLNAME,sizeof(FLNAME),"%s/state/histograms",WORKDIR);
- snprintf(FLNAME,CF_BUFSIZE,"%s/state/histograms",CFWORKDIR);
+ snprintf(FLNAME,sizeof(FLNAME),"%s/state/histograms",CFWORKDIR);
if ((fp = fopen(FLNAME,"r")) == NULL)
{
@@ -1070,31 +1070,31 @@ for (i = 0; i < 7; i++)
@@ -1076,31 +1076,31 @@ for (i = 0; i < 7; i++)
}
}
@ -199,7 +199,7 @@ $OpenBSD: patch-src_cfenvgraph_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
if ((FPLOAD = fopen(FLNAME,"w")) == NULL)
{
perror("fopen");
@@ -1103,14 +1103,14 @@ for (i = 0; i < 7; i++)
@@ -1109,14 +1109,14 @@ for (i = 0; i < 7; i++)
for (i = 0; i < ATTR; i++)
{
@ -216,7 +216,7 @@ $OpenBSD: patch-src_cfenvgraph_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
if ((FPOUT[i] = fopen(FLNAME,"w")) == NULL)
{
perror("fopen");
@@ -1120,13 +1120,13 @@ for (i = 0; i < 7; i++)
@@ -1126,13 +1126,13 @@ for (i = 0; i < 7; i++)
for (i = 0; i < CF_NETATTR; i++)
{
@ -232,7 +232,7 @@ $OpenBSD: patch-src_cfenvgraph_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
if ((FPNETOUT[i] = fopen(FLNAME,"w")) == NULL)
{
@@ -1142,7 +1142,7 @@ for (i = 0; i < 7; i++)
@@ -1148,7 +1148,7 @@ for (i = 0; i < 7; i++)
continue;
}
@ -241,7 +241,7 @@ $OpenBSD: patch-src_cfenvgraph_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
if ((FPPH[i] = fopen(FLNAME,"w")) == NULL)
{
perror("fopen");
@@ -1374,7 +1374,7 @@ for (dirp = readdir(dirh); dirp != NULL;
@@ -1380,7 +1380,7 @@ for (dirp = readdir(dirh); dirp != NULL;
memset(&key,0,sizeof(key));
memset(&value,0,sizeof(value));
@ -250,7 +250,26 @@ $OpenBSD: patch-src_cfenvgraph_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
key.data = TIMEKEY;
key.size = strlen(TIMEKEY)+1;
@@ -1477,7 +1477,7 @@ while ((c=getopt_long(argc,argv,"Thtf:rs
@@ -1476,15 +1476,15 @@ void CheckOpts(int argc,char **argv)
/* XXX Initialize workdir for non privileged users */
- strcpy(CFWORKDIR,WORKDIR);
+ (void)strlcpy(CFWORKDIR,WORKDIR,sizeof(CFWORKDIR));
if (geteuid() > 0)
{
char *homedir;
if ((homedir = getenv("HOME")) != NULL)
{
- strcpy(CFWORKDIR,homedir);
- strcat(CFWORKDIR,"/.cfagent");
+ (void)strlcpy(CFWORKDIR,homedir,sizeof(CFWORKDIR));
+ (void)strlcat(CFWORKDIR,"/.cfagent",sizeof(CFWORKDIR));
}
}
@@ -1497,7 +1497,7 @@ while ((c=getopt_long(argc,argv,"Thtf:rs
case 't': TITLES = true;
break;
@ -259,7 +278,7 @@ $OpenBSD: patch-src_cfenvgraph_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
break;
case 'T': TIMESTAMPS = true;
@@ -1531,7 +1531,7 @@ char *CanonifyName(char *str)
@@ -1551,7 +1551,7 @@ char *CanonifyName(char *str)
char *sp;
memset(buffer,0,CF_BUFSIZE);
@ -268,7 +287,7 @@ $OpenBSD: patch-src_cfenvgraph_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
for (sp = buffer; *sp != '\0'; sp++)
{
@@ -1603,7 +1603,7 @@ for (NOW = CF_MONDAY_MORNING; NOW < CF_M
@@ -1623,7 +1623,7 @@ for (NOW = CF_MONDAY_MORNING; NOW < CF_M
memset(&value,0,sizeof(value));
memset(&ENTRY,0,sizeof(ENTRY));

123
sysutils/cfengine/patches/patch-src_cfexecd_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_cfexecd_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
--- src/cfexecd.c.orig Mon Aug 16 22:12:46 2004
+++ src/cfexecd.c Fri Oct 1 23:14:46 2004
@@ -148,7 +148,7 @@ Banner("Check options");
$OpenBSD: patch-src_cfexecd_c,v 1.4 2005/07/21 15:16:46 aanriot Exp $
--- src/cfexecd.c.orig Wed May 25 03:52:26 2005
+++ src/cfexecd.c Fri Jul 15 12:24:00 2005
@@ -147,7 +147,7 @@ Banner("Check options");
NOSPLAY = false;
@ -9,49 +9,54 @@ $OpenBSD: patch-src_cfexecd_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
+(void)snprintf(VPREFIX, 40, "cfexecd");
openlog(VPREFIX,LOG_PID|LOG_NOWAIT|LOG_ODELAY,LOG_DAEMON);
while ((c=getopt_long(argc,argv,"L:d:vhpFV1g",CFDOPTIONS,&optindex)) != EOF)
@@ -229,7 +229,7 @@ strncpy(VLOGDIR,WORKDIR,CF_BUFSIZE-1);
while ((c=getopt_long(argc,argv,"L:d:vhpqFV1g",CFDOPTIONS,&optindex)) != EOF)
@@ -216,15 +216,15 @@ LOGGING = true; /* Do
/* XXX Initialize workdir for non privileged users */
-strcpy(CFWORKDIR,WORKDIR);
+(void)strlcpy(CFWORKDIR,WORKDIR,sizeof(CFWORKDIR));
if (getuid() > 0)
{
char *homedir;
if ((homedir = getenv("HOME")) != NULL)
{
- strcpy(CFWORKDIR,homedir);
- strcat(CFWORKDIR,"/.cfagent");
+ (void)strlcpy(CFWORKDIR,homedir,sizeof(CFWORKDIR));
+ (void)strlcat(CFWORKDIR,"/.cfagent",sizeof(CFWORKDIR));
}
}
@@ -246,7 +246,7 @@ strncpy(VLOGDIR,CFWORKDIR,CF_BUFSIZE-1);
VCANONICALFILE = strdup(CanonifyName(VINPUTFILE));
GetNameInfo();
-strcpy(VUQNAME,VSYSNAME.nodename);
+(void)strlcpy(VUQNAME,VSYSNAME.nodename,CF_MAXVARSIZE);
MAILTO[0] = '\0';
MAILFROM[0] = '\0';
@@ -555,7 +555,7 @@ for (ip = SCHEDULE; ip != NULL; ip = ip-
DeleteItemList(VHEAP);
VHEAP = NULL;
GetNameInfo();
- strcpy(VUQNAME,VSYSNAME.nodename);
+ (void)strlcpy(VUQNAME,VSYSNAME.nodename,CF_MAXVARSIZE);
return true;
}
}
@@ -563,7 +563,7 @@ for (ip = SCHEDULE; ip != NULL; ip = ip-
DeleteItemList(VHEAP);
VHEAP = NULL;
GetNameInfo();
-strcpy(VUQNAME,VSYSNAME.nodename);
+(void)strlcpy(VUQNAME,VSYSNAME.nodename,CF_MAXVARSIZE);
return false;
}
@@ -412,7 +412,7 @@ if (strstr(line,"No SMTP"))
CfLog(cferror,"Need: smtpserver = ( ?? ) in control ","");
}
-strcpy(VMAILSERVER,line);
+(void)strlcpy(VMAILSERVER,line,sizeof(VMAILSERVER));
Debug("Got cfengine SMTP server as (%s)\n",VMAILSERVER);
@@ -426,19 +426,19 @@ if (strlen(line) == 0)
CfLog(cferror,"Need: sysadm = ( ??@?? ) in control ","");
}
-strcpy(MAILTO,line);
+(void)strlcpy(MAILTO,line,sizeof(MAILTO));
Debug("Got cfengine sysadm variable (%s)\n",MAILTO);
line[0] = '\0';
fgets(line,CF_BUFSIZE,pp);
Chop(line);
-strcpy(VFQNAME,line);
+(void)strlcpy(VFQNAME,line,CF_MAXVARSIZE);
Debug("Got fully qualified name (%s)\n",VFQNAME);
line[0] = '\0';
fgets(line,CF_BUFSIZE,pp);
Chop(line);
-strcpy(VIPADDRESS,line);
+(void)strlcpy(VIPADDRESS,line,18);
Debug("Got IP (%s)\n",VIPADDRESS);
if ((ungetc(fgetc(pp), pp)) != '[')
@@ -917,7 +917,7 @@ if (!Dialogue(sd,NULL))
@@ -971,7 +971,7 @@ if (!Dialogue(sd,NULL))
goto mail_err;
}
@ -60,7 +65,16 @@ $OpenBSD: patch-src_cfexecd_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
Debug("%s",VBUFF);
if (!Dialogue(sd,VBUFF))
@@ -930,12 +930,12 @@ sscanf(to,"%*[^@]@%.64s",domain);
@@ -981,7 +981,7 @@ if (!Dialogue(sd,VBUFF))
if (strlen(MAILFROM) > 0)
{
- sprintf(VBUFF,"MAIL FROM: <%s>\r\n",MAILFROM);
+ (void)snprintf(VBUFF,sizeof(VBUFF),"MAIL FROM: <%s>\r\n",MAILFROM);
Debug("%s",VBUFF);
}
else
@@ -991,12 +991,12 @@ else
if (strlen(domain) > 0)
{
@ -74,8 +88,8 @@ $OpenBSD: patch-src_cfexecd_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
+ (void)snprintf(VBUFF,sizeof(VBUFF),"MAIL FROM: <%s>\r\n",to);
Debug("%s",VBUFF);
}
@@ -944,7 +944,7 @@ if (!Dialogue(sd,VBUFF))
}
@@ -1006,7 +1006,7 @@ if (!Dialogue(sd,VBUFF))
goto mail_err;
}
@ -84,7 +98,7 @@ $OpenBSD: patch-src_cfexecd_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
Debug("%s",VBUFF);
if (!Dialogue(sd,VBUFF))
@@ -959,12 +959,12 @@ if (!Dialogue(sd,"DATA\r\n"))
@@ -1021,12 +1021,12 @@ if (!Dialogue(sd,"DATA\r\n"))
if (anomaly)
{
@ -99,20 +113,29 @@ $OpenBSD: patch-src_cfexecd_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
Debug("%s",VBUFF);
}
@@ -978,10 +978,10 @@ strftime(VBUFF,CF_BUFSIZE,"Date: %a, %d
sent=send(sd,VBUFF,strlen(VBUFF),0);
#endif
@@ -1042,18 +1042,18 @@ sent=send(sd,VBUFF,strlen(VBUFF),0);
if (strlen(MAILFROM) == 0)
{
- sprintf(VBUFF,"From: cfengine@%s\r\n",VFQNAME);
+ (void)snprintf(VBUFF,sizeof(VBUFF),"From: cfengine@%s\r\n",VFQNAME);
Debug("%s",VBUFF);
}
else
{
- sprintf(VBUFF,"From: cfengine@%s\r\n",VFQNAME);
+ (void)snprintf(VBUFF,sizeof(VBUFF),"From: cfengine@%s\r\n",VFQNAME);
Debug("%s",VBUFF);
}
sent=send(sd,VBUFF,strlen(VBUFF),0);
-sprintf(VBUFF,"To: %s\r\n\r\n",to);
+(void)snprintf(VBUFF,sizeof(VBUFF),"To: %s\r\n\r\n",to);
Debug("%s",VBUFF);
sent=send(sd,VBUFF,strlen(VBUFF),0);
@@ -994,14 +994,14 @@ while(!feof(fp))
@@ -1066,14 +1066,14 @@ while(!feof(fp))
if (strlen(VBUFF) > 0)
{
VBUFF[strlen(VBUFF)-1] = '\r';
@ -129,12 +152,12 @@ $OpenBSD: patch-src_cfexecd_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
sent=send(sd,VBUFF,strlen(VBUFF),0);
break;
}
@@ -1023,7 +1023,7 @@ mail_err:
@@ -1095,7 +1095,7 @@ mail_err:
fclose(fp);
close(sd);
-sprintf(VBUFF, "Cannot mail to %s.", to);
+(void)snprintf(VBUFF, sizeof(VBUFF), "Cannot mail to %s.", to);
CfLog(cferror,VBUFF,"");
CfLog(cflogonly,VBUFF,"");
}

36
sysutils/cfengine/patches/patch-src_cfkey_c
View File

@ -1,14 +1,30 @@
$OpenBSD: patch-src_cfkey_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
--- src/cfkey.c.orig 2004-06-10 23:26:34.000000000 -0400
+++ src/cfkey.c 2004-06-10 22:30:18.000000000 -0400
@@ -147,8 +147,8 @@ void Initialize()
{
$OpenBSD: patch-src_cfkey_c,v 1.2 2005/07/21 15:16:46 aanriot Exp $
--- src/cfkey.c.orig Thu Apr 7 15:26:44 2005
+++ src/cfkey.c Fri Jul 15 12:24:00 2005
@@ -149,20 +149,21 @@ void Initialize()
umask(077);
-strcpy(VLOCKDIR,WORKDIR);
-strcpy(VLOGDIR,WORKDIR);
+(void)strlcpy(VLOCKDIR,WORKDIR,CF_BUFSIZE);
+(void)strlcpy(VLOGDIR,WORKDIR,CF_BUFSIZE);
/* XXX Initialize workdir for non privileged users */
- strcpy(CFWORKDIR,WORKDIR);
+ (void)strlcpy(CFWORKDIR,WORKDIR,sizeof(CFWORKDIR));
if (geteuid() > 0)
{
char *homedir;
if ((homedir = getenv("HOME")) != NULL)
{
- strcpy(CFWORKDIR,homedir);
- strcat(CFWORKDIR,"/.cfagent");
+ (void)strlcpy(CFWORKDIR,homedir,sizeof(CFWORKDIR));
+ (void)strlcat(CFWORKDIR,"/.cfagent",sizeof(CFWORKDIR));
}
}
-strcpy(VLOCKDIR,CFWORKDIR);
-strcpy(VLOGDIR,CFWORKDIR);
+(void)strlcpy(VLOCKDIR,CFWORKDIR,CF_BUFSIZE);
+(void)strlcpy(VLOGDIR,CFWORKDIR,CF_BUFSIZE);
+
OpenSSL_add_all_algorithms();
ERR_load_crypto_strings();

39
sysutils/cfengine/patches/patch-src_cflex_c Normal file
View File

@ -0,0 +1,39 @@
$OpenBSD: patch-src_cflex_c,v 1.1 2005/07/21 15:16:46 aanriot Exp $
--- src/cflex.c.orig Fri Jun 10 16:02:28 2005
+++ src/cflex.c Fri Jul 15 12:24:01 2005
@@ -2376,7 +2376,7 @@ YY_RULE_SETUP
#line 236 "cflex.l"
{
Debug1("LFARROW %s\n",yytext);
- strcpy(LINKFROM,CURRENTOBJECT);
+ (void)strlcpy(LINKFROM,CURRENTOBJECT,CF_BUFSIZE);
ACTION_IS_LINKCHILDREN = true;
FORCELINK='y';
return LARROW;
@@ -2387,7 +2387,7 @@ YY_RULE_SETUP
#line 245 "cflex.l"
{
Debug1("FARROW %s\n",yytext);
- strcpy(LINKFROM,CURRENTOBJECT);
+ (void)strlcpy(LINKFROM,CURRENTOBJECT,CF_BUFSIZE);
ACTION_IS_LINK = true;
FORCELINK='y';
return ARROW;
@@ -2398,7 +2398,7 @@ YY_RULE_SETUP
#line 253 "cflex.l"
{
Debug1("ARROW %s\n",yytext);
- strcpy(LINKFROM,CURRENTOBJECT);
+ (void)strlcpy(LINKFROM,CURRENTOBJECT,CF_BUFSIZE);
ACTION_IS_LINK = true;
FORCELINK='n';
return ARROW;
@@ -2409,7 +2409,7 @@ YY_RULE_SETUP
#line 262 "cflex.l"
{
Debug1("LARROW %s\n",yytext);
- strcpy(LINKFROM,CURRENTOBJECT);
+ (void)strlcpy(LINKFROM,CURRENTOBJECT,CF_BUFSIZE);
ACTION_IS_LINKCHILDREN = true;
FORCELINK='n';
return LARROW;

69
sysutils/cfengine/patches/patch-src_cfrun_c
View File

@ -1,36 +1,44 @@
$OpenBSD: patch-src_cfrun_c,v 1.2 2004/10/01 21:22:15 sturm Exp $
--- src/cfrun.c.orig Mon Aug 2 21:46:03 2004
+++ src/cfrun.c Fri Oct 1 23:17:38 2004
@@ -245,23 +245,23 @@ if (uname(&VSYSNAME) == -1)
$OpenBSD: patch-src_cfrun_c,v 1.3 2005/07/21 15:16:46 aanriot Exp $
--- src/cfrun.c.orig Tue Feb 8 06:50:01 2005
+++ src/cfrun.c Fri Jul 15 12:24:01 2005
@@ -233,7 +233,7 @@ for (i = 1; i < argc; i++)
if ((strlen(VDOMAIN) > 0) && !strchr(VSYSNAME.nodename,'.'))
{
- sprintf(VFQNAME,"%s.%s",VSYSNAME.nodename,VDOMAIN);
+ (void)snprintf(VFQNAME,CF_MAXVARSIZE,"%s.%s",VSYSNAME.nodename,VDOMAIN);
}
else
{
- sprintf(VFQNAME,"%s",VSYSNAME.nodename);
+ (void)snprintf(VFQNAME,CF_MAXVARSIZE,"%s",VSYSNAME.nodename);
}
*/
/* XXX Initialize workdir for non privileged users */
Debug("FQNAME = %s\n",VFQNAME);
- strcpy(CFWORKDIR,WORKDIR);
+ (void)strlcpy(CFWORKDIR,WORKDIR,sizeof(CFWORKDIR));
if (getuid() > 0)
{
@@ -241,7 +241,7 @@ for (i = 1; i < argc; i++)
if ((homedir = getenv("HOME")) != NULL)
{
strncpy(CFWORKDIR,homedir,CF_BUFSIZE-16);
- strcat(CFWORKDIR,"/.cfagent");
+ (void)strlcat(CFWORKDIR,"/.cfagent",sizeof(CFWORKDIR));
}
}
@@ -254,14 +254,15 @@ for (i = 1; i < argc; i++)
Debug("FQNAME = %s, WORKDIR = %s\n",VFQNAME,WORKDIR);
- sprintf(VPREFIX,"cfrun:%s",VFQNAME);
+ (void)snprintf(VPREFIX,40,"cfrun:%s",VFQNAME);
/* Read hosts file */
umask(077);
-strcpy(VLOCKDIR,WORKDIR);
-strcpy(VLOGDIR,WORKDIR);
+(void)strlcpy(VLOCKDIR,WORKDIR,CF_BUFSIZE);
+(void)strlcpy(VLOGDIR,WORKDIR,CF_BUFSIZE);
- strcpy(VLOCKDIR,CFWORKDIR);
- strcpy(VLOGDIR,CFWORKDIR);
+ (void)strlcpy(VLOCKDIR,CFWORKDIR,CF_BUFSIZE);
+ (void)strlcpy(VLOGDIR,CFWORKDIR,CF_BUFSIZE);
+
OpenSSL_add_all_algorithms();
ERR_load_crypto_strings();
@@ -294,7 +294,7 @@ CONN = NewAgentConn();
@@ -295,7 +296,7 @@ CONN = NewAgentConn();
if (storeinfile)
{
@ -39,7 +47,7 @@ $OpenBSD: patch-src_cfrun_c,v 1.2 2004/10/01 21:22:15 sturm Exp $
if ((fp = fopen(filebuffer, "w")) == NULL)
{
return false;
@@ -564,10 +564,10 @@ if (!strchr(VCFRUNHOSTS, '/'))
@@ -566,10 +567,10 @@ if (!strchr(VCFRUNHOSTS, '/'))
{
if ((sp=getenv(CF_INPUTSVAR)) != NULL)
{
@ -52,7 +60,7 @@ $OpenBSD: patch-src_cfrun_c,v 1.2 2004/10/01 21:22:15 sturm Exp $
}
}
else
@@ -576,7 +576,7 @@ if (!strchr(VCFRUNHOSTS, '/'))
@@ -578,7 +579,7 @@ if (!strchr(VCFRUNHOSTS, '/'))
}
}
@ -61,16 +69,7 @@ $OpenBSD: patch-src_cfrun_c,v 1.2 2004/10/01 21:22:15 sturm Exp $
if ((fp = fopen(filename,"r")) == NULL) /* Open root file */
{
@@ -601,7 +601,7 @@ while (!feof(fp))
if (strncmp(line,"hostnamekeys",6) == 0)
{
- char buf[16];
+ char buf[296];
buf[0] = '\0';
sscanf(line,"hostnamekeys = %295[^# \n]",buf);
Verbose("Hostname keys\n");
@@ -703,8 +703,8 @@ while (!feof(fp))
@@ -705,8 +706,8 @@ while (!feof(fp))
if ((!strstr(buffer,".")) && (strlen(VDOMAIN) > 0))
{
@ -81,7 +80,7 @@ $OpenBSD: patch-src_cfrun_c,v 1.2 2004/10/01 21:22:15 sturm Exp $
}
if (!IsItemIn(VCFRUNHOSTLIST,buffer))
@@ -762,8 +762,8 @@ for (ip = VCFRUNCLASSES; ip != NULL; ip
@@ -764,8 +765,8 @@ for (ip = VCFRUNCLASSES; ip != NULL; ip
memset(sendbuffer,0,CF_BUFSIZE);
}
@ -92,7 +91,7 @@ $OpenBSD: patch-src_cfrun_c,v 1.2 2004/10/01 21:22:15 sturm Exp $
sp += strlen(ip->name)+1;
used += strlen(ip->name)+1;
@@ -782,7 +782,7 @@ if (used + strlen(CFD_TERMINATOR) +2 > C
@@ -784,7 +785,7 @@ if (used + strlen(CFD_TERMINATOR) +2 > C
memset(sendbuffer,0,CF_BUFSIZE);
}

61
sysutils/cfengine/patches/patch-src_cfservd_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_cfservd_c,v 1.2 2004/10/01 21:22:15 sturm Exp $
--- src/cfservd.c.orig Fri Aug 13 11:08:25 2004
+++ src/cfservd.c Fri Oct 1 23:14:47 2004
@@ -172,10 +172,10 @@ void CheckOptsAndInit(int argc,char **ar
$OpenBSD: patch-src_cfservd_c,v 1.3 2005/07/21 15:16:46 aanriot Exp $
--- src/cfservd.c.orig Wed May 25 09:58:03 2005
+++ src/cfservd.c Fri Jul 15 12:24:01 2005
@@ -171,10 +171,10 @@ void CheckOptsAndInit(int argc,char **ar
int c;
SetContext("server");
@ -15,7 +15,26 @@ $OpenBSD: patch-src_cfservd_c,v 1.2 2004/10/01 21:22:15 sturm Exp $
OUTPUT[0] = '\0';
/*
@@ -277,7 +277,7 @@ strncpy(VLOCKDIR,WORKDIR,CF_BUFSIZE-1);
@@ -272,15 +272,15 @@ if ((CFSTARTTIME = time((time_t *)NULL))
/* XXX Initialize workdir for non privileged users */
- strcpy(CFWORKDIR,WORKDIR);
+ (void)strlcpy(CFWORKDIR,WORKDIR,sizeof(CFWORKDIR));
if (getuid() > 0)
{
char *homedir;
if ((homedir = getenv("HOME")) != NULL)
{
- strcpy(CFWORKDIR,homedir);
- strcat(CFWORKDIR,"/.cfagent");
+ (void)strlcpy(CFWORKDIR,homedir,sizeof(CFWORKDIR));
+ (void)strlcat(CFWORKDIR,"/.cfagent",sizeof(CFWORKDIR));
}
}
@@ -293,7 +293,7 @@ strncpy(VLOCKDIR,CFWORKDIR,CF_BUFSIZE-1)
VIFELAPSED = CF_EXEC_IFELAPSED;
VEXPIREAFTER = CF_EXEC_EXPIREAFTER;
@ -24,8 +43,8 @@ $OpenBSD: patch-src_cfservd_c,v 1.2 2004/10/01 21:22:15 sturm Exp $
VCANONICALFILE = strdup(CanonifyName(VINPUTFILE));
VREPOSITORY = strdup("\0");
@@ -1024,7 +1024,7 @@ if (CFDSTARTTIME < newstat.st_mtime)
DeleteItemList(TRUSTKEYLIST);
@@ -1047,7 +1047,7 @@ if (CFDSTARTTIME < newstat.st_mtime)
DeleteItemList(VIMPORT);
DeleteAuthList(VADMIT);
DeleteAuthList(VDENY);
- strcpy(VDOMAIN,"undefined.domain");
@ -33,7 +52,7 @@ $OpenBSD: patch-src_cfservd_c,v 1.2 2004/10/01 21:22:15 sturm Exp $
VADMIT = VADMITTOP = NULL;
VDENY = VDENYTOP = NULL;
@@ -1401,7 +1401,7 @@ switch (GetCommand(recvbuffer))
@@ -1427,7 +1427,7 @@ switch (GetCommand(recvbuffer))
if ((tloc = time((time_t *)NULL)) == -1)
{
@ -42,7 +61,7 @@ $OpenBSD: patch-src_cfservd_c,v 1.2 2004/10/01 21:22:15 sturm Exp $
CfLog(cfinform,conn->output,"time");
SendTransaction(conn->sd_reply,"BAD: clocks out of synch",0,CF_DONE);
return true;
@@ -1466,7 +1466,7 @@ switch (GetCommand(recvbuffer))
@@ -1492,7 +1492,7 @@ switch (GetCommand(recvbuffer))
}
@ -51,7 +70,7 @@ $OpenBSD: patch-src_cfservd_c,v 1.2 2004/10/01 21:22:15 sturm Exp $
SendTransaction(conn->sd_reply,sendbuffer,0,CF_DONE);
CfLog(cfinform,"Closing connection\n","");
return false;
@@ -1574,7 +1574,7 @@ if ((CFSTARTTIME = time((time_t *)NULL))
@@ -1600,7 +1600,7 @@ if ((CFSTARTTIME = time((time_t *)NULL))
if (GetMacroValue(CONTEXTID,"cfrunCommand") == NULL)
{
Verbose("cfservd exec request: no cfrunCommand defined\n");
@ -60,7 +79,7 @@ $OpenBSD: patch-src_cfservd_c,v 1.2 2004/10/01 21:22:15 sturm Exp $
SendTransaction(conn->sd_reply,sendbuffer,0,CF_DONE);
return;
}
@@ -1615,8 +1615,8 @@ else
@@ -1641,8 +1641,8 @@ else
{
if ((args != NULL) & (strlen(args) > 0))
{
@ -71,7 +90,7 @@ $OpenBSD: patch-src_cfservd_c,v 1.2 2004/10/01 21:22:15 sturm Exp $
snprintf(sendbuffer,CF_BUFSIZE,"cfservd Executing %s\n",ebuff);
SendTransaction(conn->sd_reply,sendbuffer,0,CF_DONE);
@@ -2483,7 +2483,7 @@ if (S_ISLNK(statbuf.st_mode))
@@ -2551,7 +2551,7 @@ if (S_ISLNK(statbuf.st_mode))
if (readlink(filename,linkbuf,CF_BUFSIZE-1) == -1)
{
@ -80,7 +99,7 @@ $OpenBSD: patch-src_cfservd_c,v 1.2 2004/10/01 21:22:15 sturm Exp $
CfLog(cferror,sendbuffer,"readlink");
SendTransaction(conn->sd_reply,sendbuffer,0,CF_DONE);
return -1;
@@ -2586,12 +2586,12 @@ SendTransaction(conn->sd_reply,sendbuffe
@@ -2654,12 +2654,12 @@ SendTransaction(conn->sd_reply,sendbuffe
if (cfst.cf_readlink != NULL)
{
@ -96,7 +115,7 @@ $OpenBSD: patch-src_cfservd_c,v 1.2 2004/10/01 21:22:15 sturm Exp $
}
SendTransaction(conn->sd_reply,sendbuffer,0,CF_DONE);
@@ -2793,13 +2793,13 @@ memset(sendbuffer,0,CF_BUFSIZE);
@@ -2861,13 +2861,13 @@ memset(sendbuffer,0,CF_BUFSIZE);
if (ChecksumChanged(filename,digest,cfverbose,true,'m'))
{
@ -112,7 +131,7 @@ $OpenBSD: patch-src_cfservd_c,v 1.2 2004/10/01 21:22:15 sturm Exp $
Debug("Checksums matched ok\n");
SendTransaction(conn->sd_reply,sendbuffer,0,CF_DONE);
}
@@ -2817,7 +2817,7 @@ Debug("CfOpenDirectory(%s)\n",dirname);
@@ -2885,7 +2885,7 @@ Debug("CfOpenDirectory(%s)\n",dirname);
if (*dirname != '/')
{
@ -121,7 +140,7 @@ $OpenBSD: patch-src_cfservd_c,v 1.2 2004/10/01 21:22:15 sturm Exp $
SendTransaction(conn->sd_reply,sendbuffer,0,CF_DONE);
return -1;
}
@@ -2849,7 +2849,7 @@ for (dirp = readdir(dirh); dirp != NULL;
@@ -2917,7 +2917,7 @@ for (dirp = readdir(dirh); dirp != NULL;
offset += strlen(dirp->d_name) + 1; /* + zero byte separator */
}
@ -130,7 +149,7 @@ $OpenBSD: patch-src_cfservd_c,v 1.2 2004/10/01 21:22:15 sturm Exp $
SendTransaction(conn->sd_reply,sendbuffer,offset+2+strlen(CFD_TERMINATOR),CF_DONE);
Debug("END CfOpenDirectory(%s)\n",dirname);
closedir(dirh);
@@ -2864,7 +2864,7 @@ void Terminate(int sd)
@@ -2932,7 +2932,7 @@ void Terminate(int sd)
memset(buffer,0,CF_BUFSIZE);
@ -139,7 +158,7 @@ $OpenBSD: patch-src_cfservd_c,v 1.2 2004/10/01 21:22:15 sturm Exp $
if (SendTransaction(sd,buffer,strlen(buffer)+1,CF_DONE) == -1)
{
@@ -3083,7 +3083,7 @@ Debug("Checking to see if we have seen t
@@ -3151,7 +3151,7 @@ Debug("Checking to see if we have seen t
if ((errno = db_create(&dbp,NULL,0)) != 0)
{
@ -148,7 +167,7 @@ $OpenBSD: patch-src_cfservd_c,v 1.2 2004/10/01 21:22:15 sturm Exp $
CfLog(cferror,OUTPUT,"db_open");
return false;
}
@@ -3094,7 +3094,7 @@ if ((errno = dbp->open(dbp,keydb,NULL,DB
@@ -3162,7 +3162,7 @@ if ((errno = dbp->open(dbp,keydb,NULL,DB
if ((errno = dbp->open(dbp,NULL,keydb,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
#endif
{
@ -157,7 +176,7 @@ $OpenBSD: patch-src_cfservd_c,v 1.2 2004/10/01 21:22:15 sturm Exp $
CfLog(cferror,OUTPUT,"db_open");
return false;
}
@@ -3167,7 +3167,7 @@ if ((DHCPLIST != NULL) && IsFuzzyItemIn(
@@ -3235,7 +3235,7 @@ if ((DHCPLIST != NULL) && IsFuzzyItemIn(
if ((errno = db_create(&dbp,NULL,0)) != 0)
{
@ -166,7 +185,7 @@ $OpenBSD: patch-src_cfservd_c,v 1.2 2004/10/01 21:22:15 sturm Exp $
CfLog(cferror,OUTPUT,"db_open");
return;
}
@@ -3178,7 +3178,7 @@ if ((DHCPLIST != NULL) && IsFuzzyItemIn(
@@ -3246,7 +3246,7 @@ if ((DHCPLIST != NULL) && IsFuzzyItemIn(
if ((errno = dbp->open(dbp,NULL,keydb,NULL,DB_BTREE,DB_CREATE,0644)) != 0)
#endif
{

61
sysutils/cfengine/patches/patch-src_cfshow_c Normal file
View File

@ -0,0 +1,61 @@
$OpenBSD: patch-src_cfshow_c,v 1.1 2005/07/21 15:16:46 aanriot Exp $
--- src/cfshow.c.orig Thu Feb 10 15:19:37 2005
+++ src/cfshow.c Tue Jul 19 12:02:08 2005
@@ -131,7 +131,7 @@ while ((c=getopt_long(argc,argv,"hdvaVls
}
-strcpy(CFWORKDIR,WORKDIR);
+(void)strlcpy(CFWORKDIR,WORKDIR,sizeof(CFWORKDIR));
if (getuid() > 0)
{
@@ -139,8 +139,8 @@ if (getuid() > 0)
if ((homedir = getenv("HOME")) != NULL)
{
- strcpy(CFWORKDIR,homedir);
- strcat(CFWORKDIR,"/.cfagent");
+ (void)strlcpy(CFWORKDIR,homedir,sizeof(CFWORKDIR));
+ (void)strlcat(CFWORKDIR,"/.cfagent",sizeof(CFWORKDIR));
}
}
}
@@ -248,7 +248,7 @@ while (dbcp->c_get(dbcp, &key, &value, D
char tbuf[CF_BUFSIZE];
memcpy(&then,value.data,sizeof(then));
- strcpy(hostname,(char *)key.data);
+ (void)strlcpy(hostname,(char *)key.data,sizeof(hostname));
if (value.data != NULL)
{
@@ -444,6 +444,7 @@ char *ChecksumDump(unsigned char digest[
{ unsigned int i;
static char buffer[EVP_MAX_MD_SIZE*4];
int len = 1;
+ int s = 0;
for (i = 0; buffer[i] != 0; i++)
{
@@ -460,15 +461,17 @@ else
switch(len)
{
- case 20: sprintf(buffer,"SHA= ");
+ case 20: (void)snprintf(buffer,sizeof(buffer),"SHA= ");
break;
- case 16: sprintf(buffer,"MD5= ");
+ case 16: (void)snprintf(buffer,sizeof(buffer),"MD5= ");
break;
}
for (i = 0; i < len; i++)
{
- sprintf((char *)(buffer+4+2*i),"%02x", digest[i]);
+ s = sizeof(buffer) - (4+2*i);
+ if (s > 0)
+ (void)snprintf((char *)(buffer+4+2*i),s,"%02x", digest[i]);
}
return buffer;

20
sysutils/cfengine/patches/patch-src_crypto_c
View File

@ -1,20 +1,6 @@
$OpenBSD: patch-src_crypto_c,v 1.2 2004/10/01 21:22:15 sturm Exp $
--- src/crypto.c.orig Wed Aug 11 22:55:51 2004
+++ src/crypto.c Fri Oct 1 23:14:47 2004
@@ -49,11 +49,11 @@ snprintf(VBUFF,CF_BUFSIZE,"%s/randseed",
if (stat(VBUFF,&statbuf) == -1)
{
- snprintf(AVDB,CF_BUFSIZE,"%s/%s",WORKDIR,CF_AVDB_FILE);
+ snprintf(AVDB,sizeof(AVDB),"%s/%s",WORKDIR,CF_AVDB_FILE);
}
else
{
- strcpy(AVDB,VBUFF);
+ (void)strlcpy(AVDB,VBUFF,sizeof(AVDB));
}
Verbose("Looking for a source of entropy in %s\n",AVDB);
$OpenBSD: patch-src_crypto_c,v 1.3 2005/07/21 15:16:46 aanriot Exp $
--- src/crypto.c.orig Wed Apr 6 10:53:12 2005
+++ src/crypto.c Fri Jul 15 12:24:01 2005
@@ -294,7 +294,7 @@ snprintf(buffer,CF_BUFSIZE,"%d%d%25s",(i
EVP_DigestUpdate(&context,buffer,CF_BUFSIZE);

76
sysutils/cfengine/patches/patch-src_do_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_do_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
--- src/do.c.orig Sun Aug 15 07:38:39 2004
+++ src/do.c Fri Oct 1 23:14:47 2004
$OpenBSD: patch-src_do_c,v 1.4 2005/07/21 15:16:46 aanriot Exp $
--- src/do.c.orig Sun May 29 06:21:19 2005
+++ src/do.c Fri Jul 15 12:24:01 2005
@@ -76,9 +76,9 @@ for (ip = VMOUNTLIST; ip != NULL; ip=ip-
continue;
}
@ -122,7 +122,7 @@ $OpenBSD: patch-src_do_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
if (stat(VBUFF,&statbuf) != -1)
{
@@ -1189,9 +1189,9 @@ if (!IsPrivileged())
@@ -1191,9 +1191,9 @@ if (!IsPrivileged())
}
pathbuff[0]='\0';
basename[0]='\0';
@ -134,7 +134,7 @@ $OpenBSD: patch-src_do_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
ExpandWildCardsAndDo(pathbuff,basename,RecHomeTidyWrapper,NULL);
}
@@ -1428,6 +1428,7 @@ void GetSetuidLog()
@@ -1430,6 +1430,7 @@ void GetSetuidLog()
struct Item *ip;
FILE *fp;
char *sp;
@ -142,7 +142,7 @@ $OpenBSD: patch-src_do_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
if (!IsPrivileged()) /* Ignore this if not root */
{
@@ -1454,7 +1455,8 @@ else
@@ -1456,7 +1457,8 @@ else
FatalError("GetSetuidList() couldn't allocate memory #1");
}
@ -152,7 +152,7 @@ $OpenBSD: patch-src_do_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
{
perror("malloc");
FatalError("GetSetuidList() couldn't allocate memory #2");
@@ -1471,7 +1473,7 @@ else
@@ -1473,7 +1475,7 @@ else
Debug2("SETUID-LOG: %s\n",VBUFF);
@ -161,7 +161,7 @@ $OpenBSD: patch-src_do_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
ip->name = sp;
ip->next = NULL;
filetop = ip;
@@ -1766,7 +1768,7 @@ for (dp = VDISABLELIST; dp != NULL; dp=d
@@ -1762,7 +1764,7 @@ for (dp = VDISABLELIST; dp != NULL; dp=d
}
else
{
@ -170,7 +170,7 @@ $OpenBSD: patch-src_do_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
ChopLastNode(path);
AddSlash(path);
if (BufferOverflow(path,dp->destination))
@@ -1777,13 +1779,13 @@ for (dp = VDISABLELIST; dp != NULL; dp=d
@@ -1773,13 +1775,13 @@ for (dp = VDISABLELIST; dp != NULL; dp=d
ReleaseCurrentLock();
continue;
}
@ -186,8 +186,8 @@ $OpenBSD: patch-src_do_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
+ (void)strlcat(path,".cfdisabled",sizeof(path));
}
snprintf(OUTPUT,CF_BUFSIZE*2,"Disabling/renaming file %s to %s\n",workname,path);
@@ -1911,15 +1913,15 @@ for (mp = VMOUNTABLES; mp != NULL; mp=mp
snprintf(OUTPUT,CF_BUFSIZE*2,"Disabling/renaming file %s to %s (pending repository move)\n",workname,path);
@@ -1907,15 +1909,15 @@ for (mp = VMOUNTABLES; mp != NULL; mp=mp
Debug("Mount: checking %s\n",mp->filesystem);
@ -206,7 +206,7 @@ $OpenBSD: patch-src_do_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
if (strcmp(host,VDEFAULTBINSERVER.name) == 0) /* A host never mounts itself nfs */
@@ -1931,11 +1933,11 @@ for (mp = VMOUNTABLES; mp != NULL; mp=mp
@@ -1927,11 +1929,11 @@ for (mp = VMOUNTABLES; mp != NULL; mp=mp
/* HvB: Bas van der Vlies */
if ( mp->readonly )
{
@ -220,7 +220,7 @@ $OpenBSD: patch-src_do_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
if (IsHomeDir(mountdir))
@@ -2005,15 +2007,15 @@ for (mp = VMISCMOUNT; mp != NULL; mp=mp-
@@ -2001,15 +2003,15 @@ for (mp = VMISCMOUNT; mp != NULL; mp=mp-
mp->done = 'y';
}
@ -239,7 +239,7 @@ $OpenBSD: patch-src_do_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
if (strcmp(host,VDEFAULTBINSERVER.name) == 0) /* A host never mounts itself nfs */
@@ -2167,8 +2169,8 @@ for (ptr=VUNMOUNT; ptr != NULL; ptr=ptr-
@@ -2163,8 +2165,8 @@ for (ptr=VUNMOUNT; ptr != NULL; ptr=ptr-
{
if (VSYSTEMHARDCLASS == aix)
{
@ -250,7 +250,7 @@ $OpenBSD: patch-src_do_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
item = LocateNextItemContaining(filelist,VBUFF);
@@ -2192,8 +2194,8 @@ for (ptr=VUNMOUNT; ptr != NULL; ptr=ptr-
@@ -2188,8 +2190,8 @@ for (ptr=VUNMOUNT; ptr != NULL; ptr=ptr-
if (VSYSTEMHARDCLASS == ultrx) /* ensure name is not just a substring */
{
@ -261,7 +261,7 @@ $OpenBSD: patch-src_do_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
DeleteItemContaining(&filelist,VBUFF);
}
else
@@ -2583,14 +2585,14 @@ for (ip = VTIMEZONE; ip != NULL; ip=ip->
@@ -2568,14 +2570,14 @@ for (ip = VTIMEZONE; ip != NULL; ip=ip->
#ifdef NT
tzset();
@ -278,7 +278,7 @@ $OpenBSD: patch-src_do_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
#else
@@ -2598,7 +2600,7 @@ for (ip = VTIMEZONE; ip != NULL; ip=ip->
@@ -2583,7 +2585,7 @@ for (ip = VTIMEZONE; ip != NULL; ip=ip->
{
printf("Couldn't read system clock\n\n");
}
@ -287,7 +287,18 @@ $OpenBSD: patch-src_do_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
#endif /* SUN4 */
#endif /* AOS */
@@ -2841,14 +2843,14 @@ if (S_ISDIR(statbuf.st_mode))
@@ -2739,8 +2741,8 @@ for (ptr = VPKG; ptr != NULL; ptr=ptr->n
}
/* Finally add the name to the list. */
- strcat(package_install_list[ptr->pkgmgr], ptr->name);
- strcat(package_install_list[ptr->pkgmgr], " ");
+ (void)strlcat(package_install_list[ptr->pkgmgr], ptr->name, CF_BUFSIZE);
+ (void)strlcat(package_install_list[ptr->pkgmgr], " ", CF_BUFSIZE);
}
}
@@ -2878,14 +2880,14 @@ if (S_ISDIR(statbuf.st_mode))
filecount++;
@ -305,7 +316,7 @@ $OpenBSD: patch-src_do_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
if (lstat(buff,&localstat) == -1)
{
@@ -2876,14 +2878,14 @@ if (S_ISDIR(statbuf.st_mode))
@@ -2913,14 +2915,14 @@ if (S_ISDIR(statbuf.st_mode))
if (sizeinbytes < SENSIBLEFSSIZE)
{
@ -322,7 +333,7 @@ $OpenBSD: patch-src_do_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
CfLog(cferror,OUTPUT,"");
return(false);
}
@@ -2931,7 +2933,7 @@ for (dirp = readdir(dirh); dirp != NULL;
@@ -2968,7 +2970,7 @@ for (dirp = readdir(dirh); dirp != NULL;
continue;
}
@ -331,7 +342,7 @@ $OpenBSD: patch-src_do_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
AddSlash(pcwd);
if (BufferOverflow(pcwd,dirp->d_name))
@@ -2940,7 +2942,7 @@ for (dirp = readdir(dirh); dirp != NULL;
@@ -2977,7 +2979,7 @@ for (dirp = readdir(dirh); dirp != NULL;
return true;
}
@ -340,7 +351,7 @@ $OpenBSD: patch-src_do_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
if (lstat(dirp->d_name,&statbuf) == -1)
{
@@ -2984,9 +2986,9 @@ void InstallMountedItem(char *host,char
@@ -3021,9 +3023,9 @@ void InstallMountedItem(char *host,char
{ char buf[CF_BUFSIZE];
@ -353,7 +364,7 @@ $OpenBSD: patch-src_do_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
if (IsItemIn(VMOUNTED,buf))
{
@@ -3089,16 +3091,16 @@ if (MatchStringInFstab(mountpt))
@@ -3126,16 +3128,16 @@ if (MatchStringInFstab(mountpt))
CfLog(cfinform,"---------------------------------------------------","");
/* delete current fstab entry and unmount if necessary */
@ -374,7 +385,7 @@ $OpenBSD: patch-src_do_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
/* delete current fstab entry and unmount if necessary (don't rmdir) */
cleaner.name = mountspec;
@@ -3247,14 +3249,14 @@ for (ip1 = VHOMEPATLIST; ip1 != NULL; ip
@@ -3284,14 +3286,14 @@ for (ip1 = VHOMEPATLIST; ip1 != NULL; ip
}
pathbuff[0]='\0';
basename[0]='\0';
@ -392,7 +403,7 @@ $OpenBSD: patch-src_do_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
AddSlash(pathbuff);
if (*(ptr->path+4) != '/')
@@ -3265,7 +3267,7 @@ for (ip1 = VHOMEPATLIST; ip1 != NULL; ip
@@ -3302,7 +3304,7 @@ for (ip1 = VHOMEPATLIST; ip1 != NULL; ip
}
else
{
@ -401,12 +412,7 @@ $OpenBSD: patch-src_do_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
ExpandWildCardsAndDo(pathbuff,basename,RecFileCheck,ptr);
@@ -3296,11 +3298,11 @@ void EditItemsInResolvConf(struct Item *
if (isdigit((int)*(work)))
{
- snprintf(buf,CF_BUFSIZE,"nameserver %s",work);
+ (void)snprintf(buf,CF_MAXVARSIZE,"nameserver %s",work);
@@ -3337,7 +3339,7 @@ void EditItemsInResolvConf(struct Item *
}
else
{
@ -415,7 +421,7 @@ $OpenBSD: patch-src_do_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
DeleteItemMatching(list,buf); /* del+prep = move to head of list */
@@ -3372,7 +3374,7 @@ if (strlen(extract) == 0)
@@ -3409,7 +3411,7 @@ if (strlen(extract) == 0)
{
if (isdir)
{
@ -424,7 +430,7 @@ $OpenBSD: patch-src_do_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
(*function)(buffer,argptr);
return;
@@ -3380,20 +3382,20 @@ if (strlen(extract) == 0)
@@ -3417,20 +3419,20 @@ if (strlen(extract) == 0)
if (! IsWildCard(extract))
{
@ -448,7 +454,7 @@ $OpenBSD: patch-src_do_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
if ((dirh=opendir(buffer)) == NULL)
{
@@ -3403,7 +3405,7 @@ else
@@ -3440,7 +3442,7 @@ else
}
count = 0;
@ -457,7 +463,7 @@ $OpenBSD: patch-src_do_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
for (dp = readdir(dirh); dp != 0; dp = readdir(dirh))
{
@@ -3413,8 +3415,8 @@ else
@@ -3450,8 +3452,8 @@ else
}
count++;

14
sysutils/cfengine/patches/patch-src_edittools_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_edittools_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
--- src/edittools.c.orig Wed Aug 11 22:50:07 2004
+++ src/edittools.c Fri Oct 1 23:14:47 2004
$OpenBSD: patch-src_edittools_c,v 1.4 2005/07/21 15:16:46 aanriot Exp $
--- src/edittools.c.orig Tue Feb 8 06:50:01 2005
+++ src/edittools.c Fri Jul 15 12:24:01 2005
@@ -74,7 +74,7 @@ for (dirp = readdir(dirh); dirp != NULL;
continue;
}
@ -65,7 +65,7 @@ $OpenBSD: patch-src_edittools_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
if (!FileObjectFilter(realname,&statbuf2,ptr->filters,editfiles))
{
@@ -401,8 +401,8 @@ NUMBEROFEDITS = 0;
@@ -405,8 +405,8 @@ NUMBEROFEDITS = 0;
EDITVERBOSE = VERBOSE;
CURRENTLINENUMBER = 1;
CURRENTLINEPTR = filestart;
@ -76,7 +76,7 @@ $OpenBSD: patch-src_edittools_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
EDITGROUPLEVEL = 0;
SEARCHREPLACELEVEL = 0;
FOREACHLEVEL = 0;
@@ -1329,6 +1329,7 @@ return true;
@@ -1354,6 +1354,7 @@ return true;
int ReplaceEditLineWith (char *string)
{ char *sp;
@ -84,7 +84,7 @@ $OpenBSD: patch-src_edittools_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
if (strcmp(string,CURRENTLINEPTR->name) == 0)
{
@@ -1336,14 +1337,15 @@ if (strcmp(string,CURRENTLINEPTR->name)
@@ -1361,14 +1362,15 @@ if (strcmp(string,CURRENTLINEPTR->name)
return true;
}
@ -102,7 +102,7 @@ $OpenBSD: patch-src_edittools_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
free (CURRENTLINEPTR->name);
CURRENTLINEPTR->name = sp;
NUMBEROFEDITS++;
@@ -2048,10 +2050,10 @@ int SaveBinaryFile(char *file,off_t size
@@ -2077,10 +2079,10 @@ int SaveBinaryFile(char *file,off_t size
Debug("SaveBinaryFile(%s,%d)\n",file,size);
Verbose("Saving %s\n",file);

12
sysutils/cfengine/patches/patch-src_filedir_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_filedir_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
--- src/filedir.c.orig 2004-06-10 10:50:03.000000000 -0400
+++ src/filedir.c 2004-06-10 11:21:14.000000000 -0400
$OpenBSD: patch-src_filedir_c,v 1.2 2005/07/21 15:16:46 aanriot Exp $
--- src/filedir.c.orig Sun May 29 07:40:33 2005
+++ src/filedir.c Fri Jul 15 12:24:01 2005
@@ -169,7 +169,7 @@ for (dirp = readdir(dirh); dirp != NULL;
continue;
}
@ -19,7 +19,7 @@ $OpenBSD: patch-src_filedir_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
if (lstat(dirp->d_name,&statbuf) == -1)
{
@@ -1168,7 +1168,7 @@ int CheckHomeSubDir(char *testpath,char
@@ -1181,7 +1181,7 @@ int CheckHomeSubDir(char *testpath,char
if (strncmp(tidypath,"home/",5) == 0)
{
@ -28,7 +28,7 @@ $OpenBSD: patch-src_filedir_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
for (ChopLastNode(buffer); strlen(buffer) != 0; ChopLastNode(buffer))
{
@@ -1189,7 +1189,7 @@ if (strncmp(tidypath,"home/",5) == 0)
@@ -1202,7 +1202,7 @@ if (strncmp(tidypath,"home/",5) == 0)
subdirstart = tidypath + 4; /* Ptr to start of subdir */
@ -37,7 +37,7 @@ $OpenBSD: patch-src_filedir_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
ChopLastNode(buffer); /* Filename only */
@@ -1259,7 +1259,7 @@ if (name == NULL || strlen(name) == 0)
@@ -1272,7 +1272,7 @@ if (name == NULL || strlen(name) == 0)
strncpy(VBUFF,pathto,CF_BUFSIZE-1);
AddSlash(VBUFF);

16
sysutils/cfengine/patches/patch-src_filenames_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_filenames_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
--- src/filenames.c.orig Mon Jun 7 14:03:15 2004
+++ src/filenames.c Mon Aug 2 13:30:34 2004
$OpenBSD: patch-src_filenames_c,v 1.3 2005/07/21 15:16:46 aanriot Exp $
--- src/filenames.c.orig Tue Feb 8 06:50:01 2005
+++ src/filenames.c Fri Jul 15 12:24:01 2005
@@ -121,7 +121,7 @@ if (str == NULL)
if (!IsFileSep(str[strlen(str)-1]))
@ -48,9 +48,9 @@ $OpenBSD: patch-src_filenames_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
return buffer;
@@ -365,9 +365,9 @@ if (strstr(pathbuf, _PATH_RSRCFORKSPEC)
struct TidyPattern tpat;
struct stat sbuf;
@@ -371,9 +371,9 @@ if (strstr(pathbuf, _PATH_RSRCFORKSPEC)
return true;
}
- strcpy(currentpath,pathbuf);
+ (void)strlcpy(currentpath,pathbuf,sizeof(currentpath));
@ -60,7 +60,7 @@ $OpenBSD: patch-src_filenames_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
snprintf(OUTPUT,CF_BUFSIZE,"Moving obstructing file/link %s to %s to make directory",pathbuf,currentpath);
CfLog(cferror,OUTPUT,"");
@@ -640,7 +640,7 @@ for (sp = src+rootlen; *sp != '\0'; sp++
@@ -646,7 +646,7 @@ for (sp = src+rootlen; *sp != '\0'; sp++
return false;
}
@ -69,7 +69,7 @@ $OpenBSD: patch-src_filenames_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
return true;
@@ -702,7 +702,7 @@ if (strlen(str) >= CF_BUFSIZE)
@@ -708,7 +708,7 @@ if (strlen(str) >= CF_BUFSIZE)
{
char *tmp;
tmp = malloc(40+strlen(str));

12
sysutils/cfengine/patches/patch-src_filters_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_filters_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
--- src/filters.c.orig Thu Jun 24 15:01:11 2004
+++ src/filters.c Mon Aug 2 13:30:34 2004
$OpenBSD: patch-src_filters_c,v 1.3 2005/07/21 15:16:46 aanriot Exp $
--- src/filters.c.orig Tue Feb 8 06:50:01 2005
+++ src/filters.c Fri Jul 15 12:24:01 2005
@@ -177,7 +177,7 @@ else
break;
}
@ -10,7 +10,7 @@ $OpenBSD: patch-src_filters_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
break;
case filterexecregex:
for (sp = ebuff+strlen(ebuff)-1; (*sp != '(') && (sp > ebuff); sp--)
@@ -1025,15 +1025,15 @@ int FilterProcSTimeMatch(char *name1,cha
@@ -1027,15 +1027,15 @@ int FilterProcSTimeMatch(char *name1,cha
char year[5],month[4],hr[3],min[3],day[3],timestr[256];
memset(year,0,5);
@ -31,7 +31,7 @@ $OpenBSD: patch-src_filters_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
fromtime = Date2Number(fromexpr,now);
totime = Date2Number(toexpr,now);
@@ -1153,7 +1153,7 @@ int FilterOwnerMatch(struct stat *lstatp
@@ -1155,7 +1155,7 @@ int FilterOwnerMatch(struct stat *lstatp
char buffer[64];
struct passwd *pw;
@ -40,7 +40,7 @@ $OpenBSD: patch-src_filters_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
PrependItem(&attrib,buffer,"");
if ((pw = getpwuid(lstatptr->st_uid)) != NULL)
@@ -1185,7 +1185,7 @@ int FilterGroupMatch(struct stat *lstatp
@@ -1187,7 +1187,7 @@ int FilterGroupMatch(struct stat *lstatp
char buffer[64];
struct group *gr;

128
sysutils/cfengine/patches/patch-src_functions_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_functions_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
--- src/functions.c.orig Mon Aug 16 22:41:21 2004
+++ src/functions.c Fri Oct 1 23:14:47 2004
@@ -215,13 +215,13 @@ case fn_syslog:
$OpenBSD: patch-src_functions_c,v 1.4 2005/07/21 15:16:46 aanriot Exp $
--- src/functions.c.orig Sat Apr 9 11:02:50 2005
+++ src/functions.c Fri Jul 15 12:24:01 2005
@@ -221,13 +221,13 @@ switch (fn = FunctionStringToCode(name))
{
if (strcmp(value,CF_NOCLASS) == 0)
{
@ -17,7 +17,7 @@ $OpenBSD: patch-src_functions_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
return value;
}
}
@@ -318,46 +318,46 @@ if (strchr(args,','))
@@ -321,46 +321,46 @@ FunctionArgs(args,argv,1);
if (lstat(args,&statbuf) == -1)
{
@ -71,7 +71,7 @@ $OpenBSD: patch-src_functions_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
/*********************************************************************/
@@ -372,7 +372,7 @@ if (strchr(args,','))
@@ -375,7 +375,7 @@ if (strchr(args,','))
return;
}
@ -80,7 +80,7 @@ $OpenBSD: patch-src_functions_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
if (!FuzzyMatchParse(args))
{
@@ -387,7 +387,7 @@ for (ip = IPADDRESSES; ip != NULL; ip =
@@ -390,7 +390,7 @@ for (ip = IPADDRESSES; ip != NULL; ip =
if (FuzzySetMatch(args,ip->name) == 0)
{
Debug("IPRange Matched\n");
@ -89,7 +89,7 @@ $OpenBSD: patch-src_functions_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
return;
}
}
@@ -398,12 +398,12 @@ Debug("Checking IP Range against RDNS %s
@@ -401,12 +401,12 @@ Debug("Checking IP Range against RDNS %s
if (FuzzySetMatch(args,VIPADDRESS) == 0)
{
Debug("IPRange Matched\n");
@ -104,7 +104,7 @@ $OpenBSD: patch-src_functions_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
/*********************************************************************/
@@ -416,7 +416,7 @@ Debug("SRDEBUG args=%s value=%s\n",args,
@@ -419,7 +419,7 @@ Debug("SRDEBUG args=%s value=%s\n",args,
if (!FuzzyHostParse(args))
{
@ -113,7 +113,7 @@ $OpenBSD: patch-src_functions_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
return;
}
/* VDEFAULTBINSERVER.name is relative domain name */
@@ -425,12 +425,12 @@ if (!FuzzyHostParse(args))
@@ -428,12 +428,12 @@ if (!FuzzyHostParse(args))
if (FuzzyHostMatch(args,VDEFAULTBINSERVER.name) == 0)
{
Debug("SRDEBUG SUCCESS!\n");
@ -128,7 +128,7 @@ $OpenBSD: patch-src_functions_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
return;
@@ -444,7 +444,7 @@ void HandleCompareStat(enum builtin fn,c
@@ -447,7 +447,7 @@ void HandleCompareStat(enum builtin fn,c
char argv[CF_MAXFARGS][CF_MAXVARSIZE];
FunctionArgs(args,argv,2);
@ -137,7 +137,7 @@ $OpenBSD: patch-src_functions_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
if (stat(argv[0],&frombuf) == -1)
{
@@ -461,7 +461,7 @@ switch(fn)
@@ -464,7 +464,7 @@ switch(fn)
case fn_newerthan:
if (frombuf.st_mtime < tobuf.st_mtime)
{
@ -146,7 +146,7 @@ $OpenBSD: patch-src_functions_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
return;
}
break;
@@ -469,7 +469,7 @@ switch(fn)
@@ -472,7 +472,7 @@ switch(fn)
case fn_accessedbefore:
if (frombuf.st_atime < tobuf.st_atime)
{
@ -155,7 +155,7 @@ $OpenBSD: patch-src_functions_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
return;
}
break;
@@ -477,13 +477,13 @@ switch(fn)
@@ -480,13 +480,13 @@ switch(fn)
case fn_changedbefore:
if (frombuf.st_ctime < tobuf.st_ctime)
{
@ -171,7 +171,7 @@ $OpenBSD: patch-src_functions_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
@@ -530,7 +530,7 @@ if (*args == '/')
@@ -533,7 +533,7 @@ if (*args == '/')
if (ShellCommandReturnsZero(command))
{
@ -180,7 +180,7 @@ $OpenBSD: patch-src_functions_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
return;
}
}
@@ -539,7 +539,7 @@ if (*args == '/')
@@ -542,7 +542,7 @@ if (*args == '/')
yyerror("ExecResult(/command) must specify an absolute path");
}
@ -189,7 +189,7 @@ $OpenBSD: patch-src_functions_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
@@ -557,11 +557,11 @@ Debug("HandleIsDefined(%s)\n",args);
@@ -560,11 +560,11 @@ Debug("HandleIsDefined(%s)\n",args);
if (GetMacroValue(CONTEXTID,args))
{
@ -203,7 +203,7 @@ $OpenBSD: patch-src_functions_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
/*********************************************************************/
@@ -577,7 +577,7 @@ value[0] = '\0';
@@ -580,7 +580,7 @@ value[0] = '\0';
if (PARSING)
{
@ -212,7 +212,7 @@ $OpenBSD: patch-src_functions_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
return;
}
@@ -631,11 +631,11 @@ FunctionArgs(args,argv,2);
@@ -634,11 +634,11 @@ FunctionArgs(args,argv,2);
if (strcmp(argv[0],argv[1]) == 0)
{
@ -226,7 +226,62 @@ $OpenBSD: patch-src_functions_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
}
@@ -660,11 +660,11 @@ ret = LocateNextItemMatching(list,argv[0
@@ -662,11 +662,11 @@ if ((a != CF_NOVAL) && (b != CF_NOVAL))
{
if (a > b)
{
- strcpy(value,CF_ANYCLASS);
+ (void)strlcpy(value,CF_ANYCLASS,CF_EXPANDSIZE);
}
else
{
- strcpy(value,CF_NOCLASS);
+ (void)strlcpy(value,CF_NOCLASS,CF_EXPANDSIZE);
}
return;
}
@@ -674,11 +674,11 @@ if ((a != CF_NOVAL) && (b != CF_NOVAL))
{
if (a < b)
{
- strcpy(value,CF_ANYCLASS);
+ (void)strlcpy(value,CF_ANYCLASS,CF_EXPANDSIZE);
}
else
{
- strcpy(value,CF_NOCLASS);
+ (void)strlcpy(value,CF_NOCLASS,CF_EXPANDSIZE);
}
return;
}
@@ -690,22 +690,22 @@ if (strcmp(argv[0],argv[1]) > 0)
{
if (ch == '+')
{
- strcpy(value,CF_ANYCLASS);
+ (void)strlcpy(value,CF_ANYCLASS,CF_EXPANDSIZE);
}
else
{
- strcpy(value,CF_NOCLASS);
+ (void)strlcpy(value,CF_NOCLASS,CF_EXPANDSIZE);
}
}
else
{
if (ch == '+')
{
- strcpy(value,CF_NOCLASS);
+ (void)strlcpy(value,CF_NOCLASS,CF_EXPANDSIZE);
}
else
{
- strcpy(value,CF_ANYCLASS);
+ (void)strlcpy(value,CF_ANYCLASS,CF_EXPANDSIZE);
}
}
}
@@ -731,11 +731,11 @@ ret = LocateNextItemMatching(list,argv[0
if (ret != NULL)
{
@ -240,7 +295,7 @@ $OpenBSD: patch-src_functions_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
DeleteItemList(list);
@@ -1009,7 +1009,7 @@ first[0] = '\0';
@@ -1080,7 +1080,7 @@ first[0] = '\0';
if (psize < 2)
{
@ -249,7 +304,7 @@ $OpenBSD: patch-src_functions_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
CfLog(cferror,"Partitioning of size < 2 is silly","");
return;
}
@@ -1018,7 +1018,7 @@ Verbose("Searching for my peer group in
@@ -1089,7 +1089,7 @@ Verbose("Searching for my peer group in
if (!((strcmp("random",policy) == 0) || (strcmp("first",policy) == 0)))
{
@ -258,7 +313,7 @@ $OpenBSD: patch-src_functions_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
CfLog(cferror,"Partition leader policy is first/random only","");
return;
}
@@ -1173,7 +1173,7 @@ value[0] = '\0';
@@ -1244,7 +1244,7 @@ value[0] = '\0';
if (psize < 2)
{
@ -267,7 +322,7 @@ $OpenBSD: patch-src_functions_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
CfLog(cferror,"Partitioning of size < 2 is silly","");
return;
}
@@ -1182,7 +1182,7 @@ Verbose("Searching for my peer group nei
@@ -1253,7 +1253,7 @@ Verbose("Searching for my peer group nei
if (!(strcmp("random",policy) == 0 || strcmp("first",policy) == 0))
{
@ -276,8 +331,8 @@ $OpenBSD: patch-src_functions_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
CfLog(cferror,"Partition leader policy is first/random only","");
return;
}
@@ -1305,7 +1305,7 @@ for (ip = SplitStringAsItemList(args,','
AppendItem(&METHODRETURNVARS,args,CLASSBUFF);
@@ -1376,7 +1376,7 @@ for (ip = SplitStringAsItemList(args,','
AppendItem(&METHODRETURNVARS,ip->name,CLASSBUFF);
}
-strcpy(value,"noinstall");
@ -285,7 +340,7 @@ $OpenBSD: patch-src_functions_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
/*********************************************************************/
@@ -1321,7 +1321,7 @@ for (ip = SplitStringAsItemList(args,','
@@ -1392,7 +1392,7 @@ for (ip = SplitStringAsItemList(args,','
AppendItem(&METHODRETURNCLASSES,args,CLASSBUFF);
}
@ -294,7 +349,7 @@ $OpenBSD: patch-src_functions_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
/*********************************************************************/
@@ -1347,7 +1347,7 @@ Debug("ShowState(%s)\n",args);
@@ -1418,7 +1418,7 @@ Debug("ShowState(%s)\n",args);
if (PARSING)
{
@ -303,7 +358,7 @@ $OpenBSD: patch-src_functions_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
return;
}
@@ -1532,12 +1532,12 @@ if (stat(buffer,&statbuf) == 0)
@@ -1604,12 +1604,12 @@ if (stat(buffer,&statbuf) == 0)
printf("%s: -----------------------------------------------------------------------------------\n",VPREFIX);
snprintf(buffer,CF_BUFSIZE,"State of %s peaked at %s\n",args,ctime(&statbuf.st_mtime));
@ -318,7 +373,7 @@ $OpenBSD: patch-src_functions_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
DeleteItemList(addresses);
@@ -1564,7 +1564,7 @@ FunctionArgs(args,argv,1);
@@ -1636,7 +1636,7 @@ FunctionArgs(args,argv,1);
if (PARSING)
{
@ -327,7 +382,7 @@ $OpenBSD: patch-src_functions_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
return;
}
@@ -1575,7 +1575,7 @@ if (time >= 0)
@@ -1647,7 +1647,7 @@ if (time >= 0)
CheckFriendConnections(time);
}
@ -336,7 +391,7 @@ $OpenBSD: patch-src_functions_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
/*********************************************************************/
@@ -1648,11 +1648,11 @@ Debug("PrepModule(%s,%s)\n",argv[0],argv
@@ -1721,11 +1721,11 @@ Debug("PrepModule(%s,%s)\n",argv[0],argv
if (CheckForModule(argv[0],argv[1]))
{
@ -350,12 +405,3 @@ $OpenBSD: patch-src_functions_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
}
@@ -1690,7 +1690,7 @@ if (strchr(args,','))
return;
}
-strcpy(arg1,UnQuote(args));
+(void)strlcpy(arg1,UnQuote(args),CF_BUFSIZE);
}
/*********************************************************************/

80
sysutils/cfengine/patches/patch-src_ifconf_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_ifconf_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
--- src/ifconf.c.orig 2004-06-10 10:50:04.000000000 -0400
+++ src/ifconf.c 2004-06-10 13:33:06.000000000 -0400
$OpenBSD: patch-src_ifconf_c,v 1.2 2005/07/21 15:16:46 aanriot Exp $
--- src/ifconf.c.orig Fri Mar 18 12:05:24 2005
+++ src/ifconf.c Fri Jul 15 12:35:26 2005
@@ -113,7 +113,7 @@ if (vbroadcast[0] == '\0')
return;
}
@ -64,3 +64,77 @@ $OpenBSD: patch-src_ifconf_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
}
/****************************************************************/
@@ -362,7 +362,9 @@ sprintf(VNUMBROADCAST,"%u.%u.%u.%u",ba,b
void SetDefaultRoute()
{ int sk, defaultokay = 1;
+# ifndef __OpenBSD__
struct sockaddr_in sindst,singw;
+# endif /* __OpenBSD__ */
# ifdef HAVE_ORTENTRY
struct ortentry route;
@@ -474,6 +476,7 @@ if ((sk = socket(AF_INET,SOCK_RAW,0)) ==
FatalError("Error in SetDefaultRoute()");
}
+# ifndef __OpenBSD__
sindst.sin_family = AF_INET;
singw.sin_family = AF_INET;
@@ -491,6 +494,55 @@ if (! DONTDO)
CfLog(cferror,"","ioctl SIOCADDRT:");
FatalError("Software error: set default route");
}
+
+# else /* __OpenBSD__ */
+
+if (! DONTDO)
+ {
+ /* swiped from net/net-snmp/patches/patch-agent_mibgroup_mibII_route_write_c */
+
+ int s, rc;
+ struct {
+ struct rt_msghdr hdr;
+ struct sockaddr_in dst;
+ struct sockaddr_in gateway;
+ } rtmsg;
+
+ s = socket(PF_ROUTE, SOCK_RAW, 0);
+ if (s < 0) {
+ CfLog(cferror,"","socket");
+ FatalError("Software error: socket");
+ }
+
+ shutdown(s, SHUT_RD);
+
+ /* possible panic otherwise */
+ /* flags |= (RTF_UP | RTF_GATEWAY); */
+
+ bzero(&rtmsg, sizeof(rtmsg));
+
+ rtmsg.hdr.rtm_type = RTM_ADD;
+ rtmsg.hdr.rtm_version = RTM_VERSION;
+ rtmsg.hdr.rtm_addrs = RTA_DST | RTA_GATEWAY;
+ rtmsg.hdr.rtm_flags = RTF_GATEWAY;
+
+ rtmsg.dst.sin_len = sizeof(rtmsg.dst);
+ rtmsg.dst.sin_family = AF_INET;
+ rtmsg.dst.sin_addr.s_addr = htonl(INADDR_ANY);
+
+ rtmsg.gateway.sin_len = sizeof(rtmsg.gateway);
+ rtmsg.gateway.sin_family = AF_INET;
+ rtmsg.gateway.sin_addr.s_addr = htonl(inet_addr(VDEFAULTROUTE->name));
+
+ rc = sizeof(rtmsg);
+ rtmsg.hdr.rtm_msglen = rc;
+
+ if ((rc = write(s, &rtmsg, rc)) < 0) {
+ CfLog(cferror,"","writing to routing socket");
+ FatalError("Software error: writing to routing socket");
+ }
+
+# endif /* __OpenBSD__ */
CfLog(cferror,"The routing table did not contain a default route.\n","");
snprintf(OUTPUT,CF_BUFSIZE*2,"I'm setting it to %s\n",VDEFAULTROUTE->name);

32
sysutils/cfengine/patches/patch-src_image_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_image_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
--- src/image.c.orig Thu Aug 12 22:16:20 2004
+++ src/image.c Fri Oct 1 23:14:48 2004
@@ -57,8 +57,8 @@ Banner("Looking for remote method collab
$OpenBSD: patch-src_image_c,v 1.4 2005/07/21 15:16:47 aanriot Exp $
--- src/image.c.orig Sun May 29 07:04:05 2005
+++ src/image.c Fri Jul 15 12:24:01 2005
@@ -59,8 +59,8 @@ for (ip = VRPCPEERLIST; ip != NULL; ip =
}
else
{
@ -12,7 +12,7 @@ $OpenBSD: patch-src_image_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
Verbose(" Hailing remote peer %s\n",client);
@@ -81,8 +81,8 @@ Banner("Looking for remote method collab
@@ -81,8 +81,8 @@ for (ip = VRPCPEERLIST; ip != NULL; ip =
MINUSMASK = 0377;
IMAGEBACKUP = 'n';
ENCRYPT = 'y';
@ -23,7 +23,7 @@ $OpenBSD: patch-src_image_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
snprintf(VUIDNAME,CF_MAXVARSIZE,"%d",getuid());
snprintf(VGIDNAME,CF_MAXVARSIZE,"%d",getgid());
IMGCOMP = '>';
@@ -189,7 +189,7 @@ for (dirp = cfreaddir(dirh,ip); dirp !=
@@ -190,7 +190,7 @@ for (dirp = cfreaddir(dirh,ip); dirp !=
return;
}
@ -32,7 +32,7 @@ $OpenBSD: patch-src_image_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
if (TRAVLINKS || ip->linktype == 'n')
{
@@ -360,9 +360,9 @@ for (itp = VMOUNTLIST; itp != NULL; itp=
@@ -361,9 +361,9 @@ for (itp = VMOUNTLIST; itp != NULL; itp=
continue;
}
@ -44,7 +44,7 @@ $OpenBSD: patch-src_image_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
if (! IsHomeDir(homedir))
{
@@ -383,10 +383,10 @@ for (itp = VMOUNTLIST; itp != NULL; itp=
@@ -384,10 +384,10 @@ for (itp = VMOUNTLIST; itp != NULL; itp=
continue;
}
@ -58,7 +58,7 @@ $OpenBSD: patch-src_image_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
if (strlen(ip->destination) > 4)
{
@@ -399,7 +399,7 @@ for (itp = VMOUNTLIST; itp != NULL; itp=
@@ -400,7 +400,7 @@ for (itp = VMOUNTLIST; itp != NULL; itp=
}
else
{
@ -67,7 +67,7 @@ $OpenBSD: patch-src_image_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
}
@@ -501,9 +501,9 @@ if ((ip->gid)->gid == (gid_t)-1)
@@ -502,9 +502,9 @@ if ((ip->gid)->gid == (gid_t)-1)
if (S_ISDIR(sourcestatbuf.st_mode))
{
@ -79,7 +79,7 @@ $OpenBSD: patch-src_image_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
AddSlash(destdir);
if ((dirh = cfopendir(sourcedir,ip)) == NULL)
@@ -535,22 +535,22 @@ if (S_ISDIR(sourcestatbuf.st_mode))
@@ -536,22 +536,22 @@ if (S_ISDIR(sourcestatbuf.st_mode))
continue;
}
@ -106,7 +106,7 @@ $OpenBSD: patch-src_image_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
if (cflstat(sourcefile,&sourcestatbuf,ip) == -1)
{
@@ -571,8 +571,8 @@ if (S_ISDIR(sourcestatbuf.st_mode))
@@ -572,8 +572,8 @@ if (S_ISDIR(sourcestatbuf.st_mode))
return;
}
@ -117,7 +117,7 @@ $OpenBSD: patch-src_image_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
ImageCopy(sourcefile,destfile,sourcestatbuf,ip);
(ip->uid)->uid = save_uid;
@@ -1007,7 +1007,7 @@ if (ip->linktype != 'n')
@@ -1008,7 +1008,7 @@ if (ip->linktype != 'n')
if (ip->linktype == 'a' && linkbuf[0] != '/') /* Not absolute path - must fix */
{
@ -126,7 +126,7 @@ $OpenBSD: patch-src_image_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
ChopLastNode(VBUFF);
AddSlash(VBUFF);
strncat(VBUFF,linkbuf,CF_BUFSIZE-1);
@@ -1383,7 +1383,7 @@ for (sp = ip->cache; sp != NULL; sp=sp->
@@ -1396,7 +1396,7 @@ for (sp = ip->cache; sp != NULL; sp=sp->
else
{
memset(linkbuf,0,buffsize);
@ -135,7 +135,7 @@ $OpenBSD: patch-src_image_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
return 0;
}
}
@@ -1571,13 +1571,13 @@ if (BufferOverflow(dest,CF_NEW))
@@ -1584,13 +1584,13 @@ if (BufferOverflow(dest,CF_NEW))
printf(" culprit: CopyReg\n");
return false;
}
@ -151,7 +151,7 @@ $OpenBSD: patch-src_image_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
if (remote)
{
@@ -1616,22 +1616,22 @@ if (IMAGEBACKUP != 'n')
@@ -1629,22 +1629,22 @@ if (IMAGEBACKUP != 'n')
time_t STAMPNOW;
STAMPNOW = time((time_t *)NULL);

30
sysutils/cfengine/patches/patch-src_init_c
View File

@ -1,30 +0,0 @@
$OpenBSD: patch-src_init_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
--- src/init.c.orig 2004-06-15 12:33:21.000000000 +0200
+++ src/init.c 2004-06-15 12:32:30.000000000 +0200
@@ -93,7 +93,7 @@ else
{
if (statbuf.st_mode & 022)
{
- snprintf(OUTPUT,CF_BUFSIZE*2,"UNTRUSTED: State directory %s was not private!\n",VLOCKDIR,statbuf.st_mode & 0777);
+ snprintf(OUTPUT,CF_BUFSIZE*2,"UNTRUSTED: State directory %s was not private! (%o)\n",VLOCKDIR,statbuf.st_mode & 0777);
CfLog(cferror,OUTPUT,"");
}
}
@@ -113,7 +113,7 @@ else
{
if (statbuf.st_mode & 022)
{
- snprintf(OUTPUT,CF_BUFSIZE*2,"UNTRUSTED: Module directory %s was not private!\n",VLOCKDIR,statbuf.st_mode & 0777);
+ snprintf(OUTPUT,CF_BUFSIZE*2,"UNTRUSTED: Module directory %s was not private! (%o)\n",VLOCKDIR,statbuf.st_mode & 0777);
CfLog(cferror,OUTPUT,"");
}
}
@@ -173,7 +173,7 @@ else
{
if (statbuf.st_mode & 077)
{
- snprintf(OUTPUT,CF_BUFSIZE*2,"UNTRUSTED: Private key directory %s/ppkeys was not private!\n",VLOCKDIR,statbuf.st_mode & 0777);
+ snprintf(OUTPUT,CF_BUFSIZE*2,"UNTRUSTED: Private key directory %s/ppkeys was not private! (%o)\n",VLOCKDIR,statbuf.st_mode & 0777);
FatalError(OUTPUT);
}
}

113
sysutils/cfengine/patches/patch-src_install_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_install_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
--- src/install.c.orig Wed Aug 11 22:50:46 2004
+++ src/install.c Fri Oct 1 23:14:48 2004
@@ -106,7 +106,7 @@ else
$OpenBSD: patch-src_install_c,v 1.4 2005/07/21 15:16:47 aanriot Exp $
--- src/install.c.orig Sun May 29 06:34:15 2005
+++ src/install.c Fri Jul 15 12:24:01 2005
@@ -113,7 +113,7 @@ else
FatalError("Redefinition of basic system variable");
}
@ -10,7 +10,7 @@ $OpenBSD: patch-src_install_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
break;
case cfdomain:
@@ -117,7 +117,7 @@ else
@@ -124,7 +124,7 @@ else
if (strlen(value) > 0)
{
@ -19,7 +19,7 @@ $OpenBSD: patch-src_install_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
else
{
@@ -127,12 +127,12 @@ else
@@ -134,12 +134,12 @@ else
if (!StrStr(VSYSNAME.nodename,VDOMAIN))
{
snprintf(VFQNAME,CF_BUFSIZE,"%s.%s",VSYSNAME.nodename,ToLowerStr(VDOMAIN));
@ -30,11 +30,11 @@ $OpenBSD: patch-src_install_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
{
int n = 0;
- strcpy(VFQNAME,VSYSNAME.nodename);
+ (void)strlcpy(VFQNAME,VSYSNAME.nodename,CF_BUFSIZE);
+ (void)strlcpy(VFQNAME,VSYSNAME.nodename,CF_MAXVARSIZE);
while(VSYSNAME.nodename[n++] != '.')
{
@@ -148,7 +148,7 @@ else
@@ -155,7 +155,7 @@ else
FatalError("The fully qualified name is longer than CF_MAXVARSIZE!!");
}
@ -43,7 +43,7 @@ $OpenBSD: patch-src_install_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
AddClassToHeap(CanonifyName(buffer));
}
@@ -162,7 +162,7 @@ else
@@ -170,7 +170,7 @@ else
break;
}
@ -52,7 +52,7 @@ $OpenBSD: patch-src_install_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
break;
case cfnetmask:
@@ -176,7 +176,7 @@ else
@@ -185,7 +185,7 @@ else
yyerror("Multiple declaration of variable netmask");
FatalError("Redefinition of basic system variable");
}
@ -61,7 +61,7 @@ $OpenBSD: patch-src_install_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
AddNetworkClass(VNETMASK);
break;
@@ -338,7 +338,7 @@ else
@@ -347,7 +347,7 @@ else
break;
case cfnfstype:
@ -70,7 +70,7 @@ $OpenBSD: patch-src_install_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
break;
case cfmethodname:
@@ -418,7 +418,7 @@ else
@@ -427,7 +427,7 @@ else
{
}
@ -79,7 +79,7 @@ $OpenBSD: patch-src_install_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
AddClassToHeap(rename);
break;
@@ -439,7 +439,7 @@ else
@@ -448,7 +448,7 @@ else
yyerror("Silly interface name, (should be something link eth0)");
}
@ -88,7 +88,7 @@ $OpenBSD: patch-src_install_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
VIFDEV[VSYSTEMHARDCLASS] = VIFNAMEOVERRIDE; /* override */
Debug("Overriding interface with %s\n",VIFDEV[VSYSTEMHARDCLASS]);
break;
@@ -539,7 +539,7 @@ switch(GetCommAttribute(item))
@@ -548,7 +548,7 @@ switch(GetCommAttribute(item))
case cfowner:
if (strlen(value) < CF_BUFSIZE)
{
@ -97,7 +97,7 @@ $OpenBSD: patch-src_install_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
else
{
@@ -550,7 +550,7 @@ switch(GetCommAttribute(item))
@@ -559,7 +559,7 @@ switch(GetCommAttribute(item))
case cfgroup:
if (strlen(value) < CF_BUFSIZE)
{
@ -106,7 +106,7 @@ $OpenBSD: patch-src_install_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
else
{
@@ -632,13 +632,13 @@ switch(GetCommAttribute(item))
@@ -641,13 +641,13 @@ switch(GetCommAttribute(item))
break;
case cfflags: ParseFlagString(value,&PLUSFLAG,&MINUSFLAG);
break;
@ -124,7 +124,7 @@ $OpenBSD: patch-src_install_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
break;
case cfcompat: HandleCharSwitch("oldserver",value,&COMPATIBILITY);
break;
@@ -811,7 +811,7 @@ Debug1("HandleOptionalMountItem(%s)\n",v
@@ -820,7 +820,7 @@ Debug1("HandleOptionalMountItem(%s)\n",v
switch(GetCommAttribute(item))
{
case cfmountoptions:
@ -133,7 +133,7 @@ $OpenBSD: patch-src_install_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
break;
case cfreadonly:
@@ -998,7 +998,7 @@ switch(GetCommAttribute(item))
@@ -1007,7 +1007,7 @@ switch(GetCommAttribute(item))
case cfinclude:
case cfpattern:
@ -142,7 +142,7 @@ $OpenBSD: patch-src_install_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
if (*value == '/')
{
yyerror("search pattern begins with / must be a relative name");
@@ -1074,9 +1074,9 @@ switch(GetCommAttribute(item))
@@ -1083,9 +1083,9 @@ switch(GetCommAttribute(item))
break;
case cfflags: ParseFlagString(value,&PLUSFLAG,&MINUSFLAG);
break;
@ -154,7 +154,7 @@ $OpenBSD: patch-src_install_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
break;
case cfdefine: HandleDefine(value);
break;
@@ -1282,9 +1282,9 @@ switch(GetCommAttribute(item))
@@ -1291,9 +1291,9 @@ switch(GetCommAttribute(item))
break;
case cffilter: PrependItem(&VFILTERBUILD,value,CF_ANYCLASS);
break;
@ -166,7 +166,7 @@ $OpenBSD: patch-src_install_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
break;
case cfchdir: HandleChDir(value);
break;
@@ -1324,7 +1324,7 @@ Debug1("HandleOptionalPackagesAttribute(
@@ -1333,7 +1333,7 @@ Debug1("HandleOptionalPackagesAttribute(
switch(GetCommAttribute(item))
{
@ -175,7 +175,7 @@ $OpenBSD: patch-src_install_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
break;
case cfcmp: CMPSENSE = (enum cmpsense) GetCmpSense(value);
break;
@@ -1454,9 +1454,9 @@ switch(GetCommAttribute(item))
@@ -1465,9 +1465,9 @@ switch(GetCommAttribute(item))
break;
case cfsetinform: HandleCharSwitch("inform",value,&INFORMP);
break;
@ -187,7 +187,7 @@ $OpenBSD: patch-src_install_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
break;
case cfdefine: HandleDefine(value);
break;
@@ -1522,7 +1522,7 @@ if (!IsAbsoluteFileName(value))
@@ -1534,7 +1534,7 @@ if (!IsAbsoluteFileName(value))
yyerror("chdir is not an absolute directory name");
}
@ -196,7 +196,7 @@ $OpenBSD: patch-src_install_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
/*******************************************************************/
@@ -1535,7 +1535,7 @@ if (!IsAbsoluteFileName(value))
@@ -1547,7 +1547,7 @@ if (!IsAbsoluteFileName(value))
yyerror("chdir is not an absolute directory name");
}
@ -205,7 +205,7 @@ $OpenBSD: patch-src_install_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
/*******************************************************************/
@@ -1546,7 +1546,7 @@ void HandleFileItem(char *item)
@@ -1558,7 +1558,7 @@ void HandleFileItem(char *item)
if (strcmp(item,"home") == 0)
{
ACTIONPENDING=true;
@ -214,7 +214,7 @@ $OpenBSD: patch-src_install_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
return;
}
@@ -1576,19 +1576,19 @@ if (VBROADCAST[0] != '\0')
@@ -1588,19 +1588,19 @@ if (VBROADCAST[0] != '\0')
if (strcmp("ones",item) == 0)
{
@ -237,22 +237,7 @@ $OpenBSD: patch-src_install_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
return;
}
@@ -1631,12 +1631,12 @@ ExpandVarstring(item,ebuff,NULL);
else
{
memcpy(&inaddr,hp->h_addr, hp->h_length);
- strncpy(VDEFAULTROUTE,inet_ntoa(inaddr),CF_MAXVARSIZE);
+ (void)strlcpy(VDEFAULTROUTE,inet_ntoa(inaddr),sizeof(VDEFAULTROUTE));
}
}
else
{
- strncpy(VDEFAULTROUTE,ebuff,CF_MAXVARSIZE);
+ (void)strlcpy(VDEFAULTROUTE,ebuff,sizeof(VDEFAULTROUTE));
}
}
@@ -1874,7 +1874,7 @@ if (VMAILSERVER[0] != '\0')
@@ -1880,7 +1880,7 @@ if (VMAILSERVER[0] != '\0')
FatalError("Redefinition of mailserver");
}
@ -261,7 +246,7 @@ $OpenBSD: patch-src_install_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
Debug1("Installing mailserver (%s) for group (%s)",path,GROUPBUFF);
}
@@ -2592,9 +2592,9 @@ switch (action)
@@ -2598,9 +2598,9 @@ switch (action)
{
switch (MOUNTMODE)
{
@ -273,7 +258,7 @@ $OpenBSD: patch-src_install_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
break;
default: printf("Install pending, miscmount, shouldn't happen\n");
MOUNTOPTS[0] = '\0'; /* no mount mode set! */
@@ -2610,8 +2610,8 @@ switch (action)
@@ -2616,8 +2616,8 @@ switch (action)
MOUNTFROM, MOUNTONTO);
return;
}
@ -284,7 +269,7 @@ $OpenBSD: patch-src_install_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
AppendMiscMount(MOUNTFROM,MOUNTONTO,MOUNTOPTS);
}
@@ -3470,11 +3470,11 @@ for (sp = Get2DListEnt(tp); sp != NULL;
@@ -3481,11 +3481,11 @@ for (sp = Get2DListEnt(tp); sp != NULL;
if (strlen(type) == 0)
{
@ -298,7 +283,7 @@ $OpenBSD: patch-src_install_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
if ((ptr->type = strdup(ebuff)) == NULL)
@@ -3602,7 +3602,7 @@ if (!strstr(function,"("))
@@ -3613,7 +3613,7 @@ if (!strstr(function,"("))
}
/* First look at bare args to cache an arg fingerprint */
@ -307,7 +292,7 @@ $OpenBSD: patch-src_install_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
if (work[strlen(work)-1] != ')')
{
@@ -4796,12 +4796,12 @@ Debug1("InstallImageItem (%s) (+%o)(-%o)
@@ -4848,12 +4848,12 @@ Debug1("InstallImageItem (%s) (+%o)(-%o)
if (strlen(action) == 0) /* default action */
{
@ -322,7 +307,7 @@ $OpenBSD: patch-src_install_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
yyerror(VBUFF);
return;
}
@@ -4901,7 +4901,7 @@ for (spl = Get2DListEnt(tp); spl != NULL
@@ -4944,7 +4944,7 @@ for (spl = Get2DListEnt(tp); spl != NULL
if (strlen(destination) == 0)
{
@ -331,7 +316,7 @@ $OpenBSD: patch-src_install_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
else
{
@@ -5217,11 +5217,11 @@ if (strlen(CURRENTITEM) != 0)
@@ -5275,11 +5275,11 @@ if (strlen(CURRENTITEM) != 0)
if (strcmp(value,"link") == 0 || strcmp(value,"links") == 0)
{
@ -345,7 +330,7 @@ $OpenBSD: patch-src_install_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
else
{
@@ -5340,7 +5340,7 @@ void HandleNetmask(char *value)
@@ -5398,7 +5398,7 @@ void HandleNetmask(char *value)
{
if (strlen(DESTINATION) == 0)
{
@ -354,7 +339,7 @@ $OpenBSD: patch-src_install_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
else
{
@@ -5355,7 +5355,7 @@ void HandleIPAddress(char *value)
@@ -5413,7 +5413,7 @@ void HandleIPAddress(char *value)
{
if (strlen(LINKTO) == 0)
{
@ -363,7 +348,7 @@ $OpenBSD: patch-src_install_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
else
{
@@ -5376,19 +5376,19 @@ if (strlen(CURRENTOBJECT) != 0)
@@ -5434,19 +5434,19 @@ if (strlen(CURRENTOBJECT) != 0)
if (strcmp("ones",value) == 0)
{
@ -386,7 +371,7 @@ $OpenBSD: patch-src_install_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
return;
}
@@ -5401,6 +5401,7 @@ void AppendToActionSequence (char *actio
@@ -5459,6 +5459,7 @@ void AppendToActionSequence (char *actio
{ int j = 0;
char *sp,cbuff[CF_BUFSIZE],actiontxt[CF_BUFSIZE];
@ -394,7 +379,7 @@ $OpenBSD: patch-src_install_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
Debug1("Installing item (%s) in the action sequence list\n",action);
@@ -5432,8 +5433,10 @@ while (*sp != '\0')
@@ -5490,8 +5491,10 @@ while (*sp != '\0')
if (IsHardClass(cbuff))
{
@ -407,7 +392,7 @@ $OpenBSD: patch-src_install_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
yyerror(tmp);
free(tmp);
yyerror("You cannot add a reserved class!");
@@ -5442,7 +5445,7 @@ while (*sp != '\0')
@@ -5500,7 +5503,7 @@ while (*sp != '\0')
if (j == 1)
{
@ -416,7 +401,7 @@ $OpenBSD: patch-src_install_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
continue;
}
else if (!IsSpecialClass(cbuff))
@@ -5469,7 +5472,7 @@ if (isalpha((int)user[0]))
@@ -5527,7 +5530,7 @@ if (isalpha((int)user[0]))
return;
}
@ -425,7 +410,7 @@ $OpenBSD: patch-src_install_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
AppendItem(&VACCESSLIST,id,NULL);
}
else
@@ -5567,7 +5570,7 @@ void HandleServer(char *value)
@@ -5625,7 +5628,7 @@ void HandleServer(char *value)
{
Debug("Server in copy set to : %s\n",value);
@ -434,7 +419,7 @@ $OpenBSD: patch-src_install_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
/*******************************************************************/
@@ -5589,7 +5592,7 @@ if (strlen(value) > CF_BUFSIZE)
@@ -5647,7 +5650,7 @@ if (strlen(value) > CF_BUFSIZE)
yyerror(OUTPUT);
}
*/
@ -443,7 +428,7 @@ $OpenBSD: patch-src_install_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
for (sp = value; *sp != '\0'; sp++)
{
@@ -5619,7 +5622,7 @@ if (strlen(value) > CF_BUFSIZE)
@@ -5677,7 +5680,7 @@ if (strlen(value) > CF_BUFSIZE)
yyerror("class list too long - can't handle it!");
}
@ -452,7 +437,7 @@ $OpenBSD: patch-src_install_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
for (sp = value; *sp != '\0'; sp++)
{
@@ -5649,7 +5652,7 @@ if (strlen(value) > CF_BUFSIZE)
@@ -5707,7 +5710,7 @@ if (strlen(value) > CF_BUFSIZE)
yyerror("class list too long - can't handle it!");
}
@ -461,7 +446,7 @@ $OpenBSD: patch-src_install_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
for (sp = value; *sp != '\0'; sp++)
{
@@ -6262,8 +6265,8 @@ switch(GetCommAttribute(attribute))
@@ -6320,8 +6323,8 @@ switch(GetCommAttribute(attribute))
{
if (strlen(copyhost)+strlen(VDOMAIN) < CF_MAXVARSIZE-2)
{
@ -472,7 +457,7 @@ $OpenBSD: patch-src_install_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
else
{
@@ -6296,6 +6299,7 @@ void PrependTidy(struct TidyPattern **li
@@ -6354,6 +6357,7 @@ void PrependTidy(struct TidyPattern **li
{ struct TidyPattern *tp;
char *spe = NULL,*sp, buffer[CF_EXPANDSIZE];
@ -480,7 +465,7 @@ $OpenBSD: patch-src_install_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
if ((tp = (struct TidyPattern *)malloc(sizeof(struct TidyPattern))) == NULL)
{
@@ -6325,10 +6329,14 @@ if ((tp->elsedef = strdup(buffer)) == NU
@@ -6383,10 +6387,14 @@ if ((tp->elsedef = strdup(buffer)) == NU
AddInstallable(tp->defines);
AddInstallable(tp->elsedef);
@ -498,7 +483,7 @@ $OpenBSD: patch-src_install_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
if (travlinks == '?')
@@ -6354,7 +6362,7 @@ tp->rmdirs =tidydirs;
@@ -6412,7 +6420,7 @@ tp->rmdirs =tidydirs;
if (classes != NULL)
{

30
sysutils/cfengine/patches/patch-src_ip_c Normal file
View File

@ -0,0 +1,30 @@
$OpenBSD: patch-src_ip_c,v 1.1 2005/07/21 15:16:47 aanriot Exp $
--- src/ip.c.orig Tue Feb 8 06:50:02 2005
+++ src/ip.c Fri Jul 15 12:24:01 2005
@@ -344,7 +344,7 @@ if ((iaddr.s_addr = inet_addr(ipaddress)
if ((hp == NULL) || (hp->h_name == NULL))
{
- strcpy(hostbuffer,"(Non registered IP)");
+ (void)strlcpy(hostbuffer,"(Non registered IP)",sizeof(hostbuffer));
return hostbuffer;
}
@@ -352,7 +352,7 @@ if ((iaddr.s_addr = inet_addr(ipaddress)
}
else
{
- strcpy(hostbuffer,"(non registered IP)");
+ (void)strlcpy(hostbuffer,"(non registered IP)",sizeof(hostbuffer));
}
#endif
@@ -541,7 +541,7 @@ while (dbcp->c_get(dbcp, &key, &value, D
time_t then;
memcpy(&then,value.data,sizeof(then));
- strcpy(hostname,(char *)key.data);
+ (void)strlcpy(hostname,(char *)key.data,sizeof(hostname));
if (value.data != NULL)
{

24
sysutils/cfengine/patches/patch-src_item-ext_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_item-ext_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
--- src/item-ext.c.orig Wed Jun 23 17:30:52 2004
+++ src/item-ext.c Mon Aug 2 14:48:07 2004
$OpenBSD: patch-src_item-ext_c,v 1.3 2005/07/21 15:16:47 aanriot Exp $
--- src/item-ext.c.orig Tue Feb 22 07:21:39 2005
+++ src/item-ext.c Fri Jul 15 12:24:01 2005
@@ -190,6 +190,7 @@ void InsertItemAfter (struct Item **file
{ struct Item *ip;
@ -167,7 +167,7 @@ $OpenBSD: patch-src_item-ext_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
i += strlen(replace)-1;
memcpy(&rx,&rxcache,sizeof(rx)); /* To fix a bug on some implementations where rx gets emptied */
@@ -1449,12 +1457,12 @@ char *search, *replace;
@@ -1469,12 +1477,12 @@ char *search, *replace;
start = ip->name + match.rm_so;
EditVerbose("Doing SingleReplace of \"%s\" with \"%s\" on line %d\n",start,replace,i);
bzero(VBUFF,CF_BUFSIZE);
@ -183,7 +183,7 @@ $OpenBSD: patch-src_item-ext_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
Debug("SRDEBUG old line num %d is: \"%s\"\n",i,ip->name);
Debug("SRDEBUG new line num %d is: \"%s\"\n",i,VBUFF);
CURRENTLINEPTR = ip;
@@ -1477,6 +1485,7 @@ int CommentSeveralLines(struct Item **fi
@@ -1497,6 +1505,7 @@ int CommentSeveralLines(struct Item **fi
{ struct Item *ip;
int ctr, N = -99, done = false;
char *sp;
@ -191,7 +191,7 @@ $OpenBSD: patch-src_item-ext_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
Debug2("CommentNLines(list,%s)\n",string);
@@ -1532,15 +1541,16 @@ for (ip = CURRENTLINEPTR; ip != NULL; ip
@@ -1552,15 +1561,16 @@ for (ip = CURRENTLINEPTR; ip != NULL; ip
NUMBEROFEDITS++;
CURRENTLINEPTR = ip->next;
@ -212,7 +212,7 @@ $OpenBSD: patch-src_item-ext_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
free (ip->name);
ip->name = sp;
@@ -1570,6 +1580,7 @@ int UnCommentSeveralLines (struct Item *
@@ -1590,6 +1600,7 @@ int UnCommentSeveralLines (struct Item *
{ struct Item *ip;
int ctr, N = -99, done = false;
char *sp, *sp1, *sp2, *spc;
@ -220,7 +220,7 @@ $OpenBSD: patch-src_item-ext_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
Debug2("UnCommentNLines(list,%s)\n",string);
@@ -1620,7 +1631,8 @@ for (ip = CURRENTLINEPTR; ip != NULL; ip
@@ -1640,7 +1651,8 @@ for (ip = CURRENTLINEPTR; ip != NULL; ip
EditVerbose("Uncomment line %s\n",ip->name);
CURRENTLINEPTR = ip->next;
@ -230,7 +230,7 @@ $OpenBSD: patch-src_item-ext_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
{
CfLog(cferror,"No memory in UnCommentNLines\n","malloc");
return false;
@@ -1646,11 +1658,11 @@ for (ip = CURRENTLINEPTR; ip != NULL; ip
@@ -1666,11 +1678,11 @@ for (ip = CURRENTLINEPTR; ip != NULL; ip
*sp2 = '\0';
}
@ -244,7 +244,7 @@ $OpenBSD: patch-src_item-ext_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
ctr++;
@@ -1835,7 +1847,7 @@ for (ip = *filestart; ip != NULL; ip=ip-
@@ -1855,7 +1867,7 @@ for (ip = *filestart; ip != NULL; ip=ip-
free(ip->name);
ip->name = (char *) malloc(strlen(replace)+1);
@ -253,7 +253,7 @@ $OpenBSD: patch-src_item-ext_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
EditVerbose("Edit: With (%s)\n",replace);
}
}
@@ -1846,6 +1858,7 @@ for (ip = *filestart; ip != NULL; ip=ip-
@@ -1866,6 +1878,7 @@ for (ip = *filestart; ip != NULL; ip=ip-
void AppendToLine(struct Item *current,char *text,char *filename)
{ char *new;
@ -261,7 +261,7 @@ $OpenBSD: patch-src_item-ext_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
if (strstr(current->name,text))
{
@@ -1854,9 +1867,10 @@ if (strstr(current->name,text))
@@ -1874,9 +1887,10 @@ if (strstr(current->name,text))
EditVerbose("Appending %s to line %-60s...\n",text,current->name);

14
sysutils/cfengine/patches/patch-src_item_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_item_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
--- src/item.c.orig Fri Aug 13 10:59:52 2004
+++ src/item.c Fri Oct 1 23:14:48 2004
$OpenBSD: patch-src_item_c,v 1.4 2005/07/21 15:16:47 aanriot Exp $
--- src/item.c.orig Thu Feb 17 02:37:07 2005
+++ src/item.c Fri Jul 15 12:24:01 2005
@@ -212,6 +212,7 @@ void PrependItem (struct Item **liststar
{ struct Item *ip;
@ -145,16 +145,16 @@ $OpenBSD: patch-src_item_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
ip->classes = spe;
}
else
@@ -1059,7 +1077,7 @@ char *s1, *s2;
@@ -1061,7 +1079,7 @@ char *s1, *s2;
return 1;
}
sscanf(sp,"%ld",&cmp);
- Debug("SRDEBUG extracted int %d\n",cmp,sp);
+ Debug("SRDEBUG extracted int %d from %s\n",cmp,sp);
if ( cmp < 0 )
{
@@ -1114,7 +1132,7 @@ struct Item *SplitStringAsItemList(char
/* HvB basename is */
strncpy(host_basename, s2, strlen(s2) - strlen(sp));
@@ -1110,7 +1128,7 @@ struct Item *SplitStringAsItemList(char
Debug("SplitStringAsItemList(%s,%c)\n",string,sep);

16
sysutils/cfengine/patches/patch-src_locks_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_locks_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
--- src/locks.c.orig Tue May 18 02:37:46 2004
+++ src/locks.c Mon Aug 2 13:30:35 2004
@@ -80,7 +80,7 @@ struct LockData
$OpenBSD: patch-src_locks_c,v 1.3 2005/07/21 15:16:47 aanriot Exp $
--- src/locks.c.orig Sun Apr 3 08:47:48 2005
+++ src/locks.c Fri Jul 15 12:24:01 2005
@@ -74,7 +74,7 @@ DB *DBP;
void PreLockState()
{
@ -10,7 +10,7 @@ $OpenBSD: patch-src_locks_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
/********************************************************************/
@@ -88,7 +88,7 @@ void PreLockState()
@@ -82,7 +82,7 @@ void PreLockState()
void SaveExecLock()
{
@ -19,7 +19,7 @@ $OpenBSD: patch-src_locks_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
@@ -97,7 +97,7 @@ void SaveExecLock()
@@ -91,7 +91,7 @@ strcpy(SAVELOCK,CFLOCK);
void RestoreExecLock()
{
@ -28,7 +28,7 @@ $OpenBSD: patch-src_locks_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
/********************************************************************/
@@ -343,7 +343,7 @@ if (PutLock(CFLAST) == -1)
@@ -364,7 +364,7 @@ if (PutLock(CFLAST) == -1)
LockLog(getpid(),"Lock removed normally ",CFLOCK,"");
@ -37,7 +37,7 @@ $OpenBSD: patch-src_locks_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
@@ -668,7 +668,7 @@ if ((tim = time((time_t *)NULL)) == -1)
@@ -689,7 +689,7 @@ if ((tim = time((time_t *)NULL)) == -1)
Debug("Cfengine: couldn't read system clock\n");
}

12
sysutils/cfengine/patches/patch-src_macro_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_macro_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
--- src/macro.c.orig Mon Aug 2 20:52:24 2004
+++ src/macro.c Fri Oct 1 23:14:48 2004
@@ -175,6 +175,7 @@ void AddMacroValue(char *scope,char *nam
$OpenBSD: patch-src_macro_c,v 1.4 2005/07/21 15:16:47 aanriot Exp $
--- src/macro.c.orig Wed May 25 09:43:58 2005
+++ src/macro.c Fri Jul 15 12:24:01 2005
@@ -200,6 +200,7 @@ void AddMacroValue(char *scope,char *nam
{ char *sp, buffer[CF_BUFSIZE],exp[CF_EXPANDSIZE];
struct cfObject *ptr;
int slot;
@ -9,7 +9,7 @@ $OpenBSD: patch-src_macro_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
Debug("AddMacroValue(%s.%s=%s)\n",scope,name,value);
@@ -196,13 +197,14 @@ ptr = ObjectContext(scope);
@@ -237,13 +238,14 @@ ptr = ObjectContext(scope);
snprintf(buffer,CF_BUFSIZE,"%s=%s",name,exp);
@ -26,7 +26,7 @@ $OpenBSD: patch-src_macro_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
slot = Hash(name);
@@ -319,7 +321,7 @@ if (strstr(name,"."))
@@ -360,7 +362,7 @@ if (strstr(name,"."))
if (ptr == NULL)
{

18
sysutils/cfengine/patches/patch-src_methods_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_methods_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
--- src/methods.c.orig Tue Aug 17 20:11:28 2004
+++ src/methods.c Fri Oct 1 23:14:49 2004
@@ -272,24 +272,24 @@ options[0] = '\0';
$OpenBSD: patch-src_methods_c,v 1.4 2005/07/21 15:16:47 aanriot Exp $
--- src/methods.c.orig Wed Mar 23 14:00:54 2005
+++ src/methods.c Fri Jul 15 12:24:01 2005
@@ -271,29 +271,29 @@ options[0] = '\0';
if (INFORM)
{
@ -9,6 +9,12 @@ $OpenBSD: patch-src_methods_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
+ (void)strlcat(options,"-I ",sizeof(options));
}
if (IGNORELOCK)
{
- strcat(options,"-K ");
+ (void)strlcat(options,"-K ",sizeof(options));
}
if (VERBOSE)
{
- strcat(options,"-v ");
@ -30,9 +36,9 @@ $OpenBSD: patch-src_methods_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
+(void)strlcat(options,digeststring,sizeof(options));
+(void)strlcat(options," ",sizeof(options));
snprintf(execstr,CF_BUFSIZE-1,"%s/bin/cfagent -f %s %s",WORKDIR,GetMethodFilename(ptr),options);
snprintf(execstr,CF_BUFSIZE-1,"%s/bin/cfagent -f %s %s",CFWORKDIR,GetMethodFilename(ptr),options);
@@ -1062,10 +1062,10 @@ for (dirp = readdir(dirh); dirp != NULL;
@@ -1066,10 +1066,10 @@ for (dirp = readdir(dirh); dirp != NULL;
SplitMethodName(dirp->d_name,client,server,name,digeststring,extra);
Debug("This request came from %s - our reply should be sent there!\n",client);

36
sysutils/cfengine/patches/patch-src_misc_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_misc_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
--- src/misc.c.orig Fri Jul 30 15:06:17 2004
+++ src/misc.c Fri Oct 1 23:14:49 2004
@@ -556,17 +556,17 @@ char *ChecksumPrint(char type,unsigned c
$OpenBSD: patch-src_misc_c,v 1.4 2005/07/21 15:16:47 aanriot Exp $
--- src/misc.c.orig Fri Mar 11 12:57:29 2005
+++ src/misc.c Fri Jul 15 12:24:01 2005
@@ -540,17 +540,17 @@ char *ChecksumPrint(char type,unsigned c
switch(type)
{
@ -22,7 +22,7 @@ $OpenBSD: patch-src_misc_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
return buffer;
@@ -942,17 +942,17 @@ char strmajor[CF_MAXVARSIZE];
@@ -926,17 +926,17 @@ char strmajor[CF_MAXVARSIZE];
release += strlen(RELEASE_FLAG);
if (sscanf(release, "%d", &major) == 1)
{
@ -44,7 +44,7 @@ $OpenBSD: patch-src_misc_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
AddClassToHeap(classbuf);
}
@@ -1071,15 +1071,15 @@ Verbose("Looking for redhat linux info i
@@ -1094,15 +1094,15 @@ Verbose("Looking for redhat linux info i
release += strlen(RELEASE_FLAG);
if (sscanf(release, "%d.%d", &major, &minor) == 2)
{
@ -63,7 +63,7 @@ $OpenBSD: patch-src_misc_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
minor = -2;
};
}
@@ -1087,21 +1087,21 @@ Verbose("Looking for redhat linux info i
@@ -1110,21 +1110,21 @@ Verbose("Looking for redhat linux info i
if (major != -1 && minor != -1 && vendor != "")
{
classbuf[0] = '\0';
@ -92,7 +92,23 @@ $OpenBSD: patch-src_misc_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
AddClassToHeap(classbuf);
}
}
@@ -1175,19 +1175,19 @@ FILE *fp;
@@ -1171,13 +1171,13 @@ FILE *fp;
if(!strncmp(relstring, SUSE_SLES8_ID, strlen(SUSE_SLES8_ID)))
{
classbuf[0] = '\0';
- strcat(classbuf, "SLES8");
+ (void)strlcat(classbuf, "SLES8", sizeof(classbuf));
AddClassToHeap(classbuf);
}
else if(!strncmp(relstring, SUSE_SLES9_ID, strlen(SUSE_SLES9_ID)))
{
classbuf[0] = '\0';
- strcat(classbuf, "SLES9");
+ (void)strlcat(classbuf, "SLES9", sizeof(classbuf));
AddClassToHeap(classbuf);
}
@@ -1198,19 +1198,19 @@ FILE *fp;
{
release += strlen(SUSE_RELEASE_FLAG);
sscanf(release, "%d.%d", &major, &minor);
@ -119,7 +135,7 @@ $OpenBSD: patch-src_misc_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
AddClassToHeap(classbuf);
}
@@ -1300,8 +1300,8 @@ char strminor[CF_MAXVARSIZE];
@@ -1323,8 +1323,8 @@ char strminor[CF_MAXVARSIZE];
release += strlen(RELEASE_FLAG);
if (sscanf(release, "%d.%d", &major, &minor) == 2)
{
@ -130,7 +146,7 @@ $OpenBSD: patch-src_misc_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
else
{
@@ -1313,15 +1313,15 @@ char strminor[CF_MAXVARSIZE];
@@ -1336,15 +1336,15 @@ char strminor[CF_MAXVARSIZE];
if (major != -1 && minor != -1 && vendor != "")
{
classbuf[0] = '\0';

24
sysutils/cfengine/patches/patch-src_nameinfo_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_nameinfo_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
--- src/nameinfo.c.orig Tue Aug 17 08:54:14 2004
+++ src/nameinfo.c Fri Oct 1 23:14:49 2004
$OpenBSD: patch-src_nameinfo_c,v 1.4 2005/07/21 15:16:47 aanriot Exp $
--- src/nameinfo.c.orig Wed May 25 03:29:36 2005
+++ src/nameinfo.c Fri Jul 15 12:24:01 2005
@@ -59,6 +59,7 @@ void GetNameInfo()
time_t tloc;
struct hostent *hp;
@ -9,7 +9,7 @@ $OpenBSD: patch-src_nameinfo_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
#ifdef AIX
char real_version[_SYS_NMLN];
#endif
@@ -129,12 +130,13 @@ for (i = 0; CLASSATTRIBUTES[i][0] != '\0
@@ -127,12 +128,13 @@ for (i = 0; CLASSATTRIBUTES[i][0] != '\0
}
}
@ -24,8 +24,8 @@ $OpenBSD: patch-src_nameinfo_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
+(void)strlcpy(sp,VSYSNAME.nodename,buflen);
SetDomainName(sp);
for (sp2=sp; *sp2 != '\0'; sp2++) /* Truncate fully qualified name */
@@ -190,7 +192,7 @@ if (VERBOSE || DEBUG || D2 || D3)
for (sp2=sp; *sp2 != '\0'; sp2++) /* Add some domain hierarchy classes */
@@ -204,7 +206,7 @@ if (VERBOSE || DEBUG || D2 || D3)
}
@ -34,7 +34,7 @@ $OpenBSD: patch-src_nameinfo_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
AddClassToHeap(VBUFF);
Verbose("Additional hard class defined as: %s\n",CanonifyName(VBUFF));
@@ -259,8 +261,8 @@ if (! found)
@@ -285,8 +287,8 @@ if (! found)
CfLog(cferror,"Cfengine: I don't understand what architecture this is!","");
}
@ -45,7 +45,7 @@ $OpenBSD: patch-src_nameinfo_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
AddClassToHeap(CanonifyName(VBUFF));
@@ -277,7 +279,7 @@ else
@@ -303,7 +305,7 @@ else
memset(&cin,0,sizeof(cin));
cin.sin_addr.s_addr = ((struct in_addr *)(hp->h_addr))->s_addr;
Verbose("Address given by nameserver: %s\n",inet_ntoa(cin.sin_addr));
@ -54,7 +54,7 @@ $OpenBSD: patch-src_nameinfo_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
for (i=0; hp->h_aliases[i]!= NULL; i++)
{
@@ -385,7 +387,7 @@ for (j = 0,len = 0,ifp = list.ifc_req; l
@@ -411,7 +413,7 @@ for (j = 0,len = 0,ifp = list.ifc_req; l
}
/* Old style compat */
@ -63,7 +63,7 @@ $OpenBSD: patch-src_nameinfo_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
AppendItem(&IPADDRESSES,ip,"");
for (sp = ip+strlen(ip)-1; *sp != '.'; sp--)
@@ -396,8 +398,8 @@ for (j = 0,len = 0,ifp = list.ifc_req; l
@@ -422,8 +424,8 @@ for (j = 0,len = 0,ifp = list.ifc_req; l
/* New style */
@ -74,7 +74,7 @@ $OpenBSD: patch-src_nameinfo_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
AddClassToHeap(CanonifyName(ip));
snprintf(name,CF_MAXVARSIZE-1,"ipv4[%s]",CanonifyName(ifp->ifr_name));
AddMacroValue(CONTEXTID,name,inet_ntoa(sin->sin_addr));
@@ -505,9 +507,9 @@ void AddNetworkClass(char *netmask) /* F
@@ -544,9 +546,9 @@ void AddNetworkClass(char *netmask) /* F
if ((nm.s_addr = inet_addr(netmask)) != -1 && (ip.s_addr = inet_addr(VIPADDRESS)) != -1)
{
ip.s_addr &= nm.s_addr; /* Will not work with IPv6 */
@ -86,7 +86,7 @@ $OpenBSD: patch-src_nameinfo_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
while( (sp = strrchr(nmbuf,'.')) && strcmp(sp,".0") == 0 )
{
@@ -530,22 +532,22 @@ void SetDomainName(char *sp) /
@@ -569,22 +571,22 @@ void SetDomainName(char *sp) /
if (gethostname(fqn, sizeof(fqn)) != -1)
{

25
sysutils/cfengine/patches/patch-src_package_c
View File

@ -1,7 +1,24 @@
$OpenBSD: patch-src_package_c,v 1.2 2004/10/01 21:22:15 sturm Exp $
--- src/package.c.orig Wed Aug 11 23:02:06 2004
+++ src/package.c Fri Oct 1 23:14:49 2004
@@ -338,11 +338,11 @@ int DPKGPackageCheck(char *package,char
$OpenBSD: patch-src_package_c,v 1.3 2005/07/21 15:16:47 aanriot Exp $
--- src/package.c.orig Mon Feb 28 17:19:20 2005
+++ src/package.c Fri Jul 15 13:42:23 2005
@@ -335,14 +335,14 @@ int InstallPackage(char *name, enum pkgm
strncpy(instcmd, rawinstcmd, CF_BUFSIZE*2);
ptr = instcmd + strlen(rawinstcmd);
*percent = '%';
- strcat(ptr, name);
+ (void)strlcat(ptr, name, (CF_BUFSIZE*2 - strlen(rawinstcmd)));
ptr += strlen(name);
percent += 2;
strncpy(ptr, percent, (CF_BUFSIZE*2 - (ptr-instcmd)));
}
else
{
- sprintf(instcmd, "%s %s", rawinstcmd, name);
+ (void)snprintf(instcmd, CF_BUFSIZE*2, "%s %s", rawinstcmd, name);
}
Verbose("Installing package(s) %s using %s\n", name, instcmd);
if ((pp = cfpopen(instcmd, "r")) == NULL)
@@ -443,11 +443,11 @@ int DPKGPackageCheck(char *package,char
treat "" as "no version" */
if (strncmp (evrstart, "(none)", strlen ("(none)")) == 0) {

56
sysutils/cfengine/patches/patch-src_parse_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_parse_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
--- src/parse.c.orig Wed Aug 11 00:51:38 2004
+++ src/parse.c Fri Oct 1 23:14:49 2004
@@ -256,7 +256,7 @@ SetStrategies();
$OpenBSD: patch-src_parse_c,v 1.4 2005/07/21 15:16:47 aanriot Exp $
--- src/parse.c.orig Sun May 29 06:34:15 2005
+++ src/parse.c Fri Jul 15 12:24:01 2005
@@ -258,7 +258,7 @@ SetStrategies();
Debug1("\n\n==============================BEGIN NEW ACTION %s=============\n\n",ACTIONTEXT[action]);
ACTION = action;
@ -10,7 +10,7 @@ $OpenBSD: patch-src_parse_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
switch (ACTION)
{
@@ -282,7 +282,7 @@ switch (ACTION)
@@ -284,7 +284,7 @@ switch (ACTION)
}
Debug1("\nResetting CLASS to ANY\n\n");
@ -19,7 +19,7 @@ $OpenBSD: patch-src_parse_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
/*******************************************************************/
@@ -298,7 +298,7 @@ Debug1("HandleLVALUE(%s) in action %s\n"
@@ -300,7 +300,7 @@ Debug1("HandleLVALUE(%s) in action %s\n"
if ((CONTROLVAR = ScanVariable(id)) != nonexistentvar)
{
@ -28,7 +28,7 @@ $OpenBSD: patch-src_parse_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
return;
}
else
@@ -339,7 +339,7 @@ Debug1("HandleLVALUE(%s) in action %s\n"
@@ -341,7 +341,7 @@ Debug1("HandleLVALUE(%s) in action %s\n"
yyerror("Reserved class name (choose a different name)");
}
@ -37,7 +37,7 @@ $OpenBSD: patch-src_parse_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
break;
@@ -358,14 +358,14 @@ Debug1("HandleBraceObjectID(%s) in actio
@@ -360,14 +360,14 @@ Debug1("HandleBraceObjectID(%s) in actio
switch (ACTION)
{
case acls:
@ -54,7 +54,7 @@ $OpenBSD: patch-src_parse_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
InstallStrategy(id,CLASSBUFF);
}
else
@@ -377,7 +377,7 @@ switch (ACTION)
@@ -379,7 +379,7 @@ switch (ACTION)
case editfiles:
if (strlen(CURRENTOBJECT) == 0)
{
@ -63,7 +63,7 @@ $OpenBSD: patch-src_parse_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
EDITGROUPLEVEL = 0;
FOREACHLEVEL = 0;
SEARCHREPLACELEVEL = 0;
@@ -391,7 +391,7 @@ switch (ACTION)
@@ -393,7 +393,7 @@ switch (ACTION)
case filters:
if (strlen(FILTERNAME)==0)
{
@ -72,7 +72,7 @@ $OpenBSD: patch-src_parse_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
InstallFilter(id);
}
else
@@ -417,7 +417,7 @@ switch (ACTION)
@@ -419,7 +419,7 @@ switch (ACTION)
case filters:
case strategies:
@ -81,7 +81,7 @@ $OpenBSD: patch-src_parse_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
break;
case editfiles:
@@ -431,7 +431,7 @@ switch (ACTION)
@@ -434,7 +434,7 @@ switch (ACTION)
HandleEdit(CURRENTOBJECT,id,NULL);
}
@ -90,7 +90,7 @@ $OpenBSD: patch-src_parse_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
break;
}
}
@@ -467,7 +467,7 @@ else
@@ -470,7 +470,7 @@ else
Debug1("Simple class = (%s)\n",id);
}
@ -99,7 +99,7 @@ $OpenBSD: patch-src_parse_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
/*******************************************************************/
@@ -484,13 +484,13 @@ switch (ACTION)
@@ -487,13 +487,13 @@ switch (ACTION)
break;
case filters:
@ -115,7 +115,7 @@ $OpenBSD: patch-src_parse_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
ACTIONPENDING = true;
InstallPending(ACTION);
break;
@@ -504,7 +504,7 @@ switch (ACTION)
@@ -507,7 +507,7 @@ switch (ACTION)
{
yyerror("Processes syntax error");
}
@ -124,7 +124,7 @@ $OpenBSD: patch-src_parse_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
ACTIONPENDING = true;
InstallPending(ACTION);
@@ -528,7 +528,7 @@ switch (ACTION)
@@ -531,7 +531,7 @@ switch (ACTION)
yyerror("Missing process search expression");
}
Debug1("Installing expression %s\n",qstring);
@ -133,7 +133,7 @@ $OpenBSD: patch-src_parse_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
HAVE_RESTART = false;
}
else if (HAVE_RESTART)
@@ -633,7 +633,7 @@ if (ACTION == methods)
@@ -645,7 +645,7 @@ if (!IsDefinedClass(CLASSBUFF))
if (IsBuiltinFunction(fn))
{
local[0] = '\0';
@ -142,7 +142,7 @@ $OpenBSD: patch-src_parse_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
switch (ACTION)
{
@@ -840,8 +840,8 @@ switch (ACTION)
@@ -852,8 +852,8 @@ switch (ACTION)
InstallPending(ACTION);
InitializeAction();
Debug1("\nFound SetOptionString\n");
@ -153,7 +153,7 @@ $OpenBSD: patch-src_parse_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
else if (HAVE_RESTART)
{
@@ -886,7 +886,7 @@ Debug("HandleServerRule(%s=%s)\n",object
@@ -898,7 +898,7 @@ Debug("HandleServerRule(%s=%s)\n",object
if (*buffer == '/')
{
Debug("\n\nNew admit/deny object=%s\n",buffer);
@ -162,7 +162,7 @@ $OpenBSD: patch-src_parse_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
else
{
@@ -1026,7 +1026,7 @@ if ((yyin = fopen(filename,"r")) == NULL
@@ -1038,7 +1038,7 @@ if ((yyin = fopen(filename,"r")) == NULL
exit (1);
}
@ -171,7 +171,7 @@ $OpenBSD: patch-src_parse_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
Debug("\n##########################################################################\n");
Debug("# BEGIN PARSING %s\n",VCURRENTFILE);
@@ -1107,7 +1107,7 @@ void RecordMacroId(char *name)
@@ -1119,7 +1119,7 @@ void RecordMacroId(char *name)
{
Debug("RecordMacroId(%s)\n",name);
@ -180,7 +180,7 @@ $OpenBSD: patch-src_parse_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
if (strcmp(name,"this") == 0)
{
@@ -1137,7 +1137,7 @@ if ((sp=getenv(CF_INPUTSVAR)) != NULL)
@@ -1149,7 +1149,7 @@ if ((sp=getenv(CF_INPUTSVAR)) != NULL)
{
if (!IsAbsoluteFileName(filename)) /* Don't prepend to absolute names */
{
@ -189,12 +189,12 @@ $OpenBSD: patch-src_parse_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
if (! IsAbsoluteFileName(result))
{
@@ -1152,13 +1152,13 @@ if ((sp=getenv(CF_INPUTSVAR)) != NULL)
@@ -1164,13 +1164,13 @@ if ((sp=getenv(CF_INPUTSVAR)) != NULL)
{
if (!IsAbsoluteFileName(filename)) /* Don't prepend to absolute names */
{
- strcpy(result,WORKDIR);
+ (void)strlcpy(result,WORKDIR,CF_BUFSIZE);
- strcpy(result,CFWORKDIR);
+ (void)strlcpy(result,CFWORKDIR,CF_BUFSIZE);
AddSlash(result);
- strcat(result,"inputs/");
+ (void)strlcat(result,"inputs/",CF_BUFSIZE);
@ -206,7 +206,7 @@ $OpenBSD: patch-src_parse_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
return result;
}
@@ -1182,8 +1182,8 @@ void InitializeAction()
@@ -1194,8 +1194,8 @@ void InitializeAction()
HAVE_RESTART = false;
VAGE = 99999;
strncpy(FINDERTYPE,"*",CF_BUFSIZE);
@ -217,7 +217,7 @@ $OpenBSD: patch-src_parse_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
HAVE_RESTART = 0;
FILEACTION=warnall;
PIFELAPSED=-1;
@@ -1204,7 +1204,7 @@ void InitializeAction()
@@ -1216,7 +1216,7 @@ void InitializeAction()
PARSEMETHODRETURNCLASSES[0] = '\0';
METHODFORCE[0] = '\0';
CHROOT[0] = '\0';
@ -226,7 +226,7 @@ $OpenBSD: patch-src_parse_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
PTRAVLINKS = (short) '?';
IMAGEBACKUP = 'y';
ENCRYPT = 'n';
@@ -1246,7 +1246,7 @@ void InitializeAction()
@@ -1259,7 +1259,7 @@ void InitializeAction()
memset(ALLCLASSBUFFER,0,CF_BUFSIZE);
memset(ELSECLASSBUFFER,0,CF_BUFSIZE);

18
sysutils/cfengine/patches/patch-src_patches_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_patches_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
--- src/patches.c.orig 2004-06-10 10:50:04.000000000 -0400
+++ src/patches.c 2004-06-10 11:32:49.000000000 -0400
@@ -134,7 +134,7 @@ if (gethostname(buffer,CF_BUFSIZE) == -1
$OpenBSD: patch-src_patches_c,v 1.2 2005/07/21 15:16:47 aanriot Exp $
--- src/patches.c.orig Tue Feb 8 06:50:02 2005
+++ src/patches.c Fri Jul 15 12:24:01 2005
@@ -135,7 +135,7 @@ if (gethostname(buffer,CF_BUFSIZE) == -1
exit(1);
}
@ -10,7 +10,7 @@ $OpenBSD: patch-src_patches_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
if (strcmp(buffer,AUTOCONF_HOSTNAME) != 0)
{
@@ -142,10 +142,10 @@ if (strcmp(buffer,AUTOCONF_HOSTNAME) !=
@@ -143,10 +143,10 @@ if (strcmp(buffer,AUTOCONF_HOSTNAME) !=
Verbose("This host does not have uname, so I can't tell if it is the exact same OS\n");
}
@ -25,7 +25,7 @@ $OpenBSD: patch-src_patches_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
/* Extract a version number if possible */
@@ -154,8 +154,8 @@ for (sp = sys->sysname; *sp != '\0'; sp+
@@ -155,8 +155,8 @@ for (sp = sys->sysname; *sp != '\0'; sp+
{
if (isdigit(*sp))
{
@ -36,7 +36,7 @@ $OpenBSD: patch-src_patches_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
*sp = '\0';
break;
}
@@ -204,6 +204,7 @@ return NULL;
@@ -205,6 +205,7 @@ return NULL;
#ifndef HAVE_STRDUP
char *strdup(char *str)
@ -44,7 +44,7 @@ $OpenBSD: patch-src_patches_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
{ char *sp;
@@ -212,13 +213,14 @@ if (str == NULL)
@@ -213,13 +214,14 @@ if (str == NULL)
return NULL;
}
@ -61,7 +61,7 @@ $OpenBSD: patch-src_patches_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
return sp;
}
@@ -270,7 +272,7 @@ char *strerror(int err)
@@ -271,7 +273,7 @@ char *strerror(int err)
{ static char buffer[20];

10
sysutils/cfengine/patches/patch-src_popen_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_popen_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
--- src/popen.c.orig 2004-06-15 10:48:40.000000000 +0200
+++ src/popen.c 2004-06-15 10:49:04.000000000 +0200
@@ -410,7 +410,7 @@ FILE *cfpopen_sh(char *command,char *typ
$OpenBSD: patch-src_popen_c,v 1.2 2005/07/21 15:16:47 aanriot Exp $
--- src/popen.c.orig Thu Mar 10 15:47:10 2005
+++ src/popen.c Fri Jul 15 12:24:01 2005
@@ -412,7 +412,7 @@ FILE *cfpopen_sh(char *command,char *typ
}
}
@ -10,7 +10,7 @@ $OpenBSD: patch-src_popen_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
_exit(1);
}
else
@@ -559,7 +559,7 @@ FILE *cfpopen_shsetuid(char *command,cha
@@ -561,7 +561,7 @@ FILE *cfpopen_shsetuid(char *command,cha
}
}

8
sysutils/cfengine/patches/patch-src_process_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_process_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
--- src/process.c.orig 2004-06-10 23:27:24.000000000 -0400
+++ src/process.c 2004-06-10 23:22:19.000000000 -0400
@@ -400,7 +400,7 @@ for (ip = procdata; ip != NULL; ip=ip->n
$OpenBSD: patch-src_process_c,v 1.2 2005/07/21 15:16:47 aanriot Exp $
--- src/process.c.orig Tue Feb 8 06:50:02 2005
+++ src/process.c Fri Jul 15 12:24:01 2005
@@ -414,7 +414,7 @@ for (ip = procdata; ip != NULL; ip=ip->n
if (pp->action == 'm')
{

14
sysutils/cfengine/patches/patch-src_proto_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_proto_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
--- src/proto.c.orig Mon Jun 28 03:38:20 2004
+++ src/proto.c Mon Aug 2 13:30:36 2004
$OpenBSD: patch-src_proto_c,v 1.3 2005/07/21 15:16:47 aanriot Exp $
--- src/proto.c.orig Fri May 27 02:29:36 2005
+++ src/proto.c Fri Jul 15 12:24:01 2005
@@ -132,8 +132,8 @@ if (!SKIPIDENTIFY && (strcmp(VDOMAIN,CF_
if ((strstr(hp->h_name,".") == 0) && (strlen(VDOMAIN) > 0))
@ -12,7 +12,7 @@ $OpenBSD: patch-src_proto_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
}
#endif
@@ -145,14 +145,14 @@ uname = user_ptr ? user_ptr->pw_name : "
@@ -145,19 +145,19 @@ uname = user_ptr ? user_ptr->pw_name : "
if ((strlen(VDOMAIN) > 0) && !IsIPV6Address(dnsname) && !strchr(dnsname,'.'))
{
Debug("Appending domain %s to %s\n",VDOMAIN,dnsname);
@ -25,6 +25,12 @@ $OpenBSD: patch-src_proto_c,v 1.2 2004/08/08 14:02:11 sturm Exp $
{
/* Seems to be a bug in some resolvers that adds garbage, when it just returns the input */
- strcpy(dnsname,localip);
+ (void)strlcpy(dnsname,localip,sizeof(dnsname));
}
if (strlen(dnsname) == 0)
{
- strcpy(dnsname,localip);
+ (void)strlcpy(dnsname,localip,sizeof(dnsname));
}

8
sysutils/cfengine/patches/patch-src_prototypes_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_prototypes_h,v 1.2 2004/08/08 14:02:11 sturm Exp $
--- src/prototypes.h.orig Fri Jun 25 11:12:38 2004
+++ src/prototypes.h Mon Aug 2 13:30:36 2004
@@ -201,8 +201,8 @@ int EmbeddedWrite ARGLIST((char *new,int
$OpenBSD: patch-src_prototypes_h,v 1.3 2005/07/21 15:16:47 aanriot Exp $
--- src/prototypes.h.orig Sun May 29 07:04:38 2005
+++ src/prototypes.h Fri Jul 15 12:24:01 2005
@@ -199,8 +199,8 @@ int EmbeddedWrite ARGLIST((char *new,int
/* dce_acl.c */

14
sysutils/cfengine/patches/patch-src_tidy_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_tidy_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
--- src/tidy.c.orig 2004-04-17 10:11:07.000000000 -0400
+++ src/tidy.c 2004-06-10 23:51:23.000000000 -0400
$OpenBSD: patch-src_tidy_c,v 1.2 2005/07/21 15:16:47 aanriot Exp $
--- src/tidy.c.orig Mon Apr 4 04:54:12 2005
+++ src/tidy.c Fri Jul 15 12:24:01 2005
@@ -76,8 +76,8 @@ if (level == 2)
if (LOGTIDYHOMEFILES)
{
@ -39,7 +39,7 @@ $OpenBSD: patch-src_tidy_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
if (TRAVLINKS)
{
@@ -399,7 +399,7 @@ for (dirp = readdir(dirh); dirp != NULL;
@@ -398,7 +398,7 @@ for (dirp = readdir(dirh); dirp != NULL;
continue;
}
@ -48,9 +48,9 @@ $OpenBSD: patch-src_tidy_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
AddSlash(pcwd);
if (BufferOverflow(pcwd,dirp->d_name))
@@ -407,7 +407,7 @@ for (dirp = readdir(dirh); dirp != NULL;
return true;
}
@@ -408,7 +408,7 @@ for (dirp = readdir(dirh); dirp != NULL;
level = tp->maxrecurse - maxrecurse;
- strcat(pcwd,dirp->d_name);
+ (void)strlcat(pcwd,dirp->d_name,sizeof(pcwd));

106
sysutils/cfengine/patches/patch-src_varstring_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_varstring_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
--- src/varstring.c.orig Wed Aug 11 23:07:05 2004
+++ src/varstring.c Fri Oct 1 23:14:50 2004
@@ -353,7 +353,7 @@ for (sp = string; /* No exit */ ; sp++)
$OpenBSD: patch-src_varstring_c,v 1.4 2005/07/21 15:16:47 aanriot Exp $
--- src/varstring.c.orig Wed Apr 20 13:11:14 2005
+++ src/varstring.c Fri Jul 15 13:36:19 2005
@@ -354,7 +354,7 @@ for (sp = string; /* No exit */ ; sp++)
FatalError("Can't expand varstring");
}
@ -10,7 +10,7 @@ $OpenBSD: patch-src_varstring_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
sp += strlen(currentitem);
if (*sp == '$')
@@ -367,7 +367,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -368,7 +368,7 @@ for (sp = string; /* No exit */ ; sp++)
varstring = '}';
break;
default:
@ -19,7 +19,7 @@ $OpenBSD: patch-src_varstring_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
continue;
}
sp++;
@@ -405,7 +405,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -406,7 +406,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expand varstring");
}
@ -28,7 +28,7 @@ $OpenBSD: patch-src_varstring_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
break;
case cffaculty:
@@ -419,7 +419,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -420,7 +420,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expand varstring");
}
@ -37,7 +37,7 @@ $OpenBSD: patch-src_varstring_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
break;
@@ -430,7 +430,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -431,7 +431,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expand varstring");
}
@ -46,7 +46,7 @@ $OpenBSD: patch-src_varstring_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
else
{
@@ -438,7 +438,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -439,7 +439,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expand varstring");
}
@ -55,16 +55,16 @@ $OpenBSD: patch-src_varstring_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
break;
@@ -447,7 +447,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -448,7 +448,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expand varstring");
}
- strcat(buffer,VFQNAME);
+ (void)strlcat(buffer,VFQNAME,CF_EXPANDSIZE);
+ (void)strlcat(buffer,VFQNAME,CF_MAXVARSIZE);
break;
case cfnetmask:
@@ -455,7 +455,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -456,7 +456,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expand varstring");
}
@ -73,7 +73,7 @@ $OpenBSD: patch-src_varstring_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
break;
@@ -464,7 +464,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -465,7 +465,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expand varstring");
}
@ -82,7 +82,7 @@ $OpenBSD: patch-src_varstring_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
break;
case cfbinserver:
@@ -478,7 +478,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -479,7 +479,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expand varstring");
}
@ -91,7 +91,7 @@ $OpenBSD: patch-src_varstring_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
break;
case cfsysadm:
@@ -491,7 +491,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -492,7 +492,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expand varstring");
}
@ -100,7 +100,7 @@ $OpenBSD: patch-src_varstring_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
break;
case cfdomain:
@@ -504,7 +504,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -505,7 +505,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expandvarstring");
}
@ -109,7 +109,7 @@ $OpenBSD: patch-src_varstring_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
break;
case cfnfstype:
@@ -512,7 +512,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -513,7 +513,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expandvarstring");
}
@ -118,7 +118,7 @@ $OpenBSD: patch-src_varstring_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
break;
case cftimezone:
@@ -525,7 +525,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -526,7 +526,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expandvarstring");
}
@ -127,7 +127,7 @@ $OpenBSD: patch-src_varstring_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
break;
case cfclass:
@@ -533,7 +533,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -534,7 +534,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expandvarstring");
}
@ -136,7 +136,7 @@ $OpenBSD: patch-src_varstring_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
break;
case cfarch:
@@ -541,7 +541,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -542,7 +542,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expandvarstring");
}
@ -145,7 +145,7 @@ $OpenBSD: patch-src_varstring_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
break;
case cfarch2:
@@ -549,7 +549,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -550,7 +550,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expandvarstring");
}
@ -154,7 +154,7 @@ $OpenBSD: patch-src_varstring_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
break;
@@ -567,7 +567,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -568,7 +568,7 @@ for (sp = string; /* No exit */ ; sp++)
}
else
{
@ -163,7 +163,7 @@ $OpenBSD: patch-src_varstring_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
Chop(buffer);
}
@@ -580,7 +580,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -581,7 +581,7 @@ for (sp = string; /* No exit */ ; sp++)
}
else
{
@ -172,7 +172,7 @@ $OpenBSD: patch-src_varstring_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
break;
@@ -591,7 +591,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -592,7 +592,7 @@ for (sp = string; /* No exit */ ; sp++)
}
else
{
@ -181,7 +181,7 @@ $OpenBSD: patch-src_varstring_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
break;
@@ -602,7 +602,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -603,7 +603,7 @@ for (sp = string; /* No exit */ ; sp++)
}
else
{
@ -190,7 +190,7 @@ $OpenBSD: patch-src_varstring_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
break;
case cfhr:
@@ -612,7 +612,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -613,7 +613,7 @@ for (sp = string; /* No exit */ ; sp++)
}
else
{
@ -199,7 +199,7 @@ $OpenBSD: patch-src_varstring_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
break;
@@ -623,7 +623,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -624,7 +624,7 @@ for (sp = string; /* No exit */ ; sp++)
}
else
{
@ -208,7 +208,7 @@ $OpenBSD: patch-src_varstring_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
break;
@@ -631,14 +631,14 @@ for (sp = string; /* No exit */ ; sp++)
@@ -632,14 +632,14 @@ for (sp = string; /* No exit */ ; sp++)
if (strlen(ALLCLASSBUFFER) == 0)
{
snprintf(name,CF_MAXVARSIZE,"$(%s)",currentitem);
@ -225,7 +225,7 @@ $OpenBSD: patch-src_varstring_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
break;
case cfspc:
@@ -646,7 +646,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -647,7 +647,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expandvarstring");
}
@ -234,7 +234,7 @@ $OpenBSD: patch-src_varstring_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
break;
case cftab:
@@ -654,7 +654,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -655,7 +655,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expandvarstring");
}
@ -243,7 +243,7 @@ $OpenBSD: patch-src_varstring_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
break;
case cflf:
@@ -662,7 +662,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -663,7 +663,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expandvarstring");
}
@ -252,7 +252,7 @@ $OpenBSD: patch-src_varstring_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
break;
case cfcr:
@@ -670,7 +670,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -671,7 +671,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expandvarstring");
}
@ -261,7 +261,7 @@ $OpenBSD: patch-src_varstring_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
break;
case cfn:
@@ -678,7 +678,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -679,7 +679,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expandvarstring");
}
@ -270,7 +270,7 @@ $OpenBSD: patch-src_varstring_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
break;
case cfdblquote:
@@ -686,14 +686,14 @@ for (sp = string; /* No exit */ ; sp++)
@@ -687,14 +687,14 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expandvarstring");
}
@ -286,8 +286,17 @@ $OpenBSD: patch-src_varstring_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
+ (void)strlcat(buffer,"\'",CF_EXPANDSIZE);
break;
case cfdollar:
@@ -704,7 +704,7 @@ for (sp = string; /* No exit */ ; sp++)
case cfcolon:
@@ -702,7 +702,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expandvarstring");
}
- strcat(buffer,":");
+ (void)strlcat(buffer,":",CF_EXPANDSIZE);
break;
@@ -714,7 +714,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expandvarstring");
}
@ -296,7 +305,7 @@ $OpenBSD: patch-src_varstring_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
else
{
@@ -712,7 +712,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -722,7 +722,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expandvarstring");
}
@ -305,7 +314,16 @@ $OpenBSD: patch-src_varstring_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
break;
@@ -745,7 +745,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -744,7 +744,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expandvarstring");
}
- strcat(buffer,VREPOSITORY);
+ (void)strlcat(buffer,VREPOSITORY,CF_EXPANDSIZE);
}
break;
@@ -766,7 +766,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expandvarstring");
}
@ -314,7 +332,7 @@ $OpenBSD: patch-src_varstring_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
Debug("Expansion gave (%s)\n",buffer);
break;
@@ -761,7 +761,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -782,7 +782,7 @@ for (sp = string; /* No exit */ ; sp++)
{
snprintf(name,CF_MAXVARSIZE,"$(%s)",currentitem);
}
@ -323,7 +341,7 @@ $OpenBSD: patch-src_varstring_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
}
sp += strlen(currentitem);
@@ -795,7 +795,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -816,7 +816,7 @@ for (sp = string; /* No exit */ ; sp++)
sscanf(sp,"%[^$]",currentitem);
@ -332,7 +350,7 @@ $OpenBSD: patch-src_varstring_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
sp += strlen(currentitem);
if (*sp == '$')
@@ -809,7 +809,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -830,7 +830,7 @@ for (sp = string; /* No exit */ ; sp++)
varstring = '}';
break;
default:
@ -341,7 +359,7 @@ $OpenBSD: patch-src_varstring_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
continue;
}
sp++;
@@ -823,7 +823,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -844,7 +844,7 @@ for (sp = string; /* No exit */ ; sp++)
}
else
{
@ -350,7 +368,7 @@ $OpenBSD: patch-src_varstring_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
sscanf(++sp,scanstr,currentitem); /* reduce item */
switch (ScanVariable(currentitem))
@@ -833,7 +833,7 @@ for (sp = string; /* No exit */ ; sp++)
@@ -854,7 +854,7 @@ for (sp = string; /* No exit */ ; sp++)
{
FatalError("Can't expand varstring");
}
@ -359,7 +377,7 @@ $OpenBSD: patch-src_varstring_c,v 1.3 2004/10/01 21:22:15 sturm Exp $
break;
}
@@ -894,7 +894,7 @@ if (!IsVarString(varstring))
@@ -915,7 +915,7 @@ if (!IsVarString(varstring))
return liststart;
}

8
sysutils/cfengine/patches/patch-src_wrapper_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_wrapper_c,v 1.1 2004/06/17 11:21:43 sturm Exp $
--- src/wrapper.c.orig 2004-06-10 23:27:34.000000000 -0400
+++ src/wrapper.c 2004-06-10 23:10:23.000000000 -0400
@@ -305,7 +305,7 @@ ptr=(struct File *)vp;
$OpenBSD: patch-src_wrapper_c,v 1.2 2005/07/21 15:16:47 aanriot Exp $
--- src/wrapper.c.orig Sun Mar 20 04:10:11 2005
+++ src/wrapper.c Fri Jul 15 12:24:01 2005
@@ -308,7 +308,7 @@ ptr=(struct File *)vp;
ExpandVarstring(dir,directory,"");
AddSlash(directory);

11
sysutils/cfengine/pkg/DESCR
View File

@ -1,5 +1,6 @@
Cfengine, or the configuration engine, is an autonomous agent and a middle to
high level policy language for building expert systems which administrate and
configure large computer networks. Cfengine uses the idea of classes and a
primitive intelligence to define and automate the configuration and
maintenance of system state, for small to huge configurations.
Cfengine, or the configuration engine, is an autonomous agent and a
middle to high level policy language for building expert systems which
administrate and configure large computer networks. Cfengine uses the
idea of classes and a primitive intelligence to define and automate the
configuration and maintenance of system state, for small to huge
configurations.

8
sysutils/cfengine/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.7 2004/10/01 21:22:15 sturm Exp $
@comment $OpenBSD: PLIST,v 1.8 2005/07/21 15:16:47 aanriot Exp $
@comment doc/
@comment doc/cfengine-${V}/
@info info/cfengine-Anomalies.info
@ -12,6 +12,7 @@
@man man/man8/cfkey.8
@man man/man8/cfrun.8
@man man/man8/cfservd.8
@man man/man8/cfshow.8
sbin/cfagent
sbin/cfdoc
sbin/cfenvd
@ -20,8 +21,13 @@ sbin/cfexecd
sbin/cfkey
sbin/cfrun
sbin/cfservd
sbin/cfshow
sbin/vicf
share/cfengine/
share/cfengine/ChangeLog
share/cfengine/INSTALL
share/cfengine/NEWS
share/cfengine/README
share/cfengine/cfengine.el
share/examples/cfengine/
share/examples/cfengine/cf.chflags.example