[arch-commits] Commit in (10 files)
Anatol Pomozov
anatolik at archlinux.org
Mon Dec 12 21:02:14 UTC 2016
Date: Monday, December 12, 2016 @ 21:02:13
Author: anatolik
Revision: 283082
Add fuse3 package
Rename fuse to fuse2 package
https://github.com/libfuse/libfuse/releases/tag/fuse-3.0.0
Added:
fuse2/
fuse3/
Modified:
fuse2/trunk/PKGBUILD
fuse3/trunk/PKGBUILD
Deleted:
fuse/
fuse2/trunk/fuse.conf
fuse3/repos/extra-i686/PKGBUILD
fuse3/repos/extra-i686/fuse.conf
fuse3/repos/extra-x86_64/PKGBUILD
fuse3/repos/extra-x86_64/fuse.conf
------------------------------+
repos/extra-i686/PKGBUILD | 48 --------------------------
repos/extra-i686/fuse.conf | 9 ----
repos/extra-x86_64/PKGBUILD | 48 --------------------------
repos/extra-x86_64/fuse.conf | 9 ----
trunk/PKGBUILD | 75 ++++++++++++++++++++++++++---------------
trunk/fuse.conf | 9 ----
6 files changed, 48 insertions(+), 150 deletions(-)
Modified: fuse2/trunk/PKGBUILD
===================================================================
--- fuse/trunk/PKGBUILD 2016-12-12 20:52:18 UTC (rev 283081)
+++ fuse2/trunk/PKGBUILD 2016-12-12 21:02:13 UTC (rev 283082)
@@ -3,21 +3,22 @@
# Contributor: Tom Gundersen <teg at jklm.no>
# Contributor: Mark Rosenstand <mark at archlinux.org>
-pkgname=fuse
+pkgname=fuse2
pkgver=2.9.7
-pkgrel=1
+pkgrel=2
pkgdesc="A library that makes it possible to implement a filesystem in a userspace program."
arch=('i686' 'x86_64')
url='https://github.com/libfuse/libfuse'
license=('GPL2')
-depends=('glibc')
+provides=('fuse') # TODO: remove it once all packages start to use 'fuse2' name
+replaces=('fuse')
+conflicts=('fuse')
+depends=('glibc' 'fuse-common')
makedepends=('pkg-config')
-backup=(etc/fuse.conf)
-source=(https://github.com/libfuse/libfuse/releases/download/fuse-$pkgver/fuse-$pkgver.tar.gz{,.asc}
- 'fuse.conf')
+options=(!emptydirs)
+source=(https://github.com/libfuse/libfuse/releases/download/fuse-$pkgver/fuse-$pkgver.tar.gz{,.asc})
sha1sums=('cd174e3d37995a42fad32fac92f76cd18e24174f'
- 'SKIP'
- '3b42e37a741d4651099225987dc40e7f02a716ad')
+ 'SKIP')
validpgpkeys=(ED31791B2C5C1613AF388B8AD113FCAC3C4E599F) # Nikolaus Rath <Nikolaus at rath.org>
build() {
@@ -35,14 +36,14 @@
# Remove init script in wrong path
# Don't add our own for now, as fusectl fs oopses on 2.6.18
- rm -rf ${pkgdir}/etc/init.d
+ rm -r ${pkgdir}/etc/init.d
- # install sample config file
- install -Dm644 ${srcdir}/fuse.conf ${pkgdir}/etc/fuse.conf
-
# remove udev rules (is in the udev package}
rm -rf ${pkgdir}/etc/udev
# static device nodes are handled by udev
- rm -rf ${pkgdir}/dev
+ rm -r ${pkgdir}/dev
+
+ # part of fuse-common package
+ rm ${pkgdir}/usr/share/man/man8/mount.fuse.8
}
Deleted: fuse2/trunk/fuse.conf
===================================================================
--- fuse/trunk/fuse.conf 2016-12-12 20:52:18 UTC (rev 283081)
+++ fuse2/trunk/fuse.conf 2016-12-12 21:02:13 UTC (rev 283082)
@@ -1,9 +0,0 @@
-# Set the maximum number of FUSE mounts allowed to non-root users.
-# The default is 1000.
-#
-#mount_max = 1000
-
-# Allow non-root users to specify the 'allow_other' or 'allow_root'
-# mount options.
-#
-#user_allow_other
Deleted: fuse3/repos/extra-i686/PKGBUILD
===================================================================
--- fuse/repos/extra-i686/PKGBUILD 2016-12-09 19:33:23 UTC (rev 282970)
+++ fuse3/repos/extra-i686/PKGBUILD 2016-12-12 21:02:13 UTC (rev 283082)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Tom Gundersen <teg at jklm.no>
-# Contributor: Mark Rosenstand <mark at archlinux.org>
-
-pkgname=fuse
-pkgver=2.9.7
-pkgrel=1
-pkgdesc="A library that makes it possible to implement a filesystem in a userspace program."
-arch=('i686' 'x86_64')
-url='https://github.com/libfuse/libfuse'
-license=('GPL2')
-depends=('glibc')
-makedepends=('pkg-config')
-backup=(etc/fuse.conf)
-_tag=fuse-$pkgver
-source=(https://github.com/libfuse/libfuse/archive/$_tag.zip
- 'fuse.conf')
-sha1sums=('805be38cbfb29d05036b03f2560b193010c38720'
- '3b42e37a741d4651099225987dc40e7f02a716ad')
-
-build() {
- cd libfuse-$_tag
-
- ./makeconf.sh
- export MOUNT_FUSE_PATH=/usr/bin
- ./configure --prefix=/usr --libdir=/usr/lib --enable-lib --enable-util --disable-example
- make
-}
-
-package() {
- cd libfuse-$_tag
-
- make DESTDIR=${pkgdir} install
-
- # Remove init script in wrong path
- # Don't add our own for now, as fusectl fs oopses on 2.6.18
- rm -rf ${pkgdir}/etc/init.d
-
- # install sample config file
- install -Dm644 ${srcdir}/fuse.conf ${pkgdir}/etc/fuse.conf
-
- # remove udev rules (is in the udev package}
- rm -rf ${pkgdir}/etc/udev
-
- # static device nodes are handled by udev
- rm -rf ${pkgdir}/dev
-}
Deleted: fuse3/repos/extra-i686/fuse.conf
===================================================================
--- fuse/repos/extra-i686/fuse.conf 2016-12-09 19:33:23 UTC (rev 282970)
+++ fuse3/repos/extra-i686/fuse.conf 2016-12-12 21:02:13 UTC (rev 283082)
@@ -1,9 +0,0 @@
-# Set the maximum number of FUSE mounts allowed to non-root users.
-# The default is 1000.
-#
-#mount_max = 1000
-
-# Allow non-root users to specify the 'allow_other' or 'allow_root'
-# mount options.
-#
-#user_allow_other
Deleted: fuse3/repos/extra-x86_64/PKGBUILD
===================================================================
--- fuse/repos/extra-x86_64/PKGBUILD 2016-12-09 19:33:23 UTC (rev 282970)
+++ fuse3/repos/extra-x86_64/PKGBUILD 2016-12-12 21:02:13 UTC (rev 283082)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Tom Gundersen <teg at jklm.no>
-# Contributor: Mark Rosenstand <mark at archlinux.org>
-
-pkgname=fuse
-pkgver=2.9.7
-pkgrel=1
-pkgdesc="A library that makes it possible to implement a filesystem in a userspace program."
-arch=('i686' 'x86_64')
-url='https://github.com/libfuse/libfuse'
-license=('GPL2')
-depends=('glibc')
-makedepends=('pkg-config')
-backup=(etc/fuse.conf)
-_tag=fuse-$pkgver
-source=(https://github.com/libfuse/libfuse/archive/$_tag.zip
- 'fuse.conf')
-sha1sums=('805be38cbfb29d05036b03f2560b193010c38720'
- '3b42e37a741d4651099225987dc40e7f02a716ad')
-
-build() {
- cd libfuse-$_tag
-
- ./makeconf.sh
- export MOUNT_FUSE_PATH=/usr/bin
- ./configure --prefix=/usr --libdir=/usr/lib --enable-lib --enable-util --disable-example
- make
-}
-
-package() {
- cd libfuse-$_tag
-
- make DESTDIR=${pkgdir} install
-
- # Remove init script in wrong path
- # Don't add our own for now, as fusectl fs oopses on 2.6.18
- rm -rf ${pkgdir}/etc/init.d
-
- # install sample config file
- install -Dm644 ${srcdir}/fuse.conf ${pkgdir}/etc/fuse.conf
-
- # remove udev rules (is in the udev package}
- rm -rf ${pkgdir}/etc/udev
-
- # static device nodes are handled by udev
- rm -rf ${pkgdir}/dev
-}
Deleted: fuse3/repos/extra-x86_64/fuse.conf
===================================================================
--- fuse/repos/extra-x86_64/fuse.conf 2016-12-09 19:33:23 UTC (rev 282970)
+++ fuse3/repos/extra-x86_64/fuse.conf 2016-12-12 21:02:13 UTC (rev 283082)
@@ -1,9 +0,0 @@
-# Set the maximum number of FUSE mounts allowed to non-root users.
-# The default is 1000.
-#
-#mount_max = 1000
-
-# Allow non-root users to specify the 'allow_other' or 'allow_root'
-# mount options.
-#
-#user_allow_other
Modified: fuse3/trunk/PKGBUILD
===================================================================
--- fuse/trunk/PKGBUILD 2016-12-09 19:33:23 UTC (rev 282970)
+++ fuse3/trunk/PKGBUILD 2016-12-12 21:02:13 UTC (rev 283082)
@@ -3,19 +3,18 @@
# Contributor: Tom Gundersen <teg at jklm.no>
# Contributor: Mark Rosenstand <mark at archlinux.org>
-pkgname=fuse
-pkgver=2.9.7
+pkgbase=fuse3
+pkgname=(fuse-common fuse3)
+pkgver=3.0.0
pkgrel=1
-pkgdesc="A library that makes it possible to implement a filesystem in a userspace program."
arch=('i686' 'x86_64')
url='https://github.com/libfuse/libfuse'
license=('GPL2')
-depends=('glibc')
makedepends=('pkg-config')
-backup=(etc/fuse.conf)
+options=(!emptydirs)
source=(https://github.com/libfuse/libfuse/releases/download/fuse-$pkgver/fuse-$pkgver.tar.gz{,.asc}
'fuse.conf')
-sha1sums=('cd174e3d37995a42fad32fac92f76cd18e24174f'
+sha1sums=('0aa9a250a91cc6de028eeaf853d6c581c0824b04'
'SKIP'
'3b42e37a741d4651099225987dc40e7f02a716ad')
validpgpkeys=(ED31791B2C5C1613AF388B8AD113FCAC3C4E599F) # Nikolaus Rath <Nikolaus at rath.org>
@@ -28,21 +27,42 @@
make
}
-package() {
+package_fuse-common() {
+ pkgdesc="Common files for fuse2/3 packages"
+ backup=(etc/fuse.conf)
+
cd fuse-$pkgver
-
make DESTDIR=${pkgdir} install
+ install -Dm644 ${srcdir}/fuse.conf ${pkgdir}/etc/fuse.conf
+
+ # static device nodes are handled by udev
+ rm -r ${pkgdir}/dev
+
# Remove init script in wrong path
# Don't add our own for now, as fusectl fs oopses on 2.6.18
- rm -rf ${pkgdir}/etc/init.d
+ rm -r ${pkgdir}/usr/etc/init.d
- # install sample config file
- install -Dm644 ${srcdir}/fuse.conf ${pkgdir}/etc/fuse.conf
+ # part of fuse3 package
+ rm -r ${pkgdir}/usr/{bin,include,lib/{pkgconfig,libfuse3.so*,*.a},share/man/man1/fusermount3.1}
+}
- # remove udev rules (is in the udev package}
- rm -rf ${pkgdir}/etc/udev
+package_fuse3() {
+ pkgdesc="A library that makes it possible to implement a filesystem in a userspace program."
+ depends=('glibc' 'fuse-common')
+ cd fuse-$pkgver
+
+ make DESTDIR=${pkgdir} install
+
+ # Remove init script in wrong path
+ # Don't add our own for now, as fusectl fs oopses on 2.6.18
+ rm -r ${pkgdir}/usr/etc/init.d
+
# static device nodes are handled by udev
- rm -rf ${pkgdir}/dev
+ rm -r ${pkgdir}/dev
+
+ # part of fuse-common package
+ rm -r ${pkgdir}/usr/lib/udev/rules.d
+ rm ${pkgdir}/usr/share/man/man8/mount.fuse.8
}
More information about the arch-commits
mailing list