[PATCH 1/2] Update zlib to version 1.3

[PATCH 1/2] Update zlib to version 1.3

[Jonatan Schlag]

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

The workaround is not needed anymore. The files a placed correctly by
itself.

Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
---
 zlib/zlib.nm | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/zlib/zlib.nm b/zlib/zlib.nm
index 476431328..1aea661c8 100644
--- a/zlib/zlib.nm
+++ b/zlib/zlib.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = zlib
-version    = 1.2.13
+version    = 1.3
 release    = 1
 
 groups     = System/Libraries
@@ -31,10 +31,6 @@ build
 		make check
 	end
 
-	install_cmds
-		mkdir -pv %{BUILDROOT}%{includedir} %{BUILDROOT}%{libdir}
-		cp -pfv zconf.h zlib.h %{BUILDROOT}%{includedir}
-	end
 end
 
 packages
-- 
2.39.2

[PATCH 2/2] Update linux-firmware

[Jonatan Schlag]

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

When find returns nothing, chmod fails. So we when we get only blank
lines, we do execute nothing (-r).

Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
---
 linux-firmware/linux-firmware.nm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux-firmware/linux-firmware.nm b/linux-firmware/linux-firmware.nm
index 53413eacf..5e0eba43e 100644
--- a/linux-firmware/linux-firmware.nm
+++ b/linux-firmware/linux-firmware.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = linux-firmware
-version    = 20221214
+version    = 20230804
 release    = 1
 
 maintainer = Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org>
@@ -34,7 +34,7 @@ build
 	install_cmds
 		# Remove executable bits from any files
 		find %{BUILDROOT}%{firmwaredir} -type f \
-			-executable -print | xargs chmod -v a-x
+			-executable -print | xargs -r chmod -v a-x
 	end
 end
 
-- 
2.39.2