From 4929ece70724c3b9453de463cb1c11820b6d1c02 Mon Sep 17 00:00:00 2001 From: nia Date: Sat, 15 May 2021 10:27:16 +0000 Subject: Remove cfengine2, broken and replaced by cfengine3 ages ago --- sysutils/Makefile | 3 +- sysutils/cfengine2/DESCR | 6 ---- sysutils/cfengine2/MESSAGE | 26 --------------- sysutils/cfengine2/Makefile | 42 ------------------------ sysutils/cfengine2/PLIST | 53 ------------------------------- sysutils/cfengine2/distinfo | 10 ------ sysutils/cfengine2/files/cfenvd.sh | 15 --------- sysutils/cfengine2/files/cfexecd.sh | 42 ------------------------ sysutils/cfengine2/files/cfservd.sh | 16 ---------- sysutils/cfengine2/patches/patch-aa | 13 -------- sysutils/cfengine2/patches/patch-ab | 34 -------------------- sysutils/cfengine2/patches/patch-ac | 13 -------- sysutils/cfengine2/patches/patch-src_do.c | 15 --------- 13 files changed, 1 insertion(+), 287 deletions(-) delete mode 100644 sysutils/cfengine2/DESCR delete mode 100644 sysutils/cfengine2/MESSAGE delete mode 100644 sysutils/cfengine2/Makefile delete mode 100644 sysutils/cfengine2/PLIST delete mode 100644 sysutils/cfengine2/distinfo delete mode 100644 sysutils/cfengine2/files/cfenvd.sh delete mode 100644 sysutils/cfengine2/files/cfexecd.sh delete mode 100644 sysutils/cfengine2/files/cfservd.sh delete mode 100644 sysutils/cfengine2/patches/patch-aa delete mode 100644 sysutils/cfengine2/patches/patch-ab delete mode 100644 sysutils/cfengine2/patches/patch-ac delete mode 100644 sysutils/cfengine2/patches/patch-src_do.c diff --git a/sysutils/Makefile b/sysutils/Makefile index a3a14170b30..3fc170996e5 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.957 2021/05/08 09:14:20 adam Exp $ +# $NetBSD: Makefile,v 1.958 2021/05/15 10:27:16 nia Exp $ # COMMENT= System utilities @@ -85,7 +85,6 @@ SUBDIR+= cdirip SUBDIR+= cdrdao SUBDIR+= cdrkit SUBDIR+= cdrtools -SUBDIR+= cfengine2 SUBDIR+= cfengine3 SUBDIR+= cfm SUBDIR+= checkpassword diff --git a/sysutils/cfengine2/DESCR b/sysutils/cfengine2/DESCR deleted file mode 100644 index 99d78817c8b..00000000000 --- a/sysutils/cfengine2/DESCR +++ /dev/null @@ -1,6 +0,0 @@ -Cfengine, or the "configuration engine" is a very high level language -for building expert systems which administrate and configure large -computer networks. Cfengine uses the idea of classes and a primitive -form of intelligence to define and automate the configuration of -large systems in the most economical way possible. Cfengine is -designed to be a part of computer immune system. diff --git a/sysutils/cfengine2/MESSAGE b/sysutils/cfengine2/MESSAGE deleted file mode 100644 index 9050d3c5de1..00000000000 --- a/sysutils/cfengine2/MESSAGE +++ /dev/null @@ -1,26 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE,v 1.3 2005/05/03 15:51:51 wiz Exp $ - -To set up cfengine, install sysutils/cfengine2-doc and see: -${PREFIX}/share/doc/html/cfengine/cfengine-Tutorial.html - -At a minimum, you will need: - -1. /var/cfengine/inputs/update.conf - -2. Manually add the "cfengine" service to /etc/services or - automate it in /var/cfengine/inputs/cfagent.conf: - -editfiles: - - { /etc/services - - Backup "false" - AppendIfNoSuchLine "cfengine 5308/tcp # CFengine" - } - -3. Once you are happy using cfengine, you will want it to - run least once per hour. This is easily achieved by - adding the following line to the root crontab: - 7,37 * * * * ${PREFIX}/sbin/cfexecd -F -=========================================================================== diff --git a/sysutils/cfengine2/Makefile b/sysutils/cfengine2/Makefile deleted file mode 100644 index 605a979aa5b..00000000000 --- a/sysutils/cfengine2/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# $NetBSD: Makefile,v 1.52 2020/08/31 18:11:24 wiz Exp $ - -DISTNAME= cfengine-2.2.10 -PKGREVISION= 13 -CATEGORIES= sysutils net -#MASTER_SITES= http://www.cfengine.org/tarballs/ -MASTER_SITES+= http://ftp.osuosl.org/pub/cfengine/ -MASTER_SITES+= ftp://sunsite.uio.no/pub/cfengine/ - -MAINTAINER= pkgsrc-users@NetBSD.org -#HOMEPAGE= http://www.cfengine.org/ -COMMENT= Automate configuration and administration of large systems -LICENSE= gnu-gpl-v2 - -BROKEN= "Fails to build with OpenSSL 1.1" - -BUILD_DEFS+= IPV6_READY - -BDB_ACCEPTED= db4 -USE_LIBTOOL= yes -USE_TOOLS+= flex perl:run yacc -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-berkeleydb=${BUILDLINK_PREFIX.db4} -CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} - -PTHREAD_OPTS+= require -REPLACE_PERL= contrib/cfdoc - -RCD_SCRIPTS= cfexecd cfservd cfenvd - -OWN_DIRS= ${VARBASE}/cfengine -OWN_DIRS+= ${VARBASE}/cfengine/inputs - -INSTALLATION_DIRS= ${PKGMANDIR}/man8 - -post-install: - ${INSTALL_MAN} ${WRKSRC}/doc/*.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 - -.include "../../security/openssl/buildlink3.mk" -.include "../../mk/bdb.buildlink3.mk" -.include "../../mk/pthread.buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/sysutils/cfengine2/PLIST b/sysutils/cfengine2/PLIST deleted file mode 100644 index 473d4eecd5c..00000000000 --- a/sysutils/cfengine2/PLIST +++ /dev/null @@ -1,53 +0,0 @@ -@comment $NetBSD: PLIST,v 1.14 2014/03/11 14:05:15 jperkin Exp $ -lib/libcfengine.la -man/man8/cfagent.8 -man/man8/cfengine.8 -man/man8/cfenvd.8 -man/man8/cfenvgraph.8 -man/man8/cfetoolcheck.8 -man/man8/cfetoolcreate.8 -man/man8/cfetooldump.8 -man/man8/cfetoolgraph.8 -man/man8/cfetoolimport.8 -man/man8/cfetoolinfo.8 -man/man8/cfetoolupdate.8 -man/man8/cfexecd.8 -man/man8/cfkey.8 -man/man8/cfrun.8 -man/man8/cfservd.8 -man/man8/cfshow.8 -sbin/cfagent -sbin/cfdoc -sbin/cfenvd -sbin/cfenvgraph -sbin/cfetool -sbin/cfetoolgraph -sbin/cfexecd -sbin/cfkey -sbin/cfrun -sbin/cfservd -sbin/cfshow -share/cfengine/ChangeLog -share/cfengine/INSTALL -share/cfengine/NEWS -share/cfengine/README -share/cfengine/cfengine.el -share/examples/cfengine/cf.chflags.example -share/examples/cfengine/cf.freebsd.example -share/examples/cfengine/cf.ftp.example -share/examples/cfengine/cf.groups.example -share/examples/cfengine/cf.linux.example -share/examples/cfengine/cf.main.example -share/examples/cfengine/cf.motd.example -share/examples/cfengine/cf.preconf.example -share/examples/cfengine/cf.services.example -share/examples/cfengine/cf.site.example -share/examples/cfengine/cf.solaris.example -share/examples/cfengine/cf.sun4.example -share/examples/cfengine/cf.users.example -share/examples/cfengine/cfagent.conf-advanced.example -share/examples/cfengine/cfagent.conf.example -share/examples/cfengine/cfrc.example -share/examples/cfengine/cfrun.hosts.example -share/examples/cfengine/cfservd.conf.example -share/examples/cfengine/update.conf.example diff --git a/sysutils/cfengine2/distinfo b/sysutils/cfengine2/distinfo deleted file mode 100644 index 4cc7ec4d918..00000000000 --- a/sysutils/cfengine2/distinfo +++ /dev/null @@ -1,10 +0,0 @@ -$NetBSD: distinfo,v 1.16 2018/10/01 10:05:23 jperkin Exp $ - -SHA1 (cfengine-2.2.10.tar.gz) = 032bec0bc59ffee7179422e96dfd902afbf94340 -RMD160 (cfengine-2.2.10.tar.gz) = 67fd3dc80270dc000887e3dbf26f372338e2600f -SHA512 (cfengine-2.2.10.tar.gz) = 861af25f32248e115512790357cb4739b16bee9d19db33cc1b93ab2091d020991770970fc916796a5894c978ee6a5956100d2f714efb6e97e9e9a9ea88f64dea -Size (cfengine-2.2.10.tar.gz) = 2690333 bytes -SHA1 (patch-aa) = cdbebcf1a8d284bbaa9e8e0deb60112c5e33287c -SHA1 (patch-ab) = c4578db20daf502980dfebab706e6a13185690db -SHA1 (patch-ac) = ca643a6dd76307053923c93b321533b684d22474 -SHA1 (patch-src_do.c) = 5773b0b2331818b2340ab288711840073507c25b diff --git a/sysutils/cfengine2/files/cfenvd.sh b/sysutils/cfengine2/files/cfenvd.sh deleted file mode 100644 index 9ec02f8efbd..00000000000 --- a/sysutils/cfengine2/files/cfenvd.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!@RCD_SCRIPTS_SHELL@ -# -# $NetBSD: cfenvd.sh,v 1.1 2004/08/19 17:13:36 ben Exp $ - -# PROVIDE: cfenvd -# REQUIRE: cfexecd - -. /etc/rc.subr - -name="cfenvd" -rcvar=$name -command="@PREFIX@/sbin/${name}" - -load_rc_config $name -run_rc_command "$1" diff --git a/sysutils/cfengine2/files/cfexecd.sh b/sysutils/cfengine2/files/cfexecd.sh deleted file mode 100644 index 35550889073..00000000000 --- a/sysutils/cfengine2/files/cfexecd.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!@RCD_SCRIPTS_SHELL@ -# -# $NetBSD: cfexecd.sh,v 1.1 2004/08/19 17:13:36 ben Exp $ -# -# start script for cfexecd - -# PROVIDE: cfexecd -# REQUIRE: network - -. /etc/rc.subr - -name="cfexecd" -rcvar=$name -command="@PREFIX@/sbin/${name}" -required_files="/var/cfengine/inputs/update.conf" -extra_commands="keygen reload" - -cfexecd_keygen() -{ - ( - umask 022 - if [ -f /var/cfengine/ppkeys/localhost.priv ]; then - echo "You already have a host key" \ - "in /var/cfengine/ppkeys/localhost.priv" - else - @PREFIX@/sbin/cfkey - fi - ) -} - -cfexecd_precmd() -{ - if [ ! -f /var/cfengine/ppkeys/localhost.priv ]; then - run_rc_command keygen - fi -} - -keygen_cmd=cfexecd_keygen -start_precmd=cfexecd_precmd - -load_rc_config $name -run_rc_command "$1" diff --git a/sysutils/cfengine2/files/cfservd.sh b/sysutils/cfengine2/files/cfservd.sh deleted file mode 100644 index 4a7ac82ae5d..00000000000 --- a/sysutils/cfengine2/files/cfservd.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!@RCD_SCRIPTS_SHELL@ -# -# $NetBSD: cfservd.sh,v 1.1 2004/08/19 17:13:36 ben Exp $ - -# PROVIDE: cfservd -# REQUIRE: cfexecd - -. /etc/rc.subr - -name="cfservd" -rcvar=$name -command="@PREFIX@/sbin/${name}" -required_files="/var/cfengine/inputs/cfservd.conf" - -load_rc_config $name -run_rc_command "$1" diff --git a/sysutils/cfengine2/patches/patch-aa b/sysutils/cfengine2/patches/patch-aa deleted file mode 100644 index 6f9dd87f34d..00000000000 --- a/sysutils/cfengine2/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.4 2008/09/07 10:14:31 rhaen Exp $ - ---- inputs/Makefile.in.orig 2008-08-26 10:31:10.000000000 +0200 -+++ inputs/Makefile.in 2008-08-26 10:32:26.000000000 +0200 -@@ -15,7 +15,7 @@ - @SET_MAKE@ - - VPATH = @srcdir@ --pkgdatadir = $(datadir)/@PACKAGE@ -+pkgdatadir = $(datadir)/examples/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd diff --git a/sysutils/cfengine2/patches/patch-ab b/sysutils/cfengine2/patches/patch-ab deleted file mode 100644 index dc0c9cdc094..00000000000 --- a/sysutils/cfengine2/patches/patch-ab +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-ab,v 1.8 2018/10/01 10:05:24 jperkin Exp $ - -Remove bogus _POSIX_C_SOURCE setting. - ---- configure.orig 2009-04-11 19:59:34.000000000 +0000 -+++ configure -@@ -16104,7 +16104,7 @@ $as_echo "$BERKELEY_DB_DIR" >&6; } - elif test -d "$BERKELEY_DB_DIR"; then - - BERKELEY_DB_CFLAGS="-I$BERKELEY_DB_DIR/include" -- for v in . db47 db46 db45 db44 db43 db42 db41 db40 db4 db33 db32 db3 db; do -+ for v in . db47 db46 db45 db44 db43 db42 db41 db40 db4 db33 db32 db3 db db4; do - if test -f "$BERKELEY_DB_DIR/include/$v/db.h"; then - BERKELEY_DB_CFLAGS="-I$BERKELEY_DB_DIR/include/$v" - break -@@ -16112,7 +16112,7 @@ $as_echo "$BERKELEY_DB_DIR" >&6; } - done - - BERKELEY_DB_LIB="-ldb" -- for v in db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44; do -+ for v in db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db4; do - if test -f "$BERKELEY_DB_DIR/lib/lib$v.so"; then - BERKELEY_DB_LIB="-l$v" - break -@@ -22778,9 +22778,6 @@ else - $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- cat >>confdefs.h <<\_ACEOF --#define _POSIX_C_SOURCE 200112loL --_ACEOF - - fi - diff --git a/sysutils/cfengine2/patches/patch-ac b/sysutils/cfengine2/patches/patch-ac deleted file mode 100644 index 438dec1892f..00000000000 --- a/sysutils/cfengine2/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.2 2010/05/09 22:09:30 pettai Exp $ - ---- src/nameinfo.c.orig 2010-03-22 15:32:43.000000000 +0100 -+++ src/nameinfo.c 2010-03-22 15:31:57.000000000 +0100 -@@ -40,7 +40,7 @@ - #include - #endif - --#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN -+#if defined (HAVE_STRUCT_SOCKADDR_SA_LEN) && !defined(__NetBSD__) - # ifdef _SIZEOF_ADDR_IFREQ - # define SIZEOF_IFREQ(x) _SIZEOF_ADDR_IFREQ(x) - # else diff --git a/sysutils/cfengine2/patches/patch-src_do.c b/sysutils/cfengine2/patches/patch-src_do.c deleted file mode 100644 index 282dc239930..00000000000 --- a/sysutils/cfengine2/patches/patch-src_do.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_do.c,v 1.1 2015/06/18 01:58:30 dholland Exp $ - -avoid gccism (from PR 46354) - ---- src/do.c~ 2009-03-08 16:27:56.000000000 +0000 -+++ src/do.c -@@ -2846,7 +2846,7 @@ for (ptr = VPKG; ptr != NULL; ptr=ptr->n - - ExpandVarstring(ptr->name,name,""); - -- snprintf(lock,CF_BUFSIZE-1,"%s_%d_%s_%d_%s_%s", name, ptr->cmp, ptr->ver ? ptr->ver: "" ,ptr->action, ptr->defines ?: "", ptr->elsedef ?: ""); -+ snprintf(lock,CF_BUFSIZE-1,"%s_%d_%s_%d_%s_%s", name, ptr->cmp, ptr->ver ? ptr->ver: "" ,ptr->action, ptr->defines ? ptr->defines : "", ptr->elsedef ? ptr->elsedef : ""); - - if (!GetLock(ASUniqueName("packages"),CanonifyName(lock),ptr->ifelapsed,ptr->expireafter,VUQNAME,CFSTARTTIME)) - { -- cgit v1.2.3