[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5e5ee282345935a84de3cf63402a6d345f156b15
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 5e5ee282345935a84de3cf63402a6d345f156b15 (commit) via a1e9afcbaffbb8ca594db1da783c5926b14ea982 (commit) via bfde1c5af3add95ef1d54ae4f0a4616a08ac6589 (commit) via 0b6d12adae7f41bb31f6b361b2d6a90057de7867 (commit) via 0ad14f4d83ef8a3f18e8cbc2db48367a0b6ec3b5 (commit) via 2c76a055663b581a86f9e74c1603b520fe005c81 (commit) via 16fa9ed5e581140dd9f1a718d0160a3b803f726a (commit) via e90c62b2e3d99c3d4d244962e114f7c1924c4640 (commit) via 3815512d05948b95bc6dc3b76351f4e08e019709 (commit) from da4ff2f6a971ceedeacfd0c929ed1eaf4ecef34f (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 5e5ee282345935a84de3cf63402a6d345f156b15 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Mar 21 08:51:51 2022 +0000
core166: Ship /etc/inittab.d
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit a1e9afcbaffbb8ca594db1da783c5926b14ea982 Author: Adolf Belka adolf.belka@ipfire.org Date: Thu Mar 17 22:27:15 2022 +0100
sysvinit: Update rootfile to fix bug 12797
- In sysvinit-2.97 (Dec2020) a patch was added which allows init to load configuration data from files stored in /etc/inittab.d/ This modification would have come in with Core Update 155. - When sysvinit was updated from 2.88dsf to 2.98 the /etc/inittab.d/ directory in the rootfile was commented out. Sysvinit looks to see if there are any files in inittab.d but as that directory does not exist then the message "No inittab.d directory found" is written during the boot and is also shown in the log summary. - This patch uncomments the directory so that it will be present. No files will be placed in it but its prescence will stop the error message being shown during boot.
Fixes: Bug #12797 Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit bfde1c5af3add95ef1d54ae4f0a4616a08ac6589 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Mar 21 08:50:56 2022 +0000
core166: Drop openvpn-ccd-convert script from all installations
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 0b6d12adae7f41bb31f6b361b2d6a90057de7867 Author: Peter Müller peter.mueller@ipfire.org Date: Sat Mar 19 16:35:35 2022 +0000
Drop orphaned ovpn-ccd-convert script
This script appeared in the rootfiles for Core Updates 65 and 66, being released in late 2012 and early 2013. It is not used elsewhere, and there is no sense in keeping it around on IPFire installations.
Should this patch be accepted, a corresponding 'rm' statement is necessary in the update.sh script of the Core Update it will go into.
Signed-off-by: Peter Müller peter.mueller@ipfire.org Reviewed-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 0ad14f4d83ef8a3f18e8cbc2db48367a0b6ec3b5 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Mar 20 15:21:25 2022 +0000
core166: Ship psmisc
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 2c76a055663b581a86f9e74c1603b520fe005c81 Author: Peter Müller peter.mueller@ipfire.org Date: Sun Mar 20 13:46:47 2022 +0000
psmisc: Update to 23.4
Please refer to https://gitlab.com/psmisc/psmisc/-/tags for an overview of the changes happened since version 22.2 .
Signed-off-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 16fa9ed5e581140dd9f1a718d0160a3b803f726a Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Mar 20 15:20:13 2022 +0000
core166: Ship connections.cgi
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit e90c62b2e3d99c3d4d244962e114f7c1924c4640 Author: Peter Müller peter.mueller@ipfire.org Date: Sun Mar 20 10:48:46 2022 +0000
connections.cgi: Update links to SANS ISC
Fixes: #12783
Signed-off-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 3815512d05948b95bc6dc3b76351f4e08e019709 Author: Peter Müller peter.mueller@ipfire.org Date: Sun Mar 20 10:41:28 2022 +0000
libseccomp: Bump package version
Fixes: #12807
Signed-off-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/aarch64/stage2 | 1 - config/rootfiles/common/armv6l/stage2 | 1 - config/rootfiles/common/psmisc | 51 +++++++++++++++++++-- config/rootfiles/common/sysvinit | 2 +- config/rootfiles/common/x86_64/stage2 | 1 - config/rootfiles/core/166/filelists/files | 2 + config/rootfiles/core/166/filelists/psmisc | 1 + config/rootfiles/core/166/update.sh | 1 + html/cgi-bin/connections.cgi | 8 ++-- lfs/libseccomp | 4 +- lfs/psmisc | 10 ++--- lfs/stage2 | 1 - src/scripts/ovpn-ccd-convert | 71 ------------------------------ 13 files changed, 63 insertions(+), 91 deletions(-) create mode 120000 config/rootfiles/core/166/filelists/psmisc delete mode 100644 src/scripts/ovpn-ccd-convert
Difference in files: diff --git a/config/rootfiles/common/aarch64/stage2 b/config/rootfiles/common/aarch64/stage2 index d8dc12a7f..e7eae625c 100644 --- a/config/rootfiles/common/aarch64/stage2 +++ b/config/rootfiles/common/aarch64/stage2 @@ -131,7 +131,6 @@ usr/local/bin/update-location-database #usr/local/src #usr/sbin usr/sbin/openvpn-metrics -usr/sbin/ovpn-ccd-convert #usr/share #usr/share/doc #usr/share/doc/licenses diff --git a/config/rootfiles/common/armv6l/stage2 b/config/rootfiles/common/armv6l/stage2 index 42ce447d1..670a99927 100644 --- a/config/rootfiles/common/armv6l/stage2 +++ b/config/rootfiles/common/armv6l/stage2 @@ -129,7 +129,6 @@ usr/local/bin/update-location-database #usr/local/src #usr/sbin usr/sbin/openvpn-metrics -usr/sbin/ovpn-ccd-convert #usr/share #usr/share/doc #usr/share/doc/licenses diff --git a/config/rootfiles/common/psmisc b/config/rootfiles/common/psmisc index f7337b7a1..759e7f0ab 100644 --- a/config/rootfiles/common/psmisc +++ b/config/rootfiles/common/psmisc @@ -1,8 +1,51 @@ #bin/fuser bin/killall -#bin/oldfuser +#bin/peekfd +#bin/prtstat +#bin/pslog usr/bin/pstree #usr/bin/pstree.x11 -#usr/man/man1/fuser.1 -#usr/man/man1/killall.1 -#usr/man/man1/pstree.1 +#usr/share/man/de/man1/fuser.1 +#usr/share/man/de/man1/killall.1 +#usr/share/man/de/man1/peekfd.1 +#usr/share/man/de/man1/prtstat.1 +#usr/share/man/de/man1/pslog.1 +#usr/share/man/de/man1/pstree.1 +#usr/share/man/fr +#usr/share/man/fr/man1 +#usr/share/man/fr/man1/fuser.1 +#usr/share/man/fr/man1/killall.1 +#usr/share/man/fr/man1/peekfd.1 +#usr/share/man/fr/man1/prtstat.1 +#usr/share/man/fr/man1/pslog.1 +#usr/share/man/fr/man1/pstree.1 +#usr/share/man/man1/fuser.1 +#usr/share/man/man1/killall.1 +#usr/share/man/man1/peekfd.1 +#usr/share/man/man1/prtstat.1 +#usr/share/man/man1/pslog.1 +#usr/share/man/man1/pstree.1 +#usr/share/man/pt_BR +#usr/share/man/pt_BR/man1 +#usr/share/man/pt_BR/man1/fuser.1 +#usr/share/man/pt_BR/man1/killall.1 +#usr/share/man/pt_BR/man1/peekfd.1 +#usr/share/man/pt_BR/man1/prtstat.1 +#usr/share/man/pt_BR/man1/pslog.1 +#usr/share/man/pt_BR/man1/pstree.1 +#usr/share/man/ru +#usr/share/man/ru/man1 +#usr/share/man/ru/man1/fuser.1 +#usr/share/man/ru/man1/killall.1 +#usr/share/man/ru/man1/peekfd.1 +#usr/share/man/ru/man1/prtstat.1 +#usr/share/man/ru/man1/pslog.1 +#usr/share/man/ru/man1/pstree.1 +#usr/share/man/uk +#usr/share/man/uk/man1 +#usr/share/man/uk/man1/fuser.1 +#usr/share/man/uk/man1/killall.1 +#usr/share/man/uk/man1/peekfd.1 +#usr/share/man/uk/man1/prtstat.1 +#usr/share/man/uk/man1/pslog.1 +#usr/share/man/uk/man1/pstree.1 diff --git a/config/rootfiles/common/sysvinit b/config/rootfiles/common/sysvinit index d06a31872..f97745760 100644 --- a/config/rootfiles/common/sysvinit +++ b/config/rootfiles/common/sysvinit @@ -1,6 +1,6 @@ bin/mountpoint bin/pidof -#etc/inittab.d +etc/inittab.d #sbin/bootlogd #sbin/fstab-decode sbin/halt diff --git a/config/rootfiles/common/x86_64/stage2 b/config/rootfiles/common/x86_64/stage2 index 70e6c6e75..d07c264b4 100644 --- a/config/rootfiles/common/x86_64/stage2 +++ b/config/rootfiles/common/x86_64/stage2 @@ -131,7 +131,6 @@ usr/local/bin/update-location-database #usr/local/src #usr/sbin usr/sbin/openvpn-metrics -usr/sbin/ovpn-ccd-convert #usr/share #usr/share/doc #usr/share/doc/licenses diff --git a/config/rootfiles/core/166/filelists/files b/config/rootfiles/core/166/filelists/files index 1ba79d4bb..b77c7fa07 100644 --- a/config/rootfiles/core/166/filelists/files +++ b/config/rootfiles/core/166/filelists/files @@ -1,4 +1,6 @@ +etc/inittab.d etc/rc.d/init.d/firewall +srv/web/ipfire/cgi-bin/connections.cgi srv/web/ipfire/cgi-bin/ids.cgi usr/lib/firewall/rules.pl var/ipfire/ids-functions.pl diff --git a/config/rootfiles/core/166/filelists/psmisc b/config/rootfiles/core/166/filelists/psmisc new file mode 120000 index 000000000..0b07b1bf5 --- /dev/null +++ b/config/rootfiles/core/166/filelists/psmisc @@ -0,0 +1 @@ +../../../common/psmisc \ No newline at end of file diff --git a/config/rootfiles/core/166/update.sh b/config/rootfiles/core/166/update.sh index d94b20338..3924039c6 100644 --- a/config/rootfiles/core/166/update.sh +++ b/config/rootfiles/core/166/update.sh @@ -36,6 +36,7 @@ rm -vf \ /etc/dracut.conf \ /usr/bin/mkinitrd \ /usr/lib/dracut \ + /usr/local/bin/ovpn-ccd-convert \ /usr/local/bin/rebuild-initrd
# Stop services diff --git a/html/cgi-bin/connections.cgi b/html/cgi-bin/connections.cgi index 7f06a5594..771728d88 100644 --- a/html/cgi-bin/connections.cgi +++ b/html/cgi-bin/connections.cgi @@ -589,7 +589,7 @@ foreach my $line (@conntrack) { }
$sport_extra = "<span style='color:#FFFFFF;'>></span> "; - $sport_extra .= "<a href='http://isc.sans.org/port_details.php?port=$sport_ret' target='top' title='$sserv_ret'>"; + $sport_extra .= "<a href='https://isc.sans.edu/port.html?port=$sport_ret' target='top' title='$sserv_ret'>"; $sport_extra .= " <span style='color:#FFFFFF;'>$sport_ret</span>"; $sport_extra .= "</a>"; } @@ -602,7 +602,7 @@ foreach my $line (@conntrack) { }
$dport_extra = "<span style='color:#FFFFFF;'>></span> "; - $dport_extra .= "<a href='http://isc.sans.org/port_details.php?port=$dport_ret' target='top' title='$dserv_ret'>"; + $dport_extra .= "<a href='https://isc.sans.edu/port.html?port=$dport_ret' target='top' title='$dserv_ret'>"; $dport_extra .= " <span style='color:#FFFFFF;'>$dport_ret</span>"; $dport_extra .= "</a>"; } @@ -617,7 +617,7 @@ foreach my $line (@conntrack) { $sip_extra </td> <td style='text-align:center; background-color:$sip_colour;'> - <a href='http://isc.sans.org/port_details.php?port=$sport' target='top' title='$sserv'> + <a href='https://isc.sans.edu/port.html?port=$sport' target='top' title='$sserv'> <span style='color:#FFFFFF;'>$sport</span> </a> $sport_extra @@ -632,7 +632,7 @@ foreach my $line (@conntrack) { $dip_extra </td> <td style='text-align:center; background-color:$dip_colour;'> - <a href='http://isc.sans.org/port_details.php?port=$dport' target='top' title='$dserv'> + <a href='https://isc.sans.edu/port.html?port=$dport' target='top' title='$dserv'> <span style='color:#FFFFFF;'>$dport</span> </a> $dport_extra diff --git a/lfs/libseccomp b/lfs/libseccomp index 17930291d..180f995cb 100644 --- a/lfs/libseccomp +++ b/lfs/libseccomp @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2021 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2022 IPFire Team info@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 # @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = libseccomp -PAK_VER = 6 +PAK_VER = 7
DEPS =
diff --git a/lfs/psmisc b/lfs/psmisc index 1f0c7d893..d03ba09ff 100644 --- a/lfs/psmisc +++ b/lfs/psmisc @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2022 IPFire Team info@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,10 +24,10 @@
include Config
-VER = 22.2 +VER = 23.4
THISAPP = psmisc-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 77737c817a40ef2c160a7194b5b64337 +$(DL_FILE)_MD5 = 8114cd4489b95308efe2509c3a406bbf
install : $(TARGET)
@@ -69,7 +69,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) $(UPDATE_AUTOMAKE) cd $(DIR_APP) && ./configure --prefix=/usr --exec-prefix="" --disable-nls cd $(DIR_APP) && make $(MAKETUNING) diff --git a/lfs/stage2 b/lfs/stage2 index 356060a1f..6582a0c1a 100644 --- a/lfs/stage2 +++ b/lfs/stage2 @@ -113,7 +113,6 @@ endif
# Move script to correct place. mv -vf /usr/local/bin/openvpn-metrics /usr/sbin/ - mv -vf /usr/local/bin/ovpn-ccd-convert /usr/sbin/ mv -vf /usr/local/bin/captive-cleanup /usr/bin/
# Install firewall scripts. diff --git a/src/scripts/ovpn-ccd-convert b/src/scripts/ovpn-ccd-convert deleted file mode 100644 index 05339af78..000000000 --- a/src/scripts/ovpn-ccd-convert +++ /dev/null @@ -1,71 +0,0 @@ -#!/usr/bin/perl -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 IPFire Team info@ipfire.org # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see http://www.gnu.org/licenses/. # -# # -############################################################################### - -my %net=(); -my %ovpnconfig=(); -my @serverconf=(); -my $greennet; -my $greensubnet; -my $running='off'; - -require '/var/ipfire/general-functions.pl'; -unless (-d "${General::swroot}/ovpn/ccd") { system("mkdir ${General::swroot}/ovpn/ccd"); } -system ("chown nobody.nobody ${General::swroot}/ovpn/ccd"); -if ( -e "/var/run/openvpn.pid"){ - $running='on'; - system('/usr/local/bin/openvpnctrl', '-k'); -} - -&General::readhash("/var/ipfire/ethernet/settings", %net); - $greennet=$net{'GREEN_NETADDRESS'}; - $greensubnet=$net{'GREEN_NETMASK'}; -open(FILE,"/var/ipfire/ovpn/server.conf"); - while (<FILE>) { - $_=~s/\s*$//g; - if ($_ ne "route $greennet $greensubnet"){ - push (@serverconf,$_."\n"); - }else{ - print"\nFound ROUTE >>route $greennet $greensubnet<< in server.conf.. Deleted!"; - } - } - -&General::readhasharray("/var/ipfire/ovpn/ovpnconfig", %ovpnconfig); -foreach my $key (keys %ovpnconfig){ - if($ovpnconfig{$key}[32] eq '' && $ovpnconfig{$key}[3] eq 'host'){ - $ovpnconfig{$key}[2] =~ s/ /_/gi; - open ( CCDRWCONF,'>',"/var/ipfire/ovpn/ccd/$ovpnconfig{$key}[2]") or die "Unable to create clientconfigfile $!"; - print CCDRWCONF "# OpenVPN Clientconfig from CCD extension by Copymaster#\n\n"; - print CCDRWCONF "#This client uses the dynamic pool\n\n"; - print CCDRWCONF "\n#Client gets routes to these Networks (behind IPFIRE)\n"; - print CCDRWCONF "push "route $greennet $greensubnet"\n"; - close CCDRWCONF; - print"Client $ovpnconfig{$key}[2] converted! \n"; - }else{ - print "Client $ovpnconfig{$key}[2] NOT converted!\n"; - } - $ovpnconfig{$key}[32] = 'dynamic' if ($ovpnconfig{$key}[32] eq ''); -} -&General::writehasharray("/var/ipfire/ovpn/ovpnconfig", %ovpnconfig); -if ($running eq 'on') -{ - system('/usr/local/bin/openvpnctrl', '-s'); -} -system ("chown nobody:nobody /var/ipfire/ovpn/ccd/*");
hooks/post-receive -- IPFire 2.x development tree
-
Michael Tremer