IPFire-SCM August 2020

ipfire-scm@lists.ipfire.org

1 participants
35 discussions

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 16105723e82cb592cd833c7aca862b7ffc6c48ce
by Arne Fitzenreiter 25 Aug '20

25 Aug '20

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, master has been updated via 16105723e82cb592cd833c7aca862b7ffc6c48ce (commit) from 144f344845738ce69422ac9a1dcbe731cba3ee48 (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 16105723e82cb592cd833c7aca862b7ffc6c48ce Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Aug 25 20:46:56 2020 +0200 Core 148: Exclude location related settings files. This prevents from overwriting existing files, with empty ones and finally to lose the stored settings. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/148/exclude | 2 ++ 1 file changed, 2 insertions(+) Difference in files: diff --git a/config/rootfiles/core/148/exclude b/config/rootfiles/core/148/exclude index b22159878..99dd65af1 100644 --- a/config/rootfiles/core/148/exclude +++ b/config/rootfiles/core/148/exclude @@ -19,6 +19,8 @@ etc/udev/rules.d/30-persistent-network.rules srv/web/ipfire/html/proxy.pac var/ipfire/dma var/ipfire/time +var/ipfire/firewall/locationblock +var/ipfire/fwhosts/customlocationgrp var/ipfire/ovpn var/lib/alternatives var/log/cache hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 6f60b0d2719f930254e12914a73ff55df4f8224d
by Michael Tremer 24 Aug '20

24 Aug '20

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 6f60b0d2719f930254e12914a73ff55df4f8224d (commit) via 9fa6a8d81dd4f3011d4bc325b965bd213fa21ebf (commit) from 0e457b13eaf61b2830919e3745df3956e2042640 (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 6f60b0d2719f930254e12914a73ff55df4f8224d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Aug 24 09:48:36 2020 +0000 core149: Restart squid Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 9fa6a8d81dd4f3011d4bc325b965bd213fa21ebf Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sun Aug 23 14:42:58 2020 +0200 squid: Update to 4.13 For details see: http://www.squid-cache.org/Versions/v4/changesets/ and http://lists.squid-cache.org/pipermail/squid-users/2020-August/022566.html Fixes (excerpt): "* SQUID-2020:8 HTTP(S) Request Splitting (CVE-2020-15811) This problem is serious because it allows any client, including browser scripts, to bypass local security and poison the browser cache and any downstream caches with content from an arbitrary source. * SQUID-2020:9 Denial of Service processing Cache Digest Response (CVE pending allocation) This problem allows a trusted peer to deliver to perform Denial of Service by consuming all available CPU cycles on the machine running Squid when handling a crafted Cache Digest response message. * SQUID-2020:10 HTTP(S) Request Smuggling (CVE-2020-15810) This problem is serious because it allows any client, including browser scripts, to bypass local security and poison the proxy cache and any downstream caches with content from an arbitrary source. * Bug 5051: Some collapsed revalidation responses never expire * SSL-Bump: Support parsing GREASEd (and future) TLS handshakes * Honor on_unsupported_protocol for intercepted https_port" Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/149/update.sh | 1 + lfs/squid | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) Difference in files: diff --git a/config/rootfiles/core/149/update.sh b/config/rootfiles/core/149/update.sh index d30f748f5..923d4254c 100644 --- a/config/rootfiles/core/149/update.sh +++ b/config/rootfiles/core/149/update.sh @@ -51,6 +51,7 @@ ldconfig # Start services /etc/init.d/apache restart /etc/init.d/unbound restart +/etc/init.d/squid restart # Update crontab sed -i /var/spool/cron/root.orig \ diff --git a/lfs/squid b/lfs/squid index ebd25e42e..3a53315d7 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,7 +24,7 @@ include Config -VER = 4.12 +VER = 4.13 THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -46,7 +46,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = ad7a4a8a0031cae3435717a759173829 +$(DL_FILE)_MD5 = 492e54afc15821141ff1d1d9903854d6 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0e457b13eaf61b2830919e3745df3956e2042640
by Michael Tremer 21 Aug '20

21 Aug '20

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 0e457b13eaf61b2830919e3745df3956e2042640 (commit) from 087e3023812fec5dc4d4d85724166e64c24ab4cc (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 0e457b13eaf61b2830919e3745df3956e2042640 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Aug 21 11:51:10 2020 +0200 smt: Fix check to detect if a system is running virtually /sys/hypervisor exists when a host has loaded the kvm modules. Fixes: #12472 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: src/initscripts/system/functions | 5 +++++ src/initscripts/system/smt | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) Difference in files: diff --git a/src/initscripts/system/functions b/src/initscripts/system/functions index 30119918c..234b798cf 100644 --- a/src/initscripts/system/functions +++ b/src/initscripts/system/functions @@ -784,6 +784,11 @@ umount_ramdisk() { rm -rf "${path_tmpfs}" } +# Returns true when this system running in a virtual environment +running_on_hypervisor() { + grep -qE "^flags\s+:.*hypervisor" /proc/cpuinfo +} + # https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/identify_ec2_instances.… running_on_ec2() { local uuid diff --git a/src/initscripts/system/smt b/src/initscripts/system/smt index bfa7d57b3..274ec4bba 100644 --- a/src/initscripts/system/smt +++ b/src/initscripts/system/smt @@ -21,7 +21,7 @@ case "${1}" in fi 2>/dev/null # Do not disable SMT inside virtual machines - if [ -d "/sys/hypervisor" ]; then + if running_on_hypervisor; then exit 0 fi hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 087e3023812fec5dc4d4d85724166e64c24ab4cc
by Michael Tremer 20 Aug '20

20 Aug '20

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 087e3023812fec5dc4d4d85724166e64c24ab4cc (commit) from 9a62b6daac483a8769f6760a627121550a6cc0f3 (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 087e3023812fec5dc4d4d85724166e64c24ab4cc Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Aug 20 17:56:03 2020 +0000 general-functions.pl: Do not check IPsec subnets for VTI/GRE connections Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/cfgroot/general-functions.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl index 8ee5eaa5d..5de4fb84b 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -529,7 +529,7 @@ sub checksubnets if($ownnet ne 'ipsec'){ &General::readhasharray("${General::swroot}/vpn/config", \%ipsecconf); foreach my $key (keys %ipsecconf){ - if ($ipsecconf{$key}[11] ne ''){ + if ($ipsecconf{$key}[11] ne '' && $ipsecconf{$key}[36] eq ""){ foreach my $ipsecsubitem (split(/\|/, $ipsecconf{$key}[11])) { my ($ipsecip,$ipsecsub) = split (/\//, $ipsecconf{$key}[11]); $ipsecsub=&iporsubtodec($ipsecsub); hooks/post-receive -- IPFire 2.x development tree

1 0

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

19 Aug '20

1 0

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

19 Aug '20

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 17d01f01385be5fd80c0906723b17e6bb21f7bb5 (commit) via 0e45bb173407e80b2a094e3260bd0aacf22bd9a1 (commit) from 9a2685f326881914791d8f9511c31fd5a0cfa7f4 (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 17d01f01385be5fd80c0906723b17e6bb21f7bb5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Aug 19 12:12:08 2020 +0000 core149: Ship zstd which is now part of the base system Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 0e45bb173407e80b2a094e3260bd0aacf22bd9a1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Aug 19 12:11:43 2020 +0000 zstd: Do not ship libstd.so Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/zstd | 2 +- config/rootfiles/core/149/filelists/zstd | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 120000 config/rootfiles/core/149/filelists/zstd Difference in files: diff --git a/config/rootfiles/common/zstd b/config/rootfiles/common/zstd index 78c3ffec3..710ad5369 100644 --- a/config/rootfiles/common/zstd +++ b/config/rootfiles/common/zstd @@ -9,7 +9,7 @@ usr/bin/zstdmt #usr/include/zstd.h #usr/include/zstd_errors.h #usr/lib/libzstd.a -usr/lib/libzstd.so +#usr/lib/libzstd.so usr/lib/libzstd.so.1 usr/lib/libzstd.so.1.4.5 #usr/lib/pkgconfig/libzstd.pc diff --git a/config/rootfiles/core/149/filelists/zstd b/config/rootfiles/core/149/filelists/zstd new file mode 120000 index 000000000..d6d4a3bf1 --- /dev/null +++ b/config/rootfiles/core/149/filelists/zstd @@ -0,0 +1 @@ +../../../common/zstd \ No newline at end of file hooks/post-receive -- IPFire 2.x development tree

1 0

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

19 Aug '20

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9ac54186132701e67fbbdf6ef1a76c44d415e40e
by Michael Tremer 18 Aug '20

18 Aug '20

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 9ac54186132701e67fbbdf6ef1a76c44d415e40e (commit) via 3caa418097b4c1bacea267f79e3d6bd6b48a2a2f (commit) from 10771d94ad484f6a32299fa149b70dc25df9c685 (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 9ac54186132701e67fbbdf6ef1a76c44d415e40e Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Tue Aug 18 17:37:22 2020 +0200 zstd 1.4.5: Deleted obsolete files from '/src/paks/' No longer needed => deleted because of: https://git.ipfire.org/?p=ipfire-2.x.git;a=commit;h=c67ff7d72c2232b6994e1ff… Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 3caa418097b4c1bacea267f79e3d6bd6b48a2a2f Author: Erik Kapfer <ummeegge(a)ipfire.org> Date: Tue Aug 18 14:34:37 2020 +0000 tshark: Update to version 3.2.6 The version jump from 3.2.3 to 3.2.6 includes several changes. 3.2.4 includes only bugfixes. 3.2.5 includes bugfixes and updated protocols. 3.2.6 includes also bugfixes and updated protocols. For a full overview, the release notes can be found in here --> https://www.wireshark.org/docs/relnotes/ . Signed-off-by: Erik Kapfer <ummeegge(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/tshark | 4 ++-- lfs/tshark | 6 +++--- src/paks/zstd/install.sh | 25 ------------------------- src/paks/zstd/uninstall.sh | 25 ------------------------- src/paks/zstd/update.sh | 26 -------------------------- 5 files changed, 5 insertions(+), 81 deletions(-) delete mode 100644 src/paks/zstd/install.sh delete mode 100644 src/paks/zstd/uninstall.sh delete mode 100644 src/paks/zstd/update.sh Difference in files: diff --git a/config/rootfiles/packages/tshark b/config/rootfiles/packages/tshark index 5b7824a9f..c5081989c 100644 --- a/config/rootfiles/packages/tshark +++ b/config/rootfiles/packages/tshark @@ -612,10 +612,10 @@ usr/bin/tshark #usr/include/wireshark/wsutil/xtea.h #usr/lib/libwireshark.so usr/lib/libwireshark.so.13 -usr/lib/libwireshark.so.13.0.3 +usr/lib/libwireshark.so.13.0.6 #usr/lib/libwiretap.so usr/lib/libwiretap.so.10 -usr/lib/libwiretap.so.10.0.3 +usr/lib/libwiretap.so.10.0.6 #usr/lib/libwsutil.so usr/lib/libwsutil.so.11 usr/lib/libwsutil.so.11.0.0 diff --git a/lfs/tshark b/lfs/tshark index c32fb181e..7b124ef5b 100644 --- a/lfs/tshark +++ b/lfs/tshark @@ -24,7 +24,7 @@ include Config -VER = 3.2.3 +VER = 3.2.6 THISAPP = wireshark-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -33,7 +33,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = tshark DEPS = krb5 -PAK_VER = 6 +PAK_VER = 7 ############################################################################### # Top-level Rules @@ -43,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = ff732e4586eebeb61a41abe2fcba7431 +$(DL_FILE)_MD5 = f14ef8d73fa5f30b57fec51283e6b73e install : $(TARGET) diff --git a/src/paks/zstd/install.sh b/src/paks/zstd/install.sh deleted file mode 100644 index 3fe8bc67e..000000000 --- a/src/paks/zstd/install.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire is free software; you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 2 of the License, or # -# (at your option) any later version. # -# # -# IPFire is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2009 IPFire-Team <info(a)ipfire.org>. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -extract_files diff --git a/src/paks/zstd/uninstall.sh b/src/paks/zstd/uninstall.sh deleted file mode 100644 index f786519d6..000000000 --- a/src/paks/zstd/uninstall.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire is free software; you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 2 of the License, or # -# (at your option) any later version. # -# # -# IPFire is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2009 IPFire-Team <info(a)ipfire.org>. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -remove_files diff --git a/src/paks/zstd/update.sh b/src/paks/zstd/update.sh deleted file mode 100644 index 89c40d0d7..000000000 --- a/src/paks/zstd/update.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire is free software; you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 2 of the License, or # -# (at your option) any later version. # -# # -# IPFire is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -./uninstall.sh -./install.sh hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 10771d94ad484f6a32299fa149b70dc25df9c685
by Michael Tremer 18 Aug '20

18 Aug '20

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 10771d94ad484f6a32299fa149b70dc25df9c685 (commit) from c67ff7d72c2232b6994e1ff97277d4040711f97d (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 10771d94ad484f6a32299fa149b70dc25df9c685 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Mon Aug 17 19:30:21 2020 +0000 Postfix: update to 3.5.6 Please refer to http://www.postfix.org/announcements/postfix-3.5.6.html for release announcements. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/postfix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/lfs/postfix b/lfs/postfix index e5f812d8e..d75f2a949 100644 --- a/lfs/postfix +++ b/lfs/postfix @@ -24,7 +24,7 @@ include Config -VER = 3.5.4 +VER = 3.5.6 THISAPP = postfix-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = postfix -PAK_VER = 25 +PAK_VER = 26 DEPS = @@ -66,7 +66,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 9a781213330e9aa9d0ccd81ea45ed598 +$(DL_FILE)_MD5 = c5819f40ffbe22bc785a30905b1f1c7a install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. c67ff7d72c2232b6994e1ff97277d4040711f97d
by Michael Tremer 18 Aug '20

18 Aug '20

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 c67ff7d72c2232b6994e1ff97277d4040711f97d (commit) via f8a54e19617bdad48e390924547732386ce4d04a (commit) via 5a918d828f8a7ae3471ab6ca678ba634470917cd (commit) from bef8b9c027b830f5b984cd33ffe4b681f37fbe7c (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 c67ff7d72c2232b6994e1ff97277d4040711f97d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Aug 18 10:13:01 2020 +0000 zstd: Make this part of the core distributions Many packages link against it and we should make use of it when we have it. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f8a54e19617bdad48e390924547732386ce4d04a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Aug 18 10:11:33 2020 +0000 qemu: Update rootfile Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5a918d828f8a7ae3471ab6ca678ba634470917cd Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Aug 18 10:10:13 2020 +0000 rsync: Update rootfile Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/{packages => common}/zstd | 0 config/rootfiles/packages/qemu | 3 +-- config/rootfiles/packages/rsync | 2 ++ lfs/rsync | 2 +- lfs/zstd | 4 ---- make.sh | 2 +- 6 files changed, 5 insertions(+), 8 deletions(-) rename config/rootfiles/{packages => common}/zstd (100%) Difference in files: diff --git a/config/rootfiles/packages/zstd b/config/rootfiles/common/zstd similarity index 100% rename from config/rootfiles/packages/zstd rename to config/rootfiles/common/zstd diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu index 60ee05c55..21ae286e8 100644 --- a/config/rootfiles/packages/qemu +++ b/config/rootfiles/packages/qemu @@ -124,14 +124,13 @@ usr/share/qemu/multiboot.bin #usr/share/qemu/openbios-ppc #usr/share/qemu/openbios-sparc32 #usr/share/qemu/openbios-sparc64 -+usr/share/qemu/opensbi-riscv32-sifive_u-fw_jump.bin +#usr/share/qemu/opensbi-riscv32-sifive_u-fw_jump.bin #usr/share/qemu/opensbi-riscv32-virt-fw_jump.bin #usr/share/qemu/opensbi-riscv64-sifive_u-fw_jump.bin #usr/share/qemu/opensbi-riscv64-virt-fw_jump.bin #usr/share/qemu/palcode-clipper #usr/share/qemu/petalogix-ml605.dtb #usr/share/qemu/petalogix-s3adsp1800.dtb -#usr/share/qemu/ppc_rom.bin usr/share/qemu/pvh.bin usr/share/qemu/pxe-e1000.rom usr/share/qemu/pxe-eepro100.rom diff --git a/config/rootfiles/packages/rsync b/config/rootfiles/packages/rsync index 59c8be9f1..70bb401fe 100644 --- a/config/rootfiles/packages/rsync +++ b/config/rootfiles/packages/rsync @@ -1,3 +1,5 @@ usr/bin/rsync +usr/bin/rsync-ssl +#usr/share/man/man1/rsync-ssl.1 #usr/share/man/man1/rsync.1 #usr/share/man/man5/rsyncd.conf.5 diff --git a/lfs/rsync b/lfs/rsync index 46da6075b..092b0187b 100644 --- a/lfs/rsync +++ b/lfs/rsync @@ -34,7 +34,7 @@ TARGET = $(DIR_INFO)/$(THISAPP) PROG = rsync PAK_VER = 12 -DEPS = zstd +DEPS = ############################################################################### # Top-level Rules diff --git a/lfs/zstd b/lfs/zstd index 55ac837d3..c6af0f129 100644 --- a/lfs/zstd +++ b/lfs/zstd @@ -31,10 +31,6 @@ DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -PROG = zstd -PAK_VER = 1 - -DEPS = ############################################################################### # Top-level Rules diff --git a/make.sh b/make.sh index 1d6e3c390..2a6198e05 100755 --- a/make.sh +++ b/make.sh @@ -1383,6 +1383,7 @@ buildipfire() { lfsmake2 spandsp lfsmake2 lz4 lfsmake2 lzo + lfsmake2 zstd lfsmake2 openvpn lfsmake2 mpage lfsmake2 dbus @@ -1433,7 +1434,6 @@ buildipfire() { lfsmake2 xvid lfsmake2 libmpeg2 lfsmake2 gnump3d - lfsmake2 zstd lfsmake2 rsync lfsmake2 rpcbind lfsmake2 keyutils 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 August 2020