Date: Monday, October 2, 2017 @ 02:19:22 Author: grazzolini Revision: 261203
archrelease: copy trunk to community-x86_64, community-i686 Added: sshfs/repos/community-i686/001-sshfs-3.3.0-meson.build.patch (from rev 261202, sshfs/trunk/001-sshfs-3.3.0-meson.build.patch) sshfs/repos/community-i686/002-sshfs-3.3.0-sshfs.c.patch (from rev 261202, sshfs/trunk/002-sshfs-3.3.0-sshfs.c.patch) sshfs/repos/community-i686/PKGBUILD (from rev 261202, sshfs/trunk/PKGBUILD) sshfs/repos/community-x86_64/001-sshfs-3.3.0-meson.build.patch (from rev 261202, sshfs/trunk/001-sshfs-3.3.0-meson.build.patch) sshfs/repos/community-x86_64/002-sshfs-3.3.0-sshfs.c.patch (from rev 261202, sshfs/trunk/002-sshfs-3.3.0-sshfs.c.patch) sshfs/repos/community-x86_64/PKGBUILD (from rev 261202, sshfs/trunk/PKGBUILD) Deleted: sshfs/repos/community-i686/001-sshfs-3.3.0-meson.build.patch sshfs/repos/community-i686/PKGBUILD sshfs/repos/community-x86_64/001-sshfs-3.3.0-meson.build.patch sshfs/repos/community-x86_64/PKGBUILD ----------------------------------------------------+ /001-sshfs-3.3.0-meson.build.patch | 24 ++++ /PKGBUILD | 96 +++++++++++++++++++ community-i686/001-sshfs-3.3.0-meson.build.patch | 12 -- community-i686/002-sshfs-3.3.0-sshfs.c.patch | 21 ++++ community-i686/PKGBUILD | 42 -------- community-x86_64/001-sshfs-3.3.0-meson.build.patch | 12 -- community-x86_64/002-sshfs-3.3.0-sshfs.c.patch | 21 ++++ community-x86_64/PKGBUILD | 42 -------- 8 files changed, 162 insertions(+), 108 deletions(-) Deleted: community-i686/001-sshfs-3.3.0-meson.build.patch =================================================================== --- community-i686/001-sshfs-3.3.0-meson.build.patch 2017-10-02 02:18:08 UTC (rev 261202) +++ community-i686/001-sshfs-3.3.0-meson.build.patch 2017-10-02 02:19:22 UTC (rev 261203) @@ -1,12 +0,0 @@ -diff -ura sshfs-3.3.0.orig/meson.build sshfs-3.3.0.new/meson.build ---- sshfs-3.3.0.orig/meson.build 2017-09-20 14:08:27.000000000 -0300 -+++ sshfs-3.3.0.new/meson.build 2017-09-25 11:19:19.946623793 -0300 -@@ -58,7 +58,7 @@ - if rst2man.found() - custom_target('manpages', input: [ 'sshfs.rst' ], output: [ 'sshfs.1' ], - command: [rst2man, '@INPUT@', '@OUTPUT@'], install: true, -- install_dir: join_paths(get_option('mandir'), '1')) -+ install_dir: join_paths(get_option('mandir'), 'man1')) - else - message('rst2man not found, not building manual page.') - endif Copied: sshfs/repos/community-i686/001-sshfs-3.3.0-meson.build.patch (from rev 261202, sshfs/trunk/001-sshfs-3.3.0-meson.build.patch) =================================================================== --- community-i686/001-sshfs-3.3.0-meson.build.patch (rev 0) +++ community-i686/001-sshfs-3.3.0-meson.build.patch 2017-10-02 02:19:22 UTC (rev 261203) @@ -0,0 +1,12 @@ +diff -ura sshfs-3.3.0.orig/meson.build sshfs-3.3.0.new/meson.build +--- sshfs-3.3.0.orig/meson.build 2017-09-20 14:08:27.000000000 -0300 ++++ sshfs-3.3.0.new/meson.build 2017-09-25 11:19:19.946623793 -0300 +@@ -58,7 +58,7 @@ + if rst2man.found() + custom_target('manpages', input: [ 'sshfs.rst' ], output: [ 'sshfs.1' ], + command: [rst2man, '@INPUT@', '@OUTPUT@'], install: true, +- install_dir: join_paths(get_option('mandir'), '1')) ++ install_dir: join_paths(get_option('mandir'), 'man1')) + else + message('rst2man not found, not building manual page.') + endif Copied: sshfs/repos/community-i686/002-sshfs-3.3.0-sshfs.c.patch (from rev 261202, sshfs/trunk/002-sshfs-3.3.0-sshfs.c.patch) =================================================================== --- community-i686/002-sshfs-3.3.0-sshfs.c.patch (rev 0) +++ community-i686/002-sshfs-3.3.0-sshfs.c.patch 2017-10-02 02:19:22 UTC (rev 261203) @@ -0,0 +1,21 @@ +diff -ura sshfs-3.3.0.orig/sshfs.c sshfs-3.3.0.new/sshfs.c +--- sshfs-3.3.0.orig/sshfs.c 2017-09-20 14:08:27.000000000 -0300 ++++ sshfs-3.3.0.new/sshfs.c 2017-10-01 23:04:23.048755162 -0300 +@@ -428,9 +428,15 @@ + FUSE_OPT_KEY("writeback_cache=no", FUSE_OPT_KEY_DISCARD), + FUSE_OPT_KEY("unreliable_append", FUSE_OPT_KEY_DISCARD), + +- +- FUSE_OPT_END ++ /* These may come in from /etc/fstab - we just ignore them */ ++ FUSE_OPT_KEY("auto", FUSE_OPT_KEY_DISCARD), ++ FUSE_OPT_KEY("noauto", FUSE_OPT_KEY_DISCARD), ++ FUSE_OPT_KEY("user", FUSE_OPT_KEY_DISCARD), ++ FUSE_OPT_KEY("nouser", FUSE_OPT_KEY_DISCARD), ++ FUSE_OPT_KEY("users", FUSE_OPT_KEY_DISCARD), ++ FUSE_OPT_KEY("_netdev", FUSE_OPT_KEY_DISCARD), + ++ FUSE_OPT_END + }; + + static struct fuse_opt workaround_opts[] = { Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2017-10-02 02:18:08 UTC (rev 261202) +++ community-i686/PKGBUILD 2017-10-02 02:19:22 UTC (rev 261203) @@ -1,42 +0,0 @@ -# $Id$ -# Maintainer: Giancarlo Razzolini <grazzol...@archlinux.org> -# Contributor: Antonio Rojas <aro...@archlinux.org> -# Contributor: Giovanni Scafora <giova...@archlinux.org> - -pkgname=sshfs -pkgver=3.3.0 -pkgrel=3 -pkgdesc="FUSE client based on the SSH File Transfer Protocol" -arch=(x86_64 i686) -url="http://github.com/libfuse/sshfs" -license=(GPL) -depends=(fuse3 glib2 openssh) -makedepends=('meson' 'python-docutils') -source=(https://github.com/libfuse/sshfs/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.xz{,.asc} - 001-sshfs-3.3.0-meson.build.patch) -sha256sums=('9ddfcc2564fafe002706b093b6295afbcb2cc0a3bc52bc805cc5361cb69ca51d' - 'SKIP' - 'da928d31291ad86582ab616ea91619c345513dec00f6aafb5bac8f2929159e6b') -validpgpkeys=('ED31791B2C5C1613AF388B8AD113FCAC3C4E599F') # Nikolaus Rath <nikol...@rath.org> - -prepare() { - cd $pkgname-$pkgver - - # patch meson.build - patch -p1 < ../001-sshfs-3.3.0-meson.build.patch - - [[ $CARCH == 'i686' ]] && export CFLAGS+=" -D_FILE_OFFSET_BITS=64" - rm -rf build - meson setup --prefix=/usr --sbindir=bin . build -} - -build() { - cd $pkgname-$pkgver/build - ninja -} - -package() { - cd $pkgname-$pkgver/build - - DESTDIR="$pkgdir" ninja install -} Copied: sshfs/repos/community-i686/PKGBUILD (from rev 261202, sshfs/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2017-10-02 02:19:22 UTC (rev 261203) @@ -0,0 +1,48 @@ +# $Id$ +# Maintainer: Giancarlo Razzolini <grazzol...@archlinux.org> +# Contributor: Antonio Rojas <aro...@archlinux.org> +# Contributor: Giovanni Scafora <giova...@archlinux.org> + +pkgname=sshfs +pkgver=3.3.0 +pkgrel=4 +pkgdesc="FUSE client based on the SSH File Transfer Protocol" +arch=(x86_64 i686) +url="http://github.com/libfuse/sshfs" +license=(GPL) +depends=(fuse3 glib2 openssh) +makedepends=('meson' 'python-docutils') +source=(https://github.com/libfuse/sshfs/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.xz{,.asc} + 001-sshfs-3.3.0-meson.build.patch + 002-sshfs-3.3.0-sshfs.c.patch) +sha256sums=('9ddfcc2564fafe002706b093b6295afbcb2cc0a3bc52bc805cc5361cb69ca51d' + 'SKIP' + 'da928d31291ad86582ab616ea91619c345513dec00f6aafb5bac8f2929159e6b' + '2655139190ee5d2d295afc89a4ae028e78b881ecad9e03fcf9cd1869b2e4e439') +validpgpkeys=('ED31791B2C5C1613AF388B8AD113FCAC3C4E599F') # Nikolaus Rath <nikol...@rath.org> + +prepare() { + cd $pkgname-$pkgver + + # patch meson.build + patch -p1 < ../001-sshfs-3.3.0-meson.build.patch + # patch sshfs.c + patch -p1 < ../002-sshfs-3.3.0-sshfs.c.patch + + [[ $CARCH == 'i686' ]] && export CFLAGS+=" -D_FILE_OFFSET_BITS=64" + rm -rf build + mkdir build + cd build + arch-meson .. +} + +build() { + cd $pkgname-$pkgver/build + ninja +} + +package() { + cd $pkgname-$pkgver/build + + DESTDIR="$pkgdir" ninja install +} Deleted: community-x86_64/001-sshfs-3.3.0-meson.build.patch =================================================================== --- community-x86_64/001-sshfs-3.3.0-meson.build.patch 2017-10-02 02:18:08 UTC (rev 261202) +++ community-x86_64/001-sshfs-3.3.0-meson.build.patch 2017-10-02 02:19:22 UTC (rev 261203) @@ -1,12 +0,0 @@ -diff -ura sshfs-3.3.0.orig/meson.build sshfs-3.3.0.new/meson.build ---- sshfs-3.3.0.orig/meson.build 2017-09-20 14:08:27.000000000 -0300 -+++ sshfs-3.3.0.new/meson.build 2017-09-25 11:19:19.946623793 -0300 -@@ -58,7 +58,7 @@ - if rst2man.found() - custom_target('manpages', input: [ 'sshfs.rst' ], output: [ 'sshfs.1' ], - command: [rst2man, '@INPUT@', '@OUTPUT@'], install: true, -- install_dir: join_paths(get_option('mandir'), '1')) -+ install_dir: join_paths(get_option('mandir'), 'man1')) - else - message('rst2man not found, not building manual page.') - endif Copied: sshfs/repos/community-x86_64/001-sshfs-3.3.0-meson.build.patch (from rev 261202, sshfs/trunk/001-sshfs-3.3.0-meson.build.patch) =================================================================== --- community-x86_64/001-sshfs-3.3.0-meson.build.patch (rev 0) +++ community-x86_64/001-sshfs-3.3.0-meson.build.patch 2017-10-02 02:19:22 UTC (rev 261203) @@ -0,0 +1,12 @@ +diff -ura sshfs-3.3.0.orig/meson.build sshfs-3.3.0.new/meson.build +--- sshfs-3.3.0.orig/meson.build 2017-09-20 14:08:27.000000000 -0300 ++++ sshfs-3.3.0.new/meson.build 2017-09-25 11:19:19.946623793 -0300 +@@ -58,7 +58,7 @@ + if rst2man.found() + custom_target('manpages', input: [ 'sshfs.rst' ], output: [ 'sshfs.1' ], + command: [rst2man, '@INPUT@', '@OUTPUT@'], install: true, +- install_dir: join_paths(get_option('mandir'), '1')) ++ install_dir: join_paths(get_option('mandir'), 'man1')) + else + message('rst2man not found, not building manual page.') + endif Copied: sshfs/repos/community-x86_64/002-sshfs-3.3.0-sshfs.c.patch (from rev 261202, sshfs/trunk/002-sshfs-3.3.0-sshfs.c.patch) =================================================================== --- community-x86_64/002-sshfs-3.3.0-sshfs.c.patch (rev 0) +++ community-x86_64/002-sshfs-3.3.0-sshfs.c.patch 2017-10-02 02:19:22 UTC (rev 261203) @@ -0,0 +1,21 @@ +diff -ura sshfs-3.3.0.orig/sshfs.c sshfs-3.3.0.new/sshfs.c +--- sshfs-3.3.0.orig/sshfs.c 2017-09-20 14:08:27.000000000 -0300 ++++ sshfs-3.3.0.new/sshfs.c 2017-10-01 23:04:23.048755162 -0300 +@@ -428,9 +428,15 @@ + FUSE_OPT_KEY("writeback_cache=no", FUSE_OPT_KEY_DISCARD), + FUSE_OPT_KEY("unreliable_append", FUSE_OPT_KEY_DISCARD), + +- +- FUSE_OPT_END ++ /* These may come in from /etc/fstab - we just ignore them */ ++ FUSE_OPT_KEY("auto", FUSE_OPT_KEY_DISCARD), ++ FUSE_OPT_KEY("noauto", FUSE_OPT_KEY_DISCARD), ++ FUSE_OPT_KEY("user", FUSE_OPT_KEY_DISCARD), ++ FUSE_OPT_KEY("nouser", FUSE_OPT_KEY_DISCARD), ++ FUSE_OPT_KEY("users", FUSE_OPT_KEY_DISCARD), ++ FUSE_OPT_KEY("_netdev", FUSE_OPT_KEY_DISCARD), + ++ FUSE_OPT_END + }; + + static struct fuse_opt workaround_opts[] = { Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2017-10-02 02:18:08 UTC (rev 261202) +++ community-x86_64/PKGBUILD 2017-10-02 02:19:22 UTC (rev 261203) @@ -1,42 +0,0 @@ -# $Id$ -# Maintainer: Giancarlo Razzolini <grazzol...@archlinux.org> -# Contributor: Antonio Rojas <aro...@archlinux.org> -# Contributor: Giovanni Scafora <giova...@archlinux.org> - -pkgname=sshfs -pkgver=3.3.0 -pkgrel=3 -pkgdesc="FUSE client based on the SSH File Transfer Protocol" -arch=(x86_64 i686) -url="http://github.com/libfuse/sshfs" -license=(GPL) -depends=(fuse3 glib2 openssh) -makedepends=('meson' 'python-docutils') -source=(https://github.com/libfuse/sshfs/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.xz{,.asc} - 001-sshfs-3.3.0-meson.build.patch) -sha256sums=('9ddfcc2564fafe002706b093b6295afbcb2cc0a3bc52bc805cc5361cb69ca51d' - 'SKIP' - 'da928d31291ad86582ab616ea91619c345513dec00f6aafb5bac8f2929159e6b') -validpgpkeys=('ED31791B2C5C1613AF388B8AD113FCAC3C4E599F') # Nikolaus Rath <nikol...@rath.org> - -prepare() { - cd $pkgname-$pkgver - - # patch meson.build - patch -p1 < ../001-sshfs-3.3.0-meson.build.patch - - [[ $CARCH == 'i686' ]] && export CFLAGS+=" -D_FILE_OFFSET_BITS=64" - rm -rf build - meson setup --prefix=/usr --sbindir=bin . build -} - -build() { - cd $pkgname-$pkgver/build - ninja -} - -package() { - cd $pkgname-$pkgver/build - - DESTDIR="$pkgdir" ninja install -} Copied: sshfs/repos/community-x86_64/PKGBUILD (from rev 261202, sshfs/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2017-10-02 02:19:22 UTC (rev 261203) @@ -0,0 +1,48 @@ +# $Id$ +# Maintainer: Giancarlo Razzolini <grazzol...@archlinux.org> +# Contributor: Antonio Rojas <aro...@archlinux.org> +# Contributor: Giovanni Scafora <giova...@archlinux.org> + +pkgname=sshfs +pkgver=3.3.0 +pkgrel=4 +pkgdesc="FUSE client based on the SSH File Transfer Protocol" +arch=(x86_64 i686) +url="http://github.com/libfuse/sshfs" +license=(GPL) +depends=(fuse3 glib2 openssh) +makedepends=('meson' 'python-docutils') +source=(https://github.com/libfuse/sshfs/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.xz{,.asc} + 001-sshfs-3.3.0-meson.build.patch + 002-sshfs-3.3.0-sshfs.c.patch) +sha256sums=('9ddfcc2564fafe002706b093b6295afbcb2cc0a3bc52bc805cc5361cb69ca51d' + 'SKIP' + 'da928d31291ad86582ab616ea91619c345513dec00f6aafb5bac8f2929159e6b' + '2655139190ee5d2d295afc89a4ae028e78b881ecad9e03fcf9cd1869b2e4e439') +validpgpkeys=('ED31791B2C5C1613AF388B8AD113FCAC3C4E599F') # Nikolaus Rath <nikol...@rath.org> + +prepare() { + cd $pkgname-$pkgver + + # patch meson.build + patch -p1 < ../001-sshfs-3.3.0-meson.build.patch + # patch sshfs.c + patch -p1 < ../002-sshfs-3.3.0-sshfs.c.patch + + [[ $CARCH == 'i686' ]] && export CFLAGS+=" -D_FILE_OFFSET_BITS=64" + rm -rf build + mkdir build + cd build + arch-meson .. +} + +build() { + cd $pkgname-$pkgver/build + ninja +} + +package() { + cd $pkgname-$pkgver/build + + DESTDIR="$pkgdir" ninja install +}