Prepare release 4.2.2

inverse-inc · May 29, 2014 · 8d9a700 · 8d9a700
1 parent dce1fe8
commit 8d9a700
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 16 deletions.
diff --git a/NEWS.asciidoc b/NEWS.asciidoc
@@ -14,9 +14,6 @@ For a list of compatibility related changes see the UPGRADE.asciidoc file.
 Version 4.2.2 released on 2014-05-29
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-New Features
-++++++++++++
-
 Enhancements
 ++++++++++++
 
@@ -29,12 +26,12 @@ Bug Fixes
 
 * Remove double saving of iptables
 * Do a configreload hard only during a pf restart not everytime you restart
-* Fixed undefined function and HP Controller module 
+* Fixed undefined function and HP Controller module
 * Fixed a test in pfsetvlan
-* Allow old gaming-registration url to work
-* If node is not found in the database then default to the default profile
-* Logging in dispatcher not workingFixed deletion of a user failing
-* Deletion of a user failing
+* Allow old gaming-registration URL to work
+* If node is not found in the database then use the default profile
+* Fixed logging in dispatcher
+* Fixed deletion of a user failing
 * Compute unregdate and save the role for autoreg 802.1x
 * Fixed portal profile URI filter in new Catalyst-based captive-portal
 * RADIUS accounting fixed to call the correct method to parse the RADIUS request

diff --git a/addons/packages/packetfence.spec b/addons/packages/packetfence.spec
@@ -939,6 +939,12 @@ fi
 %attr(6755, root, root) /usr/local/pf/bin/pfcmd
 
 %changelog
+* Tue May 29 2014 Inverse <info@inverse.ca> - 4.2.2-1
+- New release 4.2.2
+
+* Tue May 16 2014 Inverse <info@inverse.ca> - 4.2.1-1
+- New release 4.2.1
+
 * Tue May  6 2014 Inverse <info@inverse.ca> - 4.2.0-1
 - New release 4.2.0
 

diff --git a/conf/dhcp_fingerprints.conf b/conf/dhcp_fingerprints.conf
@@ -1,4 +1,4 @@
-# dhcp_fingerprints.conf  Version 6.7.0  Date 20140506
+# dhcp_fingerprints.conf  Version 6.7.2  Date 20140513
 #
 # FingerBank - DHCP fingerprint / signature database
 # Copyright (C) 2008-2013 Inverse inc.
@@ -887,6 +887,9 @@ fingerprints=<<EOT
 1,28,2,3,15,6,119,12,44,47,26
 1,28,2,3,15,6,119,12
 1,28,2,3,15,6,119,12,44,47,26,121,42,121,249,33,252,42
+1,28,2,121,15,6,12,40,41,42,26,119,3,121,249,33,42
+1,28,2,3,15,6,12,121,249,33,252,42
+1,28,3,121,26,12,15,119,6,40,41,87,85,86,44,45,46,47,42,121,249,33,252,42
 EOT
 
 [os 501]
@@ -1217,6 +1220,7 @@ fingerprints=<<EOT
 1,28,3,15,6,12,44,81,78,79,116,2,42,58,59,69,119
 1,28,3,15,6,12,81,44,46,78,79,116,66,67,2,69,42,58,59,119,252
 116,252,67,28,59,58,15,6,119,81,44,46,47,42,70,3,78,79,69,1,66,2
+1,2,3,6,15,26,28,85,86,87,88,44,45,46,47,70,69,78,79,120
 EOT
 
 [os 803]
@@ -1455,9 +1459,9 @@ EOT
 
 [os 1101]
 # conflict with xbox 1,3,6,15
-vendor_id=<<EOF
+vendor_id=<<EOT
 Research In Motion
-EOF
+EOT
 description=RIM BlackBerry
 fingerprints=<<EOT
 56,6,1,3,15
@@ -1850,6 +1854,7 @@ EOT
 description=Etherboot/gPXE
 fingerprints=<<EOT
 1,3,6,43
+1,3,12,43,17,128,129,130,150
 EOT
 
 [os 1707]

diff --git a/conf/pf-release b/conf/pf-release
@@ -1 +1 @@
-PacketFence 4.2.1
+PacketFence 4.2.2
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,15 @@
+packetfence (4.2.2) unstable; urgency=low
+
+  * Version 4.2.2
+
+ -- Inverse <info@inverse.ca> Tue, 29 May 2014 12:00:00 -0400
+
+packetfence (4.2.1) unstable; urgency=low
+
+  * Version 4.2.1
+
+ -- Inverse <info@inverse.ca> Tue, 16 May 2014 12:00:00 -0400
+
 packetfence (4.2.0) unstable; urgency=low
 
   * Version 4.2.0

diff --git a/docs/docinfo.xml b/docs/docinfo.xml
@@ -1,7 +1,7 @@
 <!-- TODO have the build system take care of this  -->
-<releaseinfo>Version 4.2.1 - May 2014</releaseinfo>
-<subtitle>for version 4.2.1</subtitle>
-<date>2014-05-15</date>
+<releaseinfo>Version 4.2.2 - May 2014</releaseinfo>
+<subtitle>for version 4.2.2</subtitle>
+<date>2014-05-29</date>
 
 <legalnotice>
   <para>Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled "GNU Free Documentation License".</para>

diff --git a/docs/includes/global-attributes.asciidoc b/docs/includes/global-attributes.asciidoc
@@ -13,6 +13,6 @@
 
 // TODO have the build system take care of this
 
-:release_version: 4.2.1
+:release_version: 4.2.2
 
 // vim: set syntax=asciidoc tabstop=2 shiftwidth=2 expandtab: