Development August 2020

development@lists.ipfire.org

11 participants
55 discussions

[PATCH] Core 148: Exclude location related settings files.
by Stefan Schantl 25 Aug '20

25 Aug '20

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> --- config/rootfiles/oldcore/148/exclude | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/rootfiles/oldcore/148/exclude b/config/rootfiles/oldcore/148/exclude index b22159878..99dd65af1 100644 --- a/config/rootfiles/oldcore/148/exclude +++ b/config/rootfiles/oldcore/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 -- 2.20.1

1 0

[PATCH 01/12] fontconfig: update to 2.13.1
by Michael Tremer 25 Aug '20

25 Aug '20

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> --- config/rootfiles/common/fontconfig | 2 +- lfs/fontconfig | 17 +++-- ...ts-with-integer-width-macros-from-TS.patch | 72 ------------------- 3 files changed, 11 insertions(+), 80 deletions(-) delete mode 100644 src/patches/fontconfig-avoid-conflicts-with-integer-width-macros-from-TS.patch diff --git a/config/rootfiles/common/fontconfig b/config/rootfiles/common/fontconfig index e567d6df3..85fe2f442 100644 --- a/config/rootfiles/common/fontconfig +++ b/config/rootfiles/common/fontconfig @@ -33,7 +33,7 @@ usr/bin/fc-validate #usr/lib/libfontconfig.la #usr/lib/libfontconfig.so usr/lib/libfontconfig.so.1 -usr/lib/libfontconfig.so.1.9.2 +usr/lib/libfontconfig.so.1.12.0 #usr/lib/pkgconfig/fontconfig.pc #usr/share/doc/fontconfig #usr/share/doc/fontconfig/fontconfig-devel diff --git a/lfs/fontconfig b/lfs/fontconfig index 01ac3bb69..cb3f55de4 100644 --- a/lfs/fontconfig +++ b/lfs/fontconfig @@ -24,10 +24,10 @@ include Config -VER = 2.12.1 +VER = 2.13.1 THISAPP = fontconfig-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.bz2 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 = ce55e525c37147eee14cc2de6cc09f6c +$(DL_FILE)_MD5 = 36cdea1058ef13cbbfdabe6cb019dc1c install : $(TARGET) @@ -69,10 +69,13 @@ $(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) && patch -Np1 < $(DIR_SRC)/src/patches/fontconfig-avoid-conflicts-with-integer-width-macros-from-TS.patch - cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && rm -vf src/fcobjshash.h + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-docs cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/src/patches/fontconfig-avoid-conflicts-with-integer-width-macros-from-TS.patch b/src/patches/fontconfig-avoid-conflicts-with-integer-width-macros-from-TS.patch deleted file mode 100644 index cad71707a..000000000 --- a/src/patches/fontconfig-avoid-conflicts-with-integer-width-macros-from-TS.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 20cddc824c6501c2082cac41b162c34cd5fcc530 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem(a)gmail.com> -Date: Sun, 11 Dec 2016 14:32:00 -0800 -Subject: [PATCH] Avoid conflicts with integer width macros from TS - 18661-1:2014 - -glibc 2.25+ has now defined these macros in <limits.h> -https://sourceware.org/git/?p=glibc.git;a=commit;h=5b17fd0da62bf923cb61d1bb7b08cf2e1f1f9c1a - -Signed-off-by: Khem Raj <raj.khem(a)gmail.com> ---- -Upstream-Status: Submitted - - fontconfig/fontconfig.h | 2 +- - src/fcobjs.h | 2 +- - src/fcobjshash.gperf | 2 +- - src/fcobjshash.h | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -Index: fontconfig-2.12.1/fontconfig/fontconfig.h -=================================================================== ---- fontconfig-2.12.1.orig/fontconfig/fontconfig.h -+++ fontconfig-2.12.1/fontconfig/fontconfig.h -@@ -128,7 +128,8 @@ typedef int FcBool; - #define FC_USER_CACHE_FILE ".fonts.cache-" FC_CACHE_VERSION - - /* Adjust outline rasterizer */ --#define FC_CHAR_WIDTH "charwidth" /* Int */ -+#define FC_CHARWIDTH "charwidth" /* Int */ -+#define FC_CHAR_WIDTH FC_CHARWIDTH - #define FC_CHAR_HEIGHT "charheight"/* Int */ - #define FC_MATRIX "matrix" /* FcMatrix */ - -Index: fontconfig-2.12.1/src/fcobjs.h -=================================================================== ---- fontconfig-2.12.1.orig/src/fcobjs.h -+++ fontconfig-2.12.1/src/fcobjs.h -@@ -51,7 +51,7 @@ FC_OBJECT (DPI, FcTypeDouble, NULL) - FC_OBJECT (RGBA, FcTypeInteger, NULL) - FC_OBJECT (SCALE, FcTypeDouble, NULL) - FC_OBJECT (MINSPACE, FcTypeBool, NULL) --FC_OBJECT (CHAR_WIDTH, FcTypeInteger, NULL) -+FC_OBJECT (CHARWIDTH, FcTypeInteger, NULL) - FC_OBJECT (CHAR_HEIGHT, FcTypeInteger, NULL) - FC_OBJECT (MATRIX, FcTypeMatrix, NULL) - FC_OBJECT (CHARSET, FcTypeCharSet, FcCompareCharSet) -Index: fontconfig-2.12.1/src/fcobjshash.gperf -=================================================================== ---- fontconfig-2.12.1.orig/src/fcobjshash.gperf -+++ fontconfig-2.12.1/src/fcobjshash.gperf -@@ -44,7 +44,7 @@ int id; - "rgba",FC_RGBA_OBJECT - "scale",FC_SCALE_OBJECT - "minspace",FC_MINSPACE_OBJECT --"charwidth",FC_CHAR_WIDTH_OBJECT -+"charwidth",FC_CHARWIDTH_OBJECT - "charheight",FC_CHAR_HEIGHT_OBJECT - "matrix",FC_MATRIX_OBJECT - "charset",FC_CHARSET_OBJECT -Index: fontconfig-2.12.1/src/fcobjshash.h -=================================================================== ---- fontconfig-2.12.1.orig/src/fcobjshash.h -+++ fontconfig-2.12.1/src/fcobjshash.h -@@ -284,7 +284,7 @@ FcObjectTypeLookup (register const char - {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str43,FC_CHARSET_OBJECT}, - {-1}, - #line 47 "fcobjshash.gperf" -- {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str45,FC_CHAR_WIDTH_OBJECT}, -+ {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str45,FC_CHARWIDTH_OBJECT}, - #line 48 "fcobjshash.gperf" - {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str46,FC_CHAR_HEIGHT_OBJECT}, - #line 55 "fcobjshash.gperf" -- 2.20.1

1 11

Re: [PATCH] ncdu-1.15.1
by smooky 24 Aug '20

24 Aug '20

Hi Michael.Thanks for the tip. I will stick to it next time.best regardsMarcel Follert null

1 0

[PATCH] lshw-B.02.19.2
by smooky＠v16.de 24 Aug '20

24 Aug '20

>>> https://ezix.org/project/wiki/HardwareLiSter <<< lshw (Hardware Lister) is a small tool to provide detailed information on the hardware configuration of the machine. It can report exact memory configuration, firmware version, mainboard configuration, CPU version and speed, cache configuration, bus speed, etc. Signed-off-by: Marcel Follert (Smooky) <smooky(a)16.de> --- config/rootfiles/packages/lshw | 10 +++++ lfs/lshw | 84 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+) create mode 100644 config/rootfiles/packages/lshw create mode 100644 lfs/lshw diff --git a/config/rootfiles/packages/lshw b/config/rootfiles/packages/lshw new file mode 100644 index 000000000..3987b2f25 --- /dev/null +++ b/config/rootfiles/packages/lshw @@ -0,0 +1,10 @@ +usr/sbin/lshw +#usr/share/locale/fr/LC_MESSAGES/lshw.mo +#usr/share/lshw +#usr/share/lshw/manuf.txt +#usr/share/lshw/oui.txt +#usr/share/lshw/pci.ids +#usr/share/lshw/pnp.ids +#usr/share/lshw/pnpid.txt +#usr/share/lshw/usb.ids +#usr/share/man/man1/lshw.1 diff --git a/lfs/lshw b/lfs/lshw new file mode 100644 index 000000000..1e22bed05 --- /dev/null +++ b/lfs/lshw @@ -0,0 +1,84 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2020 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/>. # +# # +############################################################################### + + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = B.02.19.2 + +THISAPP = lshw-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = lshw +PAK_VER = 1 + +DEPS = + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 8c70d46e906688309095c73ecb9396e3 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xzf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) -- 2.12.2

2 1

[PATCH] ncdu-1.15.1
by smooky＠v16.de 24 Aug '20

24 Aug '20

>>> https://dev.yorhel.nl/ncdu <<< Ncdu is a disk usage analyzer with an ncurses interface. It is designed to find space hogs on a remote server where you don't have an entire graphical setup available, but it is a useful tool even on regular desktop systems. Ncdu aims to be fast, simple and easy to use, and should be able to run in any minimal POSIX-like environment with ncurses installed. Signed-off-by: Marcel Follert (Smooky) <smooky(a)16.de> --- config/rootfiles/packages/ncdu | 2 + lfs/ncdu | 85 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+) create mode 100644 config/rootfiles/packages/ncdu create mode 100644 lfs/ncdu diff --git a/config/rootfiles/packages/ncdu b/config/rootfiles/packages/ncdu new file mode 100644 index 000000000..0dd1d7ac6 --- /dev/null +++ b/config/rootfiles/packages/ncdu @@ -0,0 +1,2 @@ +usr/bin/ncdu +#usr/share/man/man1/ncdu.1 diff --git a/lfs/ncdu b/lfs/ncdu new file mode 100644 index 000000000..0ea9370b2 --- /dev/null +++ b/lfs/ncdu @@ -0,0 +1,85 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2020 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/>. # +# # +############################################################################### + + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.15.1 + +THISAPP = ncdu-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = ncdu +PAK_VER = 1 + +DEPS = + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = af25aa8462a6f29c8a0c4d3d83d186e7 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xvf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) -- 2.12.2

3 4

[PATCH] graphs.pl: Standardize localization strings for disk access graphs
by Matthias Fischer 24 Aug '20

24 Aug '20

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/cfgroot/graphs.pl | 2 +- langs/de/cgi-bin/de.pl | 2 +- langs/en/cgi-bin/en.pl | 2 +- langs/es/cgi-bin/es.pl | 2 +- langs/fr/cgi-bin/fr.pl | 2 +- langs/it/cgi-bin/it.pl | 2 +- langs/nl/cgi-bin/nl.pl | 2 +- langs/pl/cgi-bin/pl.pl | 2 +- langs/tr/cgi-bin/tr.pl | 4 ++-- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl index a7b82fed3..9531a0e37 100644 --- a/config/cfgroot/graphs.pl +++ b/config/cfgroot/graphs.pl @@ -486,7 +486,7 @@ sub updatediskgraph { "--start", "-1".$period, "-r", - "-t ".$disk." ".$Lang::tr{'disk access per'}." ".$Lang::tr{$period."-graph"}, + "-t ".$disk." ".$Lang::tr{'disk access'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "-v ".$Lang::tr{'bytes per second'}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index ef4e4e6c8..b8f50b504 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -803,7 +803,7 @@ 'disconnect' => 'OpenVPN Stop / Trennen', 'disconnected' => 'Getrennt', 'disconnects' => 'Abbrüche', -'disk access per' => 'Festplattenzugriff je', +'disk access' => 'Festplattenzugriff', 'disk usage' => 'Festplattenbelegung', 'display' => 'Anzeige', 'display charset' => 'Display Charset', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 0b1b304a9..d3721fb85 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -823,7 +823,7 @@ 'disconnect' => 'OVPN Stop / Disconnect', 'disconnected' => 'Disconnected', 'disconnects' => 'Disconnects', -'disk access per' => 'Disk Access per', +'disk access' => 'Disk Access', 'disk usage' => 'Disk usage', 'display' => 'Display', 'display charset' => 'Display Charset', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index 8a611e181..f9c079b5b 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -655,7 +655,7 @@ 'disabled' => 'desactivado', 'disconnect' => 'Parar / Desconectar OVPN', 'disconnects' => 'Desconecta', -'disk access per' => 'Acceso a disco por', +'disk access' => 'Acceso a disco', 'disk usage' => 'Uso de disco', 'display' => 'Mostrar', 'display charset' => 'Juego de caracteres a mostrar', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index fc19257bf..7adf1d8c4 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -829,7 +829,7 @@ 'disconnect' => 'OVPN stoppé / déconnecté', 'disconnected' => 'Déconnecté', 'disconnects' => 'Déconnexion', -'disk access per' => 'Accès disque par', +'disk access' => 'Accès disque', 'disk usage' => 'Utilisation disque', 'display' => 'Réglages', 'display charset' => 'Afficher jeu de car.', diff --git a/langs/it/cgi-bin/it.pl b/langs/it/cgi-bin/it.pl index fa4591b67..d07d21c10 100644 --- a/langs/it/cgi-bin/it.pl +++ b/langs/it/cgi-bin/it.pl @@ -733,7 +733,7 @@ 'disabled' => 'disabled', 'disconnect' => 'OVPN Stop / Disconnect', 'disconnects' => 'Disconnects', -'disk access per' => 'Accessi al disco per', +'disk access' => 'Accessi al disco', 'disk usage' => 'utilizzo del disco', 'display' => 'Display', 'display charset' => 'Display Charset', diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl index 4be11d5c1..47e8b0018 100644 --- a/langs/nl/cgi-bin/nl.pl +++ b/langs/nl/cgi-bin/nl.pl @@ -723,7 +723,7 @@ 'disabled' => 'uitgeschakeld', 'disconnect' => 'OVPN Stop / Verbreek', 'disconnects' => 'Verbreekt', -'disk access per' => 'Schijftoegang per', +'disk access' => 'Schijftoegang', 'disk usage' => 'Schijfgebruik', 'display' => 'Scherm', 'display charset' => 'Scherm tekenset', diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl index e77120273..31453d071 100644 --- a/langs/pl/cgi-bin/pl.pl +++ b/langs/pl/cgi-bin/pl.pl @@ -656,7 +656,7 @@ 'disabled' => 'wyłączony', 'disconnect' => 'OVPN Zatrz./Rozłączenie', 'disconnects' => 'Rozłączeń', -'disk access per' => 'Dostepow do dysku na', +'disk access' => 'Dostepow do dysku', 'disk usage' => 'Wykorzystanie dysku', 'display' => 'Wyświetl', 'display charset' => 'Display Charset', diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl index ea2047609..7e7f711c0 100644 --- a/langs/tr/cgi-bin/tr.pl +++ b/langs/tr/cgi-bin/tr.pl @@ -804,7 +804,7 @@ 'disabled' => 'devre dışı', 'disconnect' => 'OVPN Durdur / Bağlantıyı kes', 'disconnects' => 'Bağlantıyı kes', -'disk access per' => 'erişim başına disk', +'disk access' => 'Disk erişim', 'disk usage' => 'Disk kullanımı', 'display' => 'Görünüm', 'display charset' => 'Karakterleri göster', @@ -1295,7 +1295,7 @@ 'gpl please read carefully the general public license and accept it below' => 'Dikkatlice Genel Kamu Lisansını okuyup kabul edin', 'gpl unofficial translation of the general public license v3' => 'Resmi olmayan sürüm-3 Genel Kamu Lisansı çevirisi', 'graph' => 'grafiği', -'graph per' => '-', +'graph per' => 'uzmanı', 'green' => 'YEŞİL', 'green interface' => 'Yeşil Arabirim', 'grouptype' => 'Grup türü:', -- 2.17.1

2 1

[PATCH] graphs.pl: Standardize localization strings for entropy graphs
by Matthias Fischer 24 Aug '20

24 Aug '20

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/cfgroot/graphs.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl index de306710e..9b310d458 100644 --- a/config/cfgroot/graphs.pl +++ b/config/cfgroot/graphs.pl @@ -1142,7 +1142,7 @@ sub updateentropygraph { "-1".$period, "-r", "--lower-limit","0", - "-t $Lang::tr{'entropy'}", + "-t ".$Lang::tr{'entropy'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "-v $Lang::tr{'bit'}", "DEF:entropy=$mainsettings{'RRDLOG'}/collectd/localhost/entropy/entropy.rrd:entropy:AVERAGE", "LINE3:entropy#ff0000:" . sprintf("%-15s", $Lang::tr{'entropy'}), -- 2.17.1

2 1

[PATCH] squid: Update to 4.13
by Matthias Fischer 24 Aug '20

24 Aug '20

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> --- lfs/squid | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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) -- 2.18.0

2 1

[PATCH] perl: Add get_as_name()
by Stefan Schantl 22 Aug '20

22 Aug '20

This function can be use to give the numer of an Autonomous System and get back the stored name from the used location database. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- src/perl/Location.xs | 23 +++++++++++++++++++++++ src/perl/t/Location.t | 7 +++++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/src/perl/Location.xs b/src/perl/Location.xs index 3c347db..7afa3e7 100644 --- a/src/perl/Location.xs +++ b/src/perl/Location.xs @@ -229,6 +229,29 @@ get_continent_code(db, ccode) OUTPUT: RETVAL +SV* +get_as_name(db, as_number) + struct loc_database* db; + unsigned int as_number; + + CODE: + RETVAL = &PL_sv_undef; + + // Lookup AS. + struct loc_as *as; + int err = loc_database_get_as(db, &as, as_number); + if(!err) { + // Get the name of the given AS number. + const char* as_name = loc_as_get_name(as); + + RETVAL = newSVpv(as_name, strlen(as_name)); + + loc_as_unref(as); + } + + OUTPUT: + RETVAL + void DESTROY(db) struct loc_database* db; diff --git a/src/perl/t/Location.t b/src/perl/t/Location.t index ec7f1e0..0d9a1a5 100644 --- a/src/perl/t/Location.t +++ b/src/perl/t/Location.t @@ -12,7 +12,7 @@ use warnings; my $testdb = $ENV{'database'}; my $keyfile = $ENV{'keyfile'}; -use Test::More tests => 8; +use Test::More tests => 9; BEGIN { use_ok('Location') }; ######################### @@ -57,5 +57,8 @@ if(defined($as_number)) { fail("Test 8 - Lookup Autonomous System Number for add $as_number = &Location::lookup_asn($db, "a.b.c.d"); if(defined($as_number)) { fail("Test 9 - Lookup Autonomous System Number for invalid address.") } +my $as_name = &Location::get_as_name($db, "204867"); +ok($as_name eq "Lightning Wire Labs GmbH", "Test 10 - Get name for AS204867."); + my @locations = &Location::database_countries($db); -ok(@locations != 0, "Test 10 - Get database countries."); +ok(@locations != 0, "Test 11 - Get database countries."); -- 2.20.1

1 0

[PATCH 1/2] collectd: Enable conntrack plugin
by Michael Tremer 21 Aug '20

21 Aug '20

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> --- config/collectd/collectd.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf index e336a9d3f..c2316e415 100644 --- a/config/collectd/collectd.conf +++ b/config/collectd/collectd.conf @@ -12,6 +12,7 @@ TypesDB "/usr/share/collectd/types.db" Interval 30 ReadThreads 1 +LoadPlugin conntrack LoadPlugin cpu #LoadPlugin cpufreq LoadPlugin disk -- 2.12.2

1 1

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development August 2020