Merge to Stable

Conflicts: NEWS.asciidoc UPGRADE.asciidoc addons/packages/packetfence.spec debian/changelog
inverse-inc · Feb 19, 2015 · 0855b29 · 0855b29
2 parents 53b3015 + d3829ee
commit 0855b29
Show file tree

Hide file tree

Showing 755 changed files with 1,914 additions and 826 deletions.
diff --git a/ChangeLog b/ChangeLog
diff --git a/NEWS.asciidoc b/NEWS.asciidoc
@@ -11,6 +11,24 @@ This is a list of noteworthy changes across releases.
 For more details and developer visible changes see the ChangeLog file.
 For a list of compatibility related changes see the UPGRADE.asciidoc file.
 
+Version 4.6.1 released on 2015-02-19
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+New Features
+++++++++++++
+
+Enhancements
+++++++++++++
+
+Bug Fixes
++++++++++
+
+* Fix dynamic unregdate breaking when handling the infinite unregdate '0000-00-00'
+* Fixed issue where the same password can be generated multiple times
+* Assigned LC_CTYPE to C during postinstall script on debian to prevent i18n issues during installation.
+* Fixed dynamic_unreg_dated called from the wrong place
+* Fix searching for switches in the admin gui
+
 Version 4.6.0 released on 2015-02-04
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

diff --git a/UPGRADE.asciidoc b/UPGRADE.asciidoc
@@ -3,7 +3,13 @@ PacketFence Upgrade Guide
 
 http://www.packetfence.org/
 
-Notes on upgrading from an older release.
+Upgrade procedure
+-----------------
+For RedHat-based systems, run the following command:
+
+  yum update packetfence --enablerepo=packetfence
+
+PacketFence should now be upgraded.  However, there may be extra steps required depending on the version you are upgrading from.  Please review the following notes about upgrading from an older release.
 
 Upgrading from a version prior to 4.6.0
 ---------------------------------------
@@ -16,7 +22,7 @@ We added new INDEX on iplog, violation and locationlog tables.
 
 Make sure you run the following to update your schema:
 
-  mysql -u root -p pf -v < db/upgrade-4.5.0-4.6.0.sql
+  mysql -u root -p pf -v < /usr/local/pf/db/upgrade-4.5.0-4.6.0.sql
 
 
 Violation template pages language handling
@@ -40,7 +46,7 @@ The class table has a new column delay_by.
 
 Make sure you run the following to update your schema:
 
-  mysql -u root -p pf -v < db/upgrade-4.4.0-4.5.0.sql
+  mysql -u root -p pf -v < /usr/local/pf/db/upgrade-4.4.0-4.5.0.sql
 
 Upgrading from a version prior to 4.4.0
 ---------------------------------------
@@ -65,7 +71,7 @@ The tables email_activation and sms_activation have been merged in a table named
 
 Make sure you run the following to update your schema:
 
-  mysql -u root -p pf -v < db/upgrade-4.2.0-4.3.0.sql
+  mysql -u root -p pf -v < /usr/local/pf/db/upgrade-4.2.0-4.3.0.sql
 
 Configuration changes
 ^^^^^^^^^^^^^^^^^^^^^
@@ -98,7 +104,7 @@ New table for WRIX data.
 
 Make sure you run the following to update your schema:
 
-  mysql -u root -p pf -v < db/upgrade-4.1.0-4.2.0.sql
+  mysql -u root -p pf -v < /usr/local/pf/db/upgrade-4.1.0-4.2.0.sql
 
 Configuration changes
 ^^^^^^^^^^^^^^^^^^^^^
@@ -128,7 +134,7 @@ Also, the access_level of the temporary_password table is now a string instead o
 
 Make sure you run the following to update your schema:
 
-  mysql -u root -p pf -v < db/upgrade-4.0.0-4.1.0.sql
+  mysql -u root -p pf -v < /usr/local/pf/db/upgrade-4.0.0-4.1.0.sql
 
 Configuration changes
 ^^^^^^^^^^^^^^^^^^^^^
@@ -208,7 +214,7 @@ Moreover, an "admin" user is now automatically created. The default password
 is also "admin". Finally, a new table has been added for saved searches in the
 new Web administrative interface.
 
-  mysql -u root -p pf -v < db/upgrade-3.6.1-4.0.0.sql
+  mysql -u root -p pf -v < /usr/local/pf/db/upgrade-3.6.1-4.0.0.sql
 
 Other important changes
 ^^^^^^^^^^^^^^^^^^^^^^^

diff --git a/addons/accounting.pl b/addons/accounting.pl
@@ -118,7 +118,7 @@ =head1 AUTHOR
 
 =head1 COPYRIGHT
 
-Copyright (C) 2005-2013 Inverse inc.
+Copyright (C) 2005-2015 Inverse inc.
 
 =head1 LICENSE
 

diff --git a/addons/autodiscover.pl b/addons/autodiscover.pl
@@ -23,7 +23,7 @@ =head1 AUTHOR
 
 =head1 COPYRIGHT
 
-Copyright (C) 2005-2013 Inverse inc.
+Copyright (C) 2005-2015 Inverse inc.
 
 =head1 LICENSE
 

diff --git a/addons/captive-portal/proxy-bypass/squid-redirector.pl b/addons/captive-portal/proxy-bypass/squid-redirector.pl
@@ -58,7 +58,7 @@ =head1 AUTHOR
 
 =head1 COPYRIGHT
 
-Copyright (C) 2005-2013 Inverse inc.
+Copyright (C) 2005-2015 Inverse inc.
 
 =head1 LICENSE
 

diff --git a/addons/connect_and_read.pl b/addons/connect_and_read.pl
@@ -113,7 +113,7 @@ =head1 AUTHOR
 
 =head1 COPYRIGHT
 
-Copyright (C) 2005-2013 Inverse inc.
+Copyright (C) 2005-2015 Inverse inc.
 
 =head1 LICENSE
 

diff --git a/addons/convertToPortSecurity.pl b/addons/convertToPortSecurity.pl
@@ -399,7 +399,7 @@ =head1 AUTHOR
 
 =head1 COPYRIGHT
 
-Copyright (C) 2005-2013 Inverse inc.
+Copyright (C) 2005-2015 Inverse inc.
 
 =head1 LICENSE
 

diff --git a/addons/database-backup-and-maintenance.sh b/addons/database-backup-and-maintenance.sh
@@ -7,7 +7,7 @@
 # - compressed mysqldump to $BACKUP_DIRECTORY, rotate and clean
 # - archive locationlog_history entries older than a year the first day of each month
 #
-# Copyright (C) 2005-2013 Inverse inc.
+# Copyright (C) 2005-2015 Inverse inc.
 #
 # Author: Inverse inc. <[email protected]>
 #

diff --git a/addons/dev-helpers/dump.pl b/addons/dev-helpers/dump.pl
@@ -175,7 +175,7 @@ =head1 AUTHOR
 
 =head1 COPYRIGHT
 
-Copyright (C) 2005-2013 Inverse inc.
+Copyright (C) 2005-2015 Inverse inc.
 
 =head1 LICENSE
 

diff --git a/addons/dev-helpers/radius-hook.pl b/addons/dev-helpers/radius-hook.pl
@@ -36,7 +36,7 @@ =head1 AUTHOR
 
 =head1 COPYRIGHT
 
-Copyright (C) 2005-2013 Inverse inc.
+Copyright (C) 2005-2015 Inverse inc.
 
 =head1 LICENSE
 

diff --git a/addons/dev-helpers/test-billing.pl b/addons/dev-helpers/test-billing.pl
@@ -98,7 +98,7 @@ =head1 AUTHOR
 
 =head1 COPYRIGHT
 
-Copyright (C) 2005-2013 Inverse inc.
+Copyright (C) 2005-2015 Inverse inc.
 
 =head1 LICENSE
 

diff --git a/addons/dev-helpers/useragent-build-regexp.pl b/addons/dev-helpers/useragent-build-regexp.pl
@@ -20,7 +20,7 @@ =head1 AUTHOR
 
 =head1 COPYRIGHT
 
-Copyright (C) 2005-2013 Inverse inc.
+Copyright (C) 2005-2015 Inverse inc.
 
 =head1 LICENSE
 

diff --git a/addons/dhcp_dumper.pl b/addons/dhcp_dumper.pl
@@ -239,7 +239,7 @@ =head1 AUTHOR
 
 =head1 COPYRIGHT
 
-Copyright (C) 2005-2013 Inverse inc.
+Copyright (C) 2005-2015 Inverse inc.
 
 Copyright (C) 2005 Kevin Amorin
 

diff --git a/addons/extract_i18n_strings.pl b/addons/extract_i18n_strings.pl
@@ -418,7 +418,7 @@ sub print_po {
 
     print <<EOT;
 # English translations for $package package.
-# Copyright (C) 2012-2014 Inverse inc.
+# Copyright (C) 2005-2015 Inverse inc.
 # This file is distributed under the same license as the $package package.
 #
 msgid ""
@@ -492,7 +492,7 @@ =head1 AUTHOR
 
 =head1 COPYRIGHT
 
-Copyright (C) 2013-2014 Inverse inc.
+Copyright (C) 2005-2015 Inverse inc.
 
 =head1 LICENSE
 

diff --git a/addons/high-availability/pf-diff b/addons/high-availability/pf-diff
@@ -2,7 +2,7 @@
 #
 # Highlight changes between pf servers
 #
-# Copyright (C) 2005-2013 Inverse inc.
+# Copyright (C) 2005-2015 Inverse inc.
 #
 # Author: Inverse inc. <[email protected]>
 #

diff --git a/addons/high-availability/rdiff b/addons/high-availability/rdiff
@@ -2,7 +2,7 @@
 #
 # Convenient little wrapper to remotely diff files
 #
-# Copyright (C) 2005-2013 Inverse inc.
+# Copyright (C) 2005-2015 Inverse inc.
 #
 # Author: Inverse inc. <[email protected]>
 #

diff --git a/addons/import-node-csv.pl b/addons/import-node-csv.pl
@@ -109,7 +109,7 @@ =head1 AUTHOR
 
 =head1 COPYRIGHT
 
-Copyright (C) 2005-2013 Inverse inc.
+Copyright (C) 2005-2015 Inverse inc.
 
 =head1 LICENSE
 

diff --git a/addons/integration-testing/replay-snmptrapd-logs.pl b/addons/integration-testing/replay-snmptrapd-logs.pl
@@ -19,7 +19,7 @@ =head1 AUTHOR
 
 =head1 COPYRIGHT
 
-Copyright (C) 2005-2013 Inverse inc.
+Copyright (C) 2005-2015 Inverse inc.
 
 =head1 LICENSE
 

diff --git a/addons/iplog-cleanup.pl b/addons/iplog-cleanup.pl
@@ -49,7 +49,7 @@ =head1 AUTHOR
 
 =head1 COPYRIGHT
 
-Copyright (C) 2005-2014 Inverse inc.
+Copyright (C) 2005-2015 Inverse inc.
 
 =head1 LICENSE
 

diff --git a/addons/locationlog-cleanup.pl b/addons/locationlog-cleanup.pl
@@ -49,7 +49,7 @@ =head1 AUTHOR
 
 =head1 COPYRIGHT
 
-Copyright (C) 2005-2014 Inverse inc.
+Copyright (C) 2005-2015 Inverse inc.
 
 =head1 LICENSE
 

diff --git a/addons/migrate-to-locationlog_history.sh b/addons/migrate-to-locationlog_history.sh
@@ -12,7 +12,7 @@
 # Usage: migrate-to-locationlog_history.sh <days>
 # Where <days> is the number of days to migrate the records of.
 #
-# Copyright (C) 2005-2013 Inverse inc.
+# Copyright (C) 2005-2015 Inverse inc.
 #
 # Author: Inverse inc. <[email protected]>
 #

diff --git a/addons/monitorpfsetvlan.pl b/addons/monitorpfsetvlan.pl
@@ -152,7 +152,7 @@ =head1 AUTHOR
 
 =head1 COPYRIGHT
 
-Copyright (C) 2005-2013 Inverse inc.
+Copyright (C) 2005-2015 Inverse inc.
 
 =head1 LICENSE
 

diff --git a/addons/network-save-configs.pl b/addons/network-save-configs.pl
@@ -139,7 +139,7 @@ =head1 AUTHOR
 
 =head1 COPYRIGHT
 
-Copyright (C) 2005-2013 Inverse inc.
+Copyright (C) 2005-2015 Inverse inc.
 
 =head1 LICENSE
 

diff --git a/addons/packages/packetfence-rpm-build.sh b/addons/packages/packetfence-rpm-build.sh
@@ -5,7 +5,7 @@
 # - building directly from git
 # - specifying branch to build
 #
-# Copyright (C) 2005-2013 Inverse inc.
+# Copyright (C) 2005-2015 Inverse inc.
 #
 # Author: Inverse inc. <[email protected]>
 #

diff --git a/addons/packages/packetfence.spec b/addons/packages/packetfence.spec
@@ -983,6 +983,9 @@ fi
 %attr(6755, root, root) /usr/local/pf/bin/pfcmd
 
 %changelog
+* Thu Feb 19 2015 Inverse <[email protected]> - 4.6.1-1
+- New release 4.6.1
+
 * Wed Feb 04 2015 Inverse <[email protected]> - 4.6.0-1
 - New release 4.6.0
 

diff --git a/addons/packages/perl-Net-Appliance-Session.spec.diff b/addons/packages/perl-Net-Appliance-Session.spec.diff
@@ -7,7 +7,7 @@
 # http://packetfence.org/bugs/view.php?id=1556
 #
 # Olivier Bilodeau <[email protected]>
-# Copyright 2012 Inverse inc.
+# Copyright (C) 2005-2015 Inverse inc.
 #
 --- perl-Net-Appliance-Session.spec     2012-09-26 13:40:14.000000000 -0400
 +++ SPECS/perl-Net-Appliance-Session.spec       2012-09-26 13:38:08.000000000 -0400

diff --git a/addons/pf-maint.pl b/addons/pf-maint.pl
@@ -187,7 +187,7 @@ =head1 AUTHOR
 
 =head1 COPYRIGHT
 
-Copyright (C) 2005-2014 Inverse inc.
+Copyright (C) 2005-2015 Inverse inc.
 
 =head1 LICENSE
 

diff --git a/addons/pfarp_remote/sbin/pfarp_remote b/addons/pfarp_remote/sbin/pfarp_remote
@@ -341,7 +341,7 @@ Inverse inc. <[email protected]>
 
 =head1 COPYRIGHT
 
-Copyright (C) 2005-2013 Inverse inc.
+Copyright (C) 2005-2015 Inverse inc.
 
 =head1 LICENSE
 

diff --git a/addons/pfdetect_remote/sbin/pfdetect_remote b/addons/pfdetect_remote/sbin/pfdetect_remote
@@ -198,7 +198,7 @@ Inverse inc. <[email protected]>
 
 =head1 COPYRIGHT
 
-Copyright (C) 2005-2013 Inverse inc.
+Copyright (C) 2005-2015 Inverse inc.
 
 =head1 LICENSE
 

diff --git a/addons/recovery.pl b/addons/recovery.pl
@@ -35,7 +35,7 @@ =head1 AUTHOR
 
 =head1 COPYRIGHT
 
-Copyright (C) 2005-2013 Inverse inc.
+Copyright (C) 2005-2015 Inverse inc.
 
 =head1 LICENSE
 

diff --git a/addons/snort/update_rules.pl b/addons/snort/update_rules.pl
@@ -90,7 +90,7 @@ =head1 AUTHOR
 
 =head1 COPYRIGHT
 
-Copyright (C) 2005-2013 Inverse inc.
+Copyright (C) 2005-2015 Inverse inc.
 
 =head1 LICENSE
 

diff --git a/addons/template-from-csv.pl b/addons/template-from-csv.pl
@@ -33,7 +33,7 @@ =head1 AUTHOR
 
 =head1 COPYRIGHT
 
-Copyright (C) 2005-2014 Inverse inc.
+Copyright (C) 2005-2015 Inverse inc.
 
 =head1 LICENSE
 

diff --git a/addons/upgrade/to-2.2.0-update-all-useragents.pl b/addons/upgrade/to-2.2.0-update-all-useragents.pl
@@ -105,7 +105,7 @@ =head1 AUTHOR
 
 =head1 COPYRIGHT
 
-Copyright (C) 2005-2013 Inverse inc.
+Copyright (C) 2005-2015 Inverse inc.
 
 =head1 LICENSE
 

diff --git a/addons/upgrade/to-3.0-networks.conf.pl b/addons/upgrade/to-3.0-networks.conf.pl
@@ -56,7 +56,7 @@ =head1 AUTHOR
 
 =head1 COPYRIGHT
 
-Copyright (C) 2005-2013 Inverse inc.
+Copyright (C) 2005-2015 Inverse inc.
 
 =head1 LICENSE