From b0a6d84880eb174d595d4bb41bedd117421d27a3 Mon Sep 17 00:00:00 2001 From: marc Date: Fri, 18 Sep 1998 00:09:29 +0000 Subject: [PATCH] cfengine; openbsd patches from --- sysutils/cfengine/Makefile | 16 +++++++++++++++ sysutils/cfengine/files/md5 | 1 + sysutils/cfengine/patches/patch-aa | 12 +++++++++++ sysutils/cfengine/patches/patch-ab | 15 ++++++++++++++ sysutils/cfengine/patches/patch-ac | 10 ++++++++++ sysutils/cfengine/patches/patch-ad | 11 ++++++++++ sysutils/cfengine/patches/patch-ae | 10 ++++++++++ sysutils/cfengine/patches/patch-af | 18 +++++++++++++++++ sysutils/cfengine/patches/patch-ag | 19 ++++++++++++++++++ sysutils/cfengine/patches/patch-ah | 11 ++++++++++ sysutils/cfengine/patches/patch-ai | 32 ++++++++++++++++++++++++++++++ sysutils/cfengine/patches/patch-aj | 11 ++++++++++ sysutils/cfengine/pkg/COMMENT | 1 + sysutils/cfengine/pkg/DESCR | 2 ++ sysutils/cfengine/pkg/PLIST | 27 +++++++++++++++++++++++++ 15 files changed, 196 insertions(+) create mode 100644 sysutils/cfengine/Makefile create mode 100644 sysutils/cfengine/files/md5 create mode 100644 sysutils/cfengine/patches/patch-aa create mode 100644 sysutils/cfengine/patches/patch-ab create mode 100644 sysutils/cfengine/patches/patch-ac create mode 100644 sysutils/cfengine/patches/patch-ad create mode 100644 sysutils/cfengine/patches/patch-ae create mode 100644 sysutils/cfengine/patches/patch-af create mode 100644 sysutils/cfengine/patches/patch-ag create mode 100644 sysutils/cfengine/patches/patch-ah create mode 100644 sysutils/cfengine/patches/patch-ai create mode 100644 sysutils/cfengine/patches/patch-aj create mode 100644 sysutils/cfengine/pkg/COMMENT create mode 100644 sysutils/cfengine/pkg/DESCR create mode 100644 sysutils/cfengine/pkg/PLIST diff --git a/sysutils/cfengine/Makefile b/sysutils/cfengine/Makefile new file mode 100644 index 00000000000..de27bfdae2a --- /dev/null +++ b/sysutils/cfengine/Makefile @@ -0,0 +1,16 @@ +# $OpenBSD: Makefile,v 1.1.1.1 1998/09/18 00:09:29 marc Exp $ +# $FreeBSD: Makefile,v 1.2 1998/08/19 11:28:23 jseger Exp $ +# + +DISTNAME= cfengine-1.4.12 +CATEGORIES= sysutils + +MAINTAINER= marc@openbsd.org + +MASTER_SITES= ${MASTER_SITE_GNU} + + +GNU_CONFIGURE= yes +MAKE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}" + +.include diff --git a/sysutils/cfengine/files/md5 b/sysutils/cfengine/files/md5 new file mode 100644 index 00000000000..aef5e21130c --- /dev/null +++ b/sysutils/cfengine/files/md5 @@ -0,0 +1 @@ +MD5 (cfengine-1.4.12.tar.gz) = 31cf76f622a08fe8f2e9f7387eb0a8aa diff --git a/sysutils/cfengine/patches/patch-aa b/sysutils/cfengine/patches/patch-aa new file mode 100644 index 00000000000..20277e6b12f --- /dev/null +++ b/sysutils/cfengine/patches/patch-aa @@ -0,0 +1,12 @@ +--- configure.in.orig Tue Jul 21 06:21:06 1998 ++++ configure.in Thu Sep 17 15:39:32 1998 +@@ -274,6 +274,9 @@ + netbsd*) + AC_DEFINE(NETBSD) + ;; ++ openbsd*) ++ AC_DEFINE(OPENBSD) ++ ;; + newsos*) + AC_DEFINE(NEWS_OS) + ;; diff --git a/sysutils/cfengine/patches/patch-ab b/sysutils/cfengine/patches/patch-ab new file mode 100644 index 00000000000..1a87421b83d --- /dev/null +++ b/sysutils/cfengine/patches/patch-ab @@ -0,0 +1,15 @@ +--- configure.orig Tue Jul 21 06:09:16 1998 ++++ configure Thu Sep 17 15:39:32 1998 +@@ -3924,6 +3924,12 @@ + EOF + + ;; ++ openbsd*) ++ cat >> confdefs.h <<\EOF ++#define OPENBSD 1 ++EOF ++ ++ ;; + newsos*) + cat >> confdefs.h <<\EOF + #define NEWS_OS 1 diff --git a/sysutils/cfengine/patches/patch-ac b/sysutils/cfengine/patches/patch-ac new file mode 100644 index 00000000000..a48d62cb5b1 --- /dev/null +++ b/sysutils/cfengine/patches/patch-ac @@ -0,0 +1,10 @@ +--- acconfig.h.orig Mon May 25 23:29:17 1998 ++++ acconfig.h Thu Sep 17 15:39:32 1998 +@@ -48,6 +48,7 @@ + #undef DEBIAN + #undef FREEBSD + #undef NETBSD ++#undef OPENBSD + #undef NEWS_OS + #undef BSDOS + #undef BSD43 diff --git a/sysutils/cfengine/patches/patch-ad b/sysutils/cfengine/patches/patch-ad new file mode 100644 index 00000000000..430435b235b --- /dev/null +++ b/sysutils/cfengine/patches/patch-ad @@ -0,0 +1,11 @@ +--- src/df.c.orig Sun Mar 22 23:14:49 1998 ++++ src/df.c Thu Sep 17 15:39:35 1998 +@@ -109,7 +109,7 @@ + avail = buf.f_bavail * (buf.f_frsize / blocksize); + #endif + +-#if defined NETBSD || defined LINUX || defined SUNOS || defined HPuUX ++#if defined NETBSD || defined LINUX || defined SUNOS || defined HPuUX || defined OPENBSD + total = buf.f_blocks; + used = buf.f_blocks - buf.f_bfree; + avail = buf.f_bavail; diff --git a/sysutils/cfengine/patches/patch-ae b/sysutils/cfengine/patches/patch-ae new file mode 100644 index 00000000000..e09da9fc020 --- /dev/null +++ b/sysutils/cfengine/patches/patch-ae @@ -0,0 +1,10 @@ +--- src/conf.h.in.orig Tue Jul 21 06:09:30 1998 ++++ src/conf.h.in Thu Sep 17 15:39:35 1998 +@@ -77,6 +77,7 @@ + #undef DEBIAN + #undef FREEBSD + #undef NETBSD ++#undef OPENBSD + #undef NEWS_OS + #undef BSDOS + #undef BSD43 diff --git a/sysutils/cfengine/patches/patch-af b/sysutils/cfengine/patches/patch-af new file mode 100644 index 00000000000..833dc2af24a --- /dev/null +++ b/sysutils/cfengine/patches/patch-af @@ -0,0 +1,18 @@ +--- src/cfengine.c.orig Fri Jul 31 05:13:48 1998 ++++ src/cfengine.c Thu Sep 17 15:39:35 1998 +@@ -1153,6 +1153,7 @@ + case unix_sv: + case freebsd: + case netbsd: ++ case openbsd: + case bsd_i: + case nextstep: + case bsd4_3: +@@ -4249,6 +4250,7 @@ + break; + + case netbsd: ++ case openbsd: + case bsd_i: + case freebsd: sprintf(fstab,"%s:%s \t %s \t %s \t %s,%s 0 0",host,rmountpt,mountpt,VNFSTYPE,mode,opts); + break; diff --git a/sysutils/cfengine/patches/patch-ag b/sysutils/cfengine/patches/patch-ag new file mode 100644 index 00000000000..d191e113e48 --- /dev/null +++ b/sysutils/cfengine/patches/patch-ag @@ -0,0 +1,19 @@ +--- src/cf.defs.h.orig Tue Jul 14 07:48:57 1998 ++++ src/cf.defs.h Thu Sep 17 15:39:34 1998 +@@ -228,7 +228,7 @@ + #define maxvarsize 128 + #define maxlinksize 256 + #define maxlinklevel 4 +-#define maxargs 30 ++#define maxargs 31 + #define hashtablesize 119 /* prime number */ + #define macroalphabet 60 /* a-z, A-Z plus a bit */ + #define maxshellargs 11 +@@ -481,6 +481,7 @@ + GnU, + cfnt, + unix_sv, ++ openbsd, + unused1, + unused2, + unused3 diff --git a/sysutils/cfengine/patches/patch-ah b/sysutils/cfengine/patches/patch-ah new file mode 100644 index 00000000000..270bb7ba49c --- /dev/null +++ b/sysutils/cfengine/patches/patch-ah @@ -0,0 +1,11 @@ +--- pub/regex.h.orig Tue Jan 7 07:07:54 1997 ++++ pub/regex.h Thu Sep 17 15:39:34 1998 +@@ -469,7 +469,7 @@ + unsigned num_regs, regoff_t *starts, regoff_t *ends)); + + /* 4.2 bsd compatibility. */ +-#if !defined(FREEBSD) && !defined(IRIX) && !defined(NETBSD) ++#if !defined(FREEBSD) && !defined(IRIX) && !defined(NETBSD) && !defined(OPENBSD) + extern char *re_comp _RE_ARGS (( char *)); + extern int re_exec _RE_ARGS (( char *)); + #endif diff --git a/sysutils/cfengine/patches/patch-ai b/sysutils/cfengine/patches/patch-ai new file mode 100644 index 00000000000..10df79394f4 --- /dev/null +++ b/sysutils/cfengine/patches/patch-ai @@ -0,0 +1,32 @@ +--- doc/cfengine.texinfo.orig Sat Aug 1 03:36:35 1998 ++++ doc/cfengine.texinfo Thu Sep 17 15:39:34 1998 +@@ -1713,7 +1713,7 @@ + + @smallexample + ultrix, sun4, sun3, hpux, hpux10, aix, solaris, osf, irix4, irix, irix64 +- freebsd, netbsd, bsd4_3, newsos, solarisx86, aos, ++ freebsd, netbsd, openbsd, bsd4_3, newsos, solarisx86, aos, + nextstep, bsdos, linux, debian, cray, unix_sv, GnU + @end smallexample + +@@ -11832,7 +11832,7 @@ + Another problem with GNU/Linux concerns a special socket call to the + TCP/IP network interface. This is a command which configures the static + routing table and appears to be absent from all versions of Linux and +-newer IRIX versions. There are also problems with NetBSD. These ++newer IRIX versions. There are also problems with NetBSD (and therefore, likely, OpenBSD). These + features are undocumented and will be fixed as soon as they have been + understood! If you are running in verbose mode a warning message is + printed, otherwise cfengine will ignore attempts to set a default route +@@ -15011,9 +15011,9 @@ + @c ..................................................... + + @node cf.freebsd, cfd.conf, cf.linux, Example configuration file +-@section cf.freebsd / cf.netbsd ++@section cf.freebsd / cf.netbsd /cf.openbsd + +-FreeBSD and NetBSD are sufficiently similar to have a single ++FreeBSD, NetBSD and OpenBSD are sufficiently similar to have a single + file for both. + + @smallexample diff --git a/sysutils/cfengine/patches/patch-aj b/sysutils/cfengine/patches/patch-aj new file mode 100644 index 00000000000..71be2deeb27 --- /dev/null +++ b/sysutils/cfengine/patches/patch-aj @@ -0,0 +1,11 @@ +--- contrib/Makefile.in.~1~ Thu Apr 10 01:19:55 1997 ++++ contrib/Makefile.in Thu Sep 17 16:44:18 1998 +@@ -28,7 +28,7 @@ + ${MKINSTALLDIR} ${sbindir} + for x in $?; \ + do \ +- ${INSTALL_PROGRAM} $$x ${sbindir}; \ ++ ${INSTALL_SCRIPT} $$x ${sbindir}; \ + done + + clean: diff --git a/sysutils/cfengine/pkg/COMMENT b/sysutils/cfengine/pkg/COMMENT new file mode 100644 index 00000000000..4d491e47d14 --- /dev/null +++ b/sysutils/cfengine/pkg/COMMENT @@ -0,0 +1 @@ +GNU cfengine - a systems administration tool for networks. diff --git a/sysutils/cfengine/pkg/DESCR b/sysutils/cfengine/pkg/DESCR new file mode 100644 index 00000000000..a3b93004ca8 --- /dev/null +++ b/sysutils/cfengine/pkg/DESCR @@ -0,0 +1,2 @@ +cfengine lets you manage you network (including editing files automatically), +in an object-oriented manner. diff --git a/sysutils/cfengine/pkg/PLIST b/sysutils/cfengine/pkg/PLIST new file mode 100644 index 00000000000..d3939b1c168 --- /dev/null +++ b/sysutils/cfengine/pkg/PLIST @@ -0,0 +1,27 @@ +sbin/cfd +sbin/cfdoc +sbin/cfengine +sbin/cfrun +share/cfengine/backup.exclude +share/cfengine/cf.groups.example +share/cfengine/cf.hpux.example +share/cfengine/cf.linux.example +share/cfengine/cf.main.example +share/cfengine/cf.motd.example +share/cfengine/cf.preconf.example +share/cfengine/cf.site.example +share/cfengine/cf.solaris.example +share/cfengine/cf.sun4.example +share/cfengine/cf.ultrix.example +share/cfengine/cf.users.example +share/cfengine/cfbackup +share/cfengine/cfbg +share/cfengine/cfd.conf.example +share/cfengine/cfdaily +share/cfengine/cfengine.conf.example +share/cfengine/cfmail +share/cfengine/cfrestore +share/cfengine/cfwrap +share/cfengine/editquotas +share/cfengine/noseyparker +@dirrm share/cfengine