entrouvert
/
univnautes-old
Archived
17
0
Fork 0
Code Issues Pull Requests Releases Activity

[patches] sync with upstream (really...)

This commit is contained in:
Thomas NOËL 2013-09-13 21:43:02 +02:00
parent d0b591c861
commit 54368b7aed
13 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
copy_overlay/usr/src/univnautes-patches/captive_portal_status.widget.php.diff
View File

@ -1,5 +1,5 @@
--- orig/captive_portal_status.widget.php 2011-03-05 00:39:48.000000000 +0100
+++ new/captive_portal_status.widget.php 2011-09-27 19:41:05.000000000 +0200
--- orig/captive_portal_status.widget.php 2013-03-12 08:55:49.343739839 +0100
+++ new/captive_portal_status.widget.php 2013-03-12 08:55:49.343739839 +0100
@@ -51,6 +51,8 @@
flush();

4
copy_overlay/usr/src/univnautes-patches/captiveportal.inc.diff
View File

@ -1,5 +1,5 @@
--- orig/captiveportal.inc 2013-02-22 15:38:14.729418160 +0100
+++ new/captiveportal.inc 2013-02-22 15:44:22.384440832 +0100
--- orig/captiveportal.inc 2013-03-12 08:55:49.347739851 +0100
+++ new/captiveportal.inc 2013-03-12 08:55:49.343739839 +0100
@@ -406,19 +406,21 @@
$cacert = "";
$key = base64_decode($config['captiveportal']['private-key']);

6
copy_overlay/usr/src/univnautes-patches/globals.inc.diff
View File

@ -1,6 +1,6 @@
--- orig/globals.inc 2013-01-08 17:10:32.840290872 +0100
+++ new/globals.inc 2013-01-08 17:10:36.312290777 +0100
@@ -149,4 +149,8 @@
--- orig/globals.inc 2013-09-13 14:38:09.343123470 +0200
+++ new/globals.inc 2013-09-13 14:38:18.047166628 +0200
@@ -154,4 +154,8 @@
$config_parsed = false;

4
copy_overlay/usr/src/univnautes-patches/rc.initial.setlanip.diff
View File

@ -1,5 +1,5 @@
--- orig/rc.initial.setlanip 2013-03-13 10:26:37.878255375 +0100
+++ new/rc.initial.setlanip 2013-03-13 10:26:43.178296717 +0100
--- orig/rc.initial.setlanip 2013-03-25 22:21:03.049663115 +0100
+++ new/rc.initial.setlanip 2013-03-25 22:21:03.049663115 +0100
@@ -201,6 +201,7 @@
echo "Done!\n";
}

6
copy_overlay/usr/src/univnautes-patches/services.inc.diff
View File

@ -1,6 +1,6 @@
--- orig/services.inc 2012-05-10 22:59:12.171595982 +0200
+++ new/services.inc 2012-05-10 22:59:24.231595704 +0200
@@ -835,6 +835,47 @@
--- orig/services.inc 2013-09-13 14:39:53.527640099 +0200
+++ new/services.inc 2013-09-13 14:39:56.727655966 +0200
@@ -878,6 +878,47 @@
EOD;
}

4
copy_overlay/usr/src/univnautes-patches/services_captiveportal.php.diff
View File

@ -1,5 +1,5 @@
--- orig/services_captiveportal.php 2012-05-30 23:22:22.655942179 +0200
+++ new/services_captiveportal.php 2012-07-09 16:43:53.138749949 +0200
--- orig/services_captiveportal.php 2013-03-12 08:55:49.347739851 +0100
+++ new/services_captiveportal.php 2013-03-12 08:55:49.343739839 +0100
@@ -309,11 +309,15 @@
<?php
$tab_array = array();

4
copy_overlay/usr/src/univnautes-patches/services_captiveportal_filemanager.php.diff
View File

@ -1,5 +1,5 @@
--- orig/services_captiveportal_filemanager.php 2011-02-16 10:55:47.000000000 +0100
+++ new/services_captiveportal_filemanager.php 2012-07-09 16:43:25.378748841 +0200
--- orig/services_captiveportal_filemanager.php 2013-03-12 08:55:49.347739851 +0100
+++ new/services_captiveportal_filemanager.php 2013-03-12 08:55:49.343739839 +0100
@@ -137,11 +137,15 @@
<?php
$tab_array = array();

4
copy_overlay/usr/src/univnautes-patches/services_captiveportal_ip.php.diff
View File

@ -1,5 +1,5 @@
--- orig/services_captiveportal_ip.php 2011-02-16 10:55:47.000000000 +0100
+++ new/services_captiveportal_ip.php 2012-07-09 16:43:35.766749256 +0200
--- orig/services_captiveportal_ip.php 2013-03-12 08:55:49.347739851 +0100
+++ new/services_captiveportal_ip.php 2013-03-12 08:55:49.343739839 +0100
@@ -91,11 +91,15 @@
<?php
$tab_array = array();

4
copy_overlay/usr/src/univnautes-patches/services_captiveportal_mac.php.diff
View File

@ -1,5 +1,5 @@
--- orig/services_captiveportal_mac.php 2011-05-27 13:24:37.000000000 +0200
+++ new/services_captiveportal_mac.php 2012-07-09 16:43:44.758749615 +0200
--- orig/services_captiveportal_mac.php 2013-03-12 08:55:49.347739851 +0100
+++ new/services_captiveportal_mac.php 2013-03-12 08:55:49.343739839 +0100
@@ -133,11 +133,15 @@
<?php
$tab_array = array();

4
copy_overlay/usr/src/univnautes-patches/services_snmp.php.diff
View File

@ -1,5 +1,5 @@
--- orig/services_snmp.php 2013-02-22 15:44:52.532687817 +0100
+++ new/services_snmp.php 2013-02-22 15:44:56.036716515 +0100
--- orig/services_snmp.php 2013-03-12 08:55:49.347739851 +0100
+++ new/services_snmp.php 2013-03-12 08:55:49.343739839 +0100
@@ -54,6 +54,7 @@
$config['snmpd']['modules']['netgraph'] = true;
$config['snmpd']['modules']['pf'] = true;

4
copy_overlay/usr/src/univnautes-patches/services_status.widget.php.diff
View File

@ -1,5 +1,5 @@
--- orig/services_status.widget.php 2012-05-15 00:52:17.988894062 +0200
+++ new/services_status.widget.php 2012-05-15 00:52:21.600894200 +0200
--- orig/services_status.widget.php 2013-03-12 08:55:49.347739851 +0100
+++ new/services_status.widget.php 2013-03-12 08:55:49.343739839 +0100
@@ -75,10 +75,24 @@
$services[] = $svcconfig;

4
copy_overlay/usr/src/univnautes-patches/status_captiveportal.php.diff
View File

@ -1,5 +1,5 @@
--- orig/status_captiveportal.php 2011-08-24 10:56:37.000000000 +0200
+++ new/status_captiveportal.php 2011-09-27 19:41:58.000000000 +0200
--- orig/status_captiveportal.php 2013-09-13 14:37:43.902997367 +0200
+++ new/status_captiveportal.php 2013-09-13 14:37:48.911022159 +0200
@@ -123,7 +123,8 @@
<tr>
<td class="listhdrr"><a href="?order=ip&amp;showact=<?=htmlspecialchars($_GET['showact']);?>"><?=gettext("IP address");?></a></td>

4
copy_overlay/usr/src/univnautes-patches/status_services.php.diff
View File

@ -1,5 +1,5 @@
--- orig/status_services.php 2013-02-22 15:37:14.028917059 +0100
+++ new/status_services.php 2013-02-22 15:37:18.172951289 +0100
--- orig/status_services.php 2013-03-12 08:55:49.347739851 +0100
+++ new/status_services.php 2013-03-12 08:55:49.343739839 +0100
@@ -68,6 +68,10 @@
killbypid("{$g['varrun_path']}/lighty-CaptivePortal-SSL.pid");
captiveportal_init_webgui();