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 02a8a241bb74f9ab56d673bc89f3b720fe9c7e12 (commit) via e01e07ec8b770eb849a42ad3f8c0f67e55faf905 (commit) via fd16f5d8c132ae28baf33163b8553933035c2beb (commit) from 08d91c0f7a7511da8a8d4a7ff2f156677d94463b (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 02a8a241bb74f9ab56d673bc89f3b720fe9c7e12 Author: Michael Tremer Date: Thu Feb 7 15:13:50 2019 +0000 core128: Ship updated firewall initscript Require reboot after the update Signed-off-by: Michael Tremer commit e01e07ec8b770eb849a42ad3f8c0f67e55faf905 Author: Peter Müller Date: Wed Feb 6 21:00:00 2019 +0000 apply default firewall policy for ORANGE, too If firewall default policy is set to DROP, this setting was not applied to outgoing ORANGE traffic as well, which was misleading. Fixes #11973 Signed-off-by: Peter Müller Cc: Michael Tremer Cc: Oliver Fuhrer Signed-off-by: Michael Tremer commit fd16f5d8c132ae28baf33163b8553933035c2beb Author: Peter Müller Date: Wed Feb 6 19:21:00 2019 +0000 Tor: update to 0.3.5.7 Signed-off-by: Peter Müller Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/128/filelists/files | 1 + config/rootfiles/core/128/update.sh | 3 +++ config/rootfiles/packages/tor | 3 +++ lfs/tor | 8 ++++---- src/initscripts/system/firewall | 13 ++----------- 5 files changed, 13 insertions(+), 15 deletions(-) Difference in files: diff --git a/config/rootfiles/core/128/filelists/files b/config/rootfiles/core/128/filelists/files index 4684d98d0..1998a08c0 100644 --- a/config/rootfiles/core/128/filelists/files +++ b/config/rootfiles/core/128/filelists/files @@ -4,6 +4,7 @@ srv/web/ipfire/cgi-bin/credits.cgi var/ipfire/langs etc/rc.d/helper/aws-setup etc/rc.d/init.d/aws +etc/rc.d/init.d/firewall etc/ssl/openssl.cnf etc/sysctl.conf srv/web/ipfire/cgi-bin/proxy.cgi diff --git a/config/rootfiles/core/128/update.sh b/config/rootfiles/core/128/update.sh index 71824266b..dc185ed70 100644 --- a/config/rootfiles/core/128/update.sh +++ b/config/rootfiles/core/128/update.sh @@ -63,6 +63,9 @@ fi /etc/init.d/sshd restart /etc/init.d/apache restart +# This update needs a reboot... +touch /var/run/need_reboot + # Finish /etc/init.d/fireinfo start sendprofile diff --git a/config/rootfiles/packages/tor b/config/rootfiles/packages/tor index 972b20775..c75e86f11 100644 --- a/config/rootfiles/packages/tor +++ b/config/rootfiles/packages/tor @@ -8,15 +8,18 @@ etc/tor/torrc srv/web/ipfire/cgi-bin/tor.cgi usr/bin/tor usr/bin/tor-gencert +usr/bin/tor-print-ed-signing-cert usr/bin/tor-resolve #usr/bin/torify usr/local/bin/torctrl #usr/share/doc/tor #usr/share/doc/tor/tor-gencert.html +#usr/share/doc/tor/tor-print-ed-signing-cert.html #usr/share/doc/tor/tor-resolve.html #usr/share/doc/tor/tor.html #usr/share/doc/tor/torify.html #usr/share/man/man1/tor-gencert.1 +#usr/share/man/man1/tor-print-ed-signing-cert.1 #usr/share/man/man1/tor-resolve.1 #usr/share/man/man1/tor.1 #usr/share/man/man1/torify.1 diff --git a/lfs/tor b/lfs/tor index 2c3940638..e1027c131 100644 --- a/lfs/tor +++ b/lfs/tor @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team # +# Copyright (C) 2007-2019 IPFire Team # # # # 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 = 0.3.4.9 +VER = 0.3.5.7 THISAPP = tor-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = tor -PAK_VER = 31 +PAK_VER = 32 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 8a303c7c2491cd27b1646f6efdc4a5d0 +$(DL_FILE)_MD5 = 8076f11045b5a94fd4ef0a0114b845f6 install : $(TARGET) diff --git a/src/initscripts/system/firewall b/src/initscripts/system/firewall index 707209987..b9dd3485e 100644 --- a/src/initscripts/system/firewall +++ b/src/initscripts/system/firewall @@ -294,7 +294,7 @@ iptables_init() { iptables -N OVPNINPUT iptables -A INPUT -j OVPNINPUT - # TOR + # Tor iptables -N TOR_INPUT iptables -A INPUT -j TOR_INPUT @@ -414,15 +414,6 @@ iptables_red_up() { iptables -A REDINPUT -p udp --source-port 67 --destination-port 68 -i $DEVICE -j ACCEPT fi - # Orange pinholes - if [ "$ORANGE_DEV" != "" ]; then - # This rule enables a host on ORANGE network to connect to the outside - # (only if we have a red connection) - if [ "$IFACE" != "" ]; then - iptables -A REDFORWARD -i $ORANGE_DEV -o $IFACE -j ACCEPT - fi - fi - if [ "$IFACE" != "" -a -f /var/ipfire/red/active ]; then # DHCP if [ "$RED_DEV" != "" -a "$RED_TYPE" == "DHCP" ]; then @@ -470,7 +461,7 @@ iptables_red_up() { iptables_red_down() { # Prohibit packets to reach the masquerading rule - # while the wan interface is down - this is required to + # while the WAN interface is down - this is required to # circumvent udp related NAT issues # http://forum.ipfire.org/index.php?topic=11127.0 if [ -n "${IFACE}" ]; then hooks/post-receive -- IPFire 2.x development tree