Development February 2021

development@lists.ipfire.org

15 participants
89 discussions

[PATCH] WIO - Patch PPPOE show right Icon
by Stephan Feddersen 16 Feb '21

16 Feb '21

--- lfs/wio | 6 +++--- src/wio/wio.cgi | 52 +++++++++++++++++++++++++++---------------------- 2 files changed, 32 insertions(+), 26 deletions(-) diff --git a/lfs/wio b/lfs/wio index b4222f1b5..b65d244d6 100644 --- a/lfs/wio +++ b/lfs/wio @@ -1,6 +1,6 @@ ############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> # +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) 2007-2021 IPFire Team <info(a)ipfire.org> # ############################################################################### ############################################################################### @@ -15,7 +15,7 @@ THISAPP = wio-$(VER) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = wio -PAK_VER = 11 +PAK_VER = 12 ############################################################################### # Top-level Rules diff --git a/src/wio/wio.cgi b/src/wio/wio.cgi index d07332e5e..ac8fc1220 100644 --- a/src/wio/wio.cgi +++ b/src/wio/wio.cgi @@ -3,7 +3,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2017-2020 Stephan Feddersen <sfeddersen(a)ipfire.org> # +# Copyright (C) 2017-2021 Stephan Feddersen <sfeddersen(a)ipfire.org> # # All Rights Reserved. # # # # This program is free software: you can redistribute it and/or modify # @@ -21,7 +21,7 @@ # # ############################################################################### # -# Version: 2020/08/04 21:12:23 +# Version: 2021/02/16 21:32:23 # # This wio.cgi is based on the code from the IPCop WIO Addon # and is extremly adapted to work with IPFire. @@ -1140,7 +1140,16 @@ print" <tr bgcolor='$color{'color22'}' height='20'> <td align='center'>01</td> <td align='center'><font color='$Header::colourred'>$redip</font></td> - <td align='center'><img align='middle' src='$imgstatic/red.png' alt='$Lang::tr{'internet'}' title='$Lang::tr{'internet'}' /></td> +"; + +if ( $netsettings{"RED_TYPE"} eq 'PPPOE' ) { + print"<td align='center'><img align='middle' src='$imgstatic/red.png' alt='$Lang::tr{'internet'}' title='$Lang::tr{'internet'}' /></td>"; +} +else { + print"<td align='center'><img align='middle' src='$imgstatic/red.png' alt='$Lang::tr{'wio_red_lan'}' title='$Lang::tr{'wio_red_lan'}' /></td>"; +} + +print" <td align='center'><font color='$Header::colourgreen'>".$mainsettings{'HOSTNAME'}.".".$mainsettings{'DOMAINNAME'}."</font></td> <td align='center'><font color='$Header::colourred'>".( $redip ne '-' ? (gethostbyaddr(pack("C4", split (/\./, $redip)), 2))[0] : '-' )."</font></td> <td align='center'> @@ -1154,7 +1163,6 @@ close (FILE); foreach (@ddns) { chomp; - @temp = split (/\,/, $_); if ( $temp[7] eq "on" ) { @@ -1336,7 +1344,7 @@ foreach $key (keys %ovpnconfighash) { if (-e "/var/run/$ovpnconfighash{$key}[1]n2n.pid") { my ( @output, @tustate ) = ''; my $tport = $ovpnconfighash{$key}[22]; - my $tnet = new Net::Telnet ( Timeout=>5, Errmode=>'return', Port=>$tport); + my $tnet = new Net::Telnet (Timeout=>5, Errmode=>'return', Port=>$tport); if ($tport ne '') { $tnet->open('127.0.0.1'); @output = $tnet->cmd(String => 'state', Prompt => '/(END.*\n|ERROR:.*\n)/'); @@ -1589,16 +1597,9 @@ my $dotip = length($ipaddresses[$a]) - rindex($ipaddresses[$a],'.'); } if ( $netsettings{"RED_TYPE"} eq 'PPPOE' ) { - my $redipadr = qx'ip addr | grep red0 | grep inet | awk "{print \$2}"'; - my @rednet = split ("/", $redipadr); - chomp ($rednet[1]); - my $red_netmask = General::iporsubtodec($rednet[1]); - my $red_netaddress = Network::get_netaddress("$rednet[0]/$red_netmask"); + print"<td align='center' height='20'><img src='$imgstatic/red.png' alt='$Lang::tr{'internet'}' title='$Lang::tr{'internet'}' /></td>"; + last SWITCH; - if ( &General::IpInSubnet($ipaddresses[$a], $red_netaddress, $red_netmask) ) { - print"<td align='center' height='20'><img src='$imgstatic/red.png' alt='$Lang::tr{'internet'}' title='$Lang::tr{'internet'}' /></td>"; - last SWITCH; - } } else { print"<td align='center'><img align='middle' src='$imgstatic/white.png' alt='$Lang::tr{'wio_unknown_lan'}' title='$Lang::tr{'wio_unknown_lan'}' /></td>"; @@ -1606,17 +1607,20 @@ my $dotip = length($ipaddresses[$a]) - rindex($ipaddresses[$a],'.'); } } -if ( $webinterface[$a] eq 'HTTP' ) { - print"<td align='center'><a title=\"$Lang::tr{'wio_webinterface_link'}\" href=\"http://$names[$a]\" target=\"_blank\">$names[$a]</a></td>"; -} -elsif ( $webinterface[$a] eq 'HTTPS' ) { - print"<td align='center'><a title=\"$Lang::tr{'wio_webinterface_link'}\" href=\"https://$names[$a]\" target=\"_blank\">$names[$a]</a></td>"; -} -else { - print"<td align='center'>$names[$a]</td>"; -} +print"<td align='center'>"; + + if ( $webinterface[$a] eq 'HTTP' ) { + print"<a title=\"$Lang::tr{'wio_webinterface_link'}\" href=\"http://$names[$a]\" target=\"_blank\">$names[$a]</a>"; + } + elsif ( $webinterface[$a] eq 'HTTPS' ) { + print"<a title=\"$Lang::tr{'wio_webinterface_link'}\" href=\"https://$names[$a]\" target=\"_blank\">$names[$a]</a>"; + } + else { + print $names[$a]; + } print" + </td> <td> <table bgcolor='$bgcolor' cellpadding='2' cellspacing='0' width='100%'> <tr height='20'> @@ -2054,6 +2058,8 @@ if ( $wiosettings{'LOGGING'} eq 'on' ) { print" <td width='10%' align='right'><form method='post' action='$ENV{'SCRIPT_NAME'}' enctype='multipart/form-data'><input type='hidden' name='ACTION' value='$Lang::tr{'edit'}1' /><input type='submit' name='SUBMIT' value='$Lang::tr{'wio_edit_set'}' /></form></td> </tr> +<tr><td colspan='4'><b> </b></td></tr> +<tr><td colspan='4' align='right'><b><font size='1' color='grey'>wio-1.3.2-12</font></b></td></tr> </table> "; } -- 2.25.1

1 0

[PATCH v2] sysvinit: Update to 2.98
by Adolf Belka 16 Feb '21

16 Feb '21

- Update sysvinit from 2.88dsf to 2.98 - From version 2.89 mounpoint build was not enabled as standard - Patch created to modify Makefile to define mountpoint to be built - Update of rootfiles - Changelog is ~400 lines long from 2.88dsf to 2.98 - For details see the Changelog in the doc directory in the tarball Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/common/sysvinit | 4 ++++ lfs/sysvinit | 7 ++++--- src/patches/sysvinit-2.98_build_mountpoint.patch | 12 ++++++++++++ 3 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 src/patches/sysvinit-2.98_build_mountpoint.patch diff --git a/config/rootfiles/common/sysvinit b/config/rootfiles/common/sysvinit index ede5aa50d..0b389a7c3 100644 --- a/config/rootfiles/common/sysvinit +++ b/config/rootfiles/common/sysvinit @@ -1,5 +1,6 @@ bin/mountpoint bin/pidof +#etc/inittab.d #sbin/bootlogd #sbin/fstab-decode sbin/halt @@ -14,6 +15,7 @@ sbin/telinit usr/bin/last usr/bin/lastb usr/bin/mesg +#usr/bin/readbootlog usr/bin/utmpdump usr/bin/wall #usr/include/initreq.h @@ -21,8 +23,10 @@ usr/bin/wall #usr/share/man/man1/lastb.1 #usr/share/man/man1/mesg.1 #usr/share/man/man1/mountpoint.1 +#usr/share/man/man1/readbootlog.1 #usr/share/man/man1/utmpdump.1 #usr/share/man/man1/wall.1 +#usr/share/man/man5/initctl.5 #usr/share/man/man5/initscript.5 #usr/share/man/man5/inittab.5 #usr/share/man/man8/bootlogd.8 diff --git a/lfs/sysvinit b/lfs/sysvinit index 0306b5518..e7b715ea4 100644 --- a/lfs/sysvinit +++ b/lfs/sysvinit @@ -24,10 +24,10 @@ include Config -VER = 2.88dsf +VER = 2.98 THISAPP = sysvinit-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 6eda8a97b86e0a6f59dabbf25202aa6f +$(DL_FILE)_MD5 = e3254f7622ea5cf2322b1b386a98ba59 install : $(TARGET) @@ -72,6 +72,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) # Newer C libraries omit this include from sys/types.h. # https://lists.gnu.org/archive/html/bug-gnulib/2016-03/msg00018.html + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/sysvinit-2.98_build_mountpoint.patch cd $(DIR_APP) && sed -i src/mountpoint.c src/bootlogd.c \ -e "/include.*sys\/stat.h/a#include <sys/sysmacros.h>\n" cd $(DIR_APP) && sed -e "s/libcrypt.a/libcrypt.so/g" -i src/Makefile diff --git a/src/patches/sysvinit-2.98_build_mountpoint.patch b/src/patches/sysvinit-2.98_build_mountpoint.patch new file mode 100644 index 000000000..719eff558 --- /dev/null +++ b/src/patches/sysvinit-2.98_build_mountpoint.patch @@ -0,0 +1,12 @@ +diff -aup sysvinit-2.98/src/Makefile.orig sysvinit-2.98/src/Makefile +--- sysvinit-2.98/src/Makefile.orig 2021-02-12 14:31:56.325112868 +0100 ++++ sysvinit-2.98/src/Makefile 2021-02-12 14:31:56.257086870 +0100 +@@ -19,7 +19,7 @@ MANDB := s@^$'\\\\\"$[^\*-]*-\*- codin + # Leave empty if the mountpoint(1) command from util-linux 2.20 + # and above should be used, otherwise set it to yes. + # +-MNTPOINT= ++MNTPOINT=yes + + # For some known distributions we do not build all programs, otherwise we do. + BIN = -- 2.30.1

3 4

Fwd: OpenSSL version 1.1.1j published
by Michael Tremer 16 Feb '21

16 Feb '21

Hello, There is a new release of OpenSSL which fixes a couple of vulnerabilities that we are affected by. I will take care of the update and push it into next as soon as possible. -Michael > Begin forwarded message: > > From: OpenSSL <openssl(a)openssl.org> > Subject: OpenSSL version 1.1.1j published > Date: 16 February 2021 at 16:12:43 GMT > To: openssl-project(a)openssl.org, OpenSSL User Support ML <openssl-users(a)openssl.org>, OpenSSL Announce ML <openssl-announce(a)openssl.org> > Reply-To: openssl-users(a)openssl.org, openssl(a)openssl.org > > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA256 > > > OpenSSL version 1.1.1j released > =============================== > > OpenSSL - The Open Source toolkit for SSL/TLS > https://www.openssl.org/ > > The OpenSSL project team is pleased to announce the release of > version 1.1.1j of our open source toolkit for SSL/TLS. For details > of changes and known issues see the release notes at: > > https://www.openssl.org/news/openssl-1.1.1-notes.html > > OpenSSL 1.1.1j is available for download via HTTP and FTP from the > following master locations (you can find the various FTP mirrors under > https://www.openssl.org/source/mirror.html): > > * https://www.openssl.org/source/ > * ftp://ftp.openssl.org/source/ > > The distribution file name is: > > o openssl-1.1.1j.tar.gz > Size: 9823161 > SHA1 checksum: 04c340b086828eecff9df06dceff196790bb9268 > SHA256 checksum: aaf2fcb575cdf6491b98ab4829abf78a3dec8402b8b81efc8f23c00d443981bf > > The checksums were calculated using the following commands: > > openssl sha1 openssl-1.1.1j.tar.gz > openssl sha256 openssl-1.1.1j.tar.gz > > Yours, > > The OpenSSL Project Team. > > -----BEGIN PGP SIGNATURE----- > > iQEzBAEBCAAdFiEEhlersmDwVrHlGQg52cTSbQ5gRJEFAmAr45gACgkQ2cTSbQ5g > RJFhXAf7BMbLDUqKxw1YnGpUTXRTKe1TSzrOPI/m/yfyn3YHm64HYwTxNy8Idm9Y > V+78djXqhs3VMDDu9ZOmopSLEOOOHvpKE89kj7pHrYnOJcmPE+HNmS0qneOyQZtb > slvYbDhqeyEqNxy/jVlz6Bm/BV57HdbszpAzhv9zTP6hf6aYvNwIFJoPpHznu028 > Knn+qrlkcHizKPY9zG1h8zfK9m6CWGV+S8qeKHERgvlKBz6hAOYC/3f6sZumRr7K > m7jEEjkEvjVzcojXKoY2+C9yeRwJdj8GM2Haa+kdwcW34o4uCOrP+mW+MeBg+4qM > id26+r6cNtTdv7jE4gPWLCKoOZ7CsA== > =baPF > -----END PGP SIGNATURE-----

1 1

[PATCH] dhcp.cgi: Fix incorrect { placement from patch 3724
by Adolf Belka 16 Feb '21

16 Feb '21

- When patch 3724 was created for bug #10743 a curly bracket was placed in the wrong place This results in the overlap of two if loops meaning that there will be no validity check carried out on Default Lease Time if Deny Known Clients is not checked. - This patch moves the { bracket to the right location. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- html/cgi-bin/dhcp.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi index 2ebdde818..867614f2a 100644 --- a/html/cgi-bin/dhcp.cgi +++ b/html/cgi-bin/dhcp.cgi @@ -180,12 +180,12 @@ if ($dhcpsettings{'ACTION'} eq $Lang::tr{'save'}) { if (($dhcpsettings{"START_ADDR_${itf}"}) eq '' && ($dhcpsettings{"END_ADDR_${itf}"}) eq '') { $errormessage = "DHCP on ${itf}: " . $Lang::tr{'dhcp valid range required when deny known clients checked'}; goto ERROR; + } } if (!($dhcpsettings{"DEFAULT_LEASE_TIME_${itf}"} =~ /^\d+$/)) { $errormessage = "DHCP on ${itf}: " . $Lang::tr{'invalid default lease time'} . $dhcpsettings{'DEFAULT_LEASE_TIME_${itf}'}; goto ERROR; - } } if (!($dhcpsettings{"MAX_LEASE_TIME_${itf}"} =~ /^\d+$/)) { -- 2.30.1

2 1

[PATCH] country.cgi: Fix for copy&paste typo
by Matthias Fischer 12 Feb '21

12 Feb '21

Fixes typo in line 103 (<-> is no tab...) Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- html/cgi-bin/country.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/cgi-bin/country.cgi b/html/cgi-bin/country.cgi index 6519aa26c..30111dc21 100644 --- a/html/cgi-bin/country.cgi +++ b/html/cgi-bin/country.cgi @@ -100,7 +100,7 @@ print <<END <div align='center'> <table width='80%'> <tr> -<-><td align='center'><a href='$ENV{'HTTP_REFERER'}'><img src='/images/back.png' alt='$Lang::tr{'back'}' title='$Lang::tr{'back'}' /></a></td> + <td align='center'><a href='$ENV{'HTTP_REFERER'}'><img src='/images/back.png' alt='$Lang::tr{'back'}' title='$Lang::tr{'back'}' /></a></td> </tr> </table> </div> -- 2.18.0

1 0

[PATCH] sysvinit: Update to 2.98
by Adolf Belka 12 Feb '21

12 Feb '21

- Update sysvinit from 2.88dsf to 2.98 - Update of rootfiles - Changelog is ~400 lines long from 2.88dsf to 2.98 - For details see the Changelog in the doc directory in the tarball Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/common/sysvinit | 6 ++++-- lfs/sysvinit | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/config/rootfiles/common/sysvinit b/config/rootfiles/common/sysvinit index ede5aa50d..a6fb1fd04 100644 --- a/config/rootfiles/common/sysvinit +++ b/config/rootfiles/common/sysvinit @@ -1,5 +1,5 @@ -bin/mountpoint bin/pidof +#etc/inittab.d #sbin/bootlogd #sbin/fstab-decode sbin/halt @@ -14,15 +14,17 @@ sbin/telinit usr/bin/last usr/bin/lastb usr/bin/mesg +#usr/bin/readbootlog usr/bin/utmpdump usr/bin/wall #usr/include/initreq.h #usr/share/man/man1/last.1 #usr/share/man/man1/lastb.1 #usr/share/man/man1/mesg.1 -#usr/share/man/man1/mountpoint.1 +#usr/share/man/man1/readbootlog.1 #usr/share/man/man1/utmpdump.1 #usr/share/man/man1/wall.1 +#usr/share/man/man5/initctl.5 #usr/share/man/man5/initscript.5 #usr/share/man/man5/inittab.5 #usr/share/man/man8/bootlogd.8 diff --git a/lfs/sysvinit b/lfs/sysvinit index 0306b5518..93ee98f51 100644 --- a/lfs/sysvinit +++ b/lfs/sysvinit @@ -24,10 +24,10 @@ include Config -VER = 2.88dsf +VER = 2.98 THISAPP = sysvinit-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 6eda8a97b86e0a6f59dabbf25202aa6f +$(DL_FILE)_MD5 = e3254f7622ea5cf2322b1b386a98ba59 install : $(TARGET) -- 2.30.1

3 3

[PATCH] monit: Update to 5.27.2
by Matthias Fischer 12 Feb '21

12 Feb '21

For details see: https://mmonit.com/monit/changes/ Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- lfs/monit | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lfs/monit b/lfs/monit index caaa022e2..615f2febb 100644 --- a/lfs/monit +++ b/lfs/monit @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2021 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 5.27.1 +VER = 5.27.2 THISAPP = monit-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = monit -PAK_VER = 12 +PAK_VER = 13 DEPS = @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 200068f37847e3402f6a9b061c2d327e +$(DL_FILE)_MD5 = 13a0804dae18ef08198c3ace72f9dd60 install : $(TARGET) -- 2.18.0

1 0

[PATCH] wirelessclient.cgi: Fix for bug #12571
by Adolf Belka 12 Feb '21

12 Feb '21

- Wirelessclient shows priority 0 to be most preferred and priority 4 as least preferred. Based on forum posters experience and the wpa_supplicant man page it is the other way round. - This patch moves the least preferred title to priority 0 and vice versa - Will ask bug reporter to test out the patch and confirm it works. The page is only shown if you have a wifi connection on red. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- html/cgi-bin/wirelessclient.cgi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/html/cgi-bin/wirelessclient.cgi b/html/cgi-bin/wirelessclient.cgi index e8c3c9628..b1679c128 100644 --- a/html/cgi-bin/wirelessclient.cgi +++ b/html/cgi-bin/wirelessclient.cgi @@ -602,11 +602,11 @@ sub showEditBox() { </td> <td width='40%'> <select name='PRIO'> - <option value="0" $selected{'PRIO'}{'0'}>0 ($Lang::tr{'most preferred'})</option> + <option value="0" $selected{'PRIO'}{'0'}>0 ($Lang::tr{'least preferred'})</option> <option value="1" $selected{'PRIO'}{'1'}>1</option> <option value="2" $selected{'PRIO'}{'2'}>2</option> <option value="3" $selected{'PRIO'}{'3'}>3</option> - <option value="4" $selected{'PRIO'}{'4'}>4 ($Lang::tr{'least preferred'})</option> + <option value="4" $selected{'PRIO'}{'4'}>4 ($Lang::tr{'most preferred'})</option> </select> </td> <td colspan="2" width='40%'></td> -- 2.30.1

3 3

[PATCH] net-tools: Update to 2.10
by Adolf Belka 12 Feb '21

12 Feb '21

- Update net-tools from 1.60 to 2.10 - Based on guidance from Michael Tremer - new no-hostname patch created to remove all hostname references from makefile - all other patch files removed from lfs as no longer needed - version 2.10 places ifconfig and route tools in bin instead of sbin those tools moved to sbin to keep in line with previous approach - make update replaced by make install as there is no longer a make rule for make update - Updated rootfiles Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/common/net-tools | 10 ++- lfs/net-tools | 22 ++--- src/patches/net-tools-1.60-gcc34-3.patch | 86 ------------------- src/patches/net-tools-1.60-iphdr-redef.patch | 12 --- .../net-tools-1.60-kernel_headers-3.patch | 55 ------------ src/patches/net-tools-1.60-mii_ioctl-1.patch | 27 ------ src/patches/net-tools-1.60-no-hostname.patch | 52 ----------- src/patches/net-tools-2.10-no-hostname.patch | 41 +++++++++ 8 files changed, 61 insertions(+), 244 deletions(-) delete mode 100644 src/patches/net-tools-1.60-gcc34-3.patch delete mode 100644 src/patches/net-tools-1.60-iphdr-redef.patch delete mode 100644 src/patches/net-tools-1.60-kernel_headers-3.patch delete mode 100644 src/patches/net-tools-1.60-mii_ioctl-1.patch delete mode 100644 src/patches/net-tools-1.60-no-hostname.patch create mode 100644 src/patches/net-tools-2.10-no-hostname.patch diff --git a/config/rootfiles/common/net-tools b/config/rootfiles/common/net-tools index 4860b2f0a..0578c1bc0 100644 --- a/config/rootfiles/common/net-tools +++ b/config/rootfiles/common/net-tools @@ -1,17 +1,23 @@ +sbin/ifconfig bin/netstat +sbin/route sbin/arp -sbin/ifconfig #sbin/ipmaddr #sbin/iptunnel sbin/mii-tool sbin/nameif #sbin/plipconfig sbin/rarp -sbin/route sbin/slattach +#usr/share/man/man1/dnsdomainname.1 +#usr/share/man/man1/domainname.1 +#usr/share/man/man1/nisdomainname.1 +#usr/share/man/man1/ypdomainname.1 #usr/share/man/man5/ethers.5 #usr/share/man/man8/arp.8 #usr/share/man/man8/ifconfig.8 +#usr/share/man/man8/ipmaddr.8 +#usr/share/man/man8/iptunnel.8 #usr/share/man/man8/mii-tool.8 #usr/share/man/man8/nameif.8 #usr/share/man/man8/netstat.8 diff --git a/lfs/net-tools b/lfs/net-tools index 3fde55e2d..7a568a260 100644 --- a/lfs/net-tools +++ b/lfs/net-tools @@ -24,10 +24,10 @@ include Config -VER = 1.60 +VER = 2.10 THISAPP = net-tools-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -39,7 +39,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 888774accab40217dde927e21979c165 +$(DL_FILE)_MD5 = 78aae762c95e2d731faf88d482e4cde5 install : $(TARGET) @@ -68,12 +68,8 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/net-tools-1.60-no-hostname.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-gcc34-3.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-kernel_headers-3.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-iphdr-redef.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-mii_ioctl-1.patch + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/net-tools-2.10-no-hostname.patch cd $(DIR_APP) && yes "" | make config cd $(DIR_APP) && sed -i -e 's|HAVE_IP_TOOLS 0|HAVE_IP_TOOLS 1|g' \ -e 's|HAVE_HWSTRIP 1|HAVE_HWSTRIP 0|g' \ @@ -82,6 +78,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) -e 's|HAVE_HWSTRIP 1|HAVE_HWSTRIP 0|g' \ -e 's|# HAVE_MII=0|HAVE_MII=1|g' config.make cd $(DIR_APP) && make - cd $(DIR_APP) && make update + cd $(DIR_APP) && make install + + # Version 2.10 has moved ifconfig and route from sbin to bin + # Move these tools back to sbin to align with previous status in case anyone has + # scripts using these tools with the full pathname defined. + mv -v /bin/{ifconfig,route} /sbin + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/src/patches/net-tools-1.60-gcc34-3.patch b/src/patches/net-tools-1.60-gcc34-3.patch deleted file mode 100644 index e6ec25329..000000000 --- a/src/patches/net-tools-1.60-gcc34-3.patch +++ /dev/null @@ -1,86 +0,0 @@ -Originaly By: Zack Winkles <winkie AT linuxfromscratch DOT org> -Submitted By: Jim Gifford <jim AT linuxfromscratch DOT org> -Date: 2004-06-23 -Initial Package Version: 1.60 -Origin: N/A -Upstream Status: N/A -Description: Fix some occurrences of syntax that GCC 3.4 doesn't like. - -diff -Naur net-tools-1.60.orig/hostname.c net-tools-1.60/hostname.c ---- net-tools-1.60.orig/hostname.c 2001-04-08 17:04:23.000000000 +0000 -+++ net-tools-1.60/hostname.c 2004-06-24 06:22:16.913258663 +0000 -@@ -78,6 +78,7 @@ - fprintf(stderr, _("%s: name too long\n"), program_name); - break; - default: -+ ((void)0); - } - exit(1); - } -@@ -98,6 +99,7 @@ - fprintf(stderr, _("%s: name too long\n"), program_name); - break; - default: -+ ((void)0); - } - exit(1); - }; -@@ -117,6 +119,7 @@ - fprintf(stderr, _("%s: name too long\n"), program_name); - break; - default: -+ ((void)0); - } - exit(1); - }; -@@ -174,6 +177,7 @@ - printf("%s\n", hp->h_name); - break; - default: -+ ((void)0); - } - } - -diff -Naur net-tools-1.60.orig/lib/inet_sr.c net-tools-1.60/lib/inet_sr.c ---- net-tools-1.60.orig/lib/inet_sr.c 2000-02-20 21:46:45.000000000 +0000 -+++ net-tools-1.60/lib/inet_sr.c 2004-06-24 06:22:01.967840446 +0000 -@@ -105,6 +105,7 @@ - case 2: - isnet = 0; break; - default: -+ ((void)0); - } - - /* Fill in the other fields. */ -diff -Naur net-tools-1.60.orig/mii-tool.c net-tools-1.60/mii-tool.c ---- net-tools-1.60.orig/mii-tool.c 2000-05-21 14:31:17.000000000 +0000 -+++ net-tools-1.60/mii-tool.c 2004-06-24 06:22:01.971839755 +0000 -@@ -379,17 +379,17 @@ - /*--------------------------------------------------------------------*/ - - const char *usage = --"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...] -- -V, --version display version information -- -v, --verbose more verbose output -- -R, --reset reset MII to poweron state -- -r, --restart restart autonegotiation -- -w, --watch monitor for link status changes -- -l, --log with -w, write events to syslog -- -A, --advertise=media,... advertise only specified media -- -F, --force=media force specified media technology --media: 100baseT4, 100baseTx-FD, 100baseTx-HD, 10baseT-FD, 10baseT-HD, -- (to advertise both HD and FD) 100baseTx, 10baseT\n"; -+"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...]\n" -+" -V, --version display version information\n" -+" -v, --verbose more verbose output\n" -+" -R, --reset reset MII to poweron state\n" -+" -r, --restart restart autonegotiation\n" -+" -w, --watch monitor for link status changes\n" -+" -l, --log with -w, write events to syslog\n" -+" -A, --advertise=media,... advertise only specified media\n" -+" -F, --force=media force specified media technology\n" -+"media: 100baseT4, 100baseTx-FD, 100baseTx-HD, 10baseT-FD, 10baseT-HD,\n" -+" (to advertise both HD and FD) 100baseTx, 10baseT\n"; - - int main(int argc, char **argv) - { diff --git a/src/patches/net-tools-1.60-iphdr-redef.patch b/src/patches/net-tools-1.60-iphdr-redef.patch deleted file mode 100644 index 23b6dfe01..000000000 --- a/src/patches/net-tools-1.60-iphdr-redef.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur net-tools-1.60.org/iptunnel.c net-tools-1.60/iptunnel.c ---- net-tools-1.60.org/iptunnel.c 2001-04-08 19:04:23.000000000 +0200 -+++ net-tools-1.60/iptunnel.c 2017-02-07 17:37:17.956405434 +0100 -@@ -26,7 +26,7 @@ - #include <sys/socket.h> - #include <sys/ioctl.h> - #include <netinet/in.h> --#include <netinet/ip.h> -+#include <linux/ip.h> - #include <arpa/inet.h> - #if defined(__GLIBC__) && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1)) - #include <net/if.h> diff --git a/src/patches/net-tools-1.60-kernel_headers-3.patch b/src/patches/net-tools-1.60-kernel_headers-3.patch deleted file mode 100644 index 89988f0e7..000000000 --- a/src/patches/net-tools-1.60-kernel_headers-3.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff -Naur net-tools-1.60.org/hostname.c net-tools-1.60/hostname.c ---- net-tools-1.60.org/hostname.c 2001-04-08 19:04:23.000000000 +0200 -+++ net-tools-1.60/hostname.c 2013-08-26 11:56:50.131844273 +0200 -@@ -42,10 +42,16 @@ - #include "config.h" - #include "version.h" - #include "../intl.h" -+#include <linux/version.h> - - #if HAVE_AFDECnet -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0) - #include <netdnet/dn.h> - #endif -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) -+#include <linux/dn.h> -+#endif -+#endif - - char *Release = RELEASE, *Version = "hostname 1.100 (2001-04-14)"; - -diff -Naur net-tools-1.60.org/lib/tr.c net-tools-1.60/lib/tr.c ---- net-tools-1.60.org/lib/tr.c 2000-02-20 22:46:45.000000000 +0100 -+++ net-tools-1.60/lib/tr.c 2013-08-26 11:57:33.675175033 +0200 -@@ -20,7 +20,7 @@ - #include <sys/types.h> - #include <sys/socket.h> - #include <net/if_arp.h> --#include <linux/if_tr.h> -+#include <netinet/if_tr.h> - #include <stdlib.h> - #include <stdio.h> - #include <errno.h> -diff -Naur net-tools-1.60.org/lib/x25_sr.c net-tools-1.60/lib/x25_sr.c ---- net-tools-1.60.org/lib/x25_sr.c 2000-05-20 15:38:10.000000000 +0200 -+++ net-tools-1.60/lib/x25_sr.c 2013-08-26 11:56:50.131844273 +0200 -@@ -22,6 +22,7 @@ - #include <sys/socket.h> - #include <sys/ioctl.h> - #include <linux/x25.h> -+#include <linux/version.h> - #include <ctype.h> - #include <errno.h> - #include <netdb.h> -@@ -77,7 +78,11 @@ - rt.sigdigits=sigdigits; - - /* x25_route_struct.address isn't type struct sockaddr_x25, Why? */ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) - memcpy(&rt.address, &sx25.sx25_addr, sizeof(x25_address)); -+#else -+ memcpy(&rt.address, &sx25.sx25_addr, sizeof(struct x25_address)); -+#endif - - while (*args) { - if (!strcmp(*args,"device") || !strcmp(*args,"dev")) { diff --git a/src/patches/net-tools-1.60-mii_ioctl-1.patch b/src/patches/net-tools-1.60-mii_ioctl-1.patch deleted file mode 100644 index ca8582d51..000000000 --- a/src/patches/net-tools-1.60-mii_ioctl-1.patch +++ /dev/null @@ -1,27 +0,0 @@ -Submitted By: Randy McMurchy <randy_at_linuxfromscratch_dot_org> -Date: 2004-08-27 -Initial Package Version: 1.60 -Upstream Status: N/A (package is unmaintained) -Origin: From Fedora Core (submitted to LFS-Hackers by Kevin White) -Description: Fixes mii-tool when compiled using Linux-2.6.x - -$LastChangedBy: randy $ -$Date: 2004-08-27 21:04:05 -0600 (Fri, 27 Aug 2004) $ - ---- net-tools-1.60/include/mii.h.bar Tue Jul 31 11:49:39 2001 -+++ net-tools-1.60/include/mii.h Tue Jul 31 11:49:33 2001 -@@ -11,11 +11,9 @@ - - /* network interface ioctl's for MII commands */ - #ifndef SIOCGMIIPHY --#define SIOCGMIIPHY (SIOCDEVPRIVATE) /* Read from current PHY */ --#define SIOCGMIIREG (SIOCDEVPRIVATE+1) /* Read any PHY register */ --#define SIOCSMIIREG (SIOCDEVPRIVATE+2) /* Write any PHY register */ --#define SIOCGPARAMS (SIOCDEVPRIVATE+3) /* Read operational parameters */ --#define SIOCSPARAMS (SIOCDEVPRIVATE+4) /* Set operational parameters */ -+#define SIOCGMIIPHY 0x8947 /* Read from current PHY */ -+#define SIOCGMIIREG 0x8948 /* Read any PHY register */ -+#define SIOCSMIIREG 0x8949 /* Write any PHY register */ - #endif - - #include <linux/types.h> diff --git a/src/patches/net-tools-1.60-no-hostname.patch b/src/patches/net-tools-1.60-no-hostname.patch deleted file mode 100644 index e2e34a173..000000000 --- a/src/patches/net-tools-1.60-no-hostname.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- a/Makefile.bak 2014-06-03 19:01:39.758845492 +0000 -+++ b/Makefile 2014-06-03 19:02:34.119171419 +0000 -@@ -76,7 +76,7 @@ - NET_LIB_PATH = lib - NET_LIB_NAME = net-tools - --PROGS := ifconfig hostname arp netstat route rarp slattach plipconfig nameif -+PROGS := ifconfig arp netstat route rarp slattach plipconfig nameif - - -include config.make - ifeq ($(HAVE_IP_TOOLS),1) -@@ -190,9 +190,6 @@ - nameif: nameif.o - $(CC) $(LDFLAGS) -o nameif nameif.o - --hostname: hostname.o -- $(CC) $(LDFLAGS) -o hostname hostname.o $(DNLIB) -- - route: $(NET_LIB) route.o - $(CC) $(LDFLAGS) -o route route.o $(NLIB) $(RESLIB) - -@@ -224,7 +221,6 @@ - install -m 0755 -d ${BASEDIR}/sbin - install -m 0755 -d ${BASEDIR}/bin - install -m 0755 arp ${BASEDIR}/sbin -- install -m 0755 hostname ${BASEDIR}/bin - install -m 0755 ifconfig ${BASEDIR}/sbin - install -m 0755 nameif ${BASEDIR}/sbin - install -m 0755 netstat ${BASEDIR}/bin -@@ -239,21 +235,11 @@ - ifeq ($(HAVE_MII),1) - install -m 0755 mii-tool $(BASEDIR)/sbin - endif -- ln -fs hostname $(BASEDIR)/bin/dnsdomainname -- ln -fs hostname $(BASEDIR)/bin/ypdomainname -- ln -fs hostname $(BASEDIR)/bin/nisdomainname -- ln -fs hostname $(BASEDIR)/bin/domainname --ifeq ($(HAVE_AFDECnet),1) -- ln -fs hostname $(BASEDIR)/bin/nodename --endif - - savebin: - @for i in ${BASEDIR}/sbin/arp ${BASEDIR}/sbin/ifconfig \ - ${BASEDIR}/bin/netstat \ -- ${BASEDIR}/sbin/rarp ${BASEDIR}/sbin/route \ -- ${BASEDIR}/bin/hostname ${BASEDIR}/bin/ypdomainname \ -- ${BASEDIR}/bin/dnsdomainname ${BASEDIR}/bin/nisdomainname \ -- ${BASEDIR}/bin/domainname ; do \ -+ ${BASEDIR}/sbin/rarp ${BASEDIR}/sbin/route; do \ - [ -f $$i ] && cp -f $$i $$i.old ; done ; echo Saved. - - installdata: diff --git a/src/patches/net-tools-2.10-no-hostname.patch b/src/patches/net-tools-2.10-no-hostname.patch new file mode 100644 index 000000000..c96c798ac --- /dev/null +++ b/src/patches/net-tools-2.10-no-hostname.patch @@ -0,0 +1,41 @@ +--- net-tools-2.10/Makefile.orig 2021-01-07 00:22:35.000000000 +0100 ++++ net-tools-2.10/Makefile 2021-02-06 19:30:07.104393812 +0100 +@@ -39,9 +39,6 @@ + ifeq ($(HAVE_ARP_TOOLS),1) + PROGS += arp rarp + endif +-ifeq ($(HAVE_HOSTNAME_TOOLS),1) +-PROGS += hostname +-endif + ifeq ($(HAVE_IP_TOOLS),1) + PROGS += iptunnel ipmaddr + endif +@@ -173,9 +170,6 @@ + nameif: $(NET_LIB) nameif.o + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ nameif.o $(NLIB) $(LDLIBS) + +-hostname: hostname.o +- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ hostname.o $(DNLIB) $(LDLIBS) +- + route: $(NET_LIB) route.o + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ route.o $(NLIB) $(LDLIBS) + +@@ -219,18 +213,6 @@ + install -m 0755 arp ${BASEDIR}${SBINDIR} + install -m 0755 rarp ${BASEDIR}${SBINDIR} + endif +-ifeq ($(HAVE_HOSTNAME_TOOLS),1) +- install -m 0755 hostname ${BASEDIR}${BINDIR} +- ln -fs hostname $(BASEDIR)${BINDIR}/dnsdomainname +-ifeq ($(HAVE_HOSTNAME_SYMLINKS),1) +- ln -fs hostname $(BASEDIR)${BINDIR}/ypdomainname +- ln -fs hostname $(BASEDIR)${BINDIR}/nisdomainname +- ln -fs hostname $(BASEDIR)${BINDIR}/domainname +-endif +-ifeq ($(HAVE_AFDECnet),1) +- ln -fs hostname $(BASEDIR)${BINDIR}/nodename +-endif +-endif + ifeq ($(HAVE_IP_TOOLS),1) + install -m 0755 ipmaddr $(BASEDIR)${SBINDIR} + install -m 0755 iptunnel $(BASEDIR)${SBINDIR} -- 2.30.0

3 5

Pmacct - possible new add-on or package for IPFire
by Jon Murphy 11 Feb '21

11 Feb '21

Sorry if this is a repeat. I looked the the archives and did not locate it. Started a new thread for pmacct - hope that was OK. This is continued from: https://lists.ipfire.org/pipermail/development/2021-January/009174.html <https://lists.ipfire.org/pipermail/development/2021-January/009174.html> >> >> Remains the question, do we need such a tool for measuring IP traffic for a certain ( all ) client(s) in the local network(s). > > We do not urgently need it, but I would like to have that feature at some point. > > I would like it to monitor all traffic though without adding any hosts first, because then we can simply do more with the data. This will be slightly tricky with many hosts, but it isn’t impossible when designed well. There is pmacct which seems to be a good basis to start from without reinventing the wheel and it looks like it performs much better than iptables rules. But I have never actually built it. Michael, I’ve been using pmacct on & off since Oct 2019. There is information here: https://community.ipfire.org/t/pmacct-a-lightweight-passive-network-monitor… <https://community.ipfire.org/t/pmacct-a-lightweight-passive-network-monitor…> My Use Case: I’ve been over-running our data caps for a year and I wanted to track down the main problem(s). I had a good idea of the problem devices but I wanted to be sure. AND I am a big fan of "You can't fix what you can't track". So that means these type of metrics. Hopefully the above thread will give you an idea about pmacct. Regards, Jon

1 0

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development February 2021