From 8f4611ec1b533295175f57ee9327b58f5f890303 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sat, 1 Sep 2018 15:58:26 -0300 Subject: [PATCH] fuse3: update to 3.2.6. --- .../fuse3/patches/fix-install-script.patch | 41 +++++++++++++++++++ .../fuse3/patches/skip-install-script.patch | 10 ----- srcpkgs/fuse3/template | 5 ++- 3 files changed, 44 insertions(+), 12 deletions(-) create mode 100644 srcpkgs/fuse3/patches/fix-install-script.patch delete mode 100644 srcpkgs/fuse3/patches/skip-install-script.patch diff --git a/srcpkgs/fuse3/patches/fix-install-script.patch b/srcpkgs/fuse3/patches/fix-install-script.patch new file mode 100644 index 0000000000..eeb42a1e05 --- /dev/null +++ b/srcpkgs/fuse3/patches/fix-install-script.patch @@ -0,0 +1,41 @@ +--- util/install_helper.sh ++++ util/install_helper.sh +@@ -7,7 +7,6 @@ + set -e + + sysconfdir="$1" +-bindir="$2" + udevrulesdir="$3" + + # Both sysconfdir and bindir are absolute paths (since they are joined +@@ -22,30 +21,9 @@ else + DESTDIR="${DESTDIR%/}" + fi + +-chown root:root "${DESTDIR}${bindir}/fusermount3" +-chmod u+s "${DESTDIR}${bindir}/fusermount3" +- + install -D -m 644 "${MESON_SOURCE_ROOT}/util/fuse.conf" \ + "${DESTDIR}${sysconfdir}/fuse.conf" + + +-if test ! -e "${DESTDIR}/dev/fuse"; then +- mkdir -p "${DESTDIR}/dev" +- mknod "${DESTDIR}/dev/fuse" -m 0666 c 10 229 +-fi +- + install -D -m 644 "${MESON_SOURCE_ROOT}/util/udev.rules" \ + "${DESTDIR}${udevrulesdir}/99-fuse3.rules" +- +-install -D -m 755 "${MESON_SOURCE_ROOT}/util/init_script" \ +- "${DESTDIR}${sysconfdir}/init.d/fuse3" +- +- +-if test -x /usr/sbin/update-rc.d && test -z "${DESTDIR}"; then +- /usr/sbin/update-rc.d fuse3 start 34 S . start 41 0 6 . || /bin/true +-else +- echo "== FURTHER ACTION REQUIRED ==" +- echo "Make sure that your init system will start the ${sysconfdir}/init.d/fuse3 init script" +-fi +- +- diff --git a/srcpkgs/fuse3/patches/skip-install-script.patch b/srcpkgs/fuse3/patches/skip-install-script.patch deleted file mode 100644 index c1a527981c..0000000000 --- a/srcpkgs/fuse3/patches/skip-install-script.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- util/meson.build.orig 2017-09-12 13:50:16.000000000 +0000 -+++ util/meson.build 2017-09-24 22:54:36.469742098 +0000 -@@ -21,7 +21,3 @@ - udev = dependency('udev') - udevrulesdir = join_paths(udev.get_pkgconfig_variable('udevdir'), 'rules.d') - --meson.add_install_script('install_helper.sh', get_option('sysconfdir'), -- get_option('bindir'), udevrulesdir) -- -- diff --git a/srcpkgs/fuse3/template b/srcpkgs/fuse3/template index 30ff69034f..da0140d1d7 100644 --- a/srcpkgs/fuse3/template +++ b/srcpkgs/fuse3/template @@ -1,6 +1,6 @@ # Template file for 'fuse3' pkgname=fuse3 -version=3.2.5 +version=3.2.6 revision=1 wrksrc="fuse-${version}" build_style=meson @@ -12,7 +12,8 @@ maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://github.com/libfuse/libfuse" distfiles="https://github.com/libfuse/libfuse/releases/download/fuse-${version}/fuse-${version}.tar.xz" -checksum=3fa7534aae3d9523bd0245f085eb753a9b9d0dc9d2902dd51d6959b2b5394cf1 +checksum=cea4dad559b3fbdbb8e4ad5f9df6083fdb7f2b904104bd507ef790d311d271cf +conf_files="/etc/fuse.conf" post_install() { chmod u+s ${DESTDIR}/usr/bin/fusermount3