IPFire-SCM April 2019

ipfire-scm@lists.ipfire.org

1 participants
62 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e7a52c52d109e044bcce0ca52eb0b5a94c2ec03a
by Arne Fitzenreiter 20 Apr '19

20 Apr '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 e7a52c52d109e044bcce0ca52eb0b5a94c2ec03a (commit) via 08639bc2a90ca945e710f5ca13556a50458f0056 (commit) from 9e65aa9ed6d7a3a489c58a6f966eac34972c68f8 (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 e7a52c52d109e044bcce0ca52eb0b5a94c2ec03a Merge: 08639bc2a 9e65aa9ed Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Apr 20 17:35:54 2019 +0200 Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next commit 08639bc2a90ca945e710f5ca13556a50458f0056 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Apr 20 17:21:03 2019 +0200 kernel: update 4.14.113 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/linux | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) Difference in files: diff --git a/lfs/linux b/lfs/linux index 4acf2f951..974c2a2f4 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,8 +24,8 @@ include Config -VER = 4.14.112 -ARM_PATCHES = 4.14.112-ipfire0 +VER = 4.14.113 +ARM_PATCHES = 4.14.113-ipfire0 THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -82,8 +82,8 @@ objects =$(DL_FILE) \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) arm-multi-patches-$(ARM_PATCHES).patch.xz = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz -$(DL_FILE)_MD5 = 5a2e0b7c333ac5dd14b0c7e12fe39a8c -arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = ed976ae7954c36b715fdb6b83630d0b6 +$(DL_FILE)_MD5 = fd34a25839945f902f0c6d694d42ea7f +arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = 51eab5175bf8f0ad986006c74e60b472 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

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

18 Apr '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 9e65aa9ed6d7a3a489c58a6f966eac34972c68f8 (commit) via c25a386523c305615641a1810bcc3b009bc3cf07 (commit) via 64aed99df6ba3b057c35ebb6b9278a13ae5e575d (commit) from 5fa063f8590dcd85867935fd6d1a6bd570ac61c6 (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 9e65aa9ed6d7a3a489c58a6f966eac34972c68f8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Apr 17 19:15:44 2019 +0100 Revert "hostapd: Always enable 80 MHz channel width for 802.11ac" This reverts commit c31c8078cffcf3f933f567cb02a366ceedd6d5da. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit c25a386523c305615641a1810bcc3b009bc3cf07 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Apr 17 07:38:27 2019 +0100 unbound: Drop unused function Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 64aed99df6ba3b057c35ebb6b9278a13ae5e575d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Apr 17 05:16:05 2019 +0100 suricata: Change runmode to workers Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/suricata/suricata.yaml | 2 +- html/cgi-bin/wlanap.cgi | 2 -- src/initscripts/system/unbound | 24 ------------------------ 3 files changed, 1 insertion(+), 27 deletions(-) Difference in files: diff --git a/config/suricata/suricata.yaml b/config/suricata/suricata.yaml index 3fe78cb2f..e7e27c731 100644 --- a/config/suricata/suricata.yaml +++ b/config/suricata/suricata.yaml @@ -317,7 +317,7 @@ max-pending-packets: 1024 # Runmode the engine should use. Please check --list-runmodes to get the available # runmodes for each packet acquisition method. Defaults to "autofp" (auto flow pinned # load balancing). -#runmode: autofp +runmode: workers # Specifies the kind of flow load balancer used by the flow pinned autofp mode. # diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi index 93366a38f..44b0b4053 100644 --- a/html/cgi-bin/wlanap.cgi +++ b/html/cgi-bin/wlanap.cgi @@ -600,8 +600,6 @@ ieee80211n=1 wmm_enabled=1 ht_capab=$wlanapsettings{'HTCAPS'} vht_capab=$wlanapsettings{'VHTCAPS'} -vht_oper_chwidth=1 -vht_oper_centr_freq_seg0_idx=42 END ; diff --git a/src/initscripts/system/unbound b/src/initscripts/system/unbound index e87f9e10d..fbb096e0d 100644 --- a/src/initscripts/system/unbound +++ b/src/initscripts/system/unbound @@ -24,30 +24,6 @@ EDNS_DEFAULT_BUFFER_SIZE=4096 # Load optional configuration [ -e "/etc/sysconfig/unbound" ] && . /etc/sysconfig/unbound -function cidr() { - local cidr nbits IFS; - IFS=. read -r i1 i2 i3 i4 <<< ${1} - IFS=. read -r m1 m2 m3 m4 <<< ${2} - cidr=$(printf "%d.%d.%d.%d\n" "$((i1 & m1))" "$((i2 & m2))" "$((i3 & m3))" "$((i4 & m4))") - nbits=0 - IFS=. - for dec in $2 ; do - case $dec in - 255) let nbits+=8;; - 254) let nbits+=7;; - 252) let nbits+=6;; - 248) let nbits+=5;; - 240) let nbits+=4;; - 224) let nbits+=3;; - 192) let nbits+=2;; - 128) let nbits+=1;; - 0);; - *) echo "Error: $dec is not recognised"; exit 1 - esac - done - echo "${cidr}/${nbits}" -} - ip_address_revptr() { local addr=${1} hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5fa063f8590dcd85867935fd6d1a6bd570ac61c6
by Arne Fitzenreiter 17 Apr '19

17 Apr '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 5fa063f8590dcd85867935fd6d1a6bd570ac61c6 (commit) from 26dc79a6fe16c83c5b57f4b6c7c3f73281a03d6c (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 5fa063f8590dcd85867935fd6d1a6bd570ac61c6 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Apr 17 22:30:19 2019 +0200 kernel: update to 4.14.112 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.aarch64-ipfire | 4 ++-- config/kernel/kernel.config.armv5tel-ipfire-kirkwood | 4 ++-- config/kernel/kernel.config.armv5tel-ipfire-multi | 4 ++-- config/kernel/kernel.config.i586-ipfire | 4 ++-- config/kernel/kernel.config.i586-ipfire-pae | 4 ++-- config/kernel/kernel.config.x86_64-ipfire | 4 ++-- config/rootfiles/common/aarch64/linux | 1 - config/rootfiles/common/armv5tel/linux-multi | 1 - config/rootfiles/common/i586/linux | 1 - config/rootfiles/common/x86_64/linux | 1 - config/rootfiles/packages/linux-pae | 1 - lfs/linux | 6 +++--- 12 files changed, 15 insertions(+), 20 deletions(-) Difference in files: diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index 3944b0eba..9dc7ad18d 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.14.111-ipfire Kernel Configuration +# Linux/arm64 4.14.112-ipfire Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y @@ -2820,6 +2820,7 @@ CONFIG_SERIAL_NONSTANDARD=y CONFIG_N_HDLC=m CONFIG_N_GSM=m # CONFIG_TRACE_SINK is not set +CONFIG_LDISC_AUTOLOAD=y CONFIG_DEVMEM=y # @@ -2899,7 +2900,6 @@ CONFIG_HW_RANDOM_OMAP=y CONFIG_HW_RANDOM_VIRTIO=y CONFIG_HW_RANDOM_MESON=y CONFIG_HW_RANDOM_CAVIUM=y -CONFIG_R3964=m # CONFIG_APPLICOM is not set # diff --git a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood index ad9c07ecc..5c6050b91 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood +++ b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.14.111-ipfire-kirkwood Kernel Configuration +# Linux/arm 4.14.112-ipfire-kirkwood Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -2711,6 +2711,7 @@ CONFIG_SERIAL_NONSTANDARD=y CONFIG_N_HDLC=m CONFIG_N_GSM=m # CONFIG_TRACE_SINK is not set +CONFIG_LDISC_AUTOLOAD=y CONFIG_DEVMEM=y # CONFIG_DEVKMEM is not set @@ -2766,7 +2767,6 @@ CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_TIMERIOMEM=m # CONFIG_HW_RANDOM_OMAP is not set # CONFIG_NVRAM is not set -# CONFIG_R3964 is not set # CONFIG_APPLICOM is not set # CONFIG_RAW_DRIVER is not set # CONFIG_TCG_TPM is not set diff --git a/config/kernel/kernel.config.armv5tel-ipfire-multi b/config/kernel/kernel.config.armv5tel-ipfire-multi index 2969e2344..7ba02c6d1 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-multi +++ b/config/kernel/kernel.config.armv5tel-ipfire-multi @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.14.111-ipfire-multi Kernel Configuration +# Linux/arm 4.14.112-ipfire-multi Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -3112,6 +3112,7 @@ CONFIG_SERIAL_NONSTANDARD=y CONFIG_N_HDLC=m CONFIG_N_GSM=m # CONFIG_TRACE_SINK is not set +CONFIG_LDISC_AUTOLOAD=y CONFIG_DEVMEM=y # CONFIG_DEVKMEM is not set @@ -3201,7 +3202,6 @@ CONFIG_HW_RANDOM_MXC_RNGA=y CONFIG_HW_RANDOM_IMX_RNGC=y CONFIG_HW_RANDOM_MESON=y CONFIG_NVRAM=y -CONFIG_R3964=m # CONFIG_APPLICOM is not set CONFIG_RAW_DRIVER=y CONFIG_MAX_RAW_DEVS=8192 diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index 8065f4088..3ced58c5d 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.111-ipfire Kernel Configuration +# Linux/x86 4.14.112-ipfire Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -3040,6 +3040,7 @@ CONFIG_NOZOMI=m CONFIG_N_HDLC=m CONFIG_N_GSM=m # CONFIG_TRACE_SINK is not set +CONFIG_LDISC_AUTOLOAD=y CONFIG_DEVMEM=y # CONFIG_DEVKMEM is not set @@ -3117,7 +3118,6 @@ CONFIG_HW_RANDOM_VIA=m CONFIG_HW_RANDOM_VIRTIO=m CONFIG_NVRAM=y # CONFIG_DTLK is not set -CONFIG_R3964=m # CONFIG_APPLICOM is not set CONFIG_SONYPI=m diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae index f7dec8e1f..870a01c52 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.111-ipfire-pae Kernel Configuration +# Linux/x86 4.14.112-ipfire-pae Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -3063,6 +3063,7 @@ CONFIG_NOZOMI=m CONFIG_N_HDLC=m CONFIG_N_GSM=m # CONFIG_TRACE_SINK is not set +CONFIG_LDISC_AUTOLOAD=y CONFIG_DEVMEM=y # CONFIG_DEVKMEM is not set @@ -3143,7 +3144,6 @@ CONFIG_HW_RANDOM_VIA=m CONFIG_HW_RANDOM_VIRTIO=m CONFIG_NVRAM=y # CONFIG_DTLK is not set -CONFIG_R3964=m # CONFIG_APPLICOM is not set CONFIG_SONYPI=m diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index 92f8c862c..8018dc01d 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.111-ipfire Kernel Configuration +# Linux/x86 4.14.112-ipfire Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -3002,6 +3002,7 @@ CONFIG_NOZOMI=m CONFIG_N_HDLC=m CONFIG_N_GSM=m # CONFIG_TRACE_SINK is not set +CONFIG_LDISC_AUTOLOAD=y CONFIG_DEVMEM=y # CONFIG_DEVKMEM is not set @@ -3075,7 +3076,6 @@ CONFIG_HW_RANDOM_AMD=m CONFIG_HW_RANDOM_VIA=m CONFIG_HW_RANDOM_VIRTIO=m CONFIG_NVRAM=y -CONFIG_R3964=m # CONFIG_APPLICOM is not set # diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux index 2b11e71a8..e3f6ba406 100644 --- a/config/rootfiles/common/aarch64/linux +++ b/config/rootfiles/common/aarch64/linux @@ -1760,7 +1760,6 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/drivers/tty #lib/modules/KVER-ipfire/kernel/drivers/tty/n_gsm.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/tty/n_hdlc.ko.xz -#lib/modules/KVER-ipfire/kernel/drivers/tty/n_r3964.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/tty/serial #lib/modules/KVER-ipfire/kernel/drivers/tty/serial/arc_uart.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/tty/serial/fsl_lpuart.ko.xz diff --git a/config/rootfiles/common/armv5tel/linux-multi b/config/rootfiles/common/armv5tel/linux-multi index 9ca15348e..c159ca8b8 100644 --- a/config/rootfiles/common/armv5tel/linux-multi +++ b/config/rootfiles/common/armv5tel/linux-multi @@ -2265,7 +2265,6 @@ lib/modules/KVER-ipfire-multi #lib/modules/KVER-ipfire-multi/kernel/drivers/tty #lib/modules/KVER-ipfire-multi/kernel/drivers/tty/n_gsm.ko.xz #lib/modules/KVER-ipfire-multi/kernel/drivers/tty/n_hdlc.ko.xz -#lib/modules/KVER-ipfire-multi/kernel/drivers/tty/n_r3964.ko.xz #lib/modules/KVER-ipfire-multi/kernel/drivers/tty/serial #lib/modules/KVER-ipfire-multi/kernel/drivers/tty/serial/arc_uart.ko.xz #lib/modules/KVER-ipfire-multi/kernel/drivers/tty/serial/fsl_lpuart.ko.xz diff --git a/config/rootfiles/common/i586/linux b/config/rootfiles/common/i586/linux index 88d1a7396..cb4a972f3 100644 --- a/config/rootfiles/common/i586/linux +++ b/config/rootfiles/common/i586/linux @@ -2352,7 +2352,6 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/drivers/tty/cyclades.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/tty/n_gsm.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/tty/n_hdlc.ko.xz -#lib/modules/KVER-ipfire/kernel/drivers/tty/n_r3964.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/tty/nozomi.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/tty/rocket.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/tty/serial diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux index ffbf7d0da..2d25334ab 100644 --- a/config/rootfiles/common/x86_64/linux +++ b/config/rootfiles/common/x86_64/linux @@ -2334,7 +2334,6 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/drivers/tty/cyclades.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/tty/n_gsm.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/tty/n_hdlc.ko.xz -#lib/modules/KVER-ipfire/kernel/drivers/tty/n_r3964.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/tty/nozomi.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/tty/rocket.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/tty/serial diff --git a/config/rootfiles/packages/linux-pae b/config/rootfiles/packages/linux-pae index 39958585c..e139e20cc 100644 --- a/config/rootfiles/packages/linux-pae +++ b/config/rootfiles/packages/linux-pae @@ -2355,7 +2355,6 @@ lib/modules/KVER-ipfire-pae #lib/modules/KVER-ipfire-pae/kernel/drivers/tty/cyclades.ko.xz #lib/modules/KVER-ipfire-pae/kernel/drivers/tty/n_gsm.ko.xz #lib/modules/KVER-ipfire-pae/kernel/drivers/tty/n_hdlc.ko.xz -#lib/modules/KVER-ipfire-pae/kernel/drivers/tty/n_r3964.ko.xz #lib/modules/KVER-ipfire-pae/kernel/drivers/tty/nozomi.ko.xz #lib/modules/KVER-ipfire-pae/kernel/drivers/tty/rocket.ko.xz #lib/modules/KVER-ipfire-pae/kernel/drivers/tty/serial diff --git a/lfs/linux b/lfs/linux index ef612fe10..4acf2f951 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,8 +24,8 @@ include Config -VER = 4.14.111 -ARM_PATCHES = 4.14.111-ipfire0 +VER = 4.14.112 +ARM_PATCHES = 4.14.112-ipfire0 THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -82,7 +82,7 @@ objects =$(DL_FILE) \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) arm-multi-patches-$(ARM_PATCHES).patch.xz = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz -$(DL_FILE)_MD5 = d1ef2ffcf41ca1cb58ba4fd6f2872ccf +$(DL_FILE)_MD5 = 5a2e0b7c333ac5dd14b0c7e12fe39a8c arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = ed976ae7954c36b715fdb6b83630d0b6 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 26dc79a6fe16c83c5b57f4b6c7c3f73281a03d6c
by Michael Tremer 17 Apr '19

17 Apr '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 26dc79a6fe16c83c5b57f4b6c7c3f73281a03d6c (commit) via e96adc77972108de9cb8b4b6c0f7fbad07b76035 (commit) from e91c83490be8d248796d50b0c9bca3976199551c (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 26dc79a6fe16c83c5b57f4b6c7c3f73281a03d6c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Apr 17 21:24:25 2019 +0100 suricata: Do not let oinkmaster be too verbose Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit e96adc77972108de9cb8b4b6c0f7fbad07b76035 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Apr 17 20:59:55 2019 +0100 suricata: Redirect oinkmaster output to perl function The output was written to stderr before and landed in apache's error log where we do not want it. Fixes: #12004 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/cfgroot/ids-functions.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/config/cfgroot/ids-functions.pl b/config/cfgroot/ids-functions.pl index 016c0e49d..5496df1a9 100644 --- a/config/cfgroot/ids-functions.pl +++ b/config/cfgroot/ids-functions.pl @@ -324,7 +324,7 @@ sub oinkmaster () { openlog('oinkmaster', 'cons,pid', 'user'); # Call oinkmaster to generate ruleset. - open(OINKMASTER, "/usr/local/bin/oinkmaster.pl -v -s -u file://$rulestarball -C $settingsdir/oinkmaster.conf -o $rulespath|") or die "Could not execute oinkmaster $!\n"; + open(OINKMASTER, "/usr/local/bin/oinkmaster.pl -s -u file://$rulestarball -C $settingsdir/oinkmaster.conf -o $rulespath 2>&1 |") or die "Could not execute oinkmaster $!\n"; # Log output of oinkmaster to syslog. while(<OINKMASTER>) { hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e91c83490be8d248796d50b0c9bca3976199551c
by Arne Fitzenreiter 16 Apr '19

16 Apr '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 e91c83490be8d248796d50b0c9bca3976199551c (commit) from fea27a56f7ef299fa2793971ef6e49f3a423fdc3 (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 e91c83490be8d248796d50b0c9bca3976199551c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Apr 16 18:05:18 2019 +0200 wireless-regdb: update to 2019.03.01 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/wireless-regdb | 5 ++++- config/rootfiles/{oldcore/51 => core/131}/filelists/wireless-regdb | 0 lfs/wireless-regdb | 6 +++--- 3 files changed, 7 insertions(+), 4 deletions(-) copy config/rootfiles/{oldcore/51 => core/131}/filelists/wireless-regdb (100%) Difference in files: diff --git a/config/rootfiles/common/wireless-regdb b/config/rootfiles/common/wireless-regdb index 2dcdbca32..7e830ae1f 100644 --- a/config/rootfiles/common/wireless-regdb +++ b/config/rootfiles/common/wireless-regdb @@ -1,5 +1,8 @@ +lib/firmware/regulatory.db +lib/firmware/regulatory.db.p7s #usr/lib/crda #usr/lib/crda/pubkeys -usr/lib/crda/pubkeys/linville.key.pub.pem +usr/lib/crda/pubkeys/sforshee.key.pub.pem usr/lib/crda/regulatory.bin #usr/share/man/man5/regulatory.bin.5.gz +#usr/share/man/man5/regulatory.db.5.gz diff --git a/config/rootfiles/core/131/filelists/wireless-regdb b/config/rootfiles/core/131/filelists/wireless-regdb new file mode 120000 index 000000000..c9205b3cf --- /dev/null +++ b/config/rootfiles/core/131/filelists/wireless-regdb @@ -0,0 +1 @@ +../../../common/wireless-regdb \ No newline at end of file diff --git a/lfs/wireless-regdb b/lfs/wireless-regdb index 84cad32ea..182f0371f 100644 --- a/lfs/wireless-regdb +++ b/lfs/wireless-regdb @@ -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 = 2014.11.18 +VER = 2019.03.01 THISAPP = wireless-regdb-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -41,7 +41,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = d750c402c5510add7380edcb1d9b75b2 +$(DL_FILE)_MD5 = b5eb2d0cc23f5e495a59405e34ce437f install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

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

16 Apr '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 fea27a56f7ef299fa2793971ef6e49f3a423fdc3 (commit) via 175f5c060ea8b967bc3020b376385d5b71116e92 (commit) from 820b2909825479b52696886d1f9054c0f709d3f0 (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 fea27a56f7ef299fa2793971ef6e49f3a423fdc3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 16 13:23:17 2019 +0100 haproxy: Backup certificates, too Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 175f5c060ea8b967bc3020b376385d5b71116e92 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 16 13:22:10 2019 +0100 backup: Allow passing name of tarball for creation/restore Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/backup/backup.pl | 24 +++++++++++++++++++++--- config/backup/includes/haproxy | 1 + lfs/haproxy | 2 +- 3 files changed, 23 insertions(+), 4 deletions(-) Difference in files: diff --git a/config/backup/backup.pl b/config/backup/backup.pl index 5737740e5..6ac4e4967 100644 --- a/config/backup/backup.pl +++ b/config/backup/backup.pl @@ -176,19 +176,34 @@ main() { local command="${1}" shift - # Desired backup filename - local filename="/var/ipfire/backup/${NOW}.ipf" - case "${command}" in include) + local filename="${1}" + + if [ -z "${filename}" ]; then + filename="/var/ipfire/backup/${NOW}.ipf" + fi + make_backup "${filename}" $(find_logfiles) ;; exclude) + local filename="${1}" + + if [ -z "${filename}" ]; then + filename="/var/ipfire/backup/${NOW}.ipf" + fi + make_backup "${filename}" ;; restore) + local filename="${1}" + + if [ -z "${filename}" ]; then + filename="/tmp/restore.ipf" + fi + restore_backup "/tmp/restore.ipf" ;; @@ -201,6 +216,9 @@ main() { ;; iso) + # Desired backup filename + local filename="/var/ipfire/backup/${NOW}.ipf" + if make_backup "${filename}"; then /usr/local/bin/backupiso "${NOW}" & fi diff --git a/config/backup/includes/haproxy b/config/backup/includes/haproxy index 4516e18ac..483746808 100644 --- a/config/backup/includes/haproxy +++ b/config/backup/includes/haproxy @@ -1 +1,2 @@ +/etc/haproxy/certs /etc/haproxy/haproxy.cfg diff --git a/lfs/haproxy b/lfs/haproxy index ac531bede..3bdbd28fa 100644 --- a/lfs/haproxy +++ b/lfs/haproxy @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = haproxy -PAK_VER = 9 +PAK_VER = 10 DEPS = "" hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 820b2909825479b52696886d1f9054c0f709d3f0
by Michael Tremer 15 Apr '19

15 Apr '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 820b2909825479b52696886d1f9054c0f709d3f0 (commit) via 0851afba33bf8f1a4562a7e755bec5af23d4d03e (commit) via 5e39f3c08a4a6e9f402b18c267fe82595cb0596b (commit) via e8b389e0f0a88f064c192305e8bbbc366300af24 (commit) via 316d14c43ad3b0b27cfa6984d8253e8f9255a87c (commit) via 6874a5765b887b51e324e1afbddc4516d66a710f (commit) via 5b2ec053c25b80843958864d4305b3108b55dd3c (commit) via c3c2ae4475a0e99a6163027405a45a1e2b4fa8b6 (commit) from 32e7b93c284fe02450e28f431453621537214a03 (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 820b2909825479b52696886d1f9054c0f709d3f0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Apr 11 23:32:57 2019 +0100 Move IPS to a higher position in the Firewall menu Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 0851afba33bf8f1a4562a7e755bec5af23d4d03e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Apr 11 23:24:28 2019 +0100 remote.cgi: Move SSH Agent Forwarding to the top Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5e39f3c08a4a6e9f402b18c267fe82595cb0596b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Apr 11 23:22:14 2019 +0100 sshctrl: Fix syntax of generated sed command Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit e8b389e0f0a88f064c192305e8bbbc366300af24 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Apr 11 23:02:57 2019 +0100 core131: Ship PTR changes in hosts.cgi Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 316d14c43ad3b0b27cfa6984d8253e8f9255a87c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Apr 11 23:00:25 2019 +0100 Update list of contributors Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 6874a5765b887b51e324e1afbddc4516d66a710f Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Mon Apr 8 18:04:00 2019 +0000 Unbound: do not generate PTR if the user requested not to, do so Partially fixes #12030 Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5b2ec053c25b80843958864d4305b3108b55dd3c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Apr 11 22:58:35 2019 +0100 Update translations Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit c3c2ae4475a0e99a6163027405a45a1e2b4fa8b6 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Mon Apr 8 18:04:00 2019 +0000 add option for selective PTR generation on hosts.cgi In some cases, it might be useful to create an additional host (i.e. for round robin loadbalancing) without assigning another PTR to the IP address specified. This patch introduces the ability to check or uncheck PTR generation for each host individually. Partially fixes #12030 Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/menu/50-firewall.menu | 18 +++++------ config/rootfiles/core/131/filelists/files | 2 ++ doc/language_issues.en | 3 ++ doc/language_issues.es | 3 ++ doc/language_issues.fr | 3 ++ doc/language_issues.it | 3 ++ doc/language_issues.nl | 3 ++ doc/language_issues.pl | 3 ++ doc/language_issues.ru | 3 ++ doc/language_issues.tr | 3 ++ doc/language_missings | 21 +++++++++++++ html/cgi-bin/credits.cgi | 4 +-- html/cgi-bin/hosts.cgi | 52 +++++++++++++++++++++++-------- html/cgi-bin/remote.cgi | 10 +++--- langs/de/cgi-bin/de.pl | 2 ++ langs/en/cgi-bin/en.pl | 4 ++- src/initscripts/system/unbound | 7 +++-- src/misc-progs/sshctrl.c | 4 +-- 18 files changed, 114 insertions(+), 34 deletions(-) Difference in files: diff --git a/config/menu/50-firewall.menu b/config/menu/50-firewall.menu index 77642b0ac..5ec1f67fc 100644 --- a/config/menu/50-firewall.menu +++ b/config/menu/50-firewall.menu @@ -16,35 +16,35 @@ 'title' => "$Lang::tr{'options fw'}", 'enabled' => 1, }; - $subfirewall->{'40.p2p'} = { + $subfirewall->{'40.ids'} = {'caption' => $Lang::tr{'intrusion detection'}, + 'uri' => '/cgi-bin/ids.cgi', + 'title' => "$Lang::tr{'intrusion detection system'}", + 'enabled' => 1, + }; + $subfirewall->{'50.p2p'} = { 'caption' => $Lang::tr{'p2p block'}, 'uri' => '/cgi-bin/p2p-block.cgi', 'title' => "P2P-Block", 'enabled' => 1, }; - $subfirewall->{'50.geoipblock'} = { + $subfirewall->{'60.geoipblock'} = { 'caption' => $Lang::tr{'geoipblock'}, 'uri' => '/cgi-bin/geoip-block.cgi', 'title' => $Lang::tr{'geoipblock'}, 'enabled' => 1, }; - $subfirewall->{'60.wireless'} = { + $subfirewall->{'70.wireless'} = { 'caption' => $Lang::tr{'blue access'}, 'uri' => '/cgi-bin/wireless.cgi', 'title' => "$Lang::tr{'blue access'}", 'enabled' => 1, }; - $subfirewall->{'70.upnp'} = { + $subfirewall->{'80.upnp'} = { 'caption' => 'UPnP', 'uri' => '/cgi-bin/upnp.cgi', 'title' => "Universal Plug and Play", 'enabled' => 0, }; - $subfirewall->{'80.ids'} = {'caption' => $Lang::tr{'intrusion detection'}, - 'uri' => '/cgi-bin/ids.cgi', - 'title' => "$Lang::tr{'intrusion detection system'}", - 'enabled' => 1, - }; $subfirewall->{'90.iptables'} = { 'caption' => $Lang::tr{'ipts'}, 'uri' => '/cgi-bin/iptables.cgi', diff --git a/config/rootfiles/core/131/filelists/files b/config/rootfiles/core/131/filelists/files index 0cb51ca88..810c67b1e 100644 --- a/config/rootfiles/core/131/filelists/files +++ b/config/rootfiles/core/131/filelists/files @@ -7,11 +7,13 @@ etc/rc.d/init.d/collectd etc/rc.d/init.d/firewall etc/rc.d/init.d/networking/red.up/23-suricata etc/rc.d/init.d/suricata +etc/rc.d/init.d/unbound etc/syslog.conf lib/udev/network-hotplug-rename opt/pakfire/etc/pakfire.conf srv/web/ipfire/cgi-bin/aliases.cgi srv/web/ipfire/cgi-bin/dnsforward.cgi +srv/web/ipfire/cgi-bin/hosts.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 diff --git a/doc/language_issues.en b/doc/language_issues.en index b8affb54d..72d94868a 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -951,6 +951,7 @@ WARNING: untranslated string: gen dh = Generate new Diffie-Hellman parameters WARNING: untranslated string: generate a certificate = Generate a certificate: WARNING: untranslated string: generate dh key = Generate Diffie-Hellman parameters WARNING: untranslated string: generate iso = Generate ISO +WARNING: untranslated string: generate ptr = Generate PTR WARNING: untranslated string: generate root/host certificates = Generate root/host certificates WARNING: untranslated string: generating the root and host certificates may take a long time. it can take up to several minutes on older hardware. please be patient = Generating the root and host certificates may take a long time. It can take up to several minutes on older hardware. Please be patient. WARNING: untranslated string: genre = Genre @@ -1499,6 +1500,7 @@ WARNING: untranslated string: proxy reports daily = Daily reports WARNING: untranslated string: proxy reports monthly = Monthly reports WARNING: untranslated string: proxy reports today = Today WARNING: untranslated string: proxy reports weekly = Weekly reports +WARNING: untranslated string: ptr = PTR WARNING: untranslated string: pulse = Pulse WARNING: untranslated string: pulse dial = Pulse dial: WARNING: untranslated string: qos add subclass = Add subclass @@ -1633,6 +1635,7 @@ WARNING: untranslated string: src port = Src Port WARNING: untranslated string: ssh = SSH WARNING: untranslated string: ssh access = SSH Access WARNING: untranslated string: ssh active sessions = Active logins +WARNING: untranslated string: ssh agent forwarding = Allow SSH Agent Forwarding WARNING: untranslated string: ssh fingerprint = Fingerprint WARNING: untranslated string: ssh host keys = SSH Host Keys WARNING: untranslated string: ssh is disabled = SSH is disabled. Stopping. diff --git a/doc/language_issues.es b/doc/language_issues.es index 690416af7..f292ebb85 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -1022,6 +1022,7 @@ WARNING: untranslated string: fwhost used = Used WARNING: untranslated string: fwhost welcome = Over here, you can group single hosts, networks and services together, which will creating new rules more easy and faster. WARNING: untranslated string: gen dh = Generate new Diffie-Hellman parameters WARNING: untranslated string: generate dh key = Generate Diffie-Hellman parameters +WARNING: untranslated string: generate ptr = Generate PTR WARNING: untranslated string: grouptype = Grouptype: WARNING: untranslated string: guardian = Guardian WARNING: untranslated string: guardian block a host = unknown string @@ -1192,6 +1193,7 @@ WARNING: untranslated string: proxy reports daily = Daily reports WARNING: untranslated string: proxy reports monthly = Monthly reports WARNING: untranslated string: proxy reports today = Today WARNING: untranslated string: proxy reports weekly = Weekly reports +WARNING: untranslated string: ptr = PTR WARNING: untranslated string: qos enter bandwidths = You will need to enter your downstream and upstream bandwidth! WARNING: untranslated string: random number generator daemon = Random Number Generator Daemon WARNING: untranslated string: rdns = rDNS @@ -1212,6 +1214,7 @@ WARNING: untranslated string: software version = Software Version WARNING: untranslated string: source ip country = Source IP Country WARNING: untranslated string: ssh = SSH WARNING: untranslated string: ssh active sessions = Active logins +WARNING: untranslated string: ssh agent forwarding = Allow SSH Agent Forwarding WARNING: untranslated string: ssh login time = Logged in since WARNING: untranslated string: ssh no active logins = No active logins WARNING: untranslated string: ssh username = Username diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 8f8b8d39f..e903e017d 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -789,6 +789,7 @@ WARNING: untranslated string: dnsforward dnssec disabled = DNSSEC Validation is 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 +WARNING: untranslated string: generate ptr = Generate PTR WARNING: untranslated string: guardian block a host = unknown string WARNING: untranslated string: guardian block httpd brute-force = unknown string WARNING: untranslated string: guardian block ssh brute-force = unknown string @@ -860,10 +861,12 @@ WARNING: untranslated string: local ip address = Local IP Address WARNING: untranslated string: mtu = MTU WARNING: untranslated string: no data = unknown string WARNING: untranslated string: pakfire ago = ago. +WARNING: untranslated string: ptr = PTR WARNING: untranslated string: route config changed = unknown string WARNING: untranslated string: routing config added = unknown string WARNING: untranslated string: routing config changed = unknown string WARNING: untranslated string: routing table = unknown string +WARNING: untranslated string: ssh agent forwarding = Allow SSH Agent Forwarding WARNING: untranslated string: subnet mask = Subnet Mask WARNING: untranslated string: system is offline = The system is offline. WARNING: untranslated string: transport mode does not support vti = VTI is not support in transport mode diff --git a/doc/language_issues.it b/doc/language_issues.it index f8a3f6ac1..c18ff4d2b 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -854,6 +854,7 @@ WARNING: untranslated string: fwhost cust geoipgrp = unknown string WARNING: untranslated string: fwhost cust geoiplocation = GeoIP Locations WARNING: untranslated string: fwhost err hostip = unknown string WARNING: untranslated string: fwhost newgeoipgrp = GeoIP Groups +WARNING: untranslated string: generate ptr = Generate PTR WARNING: untranslated string: geoip = GeoIP WARNING: untranslated string: geoipblock = GeoIP Block WARNING: untranslated string: geoipblock block countries = Block countries @@ -961,6 +962,7 @@ WARNING: untranslated string: ovpn warning rfc3280 = Your host certificate is no WARNING: untranslated string: pptp netconfig = My Net Config WARNING: untranslated string: pptp peer = Peer WARNING: untranslated string: pptp route = PPTP Route +WARNING: untranslated string: ptr = PTR WARNING: untranslated string: rdns = rDNS WARNING: untranslated string: required field = Required field WARNING: untranslated string: route config changed = unknown string @@ -971,6 +973,7 @@ WARNING: untranslated string: samba join a domain = Join a domain WARNING: untranslated string: samba join domain = Join domain WARNING: untranslated string: search = Search WARNING: untranslated string: ssh active sessions = Active logins +WARNING: untranslated string: ssh agent forwarding = Allow SSH Agent Forwarding WARNING: untranslated string: ssh login time = Logged in since WARNING: untranslated string: ssh no active logins = No active logins WARNING: untranslated string: ssh username = Username diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 2a1a0877c..509a58f0b 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -867,6 +867,7 @@ WARNING: untranslated string: fwhost err hostip = unknown string WARNING: untranslated string: fwhost newgeoipgrp = GeoIP Groups WARNING: untranslated string: gen dh = Generate new Diffie-Hellman parameters WARNING: untranslated string: generate dh key = Generate Diffie-Hellman parameters +WARNING: untranslated string: generate ptr = Generate PTR WARNING: untranslated string: geoip = GeoIP WARNING: untranslated string: geoipblock = GeoIP Block WARNING: untranslated string: geoipblock block countries = Block countries @@ -999,6 +1000,7 @@ WARNING: untranslated string: ovpn warning rfc3280 = Your host certificate is no WARNING: untranslated string: pptp netconfig = My Net Config WARNING: untranslated string: pptp peer = Peer WARNING: untranslated string: pptp route = PPTP Route +WARNING: untranslated string: ptr = PTR WARNING: untranslated string: random number generator daemon = Random Number Generator Daemon WARNING: untranslated string: rdns = rDNS WARNING: untranslated string: required field = Required field @@ -1014,6 +1016,7 @@ WARNING: untranslated string: show tls-auth key = Show tls-auth key WARNING: untranslated string: software version = Software Version WARNING: untranslated string: source ip country = Source IP Country WARNING: untranslated string: ssh active sessions = Active logins +WARNING: untranslated string: ssh agent forwarding = Allow SSH Agent Forwarding WARNING: untranslated string: ssh login time = Logged in since WARNING: untranslated string: ssh no active logins = No active logins WARNING: untranslated string: ssh username = Username diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 690416af7..f292ebb85 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -1022,6 +1022,7 @@ WARNING: untranslated string: fwhost used = Used WARNING: untranslated string: fwhost welcome = Over here, you can group single hosts, networks and services together, which will creating new rules more easy and faster. WARNING: untranslated string: gen dh = Generate new Diffie-Hellman parameters WARNING: untranslated string: generate dh key = Generate Diffie-Hellman parameters +WARNING: untranslated string: generate ptr = Generate PTR WARNING: untranslated string: grouptype = Grouptype: WARNING: untranslated string: guardian = Guardian WARNING: untranslated string: guardian block a host = unknown string @@ -1192,6 +1193,7 @@ WARNING: untranslated string: proxy reports daily = Daily reports WARNING: untranslated string: proxy reports monthly = Monthly reports WARNING: untranslated string: proxy reports today = Today WARNING: untranslated string: proxy reports weekly = Weekly reports +WARNING: untranslated string: ptr = PTR WARNING: untranslated string: qos enter bandwidths = You will need to enter your downstream and upstream bandwidth! WARNING: untranslated string: random number generator daemon = Random Number Generator Daemon WARNING: untranslated string: rdns = rDNS @@ -1212,6 +1214,7 @@ WARNING: untranslated string: software version = Software Version WARNING: untranslated string: source ip country = Source IP Country WARNING: untranslated string: ssh = SSH WARNING: untranslated string: ssh active sessions = Active logins +WARNING: untranslated string: ssh agent forwarding = Allow SSH Agent Forwarding WARNING: untranslated string: ssh login time = Logged in since WARNING: untranslated string: ssh no active logins = No active logins WARNING: untranslated string: ssh username = Username diff --git a/doc/language_issues.ru b/doc/language_issues.ru index c67a93125..d6fa07a3c 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -1016,6 +1016,7 @@ WARNING: untranslated string: fwhost used = Used WARNING: untranslated string: fwhost welcome = Over here, you can group single hosts, networks and services together, which will creating new rules more easy and faster. WARNING: untranslated string: gen dh = Generate new Diffie-Hellman parameters WARNING: untranslated string: generate dh key = Generate Diffie-Hellman parameters +WARNING: untranslated string: generate ptr = Generate PTR WARNING: untranslated string: geoip = GeoIP WARNING: untranslated string: geoipblock = GeoIP Block WARNING: untranslated string: geoipblock block countries = Block countries @@ -1188,6 +1189,7 @@ WARNING: untranslated string: proxy reports daily = Daily reports WARNING: untranslated string: proxy reports monthly = Monthly reports WARNING: untranslated string: proxy reports today = Today WARNING: untranslated string: proxy reports weekly = Weekly reports +WARNING: untranslated string: ptr = PTR WARNING: untranslated string: qos enter bandwidths = You will need to enter your downstream and upstream bandwidth! WARNING: untranslated string: random number generator daemon = Random Number Generator Daemon WARNING: untranslated string: rdns = rDNS @@ -1208,6 +1210,7 @@ WARNING: untranslated string: software version = Software Version WARNING: untranslated string: source ip country = Source IP Country WARNING: untranslated string: ssh = SSH WARNING: untranslated string: ssh active sessions = Active logins +WARNING: untranslated string: ssh agent forwarding = Allow SSH Agent Forwarding WARNING: untranslated string: ssh login time = Logged in since WARNING: untranslated string: ssh no active logins = No active logins WARNING: untranslated string: ssh username = Username diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 7ebb4d0e7..9a4339db9 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -794,6 +794,7 @@ WARNING: untranslated string: emerging pro rules = Emergingthreats.net Pro Rules WARNING: untranslated string: fwdfw all subnets = All subnets WARNING: untranslated string: fwhost cust geoipgrp = unknown string WARNING: untranslated string: fwhost err hostip = unknown string +WARNING: untranslated string: generate ptr = Generate PTR WARNING: untranslated string: guardian block a host = unknown string WARNING: untranslated string: guardian block httpd brute-force = unknown string WARNING: untranslated string: guardian block ssh brute-force = unknown string @@ -868,11 +869,13 @@ WARNING: untranslated string: no data = unknown string WARNING: untranslated string: ovpn error dh = The Diffie-Hellman parameter needs to be in minimum 2048 bit! <br>Please generate or upload a new Diffie-Hellman parameter, this can be made below in the section "Diffie-Hellman parameters options".</br> WARNING: untranslated string: ovpn error md5 = You host certificate uses MD5 for the signature which is not accepted anymore. <br>Please update to the latest IPFire version and generate a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br> WARNING: untranslated string: ovpn warning rfc3280 = Your host certificate is not RFC3280 compliant. <br>Please update to the latest IPFire version and generate as soon as possible a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br> +WARNING: untranslated string: ptr = PTR WARNING: untranslated string: route config changed = unknown string WARNING: untranslated string: routing config added = unknown string WARNING: untranslated string: routing config changed = unknown string WARNING: untranslated string: routing table = unknown string WARNING: untranslated string: ssh active sessions = Active logins +WARNING: untranslated string: ssh agent forwarding = Allow SSH Agent Forwarding WARNING: untranslated string: ssh login time = Logged in since WARNING: untranslated string: ssh no active logins = No active logins WARNING: untranslated string: ssh username = Username diff --git a/doc/language_missings b/doc/language_missings index 07813f252..9d13d4775 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -493,6 +493,7 @@ < fw settings ruletable < gen dh < generate dh key +< generate ptr < grouptype < guardian < hardware support @@ -656,6 +657,7 @@ < proxy reports monthly < proxy reports today < proxy reports weekly +< ptr < qos enter bandwidths < random number generator daemon < rdns @@ -674,6 +676,7 @@ < source ip country < ssh < ssh active sessions +< ssh agent forwarding < ssh login time < ssh no active logins < ssh username @@ -841,6 +844,7 @@ < dnsforward dnssec disabled < dns forwarding dnssec disabled notice < emerging pro rules +< generate ptr < ids apply < ids apply ruleset changes < ids automatic rules update @@ -874,7 +878,9 @@ < ipsec settings < local ip address < mtu +< ptr < runmode +< ssh agent forwarding < subnet mask < system is offline < transport mode does not support vti @@ -1008,6 +1014,7 @@ < fwhost cust geoipgroup < fwhost cust geoiplocation < fwhost newgeoipgrp +< generate ptr < geoip < geoipblock < geoipblock block countries @@ -1083,6 +1090,7 @@ < pptp netconfig < pptp peer < pptp route +< ptr < rdns < required field < runmode @@ -1090,6 +1098,7 @@ < samba join domain < search < ssh active sessions +< ssh agent forwarding < ssh login time < ssh no active logins < ssh username @@ -1290,6 +1299,7 @@ < fwhost newgeoipgrp < gen dh < generate dh key +< generate ptr < geoip < geoipblock < geoipblock block countries @@ -1393,6 +1403,7 @@ < pptp netconfig < pptp peer < pptp route +< ptr < random number generator daemon < rdns < required field @@ -1405,6 +1416,7 @@ < software version < source ip country < ssh active sessions +< ssh agent forwarding < ssh login time < ssh no active logins < ssh username @@ -1888,6 +1900,7 @@ < fw settings ruletable < gen dh < generate dh key +< generate ptr < geoip < geoipblock < geoipblock block countries @@ -2047,6 +2060,7 @@ < proxy reports monthly < proxy reports today < proxy reports weekly +< ptr < qos enter bandwidths < random number generator daemon < rdns @@ -2064,6 +2078,7 @@ < source ip country < ssh < ssh active sessions +< ssh agent forwarding < ssh login time < ssh no active logins < ssh username @@ -2652,6 +2667,7 @@ < fw settings ruletable < gen dh < generate dh key +< generate ptr < geoip < geoipblock < geoipblock block countries @@ -2811,6 +2827,7 @@ < proxy reports monthly < proxy reports today < proxy reports weekly +< ptr < qos enter bandwidths < random number generator daemon < rdns @@ -2828,6 +2845,7 @@ < source ip country < ssh < ssh active sessions +< ssh agent forwarding < ssh login time < ssh no active logins < ssh username @@ -3000,6 +3018,7 @@ < dns forwarding dnssec disabled notice < emerging pro rules < fwdfw all subnets +< generate ptr < ids apply < ids apply ruleset changes < ids automatic rules update @@ -3037,8 +3056,10 @@ < ovpn error dh < ovpn error md5 < ovpn warning rfc3280 +< ptr < runmode < ssh active sessions +< ssh agent forwarding < ssh login time < ssh no active logins < ssh username diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi index 337e8bc22..baa49fd3b 100644 --- a/html/cgi-bin/credits.cgi +++ b/html/cgi-bin/credits.cgi @@ -90,12 +90,13 @@ Rene Zingel, Sascha Kilian, Ronald Wiesinger, Stephan Feddersen, +Stéphane Pautrel, Justin Luth, Michael Eitelwein, -Stéphane Pautrel, Bernhard Bitsch, Dominik Hassler, Larsen, +Alexander Koch, Gabriel Rolland, Anton D. Seliverstov, Bernhard Bittner, @@ -105,7 +106,6 @@ Jakub Ratajczak, Jorrit de Jonge, Jörn-Ingo Weigert, Przemek Zdroik, -Alexander Koch, Alexander Rudolf Gruber, Andrew Bellows, Axel Gembe, diff --git a/html/cgi-bin/hosts.cgi b/html/cgi-bin/hosts.cgi index 41fe8a5b6..973c480b3 100644 --- a/html/cgi-bin/hosts.cgi +++ b/html/cgi-bin/hosts.cgi @@ -2,9 +2,9 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2019 IPFire Team <info(a)ipfire.org> # # # -# This program is free software you can redistribute it and/or modify # +# 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. # @@ -50,9 +50,10 @@ our %settings = (); #Must not be saved ! $settings{'EN'} = ''; # reuse for dummy field in position zero $settings{'IP'} = ''; -$settings{'HOST'} = ''; -$settings{'DOM'} = ''; -my @nosaved=('EN','IP','HOST','DOM'); # List here ALL setting2 fields. Mandatory +$settings{'HOST'} = ''; +$settings{'DOM'} = ''; +$settings{'PTR'} = ''; +my @nosaved=('EN','IP','HOST','DOM','PTR'); # List here ALL setting2 fields. Mandatory $settings{'ACTION'} = ''; # add/edit/remove $settings{'KEY1'} = ''; # point record for ACTION @@ -78,6 +79,10 @@ if (open(FILE, "$datafile")) { ## Settings1 Box not used... &General::readhash("${General::swroot}/main/settings", \%settings); +# Set PTR to off if filed was not received +if ($settings{'PTR'} eq '') { + $settings{'PTR'} = 'off'; +} ## Now manipulate the multi-line list with Settings2 # Basic actions are: @@ -122,13 +127,12 @@ if ($settings{'ACTION'} eq $Lang::tr{'add'}) { $errormessage = $Lang::tr{'invalid domain name'}; } - unless ($errormessage) { if ($settings{'KEY1'} eq '') { #add or edit ? - unshift (@current, "$settings{'EN'},$settings{'IP'},$settings{'HOST'},$settings{'DOM'}\n"); + unshift (@current, "$settings{'EN'},$settings{'IP'},$settings{'HOST'},$settings{'DOM'},$settings{'PTR'}\n"); &General::log($Lang::tr{'hosts config added'}); } else { - @current[$settings{'KEY1'}] = "$settings{'EN'},$settings{'IP'},$settings{'HOST'},$settings{'DOM'}\n"; + @current[$settings{'KEY1'}] = "$settings{'EN'},$settings{'IP'},$settings{'HOST'},$settings{'DOM'},$settings{'PTR'}\n"; $settings{'KEY1'} = ''; # End edit mode &General::log($Lang::tr{'hosts config changed'}); } @@ -150,6 +154,11 @@ if ($settings{'ACTION'} eq $Lang::tr{'edit'}) { $settings{'IP'}=$temp[1]; $settings{'HOST'}=$temp[2]; $settings{'DOM'}=$temp[3]; + if ($temp[4] eq '') { + $settings{'PTR'} = 'on'; + } else { + $settings{'PTR'}=$temp[4]; + } } if ($settings{'ACTION'} eq $Lang::tr{'remove'}) { @@ -190,6 +199,7 @@ if ($settings{'ACTION'} eq '' ) { # First launch from GUI # Place here default value when nothing is initialized $settings{'EN'} = 'on'; $settings{'DOM'} = $settings{'DOMAINNAME'}; + $settings{'PTR'} = 'on'; } &Header::openpage($Lang::tr{'hostname'}, 1, ''); @@ -238,6 +248,7 @@ if ($errormessage) { # Second check box is for editing the list # $checked{'EN'}{'on'} = ($settings{'EN'} eq '' ) ? '' : "checked='checked'"; +$checked{'PTR'}{'on'} = ($settings{'PTR'} eq 'off' ) ? '' : "checked='checked'"; my $buttontext = $Lang::tr{'add'}; if ($settings{'KEY1'} ne '') { @@ -257,9 +268,16 @@ print <<END <td><input type='text' name='IP' value='$settings{'IP'}' /></td> <td class='base'>$Lang::tr{'hostname'}: <img src='/blob.gif' alt='*' /></td> <td><input type='text' name='HOST' value='$settings{'HOST'}' /></td> -</tr><tr> +</tr> +<tr> <td class='base'>$Lang::tr{'domain name'}:</td> <td><input type='text' name='DOM' value='$settings{'DOM'}' /></td> + <td class='base'>$Lang::tr{'generate ptr'}:</td> + <td><input type='checkbox' name='PTR' $checked{'PTR'}{'on'} /></td> +</tr> +<tr> + <td> </td> + <td> </td> <td class='base'>$Lang::tr{'enabled'}</td> <td><input type='checkbox' name='EN' $checked{'EN'}{'on'} /></td> </tr> @@ -288,7 +306,8 @@ print <<END <tr> <th width='20%' align='center'><a href='$ENV{'SCRIPT_NAME'}?IP'><b>$Lang::tr{'host ip'}</b></a></th> <th width='20%' align='center'><a href='$ENV{'SCRIPT_NAME'}?HOST'><b>$Lang::tr{'hostname'}</b></a></th> - <th width='50%' align='center'><a href='$ENV{'SCRIPT_NAME'}?DOM'><b>$Lang::tr{'domain name'}</b></a></th> + <th width='40%' align='center'><a href='$ENV{'SCRIPT_NAME'}?DOM'><b>$Lang::tr{'domain name'}</b></a></th> + <th width='10%' align='center' class='boldbase'><b>$Lang::tr{'ptr'}</b></th> <th width='10%' colspan='3' class='boldbase' align='center'><b>$Lang::tr{'action'}</b></th> </tr> END @@ -315,6 +334,12 @@ foreach my $line (@current) { $gdesc = $Lang::tr{'click to enable'}; } + if ($temp[4] eq '' || $temp[4] eq 'on') { + $temp[4] = $Lang::tr{'yes'}; + } else { + $temp[4] = $Lang::tr{'no'}; + } + #Colorize each line if ($settings{'KEY1'} eq $key) { print "<tr bgcolor='${Header::colouryellow}'>"; @@ -329,6 +354,7 @@ foreach my $line (@current) { <td align='center' $col>$temp[1]</td> <td align='center' $col>$temp[2]</td> <td align='center' $col>$temp[3]</td> +<td align='center' $col>$temp[4]</td> <td align='center' $col> <form method='post' action='$ENV{'SCRIPT_NAME'}'> <input type='hidden' name='ACTION' value='$Lang::tr{'toggle enable disable'}' /> @@ -430,14 +456,14 @@ sub SortDataFile my $key = 0; foreach my $line (@current) { chomp( $line); #remove newline because can be on field 5 or 6 (addition of REMARK) - my @temp = ( '','','', ''); + my @temp = ( '','','','',''); @temp = split (',',$line); # Build a pair 'Field Name',value for each of the data dataline. # Each SORTABLE field must have is pair. # Other data fields (non sortable) can be grouped in one - my @record = ('KEY',$key++,'EN',$temp[0],'IP',$temp[1],'HOST',$temp[2],'DOM',$temp[3]); + my @record = ('KEY',$key++,'EN',$temp[0],'IP',$temp[1],'HOST',$temp[2],'DOM',$temp[3],'PTR',$temp[4]); my $record = {}; # create a reference to empty hash %{$record} = @record; # populate that hash with @record $entries{$record->{KEY}} = $record; # add this to a hash of hashes @@ -447,7 +473,7 @@ sub SortDataFile # Each field value is printed , with the newline ! Don't forget separator and order of them. foreach my $entry (sort fixedleasesort keys %entries) { - print FILE "$entries{$entry}->{EN},$entries{$entry}->{IP},$entries{$entry}->{HOST},$entries{$entry}->{DOM}\n"; + print FILE "$entries{$entry}->{EN},$entries{$entry}->{IP},$entries{$entry}->{HOST},$entries{$entry}->{DOM},$entries{$entry}->{PTR}\n"; } close(FILE); diff --git a/html/cgi-bin/remote.cgi b/html/cgi-bin/remote.cgi index 10d94fe99..8beb84efa 100644 --- a/html/cgi-bin/remote.cgi +++ b/html/cgi-bin/remote.cgi @@ -145,6 +145,11 @@ print <<END <td><input type='checkbox' name='ENABLE_SSH' $checked{'ENABLE_SSH'}{'on'} /></td> <td class='base' colspan='2'>$Lang::tr{'ssh access'}</td> </tr> +<tr> + <td> </td> + <td><input type='checkbox' name='SSH_AGENT_FORWARDING' $checked{'SSH_AGENT_FORWARDING'}{'on'} /></td> + <td width='100%' class='base'>$Lang::tr{'ssh agent forwarding'}</td> +</tr> <tr> <td> </td> <td><input type='checkbox' name='ENABLE_SSH_PORTFW' $checked{'ENABLE_SSH_PORTFW'}{'on'} /></td> @@ -165,11 +170,6 @@ print <<END <td><input type='checkbox' name='SSH_PORT' $checked{'SSH_PORT'}{'on'} /></td> <td width='100%' class='base'>$Lang::tr{'ssh port'}</td> </tr> -<tr> - <td> </td> - <td><input type='checkbox' name='SSH_AGENT_FORWARDING' $checked{'SSH_AGENT_FORWARDING'}{'on'} /></td> - <td width='100%' class='base'>$Lang::tr{'ssh agent forwarding'}</td> -</tr> <tr> <td align='right' colspan='3'> <input type='submit' name='ACTION' value='$Lang::tr{'ssh tempstart15'}' /> diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index d63ebe6e5..90b1ada06 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1261,6 +1261,7 @@ 'generate a certificate' => 'Erzeuge ein Zertifikat:', 'generate dh key' => 'Diffie-Hellman Key generieren', 'generate iso' => 'ISO erstellen', +'generate ptr' => 'PTR erzeugen', 'generate root/host certificates' => 'Erzeuge Root/Host-Zertifikate', 'generate tripwire keys and init' => 'Tripwire Initalisierung', 'generatekeys' => 'Neue Schlüssel erzeugen', @@ -1998,6 +1999,7 @@ 'proxy reports today' => 'Heute', 'proxy reports weekly' => 'Wöchentliche Berichte', 'psk' => 'PSK', +'ptr' => 'PTR', 'pulse' => 'Puls', 'pulse dial' => 'Pulswahl:', 'qos add subclass' => 'Unterklasse hinzufügen', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index a709604b0..98e99f150 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1293,6 +1293,7 @@ 'generate a certificate' => 'Generate a certificate:', 'generate dh key' => 'Generate Diffie-Hellman parameters', 'generate iso' => 'Generate ISO', +'generate ptr' => 'Generate PTR', 'generate root/host certificates' => 'Generate root/host certificates', 'generate tripwire keys and init' => 'generate tripwire keys and init', 'generatekeys' => 'Generate Keys', @@ -2036,6 +2037,7 @@ 'proxy reports today' => 'Today', 'proxy reports weekly' => 'Weekly reports', 'psk' => 'PSK', +'ptr' => 'PTR', 'pulse' => 'Pulse', 'pulse dial' => 'Pulse dial:', 'qos add subclass' => 'Add subclass', @@ -2230,7 +2232,7 @@ 'ssh access' => 'SSH Access', 'ssh access tip' => 'IPFire SSH is not using default port 22!', 'ssh active sessions' => 'Active logins', -'ssh agent forwarding' => 'Enable SSH agent forwarding', +'ssh agent forwarding' => 'Allow SSH Agent Forwarding', 'ssh fingerprint' => 'Fingerprint', 'ssh host keys' => 'SSH Host Keys', 'ssh is disabled' => 'SSH is disabled. Stopping.', diff --git a/src/initscripts/system/unbound b/src/initscripts/system/unbound index af9bcef73..e87f9e10d 100644 --- a/src/initscripts/system/unbound +++ b/src/initscripts/system/unbound @@ -172,9 +172,9 @@ own_hostname() { } update_hosts() { - local enabled address hostname domainname + local enabled address hostname domainname generateptr - while IFS="," read -r enabled address hostname domainname; do + while IFS="," read -r enabled address hostname domainname generateptr; do [ "${enabled}" = "on" ] || continue # Build FQDN @@ -185,6 +185,9 @@ update_hosts() { # Skip reverse resolution if the address equals the GREEN address [ "${address}" = "${GREEN_ADDRESS}" ] && continue + # Skip reverse resolution if user requested not to do so + [ "${generateptr}" = "off" ] && continue + # Add RDNS address=$(ip_address_revptr ${address}) unbound-control -q local_data "${address} ${LOCAL_TTL} IN PTR ${fqdn}" diff --git a/src/misc-progs/sshctrl.c b/src/misc-progs/sshctrl.c index 476dbc9d5..f855c5a4a 100644 --- a/src/misc-progs/sshctrl.c +++ b/src/misc-progs/sshctrl.c @@ -72,9 +72,9 @@ int main(int argc, char *argv[]) strlcat(command, "s/^AllowTcpForwarding .*$/AllowTcpForwarding no/;", STRING_SIZE - 1 ); if(findkey(kv, "SSH_PORT", buffer) && !strcmp(buffer,"on")) - strlcat(command, "s/^Port .*$/Port 22/", STRING_SIZE - 1 ); + strlcat(command, "s/^Port .*$/Port 22/;", STRING_SIZE - 1 ); else - strlcat(command, "s/^Port .*$/Port 222/", STRING_SIZE - 1 ); + strlcat(command, "s/^Port .*$/Port 222/;", STRING_SIZE - 1 ); if(findkey(kv, "SSH_AGENT_FORWARDING", buffer) && !strcmp(buffer,"on")) strlcat(command, "s/^AllowAgentForwarding .*$/AllowAgentForwarding yes/;", STRING_SIZE - 1 ); hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 32e7b93c284fe02450e28f431453621537214a03
by Michael Tremer 13 Apr '19

13 Apr '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 32e7b93c284fe02450e28f431453621537214a03 (commit) from dccbdf5b97130f72b4d0bb26d962ffcda8121a51 (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 32e7b93c284fe02450e28f431453621537214a03 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Apr 11 21:59:41 2019 +0100 udev: Rename interfaces when MACs are uppercase The script relied on the configuration being in lowercase. If people manually editied their configuration file they might not have paid attention to this and therefore this script now also accepts uppercase MAC addresses. Fixes: #12047 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/131/filelists/files | 1 + config/udev/network-hotplug-rename | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) Difference in files: diff --git a/config/rootfiles/core/131/filelists/files b/config/rootfiles/core/131/filelists/files index 428d877c6..0cb51ca88 100644 --- a/config/rootfiles/core/131/filelists/files +++ b/config/rootfiles/core/131/filelists/files @@ -8,6 +8,7 @@ etc/rc.d/init.d/firewall etc/rc.d/init.d/networking/red.up/23-suricata etc/rc.d/init.d/suricata etc/syslog.conf +lib/udev/network-hotplug-rename opt/pakfire/etc/pakfire.conf srv/web/ipfire/cgi-bin/aliases.cgi srv/web/ipfire/cgi-bin/dnsforward.cgi diff --git a/config/udev/network-hotplug-rename b/config/udev/network-hotplug-rename index 3a482d2db..71a25c317 100644 --- a/config/udev/network-hotplug-rename +++ b/config/udev/network-hotplug-rename @@ -63,7 +63,7 @@ for zone in ${ZONES}; do [ -n "${!address}" -a -n "${!device}" ] || continue # Compare MAC addresses - [ "${ADDRESS}" = "${!address}" ] || continue + [ "${ADDRESS}" = "${!address,,}" ] || continue # If a matching interface has been found we will # print the name to which udev will rename it. hooks/post-receive -- IPFire 2.x development tree

1 0

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

12 Apr '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 dccbdf5b97130f72b4d0bb26d962ffcda8121a51 (commit) from 2c44da1382dfffb311b15250b9e02784b826dff2 (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 dccbdf5b97130f72b4d0bb26d962ffcda8121a51 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Apr 12 17:59:21 2019 +0100 suricata: Take as much off of the CPU as possible https://suricata.readthedocs.io/en/suricata-4.1.3/performance/high-performa… This will compile the ruleset as efficient as possible and allows the IPS to run faster on smaller systems. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/suricata/suricata.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/config/suricata/suricata.yaml b/config/suricata/suricata.yaml index f37294d54..3fe78cb2f 100644 --- a/config/suricata/suricata.yaml +++ b/config/suricata/suricata.yaml @@ -624,10 +624,10 @@ decoder: # If the argument specified is 0, the engine uses an internally defined # default limit. On not specifying a value, we use no limits on the recursion. detect: - profile: high + profile: custom custom-values: - toclient-groups: 3 - toserver-groups: 25 + toclient-groups: 200 + toserver-groups: 200 sgh-mpm-context: auto inspection-recursion-limit: 3000 hooks/post-receive -- IPFire 2.x development tree

1 0

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

12 Apr '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 2c44da1382dfffb311b15250b9e02784b826dff2 (commit) via 0d34a479c878cd775e541601b2a72238eb3f7546 (commit) from d51d3c5b93886a66b75388d029e35eb07d9b06eb (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 2c44da1382dfffb311b15250b9e02784b826dff2 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Apr 11 10:29:56 2019 +0100 core131: Ship updated setup Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 0d34a479c878cd775e541601b2a72238eb3f7546 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Fri Apr 12 18:21:01 2019 +0200 ids.cgi: Display oinkcode section after page load when neccessary. Fixes #12048. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: .../{oldcore/119 => core/131}/filelists/setup | 0 html/cgi-bin/ids.cgi | 32 +++++++++++++--------- 2 files changed, 19 insertions(+), 13 deletions(-) copy config/rootfiles/{oldcore/119 => core/131}/filelists/setup (100%) Difference in files: diff --git a/config/rootfiles/core/131/filelists/setup b/config/rootfiles/core/131/filelists/setup new file mode 120000 index 000000000..209374bbc --- /dev/null +++ b/config/rootfiles/core/131/filelists/setup @@ -0,0 +1 @@ +../../../common/setup \ No newline at end of file diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index 98c6f57b4..00db6a0c3 100644 --- a/html/cgi-bin/ids.cgi +++ b/html/cgi-bin/ids.cgi @@ -689,20 +689,26 @@ print"var show = \"$Lang::tr{'ids show'}\"\;\n"; print"var hide = \"$Lang::tr{'ids hide'}\"\;\n"; print <<END - // JQuery function to show/hide the text input field for + // Java Script function to show/hide the text input field for // Oinkcode/Subscription code. - \$(function() { - \$('#RULES').change(function(){ - if(\$('#RULES').val() == 'registered') { - \$('#code').show(); - } else if(\$('#RULES').val() == 'subscripted') { - \$('#code').show(); - } else if(\$('#RULES').val() == 'emerging_pro') { - \$('#code').show(); - } else { - \$('#code').hide(); - } - }); + var update_code = function() { + if(\$('#RULES').val() == 'registered') { + \$('#code').show(); + } else if(\$('#RULES').val() == 'subscripted') { + \$('#code').show(); + } else if(\$('#RULES').val() == 'emerging_pro') { + \$('#code').show(); + } else { + \$('#code').hide(); + } + }; + + // JQuery function to call corresponding function when + // the ruleset is changed or the page is loaded for showing/hiding + // the code area. + \$(document).ready(function() { + \$('#RULES').change(update_code); + update_code(); }); // Tiny java script function to show/hide the rules hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM April 2019