- The CGI services are Python2 only

- Fix installation location of systemd files.

4 files changed, 33 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 916330fa36ae..aed04db55895 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Wed Sep 14 19:37:20 UTC 2016
+# Sun Sep 18 15:46:05 UTC 2016
 pkgbase = lizardfs
 	pkgdesc = LizardFS is a highly reliable, scalable and efficient distributed file system. It spreads data over a number of physical servers, making it visible to an end user as a single file system.
 	pkgver = 3.10.2
-	pkgrel = 1
+	pkgrel = 2
 	url = http://lizardfs.com
 	install = lizardfs.install
 	arch = x86_64
@@ -18,8 +18,12 @@ pkgbase = lizardfs
 	depends = cmake
 	source = http://github.com/lizardfs/lizardfs/archive/v3.10.2.tar.gz
 	source = cmath.patch
+	source = lizardfs-cgiservice.patch
+	source = cgiserv.patch
 	sha256sums = 972cc6c46629ebdf7b85f34c782583bb37be46de99dcf299fc92b355aa3a19cc
 	sha256sums = fd9e8e3e0bfbb3d1befb3a6136d9257dcebb60cd49012051773e35b355ce0d5c
+	sha256sums = b4ec6781cc7561ac67dcc26e3ae93ca5780b89fcbc4750fd540cff8202121a05
+	sha256sums = 7c0ad5c42b8f1bea848db1dcda41d20dd7bf9b802467b7dfc376788dd82bb6d4
 
 pkgname = lizardfs
 
diff --git a/PKGBUILD b/PKGBUILD
index 6e0d6ebdcc01..b51c4ab5a944 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # lizardfs is a fork of moosefs and as such is a replacement for it.
 pkgname=lizardfs
 pkgver=3.10.2
-pkgrel=1
+pkgrel=2
 pkgdesc='LizardFS is a highly reliable, scalable and efficient distributed file system. It spreads data over a number of physical servers, making it visible to an end user as a single file system.'
 url='http://lizardfs.com'
 conflics=('moosefs' 'mfs-master' 'mfs-chunkserver' 'mfs-client')
@@ -11,13 +11,19 @@ license=('GPL3')
 depends=('asciidoc' 'boost' 'zlib' 'fuse' 'python2' 'bash' 'cmake')
 install="$pkgname.install"
 source=("http://github.com/lizardfs/lizardfs/archive/v${pkgver}.tar.gz"
-        "cmath.patch")
+        "cmath.patch"
+        "lizardfs-cgiservice.patch"
+        "cgiserv.patch")
 sha256sums=('972cc6c46629ebdf7b85f34c782583bb37be46de99dcf299fc92b355aa3a19cc'
-            'fd9e8e3e0bfbb3d1befb3a6136d9257dcebb60cd49012051773e35b355ce0d5c')
+            'fd9e8e3e0bfbb3d1befb3a6136d9257dcebb60cd49012051773e35b355ce0d5c'
+            'b4ec6781cc7561ac67dcc26e3ae93ca5780b89fcbc4750fd540cff8202121a05'
+            '7c0ad5c42b8f1bea848db1dcda41d20dd7bf9b802467b7dfc376788dd82bb6d4')
 
 prepare() {
   cd "lizardfs-${pkgver%_*}"
   patch -Np1 -i $srcdir/cmath.patch
+  patch -Np1 -i $srcdir/lizardfs-cgiservice.patch
+  patch -Np1 -i $srcdir/cgiserv.patch
 }
 
 build() {
@@ -29,11 +35,11 @@ build() {
 
 package() {
   make DESTDIR="$pkgdir" -C "lizardfs-${pkgver%_*}/build-pack" install
-  mkdir -p $pkgdir/usr/lib/systemd
+  mkdir -p $pkgdir/usr/lib/systemd/system
   for fn in lizardfs-cgiserv.service lizardfs-chunkserver.service \
      lizardfs-master.service lizardfs-metalogger.service
   do
-    install -m 0644 lizardfs-${pkgver%_*}/rpm/service-files/$fn $pkgdir/usr/lib/systemd/$fn 
+    install -m 0644 lizardfs-${pkgver%_*}/rpm/service-files/$fn $pkgdir/usr/lib/systemd/system/$fn
   done
   mv "$pkgdir"/usr/sbin/* "$pkgdir/usr/bin/"
   rmdir "$pkgdir/usr/sbin"
diff --git a/cgiserv.patch b/cgiserv.patch
new file mode 100644
index 000000000000..db499bd3f8c0
--- /dev/null
+++ b/cgiserv.patch
@@ -0,0 +1,8 @@
+--- lizardfs-3.10.2/src/cgi/cgiserv.py.in.orig	2016-09-18 16:43:05.075283198 +0100
++++ lizardfs-3.10.2/src/cgi/cgiserv.py.in	2016-09-18 16:43:11.145096379 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ import fcntl
+ import errno
+ import posix
diff --git a/lizardfs-cgiservice.patch b/lizardfs-cgiservice.patch
new file mode 100644
index 000000000000..71475eee7dd2
--- /dev/null
+++ b/lizardfs-cgiservice.patch
@@ -0,0 +1,8 @@
+--- lizardfs-3.10.2/src/cgi/lizardfs-cgiserver.py.in.orig	2016-09-18 16:35:35.542456837 +0100
++++ lizardfs-3.10.2/src/cgi/lizardfs-cgiserver.py.in	2016-09-18 16:35:49.685354565 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ # vim: noexpandtab shiftwidth=4 softtabstop=4 tabstop=4
+ 
+ import fcntl