summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--metadata/pkg_desc_index2
-rw-r--r--sys-fs/squashfs-tools/Manifest2
-rw-r--r--sys-fs/squashfs-tools/files/squashfs-tools-4.3-aligned-data.patch15
-rw-r--r--sys-fs/squashfs-tools/files/squashfs-tools-4.3-smallstack.patch15
-rw-r--r--sys-fs/squashfs-tools/files/squashfs-tools-4.3-static-inline.patch88
-rw-r--r--sys-fs/squashfs-tools/squashfs-tools-4.3.1_alpha20190731.ebuild (renamed from sys-fs/squashfs-tools/squashfs-tools-4.3.1_alpha20190706.ebuild)6
-rw-r--r--sys-fs/squashfs-tools/squashfs-tools-99999999.ebuild6
7 files changed, 4 insertions, 130 deletions
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 57390e79..20500444 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -107,7 +107,7 @@ sys-block/zram-init 7.1-r2 8.1: Scripts to support compressed swap devices or ra
sys-boot/grub-cfg-mv 1.7: A grub.cfg library/example for GRUB2
sys-fs/emount 3.0.4: mount/unmount create/remove dm-crypt filesystems according to your /etc/fstab
sys-fs/squash_dir 13.14-r1: Keep directories compressed with squashfs. Useful for portage tree, texmf-dist
-sys-fs/squashfs-tools 4.3.1_alpha20190706 99999999: Tool for creating compressed filesystem type squashfs
+sys-fs/squashfs-tools 4.3.1_alpha20190731 99999999: Tool for creating compressed filesystem type squashfs
sys-fs/squashfuse 0.1.103 0.1.104_alpha20180721: FUSE filesystem to mount squashfs archives
sys-fs/squashmount 16.1.0-r1 20.0: Keep directories compressed with squashfs. Useful for portage tree, texmf-dist
sys-kernel/kccmp 0.3-r1: A simple tool for comparing two linux kernel .config files
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index e386eab0..e0c8e39f 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -1,2 +1,2 @@
-DIST squashfs-tools-4.3.1_alpha20190706.tar.gz 232302 SHA512 5afe06ac511c0930eaf42aaf9d55c83b5dbeb315903a35510edfb0e6d863529d9e7f87ce710ca21ab5e76d08593b7eab0e846572b176f2810746c1bfd2f8d932
+DIST squashfs-tools-4.3.1_alpha20190731.tar.gz 234445 SHA512 dd133f759dabdef007c3cb00ea3c66df90129840f7311a814423b2845405cf1f6e6281d75edd35403358d3ee87de9eada2441516dcda7576cedeb63aa797d7ed
DIST squashfs-tools_4.3-12.debian.tar.xz 27300 SHA512 13b04a85b1237b5a88a0e01f82b992d98e1b29e3a90a29230607c5232e0188d5402de55a08b6cf78b09f7da2eea05ccc6d15ac0de375af8004c468cfac1fe940
diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-aligned-data.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.3-aligned-data.patch
deleted file mode 100644
index 024129ff..00000000
--- a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-aligned-data.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-the mksquashfs code has an all_zeros func that does:
- long *p = (long *) file_buffer->data;
-
-make sure we force the data field to be aligned so that still works.
-
---- a/squashfs-tools/caches-queues-lists.h
-+++ b/squashfs-tools/caches-queues-lists.h
-@@ -123,6 +123,7 @@ struct file_buffer {
- char locked;
- char wait_on_unlock;
- char noD;
-+ long _pad;
- char data[0];
- };
-
diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-smallstack.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.3-smallstack.patch
deleted file mode 100644
index be8d537a..00000000
--- a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-smallstack.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-# Do not require a large stack. This is necessary for e.g. musl, see
-# https://sourceforge.net/p/squashfs/bugs/59/
---- a/unsquashfs.c
-+++ b/unsquashfs.c
-@@ -2136,7 +2136,9 @@
- */
- void *inflator(void *arg)
- {
-- char tmp[block_size];
-+ char *tmp = malloc(block_size);
-+ if(tmp == NULL)
-+ EXIT_UNSQUASH("Out of memory allocating block buffer\n");
-
- while(1) {
- struct cache_entry *entry = queue_get(to_inflate);
diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-static-inline.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.3-static-inline.patch
deleted file mode 100644
index a103f173..00000000
--- a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-static-inline.patch
+++ /dev/null
@@ -1,88 +0,0 @@
---- 1/mksquashfs.c
-+++ 1/mksquashfs.c
-@@ -828,13 +828,13 @@ char *subpathname(struct dir_ent *dir_ent)
- }
-
-
--inline unsigned int get_inode_no(struct inode_info *inode)
-+static inline unsigned int get_inode_no(struct inode_info *inode)
- {
- return inode->inode_number;
- }
-
-
--inline unsigned int get_parent_no(struct dir_info *dir)
-+static inline unsigned int get_parent_no(struct dir_info *dir)
- {
- return dir->depth ? get_inode_no(dir->dir_ent->inode) : inode_no;
- }
-@@ -2027,7 +2027,7 @@ struct file_info *duplicate(long long file_size, long long bytes,
- }
-
-
--inline int is_fragment(struct inode_info *inode)
-+static inline int is_fragment(struct inode_info *inode)
- {
- off_t file_size = inode->buf.st_size;
-
-@@ -2996,13 +2996,13 @@ struct inode_info *lookup_inode2(struct stat *buf, int pseudo, int id)
- }
-
-
--inline struct inode_info *lookup_inode(struct stat *buf)
-+static inline struct inode_info *lookup_inode(struct stat *buf)
- {
- return lookup_inode2(buf, 0, 0);
- }
-
-
--inline void alloc_inode_no(struct inode_info *inode, unsigned int use_this)
-+static inline void alloc_inode_no(struct inode_info *inode, unsigned int use_this)
- {
- if (inode->inode_number == 0) {
- inode->inode_number = use_this ? : inode_no ++;
-@@ -3013,7 +3013,7 @@ inline void alloc_inode_no(struct inode_info *inode, unsigned int use_this)
- }
-
-
--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));
-@@ -3031,7 +3031,7 @@ inline struct dir_ent *create_dir_entry(char *name, char *source_name,
- }
-
-
--inline void add_dir_entry(struct dir_ent *dir_ent, struct dir_info *sub_dir,
-+static inline void add_dir_entry(struct dir_ent *dir_ent, struct dir_info *sub_dir,
- struct inode_info *inode_info)
- {
- struct dir_info *dir = dir_ent->our_dir;
-@@ -3047,7 +3047,7 @@ inline void add_dir_entry(struct dir_ent *dir_ent, struct dir_info *sub_dir,
- }
-
-
--inline void add_dir_entry2(char *name, char *source_name,
-+static inline void add_dir_entry2(char *name, char *source_name,
- char *nonstandard_pathname, struct dir_info *sub_dir,
- struct inode_info *inode_info, struct dir_info *dir)
- {
-@@ -3059,7 +3059,7 @@ inline void add_dir_entry2(char *name, char *source_name,
- }
-
-
--inline void free_dir_entry(struct dir_ent *dir_ent)
-+static inline void free_dir_entry(struct dir_ent *dir_ent)
- {
- if(dir_ent->name)
- free(dir_ent->name);
-@@ -3080,7 +3080,7 @@ inline void free_dir_entry(struct dir_ent *dir_ent)
- }
-
-
--inline void add_excluded(struct dir_info *dir)
-+static inline void add_excluded(struct dir_info *dir)
- {
- dir->excluded ++;
- }
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3.1_alpha20190706.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3.1_alpha20190731.ebuild
index 3abffadf..de0c8dbe 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-4.3.1_alpha20190706.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.3.1_alpha20190731.ebuild
@@ -48,7 +48,7 @@ src_unpack() {
}
else
RESTRICT="mirror"
- EGIT_COMMIT="04ce7e5f4f5a87e4b0fb8b8fa9b4287af2bffd07"
+ EGIT_COMMIT="12d38b9f5cac88b3c18d8eb683f1361d1a7c67d6"
SRC_URI="https://github.com/plougher/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
${EXTRA_URI}"
S="${WORKDIR}/${P}/${PN}"
@@ -62,16 +62,12 @@ src_prepare() {
local debian
debian="${WORKDIR}"/debian/patches
eapply -p2 "${debian}"/0001-kfreebsd.patch
- eapply -p2 "${debian}"/0003-CVE-2015-4645_and_CVE-2015-4646.patch
eapply -p2 "${debian}"/0004-unsquashfs-add-support-for-LZMA-magics.patch
eapply -p2 "${debian}"/0009-unsquashfs-preserve-symlink-times.patch
eapply -p2 "${debian}"/0013-use-macros-not-raw-octal-with-chmod.patch
eapply -p2 "${debian}"/0014-also-set-stickybit-as-non-root.patch
- eapply -p2 "${debian}"/0015-numeric-uid-gid_to_unsquashfs.patch
eapply -p2 "${FILESDIR}"/${Pm}-sysmacros.patch
- eapply -p2 "${FILESDIR}"/${Pm}-aligned-data.patch
eapply "${FILESDIR}"/${Pm}-local-cve-fix.patch
- eapply "${FILESDIR}"/${Pm}-smallstack.patch
default
}
diff --git a/sys-fs/squashfs-tools/squashfs-tools-99999999.ebuild b/sys-fs/squashfs-tools/squashfs-tools-99999999.ebuild
index 3abffadf..de0c8dbe 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-99999999.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-99999999.ebuild
@@ -48,7 +48,7 @@ src_unpack() {
}
else
RESTRICT="mirror"
- EGIT_COMMIT="04ce7e5f4f5a87e4b0fb8b8fa9b4287af2bffd07"
+ EGIT_COMMIT="12d38b9f5cac88b3c18d8eb683f1361d1a7c67d6"
SRC_URI="https://github.com/plougher/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
${EXTRA_URI}"
S="${WORKDIR}/${P}/${PN}"
@@ -62,16 +62,12 @@ src_prepare() {
local debian
debian="${WORKDIR}"/debian/patches
eapply -p2 "${debian}"/0001-kfreebsd.patch
- eapply -p2 "${debian}"/0003-CVE-2015-4645_and_CVE-2015-4646.patch
eapply -p2 "${debian}"/0004-unsquashfs-add-support-for-LZMA-magics.patch
eapply -p2 "${debian}"/0009-unsquashfs-preserve-symlink-times.patch
eapply -p2 "${debian}"/0013-use-macros-not-raw-octal-with-chmod.patch
eapply -p2 "${debian}"/0014-also-set-stickybit-as-non-root.patch
- eapply -p2 "${debian}"/0015-numeric-uid-gid_to_unsquashfs.patch
eapply -p2 "${FILESDIR}"/${Pm}-sysmacros.patch
- eapply -p2 "${FILESDIR}"/${Pm}-aligned-data.patch
eapply "${FILESDIR}"/${Pm}-local-cve-fix.patch
- eapply "${FILESDIR}"/${Pm}-smallstack.patch
default
}