Merge branch 'temp-c168-development' into next

diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl
index 5ddea348ecfa830871a687d7bf38f3f60c0b4053..65459cc92c7d2a8c6903f0c698c5b3227b5ee871 100644 (file)
--- 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 2bcf0d5e8d0784ba5065005303c3cddc47e64557..f969a3b0b35ebdc7826052a0c3a0385868da6395 100644 (file)
--- 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 19571a8705615817b3dc4a30d0de35a9e02ac3b5..4ef537ed4dd49c29e3dccb361b33de57518dbb67 100644 (file)
--- 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 df3df4f47a6c63bc3f2dd8f204d1b4f7e2328ee3..0d41c90e5eaefea3d32f65a88f33430733141170 100644 (file)
--- 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 9901085f26281a2fcf52fb664f4381b6fb1f719b..3911aa90b601652a2a851fa44c6196b6843a16f7 100644 (file)
--- 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 (file)
index 7e98a60..0000000
--- 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 (file)
index 26288de..0000000
--- 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 (file)
index 77bbade..0000000
--- 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 8ca5cb32562bb6b65cedf9cba6266241f47bc100..8e7f7439274e364b9fe2fc4223fdb7dece26c482 100644 (file)
--- 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 (file)
index 960e1c8..0000000
--- 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 (file)
index 618d924..0000000
--- 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 cc21721c50ac68bae71fd1b7b7cc916f48edcc5c..a35daef8561a7166ef5f252022dfed736dd1e774 100644 (file)
--- 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 8f16d3e91afed096c5ebb15fab61d49aeb60067a..9c37580db6e7a97fe75174f82021f3fbfc800dc7 100644 (file)
--- 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 5c24ff0ead664c65db51e304269bb1f9bf20ba96..30605a46ac10c8d38fc5464b350229531137145d 100644 (file)
--- 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 (file)
index 439c429..0000000
--- 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 (symlink)
index 0000000..55970e1
--- /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 (symlink)
index 0000000..e1923cf
--- /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 (file)
index 0000000..4883ff3
--- /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 (symlink)
index 0000000..28e96f8
--- /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 (symlink)
index 0000000..2df12a2
--- /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 (symlink)
index 0000000..676e2c5
--- /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 (symlink)
index 0000000..f671c41
--- /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 (symlink)
index 0000000..605e72d
--- /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 (symlink)
index 0000000..493f3f7
--- /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 (symlink)
index 0000000..6b8bff6
--- /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 (symlink)
index 0000000..2dc8372
--- /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 (symlink)
index 0000000..f671f69
--- /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 (symlink)
index 0000000..60cbd18
--- /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 (symlink)
index 0000000..d6964db
--- /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 (file)
index 0000000..4446472
--- /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 <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /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 $(</opt/pakfire/db/rootfiles/netbpm); do
+               rm -rfv "/${i}"
+       done
+fi
+rm -vf \
+       /opt/pakfire/db/installed/meta-netbpm \
+       /opt/pakfire/db/meta/meta-netbpm \
+       /opt/pakfire/db/rootfiles/netbpm
+
+# Stop services
+/etc/init.d/squid stop
+/usr/local/bin/openvpnctrl -k
+/usr/local/bin/openvpnctrl -kn2n
+/etc/init.d/suricata stop
+
+# Extract files
+extract_files
+
+# update linker config
+ldconfig
+
+# Update Language cache
+/usr/local/bin/update-lang-cache
+
+# Filesytem cleanup
+/usr/local/bin/filesystem-cleanup
+
+# Apply local configuration to sshd_config
+/usr/local/bin/sshctrl
+
+# Start services
+/etc/init.d/sshd restart
+/etc/init.d/vnstatd restart
+/etc/init.d/squid start
+/usr/local/bin/openvpnctrl -s
+/usr/local/bin/openvpnctrl -sn2n
+/etc/init.d/suricata start
+
+# This update needs a reboot...
+#touch /var/run/need_reboot
+
+# Finish
+/etc/init.d/fireinfo start
+sendprofile
+
+# Update grub config to display new core version
+if [ -e /boot/grub/grub.cfg ]; then
+       grub-mkconfig -o /boot/grub/grub.cfg
+fi
+
+sync
+
+# Don't report the exitcode last command
+exit 0

diff --git a/config/rootfiles/oldcore/167/exclude b/config/rootfiles/oldcore/167/exclude
new file mode 100644 (file)
index 0000000..b22e5e9
--- /dev/null
+++ b/config/rootfiles/oldcore/167/exclude
@@ -0,0 +1,35 @@
+boot/config.txt
+boot/grub/grub.cfg
+boot/grub/grubenv
+boot/uEnv.txt
+etc/alternatives
+etc/collectd.custom
+etc/default/grub
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+etc/localtime
+etc/shadow
+etc/snort/snort.conf
+etc/ssl/openssl.cnf
+etc/sudoers
+etc/sysconfig/firewall.local
+etc/sysconfig/rc.local
+etc/udev/rules.d/30-persistent-network.rules
+srv/web/ipfire/html/proxy.pac
+usr/share/xt_geoip
+var/ipfire/dma
+var/ipfire/time
+var/ipfire/firewall/locationblock
+var/ipfire/fwhosts/customlocationgrp
+var/ipfire/ovpn
+var/ipfire/urlfilter/blacklist
+var/ipfire/urlfilter/settings
+var/lib/alternatives
+var/lib/location/database.db
+var/log/cache
+var/log/dhcpcd.log
+var/log/messages
+var/state/dhcp/dhcpd.leases
+var/updatecache

diff --git a/config/rootfiles/core/167/filelists/aarch64/linux b/config/rootfiles/oldcore/167/filelists/aarch64/linux
similarity index 100%
rename from config/rootfiles/core/167/filelists/aarch64/linux
rename to config/rootfiles/oldcore/167/filelists/aarch64/linux

diff --git a/config/rootfiles/core/167/filelists/aarch64/u-boot b/config/rootfiles/oldcore/167/filelists/aarch64/u-boot
similarity index 100%
rename from config/rootfiles/core/167/filelists/aarch64/u-boot
rename to config/rootfiles/oldcore/167/filelists/aarch64/u-boot

diff --git a/config/rootfiles/core/167/filelists/aarch64/util-linux b/config/rootfiles/oldcore/167/filelists/aarch64/util-linux
similarity index 100%
rename from config/rootfiles/core/167/filelists/aarch64/util-linux
rename to config/rootfiles/oldcore/167/filelists/aarch64/util-linux

diff --git a/config/rootfiles/core/167/filelists/apache2 b/config/rootfiles/oldcore/167/filelists/apache2
similarity index 100%
rename from config/rootfiles/core/167/filelists/apache2
rename to config/rootfiles/oldcore/167/filelists/apache2

diff --git a/config/rootfiles/core/167/filelists/armv6l/linux b/config/rootfiles/oldcore/167/filelists/armv6l/linux
similarity index 100%
rename from config/rootfiles/core/167/filelists/armv6l/linux
rename to config/rootfiles/oldcore/167/filelists/armv6l/linux

diff --git a/config/rootfiles/core/167/filelists/armv6l/util-linux b/config/rootfiles/oldcore/167/filelists/armv6l/util-linux
similarity index 100%
rename from config/rootfiles/core/167/filelists/armv6l/util-linux
rename to config/rootfiles/oldcore/167/filelists/armv6l/util-linux

diff --git a/config/rootfiles/oldcore/167/filelists/bind b/config/rootfiles/oldcore/167/filelists/bind
new file mode 120000 (symlink)
index 0000000..48a0eba
--- /dev/null
+++ b/config/rootfiles/oldcore/167/filelists/bind
@@ -0,0 +1 @@
+../../../common/bind
\ No newline at end of file

diff --git a/config/rootfiles/core/167/filelists/ca-certificates b/config/rootfiles/oldcore/167/filelists/ca-certificates
similarity index 100%
rename from config/rootfiles/core/167/filelists/ca-certificates
rename to config/rootfiles/oldcore/167/filelists/ca-certificates

diff --git a/config/rootfiles/oldcore/167/filelists/core-files b/config/rootfiles/oldcore/167/filelists/core-files
new file mode 100644 (file)
index 0000000..0dec37e
--- /dev/null
+++ b/config/rootfiles/oldcore/167/filelists/core-files
@@ -0,0 +1,5 @@
+etc/system-release
+etc/issue
+etc/os-release
+srv/web/ipfire/cgi-bin/credits.cgi
+var/ipfire/langs

diff --git a/config/rootfiles/core/167/filelists/coreutils b/config/rootfiles/oldcore/167/filelists/coreutils
similarity index 100%
rename from config/rootfiles/core/167/filelists/coreutils
rename to config/rootfiles/oldcore/167/filelists/coreutils

diff --git a/config/rootfiles/core/167/filelists/curl b/config/rootfiles/oldcore/167/filelists/curl
similarity index 100%
rename from config/rootfiles/core/167/filelists/curl
rename to config/rootfiles/oldcore/167/filelists/curl

diff --git a/config/rootfiles/core/167/filelists/ddns b/config/rootfiles/oldcore/167/filelists/ddns
similarity index 100%
rename from config/rootfiles/core/167/filelists/ddns
rename to config/rootfiles/oldcore/167/filelists/ddns

diff --git a/config/rootfiles/core/167/filelists/dracut b/config/rootfiles/oldcore/167/filelists/dracut
similarity index 100%
rename from config/rootfiles/core/167/filelists/dracut
rename to config/rootfiles/oldcore/167/filelists/dracut

diff --git a/config/rootfiles/core/167/filelists/elinks b/config/rootfiles/oldcore/167/filelists/elinks
similarity index 100%
rename from config/rootfiles/core/167/filelists/elinks
rename to config/rootfiles/oldcore/167/filelists/elinks

diff --git a/config/rootfiles/core/167/filelists/files b/config/rootfiles/oldcore/167/filelists/files
similarity index 100%
rename from config/rootfiles/core/167/filelists/files
rename to config/rootfiles/oldcore/167/filelists/files

diff --git a/config/rootfiles/core/167/filelists/gzip b/config/rootfiles/oldcore/167/filelists/gzip
similarity index 100%
rename from config/rootfiles/core/167/filelists/gzip
rename to config/rootfiles/oldcore/167/filelists/gzip

diff --git a/config/rootfiles/core/167/filelists/harfbuzz b/config/rootfiles/oldcore/167/filelists/harfbuzz
similarity index 100%
rename from config/rootfiles/core/167/filelists/harfbuzz
rename to config/rootfiles/oldcore/167/filelists/harfbuzz

diff --git a/config/rootfiles/core/167/filelists/hwdata b/config/rootfiles/oldcore/167/filelists/hwdata
similarity index 100%
rename from config/rootfiles/core/167/filelists/hwdata
rename to config/rootfiles/oldcore/167/filelists/hwdata

diff --git a/config/rootfiles/core/167/filelists/iproute2 b/config/rootfiles/oldcore/167/filelists/iproute2
similarity index 100%
rename from config/rootfiles/core/167/filelists/iproute2
rename to config/rootfiles/oldcore/167/filelists/iproute2

diff --git a/config/rootfiles/core/167/filelists/libdnet b/config/rootfiles/oldcore/167/filelists/libdnet
similarity index 100%
rename from config/rootfiles/core/167/filelists/libdnet
rename to config/rootfiles/oldcore/167/filelists/libdnet

diff --git a/config/rootfiles/core/167/filelists/libloc b/config/rootfiles/oldcore/167/filelists/libloc
similarity index 100%
rename from config/rootfiles/core/167/filelists/libloc
rename to config/rootfiles/oldcore/167/filelists/libloc

diff --git a/config/rootfiles/core/167/filelists/misc-progs b/config/rootfiles/oldcore/167/filelists/misc-progs
similarity index 100%
rename from config/rootfiles/core/167/filelists/misc-progs
rename to config/rootfiles/oldcore/167/filelists/misc-progs

diff --git a/config/rootfiles/core/167/filelists/nano b/config/rootfiles/oldcore/167/filelists/nano
similarity index 100%
rename from config/rootfiles/core/167/filelists/nano
rename to config/rootfiles/oldcore/167/filelists/nano

diff --git a/config/rootfiles/core/167/filelists/ntfs-3g b/config/rootfiles/oldcore/167/filelists/ntfs-3g
similarity index 100%
rename from config/rootfiles/core/167/filelists/ntfs-3g
rename to config/rootfiles/oldcore/167/filelists/ntfs-3g

diff --git a/config/rootfiles/oldcore/167/filelists/openssh b/config/rootfiles/oldcore/167/filelists/openssh
new file mode 120000 (symlink)
index 0000000..d8c77fd
--- /dev/null
+++ b/config/rootfiles/oldcore/167/filelists/openssh
@@ -0,0 +1 @@
+../../../common/openssh
\ No newline at end of file

diff --git a/config/rootfiles/core/167/filelists/openssl b/config/rootfiles/oldcore/167/filelists/openssl
similarity index 100%
rename from config/rootfiles/core/167/filelists/openssl
rename to config/rootfiles/oldcore/167/filelists/openssl

diff --git a/config/rootfiles/core/167/filelists/pakfire b/config/rootfiles/oldcore/167/filelists/pakfire
similarity index 100%
rename from config/rootfiles/core/167/filelists/pakfire
rename to config/rootfiles/oldcore/167/filelists/pakfire

diff --git a/config/rootfiles/core/167/filelists/pango b/config/rootfiles/oldcore/167/filelists/pango
similarity index 100%
rename from config/rootfiles/core/167/filelists/pango
rename to config/rootfiles/oldcore/167/filelists/pango

diff --git a/config/rootfiles/core/167/filelists/pcmciautils b/config/rootfiles/oldcore/167/filelists/pcmciautils
similarity index 100%
rename from config/rootfiles/core/167/filelists/pcmciautils
rename to config/rootfiles/oldcore/167/filelists/pcmciautils

diff --git a/config/rootfiles/core/167/filelists/perl-CGI b/config/rootfiles/oldcore/167/filelists/perl-CGI
similarity index 100%
rename from config/rootfiles/core/167/filelists/perl-CGI
rename to config/rootfiles/oldcore/167/filelists/perl-CGI

diff --git a/config/rootfiles/core/167/filelists/psmisc b/config/rootfiles/oldcore/167/filelists/psmisc
similarity index 100%
rename from config/rootfiles/core/167/filelists/psmisc
rename to config/rootfiles/oldcore/167/filelists/psmisc

diff --git a/config/rootfiles/core/167/filelists/rrdtool b/config/rootfiles/oldcore/167/filelists/rrdtool
similarity index 100%
rename from config/rootfiles/core/167/filelists/rrdtool
rename to config/rootfiles/oldcore/167/filelists/rrdtool

diff --git a/config/rootfiles/core/167/filelists/smartmontools b/config/rootfiles/oldcore/167/filelists/smartmontools
similarity index 100%
rename from config/rootfiles/core/167/filelists/smartmontools
rename to config/rootfiles/oldcore/167/filelists/smartmontools

diff --git a/config/rootfiles/core/167/filelists/sqlite b/config/rootfiles/oldcore/167/filelists/sqlite
similarity index 100%
rename from config/rootfiles/core/167/filelists/sqlite
rename to config/rootfiles/oldcore/167/filelists/sqlite

diff --git a/config/rootfiles/core/167/filelists/strongswan b/config/rootfiles/oldcore/167/filelists/strongswan
similarity index 100%
rename from config/rootfiles/core/167/filelists/strongswan
rename to config/rootfiles/oldcore/167/filelists/strongswan

diff --git a/config/rootfiles/core/167/filelists/sudo b/config/rootfiles/oldcore/167/filelists/sudo
similarity index 100%
rename from config/rootfiles/core/167/filelists/sudo
rename to config/rootfiles/oldcore/167/filelists/sudo

diff --git a/config/rootfiles/oldcore/167/filelists/vnstat b/config/rootfiles/oldcore/167/filelists/vnstat
new file mode 120000 (symlink)
index 0000000..2e2e610
--- /dev/null
+++ b/config/rootfiles/oldcore/167/filelists/vnstat
@@ -0,0 +1 @@
+../../../common/vnstat
\ No newline at end of file

diff --git a/config/rootfiles/core/167/filelists/wget b/config/rootfiles/oldcore/167/filelists/wget
similarity index 100%
rename from config/rootfiles/core/167/filelists/wget
rename to config/rootfiles/oldcore/167/filelists/wget

diff --git a/config/rootfiles/core/167/filelists/wireless-regdb b/config/rootfiles/oldcore/167/filelists/wireless-regdb
similarity index 100%
rename from config/rootfiles/core/167/filelists/wireless-regdb
rename to config/rootfiles/oldcore/167/filelists/wireless-regdb

diff --git a/config/rootfiles/core/167/filelists/x86_64/linux b/config/rootfiles/oldcore/167/filelists/x86_64/linux
similarity index 100%
rename from config/rootfiles/core/167/filelists/x86_64/linux
rename to config/rootfiles/oldcore/167/filelists/x86_64/linux

diff --git a/config/rootfiles/core/167/filelists/x86_64/util-linux b/config/rootfiles/oldcore/167/filelists/x86_64/util-linux
similarity index 100%
rename from config/rootfiles/core/167/filelists/x86_64/util-linux
rename to config/rootfiles/oldcore/167/filelists/x86_64/util-linux

diff --git a/config/rootfiles/core/167/filelists/xfsprogs b/config/rootfiles/oldcore/167/filelists/xfsprogs
similarity index 100%
rename from config/rootfiles/core/167/filelists/xfsprogs
rename to config/rootfiles/oldcore/167/filelists/xfsprogs

diff --git a/config/rootfiles/core/167/filelists/xz b/config/rootfiles/oldcore/167/filelists/xz
similarity index 100%
rename from config/rootfiles/core/167/filelists/xz
rename to config/rootfiles/oldcore/167/filelists/xz

diff --git a/config/rootfiles/core/167/filelists/zlib b/config/rootfiles/oldcore/167/filelists/zlib
similarity index 100%
rename from config/rootfiles/core/167/filelists/zlib
rename to config/rootfiles/oldcore/167/filelists/zlib

diff --git a/config/rootfiles/core/167/update.sh b/config/rootfiles/oldcore/167/update.sh
similarity index 100%
rename from config/rootfiles/core/167/update.sh
rename to config/rootfiles/oldcore/167/update.sh

diff --git a/config/rootfiles/packages/borgbackup b/config/rootfiles/packages/borgbackup
index dccaf4711a9ff2874cf6780b597eae9fee159509..a27b7c11cc6aca89261b7f6330817e37999c8bc3 100644 (file)
--- a/config/rootfiles/packages/borgbackup
+++ b/config/rootfiles/packages/borgbackup
@@ -7,15 +7,6 @@ usr/lib/python3.10/site-packages/borg/_version.py
 #usr/lib/python3.10/site-packages/borg/algorithms
 usr/lib/python3.10/site-packages/borg/algorithms/__init__.py
 usr/lib/python3.10/site-packages/borg/algorithms/checksums.cpython-310-xxxMACHINExxx-linux-gnu.so
-#usr/lib/python3.10/site-packages/borg/algorithms/msgpack
-usr/lib/python3.10/site-packages/borg/algorithms/msgpack/__init__.py
-usr/lib/python3.10/site-packages/borg/algorithms/msgpack/_packer.cpp
-usr/lib/python3.10/site-packages/borg/algorithms/msgpack/_packer.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/borg/algorithms/msgpack/_unpacker.cpp
-usr/lib/python3.10/site-packages/borg/algorithms/msgpack/_unpacker.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/borg/algorithms/msgpack/_version.py
-usr/lib/python3.10/site-packages/borg/algorithms/msgpack/exceptions.py
-usr/lib/python3.10/site-packages/borg/algorithms/msgpack/fallback.py
 usr/lib/python3.10/site-packages/borg/archive.py
 usr/lib/python3.10/site-packages/borg/archiver.py
 usr/lib/python3.10/site-packages/borg/cache.py
@@ -30,8 +21,22 @@ usr/lib/python3.10/site-packages/borg/crypto/keymanager.py
 usr/lib/python3.10/site-packages/borg/crypto/low_level.cpython-310-xxxMACHINExxx-linux-gnu.so
 usr/lib/python3.10/site-packages/borg/crypto/nonces.py
 usr/lib/python3.10/site-packages/borg/fuse.py
+usr/lib/python3.10/site-packages/borg/fuse_impl.py
 usr/lib/python3.10/site-packages/borg/hashindex.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/borg/helpers.py
+#usr/lib/python3.10/site-packages/borg/helpers
+usr/lib/python3.10/site-packages/borg/helpers/__init__.py
+usr/lib/python3.10/site-packages/borg/helpers/checks.py
+usr/lib/python3.10/site-packages/borg/helpers/datastruct.py
+usr/lib/python3.10/site-packages/borg/helpers/errors.py
+usr/lib/python3.10/site-packages/borg/helpers/fs.py
+usr/lib/python3.10/site-packages/borg/helpers/manifest.py
+usr/lib/python3.10/site-packages/borg/helpers/misc.py
+usr/lib/python3.10/site-packages/borg/helpers/msgpack.py
+usr/lib/python3.10/site-packages/borg/helpers/parseformat.py
+usr/lib/python3.10/site-packages/borg/helpers/process.py
+usr/lib/python3.10/site-packages/borg/helpers/progress.py
+usr/lib/python3.10/site-packages/borg/helpers/time.py
+usr/lib/python3.10/site-packages/borg/helpers/yes.py
 usr/lib/python3.10/site-packages/borg/item.cpython-310-xxxMACHINExxx-linux-gnu.so
 usr/lib/python3.10/site-packages/borg/locking.py
 usr/lib/python3.10/site-packages/borg/logger.py
@@ -45,6 +50,8 @@ usr/lib/python3.10/site-packages/borg/platform/base.py
 usr/lib/python3.10/site-packages/borg/platform/linux.cpython-310-xxxMACHINExxx-linux-gnu.so
 usr/lib/python3.10/site-packages/borg/platform/posix.cpython-310-xxxMACHINExxx-linux-gnu.so
 usr/lib/python3.10/site-packages/borg/platform/syncfilerange.cpython-310-xxxMACHINExxx-linux-gnu.so
+usr/lib/python3.10/site-packages/borg/platform/xattr.py
+usr/lib/python3.10/site-packages/borg/platformflags.py
 usr/lib/python3.10/site-packages/borg/remote.py
 usr/lib/python3.10/site-packages/borg/repository.py
 usr/lib/python3.10/site-packages/borg/selftest.py
@@ -58,8 +65,11 @@ usr/lib/python3.10/site-packages/borg/testsuite/benchmark.py
 usr/lib/python3.10/site-packages/borg/testsuite/cache.py
 usr/lib/python3.10/site-packages/borg/testsuite/checksums.py
 usr/lib/python3.10/site-packages/borg/testsuite/chunker.py
+usr/lib/python3.10/site-packages/borg/testsuite/chunker_pytest.py
+usr/lib/python3.10/site-packages/borg/testsuite/chunker_slow.py
 usr/lib/python3.10/site-packages/borg/testsuite/compress.py
 usr/lib/python3.10/site-packages/borg/testsuite/crypto.py
+usr/lib/python3.10/site-packages/borg/testsuite/efficient_collection_queue.py
 usr/lib/python3.10/site-packages/borg/testsuite/file_integrity.py
 usr/lib/python3.10/site-packages/borg/testsuite/hashindex.py
 usr/lib/python3.10/site-packages/borg/testsuite/helpers.py
@@ -81,11 +91,11 @@ usr/lib/python3.10/site-packages/borg/testsuite/xattr.py
 usr/lib/python3.10/site-packages/borg/upgrader.py
 usr/lib/python3.10/site-packages/borg/version.py
 usr/lib/python3.10/site-packages/borg/xattr.py
-usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info
-usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info/PKG-INFO
-usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info/SOURCES.txt
-usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info/dependency_links.txt
-usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info/entry_points.txt
-usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info/not-zip-safe
-usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info/requires.txt
-usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info
+#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/entry_points.txt
+#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/not-zip-safe
+#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/requires.txt
+#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/top_level.txt

diff --git a/config/rootfiles/packages/dbus b/config/rootfiles/packages/dbus
index abcb6c695c008a703a6ea50e6fee0a52f553bbeb..82817a9420fa26dad7ef47e09d93b8f2f39f4c37 100644 (file)
--- a/config/rootfiles/packages/dbus
+++ b/config/rootfiles/packages/dbus
@@ -37,11 +37,10 @@ usr/bin/dbus-uuidgen
 #usr/lib/dbus-1.0/include
 #usr/lib/dbus-1.0/include/dbus
 #usr/lib/dbus-1.0/include/dbus/dbus-arch-deps.h
-#usr/lib/libdbus-1.a
 #usr/lib/libdbus-1.la
-usr/lib/libdbus-1.so
+#usr/lib/libdbus-1.so
 usr/lib/libdbus-1.so.3
-usr/lib/libdbus-1.so.3.19.13
+usr/lib/libdbus-1.so.3.32.0
 #usr/lib/pkgconfig/dbus-1.pc
 usr/libexec/dbus-daemon-launch-helper
 #usr/share/dbus-1
@@ -58,8 +57,10 @@ usr/share/dbus-1/system.d
 #usr/share/doc/dbus/examples/GetAllMatchRules.py
 #usr/share/doc/dbus/examples/example-session-disable-stats.conf
 #usr/share/doc/dbus/examples/example-system-enable-stats.conf
+#usr/share/doc/dbus/examples/example-system-hardening-without-traditional-activation.conf
 #usr/share/doc/dbus/system-activation.txt
 #usr/share/xml/dbus-1
 #usr/share/xml/dbus-1/busconfig.dtd
+#usr/share/xml/dbus-1/catalog.xml
 #usr/share/xml/dbus-1/introspect.dtd
 var/lib/dbus

diff --git a/config/rootfiles/packages/libpri b/config/rootfiles/packages/libpri
deleted file mode 100644 (file)
index 19fd874..0000000
--- a/config/rootfiles/packages/libpri
+++ /dev/null
@@ -1,4 +0,0 @@
-#usr/include/libpri.h
-#usr/lib/libpri.a
-usr/lib/libpri.so
-usr/lib/libpri.so.1.4

diff --git a/config/rootfiles/packages/libsolv b/config/rootfiles/packages/libsolv
deleted file mode 100644 (file)
index 8a9c1a2..0000000
--- a/config/rootfiles/packages/libsolv
+++ /dev/null
@@ -1,52 +0,0 @@
-#usr/include/solv
-#usr/include/solv/bitmap.h
-#usr/include/solv/chksum.h
-#usr/include/solv/dataiterator.h
-#usr/include/solv/dirpool.h
-#usr/include/solv/evr.h
-#usr/include/solv/hash.h
-#usr/include/solv/knownid.h
-#usr/include/solv/policy.h
-#usr/include/solv/pool.h
-#usr/include/solv/poolarch.h
-#usr/include/solv/poolid.h
-#usr/include/solv/pooltypes.h
-#usr/include/solv/poolvendor.h
-#usr/include/solv/problems.h
-#usr/include/solv/queue.h
-#usr/include/solv/repo.h
-#usr/include/solv/repo_solv.h
-#usr/include/solv/repo_write.h
-#usr/include/solv/repodata.h
-#usr/include/solv/rules.h
-#usr/include/solv/selection.h
-#usr/include/solv/solv_xfopen.h
-#usr/include/solv/solvable.h
-#usr/include/solv/solver.h
-#usr/include/solv/solverdebug.h
-#usr/include/solv/solvversion.h
-#usr/include/solv/strpool.h
-#usr/include/solv/testcase.h
-#usr/include/solv/tools_util.h
-#usr/include/solv/transaction.h
-#usr/include/solv/util.h
-#usr/lib/libsolv.so
-usr/lib/libsolv.so.1
-#usr/lib/libsolvext.so
-usr/lib/libsolvext.so.1
-#usr/lib/pkgconfig/libsolv.pc
-#usr/lib/pkgconfig/libsolvext.pc
-#usr/share/cmake
-#usr/share/cmake/Modules
-#usr/share/cmake/Modules/FindLibSolv.cmake
-#usr/share/man/man1/dumpsolv.1
-#usr/share/man/man1/installcheck.1
-#usr/share/man/man1/mergesolv.1
-#usr/share/man/man1/repo2solv.1
-#usr/share/man/man1/solv.1
-#usr/share/man/man1/testsolv.1
-#usr/share/man/man3/libsolv-bindings.3
-#usr/share/man/man3/libsolv-constantids.3
-#usr/share/man/man3/libsolv-history.3
-#usr/share/man/man3/libsolv-pool.3
-#usr/share/man/man3/libsolv.3

diff --git a/config/rootfiles/packages/mc b/config/rootfiles/packages/mc
index 1faf7ee7628393e0ebccb1f0ad4f0411d1685c23..9d063581b4f729e236406dd4bf7869c609fcb973 100644 (file)
--- a/config/rootfiles/packages/mc
+++ b/config/rootfiles/packages/mc
@@ -158,6 +158,7 @@ usr/share/mc/syntax/debian-sources-list.syntax
 usr/share/mc/syntax/diff.syntax
 usr/share/mc/syntax/dlink.syntax
 usr/share/mc/syntax/dos.syntax
+usr/share/mc/syntax/dot.syntax
 usr/share/mc/syntax/ebuild.syntax
 usr/share/mc/syntax/eiffel.syntax
 usr/share/mc/syntax/erlang.syntax
@@ -173,9 +174,9 @@ usr/share/mc/syntax/idl.syntax
 usr/share/mc/syntax/ini.syntax
 usr/share/mc/syntax/j.syntax
 usr/share/mc/syntax/jal.syntax
-usr/share/mc/syntax/json.syntax
 usr/share/mc/syntax/java.syntax
 usr/share/mc/syntax/js.syntax
+usr/share/mc/syntax/json.syntax
 usr/share/mc/syntax/kotlin.syntax
 usr/share/mc/syntax/latex.syntax
 usr/share/mc/syntax/lisp.syntax
@@ -211,6 +212,7 @@ usr/share/mc/syntax/sh.syntax
 usr/share/mc/syntax/slang.syntax
 usr/share/mc/syntax/smalltalk.syntax
 usr/share/mc/syntax/spec.syntax
+usr/share/mc/syntax/spice.syntax
 usr/share/mc/syntax/sql.syntax
 usr/share/mc/syntax/strace.syntax
 usr/share/mc/syntax/swift.syntax

diff --git a/config/rootfiles/packages/netpbm b/config/rootfiles/packages/netpbm
deleted file mode 100644 (file)
index e3e13fa..0000000
--- a/config/rootfiles/packages/netpbm
+++ /dev/null
@@ -1,397 +0,0 @@
-#usr/bin/411toppm
-#usr/bin/anytopnm
-#usr/bin/asciitopgm
-#usr/bin/atktopbm
-#usr/bin/avstopam
-#usr/bin/bioradtopgm
-#usr/bin/bmptopnm
-#usr/bin/bmptoppm
-#usr/bin/brushtopbm
-#usr/bin/cameratopam
-#usr/bin/cistopbm
-#usr/bin/cmuwmtopbm
-#usr/bin/ddbugtopbm
-#usr/bin/doc.url
-#usr/bin/escp2topbm
-#usr/bin/eyuvtoppm
-#usr/bin/fiascotopnm
-#usr/bin/fitstopnm
-#usr/bin/fstopgm
-#usr/bin/g3topbm
-#usr/bin/gemtopbm
-#usr/bin/gemtopnm
-#usr/bin/giftopnm
-#usr/bin/gouldtoppm
-#usr/bin/hdifftopam
-#usr/bin/hipstopgm
-#usr/bin/hpcdtoppm
-#usr/bin/icontopbm
-#usr/bin/ilbmtoppm
-#usr/bin/imgtoppm
-#usr/bin/infotopam
-#usr/bin/jbigtopnm
-#usr/bin/jpeg2ktopam
-#usr/bin/jpegtopnm
-#usr/bin/leaftoppm
-#usr/bin/lispmtopgm
-#usr/bin/macptopbm
-#usr/bin/manweb
-#usr/bin/mdatopbm
-#usr/bin/mgrtopbm
-#usr/bin/mrftopbm
-#usr/bin/mtvtoppm
-#usr/bin/neotoppm
-#usr/bin/palmtopnm
-#usr/bin/pamaddnoise
-#usr/bin/pamarith
-#usr/bin/pambackground
-#usr/bin/pambayer
-#usr/bin/pamchannel
-#usr/bin/pamcomp
-#usr/bin/pamcrater
-#usr/bin/pamcut
-#usr/bin/pamdeinterlace
-#usr/bin/pamdepth
-#usr/bin/pamdice
-#usr/bin/pamditherbw
-#usr/bin/pamedge
-#usr/bin/pamendian
-#usr/bin/pamenlarge
-#usr/bin/pamexec
-#usr/bin/pamfile
-#usr/bin/pamfix
-#usr/bin/pamfixtrunc
-#usr/bin/pamflip
-#usr/bin/pamfunc
-#usr/bin/pamgauss
-#usr/bin/pamgradient
-#usr/bin/pamlookup
-#usr/bin/pammasksharpen
-#usr/bin/pammixinterlace
-#usr/bin/pammosaicknit
-#usr/bin/pamoil
-#usr/bin/pampaintspill
-#usr/bin/pamperspective
-#usr/bin/pampick
-#usr/bin/pampop9
-#usr/bin/pamrecolor
-#usr/bin/pamrgbatopng
-#usr/bin/pamrubber
-#usr/bin/pamscale
-#usr/bin/pamseq
-#usr/bin/pamshadedrelief
-#usr/bin/pamsharpmap
-#usr/bin/pamsharpness
-#usr/bin/pamsistoaglyph
-#usr/bin/pamslice
-#usr/bin/pamsplit
-#usr/bin/pamstack
-#usr/bin/pamstereogram
-#usr/bin/pamstretch
-#usr/bin/pamstretch-gen
-#usr/bin/pamsumm
-#usr/bin/pamsummcol
-#usr/bin/pamthreshold
-#usr/bin/pamtilt
-#usr/bin/pamtoavs
-#usr/bin/pamtodjvurle
-#usr/bin/pamtofits
-#usr/bin/pamtogif
-#usr/bin/pamtohdiff
-#usr/bin/pamtohtmltbl
-#usr/bin/pamtojpeg2k
-#usr/bin/pamtompfont
-#usr/bin/pamtooctaveimg
-#usr/bin/pamtopam
-#usr/bin/pamtopdbimg
-#usr/bin/pamtopfm
-#usr/bin/pamtopng
-#usr/bin/pamtopnm
-#usr/bin/pamtosrf
-#usr/bin/pamtosvg
-#usr/bin/pamtotga
-#usr/bin/pamtotiff
-#usr/bin/pamtouil
-#usr/bin/pamtowinicon
-#usr/bin/pamtoxvmini
-#usr/bin/pamundice
-#usr/bin/pamunlookup
-#usr/bin/pamvalidate
-#usr/bin/pamwipeout
-#usr/bin/pbmclean
-#usr/bin/pbmlife
-#usr/bin/pbmmake
-#usr/bin/pbmmask
-#usr/bin/pbmminkowski
-#usr/bin/pbmpage
-#usr/bin/pbmpscale
-#usr/bin/pbmreduce
-#usr/bin/pbmtext
-#usr/bin/pbmtextps
-#usr/bin/pbmto10x
-#usr/bin/pbmto4425
-#usr/bin/pbmtoascii
-#usr/bin/pbmtoatk
-#usr/bin/pbmtobbnbg
-#usr/bin/pbmtocis
-#usr/bin/pbmtocmuwm
-#usr/bin/pbmtodjvurle
-#usr/bin/pbmtoepsi
-#usr/bin/pbmtoepson
-#usr/bin/pbmtoescp2
-#usr/bin/pbmtog3
-#usr/bin/pbmtogem
-#usr/bin/pbmtogo
-#usr/bin/pbmtoibm23xx
-#usr/bin/pbmtoicon
-#usr/bin/pbmtolj
-#usr/bin/pbmtoln03
-#usr/bin/pbmtolps
-#usr/bin/pbmtomacp
-#usr/bin/pbmtomatrixorbital
-#usr/bin/pbmtomda
-#usr/bin/pbmtomgr
-#usr/bin/pbmtomrf
-#usr/bin/pbmtonokia
-#usr/bin/pbmtopgm
-#usr/bin/pbmtopi3
-#usr/bin/pbmtopk
-#usr/bin/pbmtoplot
-#usr/bin/pbmtoppa
-#usr/bin/pbmtopsg3
-#usr/bin/pbmtoptx
-#usr/bin/pbmtosunicon
-#usr/bin/pbmtowbmp
-#usr/bin/pbmtox10bm
-#usr/bin/pbmtoxbm
-#usr/bin/pbmtoybm
-#usr/bin/pbmtozinc
-#usr/bin/pbmupc
-#usr/bin/pc1toppm
-#usr/bin/pcdovtoppm
-#usr/bin/pcxtoppm
-#usr/bin/pdbimgtopam
-#usr/bin/pfmtopam
-#usr/bin/pgmabel
-#usr/bin/pgmbentley
-#usr/bin/pgmcrater
-#usr/bin/pgmdeshadow
-#usr/bin/pgmedge
-#usr/bin/pgmenhance
-#usr/bin/pgmhist
-#usr/bin/pgmkernel
-#usr/bin/pgmmake
-#usr/bin/pgmmedian
-#usr/bin/pgmminkowski
-#usr/bin/pgmmorphconv
-#usr/bin/pgmnoise
-#usr/bin/pgmnorm
-#usr/bin/pgmoil
-#usr/bin/pgmramp
-#usr/bin/pgmslice
-#usr/bin/pgmtexture
-#usr/bin/pgmtofs
-#usr/bin/pgmtolispm
-#usr/bin/pgmtopbm
-#usr/bin/pgmtopgm
-#usr/bin/pgmtoppm
-#usr/bin/pgmtosbig
-#usr/bin/pgmtost4
-#usr/bin/pi1toppm
-#usr/bin/pi3topbm
-#usr/bin/picttoppm
-#usr/bin/pjtoppm
-#usr/bin/pktopbm
-#usr/bin/pngtopam
-#usr/bin/pngtopnm
-#usr/bin/pnmalias
-#usr/bin/pnmarith
-#usr/bin/pnmcat
-#usr/bin/pnmcolormap
-#usr/bin/pnmcomp
-#usr/bin/pnmconvol
-#usr/bin/pnmcrop
-#usr/bin/pnmcut
-#usr/bin/pnmdepth
-#usr/bin/pnmenlarge
-#usr/bin/pnmfile
-#usr/bin/pnmflip
-#usr/bin/pnmgamma
-#usr/bin/pnmhisteq
-#usr/bin/pnmhistmap
-#usr/bin/pnmindex
-#usr/bin/pnminterp
-#usr/bin/pnminvert
-#usr/bin/pnmmargin
-#usr/bin/pnmmercator
-#usr/bin/pnmmontage
-#usr/bin/pnmnlfilt
-#usr/bin/pnmnoraw
-#usr/bin/pnmnorm
-#usr/bin/pnmpad
-#usr/bin/pnmpaste
-#usr/bin/pnmpsnr
-#usr/bin/pnmquant
-#usr/bin/pnmquantall
-#usr/bin/pnmremap
-#usr/bin/pnmrotate
-#usr/bin/pnmscale
-#usr/bin/pnmscalefixed
-#usr/bin/pnmshear
-#usr/bin/pnmsmooth
-#usr/bin/pnmsplit
-#usr/bin/pnmstitch
-#usr/bin/pnmtile
-#usr/bin/pnmtoddif
-#usr/bin/pnmtofiasco
-#usr/bin/pnmtofits
-#usr/bin/pnmtojbig
-usr/bin/pnmtojpeg
-#usr/bin/pnmtopalm
-#usr/bin/pnmtopclxl
-#usr/bin/pnmtoplainpnm
-usr/bin/pnmtopng
-#usr/bin/pnmtopnm
-#usr/bin/pnmtops
-#usr/bin/pnmtorast
-#usr/bin/pnmtorle
-#usr/bin/pnmtosgi
-#usr/bin/pnmtosir
-usr/bin/pnmtotiff
-#usr/bin/pnmtotiffcmyk
-#usr/bin/pnmtoxwd
-#usr/bin/ppm3d
-#usr/bin/ppmbrighten
-#usr/bin/ppmchange
-#usr/bin/ppmcie
-#usr/bin/ppmcolormask
-#usr/bin/ppmcolors
-#usr/bin/ppmdcfont
-#usr/bin/ppmddumpfont
-#usr/bin/ppmdim
-#usr/bin/ppmdist
-#usr/bin/ppmdither
-#usr/bin/ppmdmkfont
-#usr/bin/ppmdraw
-#usr/bin/ppmfade
-#usr/bin/ppmflash
-#usr/bin/ppmforge
-#usr/bin/ppmglobe
-#usr/bin/ppmhist
-#usr/bin/ppmlabel
-#usr/bin/ppmmake
-#usr/bin/ppmmix
-#usr/bin/ppmnorm
-#usr/bin/ppmntsc
-#usr/bin/ppmpat
-#usr/bin/ppmquant
-#usr/bin/ppmquantall
-#usr/bin/ppmrainbow
-#usr/bin/ppmrelief
-#usr/bin/ppmrough
-#usr/bin/ppmshadow
-#usr/bin/ppmshift
-#usr/bin/ppmspread
-#usr/bin/ppmtoacad
-#usr/bin/ppmtoapplevol
-#usr/bin/ppmtoarbtxt
-#usr/bin/ppmtoascii
-#usr/bin/ppmtobmp
-#usr/bin/ppmtoeyuv
-#usr/bin/ppmtogif
-#usr/bin/ppmtoicr
-#usr/bin/ppmtoilbm
-#usr/bin/ppmtojpeg
-#usr/bin/ppmtoleaf
-#usr/bin/ppmtolj
-#usr/bin/ppmtomap
-#usr/bin/ppmtomitsu
-#usr/bin/ppmtompeg
-#usr/bin/ppmtoneo
-#usr/bin/ppmtopcx
-#usr/bin/ppmtopgm
-#usr/bin/ppmtopi1
-#usr/bin/ppmtopict
-#usr/bin/ppmtopj
-#usr/bin/ppmtopjxl
-#usr/bin/ppmtoppm
-#usr/bin/ppmtopuzz
-#usr/bin/ppmtorgb3
-#usr/bin/ppmtosixel
-#usr/bin/ppmtospu
-#usr/bin/ppmtoterm
-#usr/bin/ppmtotga
-#usr/bin/ppmtouil
-#usr/bin/ppmtowinicon
-#usr/bin/ppmtoxpm
-#usr/bin/ppmtoyuv
-#usr/bin/ppmtoyuvsplit
-#usr/bin/ppmtv
-#usr/bin/ppmwheel
-#usr/bin/psidtopgm
-#usr/bin/pstopnm
-#usr/bin/qrttoppm
-#usr/bin/rasttopnm
-#usr/bin/rawtopgm
-#usr/bin/rawtoppm
-#usr/bin/rgb3toppm
-#usr/bin/rlatopam
-#usr/bin/rletopnm
-#usr/bin/sbigtopgm
-#usr/bin/sgitopnm
-#usr/bin/sirtopnm
-#usr/bin/sldtoppm
-#usr/bin/spctoppm
-#usr/bin/spottopgm
-#usr/bin/sputoppm
-#usr/bin/srftopam
-#usr/bin/st4topgm
-#usr/bin/sunicontopnm
-#usr/bin/svgtopam
-#usr/bin/tgatoppm
-#usr/bin/thinkjettopbm
-#usr/bin/tifftopnm
-#usr/bin/wbmptopbm
-#usr/bin/winicontopam
-#usr/bin/winicontoppm
-#usr/bin/xbmtopbm
-#usr/bin/ximtoppm
-#usr/bin/xpmtoppm
-#usr/bin/xvminitoppm
-#usr/bin/xwdtopnm
-#usr/bin/ybmtopbm
-#usr/bin/yuvsplittoppm
-#usr/bin/yuvtoppm
-#usr/bin/yuy2topam
-#usr/bin/zeisstopnm
-#usr/include/netpbm
-#usr/include/netpbm/colorname.h
-#usr/include/netpbm/mallocvar.h
-#usr/include/netpbm/pam.h
-#usr/include/netpbm/pamdraw.h
-#usr/include/netpbm/pammap.h
-#usr/include/netpbm/pbm.h
-#usr/include/netpbm/pbmfont.h
-#usr/include/netpbm/pgm.h
-#usr/include/netpbm/pm.h
-#usr/include/netpbm/pm_config.h
-#usr/include/netpbm/pm_gamma.h
-#usr/include/netpbm/pm_system.h
-#usr/include/netpbm/pnm.h
-#usr/include/netpbm/ppm.h
-#usr/include/netpbm/ppmcmap.h
-#usr/include/netpbm/ppmdfont.h
-#usr/include/netpbm/ppmdraw.h
-#usr/include/netpbm/ppmfloyd.h
-#usr/include/netpbm/runlength.h
-#usr/include/netpbm/shhopt.h
-usr/lib/libnetpbm.so
-usr/lib/libnetpbm.so.11
-usr/lib/libnetpbm.so.11.73
-#usr/share/netpbm
-usr/share/netpbm/palmcolor8.map
-usr/share/netpbm/palmgray1.map
-usr/share/netpbm/palmgray2.map
-usr/share/netpbm/palmgray4.map
-usr/share/netpbm/pcxstd.ppm
-#usr/share/netpbm/rgb.txt

diff --git a/config/rootfiles/packages/python3-botocore b/config/rootfiles/packages/python3-botocore
index c99fe5d258101e96f848ec019c4ae9ecbf427cf0..638dff0ebdc45ed749c1f6c8bf9fbf3759d6775a 100644 (file)
--- a/config/rootfiles/packages/python3-botocore
+++ b/config/rootfiles/packages/python3-botocore
@@ -1,10 +1,10 @@
 #usr/lib/python3.10/site-packages/botocore
-#usr/lib/python3.10/site-packages/botocore-1.23.21-py3.10.egg-info
-#usr/lib/python3.10/site-packages/botocore-1.23.21-py3.10.egg-info/PKG-INFO
-#usr/lib/python3.10/site-packages/botocore-1.23.21-py3.10.egg-info/SOURCES.txt
-#usr/lib/python3.10/site-packages/botocore-1.23.21-py3.10.egg-info/dependency_links.txt
-#usr/lib/python3.10/site-packages/botocore-1.23.21-py3.10.egg-info/requires.txt
-#usr/lib/python3.10/site-packages/botocore-1.23.21-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/botocore-1.24.37-py3.10.egg-info
+#usr/lib/python3.10/site-packages/botocore-1.24.37-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/botocore-1.24.37-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/botocore-1.24.37-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/botocore-1.24.37-py3.10.egg-info/requires.txt
+#usr/lib/python3.10/site-packages/botocore-1.24.37-py3.10.egg-info/top_level.txt
 usr/lib/python3.10/site-packages/botocore/__init__.py
 usr/lib/python3.10/site-packages/botocore/args.py
 usr/lib/python3.10/site-packages/botocore/auth.py
@@ -159,6 +159,11 @@ usr/lib/python3.10/site-packages/botocore/crt/auth.py
 #usr/lib/python3.10/site-packages/botocore/data/batch/2016-08-10/examples-1.json
 #usr/lib/python3.10/site-packages/botocore/data/batch/2016-08-10/paginators-1.json
 #usr/lib/python3.10/site-packages/botocore/data/batch/2016-08-10/service-2.json
+#usr/lib/python3.10/site-packages/botocore/data/billingconductor
+#usr/lib/python3.10/site-packages/botocore/data/billingconductor/2021-07-30
+#usr/lib/python3.10/site-packages/botocore/data/billingconductor/2021-07-30/paginators-1.json
+#usr/lib/python3.10/site-packages/botocore/data/billingconductor/2021-07-30/service-2.json
+#usr/lib/python3.10/site-packages/botocore/data/billingconductor/2021-07-30/waiters-2.json
 #usr/lib/python3.10/site-packages/botocore/data/braket
 #usr/lib/python3.10/site-packages/botocore/data/braket/2019-09-01
 #usr/lib/python3.10/site-packages/botocore/data/braket/2019-09-01/paginators-1.json
@@ -690,6 +695,10 @@ usr/lib/python3.10/site-packages/botocore/crt/auth.py
 #usr/lib/python3.10/site-packages/botocore/data/gamelift/2015-10-01/examples-1.json
 #usr/lib/python3.10/site-packages/botocore/data/gamelift/2015-10-01/paginators-1.json
 #usr/lib/python3.10/site-packages/botocore/data/gamelift/2015-10-01/service-2.json
+#usr/lib/python3.10/site-packages/botocore/data/gamesparks
+#usr/lib/python3.10/site-packages/botocore/data/gamesparks/2021-08-17
+#usr/lib/python3.10/site-packages/botocore/data/gamesparks/2021-08-17/paginators-1.json
+#usr/lib/python3.10/site-packages/botocore/data/gamesparks/2021-08-17/service-2.json
 #usr/lib/python3.10/site-packages/botocore/data/glacier
 #usr/lib/python3.10/site-packages/botocore/data/glacier/2012-06-01
 #usr/lib/python3.10/site-packages/botocore/data/glacier/2012-06-01/examples-1.json
@@ -851,6 +860,11 @@ usr/lib/python3.10/site-packages/botocore/crt/auth.py
 #usr/lib/python3.10/site-packages/botocore/data/kendra/2019-02-03
 #usr/lib/python3.10/site-packages/botocore/data/kendra/2019-02-03/paginators-1.json
 #usr/lib/python3.10/site-packages/botocore/data/kendra/2019-02-03/service-2.json
+#usr/lib/python3.10/site-packages/botocore/data/keyspaces
+#usr/lib/python3.10/site-packages/botocore/data/keyspaces/2022-02-10
+#usr/lib/python3.10/site-packages/botocore/data/keyspaces/2022-02-10/paginators-1.json
+#usr/lib/python3.10/site-packages/botocore/data/keyspaces/2022-02-10/service-2.json
+#usr/lib/python3.10/site-packages/botocore/data/keyspaces/2022-02-10/waiters-2.json
 #usr/lib/python3.10/site-packages/botocore/data/kinesis
 #usr/lib/python3.10/site-packages/botocore/data/kinesis-video-archived-media
 #usr/lib/python3.10/site-packages/botocore/data/kinesis-video-archived-media/2017-09-30
@@ -1142,6 +1156,12 @@ usr/lib/python3.10/site-packages/botocore/crt/auth.py
 #usr/lib/python3.10/site-packages/botocore/data/pinpoint-email/2018-07-26/paginators-1.json
 #usr/lib/python3.10/site-packages/botocore/data/pinpoint-email/2018-07-26/service-2.json
 #usr/lib/python3.10/site-packages/botocore/data/pinpoint-sms-voice
+#usr/lib/python3.10/site-packages/botocore/data/pinpoint-sms-voice-v2
+#usr/lib/python3.10/site-packages/botocore/data/pinpoint-sms-voice-v2/2022-03-31
+#usr/lib/python3.10/site-packages/botocore/data/pinpoint-sms-voice-v2/2022-03-31/paginators-1.json
+#usr/lib/python3.10/site-packages/botocore/data/pinpoint-sms-voice-v2/2022-03-31/paginators-1.sdk-extras.json
+#usr/lib/python3.10/site-packages/botocore/data/pinpoint-sms-voice-v2/2022-03-31/service-2.json
+#usr/lib/python3.10/site-packages/botocore/data/pinpoint-sms-voice-v2/2022-03-31/waiters-2.json
 #usr/lib/python3.10/site-packages/botocore/data/pinpoint-sms-voice/2018-09-05
 #usr/lib/python3.10/site-packages/botocore/data/pinpoint-sms-voice/2018-09-05/service-2.json
 #usr/lib/python3.10/site-packages/botocore/data/pinpoint/2016-12-01
@@ -1316,6 +1336,7 @@ usr/lib/python3.10/site-packages/botocore/crt/auth.py
 #usr/lib/python3.10/site-packages/botocore/data/sdb/2009-04-15
 #usr/lib/python3.10/site-packages/botocore/data/sdb/2009-04-15/paginators-1.json
 #usr/lib/python3.10/site-packages/botocore/data/sdb/2009-04-15/service-2.json
+#usr/lib/python3.10/site-packages/botocore/data/sdk-default-configuration.json
 #usr/lib/python3.10/site-packages/botocore/data/secretsmanager
 #usr/lib/python3.10/site-packages/botocore/data/secretsmanager/2017-10-17
 #usr/lib/python3.10/site-packages/botocore/data/secretsmanager/2017-10-17/examples-1.json
@@ -1473,6 +1494,7 @@ usr/lib/python3.10/site-packages/botocore/crt/auth.py
 #usr/lib/python3.10/site-packages/botocore/data/transfer/2018-11-05
 #usr/lib/python3.10/site-packages/botocore/data/transfer/2018-11-05/paginators-1.json
 #usr/lib/python3.10/site-packages/botocore/data/transfer/2018-11-05/service-2.json
+#usr/lib/python3.10/site-packages/botocore/data/transfer/2018-11-05/waiters-2.json
 #usr/lib/python3.10/site-packages/botocore/data/translate
 #usr/lib/python3.10/site-packages/botocore/data/translate/2017-07-01
 #usr/lib/python3.10/site-packages/botocore/data/translate/2017-07-01/examples-1.json
@@ -1562,6 +1584,7 @@ usr/lib/python3.10/site-packages/botocore/exceptions.py
 usr/lib/python3.10/site-packages/botocore/handlers.py
 usr/lib/python3.10/site-packages/botocore/history.py
 usr/lib/python3.10/site-packages/botocore/hooks.py
+#usr/lib/python3.10/site-packages/botocore/httpchecksum.py
 usr/lib/python3.10/site-packages/botocore/httpsession.py
 usr/lib/python3.10/site-packages/botocore/loaders.py
 usr/lib/python3.10/site-packages/botocore/model.py

diff --git a/config/rootfiles/packages/python3-charset-normalizer b/config/rootfiles/packages/python3-charset-normalizer
index 8c754ad654f1c8b4f44fdf5a4582b628ab22a0d0..5088aa60d9cea06a9e570022e19dda7a439c6bcf 100644 (file)
--- a/config/rootfiles/packages/python3-charset-normalizer
+++ b/config/rootfiles/packages/python3-charset-normalizer
@@ -1,12 +1,12 @@
 usr/bin/normalizer
 usr/lib/python3.10/site-packages/charset_normalizer
-#usr/lib/python3.10/site-packages/charset_normalizer-2.0.10-py3.10.egg-info
-#usr/lib/python3.10/site-packages/charset_normalizer-2.0.10-py3.10.egg-info/PKG-INFO
-#usr/lib/python3.10/site-packages/charset_normalizer-2.0.10-py3.10.egg-info/SOURCES.txt
-#usr/lib/python3.10/site-packages/charset_normalizer-2.0.10-py3.10.egg-info/dependency_links.txt
-#usr/lib/python3.10/site-packages/charset_normalizer-2.0.10-py3.10.egg-info/entry_points.txt
-#usr/lib/python3.10/site-packages/charset_normalizer-2.0.10-py3.10.egg-info/requires.txt
-#usr/lib/python3.10/site-packages/charset_normalizer-2.0.10-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/charset_normalizer-2.0.12-py3.10.egg-info
+#usr/lib/python3.10/site-packages/charset_normalizer-2.0.12-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/charset_normalizer-2.0.12-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/charset_normalizer-2.0.12-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/charset_normalizer-2.0.12-py3.10.egg-info/entry_points.txt
+#usr/lib/python3.10/site-packages/charset_normalizer-2.0.12-py3.10.egg-info/requires.txt
+#usr/lib/python3.10/site-packages/charset_normalizer-2.0.12-py3.10.egg-info/top_level.txt
 usr/lib/python3.10/site-packages/charset_normalizer/__init__.py
 usr/lib/python3.10/site-packages/charset_normalizer/api.py
 usr/lib/python3.10/site-packages/charset_normalizer/assets

diff --git a/config/rootfiles/packages/python3-click b/config/rootfiles/packages/python3-click
index f72d4a679201de5b5c555957c26606d3dcb34373..90264aa75f64013592445e19e543cc981a76c4d5 100644 (file)
--- a/config/rootfiles/packages/python3-click
+++ b/config/rootfiles/packages/python3-click
@@ -1,15 +1,14 @@
 usr/lib/python3.10/site-packages/click
-#usr/lib/python3.10/site-packages/click-8.0.3-py3.10.egg-info
-#usr/lib/python3.10/site-packages/click-8.0.3-py3.10.egg-info/PKG-INFO
-#usr/lib/python3.10/site-packages/click-8.0.3-py3.10.egg-info/SOURCES.txt
-#usr/lib/python3.10/site-packages/click-8.0.3-py3.10.egg-info/dependency_links.txt
-#usr/lib/python3.10/site-packages/click-8.0.3-py3.10.egg-info/requires.txt
-#usr/lib/python3.10/site-packages/click-8.0.3-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/click-8.1.2-py3.10.egg-info
+#usr/lib/python3.10/site-packages/click-8.1.2-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/click-8.1.2-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/click-8.1.2-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/click-8.1.2-py3.10.egg-info/requires.txt
+#usr/lib/python3.10/site-packages/click-8.1.2-py3.10.egg-info/top_level.txt
 usr/lib/python3.10/site-packages/click/__init__.py
 usr/lib/python3.10/site-packages/click/_compat.py
 usr/lib/python3.10/site-packages/click/_termui_impl.py
 usr/lib/python3.10/site-packages/click/_textwrap.py
-usr/lib/python3.10/site-packages/click/_unicodefun.py
 usr/lib/python3.10/site-packages/click/_winconsole.py
 usr/lib/python3.10/site-packages/click/core.py
 usr/lib/python3.10/site-packages/click/decorators.py

diff --git a/config/rootfiles/packages/python3-flit b/config/rootfiles/packages/python3-flit
index ac483dddf05f5c9f42679c6cb9a2f1d59e320385..2dcda51fdaa2b617345ac336e6f71ebf5d7aca42 100644 (file)
--- a/config/rootfiles/packages/python3-flit
+++ b/config/rootfiles/packages/python3-flit
@@ -1,11 +1,11 @@
 usr/lib/python3.10/site-packages/flit_core
-#usr/lib/python3.10/site-packages/flit_core-3.6.0.dist-info
-#usr/lib/python3.10/site-packages/flit_core-3.6.0.dist-info/INSTALLER
-#usr/lib/python3.10/site-packages/flit_core-3.6.0.dist-info/METADATA
-#usr/lib/python3.10/site-packages/flit_core-3.6.0.dist-info/RECORD
-#usr/lib/python3.10/site-packages/flit_core-3.6.0.dist-info/REQUESTED
-#usr/lib/python3.10/site-packages/flit_core-3.6.0.dist-info/WHEEL
-#usr/lib/python3.10/site-packages/flit_core-3.6.0.dist-info/direct_url.json
+#usr/lib/python3.10/site-packages/flit_core-3.7.1.dist-info
+#usr/lib/python3.10/site-packages/flit_core-3.7.1.dist-info/INSTALLER
+#usr/lib/python3.10/site-packages/flit_core-3.7.1.dist-info/METADATA
+#usr/lib/python3.10/site-packages/flit_core-3.7.1.dist-info/RECORD
+#usr/lib/python3.10/site-packages/flit_core-3.7.1.dist-info/REQUESTED
+#usr/lib/python3.10/site-packages/flit_core-3.7.1.dist-info/WHEEL
+#usr/lib/python3.10/site-packages/flit_core-3.7.1.dist-info/direct_url.json
 usr/lib/python3.10/site-packages/flit_core/__init__.py
 usr/lib/python3.10/site-packages/flit_core/buildapi.py
 usr/lib/python3.10/site-packages/flit_core/common.py
@@ -26,6 +26,11 @@ usr/lib/python3.10/site-packages/flit_core/sdist.py
 #usr/lib/python3.10/site-packages/flit_core/tests/samples/constructed_version/pyproject.toml
 #usr/lib/python3.10/site-packages/flit_core/tests/samples/extras-dev-conflict.toml
 #usr/lib/python3.10/site-packages/flit_core/tests/samples/extras.toml
+#usr/lib/python3.10/site-packages/flit_core/tests/samples/imported_version
+#usr/lib/python3.10/site-packages/flit_core/tests/samples/imported_version/package1
+#usr/lib/python3.10/site-packages/flit_core/tests/samples/imported_version/package1/__init__.py
+#usr/lib/python3.10/site-packages/flit_core/tests/samples/imported_version/package1/_version.py
+#usr/lib/python3.10/site-packages/flit_core/tests/samples/imported_version/pyproject.toml
 #usr/lib/python3.10/site-packages/flit_core/tests/samples/inclusion
 #usr/lib/python3.10/site-packages/flit_core/tests/samples/inclusion/LICENSES
 #usr/lib/python3.10/site-packages/flit_core/tests/samples/inclusion/LICENSES/README
@@ -83,6 +88,16 @@ usr/lib/python3.10/site-packages/flit_core/sdist.py
 #usr/lib/python3.10/site-packages/flit_core/tests/samples/requires-envmark.toml
 #usr/lib/python3.10/site-packages/flit_core/tests/samples/requires-extra-envmark.toml
 #usr/lib/python3.10/site-packages/flit_core/tests/samples/requires-requests.toml
+#usr/lib/python3.10/site-packages/flit_core/tests/samples/with_data_dir
+#usr/lib/python3.10/site-packages/flit_core/tests/samples/with_data_dir/LICENSE
+#usr/lib/python3.10/site-packages/flit_core/tests/samples/with_data_dir/README.rst
+#usr/lib/python3.10/site-packages/flit_core/tests/samples/with_data_dir/data
+#usr/lib/python3.10/site-packages/flit_core/tests/samples/with_data_dir/data/share
+#usr/lib/python3.10/site-packages/flit_core/tests/samples/with_data_dir/data/share/man
+#usr/lib/python3.10/site-packages/flit_core/tests/samples/with_data_dir/data/share/man/man1
+#usr/lib/python3.10/site-packages/flit_core/tests/samples/with_data_dir/data/share/man/man1/foo.1
+#usr/lib/python3.10/site-packages/flit_core/tests/samples/with_data_dir/module1.py
+#usr/lib/python3.10/site-packages/flit_core/tests/samples/with_data_dir/pyproject.toml
 #usr/lib/python3.10/site-packages/flit_core/tests/test_build_thyself.py
 #usr/lib/python3.10/site-packages/flit_core/tests/test_buildapi.py
 #usr/lib/python3.10/site-packages/flit_core/tests/test_common.py

diff --git a/config/rootfiles/packages/python3-jmespath b/config/rootfiles/packages/python3-jmespath
index 5232c958b620d10796bd6c2d68bbbff3b6fa358d..6e15e60fd7cd394c5bc0e9b8c9d727c1ee279337 100644 (file)
--- a/config/rootfiles/packages/python3-jmespath
+++ b/config/rootfiles/packages/python3-jmespath
@@ -1,10 +1,10 @@
 usr/bin/jp.py
 #usr/lib/python3.10/site-packages/jmespath
-#usr/lib/python3.10/site-packages/jmespath-0.10.0-py3.10.egg-info
-#usr/lib/python3.10/site-packages/jmespath-0.10.0-py3.10.egg-info/PKG-INFO
-#usr/lib/python3.10/site-packages/jmespath-0.10.0-py3.10.egg-info/SOURCES.txt
-#usr/lib/python3.10/site-packages/jmespath-0.10.0-py3.10.egg-info/dependency_links.txt
-#usr/lib/python3.10/site-packages/jmespath-0.10.0-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/jmespath-1.0.0-py3.10.egg-info
+#usr/lib/python3.10/site-packages/jmespath-1.0.0-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/jmespath-1.0.0-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/jmespath-1.0.0-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/jmespath-1.0.0-py3.10.egg-info/top_level.txt
 usr/lib/python3.10/site-packages/jmespath/__init__.py
 usr/lib/python3.10/site-packages/jmespath/ast.py
 usr/lib/python3.10/site-packages/jmespath/compat.py

diff --git a/config/rootfiles/packages/python3-pkgconfig b/config/rootfiles/packages/python3-pkgconfig
new file mode 100644 (file)
index 0000000..54c0155
--- /dev/null
+++ b/config/rootfiles/packages/python3-pkgconfig
@@ -0,0 +1,8 @@
+usr/lib/python3.10/site-packages/pkgconfig
+#usr/lib/python3.10/site-packages/pkgconfig-1.5.5-py3.10.egg-info
+#usr/lib/python3.10/site-packages/pkgconfig-1.5.5-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/pkgconfig-1.5.5-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/pkgconfig-1.5.5-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/pkgconfig-1.5.5-py3.10.egg-info/top_level.txt
+usr/lib/python3.10/site-packages/pkgconfig/__init__.py
+usr/lib/python3.10/site-packages/pkgconfig/pkgconfig.py

diff --git a/config/rootfiles/packages/python3-pyparsing b/config/rootfiles/packages/python3-pyparsing
index 3dbfdcdafdc2c530db1e3a78af482ebc4f32be4f..08099a30a1d2a79ac57978898e9f6e6e8fa523a2 100644 (file)
--- a/config/rootfiles/packages/python3-pyparsing
+++ b/config/rootfiles/packages/python3-pyparsing
@@ -1,22 +1,22 @@
-#usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg
-#usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/EGG-INFO
-#usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/EGG-INFO/PKG-INFO
-#usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/EGG-INFO/SOURCES.txt
-#usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/EGG-INFO/dependency_links.txt
-#usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/EGG-INFO/not-zip-safe
-#usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/EGG-INFO/requires.txt
-#usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/EGG-INFO/top_level.txt
-#usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/pyparsing
-usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/pyparsing/__init__.py
-usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/pyparsing/actions.py
-usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/pyparsing/common.py
-usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/pyparsing/core.py
-#usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/pyparsing/diagram
-usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/pyparsing/diagram/__init__.py
-usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/pyparsing/diagram/template.jinja2
-usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/pyparsing/exceptions.py
-usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/pyparsing/helpers.py
-usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/pyparsing/results.py
-usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/pyparsing/testing.py
-usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/pyparsing/unicode.py
-usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/pyparsing/util.py
+#usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg
+#usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/EGG-INFO
+#usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/EGG-INFO/PKG-INFO
+#usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/EGG-INFO/SOURCES.txt
+#usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/EGG-INFO/dependency_links.txt
+#usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/EGG-INFO/not-zip-safe
+#usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/EGG-INFO/requires.txt
+#usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/EGG-INFO/top_level.txt
+#usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/pyparsing
+usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/pyparsing/__init__.py
+usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/pyparsing/actions.py
+usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/pyparsing/common.py
+usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/pyparsing/core.py
+#usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/pyparsing/diagram
+usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/pyparsing/diagram/__init__.py
+#usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/pyparsing/diagram/template.jinja2
+usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/pyparsing/exceptions.py
+usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/pyparsing/helpers.py
+usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/pyparsing/results.py
+usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/pyparsing/testing.py
+usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/pyparsing/unicode.py
+usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/pyparsing/util.py

diff --git a/config/rootfiles/packages/python3-pytz b/config/rootfiles/packages/python3-pytz
index 5a7484621a83941064aaf1efbcc19a6c998caa2d..040b17c99d39010d2ca98c88b7953e3aadce5914 100644 (file)
--- a/config/rootfiles/packages/python3-pytz
+++ b/config/rootfiles/packages/python3-pytz
@@ -1,10 +1,10 @@
 usr/lib/python3.10/site-packages/pytz
-#usr/lib/python3.10/site-packages/pytz-2021.3-py3.10.egg-info
-#usr/lib/python3.10/site-packages/pytz-2021.3-py3.10.egg-info/PKG-INFO
-#usr/lib/python3.10/site-packages/pytz-2021.3-py3.10.egg-info/SOURCES.txt
-#usr/lib/python3.10/site-packages/pytz-2021.3-py3.10.egg-info/dependency_links.txt
-#usr/lib/python3.10/site-packages/pytz-2021.3-py3.10.egg-info/top_level.txt
-#usr/lib/python3.10/site-packages/pytz-2021.3-py3.10.egg-info/zip-safe
+#usr/lib/python3.10/site-packages/pytz-2022.1-py3.10.egg-info
+#usr/lib/python3.10/site-packages/pytz-2022.1-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/pytz-2022.1-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/pytz-2022.1-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/pytz-2022.1-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/pytz-2022.1-py3.10.egg-info/zip-safe
 usr/lib/python3.10/site-packages/pytz/__init__.py
 usr/lib/python3.10/site-packages/pytz/exceptions.py
 usr/lib/python3.10/site-packages/pytz/lazy.py

diff --git a/config/rootfiles/packages/python3-s3transfer b/config/rootfiles/packages/python3-s3transfer
index 07e2def398691fc23d7f0c4734a699601bd95d71..6723f34984387cae47beafb0696ab2916304ee00 100644 (file)
--- a/config/rootfiles/packages/python3-s3transfer
+++ b/config/rootfiles/packages/python3-s3transfer
@@ -1,10 +1,10 @@
 #usr/lib/python3.10/site-packages/s3transfer
-#usr/lib/python3.10/site-packages/s3transfer-0.5.0-py3.10.egg-info
-#usr/lib/python3.10/site-packages/s3transfer-0.5.0-py3.10.egg-info/PKG-INFO
-#usr/lib/python3.10/site-packages/s3transfer-0.5.0-py3.10.egg-info/SOURCES.txt
-#usr/lib/python3.10/site-packages/s3transfer-0.5.0-py3.10.egg-info/dependency_links.txt
-#usr/lib/python3.10/site-packages/s3transfer-0.5.0-py3.10.egg-info/requires.txt
-#usr/lib/python3.10/site-packages/s3transfer-0.5.0-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/s3transfer-0.5.2-py3.10.egg-info
+#usr/lib/python3.10/site-packages/s3transfer-0.5.2-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/s3transfer-0.5.2-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/s3transfer-0.5.2-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/s3transfer-0.5.2-py3.10.egg-info/requires.txt
+#usr/lib/python3.10/site-packages/s3transfer-0.5.2-py3.10.egg-info/top_level.txt
 usr/lib/python3.10/site-packages/s3transfer/__init__.py
 usr/lib/python3.10/site-packages/s3transfer/bandwidth.py
 usr/lib/python3.10/site-packages/s3transfer/compat.py

diff --git a/config/rootfiles/packages/python3-semantic-version b/config/rootfiles/packages/python3-semantic-version
index 5c4ff5ec3e655711075a32675f79aa6115821336..a5be99d34fda2d8883c66782eaa30d78dd104c1e 100644 (file)
--- a/config/rootfiles/packages/python3-semantic-version
+++ b/config/rootfiles/packages/python3-semantic-version
@@ -1,10 +1,11 @@
 usr/lib/python3.10/site-packages/semantic_version
-#usr/lib/python3.10/site-packages/semantic_version-2.8.5-py3.10.egg-info
-#usr/lib/python3.10/site-packages/semantic_version-2.8.5-py3.10.egg-info/PKG-INFO
-#usr/lib/python3.10/site-packages/semantic_version-2.8.5-py3.10.egg-info/SOURCES.txt
-#usr/lib/python3.10/site-packages/semantic_version-2.8.5-py3.10.egg-info/dependency_links.txt
-#usr/lib/python3.10/site-packages/semantic_version-2.8.5-py3.10.egg-info/not-zip-safe
-#usr/lib/python3.10/site-packages/semantic_version-2.8.5-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/semantic_version-2.9.0-py3.10.egg-info
+#usr/lib/python3.10/site-packages/semantic_version-2.9.0-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/semantic_version-2.9.0-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/semantic_version-2.9.0-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/semantic_version-2.9.0-py3.10.egg-info/not-zip-safe
+#usr/lib/python3.10/site-packages/semantic_version-2.9.0-py3.10.egg-info/requires.txt
+#usr/lib/python3.10/site-packages/semantic_version-2.9.0-py3.10.egg-info/top_level.txt
 usr/lib/python3.10/site-packages/semantic_version/__init__.py
 usr/lib/python3.10/site-packages/semantic_version/base.py
 usr/lib/python3.10/site-packages/semantic_version/django_fields.py

diff --git a/config/rootfiles/packages/python3-setuptools b/config/rootfiles/packages/python3-setuptools
index 1f491c8a7def817903fc3025e1d9561ccfd73990..1f7447cb271ab25588072c5e4fce014b2f59e5dd 100644 (file)
--- a/config/rootfiles/packages/python3-setuptools
+++ b/config/rootfiles/packages/python3-setuptools
@@ -1,179 +1,252 @@
 #usr/lib/python3.10/site-packages/easy-install.pth
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/EGG-INFO
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/EGG-INFO/PKG-INFO
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/EGG-INFO/SOURCES.txt
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/EGG-INFO/dependency_links.txt
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/EGG-INFO/entry_points.txt
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/EGG-INFO/not-zip-safe
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/EGG-INFO/requires.txt
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/EGG-INFO/top_level.txt
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/_distutils_hack
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/_distutils_hack/__init__.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/_distutils_hack/override.py
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/__init__.py
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/_vendor
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/_vendor/__init__.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/_vendor/appdirs.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/_vendor/packaging
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/_vendor/packaging/__about__.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/_vendor/packaging/__init__.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/_vendor/packaging/_manylinux.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/_vendor/packaging/_musllinux.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/_vendor/packaging/_structures.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/_vendor/packaging/markers.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/_vendor/packaging/requirements.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/_vendor/packaging/specifiers.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/_vendor/packaging/tags.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/_vendor/packaging/utils.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/_vendor/packaging/version.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/_vendor/pyparsing.py
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/extern
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/extern/__init__.py
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/tests
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/tests/data
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/tests/data/my-test-package-source
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/tests/data/my-test-package-source/setup.py
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/__init__.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_deprecation_warning.py
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/__init__.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/_msvccompiler.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/archive_util.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/bcppcompiler.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/ccompiler.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/cmd.py
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/__init__.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/bdist.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/bdist_dumb.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/bdist_msi.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/bdist_rpm.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/bdist_wininst.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/build.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/build_clib.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/build_ext.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/build_py.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/build_scripts.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/check.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/clean.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/config.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/install.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/install_data.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/install_egg_info.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/install_headers.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/install_lib.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/install_scripts.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/py37compat.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/register.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/sdist.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/upload.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/config.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/core.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/cygwinccompiler.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/debug.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/dep_util.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/dir_util.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/dist.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/errors.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/extension.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/fancy_getopt.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/file_util.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/filelist.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/log.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/msvc9compiler.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/msvccompiler.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/py35compat.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/py38compat.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/spawn.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/sysconfig.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/text_file.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/unixccompiler.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/util.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/version.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/versionpredicate.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_imp.py
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/__init__.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/more_itertools
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/more_itertools/__init__.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/more_itertools/more.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/more_itertools/recipes.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/ordered_set.py
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/packaging
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/packaging/__about__.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/packaging/__init__.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/packaging/_manylinux.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/packaging/_musllinux.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/packaging/_structures.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/packaging/markers.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/packaging/requirements.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/packaging/specifiers.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/packaging/tags.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/packaging/utils.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/packaging/version.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/pyparsing.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/archive_util.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/build_meta.py
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/cli-32.exe
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/cli-64.exe
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/cli-arm64.exe
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/cli.exe
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/__init__.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/alias.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/bdist_egg.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/bdist_rpm.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/build_clib.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/build_ext.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/build_py.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/develop.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/dist_info.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/easy_install.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/egg_info.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/install.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/install_egg_info.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/install_lib.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/install_scripts.py
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/launcher
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/EGG-INFO
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/EGG-INFO/PKG-INFO
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/EGG-INFO/SOURCES.txt
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/EGG-INFO/dependency_links.txt
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/EGG-INFO/entry_points.txt
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/EGG-INFO/not-zip-safe
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/EGG-INFO/requires.txt
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/EGG-INFO/top_level.txt
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/_distutils_hack
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/_distutils_hack/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/_distutils_hack/override.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/__init__.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/appdirs.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/importlib_resources
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/importlib_resources/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/importlib_resources/_adapters.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/importlib_resources/_common.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/importlib_resources/_compat.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/importlib_resources/_itertools.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/importlib_resources/_legacy.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/importlib_resources/abc.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/importlib_resources/readers.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/importlib_resources/simple.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/jaraco
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/jaraco/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/jaraco/context.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/jaraco/functools.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/jaraco/text
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/jaraco/text/__init__.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/more_itertools
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/more_itertools/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/more_itertools/more.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/more_itertools/recipes.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/packaging
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/packaging/__about__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/packaging/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/packaging/_manylinux.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/packaging/_musllinux.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/packaging/_structures.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/packaging/markers.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/packaging/requirements.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/packaging/specifiers.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/packaging/tags.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/packaging/utils.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/packaging/version.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/pyparsing.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/zipp.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/extern
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/extern/__init__.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_deprecation_warning.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/_collections.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/_macos_compat.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/_msvccompiler.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/archive_util.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/bcppcompiler.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/ccompiler.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/cmd.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/bdist.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/bdist_dumb.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/bdist_msi.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/bdist_rpm.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/bdist_wininst.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/build.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/build_clib.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/build_ext.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/build_py.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/build_scripts.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/check.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/clean.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/config.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/install.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/install_data.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/install_egg_info.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/install_headers.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/install_lib.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/install_scripts.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/py37compat.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/register.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/sdist.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/upload.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/config.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/core.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/cygwinccompiler.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/debug.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/dep_util.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/dir_util.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/dist.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/errors.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/extension.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/fancy_getopt.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/file_util.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/filelist.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/log.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/msvc9compiler.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/msvccompiler.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/py35compat.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/py38compat.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/spawn.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/sysconfig.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/text_file.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/unixccompiler.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/util.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/version.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/versionpredicate.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_entry_points.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_imp.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_importlib.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_itertools.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_path.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_reqs.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/__init__.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_metadata
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_metadata/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_metadata/_adapters.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_metadata/_collections.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_metadata/_compat.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_metadata/_functools.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_metadata/_itertools.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_metadata/_meta.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_metadata/_text.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_resources
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_resources/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_resources/_adapters.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_resources/_common.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_resources/_compat.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_resources/_itertools.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_resources/_legacy.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_resources/abc.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_resources/readers.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_resources/simple.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/jaraco
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/jaraco/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/jaraco/context.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/jaraco/functools.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/jaraco/text
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/jaraco/text/__init__.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/more_itertools
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/more_itertools/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/more_itertools/more.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/more_itertools/recipes.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/nspektr
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/nspektr/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/nspektr/_compat.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/ordered_set.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/packaging
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/packaging/__about__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/packaging/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/packaging/_manylinux.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/packaging/_musllinux.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/packaging/_structures.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/packaging/markers.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/packaging/requirements.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/packaging/specifiers.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/packaging/tags.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/packaging/utils.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/packaging/version.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/pyparsing.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/tomli
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/tomli/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/tomli/_parser.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/tomli/_re.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/tomli/_types.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/typing_extensions.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/zipp.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/archive_util.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/build_meta.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/cli-32.exe
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/cli-64.exe
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/cli-arm64.exe
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/cli.exe
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/alias.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/bdist_egg.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/bdist_rpm.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/build_clib.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/build_ext.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/build_py.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/develop.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/dist_info.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/easy_install.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/egg_info.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/install.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/install_egg_info.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/install_lib.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/install_scripts.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/launcher
 #manifest.xml
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/py36compat.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/register.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/rotate.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/saveopts.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/sdist.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/setopt.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/test.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/upload.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/upload_docs.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/config.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/dep_util.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/depends.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/dist.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/errors.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/extension.py
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/extern
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/extern/__init__.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/glob.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/gui-32.exe
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/gui-64.exe
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/gui-arm64.exe
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/gui.exe
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/installer.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/launch.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/monkey.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/msvc.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/namespaces.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/package_index.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/py34compat.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/sandbox.py
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/script
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/py36compat.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/register.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/rotate.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/saveopts.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/sdist.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/setopt.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/test.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/upload.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/upload_docs.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/config
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/config/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/config/_apply_pyprojecttoml.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/config/_validate_pyproject
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/config/_validate_pyproject/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/config/_validate_pyproject/error_reporting.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/config/_validate_pyproject/extra_validations.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/config/_validate_pyproject/fastjsonschema_exceptions.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/config/_validate_pyproject/fastjsonschema_validations.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/config/_validate_pyproject/formats.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/config/expand.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/config/pyprojecttoml.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/config/setupcfg.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/dep_util.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/depends.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/discovery.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/dist.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/errors.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/extension.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/extern
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/extern/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/glob.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/gui-32.exe
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/gui-64.exe
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/gui-arm64.exe
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/gui.exe
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/installer.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/launch.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/logging.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/monkey.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/msvc.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/namespaces.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/package_index.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/py34compat.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/sandbox.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/script
 #(dev).tmpl
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/script.tmpl
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/unicode_utils.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/version.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/wheel.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/windows_support.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/script.tmpl
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/unicode_utils.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/version.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/wheel.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/windows_support.py
 #usr/lib/python3.10/site-packages/setuptools.pth

diff --git a/config/rootfiles/packages/python3-typing-extensions b/config/rootfiles/packages/python3-typing-extensions
index 3cf68834d35693d8c261cb6daf6555d28668c41d..fb11f5a4cfb343b2952cee772b20e4a988d26864 100644 (file)
--- a/config/rootfiles/packages/python3-typing-extensions
+++ b/config/rootfiles/packages/python3-typing-extensions
@@ -1,6 +1,6 @@
-#usr/lib/python3.10/site-packages/typing_extensions-4.0.1.dist-info
-#usr/lib/python3.10/site-packages/typing_extensions-4.0.1.dist-info/LICENSE
-#usr/lib/python3.10/site-packages/typing_extensions-4.0.1.dist-info/METADATA
-#usr/lib/python3.10/site-packages/typing_extensions-4.0.1.dist-info/RECORD
-#usr/lib/python3.10/site-packages/typing_extensions-4.0.1.dist-info/WHEEL
+#usr/lib/python3.10/site-packages/typing_extensions-4.1.1.dist-info
+#usr/lib/python3.10/site-packages/typing_extensions-4.1.1.dist-info/LICENSE
+#usr/lib/python3.10/site-packages/typing_extensions-4.1.1.dist-info/METADATA
+#usr/lib/python3.10/site-packages/typing_extensions-4.1.1.dist-info/RECORD
+#usr/lib/python3.10/site-packages/typing_extensions-4.1.1.dist-info/WHEEL
 usr/lib/python3.10/site-packages/typing_extensions.py

diff --git a/config/rootfiles/packages/python3-urllib3 b/config/rootfiles/packages/python3-urllib3
index 9a76302cba03c7418534c75a17bbccaa318cc69f..5d486273ef80dbef20a6440c2fe6c0aac57a3cd6 100644 (file)
--- a/config/rootfiles/packages/python3-urllib3
+++ b/config/rootfiles/packages/python3-urllib3
@@ -1,10 +1,10 @@
 usr/lib/python3.10/site-packages/urllib3
-#usr/lib/python3.10/site-packages/urllib3-1.26.7-py3.10.egg-info
-#usr/lib/python3.10/site-packages/urllib3-1.26.7-py3.10.egg-info/PKG-INFO
-#usr/lib/python3.10/site-packages/urllib3-1.26.7-py3.10.egg-info/SOURCES.txt
-#usr/lib/python3.10/site-packages/urllib3-1.26.7-py3.10.egg-info/dependency_links.txt
-#usr/lib/python3.10/site-packages/urllib3-1.26.7-py3.10.egg-info/requires.txt
-#usr/lib/python3.10/site-packages/urllib3-1.26.7-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/urllib3-1.26.9-py3.10.egg-info
+#usr/lib/python3.10/site-packages/urllib3-1.26.9-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/urllib3-1.26.9-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/urllib3-1.26.9-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/urllib3-1.26.9-py3.10.egg-info/requires.txt
+#usr/lib/python3.10/site-packages/urllib3-1.26.9-py3.10.egg-info/top_level.txt
 #usr/lib/python3.10/site-packages/urllib3/__init__.py
 #usr/lib/python3.10/site-packages/urllib3/_collections.py
 #usr/lib/python3.10/site-packages/urllib3/_version.py
@@ -31,9 +31,6 @@ usr/lib/python3.10/site-packages/urllib3
 #usr/lib/python3.10/site-packages/urllib3/packages/backports/__init__.py
 #usr/lib/python3.10/site-packages/urllib3/packages/backports/makefile.py
 #usr/lib/python3.10/site-packages/urllib3/packages/six.py
-#usr/lib/python3.10/site-packages/urllib3/packages/ssl_match_hostname
-#usr/lib/python3.10/site-packages/urllib3/packages/ssl_match_hostname/__init__.py
-#usr/lib/python3.10/site-packages/urllib3/packages/ssl_match_hostname/_implementation.py
 #usr/lib/python3.10/site-packages/urllib3/poolmanager.py
 #usr/lib/python3.10/site-packages/urllib3/request.py
 #usr/lib/python3.10/site-packages/urllib3/response.py
@@ -46,6 +43,7 @@ usr/lib/python3.10/site-packages/urllib3
 #usr/lib/python3.10/site-packages/urllib3/util/response.py
 #usr/lib/python3.10/site-packages/urllib3/util/retry.py
 #usr/lib/python3.10/site-packages/urllib3/util/ssl_.py
+#usr/lib/python3.10/site-packages/urllib3/util/ssl_match_hostname.py
 #usr/lib/python3.10/site-packages/urllib3/util/ssltransport.py
 #usr/lib/python3.10/site-packages/urllib3/util/timeout.py
 #usr/lib/python3.10/site-packages/urllib3/util/url.py

diff --git a/config/rootfiles/packages/tshark b/config/rootfiles/packages/tshark
index f46d7ba0135389580fc5ea2d646121baa4aab586..937ddd3d6a0f1b018710e5291145b1c9aa7ef5b5 100644 (file)
--- a/config/rootfiles/packages/tshark
+++ b/config/rootfiles/packages/tshark
@@ -44,6 +44,7 @@ usr/bin/tshark
 #usr/include/wireshark/epan/crc32-tvb.h
 #usr/include/wireshark/epan/crc6-tvb.h
 #usr/include/wireshark/epan/crc8-tvb.h
+#usr/include/wireshark/epan/dccpservicecodes.h
 #usr/include/wireshark/epan/decode_as.h
 #usr/include/wireshark/epan/dfilter
 #usr/include/wireshark/epan/dfilter/dfilter.h
@@ -51,6 +52,7 @@ usr/bin/tshark
 #usr/include/wireshark/epan/diam_dict.h
 #usr/include/wireshark/epan/disabled_protos.h
 #usr/include/wireshark/epan/dissectors
+#usr/include/wireshark/epan/dissectors/cond_ace_token_enum.h
 #usr/include/wireshark/epan/dissectors/file-rbm.h
 #usr/include/wireshark/epan/dissectors/packet-6lowpan.h
 #usr/include/wireshark/epan/dissectors/packet-a21.h
@@ -61,10 +63,12 @@ usr/bin/tshark
 #usr/include/wireshark/epan/dissectors/packet-adb_service.h
 #usr/include/wireshark/epan/dissectors/packet-afp.h
 #usr/include/wireshark/epan/dissectors/packet-alcap.h
+#usr/include/wireshark/epan/dissectors/packet-amp.h
 #usr/include/wireshark/epan/dissectors/packet-ansi_a.h
 #usr/include/wireshark/epan/dissectors/packet-ansi_map.h
 #usr/include/wireshark/epan/dissectors/packet-ansi_tcap.h
 #usr/include/wireshark/epan/dissectors/packet-arp.h
+#usr/include/wireshark/epan/dissectors/packet-asap+enrp-common.h
 #usr/include/wireshark/epan/dissectors/packet-atalk.h
 #usr/include/wireshark/epan/dissectors/packet-atm.h
 #usr/include/wireshark/epan/dissectors/packet-atn-ulcs.h
@@ -75,12 +79,16 @@ usr/bin/tshark
 #usr/include/wireshark/epan/dissectors/packet-bgp.h
 #usr/include/wireshark/epan/dissectors/packet-bicc_mst.h
 #usr/include/wireshark/epan/dissectors/packet-bluetooth.h
+#usr/include/wireshark/epan/dissectors/packet-bpsec.h
+#usr/include/wireshark/epan/dissectors/packet-bpv6.h
+#usr/include/wireshark/epan/dissectors/packet-bpv7.h
 #usr/include/wireshark/epan/dissectors/packet-bssap.h
 #usr/include/wireshark/epan/dissectors/packet-bssgp.h
 #usr/include/wireshark/epan/dissectors/packet-btatt.h
 #usr/include/wireshark/epan/dissectors/packet-btavctp.h
 #usr/include/wireshark/epan/dissectors/packet-btavdtp.h
 #usr/include/wireshark/epan/dissectors/packet-btavrcp.h
+#usr/include/wireshark/epan/dissectors/packet-btbredr_rf.h
 #usr/include/wireshark/epan/dissectors/packet-bthci_acl.h
 #usr/include/wireshark/epan/dissectors/packet-bthci_cmd.h
 #usr/include/wireshark/epan/dissectors/packet-bthci_evt.h
@@ -102,6 +110,7 @@ usr/bin/tshark
 #usr/include/wireshark/epan/dissectors/packet-cmp.h
 #usr/include/wireshark/epan/dissectors/packet-cms.h
 #usr/include/wireshark/epan/dissectors/packet-coap.h
+#usr/include/wireshark/epan/dissectors/packet-cose.h
 #usr/include/wireshark/epan/dissectors/packet-credssp.h
 #usr/include/wireshark/epan/dissectors/packet-crmf.h
 #usr/include/wireshark/epan/dissectors/packet-csn1.h
@@ -132,10 +141,10 @@ usr/bin/tshark
 #usr/include/wireshark/epan/dissectors/packet-disp.h
 #usr/include/wireshark/epan/dissectors/packet-dns.h
 #usr/include/wireshark/epan/dissectors/packet-docsis-tlv.h
+#usr/include/wireshark/epan/dissectors/packet-doip.h
 #usr/include/wireshark/epan/dissectors/packet-dop.h
 #usr/include/wireshark/epan/dissectors/packet-dsp.h
 #usr/include/wireshark/epan/dissectors/packet-dtls.h
-#usr/include/wireshark/epan/dissectors/packet-dtn.h
 #usr/include/wireshark/epan/dissectors/packet-dvbci.h
 #usr/include/wireshark/epan/dissectors/packet-e164.h
 #usr/include/wireshark/epan/dissectors/packet-e1ap.h
@@ -162,6 +171,7 @@ usr/bin/tshark
 #usr/include/wireshark/epan/dissectors/packet-fcswils.h
 #usr/include/wireshark/epan/dissectors/packet-ff.h
 #usr/include/wireshark/epan/dissectors/packet-fix.h
+#usr/include/wireshark/epan/dissectors/packet-flexray.h
 #usr/include/wireshark/epan/dissectors/packet-fmp.h
 #usr/include/wireshark/epan/dissectors/packet-frame.h
 #usr/include/wireshark/epan/dissectors/packet-ftam.h
@@ -220,6 +230,8 @@ usr/bin/tshark
 #usr/include/wireshark/epan/dissectors/packet-isis-clv.h
 #usr/include/wireshark/epan/dissectors/packet-isis.h
 #usr/include/wireshark/epan/dissectors/packet-isl.h
+#usr/include/wireshark/epan/dissectors/packet-iso10681.h
+#usr/include/wireshark/epan/dissectors/packet-iso15765.h
 #usr/include/wireshark/epan/dissectors/packet-isup.h
 #usr/include/wireshark/epan/dissectors/packet-its.h
 #usr/include/wireshark/epan/dissectors/packet-iwarp-ddp-rdmap.h
@@ -237,6 +249,7 @@ usr/bin/tshark
 #usr/include/wireshark/epan/dissectors/packet-lcsap.h
 #usr/include/wireshark/epan/dissectors/packet-ldap.h
 #usr/include/wireshark/epan/dissectors/packet-ldp.h
+#usr/include/wireshark/epan/dissectors/packet-lin.h
 #usr/include/wireshark/epan/dissectors/packet-link16.h
 #usr/include/wireshark/epan/dissectors/packet-lisp.h
 #usr/include/wireshark/epan/dissectors/packet-llc.h
@@ -274,6 +287,7 @@ usr/bin/tshark
 #usr/include/wireshark/epan/dissectors/packet-nisplus.h
 #usr/include/wireshark/epan/dissectors/packet-nlm.h
 #usr/include/wireshark/epan/dissectors/packet-nr-rrc.h
+#usr/include/wireshark/epan/dissectors/packet-nrppa.h
 #usr/include/wireshark/epan/dissectors/packet-nsh.h
 #usr/include/wireshark/epan/dissectors/packet-ntlmssp.h
 #usr/include/wireshark/epan/dissectors/packet-ntp.h
@@ -292,6 +306,7 @@ usr/bin/tshark
 #usr/include/wireshark/epan/dissectors/packet-pcnfsd.h
 #usr/include/wireshark/epan/dissectors/packet-pdcp-lte.h
 #usr/include/wireshark/epan/dissectors/packet-pdcp-nr.h
+#usr/include/wireshark/epan/dissectors/packet-pdu-transport.h
 #usr/include/wireshark/epan/dissectors/packet-per.h
 #usr/include/wireshark/epan/dissectors/packet-pkcs1.h
 #usr/include/wireshark/epan/dissectors/packet-pkcs12.h
@@ -334,7 +349,6 @@ usr/bin/tshark
 #usr/include/wireshark/epan/dissectors/packet-rtcp.h
 #usr/include/wireshark/epan/dissectors/packet-rtp-events.h
 #usr/include/wireshark/epan/dissectors/packet-rtp.h
-#usr/include/wireshark/epan/dissectors/packet-rtps.h
 #usr/include/wireshark/epan/dissectors/packet-rtse.h
 #usr/include/wireshark/epan/dissectors/packet-rtsp.h
 #usr/include/wireshark/epan/dissectors/packet-rx.h
@@ -367,6 +381,7 @@ usr/bin/tshark
 #usr/include/wireshark/epan/dissectors/packet-smrse.h
 #usr/include/wireshark/epan/dissectors/packet-snmp.h
 #usr/include/wireshark/epan/dissectors/packet-socketcan.h
+#usr/include/wireshark/epan/dissectors/packet-someip.h
 #usr/include/wireshark/epan/dissectors/packet-spice.h
 #usr/include/wireshark/epan/dissectors/packet-sprt.h
 #usr/include/wireshark/epan/dissectors/packet-sscop.h
@@ -380,6 +395,7 @@ usr/bin/tshark
 #usr/include/wireshark/epan/dissectors/packet-tacacs.h
 #usr/include/wireshark/epan/dissectors/packet-tcap.h
 #usr/include/wireshark/epan/dissectors/packet-tcp.h
+#usr/include/wireshark/epan/dissectors/packet-tcpclv3.h
 #usr/include/wireshark/epan/dissectors/packet-tetra.h
 #usr/include/wireshark/epan/dissectors/packet-thrift.h
 #usr/include/wireshark/epan/dissectors/packet-tls-utils.h
@@ -391,6 +407,7 @@ usr/bin/tshark
 #usr/include/wireshark/epan/dissectors/packet-tte.h
 #usr/include/wireshark/epan/dissectors/packet-ua.h
 #usr/include/wireshark/epan/dissectors/packet-uaudp.h
+#usr/include/wireshark/epan/dissectors/packet-uavcan-dsdl.h
 #usr/include/wireshark/epan/dissectors/packet-ubertooth.h
 #usr/include/wireshark/epan/dissectors/packet-udp.h
 #usr/include/wireshark/epan/dissectors/packet-umts_fp.h
@@ -478,6 +495,7 @@ usr/bin/tshark
 #usr/include/wireshark/epan/packet.h
 #usr/include/wireshark/epan/packet_info.h
 #usr/include/wireshark/epan/params.h
+#usr/include/wireshark/epan/pci-ids.h
 #usr/include/wireshark/epan/plugin_if.h
 #usr/include/wireshark/epan/ppptypes.h
 #usr/include/wireshark/epan/prefs-int.h
@@ -522,27 +540,12 @@ usr/bin/tshark
 #usr/include/wireshark/epan/uat.h
 #usr/include/wireshark/epan/unit_strings.h
 #usr/include/wireshark/epan/value_string.h
-#usr/include/wireshark/epan/wmem
-#usr/include/wireshark/epan/wmem/wmem.h
-#usr/include/wireshark/epan/wmem/wmem_array.h
-#usr/include/wireshark/epan/wmem/wmem_core.h
-#usr/include/wireshark/epan/wmem/wmem_interval_tree.h
-#usr/include/wireshark/epan/wmem/wmem_list.h
-#usr/include/wireshark/epan/wmem/wmem_map.h
-#usr/include/wireshark/epan/wmem/wmem_miscutl.h
-#usr/include/wireshark/epan/wmem/wmem_queue.h
-#usr/include/wireshark/epan/wmem/wmem_scopes.h
-#usr/include/wireshark/epan/wmem/wmem_stack.h
-#usr/include/wireshark/epan/wmem/wmem_strbuf.h
-#usr/include/wireshark/epan/wmem/wmem_strutl.h
-#usr/include/wireshark/epan/wmem/wmem_tree.h
-#usr/include/wireshark/epan/wmem/wmem_user_cb.h
+#usr/include/wireshark/epan/wmem_scopes.h
+#usr/include/wireshark/epan/wscbor.h
 #usr/include/wireshark/epan/x264_prt_id.h
 #usr/include/wireshark/epan/xdlc.h
 #usr/include/wireshark/file.h
 #usr/include/wireshark/globals.h
-#usr/include/wireshark/log.h
-#usr/include/wireshark/version_info.h
 #usr/include/wireshark/wiretap
 #usr/include/wireshark/wiretap/file_wrappers.h
 #usr/include/wireshark/wiretap/merge.h
@@ -550,13 +553,16 @@ usr/bin/tshark
 #usr/include/wireshark/wiretap/pcapng_module.h
 #usr/include/wireshark/wiretap/secrets-types.h
 #usr/include/wireshark/wiretap/wtap.h
+#usr/include/wireshark/wiretap/wtap_modules.h
 #usr/include/wireshark/wiretap/wtap_opttypes.h
 #usr/include/wireshark/ws_attributes.h
 #usr/include/wireshark/ws_compiler_tests.h
 #usr/include/wireshark/ws_diag_control.h
+#usr/include/wireshark/ws_log_defs.h
 #usr/include/wireshark/ws_symbol_export.h
 #usr/include/wireshark/ws_version.h
 #usr/include/wireshark/wsutil
+#usr/include/wireshark/wsutil/802_11-utils.h
 #usr/include/wireshark/wsutil/adler32.h
 #usr/include/wireshark/wsutil/base32.h
 #usr/include/wireshark/wsutil/bits_count_ones.h
@@ -580,9 +586,10 @@ usr/bin/tshark
 #usr/include/wireshark/wsutil/curve25519.h
 #usr/include/wireshark/wsutil/eax.h
 #usr/include/wireshark/wsutil/epochs.h
+#usr/include/wireshark/wsutil/exported_pdu_tlvs.h
 #usr/include/wireshark/wsutil/filesystem.h
-#usr/include/wireshark/wsutil/frequency-utils.h
 #usr/include/wireshark/wsutil/g711.h
+#usr/include/wireshark/wsutil/glib-compat.h
 #usr/include/wireshark/wsutil/inet_addr.h
 #usr/include/wireshark/wsutil/inet_ipv4.h
 #usr/include/wireshark/wsutil/inet_ipv6.h
@@ -595,7 +602,6 @@ usr/bin/tshark
 #usr/include/wireshark/wsutil/os_version_info.h
 #usr/include/wireshark/wsutil/pint.h
 #usr/include/wireshark/wsutil/please_report_bug.h
-#usr/include/wireshark/wsutil/plugins.h
 #usr/include/wireshark/wsutil/pow2.h
 #usr/include/wireshark/wsutil/privileges.h
 #usr/include/wireshark/wsutil/processes.h
@@ -608,25 +614,43 @@ usr/bin/tshark
 #usr/include/wireshark/wsutil/strtoi.h
 #usr/include/wireshark/wsutil/tempfile.h
 #usr/include/wireshark/wsutil/time_util.h
+#usr/include/wireshark/wsutil/to_str.h
 #usr/include/wireshark/wsutil/type_util.h
 #usr/include/wireshark/wsutil/unicode-utils.h
 #usr/include/wireshark/wsutil/utf8_entities.h
+#usr/include/wireshark/wsutil/wmem
+#usr/include/wireshark/wsutil/wmem/wmem.h
+#usr/include/wireshark/wsutil/wmem/wmem_array.h
+#usr/include/wireshark/wsutil/wmem/wmem_core.h
+#usr/include/wireshark/wsutil/wmem/wmem_interval_tree.h
+#usr/include/wireshark/wsutil/wmem/wmem_list.h
+#usr/include/wireshark/wsutil/wmem/wmem_map.h
+#usr/include/wireshark/wsutil/wmem/wmem_miscutl.h
+#usr/include/wireshark/wsutil/wmem/wmem_queue.h
+#usr/include/wireshark/wsutil/wmem/wmem_stack.h
+#usr/include/wireshark/wsutil/wmem/wmem_strbuf.h
+#usr/include/wireshark/wsutil/wmem/wmem_strutl.h
+#usr/include/wireshark/wsutil/wmem/wmem_tree.h
+#usr/include/wireshark/wsutil/wmem/wmem_user_cb.h
+#usr/include/wireshark/wsutil/ws_assert.h
 #usr/include/wireshark/wsutil/ws_cpuid.h
+#usr/include/wireshark/wsutil/ws_getopt.h
 #usr/include/wireshark/wsutil/ws_mempbrk.h
 #usr/include/wireshark/wsutil/ws_mempbrk_int.h
 #usr/include/wireshark/wsutil/ws_pipe.h
-#usr/include/wireshark/wsutil/ws_printf.h
+#usr/include/wireshark/wsutil/ws_roundup.h
 #usr/include/wireshark/wsutil/wsjson.h
+#usr/include/wireshark/wsutil/wslog.h
 #usr/include/wireshark/wsutil/xtea.h
 #usr/lib/libwireshark.so
-usr/lib/libwireshark.so.14
-usr/lib/libwireshark.so.14.0.7
+usr/lib/libwireshark.so.15
+usr/lib/libwireshark.so.15.0.3
 #usr/lib/libwiretap.so
-usr/lib/libwiretap.so.11
-usr/lib/libwiretap.so.11.0.7
+usr/lib/libwiretap.so.12
+usr/lib/libwiretap.so.12.0.3
 #usr/lib/libwsutil.so
-usr/lib/libwsutil.so.12
-usr/lib/libwsutil.so.12.0.0
+usr/lib/libwsutil.so.13
+usr/lib/libwsutil.so.13.1.0
 #usr/lib/pkgconfig/wireshark.pc
 #usr/lib/wireshark
 #usr/lib/wireshark/cmake
@@ -648,81 +672,34 @@ usr/lib/wireshark/extcap/randpktdump
 usr/lib/wireshark/extcap/sshdump
 usr/lib/wireshark/extcap/udpdump
 #usr/lib/wireshark/plugins
-#usr/lib/wireshark/plugins/3.4
-#usr/lib/wireshark/plugins/3.4/codecs
-usr/lib/wireshark/plugins/3.4/codecs/g711.so
-usr/lib/wireshark/plugins/3.4/codecs/g722.so
-usr/lib/wireshark/plugins/3.4/codecs/g726.so
-usr/lib/wireshark/plugins/3.4/codecs/l16mono.so
-usr/lib/wireshark/plugins/3.4/codecs/opus_dec.so
-#usr/lib/wireshark/plugins/3.4/epan
-usr/lib/wireshark/plugins/3.4/epan/ethercat.so
-usr/lib/wireshark/plugins/3.4/epan/gryphon.so
-usr/lib/wireshark/plugins/3.4/epan/irda.so
-usr/lib/wireshark/plugins/3.4/epan/mate.so
-usr/lib/wireshark/plugins/3.4/epan/opcua.so
-usr/lib/wireshark/plugins/3.4/epan/profinet.so
-usr/lib/wireshark/plugins/3.4/epan/stats_tree.so
-usr/lib/wireshark/plugins/3.4/epan/transum.so
-usr/lib/wireshark/plugins/3.4/epan/unistim.so
-usr/lib/wireshark/plugins/3.4/epan/wimax.so
-usr/lib/wireshark/plugins/3.4/epan/wimaxasncp.so
-usr/lib/wireshark/plugins/3.4/epan/wimaxmacphy.so
-#usr/lib/wireshark/plugins/3.4/wiretap
-usr/lib/wireshark/plugins/3.4/wiretap/usbdump.so
-#usr/share/doc/wireshark
-#usr/share/doc/wireshark/androiddump.html
-#usr/share/doc/wireshark/capinfos.html
-#usr/share/doc/wireshark/captype.html
-#usr/share/doc/wireshark/ciscodump.html
-#usr/share/doc/wireshark/dftest.html
-#usr/share/doc/wireshark/dpauxmon.html
-#usr/share/doc/wireshark/dumpcap.html
-#usr/share/doc/wireshark/editcap.html
-#usr/share/doc/wireshark/extcap.html
-#usr/share/doc/wireshark/mergecap.html
-#usr/share/doc/wireshark/randpkt.html
-#usr/share/doc/wireshark/randpktdump.html
-#usr/share/doc/wireshark/rawshark.html
-#usr/share/doc/wireshark/reordercap.html
-#usr/share/doc/wireshark/sshdump.html
-#usr/share/doc/wireshark/text2pcap.html
-#usr/share/doc/wireshark/tshark.html
-#usr/share/doc/wireshark/udpdump.html
-#usr/share/doc/wireshark/wireshark-filter.html
-#usr/share/doc/wireshark/wireshark.html
-#usr/share/man/man1/androiddump.1
-#usr/share/man/man1/capinfos.1
-#usr/share/man/man1/captype.1
-#usr/share/man/man1/ciscodump.1
-#usr/share/man/man1/dftest.1
-#usr/share/man/man1/dpauxmon.1
-#usr/share/man/man1/dumpcap.1
-#usr/share/man/man1/editcap.1
-#usr/share/man/man1/mergecap.1
-#usr/share/man/man1/randpkt.1
-#usr/share/man/man1/randpktdump.1
-#usr/share/man/man1/rawshark.1
-#usr/share/man/man1/reordercap.1
-#usr/share/man/man1/sshdump.1
-#usr/share/man/man1/text2pcap.1
-#usr/share/man/man1/tshark.1
-#usr/share/man/man1/udpdump.1
-#usr/share/man/man1/wireshark.1
-#usr/share/man/man4/extcap.4
-#usr/share/man/man4/wireshark-filter.4
+#usr/lib/wireshark/plugins/3.6
+#usr/lib/wireshark/plugins/3.6/codecs
+usr/lib/wireshark/plugins/3.6/codecs/g711.so
+usr/lib/wireshark/plugins/3.6/codecs/g722.so
+usr/lib/wireshark/plugins/3.6/codecs/g726.so
+usr/lib/wireshark/plugins/3.6/codecs/l16mono.so
+usr/lib/wireshark/plugins/3.6/codecs/opus_dec.so
+#usr/lib/wireshark/plugins/3.6/epan
+usr/lib/wireshark/plugins/3.6/epan/ethercat.so
+usr/lib/wireshark/plugins/3.6/epan/gryphon.so
+usr/lib/wireshark/plugins/3.6/epan/irda.so
+usr/lib/wireshark/plugins/3.6/epan/mate.so
+usr/lib/wireshark/plugins/3.6/epan/opcua.so
+usr/lib/wireshark/plugins/3.6/epan/profinet.so
+usr/lib/wireshark/plugins/3.6/epan/stats_tree.so
+usr/lib/wireshark/plugins/3.6/epan/transum.so
+usr/lib/wireshark/plugins/3.6/epan/unistim.so
+usr/lib/wireshark/plugins/3.6/epan/wimax.so
+usr/lib/wireshark/plugins/3.6/epan/wimaxasncp.so
+usr/lib/wireshark/plugins/3.6/epan/wimaxmacphy.so
+#usr/lib/wireshark/plugins/3.6/wiretap
+usr/lib/wireshark/plugins/3.6/wiretap/usbdump.so
 #usr/share/wireshark
-#usr/share/wireshark/AUTHORS-SHORT
 #usr/share/wireshark/COPYING
-#usr/share/wireshark/androiddump.html
-#usr/share/wireshark/capinfos.html
-#usr/share/wireshark/captype.html
 usr/share/wireshark/cfilters
-#usr/share/wireshark/ciscodump.html
 usr/share/wireshark/colorfilters
 #usr/share/wireshark/dfilter_macros
 usr/share/wireshark/dfilters
-#usr/share/wireshark/dftest.html
 #usr/share/wireshark/diameter
 usr/share/wireshark/diameter/AlcatelLucent.xml
 usr/share/wireshark/diameter/Cisco.xml
@@ -768,13 +745,9 @@ usr/share/wireshark/dtds/smil.dtd
 usr/share/wireshark/dtds/watcherinfo.dtd
 usr/share/wireshark/dtds/xcap-caps.dtd
 usr/share/wireshark/dtds/xcap-error.dtd
-#usr/share/wireshark/dumpcap.html
-#usr/share/wireshark/editcap.html
 usr/share/wireshark/enterprises.tsv
-#usr/share/wireshark/extcap.html
 #usr/share/wireshark/ipmap.html
 #usr/share/wireshark/manuf
-#usr/share/wireshark/mergecap.html
 #usr/share/wireshark/pdml2html.xsl
 #usr/share/wireshark/profiles
 #usr/share/wireshark/profiles/Bluetooth
@@ -996,22 +969,12 @@ usr/share/wireshark/radius/dictionary.yubico
 usr/share/wireshark/radius/dictionary.zeus
 usr/share/wireshark/radius/dictionary.zte
 usr/share/wireshark/radius/dictionary.zyxel
-#usr/share/wireshark/randpkt.html
-#usr/share/wireshark/randpktdump.html
-#usr/share/wireshark/rawshark.html
-#usr/share/wireshark/reordercap.html
 usr/share/wireshark/services
 usr/share/wireshark/smi_modules
-#usr/share/wireshark/sshdump.html
-#usr/share/wireshark/text2pcap.html
 #usr/share/wireshark/tpncp
 usr/share/wireshark/tpncp/tpncp.dat
-#usr/share/wireshark/tshark.html
-#usr/share/wireshark/udpdump.html
 #usr/share/wireshark/wimaxasncp
 usr/share/wireshark/wimaxasncp/dictionary.dtd
 usr/share/wireshark/wimaxasncp/dictionary.xml
-#usr/share/wireshark/wireshark-filter.html
-#usr/share/wireshark/wireshark.html
 usr/share/wireshark/wka
 usr/share/wireshark/ws.css

diff --git a/config/ssh/ssh_config b/config/ssh/ssh_config
index 2e2ee60c39e7f5ba68ea955077b046add2dbaa41..85c069ddae4692a3b4225f793544d572b01190ac 100644 (file)
--- a/config/ssh/ssh_config
+++ b/config/ssh/ssh_config
@@ -5,23 +5,27 @@
 
 # Set some basic hardening options for all connections
 Host *
-        # Disable Roaming as it is known to be vulnerable
+        # Disable undocumented roaming feature as it is known to be vulnerable
         UseRoaming no
 
         # Only use secure crypto algorithms
-        KexAlgorithms curve25519-sha256@libssh.org,diffie-hellman-group-exchange-sha256
+        KexAlgorithms sntrup761x25519-sha512@openssh.com,curve25519-sha256,curve25519-sha256@libssh.org,diffie-hellman-group-exchange-sha256
         Ciphers chacha20-poly1305@openssh.com,aes256-gcm@openssh.com,aes128-gcm@openssh.com,aes256-ctr,aes192-ctr,aes128-ctr
         MACs hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com,umac-128-etm@openssh.com,hmac-sha2-512,hmac-sha2-256,umac-128@openssh.com
 
-        # Always visualise server host keys (but helps to identify key based MITM attacks)
+        # Always visualise server host keys (helps to identify key based MITM attacks)
         VisualHostKey yes
 
         # Use SSHFP (might work on some up-to-date networks) to look up host keys
         VerifyHostKeyDNS yes
 
-        # send keep-alive messages to connected server to avoid broken connections
+        # Send SSH-based keep alive messages to connected server to avoid broken connections
         ServerAliveInterval 10
-        ServerAliveCountMax 6
+        ServerAliveCountMax 30
+
+       # Disable TCP keep alive messages since they can be spoofed and we have SSH-based
+       # keep alive messages enabled; there is no need to do things twice here
+       TCPKeepAlive no
 
         # Ensure only allowed authentication methods are used
         PreferredAuthentications publickey,keyboard-interactive,password

diff --git a/config/ssh/sshd_config b/config/ssh/sshd_config
index bea5cee5340e3841c6ade17232a814ade8b8c95b..76c9b3eb1cdd046950ad095c81dc34a46d2f4185 100644 (file)
--- a/config/ssh/sshd_config
+++ b/config/ssh/sshd_config
@@ -19,9 +19,8 @@ LoginGraceTime 30s
 # Limit maximum instanctes to prevent DoS
 MaxStartups 5
 
-# Only allow safe crypto algorithms (may break some _very_ outdated clients)
-# See also: https://stribika.github.io/2015/01/04/secure-secure-shell.html
-KexAlgorithms curve25519-sha256@libssh.org,diffie-hellman-group-exchange-sha256
+# Only allow safe crypto algorithms
+KexAlgorithms sntrup761x25519-sha512@openssh.com,curve25519-sha256,curve25519-sha256@libssh.org,diffie-hellman-group-exchange-sha256
 Ciphers chacha20-poly1305@openssh.com,aes256-gcm@openssh.com,aes128-gcm@openssh.com,aes256-ctr,aes192-ctr,aes128-ctr
 MACs hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com,umac-128-etm@openssh.com,hmac-sha2-512,hmac-sha2-256,umac-128@openssh.com
 
@@ -47,11 +46,13 @@ AllowTcpForwarding no
 AllowAgentForwarding no
 PermitOpen none
 
-# Detect broken sessions by sending keep-alive messages to clients via SSH connection
+# Send SSH-based keep alive messages to connected clients to avoid broken connections
 ClientAliveInterval 10
+ClientAliveCountMax 30
 
-# Close unresponsive SSH sessions which fail to answer keep-alive
-ClientAliveCountMax 6
+# Since TCP keep alive messages can be spoofed and we have the SSH-based already,
+# there is no need for this to be enabled as well
+TCPKeepAlive no
 
 # Add support for SFTP
 Subsystem      sftp    /usr/lib/openssh/sftp-server

diff --git a/html/cgi-bin/captive.cgi b/html/cgi-bin/captive.cgi
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/html/cgi-bin/captive/index.cgi b/html/cgi-bin/captive/index.cgi
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/html/cgi-bin/captive/redirect.cgi b/html/cgi-bin/captive/redirect.cgi
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/html/cgi-bin/dns.cgi b/html/cgi-bin/dns.cgi
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/html/cgi-bin/logs.cgi/ovpnclients.dat b/html/cgi-bin/logs.cgi/ovpnclients.dat
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/html/cgi-bin/mail.cgi b/html/cgi-bin/mail.cgi
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/html/cgi-bin/netother.cgi b/html/cgi-bin/netother.cgi
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/html/cgi-bin/netovpnrw.cgi b/html/cgi-bin/netovpnrw.cgi
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/html/cgi-bin/netovpnsrv.cgi b/html/cgi-bin/netovpnsrv.cgi
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/html/html/clwarn.cgi b/html/html/clwarn.cgi
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/html/html/themes/ipfire/include/functions.pl b/html/html/themes/ipfire/include/functions.pl
index d74c962e430fb9529792f22c360164879710ef4b..f2b8e99257b505f7b5c25ec3bd1f09ef2141988f 100644 (file)
--- a/html/html/themes/ipfire/include/functions.pl
+++ b/html/html/themes/ipfire/include/functions.pl
@@ -31,8 +31,6 @@
 # IPFire default theme.                                                       #
 ###############################################################################
 
-require "${General::swroot}/lang.pl";
-
 ###############################################################################
 #
 # print menu html elements for submenu entries
@@ -101,20 +99,15 @@ sub openpage {
        my $title = shift;
        my $boh = shift;
        my $extrahead = shift;
-       my $suppressMenu = shift;
+       my $suppressMenu = shift // 0;
        my @tmp = split(/\./, basename($0));
        my $scriptName = @tmp[0];
 
-       @URI=split ('\?',  $ENV{'REQUEST_URI'} );
-       &General::readhash("${swroot}/main/settings", \%settings);
-       &genmenu();
-
        my $headline = "IPFire";
        if (($settings{'WINDOWWITHHOSTNAME'} eq 'on') || ($settings{'WINDOWWITHHOSTNAME'} eq '')) {
                $headline =  "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}";
        }
 
-
 print <<END;
 <!DOCTYPE html>
 <html>
@@ -165,7 +158,10 @@ print <<END
 END
 ;
 
-&showmenu() if ($suppressMenu != 1);
+unless($suppressMenu) {
+       &genmenu();
+       &showmenu();
+}
 
 print <<END
        <div class="bigbox fixed">
@@ -270,5 +266,3 @@ sub openbox {
 sub closebox {
        print "</div>";
 }
-
-1;

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 6094c191aa7a0c5a1ca0c7aafb8bee9c6aae6889..1145745e00aa6b126fe2e1c123a0b769021d215c 100644 (file)
--- 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 03fc754dff0245875db36380a4ace592523fe97d..23c01ddb842fe6b77f48794025f65646e6fd0a66 100644 (file)
--- 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 c558cfa019904f5edef346df0263b710d647f40d..e3efc84a1aa3ec0a31cb168be69e2aa6d8612821 100644 (file)
--- 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 c140aa8118f657d2ea563b02e870cee86e3bbde4..591ccc6a7df638bebd8bd35c796628d78739042f 100644 (file)
--- 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 9244900bf3ff7329659a64f79c6db5219811904d..bfdc9e3ff35941773e90a6e677ddddcc69b9b128 100644 (file)
--- 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 c854359a05d4c5936e2febebe3bf86ed70e11daf..c816b2c07b6b1887701ddb4870cd821929ec4b6c 100644 (file)
--- 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 9eb9a53044d74f791f919bf1eadebd2895ebdca4..2b399349ce33e1759bd2129c38ff593ffa56c08b 100644 (file)
--- a/lfs/efibootmgr
+++ b/lfs/efibootmgr
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2022  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,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 2441396826c38f424c47c34cd175aabc85bbda47..76f5a8e9461741748f7ff087a86ba5ab6e01b26d 100644 (file)
--- 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 e3a9924d463a04e25ec92b56019adb46998bee57..0c0c033c03e4634ce26f83970b2dcd5533d89945 100644 (file)
--- a/lfs/knot
+++ b/lfs/knot
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2021  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2022  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 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 (file)
index b5f4636..0000000
--- a/lfs/libart
+++ /dev/null
@@ -1,78 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 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 (file)
index 0736857..0000000
--- a/lfs/libdnet
+++ /dev/null
@@ -1,80 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 1.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 (file)
index 7a043a6..0000000
--- a/lfs/libevent
+++ /dev/null
@@ -1,78 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 1.4.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 04ced7775c342b50fd2f56dc5120f0e5e350b28c..bf81a064559cceb463277ec92959b8d153a953d3 100644 (file)
--- 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 3dad9955bf949543587e4b093bc041a519889215..ffc82f8cd75a57a64316e0b2c116287b8f5eb7c4 100644 (file)
--- a/lfs/libhtp
+++ b/lfs/libhtp
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2021  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2022  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 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 72273e3aaf80b1f27cb27d4ade42e6a8745e91ea..9a96cdb7ce0f855c0fcdf07eb43b1b66f2a1276a 100644 (file)
--- 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 38f9cdc10142821e09be0299fedfccd1e96b048c..f5a15d5c390238a309570dbccff0ffb5861b7539 100644 (file)
--- 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 (file)
index 61b458c..0000000
--- a/lfs/libnl
+++ /dev/null
@@ -1,80 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 1.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 (file)
index d6efc64..0000000
--- a/lfs/libsolv
+++ /dev/null
@@ -1,104 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-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 c2fa262b044ab8bb59ffe46f68f977f2a70cb041..bc6b29297c1550eb0655678bbf678938f3423911 100644 (file)
--- a/lfs/lynis
+++ b/lfs/lynis
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2021  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2022  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -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 36d60b416c4ba3ed5f7880f5d60b7e9ec09252ad..5c77e544d7f6c7d2ca0f49e77f89c5e65e58efd5 100644 (file)
--- a/lfs/mc
+++ b/lfs/mc
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2021  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2022  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -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 (file)
index 03f537a..0000000
--- a/lfs/netpbm
+++ /dev/null
@@ -1,99 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-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 bf5ebb1a3c8be09a4ae52030bbdeddc952e46ba1..a624ca44ea94313c1a71174bf163b98d555d120d 100644 (file)
--- a/lfs/nginx
+++ b/lfs/nginx
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2022  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -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 8c958e9fe892990c78f4033e3c99958711b9fa9c..302ae60417a444af7218487888305540bc2cb8df 100644 (file)
--- a/lfs/openssh
+++ b/lfs/openssh
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2022  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 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 9b2e7853c20e35f1468105de512f61ce2ba10f2d..27a052ae152847dbafe4650c08b1b22119397cbb 100644 (file)
--- 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 b10df97ed1c41ebfd214b734f3ff1767517b12d9..cec71ffcaadcc54f3bdf651f8fee6f0c38ce5805 100644 (file)
--- 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 (file)
index 7fe9177..0000000
--- a/lfs/pigz
+++ /dev/null
@@ -1,80 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 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 e310d2394ff153a15c0f2ab8df6769040a4d2ef5..cbda1ca52b61058b6c9e5caabd8917fdec76910c 100644 (file)
--- 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 1a235915c88c396af8dc99dde47485b7fbddc3b4..ef4feb91c5a6f96745fc77554e83e72189d15333 100644 (file)
--- 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 e923a8d009c526feab23f062a502437ac9de4a58..615f5e399ceabeb514b56c4ae0d4862571ab23e8 100644 (file)
--- 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 c445b623b24a7cad87d6c5f654576e0634c8d6ef..36cd59596b024e49a8171a9467e4f34a36f9c872 100644 (file)
--- 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 3b6fc8d09e06f37cc1435c27dfc4bbce285eca3e..f3bb34ff34c4d7a7872a4ba75e43d53043738b67 100644 (file)
--- 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 3236bbff81a332ce4890f42f87fd2ec8b5202359..a91aca39b60f16f6f9f567b0ba65f301e4dd94fa 100644 (file)
--- a/lfs/libpri
+++ b/lfs/python3-pkgconfig
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,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 270466f4443e91a393c250817600c8f479824939..14920ecceaf6fd8422332a20e045c9c1112e7a53 100644 (file)
--- 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 68b7ad652052503945968f1a86573b39b775e95d..5567ce74f8bc043680c32f09e432b65a22494856 100644 (file)
--- 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 a8b2e459bea16bd2634d089b0ec0414eddbbaf6a..3c18becc265027824624c83b9c6420cc3cc45ac0 100644 (file)
--- 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 2153b04035a1837cd498a04a910cd24956e8a2ad..8b9979cf47538d000eaada7ba028d2e06b6a1f42 100644 (file)
--- 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 992583153e13b47b0f0b99d069364f160690b921..3575a7a77c5f9152a93c986f7559833f55e6cc00 100644 (file)
--- 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 8d8b2cc4b12f3ad4bfe088ba2fe8600a72da0185..4bf85961c4ebb2735575b7d7096b6d29fa31a1d0 100644 (file)
--- 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 8e29b2798dca526a4d18f267149e8a4f83a7f2e9..561138c0a10b8121d35088f2627327803377517e 100644 (file)
--- 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 bfa6e0a3a4cc94da58481c02a419a20ec9fcb2d5..d543b69b96d86fe3351292b5ef9666cd94521460 100644 (file)
--- 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 a7686547a00d6c6f77d8a19062aae44a51b7d2ba..c3b3060975e2b82e44e4f462806dc14227bfe634 100644 (file)
--- 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 ec43d9cd3ce35230795fcb71a21b35b05229eec4..411a52b8d8c2fb4d31590f3bfc1c97d8afa77145 100644 (file)
--- 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 7422a5d139272f513d9608d6f758d8813a09c50e..f40c28ce25be9867749d24adbd82e4f381df04c7 100644 (file)
--- a/lfs/rsync
+++ b/lfs/rsync
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2022  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -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 (file)
index d77542d..0000000
--- a/lfs/sdparm
+++ /dev/null
@@ -1,81 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 1.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 ceaddac86e23dbdd676a16e0b29bccd65dec82cc..7b77e568f4c0248504e50b67df8d45b1896d8116 100644 (file)
--- 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 80e0923d33b163c6ddaaf3575ed23b03955efe1d..4a9dcdb1d800a8a86daab53ea3c7847b68f67e23 100644 (file)
--- a/lfs/suricata
+++ b/lfs/suricata
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2021  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2022  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.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 be732c97e232fb515e86f9d8beaa3ade8b6d4d9f..eb89f74745d570f657055f894ff150303ed9f9e1 100644 (file)
--- 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 e4859be0bc90856fcf40f6e6f7e528dbb1f66bd4..a7b28f3fd82728e92d53e18c3834aeeb0891ca18 100644 (file)
--- a/lfs/vnstat
+++ b/lfs/vnstat
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2021  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2022  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 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 5dee31d4afa75528bcb8a7d56055cc6d85a9c45b..19989af369346d877b4538cec3efcd9901e87bb6 100644 (file)
--- a/lfs/whois
+++ b/lfs/whois
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2022  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.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 a87fa635ef06dc5ab058c6e6d442501ea5f4bee5..be80cef224b08e3bfd42c0d83e385ea265c61067 100644 (file)
--- a/lfs/wio
+++ b/lfs/wio
@@ -1,6 +1,21 @@
 ###############################################################################
-# IPFire.org    - An Open Source Firewall Solution                            #
-# Copyright (C) 2007-2021  IPFire Team  <info@ipfire.org>                     #
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2022  IPFire Team  <info@ipfire.org>                     #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -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 95e6e89db3a04ded3f5847af3af00fca202fc562..bf2fce1683c193256fecb6835a5e63718520844a 100755 (executable)
--- 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 0facf23d890264850e87c434e1ef2684ffcf3990..15197badb76664acd95511c0b479194b2e67aa28 100644 (file)
--- 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 38129deeb10e47451bd81d0fe55a2782de737d6b..fc10e077abce37ef6af0bb4dbe40e362c3656e50 100644 (file)
--- 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 fcea77cfa218352cd45d3f5009bdac6eb6e6843b..6bc745a0fa5e9bb3ed0df2ac5d36aeb1a26c9fb0 100644 (file)
--- 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 a6747a2a7d9c961f5186d8301fa980f04e3be307..68a21f1e94a269b3c322200545af06e1f6cd2e16 100644 (file)
--- 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 91c6c14946f010942fdc2543f1447e601d5dc112..78c91eeb959cde7cb93fdb8f995df60a4a023c3a 100644 (file)
--- 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 1dcec52fe266e342eb02d7c5404ded26ec31118d..a611028943b5b9af1dfbc7996d6c7dec77950173 100644 (file)
--- 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();