need ha-glue for building booth

3 files changed, 50 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 47c79701f3c8..79473851c724 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = pacemaker
 	pkgdesc = advanced, scalable high-availability cluster resource manager
 	pkgver = 1.1.18
-	pkgrel = 4
+	pkgrel = 6
 	url = https://github.com/ClusterLabs/pacemaker/
 	install = pacemaker.install
 	arch = i686
@@ -28,8 +28,10 @@ pkgbase = pacemaker
 	optdepends = crmsh: for use with crm_report
 	source = https://github.com/ClusterLabs/pacemaker/archive/Pacemaker-1.1.18.tar.gz
 	source = crm_report.in
+	source = makefile-chown.patch
 	sha512sums = 63c287888e5f0bd5f1a2f56450cb3d4da580df2d750ffa90b2212a4efcfa146e05e258a9d87fdcaacde5f8985b9730dae11c5d5ad22e811fd114e1640365c9aa
 	sha512sums = 09a80f5579db9016dcbba759ee9b661aea24ed7c98906939d5e50befb344c693652a9634ab804a91bfedeeeb69ce5ab87f30d2ed356bfefd9cdc67669a1cce64
+	sha512sums = bbd4f0415bbc07dedc447cdedea8470ee5308631721c04d7a495e5d0dcad639754f26d7db5c2bdad13e9669346e83d9674607dc7349e1b59cb7e9a35b31b2d22
 
 pkgname = pacemaker
 
diff --git a/PKGBUILD b/PKGBUILD
index 924697b84903..cebe6b79c8fa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=pacemaker
 pkgver=1.1.18
-pkgrel=4
+pkgrel=6
 pkgdesc="advanced, scalable high-availability cluster resource manager"
 arch=('i686' 'x86_64')
 url="https://github.com/ClusterLabs/${pkgname}/"
@@ -19,12 +19,15 @@ optdepends=('pssh: for use with some tools'
             'crmsh: for use with crm_report')
 install=${pkgname}.install
 source=("https://github.com/ClusterLabs/$pkgname/archive/Pacemaker-$pkgver.tar.gz"
-        'crm_report.in')
+        'crm_report.in'
+        'makefile-chown.patch')
 sha512sums=('63c287888e5f0bd5f1a2f56450cb3d4da580df2d750ffa90b2212a4efcfa146e05e258a9d87fdcaacde5f8985b9730dae11c5d5ad22e811fd114e1640365c9aa'
-            '09a80f5579db9016dcbba759ee9b661aea24ed7c98906939d5e50befb344c693652a9634ab804a91bfedeeeb69ce5ab87f30d2ed356bfefd9cdc67669a1cce64')
+            '09a80f5579db9016dcbba759ee9b661aea24ed7c98906939d5e50befb344c693652a9634ab804a91bfedeeeb69ce5ab87f30d2ed356bfefd9cdc67669a1cce64'
+            'bbd4f0415bbc07dedc447cdedea8470ee5308631721c04d7a495e5d0dcad639754f26d7db5c2bdad13e9669346e83d9674607dc7349e1b59cb7e9a35b31b2d22')
 
 prepare() {
   cd ${pkgname}-Pacemaker-${pkgver}
+  patch -Np2 -b -z .orig <../makefile-chown.patch
   autoreconf -fiv
 #  ./autogen.sh
 }
@@ -67,12 +70,11 @@ package() {
   cd "$srcdir"
   install -Dm644 /dev/null "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
   cat>"$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"<<-EOF
-		d /var/log/pacemaker          0755 hacluster haclient
-		d /var/lib/pacemaker          0770 hacluster haclient
-		d /var/lib/pacemaker/blackbox 0770 hacluster haclient
-		d /var/lib/pacemaker/cib      0770 hacluster haclient
-		d /var/lib/pacemaker/cores    0770 hacluster haclient
-		d /var/lib/pacemaker/pengine  0770 hacluster haclient
+		d /var/lib/pacemaker          0750 hacluster haclient
+		d /var/lib/pacemaker/blackbox 0750 hacluster haclient
+		d /var/lib/pacemaker/cib      0750 hacluster haclient
+		d /var/lib/pacemaker/cores    0750 hacluster haclient
+		d /var/lib/pacemaker/pengine  0750 hacluster haclient
 	EOF
 # install -Dm644 /dev/null "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
 # cat>"$pkgdir/usr/lib/sysusers.d/$pkgname.conf"<<-EOF
diff --git a/makefile-chown.patch b/makefile-chown.patch
new file mode 100644
index 000000000000..034091b19f0e
--- /dev/null
+++ b/makefile-chown.patch
@@ -0,0 +1,36 @@
+diff -up src/pacemaker-Pacemaker-1.1.18/Makefile.am.orig src/pacemaker-Pacemaker-1.1.18/Makefile.am
+--- src/pacemaker-Pacemaker-1.1.18/Makefile.am.orig	2018-04-19 23:26:43.000000000 -0600
++++ src/pacemaker-Pacemaker-1.1.18/Makefile.am	2018-04-19 23:40:07.000000000 -0600
+@@ -67,13 +67,13 @@ install-exec-local:
+ 	$(INSTALL) -d -m 750 $(DESTDIR)/$(CRM_CONFIG_DIR)
+ 	$(INSTALL) -d -m 750 $(DESTDIR)/$(CRM_CORE_DIR)
+ 	$(INSTALL) -d -m 750 $(DESTDIR)/$(CRM_BLACKBOX_DIR)
+-	-chown $(CRM_DAEMON_USER):$(CRM_DAEMON_GROUP) $(DESTDIR)/$(CRM_CONFIG_DIR)
+-	-chown $(CRM_DAEMON_USER):$(CRM_DAEMON_GROUP) $(DESTDIR)/$(CRM_CORE_DIR)
+-	-chown $(CRM_DAEMON_USER):$(CRM_DAEMON_GROUP) $(DESTDIR)/$(CRM_BLACKBOX_DIR)
+ if BUILD_CS_PLUGIN
+ 	rm -f $(DESTDIR)$(LCRSODIR)/pacemaker.lcrso $(DESTDIR)$(LCRSODIR)/service_crm.so
+ 	cp $(DESTDIR)$(libdir)/service_crm.so $(DESTDIR)$(LCRSODIR)/pacemaker.lcrso
+ endif
++#	-chown $(CRM_DAEMON_USER):$(CRM_DAEMON_GROUP) $(DESTDIR)/$(CRM_CONFIG_DIR)
++#	-chown $(CRM_DAEMON_USER):$(CRM_DAEMON_GROUP) $(DESTDIR)/$(CRM_CORE_DIR)
++#	-chown $(CRM_DAEMON_USER):$(CRM_DAEMON_GROUP) $(DESTDIR)/$(CRM_BLACKBOX_DIR)
+ # Use chown because the user/group may not exist
+ 
+ clean-generic:
+diff -up src/pacemaker-Pacemaker-1.1.18/pengine/Makefile.am.orig src/pacemaker-Pacemaker-1.1.18/pengine/Makefile.am
+--- src/pacemaker-Pacemaker-1.1.18/pengine/Makefile.am.orig	2018-04-19 23:26:29.000000000 -0600
++++ src/pacemaker-Pacemaker-1.1.18/pengine/Makefile.am	2018-04-19 23:39:40.000000000 -0600
+@@ -80,9 +80,9 @@ pengine_SOURCES	= main.c
+ 
+ install-exec-local:
+ 	$(mkinstalldirs) $(DESTDIR)/$(PE_STATE_DIR)
+-	-chown $(CRM_DAEMON_USER) $(DESTDIR)/$(PE_STATE_DIR)
+-	-chgrp $(CRM_DAEMON_GROUP) $(DESTDIR)/$(PE_STATE_DIR)
+-	-chmod 750 $(DESTDIR)/$(PE_STATE_DIR)
++#	-chown $(CRM_DAEMON_USER) $(DESTDIR)/$(PE_STATE_DIR)
++#	-chgrp $(CRM_DAEMON_GROUP) $(DESTDIR)/$(PE_STATE_DIR)
++#	-chmod 750 $(DESTDIR)/$(PE_STATE_DIR)
+ 
+ uninstall-local:
+