Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
2025-07-25 18:40:29 +00:00 · 2025-01-19 11:30:13 +00:00 · 2024-07-20 06:19:06 +00:00 · 2024-01-27 04:13:51 +00:00 · 2023-10-16 05:44:23 +02:00 · 2023-07-22 02:23:48 +00:00
4 changed files with 108 additions and 9 deletions
--- a/.gitignore
+++ b/.gitignore
@ -39,3 +39,10 @@ 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
+/squashfs-tools-746a81c8ea15e0573cc6abca9dc52e265d43a049.tar.gz
+/squashfs-tools-1eaad6d730604131f0da0c675e547cfe544ddcfa.tar.gz
+/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
--- a/0001-xattrs-fix-out-of-bounds-access-again.patch
+++ 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 <awilliam@redhat.com>
+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 <awilliam@redhat.com>
+---
+ 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
+
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (squashfs-tools-4.5.1.tar.gz) = b3934ea1e26c7508110312711465644a6d9674b6b5332a7d011e191fa3c1d4b8be694214794a0f6005263d0f4e18bab96af2f7ed66a178f8e3bb3a781cd44896
+SHA512 (squashfs-tools-4.6.1.tar.gz) = 10e8a4b1e2327e062aef4f85860e76ebcd7a29e4c19e152ff7edec4a38316982b5bcfde4ab69da6bcb931258d264c2b6cb40cb5f635f9e6f6eba1ed5976267cb
--- a/squashfs-tools.spec
+++ b/squashfs-tools.spec
@ -1,14 +1,18 @@
 Name: squashfs-tools
-Version: 4.5.1
+Version: 4.6.1
 Summary: Utility for the creation of squashfs filesystems
 %global forgeurl https://github.com/plougher/%{name}
-%global date 20220318
-%global tag 4.5.1
-%forgemeta -i -v
+%global tag %{version}
+%forgemeta
 URL:	 %{forgeurl}
 Source:  %{forgesource}
-Release: 3%{?dist}
-License: GPLv2+
+# 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
+Release: 7%{dist}
+License: GPL-2.0-or-later

 BuildRequires: make
 BuildRequires: gcc
@ -37,7 +41,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
@ -50,13 +54,68 @@ make INSTALL_PREFIX=%{buildroot}/usr INSTALL_DIR=%{buildroot}%{_sbindir} INSTALL
 %{_sbindir}/sqfscat

 %changelog
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.6.1-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.6.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.6.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.6.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Oct 16 2023 Pavel Reichl <preichl@redhat.com> - 4.6.1-3
+- Convert License tag to SPDX format
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.6.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Wed Mar 29 2023 Bruno Wolff III <bruno@wolff.to> - 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 <bruno@wolff.to> - 4.6-2
+- Remove the dist prefix from the release
+
+* Fri Mar 17 2023 Bruno Wolff III <bruno@wolff.to> - 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 <awilliam@redhat.com> - 4.6-0.7.20230314git36abab0
+- Backport PR #231 to fix a crash (#2178510)
+
+* Tue Mar 14 2023 Bruno Wolff III <bruno@wolff.to> - 4.6-0.6^20230314git36abab0
+- A few minor memory leaks were fixed
+
+* Sun Mar 12 2023 Bruno Wolff III <bruno@wolff.to> - 4.6-0.5^20230312gitaaf011a
+- Doc updates
+- Probably the last version before the official release (tentatively tomorrow)
+
+* Mon Mar 06 2023 Bruno Wolff III <bruno@wolff.to> - 4.6-0.4^20230306git1eaad6d
+- Doc updates and unanchored search improvemebts
+
+* Tue Feb 28 2023 Bruno Wolff III <bruno@wolff.to> - 4.6-0.3^20230228git746a81c
+- Doc updates and minor bug fix
+
+* Thu Feb 23 2023 Bruno Wolff III <bruno@wolff.to> - 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 <bruno@wolff.to> - 4.6-0.1^20230323git7cf6cee
+- Prerelease snapshot of 4.6
+
 * Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - Packaging variables read or set by %forgemeta
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

 * Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - Packaging variables read or set by %forgemeta
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

-* Sat Mar 18 2022 Bruno Wolff III <bruno@wolff.to> - 4.5-1
+* Sat Mar 19 2022 Bruno Wolff III <bruno@wolff.to> - 4.5-1
 - 4.5.1 release
 - Up to date man pages
 - Lots of little fixes
Author	SHA1	Message	Date
Fedora Release Engineering	246f20758c	Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild	2025-07-25 18:40:29 +00:00
Fedora Release Engineering	a219bd1500	Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild	2025-01-19 11:30:13 +00:00
Fedora Release Engineering	4f33d9dd14	Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild	2024-07-20 06:19:06 +00:00
Fedora Release Engineering	2a6d2b84fe	Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild	2024-01-27 04:13:51 +00:00
Pavel Reichl	dc19b30fc6	Convert License tag to SPDX format Related: https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2 Signed-off-by: Pavel Reichl <preichl@redhat.com>	2023-10-16 05:44:23 +02:00
Fedora Release Engineering	a85b390063	Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2023-07-22 02:23:48 +00:00
Bruno Wolff III	19fef1af31	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.	2023-03-29 18:55:56 -05:00
Bruno Wolff III	6a1ea5214e	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.	2023-03-17 19:05:01 -05:00
Bruno Wolff III	edbe07b14f	4.6 release	2023-03-17 18:36:36 -05:00
Adam Williamson	170ea8d03e	Backport PR #231 to fix a crash (#2178510 )	2023-03-15 12:58:39 -07:00
Bruno Wolff III	c83d9ab871	A few minor memory leaks were fixed	2023-03-14 18:49:50 -05:00
Bruno Wolff III	b280d436ab	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.	2023-03-12 22:22:05 -05:00
Bruno Wolff III	2073c47ba2	Get all README and USAGE files This way we don't need to worry about version numbers in the names.	2023-03-12 22:14:19 -05:00
Bruno Wolff III	780d2c1999	Get some manual updates and unanchored search improvements	2023-03-06 02:03:41 -06:00
Bruno Wolff III	b80cc2ea93	Update the release string This is extra important since there was a typo in the date previously.	2023-02-28 07:26:21 -06:00
Bruno Wolff III	1356cfd6af	Get some more prerelease updates This includes updated documentation and a minor bug fix	2023-02-28 07:09:27 -06:00
Bruno Wolff III	bbde1b74a3	Update the sources file	2023-02-23 11:03:13 -06:00
Bruno Wolff III	d539ae94f6	I forgot to remove the -i and -v options to forgemeta This adds noise to builds that isn't needed.	2023-02-23 10:50:17 -06:00
Bruno Wolff III	c68ead5389	Fix incorrect date	2023-02-23 10:39:59 -06:00
Bruno Wolff III	bc602cbf2f	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.	2023-02-23 10:35:21 -06:00