Date: Sun, 12 Aug 2001 12:16:39 -0700 (PDT) From: Gordon Tetlow <gordont@gnf.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/29649: Update of cfengine port Message-ID: <200108121916.f7CJGd380078@hobbes.melthusia.org>
next in thread | raw e-mail | index | archive | help
>Number: 29649 >Category: ports >Synopsis: Update of cfengine port >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Aug 12 12:20:30 PDT 2001 >Closed-Date: >Last-Modified: >Originator: Gordon Tetlow >Release: FreeBSD 4.3-STABLE i386 >Organization: GNF >Environment: N/A >Description: 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. While we are at it, update my email address and add some optional documentation that I should have added earlier. Patches obtained from Michael Kyle <mike@rainc.com> They were slightly massaged to fit better. >How-To-Repeat: run cfd. run cfengine and wait for it to deadlock. >Fix: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/sysutils/cfengine/Makefile,v retrieving revision 1.17 diff -u -r1.17 Makefile --- Makefile 2001/04/02 10:21:18 1.17 +++ Makefile 2001/08/11 07:12:06 @@ -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) Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/sysutils/cfengine/pkg-plist,v retrieving revision 1.5 diff -u -r1.5 pkg-plist --- pkg-plist 2001/04/02 10:21:18 1.5 +++ pkg-plist 2001/08/11 07:12:06 @@ -50,4 +50,7 @@ %%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 Index: files/patch-ac =================================================================== RCS file: /home/ncvs/ports/sysutils/cfengine/files/patch-ac,v retrieving revision 1.3 diff -u -r1.3 patch-ac --- files/patch-ac 2001/01/23 08:58:29 1.3 +++ files/patch-ac 2001/08/11 07:12:06 @@ -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*) --- /dev/null Sat Aug 11 00:09:31 2001 +++ files/patch-af Fri Aug 10 23:59:50 2001 @@ -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 \ --- /dev/null Sat Aug 11 00:09:31 2001 +++ files/patch-ag Fri Aug 10 23:41:27 2001 @@ -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); >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200108121916.f7CJGd380078>