Add cfengine to sysutils SUBDIRS

Add patches to set the correct Class based on the netmask (in the process of
submitting all patches back to the maintainer)

5 files changed, 62 insertions, 3 deletions

diff --git a/sysutils/Makefile b/sysutils/Makefile
index bef40bf4742..934a5519719 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 1999/11/02 21:55:25 hubertf Exp $
+# $NetBSD: Makefile,v 1.46 1999/11/05 13:52:50 abs Exp $
 # FreeBSD Id: Makefile,v 1.23 1997/09/30 06:14:59 asami Exp
 #
 
@@ -12,6 +12,7 @@
     SUBDIR += amanda-plot
     SUBDIR += asapm
     SUBDIR += cdrecord
+    SUBDIR += cfengine
 #    SUBDIR += cd-write
 #    SUBDIR += contool
     SUBDIR += crashme
diff --git a/sysutils/cfengine/Makefile b/sysutils/cfengine/Makefile
index cf0e4b099a3..b27339d8397 100644
--- a/sysutils/cfengine/Makefile
+++ b/sysutils/cfengine/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/10/10 23:13:06 abs Exp $
+# $NetBSD: Makefile,v 1.2 1999/11/05 13:52:51 abs Exp $
 #
 
 DISTNAME=	cfengine-1.5.2
+PKGNAME=	cfengine-1.5.2p1
 CATEGORIES=	sysutils net
 MASTER_SITES=	ftp://ftp.iu.hioslo.no/pub/cfengine/ \
 		ftp://ftp.cfengine.webmotion.net/pub/cfengine/
diff --git a/sysutils/cfengine/files/patch-sum b/sysutils/cfengine/files/patch-sum
index 91801fe73d5..c28af38e629 100644
--- a/sysutils/cfengine/files/patch-sum
+++ b/sysutils/cfengine/files/patch-sum
@@ -1,4 +1,6 @@
-$NetBSD: patch-sum,v 1.1.1.1 1999/10/10 23:13:07 abs Exp $
+$NetBSD: patch-sum,v 1.2 1999/11/05 13:52:52 abs Exp $
 
 MD5 (patch-aa) = ebd4b9f4a796be4616eb8e7dfcd94ff1
 MD5 (patch-ab) = b77512ca82715104b944d2b3e097f481
+MD5 (patch-ac) = 8e21f9df160a1c36d7e8da66445bd792
+MD5 (patch-ad) = 92441253e24f78b9658c6a3a975cf245
diff --git a/sysutils/cfengine/patches/patch-ac b/sysutils/cfengine/patches/patch-ac
new file mode 100644
index 00000000000..62b7cd50ffb
--- /dev/null
+++ b/sysutils/cfengine/patches/patch-ac
@@ -0,0 +1,11 @@
+$NetBSD: patch-ac,v 1.1 1999/11/05 13:52:52 abs Exp $
+--- src/install.c.orig	Fri Nov  5 06:44:50 1999
++++ src/install.c	Fri Nov  5 10:38:31 1999
+@@ -153,6 +153,7 @@
+                      FatalError("Redefinition of basic system variable");
+                      }
+                   strcpy(VNETMASK,value);
++		  AddNetworkClass(VNETMASK);
+                   break;
+ 
+ 
diff --git a/sysutils/cfengine/patches/patch-ad b/sysutils/cfengine/patches/patch-ad
new file mode 100644
index 00000000000..b4e45c6d49b
--- /dev/null
+++ b/sysutils/cfengine/patches/patch-ad
@@ -0,0 +1,44 @@
+$NetBSD: patch-ad,v 1.1 1999/11/05 13:52:52 abs Exp $
+--- src/misc.c.orig	Fri Nov  5 06:44:40 1999
++++ src/misc.c	Fri Nov  5 10:37:17 1999
+@@ -652,3 +652,40 @@
+ 
+ AddClassToHeap(CanonifyName(VDOMAIN)); 
+ }
++
++/*********************************************************************/
++
++AddNetworkClass(netmask)
++
++const char *netmask;
++
++{
++struct in_addr	ip,
++		nm;
++char		*sp,
++		nmbuf[maxvarsize],
++		ipbuf[maxvarsize];
++
++    /*
++     * Has to differentiate between cases such as:
++     *		192.168.101.1/24 -> 192.168.101  	and
++     *		192.168.101.1/26 -> 192.168.101.0 
++     * We still have the, um... 'interesting' Class C default Network Class
++     * set by GetNameInfo()
++     */
++
++    /* This is also a convenient method to ensure valid dotted quad */
++if (inet_aton(netmask,&nm) && inet_aton(VIPADDRESS,&ip))
++    {
++    ip.s_addr &= nm.s_addr;	/* Will not work with IPv6 */
++    strcpy(ipbuf,inet_ntoa(ip));
++
++    strcpy(nmbuf,inet_ntoa(nm));
++    while( (sp = strrchr(nmbuf,'.')) && strcmp(sp,".0") == 0 )
++	{
++	*sp = 0;
++	*strrchr(ipbuf,'.') = 0;
++	}
++    AddClassToHeap(CanonifyName(ipbuf)); 
++    }
++}