From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Sep 24 17:30:22 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8C58416A4CE for ; Fri, 24 Sep 2004 17:30:22 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 65DDA43D49 for ; Fri, 24 Sep 2004 17:30:22 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i8OHUMfr044936 for ; Fri, 24 Sep 2004 17:30:22 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i8OHUMwM044930; Fri, 24 Sep 2004 17:30:22 GMT (envelope-from gnats) Resent-Date: Fri, 24 Sep 2004 17:30:22 GMT Resent-Message-Id: <200409241730.i8OHUMwM044930@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Kevin Way Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0A43C16A4CE for ; Fri, 24 Sep 2004 17:21:08 +0000 (GMT) Received: from krill.titanresearch.com (krill.titanresearch.com [216.12.208.220]) by mx1.FreeBSD.org (Postfix) with ESMTP id CA93C43D2D for ; Fri, 24 Sep 2004 17:21:05 +0000 (GMT) (envelope-from kway@krill.titanresearch.com) Received: from kway by krill.titanresearch.com with local (Exim 4.42 (FreeBSD)) id 1CAtkn-000LQH-6Y for FreeBSD-gnats-submit@freebsd.org; Fri, 24 Sep 2004 13:21:05 -0400 Message-Id: Date: Fri, 24 Sep 2004 13:21:05 -0400 From: Kevin Way Sender: Mosch To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/72066: [patch] Update sysutils/cfengine2 to 2.1.10 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Kevin Way List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Sep 2004 17:30:22 -0000 >Number: 72066 >Category: ports >Synopsis: [patch] Update sysutils/cfengine2 to 2.1.10 >Confidential: no >Severity: critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Sep 24 17:30:21 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Kevin Way >Release: FreeBSD 4.10-RELEASE-p2 i386 >Organization: InsideSystems >Environment: System: FreeBSD krill.titanresearch.com 4.10-RELEASE-p2 FreeBSD 4.10-RELEASE-p2 #8: Fri Sep 10 23:01:19 EDT 2004 root@scratch.overtone.org:/usr/obj/usr/src/sys/SERVER i386 Any OS, cfengine-2.1.5 running as a daemon. >Description: cfengine 2.1.5 is vulnerable to remote root exploit, and denial of service. as described http://www.coresecurity.com/common/showdoc.php?idx=387&idxseccion=10 >How-To-Repeat: >Fix: Upgrade port to cfengine 2.1.10 diff -ruN cfengine2.orig/Makefile cfengine2/Makefile --- cfengine2.orig/Makefile Mon Sep 13 18:55:47 2004 +++ cfengine2/Makefile Mon Sep 13 20:09:42 2004 @@ -6,7 +6,7 @@ # PORTNAME= cfengine2 -PORTVERSION= 2.1.5 +PORTVERSION= 2.1.10 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.iu.hio.no/pub/cfengine/ \ ${MASTER_SITE_GNU} @@ -16,15 +16,25 @@ 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?= 41 + +.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 diff -ruN cfengine2.orig/distinfo cfengine2/distinfo --- cfengine2.orig/distinfo Mon Sep 13 18:55:47 2004 +++ cfengine2/distinfo Mon Sep 13 18:59:40 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.10.tar.gz) = 7a867c74ca3ad806a41b6f7339e67fa3 +SIZE (cfengine-2.1.10.tar.gz) = 3100323 diff -ruN cfengine2.orig/files/patch-contrib_Makefile.in cfengine2/files/patch-contrib_Makefile.in --- cfengine2.orig/files/patch-contrib_Makefile.in Mon Sep 13 18:55:47 2004 +++ cfengine2/files/patch-contrib_Makefile.in Mon Sep 13 19:25:02 2004 @@ -1,5 +1,5 @@ ---- contrib/Makefile.in.orig Tue Jan 27 01:34:49 2004 -+++ contrib/Makefile.in Tue Jan 27 01:35:03 2004 +--- contrib/Makefile.in.orig Mon Sep 13 19:21:57 2004 ++++ contrib/Makefile.in Mon Sep 13 19:22:23 2004 @@ -17,7 +17,7 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -9,3 +9,4 @@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. + diff -ruN cfengine2.orig/files/patch-doc_Makefile.in cfengine2/files/patch-doc_Makefile.in --- cfengine2.orig/files/patch-doc_Makefile.in Mon Sep 13 18:55:47 2004 +++ cfengine2/files/patch-doc_Makefile.in Mon Sep 13 19:40:12 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 Sep 13 19:37:05 2004 ++++ doc/Makefile.in Mon Sep 13 19:39:34 2004 @@ -70,7 +70,7 @@ docDATA_INSTALL = $(INSTALL_DATA) htmlDATA_INSTALL = $(INSTALL_DATA) @@ -9,38 +9,38 @@ 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 \ - install-man install-psDATA -+ install-man ++ install-man install-exec-am: -@@ -768,7 +768,7 @@ +@@ -769,7 +769,7 @@ ps-am: $(PSS) uninstall-am: uninstall-docDATA uninstall-htmlDATA uninstall-info-am \ diff -ruN cfengine2.orig/files/patch-inputs_Makefile.in cfengine2/files/patch-inputs_Makefile.in --- cfengine2.orig/files/patch-inputs_Makefile.in Mon Sep 13 18:55:47 2004 +++ cfengine2/files/patch-inputs_Makefile.in Mon Sep 13 19:27:03 2004 @@ -1,6 +1,6 @@ ---- inputs/Makefile.in.orig Tue Jan 27 01:33:35 2004 -+++ inputs/Makefile.in Tue Jan 27 01:34:11 2004 -@@ -20,7 +20,7 @@ +--- inputs/Makefile.in.orig Mon Sep 13 19:25:42 2004 ++++ inputs/Makefile.in Mon Sep 13 19:25:57 2004 +@@ -17,7 +17,7 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -9,3 +9,4 @@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. + >Release-Note: >Audit-Trail: >Unformatted: