[PATCH 1/6] openssl: Dynamically link zlib

[PATCH 1/6] openssl: Dynamically link zlib

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 624 bytes --]

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 <michael.tremer(a)ipfire.org>
---
 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 \
-- 
2.39.5

[PATCH 2/6] Revert "zlib-ng: ship /usr/lib/libz.so"

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 602 bytes --]

This reverts commit 2dbfc2f042839d2942b2a38790123c480d087cd8.

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 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
-- 
2.39.5

[PATCH 3/6] zlib-ng: Install the compat library into /lib again

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 1412 bytes --]

This is just to remain compatible with the older version which was also
installed in /lib.

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 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)
-- 
2.39.5

[PATCH 4/6] zlib-ng: Don't install the static version of the library

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 1332 bytes --]

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 <michael.tremer(a)ipfire.org>
---
 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
-- 
2.39.5

[PATCH 5/6] core192: Remove the old version of zlib

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 551 bytes --]

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 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
 
-- 
2.39.5

[PATCH 6/6] slang: This package does not build the zlib module any more

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 735 bytes --]

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 <michael.tremer(a)ipfire.org>
---
 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
-- 
2.39.5