squashfs-tools-ng: Update to 1.0.4

7 files changed, 5 insertions, 43 deletions

diff --git a/pkg/squashfs-tools-ng/config.h b/pkg/squashfs-tools-ng/config.h
index 81997772..7d8ba481 100644
--- a/pkg/squashfs-tools-ng/config.h
+++ b/pkg/squashfs-tools-ng/config.h
@@ -24,13 +24,13 @@
 #define PACKAGE "squashfs-tools-ng"
 #define PACKAGE_BUGREPORT "goliath@infraroot.at"
 #define PACKAGE_NAME "squashfs-tools-ng"
-#define PACKAGE_STRING "squashfs-tools-ng 1.0.3"
+#define PACKAGE_STRING "squashfs-tools-ng 1.0.4"
 #define PACKAGE_TARNAME "squashfs-tools-ng"
 #define PACKAGE_URL ""
-#define PACKAGE_VERSION "1.0.3"
+#define PACKAGE_VERSION "1.0.4"
 /* #undef PTHREAD_CREATE_JOINABLE */
 #define STDC_HEADERS 1
-#define VERSION "1.0.3"
+#define VERSION "1.0.4"
 #ifndef _DARWIN_USE_64_BIT_INODE
 # define _DARWIN_USE_64_BIT_INODE 1
 #endif
diff --git a/pkg/squashfs-tools-ng/gen.lua b/pkg/squashfs-tools-ng/gen.lua
index 7362f155..3f3a87dd 100644
--- a/pkg/squashfs-tools-ng/gen.lua
+++ b/pkg/squashfs-tools-ng/gen.lua
@@ -1,7 +1,7 @@
 cflags{
 	'-std=c99', '-Wall', '-Wpedantic',
 	'-Wno-maybe-uninitialized',
-	'-D _XOPEN_SOURCE=700',
+	'-D _GNU_SOURCE',
 	'-I $srcdir',
 	'-I $srcdir/include',
 	'-I $dir',
diff --git a/pkg/squashfs-tools-ng/patch/0002-Add-missing-includes-of-alloca.h.patch b/pkg/squashfs-tools-ng/patch/0002-Add-missing-includes-of-alloca.h.patch
deleted file mode 100644
index e0551072..00000000
--- a/pkg/squashfs-tools-ng/patch/0002-Add-missing-includes-of-alloca.h.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From d7dd64b56ce96630d01a269439b86dc940c9df07 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Sat, 30 May 2020 00:24:10 -0700
-Subject: [PATCH] Add missing includes of alloca.h
-
----
- bin/sqfsdiff/extract.c | 2 ++
- lib/common/mkdir_p.c   | 1 +
- 2 files changed, 3 insertions(+)
-
-diff --git a/bin/sqfsdiff/extract.c b/bin/sqfsdiff/extract.c
-index 979572a..45e32e7 100644
---- a/bin/sqfsdiff/extract.c
-+++ b/bin/sqfsdiff/extract.c
-@@ -6,6 +6,8 @@
-  */
- #include "sqfsdiff.h"
- 
-+#include <alloca.h>
-+
- static int extract(sqfs_data_reader_t *data, const sqfs_inode_generic_t *inode,
- 		   const char *prefix, const char *path, size_t block_size)
- {
-diff --git a/lib/common/mkdir_p.c b/lib/common/mkdir_p.c
-index 0413495..b1845b1 100644
---- a/lib/common/mkdir_p.c
-+++ b/lib/common/mkdir_p.c
-@@ -6,6 +6,7 @@
-  */
- #include "common.h"
- 
-+#include <alloca.h>
- #include <string.h>
- #include <stdlib.h>
- #include <stdio.h>
--- 
-2.26.2
-
diff --git a/pkg/squashfs-tools-ng/patch/0003-Use-_MAX-to-remove-need-for-configure-time-type-size.patch b/pkg/squashfs-tools-ng/patch/0002-Use-_MAX-to-remove-need-for-configure-time-type-size.patch
index fa937a04..fa937a04 100644
--- a/pkg/squashfs-tools-ng/patch/0003-Use-_MAX-to-remove-need-for-configure-time-type-size.patch
+++ b/pkg/squashfs-tools-ng/patch/0002-Use-_MAX-to-remove-need-for-configure-time-type-size.patch
diff --git a/pkg/squashfs-tools-ng/patch/0004-Avoid-unnecessary-VLAs.patch b/pkg/squashfs-tools-ng/patch/0003-Avoid-unnecessary-VLAs.patch
index f892dc88..f892dc88 100644
--- a/pkg/squashfs-tools-ng/patch/0004-Avoid-unnecessary-VLAs.patch
+++ b/pkg/squashfs-tools-ng/patch/0003-Avoid-unnecessary-VLAs.patch
diff --git a/pkg/squashfs-tools-ng/src b/pkg/squashfs-tools-ng/src
-Subproject 587b1066b3805e0c961cde893691bf993eb9c93
+Subproject 6bab038b79615e4b2de112879ec415b68096b24
diff --git a/pkg/squashfs-tools-ng/ver b/pkg/squashfs-tools-ng/ver
index 6cb3ac3c..3385fde2 100644
--- a/pkg/squashfs-tools-ng/ver
+++ b/pkg/squashfs-tools-ng/ver
@@ -1 +1 @@
-1.0.3 r0
+1.0.4 r0