summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Väth <mvath@google.com>2019-08-24 15:52:35 +0200
committerMartin Väth <mvath@google.com>2019-08-24 15:53:22 +0200
commitf3fe7ee9575b056455e226bd45617cde854b9936 (patch)
tree27a40920cf40c1197097cb5225e6289f2c605798 /sys-fs/squashfs-tools
parentsys-block/zram-init: Version bump (diff)
downloadmv-f3fe7ee9575b056455e226bd45617cde854b9936.tar.gz
mv-f3fe7ee9575b056455e226bd45617cde854b9936.tar.bz2
mv-f3fe7ee9575b056455e226bd45617cde854b9936.zip
fast-syntax-highlighting, schily-tools, squashfs-tools: Version bumps
Signed-off-by: Martin Väth <mvath@google.com>
Diffstat (limited to 'sys-fs/squashfs-tools')
-rw-r--r--sys-fs/squashfs-tools/Manifest2
-rw-r--r--sys-fs/squashfs-tools/files/squashfs-tools-4.4_alpha20190823-write_xattr.patch13
-rw-r--r--sys-fs/squashfs-tools/squashfs-tools-4.4_alpha20190823.ebuild (renamed from sys-fs/squashfs-tools/squashfs-tools-4.3.1_alpha20190731.ebuild)7
-rw-r--r--sys-fs/squashfs-tools/squashfs-tools-99999999.ebuild7
4 files changed, 18 insertions, 11 deletions
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index e0c8e39f..4335ad1a 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -1,2 +1,2 @@
-DIST squashfs-tools-4.3.1_alpha20190731.tar.gz 234445 SHA512 dd133f759dabdef007c3cb00ea3c66df90129840f7311a814423b2845405cf1f6e6281d75edd35403358d3ee87de9eada2441516dcda7576cedeb63aa797d7ed
+DIST squashfs-tools-4.4_alpha20190823.tar.gz 242804 SHA512 abcc38d542325ffe3d27620d254cbc02d0c9ed9f4e3573d31481038ce99156cf073150f2b5117f366a7151122607207890341486c0b382e8e0df805070f85c40
DIST squashfs-tools_4.3-12.debian.tar.xz 27300 SHA512 13b04a85b1237b5a88a0e01f82b992d98e1b29e3a90a29230607c5232e0188d5402de55a08b6cf78b09f7da2eea05ccc6d15ac0de375af8004c468cfac1fe940
diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-4.4_alpha20190823-write_xattr.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.4_alpha20190823-write_xattr.patch
new file mode 100644
index 00000000..c59bf39d
--- /dev/null
+++ b/sys-fs/squashfs-tools/files/squashfs-tools-4.4_alpha20190823-write_xattr.patch
@@ -0,0 +1,13 @@
+--- 1/squashfs-tools/xattr.h
++++ 1/squashfs-tools/xattr.h
+@@ -110,8 +110,9 @@
+ }
+
+
+-static inline void write_xattr(char *pathname, unsigned int xattr)
++static inline int write_xattr(char *pathname, unsigned int xattr)
+ {
++ return 0;
+ }
+
+
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3.1_alpha20190731.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.4_alpha20190823.ebuild
index de0c8dbe..8b902d72 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-4.3.1_alpha20190731.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.4_alpha20190823.ebuild
@@ -48,7 +48,7 @@ src_unpack() {
}
else
RESTRICT="mirror"
- EGIT_COMMIT="12d38b9f5cac88b3c18d8eb683f1361d1a7c67d6"
+ EGIT_COMMIT="c3ab7d1d28c030a5428a6cd565a5af17ecb6498b"
SRC_URI="https://github.com/plougher/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
${EXTRA_URI}"
S="${WORKDIR}/${P}/${PN}"
@@ -62,12 +62,9 @@ src_prepare() {
local debian
debian="${WORKDIR}"/debian/patches
eapply -p2 "${debian}"/0001-kfreebsd.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 "${FILESDIR}"/${Pm}-sysmacros.patch
eapply "${FILESDIR}"/${Pm}-local-cve-fix.patch
+ eapply -p2 "${FILESDIR}"/${P}-write_xattr.patch
default
}
diff --git a/sys-fs/squashfs-tools/squashfs-tools-99999999.ebuild b/sys-fs/squashfs-tools/squashfs-tools-99999999.ebuild
index de0c8dbe..8b902d72 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="12d38b9f5cac88b3c18d8eb683f1361d1a7c67d6"
+ EGIT_COMMIT="c3ab7d1d28c030a5428a6cd565a5af17ecb6498b"
SRC_URI="https://github.com/plougher/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
${EXTRA_URI}"
S="${WORKDIR}/${P}/${PN}"
@@ -62,12 +62,9 @@ src_prepare() {
local debian
debian="${WORKDIR}"/debian/patches
eapply -p2 "${debian}"/0001-kfreebsd.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 "${FILESDIR}"/${Pm}-sysmacros.patch
eapply "${FILESDIR}"/${Pm}-local-cve-fix.patch
+ eapply -p2 "${FILESDIR}"/${P}-write_xattr.patch
default
}