summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabian Maurer2016-08-31 05:13:56 +0200
committerFabian Maurer2016-08-31 05:13:56 +0200
commit669b5bb4f21b98598d8daf7da404c1f953dd3582 (patch)
treed86ad2fb0de8208e48efdcbbe3f912330443f188
parent0283823cce7734629183e7f977a3933d545c9d6a (diff)
downloadaur-669b5bb4f21b98598d8daf7da404c1f953dd3582.tar.gz
Update to SDFS 3.2.1, now support spaced in buildpath
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD28
-rw-r--r--mount.patch15
3 files changed, 17 insertions, 38 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4cae0b4032c3..82d266199192 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,15 @@
pkgbase = sdfs
pkgdesc = Deduplication file system from Opendedup
- pkgver = 3.1.7
- pkgrel = 2
+ pkgver = 3.2.1
+ pkgrel = 1
url = http://opendedup.org
arch = x86_64
license = GPL2
depends = libxml2
- depends = java-environment
+ depends = java-runtime
depends = fuse
- source = https://github.com/opendedup/sdfs/archive/3.1.7.zip
- source = mount.patch
- md5sums = cdc1af3868c8a2660e16796fcee6f636
- md5sums = SKIP
+ source = https://github.com/opendedup/sdfs/archive/3.2.1.zip
+ md5sums = 33099d698ada4ade03a33df5dcf33d58
pkgname = sdfs
diff --git a/PKGBUILD b/PKGBUILD
index a72cd36700c2..d276d74a6c4c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,28 @@
# Maintainer: Fabian Maurer <dark.shadow4@web.de>
pkgname=sdfs
-pkgver=3.1.7
-pkgrel=2
+pkgver=3.2.1
+pkgrel=1
pkgdesc="Deduplication file system from Opendedup"
arch=('x86_64')
url="http://opendedup.org"
license=('GPL2')
-depends=('libxml2' 'java-environment' 'fuse')
-source=('https://github.com/opendedup/sdfs/archive/3.1.7.zip'
- 'mount.patch')
-md5sums=('cdc1af3868c8a2660e16796fcee6f636'
- 'SKIP')
+depends=('libxml2' 'java-runtime' 'fuse')
+source=('https://github.com/opendedup/sdfs/archive/3.2.1.zip')
+md5sums=('33099d698ada4ade03a33df5dcf33d58')
prepare() {
- cd ${srcdir}/$pkgname-$pkgver/install-packages/deb
+ cd "${srcdir}/$pkgname-$pkgver/install-packages/deb"
- patch usr/share/sdfs/mount.sdfs < ${srcdir}/mount.patch
-
- ln -s /usr/lib/jvm/default-runtime usr/share/sdfs/bin/jre
+ ln -s /usr/lib/jvm/default-runtime usr/share/sdfs/bin/jre
}
package() {
- cd ${srcdir}/$pkgname-$pkgver/install-packages/deb
+ cd "${srcdir}/$pkgname-$pkgver/install-packages/deb"
- cp -dr --no-preserve=ownership etc ${pkgdir}
- cp -dr --no-preserve=ownership usr ${pkgdir}
+ cp -dr --no-preserve=ownership etc "${pkgdir}"
+ cp -dr --no-preserve=ownership usr "${pkgdir}"
- install -d ${pkgdir}/usr/bin/
- cp -dr --no-preserve=ownership sbin/* ${pkgdir}/usr/bin
+ install -d "${pkgdir}/usr/bin/"
+ cp -dr --no-preserve=ownership sbin/* "${pkgdir}/usr/bin"
}
diff --git a/mount.patch b/mount.patch
deleted file mode 100644
index a4f3e2b860aa..000000000000
--- a/mount.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- mount.sdfs 2016-04-17 20:43:31.000000000 +0200
-+++ mod-mount.sdfs 2016-07-03 00:46:23.919483868 +0200
-@@ -36,11 +36,8 @@
- else
- MEMORY=$MEM
- fi
--else
-- MEMORY=$MEM
--fi
-
--LD_PRELOAD="/usr/share/sdfs/bin/libfuse.so.2" $EXEC -server -outfile '&1' -errfile '&2' -Djava.library.path=/usr/share/sdfs/bin/ -home /usr/share/sdfs/bin/jre -Dorg.apache.commons.logging.Log=fuse.logging.FuseLog\
-+LD_PRELOAD="/usr/share/sdfs/bin/libfuse.so.2" $EXEC -server -outfile '&1' -errfile '&2' -Djava.library.path=/usr/share/sdfs/bin/ -home /usr/lib/jvm/default-runtime -Dorg.apache.commons.logging.Log=fuse.logging.FuseLog\
- -Dfuse.logging.level=INFO -Xmx$MEMORY$MU -Xms$MEMORY$MU \
- -XX:+DisableExplicitGC -pidfile /var/run/$PF -XX:+UseG1GC -Djava.awt.headless=true \
- -cp /usr/share/sdfs/lib/commons-daemon-1.0.15.jar:/usr/share/sdfs/lib/sdfs.jar:/usr/share/sdfs/lib/* fuse.SDFS.MountSDFS "$@"