Development March 2023

development@lists.ipfire.org

11 participants
72 discussions

[PATCH] insert addon rsnapshot
by Gerd Hoerst 13 Mar '23

13 Mar '23

Signed-off-by: Gerd Hoerst <gerd(a)hoerst.net> --- config/rootfiles/packages/rsnapshot | 5 ++ lfs/rsnapshot | 88 +++++++++++++++++++++++++++++ make.sh | 1 + src/paks/rsnapshot/install.sh | 27 +++++++++ src/paks/rsnapshot/uninstall.sh | 26 +++++++++ src/paks/rsnapshot/update.sh | 26 +++++++++ 6 files changed, 173 insertions(+) create mode 100644 config/rootfiles/packages/rsnapshot create mode 100644 lfs/rsnapshot create mode 100644 src/paks/rsnapshot/install.sh create mode 100644 src/paks/rsnapshot/uninstall.sh create mode 100644 src/paks/rsnapshot/update.sh diff --git a/config/rootfiles/packages/rsnapshot b/config/rootfiles/packages/rsnapshot new file mode 100644 index 000000000..f9d833b6e --- /dev/null +++ b/config/rootfiles/packages/rsnapshot @@ -0,0 +1,5 @@ +usr/bin/rsnapshot +usr/bin/rsnapshot-diff +etc/rsnapshot.conf.default +#usr/share/man/man1/rsnapshot-diff.1 +#usr/share/man/man1/rsnapshot.1 diff --git a/lfs/rsnapshot b/lfs/rsnapshot new file mode 100644 index 000000000..b5d61bbce --- /dev/null +++ b/lfs/rsnapshot @@ -0,0 +1,88 @@ +############################################################################### +# # +# 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.4.5 + +THISAPP = rsnapshot-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = https://github.com/rsnapshot/rsnapshot/releases/download/1.4.5 +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = rsnapshot +PAK_VER = 1 +DEPS = "rsync" +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_BLAKE2 = 2a668aa16991b2b4e611c6204cdcd0e8c9593e5f0af5ea89e787a578e73b6f5987514cd7d0252bb78aea1b157ef85aea947686111ca9e3befdb2a8cef0aa9ecd + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) +b2 : $(subst %,%_BLAKE2,$(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 zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && \ + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc + --mandir=/usr/share/man \ + + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + +# cp -avf $(DIR_CONF)/rsnapshot/etc/* /etc/ + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index c083f7fcc..7b9561aba 100755 --- a/make.sh +++ b/make.sh @@ -1506,6 +1506,7 @@ buildipfire() { lfsmake2 libmpeg2 lfsmake2 gnump3d lfsmake2 rsync + lfsmake2 rsnapshot lfsmake2 rpcbind lfsmake2 keyutils lfsmake2 nfs diff --git a/src/paks/rsnapshot/install.sh b/src/paks/rsnapshot/install.sh new file mode 100644 index 000000000..9aafb0d56 --- /dev/null +++ b/src/paks/rsnapshot/install.sh @@ -0,0 +1,27 @@ +#!/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 + +extract_files +restore_backup ${NAME} diff --git a/src/paks/rsnapshot/uninstall.sh b/src/paks/rsnapshot/uninstall.sh new file mode 100644 index 000000000..66f4344eb --- /dev/null +++ b/src/paks/rsnapshot/uninstall.sh @@ -0,0 +1,26 @@ +#!/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 +make_backup ${NAME} +remove_files diff --git a/src/paks/rsnapshot/update.sh b/src/paks/rsnapshot/update.sh new file mode 100644 index 000000000..89c40d0d7 --- /dev/null +++ b/src/paks/rsnapshot/update.sh @@ -0,0 +1,26 @@ +#!/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 -- 2.25.1

1 0

[PATCH] Drop support for entropy graph
by Leo-Andres Hofmann 13 Mar '23

13 Mar '23

Entropy data isn't collected anymore. See 8000bc0 for reference. Signed-off-by: Leo-Andres Hofmann <hofmann(a)leo-andres.de> --- config/cfgroot/graphs.pl | 28 ---------------------------- html/cgi-bin/getrrdimage.cgi | 8 ++------ 2 files changed, 2 insertions(+), 34 deletions(-) diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl index 3368e5aad..8a6735409 100644 --- a/config/cfgroot/graphs.pl +++ b/config/cfgroot/graphs.pl @@ -1169,34 +1169,6 @@ sub getprocesses { return @processesgraph; } -sub updateentropygraph { - my $period = $_[0]; - my @command = ( - @GRAPH_ARGS, - "-", - "--start", - "-1".$period, - "-r", - "--lower-limit","0", - "-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'}), - "VDEF:entrmin=entropy,MINIMUM", - "VDEF:entrmax=entropy,MAXIMUM", - "VDEF:entravg=entropy,AVERAGE", - "GPRINT:entrmax:" . sprintf("%12s\\: %%5.0lf", $Lang::tr{'maximum'}), - "GPRINT:entrmin:" . sprintf("%12s\\: %%5.0lf", $Lang::tr{'minimum'}), - "GPRINT:entravg:" . sprintf("%12s\\: %%5.0lf", $Lang::tr{'average'}) . "\\n", - "--color=BACK".$color{"color21"}, - ); - - RRDs::graph (@command); - $ERROR = RRDs::error; - - return "Error in RRD::graph for entropy: ".$ERROR."\n" if $ERROR; -} - sub updateconntrackgraph { my $period = $_[0]; my @command = ( diff --git a/html/cgi-bin/getrrdimage.cgi b/html/cgi-bin/getrrdimage.cgi index 6ec91cc92..f80f0138f 100644 --- a/html/cgi-bin/getrrdimage.cgi +++ b/html/cgi-bin/getrrdimage.cgi @@ -35,7 +35,7 @@ require "${General::swroot}/graphs.pl"; # List of graph origins that getrrdimage.cgi can process directly # (unknown origins are forwarded to ensure compatibility) -my @supported_origins = ("entropy.cgi", "hardwaregraphs.cgi", "media.cgi", +my @supported_origins = ("hardwaregraphs.cgi", "media.cgi", "memory.cgi", "netexternal.cgi", "netinternal.cgi", "netother.cgi", "netovpnrw.cgi", "netovpnsrv.cgi", "qos.cgi", "services.cgi", "system.cgi"); @@ -80,11 +80,7 @@ _start_svg_output(); # Graphs are first grouped by their origin. # This is because some graph categories require special parameter handling. my $graphstatus = ''; -if($origin eq "entropy.cgi") { ## entropy.cgi - $graphstatus = Graphs::updateentropygraph($range); -# ------ - -} elsif($origin eq "hardwaregraphs.cgi") { ## hardwaregraphs.cgi +if($origin eq "hardwaregraphs.cgi") { ## hardwaregraphs.cgi if($graph eq "hwtemp") { $graphstatus = Graphs::updatehwtempgraph($range); } elsif($graph eq "hwfan") { -- 2.37.1.windows.1

2 1

[PATCH v2] Language files: Fixes bug#12701 - Line removed from proxy.cgi no longer needed in lang files
by Adolf Belka 12 Mar '23

12 Mar '23

- v2 version that has only the removed line in the language files diffs - Line removed from de, en, es & fr - No translations had been done for the other languages for that line. Fixes: Bug#12701 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- doc/language_issues.de | 1 - doc/language_issues.es | 1 - doc/language_issues.fr | 1 - doc/language_missings | 5 ----- langs/de/cgi-bin/de.pl | 1 - langs/en/cgi-bin/en.pl | 1 - langs/es/cgi-bin/es.pl | 1 - langs/fr/cgi-bin/fr.pl | 1 - 8 files changed, 12 deletions(-) diff --git a/doc/language_issues.de b/doc/language_issues.de index 3ba7b4bcf..392416192 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -103,7 +103,6 @@ WARNING: translation string unused: advproxy throttle dskimg WARNING: translation string unused: advproxy throttle mmedia WARNING: translation string unused: advproxy update notification WARNING: translation string unused: advproxy web browser -WARNING: translation string unused: advproxy wpad notice WARNING: translation string unused: again WARNING: translation string unused: age seconds WARNING: translation string unused: age shour diff --git a/doc/language_issues.es b/doc/language_issues.es index e84e38a87..501f60764 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -105,7 +105,6 @@ WARNING: translation string unused: advproxy throttle mmedia WARNING: translation string unused: advproxy update information WARNING: translation string unused: advproxy update notification WARNING: translation string unused: advproxy web browser -WARNING: translation string unused: advproxy wpad notice WARNING: translation string unused: again WARNING: translation string unused: age seconds WARNING: translation string unused: age shour diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 7677e61c3..bbf686b74 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -108,7 +108,6 @@ WARNING: translation string unused: advproxy throttle mmedia WARNING: translation string unused: advproxy update information WARNING: translation string unused: advproxy update notification WARNING: translation string unused: advproxy web browser -WARNING: translation string unused: advproxy wpad notice WARNING: translation string unused: again WARNING: translation string unused: age seconds WARNING: translation string unused: age shour diff --git a/doc/language_missings b/doc/language_missings index 72c724243..1b4e231e2 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -157,7 +157,6 @@ < advproxy wpad example dst_noproxy_url < advproxy wpad label dst_noproxy_ip < advproxy wpad label dst_noproxy_url -< advproxy wpad notice < advproxy wpad title < advproxy wpad view pac < aliases default interface @@ -662,7 +661,6 @@ < advproxy wpad example dst_noproxy_url < advproxy wpad label dst_noproxy_ip < advproxy wpad label dst_noproxy_url -< advproxy wpad notice < advproxy wpad title < advproxy wpad view pac < aliases default interface @@ -1202,7 +1200,6 @@ < advproxy wpad example dst_noproxy_url < advproxy wpad label dst_noproxy_ip < advproxy wpad label dst_noproxy_url -< advproxy wpad notice < advproxy wpad title < advproxy wpad view pac < age second @@ -2181,7 +2178,6 @@ < advproxy wpad example dst_noproxy_url < advproxy wpad label dst_noproxy_ip < advproxy wpad label dst_noproxy_url -< advproxy wpad notice < advproxy wpad title < advproxy wpad view pac < age second @@ -3150,7 +3146,6 @@ < advproxy wpad example dst_noproxy_url < advproxy wpad label dst_noproxy_ip < advproxy wpad label dst_noproxy_url -< advproxy wpad notice < advproxy wpad title < advproxy wpad view pac < aliases default interface diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index a57b62ad8..33730f0c3 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -410,7 +410,6 @@ 'advproxy wpad example dst_noproxy_url' => 'z.B. *.ipfire.org*', 'advproxy wpad label dst_noproxy_ip' => 'Ausgenommene IP-Subnetze (eins pro Zeile)', 'advproxy wpad label dst_noproxy_url' => 'Ausgenommene URLs (eine pro Zeile)', -'advproxy wpad notice' => 'Hinweis: Damit WPAD/PAC korrekt funktioniert, sind weitere Anpassungen erforderlich. Bitte konsultieren Sie das <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a> für weitere Informationen.', 'advproxy wpad title' => 'Web Proxy Auto-Discovery Protocol (WPAD)/Proxy Auto-Config (PAC)', 'advproxy wpad view pac' => 'PAC-Datei aufrufen', 'again' => 'Wiederholung:', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index cc7704e9d..729516538 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -412,7 +412,6 @@ 'advproxy wpad example dst_noproxy_url' => 'e.g. *.ipfire.org*', 'advproxy wpad label dst_noproxy_ip' => 'Excluded IP Subnets (one per line)', 'advproxy wpad label dst_noproxy_url' => 'Excluded URL s (one per line)', -'advproxy wpad notice' => 'Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>.', 'advproxy wpad title' => 'Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC)', 'advproxy wpad view pac' => 'Open PAC File', 'again' => 'Again:', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index 3daca873c..2e85a5b27 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -409,7 +409,6 @@ 'advproxy wpad example dst_noproxy_url' => 'e.g. *.ipfire.org*', 'advproxy wpad label dst_noproxy_ip' => 'Subredes IP excluidas (una por línea)', 'advproxy wpad label dst_noproxy_url' => 'URL excluidas (una por línea)', -'advproxy wpad notice' => 'Aviso: Para que WPAD/PAC funcione correctamente, es necesario realizar más cambios. Consulte <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>.', 'advproxy wpad title' => 'Protocolo de detección automática de proxy web (WPAD)/Configuración automática de proxy (PAC)', 'advproxy wpad view pac' => 'Abrir archivo PAC', 'again' => 'Otra vez:', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index b09b8673e..6ef4075a1 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -415,7 +415,6 @@ 'advproxy wpad example dst_noproxy_url' => 'Ex. : *.ipfire.org*', 'advproxy wpad label dst_noproxy_ip' => 'Sous-réseaux IP exclus (un par ligne) ', 'advproxy wpad label dst_noproxy_url' => 'URL exclus (une par ligne) ', -'advproxy wpad notice' => 'Note : Pour le fonctionnement correct de WPAD/PAC, d\'autres modifications doivent être apportées. Veuillez consulter le <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>.', 'advproxy wpad title' => 'Protocole de détection automatique du proxy web (WPAD) / config automatique du proxy (PAC)', 'advproxy wpad view pac' => 'Ouvrir fichier PAC ', 'again' => 'De nouveau :', -- 2.39.2

2 1

[PATCH] rules.pl: Proposed patch - Fix for missing bracket
by Matthias Fischer 12 Mar '23

12 Mar '23

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/firewall/rules.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl index 80985ca53..6c08feb86 100644 --- a/config/firewall/rules.pl +++ b/config/firewall/rules.pl @@ -761,7 +761,7 @@ sub ipblocklist () { } # Check if logging is enabled. - if($blocklistsettings{'LOGGING'}) && ($blocklistsettings{'LOGGING'} eq "on")) { + if(($blocklistsettings{'LOGGING'}) && ($blocklistsettings{'LOGGING'} eq "on")) { # Create logging rule. run("$IPTABLES -A ${blocklist}_DROP -j LOG -m limit --limit 10/second --log-prefix \"BLKLST_$blocklist \""); } -- 2.34.1

2 1

Location Database Update
by Charles Brown 12 Mar '23

12 Mar '23

The location database has not updated since Feb 24. Is that to be expected?

3 7

[PATCH 1/2] procy.cgi: Fix bug#12701 - remove advproxy wpad notice line
by Adolf Belka 12 Mar '23

12 Mar '23

- This line is no longer needed with the help button at the top of each WUI page that was implemented by @Leo - Sorry for long time for me to get around to finalising this patch but it is done now. Fixes: bug#12701 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- html/cgi-bin/proxy.cgi | 3 --- 1 file changed, 3 deletions(-) diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index b4073343e..a718d5771 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -1421,9 +1421,6 @@ print <<END <tr> <td colspan="4"> </td> </tr> -<tr> - <td colspan="4">$Lang::tr{'advproxy wpad notice'}</td> -</tr> </table> <hr size='1'> -- 2.39.1

2 3

[PATCH] grep: Update to version 3.9
by Adolf Belka 12 Mar '23

12 Mar '23

- Update from version 3.8 to 3.9 - Update of rootfile not required - Changelog Noteworthy changes in release 3.9 (2023-03-05) [stable] Bug fixes With -P, some non-ASCII UTF8 characters were not recognized as word-constituent due to our omission of the PCRE2_UCP flag. E.g., given f(){ echo Perú|LC_ALL=en_US.UTF-8 grep -Po "$1"; } and this command, echo $(f 'r\w'):$(f '.\b'), before it would print ":r". After the fix, it prints the correct results: "rú:ú". When given multiple patterns the last of which has a back-reference, grep no longer sometimes mistakenly matches lines in some cases. [Bug#36148#13 introduced in grep 3.4] Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- lfs/grep | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/grep b/lfs/grep index deb180348..b1a0ec6aa 100644 --- a/lfs/grep +++ b/lfs/grep @@ -24,7 +24,7 @@ include Config -VER = 3.8 +VER = 3.9 THISAPP = grep-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -50,7 +50,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 24cf6f7aa35c85f59f508969ee9731c5be1e5c613e64e636f464bbdde917bb99ba739e4b82abf08da127ad0400d62e27d139f85142035745121d381982ec6c36 +$(DL_FILE)_BLAKE2 = 33fefce2a831ad6f00f2eb1d8a063cf280635f2d9c481c98981f7a2ff143c846ab570a448c9c02c3ba08cf2c98612cb364d2d033baf92d62c4515315453cc6f9 install : $(TARGET) -- 2.39.2

2 7

[PATCH] netpbm: Fix hardening
by Stefan Schantl 12 Mar '23

12 Mar '23

* Add some additional CFLAGS to workaround a gcc bug with enabled SSP. * Add patch to proper use our LDFLAGS when linking libnetpbm. * Disable stripping the binaries during install. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- netpbm/netpbm.nm | 9 ++++++++- netpbm/patches/netpbm-libnetpbm-use-ldflags.patch | 12 ++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 netpbm/patches/netpbm-libnetpbm-use-ldflags.patch diff --git a/netpbm/netpbm.nm b/netpbm/netpbm.nm index 49488e5fa..cbafb517c 100644 --- a/netpbm/netpbm.nm +++ b/netpbm/netpbm.nm @@ -5,7 +5,7 @@ name = netpbm version = 10.73.42 -release = 1 +release = 2 groups = System/Libraries url = https://netpbm.sourceforge.net/ @@ -37,6 +37,10 @@ build perl(English) end + CFLAGS += \ + -fno-builtin-exit \ + -D__noreturn__= + prepare_cmds # Create config file. cp -avf config.mk.in config.mk @@ -58,6 +62,9 @@ build echo 'JPEGHDR_DIR = %{includedir}' >> config.mk echo 'PNGHDR_DIR = %{includedir}' >> config.mk echo 'ZHDR_DIR = %{includedir}' >> config.mk + + # Do not strip the binaries during install. + echo 'STRIPFLAG =' >> config.mk end build diff --git a/netpbm/patches/netpbm-libnetpbm-use-ldflags.patch b/netpbm/patches/netpbm-libnetpbm-use-ldflags.patch new file mode 100644 index 000000000..21384cb26 --- /dev/null +++ b/netpbm/patches/netpbm-libnetpbm-use-ldflags.patch @@ -0,0 +1,12 @@ +diff -Nur a/lib/Makefile b/lib/Makefile +--- a/lib/Makefile 2019-06-29 01:07:55.000000000 +0200 ++++ b/lib/Makefile 2023-03-12 09:21:25.558949353 +0100 +@@ -128,7 +128,7 @@ + rm -f $@ + $(SYMLINK) $< $@ + libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN): $(LIBOBJECTS) $(LIBOBJECTS_X) +- $(LD) $(LDSHLIB) -o $@ $(LIBOBJECTS) $(LIBOBJECTS_X) \ ++ $(LD) $(LDFLAGS) $(LDSHLIB) -o $@ $(LIBOBJECTS) $(LIBOBJECTS_X) \ + $(SHLIB_CLIB) -lm $(LADD) + endif + -- 2.30.2

1 0

[PATCH] openjade: Use our LDFLAGS when linking the libraries
by Stefan Schantl 11 Mar '23

11 Mar '23

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- openjade/openjade.nm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/openjade/openjade.nm b/openjade/openjade.nm index 717e4dd06..7437215ec 100644 --- a/openjade/openjade.nm +++ b/openjade/openjade.nm @@ -5,7 +5,7 @@ name = openjade version = 1.3.2 -release = 6 +release = 7 groups = Application/Text url = https://openjade.sourceforge.net/ @@ -39,6 +39,11 @@ build %{MACRO_FIX_AUTOTOOLS} end + configure_cmds + # Ensure to use our LDFLAGS when linking the libraries. + sed -i 's/LINKFLAGS =/LINKFLAGS = %{LDFLAGS}/g' Makefile.lib + end + install_cmds # Create symlink for jade ln -s openjade %{BUILDROOT}/usr/bin/jade -- 2.30.2

1 0

[PATCH] traffic.cgi: Do not use hard-coded red interface name
by Stefan Schantl 11 Mar '23

11 Mar '23

If QMI is used the dial in mode has to be set as ppp dialin but the interface name is red. In such a case the old code tried to display the stats for the ppp0 interface which is wrong. This patch fixes this issue by calling the handy function to get the correct interface name for red. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- html/cgi-bin/traffic.cgi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/html/cgi-bin/traffic.cgi b/html/cgi-bin/traffic.cgi index 2f28537d0..67cea7c2e 100644 --- a/html/cgi-bin/traffic.cgi +++ b/html/cgi-bin/traffic.cgi @@ -55,12 +55,12 @@ display_vnstat($netsettings{'GREEN_DEV'}); # Display external network / check if it is PPP or ETH # and dont display if RED_DEV=GREEN_DEV (green only mode) -if ($netsettings{'RED_TYPE'} ne 'PPPOE') { - if ($netsettings{'RED_DEV'} ne $netsettings{'GREEN_DEV'}) { - display_vnstat($netsettings{'RED_DEV'}); - } -} else { - display_vnstat("ppp0"); +if ($netsettings{'RED_DEV'} ne $netsettings{'GREEN_DEV'}) { + # Omit the red interface name. + my $red_iface = &General::get_red_interface(); + + # Display the red stats if a device could be grabbed. + display_vnstat($red_iface) if ($red_iface); } # Check config and display aditional Networks (BLUE and ORANGE) -- 2.30.2

2 1

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development March 2023