diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-07-10 13:16:57 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-07-10 13:16:57 +0000 |
| commit | 6caff47f16141f7a82ec023ce8eb3be64f54c7e0 (patch) | |
| tree | 688a026e66ef83a003041f2e881ccb97d917c10c /main/squashfs-tools/fix-compat.patch | |
| parent | dd5997d778ab12541a432670cac1c5afdc0a7ff7 (diff) | |
| download | aports-6caff47f16141f7a82ec023ce8eb3be64f54c7e0.tar.bz2 aports-6caff47f16141f7a82ec023ce8eb3be64f54c7e0.tar.xz | |
main/squashfs-tools: upgrade to 4.3
Diffstat (limited to 'main/squashfs-tools/fix-compat.patch')
| -rw-r--r-- | main/squashfs-tools/fix-compat.patch | 54 |
1 files changed, 32 insertions, 22 deletions
diff --git a/main/squashfs-tools/fix-compat.patch b/main/squashfs-tools/fix-compat.patch index 2ecb17176..2a3b33ca9 100644 --- a/main/squashfs-tools/fix-compat.patch +++ b/main/squashfs-tools/fix-compat.patch @@ -1,36 +1,46 @@ ---- squashfs4.2.orig/squashfs-tools/mksquashfs.c -+++ squashfs4.2/squashfs-tools/mksquashfs.c -@@ -60,6 +60,10 @@ - #include <sys/sysinfo.h> - #endif +--- squashfs4.3.orig/squashfs-tools/action.c ++++ squashfs4.3/squashfs-tools/action.c +@@ -1905,6 +1905,9 @@ + return 1; + } -+#if !defined(FNM_EXTMATCH) ++#ifndef FNM_EXTMATCH ++#define FNM_EXTMATCH 0 ++#endif + + TEST_FN(name, ACTION_ALL_LNK, \ + return fnmatch(atom->argv[0], action_data->name, +--- squashfs4.3.orig/squashfs-tools/mksquashfs.c ++++ squashfs4.3/squashfs-tools/mksquashfs.c +@@ -4391,6 +4391,9 @@ + return paths; + } + ++#ifndef FNM_EXTMATCH +#define FNM_EXTMATCH 0 +#endif -+ - #ifdef SQUASHFS_TRACE - #define TRACE(s, args...) \ - do { \ ---- squashfs4.2.orig/squashfs-tools/pseudo.c -+++ squashfs4.2/squashfs-tools/pseudo.c + + int excluded_match(char *name, struct pathname *path, struct pathnames **new) + { +--- squashfs4.3.orig/squashfs-tools/pseudo.c ++++ squashfs4.3/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" - ---- squashfs4.2.orig/squashfs-tools/unsquashfs.c -+++ squashfs4.2/squashfs-tools/unsquashfs.c -@@ -32,6 +32,10 @@ - #include <sys/sysinfo.h> - #include <sys/types.h> +--- squashfs4.3.orig/squashfs-tools/unsquashfs.c ++++ squashfs4.3/squashfs-tools/unsquashfs.c +@@ -1410,6 +1410,9 @@ + free(paths); + } +#ifndef FNM_EXTMATCH +#define FNM_EXTMATCH 0 +#endif -+ - struct cache *fragment_cache, *data_cache; - struct queue *to_reader, *to_deflate, *to_writer, *from_writer; - pthread_t *thread, *deflator_thread; + + int matches(struct pathnames *paths, char *name, struct pathnames **new) + { |