From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 27 Jun 2023 09:55:20 +0000 (+0000)
Subject: core176: Re-ship lots of stuff that is still linked against OpenSSL 1.1.1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=87d0d07bbca6c25e6458cc1cf8a513baf8fbc7fa;p=people%2Fms%2Fipfire-2.x.git

core176: Re-ship lots of stuff that is still linked against OpenSSL 1.1.1

There are no functional changes in these files, but they are however
linked against OpenSSL 1.1.1 and need to be re-shipped before we remove
the legacy library.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/rootfiles/core/176/filelists/bind b/config/rootfiles/core/176/filelists/bind
new file mode 120000
index 0000000000..48a0ebaefd
--- /dev/null
+++ b/config/rootfiles/core/176/filelists/bind
@@ -0,0 +1 @@
+../../../common/bind
\ No newline at end of file
diff --git a/config/rootfiles/core/176/filelists/collectd b/config/rootfiles/core/176/filelists/collectd
new file mode 120000
index 0000000000..871b32f14b
--- /dev/null
+++ b/config/rootfiles/core/176/filelists/collectd
@@ -0,0 +1 @@
+../../../common/collectd
\ No newline at end of file
diff --git a/config/rootfiles/core/176/filelists/cyrus-sasl b/config/rootfiles/core/176/filelists/cyrus-sasl
new file mode 120000
index 0000000000..bb51b4c92c
--- /dev/null
+++ b/config/rootfiles/core/176/filelists/cyrus-sasl
@@ -0,0 +1 @@
+../../../common/cyrus-sasl
\ No newline at end of file
diff --git a/config/rootfiles/core/176/filelists/elinks b/config/rootfiles/core/176/filelists/elinks
new file mode 120000
index 0000000000..10db4dd8f7
--- /dev/null
+++ b/config/rootfiles/core/176/filelists/elinks
@@ -0,0 +1 @@
+../../../common/elinks
\ No newline at end of file
diff --git a/config/rootfiles/core/176/filelists/files b/config/rootfiles/core/176/filelists/files
index 87f10e8d90..b5ec2afc19 100644
--- a/config/rootfiles/core/176/filelists/files
+++ b/config/rootfiles/core/176/filelists/files
@@ -4,4 +4,7 @@ srv/web/ipfire/cgi-bin/extrahd.cgi
 srv/web/ipfire/cgi-bin/ovpnmain.cgi
 srv/web/ipfire/cgi-bin/proxy.cgi
 srv/web/ipfire/cgi-bin/vpnmain.cgi
+usr/lib/python3.10/lib-dynload/_hashlib.cpython-310-xxxMACHINExxx-linux-gnu.so
+usr/lib/python3.10/lib-dynload/_ssl.cpython-310-xxxMACHINExxx-linux-gnu.so
+usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Net/SSLeay/SSLeay.so
 var/ipfire/qos/bin/parse-func.pl
diff --git a/config/rootfiles/core/176/filelists/gnutls b/config/rootfiles/core/176/filelists/gnutls
new file mode 120000
index 0000000000..8dbe60bc32
--- /dev/null
+++ b/config/rootfiles/core/176/filelists/gnutls
@@ -0,0 +1 @@
+../../../common/gnutls
\ No newline at end of file
diff --git a/config/rootfiles/core/176/filelists/kmod b/config/rootfiles/core/176/filelists/kmod
new file mode 120000
index 0000000000..0020e197e2
--- /dev/null
+++ b/config/rootfiles/core/176/filelists/kmod
@@ -0,0 +1 @@
+../../../common/kmod
\ No newline at end of file
diff --git a/config/rootfiles/core/176/filelists/krb5 b/config/rootfiles/core/176/filelists/krb5
new file mode 120000
index 0000000000..082c3cbcdb
--- /dev/null
+++ b/config/rootfiles/core/176/filelists/krb5
@@ -0,0 +1 @@
+../../../common/krb5
\ No newline at end of file
diff --git a/config/rootfiles/core/176/filelists/libarchive b/config/rootfiles/core/176/filelists/libarchive
new file mode 120000
index 0000000000..551f1f7434
--- /dev/null
+++ b/config/rootfiles/core/176/filelists/libarchive
@@ -0,0 +1 @@
+../../../common/libarchive
\ No newline at end of file
diff --git a/config/rootfiles/core/176/filelists/libevent2 b/config/rootfiles/core/176/filelists/libevent2
new file mode 120000
index 0000000000..42edc99c3a
--- /dev/null
+++ b/config/rootfiles/core/176/filelists/libevent2
@@ -0,0 +1 @@
+../../../common/libevent2
\ No newline at end of file
diff --git a/config/rootfiles/core/176/filelists/libloc b/config/rootfiles/core/176/filelists/libloc
new file mode 120000
index 0000000000..ff4a92429c
--- /dev/null
+++ b/config/rootfiles/core/176/filelists/libloc
@@ -0,0 +1 @@
+../../../common/libloc
\ No newline at end of file
diff --git a/config/rootfiles/core/176/filelists/qpdf b/config/rootfiles/core/176/filelists/qpdf
new file mode 120000
index 0000000000..2d6c43dec3
--- /dev/null
+++ b/config/rootfiles/core/176/filelists/qpdf
@@ -0,0 +1 @@
+../../../common/qpdf
\ No newline at end of file
diff --git a/config/rootfiles/core/176/filelists/sudo b/config/rootfiles/core/176/filelists/sudo
new file mode 120000
index 0000000000..0d3c45e042
--- /dev/null
+++ b/config/rootfiles/core/176/filelists/sudo
@@ -0,0 +1 @@
+../../../common/sudo
\ No newline at end of file
diff --git a/config/rootfiles/core/176/filelists/udev b/config/rootfiles/core/176/filelists/udev
new file mode 120000
index 0000000000..e967a1c925
--- /dev/null
+++ b/config/rootfiles/core/176/filelists/udev
@@ -0,0 +1 @@
+../../../common/udev
\ No newline at end of file
diff --git a/config/rootfiles/core/176/filelists/wget b/config/rootfiles/core/176/filelists/wget
new file mode 120000
index 0000000000..fcb57dfec8
--- /dev/null
+++ b/config/rootfiles/core/176/filelists/wget
@@ -0,0 +1 @@
+../../../common/wget
\ No newline at end of file
diff --git a/lfs/bacula b/lfs/bacula
index c56e2f921b..b4c5457729 100644
--- a/lfs/bacula
+++ b/lfs/bacula
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = bacula
-PAK_VER    = 10
+PAK_VER    = 11
 
 DEPS       =
 
diff --git a/lfs/clamav b/lfs/clamav
index eeb0df5b27..c48c488349 100644
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = clamav
-PAK_VER    = 66
+PAK_VER    = 67
 
 DEPS       =
 
diff --git a/lfs/dnsdist b/lfs/dnsdist
index 883fa6abc7..7a3dd702aa 100644
--- a/lfs/dnsdist
+++ b/lfs/dnsdist
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = dnsdist
-PAK_VER    = 15
+PAK_VER    = 16
 
 SUP_ARCH   = x86_64 aarch64
 
diff --git a/lfs/fetchmail b/lfs/fetchmail
index 539c832878..6b2dda18a8 100644
--- a/lfs/fetchmail
+++ b/lfs/fetchmail
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = fetchmail
-PAK_VER    = 14
+PAK_VER    = 15
 
 DEPS       =
 
diff --git a/lfs/freeradius b/lfs/freeradius
index db2b099356..f6740c280d 100644
--- a/lfs/freeradius
+++ b/lfs/freeradius
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = freeradius
-PAK_VER    = 17
+PAK_VER    = 18
 
 DEPS       = libtalloc samba
 
diff --git a/lfs/git b/lfs/git
index d5bc667997..cf6d276131 100644
--- a/lfs/git
+++ b/lfs/git
@@ -33,7 +33,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = git
-PAK_VER    = 26
+PAK_VER    = 27
 
 DEPS       = perl-Authen-SASL perl-MIME-Base64 perl-Net-SMTP-SSL
 
diff --git a/lfs/hostapd b/lfs/hostapd
index 2cd734f5cf..5db99891d3 100644
--- a/lfs/hostapd
+++ b/lfs/hostapd
@@ -33,7 +33,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = hostapd
-PAK_VER    = 62
+PAK_VER    = 63
 
 DEPS       =
 
diff --git a/lfs/iperf3 b/lfs/iperf3
index 434764b663..985034cb3a 100644
--- a/lfs/iperf3
+++ b/lfs/iperf3
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = iperf3
-PAK_VER    = 5
+PAK_VER    = 6
 
 DEPS       =
 
diff --git a/lfs/libshout b/lfs/libshout
index 3058a9af55..2fbc72d1d9 100644
--- a/lfs/libshout
+++ b/lfs/libshout
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = libshout
-PAK_VER    = 3
+PAK_VER    = 4
 
 DEPS       =
 
diff --git a/lfs/nagios-plugins b/lfs/nagios-plugins
index a02abeec41..dabe270fa2 100644
--- a/lfs/nagios-plugins
+++ b/lfs/nagios-plugins
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = nagios-plugins
-PAK_VER    = 8
+PAK_VER    = 9
 
 DEPS       =
 
diff --git a/lfs/nagios_nrpe b/lfs/nagios_nrpe
index 3fdb167f7b..f717342ef1 100644
--- a/lfs/nagios_nrpe
+++ b/lfs/nagios_nrpe
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/nrpe-$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = nagios_nrpe
-PAK_VER    = 12
+PAK_VER    = 13
 
 DEPS       = nagios-plugins
 
diff --git a/lfs/ncat b/lfs/ncat
index 61c3794f5d..6ba2c538b2 100644
--- a/lfs/ncat
+++ b/lfs/ncat
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/nmap-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ncat
-PAK_VER    = 8
+PAK_VER    = 9
 
 DEPS       =
 
diff --git a/lfs/netatalk b/lfs/netatalk
index 7ebaf97118..75e5dbca50 100644
--- a/lfs/netatalk
+++ b/lfs/netatalk
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = netatalk
-PAK_VER    = 6
+PAK_VER    = 7
 
 DEPS       = avahi dbus
 
diff --git a/lfs/netsnmpd b/lfs/netsnmpd
index fb43173158..7724cd7deb 100644
--- a/lfs/netsnmpd
+++ b/lfs/netsnmpd
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = netsnmpd
-PAK_VER    = 13
+PAK_VER    = 14
 
 DEPS       =
 
diff --git a/lfs/nfs b/lfs/nfs
index 4df6efa6f9..fb2283842c 100644
--- a/lfs/nfs
+++ b/lfs/nfs
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = nfs
-PAK_VER    = 20
+PAK_VER    = 21
 
 DEPS       = rpcbind
 
diff --git a/lfs/nut b/lfs/nut
index d64ed2743e..e46c72a1a7 100644
--- a/lfs/nut
+++ b/lfs/nut
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = nut
-PAK_VER    = 9
+PAK_VER    = 10
 
 DEPS       =
 
diff --git a/lfs/python3-cryptography b/lfs/python3-cryptography
index f977ed14b2..5bff4b5a91 100644
--- a/lfs/python3-cryptography
+++ b/lfs/python3-cryptography
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python3-cryptography
-PAK_VER    = 3
+PAK_VER    = 4
 
 DEPS       = python3-cffi
 
diff --git a/lfs/rng-tools b/lfs/rng-tools
index 86fc0ce3d3..c3f1e205cd 100644
--- a/lfs/rng-tools
+++ b/lfs/rng-tools
@@ -33,7 +33,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = rng-tools
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       =
 
diff --git a/lfs/rsync b/lfs/rsync
index abd5d50539..7e55437042 100644
--- a/lfs/rsync
+++ b/lfs/rsync
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = rsync
-PAK_VER    = 17
+PAK_VER    = 18
 
 DEPS       =
 
diff --git a/lfs/shairport-sync b/lfs/shairport-sync
index 946aedeecb..12331b6087 100644
--- a/lfs/shairport-sync
+++ b/lfs/shairport-sync
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = shairport-sync
-PAK_VER    = 11
+PAK_VER    = 12
 
 DEPS       = alac alsa avahi ffmpeg libdaemon libplist nqptp soxr
 
diff --git a/lfs/socat b/lfs/socat
index 8a99ba93b7..66dc2472b3 100644
--- a/lfs/socat
+++ b/lfs/socat
@@ -35,7 +35,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG	   = socat
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS	   =
 
diff --git a/lfs/spice b/lfs/spice
index 47233365fb..60c9795262 100644
--- a/lfs/spice
+++ b/lfs/spice
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = spice
-PAK_VER    = 6
+PAK_VER    = 7
 
 DEPS       = opus
 
diff --git a/lfs/tor b/lfs/tor
index 3280e888e5..c03d86d76b 100644
--- a/lfs/tor
+++ b/lfs/tor
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = tor
-PAK_VER    = 76
+PAK_VER    = 77
 
 DEPS       = libseccomp
 
diff --git a/lfs/vdr_dvbapi b/lfs/vdr_dvbapi
index e55367fd1e..17f4c3a17b 100644
--- a/lfs/vdr_dvbapi
+++ b/lfs/vdr_dvbapi
@@ -35,7 +35,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vdr_dvbapi
-PAK_VER    = 5
+PAK_VER    = 6
 
 DEPS       =
 
diff --git a/lfs/zabbix_agentd b/lfs/zabbix_agentd
index 4f2a8b5d88..afda5023c2 100644
--- a/lfs/zabbix_agentd
+++ b/lfs/zabbix_agentd
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = zabbix_agentd
-PAK_VER    = 7
+PAK_VER    = 8
 
 DEPS       = fping