Development March 2022

development@lists.ipfire.org

21 participants
110 discussions

[PATCH] Core Update 166: Drop old 2007 Pakfire key, and remove it from existing installations
by Peter Müller 21 Mar '22

21 Mar '22

It is not necessary to have this key present on IPFire systems anymore, since it has not been in use for years, and we can expect systems to be sufficiently up-to-date, so they no longer need to rely on old updates or add-ons signed with this key. Also, given the current key was generated in 2018, we should consider a Pakfire key rollover soon. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- config/rootfiles/common/pakfire | 1 - config/rootfiles/core/166/filelists/files | 1 + config/rootfiles/core/166/update.sh | 6 +++++ src/initscripts/system/pakfire | 3 --- src/pakfire/pakfire-2007.key | 31 ----------------------- 5 files changed, 7 insertions(+), 35 deletions(-) delete mode 100644 src/pakfire/pakfire-2007.key diff --git a/config/rootfiles/common/pakfire b/config/rootfiles/common/pakfire index 0487c58f9..bd5559597 100644 --- a/config/rootfiles/common/pakfire +++ b/config/rootfiles/common/pakfire @@ -6,7 +6,6 @@ opt/pakfire/db/rootfiles #opt/pakfire/etc #opt/pakfire/pakfire.conf opt/pakfire/etc/pakfire.conf -opt/pakfire/pakfire-2007.key opt/pakfire/pakfire-2018.key #opt/pakfire/lib opt/pakfire/lib/functions.pl diff --git a/config/rootfiles/core/166/filelists/files b/config/rootfiles/core/166/filelists/files index b77c7fa07..6bb3c8d82 100644 --- a/config/rootfiles/core/166/filelists/files +++ b/config/rootfiles/core/166/filelists/files @@ -1,5 +1,6 @@ etc/inittab.d etc/rc.d/init.d/firewall +etc/rc.d/init.d/pakfire srv/web/ipfire/cgi-bin/connections.cgi srv/web/ipfire/cgi-bin/ids.cgi usr/lib/firewall/rules.pl diff --git a/config/rootfiles/core/166/update.sh b/config/rootfiles/core/166/update.sh index 3924039c6..1370555b0 100644 --- a/config/rootfiles/core/166/update.sh +++ b/config/rootfiles/core/166/update.sh @@ -34,11 +34,17 @@ done # Remove files rm -vf \ /etc/dracut.conf \ + /opt/pakfire/pakfire-2007.key \ /usr/bin/mkinitrd \ /usr/lib/dracut \ /usr/local/bin/ovpn-ccd-convert \ /usr/local/bin/rebuild-initrd +# Delete old 2007 Pakfire key from GPG keyring +export GNUPGHOME="/opt/pakfire/etc/.gnupg" +gpg --batch --yes --delete-keys 179740DC4D8C47DC63C099C74BDE364C64D96617 +unset GNUPGHOME + # Stop services # Extract files diff --git a/src/initscripts/system/pakfire b/src/initscripts/system/pakfire index 4fe399403..1305bda48 100644 --- a/src/initscripts/system/pakfire +++ b/src/initscripts/system/pakfire @@ -29,9 +29,6 @@ case "${1}" in boot_mesg "Setting up Pakfire Package Manager..." gpg --import /opt/pakfire/pakfire-2018.key &>/dev/null evaluate_retval - - # Try to import the old key, too - gpg --import /opt/pakfire/pakfire-2007.key &>/dev/null ;; *) diff --git a/src/pakfire/pakfire-2007.key b/src/pakfire/pakfire-2007.key deleted file mode 100644 index ced120ad8..000000000 --- a/src/pakfire/pakfire-2007.key +++ /dev/null @@ -1,31 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -mQGiBEYssZ8RBACcbHcYW+gPbjPFxv4ImlK1FgXV3s65Nnu7V9kghB7AZXterMVM -rZ87sNEw6J3JT32k0e9iBukA1QrshPg3c/mL+2/lMvvxsUW19rj/8ZBCCnP1Svgq -9q0OSJfadbm9b6Ndj06D/3EM+VpY5aI7XgNenh7ZcDbY9m8YDPdu0OF9uwCgltJS -+Pzjr16bJ/VnI549LfIG2KkEAJZWQmLQSXbl4VVEOSyaaJN8ugGBnZtnaL6IBE9K -0FHoZU3GaEOP6L3IUHUzyWsrpC/G44hGPC3xIbr5VG3sJ6hUc3J2rjx1clFdyN6A -bte9EWk1HkRFdaMfDn86vhIjn7znHU4cbvQLIpgB12+y2P/ydqLwyuyf6rV1JEWk -pSXpA/91LnlvICvqompSmrpLKpb+DSe59tr/r5GI36VNnqWt32InmF0N2ceLwG1F -K62M4Tf5/OZOg5m3uoTTHWf355+7NJjyPzT+DYbsuK56TNd/cFPeVdisdteeuINj -3DIC/8H9Y7mvYMAoSNtdA74JrdzGiqH2zSTB/oa/nwDXFekrq7Q2TWljaGFlbCBU -cmVtZXIgKFBha2ZpcmUgU2lnbmluZyBLZXkpIDxwYWtzQGlwZmlyZS5vcmc+iFoE -ExECABoFAkYssZ8CGwMCCwIDFQIDAxYCAQIeAQIXgAAKCRBL3jZMZNlmF0pBAJ95 -S5xzasjMQLpvOWA9E4JG3YJasQCfbNpdZXbZHr7Io7hLR9iJ+OhybfuIawQQEQIA -KwUCRi3ByAWDAeKFAB4aaHR0cDovL3d3dy5jYWNlcnQub3JnL2Nwcy5waHAACgkQ -0rsNAWXQ/VjJhQCfUQh+9wPAlyQVb9gYZ5zgHfqDY1MAn2T/VXH2+acwC4O3oV1W -Ni36NNRpuQINBEYsuJoQCAC6wq4ZMtWRGF/GeTd9l7boo40ulBth8Wr+IBK38XYv -5s+WLiTuuTCM8Thq4eY3MOfO+VXhjQen1S2e8WiZq+c55pDDAKXvBFmVNKcgkK7C -1AW85kY86aspoAK3/vi2pghlXAysTKSoW+WfoCbASDheEJopOkIMehdroraI2zTM -y8AEk+TnbRPzoFNBEYwr3J1GlkegtU3mIPpALDfpL4+HoCgS+7SfAvIlG//C+4W/ -oI/VOYHDdM5zR1av/pVZGpUK4Ao/JBxXMaqsbiP43KytbNuMRsZ+sFDs/ZtmHf1z -6AQ8mnxU0klT4ppU8Nl3hSVcvRacm6wBTvvGEqjkApkPAAMFCACKWJVpzcVAdOMP -aB08qJ+GPSSgxspaSoFPjVN307Pr1Di/ZriC/UVNrq/eUHEIvC1zIx+t3O109qVH -RMWbfCj+4/OBHJ4Ik3Nc5/8v6zaGwixJrkjohF8QLwodqazrjc+W3VsQ5jwfPpLe -DFpd3xHhj5zhXQKN0tCCk435Q/58aMQCK75St3/ymP6NGaE2s7dsXU/BwndgfxJu -Yz8LEK6phJ2t0jBiJJgcjWkoBkq8MhI6wKW6uDU4B/KKGHHLuZHg1ZKum8ASMcti -S980DlSJyfLJnUIio5F/u/csug8bHKq5pA1x+wmsUBhuH66aosNJuz35Bl4nW365 -PoahYtQBiEkEGBECAAkFAkYsuJsCGwwACgkQS942TGTZZheq7ACfTrW5OaZOhrwt -Jr+xgdjSFRrT14cAnjkEj51RQsP7LS5UTm+yce2olHDp -=hYb3 ------END PGP PUBLIC KEY BLOCK----- -- 2.34.1

2 1

Question regarding orphaned files on existing IPFire installations
by Peter Müller 21 Mar '22

21 Mar '22

Hello development folks, while preparing some of the last Core Updates, I frequently came across rootfile changes, or patches making some files previously shipped (and therefore present on existing IPFire installations) obsolete. By accident, I stumbled across some of these files again, and would therefore like to raise the question of what to do with them. Should I, being in responsible for a certain Core Update, delete these via the update.sh script? (This would mean to check every rootfile change for deleted files, and include them in an 'rm' block in the update.sh script. I am willing to put that effort in, but want to make sure this is desired.) Also, I recently came across some scripts such as ovpn-ccd-convert no longer needed. For whatever reason, /usr/share/GeoIP/ is also still present on all IPFire machines I administer, although it should have been deleted during the update to Core 140. If I come across such incidents, should I include them in the 'rm' block of an update.sh script as well? Threads regarding full filesystems come up at https://community.ipfire.org/ on a regular, but not worryingly frequency. I am getting the feeling that we are not always cleaning up leftovers during updates as thorough as we could to. :-) Thanks, and best regards, Peter Müller P.S.: Also, I am back in action, and can take care of Core Update 167 (or 166, if there is something left to do on it), if desired. Just drop me a line.

2 1

[PATCH] Drop orphaned ovpn-ccd-convert script
by Peter Müller 21 Mar '22

21 Mar '22

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(a)ipfire.org> --- config/rootfiles/common/aarch64/stage2 | 1 - config/rootfiles/common/armv6l/stage2 | 1 - config/rootfiles/common/x86_64/stage2 | 1 - lfs/stage2 | 1 - src/scripts/ovpn-ccd-convert | 71 -------------------------- 5 files changed, 75 deletions(-) delete mode 100644 src/scripts/ovpn-ccd-convert 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/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/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(a)ipfire.org> # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see <http://www.gnu.org/licenses/>. # -# # -############################################################################### - -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/*"); -- 2.34.1

3 2

[PATCH 1/2] iproute2: Do not ship /sbin/tipc
by Peter Müller 21 Mar '22

21 Mar '22

TIPC (Transparent Inter Process Communication) is a protocol used for interprocess communication in computer clusters. We do not use this protocol at all, and the IPFire kernel knows nothing about it (although Lyins for some reason believes it does). Therefore, there is no sense in shipping /sbin/tipc, since this executable cannot do anything. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- config/rootfiles/common/iproute2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/rootfiles/common/iproute2 b/config/rootfiles/common/iproute2 index 0247aa976..e11bd8892 100644 --- a/config/rootfiles/common/iproute2 +++ b/config/rootfiles/common/iproute2 @@ -24,7 +24,7 @@ sbin/rtmon sbin/rtstat sbin/ss sbin/tc -sbin/tipc +#sbin/tipc sbin/vdpa #usr/include/iproute2 #usr/include/iproute2/bpf_elf.h -- 2.34.1

3 4

[PATCH] psmisc: Update to 23.4
by Peter Müller 20 Mar '22

20 Mar '22

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(a)ipfire.org> --- config/rootfiles/common/psmisc | 51 +++++++++++++++++++++++++++++++--- lfs/psmisc | 10 +++---- 2 files changed, 52 insertions(+), 9 deletions(-) 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/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(a)ipfire.org> # +# Copyright (C) 2007-2022 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,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) -- 2.34.1

1 0

[PATCH] connections.cgi: Update links to SANS ISC
by Peter Müller 20 Mar '22

20 Mar '22

Fixes: #12783 Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- html/cgi-bin/connections.cgi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 = "> "; - $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 .= " $sport_ret"; $sport_extra .= "</a>"; } @@ -602,7 +602,7 @@ foreach my $line (@conntrack) { } $dport_extra = "> "; - $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 .= " $dport_ret"; $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'> $sport </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'> $dport </a> $dport_extra -- 2.34.1

1 0

[PATCH] libseccomp: Bump package version
by Peter Müller 20 Mar '22

20 Mar '22

Fixes: #12807 Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- lfs/libseccomp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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(a)ipfire.org> # +# Copyright (C) 2007-2022 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 # @@ -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 = -- 2.34.1

1 0

[PATCH] Add backup/include for cups
by Daniel Weismueller 19 Mar '22

19 Mar '22

To solve the behavior discribed in bug 12404 I added the path /var/ipfire/cups to the backup. Signed-off-by: Daniel Weismueller <daniel.weismueller(a)ipfire.org> --- config/backup/includes/cups | 1 + config/rootfiles/packages/cups | 1 + lfs/cups | 3 +++ 3 files changed, 5 insertions(+) create mode 100644 config/backup/includes/cups diff --git a/config/backup/includes/cups b/config/backup/includes/cups new file mode 100644 index 000000000..445413c2f --- /dev/null +++ b/config/backup/includes/cups @@ -0,0 +1 @@ +/var/ipfire/cups diff --git a/config/rootfiles/packages/cups b/config/rootfiles/packages/cups index f9d15bc8b..1143df6d5 100644 --- a/config/rootfiles/packages/cups +++ b/config/rootfiles/packages/cups @@ -837,6 +837,7 @@ usr/share/locale/zh_CN/cups_zh_CN.po #usr/share/man/man8/lpmove.8 var/cache/cups var/cache/cups/rss +var/ipfire/backup/addons/includes/cups #var/ipfire/cups var/ipfire/cups/cups-files.conf var/ipfire/cups/cups-files.conf.default diff --git a/lfs/cups b/lfs/cups index 99c9c8887..5c5aef5f8 100644 --- a/lfs/cups +++ b/lfs/cups @@ -94,6 +94,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && ln -v -sf /usr/bin/smbspool /usr/lib/cups/backend/smb + install -v -m 644 $(DIR_SRC)/config/backup/includes/cups \ + /var/ipfire/backup/addons/includes/cups + # install initscript $(call INSTALL_INITSCRIPT,cups) cp -fv $(DIR_SRC)/config/cups/cupsd.conf /var/ipfire/cups/ -- 2.34.1

2 1

[PATCH] ids: Fixed typo in ruleset-sources
by Matthias Fischer 19 Mar '22

19 Mar '22

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/suricata/ruleset-sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/suricata/ruleset-sources b/config/suricata/ruleset-sources index 58ab91aab..1d2c6e98b 100644 --- a/config/suricata/ruleset-sources +++ b/config/suricata/ruleset-sources @@ -78,7 +78,7 @@ our %Providers = ( }, # Etnetera Aggressive Blacklist. - etnetera_aggresive => { + etnetera_aggressive => { summary => "Etnetera Aggressive Blacklist Rules", website => "https://security.etnetera.cz/", tr_string => "etnetera aggressive blacklist rules", -- 2.25.1

2 1

[PATCH] C165: Fix ownership of suricata classification.config file.
by Stefan Schantl 19 Mar '22

19 Mar '22

The file has to be write-able for the WUI and update script, which both are executed as nobody. Fixes #12803. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- config/rootfiles/core/165/update.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/rootfiles/core/165/update.sh b/config/rootfiles/core/165/update.sh index 00974de73..ffb552c80 100644 --- a/config/rootfiles/core/165/update.sh +++ b/config/rootfiles/core/165/update.sh @@ -129,6 +129,9 @@ ldconfig telinit u /etc/rc.d/init.d/firewall restart +# Fix ownership of classification file. +chown nobody:nobody /usr/share/suricata/classification.config + # Rebuild IPS rules rm -vf /tmp/ids_page_locked perl -e "require '/var/ipfire/ids-functions.pl'; &IDS::oinkmaster();" -- 2.30.2

2 1

← Newer
1
2
3
4
5
6
7
8
9
10
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development March 2022