IPFire-SCM October 2020

ipfire-scm@lists.ipfire.org

1 participants
45 discussions

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 632075bf579d1d706ade996b786f1061244dd6a9
by Michael Tremer 30 Oct '20

30 Oct '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 632075bf579d1d706ade996b786f1061244dd6a9 (commit) from 2d43d770d26bff3cde665bfbb1f7ebbaf2acabfb (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 632075bf579d1d706ade996b786f1061244dd6a9 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Oct 30 07:35:23 2020 +0100 samba: update to 4.13.1 This is a security release in order to address CVE-2020-14318 (Missing handle permissions check in SMB1/2/3 ChangeNotify), CVE-2020-14323 (Unprivileged user can crash winbind) and CVE-2020-14383 (An authenticated user can crash the DCE/RPC DNS with easily crafted records). Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/samba | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/lfs/samba b/lfs/samba index 3a2a5bbd4..92a6b1121 100644 --- a/lfs/samba +++ b/lfs/samba @@ -24,7 +24,7 @@ include Config -VER = 4.13.0 +VER = 4.13.1 THISAPP = samba-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = samba -PAK_VER = 72 +PAK_VER = 73 DEPS = avahi cups libtirpc krb5 perl-Parse-Yapp @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = a7f5cccac09d638b3bd11204003b7e7b +$(DL_FILE)_MD5 = d9243ab374897ba91aa3eb7354e83553 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9c6fd77927cbbf1cedb5d8a0dbc1367b7af17198
by Michael Tremer 30 Oct '20

30 Oct '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 9c6fd77927cbbf1cedb5d8a0dbc1367b7af17198 (commit) via 62efd2e9d26b78fe83b850dc43a9206556a2d851 (commit) from 7f5d63c9e661d8d9feab2723944dc04739205b4b (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 9c6fd77927cbbf1cedb5d8a0dbc1367b7af17198 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Oct 30 16:29:39 2020 +0000 core153: Ship libarchive Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 62efd2e9d26b78fe83b850dc43a9206556a2d851 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Oct 30 16:29:02 2020 +0000 libarchive: Ship on core system Some tools link against this Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/libarchive | 4 ++-- config/rootfiles/{oldcore/104 => core/153}/filelists/libarchive | 0 2 files changed, 2 insertions(+), 2 deletions(-) copy config/rootfiles/{oldcore/104 => core/153}/filelists/libarchive (100%) Difference in files: diff --git a/config/rootfiles/common/libarchive b/config/rootfiles/common/libarchive index 10950c9fc..a4038b13f 100644 --- a/config/rootfiles/common/libarchive +++ b/config/rootfiles/common/libarchive @@ -5,8 +5,8 @@ #usr/include/archive_entry.h #usr/lib/libarchive.la #usr/lib/libarchive.so -#usr/lib/libarchive.so.13 -#usr/lib/libarchive.so.13.4.0 +usr/lib/libarchive.so.13 +usr/lib/libarchive.so.13.4.0 #usr/lib/pkgconfig/libarchive.pc #usr/share/man/man1/bsdcat.1 #usr/share/man/man1/bsdcpio.1 diff --git a/config/rootfiles/core/153/filelists/libarchive b/config/rootfiles/core/153/filelists/libarchive new file mode 120000 index 000000000..551f1f743 --- /dev/null +++ b/config/rootfiles/core/153/filelists/libarchive @@ -0,0 +1 @@ +../../../common/libarchive \ 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. 7f5d63c9e661d8d9feab2723944dc04739205b4b
by Michael Tremer 30 Oct '20

30 Oct '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 7f5d63c9e661d8d9feab2723944dc04739205b4b (commit) via 5cbc22ffa69b8095251a75194a5695b1e7a70fe0 (commit) via 588f1223f2f9fbb30557d85d87ba14421735bd0c (commit) from 9d29a52d7d0d0d7db2cb957fbb628b943bba40aa (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 7f5d63c9e661d8d9feab2723944dc04739205b4b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Oct 30 15:20:33 2020 +0000 core153: Ship usb_modeswitch Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5cbc22ffa69b8095251a75194a5695b1e7a70fe0 Author: Ramax Lo <ramaxlo(a)gmail.com> Date: Fri Oct 30 11:32:10 2020 +0800 usb_modeswitch_data: update to 20191128 Signed-off-by: Ramax Lo <ramaxlo(a)gmail.com> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 588f1223f2f9fbb30557d85d87ba14421735bd0c Author: Ramax Lo <ramaxlo(a)gmail.com> Date: Fri Oct 30 11:32:09 2020 +0800 usb_modeswitch: update to 2.6.1 Signed-off-by: Ramax Lo <ramaxlo(a)gmail.com> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/usb_modeswitch_data | 25 ++++++++++++++++++++++ .../106 => core/153}/filelists/usb_modeswitch | 0 .../106 => core/153}/filelists/usb_modeswitch_data | 0 lfs/usb_modeswitch | 4 ++-- lfs/usb_modeswitch_data | 4 ++-- 5 files changed, 29 insertions(+), 4 deletions(-) copy config/rootfiles/{oldcore/106 => core/153}/filelists/usb_modeswitch (100%) copy config/rootfiles/{oldcore/106 => core/153}/filelists/usb_modeswitch_data (100%) Difference in files: diff --git a/config/rootfiles/common/usb_modeswitch_data b/config/rootfiles/common/usb_modeswitch_data index 767fae512..6f30c36a3 100644 --- a/config/rootfiles/common/usb_modeswitch_data +++ b/config/rootfiles/common/usb_modeswitch_data @@ -3,6 +3,7 @@ lib/udev/rules.d/40-usb_modeswitch.rules #usr/share/usb_modeswitch usr/share/usb_modeswitch/03f0:002a usr/share/usb_modeswitch/03f0:032a +usr/share/usb_modeswitch/03f0:0857 usr/share/usb_modeswitch/03f0:371d usr/share/usb_modeswitch/03f0:4b1d usr/share/usb_modeswitch/03f0:4e1d @@ -59,6 +60,7 @@ usr/share/usb_modeswitch/05c6:1000:uMa=CELOT usr/share/usb_modeswitch/05c6:1000:uMa=Co.,Ltd usr/share/usb_modeswitch/05c6:1000:uMa=DGT usr/share/usb_modeswitch/05c6:1000:uMa=Option +usr/share/usb_modeswitch/05c6:1000:uMa=Qualcomm usr/share/usb_modeswitch/05c6:1000:uMa=SAMSUNG usr/share/usb_modeswitch/05c6:1000:uMa=SSE usr/share/usb_modeswitch/05c6:1000:uMa=StrongRising @@ -145,6 +147,7 @@ usr/share/usb_modeswitch/0b3c:c700 usr/share/usb_modeswitch/0b3c:f000 usr/share/usb_modeswitch/0b3c:f00c usr/share/usb_modeswitch/0b3c:f017 +usr/share/usb_modeswitch/0bda:1a2b usr/share/usb_modeswitch/0bdb:190d usr/share/usb_modeswitch/0bdb:1910 usr/share/usb_modeswitch/0cf3:20ff @@ -153,6 +156,7 @@ usr/share/usb_modeswitch/0d46:45a5 usr/share/usb_modeswitch/0df7:0800 usr/share/usb_modeswitch/0e8d:0002:uPr=MT usr/share/usb_modeswitch/0e8d:0002:uPr=Product +usr/share/usb_modeswitch/0e8d:2870 usr/share/usb_modeswitch/0e8d:7109 usr/share/usb_modeswitch/0fca:8020 usr/share/usb_modeswitch/0fce:d0cf @@ -248,6 +252,7 @@ usr/share/usb_modeswitch/12d1:15d0 usr/share/usb_modeswitch/12d1:15d2 usr/share/usb_modeswitch/12d1:15e7 usr/share/usb_modeswitch/12d1:15ec +usr/share/usb_modeswitch/12d1:15ee usr/share/usb_modeswitch/12d1:15f0 usr/share/usb_modeswitch/12d1:1805 usr/share/usb_modeswitch/12d1:1c0b @@ -264,6 +269,7 @@ usr/share/usb_modeswitch/12d1:1f05 usr/share/usb_modeswitch/12d1:1f06 usr/share/usb_modeswitch/12d1:1f07 usr/share/usb_modeswitch/12d1:1f09 +usr/share/usb_modeswitch/12d1:1f0a usr/share/usb_modeswitch/12d1:1f11 usr/share/usb_modeswitch/12d1:1f15 usr/share/usb_modeswitch/12d1:1f16 @@ -286,12 +292,16 @@ usr/share/usb_modeswitch/1410:5055 usr/share/usb_modeswitch/1410:5059 usr/share/usb_modeswitch/1410:7001 usr/share/usb_modeswitch/1410:9020 +usr/share/usb_modeswitch/1410:9030 +usr/share/usb_modeswitch/1410:b00c usr/share/usb_modeswitch/148e:a000 usr/share/usb_modeswitch/148f:2578 usr/share/usb_modeswitch/148f:2878 usr/share/usb_modeswitch/15eb:7153 +usr/share/usb_modeswitch/15eb:a403 usr/share/usb_modeswitch/1614:0800 usr/share/usb_modeswitch/1614:0802 +usr/share/usb_modeswitch/161c:f010 usr/share/usb_modeswitch/16d5:f000 usr/share/usb_modeswitch/16d8:6281 usr/share/usb_modeswitch/16d8:6803 @@ -360,6 +370,7 @@ usr/share/usb_modeswitch/19d2:1233 usr/share/usb_modeswitch/19d2:1237 usr/share/usb_modeswitch/19d2:1238 usr/share/usb_modeswitch/19d2:1420 +usr/share/usb_modeswitch/19d2:1421 usr/share/usb_modeswitch/19d2:1511 usr/share/usb_modeswitch/19d2:1514 usr/share/usb_modeswitch/19d2:1517 @@ -391,6 +402,7 @@ usr/share/usb_modeswitch/1bbb:f000 usr/share/usb_modeswitch/1bbb:f017 usr/share/usb_modeswitch/1bbb:f052 usr/share/usb_modeswitch/1c9e:1001 +usr/share/usb_modeswitch/1c9e:3003 usr/share/usb_modeswitch/1c9e:6000 usr/share/usb_modeswitch/1c9e:6061:uPr=Storage usr/share/usb_modeswitch/1c9e:9101 @@ -405,6 +417,7 @@ usr/share/usb_modeswitch/1c9e:9e08 usr/share/usb_modeswitch/1c9e:f000 usr/share/usb_modeswitch/1c9e:f000:uMa=USB_Modem usr/share/usb_modeswitch/1c9e:f010 +usr/share/usb_modeswitch/1c9e:f030 usr/share/usb_modeswitch/1d09:1000 usr/share/usb_modeswitch/1d09:1021 usr/share/usb_modeswitch/1d09:1025 @@ -452,10 +465,12 @@ usr/share/usb_modeswitch/2001:a805 usr/share/usb_modeswitch/2001:a809 usr/share/usb_modeswitch/2001:a80b usr/share/usb_modeswitch/2001:ab00 +usr/share/usb_modeswitch/2001:ac01 usr/share/usb_modeswitch/2015:0001 usr/share/usb_modeswitch/201e:1023 usr/share/usb_modeswitch/201e:2009 usr/share/usb_modeswitch/2020:0002 +usr/share/usb_modeswitch/2020:2030 usr/share/usb_modeswitch/2020:f00e usr/share/usb_modeswitch/2020:f00f usr/share/usb_modeswitch/2077:1000 @@ -479,12 +494,22 @@ usr/share/usb_modeswitch/230d:000d usr/share/usb_modeswitch/230d:0101 usr/share/usb_modeswitch/230d:0103 usr/share/usb_modeswitch/2357:0200 +usr/share/usb_modeswitch/2357:0600 usr/share/usb_modeswitch/2357:f000 usr/share/usb_modeswitch/23a2:1010 usr/share/usb_modeswitch/257a:a000 usr/share/usb_modeswitch/257a:b000 usr/share/usb_modeswitch/257a:c000 usr/share/usb_modeswitch/257a:d000 +usr/share/usb_modeswitch/2fd4:9aff +usr/share/usb_modeswitch/413c:81a2 +usr/share/usb_modeswitch/413c:81a3 +usr/share/usb_modeswitch/413c:81a4 +usr/share/usb_modeswitch/413c:81a8 +usr/share/usb_modeswitch/413c:81b1 +usr/share/usb_modeswitch/413c:81b3 +usr/share/usb_modeswitch/413c:81d7 +usr/share/usb_modeswitch/413c:81e0 usr/share/usb_modeswitch/6000:1000 usr/share/usb_modeswitch/8888:6500 usr/share/usb_modeswitch/ed09:1021 diff --git a/config/rootfiles/core/153/filelists/usb_modeswitch b/config/rootfiles/core/153/filelists/usb_modeswitch new file mode 120000 index 000000000..acbab6f33 --- /dev/null +++ b/config/rootfiles/core/153/filelists/usb_modeswitch @@ -0,0 +1 @@ +../../../common/usb_modeswitch \ No newline at end of file diff --git a/config/rootfiles/core/153/filelists/usb_modeswitch_data b/config/rootfiles/core/153/filelists/usb_modeswitch_data new file mode 120000 index 000000000..4cbce46cf --- /dev/null +++ b/config/rootfiles/core/153/filelists/usb_modeswitch_data @@ -0,0 +1 @@ +../../../common/usb_modeswitch_data \ No newline at end of file diff --git a/lfs/usb_modeswitch b/lfs/usb_modeswitch index c63ba395d..b3e19e6fb 100644 --- a/lfs/usb_modeswitch +++ b/lfs/usb_modeswitch @@ -24,7 +24,7 @@ include Config -VER = 2.5.2 +VER = 2.6.1 THISAPP = usb-modeswitch-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 16b9a8efa1bf8fbd7d5612757eae4f26 +$(DL_FILE)_MD5 = 69d00d6ed7097b97d972a159d14cfba1 install : $(TARGET) diff --git a/lfs/usb_modeswitch_data b/lfs/usb_modeswitch_data index 546a7a78c..0f5485d81 100644 --- a/lfs/usb_modeswitch_data +++ b/lfs/usb_modeswitch_data @@ -24,7 +24,7 @@ include Config -VER = 20170806 +VER = 20191128 THISAPP = usb-modeswitch-data-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = fb50d15b52e909d742dd16f0a9882316 +$(DL_FILE)_MD5 = e8fce7eb949cbe16c61fb71bade4cc17 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9d29a52d7d0d0d7db2cb957fbb628b943bba40aa
by Michael Tremer 30 Oct '20

30 Oct '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 9d29a52d7d0d0d7db2cb957fbb628b943bba40aa (commit) via ef7b7b1af8c32bad066ab35dbeabbd3a47d89b4b (commit) via d941effbcfd3344aa244c3f8550fe72bb21af8db (commit) via 4e49d67990b8509d12114f868d48469d41e4b06a (commit) from e1f7cc9077411dac342436441a4ea1a818f80b05 (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 9d29a52d7d0d0d7db2cb957fbb628b943bba40aa Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Oct 30 15:11:05 2020 +0000 core153: Ship NTP changes Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ef7b7b1af8c32bad066ab35dbeabbd3a47d89b4b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Oct 30 15:09:50 2020 +0000 ntp: Allow CLI tools to talk to ntpd Fixes: #12518 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit d941effbcfd3344aa244c3f8550fe72bb21af8db Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Oct 30 15:08:55 2020 +0000 ntp: Make /etc/ntp owned by root This is required for ntpd being able to write its own drift file Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 4e49d67990b8509d12114f868d48469d41e4b06a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Oct 30 15:07:26 2020 +0000 ntp: Move configuration into an own file We should not write files like that in the LFS scripts. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/ntp/ntp.conf | 6 ++++++ config/rootfiles/core/153/filelists/files | 1 + config/rootfiles/core/153/update.sh | 3 +++ lfs/ntp | 7 +------ 4 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 config/ntp/ntp.conf Difference in files: diff --git a/config/ntp/ntp.conf b/config/ntp/ntp.conf new file mode 100644 index 000000000..9e393ca8e --- /dev/null +++ b/config/ntp/ntp.conf @@ -0,0 +1,6 @@ +disable monitor +restrict default nomodify noquery +restrict 127.0.0.1 +server 127.127.1.0 prefer +fudge 127.127.1.0 stratum 10 +driftfile /etc/ntp/drift diff --git a/config/rootfiles/core/153/filelists/files b/config/rootfiles/core/153/filelists/files index ef3d556e2..619855ad4 100644 --- a/config/rootfiles/core/153/filelists/files +++ b/config/rootfiles/core/153/filelists/files @@ -1,4 +1,5 @@ etc/issue +etc/ntp.conf etc/os-release etc/system-release srv/web/ipfire/cgi-bin/credits.cgi diff --git a/config/rootfiles/core/153/update.sh b/config/rootfiles/core/153/update.sh index 68d1513aa..4a9b0a246 100644 --- a/config/rootfiles/core/153/update.sh +++ b/config/rootfiles/core/153/update.sh @@ -41,6 +41,9 @@ extract_files # update linker config ldconfig +# Update permissions +chown -vR root:root /etc/ntp + # Update Language cache #/usr/local/bin/update-lang-cache diff --git a/lfs/ntp b/lfs/ntp index 3c4a97033..c8f69039d 100644 --- a/lfs/ntp +++ b/lfs/ntp @@ -82,12 +82,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make install -mkdir /etc/ntp - chown -R ntp:ntp /etc/ntp - echo "disable monitor" > /etc/ntp.conf - echo "restrict default nomodify noquery" >> /etc/ntp.conf - echo "server 127.127.1.0 prefer" >> /etc/ntp.conf - echo "fudge 127.127.1.0 stratum 10" >> /etc/ntp.conf - echo "driftfile /etc/ntp/drift" >> /etc/ntp.conf + install -v -m 644 $(DIR_SRC)/config/ntp/ntp.conf /etc/ntp.conf #Enable it by default... cp -vf $(DIR_SRC)/config/time/* /var/ipfire/time/ hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e1f7cc9077411dac342436441a4ea1a818f80b05
by Arne Fitzenreiter 30 Oct '20

30 Oct '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 e1f7cc9077411dac342436441a4ea1a818f80b05 (commit) from ae432a5f39980cd680e281378f8729719757ad6e (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 e1f7cc9077411dac342436441a4ea1a818f80b05 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Oct 30 07:35:23 2020 +0100 samba: update to 4.13.1 This is a security release in order to address CVE-2020-14318 (Missing handle permissions check in SMB1/2/3 ChangeNotify), CVE-2020-14323 (Unprivileged user can crash winbind) and CVE-2020-14383 (An authenticated user can crash the DCE/RPC DNS with easily crafted records). Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/samba | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/lfs/samba b/lfs/samba index 3a2a5bbd4..92a6b1121 100644 --- a/lfs/samba +++ b/lfs/samba @@ -24,7 +24,7 @@ include Config -VER = 4.13.0 +VER = 4.13.1 THISAPP = samba-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = samba -PAK_VER = 72 +PAK_VER = 73 DEPS = avahi cups libtirpc krb5 perl-Parse-Yapp @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = a7f5cccac09d638b3bd11204003b7e7b +$(DL_FILE)_MD5 = d9243ab374897ba91aa3eb7354e83553 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. ae432a5f39980cd680e281378f8729719757ad6e
by Michael Tremer 29 Oct '20

29 Oct '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 ae432a5f39980cd680e281378f8729719757ad6e (commit) from 66970ccba3a74a8fd6338364a215496f6394f3ad (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 ae432a5f39980cd680e281378f8729719757ad6e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Oct 29 13:49:40 2020 +0000 core153: Ship language files Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/153/filelists/files | 1 + 1 file changed, 1 insertion(+) Difference in files: diff --git a/config/rootfiles/core/153/filelists/files b/config/rootfiles/core/153/filelists/files index 8fd152a6c..ef3d556e2 100644 --- a/config/rootfiles/core/153/filelists/files +++ b/config/rootfiles/core/153/filelists/files @@ -4,3 +4,4 @@ etc/system-release srv/web/ipfire/cgi-bin/credits.cgi srv/web/ipfire/cgi-bin/index.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi +var/ipfire/langs hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 2d43d770d26bff3cde665bfbb1f7ebbaf2acabfb
by Michael Tremer 29 Oct '20

29 Oct '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 2d43d770d26bff3cde665bfbb1f7ebbaf2acabfb (commit) from 0b9c2434f0becb75029fa8bc665678b11ce7bea1 (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 2d43d770d26bff3cde665bfbb1f7ebbaf2acabfb Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Oct 29 13:48:58 2020 +0000 core152: Ship language files Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/152/filelists/files | 1 + 1 file changed, 1 insertion(+) Difference in files: diff --git a/config/rootfiles/core/152/filelists/files b/config/rootfiles/core/152/filelists/files index 8a05052ec..58fb41dd3 100644 --- a/config/rootfiles/core/152/filelists/files +++ b/config/rootfiles/core/152/filelists/files @@ -14,3 +14,4 @@ srv/web/ipfire/cgi-bin/logs.cgi/log.dat srv/web/ipfire/cgi-bin/proxy.cgi usr/local/bin/setaliases var/ipfire/graphs.pl +var/ipfire/langs hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 66970ccba3a74a8fd6338364a215496f6394f3ad
by Michael Tremer 29 Oct '20

29 Oct '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 66970ccba3a74a8fd6338364a215496f6394f3ad (commit) from 5e1579023ad452558424cd64f93dd5d1f57f61cb (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 66970ccba3a74a8fd6338364a215496f6394f3ad Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Thu Oct 29 12:20:07 2020 +0100 suricata: Proper use confgured LDFLAGS. Fixes #12513. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/suricata | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/lfs/suricata b/lfs/suricata index d47b43d34..2871d8e7b 100644 --- a/lfs/suricata +++ b/lfs/suricata @@ -74,7 +74,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure \ + cd $(DIR_APP) && LDFLAGS="$(LDFLAGS)" ./configure \ --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5e1579023ad452558424cd64f93dd5d1f57f61cb
by Michael Tremer 29 Oct '20

29 Oct '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 5e1579023ad452558424cd64f93dd5d1f57f61cb (commit) from af94be24fea1ec1bcd1605034bd2bb5b4f5ee53c (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 5e1579023ad452558424cd64f93dd5d1f57f61cb Author: Stéphane Pautrel <steph78630(a)gmail.com> Date: Thu Oct 29 10:38:09 2020 +0000 Update French translation Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: doc/language_issues.fr | 14 -------------- doc/language_missings | 14 -------------- langs/fr/cgi-bin/fr.pl | 16 +++++++++++++++- 3 files changed, 15 insertions(+), 29 deletions(-) Difference in files: diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 1f5654456..b98154eca 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -879,9 +879,6 @@ WARNING: translation string unused: zoneconf val ppp assignment error WARNING: translation string unused: zoneconf val vlan amount assignment error WARNING: translation string unused: zoneconf val vlan tag assignment error WARNING: translation string unused: zoneconf val zoneslave amount error -WARNING: untranslated string: desired = Desired -WARNING: untranslated string: disable = Disable -WARNING: untranslated string: enable = Enable WARNING: untranslated string: fwhost cust locationgrp = unknown string WARNING: untranslated string: fwhost err hostip = unknown string WARNING: untranslated string: guardian block a host = unknown string @@ -913,18 +910,7 @@ WARNING: untranslated string: guardian logtarget_file = unknown string WARNING: untranslated string: guardian logtarget_syslog = unknown string WARNING: untranslated string: guardian no entries = unknown string WARNING: untranslated string: guardian service = unknown string -WARNING: untranslated string: netbios nameserver daemon = NetBIOS Nameserver Daemon -WARNING: untranslated string: optional = Optional WARNING: untranslated string: pakfire ago = ago. -WARNING: untranslated string: required = Required 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: samba server role member = Domain Member -WARNING: untranslated string: samba server role standalone = Standalone -WARNING: untranslated string: smb daemon = SMB Daemon -WARNING: untranslated string: user management = User Management -WARNING: untranslated string: winbind daemon = Winbind Daemon -WARNING: untranslated string: wlanap 802.11w disabled = Disabled -WARNING: untranslated string: wlanap 802.11w enforced = Enforced -WARNING: untranslated string: wlanap 802.11w optional = Optional diff --git a/doc/language_missings b/doc/language_missings index c519c5a6a..90f4c2926 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -950,23 +950,9 @@ < ansi t1.483 < bewan adsl pci st < bewan adsl usb -< desired -< disable -< enable < g.dtm < g.lite -< netbios nameserver daemon -< optional -< required -< samba server role member -< samba server role standalone -< smb daemon < upload fcdsl.o -< user management -< winbind daemon -< wlanap 802.11w disabled -< wlanap 802.11w enforced -< wlanap 802.11w optional ############################################################################ # Checking cgi-bin translations for language: it # ############################################################################ diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index aa41429f6..00328440d 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -762,6 +762,7 @@ 'demon login script' => 'Script de login du service', 'deprecated fs warn' => 'Système de fichiers obsolète ! Le nouveau noyau supprime le support. Sauvegarde et reformatage !', 'description' => 'Description', +'desired' => 'Voulu', 'dest ip and port' => 'IP Dest.:Port', 'destination' => 'Destination', 'destination ip' => 'IP de destination', @@ -826,6 +827,7 @@ 'dialup settings' => 'Réglage de connexion', 'directory mask' => 'Droits des répertoires UNIX', 'directory writeable' => 'Ecriture possible dans ce répertoire', +'disable' => 'Désactiver', 'disabled' => 'Arrêté', 'disconnect' => 'OVPN stoppé / déconnecté', 'disconnected' => 'Déconnecté', @@ -995,6 +997,7 @@ 'emerging rules' => 'Règles de la communauté Emergingthreats.net', 'empty' => 'Ce champ peut être laissé vide', 'empty profile' => 'vide', +'enable' => 'Activer', 'enable ignore filter' => 'Activer le filtre d\'exclusion ', 'enable javascript' => 'Activer Javascript', 'enable smt' => 'Activer le partage d\'un cœur de processeur (SMT)', @@ -1787,6 +1790,7 @@ 'net traffic newversion' => 'Nouvelle version de net-traffic disponible :', 'net-traffic configuration' => 'Configuration net-traffic', 'netbios name' => 'Nom Netbios', +'netbios nameserver daemon' => 'Service du serveur de noms NetBIOS', 'netmask' => 'Masque réseau ', 'network' => 'Réseau', 'network added' => 'Réseau personnalisé ajouté', @@ -1883,6 +1887,7 @@ 'openvpn prefix remote subnet' => 'L\'utilisation de la notation préfixe n\'est pas prise en charge pour le sous-réseau distant. Veuillez entrer un masque de sous-réseau comme 255.255.255.0.', 'openvpn server' => 'Serveur OpenVPN', 'openvpn subnet is used' => 'Le sous-réseau donné est utilisé par un autre serveur OpenVPN.', +'optional' => 'Optionnel', 'optional at cmd' => 'Commande AT optionnelle', 'optional data' => '3. Paramètres optionnels :', 'options' => 'Options', @@ -1906,7 +1911,7 @@ 'outgoing' => 'sortant', 'outgoing compression in bytes per second' => 'Compression sortante', 'outgoing firewall' => 'Pare-feu sortant', -'outgoing firewall access' => 'Accès sortant au pare-feu', +'outgoing firewall access' => 'Accès sortant du pare-feu', 'outgoing firewall add ip group' => 'Ajouter un groupe d\'adresses IP', 'outgoing firewall add mac group' => 'Ajouter un groupe d\'adresses MAC', 'outgoing firewall edit ip group' => 'Modifier un groupe d\'adresses IP', @@ -2153,6 +2158,7 @@ 'reportlevel' => 'Niveau de rapport', 'request' => 'Interrogation', 'requested data' => '1. Paramètres de connexion :', +'required' => 'Requis', 'required field' => 'Champs requis', 'reserved dst port' => 'Le port de destination est réservé pour l\'usage d\'IPFire :', 'reserved src port' => 'Le port source est réservé pour l\'usage d\'IPFire :', @@ -2187,6 +2193,8 @@ 'samba' => 'Samba', 'samba join a domain' => 'Joindre un domaine', 'samba join domain' => 'Joindre domaine', +'samba server role member' => 'Membre du domaine', +'samba server role standalone' => 'Autonome', 'samba status' => 'Statut Samba', 'saturday' => 'Samedi', 'save' => 'Sauvegarder', @@ -2262,6 +2270,7 @@ 'smart information' => 'Informations S.M.A.R.T.', 'smartwarn1' => 'Périphérique :', 'smartwarn2' => 'rapports des erreurs S.M.A.R.T.', +'smb daemon' => 'Service SMB', 'smbreload' => 'Recharger Samba', 'smbrestart' => 'Redémarrer Samba', 'smbstart' => 'Démarrer Samba', @@ -2834,6 +2843,7 @@ 'used swap' => 'Swap utilisée', 'user' => 'Utilisateur', 'user log' => 'log utilisateur', +'user management' => 'Gestion utilisateur', 'user proxy logs' => 'log utilisateur proxy', 'username' => 'Nom utilisateur :', 'username not set' => 'Nom d\'utilisateur non défini.', @@ -2908,6 +2918,7 @@ 'weekly firewallhits' => 'Contacts hebdomadaires du pare-feu', 'weeks' => 'semaine(s)', 'wildcards' => 'Jokers', +'winbind daemon' => 'Service Winbind', 'wins server' => 'Serveur Wins', 'wins support' => 'Support Wins', 'wireless' => 'Sans fil', @@ -2961,6 +2972,9 @@ 'wlan client wpa mode tkip tkip' => 'TKIP-TKIP', 'wlan clients' => 'Clients sans fil', 'wlanap' => 'Point d\'accès', +'wlanap 802.11w disabled' => 'Désactivé', +'wlanap 802.11w enforced' => 'Forcé', +'wlanap 802.11w optional' => 'Optionnel', 'wlanap auto' => 'Sélection automatique du canal', 'wlanap broadcast ssid' => 'Diffusion du SSID', 'wlanap channel' => 'Canal', hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. af94be24fea1ec1bcd1605034bd2bb5b4f5ee53c
by Michael Tremer 28 Oct '20

28 Oct '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 af94be24fea1ec1bcd1605034bd2bb5b4f5ee53c (commit) via 5e11ef0f67f6baf9bbcb4e20f0987044397f5862 (commit) from 8a2105b2844fdb4b2306a0a27553f01842795535 (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 af94be24fea1ec1bcd1605034bd2bb5b4f5ee53c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Oct 28 11:55:48 2020 +0000 core153: Ship logwatch Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5e11ef0f67f6baf9bbcb4e20f0987044397f5862 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Wed Sep 16 20:44:45 2020 +0200 logwatch: Added upstream patch for Bug #12242 Added upstream patch from: https://sourceforge.net/p/logwatch/mailman/message/37106642/ and https://sourceforge.net/p/logwatch/mailman/message/37106883/ Fixes the display of "Unknown Entries: reuse_lease: ... " in dhpcd-logs. Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: .../{oldcore/111 => core/153}/filelists/logwatch | 0 lfs/logwatch | 1 + .../logwatch-7.5.4-dhcpd_reuse_lease_entries.patch | 15 +++++++++++++++ 3 files changed, 16 insertions(+) copy config/rootfiles/{oldcore/111 => core/153}/filelists/logwatch (100%) create mode 100644 src/patches/logwatch/logwatch-7.5.4-dhcpd_reuse_lease_entries.patch Difference in files: diff --git a/config/rootfiles/core/153/filelists/logwatch b/config/rootfiles/core/153/filelists/logwatch new file mode 120000 index 000000000..f14eabda9 --- /dev/null +++ b/config/rootfiles/core/153/filelists/logwatch @@ -0,0 +1 @@ +../../../common/logwatch \ No newline at end of file diff --git a/lfs/logwatch b/lfs/logwatch index 509201743..abf1ba02f 100644 --- a/lfs/logwatch +++ b/lfs/logwatch @@ -73,6 +73,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && sed -e "s/^TEMPDIR=.*/TEMPDIR=\"\/tmp\"/g" -i install_logwatch.sh cd $(DIR_APP)/lib && patch < $(DIR_SRC)/src/patches/logwatch/logwatch-7.3.6-date_manip6.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/logwatch/logwatch-7.5.4-dhcpd_reuse_lease_entries.patch @cd $(DIR_APP) && chmod 755 install_logwatch.sh cd $(DIR_APP) && yes "" | ./install_logwatch.sh diff --git a/src/patches/logwatch/logwatch-7.5.4-dhcpd_reuse_lease_entries.patch b/src/patches/logwatch/logwatch-7.5.4-dhcpd_reuse_lease_entries.patch new file mode 100644 index 000000000..a66170ae5 --- /dev/null +++ b/src/patches/logwatch/logwatch-7.5.4-dhcpd_reuse_lease_entries.patch @@ -0,0 +1,15 @@ +diff --git a/scripts/services/dhcpd b/scripts/services/dhcpd +index 87312f7..bb5cd4c 100644 +--- a/scripts/services/dhcpd ++++ b/scripts/services/dhcpd +@@ -79,7 +79,9 @@ while (my $line = <STDIN>) { + ($line =~ /^Solicit message from/) or + ($line =~ /^Sending Advertise to/) or + ($line =~ /^pool [0-9a-f]+ /) or +- ($line =~ /^[^ ]* file: /) ++ ($line =~ /^[^ ]* file: /) or ++ ($line =~ /^reuse_lease: lease age \d+ $secs$ under \d+\% threshold, reply with unaltered, existing lease for/) or ++ 0 # noop, but makes diffs easier when appending ignore statements + ) { + # Ignore these lines + } elsif ($line =~ s/Listening on\s+//) { 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 October 2020