This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 87d0d07bbca6c25e6458cc1cf8a513baf8fbc7fa (commit)
via 08bd9a5a940bbb620b9c8b572f5192052f462f47 (commit)
from 6a7a635ff49dc59fb18c4b320125e8f01529ada7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 87d0d07bbca6c25e6458cc1cf8a513baf8fbc7fa
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Jun 27 09:55:20 2023 +0000
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(a)ipfire.org>
commit 08bd9a5a940bbb620b9c8b572f5192052f462f47
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Jun 27 09:46:48 2023 +0000
Revert "Core Update 176: Delete OpenSSL 1.1.1 files"
This reverts commit aa8a659ab7381fa458ca81fb68116f49a02db77a.
This cannot be done, yet, because an updated system still has hundreds
of files using the old libraries. Those will have to be re-shipped first
before we actually remove OpenSSL 1.1.1.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/{oldcore/100 => core/176}/filelists/bind | 0
config/rootfiles/{oldcore/125 => core/176}/filelists/collectd | 0
config/rootfiles/{oldcore/120 => core/176}/filelists/cyrus-sasl | 0
config/rootfiles/{oldcore/141 => core/176}/filelists/elinks | 0
config/rootfiles/core/176/filelists/files | 3 +++
config/rootfiles/{oldcore/110 => core/176}/filelists/gnutls | 0
config/rootfiles/{oldcore/125 => core/176}/filelists/kmod | 0
config/rootfiles/{oldcore/169 => core/176}/filelists/krb5 | 0
config/rootfiles/{oldcore/104 => core/176}/filelists/libarchive | 0
config/rootfiles/{oldcore/111 => core/176}/filelists/libevent2 | 0
config/rootfiles/{oldcore/148 => core/176}/filelists/libloc | 0
config/rootfiles/{oldcore/110 => core/176}/filelists/qpdf | 0
config/rootfiles/{oldcore/112 => core/176}/filelists/sudo | 0
config/rootfiles/{oldcore/125 => core/176}/filelists/udev | 0
config/rootfiles/{oldcore/104 => core/176}/filelists/wget | 0
config/rootfiles/core/176/update.sh | 3 ---
lfs/bacula | 2 +-
lfs/clamav | 2 +-
lfs/dnsdist | 2 +-
lfs/fetchmail | 2 +-
lfs/freeradius | 2 +-
lfs/git | 2 +-
lfs/hostapd | 2 +-
lfs/iperf3 | 2 +-
lfs/libshout | 2 +-
lfs/nagios-plugins | 2 +-
lfs/nagios_nrpe | 2 +-
lfs/ncat | 2 +-
lfs/netatalk | 2 +-
lfs/netsnmpd | 2 +-
lfs/nfs | 2 +-
lfs/nut | 2 +-
lfs/python3-cryptography | 2 +-
lfs/rng-tools | 2 +-
lfs/rsync | 2 +-
lfs/shairport-sync | 2 +-
lfs/socat | 2 +-
lfs/spice | 2 +-
lfs/tor | 2 +-
lfs/vdr_dvbapi | 2 +-
lfs/zabbix_agentd | 2 +-
41 files changed, 28 insertions(+), 28 deletions(-)
copy config/rootfiles/{oldcore/100 => core/176}/filelists/bind (100%)
copy config/rootfiles/{oldcore/125 => core/176}/filelists/collectd (100%)
copy config/rootfiles/{oldcore/120 => core/176}/filelists/cyrus-sasl (100%)
copy config/rootfiles/{oldcore/141 => core/176}/filelists/elinks (100%)
copy config/rootfiles/{oldcore/110 => core/176}/filelists/gnutls (100%)
copy config/rootfiles/{oldcore/125 => core/176}/filelists/kmod (100%)
copy config/rootfiles/{oldcore/169 => core/176}/filelists/krb5 (100%)
copy config/rootfiles/{oldcore/104 => core/176}/filelists/libarchive (100%)
copy config/rootfiles/{oldcore/111 => core/176}/filelists/libevent2 (100%)
copy config/rootfiles/{oldcore/148 => core/176}/filelists/libloc (100%)
copy config/rootfiles/{oldcore/110 => core/176}/filelists/qpdf (100%)
copy config/rootfiles/{oldcore/112 => core/176}/filelists/sudo (100%)
copy config/rootfiles/{oldcore/125 => core/176}/filelists/udev (100%)
copy config/rootfiles/{oldcore/104 => core/176}/filelists/wget (100%)
Difference in files:
diff --git a/config/rootfiles/core/176/filelists/bind b/config/rootfiles/core/176/filelists/bind
new file mode 120000
index 000000000..48a0ebaef
--- /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 000000000..871b32f14
--- /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 000000000..bb51b4c92
--- /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 000000000..10db4dd8f
--- /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 87f10e8d9..b5ec2afc1 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 000000000..8dbe60bc3
--- /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 000000000..0020e197e
--- /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 000000000..082c3cbcd
--- /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 000000000..551f1f743
--- /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 000000000..42edc99c3
--- /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 000000000..ff4a92429
--- /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 000000000..2d6c43dec
--- /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 000000000..0d3c45e04
--- /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 000000000..e967a1c92
--- /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 000000000..fcb57dfec
--- /dev/null
+++ b/config/rootfiles/core/176/filelists/wget
@@ -0,0 +1 @@
+../../../common/wget
\ No newline at end of file
diff --git a/config/rootfiles/core/176/update.sh b/config/rootfiles/core/176/update.sh
index 9c0ef54e4..54dda66c7 100644
--- a/config/rootfiles/core/176/update.sh
+++ b/config/rootfiles/core/176/update.sh
@@ -41,10 +41,7 @@ extract_files
# Remove files
rm -vf \
/usr/bin/gawk-5.1.1 \
- /usr/lib/engines-1* \
- /usr/lib/libcrypto.so.1* \
/usr/lib/libfreetype.so.6.1* \
- /usr/lib/libssl.so.1* \
/lib/udev/rules.d/69-dm-lvm-metad.rules
# update linker config
diff --git a/lfs/bacula b/lfs/bacula
index c56e2f921..b4c545772 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 eeb0df5b2..c48c48834 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 883fa6abc..7a3dd702a 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 539c83287..6b2dda18a 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 db2b09935..f6740c280 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 d5bc66799..cf6d27613 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 2cd734f5c..5db99891d 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 434764b66..985034cb3 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 3058a9af5..2fbc72d1d 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 a02abeec4..dabe270fa 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 3fdb167f7..f717342ef 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 61c3794f5..6ba2c538b 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 7ebaf9711..75e5dbca5 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 fb4317315..7724cd7de 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 4df6efa6f..fb2283842 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 d64ed2743..e46c72a1a 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 f977ed14b..5bff4b5a9 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 86fc0ce3d..c3f1e205c 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 abd5d5053..7e5543704 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 946aedeec..12331b608 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 8a99ba93b..66dc2472b 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 47233365f..60c979526 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 3280e888e..c03d86d76 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 e55367fd1..17f4c3a17 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 4f2a8b5d8..afda5023c 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
hooks/post-receive
--
IPFire 2.x development tree