From patchwork Wed Jan 15 14:57:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 8422 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R11" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4YY8Q012x5z3xGR for ; Wed, 15 Jan 2025 15:03:20 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "E5" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4YY8Px6dBVz4S9; Wed, 15 Jan 2025 15:03:17 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4YY8Px63H6z32fd; Wed, 15 Jan 2025 15:03:17 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R11" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4YY8Pp0J8zz32nC for ; Wed, 15 Jan 2025 15:03:10 +0000 (UTC) Received: from michael.haj.ipfire.org (michael.haj.ipfire.org [172.28.1.242]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "michael.haj.ipfire.org", Issuer "E5" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4YY8Pm4Qgpz4Md; Wed, 15 Jan 2025 15:03:08 +0000 (UTC) Received: by michael.haj.ipfire.org (Postfix, from userid 0) id 4YY8Pm3DTWzTgHm; Wed, 15 Jan 2025 15:03:08 +0000 (UTC) From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 1/6] openssl: Dynamically link zlib Date: Wed, 15 Jan 2025 14:57:45 +0000 Message-Id: <20250115145750.1540971-1-michael.tremer@ipfire.org> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 Message-ID-Hash: 7JCBENG5XYHTIXLY2HORJFZONJZAQHZ2 X-Message-ID-Hash: 7JCBENG5XYHTIXLY2HORJFZONJZAQHZ2 X-MailFrom: root@michael.haj.ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Michael Tremer X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: The former way was to open libz.so whenever it was needed. This is however not a very good solution and we will have trouble in dependency tracking and discover any linking problems much later. Signed-off-by: Michael Tremer --- lfs/openssl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lfs/openssl b/lfs/openssl index e14722c0c..ec8c63c54 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -41,7 +41,7 @@ CONFIGURE_OPTIONS = \ --prefix=/usr \ --openssldir=/etc/ssl \ shared \ - zlib-dynamic \ + zlib \ enable-camellia \ enable-seed \ enable-rfc3779 \ From patchwork Wed Jan 15 14:57:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 8420 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R11" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4YY8Py3qZ9z3wv0 for ; Wed, 15 Jan 2025 15:03:18 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "E5" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4YY8Pt3klJz4g2; Wed, 15 Jan 2025 15:03:14 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4YY8Pt3DfFz32mH; Wed, 15 Jan 2025 15:03:14 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R11" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4YY8Pn72tcz32fd for ; Wed, 15 Jan 2025 15:03:09 +0000 (UTC) Received: from michael.haj.ipfire.org (michael.haj.ipfire.org [172.28.1.242]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) client-signature ECDSA (secp384r1)) (Client CN "michael.haj.ipfire.org", Issuer "E5" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4YY8Pm5cH8z4Q5; Wed, 15 Jan 2025 15:03:08 +0000 (UTC) Received: by michael.haj.ipfire.org (Postfix, from userid 0) id 4YY8Pm3LPGzTgHP; Wed, 15 Jan 2025 15:03:08 +0000 (UTC) From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 2/6] Revert "zlib-ng: ship /usr/lib/libz.so" Date: Wed, 15 Jan 2025 14:57:46 +0000 Message-Id: <20250115145750.1540971-2-michael.tremer@ipfire.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250115145750.1540971-1-michael.tremer@ipfire.org> References: <20250115145750.1540971-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: V5RXRF3EKTQTNWBKJMXPKW3L62BXK377 X-Message-ID-Hash: V5RXRF3EKTQTNWBKJMXPKW3L62BXK377 X-MailFrom: root@michael.haj.ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Michael Tremer X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: This reverts commit 2dbfc2f042839d2942b2a38790123c480d087cd8. Signed-off-by: Michael Tremer --- config/rootfiles/common/zlib-ng | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/rootfiles/common/zlib-ng b/config/rootfiles/common/zlib-ng index cb8da194b..0e6cf18c5 100644 --- a/config/rootfiles/common/zlib-ng +++ b/config/rootfiles/common/zlib-ng @@ -9,7 +9,7 @@ usr/lib/libz-ng.so.2 usr/lib/libz-ng.so.2.2.3 #usr/lib/libz.a -usr/lib/libz.so +#usr/lib/libz.so usr/lib/libz.so.1 usr/lib/libz.so.1.3.1.zlib-ng #usr/lib/pkgconfig From patchwork Wed Jan 15 14:57:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 8419 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R11" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4YY8Px3PKJz3wv0 for ; Wed, 15 Jan 2025 15:03:17 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "E5" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4YY8Pt1jVPz4W6; Wed, 15 Jan 2025 15:03:14 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4YY8Pt18zXz32mH; Wed, 15 Jan 2025 15:03:14 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R11" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4YY8Pn73zXz32mH for ; Wed, 15 Jan 2025 15:03:09 +0000 (UTC) Received: from michael.haj.ipfire.org (michael.haj.ipfire.org [172.28.1.242]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) client-signature ECDSA (secp384r1)) (Client CN "michael.haj.ipfire.org", Issuer "E5" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4YY8Pm6JsVz4X5; Wed, 15 Jan 2025 15:03:08 +0000 (UTC) Received: by michael.haj.ipfire.org (Postfix, from userid 0) id 4YY8Pm3YBHzTgkt; Wed, 15 Jan 2025 15:03:08 +0000 (UTC) From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 3/6] zlib-ng: Install the compat library into /lib again Date: Wed, 15 Jan 2025 14:57:47 +0000 Message-Id: <20250115145750.1540971-3-michael.tremer@ipfire.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250115145750.1540971-1-michael.tremer@ipfire.org> References: <20250115145750.1540971-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: 7EAF4W7L2PE5X7NFNIXAZO3VNYI2LVPF X-Message-ID-Hash: 7EAF4W7L2PE5X7NFNIXAZO3VNYI2LVPF X-MailFrom: root@michael.haj.ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Michael Tremer X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: This is just to remain compatible with the older version which was also installed in /lib. Signed-off-by: Michael Tremer --- config/rootfiles/common/zlib-ng | 6 +++--- lfs/zlib-ng | 8 ++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/config/rootfiles/common/zlib-ng b/config/rootfiles/common/zlib-ng index 0e6cf18c5..be111d244 100644 --- a/config/rootfiles/common/zlib-ng +++ b/config/rootfiles/common/zlib-ng @@ -1,3 +1,6 @@ +#lib/libz.so +lib/libz.so.1 +lib/libz.so.1.3.1.zlib-ng #usr/include/zconf-ng.h #usr/include/zconf.h #usr/include/zlib-ng.h @@ -9,9 +12,6 @@ usr/lib/libz-ng.so.2 usr/lib/libz-ng.so.2.2.3 #usr/lib/libz.a -#usr/lib/libz.so -usr/lib/libz.so.1 -usr/lib/libz.so.1.3.1.zlib-ng #usr/lib/pkgconfig #usr/lib/pkgconfig/zlib-ng.pc #usr/lib/pkgconfig/zlib.pc diff --git a/lfs/zlib-ng b/lfs/zlib-ng index 5310c6051..7708d3c76 100644 --- a/lfs/zlib-ng +++ b/lfs/zlib-ng @@ -94,5 +94,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP)/build && make install cd $(DIR_APP)/compat && make install +ifneq "$(TOOLCHAIN)" "1" + mv -v /usr/lib/libz.so.1.3.1.zlib-ng /lib/libz.so.1.3.1.zlib-ng + ln -svf libz.so.1.3.1.zlib-ng /lib/libz.so.1 + ln -svf libz.so.1.3.1.zlib-ng /lib/libz.so + rm -vf /usr/lib/libz.so.1 + rm -vf /usr/lib/libz.so +endif + @rm -rf $(DIR_APP) @$(POSTBUILD) From patchwork Wed Jan 15 14:57:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 8421 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R11" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4YY8Pz3wKlz3wv0 for ; Wed, 15 Jan 2025 15:03:19 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "E5" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4YY8Pt5gQgz4Zs; Wed, 15 Jan 2025 15:03:14 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4YY8Pt4Zl2z32vw; Wed, 15 Jan 2025 15:03:14 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R11" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4YY8Pp0KNRz32tP for ; Wed, 15 Jan 2025 15:03:10 +0000 (UTC) Received: from michael.haj.ipfire.org (michael.haj.ipfire.org [172.28.1.242]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) client-signature ECDSA (secp384r1)) (Client CN "michael.haj.ipfire.org", Issuer "E5" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4YY8Pn01yQz4ZT; Wed, 15 Jan 2025 15:03:08 +0000 (UTC) Received: by michael.haj.ipfire.org (Postfix, from userid 0) id 4YY8Pm3hnPzTgl6; Wed, 15 Jan 2025 15:03:08 +0000 (UTC) From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 4/6] zlib-ng: Don't install the static version of the library Date: Wed, 15 Jan 2025 14:57:48 +0000 Message-Id: <20250115145750.1540971-4-michael.tremer@ipfire.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250115145750.1540971-1-michael.tremer@ipfire.org> References: <20250115145750.1540971-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: THKNRUNLJWGDD6JXWAYPFXP24CPKJEH2 X-Message-ID-Hash: THKNRUNLJWGDD6JXWAYPFXP24CPKJEH2 X-MailFrom: root@michael.haj.ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Michael Tremer X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: We want everythink to link against zlib dynamically so that we can easily replace the library in case there is some urgent reason to do so. Signed-off-by: Michael Tremer --- config/rootfiles/common/zlib-ng | 2 -- lfs/zlib-ng | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/config/rootfiles/common/zlib-ng b/config/rootfiles/common/zlib-ng index be111d244..4f5e65293 100644 --- a/config/rootfiles/common/zlib-ng +++ b/config/rootfiles/common/zlib-ng @@ -7,11 +7,9 @@ lib/libz.so.1.3.1.zlib-ng #usr/include/zlib.h #usr/include/zlib_name_mangling-ng.h #usr/include/zlib_name_mangling.h -#usr/lib/libz-ng.a #usr/lib/libz-ng.so usr/lib/libz-ng.so.2 usr/lib/libz-ng.so.2.2.3 -#usr/lib/libz.a #usr/lib/pkgconfig #usr/lib/pkgconfig/zlib-ng.pc #usr/lib/pkgconfig/zlib.pc diff --git a/lfs/zlib-ng b/lfs/zlib-ng index 7708d3c76..5c2c5a30e 100644 --- a/lfs/zlib-ng +++ b/lfs/zlib-ng @@ -94,6 +94,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP)/build && make install cd $(DIR_APP)/compat && make install + # Remove the static versions + rm -vf /usr/lib/libz.a /usr/lib/libz-ng.a + ifneq "$(TOOLCHAIN)" "1" mv -v /usr/lib/libz.so.1.3.1.zlib-ng /lib/libz.so.1.3.1.zlib-ng ln -svf libz.so.1.3.1.zlib-ng /lib/libz.so.1 From patchwork Wed Jan 15 14:57:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 8418 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R11" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4YY8Pv37lyz3wv0 for ; Wed, 15 Jan 2025 15:03:15 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "E5" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4YY8Ps1bwbz4Q5; Wed, 15 Jan 2025 15:03:13 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4YY8Pr6Gx6z32mH; Wed, 15 Jan 2025 15:03:12 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R11" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4YY8Pn70jQz2xRT for ; Wed, 15 Jan 2025 15:03:09 +0000 (UTC) Received: from michael.haj.ipfire.org (michael.haj.ipfire.org [172.28.1.242]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) client-signature ECDSA (secp384r1)) (Client CN "michael.haj.ipfire.org", Issuer "E5" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4YY8Pn0pkVz4b9; Wed, 15 Jan 2025 15:03:09 +0000 (UTC) Received: by michael.haj.ipfire.org (Postfix, from userid 0) id 4YY8Pm3rlbzTgnX; Wed, 15 Jan 2025 15:03:08 +0000 (UTC) From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 5/6] core192: Remove the old version of zlib Date: Wed, 15 Jan 2025 14:57:49 +0000 Message-Id: <20250115145750.1540971-5-michael.tremer@ipfire.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250115145750.1540971-1-michael.tremer@ipfire.org> References: <20250115145750.1540971-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: K3A2RU2LJKLCBECWWSNKOSGIEDSSA2WY X-Message-ID-Hash: K3A2RU2LJKLCBECWWSNKOSGIEDSSA2WY X-MailFrom: root@michael.haj.ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Michael Tremer X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Signed-off-by: Michael Tremer --- config/rootfiles/core/192/update.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/rootfiles/core/192/update.sh b/config/rootfiles/core/192/update.sh index ca3db5f54..983245af5 100644 --- a/config/rootfiles/core/192/update.sh +++ b/config/rootfiles/core/192/update.sh @@ -88,6 +88,10 @@ rm -rvf \ # Extract files extract_files +# Remove the old version of zlib +rm -rfv \ + /lib/libz.so.1.3.1 + # update linker config ldconfig From patchwork Wed Jan 15 14:57:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 8423 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R11" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4YY8Q05X3Vz3wv0 for ; Wed, 15 Jan 2025 15:03:20 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "E5" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4YY8Py10vbz4gH; Wed, 15 Jan 2025 15:03:18 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4YY8Py0Nq7z32vw; Wed, 15 Jan 2025 15:03:18 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R11" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4YY8Pp0NMzz32mH for ; Wed, 15 Jan 2025 15:03:10 +0000 (UTC) Received: from michael.haj.ipfire.org (michael.haj.ipfire.org [172.28.1.242]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) client-signature ECDSA (secp384r1)) (Client CN "michael.haj.ipfire.org", Issuer "E5" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4YY8Pn1JTVz4bQ; Wed, 15 Jan 2025 15:03:09 +0000 (UTC) Received: by michael.haj.ipfire.org (Postfix, from userid 0) id 4YY8Pm429HzTgph; Wed, 15 Jan 2025 15:03:08 +0000 (UTC) From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 6/6] slang: This package does not build the zlib module any more Date: Wed, 15 Jan 2025 14:57:50 +0000 Message-Id: <20250115145750.1540971-6-michael.tremer@ipfire.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250115145750.1540971-1-michael.tremer@ipfire.org> References: <20250115145750.1540971-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: A6W2V3D2HQEK4TR6TFHPCV7J67MU5KX2 X-Message-ID-Hash: A6W2V3D2HQEK4TR6TFHPCV7J67MU5KX2 X-MailFrom: root@michael.haj.ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Michael Tremer X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: This is due to the removal of the static version of zlib, but we don't need this module anyways. Signed-off-by: Michael Tremer --- config/rootfiles/common/slang | 1 - 1 file changed, 1 deletion(-) diff --git a/config/rootfiles/common/slang b/config/rootfiles/common/slang index 223458e14..4e8671155 100644 --- a/config/rootfiles/common/slang +++ b/config/rootfiles/common/slang @@ -27,7 +27,6 @@ usr/lib/slang/v2/modules/stats-module.so usr/lib/slang/v2/modules/sysconf-module.so usr/lib/slang/v2/modules/termios-module.so usr/lib/slang/v2/modules/varray-module.so -usr/lib/slang/v2/modules/zlib-module.so #usr/share/doc/slang #usr/share/doc/slang/v2 #usr/share/doc/slang/v2/COPYING