- Update to 2.1.17

- Remove patch-CAN-2005-2960 - the vulnerable contrib/vicf script
  is no longer included in the distribution
- Remove two patches that fix build errors on 4.x in the previous version -
  both patches were integrated upstream

6 files changed, 3 insertions, 68 deletions

diff --git a/sysutils/cfengine2/Makefile b/sysutils/cfengine2/Makefile
index 0584dc8f7f2f..924ef82023db 100644
--- a/sysutils/cfengine2/Makefile
+++ b/sysutils/cfengine2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	cfengine
-PORTVERSION=	2.1.16
-PORTREVISION=	1
+PORTVERSION=	2.1.17
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.iu.hio.no/pub/cfengine/ \
 		${MASTER_SITE_GNU}
diff --git a/sysutils/cfengine2/distinfo b/sysutils/cfengine2/distinfo
index 47dba170a637..181e68d388c6 100644
--- a/sysutils/cfengine2/distinfo
+++ b/sysutils/cfengine2/distinfo
@@ -1,2 +1,2 @@
-MD5 (cfengine-2.1.16.tar.gz) = 1b009dcc2ab27c205e72b536c67ae173
-SIZE (cfengine-2.1.16.tar.gz) = 3606067
+MD5 (cfengine-2.1.17.tar.gz) = 3b2c2cc852901382053133227f092535
+SIZE (cfengine-2.1.17.tar.gz) = 3613861
diff --git a/sysutils/cfengine2/files/patch-CAN-2005-2960 b/sysutils/cfengine2/files/patch-CAN-2005-2960
deleted file mode 100644
index 25e497f10556..000000000000
--- a/sysutils/cfengine2/files/patch-CAN-2005-2960
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -u -p -Nr --exclude CVS contrib/vicf.in.orig contrib/vicf.in
---- contrib/vicf.in.orig	2005-02-08 12:48:56.000000000 +0100
-+++ contrib/vicf.in	2005-09-23 12:11:34.000000000 +0200
-@@ -56,12 +56,13 @@ EdFile () {
-     while [ "$editfile" = "n" ]
-     do
- 	${EDITOR} ${CFINPUTS}/.${file}.lock
--	cp /dev/null /tmp/cfparse.$$
--	$sbindir/cfengine --no-warn --parse-only --file ${CFINPUTS}/.${file}.lock > /tmp/cfparse.$$ 2>&1
--	if [ -s /tmp/cfparse.$$ ]
-+        tmpfile=`mktemp -t tempfile.XXXXXX` || { echo "$0: Cannot create temporary file" >&2; exit 1;  }
-+        trap " [ -f \"$tmpfile\" ] && /bin/rm -f -- \"$tmpfile\"" 0 1 2 3 13 15
-+        $sbindir/cfengine --no-warn --parse-only --file ${CFINPUTS}/.${file}.lock > $tmpfile 2>&1
-+        if [ -s $tmpfile ]
- 	then
- 		echo PARSE ERROR IN NEW INPUT-FILE:
--		cat /tmp/cfparse.$$
-+		cat $tmpfile
- 		/usr/ucb/echo -n "Re-edit file? (Y/n) "
- 		read answer
- 		if [ "$answer" = "n" ]
-@@ -75,7 +76,7 @@ EdFile () {
- 	fi
-     done
- 
--    rm -f /tmp/cfparse.$$ ${CFINPUTS}/.${file}.lock
-+    rm -f ${CFINPUTS}/.${file}.lock
- }
- 
- force=n
diff --git a/sysutils/cfengine2/files/patch-src_cfetool.c b/sysutils/cfengine2/files/patch-src_cfetool.c
deleted file mode 100644
index dcbe06b3386e..000000000000
--- a/sysutils/cfengine2/files/patch-src_cfetool.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/cfetool.c.orig	Thu Oct  6 19:16:39 2005
-+++ src/cfetool.c	Thu Oct  6 19:25:48 2005
-@@ -2646,9 +2646,9 @@ void DoBatch(int dbtype)
-   double val=0;
-   float val1=0, val2=0, val3=0, val4=0, val5=0, val6=0, val7=0, val8=0, val9=0, val10=0;
-   int i = 0, j = 0, n = 0, y = 0, k = 0, w = 0;
--  time_to_update = false;
-   int timeint = -1;
-   struct Average av;
-+  time_to_update = false;
- 
-   Verbose("Batch mode\n");
- 
diff --git a/sysutils/cfengine2/files/patch-src_cfetoolgraph.c b/sysutils/cfengine2/files/patch-src_cfetoolgraph.c
deleted file mode 100644
index f1e51df51aff..000000000000
--- a/sysutils/cfengine2/files/patch-src_cfetoolgraph.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/cfetoolgraph.c.orig	Thu Oct  6 19:31:19 2005
-+++ src/cfetoolgraph.c	Thu Oct  6 19:32:22 2005
-@@ -542,6 +542,8 @@ void WriteGraphFiles(int dbtype)
- void WriteHistogram(int dbtype)
- {
-   int numdays=0;
-+  int position, day;
-+  int weekly[CF_GRAINS];
-   /* Finally, look at the histogram */
- 
-   printf("Writing histogram file now!\n");
-@@ -554,8 +556,6 @@ void WriteHistogram(int dbtype)
-     }
-   }
- 
--  int position, day;
--  int weekly[CF_GRAINS];
- 
-   switch(dbtype)
-   {
diff --git a/sysutils/cfengine2/pkg-plist b/sysutils/cfengine2/pkg-plist
index ff692a36431a..426a9cff6e15 100644
--- a/sysutils/cfengine2/pkg-plist
+++ b/sysutils/cfengine2/pkg-plist
@@ -10,7 +10,6 @@ sbin/cfkey
 sbin/cfrun
 sbin/cfservd
 sbin/cfshow
-sbin/vicf
 %%EXAMPLESDIR%%/cf.chflags.example
 %%EXAMPLESDIR%%/cf.freebsd.example
 %%EXAMPLESDIR%%/cf.ftp.example