From ff459fa3cfa4f172733d68eab4b4a91f8217e867 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 09:18:10 +0000 Subject: [PATCH 01/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- squashfs-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/squashfs-tools.spec b/squashfs-tools.spec index 06bc278..5403a0a 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -7,7 +7,7 @@ Summary: Utility for the creation of squashfs filesystems %forgemeta -i -v URL: %{forgeurl} Source: %{forgesource} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ BuildRequires: make @@ -50,6 +50,9 @@ make INSTALL_PREFIX=%{buildroot}/usr INSTALL_DIR=%{buildroot}%{_sbindir} INSTALL %{_sbindir}/sqfscat %changelog +* Sat Jul 23 2022 Fedora Release Engineering - Packaging variables read or set by %forgemeta +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Mar 18 2022 Bruno Wolff III - 4.5-1 - 4.5.1 release - Up to date man pages From a781d747a492694b102be940450a9d8f61e0f45d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 03:56:30 +0000 Subject: [PATCH 02/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- squashfs-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/squashfs-tools.spec b/squashfs-tools.spec index 5403a0a..bead389 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -7,7 +7,7 @@ Summary: Utility for the creation of squashfs filesystems %forgemeta -i -v URL: %{forgeurl} Source: %{forgesource} -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ BuildRequires: make @@ -50,6 +50,9 @@ make INSTALL_PREFIX=%{buildroot}/usr INSTALL_DIR=%{buildroot}%{_sbindir} INSTALL %{_sbindir}/sqfscat %changelog +* Sat Jan 21 2023 Fedora Release Engineering - Packaging variables read or set by %forgemeta +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - Packaging variables read or set by %forgemeta - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From bc602cbf2fa0eb164a7015a59355a07d4099ea85 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Thu, 23 Feb 2023 10:35:21 -0600 Subject: [PATCH 03/22] Prerelease of 4.6 Phillip is about to release version 4.6 and I'd like to get some testing in rawhide before that to make deploying any needed fix easier. I already ran a test that exercises the features that we use in composes and didn't see any problems, so I'm not expecting any problems. --- squashfs-tools.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/squashfs-tools.spec b/squashfs-tools.spec index bead389..8df5915 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -1,13 +1,13 @@ Name: squashfs-tools -Version: 4.5.1 +Version: 4.6 Summary: Utility for the creation of squashfs filesystems %global forgeurl https://github.com/plougher/%{name} -%global date 20220318 -%global tag 4.5.1 +%global date 20230323 +%global commit 7cf6cee6acfa61a423d63168ad198a3bfafacda8 %forgemeta -i -v URL: %{forgeurl} Source: %{forgesource} -Release: 3%{?dist} +Release: 0.1%{dist} License: GPLv2+ BuildRequires: make @@ -50,6 +50,9 @@ make INSTALL_PREFIX=%{buildroot}/usr INSTALL_DIR=%{buildroot}%{_sbindir} INSTALL %{_sbindir}/sqfscat %changelog +* Thu Feb 23 2023 Bruno Wolff III - 4.6-0.1^20230323git7cf6cee +- Prerelease snapshot of 4.6 + * Sat Jan 21 2023 Fedora Release Engineering - Packaging variables read or set by %forgemeta - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From c68ead53894e0795aa917ce099e07c26fbb14044 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Thu, 23 Feb 2023 10:39:59 -0600 Subject: [PATCH 04/22] Fix incorrect date --- squashfs-tools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/squashfs-tools.spec b/squashfs-tools.spec index 8df5915..2193d68 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -59,7 +59,7 @@ make INSTALL_PREFIX=%{buildroot}/usr INSTALL_DIR=%{buildroot}%{_sbindir} INSTALL * Sat Jul 23 2022 Fedora Release Engineering - Packaging variables read or set by %forgemeta - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild -* Sat Mar 18 2022 Bruno Wolff III - 4.5-1 +* Sat Mar 19 2022 Bruno Wolff III - 4.5-1 - 4.5.1 release - Up to date man pages - Lots of little fixes From d539ae94f63ed1f524fbf813567bce204fe545f7 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Thu, 23 Feb 2023 10:50:17 -0600 Subject: [PATCH 05/22] I forgot to remove the -i and -v options to forgemeta This adds noise to builds that isn't needed. --- squashfs-tools.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/squashfs-tools.spec b/squashfs-tools.spec index 2193d68..56fc80d 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -4,10 +4,10 @@ Summary: Utility for the creation of squashfs filesystems %global forgeurl https://github.com/plougher/%{name} %global date 20230323 %global commit 7cf6cee6acfa61a423d63168ad198a3bfafacda8 -%forgemeta -i -v +%forgemeta URL: %{forgeurl} Source: %{forgesource} -Release: 0.1%{dist} +Release: 0.2%{dist} License: GPLv2+ BuildRequires: make @@ -50,6 +50,9 @@ make INSTALL_PREFIX=%{buildroot}/usr INSTALL_DIR=%{buildroot}%{_sbindir} INSTALL %{_sbindir}/sqfscat %changelog +* Thu Feb 23 2023 Bruno Wolff III - 4.6-0.2^20230323git7cf6cee +- Remove the -i and -v forgemeta flags to get rid of the extra noise + * Thu Feb 23 2023 Bruno Wolff III - 4.6-0.1^20230323git7cf6cee - Prerelease snapshot of 4.6 From bbde1b74a373069c07d263ddf478c06848171950 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Thu, 23 Feb 2023 11:03:13 -0600 Subject: [PATCH 06/22] Update the sources file --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 743215c..f94a4ba 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ squashfs-4.1.tar.bz2 /squashfs-tools-de61d00ffd2689d122696d4fc39f584c72fb24cf.tar.gz /squashfs-tools-76624e1e6be8e16ca08273eaadb82d7b38f3d5a5.tar.gz /squashfs-tools-4.5.1.tar.gz +/squashfs-tools-7cf6cee6acfa61a423d63168ad198a3bfafacda8.tar.gz diff --git a/sources b/sources index 811cc4a..11ff61a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (squashfs-tools-4.5.1.tar.gz) = b3934ea1e26c7508110312711465644a6d9674b6b5332a7d011e191fa3c1d4b8be694214794a0f6005263d0f4e18bab96af2f7ed66a178f8e3bb3a781cd44896 +SHA512 (squashfs-tools-7cf6cee6acfa61a423d63168ad198a3bfafacda8.tar.gz) = 9bddf61d38d1eb4376324acf737e22956a7ae52abc629ddd720b37fe9398f1c207dd769616276ca5576338769447101b16754221b9fcfccc3d224c758fc4133a From 1356cfd6af769e746d2eaf21a5cdb27caeb37b5a Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 28 Feb 2023 07:09:27 -0600 Subject: [PATCH 07/22] Get some more prerelease updates This includes updated documentation and a minor bug fix --- .gitignore | 1 + sources | 2 +- squashfs-tools.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f94a4ba..3deb750 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ squashfs-4.1.tar.bz2 /squashfs-tools-76624e1e6be8e16ca08273eaadb82d7b38f3d5a5.tar.gz /squashfs-tools-4.5.1.tar.gz /squashfs-tools-7cf6cee6acfa61a423d63168ad198a3bfafacda8.tar.gz +/squashfs-tools-746a81c8ea15e0573cc6abca9dc52e265d43a049.tar.gz diff --git a/sources b/sources index 11ff61a..b195373 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (squashfs-tools-7cf6cee6acfa61a423d63168ad198a3bfafacda8.tar.gz) = 9bddf61d38d1eb4376324acf737e22956a7ae52abc629ddd720b37fe9398f1c207dd769616276ca5576338769447101b16754221b9fcfccc3d224c758fc4133a +SHA512 (squashfs-tools-746a81c8ea15e0573cc6abca9dc52e265d43a049.tar.gz) = 5c360f53e75d84e0eb86d8125da6357448603ff9fdbb7bbe2717b7a95ba04e560a2071443bf394b088e636260b84ca37a9495fbe56806f1599b78fcb96cedbba diff --git a/squashfs-tools.spec b/squashfs-tools.spec index 56fc80d..125afb9 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -2,8 +2,8 @@ Name: squashfs-tools Version: 4.6 Summary: Utility for the creation of squashfs filesystems %global forgeurl https://github.com/plougher/%{name} -%global date 20230323 -%global commit 7cf6cee6acfa61a423d63168ad198a3bfafacda8 +%global date 20230228 +%global commit 746a81c8ea15e0573cc6abca9dc52e265d43a049 %forgemeta URL: %{forgeurl} Source: %{forgesource} @@ -50,6 +50,9 @@ make INSTALL_PREFIX=%{buildroot}/usr INSTALL_DIR=%{buildroot}%{_sbindir} INSTALL %{_sbindir}/sqfscat %changelog +* Tue Feb 28 2023 Bruno Wolff III - 4.6-0.3^20230228git746a81c +- Doc updates and minor bug fix + * Thu Feb 23 2023 Bruno Wolff III - 4.6-0.2^20230323git7cf6cee - Remove the -i and -v forgemeta flags to get rid of the extra noise From b80cc2ea93e08c43feb26bae7a22641831ce77da Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 28 Feb 2023 07:26:21 -0600 Subject: [PATCH 08/22] Update the release string This is extra important since there was a typo in the date previously. --- squashfs-tools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/squashfs-tools.spec b/squashfs-tools.spec index 125afb9..20f25f8 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -7,7 +7,7 @@ Summary: Utility for the creation of squashfs filesystems %forgemeta URL: %{forgeurl} Source: %{forgesource} -Release: 0.2%{dist} +Release: 0.3%{dist} License: GPLv2+ BuildRequires: make From 780d2c1999217f74360049666fe9fc5e2a2d6012 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Mon, 6 Mar 2023 02:03:41 -0600 Subject: [PATCH 09/22] Get some manual updates and unanchored search improvements --- .gitignore | 1 + sources | 2 +- squashfs-tools.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 3deb750..f9fc92e 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ squashfs-4.1.tar.bz2 /squashfs-tools-4.5.1.tar.gz /squashfs-tools-7cf6cee6acfa61a423d63168ad198a3bfafacda8.tar.gz /squashfs-tools-746a81c8ea15e0573cc6abca9dc52e265d43a049.tar.gz +/squashfs-tools-1eaad6d730604131f0da0c675e547cfe544ddcfa.tar.gz diff --git a/sources b/sources index b195373..5e268cf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (squashfs-tools-746a81c8ea15e0573cc6abca9dc52e265d43a049.tar.gz) = 5c360f53e75d84e0eb86d8125da6357448603ff9fdbb7bbe2717b7a95ba04e560a2071443bf394b088e636260b84ca37a9495fbe56806f1599b78fcb96cedbba +SHA512 (squashfs-tools-1eaad6d730604131f0da0c675e547cfe544ddcfa.tar.gz) = 8933366f0dfc83b5cdf9adf6aee1aae45551daeed68aed62e7473d2ea45b83d2e3f54208ea3c83b5c84c55073801dec5374f615da675620d200bdc0f17b79149 diff --git a/squashfs-tools.spec b/squashfs-tools.spec index 20f25f8..f548ba2 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -2,12 +2,12 @@ Name: squashfs-tools Version: 4.6 Summary: Utility for the creation of squashfs filesystems %global forgeurl https://github.com/plougher/%{name} -%global date 20230228 -%global commit 746a81c8ea15e0573cc6abca9dc52e265d43a049 +%global date 20230306 +%global commit 1eaad6d730604131f0da0c675e547cfe544ddcfa %forgemeta URL: %{forgeurl} Source: %{forgesource} -Release: 0.3%{dist} +Release: 0.4%{dist} License: GPLv2+ BuildRequires: make @@ -50,6 +50,9 @@ make INSTALL_PREFIX=%{buildroot}/usr INSTALL_DIR=%{buildroot}%{_sbindir} INSTALL %{_sbindir}/sqfscat %changelog +* Mon Mar 06 2023 Bruno Wolff III - 4.6-0.4^20230306git1eaad6d +- Doc updates and unanchored search improvemebts + * Tue Feb 28 2023 Bruno Wolff III - 4.6-0.3^20230228git746a81c - Doc updates and minor bug fix From 2073c47ba2e2c9986452da9696187d81c14b88ae Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Sun, 12 Mar 2023 22:14:19 -0500 Subject: [PATCH 10/22] Get all README and USAGE files This way we don't need to worry about version numbers in the names. --- squashfs-tools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/squashfs-tools.spec b/squashfs-tools.spec index f548ba2..a80e228 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -37,7 +37,7 @@ pushd squashfs-tools make INSTALL_PREFIX=%{buildroot}/usr INSTALL_DIR=%{buildroot}%{_sbindir} INSTALL_MANPAGES_DIR=%{buildroot}%{_mandir}/man1 install %files -%doc ACKNOWLEDGEMENTS README-4.5.1 CHANGES COPYING USAGE ACTIONS-README +%doc ACKNOWLEDGEMENTS README* CHANGES COPYING USAGE* ACTIONS-README %{_mandir}/man1/mksquashfs.1.gz %{_mandir}/man1/unsquashfs.1.gz From b280d436abf25dcd1e787001acb45ea40ee97e93 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Sun, 12 Mar 2023 22:22:05 -0500 Subject: [PATCH 11/22] Probably the last update before the official release The release is tetstively scheduled for tomorrow and I'd like one last chance for testing before it happens. --- .gitignore | 1 + sources | 2 +- squashfs-tools.spec | 12 ++++++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index f9fc92e..a8e27b9 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ squashfs-4.1.tar.bz2 /squashfs-tools-7cf6cee6acfa61a423d63168ad198a3bfafacda8.tar.gz /squashfs-tools-746a81c8ea15e0573cc6abca9dc52e265d43a049.tar.gz /squashfs-tools-1eaad6d730604131f0da0c675e547cfe544ddcfa.tar.gz +/squashfs-tools-aaf011a868c786b06e74cbdaf860d45793939f35.tar.gz diff --git a/sources b/sources index 5e268cf..ab750ed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (squashfs-tools-1eaad6d730604131f0da0c675e547cfe544ddcfa.tar.gz) = 8933366f0dfc83b5cdf9adf6aee1aae45551daeed68aed62e7473d2ea45b83d2e3f54208ea3c83b5c84c55073801dec5374f615da675620d200bdc0f17b79149 +SHA512 (squashfs-tools-aaf011a868c786b06e74cbdaf860d45793939f35.tar.gz) = 5ebf6dcb11c1547b07e7d97969f34e25fd3de288acdfca25b50f2b6d1878b885298b6124aff5cb647e28e9a26d030e50cd3ffa9a397ac809afad1ff2a4285f01 diff --git a/squashfs-tools.spec b/squashfs-tools.spec index a80e228..0947cc5 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -2,12 +2,12 @@ Name: squashfs-tools Version: 4.6 Summary: Utility for the creation of squashfs filesystems %global forgeurl https://github.com/plougher/%{name} -%global date 20230306 -%global commit 1eaad6d730604131f0da0c675e547cfe544ddcfa -%forgemeta +%global date 20230312 +%global commit aaf011a868c786b06e74cbdaf860d45793939f35 +%forgemeta -i -v URL: %{forgeurl} Source: %{forgesource} -Release: 0.4%{dist} +Release: 0.5%{dist} License: GPLv2+ BuildRequires: make @@ -50,6 +50,10 @@ make INSTALL_PREFIX=%{buildroot}/usr INSTALL_DIR=%{buildroot}%{_sbindir} INSTALL %{_sbindir}/sqfscat %changelog +* Sun Mar 12 2023 Bruno Wolff III - 4.6-0.5^20230312gitaaf011a +- Doc updates +- Probably the last version before the official release (tentatively tomorrow) + * Mon Mar 06 2023 Bruno Wolff III - 4.6-0.4^20230306git1eaad6d - Doc updates and unanchored search improvemebts From c83d9ab87101d1d983ad0b5277c6138571cf8160 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 14 Mar 2023 18:49:50 -0500 Subject: [PATCH 12/22] A few minor memory leaks were fixed --- .gitignore | 1 + sources | 2 +- squashfs-tools.spec | 11 +++++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index a8e27b9..f91525c 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ squashfs-4.1.tar.bz2 /squashfs-tools-746a81c8ea15e0573cc6abca9dc52e265d43a049.tar.gz /squashfs-tools-1eaad6d730604131f0da0c675e547cfe544ddcfa.tar.gz /squashfs-tools-aaf011a868c786b06e74cbdaf860d45793939f35.tar.gz +/squashfs-tools-36abab0ad661247498834c2e7f5e1ec476f2081d.tar.gz diff --git a/sources b/sources index ab750ed..d4501a1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (squashfs-tools-aaf011a868c786b06e74cbdaf860d45793939f35.tar.gz) = 5ebf6dcb11c1547b07e7d97969f34e25fd3de288acdfca25b50f2b6d1878b885298b6124aff5cb647e28e9a26d030e50cd3ffa9a397ac809afad1ff2a4285f01 +SHA512 (squashfs-tools-36abab0ad661247498834c2e7f5e1ec476f2081d.tar.gz) = 9fe1f1d21525477ead2dbf8876219562cfb88bbbaf0e2c9b7bcc4fb4dd56ef45c4c8bf923cd57cb3e5e3273bac6c706fa953d1fa6979cd6df4c9a9dd8afcc35e diff --git a/squashfs-tools.spec b/squashfs-tools.spec index 0947cc5..3324f4a 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -2,12 +2,12 @@ Name: squashfs-tools Version: 4.6 Summary: Utility for the creation of squashfs filesystems %global forgeurl https://github.com/plougher/%{name} -%global date 20230312 -%global commit aaf011a868c786b06e74cbdaf860d45793939f35 -%forgemeta -i -v +%global date 20230314 +%global commit 36abab0ad661247498834c2e7f5e1ec476f2081d +%forgemeta URL: %{forgeurl} Source: %{forgesource} -Release: 0.5%{dist} +Release: 0.6%{dist} License: GPLv2+ BuildRequires: make @@ -50,6 +50,9 @@ make INSTALL_PREFIX=%{buildroot}/usr INSTALL_DIR=%{buildroot}%{_sbindir} INSTALL %{_sbindir}/sqfscat %changelog +* Tue Mar 14 2023 Bruno Wolff III - 4.6-0.6^20230314git36abab0 +- A few minor memory leaks were fixed + * Sun Mar 12 2023 Bruno Wolff III - 4.6-0.5^20230312gitaaf011a - Doc updates - Probably the last version before the official release (tentatively tomorrow) From 170ea8d03e2cd09d84069efa9200885c6ef4e9ae Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 15 Mar 2023 12:58:39 -0700 Subject: [PATCH 13/22] Backport PR #231 to fix a crash (#2178510) --- ...attrs-fix-out-of-bounds-access-again.patch | 33 +++++++++++++++++++ squashfs-tools.spec | 12 ++++++- 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 0001-xattrs-fix-out-of-bounds-access-again.patch diff --git a/0001-xattrs-fix-out-of-bounds-access-again.patch b/0001-xattrs-fix-out-of-bounds-access-again.patch new file mode 100644 index 0000000..471a632 --- /dev/null +++ b/0001-xattrs-fix-out-of-bounds-access-again.patch @@ -0,0 +1,33 @@ +From 5b2b9acd762e859822c99c5262d0bcbccff619de Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Wed, 15 Mar 2023 12:35:38 -0700 +Subject: [PATCH] xattrs: fix out of bounds access (again) + +This restores the fix from c5db34e , which was somehow lost in +83b2f3a . `j` is not available after the loop is done, we need +to use i. We use `i - 1` because, of course, list indexes start +at 0. + +Fixes https://github.com/plougher/squashfs-tools/issues/230 + +Signed-off-by: Adam Williamson +--- + squashfs-tools/xattr.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/squashfs-tools/xattr.c b/squashfs-tools/xattr.c +index d48d950..32343f5 100644 +--- a/squashfs-tools/xattr.c ++++ b/squashfs-tools/xattr.c +@@ -838,7 +838,7 @@ int read_xattrs(void *d, int type) + for(j = 1; j < i; j++) + xattr_list[j - 1].vnext = &xattr_list[j]; + +- xattr_list[j].vnext = NULL; ++ xattr_list[i - 1].vnext = NULL; + head = xattr_list; + + sort_xattr_list(&head, i); +-- +2.39.2 + diff --git a/squashfs-tools.spec b/squashfs-tools.spec index 3324f4a..6e8a24c 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -7,7 +7,13 @@ Summary: Utility for the creation of squashfs filesystems %forgemeta URL: %{forgeurl} Source: %{forgesource} -Release: 0.6%{dist} +# https://github.com/plougher/squashfs-tools/pull/231 +# https://github.com/plougher/squashfs-tools/issues/230 +# https://bugzilla.redhat.com/show_bug.cgi?id=2178510 +# Fix a crash caused by an out-of-bounds access that was inadvertently +# re-introduced in a memory leak fix +Patch0: 0001-xattrs-fix-out-of-bounds-access-again.patch +Release: 0.7%{dist} License: GPLv2+ BuildRequires: make @@ -26,6 +32,7 @@ contains the utilities for manipulating squashfs filesystems. %prep %forgesetup +%autopatch -p1 %build %set_build_flags @@ -50,6 +57,9 @@ make INSTALL_PREFIX=%{buildroot}/usr INSTALL_DIR=%{buildroot}%{_sbindir} INSTALL %{_sbindir}/sqfscat %changelog +* Wed Mar 15 2023 Adam Williamson - 4.6-0.7.20230314git36abab0 +- Backport PR #231 to fix a crash (#2178510) + * Tue Mar 14 2023 Bruno Wolff III - 4.6-0.6^20230314git36abab0 - A few minor memory leaks were fixed From edbe07b14fbcf1ce3a4f5947c608b649100ad9e7 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Fri, 17 Mar 2023 18:36:36 -0500 Subject: [PATCH 14/22] 4.6 release --- .gitignore | 1 + sources | 2 +- squashfs-tools.spec | 13 ++++++++----- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index f91525c..d23bc27 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ squashfs-4.1.tar.bz2 /squashfs-tools-1eaad6d730604131f0da0c675e547cfe544ddcfa.tar.gz /squashfs-tools-aaf011a868c786b06e74cbdaf860d45793939f35.tar.gz /squashfs-tools-36abab0ad661247498834c2e7f5e1ec476f2081d.tar.gz +/squashfs-tools-squashfs-tools-4.6.tar.gz diff --git a/sources b/sources index d4501a1..0d73970 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (squashfs-tools-36abab0ad661247498834c2e7f5e1ec476f2081d.tar.gz) = 9fe1f1d21525477ead2dbf8876219562cfb88bbbaf0e2c9b7bcc4fb4dd56ef45c4c8bf923cd57cb3e5e3273bac6c706fa953d1fa6979cd6df4c9a9dd8afcc35e +SHA512 (squashfs-tools-squashfs-tools-4.6.tar.gz) = df3e9bc369995acda49cb6c26802d568ff2ee26dc7e949671809c408e79947bf3e003a9d31aeac6214d29ce5767f604e95673dcf6f88c67e91461b392a4402cf diff --git a/squashfs-tools.spec b/squashfs-tools.spec index 6e8a24c..0a8ab14 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -2,8 +2,8 @@ Name: squashfs-tools Version: 4.6 Summary: Utility for the creation of squashfs filesystems %global forgeurl https://github.com/plougher/%{name} -%global date 20230314 -%global commit 36abab0ad661247498834c2e7f5e1ec476f2081d +%global date 20230317 +%global tag %{name}-%{version} %forgemeta URL: %{forgeurl} Source: %{forgesource} @@ -12,8 +12,7 @@ Source: %{forgesource} # https://bugzilla.redhat.com/show_bug.cgi?id=2178510 # Fix a crash caused by an out-of-bounds access that was inadvertently # re-introduced in a memory leak fix -Patch0: 0001-xattrs-fix-out-of-bounds-access-again.patch -Release: 0.7%{dist} +Release: 1%{dist} License: GPLv2+ BuildRequires: make @@ -32,7 +31,6 @@ contains the utilities for manipulating squashfs filesystems. %prep %forgesetup -%autopatch -p1 %build %set_build_flags @@ -57,6 +55,11 @@ make INSTALL_PREFIX=%{buildroot}/usr INSTALL_DIR=%{buildroot}%{_sbindir} INSTALL %{_sbindir}/sqfscat %changelog +* Fri Mar 17 2023 Bruno Wolff III - 4.6-1 +- 4.6 release +- PR #231 was merged +- See https://github.com/plougher/squashfs-tools/blob/master/CHANGES + * Wed Mar 15 2023 Adam Williamson - 4.6-0.7.20230314git36abab0 - Backport PR #231 to fix a crash (#2178510) From 6a1ea5214eeea3a3ee175d0518651c1d5dff16c0 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Fri, 17 Mar 2023 19:05:01 -0500 Subject: [PATCH 15/22] Remove dist prefix from the release Upstream used a different naming scheme for the release to solve someone else's problem. That required us to tweak how we used forgemeta to use the matching archive naming. The fix for that triggered adding the tag to the release which I didn't want for rpms based off of an actual release. So a second tweak was done to fix that. --- squashfs-tools.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/squashfs-tools.spec b/squashfs-tools.spec index 0a8ab14..1778afa 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -2,9 +2,13 @@ Name: squashfs-tools Version: 4.6 Summary: Utility for the creation of squashfs filesystems %global forgeurl https://github.com/plougher/%{name} -%global date 20230317 %global tag %{name}-%{version} %forgemeta +# Upstream used a different naming scheme for the release to help +# someone else out. That required us to set a tag to correctly get +# the release file correct. However it also caused the tag to be +# used in the version, which we don't want when based on a release. +%undefine distprefix URL: %{forgeurl} Source: %{forgesource} # https://github.com/plougher/squashfs-tools/pull/231 @@ -12,7 +16,7 @@ Source: %{forgesource} # https://bugzilla.redhat.com/show_bug.cgi?id=2178510 # Fix a crash caused by an out-of-bounds access that was inadvertently # re-introduced in a memory leak fix -Release: 1%{dist} +Release: 2%{dist} License: GPLv2+ BuildRequires: make @@ -55,6 +59,9 @@ make INSTALL_PREFIX=%{buildroot}/usr INSTALL_DIR=%{buildroot}%{_sbindir} INSTALL %{_sbindir}/sqfscat %changelog +* Fri Mar 17 2023 Bruno Wolff III - 4.6-2 +- Remove the dist prefix from the release + * Fri Mar 17 2023 Bruno Wolff III - 4.6-1 - 4.6 release - PR #231 was merged From 19fef1af31ca968e5006ab94a93489ca1afe2fe5 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Wed, 29 Mar 2023 18:55:56 -0500 Subject: [PATCH 16/22] Update for 4.6.1 Only one of the fixes seems to apply to us and shouldn't have affected composes. I was also able to simplify the spec file after Phillip modified the way he tagged releases. --- .gitignore | 1 + sources | 2 +- squashfs-tools.spec | 18 ++++++++++-------- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index d23bc27..d527b6f 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ squashfs-4.1.tar.bz2 /squashfs-tools-aaf011a868c786b06e74cbdaf860d45793939f35.tar.gz /squashfs-tools-36abab0ad661247498834c2e7f5e1ec476f2081d.tar.gz /squashfs-tools-squashfs-tools-4.6.tar.gz +/squashfs-tools-4.6.1.tar.gz diff --git a/sources b/sources index 0d73970..6f632b5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (squashfs-tools-squashfs-tools-4.6.tar.gz) = df3e9bc369995acda49cb6c26802d568ff2ee26dc7e949671809c408e79947bf3e003a9d31aeac6214d29ce5767f604e95673dcf6f88c67e91461b392a4402cf +SHA512 (squashfs-tools-4.6.1.tar.gz) = 10e8a4b1e2327e062aef4f85860e76ebcd7a29e4c19e152ff7edec4a38316982b5bcfde4ab69da6bcb931258d264c2b6cb40cb5f635f9e6f6eba1ed5976267cb diff --git a/squashfs-tools.spec b/squashfs-tools.spec index 1778afa..bec5ca6 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -1,14 +1,9 @@ Name: squashfs-tools -Version: 4.6 +Version: 4.6.1 Summary: Utility for the creation of squashfs filesystems %global forgeurl https://github.com/plougher/%{name} -%global tag %{name}-%{version} +%global tag %{version} %forgemeta -# Upstream used a different naming scheme for the release to help -# someone else out. That required us to set a tag to correctly get -# the release file correct. However it also caused the tag to be -# used in the version, which we don't want when based on a release. -%undefine distprefix URL: %{forgeurl} Source: %{forgesource} # https://github.com/plougher/squashfs-tools/pull/231 @@ -16,7 +11,7 @@ Source: %{forgesource} # https://bugzilla.redhat.com/show_bug.cgi?id=2178510 # Fix a crash caused by an out-of-bounds access that was inadvertently # re-introduced in a memory leak fix -Release: 2%{dist} +Release: 1%{dist} License: GPLv2+ BuildRequires: make @@ -59,6 +54,13 @@ make INSTALL_PREFIX=%{buildroot}/usr INSTALL_DIR=%{buildroot}%{_sbindir} INSTALL %{_sbindir}/sqfscat %changelog +* Wed Mar 29 2023 Bruno Wolff III - 4.6.1-1 +- Phillip is now doing two tags per release and we can +- use the one that works better with forgemeta +- There are a few fixes after the 4.6 release. I think only +- one applies to Fedora because of the build options we use. +- It was not something that affects image builds. + * Fri Mar 17 2023 Bruno Wolff III - 4.6-2 - Remove the dist prefix from the release From a85b390063c1e93b39a680f4867fb462b076778f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 02:23:48 +0000 Subject: [PATCH 17/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- squashfs-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/squashfs-tools.spec b/squashfs-tools.spec index bec5ca6..a3b4726 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -11,7 +11,7 @@ Source: %{forgesource} # https://bugzilla.redhat.com/show_bug.cgi?id=2178510 # Fix a crash caused by an out-of-bounds access that was inadvertently # re-introduced in a memory leak fix -Release: 1%{dist} +Release: 2%{dist} License: GPLv2+ BuildRequires: make @@ -54,6 +54,9 @@ make INSTALL_PREFIX=%{buildroot}/usr INSTALL_DIR=%{buildroot}%{_sbindir} INSTALL %{_sbindir}/sqfscat %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 4.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Mar 29 2023 Bruno Wolff III - 4.6.1-1 - Phillip is now doing two tags per release and we can - use the one that works better with forgemeta From dc19b30fc6daff63dcb6422481bb0af8b62e3d00 Mon Sep 17 00:00:00 2001 From: Pavel Reichl Date: Mon, 16 Oct 2023 05:42:03 +0200 Subject: [PATCH 18/22] Convert License tag to SPDX format Related: https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2 Signed-off-by: Pavel Reichl --- squashfs-tools.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/squashfs-tools.spec b/squashfs-tools.spec index a3b4726..338f765 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -11,8 +11,8 @@ Source: %{forgesource} # https://bugzilla.redhat.com/show_bug.cgi?id=2178510 # Fix a crash caused by an out-of-bounds access that was inadvertently # re-introduced in a memory leak fix -Release: 2%{dist} -License: GPLv2+ +Release: 3%{dist} +License: GPL-2.0-or-later BuildRequires: make BuildRequires: gcc @@ -54,6 +54,9 @@ make INSTALL_PREFIX=%{buildroot}/usr INSTALL_DIR=%{buildroot}%{_sbindir} INSTALL %{_sbindir}/sqfscat %changelog +* Mon Oct 16 2023 Pavel Reichl - 4.6.1-3 +- Convert License tag to SPDX format + * Sat Jul 22 2023 Fedora Release Engineering - 4.6.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 2a6d2b84fee564d7efa15e65c3f4b1fb8f2ae25a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 04:13:51 +0000 Subject: [PATCH 19/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- squashfs-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/squashfs-tools.spec b/squashfs-tools.spec index 338f765..7ba2fb4 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -11,7 +11,7 @@ Source: %{forgesource} # https://bugzilla.redhat.com/show_bug.cgi?id=2178510 # Fix a crash caused by an out-of-bounds access that was inadvertently # re-introduced in a memory leak fix -Release: 3%{dist} +Release: 4%{dist} License: GPL-2.0-or-later BuildRequires: make @@ -54,6 +54,9 @@ make INSTALL_PREFIX=%{buildroot}/usr INSTALL_DIR=%{buildroot}%{_sbindir} INSTALL %{_sbindir}/sqfscat %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 4.6.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Oct 16 2023 Pavel Reichl - 4.6.1-3 - Convert License tag to SPDX format From 4f33d9dd142c07da42ac46afdf0f32729de39f0b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 06:19:06 +0000 Subject: [PATCH 20/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- squashfs-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/squashfs-tools.spec b/squashfs-tools.spec index 7ba2fb4..e789f96 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -11,7 +11,7 @@ Source: %{forgesource} # https://bugzilla.redhat.com/show_bug.cgi?id=2178510 # Fix a crash caused by an out-of-bounds access that was inadvertently # re-introduced in a memory leak fix -Release: 4%{dist} +Release: 5%{dist} License: GPL-2.0-or-later BuildRequires: make @@ -54,6 +54,9 @@ make INSTALL_PREFIX=%{buildroot}/usr INSTALL_DIR=%{buildroot}%{_sbindir} INSTALL %{_sbindir}/sqfscat %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 4.6.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 4.6.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From a219bd1500fae800acbf72b30a5a4d595c0678c3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 11:30:13 +0000 Subject: [PATCH 21/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- squashfs-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/squashfs-tools.spec b/squashfs-tools.spec index e789f96..676e079 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -11,7 +11,7 @@ Source: %{forgesource} # https://bugzilla.redhat.com/show_bug.cgi?id=2178510 # Fix a crash caused by an out-of-bounds access that was inadvertently # re-introduced in a memory leak fix -Release: 5%{dist} +Release: 6%{dist} License: GPL-2.0-or-later BuildRequires: make @@ -54,6 +54,9 @@ make INSTALL_PREFIX=%{buildroot}/usr INSTALL_DIR=%{buildroot}%{_sbindir} INSTALL %{_sbindir}/sqfscat %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 4.6.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sat Jul 20 2024 Fedora Release Engineering - 4.6.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 246f20758c7bfa7553a129b5822e9b009652b2dd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 18:40:29 +0000 Subject: [PATCH 22/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- squashfs-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/squashfs-tools.spec b/squashfs-tools.spec index 676e079..4e93a7b 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -11,7 +11,7 @@ Source: %{forgesource} # https://bugzilla.redhat.com/show_bug.cgi?id=2178510 # Fix a crash caused by an out-of-bounds access that was inadvertently # re-introduced in a memory leak fix -Release: 6%{dist} +Release: 7%{dist} License: GPL-2.0-or-later BuildRequires: make @@ -54,6 +54,9 @@ make INSTALL_PREFIX=%{buildroot}/usr INSTALL_DIR=%{buildroot}%{_sbindir} INSTALL %{_sbindir}/sqfscat %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 4.6.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 4.6.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild