Update to version 1.6.5 as requested in PR pkg/19459 by Michael Santos

<mike at ethmoid dot org>.

Package changes:
	- the vicf script is not usable as is: patch it to make it obvious and
	install it as an example.
	- switch to requiring the auto* tools at build time.
	- While I'm here claim stewardship (before completely removing it
	from pkgsrc ?).

Changes in version 1.6.5:
	- bug fixes including a security issue with link races.
	- auto* tools update and commands installation directory change
	(overridden by this package patch files to keep it the same as
	previous versions and even cfengine 2.*)

XXX Threads support completely removed. From my humble experience it is
quite broken in cfengine 1.*. It is only used in cfd and when DCE support
is enabled: the latter is not activated in this package and if the former
really needs a performance/ability boost you should really consider
cfengine 2.*.

All in all you should not update but switch to cfengine2 package instead. ;)

8 files changed, 142 insertions, 74 deletions

diff --git a/sysutils/cfengine/Makefile b/sysutils/cfengine/Makefile
index a26fd643ca6..b01b44c26bb 100644
--- a/sysutils/cfengine/Makefile
+++ b/sysutils/cfengine/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.11 2003/06/02 01:16:56 jschauma Exp $
+# $NetBSD: Makefile,v 1.12 2003/06/19 11:45:02 seb Exp $
 #
 
-DISTNAME=	cfengine-1.6.3
+DISTNAME=	cfengine-1.6.5
 CATEGORIES=	sysutils net
 MASTER_SITES=	ftp://ftp.iu.hio.no/pub/cfengine/ \
-		ftp://ftp.cfengine.webmotion.net/pub/cfengine/
+		http://sunsite.utk.edu/ftp/pub/cfengine/cfengine-ftp/
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	seb@netbsd.org
 HOMEPAGE=	http://www.cfengine.org/
 COMMENT=	Automate configuration and administration of large systems
 
@@ -14,4 +14,12 @@ USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS=		--without-pthreads
 
+pre-configure:
+	cd ${WRKSRC};					\
+	${ACLOCAL};					\
+	${AUTOHEADER};					\
+	${AUTOMAKE} -a --foreign -i;			\
+	${AUTOCONF}
+
+.include "../../mk/automake.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/cfengine/PLIST b/sysutils/cfengine/PLIST
index d50b32636ac..88f11338e2d 100644
--- a/sysutils/cfengine/PLIST
+++ b/sysutils/cfengine/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:52:59 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/06/19 11:45:02 seb Exp $
 sbin/cfcron
 sbin/cfd
 sbin/cfdoc
@@ -8,7 +8,6 @@ sbin/cfmail
 sbin/cfmailfilter
 sbin/cfrun
 sbin/cfwrap
-sbin/vicf
 share/cfengine/cf.chflags.example
 share/cfengine/cf.freebsd.example
 share/cfengine/cf.ftp.example
@@ -29,4 +28,6 @@ share/cfengine/cfengine.el
 share/cfengine/cfrc.example
 share/cfengine/cfrun.hosts.example
 share/cfengine/start-cfd
+share/examples/cfengine/vicf
+@dirrm share/examples/cfengine
 @dirrm share/cfengine
diff --git a/sysutils/cfengine/distinfo b/sysutils/cfengine/distinfo
index aac1b28ce97..771a1a0a829 100644
--- a/sysutils/cfengine/distinfo
+++ b/sysutils/cfengine/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.4 2002/09/26 22:50:32 jlam Exp $
+$NetBSD: distinfo,v 1.5 2003/06/19 11:45:02 seb Exp $
 
-SHA1 (cfengine-1.6.3.tar.gz) = 4bd3fd2e2b9b798c9a3a6e8c64a7dee2cd4ab763
-Size (cfengine-1.6.3.tar.gz) = 867265 bytes
-SHA1 (patch-aa) = 0a9acfd8825be20f6739b5ec7a67fdec5376bb89
-SHA1 (patch-ab) = 4ea38815ee7a13696df545ac25b51246dcc80c42
-SHA1 (patch-ad) = 0044a60597fea926bbf456862f7fe61a96f6b37d
-SHA1 (patch-ae) = 99496b14f80c8605886cd78a520af4d1c6cc0475
+SHA1 (cfengine-1.6.5.tar.gz) = 0e40c6094cb4fa12b34920d30e789719e04df511
+Size (cfengine-1.6.5.tar.gz) = 879792 bytes
+SHA1 (patch-aa) = 49deaa907644bdc2199a861f653d888581d4a681
+SHA1 (patch-ab) = dc6a9d7381778b5f3c2fdb16e65204d5c3faac0d
+SHA1 (patch-ac) = 417ca3785c7d7d668a08d4aad298a8d2ec4a6571
+SHA1 (patch-ad) = 047e02555d541c22f07cb3e3a102beb0be32df6d
+SHA1 (patch-ae) = 283e129a515b664f651fd2272e3f9f8d7f99b60f
diff --git a/sysutils/cfengine/patches/patch-aa b/sysutils/cfengine/patches/patch-aa
index 8f190cef112..f934eba3628 100644
--- a/sysutils/cfengine/patches/patch-aa
+++ b/sysutils/cfengine/patches/patch-aa
@@ -1,10 +1,66 @@
-$NetBSD: patch-aa,v 1.3 2001/06/04 16:18:21 abs Exp $
+$NetBSD: patch-aa,v 1.4 2003/06/19 11:45:02 seb Exp $
 
---- Makefile.am.orig	Tue Jun 13 18:25:29 2000
-+++ Makefile.am
-@@ -1,4 +1,4 @@
--SUBDIRS = pub src bin contrib inputs doc
-+SUBDIRS = pub src bin contrib inputs
+--- configure.in.orig	2002-08-15 05:59:16.000000000 +0000
++++ configure.in
+@@ -159,17 +159,17 @@ dnl ####################################
+ dnl Handle DCE + threading stuff
+ dnl #######################################################################
  
- EXTRA_DIST = SURVEY acconfig.h
+-AC_CHECK_LIB(pthread,main)         dnl POSIX threads
++dnl AC_CHECK_LIB(pthread,main)         dnl POSIX threads
  
+-if test "$ac_cv_lib_pthread_main" = "yes"; then
+-	AC_CHECK_HEADERS(pthread.h)
+-	AC_CHECK_HEADERS(sched.h)
+-fi
++dnl if test "$ac_cv_lib_pthread_main" = "yes"; then
++dnl 	AC_CHECK_HEADERS(pthread.h)
++dnl 	AC_CHECK_HEADERS(sched.h)
++dnl fi
+ 
+ AC_CHECK_FUNC(lchown, AC_DEFINE(HAVE_LCHOWN))
+ 
+-AC_CHECK_FUNC(pthread_attr_setstacksize, AC_DEFINE(HAVE_PTHREAD_ATTR_SETSTACKSIZE), AC_CHECK_LIB(pthread, pthread_create))
+-AC_CHECK_FUNC(pthread_sigmask, AC_DEFINE(HAVE_PTHREAD_SIGMASK), AC_CHECK_LIB(pthread, pthread_create))
++dnl AC_CHECK_FUNC(pthread_attr_setstacksize, AC_DEFINE(HAVE_PTHREAD_ATTR_SETSTACKSIZE), AC_CHECK_LIB(pthread, pthread_create))
++dnl AC_CHECK_FUNC(pthread_sigmask, AC_DEFINE(HAVE_PTHREAD_SIGMASK), AC_CHECK_LIB(pthread, pthread_create))
+ 
+ AC_ARG_ENABLE(DCE,[  --enable-DCE            support for DCE and ACLs],[
+   case "$enableval" in
+@@ -235,8 +235,8 @@ case "$target_os" in
+    aix*)
+ 	AC_DEFINE(AIX)
+         CPPFLAGS="$CPPFLAGS -w"
+-	AC_CHECK_LIB(pthreads, main)
+-        AC_CHECK_HEADER(pthreads.h)
++dnl 	AC_CHECK_LIB(pthreads, main)
++dnl     AC_CHECK_HEADER(pthreads.h)
+         ;;
+    osf*)
+ 	AC_DEFINE(OSF)
+@@ -261,8 +261,8 @@ case "$target_os" in
+         ;;
+    freebsd*)
+ 	AC_DEFINE(FREEBSD)
+-         CFLAGS="$CFLAGS -pthread"
+-        AC_CHECK_HEADERS(pthread.h)
++dnl     CFLAGS="$CFLAGS -pthread"
++dnl     AC_CHECK_HEADERS(pthread.h)
+         ;;
+    netbsd*)
+ 	AC_DEFINE(NETBSD)
+@@ -301,10 +301,10 @@ case "$target_os" in
+ 
+    sysv4.2MP|unix_sv*)
+ 	AC_DEFINE(UNIXWARE)
+-        AC_CHECK_LIB(thread,main)         dnl POSIX threads, weird setup
+-        if test "$ac_cv_lib_thread_main" = "yes"; then
+-	   AC_CHECK_HEADERS(thread.h)
+-        fi
++dnl     AC_CHECK_LIB(thread,main)         dnl POSIX threads, weird setup
++dnl     if test "$ac_cv_lib_thread_main" = "yes"; then
++dnl	   AC_CHECK_HEADERS(thread.h)
++dnl     fi
+         ;;
+ 
+    cygwin*)
diff --git a/sysutils/cfengine/patches/patch-ab b/sysutils/cfengine/patches/patch-ab
index 4ce7f44c570..ec1e08fffa4 100644
--- a/sysutils/cfengine/patches/patch-ab
+++ b/sysutils/cfengine/patches/patch-ab
@@ -1,13 +1,19 @@
-$NetBSD: patch-ab,v 1.5 2001/06/04 16:18:21 abs Exp $
+$NetBSD: patch-ab,v 1.6 2003/06/19 11:45:02 seb Exp $
 
---- Makefile.in.orig	Wed Feb 21 12:17:36 2001
-+++ Makefile.in
-@@ -77,7 +77,7 @@
- VERSION = @VERSION@
- YACC = @YACC@
+--- contrib/Makefile.am.orig	2002-06-20 13:38:34.000000000 +0000
++++ contrib/Makefile.am
+@@ -1,10 +1,12 @@
+ s1 = cfdoc
+ s2 = cfengine.el
  
--SUBDIRS = pub src bin contrib inputs doc
-+SUBDIRS = pub src bin contrib inputs
+-sbin_SCRIPTS = cfcron
+-bin_SCRIPTS = cfdoc vicf
++sbin_SCRIPTS = cfcron cfdoc
+ pkgdata_SCRIPTS = $(s2)
  
- EXTRA_DIST = SURVEY acconfig.h
++exampledir = $(prefix)/share/examples/cfengine
++example_SCRIPTS = vicf
++
+ EXTRA_DIST = README README.cfcron README.vicf $(s1) $(s2)
  
+ #
diff --git a/sysutils/cfengine/patches/patch-ac b/sysutils/cfengine/patches/patch-ac
new file mode 100644
index 00000000000..25775b9ddbe
--- /dev/null
+++ b/sysutils/cfengine/patches/patch-ac
@@ -0,0 +1,26 @@
+$NetBSD: patch-ac,v 1.5 2003/06/19 11:45:02 seb Exp $
+
+--- contrib/vicf.in.orig	2002-06-20 13:38:34.000000000 +0000
++++ contrib/vicf.in
+@@ -8,9 +8,9 @@ CFINPUTS="${CFINPUTS-"@pkgdata@"}
+ export EDITOR CFINPUTS
+ NOPARSE="cf.preconf|cfd.conf"
+ 
+-if [ "`hostname`" != "sentral" ]
++if [ "`hostname`" != "CHANGEME" ]
+ then
+-	echo $0 can only be run on host sentral.
++	echo $0 can only be run on host CHANGEME.
+ 	exit 1
+ fi
+ 
+@@ -39,7 +39,8 @@ EdFile () {
+ 		i=`expr $i - 1`
+ 		if [ $i = 0 ]
+ 		then
+-			echo "\nSorry, file is busy -- try again later."
++			echo
++			echo "Sorry, file is busy -- try again later."
+ 			exit 0
+ 		fi
+ 		sleep 1
diff --git a/sysutils/cfengine/patches/patch-ad b/sysutils/cfengine/patches/patch-ad
index 219ae54da13..56a49487f96 100644
--- a/sysutils/cfengine/patches/patch-ad
+++ b/sysutils/cfengine/patches/patch-ad
@@ -1,44 +1,14 @@
-$NetBSD: patch-ad,v 1.5 2001/06/04 16:18:21 abs Exp $
+$NetBSD: patch-ad,v 1.6 2003/06/19 11:45:02 seb Exp $
 
---- contrib/vicf.in.orig	Mon Jun  4 16:46:23 2001
-+++ contrib/vicf.in
-@@ -4,7 +4,7 @@
- exec_prefix=@exec_prefix@
- sbindir=@sbindir@
- EDITOR="${EDITOR-vi}"
--CFINPUTS="${CFINPUTS-"@pkgdata@"}
-+CFINPUTS="${CFINPUTS-"@pkgdata@"}"
- export EDITOR CFINPUTS
- NOPARSE="cf.preconf|cfd.conf"
+--- src/Makefile.am.orig	2002-06-20 13:38:34.000000000 +0000
++++ src/Makefile.am
+@@ -5,8 +5,7 @@ LEXLIB = @LEXLIB@
+ LDADD = -L../pub -lpub
  
-@@ -20,7 +20,7 @@
- 	echo "File not found: ${file}"
- 	echo "Only these files are eligible for editing:"
- 	\ls $CFINPUTS
--	/usr/ucb/echo -n "Create new file? (Y/n) "
-+	echo -n "Create new file? (Y/n) "
- 	read answer
- 	if [ "$answer" = "n" ]
- 	then
-@@ -32,10 +32,10 @@
-     if [ -f ${CFINPUTS}/.${file}.lock -a "$force" = "n" ]
-     then
- 	i=30
--	/usr/ucb/echo -n "File ${file} is busy -- waiting up to $i seconds..."
-+	echo -n "File ${file} is busy -- waiting up to $i seconds..."
- 	while [ -f ${CFINPUTS}/.${file}.lock ]
- 	do
--		/usr/ucb/echo -n .
-+		echo -n .
- 		i=`expr $i - 1`
- 		if [ $i = 0 ]
- 		then
-@@ -62,7 +62,7 @@
- 	then
- 		echo PARSE ERROR IN NEW INPUT-FILE:
- 		cat /tmp/cfparse.$$
--		/usr/ucb/echo -n "Re-edit file? (Y/n) "
-+		echo -n "Re-edit file? (Y/n) "
- 		read answer
- 		if [ "$answer" = "n" ]
- 		then
+ 
+-sbin_PROGRAMS = cfd cfrun cfkey
+-bin_PROGRAMS = cfengine
++sbin_PROGRAMS = cfd cfrun cfkey cfengine
+ 
+ cfengine_SOURCES =							\
+ 	cfengine.c							\
diff --git a/sysutils/cfengine/patches/patch-ae b/sysutils/cfengine/patches/patch-ae
index eb8aba33860..268e6630a61 100644
--- a/sysutils/cfengine/patches/patch-ae
+++ b/sysutils/cfengine/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.3 2001/06/04 16:18:22 abs Exp $
+$NetBSD: patch-ae,v 1.4 2003/06/19 11:45:02 seb Exp $
 
---- src/image.c.orig	Thu Feb 15 07:23:22 2001
+--- src/image.c.orig	2002-06-20 17:53:53.000000000 +0000
 +++ src/image.c
-@@ -206,9 +206,12 @@
+@@ -206,9 +206,12 @@ if (ip->purge == 'y')
     DeleteItemList(namecache);
     }