From abdfb4b8bea729bf2fedd47bad11d04133c1455b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 00:02:45 +0000 Subject: [PATCH 01/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_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 ddcf09b..cd9c675 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -1,7 +1,7 @@ Summary: Utility for the creation of squashfs filesystems Name: squashfs-tools Version: 4.3 -Release: 21%{?dist} +Release: 22%{?dist} License: GPLv2+ URL: http://squashfs.sourceforge.net/ Source0: http://downloads.sourceforge.net/squashfs/squashfs%{version}.tar.gz @@ -73,6 +73,9 @@ install -m 644 %{SOURCE2} %{buildroot}%{_mandir}/man1/unsquashfs.1 %{_sbindir}/unsquashfs %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 4.3-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Mon Jun 24 2019 Bruno Wolff III - 4.3-21 - Add zstd compression support (Sean Purcell via github.com/plougher/squashfs-tools) From e209865f0d6cf9f7d57ba567730ba609ca8f2072 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Fri, 17 Jan 2020 13:13:21 -0700 Subject: [PATCH 02/68] - Fix undefined symbol when building with LTO due to incorrect use of inline function --- inline.patch | 12 ++++++++++++ squashfs-tools.spec | 10 +++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 inline.patch diff --git a/inline.patch b/inline.patch new file mode 100644 index 0000000..c8b9fe9 --- /dev/null +++ b/inline.patch @@ -0,0 +1,12 @@ +diff -Nrup a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c +--- a/squashfs-tools/mksquashfs.c 2019-12-17 11:18:23.336924170 -0700 ++++ b/squashfs-tools/mksquashfs.c 2019-12-17 11:16:56.184159640 -0700 +@@ -3030,7 +3030,7 @@ inline void alloc_inode_no(struct inode_ + } + + +-inline struct dir_ent *create_dir_entry(char *name, char *source_name, ++static inline struct dir_ent *create_dir_entry(char *name, char *source_name, + char *nonstandard_pathname, struct dir_info *dir) + { + struct dir_ent *dir_ent = malloc(sizeof(struct dir_ent)); diff --git a/squashfs-tools.spec b/squashfs-tools.spec index cd9c675..2688387 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -1,7 +1,7 @@ Summary: Utility for the creation of squashfs filesystems Name: squashfs-tools Version: 4.3 -Release: 22%{?dist} +Release: 23%{?dist} License: GPLv2+ URL: http://squashfs.sourceforge.net/ Source0: http://downloads.sourceforge.net/squashfs/squashfs%{version}.tar.gz @@ -28,6 +28,9 @@ Patch4: local-cve-fix.patch Patch5: glibc.patch # zstd compression support from https://github.com/plougher/squashfs-tools Patch6: 0001-squashfs-tools-Add-zstd-support.patch +# create_dir_entry needs a qualifier to ensure a copy is emitted if it +# is not inlined to every caller +Patch7: inline.patch BuildRequires: gcc BuildRequires: zlib-devel @@ -50,6 +53,7 @@ contains the utilities for manipulating squashfs filesystems. %patch4 -p0 %patch5 -p0 %patch6 -p1 +%patch7 -p1 %build %set_build_flags @@ -73,6 +77,10 @@ install -m 644 %{SOURCE2} %{buildroot}%{_mandir}/man1/unsquashfs.1 %{_sbindir}/unsquashfs %changelog +* Fri Jan 17 2020 Jeff Law - 4.3-23 +- Fix undefined symbol when building with LTO due to incorrect + use of inline function + * Sat Jul 27 2019 Fedora Release Engineering - 4.3-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From fd7f0cdadb54aebd91768fa31699898d11e61e3e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 00:09:47 +0000 Subject: [PATCH 03/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_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 2688387..e52c529 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -1,7 +1,7 @@ Summary: Utility for the creation of squashfs filesystems Name: squashfs-tools Version: 4.3 -Release: 23%{?dist} +Release: 24%{?dist} License: GPLv2+ URL: http://squashfs.sourceforge.net/ Source0: http://downloads.sourceforge.net/squashfs/squashfs%{version}.tar.gz @@ -77,6 +77,9 @@ install -m 644 %{SOURCE2} %{buildroot}%{_mandir}/man1/unsquashfs.1 %{_sbindir}/unsquashfs %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 4.3-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Jan 17 2020 Jeff Law - 4.3-23 - Fix undefined symbol when building with LTO due to incorrect use of inline function From 23b679cf9b2d1a6b346986f6a5b47c8ac88eac6e Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Sat, 8 Feb 2020 22:14:33 -0600 Subject: [PATCH 04/68] Fix a duplicate definition flagged by gcc10 This git fixed a couple of weeks ago upstream, the same way. --- gcc10.patch | 11 +++++++++++ squashfs-tools.spec | 9 ++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 gcc10.patch diff --git a/gcc10.patch b/gcc10.patch new file mode 100644 index 0000000..4b80ed5 --- /dev/null +++ b/gcc10.patch @@ -0,0 +1,11 @@ +--- squashfs-tools/mksquashfs.h.orig 2014-05-09 23:54:13.000000000 -0500 ++++ squashfs-tools/mksquashfs.h 2020-02-08 22:08:33.275388914 -0600 +@@ -132,7 +132,7 @@ + #define BLOCK_OFFSET 2 + + extern struct cache *reader_buffer, *fragment_buffer, *reserve_cache; +-struct cache *bwriter_buffer, *fwriter_buffer; ++extern struct cache *bwriter_buffer, *fwriter_buffer; + extern struct queue *to_reader, *to_deflate, *to_writer, *from_writer, + *to_frag, *locked_fragment, *to_process_frag; + extern struct append_file **file_mapping; diff --git a/squashfs-tools.spec b/squashfs-tools.spec index e52c529..4dff2a6 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -1,7 +1,7 @@ Summary: Utility for the creation of squashfs filesystems Name: squashfs-tools Version: 4.3 -Release: 24%{?dist} +Release: 25%{?dist} License: GPLv2+ URL: http://squashfs.sourceforge.net/ Source0: http://downloads.sourceforge.net/squashfs/squashfs%{version}.tar.gz @@ -31,6 +31,9 @@ Patch6: 0001-squashfs-tools-Add-zstd-support.patch # create_dir_entry needs a qualifier to ensure a copy is emitted if it # is not inlined to every caller Patch7: inline.patch +# gcc10 tighter checking caught a problem. It was fixed upstream +# a couple of weeks ago. +Patch8: gcc10.patch BuildRequires: gcc BuildRequires: zlib-devel @@ -54,6 +57,7 @@ contains the utilities for manipulating squashfs filesystems. %patch5 -p0 %patch6 -p1 %patch7 -p1 +%patch8 -p0 %build %set_build_flags @@ -77,6 +81,9 @@ install -m 644 %{SOURCE2} %{buildroot}%{_mandir}/man1/unsquashfs.1 %{_sbindir}/unsquashfs %changelog +* Sat Feb 08 2020 Bruno Wolff III - 4.3-25 +- Fix duplicate definition flagged by gcc10 + * Fri Jan 31 2020 Fedora Release Engineering - 4.3-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From e9664596a0eaaa33574f4356285cbccb77d62f65 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 12 May 2020 19:52:08 -0500 Subject: [PATCH 05/68] New upstream source tar ball. --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 7a50ccd..cee328e 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ squashfs-4.1.tar.bz2 /squashfs4.3.tar.gz /unsquashfs.1 /mksquashfs.1 +/squashfs-tools-c570c6188811088b12ffdd9665487a2960c997a0.tar.gz diff --git a/sources b/sources index de325af..2adb74d 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (squashfs4.3.tar.gz) = 854ed7acc99920f24ecf11e0da807e5a2a162eeda55db971aba63a03f0da2c13b20ec0564a906c4b0e415bd8258b273a10208c7abc0704f2ceea773aa6148a79 +SHA512 (squashfs-tools-c570c6188811088b12ffdd9665487a2960c997a0.tar.gz) = dfdd9f81c145b1ae85e3d7eb43af4b6e2df76a19398232e66d11c2159b62927a0a6084d6d9e621dd372ced6d278353c8884b1d81701180e24e3bc06e2f4fa263 SHA512 (mksquashfs.1) = 2859790d906263b09502ba062b1c41cfc5f9fd7bdff743021c30b649ed1fe8ff047cdf49b79776fcebac9a750fea58f9348b2f14de8c532175aeaeef3b54b217 SHA512 (unsquashfs.1) = 6e1be535d370fb39b2a0e47c98052727bab94ae4f306bb3eb8f7dd07fb84bf985e82ba66bb2030e08261473cffc34d1c1973b27e77cb7127d588e24297f2f0a3 From 2b6677ffdfef68e364925b3cf161fa962941d5f6 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 12 May 2020 19:54:04 -0500 Subject: [PATCH 06/68] Switch upstream from sourceforge to github Some more work still needs to be done since the version is also changing. --- squashfs-tools.spec | 48 +++++++++------------------------------------ 1 file changed, 9 insertions(+), 39 deletions(-) diff --git a/squashfs-tools.spec b/squashfs-tools.spec index 4dff2a6..2adf0ce 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -1,39 +1,18 @@ Summary: Utility for the creation of squashfs filesystems +%global forgeurl https://github.com/plougher/squashfs-tools +%global commit c570c6188811088b12ffdd9665487a2960c997a0 +Version: 4.4 +%forgemeta Name: squashfs-tools -Version: 4.3 -Release: 25%{?dist} +Release: 1%{?dist} License: GPLv2+ -URL: http://squashfs.sourceforge.net/ -Source0: http://downloads.sourceforge.net/squashfs/squashfs%{version}.tar.gz +URL: %{forgeurl} +# Use curl -LO %{forgesource} to get the source tar ball. +Source: %{forgesource} # manpages from http://ftp.debian.org/debian/pool/main/s/squashfs-tools/squashfs-tools_4.2+20121212-1.debian.tar.xz # The man pages have been modified for 4.3 for Fedora. Source1: mksquashfs.1 Source2: unsquashfs.1 -# From master branch (55f7ba830d40d438f0b0663a505e0c227fc68b6b). -# 32 bit process can use too much memory when using PAE or 64 bit kernels -Patch0: PAE.patch -# From master branch (604b607d8ac91eb8afc0b6e3d917d5c073096103). -# Prevent overflows when using the -mem option. -Patch1: mem-overflow.patch -# From squashfs-devel@lists.sourceforge.net by Guan Xin -# For https://bugzilla.redhat.com/show_bug.cgi?id=1141206 -Patch2: 2gb.patch -# From https://github.com/gcanalesb/sasquatch/commit/6777e08cc38bc780d27c69c1d8c272867b74524f -# Which is forked from Phillip's squashfs-tools, though it looks like -# the issue applies to us. -Patch3: cve-2015-4645.patch -# Update formats to match changes in cve-2015-4645.patch -Patch4: local-cve-fix.patch -# sys/sysmacros.h is no longer included by sys/types.h -Patch5: glibc.patch -# zstd compression support from https://github.com/plougher/squashfs-tools -Patch6: 0001-squashfs-tools-Add-zstd-support.patch -# create_dir_entry needs a qualifier to ensure a copy is emitted if it -# is not inlined to every caller -Patch7: inline.patch -# gcc10 tighter checking caught a problem. It was fixed upstream -# a couple of weeks ago. -Patch8: gcc10.patch BuildRequires: gcc BuildRequires: zlib-devel @@ -48,16 +27,7 @@ Squashfs is a highly compressed read-only filesystem for Linux. This package contains the utilities for manipulating squashfs filesystems. %prep -%setup -q -n squashfs%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p0 -%patch3 -p1 -%patch4 -p0 -%patch5 -p0 -%patch6 -p1 -%patch7 -p1 -%patch8 -p0 +%forgesetup %build %set_build_flags From aab9aed3841909071531672451b5935a559b31a5 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 12 May 2020 19:59:33 -0500 Subject: [PATCH 07/68] None of the old patches are needed any more --- 0001-squashfs-tools-Add-zstd-support.patch | 413 --------------------- 2gb.patch | 11 - PAE.patch | 159 -------- cve-2015-4645.patch | 29 -- gcc10.patch | 11 - glibc.patch | 20 - inline.patch | 12 - local-cve-fix.patch | 11 - mem-overflow.patch | 33 -- 9 files changed, 699 deletions(-) delete mode 100644 0001-squashfs-tools-Add-zstd-support.patch delete mode 100644 2gb.patch delete mode 100644 PAE.patch delete mode 100644 cve-2015-4645.patch delete mode 100644 gcc10.patch delete mode 100644 glibc.patch delete mode 100644 inline.patch delete mode 100644 local-cve-fix.patch delete mode 100644 mem-overflow.patch diff --git a/0001-squashfs-tools-Add-zstd-support.patch b/0001-squashfs-tools-Add-zstd-support.patch deleted file mode 100644 index d0ba23c..0000000 --- a/0001-squashfs-tools-Add-zstd-support.patch +++ /dev/null @@ -1,413 +0,0 @@ -From 6113361316d5ce5bfdc118d188e5617a1fcd747c Mon Sep 17 00:00:00 2001 -From: Sean Purcell -Date: Mon, 14 Aug 2017 22:46:04 -0700 -Subject: [PATCH 1/4] squashfs-tools: Add zstd support - -This patch adds zstd support to squashfs-tools. It works with zstd -versions >= 1.0.0. It was originally written by Sean Purcell. - -Signed-off-by: Sean Purcell -Signed-off-by: Nick Terrell ---- - squashfs-tools/Makefile | 20 +++ - squashfs-tools/compressor.c | 8 ++ - squashfs-tools/squashfs_fs.h | 1 + - squashfs-tools/zstd_wrapper.c | 254 ++++++++++++++++++++++++++++++++++ - squashfs-tools/zstd_wrapper.h | 48 +++++++ - 5 files changed, 331 insertions(+) - create mode 100644 squashfs-tools/zstd_wrapper.c - create mode 100644 squashfs-tools/zstd_wrapper.h - -diff --git a/squashfs-tools/Makefile b/squashfs-tools/Makefile -index 52d2582..22fc559 100644 ---- a/squashfs-tools/Makefile -+++ b/squashfs-tools/Makefile -@@ -75,6 +75,18 @@ GZIP_SUPPORT = 1 - #LZMA_SUPPORT = 1 - #LZMA_DIR = ../../../../LZMA/lzma465 - -+ -+########### Building ZSTD support ############ -+# -+# The ZSTD library is supported -+# ZSTD homepage: http://zstd.net -+# ZSTD source repository: https://github.com/facebook/zstd -+# -+# To build using the ZSTD library - install the library and uncomment the -+# ZSTD_SUPPORT line below. -+# -+#ZSTD_SUPPORT = 1 -+ - ######## Specifying default compression ######## - # - # The next line specifies which compression algorithm is used by default -@@ -177,6 +189,14 @@ LIBS += -llz4 - COMPRESSORS += lz4 - endif - -+ifeq ($(ZSTD_SUPPORT),1) -+CFLAGS += -DZSTD_SUPPORT -+MKSQUASHFS_OBJS += zstd_wrapper.o -+UNSQUASHFS_OBJS += zstd_wrapper.o -+LIBS += -lzstd -+COMPRESSORS += zstd -+endif -+ - ifeq ($(XATTR_SUPPORT),1) - ifeq ($(XATTR_DEFAULT),1) - CFLAGS += -DXATTR_SUPPORT -DXATTR_DEFAULT -diff --git a/squashfs-tools/compressor.c b/squashfs-tools/compressor.c -index 525e316..02b5e90 100644 ---- a/squashfs-tools/compressor.c -+++ b/squashfs-tools/compressor.c -@@ -65,6 +65,13 @@ static struct compressor xz_comp_ops = { - extern struct compressor xz_comp_ops; - #endif - -+#ifndef ZSTD_SUPPORT -+static struct compressor zstd_comp_ops = { -+ ZSTD_COMPRESSION, "zstd" -+}; -+#else -+extern struct compressor zstd_comp_ops; -+#endif - - static struct compressor unknown_comp_ops = { - 0, "unknown" -@@ -77,6 +84,7 @@ struct compressor *compressor[] = { - &lzo_comp_ops, - &lz4_comp_ops, - &xz_comp_ops, -+ &zstd_comp_ops, - &unknown_comp_ops - }; - -diff --git a/squashfs-tools/squashfs_fs.h b/squashfs-tools/squashfs_fs.h -index 791fe12..afca918 100644 ---- a/squashfs-tools/squashfs_fs.h -+++ b/squashfs-tools/squashfs_fs.h -@@ -277,6 +277,7 @@ typedef long long squashfs_inode; - #define LZO_COMPRESSION 3 - #define XZ_COMPRESSION 4 - #define LZ4_COMPRESSION 5 -+#define ZSTD_COMPRESSION 6 - - struct squashfs_super_block { - unsigned int s_magic; -diff --git a/squashfs-tools/zstd_wrapper.c b/squashfs-tools/zstd_wrapper.c -new file mode 100644 -index 0000000..dcab75a ---- /dev/null -+++ b/squashfs-tools/zstd_wrapper.c -@@ -0,0 +1,254 @@ -+/* -+ * Copyright (c) 2017 -+ * Phillip Lougher -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version 2, -+ * or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * zstd_wrapper.c -+ * -+ * Support for ZSTD compression http://zstd.net -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+ -+#include "squashfs_fs.h" -+#include "zstd_wrapper.h" -+#include "compressor.h" -+ -+static int compression_level = ZSTD_DEFAULT_COMPRESSION_LEVEL; -+ -+/* -+ * This function is called by the options parsing code in mksquashfs.c -+ * to parse any -X compressor option. -+ * -+ * This function returns: -+ * >=0 (number of additional args parsed) on success -+ * -1 if the option was unrecognised, or -+ * -2 if the option was recognised, but otherwise bad in -+ * some way (e.g. invalid parameter) -+ * -+ * Note: this function sets internal compressor state, but does not -+ * pass back the results of the parsing other than success/failure. -+ * The zstd_dump_options() function is called later to get the options in -+ * a format suitable for writing to the filesystem. -+ */ -+static int zstd_options(char *argv[], int argc) -+{ -+ if (strcmp(argv[0], "-Xcompression-level") == 0) { -+ if (argc < 2) { -+ fprintf(stderr, "zstd: -Xcompression-level missing " -+ "compression level\n"); -+ fprintf(stderr, "zstd: -Xcompression-level it should " -+ "be 1 <= n <= %d\n", ZSTD_maxCLevel()); -+ goto failed; -+ } -+ -+ compression_level = atoi(argv[1]); -+ if (compression_level < 1 || -+ compression_level > ZSTD_maxCLevel()) { -+ fprintf(stderr, "zstd: -Xcompression-level invalid, it " -+ "should be 1 <= n <= %d\n", ZSTD_maxCLevel()); -+ goto failed; -+ } -+ -+ return 1; -+ } -+ -+ return -1; -+failed: -+ return -2; -+} -+ -+/* -+ * This function is called by mksquashfs to dump the parsed -+ * compressor options in a format suitable for writing to the -+ * compressor options field in the filesystem (stored immediately -+ * after the superblock). -+ * -+ * This function returns a pointer to the compression options structure -+ * to be stored (and the size), or NULL if there are no compression -+ * options. -+ */ -+static void *zstd_dump_options(int block_size, int *size) -+{ -+ static struct zstd_comp_opts comp_opts; -+ -+ /* don't return anything if the options are all default */ -+ if (compression_level == ZSTD_DEFAULT_COMPRESSION_LEVEL) -+ return NULL; -+ -+ comp_opts.compression_level = compression_level; -+ -+ SQUASHFS_INSWAP_COMP_OPTS(&comp_opts); -+ -+ *size = sizeof(comp_opts); -+ return &comp_opts; -+} -+ -+/* -+ * This function is a helper specifically for the append mode of -+ * mksquashfs. Its purpose is to set the internal compressor state -+ * to the stored compressor options in the passed compressor options -+ * structure. -+ * -+ * In effect this function sets up the compressor options -+ * to the same state they were when the filesystem was originally -+ * generated, this is to ensure on appending, the compressor uses -+ * the same compression options that were used to generate the -+ * original filesystem. -+ * -+ * Note, even if there are no compressor options, this function is still -+ * called with an empty compressor structure (size == 0), to explicitly -+ * set the default options, this is to ensure any user supplied -+ * -X options on the appending mksquashfs command line are over-ridden. -+ * -+ * This function returns 0 on sucessful extraction of options, and -1 on error. -+ */ -+static int zstd_extract_options(int block_size, void *buffer, int size) -+{ -+ struct zstd_comp_opts *comp_opts = buffer; -+ -+ if (size == 0) { -+ /* Set default values */ -+ compression_level = ZSTD_DEFAULT_COMPRESSION_LEVEL; -+ return 0; -+ } -+ -+ /* we expect a comp_opts structure of sufficient size to be present */ -+ if (size < sizeof(*comp_opts)) -+ goto failed; -+ -+ SQUASHFS_INSWAP_COMP_OPTS(comp_opts); -+ -+ if (comp_opts->compression_level < 1 || -+ comp_opts->compression_level > ZSTD_maxCLevel()) { -+ fprintf(stderr, "zstd: bad compression level in compression " -+ "options structure\n"); -+ goto failed; -+ } -+ -+ compression_level = comp_opts->compression_level; -+ -+ return 0; -+ -+failed: -+ fprintf(stderr, "zstd: error reading stored compressor options from " -+ "filesystem!\n"); -+ -+ return -1; -+} -+ -+static void zstd_display_options(void *buffer, int size) -+{ -+ struct zstd_comp_opts *comp_opts = buffer; -+ -+ /* we expect a comp_opts structure of sufficient size to be present */ -+ if (size < sizeof(*comp_opts)) -+ goto failed; -+ -+ SQUASHFS_INSWAP_COMP_OPTS(comp_opts); -+ -+ if (comp_opts->compression_level < 1 || -+ comp_opts->compression_level > ZSTD_maxCLevel()) { -+ fprintf(stderr, "zstd: bad compression level in compression " -+ "options structure\n"); -+ goto failed; -+ } -+ -+ printf("\tcompression-level %d\n", comp_opts->compression_level); -+ -+ return; -+ -+failed: -+ fprintf(stderr, "zstd: error reading stored compressor options from " -+ "filesystem!\n"); -+} -+ -+/* -+ * This function is called by mksquashfs to initialise the -+ * compressor, before compress() is called. -+ * -+ * This function returns 0 on success, and -1 on error. -+ */ -+static int zstd_init(void **strm, int block_size, int datablock) -+{ -+ ZSTD_CCtx *cctx = ZSTD_createCCtx(); -+ -+ if (!cctx) { -+ fprintf(stderr, "zstd: failed to allocate compression " -+ "context!\n"); -+ return -1; -+ } -+ -+ *strm = cctx; -+ return 0; -+} -+ -+static int zstd_compress(void *strm, void *dest, void *src, int size, -+ int block_size, int *error) -+{ -+ const size_t res = ZSTD_compressCCtx((ZSTD_CCtx*)strm, dest, block_size, -+ src, size, compression_level); -+ -+ if (ZSTD_isError(res)) { -+ /* FIXME: -+ * zstd does not expose stable error codes. The error enum may -+ * change between versions. Until upstream zstd stablizes the -+ * error codes, we have no way of knowing why the error occurs. -+ * zstd shouldn't fail to compress any input unless there isn't -+ * enough output space. We assume that is the cause and return -+ * the special error code for not enough output space. -+ */ -+ return 0; -+ } -+ -+ return (int)res; -+} -+ -+static int zstd_uncompress(void *dest, void *src, int size, int outsize, -+ int *error) -+{ -+ const size_t res = ZSTD_decompress(dest, outsize, src, size); -+ -+ if (ZSTD_isError(res)) { -+ fprintf(stderr, "\t%d %d\n", outsize, size); -+ -+ *error = (int)ZSTD_getErrorCode(res); -+ return -1; -+ } -+ -+ return (int)res; -+} -+ -+static void zstd_usage(void) -+{ -+ fprintf(stderr, "\t -Xcompression-level \n"); -+ fprintf(stderr, "\t\t should be 1 .. %d (default " -+ "%d)\n", ZSTD_maxCLevel(), ZSTD_DEFAULT_COMPRESSION_LEVEL); -+} -+ -+struct compressor zstd_comp_ops = { -+ .init = zstd_init, -+ .compress = zstd_compress, -+ .uncompress = zstd_uncompress, -+ .options = zstd_options, -+ .dump_options = zstd_dump_options, -+ .extract_options = zstd_extract_options, -+ .display_options = zstd_display_options, -+ .usage = zstd_usage, -+ .id = ZSTD_COMPRESSION, -+ .name = "zstd", -+ .supported = 1 -+}; -diff --git a/squashfs-tools/zstd_wrapper.h b/squashfs-tools/zstd_wrapper.h -new file mode 100644 -index 0000000..4fbef0a ---- /dev/null -+++ b/squashfs-tools/zstd_wrapper.h -@@ -0,0 +1,48 @@ -+#ifndef ZSTD_WRAPPER_H -+#define ZSTD_WRAPPER_H -+/* -+ * Squashfs -+ * -+ * Copyright (c) 2017 -+ * Phillip Lougher -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version 2, -+ * or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * zstd_wrapper.h -+ * -+ */ -+ -+#ifndef linux -+#define __BYTE_ORDER BYTE_ORDER -+#define __BIG_ENDIAN BIG_ENDIAN -+#define __LITTLE_ENDIAN LITTLE_ENDIAN -+#else -+#include -+#endif -+ -+#if __BYTE_ORDER == __BIG_ENDIAN -+extern unsigned int inswap_le16(unsigned short); -+extern unsigned int inswap_le32(unsigned int); -+ -+#define SQUASHFS_INSWAP_COMP_OPTS(s) { \ -+ (s)->compression_level = inswap_le32((s)->compression_level); \ -+} -+#else -+#define SQUASHFS_INSWAP_COMP_OPTS(s) -+#endif -+ -+/* Default compression */ -+#define ZSTD_DEFAULT_COMPRESSION_LEVEL 15 -+ -+struct zstd_comp_opts { -+ int compression_level; -+}; -+#endif --- -2.19.1 - diff --git a/2gb.patch b/2gb.patch deleted file mode 100644 index 33e9108..0000000 --- a/2gb.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- squashfs-tools/mksquashfs.c.orig 2014-09-13 11:08:27.352318167 -0500 -+++ squashfs-tools/mksquashfs.c 2014-09-13 11:09:36.701132044 -0500 -@@ -2055,7 +2055,7 @@ - - inline int is_fragment(struct inode_info *inode) - { -- int file_size = inode->buf.st_size; -+ off_t file_size = inode->buf.st_size; - - /* - * If this block is to be compressed differently to the diff --git a/PAE.patch b/PAE.patch deleted file mode 100644 index d2f29fb..0000000 --- a/PAE.patch +++ /dev/null @@ -1,159 +0,0 @@ -From 55f7ba830d40d438f0b0663a505e0c227fc68b6b Mon Sep 17 00:00:00 2001 -From: Phillip Lougher -Date: Tue, 10 Jun 2014 21:51:52 +0100 -Subject: mksquashfs: fix phys mem calculation for 32-bit processes on - PAE/64-bit kernels - -When adding the code to base default memory usage on physical memory -(by default use 25% of physical memory), I made an oversight. I assumed -the process would be able to address 25% of physical memory. - -However, for 32-bit processes running on a PAE kernel or 64-bit kernel, -25% of physical memory can easily exceed the addressible memory for a -32-bit process, e.g. if a machine has 24 GB of physical memory, the -code would asume the process could easily use 6 GB. - -A 32-bit process by definition can only address 4 GB (32-bit pointers). -But, due to the typical kernel/user-space split (1GB/3GB, or 2GB/2GB) -on PAE kernels, a 32-bit process may only be able to address 2 GB. - -So, if Mksquashfs is a 32-bit application running on a PAE/64-bit kernel, -the code assumes it can address much more memory than it really can, which -means it runs out of memory. - -The fix is to impose a maximum default limit on 32-bit kernels, or -otherwise to never use a value more than 25% of the address space. If -we assume the maximum address space is 2 GB, then the maximum becomes -512 MB. But, given most kernels used the 1GB/3GB split, that may be -unduely conservative, and 25% of 3 GB (756 MB) may be better. This -patch compromises on 640 MB, which is mid-way between the 512 MB and 756 MB -values. It is also the fixed default value previously used by Mksquashfs. - -This patch also alters the code which imposes a maximum size. Previously -it was believed limiting to the physical memory size was adequate. But -obviously this needs to be updated to take into account a 32-bit process -may only be able to address 2 GB. In the process I've also taken the -opportunity to limit all requests to no more than 75% of physical memory. - -Signed-off-by: Phillip Lougher - -diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c -index 86f82bb..5370ecf 100644 ---- a/squashfs-tools/mksquashfs.c -+++ b/squashfs-tools/mksquashfs.c -@@ -304,7 +304,7 @@ void restorefs(); - struct dir_info *scan1_opendir(char *pathname, char *subpath, int depth); - void write_filesystem_tables(struct squashfs_super_block *sBlk, int nopad); - unsigned short get_checksum_mem(char *buff, int bytes); --int get_physical_memory(); -+void check_usable_phys_mem(int total_mem); - - - void prep_exit() -@@ -4053,11 +4053,7 @@ void initialise_threads(int readq, int fragq, int bwriteq, int fwriteq, - BAD_ERROR("Queue sizes rediculously too large\n"); - total_mem += fwriteq; - -- if(total_mem > get_physical_memory()) { -- ERROR("Total queue sizes larger than physical memory.\n"); -- ERROR("Mksquashfs will exhaust physical memory and thrash.\n"); -- BAD_ERROR("Queues too large\n"); -- } -+ check_usable_phys_mem(total_mem); - - /* - * convert from queue size in Mbytes to queue size in -@@ -4879,6 +4875,72 @@ int get_physical_memory() - } - - -+void check_usable_phys_mem(int total_mem) -+{ -+ /* -+ * We want to allow users to use as much of their physical -+ * memory as they wish. However, for practical reasons there are -+ * limits which need to be imposed, to protect users from themselves -+ * and to prevent people from using Mksquashfs as a DOS attack by using -+ * all physical memory. Mksquashfs uses memory to cache data from disk -+ * to optimise performance. It is pointless to ask it to use more -+ * than 75% of physical memory, as this causes thrashing and it is thus -+ * self-defeating. -+ */ -+ int mem = get_physical_memory(); -+ -+ mem = (mem >> 1) + (mem >> 2); /* 75% */ -+ -+ if(total_mem > mem) { -+ ERROR("Total memory requested is more than 75%% of physical " -+ "memory.\n"); -+ ERROR("Mksquashfs uses memory to cache data from disk to " -+ "optimise performance.\n"); -+ ERROR("It is pointless to ask it to use more than this amount " -+ "of memory, as this\n"); -+ ERROR("causes thrashing and it is thus self-defeating.\n"); -+ BAD_ERROR("Requested memory size too large\n"); -+ } -+ -+ if(sizeof(void *) == 4 && total_mem > 2048) { -+ /* -+ * If we're running on a kernel with PAE or on a 64-bit kernel, -+ * then the 75% physical memory limit can still easily exceed -+ * the addressable memory by this process. -+ * -+ * Due to the typical kernel/user-space split (1GB/3GB, or -+ * 2GB/2GB), we have to conservatively assume the 32-bit -+ * processes can only address 2-3GB. So refuse if the user -+ * tries to allocate more than 2GB. -+ */ -+ ERROR("Total memory requested may exceed maximum " -+ "addressable memory by this process\n"); -+ BAD_ERROR("Requested memory size too large\n"); -+ } -+} -+ -+ -+int get_default_phys_mem() -+{ -+ int mem = get_physical_memory() / SQUASHFS_TAKE; -+ -+ if(sizeof(void *) == 4 && mem > 640) { -+ /* -+ * If we're running on a kernel with PAE or on a 64-bit kernel, -+ * the default memory usage can exceed the addressable -+ * memory by this process. -+ * Due to the typical kernel/user-space split (1GB/3GB, or -+ * 2GB/2GB), we have to conservatively assume the 32-bit -+ * processes can only address 2-3GB. So limit the default -+ * usage to 640M, which gives room for other data. -+ */ -+ mem = 640; -+ } -+ -+ return mem; -+} -+ -+ - void calculate_queue_sizes(int mem, int *readq, int *fragq, int *bwriteq, - int *fwriteq) - { -@@ -4890,7 +4952,7 @@ void calculate_queue_sizes(int mem, int *readq, int *fragq, int *bwriteq, - - - #define VERSION() \ -- printf("mksquashfs version 4.3 (2014/05/12)\n");\ -+ printf("mksquashfs version 4.3-git (2014/06/09)\n");\ - printf("copyright (C) 2014 Phillip Lougher "\ - "\n\n"); \ - printf("This program is free software; you can redistribute it and/or"\ -@@ -4918,7 +4980,7 @@ int main(int argc, char *argv[]) - int fragq; - int bwriteq; - int fwriteq; -- int total_mem = get_physical_memory() / SQUASHFS_TAKE; -+ int total_mem = get_default_phys_mem(); - int progress = TRUE; - int force_progress = FALSE; - struct file_buffer **fragment = NULL; --- -cgit v0.10.1 - diff --git a/cve-2015-4645.patch b/cve-2015-4645.patch deleted file mode 100644 index f69025f..0000000 --- a/cve-2015-4645.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/squashfs-tools/unsquash-4.c b/squashfs-tools/unsquash-4.c -index ecdaac796f09..2c0cf63daf67 100644 ---- a/squashfs-tools/unsquash-4.c -+++ b/squashfs-tools/unsquash-4.c -@@ -31,9 +31,9 @@ static unsigned int *id_table; - int read_fragment_table_4(long long *directory_table_end) - { - int res, i; -- int bytes = SQUASHFS_FRAGMENT_BYTES(sBlk.s.fragments); -- int indexes = SQUASHFS_FRAGMENT_INDEXES(sBlk.s.fragments); -- long long fragment_table_index[indexes]; -+ size_t bytes = SQUASHFS_FRAGMENT_BYTES(sBlk.s.fragments); -+ size_t indexes = SQUASHFS_FRAGMENT_INDEXES(sBlk.s.fragments); -+ long long *fragment_table_index; - - TRACE("read_fragment_table: %d fragments, reading %d fragment indexes " - "from 0x%llx\n", sBlk.s.fragments, indexes, -@@ -44,6 +44,11 @@ int read_fragment_table_4(long long *directory_table_end) - return TRUE; - } - -+ fragment_table_index = malloc(indexes*sizeof(long long)); -+ if(fragment_table_index == NULL) -+ EXIT_UNSQUASH("read_fragment_table: failed to allocate " -+ "fragment table index\n"); -+ - fragment_table = malloc(bytes); - if(fragment_table == NULL) - EXIT_UNSQUASH("read_fragment_table: failed to allocate " diff --git a/gcc10.patch b/gcc10.patch deleted file mode 100644 index 4b80ed5..0000000 --- a/gcc10.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- squashfs-tools/mksquashfs.h.orig 2014-05-09 23:54:13.000000000 -0500 -+++ squashfs-tools/mksquashfs.h 2020-02-08 22:08:33.275388914 -0600 -@@ -132,7 +132,7 @@ - #define BLOCK_OFFSET 2 - - extern struct cache *reader_buffer, *fragment_buffer, *reserve_cache; --struct cache *bwriter_buffer, *fwriter_buffer; -+extern struct cache *bwriter_buffer, *fwriter_buffer; - extern struct queue *to_reader, *to_deflate, *to_writer, *from_writer, - *to_frag, *locked_fragment, *to_process_frag; - extern struct append_file **file_mapping; diff --git a/glibc.patch b/glibc.patch deleted file mode 100644 index 87c63b1..0000000 --- a/glibc.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- squashfs-tools/mksquashfs.c.orig 2019-05-21 01:50:02.197183719 -0500 -+++ squashfs-tools/mksquashfs.c 2019-05-21 01:51:05.818179903 -0500 -@@ -50,6 +50,7 @@ - #include - #include - #include -+#include - - #ifndef linux - #define __BYTE_ORDER BYTE_ORDER ---- squashfs-tools/unsquashfs.c.orig 2019-05-21 01:57:45.984155904 -0500 -+++ squashfs-tools/unsquashfs.c 2019-05-21 01:58:39.837152674 -0500 -@@ -37,6 +37,7 @@ - #include - #include - #include -+#include - - struct cache *fragment_cache, *data_cache; - struct queue *to_reader, *to_inflate, *to_writer, *from_writer; diff --git a/inline.patch b/inline.patch deleted file mode 100644 index c8b9fe9..0000000 --- a/inline.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nrup a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c ---- a/squashfs-tools/mksquashfs.c 2019-12-17 11:18:23.336924170 -0700 -+++ b/squashfs-tools/mksquashfs.c 2019-12-17 11:16:56.184159640 -0700 -@@ -3030,7 +3030,7 @@ inline void alloc_inode_no(struct inode_ - } - - --inline struct dir_ent *create_dir_entry(char *name, char *source_name, -+static inline struct dir_ent *create_dir_entry(char *name, char *source_name, - char *nonstandard_pathname, struct dir_info *dir) - { - struct dir_ent *dir_ent = malloc(sizeof(struct dir_ent)); diff --git a/local-cve-fix.patch b/local-cve-fix.patch deleted file mode 100644 index 6dce1b2..0000000 --- a/local-cve-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- squashfs-tools/unsquash-4.c.orig 2015-06-24 14:23:22.270710744 -0500 -+++ squashfs-tools/unsquash-4.c 2015-06-24 14:24:13.671243487 -0500 -@@ -35,7 +35,7 @@ - size_t indexes = SQUASHFS_FRAGMENT_INDEXES(sBlk.s.fragments); - long long *fragment_table_index; - -- TRACE("read_fragment_table: %d fragments, reading %d fragment indexes " -+ TRACE("read_fragment_table: %u fragments, reading %zu fragment indexes " - "from 0x%llx\n", sBlk.s.fragments, indexes, - sBlk.s.fragment_table_start); - diff --git a/mem-overflow.patch b/mem-overflow.patch deleted file mode 100644 index 1450fe9..0000000 --- a/mem-overflow.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 604b607d8ac91eb8afc0b6e3d917d5c073096103 Mon Sep 17 00:00:00 2001 -From: Phillip Lougher -Date: Wed, 11 Jun 2014 04:51:37 +0100 -Subject: mksquashfs: ensure value does not overflow a signed int in -mem - option - -Signed-off-by: Phillip Lougher - -diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c -index 5370ecf..9676dc8 100644 ---- a/squashfs-tools/mksquashfs.c -+++ b/squashfs-tools/mksquashfs.c -@@ -5193,7 +5193,16 @@ print_compressor_options: - argv[0]); - exit(1); - } -- /* convert from bytes to Mbytes */ -+ -+ /* -+ * convert from bytes to Mbytes, ensuring the value -+ * does not overflow a signed int -+ */ -+ if(number >= (1LL << 51)) { -+ ERROR("%s: -mem invalid mem size\n", argv[0]); -+ exit(1); -+ } -+ - total_mem = number / 1048576; - if(total_mem < (SQUASHFS_LOWMEM / SQUASHFS_TAKE)) { - ERROR("%s: -mem should be %d Mbytes or " --- -cgit v0.10.1 - From 66cdccfe02e0d5e526de4b3b2fa0d5a49d284320 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 12 May 2020 20:03:49 -0500 Subject: [PATCH 08/68] Update the change log for the new release --- squashfs-tools.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/squashfs-tools.spec b/squashfs-tools.spec index 2adf0ce..610ae88 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -51,6 +51,9 @@ install -m 644 %{SOURCE2} %{buildroot}%{_mandir}/man1/unsquashfs.1 %{_sbindir}/unsquashfs %changelog +* Tue May 12 2020 Bruno Wolff III - 4.4-1.20200513gitc570c61 +- Go to 4.4 release + plus a few upstream post release patches + * Sat Feb 08 2020 Bruno Wolff III - 4.3-25 - Fix duplicate definition flagged by gcc10 From 3f7b918958a2bd1fb0ae01b38701828f0e17b399 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 12 May 2020 20:06:22 -0500 Subject: [PATCH 09/68] Avoid warning for macro use in a comment --- squashfs-tools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/squashfs-tools.spec b/squashfs-tools.spec index 610ae88..a211a4c 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -7,7 +7,7 @@ Name: squashfs-tools Release: 1%{?dist} License: GPLv2+ URL: %{forgeurl} -# Use curl -LO %{forgesource} to get the source tar ball. +# Use curl -LO %%{forgesource} to get the source tar ball. Source: %{forgesource} # manpages from http://ftp.debian.org/debian/pool/main/s/squashfs-tools/squashfs-tools_4.2+20121212-1.debian.tar.xz # The man pages have been modified for 4.3 for Fedora. From 0fe4a80add406f16f3e7d6f4310e2a4ab92f010e Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 12 May 2020 20:09:49 -0500 Subject: [PATCH 10/68] Update list of documentation files --- squashfs-tools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/squashfs-tools.spec b/squashfs-tools.spec index a211a4c..cb2f2c9 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -42,7 +42,7 @@ install -m 644 %{SOURCE1} %{buildroot}%{_mandir}/man1/mksquashfs.1 install -m 644 %{SOURCE2} %{buildroot}%{_mandir}/man1/unsquashfs.1 %files -%doc README ACKNOWLEDGEMENTS DONATIONS PERFORMANCE.README README-4.3 CHANGES pseudo-file.example COPYING +%doc README ACKNOWLEDGEMENTS README-4.4 CHANGES COPYING USAGE %doc README %{_mandir}/man1/* From a22c334e07f69391c37b7ff2d5d98379dea9fb89 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 12 May 2020 20:42:31 -0500 Subject: [PATCH 11/68] Sources for the man pages had some changes that were uploaded This changed the hashes in the sources file. --- sources | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 2adb74d..af60a4e 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (squashfs-tools-c570c6188811088b12ffdd9665487a2960c997a0.tar.gz) = dfdd9f81c145b1ae85e3d7eb43af4b6e2df76a19398232e66d11c2159b62927a0a6084d6d9e621dd372ced6d278353c8884b1d81701180e24e3bc06e2f4fa263 -SHA512 (mksquashfs.1) = 2859790d906263b09502ba062b1c41cfc5f9fd7bdff743021c30b649ed1fe8ff047cdf49b79776fcebac9a750fea58f9348b2f14de8c532175aeaeef3b54b217 -SHA512 (unsquashfs.1) = 6e1be535d370fb39b2a0e47c98052727bab94ae4f306bb3eb8f7dd07fb84bf985e82ba66bb2030e08261473cffc34d1c1973b27e77cb7127d588e24297f2f0a3 +SHA512 (mksquashfs.1) = 4dc03bccf5842791abf6ca437ada03c331942a9a37fcacdbf136443db11a7f26121f6e8ba742aaffc9fda9a5e220b171c5223ee3ab0474dde6b300a63ee32f92 +SHA512 (unsquashfs.1) = fbf7c96454584fb844572a43af8781688186e3854c0d0acb9dfd83c5d0e3b6f49b58fbd68407b66ff573f82d8d16ecd10a4c319e49e809428fe65068f0c48bf2 From c671752333838c266337705c1a0c09213ca1c4e7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 11:21:48 +0000 Subject: [PATCH 12/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_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 cb2f2c9..de60985 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -4,7 +4,7 @@ Summary: Utility for the creation of squashfs filesystems Version: 4.4 %forgemeta Name: squashfs-tools -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: %{forgeurl} # Use curl -LO %%{forgesource} to get the source tar ball. @@ -51,6 +51,9 @@ install -m 644 %{SOURCE2} %{buildroot}%{_mandir}/man1/unsquashfs.1 %{_sbindir}/unsquashfs %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 4.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue May 12 2020 Bruno Wolff III - 4.4-1.20200513gitc570c61 - Go to 4.4 release + plus a few upstream post release patches From 14b09b038004ff3d884b476b3f2535ce081702d9 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Wed, 11 Nov 2020 13:07:23 -0600 Subject: [PATCH 13/68] New upstream release 4.4-git.1 This has a minor fix added after the snapshot we used. --- .gitignore | 1 + sources | 2 +- squashfs-tools.spec | 14 +++++++------- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index cee328e..4cfddaa 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ squashfs-4.1.tar.bz2 /unsquashfs.1 /mksquashfs.1 /squashfs-tools-c570c6188811088b12ffdd9665487a2960c997a0.tar.gz +/4.4-git.1.tar.gz diff --git a/sources b/sources index af60a4e..4aee9fc 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (squashfs-tools-c570c6188811088b12ffdd9665487a2960c997a0.tar.gz) = dfdd9f81c145b1ae85e3d7eb43af4b6e2df76a19398232e66d11c2159b62927a0a6084d6d9e621dd372ced6d278353c8884b1d81701180e24e3bc06e2f4fa263 +SHA512 (4.4-git.1.tar.gz) = 8d8cc3da7cbfc7b94d070021383413f3d1ef1261ba3fd9924dde4453558a8f8f14812c2f5614f87bef719496b0a023897de8d087c32a7344fa2eb9c1624563a0 SHA512 (mksquashfs.1) = 4dc03bccf5842791abf6ca437ada03c331942a9a37fcacdbf136443db11a7f26121f6e8ba742aaffc9fda9a5e220b171c5223ee3ab0474dde6b300a63ee32f92 SHA512 (unsquashfs.1) = fbf7c96454584fb844572a43af8781688186e3854c0d0acb9dfd83c5d0e3b6f49b58fbd68407b66ff573f82d8d16ecd10a4c319e49e809428fe65068f0c48bf2 diff --git a/squashfs-tools.spec b/squashfs-tools.spec index de60985..0e07760 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -1,14 +1,11 @@ Summary: Utility for the creation of squashfs filesystems %global forgeurl https://github.com/plougher/squashfs-tools -%global commit c570c6188811088b12ffdd9665487a2960c997a0 Version: 4.4 -%forgemeta Name: squashfs-tools -Release: 2%{?dist} +Release: 3.git1%{?dist} License: GPLv2+ -URL: %{forgeurl} -# Use curl -LO %%{forgesource} to get the source tar ball. -Source: %{forgesource} +URL: %{forgeurl}/archive/4.4-git.1.tar.gz +Source: 4.4-git.1.tar.gz # manpages from http://ftp.debian.org/debian/pool/main/s/squashfs-tools/squashfs-tools_4.2+20121212-1.debian.tar.xz # The man pages have been modified for 4.3 for Fedora. Source1: mksquashfs.1 @@ -27,7 +24,7 @@ Squashfs is a highly compressed read-only filesystem for Linux. This package contains the utilities for manipulating squashfs filesystems. %prep -%forgesetup +%setup -n %{name}-4.4-git.1 %build %set_build_flags @@ -51,6 +48,9 @@ install -m 644 %{SOURCE2} %{buildroot}%{_mandir}/man1/unsquashfs.1 %{_sbindir}/unsquashfs %changelog +* Wed Nov 11 2020 - 4.4-3.git1 +- New upstream release with a minor fix + * Wed Jul 29 2020 Fedora Release Engineering - 4.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From dd8407797b40c14ac95187e25191afbb33ca821c Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Sat, 14 Nov 2020 06:55:41 -0600 Subject: [PATCH 14/68] Work around not being able to restart gating tests --- squashfs-tools.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/squashfs-tools.spec b/squashfs-tools.spec index 0e07760..de9b30a 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -2,7 +2,7 @@ Summary: Utility for the creation of squashfs filesystems %global forgeurl https://github.com/plougher/squashfs-tools Version: 4.4 Name: squashfs-tools -Release: 3.git1%{?dist} +Release: 4.git1%{?dist} License: GPLv2+ URL: %{forgeurl}/archive/4.4-git.1.tar.gz Source: 4.4-git.1.tar.gz @@ -48,7 +48,10 @@ install -m 644 %{SOURCE2} %{buildroot}%{_mandir}/man1/unsquashfs.1 %{_sbindir}/unsquashfs %changelog -* Wed Nov 11 2020 - 4.4-3.git1 +* Sat Nov 14 2020 Bruno Wolff III - 4.4-4.git1 +- Gating tests failed and unable to rerun them + +* Wed Nov 11 2020 Bruno Wolff III - 4.4-3.git1 - New upstream release with a minor fix * Wed Jul 29 2020 Fedora Release Engineering - 4.4-2 From c62728b1e00843937828c6f3e9570fc9b6cb1bfa Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 8 Jan 2021 21:54:11 +0000 Subject: [PATCH 15/68] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- squashfs-tools.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/squashfs-tools.spec b/squashfs-tools.spec index de9b30a..a0ee4c9 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -11,6 +11,7 @@ Source: 4.4-git.1.tar.gz Source1: mksquashfs.1 Source2: unsquashfs.1 +BuildRequires: make BuildRequires: gcc BuildRequires: zlib-devel BuildRequires: xz-devel From e86b5be82fd0bbe2e5d6b1eea88c613b716242c4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 20:57:09 +0000 Subject: [PATCH 16/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_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 a0ee4c9..41795e3 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -2,7 +2,7 @@ Summary: Utility for the creation of squashfs filesystems %global forgeurl https://github.com/plougher/squashfs-tools Version: 4.4 Name: squashfs-tools -Release: 4.git1%{?dist} +Release: 5.git1%{?dist} License: GPLv2+ URL: %{forgeurl}/archive/4.4-git.1.tar.gz Source: 4.4-git.1.tar.gz @@ -49,6 +49,9 @@ install -m 644 %{SOURCE2} %{buildroot}%{_mandir}/man1/unsquashfs.1 %{_sbindir}/unsquashfs %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 4.4-5.git1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sat Nov 14 2020 Bruno Wolff III - 4.4-4.git1 - Gating tests failed and unable to rerun them From 081359eb42871649fe2726eabec246a20050d76f Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Fri, 23 Jul 2021 01:14:26 -0500 Subject: [PATCH 17/68] 4.5 has been released his is a bare bones update to test the release. There were a lot of changes and 2 new sym lynced names. The programs help has info about this. But the man pages are missing a lot and still need to be updated. Potentially command line changes could break composes, though I am not expecting that. --- .gitignore | 2 ++ sources | 2 +- squashfs-tools.spec | 21 +++++++++++++++------ 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 4cfddaa..29faa35 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,5 @@ squashfs-4.1.tar.bz2 /mksquashfs.1 /squashfs-tools-c570c6188811088b12ffdd9665487a2960c997a0.tar.gz /4.4-git.1.tar.gz +/squashfs-tools-4.5.tar.gz +/4.5.tar.gz diff --git a/sources b/sources index 4aee9fc..9f520b9 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (4.4-git.1.tar.gz) = 8d8cc3da7cbfc7b94d070021383413f3d1ef1261ba3fd9924dde4453558a8f8f14812c2f5614f87bef719496b0a023897de8d087c32a7344fa2eb9c1624563a0 +SHA512 (4.5.tar.gz) = e00610487d24eed9e5dadcf84014a3d7faa9815d8ce00fd4660e6c8ce394dccf185ed9f387f4fa1313b9812fe770f802bdcbaef87887f2bcefacf234594a72e0 SHA512 (mksquashfs.1) = 4dc03bccf5842791abf6ca437ada03c331942a9a37fcacdbf136443db11a7f26121f6e8ba742aaffc9fda9a5e220b171c5223ee3ab0474dde6b300a63ee32f92 SHA512 (unsquashfs.1) = fbf7c96454584fb844572a43af8781688186e3854c0d0acb9dfd83c5d0e3b6f49b58fbd68407b66ff573f82d8d16ecd10a4c319e49e809428fe65068f0c48bf2 diff --git a/squashfs-tools.spec b/squashfs-tools.spec index 41795e3..32f4c44 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -1,13 +1,14 @@ Summary: Utility for the creation of squashfs filesystems %global forgeurl https://github.com/plougher/squashfs-tools -Version: 4.4 +Version: 4.5 Name: squashfs-tools -Release: 5.git1%{?dist} +Release: 1%{?dist} License: GPLv2+ -URL: %{forgeurl}/archive/4.4-git.1.tar.gz -Source: 4.4-git.1.tar.gz +URL: %{forgeurl}/archive/4.5.tar.gz +Source: 4.5.tar.gz # manpages from http://ftp.debian.org/debian/pool/main/s/squashfs-tools/squashfs-tools_4.2+20121212-1.debian.tar.xz # The man pages have been modified for 4.3 for Fedora. +# Man pages still need a lot of changes for 4.5 Source1: mksquashfs.1 Source2: unsquashfs.1 @@ -25,7 +26,7 @@ Squashfs is a highly compressed read-only filesystem for Linux. This package contains the utilities for manipulating squashfs filesystems. %prep -%setup -n %{name}-4.4-git.1 +%setup -n %{name}-4.5 %build %set_build_flags @@ -38,17 +39,25 @@ install -m 755 squashfs-tools/mksquashfs %{buildroot}%{_sbindir}/mksquashfs install -m 755 squashfs-tools/unsquashfs %{buildroot}%{_sbindir}/unsquashfs install -m 644 %{SOURCE1} %{buildroot}%{_mandir}/man1/mksquashfs.1 install -m 644 %{SOURCE2} %{buildroot}%{_mandir}/man1/unsquashfs.1 +ln -s mksquashfs %{buildroot}%{_sbindir}/sqfstar +ln -s unsquashfs %{buildroot}%{_sbindir}/sqfscat %files -%doc README ACKNOWLEDGEMENTS README-4.4 CHANGES COPYING USAGE +%doc README ACKNOWLEDGEMENTS README-4.5 CHANGES COPYING USAGE %doc README %{_mandir}/man1/* %{_sbindir}/mksquashfs %{_sbindir}/unsquashfs +%{_sbindir}/sqfstar +%{_sbindir}/sqfscat %changelog +* Fri Jul 23 2021 Bruno Wolff III - 4.5-1 +- First crack at 4.5 release +- Man pages still need significant work + * Wed Jan 27 2021 Fedora Release Engineering - 4.4-5.git1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From dae6dc6e91f34d83f60c0ee7b95e13efff1666ee Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Mon, 26 Jul 2021 07:23:53 -0500 Subject: [PATCH 18/68] Include upstream fix for bug 1985561 From a comment on the bug: This is a regression caused by rewriting the duplicate checking code to be more aggressive when looking for duplicates when using tail-end packing. In particular a file doesn't now have to be the same size to be considered a (partial) duplicate. --- fix-sparse.patch | 30 ++++++++++++++++++++++++++++++ squashfs-tools.spec | 10 +++++++++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 fix-sparse.patch diff --git a/fix-sparse.patch b/fix-sparse.patch new file mode 100644 index 0000000..b6e2128 --- /dev/null +++ b/fix-sparse.patch @@ -0,0 +1,30 @@ +diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c +index aaa4b002bd87..127df00fb789 100644 +--- a/squashfs-tools/mksquashfs.c ++++ b/squashfs-tools/mksquashfs.c +@@ -2190,10 +2190,23 @@ static struct file_info *duplicate(int *dupf, int *block_dup, long long file_siz + /* Yes, the block list matches. We can use this, rather + * than writing an identical block list. + * If both it and us doesn't have a tail-end fragment, then we're +- * finished. Return the duplicate */ ++ * finished. Return the duplicate. ++ * ++ * We have to deal with the special case where the ++ * last block is a sparse block. This means the ++ * file will have matched, but, it may be a different ++ * file length (because a tail-end sparse block may be ++ * anything from 1 byte to block_size - 1 in size, but ++ * stored as zero). We can still use the block list in ++ * this case, but, we must return a new entry with the ++ * correct file size */ + if(!frag_bytes && !dupl_ptr->fragment->size) { + *dupf = *block_dup = TRUE; +- return dupl_ptr; ++ if(file_size == dupl_ptr->file_size) ++ return dupl_ptr; ++ else ++ return create_non_dup(file_size, bytes, blocks, sparse, dupl_ptr->block_list, ++ dupl_ptr->start, dupl_ptr->fragment, checksum, 0, checksum_flag, FALSE); + } + + /* We've got a tail-end fragment, and this file most likely diff --git a/squashfs-tools.spec b/squashfs-tools.spec index 32f4c44..995c6ac 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -2,7 +2,7 @@ Summary: Utility for the creation of squashfs filesystems %global forgeurl https://github.com/plougher/squashfs-tools Version: 4.5 Name: squashfs-tools -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: %{forgeurl}/archive/4.5.tar.gz Source: 4.5.tar.gz @@ -11,6 +11,10 @@ Source: 4.5.tar.gz # Man pages still need a lot of changes for 4.5 Source1: mksquashfs.1 Source2: unsquashfs.1 +# Mksquashfs: fix duplicate check when last file block is sparse +# git diff 19b161c1cd3e31f7a396ea92dea4390ad43f27b9^ 19b161c1cd3e31f7a396ea92dea4390ad43f27b9 > fix-sparse.patch +# https://bugzilla.gnome.org/show_bug.cgi?id=1985561 +Patch0: fix-sparse.patch BuildRequires: make BuildRequires: gcc @@ -27,6 +31,7 @@ contains the utilities for manipulating squashfs filesystems. %prep %setup -n %{name}-4.5 +%patch0 -p1 %build %set_build_flags @@ -54,6 +59,9 @@ ln -s unsquashfs %{buildroot}%{_sbindir}/sqfscat %{_sbindir}/sqfscat %changelog +* Mon Jul 26 2021 Bruno Wolff III - 4.5-2 +- Fix for sparse fragment bug 1985561 + * Fri Jul 23 2021 Bruno Wolff III - 4.5-1 - First crack at 4.5 release - Man pages still need significant work From 8bc59796df524ed163cebfeb3e835bf891827832 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Mon, 13 Sep 2021 08:50:22 -0500 Subject: [PATCH 19/68] Prepare for rebase --- fix-sparse.patch | 30 ------------------------------ squashfs-tools.spec | 5 ----- 2 files changed, 35 deletions(-) delete mode 100644 fix-sparse.patch diff --git a/fix-sparse.patch b/fix-sparse.patch deleted file mode 100644 index b6e2128..0000000 --- a/fix-sparse.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c -index aaa4b002bd87..127df00fb789 100644 ---- a/squashfs-tools/mksquashfs.c -+++ b/squashfs-tools/mksquashfs.c -@@ -2190,10 +2190,23 @@ static struct file_info *duplicate(int *dupf, int *block_dup, long long file_siz - /* Yes, the block list matches. We can use this, rather - * than writing an identical block list. - * If both it and us doesn't have a tail-end fragment, then we're -- * finished. Return the duplicate */ -+ * finished. Return the duplicate. -+ * -+ * We have to deal with the special case where the -+ * last block is a sparse block. This means the -+ * file will have matched, but, it may be a different -+ * file length (because a tail-end sparse block may be -+ * anything from 1 byte to block_size - 1 in size, but -+ * stored as zero). We can still use the block list in -+ * this case, but, we must return a new entry with the -+ * correct file size */ - if(!frag_bytes && !dupl_ptr->fragment->size) { - *dupf = *block_dup = TRUE; -- return dupl_ptr; -+ if(file_size == dupl_ptr->file_size) -+ return dupl_ptr; -+ else -+ return create_non_dup(file_size, bytes, blocks, sparse, dupl_ptr->block_list, -+ dupl_ptr->start, dupl_ptr->fragment, checksum, 0, checksum_flag, FALSE); - } - - /* We've got a tail-end fragment, and this file most likely diff --git a/squashfs-tools.spec b/squashfs-tools.spec index 995c6ac..a2ad9f7 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -11,10 +11,6 @@ Source: 4.5.tar.gz # Man pages still need a lot of changes for 4.5 Source1: mksquashfs.1 Source2: unsquashfs.1 -# Mksquashfs: fix duplicate check when last file block is sparse -# git diff 19b161c1cd3e31f7a396ea92dea4390ad43f27b9^ 19b161c1cd3e31f7a396ea92dea4390ad43f27b9 > fix-sparse.patch -# https://bugzilla.gnome.org/show_bug.cgi?id=1985561 -Patch0: fix-sparse.patch BuildRequires: make BuildRequires: gcc @@ -31,7 +27,6 @@ contains the utilities for manipulating squashfs filesystems. %prep %setup -n %{name}-4.5 -%patch0 -p1 %build %set_build_flags From 4603989d5621a55e188ed5b7b3b5ded9c031c10f Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Mon, 13 Sep 2021 09:52:04 -0500 Subject: [PATCH 20/68] Get fix for write outside destination directory Another write outside destination directory issue was fixed post 4.5. While 4.5.1 should be out soon, I wanted to get this out since the release date isn't known yet. --- .gitignore | 1 + sources | 2 +- squashfs-tools.spec | 22 ++++++++++++++-------- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 29faa35..f6c2c70 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ squashfs-4.1.tar.bz2 /4.4-git.1.tar.gz /squashfs-tools-4.5.tar.gz /4.5.tar.gz +/squashfs-tools-e0485802ec72996c20026da320650d8362f555bd.tar.gz diff --git a/sources b/sources index 9f520b9..8b17b0e 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (4.5.tar.gz) = e00610487d24eed9e5dadcf84014a3d7faa9815d8ce00fd4660e6c8ce394dccf185ed9f387f4fa1313b9812fe770f802bdcbaef87887f2bcefacf234594a72e0 +SHA512 (squashfs-tools-e0485802ec72996c20026da320650d8362f555bd.tar.gz) = e72ccb09d6fd725f1ff4d87d9b81f783dbc3b614e45517f28a9978922467af765e8e04c5d0081a7ca76345bc606f365e39dd28b6a2e2a2dbe73a2c6998f5fd2b SHA512 (mksquashfs.1) = 4dc03bccf5842791abf6ca437ada03c331942a9a37fcacdbf136443db11a7f26121f6e8ba742aaffc9fda9a5e220b171c5223ee3ab0474dde6b300a63ee32f92 SHA512 (unsquashfs.1) = fbf7c96454584fb844572a43af8781688186e3854c0d0acb9dfd83c5d0e3b6f49b58fbd68407b66ff573f82d8d16ecd10a4c319e49e809428fe65068f0c48bf2 diff --git a/squashfs-tools.spec b/squashfs-tools.spec index a2ad9f7..c24d302 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -1,11 +1,14 @@ -Summary: Utility for the creation of squashfs filesystems -%global forgeurl https://github.com/plougher/squashfs-tools -Version: 4.5 Name: squashfs-tools -Release: 2%{?dist} +Version: 4.5 +Summary: Utility for the creation of squashfs filesystems +%global forgeurl https://github.com/plougher/%{name} +%global date 20210913 +%global commit e0485802ec72996c20026da320650d8362f555bd +%forgemeta -i +URL: %{forgeurl} +Source: %{forgesource} +Release: 3%{?dist} License: GPLv2+ -URL: %{forgeurl}/archive/4.5.tar.gz -Source: 4.5.tar.gz # manpages from http://ftp.debian.org/debian/pool/main/s/squashfs-tools/squashfs-tools_4.2+20121212-1.debian.tar.xz # The man pages have been modified for 4.3 for Fedora. # Man pages still need a lot of changes for 4.5 @@ -13,7 +16,7 @@ Source1: mksquashfs.1 Source2: unsquashfs.1 BuildRequires: make -BuildRequires: gcc +BuildRequires: gcc BuildRequires: zlib-devel BuildRequires: xz-devel BuildRequires: lzo-devel @@ -26,7 +29,7 @@ Squashfs is a highly compressed read-only filesystem for Linux. This package contains the utilities for manipulating squashfs filesystems. %prep -%setup -n %{name}-4.5 +%forgesetup %build %set_build_flags @@ -54,6 +57,9 @@ ln -s unsquashfs %{buildroot}%{_sbindir}/sqfscat %{_sbindir}/sqfscat %changelog +* Mon Sep 13 2021 Bruno Wolff III - 4.5-3.20210913gite048580 +- Fix bug 2003701 (additional write outside destination directory exploit) + * Mon Jul 26 2021 Bruno Wolff III - 4.5-2 - Fix for sparse fragment bug 1985561 From 3bda04b33eaf58153b9658b86978f47d10672267 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 28 Dec 2021 09:09:49 -0600 Subject: [PATCH 21/68] Pick up a few upstream fixes. These are pretty minor and I wasn't planning on building anywhere but rawhide for the time being. I think there is a good chance of additional minor updates within a month or two. In particular, it would make sense to tag a minor release. But I'd like to get a little wider testing of the changes so far, because we found some issues right after the last tagged release, because we didn't do enough testing. --- .gitignore | 1 + sources | 2 +- squashfs-tools.spec | 11 +++++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index f6c2c70..459c057 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ squashfs-4.1.tar.bz2 /squashfs-tools-4.5.tar.gz /4.5.tar.gz /squashfs-tools-e0485802ec72996c20026da320650d8362f555bd.tar.gz +/squashfs-tools-5ae7238a0ae6fc420f55227d052ce9b1c66a9d0f.tar.gz diff --git a/sources b/sources index 8b17b0e..66f339e 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (squashfs-tools-e0485802ec72996c20026da320650d8362f555bd.tar.gz) = e72ccb09d6fd725f1ff4d87d9b81f783dbc3b614e45517f28a9978922467af765e8e04c5d0081a7ca76345bc606f365e39dd28b6a2e2a2dbe73a2c6998f5fd2b +SHA512 (squashfs-tools-5ae7238a0ae6fc420f55227d052ce9b1c66a9d0f.tar.gz) = e4620d5d0fb4876cfe1cc3af9d37dbe9cf49eddac96362ec232bb44d5d26d87af7d057420509659eedf7bf4b9261791a39e1945bcc17658f4afb10bbf23227c6 SHA512 (mksquashfs.1) = 4dc03bccf5842791abf6ca437ada03c331942a9a37fcacdbf136443db11a7f26121f6e8ba742aaffc9fda9a5e220b171c5223ee3ab0474dde6b300a63ee32f92 SHA512 (unsquashfs.1) = fbf7c96454584fb844572a43af8781688186e3854c0d0acb9dfd83c5d0e3b6f49b58fbd68407b66ff573f82d8d16ecd10a4c319e49e809428fe65068f0c48bf2 diff --git a/squashfs-tools.spec b/squashfs-tools.spec index c24d302..d7f2aba 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -2,12 +2,12 @@ Name: squashfs-tools Version: 4.5 Summary: Utility for the creation of squashfs filesystems %global forgeurl https://github.com/plougher/%{name} -%global date 20210913 -%global commit e0485802ec72996c20026da320650d8362f555bd -%forgemeta -i +%global date 20211227 +%global commit 5ae7238a0ae6fc420f55227d052ce9b1c66a9d0f +%forgemeta -i -v URL: %{forgeurl} Source: %{forgesource} -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ # manpages from http://ftp.debian.org/debian/pool/main/s/squashfs-tools/squashfs-tools_4.2+20121212-1.debian.tar.xz # The man pages have been modified for 4.3 for Fedora. @@ -57,6 +57,9 @@ ln -s unsquashfs %{buildroot}%{_sbindir}/sqfscat %{_sbindir}/sqfscat %changelog +* Mon Dec 27 2021 Bruno Wolff III - 4.5-4.20211227git5ae7238 +- Get fixes for a few minor bugs + * Mon Sep 13 2021 Bruno Wolff III - 4.5-3.20210913gite048580 - Fix bug 2003701 (additional write outside destination directory exploit) From 5ba26eb7bdd768b22a17f70f72afd7440a6c5a46 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 01:33:06 +0000 Subject: [PATCH 22/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_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 d7f2aba..712b6ea 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: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ # manpages from http://ftp.debian.org/debian/pool/main/s/squashfs-tools/squashfs-tools_4.2+20121212-1.debian.tar.xz # The man pages have been modified for 4.3 for Fedora. @@ -57,6 +57,9 @@ ln -s unsquashfs %{buildroot}%{_sbindir}/sqfscat %{_sbindir}/sqfscat %changelog +* Sat Jan 22 2022 Fedora Release Engineering - Packaging variables read or set by %forgemeta +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Mon Dec 27 2021 Bruno Wolff III - 4.5-4.20211227git5ae7238 - Get fixes for a few minor bugs From 7514e2801d7dc10cba2624aed45dc1ab0ccb958f Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Fri, 28 Jan 2022 01:55:07 -0600 Subject: [PATCH 23/68] Get some wider testing before a new squashfs-tools point release Phillip is going to issue a new point release soon. Adding man pages is the main thing to still be done. There are a few changes since our last bug fix update. I want to get a little wider testing of the changes before Phillip tags the new release. I'd rather not find something just after the releae like what happened with 4.5. I'm not going to push this to released versions of Fedora. Once the new point release is out, I expect to eventually push that to released versions of Fedora. --- .gitignore | 1 + sources | 2 +- squashfs-tools.spec | 10 +++++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 459c057..60c41ea 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ squashfs-4.1.tar.bz2 /4.5.tar.gz /squashfs-tools-e0485802ec72996c20026da320650d8362f555bd.tar.gz /squashfs-tools-5ae7238a0ae6fc420f55227d052ce9b1c66a9d0f.tar.gz +/squashfs-tools-d5a583e4edce3df9f0c3bca84bff4f1d5ad3d09c.tar.gz diff --git a/sources b/sources index 66f339e..8fc53f1 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (squashfs-tools-5ae7238a0ae6fc420f55227d052ce9b1c66a9d0f.tar.gz) = e4620d5d0fb4876cfe1cc3af9d37dbe9cf49eddac96362ec232bb44d5d26d87af7d057420509659eedf7bf4b9261791a39e1945bcc17658f4afb10bbf23227c6 +SHA512 (squashfs-tools-d5a583e4edce3df9f0c3bca84bff4f1d5ad3d09c.tar.gz) = b88998de6cefd004612977d79061647c3144bec0983d5f8eb01aef0537806625afd5bf9188c5092a4f748b8ae4b75755af3349026b220eda6d666b8221d66aec SHA512 (mksquashfs.1) = 4dc03bccf5842791abf6ca437ada03c331942a9a37fcacdbf136443db11a7f26121f6e8ba742aaffc9fda9a5e220b171c5223ee3ab0474dde6b300a63ee32f92 SHA512 (unsquashfs.1) = fbf7c96454584fb844572a43af8781688186e3854c0d0acb9dfd83c5d0e3b6f49b58fbd68407b66ff573f82d8d16ecd10a4c319e49e809428fe65068f0c48bf2 diff --git a/squashfs-tools.spec b/squashfs-tools.spec index 712b6ea..687b24e 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -2,9 +2,9 @@ Name: squashfs-tools Version: 4.5 Summary: Utility for the creation of squashfs filesystems %global forgeurl https://github.com/plougher/%{name} -%global date 20211227 -%global commit 5ae7238a0ae6fc420f55227d052ce9b1c66a9d0f -%forgemeta -i -v +%global date 20220128 +%global commit d5a583e4edce3df9f0c3bca84bff4f1d5ad3d09c +%forgemeta URL: %{forgeurl} Source: %{forgesource} Release: 5%{?dist} @@ -12,6 +12,7 @@ License: GPLv2+ # manpages from http://ftp.debian.org/debian/pool/main/s/squashfs-tools/squashfs-tools_4.2+20121212-1.debian.tar.xz # The man pages have been modified for 4.3 for Fedora. # Man pages still need a lot of changes for 4.5 +# Phillip is working on providing man pages very soon. Which will replace these. Source1: mksquashfs.1 Source2: unsquashfs.1 @@ -57,6 +58,9 @@ ln -s unsquashfs %{buildroot}%{_sbindir}/sqfscat %{_sbindir}/sqfscat %changelog +* Fri Jan 28 2022 Bruno Wolff III - 4.5-4.20220128gitd5a583e +- Test a few changes before upstream tags a new point release + * Sat Jan 22 2022 Fedora Release Engineering - Packaging variables read or set by %forgemeta - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From fce3fe9586c2888dc8c86ecc0c4734849aa840c1 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Wed, 2 Feb 2022 02:38:48 -0600 Subject: [PATCH 24/68] Testing before new release gets tagged There are a few more commits updating help messages. This is still just for rawhide. --- .gitignore | 1 + sources | 2 +- squashfs-tools.spec | 16 ++++++++++------ 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 60c41ea..d464637 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ squashfs-4.1.tar.bz2 /squashfs-tools-e0485802ec72996c20026da320650d8362f555bd.tar.gz /squashfs-tools-5ae7238a0ae6fc420f55227d052ce9b1c66a9d0f.tar.gz /squashfs-tools-d5a583e4edce3df9f0c3bca84bff4f1d5ad3d09c.tar.gz +/squashfs-tools-11c9591260599b7874841db6f69ae570708a4077.tar.gz diff --git a/sources b/sources index 8fc53f1..c75e841 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (squashfs-tools-d5a583e4edce3df9f0c3bca84bff4f1d5ad3d09c.tar.gz) = b88998de6cefd004612977d79061647c3144bec0983d5f8eb01aef0537806625afd5bf9188c5092a4f748b8ae4b75755af3349026b220eda6d666b8221d66aec +SHA512 (squashfs-tools-11c9591260599b7874841db6f69ae570708a4077.tar.gz) = ffad623926c30b84d0f175b03752783a01e786926dd13be85a53cf993450e1151626e720daf4dcd764ddad177f075d5e3e229e393eaa8be3f21bd4084d27512b SHA512 (mksquashfs.1) = 4dc03bccf5842791abf6ca437ada03c331942a9a37fcacdbf136443db11a7f26121f6e8ba742aaffc9fda9a5e220b171c5223ee3ab0474dde6b300a63ee32f92 SHA512 (unsquashfs.1) = fbf7c96454584fb844572a43af8781688186e3854c0d0acb9dfd83c5d0e3b6f49b58fbd68407b66ff573f82d8d16ecd10a4c319e49e809428fe65068f0c48bf2 diff --git a/squashfs-tools.spec b/squashfs-tools.spec index 687b24e..e8fb3ab 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -2,12 +2,12 @@ Name: squashfs-tools Version: 4.5 Summary: Utility for the creation of squashfs filesystems %global forgeurl https://github.com/plougher/%{name} -%global date 20220128 -%global commit d5a583e4edce3df9f0c3bca84bff4f1d5ad3d09c -%forgemeta +%global date 20220202 +%global commit 11c9591260599b7874841db6f69ae570708a4077 +%forgemeta -i -v URL: %{forgeurl} Source: %{forgesource} -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ # manpages from http://ftp.debian.org/debian/pool/main/s/squashfs-tools/squashfs-tools_4.2+20121212-1.debian.tar.xz # The man pages have been modified for 4.3 for Fedora. @@ -30,7 +30,7 @@ Squashfs is a highly compressed read-only filesystem for Linux. This package contains the utilities for manipulating squashfs filesystems. %prep -%forgesetup +%forgesetup %build %set_build_flags @@ -58,7 +58,11 @@ ln -s unsquashfs %{buildroot}%{_sbindir}/sqfscat %{_sbindir}/sqfscat %changelog -* Fri Jan 28 2022 Bruno Wolff III - 4.5-4.20220128gitd5a583e +* Wed Feb 02 2022 Bruno Wolff III - 4.5-6.20220202git11c9591 +- Continue testing upstream pages +- This includes help text changes + +* Fri Jan 28 2022 Bruno Wolff III - 4.5-5.20220128gitd5a583e - Test a few changes before upstream tags a new point release * Sat Jan 22 2022 Fedora Release Engineering - Packaging variables read or set by %forgemeta From 8c554f53c478875d87c17f526a761c98f52db800 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Fri, 4 Feb 2022 01:28:10 -0600 Subject: [PATCH 25/68] More testing of squashfs-tools before the imminent release Phillip has one of the man pages ready. --- .gitignore | 1 + sources | 3 +-- squashfs-tools.spec | 23 +++++++++++++---------- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index d464637..14059f9 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ squashfs-4.1.tar.bz2 /squashfs-tools-5ae7238a0ae6fc420f55227d052ce9b1c66a9d0f.tar.gz /squashfs-tools-d5a583e4edce3df9f0c3bca84bff4f1d5ad3d09c.tar.gz /squashfs-tools-11c9591260599b7874841db6f69ae570708a4077.tar.gz +/squashfs-tools-8a9d02e0027c69e6f47d8c2ed995d8c755c9581b.tar.gz diff --git a/sources b/sources index c75e841..305605c 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ -SHA512 (squashfs-tools-11c9591260599b7874841db6f69ae570708a4077.tar.gz) = ffad623926c30b84d0f175b03752783a01e786926dd13be85a53cf993450e1151626e720daf4dcd764ddad177f075d5e3e229e393eaa8be3f21bd4084d27512b -SHA512 (mksquashfs.1) = 4dc03bccf5842791abf6ca437ada03c331942a9a37fcacdbf136443db11a7f26121f6e8ba742aaffc9fda9a5e220b171c5223ee3ab0474dde6b300a63ee32f92 +SHA512 (squashfs-tools-8a9d02e0027c69e6f47d8c2ed995d8c755c9581b.tar.gz) = cd27550dab667de1bc629eed90434d8a0e67ee904d1a21ee5308ddadeddf1e8342d29f3434648564c64418e69430884797dbfcc57210b129cb8b3be9bb1a1d57 SHA512 (unsquashfs.1) = fbf7c96454584fb844572a43af8781688186e3854c0d0acb9dfd83c5d0e3b6f49b58fbd68407b66ff573f82d8d16ecd10a4c319e49e809428fe65068f0c48bf2 diff --git a/squashfs-tools.spec b/squashfs-tools.spec index e8fb3ab..6108de1 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -2,18 +2,16 @@ Name: squashfs-tools Version: 4.5 Summary: Utility for the creation of squashfs filesystems %global forgeurl https://github.com/plougher/%{name} -%global date 20220202 -%global commit 11c9591260599b7874841db6f69ae570708a4077 -%forgemeta -i -v +%global date 20220204 +%global commit 8a9d02e0027c69e6f47d8c2ed995d8c755c9581b +%forgemeta URL: %{forgeurl} Source: %{forgesource} -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ # manpages from http://ftp.debian.org/debian/pool/main/s/squashfs-tools/squashfs-tools_4.2+20121212-1.debian.tar.xz -# The man pages have been modified for 4.3 for Fedora. -# Man pages still need a lot of changes for 4.5 # Phillip is working on providing man pages very soon. Which will replace these. -Source1: mksquashfs.1 +# So far he has one for mksquashfs. Source2: unsquashfs.1 BuildRequires: make @@ -41,7 +39,7 @@ CFLAGS="%{optflags}" XZ_SUPPORT=1 LZO_SUPPORT=1 LZMA_XZ_SUPPORT=1 LZ4_SUPPORT=1 mkdir -p %{buildroot}%{_sbindir} %{buildroot}%{_mandir}/man1 install -m 755 squashfs-tools/mksquashfs %{buildroot}%{_sbindir}/mksquashfs install -m 755 squashfs-tools/unsquashfs %{buildroot}%{_sbindir}/unsquashfs -install -m 644 %{SOURCE1} %{buildroot}%{_mandir}/man1/mksquashfs.1 +install -m 644 manpages/mksquashfs.1 %{buildroot}%{_mandir}/man1/mksquashfs.1 install -m 644 %{SOURCE2} %{buildroot}%{_mandir}/man1/unsquashfs.1 ln -s mksquashfs %{buildroot}%{_sbindir}/sqfstar ln -s unsquashfs %{buildroot}%{_sbindir}/sqfscat @@ -50,7 +48,8 @@ ln -s unsquashfs %{buildroot}%{_sbindir}/sqfscat %doc README ACKNOWLEDGEMENTS README-4.5 CHANGES COPYING USAGE %doc README -%{_mandir}/man1/* +%{_mandir}/man1/mksquashfs.1.gz +%{_mandir}/man1/unsquashfs.1.gz %{_sbindir}/mksquashfs %{_sbindir}/unsquashfs @@ -58,8 +57,12 @@ ln -s unsquashfs %{buildroot}%{_sbindir}/sqfscat %{_sbindir}/sqfscat %changelog +* Fri Feb 04 2022 Bruno Wolff III - 4.5-7.20220204git8a9d02e +- Continue testing upstream patches +- A makefile for mksquashfs is now included + * Wed Feb 02 2022 Bruno Wolff III - 4.5-6.20220202git11c9591 -- Continue testing upstream pages +- Continue testing upstream patches - This includes help text changes * Fri Jan 28 2022 Bruno Wolff III - 4.5-5.20220128gitd5a583e From ec28c2bb7212b623d503444ef975902b9c544180 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Mon, 7 Feb 2022 05:04:24 -0600 Subject: [PATCH 26/68] Switch to building man pages from help output For now only mksquashfs.1 is built, as the work isn't complete. I've provided some feedback already on this feature. --- .gitignore | 2 ++ sources | 2 +- squashfs-tools.spec | 19 ++++++++++--------- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 14059f9..d4e9682 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,5 @@ squashfs-4.1.tar.bz2 /squashfs-tools-d5a583e4edce3df9f0c3bca84bff4f1d5ad3d09c.tar.gz /squashfs-tools-11c9591260599b7874841db6f69ae570708a4077.tar.gz /squashfs-tools-8a9d02e0027c69e6f47d8c2ed995d8c755c9581b.tar.gz +/squashfs-tools-d61eb68d75b32977b6c5a8b2d2fe57cbef0d6b4a.tar.gz +/squashfs-tools-7f9203e31bae003d12c0fc81a4b32097d17b5618.tar.gz diff --git a/sources b/sources index 305605c..c13d613 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (squashfs-tools-8a9d02e0027c69e6f47d8c2ed995d8c755c9581b.tar.gz) = cd27550dab667de1bc629eed90434d8a0e67ee904d1a21ee5308ddadeddf1e8342d29f3434648564c64418e69430884797dbfcc57210b129cb8b3be9bb1a1d57 +SHA512 (squashfs-tools-7f9203e31bae003d12c0fc81a4b32097d17b5618.tar.gz) = bcf9215d218c2d15a3b2b6b50c6771917694ae8877f767d93af0af342f13ab935db097dff2fa7ff151c6aff71e9be01dcbb1636443ef64b29b7d872a2668e629 SHA512 (unsquashfs.1) = fbf7c96454584fb844572a43af8781688186e3854c0d0acb9dfd83c5d0e3b6f49b58fbd68407b66ff573f82d8d16ecd10a4c319e49e809428fe65068f0c48bf2 diff --git a/squashfs-tools.spec b/squashfs-tools.spec index 6108de1..f17e3c9 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -2,12 +2,12 @@ Name: squashfs-tools Version: 4.5 Summary: Utility for the creation of squashfs filesystems %global forgeurl https://github.com/plougher/%{name} -%global date 20220204 -%global commit 8a9d02e0027c69e6f47d8c2ed995d8c755c9581b +%global date 20220207 +%global commit 7f9203e31bae003d12c0fc81a4b32097d17b5618 %forgemeta URL: %{forgeurl} Source: %{forgesource} -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ # manpages from http://ftp.debian.org/debian/pool/main/s/squashfs-tools/squashfs-tools_4.2+20121212-1.debian.tar.xz # Phillip is working on providing man pages very soon. Which will replace these. @@ -22,6 +22,7 @@ BuildRequires: lzo-devel BuildRequires: libattr-devel BuildRequires: lz4-devel BuildRequires: libzstd-devel +BuildRequires: help2man %description Squashfs is a highly compressed read-only filesystem for Linux. This package @@ -36,13 +37,9 @@ pushd squashfs-tools CFLAGS="%{optflags}" XZ_SUPPORT=1 LZO_SUPPORT=1 LZMA_XZ_SUPPORT=1 LZ4_SUPPORT=1 ZSTD_SUPPORT=1 make %{?_smp_mflags} %install -mkdir -p %{buildroot}%{_sbindir} %{buildroot}%{_mandir}/man1 -install -m 755 squashfs-tools/mksquashfs %{buildroot}%{_sbindir}/mksquashfs -install -m 755 squashfs-tools/unsquashfs %{buildroot}%{_sbindir}/unsquashfs -install -m 644 manpages/mksquashfs.1 %{buildroot}%{_mandir}/man1/mksquashfs.1 +pushd squashfs-tools +make INSTALL_PREFIX=%{buildroot}/usr INSTALL_DIR=%{buildroot}%{_sbindir} INSTALL_MANPAGES_DIR=%{buildroot}%{_mandir}/man1 install install -m 644 %{SOURCE2} %{buildroot}%{_mandir}/man1/unsquashfs.1 -ln -s mksquashfs %{buildroot}%{_sbindir}/sqfstar -ln -s unsquashfs %{buildroot}%{_sbindir}/sqfscat %files %doc README ACKNOWLEDGEMENTS README-4.5 CHANGES COPYING USAGE @@ -57,6 +54,10 @@ ln -s unsquashfs %{buildroot}%{_sbindir}/sqfscat %{_sbindir}/sqfscat %changelog +* Mon Feb 07 2022 Bruno Wolff III - 4.5-8.20220207git7f9203e +- Continue testing upstream patches +- Man pages are now built during the build process + * Fri Feb 04 2022 Bruno Wolff III - 4.5-7.20220204git8a9d02e - Continue testing upstream patches - A makefile for mksquashfs is now included From 3a815169701359b9ab9961f1bd27e8af2abd0f7c Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Mon, 7 Feb 2022 18:50:31 -0600 Subject: [PATCH 27/68] Get lmza man pages improvements There is now better documentation in the man page and help for the deprecated lzma support when it is built with that enabled. There is still a bit more stuff expected before the 4.5.1 release. I don't expect updates to be pushed back to released versions of Fedora until that release occurs or something unexpected happens. The point of getting these updates into rawhide is to make it less likely that a regression gets into the 4.5.1 release. --- .gitignore | 1 + sources | 2 +- squashfs-tools.spec | 8 ++++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d4e9682..9abb22e 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ squashfs-4.1.tar.bz2 /squashfs-tools-8a9d02e0027c69e6f47d8c2ed995d8c755c9581b.tar.gz /squashfs-tools-d61eb68d75b32977b6c5a8b2d2fe57cbef0d6b4a.tar.gz /squashfs-tools-7f9203e31bae003d12c0fc81a4b32097d17b5618.tar.gz +/squashfs-tools-bd186a77fe670d635e65b021b3d05fc6e67f8d07.tar.gz diff --git a/sources b/sources index c13d613..aa14722 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (squashfs-tools-7f9203e31bae003d12c0fc81a4b32097d17b5618.tar.gz) = bcf9215d218c2d15a3b2b6b50c6771917694ae8877f767d93af0af342f13ab935db097dff2fa7ff151c6aff71e9be01dcbb1636443ef64b29b7d872a2668e629 +SHA512 (squashfs-tools-bd186a77fe670d635e65b021b3d05fc6e67f8d07.tar.gz) = 08b1f4261bece99e4b76333552f451216b43b5e9bcd2ca99ff5f5cd4f1a4571ef4bad37de0fbff3867d2a36d3e69b32d4631aa3f05043c04f0ab2478210b6940 SHA512 (unsquashfs.1) = fbf7c96454584fb844572a43af8781688186e3854c0d0acb9dfd83c5d0e3b6f49b58fbd68407b66ff573f82d8d16ecd10a4c319e49e809428fe65068f0c48bf2 diff --git a/squashfs-tools.spec b/squashfs-tools.spec index f17e3c9..8862f6b 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -3,11 +3,11 @@ Version: 4.5 Summary: Utility for the creation of squashfs filesystems %global forgeurl https://github.com/plougher/%{name} %global date 20220207 -%global commit 7f9203e31bae003d12c0fc81a4b32097d17b5618 +%global commit bd186a77fe670d635e65b021b3d05fc6e67f8d07 %forgemeta URL: %{forgeurl} Source: %{forgesource} -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2+ # manpages from http://ftp.debian.org/debian/pool/main/s/squashfs-tools/squashfs-tools_4.2+20121212-1.debian.tar.xz # Phillip is working on providing man pages very soon. Which will replace these. @@ -54,6 +54,10 @@ install -m 644 %{SOURCE2} %{buildroot}%{_mandir}/man1/unsquashfs.1 %{_sbindir}/sqfscat %changelog +* Mon Feb 07 2022 Bruno Wolff III - 4.5-9.20220207gitbd186a7 +- Continue testing upstream patches +- The deprecated lzma support options are improved in the man page + * Mon Feb 07 2022 Bruno Wolff III - 4.5-8.20220207git7f9203e - Continue testing upstream patches - Man pages are now built during the build process From e9b6e8c165dbcb3d2433641c29ff252a52806e8f Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 8 Feb 2022 17:26:07 -0600 Subject: [PATCH 28/68] Man page for unsquashfs has been added --- .gitignore | 1 + sources | 3 +-- squashfs-tools.spec | 15 +++++++-------- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 9abb22e..9963211 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ squashfs-4.1.tar.bz2 /squashfs-tools-d61eb68d75b32977b6c5a8b2d2fe57cbef0d6b4a.tar.gz /squashfs-tools-7f9203e31bae003d12c0fc81a4b32097d17b5618.tar.gz /squashfs-tools-bd186a77fe670d635e65b021b3d05fc6e67f8d07.tar.gz +/squashfs-tools-9e46a75985f0b236797976e387e8bce717e7a2d5.tar.gz diff --git a/sources b/sources index aa14722..e48c796 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (squashfs-tools-bd186a77fe670d635e65b021b3d05fc6e67f8d07.tar.gz) = 08b1f4261bece99e4b76333552f451216b43b5e9bcd2ca99ff5f5cd4f1a4571ef4bad37de0fbff3867d2a36d3e69b32d4631aa3f05043c04f0ab2478210b6940 -SHA512 (unsquashfs.1) = fbf7c96454584fb844572a43af8781688186e3854c0d0acb9dfd83c5d0e3b6f49b58fbd68407b66ff573f82d8d16ecd10a4c319e49e809428fe65068f0c48bf2 +SHA512 (squashfs-tools-9e46a75985f0b236797976e387e8bce717e7a2d5.tar.gz) = af669261411c76ed4843a35de33152700c244b66ce4c95edefadf597b2ee0b0be1826f34defad5a29b5372bd80a7f5a8da0aa70b33e654210ad9c997fc578b49 diff --git a/squashfs-tools.spec b/squashfs-tools.spec index 8862f6b..ce48ca4 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -2,17 +2,13 @@ Name: squashfs-tools Version: 4.5 Summary: Utility for the creation of squashfs filesystems %global forgeurl https://github.com/plougher/%{name} -%global date 20220207 -%global commit bd186a77fe670d635e65b021b3d05fc6e67f8d07 +%global date 20220208 +%global commit 9e46a75985f0b236797976e387e8bce717e7a2d5 %forgemeta URL: %{forgeurl} Source: %{forgesource} -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2+ -# manpages from http://ftp.debian.org/debian/pool/main/s/squashfs-tools/squashfs-tools_4.2+20121212-1.debian.tar.xz -# Phillip is working on providing man pages very soon. Which will replace these. -# So far he has one for mksquashfs. -Source2: unsquashfs.1 BuildRequires: make BuildRequires: gcc @@ -39,7 +35,6 @@ CFLAGS="%{optflags}" XZ_SUPPORT=1 LZO_SUPPORT=1 LZMA_XZ_SUPPORT=1 LZ4_SUPPORT=1 %install pushd squashfs-tools make INSTALL_PREFIX=%{buildroot}/usr INSTALL_DIR=%{buildroot}%{_sbindir} INSTALL_MANPAGES_DIR=%{buildroot}%{_mandir}/man1 install -install -m 644 %{SOURCE2} %{buildroot}%{_mandir}/man1/unsquashfs.1 %files %doc README ACKNOWLEDGEMENTS README-4.5 CHANGES COPYING USAGE @@ -54,6 +49,10 @@ install -m 644 %{SOURCE2} %{buildroot}%{_mandir}/man1/unsquashfs.1 %{_sbindir}/sqfscat %changelog +* Tue Feb 08 2022 Bruno Wolff III - 4.5-10.20220207git9e46a75 +- Continue testing upstream patches prior to 4.5.1 release. +- Upstream man page for unsquashfs replaces out of date one froom Debian. + * Mon Feb 07 2022 Bruno Wolff III - 4.5-9.20220207gitbd186a7 - Continue testing upstream patches - The deprecated lzma support options are improved in the man page From 7268db5b5afaa84a500729cb7eb654ec6933163d Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Wed, 9 Feb 2022 00:17:49 -0600 Subject: [PATCH 29/68] Add a man page for sqfstar --- .gitignore | 1 + sources | 2 +- squashfs-tools.spec | 11 ++++++++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 9963211..837e8e8 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ squashfs-4.1.tar.bz2 /squashfs-tools-7f9203e31bae003d12c0fc81a4b32097d17b5618.tar.gz /squashfs-tools-bd186a77fe670d635e65b021b3d05fc6e67f8d07.tar.gz /squashfs-tools-9e46a75985f0b236797976e387e8bce717e7a2d5.tar.gz +/squashfs-tools-0425d3d2d87a7775864bc6d04a4c8c45b93fa9b2.tar.gz diff --git a/sources b/sources index e48c796..3719186 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (squashfs-tools-9e46a75985f0b236797976e387e8bce717e7a2d5.tar.gz) = af669261411c76ed4843a35de33152700c244b66ce4c95edefadf597b2ee0b0be1826f34defad5a29b5372bd80a7f5a8da0aa70b33e654210ad9c997fc578b49 +SHA512 (squashfs-tools-0425d3d2d87a7775864bc6d04a4c8c45b93fa9b2.tar.gz) = 27d9ca0028eb82c5580673a45d1cb2908968804050548f34f488bcae570863599a3d891d69edbb3f3b06964a87b780348bce14b586868b36f4b2929c5b12eece diff --git a/squashfs-tools.spec b/squashfs-tools.spec index ce48ca4..db67e0c 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -2,12 +2,12 @@ Name: squashfs-tools Version: 4.5 Summary: Utility for the creation of squashfs filesystems %global forgeurl https://github.com/plougher/%{name} -%global date 20220208 -%global commit 9e46a75985f0b236797976e387e8bce717e7a2d5 +%global date 20220209 +%global commit 0425d3d2d87a7775864bc6d04a4c8c45b93fa9b2 %forgemeta URL: %{forgeurl} Source: %{forgesource} -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2+ BuildRequires: make @@ -42,6 +42,7 @@ make INSTALL_PREFIX=%{buildroot}/usr INSTALL_DIR=%{buildroot}%{_sbindir} INSTALL %doc README %{_mandir}/man1/mksquashfs.1.gz %{_mandir}/man1/unsquashfs.1.gz +%{_mandir}/man1/sqfstar.1.gz %{_sbindir}/mksquashfs %{_sbindir}/unsquashfs @@ -49,6 +50,10 @@ make INSTALL_PREFIX=%{buildroot}/usr INSTALL_DIR=%{buildroot}%{_sbindir} INSTALL %{_sbindir}/sqfscat %changelog +* Tue Wed 09 2022 Bruno Wolff III - 4.5-11.20220207git0425d3d +- Continue testing upstream patches prior to 4.5.1 release. +- Add man page for sqfstar. + * Tue Feb 08 2022 Bruno Wolff III - 4.5-10.20220207git9e46a75 - Continue testing upstream patches prior to 4.5.1 release. - Upstream man page for unsquashfs replaces out of date one froom Debian. From 70b924385074a73f6e5379f9ab1b56a1a4e06c62 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Thu, 10 Feb 2022 02:00:25 -0600 Subject: [PATCH 30/68] Add a man page for sqfscat --- .gitignore | 1 + sources | 2 +- squashfs-tools.spec | 15 ++++++++++----- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 837e8e8..dee14fe 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ squashfs-4.1.tar.bz2 /squashfs-tools-bd186a77fe670d635e65b021b3d05fc6e67f8d07.tar.gz /squashfs-tools-9e46a75985f0b236797976e387e8bce717e7a2d5.tar.gz /squashfs-tools-0425d3d2d87a7775864bc6d04a4c8c45b93fa9b2.tar.gz +/squashfs-tools-e7e96fe6ecd5c01aada20908188d9d0096ad0bd8.tar.gz diff --git a/sources b/sources index 3719186..fc8464b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (squashfs-tools-0425d3d2d87a7775864bc6d04a4c8c45b93fa9b2.tar.gz) = 27d9ca0028eb82c5580673a45d1cb2908968804050548f34f488bcae570863599a3d891d69edbb3f3b06964a87b780348bce14b586868b36f4b2929c5b12eece +SHA512 (squashfs-tools-e7e96fe6ecd5c01aada20908188d9d0096ad0bd8.tar.gz) = 0c612bb7be469874ac04622cd6626089928ac08edd7c6a771abe9ae59c5f4b0a3711c85e5d33b9f219754f05eb1b41e43871f5e3a8f47310ccdbbdeebee01826 diff --git a/squashfs-tools.spec b/squashfs-tools.spec index db67e0c..a97b4e4 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -2,12 +2,12 @@ Name: squashfs-tools Version: 4.5 Summary: Utility for the creation of squashfs filesystems %global forgeurl https://github.com/plougher/%{name} -%global date 20220209 -%global commit 0425d3d2d87a7775864bc6d04a4c8c45b93fa9b2 +%global date 20220210 +%global commit e7e96fe6ecd5c01aada20908188d9d0096ad0bd8 %forgemeta URL: %{forgeurl} Source: %{forgesource} -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv2+ BuildRequires: make @@ -43,6 +43,7 @@ make INSTALL_PREFIX=%{buildroot}/usr INSTALL_DIR=%{buildroot}%{_sbindir} INSTALL %{_mandir}/man1/mksquashfs.1.gz %{_mandir}/man1/unsquashfs.1.gz %{_mandir}/man1/sqfstar.1.gz +%{_mandir}/man1/sqfscat.1.gz %{_sbindir}/mksquashfs %{_sbindir}/unsquashfs @@ -50,11 +51,15 @@ make INSTALL_PREFIX=%{buildroot}/usr INSTALL_DIR=%{buildroot}%{_sbindir} INSTALL %{_sbindir}/sqfscat %changelog -* Tue Wed 09 2022 Bruno Wolff III - 4.5-11.20220207git0425d3d +* Thu Feb 10 2022 Bruno Wolff III - 4.5-12.20220210gite7e96fe +- Continue testing upstream patches prior to 4.5.1 release. +- Add man page for sqfscat. + +* Wed Feb 09 2022 Bruno Wolff III - 4.5-11.20220209git0425d3d - Continue testing upstream patches prior to 4.5.1 release. - Add man page for sqfstar. -* Tue Feb 08 2022 Bruno Wolff III - 4.5-10.20220207git9e46a75 +* Tue Feb 08 2022 Bruno Wolff III - 4.5-10.20220208git9e46a75 - Continue testing upstream patches prior to 4.5.1 release. - Upstream man page for unsquashfs replaces out of date one froom Debian. From a9c890485bda3b5be961980c22e36edeb6028b35 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Thu, 10 Feb 2022 17:11:07 -0600 Subject: [PATCH 31/68] Add some fixes for gcc warnings --- .gitignore | 1 + sources | 2 +- squashfs-tools.spec | 10 +++++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index dee14fe..863c100 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ squashfs-4.1.tar.bz2 /squashfs-tools-9e46a75985f0b236797976e387e8bce717e7a2d5.tar.gz /squashfs-tools-0425d3d2d87a7775864bc6d04a4c8c45b93fa9b2.tar.gz /squashfs-tools-e7e96fe6ecd5c01aada20908188d9d0096ad0bd8.tar.gz +/squashfs-tools-a8f61e2a38992d4cd967303a61277123fcd66681.tar.gz diff --git a/sources b/sources index fc8464b..03f4587 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (squashfs-tools-e7e96fe6ecd5c01aada20908188d9d0096ad0bd8.tar.gz) = 0c612bb7be469874ac04622cd6626089928ac08edd7c6a771abe9ae59c5f4b0a3711c85e5d33b9f219754f05eb1b41e43871f5e3a8f47310ccdbbdeebee01826 +SHA512 (squashfs-tools-a8f61e2a38992d4cd967303a61277123fcd66681.tar.gz) = f2e77087c946305c323cd831ff5c7b9703cc2d33b160a4757afa4cb887d30f6af1eb2161902e80ef4a268336fd0e4b889f800839013d24452eda46e7deb1358b diff --git a/squashfs-tools.spec b/squashfs-tools.spec index a97b4e4..817ce22 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -3,11 +3,11 @@ Version: 4.5 Summary: Utility for the creation of squashfs filesystems %global forgeurl https://github.com/plougher/%{name} %global date 20220210 -%global commit e7e96fe6ecd5c01aada20908188d9d0096ad0bd8 +%global commit a8f61e2a38992d4cd967303a61277123fcd66681 %forgemeta URL: %{forgeurl} Source: %{forgesource} -Release: 12%{?dist} +Release: 13%{?dist} License: GPLv2+ BuildRequires: make @@ -25,7 +25,7 @@ Squashfs is a highly compressed read-only filesystem for Linux. This package contains the utilities for manipulating squashfs filesystems. %prep -%forgesetup +%forgesetup %build %set_build_flags @@ -51,6 +51,10 @@ make INSTALL_PREFIX=%{buildroot}/usr INSTALL_DIR=%{buildroot}%{_sbindir} INSTALL %{_sbindir}/sqfscat %changelog +* Thu Feb 10 2022 Bruno Wolff III - 4.5-13.20220210gita8f61e2 +- Continue testing upstream patches prior to 4.5.1 release. +- Some code cleanups for stuff noted by gcc. + * Thu Feb 10 2022 Bruno Wolff III - 4.5-12.20220210gite7e96fe - Continue testing upstream patches prior to 4.5.1 release. - Add man page for sqfscat. From 8b41a6d40e4f2dcf98e5a08bf8b0638d35e2ff53 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Mon, 14 Feb 2022 03:42:15 -0600 Subject: [PATCH 32/68] A few more bug fixes before 4.5.1 --- .gitignore | 1 + sources | 2 +- squashfs-tools.spec | 10 +++++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 863c100..25dfc3b 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ squashfs-4.1.tar.bz2 /squashfs-tools-0425d3d2d87a7775864bc6d04a4c8c45b93fa9b2.tar.gz /squashfs-tools-e7e96fe6ecd5c01aada20908188d9d0096ad0bd8.tar.gz /squashfs-tools-a8f61e2a38992d4cd967303a61277123fcd66681.tar.gz +/squashfs-tools-de944c3e6fc8861d8a8844186983d1295415fdaf.tar.gz diff --git a/sources b/sources index 03f4587..6757a87 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (squashfs-tools-a8f61e2a38992d4cd967303a61277123fcd66681.tar.gz) = f2e77087c946305c323cd831ff5c7b9703cc2d33b160a4757afa4cb887d30f6af1eb2161902e80ef4a268336fd0e4b889f800839013d24452eda46e7deb1358b +SHA512 (squashfs-tools-de944c3e6fc8861d8a8844186983d1295415fdaf.tar.gz) = 375c234355657f1b851f50b3dfe8fd62dfcbca59f2d000362448546962095d820af52e0f959b0995582100c4b18bc3957c95d83fb09c9072b8a8be059484c373 diff --git a/squashfs-tools.spec b/squashfs-tools.spec index 817ce22..93249ab 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -2,12 +2,12 @@ Name: squashfs-tools Version: 4.5 Summary: Utility for the creation of squashfs filesystems %global forgeurl https://github.com/plougher/%{name} -%global date 20220210 -%global commit a8f61e2a38992d4cd967303a61277123fcd66681 +%global date 20220214 +%global commit de944c3e6fc8861d8a8844186983d1295415fdaf %forgemeta URL: %{forgeurl} Source: %{forgesource} -Release: 13%{?dist} +Release: 14%{?dist} License: GPLv2+ BuildRequires: make @@ -51,6 +51,10 @@ make INSTALL_PREFIX=%{buildroot}/usr INSTALL_DIR=%{buildroot}%{_sbindir} INSTALL %{_sbindir}/sqfscat %changelog +* Thu Feb 10 2022 Bruno Wolff III - 4.5-14.20220214gitde944c3 +- Continue testing upstream patches prior to 4.5.1 release. +- Some minor fixes. + * Thu Feb 10 2022 Bruno Wolff III - 4.5-13.20220210gita8f61e2 - Continue testing upstream patches prior to 4.5.1 release. - Some code cleanups for stuff noted by gcc. From 2521e669468e407ec8604bd6c88ffb838607293f Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 15 Feb 2022 07:21:45 -0600 Subject: [PATCH 33/68] Pick up a few fixes for issues caught by a static analyzer --- .gitignore | 1 + sources | 2 +- squashfs-tools.spec | 12 ++++++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 25dfc3b..45f0c05 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ squashfs-4.1.tar.bz2 /squashfs-tools-e7e96fe6ecd5c01aada20908188d9d0096ad0bd8.tar.gz /squashfs-tools-a8f61e2a38992d4cd967303a61277123fcd66681.tar.gz /squashfs-tools-de944c3e6fc8861d8a8844186983d1295415fdaf.tar.gz +/squashfs-tools-f491ad858bcacf32dab2b37b3b0b325aa0ea6668.tar.gz diff --git a/sources b/sources index 6757a87..c564fe9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (squashfs-tools-de944c3e6fc8861d8a8844186983d1295415fdaf.tar.gz) = 375c234355657f1b851f50b3dfe8fd62dfcbca59f2d000362448546962095d820af52e0f959b0995582100c4b18bc3957c95d83fb09c9072b8a8be059484c373 +SHA512 (squashfs-tools-f491ad858bcacf32dab2b37b3b0b325aa0ea6668.tar.gz) = d1a87ad3b6423c9bb5c858301af725bdd7f9e2d5d82fe44c37d4e9eb28920e38090fe7589288bb292f85303a788d19f424316547638998d3b64be0bd31308040 diff --git a/squashfs-tools.spec b/squashfs-tools.spec index 93249ab..7460d8f 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -2,12 +2,12 @@ Name: squashfs-tools Version: 4.5 Summary: Utility for the creation of squashfs filesystems %global forgeurl https://github.com/plougher/%{name} -%global date 20220214 -%global commit de944c3e6fc8861d8a8844186983d1295415fdaf +%global date 20220215 +%global commit f491ad858bcacf32dab2b37b3b0b325aa0ea6668 %forgemeta URL: %{forgeurl} Source: %{forgesource} -Release: 14%{?dist} +Release: 15%{?dist} License: GPLv2+ BuildRequires: make @@ -51,7 +51,11 @@ make INSTALL_PREFIX=%{buildroot}/usr INSTALL_DIR=%{buildroot}%{_sbindir} INSTALL %{_sbindir}/sqfscat %changelog -* Thu Feb 10 2022 Bruno Wolff III - 4.5-14.20220214gitde944c3 +* Tue Feb 15 2022 Bruno Wolff III - 4.5-15.20220215gitf491ad8 +- Continue testing upstream patches prior to 4.5.1 release. +- Some minor fixes. + +* Mon Feb 14 2022 Bruno Wolff III - 4.5-14.20220214gitde944c3 - Continue testing upstream patches prior to 4.5.1 release. - Some minor fixes. From c5efeec47785aac399a00d4b12654d19bbcb46fe Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Thu, 17 Feb 2022 01:23:21 -0600 Subject: [PATCH 34/68] Pick up a few more fixes --- .gitignore | 1 + sources | 2 +- squashfs-tools.spec | 10 +++++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 45f0c05..36ff110 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ squashfs-4.1.tar.bz2 /squashfs-tools-a8f61e2a38992d4cd967303a61277123fcd66681.tar.gz /squashfs-tools-de944c3e6fc8861d8a8844186983d1295415fdaf.tar.gz /squashfs-tools-f491ad858bcacf32dab2b37b3b0b325aa0ea6668.tar.gz +/squashfs-tools-75951fb96de64e8062306359c87d987b527a42d0.tar.gz diff --git a/sources b/sources index c564fe9..545715c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (squashfs-tools-f491ad858bcacf32dab2b37b3b0b325aa0ea6668.tar.gz) = d1a87ad3b6423c9bb5c858301af725bdd7f9e2d5d82fe44c37d4e9eb28920e38090fe7589288bb292f85303a788d19f424316547638998d3b64be0bd31308040 +SHA512 (squashfs-tools-75951fb96de64e8062306359c87d987b527a42d0.tar.gz) = 2f0db33068c7d8be7d8b983dd9bcdb6aa43b84c1d525db4dce201b054555424f89d6b94a97f2228325a678d1c747da171a2fbd15594f35b3fbdc97707a4a9970 diff --git a/squashfs-tools.spec b/squashfs-tools.spec index 7460d8f..824b35d 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -2,12 +2,12 @@ Name: squashfs-tools Version: 4.5 Summary: Utility for the creation of squashfs filesystems %global forgeurl https://github.com/plougher/%{name} -%global date 20220215 -%global commit f491ad858bcacf32dab2b37b3b0b325aa0ea6668 +%global date 20220217 +%global commit 75951fb96de64e8062306359c87d987b527a42d0 %forgemeta URL: %{forgeurl} Source: %{forgesource} -Release: 15%{?dist} +Release: 16%{?dist} License: GPLv2+ BuildRequires: make @@ -51,6 +51,10 @@ make INSTALL_PREFIX=%{buildroot}/usr INSTALL_DIR=%{buildroot}%{_sbindir} INSTALL %{_sbindir}/sqfscat %changelog +* Thu Feb 17 2022 Bruno Wolff III - 4.5-16.20220217git75951fb +- Continue testing upstream patches prior to 4.5.1 release. +- Some minor fixes. + * Tue Feb 15 2022 Bruno Wolff III - 4.5-15.20220215gitf491ad8 - Continue testing upstream patches prior to 4.5.1 release. - Some minor fixes. From 0f2a443449ffaaaefa1c1b8dd95ed62176217604 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Fri, 18 Feb 2022 22:36:58 -0600 Subject: [PATCH 35/68] Pick up some more fixes for some minor issues --- .gitignore | 1 + sources | 2 +- squashfs-tools.spec | 10 +++++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 36ff110..19a8d64 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ squashfs-4.1.tar.bz2 /squashfs-tools-de944c3e6fc8861d8a8844186983d1295415fdaf.tar.gz /squashfs-tools-f491ad858bcacf32dab2b37b3b0b325aa0ea6668.tar.gz /squashfs-tools-75951fb96de64e8062306359c87d987b527a42d0.tar.gz +/squashfs-tools-f3783bbec5b0f105c6571699d3fd38803a345b12.tar.gz diff --git a/sources b/sources index 545715c..c928875 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (squashfs-tools-75951fb96de64e8062306359c87d987b527a42d0.tar.gz) = 2f0db33068c7d8be7d8b983dd9bcdb6aa43b84c1d525db4dce201b054555424f89d6b94a97f2228325a678d1c747da171a2fbd15594f35b3fbdc97707a4a9970 +SHA512 (squashfs-tools-f3783bbec5b0f105c6571699d3fd38803a345b12.tar.gz) = c7acb373e06e6de28d90474533e8e4f7ff2131612e20cab4a5fe2224abffd77137619d02e22b46b8715d1f2bcd2974e7bb234149f772b0235f40d7273002ced0 diff --git a/squashfs-tools.spec b/squashfs-tools.spec index 824b35d..3b9b362 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -2,12 +2,12 @@ Name: squashfs-tools Version: 4.5 Summary: Utility for the creation of squashfs filesystems %global forgeurl https://github.com/plougher/%{name} -%global date 20220217 -%global commit 75951fb96de64e8062306359c87d987b527a42d0 +%global date 20220218 +%global commit f3783bbec5b0f105c6571699d3fd38803a345b12 %forgemeta URL: %{forgeurl} Source: %{forgesource} -Release: 16%{?dist} +Release: 17%{?dist} License: GPLv2+ BuildRequires: make @@ -51,6 +51,10 @@ make INSTALL_PREFIX=%{buildroot}/usr INSTALL_DIR=%{buildroot}%{_sbindir} INSTALL %{_sbindir}/sqfscat %changelog +* Fri Feb 18 2022 Bruno Wolff III - 4.5-17.20220218gitf3783bb +- Continue testing upstream patches prior to 4.5.1 release. +- Some minor fixes. + * Thu Feb 17 2022 Bruno Wolff III - 4.5-16.20220217git75951fb - Continue testing upstream patches prior to 4.5.1 release. - Some minor fixes. From 1b406bfb5b0c59974d3887d3c86086e897cb1f5c Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Mon, 21 Feb 2022 21:10:39 -0600 Subject: [PATCH 36/68] More minor fixes for static analysis issues --- .gitignore | 1 + sources | 2 +- squashfs-tools.spec | 10 +++++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 19a8d64..97a53bf 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ squashfs-4.1.tar.bz2 /squashfs-tools-f491ad858bcacf32dab2b37b3b0b325aa0ea6668.tar.gz /squashfs-tools-75951fb96de64e8062306359c87d987b527a42d0.tar.gz /squashfs-tools-f3783bbec5b0f105c6571699d3fd38803a345b12.tar.gz +/squashfs-tools-bc0c097be93154997fe0576181e5c12d746a1420.tar.gz diff --git a/sources b/sources index c928875..e1cbef6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (squashfs-tools-f3783bbec5b0f105c6571699d3fd38803a345b12.tar.gz) = c7acb373e06e6de28d90474533e8e4f7ff2131612e20cab4a5fe2224abffd77137619d02e22b46b8715d1f2bcd2974e7bb234149f772b0235f40d7273002ced0 +SHA512 (squashfs-tools-bc0c097be93154997fe0576181e5c12d746a1420.tar.gz) = 84ec6b3b7b3925417bd52d3705f7a7b8f64e3a8b8763add3e6fe84e5262f7ec38f0a753ec50129918b490ba0856e4300056b9ef87d5e8b2849f91f75ad3425b3 diff --git a/squashfs-tools.spec b/squashfs-tools.spec index 3b9b362..fa7704e 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -2,12 +2,12 @@ Name: squashfs-tools Version: 4.5 Summary: Utility for the creation of squashfs filesystems %global forgeurl https://github.com/plougher/%{name} -%global date 20220218 -%global commit f3783bbec5b0f105c6571699d3fd38803a345b12 +%global date 20220221 +%global commit bc0c097be93154997fe0576181e5c12d746a1420 %forgemeta URL: %{forgeurl} Source: %{forgesource} -Release: 17%{?dist} +Release: 18%{?dist} License: GPLv2+ BuildRequires: make @@ -51,6 +51,10 @@ make INSTALL_PREFIX=%{buildroot}/usr INSTALL_DIR=%{buildroot}%{_sbindir} INSTALL %{_sbindir}/sqfscat %changelog +* Mon Feb 21 2022 Bruno Wolff III - 4.5-18.20220221gitbc0c097 +- Continue testing upstream patches prior to 4.5.1 release. +- Some minor fixes. + * Fri Feb 18 2022 Bruno Wolff III - 4.5-17.20220218gitf3783bb - Continue testing upstream patches prior to 4.5.1 release. - Some minor fixes. From 0e227007f02dc4fc537a8c75bcbc4e8e7ba1b3c9 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Wed, 23 Feb 2022 04:19:11 -0600 Subject: [PATCH 37/68] Get a man page improvement --- .gitignore | 1 + sources | 2 +- squashfs-tools.spec | 10 +++++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 97a53bf..8fba29c 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ squashfs-4.1.tar.bz2 /squashfs-tools-75951fb96de64e8062306359c87d987b527a42d0.tar.gz /squashfs-tools-f3783bbec5b0f105c6571699d3fd38803a345b12.tar.gz /squashfs-tools-bc0c097be93154997fe0576181e5c12d746a1420.tar.gz +/squashfs-tools-2dfbcdac38bc42af4b200a1a1e86d3154e079e04.tar.gz diff --git a/sources b/sources index e1cbef6..b202ce7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (squashfs-tools-bc0c097be93154997fe0576181e5c12d746a1420.tar.gz) = 84ec6b3b7b3925417bd52d3705f7a7b8f64e3a8b8763add3e6fe84e5262f7ec38f0a753ec50129918b490ba0856e4300056b9ef87d5e8b2849f91f75ad3425b3 +SHA512 (squashfs-tools-2dfbcdac38bc42af4b200a1a1e86d3154e079e04.tar.gz) = 707d6d4d516f8ed036013e2292926e8b00da7fc2a5e3c3b632fb11d5e2e918f633bd88f166b53eb2116f6d60b3415ef14462655c8a6248de70c2cbac92e0ea5a diff --git a/squashfs-tools.spec b/squashfs-tools.spec index fa7704e..976fdf6 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -2,12 +2,12 @@ Name: squashfs-tools Version: 4.5 Summary: Utility for the creation of squashfs filesystems %global forgeurl https://github.com/plougher/%{name} -%global date 20220221 -%global commit bc0c097be93154997fe0576181e5c12d746a1420 +%global date 20220223 +%global commit 2dfbcdac38bc42af4b200a1a1e86d3154e079e04 %forgemeta URL: %{forgeurl} Source: %{forgesource} -Release: 18%{?dist} +Release: 19%{?dist} License: GPLv2+ BuildRequires: make @@ -51,6 +51,10 @@ make INSTALL_PREFIX=%{buildroot}/usr INSTALL_DIR=%{buildroot}%{_sbindir} INSTALL %{_sbindir}/sqfscat %changelog +* Wed Feb 23 2022 Bruno Wolff III - 4.5-19.20220223git2dfbcda +- Continue testing upstream patches prior to 4.5.1 release. +- Man page improvement + * Mon Feb 21 2022 Bruno Wolff III - 4.5-18.20220221gitbc0c097 - Continue testing upstream patches prior to 4.5.1 release. - Some minor fixes. From 72ea4878303a593b5cd5614d9f93e4654516b48e Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Fri, 25 Feb 2022 11:43:24 -0600 Subject: [PATCH 38/68] Pick up some more man page improvements --- .gitignore | 1 + sources | 2 +- squashfs-tools.spec | 10 +++++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 8fba29c..7eb6b84 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ squashfs-4.1.tar.bz2 /squashfs-tools-f3783bbec5b0f105c6571699d3fd38803a345b12.tar.gz /squashfs-tools-bc0c097be93154997fe0576181e5c12d746a1420.tar.gz /squashfs-tools-2dfbcdac38bc42af4b200a1a1e86d3154e079e04.tar.gz +/squashfs-tools-c883f3212cf5004c49121e0803f12d26d0db6a97.tar.gz diff --git a/sources b/sources index b202ce7..1da481e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (squashfs-tools-2dfbcdac38bc42af4b200a1a1e86d3154e079e04.tar.gz) = 707d6d4d516f8ed036013e2292926e8b00da7fc2a5e3c3b632fb11d5e2e918f633bd88f166b53eb2116f6d60b3415ef14462655c8a6248de70c2cbac92e0ea5a +SHA512 (squashfs-tools-c883f3212cf5004c49121e0803f12d26d0db6a97.tar.gz) = be464d010b2f1e820dc7345e5e8c59e2a928295e4c91c330293ae66a47a3e498979a81d62d68b7a7d0a5fa3241aa6d4546dd830e3c94154d2c5320c4cdbe4113 diff --git a/squashfs-tools.spec b/squashfs-tools.spec index 976fdf6..9097053 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -2,12 +2,12 @@ Name: squashfs-tools Version: 4.5 Summary: Utility for the creation of squashfs filesystems %global forgeurl https://github.com/plougher/%{name} -%global date 20220223 -%global commit 2dfbcdac38bc42af4b200a1a1e86d3154e079e04 +%global date 20220225 +%global commit c883f3212cf5004c49121e0803f12d26d0db6a97 %forgemeta URL: %{forgeurl} Source: %{forgesource} -Release: 19%{?dist} +Release: 20%{?dist} License: GPLv2+ BuildRequires: make @@ -51,6 +51,10 @@ make INSTALL_PREFIX=%{buildroot}/usr INSTALL_DIR=%{buildroot}%{_sbindir} INSTALL %{_sbindir}/sqfscat %changelog +* Wed Feb 25 2022 Bruno Wolff III - 4.5-20.20220225gitc883f32 +- Continue testing upstream patches prior to 4.5.1 release. +- Man page improvement + * Wed Feb 23 2022 Bruno Wolff III - 4.5-19.20220223git2dfbcda - Continue testing upstream patches prior to 4.5.1 release. - Man page improvement From 967d3cda1d8b807831c232aeed2f912783114867 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Mon, 28 Feb 2022 20:59:17 -0600 Subject: [PATCH 39/68] Some more man page improvements --- .gitignore | 1 + sources | 2 +- squashfs-tools.spec | 12 ++++++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 7eb6b84..8db3f54 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ squashfs-4.1.tar.bz2 /squashfs-tools-bc0c097be93154997fe0576181e5c12d746a1420.tar.gz /squashfs-tools-2dfbcdac38bc42af4b200a1a1e86d3154e079e04.tar.gz /squashfs-tools-c883f3212cf5004c49121e0803f12d26d0db6a97.tar.gz +/squashfs-tools-263a14e4d1ec93fbd192289bc3aae0cac2485221.tar.gz diff --git a/sources b/sources index 1da481e..daba405 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (squashfs-tools-c883f3212cf5004c49121e0803f12d26d0db6a97.tar.gz) = be464d010b2f1e820dc7345e5e8c59e2a928295e4c91c330293ae66a47a3e498979a81d62d68b7a7d0a5fa3241aa6d4546dd830e3c94154d2c5320c4cdbe4113 +SHA512 (squashfs-tools-263a14e4d1ec93fbd192289bc3aae0cac2485221.tar.gz) = e3a9bb5a890be2d9cf8fad5fff3a17e7f9a148704197624d166cb324943f59bb726f380d6c3ae7f260a05534fe4e836c59db5d34bf6aa9effa0d876d0f8ef6e4 diff --git a/squashfs-tools.spec b/squashfs-tools.spec index 9097053..fe350aa 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -2,12 +2,12 @@ Name: squashfs-tools Version: 4.5 Summary: Utility for the creation of squashfs filesystems %global forgeurl https://github.com/plougher/%{name} -%global date 20220225 -%global commit c883f3212cf5004c49121e0803f12d26d0db6a97 +%global date 20220228 +%global commit 263a14e4d1ec93fbd192289bc3aae0cac2485221 %forgemeta URL: %{forgeurl} Source: %{forgesource} -Release: 20%{?dist} +Release: 21%{?dist} License: GPLv2+ BuildRequires: make @@ -51,7 +51,11 @@ make INSTALL_PREFIX=%{buildroot}/usr INSTALL_DIR=%{buildroot}%{_sbindir} INSTALL %{_sbindir}/sqfscat %changelog -* Wed Feb 25 2022 Bruno Wolff III - 4.5-20.20220225gitc883f32 +* Mon Feb 28 2022 Bruno Wolff III - 4.5-21.20220228git263a14e +- Continue testing upstream patches prior to 4.5.1 release. +- Man page improvement + +* Fri Feb 25 2022 Bruno Wolff III - 4.5-20.20220225gitc883f32 - Continue testing upstream patches prior to 4.5.1 release. - Man page improvement From c16b95903989ffe3586427280127a818f2f7b6ff Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Fri, 4 Mar 2022 19:56:41 -0600 Subject: [PATCH 40/68] Some more minor fixes --- .gitignore | 1 + sources | 2 +- squashfs-tools.spec | 10 +++++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 8db3f54..06f8af5 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ squashfs-4.1.tar.bz2 /squashfs-tools-2dfbcdac38bc42af4b200a1a1e86d3154e079e04.tar.gz /squashfs-tools-c883f3212cf5004c49121e0803f12d26d0db6a97.tar.gz /squashfs-tools-263a14e4d1ec93fbd192289bc3aae0cac2485221.tar.gz +/squashfs-tools-2baf12e55af5a519e1285437343d3a606962a4b6.tar.gz diff --git a/sources b/sources index daba405..0d834ea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (squashfs-tools-263a14e4d1ec93fbd192289bc3aae0cac2485221.tar.gz) = e3a9bb5a890be2d9cf8fad5fff3a17e7f9a148704197624d166cb324943f59bb726f380d6c3ae7f260a05534fe4e836c59db5d34bf6aa9effa0d876d0f8ef6e4 +SHA512 (squashfs-tools-2baf12e55af5a519e1285437343d3a606962a4b6.tar.gz) = 8ca6263833ed032d03de04be7644c7a718de726d10ca2844a159c38d7c8e57a4792cea48aede13d7c440680e2301eba3bcb793b71cd0ef397fb43b6ee26ae1f6 diff --git a/squashfs-tools.spec b/squashfs-tools.spec index fe350aa..d5e3060 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -2,12 +2,12 @@ Name: squashfs-tools Version: 4.5 Summary: Utility for the creation of squashfs filesystems %global forgeurl https://github.com/plougher/%{name} -%global date 20220228 -%global commit 263a14e4d1ec93fbd192289bc3aae0cac2485221 +%global date 20220304 +%global commit 2baf12e55af5a519e1285437343d3a606962a4b6 %forgemeta URL: %{forgeurl} Source: %{forgesource} -Release: 21%{?dist} +Release: 22%{?dist} License: GPLv2+ BuildRequires: make @@ -51,6 +51,10 @@ make INSTALL_PREFIX=%{buildroot}/usr INSTALL_DIR=%{buildroot}%{_sbindir} INSTALL %{_sbindir}/sqfscat %changelog +* Fri Mar 04 2022 Bruno Wolff III - 4.5-22.20220304git2baf12e +- Continue testing upstream patches prior to 4.5.1 release. +- Minor fixes + * Mon Feb 28 2022 Bruno Wolff III - 4.5-21.20220228git263a14e - Continue testing upstream patches prior to 4.5.1 release. - Man page improvement From dc28aaa917fbc77dea1c0d7bcd734be19ed9d720 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Mon, 7 Mar 2022 22:34:36 -0600 Subject: [PATCH 41/68] Pick up a couple of minor fixes --- .gitignore | 1 + sources | 2 +- squashfs-tools.spec | 10 +++++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 06f8af5..689acbd 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ squashfs-4.1.tar.bz2 /squashfs-tools-c883f3212cf5004c49121e0803f12d26d0db6a97.tar.gz /squashfs-tools-263a14e4d1ec93fbd192289bc3aae0cac2485221.tar.gz /squashfs-tools-2baf12e55af5a519e1285437343d3a606962a4b6.tar.gz +/squashfs-tools-580b4e122471c11dffb7dcf1e392a72c8dcb6512.tar.gz diff --git a/sources b/sources index 0d834ea..57c36a9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (squashfs-tools-2baf12e55af5a519e1285437343d3a606962a4b6.tar.gz) = 8ca6263833ed032d03de04be7644c7a718de726d10ca2844a159c38d7c8e57a4792cea48aede13d7c440680e2301eba3bcb793b71cd0ef397fb43b6ee26ae1f6 +SHA512 (squashfs-tools-580b4e122471c11dffb7dcf1e392a72c8dcb6512.tar.gz) = 1c752efc806c8bb17db82bb9337797a7534c5e4eafc9782e9e34abaea7ff46a2ec58f4c7e6a2b87a59809a7f5b5ab4dcb667a8fd10cdb7ebedc0f92090daf157 diff --git a/squashfs-tools.spec b/squashfs-tools.spec index d5e3060..d4039d6 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -2,12 +2,12 @@ Name: squashfs-tools Version: 4.5 Summary: Utility for the creation of squashfs filesystems %global forgeurl https://github.com/plougher/%{name} -%global date 20220304 -%global commit 2baf12e55af5a519e1285437343d3a606962a4b6 +%global date 20220307 +%global commit 580b4e122471c11dffb7dcf1e392a72c8dcb6512 %forgemeta URL: %{forgeurl} Source: %{forgesource} -Release: 22%{?dist} +Release: 23%{?dist} License: GPLv2+ BuildRequires: make @@ -51,6 +51,10 @@ make INSTALL_PREFIX=%{buildroot}/usr INSTALL_DIR=%{buildroot}%{_sbindir} INSTALL %{_sbindir}/sqfscat %changelog +* Mon Mar 07 2022 Bruno Wolff III - 4.5-23.20220307git580b4e1 +- Continue testing upstream patches prior to 4.5.1 release. +- Minor fixes + * Fri Mar 04 2022 Bruno Wolff III - 4.5-22.20220304git2baf12e - Continue testing upstream patches prior to 4.5.1 release. - Minor fixes From c5ff26b19af8049302626d21fb5b4dc2e71b0a0a Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 8 Mar 2022 19:12:26 -0600 Subject: [PATCH 42/68] Lastest upstream Minor fixes Man page tweaks Tentative change log --- .gitignore | 1 + sources | 2 +- squashfs-tools.spec | 12 +++++++++--- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 689acbd..06c029e 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ squashfs-4.1.tar.bz2 /squashfs-tools-263a14e4d1ec93fbd192289bc3aae0cac2485221.tar.gz /squashfs-tools-2baf12e55af5a519e1285437343d3a606962a4b6.tar.gz /squashfs-tools-580b4e122471c11dffb7dcf1e392a72c8dcb6512.tar.gz +/squashfs-tools-8b6ee895c763f0b8e2f394d83e93fc5a3e51942f.tar.gz diff --git a/sources b/sources index 57c36a9..01a040c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (squashfs-tools-580b4e122471c11dffb7dcf1e392a72c8dcb6512.tar.gz) = 1c752efc806c8bb17db82bb9337797a7534c5e4eafc9782e9e34abaea7ff46a2ec58f4c7e6a2b87a59809a7f5b5ab4dcb667a8fd10cdb7ebedc0f92090daf157 +SHA512 (squashfs-tools-8b6ee895c763f0b8e2f394d83e93fc5a3e51942f.tar.gz) = 1df0c3209dd7035598f920f6e95ad4224ae525dd5596eab4af3c03c00e7d71bcda042667217ebfe4d761146e75a014b8c0569b6e28891339d48c66750398323d diff --git a/squashfs-tools.spec b/squashfs-tools.spec index d4039d6..95938c4 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -2,12 +2,12 @@ Name: squashfs-tools Version: 4.5 Summary: Utility for the creation of squashfs filesystems %global forgeurl https://github.com/plougher/%{name} -%global date 20220307 -%global commit 580b4e122471c11dffb7dcf1e392a72c8dcb6512 +%global date 20220308 +%global commit 8b6ee895c763f0b8e2f394d83e93fc5a3e51942f %forgemeta URL: %{forgeurl} Source: %{forgesource} -Release: 23%{?dist} +Release: 24%{?dist} License: GPLv2+ BuildRequires: make @@ -51,6 +51,12 @@ make INSTALL_PREFIX=%{buildroot}/usr INSTALL_DIR=%{buildroot}%{_sbindir} INSTALL %{_sbindir}/sqfscat %changelog +* Tue Mar 08 2022 Bruno Wolff III - 4.5-24.20220307git8b6ee89 +- Continue testing upstream patches prior to 4.5.1 release. +- Minor fixes +- Man page tweaks +- Tentative 4.5.1 change log + * Mon Mar 07 2022 Bruno Wolff III - 4.5-23.20220307git580b4e1 - Continue testing upstream patches prior to 4.5.1 release. - Minor fixes From 6b746e8d48c6cae586a1f9d9977c80da8341b2cb Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 8 Mar 2022 23:07:14 -0600 Subject: [PATCH 43/68] Upstream fix for breakage of unsquashfs --- .gitignore | 1 + sources | 2 +- squashfs-tools.spec | 11 +++++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 06c029e..5b5ae52 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ squashfs-4.1.tar.bz2 /squashfs-tools-2baf12e55af5a519e1285437343d3a606962a4b6.tar.gz /squashfs-tools-580b4e122471c11dffb7dcf1e392a72c8dcb6512.tar.gz /squashfs-tools-8b6ee895c763f0b8e2f394d83e93fc5a3e51942f.tar.gz +/squashfs-tools-2ac40ca6d23cad73fb5b5da0c915382eaa31378d.tar.gz diff --git a/sources b/sources index 01a040c..4175d6e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (squashfs-tools-8b6ee895c763f0b8e2f394d83e93fc5a3e51942f.tar.gz) = 1df0c3209dd7035598f920f6e95ad4224ae525dd5596eab4af3c03c00e7d71bcda042667217ebfe4d761146e75a014b8c0569b6e28891339d48c66750398323d +SHA512 (squashfs-tools-2ac40ca6d23cad73fb5b5da0c915382eaa31378d.tar.gz) = f2f73bf881afe801322d40d8493f98a9fb5dfeaab9006c88997528b62a8ff9d3e17ffbf5843227359d91b7d259ae06dd2debf09a8526a614dd24f3458fd4816d diff --git a/squashfs-tools.spec b/squashfs-tools.spec index 95938c4..71e10cc 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -3,11 +3,11 @@ Version: 4.5 Summary: Utility for the creation of squashfs filesystems %global forgeurl https://github.com/plougher/%{name} %global date 20220308 -%global commit 8b6ee895c763f0b8e2f394d83e93fc5a3e51942f +%global commit 2ac40ca6d23cad73fb5b5da0c915382eaa31378d %forgemeta URL: %{forgeurl} Source: %{forgesource} -Release: 24%{?dist} +Release: 25%{?dist} License: GPLv2+ BuildRequires: make @@ -30,7 +30,7 @@ contains the utilities for manipulating squashfs filesystems. %build %set_build_flags pushd squashfs-tools -CFLAGS="%{optflags}" XZ_SUPPORT=1 LZO_SUPPORT=1 LZMA_XZ_SUPPORT=1 LZ4_SUPPORT=1 ZSTD_SUPPORT=1 make %{?_smp_mflags} +CFLAGS="%optflags" XZ_SUPPORT=1 LZO_SUPPORT=1 LZMA_XZ_SUPPORT=1 LZ4_SUPPORT=1 ZSTD_SUPPORT=1 make %{?_smp_mflags} %install pushd squashfs-tools @@ -51,7 +51,10 @@ make INSTALL_PREFIX=%{buildroot}/usr INSTALL_DIR=%{buildroot}%{_sbindir} INSTALL %{_sbindir}/sqfscat %changelog -* Tue Mar 08 2022 Bruno Wolff III - 4.5-24.20220307git8b6ee89 +* Tue Mar 08 2022 Bruno Wolff III - 4.5-25.20220308git2ac40ca +- Upstream fix for unsquashfs breakage from recent commit + +* Tue Mar 08 2022 Bruno Wolff III - 4.5-24.20220308git8b6ee89 - Continue testing upstream patches prior to 4.5.1 release. - Minor fixes - Man page tweaks From 80b6c5c24db5e785deb17544fa20d12ba83f7364 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Thu, 10 Mar 2022 05:38:11 -0600 Subject: [PATCH 44/68] Minor fixes and doc files updates --- .gitignore | 1 + sources | 2 +- squashfs-tools.spec | 9 +++++++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5b5ae52..dd4a92f 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ squashfs-4.1.tar.bz2 /squashfs-tools-580b4e122471c11dffb7dcf1e392a72c8dcb6512.tar.gz /squashfs-tools-8b6ee895c763f0b8e2f394d83e93fc5a3e51942f.tar.gz /squashfs-tools-2ac40ca6d23cad73fb5b5da0c915382eaa31378d.tar.gz +/squashfs-tools-de61d00ffd2689d122696d4fc39f584c72fb24cf.tar.gz diff --git a/sources b/sources index 4175d6e..7b81e1d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (squashfs-tools-2ac40ca6d23cad73fb5b5da0c915382eaa31378d.tar.gz) = f2f73bf881afe801322d40d8493f98a9fb5dfeaab9006c88997528b62a8ff9d3e17ffbf5843227359d91b7d259ae06dd2debf09a8526a614dd24f3458fd4816d +SHA512 (squashfs-tools-de61d00ffd2689d122696d4fc39f584c72fb24cf.tar.gz) = b76feecd0b8b28eeb29863fe3311acd052723a83dbc4d2e6694ba54c8b8d67ae0aba796fb7120766b55154093eb542fe84c81097deda993bb8fd7cf66fe43c9b diff --git a/squashfs-tools.spec b/squashfs-tools.spec index 71e10cc..a64a654 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -3,11 +3,11 @@ Version: 4.5 Summary: Utility for the creation of squashfs filesystems %global forgeurl https://github.com/plougher/%{name} %global date 20220308 -%global commit 2ac40ca6d23cad73fb5b5da0c915382eaa31378d +%global commit de61d00ffd2689d122696d4fc39f584c72fb24cf %forgemeta URL: %{forgeurl} Source: %{forgesource} -Release: 25%{?dist} +Release: 26%{?dist} License: GPLv2+ BuildRequires: make @@ -51,6 +51,11 @@ make INSTALL_PREFIX=%{buildroot}/usr INSTALL_DIR=%{buildroot}%{_sbindir} INSTALL %{_sbindir}/sqfscat %changelog +* Thu Mar 10 2022 Bruno Wolff III - 4.5-26.20220310gitde61d0a +- Continue testing upstream patches prior to 4.5.1 release. +- Minor fixes +- Doc updates + * Tue Mar 08 2022 Bruno Wolff III - 4.5-25.20220308git2ac40ca - Upstream fix for unsquashfs breakage from recent commit From d5ed7f4010ef9a1f9f24363b8a0a44bce00abbde Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Fri, 11 Mar 2022 01:46:42 -0600 Subject: [PATCH 45/68] Minor fix Changes should slow down now and a tagged release might be a week away. So this version might get pushed down to f34 and f35 even though the release hasn't been tagged yet. --- .gitignore | 1 + sources | 2 +- squashfs-tools.spec | 10 +++++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index dd4a92f..2262ad3 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ squashfs-4.1.tar.bz2 /squashfs-tools-8b6ee895c763f0b8e2f394d83e93fc5a3e51942f.tar.gz /squashfs-tools-2ac40ca6d23cad73fb5b5da0c915382eaa31378d.tar.gz /squashfs-tools-de61d00ffd2689d122696d4fc39f584c72fb24cf.tar.gz +/squashfs-tools-76624e1e6be8e16ca08273eaadb82d7b38f3d5a5.tar.gz diff --git a/sources b/sources index 7b81e1d..7778e07 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (squashfs-tools-de61d00ffd2689d122696d4fc39f584c72fb24cf.tar.gz) = b76feecd0b8b28eeb29863fe3311acd052723a83dbc4d2e6694ba54c8b8d67ae0aba796fb7120766b55154093eb542fe84c81097deda993bb8fd7cf66fe43c9b +SHA512 (squashfs-tools-76624e1e6be8e16ca08273eaadb82d7b38f3d5a5.tar.gz) = 87c3bb4d6f71fa77bf252a1e3a9bd5e9196e1f2c5f94e840036b2c7b2feb6b430face19f2210e85fdafb5dbe39fd000cd6dcd8de866eb90fddc934131166eb10 diff --git a/squashfs-tools.spec b/squashfs-tools.spec index a64a654..63c1052 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -2,12 +2,12 @@ Name: squashfs-tools Version: 4.5 Summary: Utility for the creation of squashfs filesystems %global forgeurl https://github.com/plougher/%{name} -%global date 20220308 -%global commit de61d00ffd2689d122696d4fc39f584c72fb24cf +%global date 20220311 +%global commit 76624e1e6be8e16ca08273eaadb82d7b38f3d5a5 %forgemeta URL: %{forgeurl} Source: %{forgesource} -Release: 26%{?dist} +Release: 27%{?dist} License: GPLv2+ BuildRequires: make @@ -51,6 +51,10 @@ make INSTALL_PREFIX=%{buildroot}/usr INSTALL_DIR=%{buildroot}%{_sbindir} INSTALL %{_sbindir}/sqfscat %changelog +* Fri Mar 11 2022 Bruno Wolff III - 4.5-27.20220311git76624e1 +- Continue testing upstream patches prior to 4.5.1 release. +- Minor fixes + * Thu Mar 10 2022 Bruno Wolff III - 4.5-26.20220310gitde61d0a - Continue testing upstream patches prior to 4.5.1 release. - Minor fixes From 5658fff821eef7243995001c8043dbdd826e53d0 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Sat, 19 Mar 2022 11:32:27 -0500 Subject: [PATCH 46/68] 4.5.1 released --- .gitignore | 1 + sources | 2 +- squashfs-tools.spec | 18 +++++++++++------- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 2262ad3..743215c 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ squashfs-4.1.tar.bz2 /squashfs-tools-2ac40ca6d23cad73fb5b5da0c915382eaa31378d.tar.gz /squashfs-tools-de61d00ffd2689d122696d4fc39f584c72fb24cf.tar.gz /squashfs-tools-76624e1e6be8e16ca08273eaadb82d7b38f3d5a5.tar.gz +/squashfs-tools-4.5.1.tar.gz diff --git a/sources b/sources index 7778e07..811cc4a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (squashfs-tools-76624e1e6be8e16ca08273eaadb82d7b38f3d5a5.tar.gz) = 87c3bb4d6f71fa77bf252a1e3a9bd5e9196e1f2c5f94e840036b2c7b2feb6b430face19f2210e85fdafb5dbe39fd000cd6dcd8de866eb90fddc934131166eb10 +SHA512 (squashfs-tools-4.5.1.tar.gz) = b3934ea1e26c7508110312711465644a6d9674b6b5332a7d011e191fa3c1d4b8be694214794a0f6005263d0f4e18bab96af2f7ed66a178f8e3bb3a781cd44896 diff --git a/squashfs-tools.spec b/squashfs-tools.spec index 63c1052..06bc278 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -1,13 +1,13 @@ Name: squashfs-tools -Version: 4.5 +Version: 4.5.1 Summary: Utility for the creation of squashfs filesystems %global forgeurl https://github.com/plougher/%{name} -%global date 20220311 -%global commit 76624e1e6be8e16ca08273eaadb82d7b38f3d5a5 -%forgemeta +%global date 20220318 +%global tag 4.5.1 +%forgemeta -i -v URL: %{forgeurl} Source: %{forgesource} -Release: 27%{?dist} +Release: 1%{?dist} License: GPLv2+ BuildRequires: make @@ -37,9 +37,8 @@ pushd squashfs-tools make INSTALL_PREFIX=%{buildroot}/usr INSTALL_DIR=%{buildroot}%{_sbindir} INSTALL_MANPAGES_DIR=%{buildroot}%{_mandir}/man1 install %files -%doc README ACKNOWLEDGEMENTS README-4.5 CHANGES COPYING USAGE +%doc ACKNOWLEDGEMENTS README-4.5.1 CHANGES COPYING USAGE ACTIONS-README -%doc README %{_mandir}/man1/mksquashfs.1.gz %{_mandir}/man1/unsquashfs.1.gz %{_mandir}/man1/sqfstar.1.gz @@ -51,6 +50,11 @@ make INSTALL_PREFIX=%{buildroot}/usr INSTALL_DIR=%{buildroot}%{_sbindir} INSTALL %{_sbindir}/sqfscat %changelog +* Sat Mar 18 2022 Bruno Wolff III - 4.5-1 +- 4.5.1 release +- Up to date man pages +- Lots of little fixes + * Fri Mar 11 2022 Bruno Wolff III - 4.5-27.20220311git76624e1 - Continue testing upstream patches prior to 4.5.1 release. - Minor fixes From ff459fa3cfa4f172733d68eab4b4a91f8217e867 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 09:18:10 +0000 Subject: [PATCH 47/68] 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 48/68] 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 49/68] 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 50/68] 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 51/68] 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 52/68] 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 53/68] 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 54/68] 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 55/68] 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 56/68] 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 57/68] 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 58/68] 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 59/68] 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 60/68] 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 61/68] 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 62/68] 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 63/68] 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 64/68] 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 65/68] 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 66/68] 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 67/68] 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 68/68] 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