IPFire-SCM

ipfire-scm@lists.ipfire.org

1 participants
7857 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. b6c60092db15360cd51091b9f5bcff637ee2ea7c
by Michael Tremer 22 Mar '19

22 Mar '19

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 b6c60092db15360cd51091b9f5bcff637ee2ea7c (commit) from fd0b2742bf217cbacacd4725a2bd9ad4ec1b6aaf (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 b6c60092db15360cd51091b9f5bcff637ee2ea7c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Mar 22 15:22:43 2019 +0000 openvpn: Remove subnet check for static pools Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/130/filelists/files | 1 + html/cgi-bin/ovpnmain.cgi | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) Difference in files: diff --git a/config/rootfiles/core/130/filelists/files b/config/rootfiles/core/130/filelists/files index 10e0184a3..b6ee45da7 100644 --- a/config/rootfiles/core/130/filelists/files +++ b/config/rootfiles/core/130/filelists/files @@ -13,6 +13,7 @@ srv/web/ipfire/cgi-bin/dnsforward.cgi srv/web/ipfire/cgi-bin/ids.cgi srv/web/ipfire/cgi-bin/logs.cgi/ids.dat srv/web/ipfire/cgi-bin/logs.cgi/log.dat +srv/web/ipfire/cgi-bin/ovpnmain.cgi usr/local/bin/ipsec-interfaces usr/local/bin/suricatactrl usr/local/bin/update-ids-ruleset diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 4fb234995..812680328 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -469,10 +469,7 @@ sub addccdnet $errormessage=$Lang::tr{'ccd err invalidnet'}; return; } - - $errormessage=&General::checksubnets($ccdname,$ccdnet); - - + if (!$errormessage) { my %ccdconfhash=(); $baseaddress=&General::getnetworkip($ccdip,$subcidr); hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 46d388cf017e80aeadc3fbf7a9764c92786bcf5f
by Michael Tremer 22 Mar '19

22 Mar '19

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 3.x development tree". The branch, master has been updated via 46d388cf017e80aeadc3fbf7a9764c92786bcf5f (commit) from eb73052472f1b98278691d61a8ca0d7ac2a5fc9b (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 46d388cf017e80aeadc3fbf7a9764c92786bcf5f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Mar 22 11:45:39 2019 +0100 hostapd: Update to 2.7 Enable to get randomness from getrandom() syscall instead of opening /dev/random directly Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: hostapd/hostapd.nm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) Difference in files: diff --git a/hostapd/hostapd.nm b/hostapd/hostapd.nm index 62dadd489..eb38e4610 100644 --- a/hostapd/hostapd.nm +++ b/hostapd/hostapd.nm @@ -4,8 +4,8 @@ ############################################################################### name = hostapd -version = 2.6 -release = 2 +version = 2.7 +release = 1 groups = Networking/Tools url = http://hostap.epitest.fi/hostapd/ @@ -33,6 +33,7 @@ build # Create our custom configuration. cat defconfig > .config sed -i .config \ + -e '/^#CONFIG_GETRANDOM=y/s/^#//' \ -e '/^#CONFIG_ACS=y/s/^#//' \ -e '/^#CONFIG_LIBNL32=y/s/^#//' \ -e '/^#CONFIG_TAXONOMY=y/s/^#//' \ hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. fd0b2742bf217cbacacd4725a2bd9ad4ec1b6aaf
by Michael Tremer 20 Mar '19

20 Mar '19

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 fd0b2742bf217cbacacd4725a2bd9ad4ec1b6aaf (commit) via aac6015042e28730982d643425f768f46dc9c603 (commit) via 5b8ff1ccb6506942485ff221e13d163691109a6c (commit) from af2dc11c921062608c4537368885eb195f54c177 (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 fd0b2742bf217cbacacd4725a2bd9ad4ec1b6aaf Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Mar 18 04:38:41 2019 +0000 dnsdist: Update to 1.3.3 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit aac6015042e28730982d643425f768f46dc9c603 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Mar 18 02:54:37 2019 +0000 dnsdist: Install some symlinks to start the service Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5b8ff1ccb6506942485ff221e13d163691109a6c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Mar 18 02:54:15 2019 +0000 dnsdist: Add backup include Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/backup/includes/dnsdist | 1 + config/rootfiles/packages/dnsdist | 3 ++- lfs/dnsdist | 20 +++++++++++++++----- src/initscripts/packages/dnsdist | 3 ++- src/paks/{bird => dnsdist}/install.sh | 11 +++-------- src/paks/{nginx => dnsdist}/uninstall.sh | 8 ++++++-- src/paks/{apcupsd => dnsdist}/update.sh | 0 7 files changed, 29 insertions(+), 17 deletions(-) create mode 100644 config/backup/includes/dnsdist copy src/paks/{bird => dnsdist}/install.sh (89%) copy src/paks/{nginx => dnsdist}/uninstall.sh (97%) copy src/paks/{apcupsd => dnsdist}/update.sh (100%) Difference in files: diff --git a/config/backup/includes/dnsdist b/config/backup/includes/dnsdist new file mode 100644 index 000000000..8d9b82584 --- /dev/null +++ b/config/backup/includes/dnsdist @@ -0,0 +1 @@ +/etc/dnsdist.conf diff --git a/config/rootfiles/packages/dnsdist b/config/rootfiles/packages/dnsdist index ba7381f34..3ccb1260c 100644 --- a/config/rootfiles/packages/dnsdist +++ b/config/rootfiles/packages/dnsdist @@ -1,3 +1,4 @@ +etc/rc.d/init.d/dnsdist usr/bin/dnsdist #usr/share/man/man1/dnsdist.1 -etc/rc.d/init.d/dnsdist +var/ipfire/backup/addons/includes/dnsdist diff --git a/lfs/dnsdist b/lfs/dnsdist index 3e10c9eb2..5963c5acd 100644 --- a/lfs/dnsdist +++ b/lfs/dnsdist @@ -24,7 +24,7 @@ include Config -VER = 0.0.498gac688af +VER = 1.3.3 THISAPP = dnsdist-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -33,11 +33,11 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) SUP_ARCH = x86_64 i586 PROG = dnsdist -PAK_VER = 1 +PAK_VER = 2 DEPS = "" -MAX_PARALLELISM = $(shell echo $$(( $(SYSTEM_MEMORY) / 512))) +MAX_PARALLELISM = $(shell echo $$(( $(SYSTEM_MEMORY) / 1024))) ############################################################################### # Top-level Rules @@ -47,7 +47,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = b1bc53b3a35aef7006b74086919847bf +$(DL_FILE)_MD5 = 6bbcdf5296ac5303e88d779d1d57a4df install : $(TARGET) @@ -80,13 +80,23 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --enable-openssl \ + --disable-gnutls \ + --with-lua \ + --without-net-snmp + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install #install initscripts $(call INSTALL_INITSCRIPT,dnsdist) + install -v -m 644 $(DIR_SRC)/config/backup/includes/dnsdist \ + /var/ipfire/backup/addons/includes/dnsdist + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/src/initscripts/packages/dnsdist b/src/initscripts/packages/dnsdist index 03e6ab81b..a70bd3806 100644 --- a/src/initscripts/packages/dnsdist +++ b/src/initscripts/packages/dnsdist @@ -14,7 +14,8 @@ case "${1}" in start) boot_mesg "Starting dnsdist..." - loadproc /usr/bin/dnsdist -d ${ARGS} + /usr/bin/dnsdist --supervised ${ARGS} >/dev/null & + evaluate_retval ;; stop) diff --git a/src/paks/dnsdist/install.sh b/src/paks/dnsdist/install.sh new file mode 100644 index 000000000..74966d643 --- /dev/null +++ b/src/paks/dnsdist/install.sh @@ -0,0 +1,35 @@ +#!/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 2 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) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh + +extract_files + +restore_backup "${NAME}" + +start_service "${NAME}" + +# Enable autostart +ln -sf ../init.d/dnsdist /etc/rc.d/rc0.d/K25dnsdist +ln -sf ../init.d/dnsdist /etc/rc.d/rc3.d/S35dnsdist +ln -sf ../init.d/dnsdist /etc/rc.d/rc6.d/K25dnsdist diff --git a/src/paks/dnsdist/uninstall.sh b/src/paks/dnsdist/uninstall.sh new file mode 100644 index 000000000..966c525c4 --- /dev/null +++ b/src/paks/dnsdist/uninstall.sh @@ -0,0 +1,34 @@ +#!/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 2 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) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh + +extract_backup_includes + +stop_service ${NAME} + +make_backup ${NAME} + +remove_files + +rm -rfv /etc/rc.d/rc*.d/*dnsdist diff --git a/src/paks/dnsdist/update.sh b/src/paks/dnsdist/update.sh new file mode 100644 index 000000000..89c40d0d7 --- /dev/null +++ b/src/paks/dnsdist/update.sh @@ -0,0 +1,26 @@ +#!/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 2 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) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +./uninstall.sh +./install.sh hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core129, updated. 36e686d94cbe5f6985725b296920535cdecf24a9
by Arne Fitzenreiter 20 Mar '19

20 Mar '19

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, core129 has been updated via 36e686d94cbe5f6985725b296920535cdecf24a9 (commit) from 67173e2831d55bf548ce6639a58d86f526761842 (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 36e686d94cbe5f6985725b296920535cdecf24a9 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Mar 20 13:17:59 2019 +0100 core129: use full path to rebuild-initrd script this is not in the search path for pakfire scripts Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/129/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/config/rootfiles/core/129/update.sh b/config/rootfiles/core/129/update.sh index dfeeeaa1e..8f3acb773 100644 --- a/config/rootfiles/core/129/update.sh +++ b/config/rootfiles/core/129/update.sh @@ -61,7 +61,7 @@ ldconfig /etc/init.d/squid start # Rebuild initrd -rebuild-initrd +/usr/local/bin/rebuild-initrd # This update needs a reboot... touch /var/run/need_reboot hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. af2dc11c921062608c4537368885eb195f54c177
by Michael Tremer 19 Mar '19

19 Mar '19

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 af2dc11c921062608c4537368885eb195f54c177 (commit) from b60fd7a3e2640d7da41a3bdb875669c302849acc (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 af2dc11c921062608c4537368885eb195f54c177 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Mar 16 23:09:11 2019 +0000 Rootfile update Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/armv5tel/python3-yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/config/rootfiles/packages/armv5tel/python3-yaml b/config/rootfiles/packages/armv5tel/python3-yaml index 6f8354a24..9525d0e37 100644 --- a/config/rootfiles/packages/armv5tel/python3-yaml +++ b/config/rootfiles/packages/armv5tel/python3-yaml @@ -1,5 +1,5 @@ #usr/lib/python3.6/site-packages/PyYAML-3.13-py3.6.egg-info -usr/lib/python3.6/site-packages/_yaml.cpython-36m-arm-linux-gnu.so +usr/lib/python3.6/site-packages/_yaml.cpython-36m-arm-linux-gnueabi.so usr/lib/python3.6/site-packages/yaml #usr/lib/python3.6/site-packages/yaml/__init__.py #usr/lib/python3.6/site-packages/yaml/__pycache__ hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. b60fd7a3e2640d7da41a3bdb875669c302849acc
by Michael Tremer 19 Mar '19

19 Mar '19

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 b60fd7a3e2640d7da41a3bdb875669c302849acc (commit) from ceaf0ef0087abb09e9cca1677c67776cf76ce417 (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 b60fd7a3e2640d7da41a3bdb875669c302849acc Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Mon Mar 18 20:33:28 2019 +0100 Core 130: Remove files after convert-snort has been launched The converter requires /etc/snort/snort.conf to grab the used rule files (categories). After all settings have been converted, we are fine to delete all snort related files, because none of them is needed anymore. Also the /var/ipfire/snort directory needs to be deleted. If it will be left on the system and at any later time a backup will get restored, the converter will be started by the backup script, because it detects that a snort settins dir exists and would be restore the old snort settings and replaces all current IPS settings. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/130/update.sh | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) Difference in files: diff --git a/config/rootfiles/core/130/update.sh b/config/rootfiles/core/130/update.sh index d33321c32..6d32bdba2 100644 --- a/config/rootfiles/core/130/update.sh +++ b/config/rootfiles/core/130/update.sh @@ -37,21 +37,6 @@ if [ -e "/etc/init.d/suricata" ]; then /etc/init.d/suricata stop fi -# Remove files -rm -rfv \ - /etc/rc.d/rc*.d/*snort \ - /etc/rc.d/init.d/networking/red.up/23-RS-snort \ - /etc/snort \ - /usr/bin/daq-modules-config \ - /usr/bin/u2boat \ - /usr/bin/u2spewfoo \ - /usr/lib/daq \ - /usr/lib/snort \ - /usr/lib/libdaq.so* \ - /usr/lib/libsfbpf.so* \ - /usr/local/bin/snortctl \ - /usr/sbin/snort - # Rename snort user to suricata if getent group snort &>/dev/null; then groupmod -n suricata snort @@ -74,6 +59,22 @@ ldconfig # Migrate snort configuration to suricata /usr/sbin/convert-snort +# Remove files +rm -rfv \ + /etc/rc.d/rc*.d/*snort \ + /etc/rc.d/init.d/networking/red.up/23-RS-snort \ + /etc/snort \ + /usr/bin/daq-modules-config \ + /usr/bin/u2boat \ + /usr/bin/u2spewfoo \ + /usr/lib/daq \ + /usr/lib/snort \ + /usr/lib/libdaq.so* \ + /usr/lib/libsfbpf.so* \ + /usr/local/bin/snortctl \ + /usr/sbin/snort \ + /var/ipfire/snort + # Start services /etc/init.d/collectd restart /etc/init.d/firewall restart hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. ceaf0ef0087abb09e9cca1677c67776cf76ce417
by Michael Tremer 18 Mar '19

18 Mar '19

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 ceaf0ef0087abb09e9cca1677c67776cf76ce417 (commit) from 08ded6035f61ed97e3a122dc1832703084b72f86 (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 ceaf0ef0087abb09e9cca1677c67776cf76ce417 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Mar 18 17:26:16 2019 +0000 dnsforward.cgi: Add DNSSEC option to legend Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: doc/language_issues.en | 1 + doc/language_issues.es | 1 + doc/language_issues.fr | 1 + doc/language_issues.it | 1 + doc/language_issues.nl | 1 + doc/language_issues.pl | 1 + doc/language_issues.ru | 1 + doc/language_issues.tr | 1 + doc/language_missings | 7 +++++++ html/cgi-bin/dnsforward.cgi | 2 ++ langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + 12 files changed, 19 insertions(+) Difference in files: diff --git a/doc/language_issues.en b/doc/language_issues.en index 76afb98d0..1de8d25a7 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -624,6 +624,7 @@ WARNING: untranslated string: dns title = Domain Name System WARNING: untranslated string: dnsforward = DNS Forwarding WARNING: untranslated string: dnsforward add a new entry = Add a new entry WARNING: untranslated string: dnsforward configuration = DNS forward configuration +WARNING: untranslated string: dnsforward dnssec disabled = DNSSEC Validation is disabled WARNING: untranslated string: dnsforward edit an entry = Edit an existing entry WARNING: untranslated string: dnsforward entries = Current entries WARNING: untranslated string: dnsforward forward_servers = Nameservers diff --git a/doc/language_issues.es b/doc/language_issues.es index fe919bf13..38a1f6b21 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -795,6 +795,7 @@ WARNING: untranslated string: dns servers = DNS Servers WARNING: untranslated string: dnsforward = DNS Forwarding WARNING: untranslated string: dnsforward add a new entry = Add a new entry WARNING: untranslated string: dnsforward configuration = DNS forward configuration +WARNING: untranslated string: dnsforward dnssec disabled = DNSSEC Validation is disabled WARNING: untranslated string: dnsforward edit an entry = Edit an existing entry WARNING: untranslated string: dnsforward entries = Current entries WARNING: untranslated string: dnsforward forward_servers = Nameservers diff --git a/doc/language_issues.fr b/doc/language_issues.fr index cb5319ed7..8f8b8d39f 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -785,6 +785,7 @@ WARNING: untranslated string: bytes = unknown string WARNING: untranslated string: default IP address = Default IP Address WARNING: untranslated string: dns forward disable dnssec = Disable DNSSEC (dangerous) WARNING: untranslated string: dns forwarding dnssec disabled notice = (DNSSEC disabled) +WARNING: untranslated string: dnsforward dnssec disabled = DNSSEC Validation is disabled WARNING: untranslated string: emerging pro rules = Emergingthreats.net Pro Rules WARNING: untranslated string: fwhost cust geoipgrp = unknown string WARNING: untranslated string: fwhost err hostip = unknown string diff --git a/doc/language_issues.it b/doc/language_issues.it index 9105e4d8d..474ded9f2 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -811,6 +811,7 @@ WARNING: untranslated string: dhcp dns update secret = Secret: WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip) WARNING: untranslated string: dns forward disable dnssec = Disable DNSSEC (dangerous) WARNING: untranslated string: dns forwarding dnssec disabled notice = (DNSSEC disabled) +WARNING: untranslated string: dnsforward dnssec disabled = DNSSEC Validation is disabled WARNING: untranslated string: dnsforward forward_servers = Nameservers WARNING: untranslated string: dnssec disabled warning = WARNING: DNSSEC has been disabled WARNING: untranslated string: eight hours = 8 Hours diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 33c1626eb..0fac2df99 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -815,6 +815,7 @@ WARNING: untranslated string: dl client arch insecure = Download insecure Client WARNING: untranslated string: dns forward disable dnssec = Disable DNSSEC (dangerous) WARNING: untranslated string: dns forwarding dnssec disabled notice = (DNSSEC disabled) WARNING: untranslated string: dns servers = DNS Servers +WARNING: untranslated string: dnsforward dnssec disabled = DNSSEC Validation is disabled WARNING: untranslated string: dnsforward forward_servers = Nameservers WARNING: untranslated string: dnssec aware = DNSSEC Aware WARNING: untranslated string: dnssec disabled warning = WARNING: DNSSEC has been disabled diff --git a/doc/language_issues.pl b/doc/language_issues.pl index fe919bf13..38a1f6b21 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -795,6 +795,7 @@ WARNING: untranslated string: dns servers = DNS Servers WARNING: untranslated string: dnsforward = DNS Forwarding WARNING: untranslated string: dnsforward add a new entry = Add a new entry WARNING: untranslated string: dnsforward configuration = DNS forward configuration +WARNING: untranslated string: dnsforward dnssec disabled = DNSSEC Validation is disabled WARNING: untranslated string: dnsforward edit an entry = Edit an existing entry WARNING: untranslated string: dnsforward entries = Current entries WARNING: untranslated string: dnsforward forward_servers = Nameservers diff --git a/doc/language_issues.ru b/doc/language_issues.ru index cbea3c0aa..906d2815c 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -799,6 +799,7 @@ WARNING: untranslated string: dns servers = DNS Servers WARNING: untranslated string: dnsforward = DNS Forwarding WARNING: untranslated string: dnsforward add a new entry = Add a new entry WARNING: untranslated string: dnsforward configuration = DNS forward configuration +WARNING: untranslated string: dnsforward dnssec disabled = DNSSEC Validation is disabled WARNING: untranslated string: dnsforward edit an entry = Edit an existing entry WARNING: untranslated string: dnsforward entries = Current entries WARNING: untranslated string: dnsforward forward_servers = Nameservers diff --git a/doc/language_issues.tr b/doc/language_issues.tr index dff15f55a..7ebb4d0e7 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -788,6 +788,7 @@ WARNING: untranslated string: crypto warning = Cryptographic warning WARNING: untranslated string: default IP address = Default IP Address WARNING: untranslated string: dns forward disable dnssec = Disable DNSSEC (dangerous) WARNING: untranslated string: dns forwarding dnssec disabled notice = (DNSSEC disabled) +WARNING: untranslated string: dnsforward dnssec disabled = DNSSEC Validation is disabled WARNING: untranslated string: dnsforward forward_servers = Nameservers WARNING: untranslated string: emerging pro rules = Emergingthreats.net Pro Rules WARNING: untranslated string: fwdfw all subnets = All subnets diff --git a/doc/language_missings b/doc/language_missings index 24fee2754..07813f252 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -217,6 +217,7 @@ < dnsforward add a new entry < dnsforward configuration < dns forward disable dnssec +< dnsforward dnssec disabled < dnsforward edit an entry < dnsforward entries < dnsforward forward_servers @@ -837,6 +838,7 @@ < default IP address < Disabled < dns forward disable dnssec +< dnsforward dnssec disabled < dns forwarding dnssec disabled notice < emerging pro rules < ids apply @@ -959,6 +961,7 @@ < Disabled < dl client arch insecure < dns forward disable dnssec +< dnsforward dnssec disabled < dnsforward forward_servers < dns forwarding dnssec disabled notice < dnssec disabled warning @@ -1229,6 +1232,7 @@ < Disabled < dl client arch insecure < dns forward disable dnssec +< dnsforward dnssec disabled < dnsforward forward_servers < dns forwarding dnssec disabled notice < dnssec aware @@ -1616,6 +1620,7 @@ < dnsforward add a new entry < dnsforward configuration < dns forward disable dnssec +< dnsforward dnssec disabled < dnsforward edit an entry < dnsforward entries < dnsforward forward_servers @@ -2377,6 +2382,7 @@ < dnsforward add a new entry < dnsforward configuration < dns forward disable dnssec +< dnsforward dnssec disabled < dnsforward edit an entry < dnsforward entries < dnsforward forward_servers @@ -2989,6 +2995,7 @@ < default IP address < Disabled < dns forward disable dnssec +< dnsforward dnssec disabled < dnsforward forward_servers < dns forwarding dnssec disabled notice < emerging pro rules diff --git a/html/cgi-bin/dnsforward.cgi b/html/cgi-bin/dnsforward.cgi index 391905f71..626b664fd 100644 --- a/html/cgi-bin/dnsforward.cgi +++ b/html/cgi-bin/dnsforward.cgi @@ -392,6 +392,8 @@ print <<END <td class='base'>$Lang::tr{'edit'}</td> <td>    <img src='/images/delete.gif' alt='$Lang::tr{'remove'}' /></td> <td class='base'>$Lang::tr{'remove'}</td> + <td>    <span style="background-color: $Header::colourred">   </span></td> + <td class='base'>$Lang::tr{'dnsforward dnssec disabled'}</td> </tr> </table> END diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 919783b8c..c300aa2c9 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -824,6 +824,7 @@ 'dnsforward' => 'DNS-Weiterleitung', 'dnsforward add a new entry' => 'Neuen Eintrag hinzufügen', 'dnsforward configuration' => 'Einstellungen für DNS Weiterleitung', +'dnsforward dnssec disabled' => 'DNSSEC-Validierung deaktiviert', 'dnsforward edit an entry' => 'Existierenden Eintrag bearbeiten', 'dnsforward entries' => 'Aktuelle Einträge', 'dnsforward forward_servers' => 'DNS-Server', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index ec0eca6a3..6124a0651 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -851,6 +851,7 @@ 'dnsforward' => 'DNS Forwarding', 'dnsforward add a new entry' => 'Add a new entry', 'dnsforward configuration' => 'DNS forward configuration', +'dnsforward dnssec disabled' => 'DNSSEC Validation is disabled', 'dnsforward edit an entry' => 'Edit an existing entry', 'dnsforward entries' => 'Current entries', 'dnsforward forward_servers' => 'Nameservers', hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 08ded6035f61ed97e3a122dc1832703084b72f86
by Michael Tremer 18 Mar '19

18 Mar '19

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 08ded6035f61ed97e3a122dc1832703084b72f86 (commit) via 3b521c724f09a45e09ac9228d8b65df0d8bd13a7 (commit) from 57521504a89e792336f55e893564a000bfe4b1d7 (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 08ded6035f61ed97e3a122dc1832703084b72f86 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Mar 18 15:35:29 2019 +0000 dnsforward.cgi: Check DISABLE_DNSSEC checkbox when editing Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 3b521c724f09a45e09ac9228d8b65df0d8bd13a7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Mar 18 15:24:56 2019 +0000 ipsec-interfaces: Apply static routes (again) after creating IPsec interfaces Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/130/filelists/files | 2 ++ html/cgi-bin/dnsforward.cgi | 4 ++-- src/scripts/ipsec-interfaces | 3 +++ 3 files changed, 7 insertions(+), 2 deletions(-) Difference in files: diff --git a/config/rootfiles/core/130/filelists/files b/config/rootfiles/core/130/filelists/files index d33ede19c..10e0184a3 100644 --- a/config/rootfiles/core/130/filelists/files +++ b/config/rootfiles/core/130/filelists/files @@ -9,9 +9,11 @@ etc/rc.d/init.d/networking/red.up/23-suricata etc/rc.d/init.d/suricata etc/syslog.conf srv/web/ipfire/cgi-bin/aliases.cgi +srv/web/ipfire/cgi-bin/dnsforward.cgi srv/web/ipfire/cgi-bin/ids.cgi srv/web/ipfire/cgi-bin/logs.cgi/ids.dat srv/web/ipfire/cgi-bin/logs.cgi/log.dat +usr/local/bin/ipsec-interfaces usr/local/bin/suricatactrl usr/local/bin/update-ids-ruleset usr/sbin/convert-snort diff --git a/html/cgi-bin/dnsforward.cgi b/html/cgi-bin/dnsforward.cgi index d9807c90e..391905f71 100644 --- a/html/cgi-bin/dnsforward.cgi +++ b/html/cgi-bin/dnsforward.cgi @@ -189,7 +189,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'edit'}) $cgiparams{'ZONE'} = $temp[1]; $cgiparams{'FORWARD_SERVERS'} = join(",", split(/\|/, $temp[2])); $cgiparams{'REMARK'} = $temp[3]; - $cgiparams{'DISABLE_DNSSEC'} = $temp[4]; + $cgiparams{'DISABLE_DNSSEC'} = ($temp[4] eq "on") ? "on" : "off"; } } } @@ -250,7 +250,7 @@ print <<END </tr> <tr> <td width ='20%' class='base'>$Lang::tr{'dns forward disable dnssec'}:</td> - <td><input type='checkbox' name='DISABLE_DNSSEC' $checked{'DISABLE_DNSSEC'}' /></td> + <td><input type='checkbox' name='DISABLE_DNSSEC' $checked{'DISABLE_DNSSEC'}{'on'} /></td> </tr> </table> <br> diff --git a/src/scripts/ipsec-interfaces b/src/scripts/ipsec-interfaces index 0e43fccbc..cb55fdf79 100644 --- a/src/scripts/ipsec-interfaces +++ b/src/scripts/ipsec-interfaces @@ -167,6 +167,9 @@ main() { log "Deleting interface ${intf}" ip link del "${intf}" &>/dev/null done + + # (Re-)Apply all static routes + /etc/init.d/static-routes start } main || exit $? hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 57521504a89e792336f55e893564a000bfe4b1d7
by Michael Tremer 18 Mar '19

18 Mar '19

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 57521504a89e792336f55e893564a000bfe4b1d7 (commit) via 5b4464a94478059ceebf266bc31dee4a4ba18fac (commit) via a10b0e5b448bf7e4a9bcc334e177ddae09806dc7 (commit) via a46903cce3863923838c5cc0721f4932adf2175d (commit) via 6f8b156bf0dcda4a1bb8ccdc8db83a54b2d7d1d0 (commit) via 2c703afc04448f15f9ad6b9c90be216bad256532 (commit) via f81c2225198b894c180cf36b6ee2cd6c0ea3849d (commit) via 728f3d2e8f3d26e80154236c6d67e303e1f7f3b9 (commit) via 7bf5b0f22194fcb617f3e678c4a1c492b0faf01d (commit) from e1d9148b61bc973ac1fef063b58500de4d881d7e (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 57521504a89e792336f55e893564a000bfe4b1d7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Mar 16 12:34:19 2019 +0000 hostapd: Bump package version Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5b4464a94478059ceebf266bc31dee4a4ba18fac Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Sat Mar 16 14:20:00 2019 +0000 hostapd: make client isolation configurable via WebUI hostapd supports client-isolation, but this feature could not be configured via the WebUI so far. Since it might be desired in public wireless networks, or even private ones, it makes sense to provide a radio button to let the user decide on. Fixes #11974. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a10b0e5b448bf7e4a9bcc334e177ddae09806dc7 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Fri Mar 15 17:00:00 2019 +0000 ensure Tor daemon files have correct permissions Set permissions for /var/lib/tor and /var/ipfire/tor to tor:tor, regardless whether Tor user has been created before or not. This ensures Tor starts properly on existing systems after reinstallation of the add-on. Thanks to Michael for the hint. Further, a comment for new Tor user in /etc/passwd has been added. Fixes #11779. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a46903cce3863923838c5cc0721f4932adf2175d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Mar 16 12:32:10 2019 +0000 core130: Ship updated unbound Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 6f8b156bf0dcda4a1bb8ccdc8db83a54b2d7d1d0 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Fri Mar 15 19:15:19 2019 +0100 unbound: Update to 1.9.1 For details see: https://nlnetlabs.nl/pipermail/unbound-users/2019-March/011415.html Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 2c703afc04448f15f9ad6b9c90be216bad256532 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Mar 16 12:30:22 2019 +0000 core130: Ship updated ntp Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f81c2225198b894c180cf36b6ee2cd6c0ea3849d Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Fri Mar 15 19:10:11 2019 +0100 ntp: Update to 4.2.8p13 For details see: http://support.ntp.org/bin/view/Main/SecurityNotice#Recent_Vulnerabilities Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 728f3d2e8f3d26e80154236c6d67e303e1f7f3b9 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Mar 16 13:04:18 2019 +0100 suricata: Fix ownership and file permissions of files inside /var/lib/suricata. These files needs to have nobody.nobody as owner but requires read-acces from everyone to allow the suricata user reading-in this files during startup. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 7bf5b0f22194fcb617f3e678c4a1c492b0faf01d Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Mar 16 12:57:25 2019 +0100 logs.cgi/ids.dat: Fixup processing dates from logfiles which contains a year Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/unbound | 2 +- config/rootfiles/{oldcore/100 => core/130}/filelists/ntp | 0 .../rootfiles/{oldcore/106 => core/130}/filelists/unbound | 0 config/rootfiles/core/130/update.sh | 1 + html/cgi-bin/logs.cgi/ids.dat | 9 ++++++++- html/cgi-bin/wlanap.cgi | 14 ++++++++++++++ lfs/hostapd | 2 +- lfs/ntp | 6 +++--- lfs/suricata | 8 ++++++-- lfs/unbound | 6 +++--- src/paks/tor/install.sh | 8 ++++---- 11 files changed, 41 insertions(+), 15 deletions(-) copy config/rootfiles/{oldcore/100 => core/130}/filelists/ntp (100%) copy config/rootfiles/{oldcore/106 => core/130}/filelists/unbound (100%) Difference in files: diff --git a/config/rootfiles/common/unbound b/config/rootfiles/common/unbound index 843e0eeca..a130a059b 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.8 -usr/lib/libunbound.so.8.1.0 +usr/lib/libunbound.so.8.1.1 #usr/lib/pkgconfig/libunbound.pc usr/sbin/unbound usr/sbin/unbound-anchor diff --git a/config/rootfiles/core/130/filelists/ntp b/config/rootfiles/core/130/filelists/ntp new file mode 120000 index 000000000..7542d86cb --- /dev/null +++ b/config/rootfiles/core/130/filelists/ntp @@ -0,0 +1 @@ +../../../common/ntp \ No newline at end of file diff --git a/config/rootfiles/core/130/filelists/unbound b/config/rootfiles/core/130/filelists/unbound new file mode 120000 index 000000000..66adf0924 --- /dev/null +++ b/config/rootfiles/core/130/filelists/unbound @@ -0,0 +1 @@ +../../../common/unbound \ No newline at end of file diff --git a/config/rootfiles/core/130/update.sh b/config/rootfiles/core/130/update.sh index b4238e7b4..d33321c32 100644 --- a/config/rootfiles/core/130/update.sh +++ b/config/rootfiles/core/130/update.sh @@ -77,6 +77,7 @@ ldconfig # Start services /etc/init.d/collectd restart /etc/init.d/firewall restart +/etc/init.d/unbound restart /etc/init.d/suricata start # This update needs a reboot... diff --git a/html/cgi-bin/logs.cgi/ids.dat b/html/cgi-bin/logs.cgi/ids.dat index e374f5711..1447a06f0 100644 --- a/html/cgi-bin/logs.cgi/ids.dat +++ b/html/cgi-bin/logs.cgi/ids.dat @@ -460,7 +460,14 @@ sub processevent } } $line++; - unless ($line == 1 || $date ne "$monthstr/$daystr") { &append; } + + # Split the date into single chunks. + my ($month, $day, $year) = split('/', $date); + + # Check if all data is collected and the date of the event fits the desired date to + # get displayed. + if ($line gt 1 || "$month/$day" eq "$monthstr/$daystr") { &append; } + close(LOG); } } diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi index 72c9a1298..cae191101 100644 --- a/html/cgi-bin/wlanap.cgi +++ b/html/cgi-bin/wlanap.cgi @@ -75,6 +75,7 @@ $wlanapsettings{'DRIVER'} = 'NL80211'; $wlanapsettings{'HTCAPS'} = ''; $wlanapsettings{'VHTCAPS'} = ''; $wlanapsettings{'NOSCAN'} = 'off'; +$wlanapsettings{'CLIENTISOLATION'} = 'off'; &General::readhash("/var/ipfire/wlanap/settings", \%wlanapsettings); &Header::getcgihash(\%wlanapsettings); @@ -252,6 +253,10 @@ $checked{'NOSCAN'}{'off'} = ''; $checked{'NOSCAN'}{'on'} = ''; $checked{'NOSCAN'}{$wlanapsettings{'NOSCAN'}} = "checked='checked'"; +$checked{'CLIENTISOLATION'}{'off'} = ''; +$checked{'CLIENTISOLATION'}{'on'} = ''; +$checked{'CLIENTISOLATION'}{$wlanapsettings{'CLIENTISOLATION'}} = "checked='checked'"; + $selected{'ENC'}{$wlanapsettings{'ENC'}} = "selected='selected'"; $selected{'CHANNEL'}{$wlanapsettings{'CHANNEL'}} = "selected='selected'"; $selected{'COUNTRY'}{$wlanapsettings{'COUNTRY'}} = "selected='selected'"; @@ -377,6 +382,7 @@ print <<END <tr><td width='25%' class='base'>SSID: </td><td class='base' colspan='3'><input type='text' name='SSID' size='30' value='$wlanapsettings{'SSID'}' /></td></tr>  <tr><td width='25%' class='base'>SSID Broadcast: </td><td class='base' colspan='3'>on <input type='radio' name='HIDESSID' value='off' $checked{'HIDESSID'}{'off'} /> | <input type='radio' name='HIDESSID' value='on' $checked{'HIDESSID'}{'on'} /> off</td></tr> +<tr><td width='25%' class='base'>Client Isolation: </td><td class='base' colspan='3'>on <input type='radio' name='CLIENTISOLATION' value='off' $checked{'CLIENTISOLATION'}{'off'} /> | <input type='radio' name='CLIENTISOLATION' value='on' $checked{'CLIENTISOLATION'}{'on'} /> off</td></tr> <tr><td width='25%' class='base'>$Lang::tr{'wlanap country'}: </td><td class='base' colspan='3'> @@ -632,6 +638,14 @@ END } + # https://forum.ipfire.org/viewtopic.php?f=22&t=12274&p=79070#p79070 + if ( $wlanapsettings{'CLIENTISOLATION'} eq 'on' ){ + print CONFIGFILE <<END +ap_isolate=1 +END +; + } + if ( $wlanapsettings{'NOSCAN'} eq 'on' ){ print CONFIGFILE <<END noscan=1 diff --git a/lfs/hostapd b/lfs/hostapd index 233863646..64ff28e4b 100644 --- a/lfs/hostapd +++ b/lfs/hostapd @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = hostapd -PAK_VER = 44 +PAK_VER = 45 DEPS = "" diff --git a/lfs/ntp b/lfs/ntp index 8f845409c..040a0c2ae 100644 --- a/lfs/ntp +++ b/lfs/ntp @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2019 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 # @@ -24,7 +24,7 @@ include Config -VER = 4.2.8p12 +VER = 4.2.8p13 THISAPP = ntp-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 1522d66574bae14abb2622746dad2bdc +$(DL_FILE)_MD5 = ea040ab9b4ca656b5229b89d6b822f13 install : $(TARGET) diff --git a/lfs/suricata b/lfs/suricata index 0a561ef8b..d7b5b71d6 100644 --- a/lfs/suricata +++ b/lfs/suricata @@ -101,8 +101,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # to the rules directory. mv /etc/suricata/*.config /var/lib/suricata - # Set correct ownership for /var/lib/suricata - chown nobody:nobody /var/lib/suricata + # Set correct permissions for the files. + chmod 644 /var/lib/suricata/*.config + + # Set correct ownership for /var/lib/suricata and the + # contained files + chown -R nobody:nobody /var/lib/suricata # Create logging directory. -mkdir -p /var/log/suricata diff --git a/lfs/unbound b/lfs/unbound index b090010d4..87666dfce 100644 --- a/lfs/unbound +++ b/lfs/unbound @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2019 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 # @@ -24,7 +24,7 @@ include Config -VER = 1.9.0 +VER = 1.9.1 THISAPP = unbound-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 1026159991a3883518525bc18e25582f +$(DL_FILE)_MD5 = 5d954920d192b33f7c88f015dd969940 install : $(TARGET) diff --git a/src/paks/tor/install.sh b/src/paks/tor/install.sh index e1ed33331..268bccecd 100644 --- a/src/paks/tor/install.sh +++ b/src/paks/tor/install.sh @@ -29,12 +29,12 @@ if ! getent group tor &>/dev/null; then fi if ! getent passwd tor; then - useradd -u 119 -g tor -d /var/empty -s /bin/false tor - - # Adjust some folder permission for new UID/GID - chown -R tor:tor /var/lib/tor /var/ipfire/tor + useradd -u 119 -g tor -c "Tor daemon user" -d /var/empty -s /bin/false tor fi +# Adjust some folder permission for new UID/GID +chown -R tor:tor /var/lib/tor /var/ipfire/tor + extract_files restore_backup ${NAME} start_service --background ${NAME} hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e1d9148b61bc973ac1fef063b58500de4d881d7e
by Michael Tremer 16 Mar '19

16 Mar '19

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 e1d9148b61bc973ac1fef063b58500de4d881d7e (commit) from 9c4477d0f394af12f51d74e52d1a1c85cd13b289 (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 e1d9148b61bc973ac1fef063b58500de4d881d7e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Mar 16 10:00:19 2019 +0000 Fix python3-yaml rootfile Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/{ => armv5tel}/python3-yaml | 1 + config/rootfiles/packages/{ => i586}/python3-yaml | 1 + config/rootfiles/packages/python3-yaml | 1 + 3 files changed, 3 insertions(+) copy config/rootfiles/packages/{ => armv5tel}/python3-yaml (97%) copy config/rootfiles/packages/{ => i586}/python3-yaml (97%) Difference in files: diff --git a/config/rootfiles/packages/armv5tel/python3-yaml b/config/rootfiles/packages/armv5tel/python3-yaml new file mode 100644 index 000000000..6f8354a24 --- /dev/null +++ b/config/rootfiles/packages/armv5tel/python3-yaml @@ -0,0 +1,38 @@ +#usr/lib/python3.6/site-packages/PyYAML-3.13-py3.6.egg-info +usr/lib/python3.6/site-packages/_yaml.cpython-36m-arm-linux-gnu.so +usr/lib/python3.6/site-packages/yaml +#usr/lib/python3.6/site-packages/yaml/__init__.py +#usr/lib/python3.6/site-packages/yaml/__pycache__ +#usr/lib/python3.6/site-packages/yaml/__pycache__/__init__.cpython-36.pyc +#usr/lib/python3.6/site-packages/yaml/__pycache__/composer.cpython-36.pyc +#usr/lib/python3.6/site-packages/yaml/__pycache__/constructor.cpython-36.pyc +#usr/lib/python3.6/site-packages/yaml/__pycache__/cyaml.cpython-36.pyc +#usr/lib/python3.6/site-packages/yaml/__pycache__/dumper.cpython-36.pyc +#usr/lib/python3.6/site-packages/yaml/__pycache__/emitter.cpython-36.pyc +#usr/lib/python3.6/site-packages/yaml/__pycache__/error.cpython-36.pyc +#usr/lib/python3.6/site-packages/yaml/__pycache__/events.cpython-36.pyc +#usr/lib/python3.6/site-packages/yaml/__pycache__/loader.cpython-36.pyc +#usr/lib/python3.6/site-packages/yaml/__pycache__/nodes.cpython-36.pyc +#usr/lib/python3.6/site-packages/yaml/__pycache__/parser.cpython-36.pyc +#usr/lib/python3.6/site-packages/yaml/__pycache__/reader.cpython-36.pyc +#usr/lib/python3.6/site-packages/yaml/__pycache__/representer.cpython-36.pyc +#usr/lib/python3.6/site-packages/yaml/__pycache__/resolver.cpython-36.pyc +#usr/lib/python3.6/site-packages/yaml/__pycache__/scanner.cpython-36.pyc +#usr/lib/python3.6/site-packages/yaml/__pycache__/serializer.cpython-36.pyc +#usr/lib/python3.6/site-packages/yaml/__pycache__/tokens.cpython-36.pyc +#usr/lib/python3.6/site-packages/yaml/composer.py +#usr/lib/python3.6/site-packages/yaml/constructor.py +#usr/lib/python3.6/site-packages/yaml/cyaml.py +#usr/lib/python3.6/site-packages/yaml/dumper.py +#usr/lib/python3.6/site-packages/yaml/emitter.py +#usr/lib/python3.6/site-packages/yaml/error.py +#usr/lib/python3.6/site-packages/yaml/events.py +#usr/lib/python3.6/site-packages/yaml/loader.py +#usr/lib/python3.6/site-packages/yaml/nodes.py +#usr/lib/python3.6/site-packages/yaml/parser.py +#usr/lib/python3.6/site-packages/yaml/reader.py +#usr/lib/python3.6/site-packages/yaml/representer.py +#usr/lib/python3.6/site-packages/yaml/resolver.py +#usr/lib/python3.6/site-packages/yaml/scanner.py +#usr/lib/python3.6/site-packages/yaml/serializer.py +#usr/lib/python3.6/site-packages/yaml/tokens.py diff --git a/config/rootfiles/packages/i586/python3-yaml b/config/rootfiles/packages/i586/python3-yaml new file mode 100644 index 000000000..19a4d19c1 --- /dev/null +++ b/config/rootfiles/packages/i586/python3-yaml @@ -0,0 +1,38 @@ +#usr/lib/python3.6/site-packages/PyYAML-3.13-py3.6.egg-info +usr/lib/python3.6/site-packages/_yaml.cpython-36m-i386-linux-gnu.so +usr/lib/python3.6/site-packages/yaml +#usr/lib/python3.6/site-packages/yaml/__init__.py +#usr/lib/python3.6/site-packages/yaml/__pycache__ +#usr/lib/python3.6/site-packages/yaml/__pycache__/__init__.cpython-36.pyc +#usr/lib/python3.6/site-packages/yaml/__pycache__/composer.cpython-36.pyc +#usr/lib/python3.6/site-packages/yaml/__pycache__/constructor.cpython-36.pyc +#usr/lib/python3.6/site-packages/yaml/__pycache__/cyaml.cpython-36.pyc +#usr/lib/python3.6/site-packages/yaml/__pycache__/dumper.cpython-36.pyc +#usr/lib/python3.6/site-packages/yaml/__pycache__/emitter.cpython-36.pyc +#usr/lib/python3.6/site-packages/yaml/__pycache__/error.cpython-36.pyc +#usr/lib/python3.6/site-packages/yaml/__pycache__/events.cpython-36.pyc +#usr/lib/python3.6/site-packages/yaml/__pycache__/loader.cpython-36.pyc +#usr/lib/python3.6/site-packages/yaml/__pycache__/nodes.cpython-36.pyc +#usr/lib/python3.6/site-packages/yaml/__pycache__/parser.cpython-36.pyc +#usr/lib/python3.6/site-packages/yaml/__pycache__/reader.cpython-36.pyc +#usr/lib/python3.6/site-packages/yaml/__pycache__/representer.cpython-36.pyc +#usr/lib/python3.6/site-packages/yaml/__pycache__/resolver.cpython-36.pyc +#usr/lib/python3.6/site-packages/yaml/__pycache__/scanner.cpython-36.pyc +#usr/lib/python3.6/site-packages/yaml/__pycache__/serializer.cpython-36.pyc +#usr/lib/python3.6/site-packages/yaml/__pycache__/tokens.cpython-36.pyc +#usr/lib/python3.6/site-packages/yaml/composer.py +#usr/lib/python3.6/site-packages/yaml/constructor.py +#usr/lib/python3.6/site-packages/yaml/cyaml.py +#usr/lib/python3.6/site-packages/yaml/dumper.py +#usr/lib/python3.6/site-packages/yaml/emitter.py +#usr/lib/python3.6/site-packages/yaml/error.py +#usr/lib/python3.6/site-packages/yaml/events.py +#usr/lib/python3.6/site-packages/yaml/loader.py +#usr/lib/python3.6/site-packages/yaml/nodes.py +#usr/lib/python3.6/site-packages/yaml/parser.py +#usr/lib/python3.6/site-packages/yaml/reader.py +#usr/lib/python3.6/site-packages/yaml/representer.py +#usr/lib/python3.6/site-packages/yaml/resolver.py +#usr/lib/python3.6/site-packages/yaml/scanner.py +#usr/lib/python3.6/site-packages/yaml/serializer.py +#usr/lib/python3.6/site-packages/yaml/tokens.py diff --git a/config/rootfiles/packages/python3-yaml b/config/rootfiles/packages/python3-yaml index 6b095f845..d3278eaca 100644 --- a/config/rootfiles/packages/python3-yaml +++ b/config/rootfiles/packages/python3-yaml @@ -1,4 +1,5 @@ #usr/lib/python3.6/site-packages/PyYAML-3.13-py3.6.egg-info +usr/lib/python3.6/site-packages/_yaml.cpython-36m-MACHINE-linux-gnu.so usr/lib/python3.6/site-packages/yaml #usr/lib/python3.6/site-packages/yaml/__init__.py #usr/lib/python3.6/site-packages/yaml/__pycache__ hooks/post-receive -- IPFire 2.x development tree

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM