diff options
Diffstat (limited to 'utils')
3 files changed, 3 insertions, 148 deletions
diff --git a/utils/squashfs-tools/Makefile b/utils/squashfs-tools/Makefile index 519c51754..d856ce7c1 100644 --- a/utils/squashfs-tools/Makefile +++ b/utils/squashfs-tools/Makefile @@ -9,16 +9,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=squashfs-tools PKG_VERSION:=4.3 -PKG_RELEASE:=5 +PKG_RELEASE:=6 PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/plougher/squashfs-tools PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=9c1db6d13a51a2e009f0027ef336ce03624eac0d +PKG_SOURCE_VERSION:=5be5d61e5e5a93911256b5f2106e50da0ca81e8d PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz -PKG_MIRROR_HASH:=4e9a017561b6f9d7b9782c7c672d224726ffd069b0543f310e85ed8ab1c4589b +PKG_MIRROR_HASH:=eac1bc559708dc8656fe7d099ffc9e9374ae0cfb9a12d180a9c0c28acb0adf11 PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk diff --git a/utils/squashfs-tools/patches/0001-squashfs-tools-fix-fnmatch.h-compatibility-with-musl.patch b/utils/squashfs-tools/patches/0001-squashfs-tools-fix-fnmatch.h-compatibility-with-musl.patch deleted file mode 100644 index 5bfd28d53..000000000 --- a/utils/squashfs-tools/patches/0001-squashfs-tools-fix-fnmatch.h-compatibility-with-musl.patch +++ /dev/null @@ -1,120 +0,0 @@ -From a0c129760ca9bdc7e564ae2a508fac3799f9d39b Mon Sep 17 00:00:00 2001 -From: Alexandru Ardelean <aa@ocedo.com> -Date: Wed, 6 Jan 2016 15:33:43 +0200 -Subject: [PATCH 1/2] squashfs-tools: with fnmatch.h compatibility with musl - -Signed-off-by: Alexandru Ardelean <aa@ocedo.com> ---- - squashfs-tools/action.c | 2 +- - squashfs-tools/fnmatch_compat.h | 32 ++++++++++++++++++++++++++++++++ - squashfs-tools/mksquashfs.c | 2 +- - squashfs-tools/unsquashfs.c | 1 + - squashfs-tools/unsquashfs.h | 1 - - 5 files changed, 35 insertions(+), 3 deletions(-) - create mode 100644 squashfs-tools/fnmatch_compat.h - -diff --git a/squashfs-tools/action.c b/squashfs-tools/action.c -index 35889a4..4b06ccb 100644 ---- a/squashfs-tools/action.c -+++ b/squashfs-tools/action.c -@@ -31,7 +31,6 @@ - #include <sys/stat.h> - #include <sys/types.h> - #include <unistd.h> --#include <fnmatch.h> - #include <pwd.h> - #include <grp.h> - #include <sys/wait.h> -@@ -43,6 +42,7 @@ - #include "mksquashfs.h" - #include "action.h" - #include "error.h" -+#include "fnmatch_compat.h" - - /* - * code to parse actions -diff --git a/squashfs-tools/fnmatch_compat.h b/squashfs-tools/fnmatch_compat.h -new file mode 100644 -index 0000000..7b4afd8 ---- /dev/null -+++ b/squashfs-tools/fnmatch_compat.h -@@ -0,0 +1,32 @@ -+#ifndef FNMATCH_COMPAT -+#define FNMATCH_COMPAT -+/* -+ * Squashfs -+ * -+ * Copyright (c) 2015 -+ * Phillip Lougher <phillip@squashfs.org.uk> -+ * -+ * 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. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ * -+ * fnmatch_compat.h -+ */ -+ -+#include <fnmatch.h> -+ -+#ifndef FNM_EXTMATCH -+#define FNM_EXTMATCH 0 -+#endif -+ -+#endif -diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c -index d221c35..4e7cbdd 100644 ---- a/squashfs-tools/mksquashfs.c -+++ b/squashfs-tools/mksquashfs.c -@@ -46,7 +46,6 @@ - #include <sys/mman.h> - #include <pthread.h> - #include <regex.h> --#include <fnmatch.h> - #include <sys/wait.h> - #include <limits.h> - #include <ctype.h> -@@ -76,6 +75,7 @@ - #include "read_fs.h" - #include "restore.h" - #include "process_fragments.h" -+#include "fnmatch_compat.h" - - int delete = FALSE; - int fd; -diff --git a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c -index 1323dd6..2428baa 100644 ---- a/squashfs-tools/unsquashfs.c -+++ b/squashfs-tools/unsquashfs.c -@@ -30,6 +30,7 @@ - #include "xattr.h" - #include "unsquashfs_info.h" - #include "stdarg.h" -+#include "fnmatch_compat.h" - - #include <sys/sysinfo.h> - #include <sys/types.h> -diff --git a/squashfs-tools/unsquashfs.h b/squashfs-tools/unsquashfs.h -index ecd0bb4..0edbd25 100644 ---- a/squashfs-tools/unsquashfs.h -+++ b/squashfs-tools/unsquashfs.h -@@ -40,7 +40,6 @@ - #include <grp.h> - #include <time.h> - #include <regex.h> --#include <fnmatch.h> - #include <signal.h> - #include <pthread.h> - #include <math.h> --- -2.1.4 - diff --git a/utils/squashfs-tools/patches/0002-pseudo.c-add-explicit-stat.h-include.patch b/utils/squashfs-tools/patches/0002-pseudo.c-add-explicit-stat.h-include.patch deleted file mode 100644 index 8f1021178..000000000 --- a/utils/squashfs-tools/patches/0002-pseudo.c-add-explicit-stat.h-include.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0ea07a1b5ddb2f2fa1358b2c1b42bcf34bbf5ee2 Mon Sep 17 00:00:00 2001 -From: Alexandru Ardelean <aa@ocedo.com> -Date: Wed, 6 Jan 2016 15:36:48 +0200 -Subject: [PATCH 2/2] pseudo.c: add explicit <stat.h> include - -Signed-off-by: Alexandru Ardelean <aa@ocedo.com> ---- - squashfs-tools/pseudo.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/squashfs-tools/pseudo.c b/squashfs-tools/pseudo.c -index f85fe60..7a26bca 100644 ---- a/squashfs-tools/pseudo.c -+++ b/squashfs-tools/pseudo.c -@@ -32,6 +32,7 @@ - #include <stdlib.h> - #include <sys/types.h> - #include <sys/wait.h> -+#include <sys/stat.h> - #include <ctype.h> - - #include "pseudo.h" --- -2.1.4 - |