This patch fixes the following problems:

    * cfengine deadlocking in the resolver due to being linked against libc_r
    * cfd issuing 'ioctl:  No such network device' whenever it is invoked.

change maintainer email
add more docs
Patches obtained from Michael Kyle <mike@rainc.com>

PR:		29649
Submitted by:	MAINTAINER

20 files changed, 136 insertions, 20 deletions

diff --git a/sysutils/cfengine/Makefile b/sysutils/cfengine/Makefile
index 2cde1d8e5757..38c9eab80852 100644
--- a/sysutils/cfengine/Makefile
+++ b/sysutils/cfengine/Makefile
@@ -7,13 +7,13 @@
 
 PORTNAME=	cfengine
 PORTVERSION=	1.6.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.iu.hioslo.no/pub/cfengine/ \
 		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	gordont@bluemtn.net
+MAINTAINER=	gordont@gnf.org
 
 LIB_DEPENDS=	db3:${PORTSDIR}/databases/db3
 .if defined(PACKAGE_BUILDING) && !exists(/usr/include/tcpd.h)
diff --git a/sysutils/cfengine/files/patch-ac b/sysutils/cfengine/files/patch-ac
index 402872a89106..673d7d0c722d 100644
--- a/sysutils/cfengine/files/patch-ac
+++ b/sysutils/cfengine/files/patch-ac
@@ -18,11 +18,11 @@
  		$PATH:$prefix/bin:/usr/bin:/usr/local/bin)
  
  
-@@ -262,6 +262,7 @@
+@@ -262,7 +262,7 @@
     freebsd*)
  	AC_DEFINE(FREEBSD)
-          CFLAGS="$CFLAGS -pthread"
-+         LIBS="$LIBS -ldes"
+-         CFLAGS="$CFLAGS -pthread"
++	LIBS="$LIBS -ldes"
          AC_CHECK_HEADERS(pthread.h)
          ;;
     netbsd*)
diff --git a/sysutils/cfengine/files/patch-af b/sysutils/cfengine/files/patch-af
new file mode 100644
index 000000000000..c7a33e7b209e
--- /dev/null
+++ b/sysutils/cfengine/files/patch-af
@@ -0,0 +1,13 @@
+Fix the linking so only cfd is linked with pthreads. This keeps cfengine
+from trying to use thread-unsafe resolver functions.
+
+--- src/Makefile.am.orig	Fri Aug 10 23:58:47 2001
++++ src/Makefile.am	Fri Aug 10 23:59:07 2001
+@@ -95,6 +95,7 @@
+ 	patches.c
+ 
+ cfd_LDADD = -L../pub -lpub $(LEXLIB)
++cfd_LDFLAGS = -pthread $(LDFLAGS)
+ 
+ cfrun_SOURCES =								\
+ 	cfrun.c								\
diff --git a/sysutils/cfengine/files/patch-ag b/sysutils/cfengine/files/patch-ag
new file mode 100644
index 000000000000..1a8101cb3542
--- /dev/null
+++ b/sysutils/cfengine/files/patch-ag
@@ -0,0 +1,13 @@
+This fixes the problem with cfd not finding the correct interfaces.
+
+--- src/misc.c.orig	Wed Jan 24 07:28:01 2001
++++ src/misc.c	Fri Aug 10 23:34:45 2001
+@@ -284,7 +284,7 @@
+ list.ifc_len = sizeof(ifbuf);
+ list.ifc_req = ifbuf;
+ 
+-if (ioctl(fd, SIOCGIFCONF, &list) == -1 || (list.ifc_len < (sizeof(struct ifreq))))
++if (ioctl(fd, OSIOCGIFCONF, &list) == -1 || (list.ifc_len < (sizeof(struct ifreq))))
+    {
+    CfLog(cferror,"Couldn't get interfaces","ioctl");
+    exit(1);
diff --git a/sysutils/cfengine/pkg-plist b/sysutils/cfengine/pkg-plist
index 7d216a6c6d18..50e59a2aba1f 100644
--- a/sysutils/cfengine/pkg-plist
+++ b/sysutils/cfengine/pkg-plist
@@ -50,4 +50,7 @@ share/cfengine/start-cfd
 %%PORTDOCS%%share/doc/cfengine/cf-security.html
 %%PORTDOCS%%share/doc/cfengine/cfengine-Reference.html
 %%PORTDOCS%%share/doc/cfengine/cfengine-Tutorial.html
+%%PORTDOCS%%share/doc/cfengine/locks.ps
+%%PORTDOCS%%share/doc/cfengine/paper1.ps
+%%PORTDOCS%%share/doc/cfengine/paper2.ps
 %%PORTDOCS%%@dirrm share/doc/cfengine
diff --git a/sysutils/cfengine2/Makefile b/sysutils/cfengine2/Makefile
index 2cde1d8e5757..38c9eab80852 100644
--- a/sysutils/cfengine2/Makefile
+++ b/sysutils/cfengine2/Makefile
@@ -7,13 +7,13 @@
 
 PORTNAME=	cfengine
 PORTVERSION=	1.6.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.iu.hioslo.no/pub/cfengine/ \
 		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	gordont@bluemtn.net
+MAINTAINER=	gordont@gnf.org
 
 LIB_DEPENDS=	db3:${PORTSDIR}/databases/db3
 .if defined(PACKAGE_BUILDING) && !exists(/usr/include/tcpd.h)
diff --git a/sysutils/cfengine2/files/patch-ac b/sysutils/cfengine2/files/patch-ac
index 402872a89106..673d7d0c722d 100644
--- a/sysutils/cfengine2/files/patch-ac
+++ b/sysutils/cfengine2/files/patch-ac
@@ -18,11 +18,11 @@
  		$PATH:$prefix/bin:/usr/bin:/usr/local/bin)
  
  
-@@ -262,6 +262,7 @@
+@@ -262,7 +262,7 @@
     freebsd*)
  	AC_DEFINE(FREEBSD)
-          CFLAGS="$CFLAGS -pthread"
-+         LIBS="$LIBS -ldes"
+-         CFLAGS="$CFLAGS -pthread"
++	LIBS="$LIBS -ldes"
          AC_CHECK_HEADERS(pthread.h)
          ;;
     netbsd*)
diff --git a/sysutils/cfengine2/files/patch-af b/sysutils/cfengine2/files/patch-af
new file mode 100644
index 000000000000..c7a33e7b209e
--- /dev/null
+++ b/sysutils/cfengine2/files/patch-af
@@ -0,0 +1,13 @@
+Fix the linking so only cfd is linked with pthreads. This keeps cfengine
+from trying to use thread-unsafe resolver functions.
+
+--- src/Makefile.am.orig	Fri Aug 10 23:58:47 2001
++++ src/Makefile.am	Fri Aug 10 23:59:07 2001
+@@ -95,6 +95,7 @@
+ 	patches.c
+ 
+ cfd_LDADD = -L../pub -lpub $(LEXLIB)
++cfd_LDFLAGS = -pthread $(LDFLAGS)
+ 
+ cfrun_SOURCES =								\
+ 	cfrun.c								\
diff --git a/sysutils/cfengine2/files/patch-ag b/sysutils/cfengine2/files/patch-ag
new file mode 100644
index 000000000000..1a8101cb3542
--- /dev/null
+++ b/sysutils/cfengine2/files/patch-ag
@@ -0,0 +1,13 @@
+This fixes the problem with cfd not finding the correct interfaces.
+
+--- src/misc.c.orig	Wed Jan 24 07:28:01 2001
++++ src/misc.c	Fri Aug 10 23:34:45 2001
+@@ -284,7 +284,7 @@
+ list.ifc_len = sizeof(ifbuf);
+ list.ifc_req = ifbuf;
+ 
+-if (ioctl(fd, SIOCGIFCONF, &list) == -1 || (list.ifc_len < (sizeof(struct ifreq))))
++if (ioctl(fd, OSIOCGIFCONF, &list) == -1 || (list.ifc_len < (sizeof(struct ifreq))))
+    {
+    CfLog(cferror,"Couldn't get interfaces","ioctl");
+    exit(1);
diff --git a/sysutils/cfengine2/pkg-plist b/sysutils/cfengine2/pkg-plist
index 7d216a6c6d18..50e59a2aba1f 100644
--- a/sysutils/cfengine2/pkg-plist
+++ b/sysutils/cfengine2/pkg-plist
@@ -50,4 +50,7 @@ share/cfengine/start-cfd
 %%PORTDOCS%%share/doc/cfengine/cf-security.html
 %%PORTDOCS%%share/doc/cfengine/cfengine-Reference.html
 %%PORTDOCS%%share/doc/cfengine/cfengine-Tutorial.html
+%%PORTDOCS%%share/doc/cfengine/locks.ps
+%%PORTDOCS%%share/doc/cfengine/paper1.ps
+%%PORTDOCS%%share/doc/cfengine/paper2.ps
 %%PORTDOCS%%@dirrm share/doc/cfengine
diff --git a/sysutils/cfengine3-legacy/Makefile b/sysutils/cfengine3-legacy/Makefile
index 2cde1d8e5757..38c9eab80852 100644
--- a/sysutils/cfengine3-legacy/Makefile
+++ b/sysutils/cfengine3-legacy/Makefile
@@ -7,13 +7,13 @@
 
 PORTNAME=	cfengine
 PORTVERSION=	1.6.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.iu.hioslo.no/pub/cfengine/ \
 		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	gordont@bluemtn.net
+MAINTAINER=	gordont@gnf.org
 
 LIB_DEPENDS=	db3:${PORTSDIR}/databases/db3
 .if defined(PACKAGE_BUILDING) && !exists(/usr/include/tcpd.h)
diff --git a/sysutils/cfengine3-legacy/files/patch-ac b/sysutils/cfengine3-legacy/files/patch-ac
index 402872a89106..673d7d0c722d 100644
--- a/sysutils/cfengine3-legacy/files/patch-ac
+++ b/sysutils/cfengine3-legacy/files/patch-ac
@@ -18,11 +18,11 @@
  		$PATH:$prefix/bin:/usr/bin:/usr/local/bin)
  
  
-@@ -262,6 +262,7 @@
+@@ -262,7 +262,7 @@
     freebsd*)
  	AC_DEFINE(FREEBSD)
-          CFLAGS="$CFLAGS -pthread"
-+         LIBS="$LIBS -ldes"
+-         CFLAGS="$CFLAGS -pthread"
++	LIBS="$LIBS -ldes"
          AC_CHECK_HEADERS(pthread.h)
          ;;
     netbsd*)
diff --git a/sysutils/cfengine3-legacy/files/patch-af b/sysutils/cfengine3-legacy/files/patch-af
new file mode 100644
index 000000000000..c7a33e7b209e
--- /dev/null
+++ b/sysutils/cfengine3-legacy/files/patch-af
@@ -0,0 +1,13 @@
+Fix the linking so only cfd is linked with pthreads. This keeps cfengine
+from trying to use thread-unsafe resolver functions.
+
+--- src/Makefile.am.orig	Fri Aug 10 23:58:47 2001
++++ src/Makefile.am	Fri Aug 10 23:59:07 2001
+@@ -95,6 +95,7 @@
+ 	patches.c
+ 
+ cfd_LDADD = -L../pub -lpub $(LEXLIB)
++cfd_LDFLAGS = -pthread $(LDFLAGS)
+ 
+ cfrun_SOURCES =								\
+ 	cfrun.c								\
diff --git a/sysutils/cfengine3-legacy/files/patch-ag b/sysutils/cfengine3-legacy/files/patch-ag
new file mode 100644
index 000000000000..1a8101cb3542
--- /dev/null
+++ b/sysutils/cfengine3-legacy/files/patch-ag
@@ -0,0 +1,13 @@
+This fixes the problem with cfd not finding the correct interfaces.
+
+--- src/misc.c.orig	Wed Jan 24 07:28:01 2001
++++ src/misc.c	Fri Aug 10 23:34:45 2001
+@@ -284,7 +284,7 @@
+ list.ifc_len = sizeof(ifbuf);
+ list.ifc_req = ifbuf;
+ 
+-if (ioctl(fd, SIOCGIFCONF, &list) == -1 || (list.ifc_len < (sizeof(struct ifreq))))
++if (ioctl(fd, OSIOCGIFCONF, &list) == -1 || (list.ifc_len < (sizeof(struct ifreq))))
+    {
+    CfLog(cferror,"Couldn't get interfaces","ioctl");
+    exit(1);
diff --git a/sysutils/cfengine3-legacy/pkg-plist b/sysutils/cfengine3-legacy/pkg-plist
index 7d216a6c6d18..50e59a2aba1f 100644
--- a/sysutils/cfengine3-legacy/pkg-plist
+++ b/sysutils/cfengine3-legacy/pkg-plist
@@ -50,4 +50,7 @@ share/cfengine/start-cfd
 %%PORTDOCS%%share/doc/cfengine/cf-security.html
 %%PORTDOCS%%share/doc/cfengine/cfengine-Reference.html
 %%PORTDOCS%%share/doc/cfengine/cfengine-Tutorial.html
+%%PORTDOCS%%share/doc/cfengine/locks.ps
+%%PORTDOCS%%share/doc/cfengine/paper1.ps
+%%PORTDOCS%%share/doc/cfengine/paper2.ps
 %%PORTDOCS%%@dirrm share/doc/cfengine
diff --git a/sysutils/cfengine3/Makefile b/sysutils/cfengine3/Makefile
index 2cde1d8e5757..38c9eab80852 100644
--- a/sysutils/cfengine3/Makefile
+++ b/sysutils/cfengine3/Makefile
@@ -7,13 +7,13 @@
 
 PORTNAME=	cfengine
 PORTVERSION=	1.6.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.iu.hioslo.no/pub/cfengine/ \
 		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	gordont@bluemtn.net
+MAINTAINER=	gordont@gnf.org
 
 LIB_DEPENDS=	db3:${PORTSDIR}/databases/db3
 .if defined(PACKAGE_BUILDING) && !exists(/usr/include/tcpd.h)
diff --git a/sysutils/cfengine3/files/patch-ac b/sysutils/cfengine3/files/patch-ac
index 402872a89106..673d7d0c722d 100644
--- a/sysutils/cfengine3/files/patch-ac
+++ b/sysutils/cfengine3/files/patch-ac
@@ -18,11 +18,11 @@
  		$PATH:$prefix/bin:/usr/bin:/usr/local/bin)
  
  
-@@ -262,6 +262,7 @@
+@@ -262,7 +262,7 @@
     freebsd*)
  	AC_DEFINE(FREEBSD)
-          CFLAGS="$CFLAGS -pthread"
-+         LIBS="$LIBS -ldes"
+-         CFLAGS="$CFLAGS -pthread"
++	LIBS="$LIBS -ldes"
          AC_CHECK_HEADERS(pthread.h)
          ;;
     netbsd*)
diff --git a/sysutils/cfengine3/files/patch-af b/sysutils/cfengine3/files/patch-af
new file mode 100644
index 000000000000..c7a33e7b209e
--- /dev/null
+++ b/sysutils/cfengine3/files/patch-af
@@ -0,0 +1,13 @@
+Fix the linking so only cfd is linked with pthreads. This keeps cfengine
+from trying to use thread-unsafe resolver functions.
+
+--- src/Makefile.am.orig	Fri Aug 10 23:58:47 2001
++++ src/Makefile.am	Fri Aug 10 23:59:07 2001
+@@ -95,6 +95,7 @@
+ 	patches.c
+ 
+ cfd_LDADD = -L../pub -lpub $(LEXLIB)
++cfd_LDFLAGS = -pthread $(LDFLAGS)
+ 
+ cfrun_SOURCES =								\
+ 	cfrun.c								\
diff --git a/sysutils/cfengine3/files/patch-ag b/sysutils/cfengine3/files/patch-ag
new file mode 100644
index 000000000000..1a8101cb3542
--- /dev/null
+++ b/sysutils/cfengine3/files/patch-ag
@@ -0,0 +1,13 @@
+This fixes the problem with cfd not finding the correct interfaces.
+
+--- src/misc.c.orig	Wed Jan 24 07:28:01 2001
++++ src/misc.c	Fri Aug 10 23:34:45 2001
+@@ -284,7 +284,7 @@
+ list.ifc_len = sizeof(ifbuf);
+ list.ifc_req = ifbuf;
+ 
+-if (ioctl(fd, SIOCGIFCONF, &list) == -1 || (list.ifc_len < (sizeof(struct ifreq))))
++if (ioctl(fd, OSIOCGIFCONF, &list) == -1 || (list.ifc_len < (sizeof(struct ifreq))))
+    {
+    CfLog(cferror,"Couldn't get interfaces","ioctl");
+    exit(1);
diff --git a/sysutils/cfengine3/pkg-plist b/sysutils/cfengine3/pkg-plist
index 7d216a6c6d18..50e59a2aba1f 100644
--- a/sysutils/cfengine3/pkg-plist
+++ b/sysutils/cfengine3/pkg-plist
@@ -50,4 +50,7 @@ share/cfengine/start-cfd
 %%PORTDOCS%%share/doc/cfengine/cf-security.html
 %%PORTDOCS%%share/doc/cfengine/cfengine-Reference.html
 %%PORTDOCS%%share/doc/cfengine/cfengine-Tutorial.html
+%%PORTDOCS%%share/doc/cfengine/locks.ps
+%%PORTDOCS%%share/doc/cfengine/paper1.ps
+%%PORTDOCS%%share/doc/cfengine/paper2.ps
 %%PORTDOCS%%@dirrm share/doc/cfengine