diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl index 5ddea348e..65459cc92 100644 --- a/config/cfgroot/header.pl +++ b/config/cfgroot/header.pl @@ -46,7 +46,7 @@ my $menu = \%menuhash; %settings = (); %ethsettings = (); %pppsettings = (); -@URI = (); +my @URI = split('\?', $ENV{'REQUEST_URI'}); ### Make sure this is an SSL request if ($ENV{'SERVER_ADDR'} && $ENV{'HTTPS'} ne 'on') { @@ -573,3 +573,5 @@ sub get_manualpage_url() { # No manual page configured, return nothing return; } + +1; # End of package "Header" diff --git a/config/menu/20-status.menu b/config/menu/20-status.menu index 2bcf0d5e8..f969a3b0b 100644 --- a/config/menu/20-status.menu +++ b/config/menu/20-status.menu @@ -49,7 +49,7 @@ $substatus->{'54.networkovpnsrv'} = { 'caption' => "$Lang::tr{'vpn statistic n2n'}", 'uri' => '/cgi-bin/netovpnsrv.cgi', - 'title' => "$Lang::tr{'vpn statistics n2n'}", + 'title' => "$Lang::tr{'vpn statistic n2n'}", 'enabled' => 1, }; $substatus->{'60.hardwaregraphs'} = { @@ -90,7 +90,7 @@ $substatus->{'75.atm-status'} = {'caption' => 'Atm-status', 'uri' => '/cgi-bin/atm-status.cgi', 'title' => 'Atm-status', - 'enabled' => `find /sys/class/atm/*/device 2>/dev/null`, + 'enabled' => (`find /sys/class/atm/*/device 2>/dev/null` ? 1 : 0), }; $substatus->{'76.mdstat'} = {'caption' => 'Mdstat', 'uri' => '/cgi-bin/mdstat.cgi', diff --git a/config/menu/30-network.menu b/config/menu/30-network.menu index 19571a870..4ef537ed4 100644 --- a/config/menu/30-network.menu +++ b/config/menu/30-network.menu @@ -67,7 +67,7 @@ 'caption' => $Lang::tr{'aliases'}, 'uri' => '/cgi-bin/aliases.cgi', 'title' => "$Lang::tr{'aliases'}", - 'enabled' => `grep "RED_TYPE=STATIC" /var/ipfire/ethernet/settings`, + 'enabled' => (`grep "RED_TYPE=STATIC" /var/ipfire/ethernet/settings` ? 1 : 0), }; $subnetwork->{'80.macadressmenu'} = { 'caption' => $Lang::tr{'mac address menu'}, diff --git a/config/rootfiles/common/bind b/config/rootfiles/common/bind index df3df4f47..0d41c90e5 100644 --- a/config/rootfiles/common/bind +++ b/config/rootfiles/common/bind @@ -274,24 +274,24 @@ usr/bin/nsupdate #usr/include/pk11/site.h #usr/include/pkcs11 #usr/include/pkcs11/pkcs11.h -usr/lib/libbind9-9.16.27.so +usr/lib/libbind9-9.16.28.so #usr/lib/libbind9.la #usr/lib/libbind9.so -usr/lib/libdns-9.16.27.so +usr/lib/libdns-9.16.28.so #usr/lib/libdns.la #usr/lib/libdns.so -usr/lib/libirs-9.16.27.so +usr/lib/libirs-9.16.28.so #usr/lib/libirs.la #usr/lib/libirs.so -usr/lib/libisc-9.16.27.so +usr/lib/libisc-9.16.28.so #usr/lib/libisc.la #usr/lib/libisc.so -usr/lib/libisccc-9.16.27.so +usr/lib/libisccc-9.16.28.so #usr/lib/libisccc.la #usr/lib/libisccc.so -usr/lib/libisccfg-9.16.27.so +usr/lib/libisccfg-9.16.28.so #usr/lib/libisccfg.la #usr/lib/libisccfg.so -usr/lib/libns-9.16.27.so +usr/lib/libns-9.16.28.so #usr/lib/libns.la #usr/lib/libns.so diff --git a/config/rootfiles/common/expat b/config/rootfiles/common/expat index 9901085f2..3911aa90b 100644 --- a/config/rootfiles/common/expat +++ b/config/rootfiles/common/expat @@ -2,20 +2,20 @@ #usr/include/expat.h #usr/include/expat_config.h #usr/include/expat_external.h -#usr/lib/cmake/expat-2.4.6 -#usr/lib/cmake/expat-2.4.6/expat-config-version.cmake -#usr/lib/cmake/expat-2.4.6/expat-config.cmake -#usr/lib/cmake/expat-2.4.6/expat-noconfig.cmake -#usr/lib/cmake/expat-2.4.6/expat.cmake +#usr/lib/cmake/expat-2.4.8 +#usr/lib/cmake/expat-2.4.8/expat-config-version.cmake +#usr/lib/cmake/expat-2.4.8/expat-config.cmake +#usr/lib/cmake/expat-2.4.8/expat-noconfig.cmake +#usr/lib/cmake/expat-2.4.8/expat.cmake #usr/lib/libexpat.la #usr/lib/libexpat.so usr/lib/libexpat.so.1 -usr/lib/libexpat.so.1.8.6 +#usr/lib/libexpat.so.1.8.8 #usr/lib/pkgconfig/expat.pc #usr/share/doc/expat -#usr/share/doc/expat-2.4.6 -#usr/share/doc/expat-2.4.6/ok.min.css -#usr/share/doc/expat-2.4.6/reference.html -#usr/share/doc/expat-2.4.6/style.css +#usr/share/doc/expat-2.4.8 +#usr/share/doc/expat-2.4.8/ok.min.css +#usr/share/doc/expat-2.4.8/reference.html +#usr/share/doc/expat-2.4.8/style.css #usr/share/doc/expat/AUTHORS #usr/share/doc/expat/changelog diff --git a/config/rootfiles/common/libart b/config/rootfiles/common/libart deleted file mode 100644 index 7e98a600d..000000000 --- a/config/rootfiles/common/libart +++ /dev/null @@ -1,53 +0,0 @@ -#usr/bin/libart2-config -#usr/include/libart-2.0 -#usr/include/libart-2.0/libart_lgpl -#usr/include/libart-2.0/libart_lgpl/art_affine.h -#usr/include/libart-2.0/libart_lgpl/art_alphagamma.h -#usr/include/libart-2.0/libart_lgpl/art_bpath.h -#usr/include/libart-2.0/libart_lgpl/art_config.h -#usr/include/libart-2.0/libart_lgpl/art_filterlevel.h -#usr/include/libart-2.0/libart_lgpl/art_gray_svp.h -#usr/include/libart-2.0/libart_lgpl/art_misc.h -#usr/include/libart-2.0/libart_lgpl/art_pathcode.h -#usr/include/libart-2.0/libart_lgpl/art_pixbuf.h -#usr/include/libart-2.0/libart_lgpl/art_point.h -#usr/include/libart-2.0/libart_lgpl/art_rect.h -#usr/include/libart-2.0/libart_lgpl/art_rect_svp.h -#usr/include/libart-2.0/libart_lgpl/art_rect_uta.h -#usr/include/libart-2.0/libart_lgpl/art_render.h -#usr/include/libart-2.0/libart_lgpl/art_render_gradient.h -#usr/include/libart-2.0/libart_lgpl/art_render_mask.h -#usr/include/libart-2.0/libart_lgpl/art_render_svp.h -#usr/include/libart-2.0/libart_lgpl/art_rgb.h -#usr/include/libart-2.0/libart_lgpl/art_rgb_a_affine.h -#usr/include/libart-2.0/libart_lgpl/art_rgb_affine.h -#usr/include/libart-2.0/libart_lgpl/art_rgb_bitmap_affine.h -#usr/include/libart-2.0/libart_lgpl/art_rgb_pixbuf_affine.h -#usr/include/libart-2.0/libart_lgpl/art_rgb_rgba_affine.h -#usr/include/libart-2.0/libart_lgpl/art_rgb_svp.h -#usr/include/libart-2.0/libart_lgpl/art_rgba.h -#usr/include/libart-2.0/libart_lgpl/art_svp.h -#usr/include/libart-2.0/libart_lgpl/art_svp_intersect.h -#usr/include/libart-2.0/libart_lgpl/art_svp_ops.h -#usr/include/libart-2.0/libart_lgpl/art_svp_point.h -#usr/include/libart-2.0/libart_lgpl/art_svp_render_aa.h -#usr/include/libart-2.0/libart_lgpl/art_svp_vpath.h -#usr/include/libart-2.0/libart_lgpl/art_svp_vpath_stroke.h -#usr/include/libart-2.0/libart_lgpl/art_svp_wind.h -#usr/include/libart-2.0/libart_lgpl/art_uta.h -#usr/include/libart-2.0/libart_lgpl/art_uta_ops.h -#usr/include/libart-2.0/libart_lgpl/art_uta_rect.h -#usr/include/libart-2.0/libart_lgpl/art_uta_svp.h -#usr/include/libart-2.0/libart_lgpl/art_uta_vpath.h -#usr/include/libart-2.0/libart_lgpl/art_vpath.h -#usr/include/libart-2.0/libart_lgpl/art_vpath_bpath.h -#usr/include/libart-2.0/libart_lgpl/art_vpath_dash.h -#usr/include/libart-2.0/libart_lgpl/art_vpath_svp.h -#usr/include/libart-2.0/libart_lgpl/libart-features.h -#usr/include/libart-2.0/libart_lgpl/libart.h -#usr/lib/libart_lgpl_2.a -#usr/lib/libart_lgpl_2.la -usr/lib/libart_lgpl_2.so -usr/lib/libart_lgpl_2.so.2 -usr/lib/libart_lgpl_2.so.2.3.21 -#usr/lib/pkgconfig/libart-2.0.pc diff --git a/config/rootfiles/common/libdnet b/config/rootfiles/common/libdnet deleted file mode 100644 index 26288de23..000000000 --- a/config/rootfiles/common/libdnet +++ /dev/null @@ -1,26 +0,0 @@ -usr/bin/dnet-config -#usr/include/dnet -#usr/include/dnet.h -#usr/include/dnet/addr.h -#usr/include/dnet/arp.h -#usr/include/dnet/blob.h -#usr/include/dnet/eth.h -#usr/include/dnet/fw.h -#usr/include/dnet/icmp.h -#usr/include/dnet/intf.h -#usr/include/dnet/ip.h -#usr/include/dnet/ip6.h -#usr/include/dnet/os.h -#usr/include/dnet/rand.h -#usr/include/dnet/route.h -#usr/include/dnet/sctp.h -#usr/include/dnet/tcp.h -#usr/include/dnet/tun.h -#usr/include/dnet/udp.h -usr/lib/libdnet.la -#usr/lib/libdnet.so -usr/lib/libdnet.so.1 -usr/lib/libdnet.so.1.0.1 -#usr/man/man3/dnet.3 -#usr/man/man8/dnet.8 -usr/sbin/dnet diff --git a/config/rootfiles/common/libevent b/config/rootfiles/common/libevent deleted file mode 100644 index 77bbade2e..000000000 --- a/config/rootfiles/common/libevent +++ /dev/null @@ -1,24 +0,0 @@ -#usr/bin/event_rpcgen.py -#usr/include/evdns.h -#usr/include/event-config.h -#usr/include/event.h -#usr/include/evhttp.h -#usr/include/evrpc.h -#usr/include/evutil.h -usr/lib/libevent-1.4.so.2 -usr/lib/libevent-1.4.so.2.2.0 -#usr/lib/libevent.a -#usr/lib/libevent.la -#usr/lib/libevent.so -usr/lib/libevent_core-1.4.so.2 -usr/lib/libevent_core-1.4.so.2.2.0 -#usr/lib/libevent_core.a -#usr/lib/libevent_core.la -#usr/lib/libevent_core.so -usr/lib/libevent_extra-1.4.so.2 -usr/lib/libevent_extra-1.4.so.2.2.0 -#usr/lib/libevent_extra.a -#usr/lib/libevent_extra.la -#usr/lib/libevent_extra.so -#usr/share/man/man3/evdns.3 -#usr/share/man/man3/event.3 diff --git a/config/rootfiles/common/libgcrypt b/config/rootfiles/common/libgcrypt index 8ca5cb325..8e7f74392 100644 --- a/config/rootfiles/common/libgcrypt +++ b/config/rootfiles/common/libgcrypt @@ -6,7 +6,7 @@ #usr/lib/libgcrypt.la #usr/lib/libgcrypt.so usr/lib/libgcrypt.so.20 -usr/lib/libgcrypt.so.20.3.4 +usr/lib/libgcrypt.so.20.4.1 #usr/lib/pkgconfig/libgcrypt.pc #usr/share/aclocal/libgcrypt.m4 #usr/share/info/gcrypt.info diff --git a/config/rootfiles/common/libnl b/config/rootfiles/common/libnl deleted file mode 100644 index 960e1c827..000000000 --- a/config/rootfiles/common/libnl +++ /dev/null @@ -1,60 +0,0 @@ -#usr/include/netlink -#usr/include/netlink/addr.h -#usr/include/netlink/attr.h -#usr/include/netlink/cache-api.h -#usr/include/netlink/cache.h -#usr/include/netlink/data.h -#usr/include/netlink/fib_lookup -#usr/include/netlink/fib_lookup/lookup.h -#usr/include/netlink/fib_lookup/request.h -#usr/include/netlink/genl -#usr/include/netlink/genl/ctrl.h -#usr/include/netlink/genl/family.h -#usr/include/netlink/genl/genl.h -#usr/include/netlink/genl/mngt.h -#usr/include/netlink/handlers.h -#usr/include/netlink/list.h -#usr/include/netlink/msg.h -#usr/include/netlink/netlink-compat.h -#usr/include/netlink/netlink-kernel.h -#usr/include/netlink/netlink.h -#usr/include/netlink/object-api.h -#usr/include/netlink/object.h -#usr/include/netlink/route -#usr/include/netlink/route/addr.h -#usr/include/netlink/route/class-modules.h -#usr/include/netlink/route/class.h -#usr/include/netlink/route/classifier-modules.h -#usr/include/netlink/route/classifier.h -#usr/include/netlink/route/cls -#usr/include/netlink/route/cls/fw.h -#usr/include/netlink/route/cls/police.h -#usr/include/netlink/route/cls/u32.h -#usr/include/netlink/route/link.h -#usr/include/netlink/route/neighbour.h -#usr/include/netlink/route/neightbl.h -#usr/include/netlink/route/nexthop.h -#usr/include/netlink/route/qdisc-modules.h -#usr/include/netlink/route/qdisc.h -#usr/include/netlink/route/route.h -#usr/include/netlink/route/rtnl.h -#usr/include/netlink/route/rule.h -#usr/include/netlink/route/sch -#usr/include/netlink/route/sch/cbq.h -#usr/include/netlink/route/sch/dsmark.h -#usr/include/netlink/route/sch/fifo.h -#usr/include/netlink/route/sch/htb.h -#usr/include/netlink/route/sch/netem.h -#usr/include/netlink/route/sch/prio.h -#usr/include/netlink/route/sch/red.h -#usr/include/netlink/route/sch/sfq.h -#usr/include/netlink/route/sch/tbf.h -#usr/include/netlink/route/tc.h -#usr/include/netlink/socket.h -#usr/include/netlink/types.h -#usr/include/netlink/utils.h -#usr/lib/libnl.a -usr/lib/libnl.so -usr/lib/libnl.so.1 -usr/lib/libnl.so.1.1.4 -#usr/lib/pkgconfig/libnl-1.pc diff --git a/config/rootfiles/common/pigz b/config/rootfiles/common/pigz deleted file mode 100644 index 618d92464..000000000 --- a/config/rootfiles/common/pigz +++ /dev/null @@ -1,2 +0,0 @@ -#usr/bin/pigz -#usr/bin/unpigz diff --git a/config/rootfiles/common/python3-setuptools-rust b/config/rootfiles/common/python3-setuptools-rust index cc21721c5..a35daef85 100644 --- a/config/rootfiles/common/python3-setuptools-rust +++ b/config/rootfiles/common/python3-setuptools-rust @@ -1,12 +1,12 @@ usr/lib/python3.10/site-packages/setuptools_rust -#usr/lib/python3.10/site-packages/setuptools_rust-1.1.2-py3.10.egg-info -#usr/lib/python3.10/site-packages/setuptools_rust-1.1.2-py3.10.egg-info/PKG-INFO -#usr/lib/python3.10/site-packages/setuptools_rust-1.1.2-py3.10.egg-info/SOURCES.txt -#usr/lib/python3.10/site-packages/setuptools_rust-1.1.2-py3.10.egg-info/dependency_links.txt -#usr/lib/python3.10/site-packages/setuptools_rust-1.1.2-py3.10.egg-info/entry_points.txt -#usr/lib/python3.10/site-packages/setuptools_rust-1.1.2-py3.10.egg-info/requires.txt -#usr/lib/python3.10/site-packages/setuptools_rust-1.1.2-py3.10.egg-info/top_level.txt -#usr/lib/python3.10/site-packages/setuptools_rust-1.1.2-py3.10.egg-info/zip-safe +#usr/lib/python3.10/site-packages/setuptools_rust-1.2.0-py3.10.egg-info +#usr/lib/python3.10/site-packages/setuptools_rust-1.2.0-py3.10.egg-info/PKG-INFO +#usr/lib/python3.10/site-packages/setuptools_rust-1.2.0-py3.10.egg-info/SOURCES.txt +#usr/lib/python3.10/site-packages/setuptools_rust-1.2.0-py3.10.egg-info/dependency_links.txt +#usr/lib/python3.10/site-packages/setuptools_rust-1.2.0-py3.10.egg-info/entry_points.txt +#usr/lib/python3.10/site-packages/setuptools_rust-1.2.0-py3.10.egg-info/requires.txt +#usr/lib/python3.10/site-packages/setuptools_rust-1.2.0-py3.10.egg-info/top_level.txt +#usr/lib/python3.10/site-packages/setuptools_rust-1.2.0-py3.10.egg-info/zip-safe usr/lib/python3.10/site-packages/setuptools_rust/__init__.py usr/lib/python3.10/site-packages/setuptools_rust/build.py usr/lib/python3.10/site-packages/setuptools_rust/clean.py diff --git a/config/rootfiles/common/python3-setuptools-scm b/config/rootfiles/common/python3-setuptools-scm index 8f16d3e91..9c37580db 100644 --- a/config/rootfiles/common/python3-setuptools-scm +++ b/config/rootfiles/common/python3-setuptools-scm @@ -1,14 +1,17 @@ #usr/lib/python3.10/site-packages/setuptools_scm -#usr/lib/python3.10/site-packages/setuptools_scm-6.3.2-py3.10.egg-info -#usr/lib/python3.10/site-packages/setuptools_scm-6.3.2-py3.10.egg-info/PKG-INFO -#usr/lib/python3.10/site-packages/setuptools_scm-6.3.2-py3.10.egg-info/SOURCES.txt -#usr/lib/python3.10/site-packages/setuptools_scm-6.3.2-py3.10.egg-info/dependency_links.txt -#usr/lib/python3.10/site-packages/setuptools_scm-6.3.2-py3.10.egg-info/entry_points.txt -#usr/lib/python3.10/site-packages/setuptools_scm-6.3.2-py3.10.egg-info/requires.txt -#usr/lib/python3.10/site-packages/setuptools_scm-6.3.2-py3.10.egg-info/top_level.txt -#usr/lib/python3.10/site-packages/setuptools_scm-6.3.2-py3.10.egg-info/zip-safe +#usr/lib/python3.10/site-packages/setuptools_scm-6.4.2-py3.10.egg-info +#usr/lib/python3.10/site-packages/setuptools_scm-6.4.2-py3.10.egg-info/PKG-INFO +#usr/lib/python3.10/site-packages/setuptools_scm-6.4.2-py3.10.egg-info/SOURCES.txt +#usr/lib/python3.10/site-packages/setuptools_scm-6.4.2-py3.10.egg-info/dependency_links.txt +#usr/lib/python3.10/site-packages/setuptools_scm-6.4.2-py3.10.egg-info/entry_points.txt +#usr/lib/python3.10/site-packages/setuptools_scm-6.4.2-py3.10.egg-info/requires.txt +#usr/lib/python3.10/site-packages/setuptools_scm-6.4.2-py3.10.egg-info/top_level.txt +#usr/lib/python3.10/site-packages/setuptools_scm-6.4.2-py3.10.egg-info/zip-safe #usr/lib/python3.10/site-packages/setuptools_scm/__init__.py #usr/lib/python3.10/site-packages/setuptools_scm/__main__.py +usr/lib/python3.10/site-packages/setuptools_scm/_entrypoints.py +usr/lib/python3.10/site-packages/setuptools_scm/_overrides.py +usr/lib/python3.10/site-packages/setuptools_scm/_types.py #usr/lib/python3.10/site-packages/setuptools_scm/_version_cls.py #usr/lib/python3.10/site-packages/setuptools_scm/config.py #usr/lib/python3.10/site-packages/setuptools_scm/discover.py diff --git a/config/rootfiles/common/python3-tomli b/config/rootfiles/common/python3-tomli index 5c24ff0ea..30605a46a 100644 --- a/config/rootfiles/common/python3-tomli +++ b/config/rootfiles/common/python3-tomli @@ -1,9 +1,9 @@ #usr/lib/python3.10/site-packages/tomli -#usr/lib/python3.10/site-packages/tomli-2.0.0-py3.10.egg-info -#usr/lib/python3.10/site-packages/tomli-2.0.0-py3.10.egg-info/PKG-INFO -#usr/lib/python3.10/site-packages/tomli-2.0.0-py3.10.egg-info/SOURCES.txt -#usr/lib/python3.10/site-packages/tomli-2.0.0-py3.10.egg-info/dependency_links.txt -#usr/lib/python3.10/site-packages/tomli-2.0.0-py3.10.egg-info/top_level.txt +#usr/lib/python3.10/site-packages/tomli-2.0.1-py3.10.egg-info +#usr/lib/python3.10/site-packages/tomli-2.0.1-py3.10.egg-info/PKG-INFO +#usr/lib/python3.10/site-packages/tomli-2.0.1-py3.10.egg-info/SOURCES.txt +#usr/lib/python3.10/site-packages/tomli-2.0.1-py3.10.egg-info/dependency_links.txt +#usr/lib/python3.10/site-packages/tomli-2.0.1-py3.10.egg-info/top_level.txt #usr/lib/python3.10/site-packages/tomli/__init__.py #usr/lib/python3.10/site-packages/tomli/_parser.py #usr/lib/python3.10/site-packages/tomli/_re.py diff --git a/config/rootfiles/common/sdparm b/config/rootfiles/common/sdparm deleted file mode 100644 index 439c42965..000000000 --- a/config/rootfiles/common/sdparm +++ /dev/null @@ -1,6 +0,0 @@ -#usr/bin/sas_disk_blink -#usr/bin/scsi_ch_swp -usr/bin/sdparm -#usr/share/man/man8/sas_disk_blink.8 -#usr/share/man/man8/scsi_ch_swp.8 -#usr/share/man/man8/sdparm.8 diff --git a/config/rootfiles/core/167/filelists/core-files b/config/rootfiles/core/168/core-files similarity index 100% rename from config/rootfiles/core/167/filelists/core-files rename to config/rootfiles/core/168/core-files diff --git a/config/rootfiles/core/167/exclude b/config/rootfiles/core/168/exclude similarity index 100% rename from config/rootfiles/core/167/exclude rename to config/rootfiles/core/168/exclude diff --git a/config/rootfiles/core/168/filelists/aarch64/efibootmgr b/config/rootfiles/core/168/filelists/aarch64/efibootmgr new file mode 120000 index 000000000..55970e1dd --- /dev/null +++ b/config/rootfiles/core/168/filelists/aarch64/efibootmgr @@ -0,0 +1 @@ +../../../../common/aarch64/efibootmgr \ No newline at end of file diff --git a/config/rootfiles/core/167/filelists/bind b/config/rootfiles/core/168/filelists/bind similarity index 100% rename from config/rootfiles/core/167/filelists/bind rename to config/rootfiles/core/168/filelists/bind diff --git a/config/rootfiles/core/168/filelists/expat b/config/rootfiles/core/168/filelists/expat new file mode 120000 index 000000000..e1923cf63 --- /dev/null +++ b/config/rootfiles/core/168/filelists/expat @@ -0,0 +1 @@ +../../../common/expat \ No newline at end of file diff --git a/config/rootfiles/core/168/filelists/files b/config/rootfiles/core/168/filelists/files new file mode 100644 index 000000000..4883ff3ea --- /dev/null +++ b/config/rootfiles/core/168/filelists/files @@ -0,0 +1,6 @@ +etc/rc.d/init.d/networking/any +etc/rc.d/init.d/networking/red +srv/web/ipfire/html/themes/ipfire/include/functions.pl +var/ipfire/header.pl +var/ipfire/menu.d/20-status.menu +var/ipfire/menu.d/30-network.menu diff --git a/config/rootfiles/core/168/filelists/knot b/config/rootfiles/core/168/filelists/knot new file mode 120000 index 000000000..28e96f878 --- /dev/null +++ b/config/rootfiles/core/168/filelists/knot @@ -0,0 +1 @@ +../../../common/knot \ No newline at end of file diff --git a/config/rootfiles/core/168/filelists/libgcrypt b/config/rootfiles/core/168/filelists/libgcrypt new file mode 120000 index 000000000..2df12a20e --- /dev/null +++ b/config/rootfiles/core/168/filelists/libgcrypt @@ -0,0 +1 @@ +../../../common/libgcrypt \ No newline at end of file diff --git a/config/rootfiles/core/168/filelists/libhtp b/config/rootfiles/core/168/filelists/libhtp new file mode 120000 index 000000000..676e2c5e8 --- /dev/null +++ b/config/rootfiles/core/168/filelists/libhtp @@ -0,0 +1 @@ +../../../common/libhtp \ No newline at end of file diff --git a/config/rootfiles/core/168/filelists/libmnl b/config/rootfiles/core/168/filelists/libmnl new file mode 120000 index 000000000..f671c4175 --- /dev/null +++ b/config/rootfiles/core/168/filelists/libmnl @@ -0,0 +1 @@ +../../../common/libmnl \ No newline at end of file diff --git a/config/rootfiles/core/168/filelists/libnfnetlink b/config/rootfiles/core/168/filelists/libnfnetlink new file mode 120000 index 000000000..605e72d90 --- /dev/null +++ b/config/rootfiles/core/168/filelists/libnfnetlink @@ -0,0 +1 @@ +../../../common/libnfnetlink \ No newline at end of file diff --git a/config/rootfiles/core/167/filelists/openssh b/config/rootfiles/core/168/filelists/openssh similarity index 100% rename from config/rootfiles/core/167/filelists/openssh rename to config/rootfiles/core/168/filelists/openssh diff --git a/config/rootfiles/core/168/filelists/openvpn b/config/rootfiles/core/168/filelists/openvpn new file mode 120000 index 000000000..493f3f7a4 --- /dev/null +++ b/config/rootfiles/core/168/filelists/openvpn @@ -0,0 +1 @@ +../../../common/openvpn \ No newline at end of file diff --git a/config/rootfiles/core/168/filelists/perl-libwww b/config/rootfiles/core/168/filelists/perl-libwww new file mode 120000 index 000000000..6b8bff6e1 --- /dev/null +++ b/config/rootfiles/core/168/filelists/perl-libwww @@ -0,0 +1 @@ +../../../common/perl-libwww \ No newline at end of file diff --git a/config/rootfiles/core/168/filelists/squid b/config/rootfiles/core/168/filelists/squid new file mode 120000 index 000000000..2dc8372a0 --- /dev/null +++ b/config/rootfiles/core/168/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/168/filelists/suricata b/config/rootfiles/core/168/filelists/suricata new file mode 120000 index 000000000..f671f6993 --- /dev/null +++ b/config/rootfiles/core/168/filelists/suricata @@ -0,0 +1 @@ +../../../common/suricata \ No newline at end of file diff --git a/config/rootfiles/core/167/filelists/vnstat b/config/rootfiles/core/168/filelists/vnstat similarity index 100% rename from config/rootfiles/core/167/filelists/vnstat rename to config/rootfiles/core/168/filelists/vnstat diff --git a/config/rootfiles/core/168/filelists/whois b/config/rootfiles/core/168/filelists/whois new file mode 120000 index 000000000..60cbd1894 --- /dev/null +++ b/config/rootfiles/core/168/filelists/whois @@ -0,0 +1 @@ +../../../common/whois \ No newline at end of file diff --git a/config/rootfiles/core/168/filelists/x86_64/efibootmgr b/config/rootfiles/core/168/filelists/x86_64/efibootmgr new file mode 120000 index 000000000..d6964dba9 --- /dev/null +++ b/config/rootfiles/core/168/filelists/x86_64/efibootmgr @@ -0,0 +1 @@ +../../../../common/x86_64/efibootmgr \ No newline at end of file diff --git a/config/rootfiles/core/168/update.sh b/config/rootfiles/core/168/update.sh new file mode 100644 index 000000000..44464725b --- /dev/null +++ b/config/rootfiles/core/168/update.sh @@ -0,0 +1,105 @@ +#!/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 3 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) 2022 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=168 + +# Remove old core updates from pakfire cache to save space... +for (( i=1; i<=$core; i++ )); do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Remove files +rm -rvf \ + /usr/bin/dnet-config \ + /usr/bin/sdparm \ + /usr/lib/libart_lgpl_2.so* \ + /usr/lib/libdnet.la \ + /usr/lib/libdnet.so* \ + /usr/lib/libevent-1.4.so* \ + /usr/lib/libevent_core-1.4.so* \ + /usr/lib/libevent_extra-1.4.so* \ + /usr/lib/libnl.so* \ + /usr/lib/libpri.so* \ + /usr/lib/libsolv.so* \ + /usr/lib/libsolvext.so* \ + /usr/sbin/dnet + +# Remove netbpm add-on, if installed +if [ -e "/opt/pakfire/db/installed/meta-netbpm" ]; then + for i in $( @@ -165,7 +158,10 @@ print < @@ -270,5 +266,3 @@ sub openbox { sub closebox { print ""; } - -1; diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 6094c191a..1145745e0 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -2874,7 +2874,6 @@ 'vpn start action start' => 'Immer An', 'vpn statistic n2n' => 'OpenVPN: Netz-zu-Netz-Statistik', 'vpn statistic rw' => 'OpenVPN: Roadwarrior-Statistik', -'vpn statistics n2n' => 'OpenVPN: Netz-zu-Netz-Statistiken', 'vpn subjectaltname' => 'SubjectAlternativeName', 'vpn subjectaltname missing' => 'SubjectAlternativeName darf nicht leer bleiben.', 'vpn wait' => 'WARTE', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 03fc754df..23c01ddb8 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -2949,7 +2949,6 @@ 'vpn start action start' => 'Toujours démarré', 'vpn statistic n2n' => 'OpenVPN (site-à-site)', 'vpn statistic rw' => 'OpenVPN (client nomade)', -'vpn statistics n2n' => 'OpenVPN (site-à-site)', 'vpn subjectaltname' => 'Nom de l\'objet', 'vpn subjectaltname missing' => 'Le nom de l\'objet ne peut être vide.', 'vpn wait' => 'ATTENTE', diff --git a/lfs/bind b/lfs/bind index c558cfa01..e3efc84a1 100644 --- a/lfs/bind +++ b/lfs/bind @@ -25,7 +25,7 @@ include Config -VER = 9.16.27 +VER = 9.16.28 THISAPP = bind-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -43,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 37b49ce81aa5122493a4feb2bb7be53c5d46ff2ce28456aec31ce1332520a09c10bb2293c736bffe7badbc2bc3d156c05f83367678bd101e17b99ca3ff69bebf +$(DL_FILE)_BLAKE2 = 55932faa004c2021cd4c3384c14d4a58ca43d5a853602e271b58c9022256a5ec2eb1317168ac07c2b233b19407ddfb8c7f64a50d93169207cb3b4fe535a78afa install : $(TARGET) diff --git a/lfs/bird b/lfs/bird index c140aa811..591ccc6a7 100644 --- a/lfs/bird +++ b/lfs/bird @@ -26,7 +26,7 @@ include Config SUMMARY = The BIRD Internet Routing Daemon -VER = 2.0.8 +VER = 2.0.9 THISAPP = bird-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = bird -PAK_VER = 8 +PAK_VER = 9 DEPS = @@ -50,7 +50,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 4b36688ac85967ad8c39d9c37dc717d77b1cb5c3ec44a0cf4e84ff38b8d1710d10653a1333b50cd2ede79fd7f012ec86de0baefc9ac18435693ec5b3e43b8a3a +$(DL_FILE)_BLAKE2 = 5226058ba8989a28e8151906e194fd3065276034f1304e0e45772b17f3d8095eff6add211320a23418bfb57b2c16c96594fb85345355e3b870d7bfa2cfe119b9 install : $(TARGET) diff --git a/lfs/borgbackup b/lfs/borgbackup index 9244900bf..bfdc9e3ff 100644 --- a/lfs/borgbackup +++ b/lfs/borgbackup @@ -24,7 +24,7 @@ include Config -VER = 1.1.17 +VER = 1.2.0 SUMMARY = Deduplicating backup program with compression and authenticated encryption THISAPP = borgbackup-$(VER) @@ -33,9 +33,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = borgbackup -PAK_VER = 10 +PAK_VER = 11 -DEPS = +DEPS = python3-pkgconfig SERVICES = @@ -47,7 +47,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 3ceb51f3c2e4ee4e38495ca0bdef2d5c1b30225afe9a3c9987a82f4a1facd4aa203fb21512e655fbbab400bcbd412ff4aefa80242aa21a579e086d38bf3e1078 +$(DL_FILE)_BLAKE2 = 9e6cb8d85ca196cbdd6baba694bc7987d63f85d2ba0e25f3ac1e59400882fff71e29b04ca218ee78f23daeb52d13547062b0c80bd0d3f5b460b28b4f274d11ec install : $(TARGET) diff --git a/lfs/dbus b/lfs/dbus index c854359a0..c816b2c07 100644 --- a/lfs/dbus +++ b/lfs/dbus @@ -26,15 +26,15 @@ include Config SUMMARY = D-Bus Message Bus System -VER = 1.12.20 +VER = 1.14.0 THISAPP = dbus-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = dbus -PAK_VER = 4 +PAK_VER = 5 DEPS = @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = b467526e7e0281db7b8c7c178469fe006dab29ccb1ea197c02495bd297e8de766230b68ed86c4a7e05dbe09ca30ce941a15e0bf8030fe0df66c04febf0534b3b +$(DL_FILE)_BLAKE2 = ae0ebc2779e840e2d83f633029f81fba0e35969648dddce0280640dd9bee3f9508aa7fb6aef696d1c4c56d40f91b754941f847525afaee5cc3170ad23a7eddbf install : $(TARGET) @@ -81,9 +81,12 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_SRC)/dbus* - cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var + cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/lfs/efibootmgr b/lfs/efibootmgr index 9eb9a5304..2b399349c 100644 --- a/lfs/efibootmgr +++ b/lfs/efibootmgr @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team # +# Copyright (C) 2007-2022 IPFire Team # # # # 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,10 +24,10 @@ include Config -VER = 16 +VER = 17 THISAPP = efibootmgr-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -41,7 +41,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 3d09a9d3c4ecd48010315fccae60ab408c0d08e9c734e86a944130ea03e038835fa08745819f5353efbbe36f5017be64faded4b625ef0a0b55d4ca0d612ef232 +$(DL_FILE)_BLAKE2 = a1995a5df74766f762d2eb971fd6095edea8d0a498c9dd1100515866b40c38ae2f299aae51f12767850ec23fbe4709c2c7428dd48755fbec499669b69f6432c9 install : $(TARGET) @@ -72,6 +72,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + # Compile fix + cd $(DIR_APP) && sed -e '/extern int efi_set_verbose/d' -i src/efibootmgr.c + cd $(DIR_APP) && make CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ EFIDIR=$(SNAME) $(MAKETUNING) cd $(DIR_APP) && make install EFIDIR=$(SNAME) diff --git a/lfs/expat b/lfs/expat index 244139682..76f5a8e94 100644 --- a/lfs/expat +++ b/lfs/expat @@ -24,7 +24,7 @@ include Config -VER = 2.4.6 +VER = 2.4.8 THISAPP = expat-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 4f41b019107f1dfc5d1b45fd5844069472e5ad2e5208ef5d7b9e4a9bdb020440d46c5ef1c7cc34fb846fc1f63b37b5ac57b692dfdcb59e52c94383945b0f456d +$(DL_FILE)_BLAKE2 = a829bd94d2cc9b305874ae2539dd4388ea99eaed21d2da17bbd99a1e7735b0f7cb910d096f72c71b128dcb8ffdff9021109e7ff5e562d8cefad228fd8d66f897 install : $(TARGET) diff --git a/lfs/knot b/lfs/knot index e3a9924d4..0c0c033c0 100644 --- a/lfs/knot +++ b/lfs/knot @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2021 IPFire Team # +# Copyright (C) 2007-2022 IPFire Team # # # # 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 = 3.1.1 +VER = 3.1.7 THISAPP = knot-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = d6f9d29de153b5bdea8a294ae3d65131a0bdcc339ecdc507a9e1429a9cc50752e91f14ea84a7446de76869c6f129d571e9b6b4f9b048618941c4f4c0d667dbff +$(DL_FILE)_BLAKE2 = d0e5c999c1b4bca89b86ad956dd91643f795fcba94757e34c44e3e6b925030c332da9cb0bfd72d6ae0f32b3016a8c50d821cfcc513268682dd6b5715714d9047 install : $(TARGET) diff --git a/lfs/libart b/lfs/libart deleted file mode 100644 index b5f463683..000000000 --- a/lfs/libart +++ /dev/null @@ -1,78 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team # -# # -# 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 . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 2.3.21 - -THISAPP = libart_lgpl-$(VER) -DL_FILE = $(THISAPP).tar.bz2 -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_BLAKE2 = 581fbe3b0c52e69543eebb244f9a49046437d907d498aff1fddead24930f7e33067c7ea657917860a1171251b77b09b9520244a2216122c28bf83a71dcb3128b - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -b2 : $(subst %,%_BLAKE2,$(objects)) - -############################################################################### -# Downloading, checking, b2sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_BLAKE2,$(objects)) : - @$(B2SUM) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - $(UPDATE_AUTOMAKE) - cd $(DIR_APP) && ./configure --prefix=/usr - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/libdnet b/lfs/libdnet deleted file mode 100644 index 073685791..000000000 --- a/lfs/libdnet +++ /dev/null @@ -1,80 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team # -# # -# 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 . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 1.14 - -THISAPP = libdnet-libdnet-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_BLAKE2 = 97e241fc374fc9489e70d440db5e19199f4e653650af85e24af56bbbc0167db1c451349c43fcb630a26c61f8ca15c58f5c879e0d82654e275189ca3e140bb22a - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -b2 : $(subst %,%_BLAKE2,$(objects)) - -############################################################################### -# Downloading, checking, b2sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_BLAKE2,$(objects)) : - @$(B2SUM) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - $(UPDATE_AUTOMAKE) - cd $(DIR_APP) && ./configure \ - --prefix=/usr \ - --disable-static - cd $(DIR_APP) && make - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/libevent b/lfs/libevent deleted file mode 100644 index 7a043a6ed..000000000 --- a/lfs/libevent +++ /dev/null @@ -1,78 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team # -# # -# 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 . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 1.4.14b-stable - -THISAPP = libevent-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_BLAKE2 = e4d5c6ff7b479544bf583b8e40c3273237f6d3e0acd07b73b6aebeaac670198d1f9ad269429afc985a488f7ce14343788d7d9bcb78de617d8781bed09de48856 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -b2 : $(subst %,%_BLAKE2,$(objects)) - -############################################################################### -# Downloading, checking, b2sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_BLAKE2,$(objects)) : - @$(B2SUM) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - $(UPDATE_AUTOMAKE) - cd $(DIR_APP) && ./configure --prefix=/usr - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/libgcrypt b/lfs/libgcrypt index 04ced7775..bf81a0645 100644 --- a/lfs/libgcrypt +++ b/lfs/libgcrypt @@ -24,7 +24,7 @@ include Config -VER = 1.9.4 +VER = 1.10.1 THISAPP = libgcrypt-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = b8244bc12a68955797b0c2b474ac5c95df1014231f7180a2ffa113e3aacedc98eed60ee1e4b30b032a5fcd6a04855ae07142c223906d5db9c28328a71e014f33 +$(DL_FILE)_BLAKE2 = 46f30459891183b6d9ec18f1c7907fee0ad156c7dd75044f3db2b4d1c19dc6f30b2dfa6f85bc82adc9243aaba913e40fb6faf77d2226ca5a33897220d032437a install : $(TARGET) diff --git a/lfs/libhtp b/lfs/libhtp index 3dad9955b..ffc82f8cd 100644 --- a/lfs/libhtp +++ b/lfs/libhtp @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2021 IPFire Team # +# Copyright (C) 2007-2022 IPFire Team # # # # 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 = 0.5.39 +VER = 0.5.40 THISAPP = libhtp-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = fec9e2b0dd867becde972e9e2bf572a21d90acc747a8ee8338e2fe68240d690706db01b12c3cf8c6bf1b5d4415da4e4a5bf92a056e1dff96f54a9ac569906712 +$(DL_FILE)_BLAKE2 = 37239d8d0afb6841c54bab1669a17ec7336b10998f8835ef91cf9556dd7449991ce6fb04a408d16b431ba6327b32f6f509a79a4c79ffc6e88e555fcf2e9f2cce install : $(TARGET) diff --git a/lfs/libmnl b/lfs/libmnl index 72273e3aa..9a96cdb7c 100644 --- a/lfs/libmnl +++ b/lfs/libmnl @@ -24,7 +24,7 @@ include Config -VER = 1.0.4 +VER = 1.0.5 THISAPP = libmnl-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = e24ae3e7a8bcfe35a04256c495bb3e9a5ec41b6bea9b7ffa0a8ebc82ce847921d4a44e5be3558239fee5008c10541a9ac3614d1a6b80d280b632a76da16be5e8 +$(DL_FILE)_BLAKE2 = 760ec6f7eaf3f2c6be6edf848551e4c7d16ae7cbe49f9cde297f5df06174fb7f9f490118942225558f0a89dabe9a4901c1b3b23fa1203132e36b86e6332564d6 install : $(TARGET) diff --git a/lfs/libnfnetlink b/lfs/libnfnetlink index 38f9cdc10..f5a15d5c3 100644 --- a/lfs/libnfnetlink +++ b/lfs/libnfnetlink @@ -24,7 +24,7 @@ include Config -VER = 1.0.1 +VER = 1.0.2 THISAPP = libnfnetlink-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 18d6f702afffa1bf2cb6978426f4a1aeab8692a288686c099eb7dfabff23648b4b0f1ac14b4661f16e3d50b6e7d29090d58ce715dac107acb12648e93c5df4f3 +$(DL_FILE)_BLAKE2 = 81c954f6ca2738b321e9319d20741aa15376e88e5f7a0ce1cfa2b02cd104f98d020ab6206bfbc79fc66655f8e40a17bfb65cbce0b1684d9373b809de5a433fc4 install : $(TARGET) diff --git a/lfs/libnl b/lfs/libnl deleted file mode 100644 index 61b458cac..000000000 --- a/lfs/libnl +++ /dev/null @@ -1,80 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team # -# # -# 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 . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 1.1.4 - -THISAPP = libnl-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_BLAKE2 = e6466e15db17fe4725674d77c6cdcefac73e51346f6f4378bc3ea8409c1534519cc28f1123c8201e78f6b95254701a2f9591f907b3cc597ac1210fd3f8b832ea - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -b2 : $(subst %,%_BLAKE2,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# Downloading, checking, b2sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_BLAKE2,$(objects)) : - @$(B2SUM) - -############################################################################### -# 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 - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/libsolv b/lfs/libsolv deleted file mode 100644 index d6efc6488..000000000 --- a/lfs/libsolv +++ /dev/null @@ -1,104 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 IPFire Team # -# # -# 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 . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -SUMMARY = Package dependency solver using a satisfiability algorithm - -VER = 0.7.19 - -THISAPP = libsolv-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) - -PROG = libsolv -DEPS = -PAK_VER = 4 - -SERVICES = - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_BLAKE2 = 32fa800eb3d6ff764499816af9cff3c11210e3845ed28902ee3c2865b4842df1db2a659e1453ac1f7541e6188e264e943b8271465bef0a78a3a982a112b0c58c - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -b2 : $(subst %,%_BLAKE2,$(objects)) - -dist : - @$(PAK) - -############################################################################### -# Downloading, checking, b2sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_BLAKE2,$(objects)) : - @$(B2SUM) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - - # Who releases code with -Werror? - cd $(DIR_APP) && sed -e "s/-Werror//g" -i CMakeLists.txt - - # Disable bindings, examples and tools. - cd $(DIR_APP) && sed "/bindings/d" -i CMakeLists.txt - cd $(DIR_APP) && sed "/examples/d" -i CMakeLists.txt - cd $(DIR_APP) && sed "/tools/d" -i CMakeLists.txt - - cd $(DIR_APP) && mkdir build - cd $(DIR_APP)/build && cmake .. \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=1 \ - -DENABLE_PERL=0 \ - -DENABLE_PYTHON=0 \ - -DENABLE_RUBY=0 - cd $(DIR_APP)/build && make $(PARALELLISMFLAGS) - cd $(DIR_APP)/build && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/lynis b/lfs/lynis index c2fa262b0..bc6b29297 100644 --- a/lfs/lynis +++ b/lfs/lynis @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2021 IPFire Team # +# Copyright (C) 2007-2022 IPFire Team # # # # 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 # @@ -26,7 +26,7 @@ include Config SUMMARY = Security and System auditing tool -VER = 3.0.6 +VER = 3.0.7 THISAPP = lynis-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -35,7 +35,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = lynis -PAK_VER = 10 +PAK_VER = 11 DEPS = @@ -49,7 +49,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 49abad8af63e4eeb3585a241d34433f85f84719a0bbd0c2c1f87a2ab45fc0f88193236f3b10261a59e1c6efd9352134a29b8f311c5a5a749eccede2c8353c6e7 +$(DL_FILE)_BLAKE2 = d9cddcba9c83ddee08ea38c8e80bf6f0a78179ad102673a876a1fe3d4544612e945d8637a8d026ce7bff72b09d6274223031e1cb6fc74596b2c65f0380fecd67 install : $(TARGET) diff --git a/lfs/mc b/lfs/mc index 36d60b416..5c77e544d 100644 --- a/lfs/mc +++ b/lfs/mc @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2021 IPFire Team # +# Copyright (C) 2007-2022 IPFire Team # # # # 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 # @@ -26,7 +26,7 @@ include Config SUMMARY = Midnight Commander -VER = 4.8.27 +VER = 4.8.28 THISAPP = mc-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = mc -PAK_VER = 22 +PAK_VER = 23 DEPS = @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = efb0f3a8beb7285a793085a8e3b3a49619d0f8a4babff7de90f7a462cf6c013bbc08b92bc48e2c2e2204799332cd0160a86e201d9368cabde78e653b4306763f +$(DL_FILE)_BLAKE2 = f4218e6c166df85b7b3736f0fd1414c9507c72074f06001f12b114ce6c6fbbf3688ab850aa70f5063eb3920736f878e113eb39a5d261ccfc3ffa9dab473a8436 install : $(TARGET) diff --git a/lfs/netpbm b/lfs/netpbm deleted file mode 100644 index 03f537abd..000000000 --- a/lfs/netpbm +++ /dev/null @@ -1,99 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 IPFire Team # -# # -# 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 . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -SUMMARY = A Graphics Conversion Package - -VER = 10.73.31 - -THISAPP = netpbm-$(VER) -DL_FILE = $(THISAPP).tgz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = netpbm -PAK_VER = 3 - -DEPS = - -SERVICES = - -CFLAGS += -flax-vector-conversions - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_BLAKE2 = 6bac4048e60e1605edb8d65be51c153431b03f305057dd64e4da912633a539d987cc6bda71960799004cc70faf957fa3e504ed6f24b6c3bb8996b90d34529309 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -b2 : $(subst %,%_BLAKE2,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# Downloading, checking, b2sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_BLAKE2,$(objects)) : - @$(B2SUM) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - rm -rf /usr/netpbm - cp $(DIR_SRC)/config/netpbm/config.mk $(DIR_APP) - cd $(DIR_APP) && make CFLAGS="$(CFLAGS)" #The build of this version cannot be parallelized - cd $(DIR_APP) && make package PKGDIR=/usr/netpbm - mkdir -pv /usr/include/netpbm - mkdir -pv /usr/share/netpbm - mv -fv /usr/netpbm/include/netpbm/* /usr/include/netpbm - mv -fv /usr/netpbm/lib/* /usr/lib - mv -fv /usr/netpbm/bin/* /usr/bin - mv -fv /usr/netpbm/misc/* /usr/share/netpbm - rm -Rfv /usr/netpbm/ - cd /usr/lib && ln -sfv libnetpbm.so.11.73 libnetpbm.so - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/nginx b/lfs/nginx index bf5ebb1a3..a624ca44e 100644 --- a/lfs/nginx +++ b/lfs/nginx @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 IPFire Team # +# Copyright (C) 2007-2022 IPFire Team # # # # 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 # @@ -25,7 +25,7 @@ include Config SUMMARY = A HTTP server and IMAP/POP3 proxy server -VER = 1.19.2 +VER = 1.20.2 THISAPP = nginx-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nginx -PAK_VER = 11 +PAK_VER = 12 DEPS = @@ -47,7 +47,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = db00b5945ed82fe90059269ba987931642981a2b8fa1cb24e0d842b97d89857993f99443c644d9217af29430b868ee8efd90dbc5daefd719d0f98c0766601554 +$(DL_FILE)_BLAKE2 = dc2fb9e7316ccac433c1f06c59d2738358c16194fe0ece80f54d145e2c4e3c3a8d6ebc4badb97580a000d721197a865bcc8c94a4d671af94be4bc3181974c586 install : $(TARGET) diff --git a/lfs/openssh b/lfs/openssh index 8c958e9fe..302ae6041 100644 --- a/lfs/openssh +++ b/lfs/openssh @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 IPFire Team # +# Copyright (C) 2007-2022 IPFire Team # # # # 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 = 8.9p1 +VER = 9.0p1 THISAPP = openssh-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 02934da7f7a2954141888e63e81e38fad4fb8558ddd1032de44f69684802c62771fdd7e9e470e0715059635999c8f9d2ab95f6351217e236573ead83a867f59b +$(DL_FILE)_BLAKE2 = 49724a400951964d659d136908657940f79e150056728cc4dadf8ff8652a832f7fd46eebb47b15085e57fca4b00c77d1ec4dd1b056ea2bbcee89f54a121ed5e2 install : $(TARGET) diff --git a/lfs/openvpn b/lfs/openvpn index 9b2e7853c..27a052ae1 100644 --- a/lfs/openvpn +++ b/lfs/openvpn @@ -24,10 +24,10 @@ include Config -VER = 2.5.4 +VER = 2.5.6 THISAPP = openvpn-$(VER) -DL_FILE = $(THISAPP).tar.xz +DL_FILE = $(THISAPP).tar.gz 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)_BLAKE2 = ebc711981ab93da69ba033f3cf1ea1c99e86f700ec98809a3c401d59a6ecf53f977935aafd37df0233a0498762db01bed0555aeb99ab7e7903274e4d78997301 +$(DL_FILE)_BLAKE2 = d0466d2b95dae892606b6369d2c227add1de43fb708bf1c31a3ef78b28fc37382d501cc559767c8c8358ec28b88d3eb80a0eb915d7872ce30757c7080a37fde2 install : $(TARGET) @@ -69,7 +69,7 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure \ --prefix=/usr \ --sysconfdir=/var/ipfire/ovpn \ diff --git a/lfs/perl-libwww b/lfs/perl-libwww index b10df97ed..cec71ffca 100644 --- a/lfs/perl-libwww +++ b/lfs/perl-libwww @@ -24,7 +24,7 @@ include Config -VER = 6.61 +VER = 6.62 THISAPP = libwww-perl-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 962e81682cad3c12d24d150db4559a133047379aea7f4835d10041591d95cfde2090f5f3fe22750d971524dbae8aaa3c185a5f37f75ad1ce66ba58038164b09c +$(DL_FILE)_BLAKE2 = 8ffdb0572b161d0f8215978749ef620e83b1f54d404bbb9667e85d51cd81a73fc0904fe9af247602587681e8a9e6faca2cd8b868ea8a3376d2e82ae41b9a27ec install : $(TARGET) diff --git a/lfs/pigz b/lfs/pigz deleted file mode 100644 index 7fe9177ef..000000000 --- a/lfs/pigz +++ /dev/null @@ -1,80 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team # -# # -# 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 . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 2.6 - -THISAPP = pigz-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_BLAKE2 = 8e1a8ca593896fc947a7d6ffaa71d9be69d347f7cf1ed2f635b8480aa05708f4679a4768cf3a18ac515ea94dd8352dd4158bd3c9d1b6fdebd82ad1b582d04cba - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -b2 : $(subst %,%_BLAKE2,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# Downloading, checking, b2sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_BLAKE2,$(objects)) : - @$(B2SUM) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && make CFLAGS="$(CFLAGS)" $(MAKETUNING) - cd $(DIR_APP) && install -m 755 pigz /usr/bin/pigz - ln -svf pigz /usr/bin/unpigz - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/python3-botocore b/lfs/python3-botocore index e310d2394..cbda1ca52 100644 --- a/lfs/python3-botocore +++ b/lfs/python3-botocore @@ -24,7 +24,7 @@ include Config -VER = 1.23.21 +VER = 1.24.37 SUMMARY = Python interface for AWS THISAPP = botocore-$(VER) @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = python3-botocore -PAK_VER = 4 +PAK_VER = 5 DEPS = python3-dateutil python3-jmespath python3-urllib3 @@ -47,7 +47,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 18dbd124834a16e5ebf925e8bd1c38ac86a87bbf2c7f10afb2b885833d95bf16893ea287585b3c70d656b888fd59e02b8e1ab4b9eec06d57ba9d1693e1a3fed2 +$(DL_FILE)_BLAKE2 = 5e5495ba399e910479c0172eb4c572a5c0371db720906586c88dc59d8bfc58a50699b05125e1e554a8571b64654604447be1e1a4bfdc2b992272101060638908 install : $(TARGET) diff --git a/lfs/python3-charset-normalizer b/lfs/python3-charset-normalizer index 1a235915c..ef4feb91c 100644 --- a/lfs/python3-charset-normalizer +++ b/lfs/python3-charset-normalizer @@ -24,15 +24,15 @@ include Config -VER = 2.0.10 +VER = 2.0.12 -THISAPP = charset_normalizer-$(VER) +THISAPP = charset-normalizer-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = python3-charset-normalizer -PAK_VER = 1 +PAK_VER = 2 DEPS = @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 935af7625c138f8751de60c4179ee6b0195e99366c7bbecd8e9dfdf09ea557e2eb7cb86830321f91b3b7aa3fc1b3cc376266a4c22d23aabc6dfa6b9db57beb45 +$(DL_FILE)_BLAKE2 = 01a7bbc89df0236ea2383589acd76880065c28137eb201cce7795a7ca4b7c2d471f0b16e68c2022b943e1b4cde530e726cffc36112b0b3626ee32904805b76f3 install : $(TARGET) diff --git a/lfs/python3-click b/lfs/python3-click index e923a8d00..615f5e399 100644 --- a/lfs/python3-click +++ b/lfs/python3-click @@ -24,7 +24,7 @@ include Config -VER = 8.0.3 +VER = 8.1.2 THISAPP = click-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = python3-click -PAK_VER = 1 +PAK_VER = 2 ############################################################################### # Top-level Rules @@ -42,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 9e42e167e26a03b4ddb238943ed5cb4d291231ceb0f56a6e74f9930c8f64f4ae44b0495a85c6abcb2167dc633bbc5e90d1a21da843a799e266e6560a7b3b909d +$(DL_FILE)_BLAKE2 = e0ac04e4583dadba61ca42640f6d75ade30c62bd46b5fd0d15378e00f102f29160190c8ebb01de637c5446d9d06b687bddba4b78b3b3c80bb6e64ba46df866fa install : $(TARGET) diff --git a/lfs/python3-flit b/lfs/python3-flit index c445b623b..36cd59596 100644 --- a/lfs/python3-flit +++ b/lfs/python3-flit @@ -24,7 +24,7 @@ include Config -VER = 3.6.0 +VER = 3.7.1 THISAPP = flit-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = python3-flit -PAK_VER = 1 +PAK_VER = 2 ############################################################################### # Top-level Rules @@ -42,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = c0f81d1429f9f8a51804c1f13cf936272d7c0fe2ba7a19d477a26b42dbde01c539ca0169ae195e9cbf3ef97764b938b6f3241b48e8a48955e0dadf541a116521 +$(DL_FILE)_BLAKE2 = b94f8bbe00c2c5fb28bddbdcf240255ed53ec3b24d2eab1a33e37261cf32a92a0171ea01ad1488384c15f46acbf84d47c4679b318932a3ee78f22c1d161156b0 install : $(TARGET) diff --git a/lfs/python3-jmespath b/lfs/python3-jmespath index 3b6fc8d09..f3bb34ff3 100644 --- a/lfs/python3-jmespath +++ b/lfs/python3-jmespath @@ -24,7 +24,7 @@ include Config -VER = 0.10.0 +VER = 1.0.0 SUMMARY = Python module for declarative JSON document element extraction THISAPP = jmespath-$(VER) @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/jmespath-$(VER) TARGET = $(DIR_INFO)/$(THISAPP) PROG = python3-jmespath -PAK_VER = 4 +PAK_VER = 5 DEPS = @@ -47,7 +47,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 8d827e61363a8d9e974ab465efd05e50ba9ce7a35e2457b43bbdd33a740c5d40dd8c397767709c4a96e157ec31f2e9388ecaed25191ceb77b0574fb4372d5247 +$(DL_FILE)_BLAKE2 = 579a9b3273fb266ea4974aef7a266d084f00169ee645ec8cebbe9d8e838bd4d69c03e952e84a430d6a47de14ee7c7830fffc07dd049929a05945f23dff43f194 install : $(TARGET) diff --git a/lfs/libpri b/lfs/python3-pkgconfig similarity index 85% rename from lfs/libpri rename to lfs/python3-pkgconfig index 3236bbff8..a91aca39b 100644 --- a/lfs/libpri +++ b/lfs/python3-pkgconfig @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team # +# Copyright (C) 2007-2020 IPFire Team # # # # 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,17 +24,16 @@ include Config -SUMMARY = An implementation of Primary Rate ISDN +VER = 1.5.5 +SUMMARY = Python module to interface Python with pkg-config -VER = 1.4.10.2 - -THISAPP = libpri-$(VER) +THISAPP = pkgconfig-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -PROG = libpri -PAK_VER = 2 +PROG = python3-pkgconfig +PAK_VER = 1 DEPS = @@ -48,7 +47,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 62f642ced45c969bf1bc3117110b35e891497de7414da11f622de868188b4b0558194cb39f4bb8941e6229fba1974a4905163f1df92f6f3c25411cf9cfa9b22f +$(DL_FILE)_BLAKE2 = 0eb3ff11b1fdcd3b1b4d3310d408d5f9a036a48c0f3176d77a13e566df35beea8ee6b3afe4c7643cc1808584e525f4d0fac9ab706b751c933f853ed1e9aecd0e install : $(TARGET) @@ -59,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) b2 : $(subst %,%_BLAKE2,$(objects)) dist: - $(PAK) + @$(PAK) ############################################################################### # Downloading, checking, b2sum @@ -81,8 +80,7 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && make $(MAKETUNING) clean all KVERS=$(KVER) \ - CFLAGS="$(CFLAGS)" - cd $(DIR_APP) && make install KVERS=$(KVER) + cd $(DIR_APP) && python3 setup.py build + cd $(DIR_APP) && python3 setup.py install --root=/ @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/python3-pyparsing b/lfs/python3-pyparsing index 270466f44..14920ecce 100644 --- a/lfs/python3-pyparsing +++ b/lfs/python3-pyparsing @@ -24,7 +24,7 @@ include Config -VER = 3.0.6 +VER = 3.0.7 SUMMARY = Grammar Parser Library for Python THISAPP = pyparsing-$(VER) @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = python3-pyparsing -PAK_VER = 4 +PAK_VER = 5 DEPS = @@ -47,7 +47,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = bf79fdb20c6dbcec5a79956ed8c68e56edbadd4d71f44a35107dfb0652c1d2ecbc980c95e729f35f94dce5783ad8159848563dadc529d0f4b48a1ce61e12a3aa +$(DL_FILE)_BLAKE2 = 1f098dd2ae6ffef6f98a44137769198ebad6af1642c1bc784284bedbcd28c617993fb51901d179962ca05f3f8699d24c04b0df5e5e5168a572c0deb506ad4e54 install : $(TARGET) diff --git a/lfs/python3-pytz b/lfs/python3-pytz index 68b7ad652..5567ce74f 100644 --- a/lfs/python3-pytz +++ b/lfs/python3-pytz @@ -24,7 +24,7 @@ include Config -VER = 2021.3 +VER = 2022.1 THISAPP = pytz-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = python3-pytz -PAK_VER = 1 +PAK_VER = 2 ############################################################################### # Top-level Rules @@ -42,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = a5f67650cc4eeaa8030fc7d5b7a66bcc397b95e41b492367981580678e1d535cdb425066d4821d9c5f94e4fd813c669987560030c046fc63ecffa2f46e0c3f89 +$(DL_FILE)_BLAKE2 = 9a745629a9e4547f8c8765353e58baa6d63e3e6b357e9ca88f69928fb9350cebb6bb3371eee419b4b92b29e6253f8c24af8c781f10d72211d78cb699043496fe install : $(TARGET) diff --git a/lfs/python3-s3transfer b/lfs/python3-s3transfer index a8b2e459b..3c18becc2 100644 --- a/lfs/python3-s3transfer +++ b/lfs/python3-s3transfer @@ -24,7 +24,7 @@ include Config -VER = 0.5.0 +VER = 0.5.2 SUMMARY = Python S3 transfer manager THISAPP = s3transfer-$(VER) @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = python3-s3transfer -PAK_VER = 4 +PAK_VER = 5 DEPS = @@ -47,7 +47,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 2ce9235fbffc4c42682345873becac6f0d574ac44de523e10178bf7d115b261acbd1753b1a41ca301b72fa96a6a93314572fe12ea4d286a325a0a36e3cf56b36 +$(DL_FILE)_BLAKE2 = 55adab89ca04a9ed1f0195237cab55f97769a8f865e645437df6d95effcf1a27a734f1577daa981261123b681044b540ebbb876e1a8a3b4cf1cf4e5018f2c213 install : $(TARGET) diff --git a/lfs/python3-semantic-version b/lfs/python3-semantic-version index 2153b0403..8b9979cf4 100644 --- a/lfs/python3-semantic-version +++ b/lfs/python3-semantic-version @@ -24,7 +24,7 @@ include Config -VER = 2.8.5 +VER = 2.9.0 THISAPP = semantic_version-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = python3-semantic-version -PAK_VER = 1 +PAK_VER = 2 ############################################################################### # Top-level Rules @@ -42,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 5f966ca68358d4963b3a41574c100a8f78275445285aebbfa47d1febb0b7a2eb3a638254d4d1bd8e093acbef47a101ef0a0d7a86475313aefa211d2a0a3cfc19 +$(DL_FILE)_BLAKE2 = c487c49ad17e7ca224ca4b6602abb42d1406dad8d70a3f5d0c536160e5b2d706ff0e1497961e3b9e0391c6d773ab7d0e9699f171f5781cec1d36025450cb7019 install : $(TARGET) diff --git a/lfs/python3-setuptools b/lfs/python3-setuptools index 992583153..3575a7a77 100644 --- a/lfs/python3-setuptools +++ b/lfs/python3-setuptools @@ -24,7 +24,7 @@ include Config -VER = 59.5.0 +VER = 62.0.0 SUMMARY = Enhancements to distutils for building and distributing Python packages THISAPP = setuptools-$(VER) @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = python3-setuptools -PAK_VER = 4 +PAK_VER = 5 DEPS = @@ -47,7 +47,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 51b3435a1d7962a06f7cf07c31487a1404274a54a1fae0567c3953686cbf3b3160327a56c599e80ce70fe8f56dc817fc76d0e4371d3622b5c6235b0fdc555980 +$(DL_FILE)_BLAKE2 = 688afed5a19e70a0fd7ab91a8d137e6641597d9f9acf31826216cd59e4632872a9661fe9ca18e45aec5cd40e52956147aa8d40ac2c376380ffa0f01dc2997e63 install : $(TARGET) diff --git a/lfs/python3-setuptools-rust b/lfs/python3-setuptools-rust index 8d8b2cc4b..4bf85961c 100644 --- a/lfs/python3-setuptools-rust +++ b/lfs/python3-setuptools-rust @@ -24,7 +24,7 @@ include Config -VER = 1.1.2 +VER = 1.2.0 THISAPP = setuptools-rust-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 2b66f886db4be992be5f910cd56d1449f0f23d306880755692a53216e6c764bc6ec34e552f5485f444408421ccaeb8cc353d5553cf8a95a1a4daa815f5600167 +$(DL_FILE)_BLAKE2 = 9028e3c02cf1090aaba5c78495d01eb01d3608242ab6b3fab2b76928e199a93bad2e1dbcd94d24689c7d42160c4dd409656f230493801906fc15f4235de7b68c install : $(TARGET) diff --git a/lfs/python3-setuptools-scm b/lfs/python3-setuptools-scm index 8e29b2798..561138c0a 100644 --- a/lfs/python3-setuptools-scm +++ b/lfs/python3-setuptools-scm @@ -24,7 +24,7 @@ include Config -VER = 6.3.2 +VER = 6.4.2 SUMMARY = Python setuptools handler for SCM tags THISAPP = setuptools_scm-$(VER) @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = python3-setuptools-scm -PAK_VER = 2 +PAK_VER = 3 DEPS = @@ -47,7 +47,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 4291f3810dc5ea111a6bad1bf37c8704a7eb6cdd112ea476d629d6175c43cc7d8f78d450181c0e588a5f3fc0fc092fedb41fcb6e198a42f730f9fc6b8d96e343 +$(DL_FILE)_BLAKE2 = e1b5191425cf5db8334761a6857b0bc39c547c167901cbdf8401af441c5941cd75744162417ff42dbac792ae867d71c7576c5e9e533fe8039a75954f4c2ba439 install : $(TARGET) diff --git a/lfs/python3-tomli b/lfs/python3-tomli index bfa6e0a3a..d543b69b9 100644 --- a/lfs/python3-tomli +++ b/lfs/python3-tomli @@ -24,7 +24,7 @@ include Config -VER = 2.0.0 +VER = 2.0.1 THISAPP = tomli-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = python3-tomli -PAK_VER = 1 +PAK_VER = 2 ############################################################################### # Top-level Rules @@ -42,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = b3b17674ed08250e85b3b3b4e57364f201f3c795b6792155a220af5c682eede584aaac02159b5829b70ad7c196036e94d0db1983c7c581b67c574d392026234f +$(DL_FILE)_BLAKE2 = e0e8b6e73ab39fcc6ec7a29cd4368d66b997e4c48b98a38d43ba813e841f33fef305028425474f67aee931118bbf2f05c147b65af729c34d67834802b6a42ad8 install : $(TARGET) diff --git a/lfs/python3-typing-extensions b/lfs/python3-typing-extensions index a7686547a..c3b306097 100644 --- a/lfs/python3-typing-extensions +++ b/lfs/python3-typing-extensions @@ -24,7 +24,7 @@ include Config -VER = 4.0.1 +VER = 4.1.1 THISAPP = typing_extensions-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = python3-typing-extensions -PAK_VER = 1 +PAK_VER = 2 ############################################################################### # Top-level Rules @@ -42,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 66fb0fdb73d434333347b953b6ffb982247f3869a4678f6f6ac6a95cec51bccd2d1109d6e9d9f611786bd3ef144175a1b21a43b5346d5a88c1eb99ad31246528 +$(DL_FILE)_BLAKE2 = 18953565f4181d648faf780db8594963813d0b26d479e5235cd75d262490b479e957f55734bb6d6d22c31fe2ccec1ac5490e7a64a469528d386e5de2751c6b1a install : $(TARGET) diff --git a/lfs/python3-urllib3 b/lfs/python3-urllib3 index ec43d9cd3..411a52b8d 100644 --- a/lfs/python3-urllib3 +++ b/lfs/python3-urllib3 @@ -24,7 +24,7 @@ include Config -VER = 1.26.7 +VER = 1.26.9 SUMMARY = HTTP library with thread-safe connection pooling, file post, and more THISAPP = urllib3-$(VER) @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = python3-urllib3 -PAK_VER = 2 +PAK_VER = 3 DEPS = @@ -47,7 +47,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 5a95ea4df2e5a66ac7f3059b5453e122ae0e40531a23cb743e5a9574778a370d0cee3cb63fe6b29483b27c4a6ec498266ec5a0434db882ce0a79fb8d8400e08d +$(DL_FILE)_BLAKE2 = 1c6b51e4243c18c25bcb53158e645ea71fe33e0d09ca029256bcbe05bf178ba600dd8911c71730bdefc3cf9f65cdfd5740f579d17d293f9ac7c5d3cbff478b6f install : $(TARGET) diff --git a/lfs/rsync b/lfs/rsync index 7422a5d13..f40c28ce2 100644 --- a/lfs/rsync +++ b/lfs/rsync @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 IPFire Team # +# Copyright (C) 2007-2022 IPFire Team # # # # 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 # @@ -26,7 +26,7 @@ include Config SUMMARY = Versatile tool for fast incremental file transfer -VER = 3.2.3 +VER = 3.2.4 THISAPP = rsync-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = rsync -PAK_VER = 13 +PAK_VER = 14 DEPS = @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 085adb55d0d7e3d063fa198912fd09df67b63800a65baff5315ccb7dfc0e9d703eef30a7f2e72e3b271162c280abd9809b3f736704752c1663eed65ad8e0ac25 +$(DL_FILE)_BLAKE2 = a67fcb9619874f1c5346a876138e59f4bf508a90736f830fb2b4eaf180ab11f15a0a7db9b3b28c3b990b77c2b0973d8e668bf509e4134f464159ed3172f53d80 install : $(TARGET) diff --git a/lfs/sdparm b/lfs/sdparm deleted file mode 100644 index d77542db0..000000000 --- a/lfs/sdparm +++ /dev/null @@ -1,81 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team # -# # -# 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 . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 1.12 - -THISAPP = sdparm-$(VER) -DL_FILE = $(THISAPP).tgz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_BLAKE2 = 8c872967f859763c5d8fc9e086175010c474e2332e82d79da76bfec636e90cbf54256f0b3c046db159e69b0d1ee64595757177901c48db66d2ea77ad53d623d6 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -b2 : $(subst %,%_BLAKE2,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# Downloading, checking, b2sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_BLAKE2,$(objects)) : - @$(B2SUM) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - $(UPDATE_AUTOMAKE) - cd $(DIR_APP) && ./configure --prefix=/usr - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/squid b/lfs/squid index ceaddac86..7b77e568f 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,7 +24,7 @@ include Config -VER = 5.4.1 +VER = 5.5 THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -46,7 +46,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 3281f592c342b59a1017f4c0829543c857d61c4d1e191461f6e69bda2dc61ff59d5b92a04744dcebb75bd1b5d85c214c1f0bea78a791033a50f29891b6995fb8 +$(DL_FILE)_BLAKE2 = aef52ba0b47098f823d3f2bbe55e015c12b853bcc0a414bc94a4103009a05fee2c33263b8ade9b31cd22068e964d7f37fc0a497877d26ff836bc2193a6d0e8fc install : $(TARGET) diff --git a/lfs/suricata b/lfs/suricata index 80e0923d3..4a9dcdb1d 100644 --- a/lfs/suricata +++ b/lfs/suricata @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2021 IPFire Team # +# Copyright (C) 2007-2022 IPFire Team # # # # 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.0.8 +VER = 5.0.9 THISAPP = suricata-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 5c13aea176b6666477c620d1ed294310ee84ec706abbc740a23d66722297c09b61f253bbe17700cd58f8ce439987c9b13f312aba37d911b6522e4848e7c1b0cd +$(DL_FILE)_BLAKE2 = 02ab99585233a47b1577e55060ba1141c339718e5bd39b6f4d38bb9384fd459aae353f313083048128507f9023a8bcfea3e5a5bcc9ea0c75cfc9c288ca9db6b6 install : $(TARGET) @@ -70,9 +70,9 @@ $(subst %,%_BLAKE2,$(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/suricata-5.0-stream-tcp-Handle-retransmitted-SYN-with-TSval.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/suricata-disable-sid-2210059.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/suricata-5.0.8-fix-level1-cache-line-size-detection.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/suricata/suricata-5.0-stream-tcp-Handle-retransmitted-SYN-with-TSval.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/suricata/suricata-disable-sid-2210059.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/suricata/suricata-5.0.8-fix-level1-cache-line-size-detection.patch cd $(DIR_APP) && LDFLAGS="$(LDFLAGS)" ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/lfs/tshark b/lfs/tshark index be732c97e..eb89f7474 100644 --- a/lfs/tshark +++ b/lfs/tshark @@ -26,7 +26,7 @@ include Config SUMMARY = A Network Traffic Analyser -VER = 3.4.7 +VER = 3.6.3 THISAPP = wireshark-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -35,7 +35,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = tshark DEPS = krb5 c-ares -PAK_VER = 11 +PAK_VER = 12 SERVICES = @@ -47,7 +47,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 0a6112ed667739935417350660e31d64747cb81295db058e0a27c38387b2ed2b9806f8d61925c262d531fb96d87e230d1cd5d511ae0bdba973373835bf5d7bc5 +$(DL_FILE)_BLAKE2 = 3b636867d946f0cf748eb719874e815c919ee9cedd21a7e9034d54b4cb87ae4a09ec02a199e1ec8051e421fe2929983d659f340ccfd12ab35e1ecd52000964fd install : $(TARGET) diff --git a/lfs/vnstat b/lfs/vnstat index e4859be0b..a7b28f3fd 100644 --- a/lfs/vnstat +++ b/lfs/vnstat @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2021 IPFire Team # +# Copyright (C) 2007-2022 IPFire Team # # # # 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 = 2.7 +VER = 2.9 THISAPP = vnstat-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = f7b50cccfe4b62bce45751e6029650dc6d8ac7b7925cc4177fb1772c6d842b5201f6834d5e6374016b4c42374660b1c127d5b021adffe873de0a4c484171b6b3 +$(DL_FILE)_BLAKE2 = 1671fe49f3add0087431b57aaa69d4c6280066a299e6899c00cd5bf6ec21380d1457295f884f683ebfb89959eea08a9d900e898a865e3f6ff2a82ecf354d974a install : $(TARGET) @@ -80,6 +80,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make all $(MAKETUNING) LOCAL_CONFIGURE_OPTIONS="--enable-readline=yes" cd $(DIR_APP) && make install + sed -i 's|^;||g' /etc/vnstat.conf sed -i 's|SaveInterval 5|SaveInterval 1|g' /etc/vnstat.conf sed -i 's|/var/lib/vnstat|/var/log/vnstat|g' /etc/vnstat.conf sed -i 's|/var/log/vnstat/vnstat.log|/var/log/vnstat.log|g' /etc/vnstat.conf diff --git a/lfs/whois b/lfs/whois index 5dee31d4a..19989af36 100644 --- a/lfs/whois +++ b/lfs/whois @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team # +# Copyright (C) 2007-2022 IPFire Team # # # # 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.5.10 +VER = 5.5.13 THISAPP = whois_$(VER) DL_FILE = $(THISAPP).tar.xz @@ -42,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = f3a2c6d0f46f2091ce8e201a1a670d144b4707cd6928a80da76c6b302fb105dab11d7bf90ac8473d40c0da0ad709956ab3d4b9a2db861b7111603b6037593cf3 +$(DL_FILE)_BLAKE2 = 6ce90ad907c4ea79301adbcda5a402344df9f283ac258a3186f5c405e0abfb97f603f3f163652f1cf03a1fc60290b8f9f54b509bf7d9fd3cec12189eeeaaffe5 install : $(TARGET) diff --git a/lfs/wio b/lfs/wio index a87fa635e..be80cef22 100644 --- a/lfs/wio +++ b/lfs/wio @@ -1,6 +1,21 @@ ############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) 2007-2021 IPFire Team # +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team # +# # +# 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 . # +# # ############################################################################### ############################################################################### @@ -17,7 +32,7 @@ THISAPP = wio-$(VER) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = wio -PAK_VER = 14 +PAK_VER = 15 DEPS = diff --git a/make.sh b/make.sh index 95e6e89db..bf2fce168 100755 --- a/make.sh +++ b/make.sh @@ -1204,7 +1204,6 @@ buildipfire() { lfsmake2 nettle lfsmake2 json-c lfsmake2 libconfig - lfsmake2 libevent lfsmake2 libevent2 lfsmake2 expat lfsmake2 apr @@ -1318,7 +1317,6 @@ buildipfire() { lfsmake2 ca-certificates lfsmake2 fireinfo lfsmake2 libnet - lfsmake2 libnl lfsmake2 libnl-3 lfsmake2 libidn lfsmake2 nasm @@ -1331,7 +1329,6 @@ buildipfire() { lfsmake2 libexif lfsmake2 libpng lfsmake2 libtiff - lfsmake2 libart lfsmake2 gd lfsmake2 slang lfsmake2 newt @@ -1379,7 +1376,6 @@ buildipfire() { lfsmake2 perl-HTTP-Date lfsmake2 gnupg lfsmake2 hdparm - lfsmake2 sdparm lfsmake2 whatmask lfsmake2 libtirpc lfsmake2 conntrack-tools @@ -1439,7 +1435,6 @@ buildipfire() { lfsmake2 pango lfsmake2 rrdtool lfsmake2 setup - lfsmake2 libdnet lfsmake2 jansson lfsmake2 yaml lfsmake2 libhtp @@ -1537,7 +1532,6 @@ buildipfire() { lfsmake2 libusbredir lfsmake2 libseccomp lfsmake2 qemu - lfsmake2 netpbm lfsmake2 netsnmpd lfsmake2 nagios_nrpe lfsmake2 nagios-plugins @@ -1592,7 +1586,6 @@ buildipfire() { lfsmake2 monit lfsmake2 nut lfsmake2 watchdog - lfsmake2 libpri lfsmake2 usb_modeswitch lfsmake2 usb_modeswitch_data lfsmake2 zerofree @@ -1605,7 +1598,6 @@ buildipfire() { lfsmake2 u-boot lfsmake2 u-boot-friendlyarm lfsmake2 wireless-regdb - lfsmake2 libsolv lfsmake2 ddns lfsmake2 python3-pycparser lfsmake2 python3-charset-normalizer @@ -1641,6 +1633,7 @@ buildipfire() { lfsmake2 python3-click lfsmake2 python3-arrow lfsmake2 python3-terminaltables + lfsmake2 python3-pkgconfig lfsmake2 aws-cli lfsmake2 oci-python-sdk lfsmake2 oci-cli @@ -1677,7 +1670,6 @@ buildipfire() { lfsmake2 perl-IO-String lfsmake2 perl-PDF-API2 lfsmake2 proxy-accounting - lfsmake2 pigz lfsmake2 tmux lfsmake2 perl-Text-CSV_XS lfsmake2 lua diff --git a/src/initscripts/networking/any b/src/initscripts/networking/any index 0facf23d8..15197badb 100644 --- a/src/initscripts/networking/any +++ b/src/initscripts/networking/any @@ -83,9 +83,6 @@ case "${1}" in fi fi - # Create & Enable vnstat data collection - /usr/bin/vnstat -u -i ${DEVICE} -r --enable --force > /dev/null 2>&1 - if [ ! "${ADDRESS}" == "1.1.1.1" ]; then boot_mesg "Adding IPv4 address ${ADDRESS} to the ${DEVICE} interface..." ip addr add ${args} dev ${DEVICE} @@ -100,8 +97,6 @@ case "${1}" in evaluate_retval fi - # Disable vnstat collection - /usr/bin/vnstat -u -i ${DEVICE} -r --disable > /dev/null 2>&1 exit 0; ;; esac diff --git a/src/initscripts/networking/red b/src/initscripts/networking/red index 38129deeb..fc10e077a 100644 --- a/src/initscripts/networking/red +++ b/src/initscripts/networking/red @@ -103,9 +103,6 @@ case "${1}" in fi fi - ## Create & Enable vnstat - /usr/bin/vnstat -u -i ${DEVICE} -r --enable --force > /dev/null 2>&1 - if [ "${TYPE}" == "STATIC" ]; then # Set the MTU if [ -n "${MTU}" ]; then @@ -176,9 +173,6 @@ case "${1}" in dhcpcd_start "${DEVICE}" fi - ## Create & Enable vnstat - /usr/bin/vnstat -u -i ${DEVICE} -r --enable --force > /dev/null 2>&1 - elif [ "$TYPE" == "PPPOE" ]; then if ( ps ax | grep -q [p]ppd ); then @@ -459,8 +453,7 @@ case "${1}" in evaluate_retval # echo PPP: /usr/sbin/pppd pty "$PPPOE_CMD" $PPP_STD_OPTIONS $DEBUG $DEMAND $PPPD_SYNC fi - ## Create & Enable vnstat - /usr/bin/vnstat -u -i ppp0 -r --enable --force > /dev/null 2>&1 + /etc/rc.d/init.d/connectd start # Add a NaN value to ppp0 rrd to supress spikes at reconnect rrdtool update $RRDLOG/collectd/localhost/interface/if_octets-ppp0.rrd \ @@ -485,8 +478,6 @@ case "${1}" in elif [ "$TYPE" == "PPPOE" ]; then boot_mesg "Bringing down the PPP interface ..." - ## Disable vnstat collection - /usr/bin/vnstat -u -i ppp0 -r --disable > /dev/null 2>&1 rm -f /var/ipfire/red/keepconnected killall -w -s TERM /usr/sbin/pppd 2>/dev/null evaluate_retval @@ -533,9 +524,6 @@ case "${1}" in killall -w -s KILL pptp >/dev/null 2>&1 killall -w -s KILL br2684ctl >/dev/null 2>&1 - ## Disable vnstat collection - /usr/bin/vnstat -u -i ${DEVICE} -r --disable > /dev/null 2>&1 - exit 0; ;; esac diff --git a/src/patches/suricata-5.0-stream-tcp-Handle-retransmitted-SYN-with-TSval.patch b/src/patches/suricata/suricata-5.0-stream-tcp-Handle-retransmitted-SYN-with-TSval.patch similarity index 97% rename from src/patches/suricata-5.0-stream-tcp-Handle-retransmitted-SYN-with-TSval.patch rename to src/patches/suricata/suricata-5.0-stream-tcp-Handle-retransmitted-SYN-with-TSval.patch index fcea77cfa..6bc745a0f 100644 --- a/src/patches/suricata-5.0-stream-tcp-Handle-retransmitted-SYN-with-TSval.patch +++ b/src/patches/suricata/suricata-5.0-stream-tcp-Handle-retransmitted-SYN-with-TSval.patch @@ -26,7 +26,7 @@ diff --git a/src/stream-tcp.c b/src/stream-tcp.c index 1cff19fa5..af681760b 100644 --- a/src/stream-tcp.c +++ b/src/stream-tcp.c -@@ -1643,6 +1643,23 @@ static int StreamTcpPacketStateSynSent(ThreadVars *tv, Packet *p, +@@ -1641,6 +1641,23 @@ static int StreamTcpPacketStateSynSent(ThreadVars *tv, Packet *p, "ssn->client.last_ack %"PRIu32"", ssn, ssn->client.isn, ssn->client.next_seq, ssn->client.last_ack); diff --git a/src/patches/suricata-5.0.8-fix-level1-cache-line-size-detection.patch b/src/patches/suricata/suricata-5.0.8-fix-level1-cache-line-size-detection.patch similarity index 95% rename from src/patches/suricata-5.0.8-fix-level1-cache-line-size-detection.patch rename to src/patches/suricata/suricata-5.0.8-fix-level1-cache-line-size-detection.patch index a6747a2a7..68a21f1e9 100644 --- a/src/patches/suricata-5.0.8-fix-level1-cache-line-size-detection.patch +++ b/src/patches/suricata/suricata-5.0.8-fix-level1-cache-line-size-detection.patch @@ -2,7 +2,7 @@ diff --git a/configure.ac b/configure.ac index d56d3a550..81abf8f00 100644 --- a/configure.ac +++ b/configure.ac -@@ -2313,7 +2313,7 @@ fi +@@ -2318,7 +2318,7 @@ fi AC_PATH_PROG(HAVE_GETCONF_CMD, getconf, "no") if test "$HAVE_GETCONF_CMD" != "no"; then CLS=$(getconf LEVEL1_DCACHE_LINESIZE) diff --git a/src/patches/suricata-disable-sid-2210059.patch b/src/patches/suricata/suricata-disable-sid-2210059.patch similarity index 100% rename from src/patches/suricata-disable-sid-2210059.patch rename to src/patches/suricata/suricata-disable-sid-2210059.patch diff --git a/src/wio/main/wio.pl b/src/wio/main/wio.pl index 91c6c1494..78c91eeb9 100644 --- a/src/wio/main/wio.pl +++ b/src/wio/main/wio.pl @@ -98,9 +98,6 @@ my ( $ping_i, $ping_t, $ping_ib, $ping_tb, $ping_iv, $ping_tv, $pingmode ) = ''; my ( @tmp, @arptmp, @myarray, @status, @arpclients ) = ''; my @ifaces = ('GREEN','BLUE','ORANGE'); -if ( $netsettings{'RED_TYPE'} eq 'STATIC' || $netsettings{'RED_TYPE'} eq 'DHCP' ) { - push (@ifaces, "RED"); -} if ( $mailsettings{'USEMAIL'} eq 'on' ) { $mailen = 'on'; } else { $mailen = 'off'; } diff --git a/src/wio/wio.cgi b/src/wio/wio.cgi index 1dcec52fe..a61102894 100644 --- a/src/wio/wio.cgi +++ b/src/wio/wio.cgi @@ -128,9 +128,6 @@ my @devs_alt = ('green','blue','orange','red'); my %ifacecolor = ( GREEN => 'wio_run_green', BLUE => 'wio_run_blue', ORANGE => 'wio_run_orange'); -#if ( $netsettings{'RED_TYPE'} eq 'STATIC' || $netsettings{'RED_TYPE'} eq 'DHCP' ) { -# %ifacecolor = ( %ifacecolor, RED => 'wio_run_red' ); -#} &loadips();