Notes |
|
|
If it's an easy fix, let's include it in 4.6. |
|
|
|
Yes I'll also push it to the maintenance.
Should be done tomorrow. |
|
|
|
Has been fixed in both maintenance/4.5 and devel
maintenance/4.5 : c66335e05543b0849f9ebb8ee14102ab5873fdba
devel : 9b4b827d9b30792532cad5ebf3a18d9db547e4a9
You can have this patch on 4.5 by running /usr/local/pf/addons/pf-maint.pl
Thanks! |
|
|
|
I got an error (see below). Did I update correctly?
[root@PacketFence-ZEN-4-5 pf]# /usr/local/pf/addons/pf-maint.pl
Currently at 566d2e3094e0c4375b53700ce47b67e5087de93f
** GET https://api.github.com/repos/inverse-inc/packetfence/branches/maintenance/4.5 [^] ==> 200 OK
Latest maintenance version is c66335e05543b0849f9ebb8ee14102ab5873fdba
** GET https://api.github.com/repos/inverse-inc/packetfence/compare/566d2e3094e0c4375b53700ce47b67e5087de93f...c66335e05543b0849f9ebb8ee14102ab5873fdba [^] ==> 200 OK (1s)
The following are going to be patched
conf/chi.conf.example
conf/radiusd/sql.conf.example
html/captive-portal/lib/captiveportal.pm
html/captive-portal/lib/captiveportal/PacketFence/Controller/Activate/Email.pm
html/captive-portal/lib/captiveportal/PacketFence/Controller/Activate/Sms.pm
html/captive-portal/lib/captiveportal/PacketFence/Controller/Authenticate.pm
html/captive-portal/lib/captiveportal/PacketFence/Controller/CaptivePortal.pm
html/captive-portal/lib/captiveportal/PacketFence/Controller/Oauth2.pm
html/captive-portal/lib/captiveportal/PacketFence/Controller/Pay.pm
html/captive-portal/lib/captiveportal/PacketFence/Controller/Root.pm
html/captive-portal/lib/captiveportal/PacketFence/Controller/Signup.pm
html/captive-portal/lib/captiveportal/PacketFence/Model/Portal/Session.pm
html/captive-portal/lib/captiveportal/PacketFence/View/HTML.pm
html/captive-portal/lib/captiveportal/Role/Request.pm
html/pfappserver/lib/pfappserver/Controller/Configuration/Fingerprints.pm
html/pfappserver/lib/pfappserver/Form/Authentication/Source/LDAP.pm
html/pfappserver/lib/pfappserver/Model/Node.pm
html/pfappserver/lib/pfappserver/Model/Search/Node.pm
html/pfappserver/lib/pfappserver/Role/Controller/BulkActions.pm
lib/pf/Authentication/Source.pm
lib/pf/Authentication/Source/LDAPSource.pm
lib/pf/CHI.pm
lib/pf/Switch/Cisco/Catalyst_2950.pm
lib/pf/activation.pm
lib/pf/api.pm
lib/pf/config.pm
lib/pf/radius.pm
lib/pf/services/manager/httpd.pm
lib/pf/services/manager/pfdhcplistener.pm
lib/pf/vlan.pm
lib/pf/web/externalportal.pm
sbin/pfdhcplistener
sbin/pfsetvlan
t/data/authentication.conf
t/ldap-auth-cache.t
Continue y/n [y]: y
Downloading the patch........
** GET https://github.com/inverse-inc/packetfence/compare/566d2e3094e0c4375b53700ce47b67e5087de93f...c66335e05543b0849f9ebb8ee14102ab5873fdba.diff [^] ==> 200 OK (1s)
Applying the patch........
patching file conf/chi.conf.example
patching file conf/radiusd/sql.conf.example
patching file html/captive-portal/lib/captiveportal.pm
patching file html/captive-portal/lib/captiveportal/PacketFence/Controller/Activate/Email.pm
patching file html/captive-portal/lib/captiveportal/PacketFence/Controller/Activate/Sms.pm
patching file html/captive-portal/lib/captiveportal/PacketFence/Controller/Authenticate.pm
patching file html/captive-portal/lib/captiveportal/PacketFence/Controller/CaptivePortal.pm
patching file html/captive-portal/lib/captiveportal/PacketFence/Controller/Oauth2.pm
patching file html/captive-portal/lib/captiveportal/PacketFence/Controller/Pay.pm
patching file html/captive-portal/lib/captiveportal/PacketFence/Controller/Root.pm
patching file html/captive-portal/lib/captiveportal/PacketFence/Controller/Signup.pm
patching file html/captive-portal/lib/captiveportal/PacketFence/Model/Portal/Session.pm
patching file html/captive-portal/lib/captiveportal/PacketFence/View/HTML.pm
patching file html/captive-portal/lib/captiveportal/Role/Request.pm
patching file html/pfappserver/lib/pfappserver/Controller/Configuration/Fingerprints.pm
patching file html/pfappserver/lib/pfappserver/Form/Authentication/Source/LDAP.pm
patching file html/pfappserver/lib/pfappserver/Model/Node.pm
patching file html/pfappserver/lib/pfappserver/Model/Search/Node.pm
patching file html/pfappserver/lib/pfappserver/Role/Controller/BulkActions.pm
patching file lib/pf/Authentication/Source.pm
patching file lib/pf/Authentication/Source/LDAPSource.pm
patching file lib/pf/CHI.pm
patching file lib/pf/Switch/Cisco/Catalyst_2950.pm
patching file lib/pf/activation.pm
patching file lib/pf/api.pm
patching file lib/pf/config.pm
patching file lib/pf/radius.pm
patching file lib/pf/services/manager/httpd.pm
patching file lib/pf/services/manager/pfdhcplistener.pm
patching file lib/pf/vlan.pm
patching file lib/pf/web/externalportal.pm
patching file sbin/pfdhcplistener
patching file sbin/pfsetvlan
can't find file to patch at input line 990
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/t/data/authentication.conf b/t/data/authentication.conf
|index 22bf634..5c83364 100644
|--- a/t/data/authentication.conf
|+++ b/t/data/authentication.conf
--------------------------
File to patch: |
|
|
|
That's because someone made a mistake of adding a unit test to the maintenance branch. Just press enter twice and it will auto select the best approach (to ignore the file in this case) |
|
|
|
After updating and restarting all services, I have success! Thanks!
"Success! Thank you for submitting your fingerprints" |
|
|
|
You're welcome.
We got them so the whole process works.
Closing |
|