From acidos@grimore.bandwidth-junkies.net  Wed Aug 11 13:00:53 2004
Return-Path: <acidos@grimore.bandwidth-junkies.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 2784916A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 11 Aug 2004 13:00:53 +0000 (GMT)
Received: from regen.bandwidth-junkies.net (pcp248006pcs.howard01.md.comcast.net [68.55.69.153])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5CB3E43D39
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 11 Aug 2004 13:00:44 +0000 (GMT)
	(envelope-from acidos@grimore.bandwidth-junkies.net)
Received: from regen.bandwidth-junkies.net (localhost.bandwidth-junkies.net [127.0.0.1])
	by regen.bandwidth-junkies.net (8.12.10/8.12.10) with ESMTP id i7BD3UEl007402
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 11 Aug 2004 09:03:30 -0400 (EDT)
	(envelope-from acidos@grimore.bandwidth-junkies.net)
Received: (from acidos@localhost)
	by regen.bandwidth-junkies.net (8.12.10/8.12.10/Submit) id i7BD3UnJ007401;
	Wed, 11 Aug 2004 09:03:30 -0400 (EDT)
	(envelope-from acidos)
Message-Id: <200408111303.i7BD3UnJ007401@regen.bandwidth-junkies.net>
Date: Wed, 11 Aug 2004 09:03:30 -0400 (EDT)
From: Adam VanderHook <acidos@bandwidth-junkies.net>
Reply-To: Adam VanderHook <acidos@bandwidth-junkies.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Update sysutils/cfengine2 to 2.1.9
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         70301
>Category:       ports
>Synopsis:       Update sysutils/cfengine2 to 2.1.9
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 11 13:10:21 GMT 2004
>Closed-Date:    Mon Oct 11 23:44:52 GMT 2004
>Last-Modified:  Mon Oct 11 23:44:52 GMT 2004
>Originator:     Adam VanderHook
>Release:        FreeBSD 5.2.1-RELEASE i386
>Organization:
>Environment:
System: FreeBSD regen.bandwidth-junkies.net 5.2.1-RELEASE FreeBSD 5.2.1-RELEASE #1: Sun May 30 14:27:59 EDT 2004 root@regen.bandwidth-junkies.net:/usr/obj/usr/src/sys/REGEN i386


>Description:

	This diff updates sysutils/cfengine2 from 2.1.5 to 2.1.9.  This solves a heap
	vulnerability in authentication with 2.1.5.  Additionally, this fixes broken
	e-mailing of reports from cfexecd (2.1.5 misparses the config).

>How-To-Repeat:

>Fix:

diff -u -r /usr/ports/sysutils/cfengine2/Makefile cfengine2/Makefile
--- /usr/ports/sysutils/cfengine2/Makefile	Fri Apr 30 10:26:58 2004
+++ cfengine2/Makefile	Wed Aug 11 08:19:59 2004
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cfengine2
-PORTVERSION=	2.1.5
+PORTVERSION=	2.1.9
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.iu.hio.no/pub/cfengine/ \
 		${MASTER_SITE_GNU}
diff -u -r /usr/ports/sysutils/cfengine2/distinfo cfengine2/distinfo
--- /usr/ports/sysutils/cfengine2/distinfo	Fri Apr 30 10:26:58 2004
+++ cfengine2/distinfo	Wed Aug 11 08:25:42 2004
@@ -1,2 +1,2 @@
-MD5 (cfengine-2.1.5.tar.gz) = 0c7c15d646defe23123708ee836b4040
-SIZE (cfengine-2.1.5.tar.gz) = 1852357
+MD5 (cfengine-2.1.9.tar.gz) = 421ac1ba0fd9cbe0384f1b0eded1afd8
+SIZE (cfengine-2.1.9.tar.gz) = 3099090
Only in /usr/ports/sysutils/cfengine2/files: patch-doc_Makefile.in
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: sem 
State-Changed-When: Wed Aug 11 13:56:06 GMT 2004 
State-Changed-Why:  
Wait for maintainer approval. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=70301 

From: Sergey Matveychuk <sem@FreeBSD.org>
To: Adam VanderHook <acidos@bandwidth-junkies.net>
Cc: FreeBSD-gnats-submit@FreeBSD.org, paul@aps.org
Subject: Re: ports/70301: Update sysutils/cfengine2 to 2.1.9
Date: Wed, 11 Aug 2004 17:54:40 +0400

 Dear maintainer, approve or disprove the PR please.
 
 -- 
 Sem.

From: Michael Ranner <mranner@inode.at>
To: freebsd-gnats-submit@FreeBSD.org, acidos@bandwidth-junkies.net
Cc: paul@aps.org, sem@FreeBSD.org
Subject: Re: ports/70301: Update sysutils/cfengine2 to 2.1.9
Date: Sun, 15 Aug 2004 16:57:58 +0200

 There are more necessary changes not only bumping PORTVERSION and make 
 makesum:
 
 diff -crN cfengine2/Makefile cfengine2.update/Makefile
 *** cfengine2/Makefile	Sun May  2 17:21:02 2004
 --- cfengine2.update/Makefile	Sun Aug 15 16:53:10 2004
 ***************
 *** 6,12 ****
   #
   
   PORTNAME=	cfengine2
 ! PORTVERSION=	2.1.5
   CATEGORIES=	sysutils
   MASTER_SITES=	ftp://ftp.iu.hio.no/pub/cfengine/ \
   		${MASTER_SITE_GNU}
 --- 6,12 ----
   #
   
   PORTNAME=	cfengine2
 ! PORTVERSION=	2.1.9
   CATEGORIES=	sysutils
   MASTER_SITES=	ftp://ftp.iu.hio.no/pub/cfengine/ \
   		${MASTER_SITE_GNU}
 ***************
 *** 21,27 ****
   USE_OPENSSL=	yes
   GNU_CONFIGURE=	yes
   CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 ! CONFIGURE_ARGS=	--with-berkeleydb=${LOCALBASE}
   
   INFO=		cfengine-Anomalies cfengine-Reference cfengine-Tutorial
   MAN8=		cfengine.8 cfagent.8 cfenvd.8 cfenvgraph.8 cfexecd.8 cfkey.8 \
 --- 21,27 ----
   USE_OPENSSL=	yes
   GNU_CONFIGURE=	yes
   CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 ! CONFIGURE_ARGS=	--with-berkeleydb=${LOCALBASE} --with-docs
   
   INFO=		cfengine-Anomalies cfengine-Reference cfengine-Tutorial
   MAN8=		cfengine.8 cfagent.8 cfenvd.8 cfenvgraph.8 cfexecd.8 cfkey.8 \
 diff -crN cfengine2/distinfo cfengine2.update/distinfo
 *** cfengine2/distinfo	Sun May  2 17:21:02 2004
 --- cfengine2.update/distinfo	Sun Aug 15 16:53:10 2004
 ***************
 *** 1,2 ****
 ! MD5 (cfengine-2.1.5.tar.gz) = 0c7c15d646defe23123708ee836b4040
 ! SIZE (cfengine-2.1.5.tar.gz) = 1852357
 --- 1,2 ----
 ! MD5 (cfengine-2.1.9.tar.gz) = 421ac1ba0fd9cbe0384f1b0eded1afd8
 ! SIZE (cfengine-2.1.9.tar.gz) = 3099090
 diff -crN cfengine2/files/patch-doc_Makefile.in 
 cfengine2.update/files/patch-doc_Makefile.in
 *** cfengine2/files/patch-doc_Makefile.in	Fri Mar  5 23:08:23 2004
 --- cfengine2.update/files/patch-doc_Makefile.in	Sun Aug 15 16:53:05 2004
 ***************
 *** 1,5 ****
 ! --- doc/Makefile.in.orig	Mon Feb  9 16:17:57 2004
 ! +++ doc/Makefile.in	Thu Feb 26 17:46:02 2004
   @@ -70,7 +70,7 @@
    docDATA_INSTALL = $(INSTALL_DATA)
    htmlDATA_INSTALL = $(INSTALL_DATA)
 --- 1,5 ----
 ! --- doc/Makefile.in.orig	Mon Aug  9 19:27:42 2004
 ! +++ doc/Makefile.in	Sun Aug 15 16:30:38 2004
   @@ -70,7 +70,7 @@
    docDATA_INSTALL = $(INSTALL_DATA)
    htmlDATA_INSTALL = $(INSTALL_DATA)
 ***************
 *** 9,37 ****
    DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    ACLOCAL = @ACLOCAL@
    AMDEP_FALSE = @AMDEP_FALSE@
 ! @@ -182,10 +182,10 @@
    target_vendor = @target_vendor@
    man_MANS = cfengine.8 cfagent.8  cfenvd.8  cfenvgraph.8  cfexecd.8  cfkey.8  
 cfrun.8  cfservd.8
    info_TEXINFOS = cfengine-Reference.texinfo cfengine-Tutorial.texinfo 
 cfengine-Anomalies.texinfo
   -docdir = $(prefix)/doc/$(PACKAGE)-$(VERSION)
   +docdir = $(prefix)/share/doc/cfengine2
    doc_DATA = 
    # Info used in building and installing HTML files
   -htmldir = $(pkgdatadir)/html
   +htmldir = $(docdir)
    htmlfiles = cfengine-Reference.html cfengine-Tutorial.html 
 cfengine-Anomalies.html
    html_DATA = $(htmlfiles)
    
 ! @@ -196,7 +196,7 @@
 !  # When the Texi2DVI problem with cfengine-Reference is corrected, 
 !  # then uncomment the reference to ps2
 !  psfiles = $(ps2)
   -psdir = $(pkgdatadir)/doc
   +psdir = $(docdir)
 !  ps_DATA = $(psfiles)
    MAKEINFOHTML = $(MAKEINFO) --html --no-split
    
 ! @@ -708,7 +708,7 @@
    info-am: $(INFO_DEPS)
    
    install-data-am: install-docDATA install-htmlDATA install-info-am \
 --- 9,37 ----
    DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    ACLOCAL = @ACLOCAL@
    AMDEP_FALSE = @AMDEP_FALSE@
 ! @@ -184,18 +184,18 @@
    target_vendor = @target_vendor@
    man_MANS = cfengine.8 cfagent.8  cfenvd.8  cfenvgraph.8  cfexecd.8  cfkey.8  
 cfrun.8  cfservd.8
    info_TEXINFOS = cfengine-Reference.texinfo cfengine-Tutorial.texinfo 
 cfengine-Anomalies.texinfo
   -docdir = $(prefix)/doc/$(PACKAGE)-$(VERSION)
   +docdir = $(prefix)/share/doc/cfengine2
    doc_DATA = 
 +  
    # Info used in building and installing HTML files
   -htmldir = $(pkgdatadir)/html
   +htmldir = $(docdir)
    htmlfiles = cfengine-Reference.html cfengine-Tutorial.html 
 cfengine-Anomalies.html
    html_DATA = $(htmlfiles)
    
 !  # Info used in building and installing Postscript files
 !  psfiles = cfengine-Tutorial.ps cfengine-Reference.ps cfengine-Anomalies.ps
 !  pdffiles = cfengine-Tutorial.pdf cfengine-Reference.pdf 
 cfengine-Anomalies.pdf
   -psdir = $(pkgdatadir)/doc
   +psdir = $(docdir)
 !  ps_DATA = $(psfiles) $(pdffiles)
    MAKEINFOHTML = $(MAKEINFO) --html --no-split
    
 ! @@ -709,7 +709,7 @@
    info-am: $(INFO_DEPS)
    
    install-data-am: install-docDATA install-htmlDATA install-info-am \
 ***************
 *** 40,46 ****
    
    install-exec-am:
    
 ! @@ -768,7 +768,7 @@
    ps-am: $(PSS)
    
    uninstall-am: uninstall-docDATA uninstall-htmlDATA uninstall-info-am \
 --- 40,46 ----
    
    install-exec-am:
    
 ! @@ -769,7 +769,7 @@
    ps-am: $(PSS)
    
    uninstall-am: uninstall-docDATA uninstall-htmlDATA uninstall-info-am \

From: Paul Dlug <paul@aps.org>
To: Michael Ranner <mranner@inode.at>
Cc: acidos@bandwidth-junkies.net, sem@FreeBSD.org,
	freebsd-gnats-submit@FreeBSD.org
Subject: Re: ports/70301: Update sysutils/cfengine2 to 2.1.9
Date: Sun, 15 Aug 2004 11:40:54 -0400

 The patch looks great, thanks. I modified it to use db42 by default or 
 optionally db41. Original patch plus this addition is below. I think 
 it's ready to be committed. I tested under 5.2.1 and 4.9
 
 
 diff -urN cfengine2/Makefile cfengine2.update/Makefile
 --- cfengine2/Makefile  Sun Aug 15 11:29:02 2004
 +++ cfengine2.update/Makefile   Sun Aug 15 11:35:41 2004
 @@ -6,7 +6,7 @@
   #
 
   PORTNAME=      cfengine2
 -PORTVERSION=   2.1.5
 +PORTVERSION=   2.1.9
   CATEGORIES=    sysutils
   MASTER_SITES=  ftp://ftp.iu.hio.no/pub/cfengine/ \
                  ${MASTER_SITE_GNU}
 @@ -16,15 +16,26 @@
   MAINTAINER=    paul@aps.org
   COMMENT=       A systems administration tool for networks
 
 -LIB_DEPENDS=   db41:${PORTSDIR}/databases/db41
 -
   USE_OPENSSL=   yes
   GNU_CONFIGURE= yes
   CONFIGURE_TARGET=      --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 -CONFIGURE_ARGS=        --with-berkeleydb=${LOCALBASE}
 +CONFIGURE_ARGS=        --with-berkeleydb=${LOCALBASE} --with-docs
 
   INFO=          cfengine-Anomalies cfengine-Reference cfengine-Tutorial
   MAN8=          cfengine.8 cfagent.8 cfenvd.8 cfenvgraph.8 cfexecd.8 
 cfkey.8 \
                          cfrun.8 cfservd.8
 +
 +WITH_BDB_VER?=                 42
 +
 +.if ${WITH_BDB_VER} == 42
 +BDBLIB=                                        db-4.2.2
 +.elif ${WITH_BDB_VER} == 41
 +BDBLIB=                                        db41.1
 +.else
 +.error WITH_BDB_VER must be 41 or 42
 +.endif
 +
 +LIB_DEPENDS+=          
 ${BDBLIB}:${PORTSDIR}/databases/db${WITH_BDB_VER}
 +
 
   .include <bsd.port.mk>
 diff -urN cfengine2/distinfo cfengine2.update/distinfo
 --- cfengine2/distinfo  Sun Aug 15 11:29:02 2004
 +++ cfengine2.update/distinfo   Sun Aug 15 11:21:24 2004
 @@ -1,2 +1,2 @@
 -MD5 (cfengine-2.1.5.tar.gz) = 0c7c15d646defe23123708ee836b4040
 -SIZE (cfengine-2.1.5.tar.gz) = 1852357
 +MD5 (cfengine-2.1.9.tar.gz) = 421ac1ba0fd9cbe0384f1b0eded1afd8
 +SIZE (cfengine-2.1.9.tar.gz) = 3099090
 diff -urN cfengine2/files/patch-doc_Makefile.in 
 cfengine2.update/files/patch-doc_Makefile.in
 --- cfengine2/files/patch-doc_Makefile.in       Sun Aug 15 11:29:02 2004
 +++ cfengine2.update/files/patch-doc_Makefile.in        Sun Aug 15 
 11:21:24 2004
 @@ -1,5 +1,5 @@
 ---- doc/Makefile.in.orig       Mon Feb  9 16:17:57 2004
 -+++ doc/Makefile.in    Thu Feb 26 17:46:02 2004
 +--- doc/Makefile.in.orig       Mon Aug  9 19:27:42 2004
 ++++ doc/Makefile.in    Sun Aug 15 16:30:38 2004
   @@ -70,7 +70,7 @@
    docDATA_INSTALL = $(INSTALL_DATA)
    htmlDATA_INSTALL = $(INSTALL_DATA)
 @@ -9,29 +9,29 @@
    DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    ACLOCAL = @ACLOCAL@
    AMDEP_FALSE = @AMDEP_FALSE@
 -@@ -182,10 +182,10 @@
 +@@ -184,18 +184,18 @@
    target_vendor = @target_vendor@
    man_MANS = cfengine.8 cfagent.8  cfenvd.8  cfenvgraph.8  cfexecd.8  
 cfkey.8  cfrun.8  cfservd.8
    info_TEXINFOS = cfengine-Reference.texinfo cfengine-Tutorial.texinfo 
 cfengine-Anomalies.texinfo
   -docdir = $(prefix)/doc/$(PACKAGE)-$(VERSION)
   +docdir = $(prefix)/share/doc/cfengine2
    doc_DATA =
 +
    # Info used in building and installing HTML files
   -htmldir = $(pkgdatadir)/html
   +htmldir = $(docdir)
    htmlfiles = cfengine-Reference.html cfengine-Tutorial.html 
 cfengine-Anomalies.html
    html_DATA = $(htmlfiles)
 
 -@@ -196,7 +196,7 @@
 - # When the Texi2DVI problem with cfengine-Reference is corrected,
 - # then uncomment the reference to ps2
 - psfiles = $(ps2)
 + # Info used in building and installing Postscript files
 + psfiles = cfengine-Tutorial.ps cfengine-Reference.ps 
 cfengine-Anomalies.ps
 + pdffiles = cfengine-Tutorial.pdf cfengine-Reference.pdf 
 cfengine-Anomalies.pdf
   -psdir = $(pkgdatadir)/doc
   +psdir = $(docdir)
 - ps_DATA = $(psfiles)
 + ps_DATA = $(psfiles) $(pdffiles)
    MAKEINFOHTML = $(MAKEINFO) --html --no-split
 
 -@@ -708,7 +708,7 @@
 +@@ -709,7 +709,7 @@
    info-am: $(INFO_DEPS)
 
    install-data-am: install-docDATA install-htmlDATA install-info-am \
 @@ -40,7 +40,7 @@
 
    install-exec-am:
 
 -@@ -768,7 +768,7 @@
 +@@ -769,7 +769,7 @@
    ps-am: $(PSS)
 
    uninstall-am: uninstall-docDATA uninstall-htmlDATA uninstall-info-am \
 
State-Changed-From-To: feedback->closed 
State-Changed-By: pav 
State-Changed-When: Mon Oct 11 23:44:40 GMT 2004 
State-Changed-Why:  
Replaced by ports/72066 

http://www.freebsd.org/cgi/query-pr.cgi?pr=70301 
>Unformatted:
