6 files changed, 30 insertions, 9 deletions

diff --git a/UPDATING b/UPDATING
index 3da8efed8721..cad270ad08ab 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,6 +6,24 @@ You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
 20141219:
+  AFFECTS: users of net-mgmt/xymon-server
+  AUTHOR: feld@FreeBSD.org
+
+  Xymon has been updated to 4.3.18. A major change is the replacement of
+  the individual cgi shell scripts with symlinks to a cgi program written
+  in C. This is to mitigate shellshock on Linux systems where the
+  /bin/sh -> /bin/bash. FreeBSD users were not exposed except in the
+  most unusual and unsupported circumstances. However, this is an
+  important update for security. This change could break your
+  configuration as Henrik describes here:
+
+  > NOTE: Replacing the shell script wrappers means that the cgioptions.cfg
+  > file is no longer processed as a shell script. The new wrapper works
+  > fine with the default version of cgioptions.cfg, but it you have
+  > modified it in a way that it relies on being processed by a shell, then
+  > it will break.
+
+20141219:
   AFFECTS: users of audio/abcde
   AUTHOR: gblach@FreeBSD.org
 
diff --git a/net-mgmt/xymon-client/Makefile b/net-mgmt/xymon-client/Makefile
index 397ac3ff2264..b218c78dd8f0 100644
--- a/net-mgmt/xymon-client/Makefile
+++ b/net-mgmt/xymon-client/Makefile
@@ -1,9 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	xymon
-PORTVERSION=	4.3.17
+PORTVERSION=	4.3.18
 CATEGORIES=	net-mgmt www
-MASTER_SITES=	SF/xymon/Xymon/${PORTVERSION}
+#MASTER_SITES=	SF/xymon/Xymon/${PORTVERSION}
+MASTER_SITES=	https://www.xymon.com/patches/
 PKGNAMESUFFIX=	-client${PKGNAMESUFFIX2}
 DIST_SUBDIR=	repacked
 
diff --git a/net-mgmt/xymon-client/distinfo b/net-mgmt/xymon-client/distinfo
index 2ca332aedc03..0e0049d99cfc 100644
--- a/net-mgmt/xymon-client/distinfo
+++ b/net-mgmt/xymon-client/distinfo
@@ -1,2 +1,2 @@
-SHA256 (repacked/xymon-4.3.17.tar.gz) = fc912efcf7adb7c5d285bf264fa44ae94fefcbeec32b58d7f9a6184fd9ac19d1
-SIZE (repacked/xymon-4.3.17.tar.gz) = 2772765
+SHA256 (repacked/xymon-4.3.18.tar.gz) = 455c1d7754ef7a9dc7f73f4ac9071c6c359fb81292ba0b87c7c5a77080354253
+SIZE (repacked/xymon-4.3.18.tar.gz) = 2770470
diff --git a/net-mgmt/xymon-server/Makefile b/net-mgmt/xymon-server/Makefile
index 6bdf5f7bda6c..63dfe5f4e504 100644
--- a/net-mgmt/xymon-server/Makefile
+++ b/net-mgmt/xymon-server/Makefile
@@ -1,10 +1,11 @@
 # $FreeBSD$
 
 PORTNAME=	xymon
-PORTVERSION=	4.3.17
-PORTREVISION=	4
+PORTVERSION=	4.3.18
+PORTREVISION=	0
 CATEGORIES=	net-mgmt www
-MASTER_SITES=	SF/xymon/Xymon/${PORTVERSION}
+#MASTER_SITES=	SF/xymon/Xymon/${PORTVERSION}
+MASTER_SITES=	https://www.xymon.com/patches/
 PKGNAMESUFFIX=	-server${PKGNAMESUFFIX2}
 DIST_SUBDIR=	repacked
 
diff --git a/net-mgmt/xymon-server/distinfo b/net-mgmt/xymon-server/distinfo
index 2ca332aedc03..0e0049d99cfc 100644
--- a/net-mgmt/xymon-server/distinfo
+++ b/net-mgmt/xymon-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (repacked/xymon-4.3.17.tar.gz) = fc912efcf7adb7c5d285bf264fa44ae94fefcbeec32b58d7f9a6184fd9ac19d1
-SIZE (repacked/xymon-4.3.17.tar.gz) = 2772765
+SHA256 (repacked/xymon-4.3.18.tar.gz) = 455c1d7754ef7a9dc7f73f4ac9071c6c359fb81292ba0b87c7c5a77080354253
+SIZE (repacked/xymon-4.3.18.tar.gz) = 2770470
diff --git a/net-mgmt/xymon-server/pkg-plist b/net-mgmt/xymon-server/pkg-plist
index 8387718dd142..41b4617e5cc6 100644
--- a/net-mgmt/xymon-server/pkg-plist
+++ b/net-mgmt/xymon-server/pkg-plist
@@ -107,6 +107,7 @@ man/man8/xymonproxy.8
 %%WWWDIR%%/server/bin/bbhostshow
 %%WWWDIR%%/server/bin/beastat
 %%WWWDIR%%/server/bin/boilerplate.cgi
+%%WWWDIR%%/server/bin/cgiwrap
 %%WWWDIR%%/server/bin/combostatus
 %%WWWDIR%%/server/bin/confreport.cgi
 %%WWWDIR%%/server/bin/convertnk