Development August 2017

development@lists.ipfire.org

12 participants
46 discussions

[PATCH 1/2] apr and aprutil: Added as requirement for apache 2.4
by Wolfgang Apolinarski 04 Sep '17

04 Sep '17

- APR 1.6.2 is a requirement for building apache httpd 2.4 - APR-Util 1.6.0 is a requirement for building apache httpd 2.4 --- config/rootfiles/common/apache2 | 8 ++-- config/rootfiles/common/apr | 57 ++++++++++++++++++++++++++++ config/rootfiles/common/aprutil | 52 +++++++++++++++++++++++++ lfs/apr | 84 +++++++++++++++++++++++++++++++++++++++++ lfs/aprutil | 84 +++++++++++++++++++++++++++++++++++++++++ make.sh | 2 + 6 files changed, 283 insertions(+), 4 deletions(-) create mode 100644 config/rootfiles/common/apr create mode 100644 config/rootfiles/common/aprutil create mode 100644 lfs/apr create mode 100644 lfs/aprutil diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2 index 7e33a155e..360f5ae61 100644 --- a/config/rootfiles/common/apache2 +++ b/config/rootfiles/common/apache2 @@ -1342,22 +1342,22 @@ usr/lib/apache/mod_usertrack.so usr/lib/apache/mod_version.so usr/lib/apache/mod_vhost_alias.so #usr/lib/apr-util-1 -usr/lib/apr-util-1/apr_dbd_sqlite3-1.so +#usr/lib/apr-util-1/apr_dbd_sqlite3-1.so #usr/lib/apr-util-1/apr_dbd_sqlite3.a #usr/lib/apr-util-1/apr_dbd_sqlite3.la -usr/lib/apr-util-1/apr_dbd_sqlite3.so +#usr/lib/apr-util-1/apr_dbd_sqlite3.so #usr/lib/apr.exp #usr/lib/aprutil.exp #usr/lib/libapr-1.a #usr/lib/libapr-1.la usr/lib/libapr-1.so usr/lib/libapr-1.so.0 -usr/lib/libapr-1.so.0.5.1 +#usr/lib/libapr-1.so.0.5.1 #usr/lib/libaprutil-1.a #usr/lib/libaprutil-1.la usr/lib/libaprutil-1.so usr/lib/libaprutil-1.so.0 -usr/lib/libaprutil-1.so.0.5.3 +#usr/lib/libaprutil-1.so.0.5.3 #usr/lib/pkgconfig/apr-1.pc #usr/lib/pkgconfig/apr-util-1.pc #usr/sbin/ab diff --git a/config/rootfiles/common/apr b/config/rootfiles/common/apr new file mode 100644 index 000000000..abc825623 --- /dev/null +++ b/config/rootfiles/common/apr @@ -0,0 +1,57 @@ +usr/bin/apr-1-config +#usr/include/apr-1 +#usr/include/apr-1/apr.h +#usr/include/apr-1/apr_allocator.h +#usr/include/apr-1/apr_atomic.h +#usr/include/apr-1/apr_cstr.h +#usr/include/apr-1/apr_dso.h +#usr/include/apr-1/apr_env.h +#usr/include/apr-1/apr_errno.h +#usr/include/apr-1/apr_escape.h +#usr/include/apr-1/apr_file_info.h +#usr/include/apr-1/apr_file_io.h +#usr/include/apr-1/apr_fnmatch.h +#usr/include/apr-1/apr_general.h +#usr/include/apr-1/apr_getopt.h +#usr/include/apr-1/apr_global_mutex.h +#usr/include/apr-1/apr_hash.h +#usr/include/apr-1/apr_inherit.h +#usr/include/apr-1/apr_lib.h +#usr/include/apr-1/apr_mmap.h +#usr/include/apr-1/apr_network_io.h +#usr/include/apr-1/apr_perms_set.h +#usr/include/apr-1/apr_poll.h +#usr/include/apr-1/apr_pools.h +#usr/include/apr-1/apr_portable.h +#usr/include/apr-1/apr_proc_mutex.h +#usr/include/apr-1/apr_random.h +#usr/include/apr-1/apr_ring.h +#usr/include/apr-1/apr_shm.h +#usr/include/apr-1/apr_signal.h +#usr/include/apr-1/apr_skiplist.h +#usr/include/apr-1/apr_strings.h +#usr/include/apr-1/apr_support.h +#usr/include/apr-1/apr_tables.h +#usr/include/apr-1/apr_thread_cond.h +#usr/include/apr-1/apr_thread_mutex.h +#usr/include/apr-1/apr_thread_proc.h +#usr/include/apr-1/apr_thread_rwlock.h +#usr/include/apr-1/apr_time.h +#usr/include/apr-1/apr_user.h +#usr/include/apr-1/apr_version.h +#usr/include/apr-1/apr_want.h +usr/lib/libapr-1.so.0.6.2 +usr/lib/apr.exp +usr/lib/libapr-1.la +usr/lib/libapr-1.so +usr/lib/libapr-1.so.0 +#usr/lib/pkgconfig/apr-1.pc +#usr/share/apr-1 +#usr/share/apr-1/build +#usr/share/apr-1/build/apr_common.m4 +#usr/share/apr-1/build/apr_rules.mk +#usr/share/apr-1/build/find_apr.m4 +#usr/share/apr-1/build/libtool +#usr/share/apr-1/build/make_exports.awk +#usr/share/apr-1/build/make_var_export.awk +#usr/share/apr-1/build/mkdir.sh diff --git a/config/rootfiles/common/aprutil b/config/rootfiles/common/aprutil new file mode 100644 index 000000000..7b0bbb8d7 --- /dev/null +++ b/config/rootfiles/common/aprutil @@ -0,0 +1,52 @@ +usr/bin/apu-1-config +#usr/include/apr-1/apr_anylock.h +#usr/include/apr-1/apr_base64.h +#usr/include/apr-1/apr_buckets.h +#usr/include/apr-1/apr_crypto.h +#usr/include/apr-1/apr_date.h +#usr/include/apr-1/apr_dbd.h +#usr/include/apr-1/apr_dbm.h +#usr/include/apr-1/apr_hooks.h +#usr/include/apr-1/apr_ldap.h +#usr/include/apr-1/apr_ldap_init.h +#usr/include/apr-1/apr_ldap_option.h +#usr/include/apr-1/apr_ldap_rebind.h +#usr/include/apr-1/apr_ldap_url.h +#usr/include/apr-1/apr_md4.h +#usr/include/apr-1/apr_md5.h +#usr/include/apr-1/apr_memcache.h +#usr/include/apr-1/apr_optional.h +#usr/include/apr-1/apr_optional_hooks.h +#usr/include/apr-1/apr_queue.h +#usr/include/apr-1/apr_redis.h +#usr/include/apr-1/apr_reslist.h +#usr/include/apr-1/apr_rmm.h +#usr/include/apr-1/apr_sdbm.h +#usr/include/apr-1/apr_sha1.h +#usr/include/apr-1/apr_siphash.h +#usr/include/apr-1/apr_strmatch.h +#usr/include/apr-1/apr_thread_pool.h +#usr/include/apr-1/apr_uri.h +#usr/include/apr-1/apr_uuid.h +#usr/include/apr-1/apr_xlate.h +#usr/include/apr-1/apr_xml.h +#usr/include/apr-1/apu.h +#usr/include/apr-1/apu_errno.h +#usr/include/apr-1/apu_version.h +#usr/include/apr-1/apu_want.h +#usr/include/apr-1/expat.h +usr/lib/libaprutil-1.la +usr/lib/libaprutil-1.so +usr/lib/libaprutil-1.so.0 +usr/lib/libaprutil-1.so.0.6.0 +#usr/lib/libexpat.a +#usr/lib/libexpat.la +#usr/lib/libexpat.so +#usr/lib/libexpat.so.0 +#usr/lib/libexpat.so.0.5.0 +#usr/lib/pkgconfig/apr-util-1.pc +usr/lib/apr-util-1 +usr/lib/apr-util-1/apr_crypto_openssl-1.so +usr/lib/apr-util-1/apr_crypto_openssl.la +usr/lib/apr-util-1/apr_crypto_openssl.so +usr/lib/aprutil.exp diff --git a/lfs/apr b/lfs/apr new file mode 100644 index 000000000..24ab1d79e --- /dev/null +++ b/lfs/apr @@ -0,0 +1,84 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2014 IPFire Team <info(a)ipfire.org> # +# # +# This program 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. # +# # +# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.6.2 + +THISAPP = apr-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = http://archive.apache.org/dist/apr +DIR_APP = $(DIR_SRC)/$(THISAPP) + +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = e81a851967c79b5ce9bfbc909e4bf735 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && sed -i "/seems to be moved/s/^/#/" build/ltmain.sh + + cd $(DIR_APP) && ./configure --prefix=/usr \ + --disable-static --with-installbuilddir=/usr/share/apr-1/build + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/aprutil b/lfs/aprutil new file mode 100644 index 000000000..cf8f4a8a9 --- /dev/null +++ b/lfs/aprutil @@ -0,0 +1,84 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2014 IPFire Team <info(a)ipfire.org> # +# # +# This program 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. # +# # +# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.6.0 + +THISAPP = apr-util-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = http://archive.apache.org/dist/apr +DIR_APP = $(DIR_SRC)/$(THISAPP) + +TARGET = $(DIR_INFO)/$(THISAPP) + +DEPS = "apr" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 069a9a980776acab05212c5f37ef8368 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && ./configure --prefix=/usr \ + --with-apr=/usr --with-gdbm=/usr --with-openssl=/usr --with-crypto + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 663f23fbb..dd57c914e 100755 --- a/make.sh +++ b/make.sh @@ -358,6 +358,7 @@ buildbase() { lfsmake2 bzip2 lfsmake2 pcre lfsmake2 pcre-compat + lfsmake2 apr lfsmake2 bash lfsmake2 diffutils lfsmake2 e2fsprogs @@ -497,6 +498,7 @@ buildipfire() { lfsmake2 libevent2 lfsmake2 libevent2-compat lfsmake2 expat + lfsmake2 aprutil lfsmake2 unbound lfsmake2 gnutls lfsmake2 bind -- 2.13.0

2 7

SSL/TLS changes in Apache
by Peter Müller 04 Sep '17

04 Sep '17

Hello development list, sorry for dropping in here. Because I am an absolute newbie, I guess it might be better to explain major changes before I submit them in a patch. The first section affected by this the SSL/TLS configuration used by Apache. As far as I am concerned, there are these issues at the moment: (a) DH cipher suites Because of several reasons, I would like to see them disabled. First, they are more or less obsolete since all modern User Agents (i.e. Web Browsers) does not support them, they mostly use ECDHE instead. (Note that this is valid for web sites only; other type of servers - especially mail servers - are often maintained very badly and therefore do not support anything better.) Second, DH is much slower and needs more CPU time on both server and client than ECDHE. While this not a problem on up-to-date hardware, it might be an issue for older systems. Third, DH is vulnerable to LOGJAM, which is the most important reason to disable it. Fixing LOGJAM is not that easy since it would require i) Apache 2.4.x, which seems to be in development since some patches appeared here the other day ii) an individually created DH prime file, which takes usually more than 20 minutes and requires a huge amount of CPU time. So, disabling the DH cipher suites would be a relatively simple workaround. (b) Cipher strength Currently, AES128 is preferred over AES265 nearly all the time. Since I do not see any reason for this, I would suggest to order them by strength. (c) Unused ciphers Further, there are many unused cipher suites listed (such as SRP, DSS and PSK) which are not supported by any modern browser - and probably never will. Thereof it might make sense to remove them, since they cause the cipherlist to be quite complex and hard to understand. (d) Certificate dual-stack At the first boot, IPFire generates an RSA host key for Apache with a size of 4096 bits. However, there is another key exchange algorithm, called ECDSA. It has several advantages over RSA: i) Compared by key size, it is more secure. An ECDSA key with 256 bits provides the same strength as a RSA key with 3072 bits. ii) Key generation is much faster (384 bits should be sufficient for most applications, it equals about 9216 bits RSA). Especially on slower hardware or systems without a HWRNG, this will accelerate the first boot. iii) It needs less CPU resources on both server and client than RSA. Again, this might be relevant for systems running on legacy hardware. Since ECDSA and RSA can be used parallel (clients that do not understand one key exchange algorithm use the other), I suggest to generate an ECDSA key, too. Most modern User Agents even prefer it over RSA. What do you think of those? (If I made a mistake somewhere - now or in the future -, I would be frightfully grateful for feedback. :-) ) Best regards, Peter Müller

2 3

Strange Firewall Log Entries in IPFire
by Subs Subs 31 Aug '17

31 Aug '17

Hi I was advised on the forum to ask for help here. My firewall logs is filled with: "Rest Connection" like the ones below What does it mean. I have searched all over and can't find a single reference. Thank you in advance 11:49:20 Rest Connection green0 TCP 10.0.0.252 216.58.205.142 40470 80(HTTP) 08:00:23:8a:85:46 11:49:20 Rest Connection red0 TCP 216.58.205.142 10.0.0.252 80(HTTP) 40470 US 0c:66:bd:fc:79:c3 Here is another interesting one. I have a virtual server at 10.0.0.252 The NTP action follows: 07:51:29 Rest Connection red0 UDP 91.189.89.198 10.0.0.252 123(NTP) 36063 GB 0c:d6:bd:fc:79:c3 07:51:28 Rest Connection green0 UDP 10.0.0.252 91.189.89.198 36063 123(NTP) 08:00:27:8a:85:46 Modem 10.0.4.1 Red 10.0.4.2 Green 10.0.0.1 Netmask 255.255.252.0 Hardware10.0.0.10 - 10.0.0.254 Group1 10.0.1.1 - 10.0.1.254 Group2 10.0.2.1 - 10.0.2.254 DHCP 10.0.3.1 - 10.0.3.254 No Blue no dmz, plain straight forward RED GREEN The MACs are known on my network. Thanks in advance Bye

1 0

[PATCH] wpa_supplicant: Allow systemd to reload the daemon.
by Stefan Schantl 29 Aug '17

29 Aug '17

* Add the required command to the systemd service file to allow systemd to reload the running instances of wpa_supplicant. * Also drop config file for logrotate, which is not needed anymore. Fixes #11479. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- wpa_supplicant/systemd/wpa_supplicant@.service | 1 + wpa_supplicant/wpa_supplicant.logrotate | 6 ------ wpa_supplicant/wpa_supplicant.nm | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) delete mode 100644 wpa_supplicant/wpa_supplicant.logrotate diff --git a/wpa_supplicant/systemd/wpa_supplicant@.service b/wpa_supplicant/systemd/wpa_supplicant@.service index 3c41490..7907310 100644 --- a/wpa_supplicant/systemd/wpa_supplicant@.service +++ b/wpa_supplicant/systemd/wpa_supplicant@.service @@ -3,6 +3,7 @@ Description=wpa_supplicant for %I. [Service] ExecStart=/usr/lib/network/helpers/wpa_supplicant %I +ExecReload=/bin/kill -HUP $MAINPID PIDFile=/run/wpa_supplicant-%I.pid Restart=on-failure UtmpIdentifier=%I diff --git a/wpa_supplicant/wpa_supplicant.logrotate b/wpa_supplicant/wpa_supplicant.logrotate deleted file mode 100644 index bd7ef91..0000000 --- a/wpa_supplicant/wpa_supplicant.logrotate +++ /dev/null @@ -1,6 +0,0 @@ -/var/log/wpa_supplicant.log { - missingok - notifempty - size 30k - create 0600 root root -} diff --git a/wpa_supplicant/wpa_supplicant.nm b/wpa_supplicant/wpa_supplicant.nm index aeb5011..80307cd 100644 --- a/wpa_supplicant/wpa_supplicant.nm +++ b/wpa_supplicant/wpa_supplicant.nm @@ -5,7 +5,7 @@ name = wpa_supplicant version = 2.6 -release = 1 +release = 2 groups = Sytem/Base url = http://hostap.epitest.fi/releases/ -- 2.9.4

2 1

[PATCH] WIO: fix the bugs reported in the forum
by Stephan Feddersen 29 Aug '17

29 Aug '17

--- lfs/wio | 4 ++-- src/paks/wio/install.sh | 1 + src/wio/wio.cgi | 25 ++++++++++++++++++++----- src/wio/wiographs.cgi | 2 +- 4 files changed, 24 insertions(+), 8 deletions(-) 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/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. -- 2.7.4

2 1

git.ipfire.org - wrong date!?
by Matthias Fischer 28 Aug '17

28 Aug '17

Hi, > ... > Looks as if someone should take a look at the clock, or am I missing > something? ;-) Please forget it, commit-date/time was "Thursday". My fault. I just waited for some answers before pushing... All is well. Best, Matthias

1 0

git.ipfire.org - wrong date!?
by Matthias Fischer 28 Aug '17

28 Aug '17

Hi, a few minutes ago I merged 'next', but 'git.ipfire.org' tells me that I did this "4 days ago": http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=b7fddaa6… This 'merge' was followed by two uploads which happened "3" and "2 days ago"!? http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=443dc6da… http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=2e502f9e… Looks as if someone should take a look at the clock, or am I missing something? ;-) Best, Matthias

1 0

[PATCH] wireless-networks: validate priority
by Jonatan Schlag 24 Aug '17

24 Aug '17

Fixes: #11469 Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/functions/functions.wireless-networks | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/functions/functions.wireless-networks b/src/functions/functions.wireless-networks index c1cf06a..8d2a32d 100644 --- a/src/functions/functions.wireless-networks +++ b/src/functions/functions.wireless-networks @@ -315,6 +315,18 @@ wireless_network_pre_shared_key() { fi } +wireless_networks_priority_is_valid() { + assert [ $# -eq 1 ] + + local priority=${1} + + if ! isinteger priority || [ ! ${priority} -ge 0 ] || [ ! ${priority} -le 999 ]; then + return ${EXIT_FALSE} + fi + + return ${EXIT_TRUE} +} + wireless_network_priority() { if [ ! $# -eq 2 ]; then log ERROR "Not enough arguments" @@ -324,8 +336,8 @@ wireless_network_priority() { local handle="${1}" local priority=${2} - if ! isinteger priority && [ ! ${priority} -ge 0 ]; then - log ERROR "The priority must be an integer greater or eqal zero" + if ! wireless_networks_priority_is_valid ${priority}; then + error "The priority must be an integer greater or eqal zero and and less then 1000" return ${EXIT_ERROR} fi -- 2.6.3

1 0

Apache 2.4 and apr patches
by Wolfgang Apolinarski 23 Aug '17

23 Aug '17

Hi! I updated the patches and made some adjustments, please check and test the new versions! Regarding the Apache 2.4 configuration, MaxRequestWorkers is the new MaxClients (it limits the total number of threads available), ThreadsPerChild standard value is 25, 16 should be enough for ipfire, since MaxRequestWorkers is computed by ServerLimit (default: 16) * ThreadsPerChild. MaxSpareThreads must be at least the sum of MinSpareThreads+ThreadsPerChild. This should be very similar to the existing prefork configuration. If possible, please test it thoroughly. Best regards, Wolfgang

1 0

[PATCH] unbound: Update to 1.6.5
by Matthias Fischer 23 Aug '17

23 Aug '17

Changelog: "21 Aug 2017: Wouter - Fix install of trust anchor when two anchors are present, makes both valid. Checks hash of DS but not signature of new key. This fixes installs between sep11 and oct11 2017." Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/common/unbound | 2 +- lfs/unbound | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/rootfiles/common/unbound b/config/rootfiles/common/unbound index 5d33140c8..b029c8b98 100644 --- a/config/rootfiles/common/unbound +++ b/config/rootfiles/common/unbound @@ -11,7 +11,7 @@ etc/unbound/unbound.conf #usr/lib/libunbound.la #usr/lib/libunbound.so usr/lib/libunbound.so.2 -usr/lib/libunbound.so.2.5.3 +usr/lib/libunbound.so.2.5.4 usr/sbin/unbound usr/sbin/unbound-anchor usr/sbin/unbound-checkconf diff --git a/lfs/unbound b/lfs/unbound index 5046f45f3..462528418 100644 --- a/lfs/unbound +++ b/lfs/unbound @@ -24,7 +24,7 @@ include Config -VER = 1.6.4 +VER = 1.6.5 THISAPP = unbound-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = ab6f7c07610907f1d87191c9ac2db87a +$(DL_FILE)_MD5 = 5825332b72bae9d8793f9cba16cb13fd install : $(TARGET) -- 2.14.1

2 1

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development August 2017