From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. c42237247aec6de190d135b61213054b8b7e2e22
Date: Sun, 24 Sep 2017 14:52:36 +0100 [thread overview]
Message-ID: <20170924135237.73AA11081DE1@git01.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 17141 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via c42237247aec6de190d135b61213054b8b7e2e22 (commit)
via d62fd7553da8699bd60e3decb6b646d4436d372d (commit)
via 2083519a64c82e8b68ef50cace6be56e7003aa3c (commit)
via 3aa4579f8f7fddc46e60faf22f19228bf358d759 (commit)
via fe6f676b3542b78b4013b8d438f4bd2026c7c9f0 (commit)
from 1b0ff72dad0225f1b636605e17a42c465f96d884 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c42237247aec6de190d135b61213054b8b7e2e22
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Sep 24 15:51:12 2017 +0200
start core115
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit d62fd7553da8699bd60e3decb6b646d4436d372d
Merge: 1b0ff72 2083519
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Sep 24 15:45:04 2017 +0200
Merge branch 'master' into next
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/{114 => 115}/exclude | 0
.../{oldcore/102 => core/115}/filelists/files | 0
.../103 => core/115}/filelists/wpa_supplicant | 0
config/rootfiles/core/{114 => 115}/meta | 0
.../rootfiles/{oldcore/112 => core/115}/update.sh | 12 ++++-------
config/rootfiles/{core => oldcore}/114/exclude | 0
.../{core => oldcore}/114/filelists/apache2 | 0
.../rootfiles/{core => oldcore}/114/filelists/apr | 0
.../{core => oldcore}/114/filelists/aprutil | 0
.../{core => oldcore}/114/filelists/files | 0
.../{core => oldcore}/114/filelists/gnutls | 0
.../{core => oldcore}/114/filelists/hdparm | 0
.../114/filelists/i586/strongswan-padlock | 0
.../rootfiles/oldcore/{111 => 114}/filelists/php | 0
.../{core => oldcore}/114/filelists/squid | 0
.../{core => oldcore}/114/filelists/strongswan | 0
.../{core => oldcore}/114/filelists/unbound | 0
config/rootfiles/{core => oldcore}/114/meta | 0
config/rootfiles/{core => oldcore}/114/update.sh | 0
lfs/wio | 4 ++--
make.sh | 2 +-
src/paks/wio/install.sh | 1 +
src/wio/wio.cgi | 25 +++++++++++++++++-----
src/wio/wiographs.cgi | 2 +-
24 files changed, 29 insertions(+), 17 deletions(-)
copy config/rootfiles/core/{114 => 115}/exclude (100%)
copy config/rootfiles/{oldcore/102 => core/115}/filelists/files (100%)
copy config/rootfiles/{oldcore/103 => core/115}/filelists/wpa_supplicant (100%)
copy config/rootfiles/core/{114 => 115}/meta (100%)
copy config/rootfiles/{oldcore/112 => core/115}/update.sh (93%)
rename config/rootfiles/{core => oldcore}/114/exclude (100%)
rename config/rootfiles/{core => oldcore}/114/filelists/apache2 (100%)
rename config/rootfiles/{core => oldcore}/114/filelists/apr (100%)
rename config/rootfiles/{core => oldcore}/114/filelists/aprutil (100%)
rename config/rootfiles/{core => oldcore}/114/filelists/files (100%)
rename config/rootfiles/{core => oldcore}/114/filelists/gnutls (100%)
rename config/rootfiles/{core => oldcore}/114/filelists/hdparm (100%)
rename config/rootfiles/{core => oldcore}/114/filelists/i586/strongswan-padlock (100%)
copy config/rootfiles/oldcore/{111 => 114}/filelists/php (100%)
rename config/rootfiles/{core => oldcore}/114/filelists/squid (100%)
rename config/rootfiles/{core => oldcore}/114/filelists/strongswan (100%)
rename config/rootfiles/{core => oldcore}/114/filelists/unbound (100%)
rename config/rootfiles/{core => oldcore}/114/meta (100%)
rename config/rootfiles/{core => oldcore}/114/update.sh (100%)
Difference in files:
diff --git a/config/rootfiles/core/114/exclude b/config/rootfiles/core/115/exclude
similarity index 100%
rename from config/rootfiles/core/114/exclude
rename to config/rootfiles/core/115/exclude
diff --git a/config/rootfiles/core/115/filelists/files b/config/rootfiles/core/115/filelists/files
new file mode 100644
index 0000000..409e5fe
--- /dev/null
+++ b/config/rootfiles/core/115/filelists/files
@@ -0,0 +1,2 @@
+etc/system-release
+etc/issue
diff --git a/config/rootfiles/core/115/filelists/wpa_supplicant b/config/rootfiles/core/115/filelists/wpa_supplicant
new file mode 120000
index 0000000..1d04c03
--- /dev/null
+++ b/config/rootfiles/core/115/filelists/wpa_supplicant
@@ -0,0 +1 @@
+../../../common/wpa_supplicant
\ No newline at end of file
diff --git a/config/rootfiles/core/114/meta b/config/rootfiles/core/115/meta
similarity index 100%
rename from config/rootfiles/core/114/meta
rename to config/rootfiles/core/115/meta
diff --git a/config/rootfiles/core/115/update.sh b/config/rootfiles/core/115/update.sh
new file mode 100644
index 0000000..31fc09d
--- /dev/null
+++ b/config/rootfiles/core/115/update.sh
@@ -0,0 +1,63 @@
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire is free software; you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation; either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# IPFire is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2017 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+core=115
+
+# Remove old core updates from pakfire cache to save space...
+for (( i=1; i<=$core; i++ )); do
+ rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+# Stop services
+
+# Extract files
+extract_files
+
+# update linker config
+ldconfig
+
+# Update Language cache
+#/usr/local/bin/update-lang-cache
+
+# Start services
+
+
+# This update need a reboot...
+#touch /var/run/need_reboot
+
+# Finish
+/etc/init.d/fireinfo start
+sendprofile
+
+# Update grub config to display new core version
+if [ -e /boot/grub/grub.cfg ]; then
+ grub-mkconfig -o /boot/grub/grub.cfg
+fi
+
+sync
+
+# Don't report the exitcode last command
+exit 0
diff --git a/config/rootfiles/oldcore/114/exclude b/config/rootfiles/oldcore/114/exclude
new file mode 100644
index 0000000..d6fd053
--- /dev/null
+++ b/config/rootfiles/oldcore/114/exclude
@@ -0,0 +1,30 @@
+boot/config.txt
+boot/grub/grub.cfg
+boot/grub/grubenv
+etc/alternatives
+etc/collectd.custom
+etc/default/grub
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+etc/localtime
+etc/shadow
+etc/snort/snort.conf
+etc/ssh/ssh_config
+etc/ssh/sshd_config
+etc/ssl/openssl.cnf
+etc/sudoers
+etc/sysconfig/firewall.local
+etc/sysconfig/rc.local
+etc/udev/rules.d/30-persistent-network.rules
+srv/web/ipfire/html/proxy.pac
+var/ipfire/dma
+var/ipfire/time
+var/ipfire/ovpn
+var/lib/alternatives
+var/log/cache
+var/log/dhcpcd.log
+var/log/messages
+var/state/dhcp/dhcpd.leases
+var/updatecache
diff --git a/config/rootfiles/core/114/filelists/apache2 b/config/rootfiles/oldcore/114/filelists/apache2
similarity index 100%
rename from config/rootfiles/core/114/filelists/apache2
rename to config/rootfiles/oldcore/114/filelists/apache2
diff --git a/config/rootfiles/core/114/filelists/apr b/config/rootfiles/oldcore/114/filelists/apr
similarity index 100%
rename from config/rootfiles/core/114/filelists/apr
rename to config/rootfiles/oldcore/114/filelists/apr
diff --git a/config/rootfiles/core/114/filelists/aprutil b/config/rootfiles/oldcore/114/filelists/aprutil
similarity index 100%
rename from config/rootfiles/core/114/filelists/aprutil
rename to config/rootfiles/oldcore/114/filelists/aprutil
diff --git a/config/rootfiles/core/114/filelists/files b/config/rootfiles/oldcore/114/filelists/files
similarity index 100%
rename from config/rootfiles/core/114/filelists/files
rename to config/rootfiles/oldcore/114/filelists/files
diff --git a/config/rootfiles/core/114/filelists/gnutls b/config/rootfiles/oldcore/114/filelists/gnutls
similarity index 100%
rename from config/rootfiles/core/114/filelists/gnutls
rename to config/rootfiles/oldcore/114/filelists/gnutls
diff --git a/config/rootfiles/core/114/filelists/hdparm b/config/rootfiles/oldcore/114/filelists/hdparm
similarity index 100%
rename from config/rootfiles/core/114/filelists/hdparm
rename to config/rootfiles/oldcore/114/filelists/hdparm
diff --git a/config/rootfiles/core/114/filelists/i586/strongswan-padlock b/config/rootfiles/oldcore/114/filelists/i586/strongswan-padlock
similarity index 100%
rename from config/rootfiles/core/114/filelists/i586/strongswan-padlock
rename to config/rootfiles/oldcore/114/filelists/i586/strongswan-padlock
diff --git a/config/rootfiles/oldcore/114/filelists/php b/config/rootfiles/oldcore/114/filelists/php
new file mode 120000
index 0000000..1ae48d7
--- /dev/null
+++ b/config/rootfiles/oldcore/114/filelists/php
@@ -0,0 +1 @@
+../../../common/php
\ No newline at end of file
diff --git a/config/rootfiles/core/114/filelists/squid b/config/rootfiles/oldcore/114/filelists/squid
similarity index 100%
rename from config/rootfiles/core/114/filelists/squid
rename to config/rootfiles/oldcore/114/filelists/squid
diff --git a/config/rootfiles/core/114/filelists/strongswan b/config/rootfiles/oldcore/114/filelists/strongswan
similarity index 100%
rename from config/rootfiles/core/114/filelists/strongswan
rename to config/rootfiles/oldcore/114/filelists/strongswan
diff --git a/config/rootfiles/core/114/filelists/unbound b/config/rootfiles/oldcore/114/filelists/unbound
similarity index 100%
rename from config/rootfiles/core/114/filelists/unbound
rename to config/rootfiles/oldcore/114/filelists/unbound
diff --git a/config/rootfiles/oldcore/114/meta b/config/rootfiles/oldcore/114/meta
new file mode 100644
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/oldcore/114/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/core/114/update.sh b/config/rootfiles/oldcore/114/update.sh
similarity index 100%
rename from config/rootfiles/core/114/update.sh
rename to config/rootfiles/oldcore/114/update.sh
diff --git a/lfs/wio b/lfs/wio
index 25726cd..d70b12b 100644
--- a/lfs/wio
+++ b/lfs/wio
@@ -15,7 +15,7 @@ THISAPP = wio-$(VER)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = wio
-PAK_VER = 2
+PAK_VER = 3
###############################################################################
# Top-level Rules
@@ -58,7 +58,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
install -v -m 644 $(DIR_APP)/wio/images/* /srv/web/ipfire/html/images/wio/
install -v -m 655 $(DIR_APP)/wio/lang/wio.de.pl /var/ipfire/addon-lang/
install -v -m 655 $(DIR_APP)/wio/lang/wio.en.pl /var/ipfire/addon-lang/
- install -v -m 655 $(DIR_APP)/wio/EX-wio.menu /var/ipfire/menu.d/
+ install -v -m 644 $(DIR_APP)/wio/EX-wio.menu /var/ipfire/menu.d/
install -v -m 644 $(DIR_APP)/wio/config/backup/includes/wio /var/ipfire/backup/addons/includes/wio
@rm -rf $(DIR_APP)
diff --git a/make.sh b/make.sh
index 73b7b38..815b25a 100755
--- a/make.sh
+++ b/make.sh
@@ -25,7 +25,7 @@
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.19" # Version number
-CORE="114" # Core Level (Filename)
+CORE="115" # Core Level (Filename)
PAKFIRE_CORE="114" # Core Level (PAKFIRE)
GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch
SLOGAN="www.ipfire.org" # Software slogan
diff --git a/src/paks/wio/install.sh b/src/paks/wio/install.sh
index f46ae35..5c7705b 100644
--- a/src/paks/wio/install.sh
+++ b/src/paks/wio/install.sh
@@ -30,6 +30,7 @@ chown -R nobody.nobody /var/log/rrd/wio
chown -R nobody.nobody /var/log/wio
chown root.nobody /usr/local/bin/wioscan
chown root.nobody /usr/local/bin/wiohelper
+chown nobody.nobody /var/ipfire/menu.d/EX-wio.menu
chmod 4750 /usr/local/bin/wioscan
chmod 4750 /usr/local/bin/wiohelper
diff --git a/src/wio/wio.cgi b/src/wio/wio.cgi
index aa471e6..4fbf34a 100644
--- a/src/wio/wio.cgi
+++ b/src/wio/wio.cgi
@@ -21,7 +21,7 @@
# #
###############################################################################
#
-# id: wio.cgi, v1.3.1 2017/07/11 21:31:16 sfeddersen
+# id: wio.cgi, v1.3.2 2017/08/27 14:11:16 sfeddersen
#
# This wio.cgi is based on the Code from the IPCop WIO Addon
# and is extremly adapted to work with IPFire.
@@ -917,7 +917,10 @@ print"
<td align='left'><select size='1' name='CRON' size='5'>
";
-for ($i=5; $i<=60; $i+=5) { printf("<option %s>%02s</option>\n",$selected{'CRON'}{$i},$i); }
+for ($i=5; $i<=60; $i+=5) {
+ $_ = sprintf("%02s",$i);
+ print "<option $selected{'CRON'}{$_}>$_</option>\n";
+}
print"
</select> $Lang::tr{'wio min'}</td>
@@ -929,7 +932,10 @@ print"
<td align='left'><select size='1' name='TIMEOUT' size='5'>
";
-for ($i=1; $i<=15; $i++) { printf("<option %s>%02s</option>\n",$selected{'TIMEOUT'}{$i},$i); }
+for ($i=1; $i<=15; $i++) {
+ $_ = sprintf("%02s",$i);
+ print "<option $selected{'TIMEOUT'}{$_}>$_</option>\n";
+}
print"
</select> $Lang::tr{'wio sec'}</td>
@@ -980,7 +986,10 @@ print"
<td align='left'><select size='1' name='OVPNCRON' size='5'>
";
-for ($i=1; $i<=15; $i++) { printf("<option %s>%02s</option>\n",$selected{'OVPNCRON'}{$i},$i); }
+for ($i=1; $i<=15; $i++) {
+ $_ = sprintf("%02s",$i);
+ print "<option $selected{'OVPNCRON'}{$_}>$_</option>\n";
+}
print"
</select> $Lang::tr{'wio min'}</td>
@@ -1947,7 +1956,13 @@ print"
<table border='0' width='100%' bordercolor='$Header::bordercolour' cellspacing='0' cellpadding='0' style='border-collapse: collapse'>
<tr bgcolor='$color{'color22'}'>
<td colspan='2' align='right'></td>
- <td width='10%' align='right'><form method='post' action='/cgi-bin/logs.cgi/log.dat' enctype='multipart/form-data'><input type='hidden' name='SECTION' value='wio' /><input type='submit' name='SUBMIT' value='$Lang::tr{'system logs'}' /></form></td>
+";
+
+if ( $wiosettings{'LOGGING'} eq 'on' ) {
+ print"<td width='10%' align='right'><form method='post' action='/cgi-bin/logs.cgi/log.dat' enctype='multipart/form-data'><input type='hidden' name='SECTION' value='wio' /><input type='submit' name='SUBMIT' value='$Lang::tr{'system logs'}' /></form></td>";
+}
+
+print"
<td width='10%' align='right'><form method='post' action='$ENV{'SCRIPT_NAME'}' enctype='multipart/form-data'><input type='hidden' name='ACTION' value='$Lang::tr{'edit'}1' /><input type='submit' name='SUBMIT' value='$Lang::tr{'wio_edit_set'}' /></form></td>
</tr>
</table>
diff --git a/src/wio/wiographs.cgi b/src/wio/wiographs.cgi
index 7370237..06b6946 100644
--- a/src/wio/wiographs.cgi
+++ b/src/wio/wiographs.cgi
@@ -21,7 +21,7 @@
# #
###############################################################################
#
-# id: wiographs.cgi, v1.3.1 2017/07/11 21:31:16 sfeddersen
+# id: wiographs.cgi, v1.3.2 2017/08/27 14:11:16 sfeddersen
#
# This wiographs.cgi is based on the Code from the IPCop WIO Addon
# and is extremly adapted to work with IPFire.
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2017-09-24 13:52 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170924135237.73AA11081DE1@git01.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox