Merge pull request #1009 from doktornotor/patch-6

4 files changed, 76 insertions, 64 deletions

diff --git a/config/git/git.xml b/config/git/git.xml
index 6c5254ae..6139fd04 100644
--- a/config/git/git.xml
+++ b/config/git/git.xml
@@ -3,23 +3,28 @@
 <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
 <packagegui>
 	<copyright>
-	<![CDATA[
-/* ========================================================================== */
+<![CDATA[
+/* $Id$ */
+/* ====================================================================================== */
 /*
-	part of pfSense (http://www.pfSense.com)
-	Copyright (C) 2013
+	git.xml
+	part of pfSense (https://www.pfSense.org/)
+	Copyright (C) 2013-2015 ESF, LLC
 	All rights reserved.
-/* ========================================================================== */
+*/
+/* ====================================================================================== */
 /*
 	Redistribution and use in source and binary forms, with or without
 	modification, are permitted provided that the following conditions are met:
 
-	 1. Redistributions of source code must retain the above copyright notice,
-		this list of conditions and the following disclaimer.
 
-	 2. Redistributions in binary form must reproduce the above copyright
-		notice, this list of conditions and the following disclaimer in the
-		documentation and/or other materials provided with the distribution.
+	1. Redistributions of source code must retain the above copyright notice,
+	   this list of conditions and the following disclaimer.
+
+	2. Redistributions in binary form must reproduce the above copyright
+	   notice, this list of conditions and the following disclaimer in the
+	   documentation and/or other materials provided with the distribution.
+
 
 	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
 	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
@@ -31,14 +36,12 @@
 	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
-										*/
-/* ==========================================================================	*/
+*/
+/* ====================================================================================== */
 	]]>
 	</copyright>
 	<description>git</description>
-	<requirements>None</requirements>
-	<faq></faq>
 	<name>git</name>
-	<version>0.0</version>
+	<version>2.2.1</version>
 	<title>git</title>
-</packagegui>
\ No newline at end of file
+</packagegui>
diff --git a/config/iftop/iftop.xml b/config/iftop/iftop.xml
index 64afbc79..b9dfbe5b 100644
--- a/config/iftop/iftop.xml
+++ b/config/iftop/iftop.xml
@@ -3,23 +3,28 @@
 <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
 <packagegui>
 	<copyright>
-	<![CDATA[
-/* ========================================================================== */
+<![CDATA[
+/* $Id$ */
+/* ====================================================================================== */
 /*
-	part of pfSense (http://www.pfSense.com)
-	Copyright (C) 2013
+	iftop.xml
+	part of pfSense (https://www.pfSense.org/)
+	Copyright (C) 2013-2015 ESF, LLC
 	All rights reserved.
-/* ========================================================================== */
+*/
+/* ====================================================================================== */
 /*
 	Redistribution and use in source and binary forms, with or without
 	modification, are permitted provided that the following conditions are met:
 
-	 1. Redistributions of source code must retain the above copyright notice,
-		this list of conditions and the following disclaimer.
 
-	 2. Redistributions in binary form must reproduce the above copyright
-		notice, this list of conditions and the following disclaimer in the
-		documentation and/or other materials provided with the distribution.
+	1. Redistributions of source code must retain the above copyright notice,
+	   this list of conditions and the following disclaimer.
+
+	2. Redistributions in binary form must reproduce the above copyright
+	   notice, this list of conditions and the following disclaimer in the
+	   documentation and/or other materials provided with the distribution.
+
 
 	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
 	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
@@ -31,14 +36,12 @@
 	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
-										*/
-/* ==========================================================================	*/
+*/
+/* ====================================================================================== */
 	]]>
 	</copyright>
 	<description>iftop</description>
-	<requirements>None</requirements>
-	<faq></faq>
 	<name>iftop</name>
-	<version>0.0</version>
+	<version>0.17</version>
 	<title>iftop</title>
-</packagegui>
\ No newline at end of file
+</packagegui>
diff --git a/config/ipmitool/ipmitool.xml b/config/ipmitool/ipmitool.xml
index a42baa36..cb6bf385 100644
--- a/config/ipmitool/ipmitool.xml
+++ b/config/ipmitool/ipmitool.xml
@@ -3,23 +3,28 @@
 <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
 <packagegui>
 	<copyright>
-	<![CDATA[
-/* ========================================================================== */
+<![CDATA[
+/* $Id$ */
+/* ====================================================================================== */
 /*
-	part of pfSense (http://www.pfSense.com)
-	Copyright (C) 2013
+	ipmitool.xml
+	part of pfSense (https://www.pfSense.org/)
+	Copyright (C) 2013-2015 ESF, LLC
 	All rights reserved.
-/* ========================================================================== */
+*/
+/* ====================================================================================== */
 /*
 	Redistribution and use in source and binary forms, with or without
 	modification, are permitted provided that the following conditions are met:
 
-	 1. Redistributions of source code must retain the above copyright notice,
-		this list of conditions and the following disclaimer.
 
-	 2. Redistributions in binary form must reproduce the above copyright
-		notice, this list of conditions and the following disclaimer in the
-		documentation and/or other materials provided with the distribution.
+	1. Redistributions of source code must retain the above copyright notice,
+	   this list of conditions and the following disclaimer.
+
+	2. Redistributions in binary form must reproduce the above copyright
+	   notice, this list of conditions and the following disclaimer in the
+	   documentation and/or other materials provided with the distribution.
+
 
 	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
 	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
@@ -31,14 +36,12 @@
 	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
-										*/
-/* ==========================================================================	*/
+*/
+/* ====================================================================================== */
 	]]>
 	</copyright>
 	<description>ipmitool</description>
-	<requirements>None</requirements>
-	<faq></faq>
 	<name>ipmitool</name>
-	<version>0.0</version>
+	<version>1.8.12_5.1</version>
 	<title>ipmitool</title>
-</packagegui>
\ No newline at end of file
+</packagegui>
diff --git a/config/urlsnarf/urlsnarf.xml b/config/urlsnarf/urlsnarf.xml
index c65d1a14..97b3d6bd 100644
--- a/config/urlsnarf/urlsnarf.xml
+++ b/config/urlsnarf/urlsnarf.xml
@@ -3,23 +3,28 @@
 <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
 <packagegui>
 	<copyright>
-	<![CDATA[
-/* ========================================================================== */
+<![CDATA[
+/* $Id$ */
+/* ====================================================================================== */
 /*
-	part of pfSense (http://www.pfSense.com)
-	Copyright (C) 2013
+	urlsnarf.xml
+	part of pfSense (https://www.pfSense.org/)
+	Copyright (C) 2013-2015 ESF, LLC
 	All rights reserved.
-/* ========================================================================== */
+*/
+/* ====================================================================================== */
 /*
 	Redistribution and use in source and binary forms, with or without
 	modification, are permitted provided that the following conditions are met:
 
-	 1. Redistributions of source code must retain the above copyright notice,
-		this list of conditions and the following disclaimer.
 
-	 2. Redistributions in binary form must reproduce the above copyright
-		notice, this list of conditions and the following disclaimer in the
-		documentation and/or other materials provided with the distribution.
+	1. Redistributions of source code must retain the above copyright notice,
+	   this list of conditions and the following disclaimer.
+
+	2. Redistributions in binary form must reproduce the above copyright
+	   notice, this list of conditions and the following disclaimer in the
+	   documentation and/or other materials provided with the distribution.
+
 
 	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
 	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
@@ -31,14 +36,12 @@
 	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
-										*/
-/* ==========================================================================	*/
+*/
+/* ====================================================================================== */
 	]]>
 	</copyright>
 	<description>urlsnarf</description>
-	<requirements>None</requirements>
-	<faq></faq>
 	<name>urlsnarf</name>
-	<version>0.0</version>
+	<version>2.4b1</version>
 	<title>urlsnarf</title>
-</packagegui>
\ No newline at end of file
+</packagegui>