Bring Arch package inline with Debian makefile, upgrade to 0.10.13, add missing samba 4.6 so

2 files changed, 30 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6eb1a04d713c..ed86a57956da 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = greyhole
 	pkgdesc = Application that uses Samba to create a storage pool of all your available hard drives and allows you to create redundant copies of the files you store, in order to prevent data loss when part of your hardware fails.
-	pkgver = 0.10.8
+	pkgver = 0.10.13
 	pkgrel = 1
 	url = https://www.greyhole.net/
 	install = greyhole.install
@@ -13,10 +13,10 @@ pkgbase = greyhole
 	depends = lsof
 	depends = sysstat
 	backup = etc/greyhole.conf
-	source = https://greyhole.net/releases/greyhole-0.10.8.tar.gz
+	source = https://greyhole.net/releases/greyhole-0.10.13.tar.gz
 	source = greyhole.service
-	sha256sums = 903B33269036662A5A432241C073AD2822878026FF4EEC6B6CE77F6300AC51F9
-	sha256sums = 5d3f50f35480258175595fca94edefe967b7727198c8e08c20b4ae897b93f296
+	sha256sums = 73f1510c9f97f5cd94f477cdd773cc3f1cc94ff0bb2e59a9bd0503f65c3882dd
+	sha256sums = 04b57cd86a092032e3b323d18b5380bfbc22ea7334832574a2e536887554ffc4
 
 pkgname = greyhole
 
diff --git a/PKGBUILD b/PKGBUILD
index 570a8bcb7337..925818c06ee1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Christopher Krooß <didi2002@web.de>
 
 pkgname=greyhole
-pkgver=0.10.8
+pkgver=0.10.13
 pkgrel=1
 pkgdesc='Application that uses Samba to create a storage pool of all your available hard drives and allows you to create redundant copies of the files you store, in order to prevent data loss when part of your hardware fails.'
 arch=('x86_64')
@@ -14,35 +14,47 @@ backup=('etc/greyhole.conf')
 install='greyhole.install'
 source=("https://greyhole.net/releases/$pkgname-$pkgver.tar.gz"
         "greyhole.service")
-sha256sums=('903B33269036662A5A432241C073AD2822878026FF4EEC6B6CE77F6300AC51F9'
-            '5d3f50f35480258175595fca94edefe967b7727198c8e08c20b4ae897b93f296')
+sha256sums=('73f1510c9f97f5cd94f477cdd773cc3f1cc94ff0bb2e59a9bd0503f65c3882dd'
+            '04b57cd86a092032e3b323d18b5380bfbc22ea7334832574a2e536887554ffc4')
 
 package() {
   cd "$pkgname-$pkgver"
 
   mkdir -p "$pkgdir/var/spool/greyhole"
   chmod 777 "$pkgdir/var/spool/greyhole"
+  mkdir -p "$pkgdir/usr/share/greyhole"
   mkdir -p "$pkgdir/usr/share/greyhole/scripts-examples"
+  mkdir -p "$pkgdir/usr/share/webapps/greyhole"
+
   install -m 0755 -D -p greyhole "$pkgdir/usr/bin/greyhole"
   install -m 0755 -D -p greyhole-dfree "$pkgdir/usr/bin/greyhole-dfree"
   install -m 0755 -D -p greyhole-php "$pkgdir/usr/bin/greyhole-php"
   install -m 0755 -D -p greyhole-dfree.php "$pkgdir/usr/share/greyhole"
+  install -m 0755 -D -p greyhole-custom-cp.sh "$pkgdir/usr/share/greyhole"
+
+  install -m 0644 -D -p schema-mysql.sql "$pkgdir/usr/share/greyhole/schema-mysql.sql"
+  install -m 0644 -D -p greyhole.example.conf "$pkgdir/usr/share/greyhole/greyhole.example.conf"
+
+  install -m 0644 -D -p greyhole.example.conf "$pkgdir/etc/greyhole.conf"
+  install -m 0644 -D -p "$srcdir/greyhole.service" "$pkgdir/usr/lib/systemd/system/greyhole.service"
   install -m 0644 -D -p logrotate.greyhole "$pkgdir/etc/logrotate.d/greyhole"
   install -m 0644 -D -p greyhole.cron.d "$pkgdir/etc/cron.d/greyhole"
-  install -m 0644 -D -p greyhole.example.conf "$pkgdir/etc/greyhole.conf"
   install -m 0755 -D -p greyhole.cron.weekly "$pkgdir/etc/cron.weekly/greyhole"
   install -m 0755 -D -p greyhole.cron.daily "$pkgdir/etc/cron.daily/greyhole"
-  install -m 0644 -D -p docs/greyhole.1.gz "$pkgdir/usr/share/man/man1/greyhole.1.gz"
-  install -m 0644 -D -p docs/greyhole-dfree.1.gz "$pkgdir/usr/share/man/man1/greyhole-dfree.1.gz"
-  install -m 0644 -D -p docs/greyhole.conf.5.gz "$pkgdir/usr/share/man/man5/greyhole.conf.5.gz"
-  install -m 0644 -D -p USAGE "$pkgdir/usr/share/greyhole/USAGE"
-  install -m 0644 -D -p schema-mysql.sql "$pkgdir/usr/share/greyhole/schema-mysql.sql"
+
+  install -m 0644 -D -p web-app/index.php "$pkgdir/usr/share/webapps/greyhole/index.php"
+  install -m 0644 -D -p web-app/README "$pkgdir/usr/share/webapps/greyhole/README"
+
   install -m 0755 -D -p scripts-examples/greyhole_file_changed.sh "$pkgdir/usr/share/greyhole/scripts-examples/greyhole_file_changed.sh"
   install -m 0755 -D -p scripts-examples/greyhole_idle.sh "$pkgdir/usr/share/greyhole/scripts-examples/greyhole_idle.sh"
   install -m 0755 -D -p scripts-examples/greyhole_notify_error.sh "$pkgdir/usr/share/greyhole/scripts-examples/greyhole_notify_error.sh"
   install -m 0755 -D -p scripts-examples/greyhole_send_fsck_report.sh "$pkgdir/usr/share/greyhole/scripts-examples/greyhole_send_fsck_report.sh"
 
-  install -m 0644 -D -p "$srcdir/greyhole.service" "$pkgdir/usr/lib/systemd/system/greyhole.service"
+  install -m 0644 -D -p USAGE "$pkgdir/usr/share/greyhole/USAGE"
+
+  install -m 0644 -D -p docs/greyhole.1.gz "$pkgdir/usr/share/man/man1/greyhole.1.gz"
+  install -m 0644 -D -p docs/greyhole-dfree.1.gz "$pkgdir/usr/share/man/man1/greyhole-dfree.1.gz"
+  install -m 0644 -D -p docs/greyhole.conf.5.gz "$pkgdir/usr/share/man/man5/greyhole.conf.5.gz"
 
   _vfs_file=greyhole-x86_64.so
 
@@ -88,6 +100,10 @@ package() {
         install -m 644 "samba-module/bin/4.5/$_vfs_file" "$pkgdir/usr/lib/greyhole/greyhole-samba45.so"
         ln -s "/usr/lib/greyhole/greyhole-samba45.so" "$pkgdir/usr/lib/samba/vfs/greyhole.so"
         ;;
+    46 )
+	install -m 644 "samba-module/bin/4.6/$_vfs_file" "$pkgdir/usr/lib/greyhole/greyhole-samba46.so"
+	ln -s "/usr/lib/greyhole/greyhole-samba46.so" "$pkgdir/usr/lib/samba/vfs/greyhole.so"
+	;;
     * )
         echo 'Incompatible Samba version: Please see https://github.com/gboudreau/Greyhole/blob/master/INSTALL for manual build directions'
         echo 'You can still install this package, but it will not work until you add a greyhole-samba.so file to /usr/lib/greyhole/'