ports/56710: Update sysutils/cfengine2 to 2.0.8p1
Paul Dlug
paul at aps.org
Thu Sep 11 16:50:16 UTC 2003
>Number: 56710
>Category: ports
>Synopsis: Update sysutils/cfengine2 to 2.0.8p1
>Confidential: no
>Severity: serious
>Priority: high
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Sep 11 09:50:12 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Paul Dlug
>Release: FreeBSD 5.1-RELEASE-p2 i386
>Organization:
>Environment:
System: FreeBSD lugnut.aps.org 5.1-RELEASE-p2 FreeBSD 5.1-RELEASE-p2 #2: Mon Aug 11 14:37:47 EDT 2003 root at lugnut.aps.org:/usr/obj/usr/src/sys/LUGNUT i386
>Description:
The attached diff updates cfengine2 to 2.0.8p1 which includes new features, performance enhancements for file copies and security patches.
NOTE: Previous submission of this accidently included a diff of the extracted port, please ignore. (Sorry for the inconvenience).
>How-To-Repeat:
>Fix:
--- cfengine2.diff begins here ---
diff -urN cfengine2.orig/Makefile cfengine2/Makefile
--- cfengine2.orig/Makefile Wed Sep 10 14:06:03 2003
+++ cfengine2/Makefile Thu Sep 11 12:44:57 2003
@@ -6,7 +6,7 @@
#
PORTNAME= cfengine2
-PORTVERSION= 2.0.3
+PORTVERSION= 2.0.8p1
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.iu.hio.no/pub/cfengine/ \
${MASTER_SITE_GNU}
diff -urN cfengine2.orig/distinfo cfengine2/distinfo
--- cfengine2.orig/distinfo Wed Sep 10 14:06:03 2003
+++ cfengine2/distinfo Thu Sep 11 12:44:57 2003
@@ -1 +1 @@
-MD5 (cfengine-2.0.3.tar.gz) = 55df32a5856e5d267f895ec1dc6b2511
+MD5 (cfengine-2.0.8p1.tar.gz) = 17f9647edcc955e5c07489a6ac6126b1
diff -urN cfengine2.orig/files/patch-configure cfengine2/files/patch-configure
--- cfengine2.orig/files/patch-configure Wed Sep 10 14:06:03 2003
+++ cfengine2/files/patch-configure Thu Sep 11 12:44:57 2003
@@ -1,55 +0,0 @@
-Accept the -STABLE version of OpenSSL
-Use the correct #includes for sys/mount.h
-
---- configure.orig Mon Jul 29 15:32:39 2002
-+++ configure Mon Jul 29 15:35:41 2002
-@@ -3637,8 +3637,8 @@
- if test x"$OPENSSL_LIB_DIR" = xno ; then
- echo "$as_me:3638: result: no" >&5
- echo "${ECHO_T}no" >&6
-- { { echo "$as_me:3640: error: This release of cfengine requires OpenSSL 0.9.6b or later" >&5
--echo "$as_me: error: This release of cfengine requires OpenSSL 0.9.6b or later" >&2;}
-+ { { echo "$as_me:3640: error: This release of cfengine requires OpenSSL 0.9.6a or later" >&5
-+echo "$as_me: error: This release of cfengine requires OpenSSL 0.9.6a or later" >&2;}
- { (exit 1); exit 1; }; }
- else
- if test x"$OPENSSL_LIB_DIR" = xyes ; then
-@@ -3700,7 +3700,7 @@
- #include <openssl/opensslv.h>
- int main(void)
- {
-- if (OPENSSL_VERSION_NUMBER < 0x0090602fL)
-+ if (OPENSSL_VERSION_NUMBER < 0x0090601fL)
- exit(1);
- exit(0);
- }
-@@ -3723,8 +3723,8 @@
- echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--{ { echo "$as_me:3726: error: This release of cfengine requires openssl 0.9.6b or later" >&5
--echo "$as_me: error: This release of cfengine requires openssl 0.9.6b or later" >&2;}
-+{ { echo "$as_me:3726: error: This release of cfengine requires openssl 0.9.6a or later" >&5
-+echo "$as_me: error: This release of cfengine requires openssl 0.9.6a or later" >&2;}
- { (exit 1); exit 1; }; }
-
- fi
-@@ -4098,6 +4098,7 @@
- cat >conftest.$ac_ext <<_ACEOF
- #line 4099 "configure"
- #include "confdefs.h"
-+#include <sys/param.h>
- #include <$ac_header>
- _ACEOF
- if { (eval echo "$as_me:4103: \"$ac_cpp conftest.$ac_ext\"") >&5
-@@ -8485,8 +8486,8 @@
- echo "$as_me: WARNING: This version requires Berkeley db version 3.2 or" >&2;}
- { echo "$as_me:8486: WARNING: later from www.sleepycat.com" >&5
- echo "$as_me: WARNING: later from www.sleepycat.com" >&2;}
--{ echo "$as_me:8488: WARNING: This version requires OpenSSL 0.9.6b or later" >&5
--echo "$as_me: WARNING: This version requires OpenSSL 0.9.6b or later" >&2;}
-+{ echo "$as_me:8488: WARNING: This version requires OpenSSL 0.9.6a or later" >&5
-+echo "$as_me: WARNING: This version requires OpenSSL 0.9.6a or later" >&2;}
- { echo "$as_me:8490: WARNING: from www.openssl.org" >&5
- echo "$as_me: WARNING: from www.openssl.org" >&2;}
- { echo "$as_me:8492: WARNING: " >&5
diff -urN cfengine2.orig/files/patch-configure.orig cfengine2/files/patch-configure.orig
--- cfengine2.orig/files/patch-configure.orig Wed Dec 31 19:00:00 1969
+++ cfengine2/files/patch-configure.orig Tue Jul 30 14:34:24 2002
@@ -0,0 +1,55 @@
+Accept the -STABLE version of OpenSSL
+Use the correct #includes for sys/mount.h
+
+--- configure.orig Mon Jul 29 15:32:39 2002
++++ configure Mon Jul 29 15:35:41 2002
+@@ -3637,8 +3637,8 @@
+ if test x"$OPENSSL_LIB_DIR" = xno ; then
+ echo "$as_me:3638: result: no" >&5
+ echo "${ECHO_T}no" >&6
+- { { echo "$as_me:3640: error: This release of cfengine requires OpenSSL 0.9.6b or later" >&5
+-echo "$as_me: error: This release of cfengine requires OpenSSL 0.9.6b or later" >&2;}
++ { { echo "$as_me:3640: error: This release of cfengine requires OpenSSL 0.9.6a or later" >&5
++echo "$as_me: error: This release of cfengine requires OpenSSL 0.9.6a or later" >&2;}
+ { (exit 1); exit 1; }; }
+ else
+ if test x"$OPENSSL_LIB_DIR" = xyes ; then
+@@ -3700,7 +3700,7 @@
+ #include <openssl/opensslv.h>
+ int main(void)
+ {
+- if (OPENSSL_VERSION_NUMBER < 0x0090602fL)
++ if (OPENSSL_VERSION_NUMBER < 0x0090601fL)
+ exit(1);
+ exit(0);
+ }
+@@ -3723,8 +3723,8 @@
+ echo "$as_me: program exited with status $ac_status" >&5
+ echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-{ { echo "$as_me:3726: error: This release of cfengine requires openssl 0.9.6b or later" >&5
+-echo "$as_me: error: This release of cfengine requires openssl 0.9.6b or later" >&2;}
++{ { echo "$as_me:3726: error: This release of cfengine requires openssl 0.9.6a or later" >&5
++echo "$as_me: error: This release of cfengine requires openssl 0.9.6a or later" >&2;}
+ { (exit 1); exit 1; }; }
+
+ fi
+@@ -4098,6 +4098,7 @@
+ cat >conftest.$ac_ext <<_ACEOF
+ #line 4099 "configure"
+ #include "confdefs.h"
++#include <sys/param.h>
+ #include <$ac_header>
+ _ACEOF
+ if { (eval echo "$as_me:4103: \"$ac_cpp conftest.$ac_ext\"") >&5
+@@ -8485,8 +8486,8 @@
+ echo "$as_me: WARNING: This version requires Berkeley db version 3.2 or" >&2;}
+ { echo "$as_me:8486: WARNING: later from www.sleepycat.com" >&5
+ echo "$as_me: WARNING: later from www.sleepycat.com" >&2;}
+-{ echo "$as_me:8488: WARNING: This version requires OpenSSL 0.9.6b or later" >&5
+-echo "$as_me: WARNING: This version requires OpenSSL 0.9.6b or later" >&2;}
++{ echo "$as_me:8488: WARNING: This version requires OpenSSL 0.9.6a or later" >&5
++echo "$as_me: WARNING: This version requires OpenSSL 0.9.6a or later" >&2;}
+ { echo "$as_me:8490: WARNING: from www.openssl.org" >&5
+ echo "$as_me: WARNING: from www.openssl.org" >&2;}
+ { echo "$as_me:8492: WARNING: " >&5
diff -urN cfengine2.orig/files/patch-contrib::Makefile.in cfengine2/files/patch-contrib::Makefile.in
--- cfengine2.orig/files/patch-contrib::Makefile.in Wed Sep 10 14:06:03 2003
+++ cfengine2/files/patch-contrib::Makefile.in Thu Sep 11 12:44:57 2003
@@ -1,11 +0,0 @@
---- contrib/Makefile.in.orig Mon Jul 29 17:24:20 2002
-+++ contrib/Makefile.in Mon Jul 29 17:26:30 2002
-@@ -33,7 +33,7 @@
- mandir = @mandir@
- includedir = @includedir@
- oldincludedir = /usr/include
--pkgdatadir = $(datadir)/@PACKAGE@
-+pkgdatadir = $(datadir)/emacs/site-lisp
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ..
diff -urN cfengine2.orig/files/patch-contrib::Makefile.in.orig cfengine2/files/patch-contrib::Makefile.in.orig
--- cfengine2.orig/files/patch-contrib::Makefile.in.orig Wed Dec 31 19:00:00 1969
+++ cfengine2/files/patch-contrib::Makefile.in.orig Tue Jul 30 14:34:24 2002
@@ -0,0 +1,11 @@
+--- contrib/Makefile.in.orig Mon Jul 29 17:24:20 2002
++++ contrib/Makefile.in Mon Jul 29 17:26:30 2002
+@@ -33,7 +33,7 @@
+ mandir = @mandir@
+ includedir = @includedir@
+ oldincludedir = /usr/include
+-pkgdatadir = $(datadir)/@PACKAGE@
++pkgdatadir = $(datadir)/emacs/site-lisp
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ..
diff -urN cfengine2.orig/files/patch-doc::Makefile.in cfengine2/files/patch-doc::Makefile.in
--- cfengine2.orig/files/patch-doc::Makefile.in Wed Sep 10 14:06:03 2003
+++ cfengine2/files/patch-doc::Makefile.in Thu Sep 11 12:44:57 2003
@@ -1,24 +0,0 @@
---- doc/Makefile.in.orig Sat Jun 22 08:36:43 2002
-+++ doc/Makefile.in Mon Jul 29 17:19:22 2002
-@@ -88,10 +88,10 @@
- man_MANS = cfengine.8
- info_TEXINFOS = cfengine-Reference.texinfo cfengine-Tutorial.texinfo cfengine-Anomalies.texinfo
-
--docdir = $(prefix)/doc/$(PACKAGE)-$(VERSION)
-+#docdir = $(prefix)/doc/$(PACKAGE)-$(VERSION)
- doc_DATA =
- # Info used in building and installing HTML files
--htmldir = $(pkgdatadir)/html
-+htmldir = $(datadir)/doc/@PACKAGE@
- htmlfiles = cfengine-Reference.html cfengine-Tutorial.html
- html_DATA = $(htmlfiles)
-
-@@ -103,7 +103,7 @@
- # then uncomment the reference to ps2
- psfiles = $(ps1) # $(ps2)
-
--psdir = $(pkgdatadir)/doc
-+#psdir = $(pkgdatadir)/doc
- ps_DATA = $(psfiles)
-
- # Make sure these get distributed with everything else.
diff -urN cfengine2.orig/files/patch-doc::Makefile.in.orig cfengine2/files/patch-doc::Makefile.in.orig
--- cfengine2.orig/files/patch-doc::Makefile.in.orig Wed Dec 31 19:00:00 1969
+++ cfengine2/files/patch-doc::Makefile.in.orig Tue Jul 30 14:34:24 2002
@@ -0,0 +1,24 @@
+--- doc/Makefile.in.orig Sat Jun 22 08:36:43 2002
++++ doc/Makefile.in Mon Jul 29 17:19:22 2002
+@@ -88,10 +88,10 @@
+ man_MANS = cfengine.8
+ info_TEXINFOS = cfengine-Reference.texinfo cfengine-Tutorial.texinfo cfengine-Anomalies.texinfo
+
+-docdir = $(prefix)/doc/$(PACKAGE)-$(VERSION)
++#docdir = $(prefix)/doc/$(PACKAGE)-$(VERSION)
+ doc_DATA =
+ # Info used in building and installing HTML files
+-htmldir = $(pkgdatadir)/html
++htmldir = $(datadir)/doc/@PACKAGE@
+ htmlfiles = cfengine-Reference.html cfengine-Tutorial.html
+ html_DATA = $(htmlfiles)
+
+@@ -103,7 +103,7 @@
+ # then uncomment the reference to ps2
+ psfiles = $(ps1) # $(ps2)
+
+-psdir = $(pkgdatadir)/doc
++#psdir = $(pkgdatadir)/doc
+ ps_DATA = $(psfiles)
+
+ # Make sure these get distributed with everything else.
diff -urN cfengine2.orig/files/patch-doc::cfengine-Anomalies.info cfengine2/files/patch-doc::cfengine-Anomalies.info
--- cfengine2.orig/files/patch-doc::cfengine-Anomalies.info Wed Sep 10 14:06:03 2003
+++ cfengine2/files/patch-doc::cfengine-Anomalies.info Thu Sep 11 12:44:57 2003
@@ -1,11 +0,0 @@
---- doc/cfengine-Anomalies.info.orig Mon Jul 29 18:15:38 2002
-+++ doc/cfengine-Anomalies.info Mon Jul 29 18:16:20 2002
-@@ -3,7 +3,7 @@
-
- INFO-DIR-SECTION System Utilities
- START-INFO-DIR-ENTRY
--* cfengine Tutorial: (cfengine-Tutorial.info).
-+* cfengine Anomalies: (cfengine-Anomalies.info).
- Cfengine is a language based tool specifically
- designed for configuring and maintaining BSD
- and System-5-like operating systems attached
diff -urN cfengine2.orig/files/patch-doc::cfengine-Anomalies.info.orig cfengine2/files/patch-doc::cfengine-Anomalies.info.orig
--- cfengine2.orig/files/patch-doc::cfengine-Anomalies.info.orig Wed Dec 31 19:00:00 1969
+++ cfengine2/files/patch-doc::cfengine-Anomalies.info.orig Tue Jul 30 14:34:24 2002
@@ -0,0 +1,11 @@
+--- doc/cfengine-Anomalies.info.orig Mon Jul 29 18:15:38 2002
++++ doc/cfengine-Anomalies.info Mon Jul 29 18:16:20 2002
+@@ -3,7 +3,7 @@
+
+ INFO-DIR-SECTION System Utilities
+ START-INFO-DIR-ENTRY
+-* cfengine Tutorial: (cfengine-Tutorial.info).
++* cfengine Anomalies: (cfengine-Anomalies.info).
+ Cfengine is a language based tool specifically
+ designed for configuring and maintaining BSD
+ and System-5-like operating systems attached
diff -urN cfengine2.orig/pkg-plist cfengine2/pkg-plist
--- cfengine2.orig/pkg-plist Wed Sep 10 14:06:03 2003
+++ cfengine2/pkg-plist Thu Sep 11 12:44:57 2003
@@ -30,7 +30,6 @@
sbin/cfrun
sbin/cfservd
sbin/vicf
-share/emacs/site-lisp/cfengine.el
share/cfengine/cf.chflags.example
share/cfengine/cf.freebsd.example
share/cfengine/cf.ftp.example
@@ -46,11 +45,16 @@
share/cfengine/cf.users.example
share/cfengine/cfagent.conf-advanced.example
share/cfengine/cfagent.conf.example
+share/cfengine/cfengine.el
share/cfengine/cfrc.example
share/cfengine/cfrun.hosts.example
share/cfengine/cfservd.conf.example
+share/cfengine/html/cfengine-Reference.html
+share/cfengine/html/cfengine-Tutorial.html
share/cfengine/update.conf.example
-share/doc/cfengine/cfengine-Reference.html
-share/doc/cfengine/cfengine-Tutorial.html
+share/nls/POSIX
+share/nls/en_US.US-ASCII
+ at dirrm share/cfengine/html
+ at dirrm share/cfengine/doc
@dirrm share/cfengine
- at dirrm share/doc/cfengine
+ at dirrm doc/cfengine-2.0.8p1
\ No newline at end of file
--- cfengine2.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list