From b72845626d062a99a4556e041b126e3eed94abb9 Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado <coadde@lavabit.com>
Date: Fri, 31 May 2013 07:27:46 -0300
Subject: resource-agent, heartbeat, pacemaker: drop ha- prefix type and drop
 unused services

---
 pcr/ha-heartbeat/PKGBUILD                 | 84 -------------------------------
 pcr/ha-heartbeat/ha-heartbeat.service     | 10 ----
 pcr/ha-pacemaker/PKGBUILD                 | 83 ------------------------------
 pcr/ha-resourceagent/PKGBUILD             | 68 -------------------------
 pcr/ha-resourceagent/ha-ldirector.service | 10 ----
 pcr/heartbeat/PKGBUILD                    | 84 +++++++++++++++++++++++++++++++
 pcr/pacemaker/PKGBUILD                    | 83 ++++++++++++++++++++++++++++++
 pcr/resource-agent/PKGBUILD               | 68 +++++++++++++++++++++++++
 8 files changed, 235 insertions(+), 255 deletions(-)
 delete mode 100644 pcr/ha-heartbeat/PKGBUILD
 delete mode 100644 pcr/ha-heartbeat/ha-heartbeat.service
 delete mode 100644 pcr/ha-pacemaker/PKGBUILD
 delete mode 100644 pcr/ha-resourceagent/PKGBUILD
 delete mode 100644 pcr/ha-resourceagent/ha-ldirector.service
 create mode 100644 pcr/heartbeat/PKGBUILD
 create mode 100644 pcr/pacemaker/PKGBUILD
 create mode 100644 pcr/resource-agent/PKGBUILD

diff --git a/pcr/ha-heartbeat/PKGBUILD b/pcr/ha-heartbeat/PKGBUILD
deleted file mode 100644
index f913344a0..000000000
--- a/pcr/ha-heartbeat/PKGBUILD
+++ /dev/null
@@ -1,84 +0,0 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-
-pkgname=ha-heartbeat
-_pkgname=${pkgname:3}
-pkgver=3.0.5
-_pkgver=${pkgver::1}_${pkgver:2:1}
-pkgrel=6
-pkgdesc='Daemon that provides cluster infrastructure services to its clients'
-arch=(
-  i686
-  x86_64
-  mips64el
-)
-url=http://linux-ha.org/wiki/${_pkgname^}
-license=(
-  GPL2
-  lGPL2.1
-)
-depends=(
-  gnutls
-  ha-glue
-)
-optdepends=(
-  lynx
-  net-tools
-  openssh
-  swig
-  valgrind
-  w3m
-)
-makedepends=(
-  docbook-xsl
-  libxslt
-  lynx
-  net-tools
-  openssh
-  swig
-  valgrind
-  w3m
-)
-options=!libtool
-source=(
-  http://hg.linux-ha.org/$_pkgname-STABLE_$_pkgver/archive/STABLE-$pkgver.tar.bz2
-  $pkgname.service
-)
-sha512sums=(
-  e38083b87c56a72eb8925ac42adeabb92618608e92218a63960ec0d0bca264f92a8e9c3ebfb0589cc4538da1a82b268b5cc9ee5a51ed33057c969e694e16b27d
-  d14013b4ee133ed07e17fa6e09cae1f9f7bdbabaadfda9b9bb8ed25d4d5ff2f3d419f344195c6d5211da33293d5fe5ad64dbc8be6e1a02f7fa21563f54907a20
-)
-
-prepare() {
-  cd $srcdir/${_pkgname^}-3-0-STABLE-$pkgver
-  mv configure.{in,ac}
-  sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|;
-          s|AM_INIT_AUTOMAKE(heartbeat, $HAPKGVERSION)|AM_INIT_AUTOMAKE|;
-         ' configure.ac
-  sed -i "s|AC_INIT(GNUmakefile)|AC_INIT(heartbeat, $pkgver)|;
-         " configure.ac
-  sed -i 's|INCLUDES|AM_CPPFLAGS|;
-         ' {contrib/{drbd-outdate-peer,ipfail,mlock},cts,heartbeat,lib/{apphb,hbclient,plugins/{HB{auth,comm,compress},quorum{,d},tiebreaker}},membership/{ccm,quorumd},replace,telecom/apphbd,tools}/Makefile.am
-}
-
-build() {
-  cd $srcdir/${_pkgname^}-3-0-STABLE-$pkgver
-  setarch $CARCH ./bootstrap
-  setarch $CARCH ./configure --prefix=/usr\
-    --disable-fatal-warnings\
-    --enable-static=no\
-    --enable-valgrind\
-    --libdir=/usr/lib\
-    --localstatedir=/var\
-    --sysconfdir=/etc
-  setarch $CARCH make
-}
-
-package() {
-  cd $srcdir/${_pkgname^}-3-0-STABLE-$pkgver
-  setarch $CARCH make DESTDIR=$pkgdir install
-
-  install -d $pkgdir/usr/lib/systemd/system
-  install -Dm644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/ha-heartbeat/ha-heartbeat.service b/pcr/ha-heartbeat/ha-heartbeat.service
deleted file mode 100644
index aacde3dbb..000000000
--- a/pcr/ha-heartbeat/ha-heartbeat.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Startup script high-availability services.
-Requires=network.target remote-fs.target timers.target
-
-[Service]
-Type=forking
-ExecStart=/usr/lib/heartbeat/heartbeat
-
-[Install]
-WantedBy=multi-user.target
diff --git a/pcr/ha-pacemaker/PKGBUILD b/pcr/ha-pacemaker/PKGBUILD
deleted file mode 100644
index 2cd0be84c..000000000
--- a/pcr/ha-pacemaker/PKGBUILD
+++ /dev/null
@@ -1,83 +0,0 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-
-pkgname=ha-pacemaker
-_pkgname=${pkgname:3}
-pkgver=1.1.9
-pkgrel=3
-pkgdesc='Cluster resource manager'
-arch=(
-  i686
-  x86_64
-  mips64el
-)
-url=http://linux-ha.org/wiki/${_pkgname^}
-license=GPL2
-depends=(
-  corosync
-  ha-heartbeat
-  ha-resourceagent
-  libqb
-)
-optdepens=(
-  inkscape
-  lynx
-  openssh
-  valgrind
-  w3m
-)
-makedepends=(
-  help2man
-  inkscape
-  libxslt
-  lynx
-  openssh
-  valgrind
-  w3m
-)
-options=(!libtool)
-source=https://github.com/ClusterLabs/$_pkgname/archive/${_pkgname^}-$pkgver.tar.gz
-sha512sums=97d13cf722aea9cba1ce344afc3137d9edc15a978d2a7acc44179c4859ecb18f800312caf02c9574b0fab528cd6e2c3e4876a1ffde8a08c2500c0ba816cdf071
-
-prepare() {
-  cd $srcdir/$_pkgname-${_pkgname^}-$pkgver
-  sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|;
-          s|AM_INIT_AUTOMAKE($PACKAGE_NAME, $PACKAGE_VERSION)|AM_INIT_AUTOMAKE|;
-         ' configure.ac
-  sed -i 's|INCLUDES|AM_CPPFLAGS|;
-         ' {cib,crmd,cts,lib/{cib,cluster,common,fencing,lrmd,pengine,services,transition},mcp,pengine,replace,tools}/Makefile.am
-}
-
-build() {
-  cd $srcdir/$_pkgname-${_pkgname^}-$pkgver
-  setarch $CARCH ./autogen.sh
-  setarch $CARCH ./configure --prefix=/usr\
-    --enable-fatal-warnings=yes\
-    --disable-static\
-    --enable-systemd\
-    --enable-upstart\
-    --libdir=/usr/lib\
-    --libexecdir=/usr/lib\
-    --localstatedir=/var\
-    --sysconfdir=/etc\
-    --with-acl\
-    --with-ais\
-    --with-cibsecrets\
-    --with-cman\
-    --with-corosync\
-    --with-cs-quorum\
-    --with-esmtp\
-    --with-heartbeat\
-    --with-lcrso-dir=/usr/lib/lcrso\
-    --with-nagios\
-    --with-profiling\
-    --with-snmp\
-    --without-gcov
-  setarch $CARCH make
-}
-
-package() {
-  cd $srcdir/$_pkgname-${_pkgname^}-$pkgver
-  setarch $CARCH make DESTDIR=$pkgdir install
-
-  mv $pkgdir/usr/sbin/cibsecret{,-pacemaker}
-}
diff --git a/pcr/ha-resourceagent/PKGBUILD b/pcr/ha-resourceagent/PKGBUILD
deleted file mode 100644
index 15438769a..000000000
--- a/pcr/ha-resourceagent/PKGBUILD
+++ /dev/null
@@ -1,68 +0,0 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-
-pkgname=ha-resourceagent
-_pkgname=${pkgname:3}
-_xname=${_pkgname::8}
-_yname=${_pkgname:8}
-_Name=${_xname^}_${_yname^}
-_name=${_xname}-${_yname}s
-pkgver=3.9.5
-pkgrel=3
-pkgdesc='Standardized interface for a cluster resource'
-arch=(
-  i686
-  x86_64
-  mips64el
-)
-url=http://linux-ha.org/wiki/$_Name
-license=GPL
-depends=ha-glue
-optdepends=(
-  net-tools
-  openssh
-)
-makedepends=(
-  #libxslt
-  libvirt
-  net-tools
-  openssh
-)
-source=(
-  https://github.com/ClusterLabs/$_name/archive/v$pkgver.tar.gz
-  ha-ldirector.service
-)
-sha512sums=(
-  668955de7a80577a1fb599d03b0a47589a00aed3017b532931b5132b877e45778c590f26d3057ee763c35973b0f6b032e2f74ebdf0b5f45b5e402b0f13b8ff4e
-  9e257b31305657a5164eebf6893d84496ef5dc5e80058dda5cd250c847c8247e10410cca99f0a481fa461487198fa59640e09d1e81fc3199a54f3ec85c56d9a3
-)
-
-prepare() {
-  cd $srcdir/$_name-$pkgver
-  sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|;
-         ' configure.ac
-  sed -i 's|INCLUDES|AM_CPPFLAGS|;
-         ' {heartbeat,tools}/Makefile.am
-}
-
-build() {
-  cd $srcdir/$_name-$pkgver
-  setarch $CARCH ./autogen.sh
-  setarch $CARCH ./configure --prefix=/usr\
-    --enable-fatal-warnings\
-    --enable-libnet\
-    --libdir=/usr/lib\
-    --localstatedir=/var\
-    --sysconfdir=/etc\
-    --with-ocf-root=/usr/lib/ocf
-  setarch $CARCH make
-}
-
-package() {
-  cd $srcdir/$_name-$pkgver
-  setarch $CARCH make DESTDIR=$pkgdir install
-
-  install -d $pkgdir/usr/lib/systemd/system
-  install -Dm644 $srcdir/ha-ldirector.service $pkgdir/usr/lib/systemd/system
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/ha-resourceagent/ha-ldirector.service b/pcr/ha-resourceagent/ha-ldirector.service
deleted file mode 100644
index c5809a216..000000000
--- a/pcr/ha-resourceagent/ha-ldirector.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Non-heartbeat systems service, that manages the Linux Virtual Server component for TCP/UDP load-balancing.
-Requires=network.target remote-fs.target
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/ldirectord
-
-[Install]
-WantedBy=multi-user.target
diff --git a/pcr/heartbeat/PKGBUILD b/pcr/heartbeat/PKGBUILD
new file mode 100644
index 000000000..f913344a0
--- /dev/null
+++ b/pcr/heartbeat/PKGBUILD
@@ -0,0 +1,84 @@
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+
+pkgname=ha-heartbeat
+_pkgname=${pkgname:3}
+pkgver=3.0.5
+_pkgver=${pkgver::1}_${pkgver:2:1}
+pkgrel=6
+pkgdesc='Daemon that provides cluster infrastructure services to its clients'
+arch=(
+  i686
+  x86_64
+  mips64el
+)
+url=http://linux-ha.org/wiki/${_pkgname^}
+license=(
+  GPL2
+  lGPL2.1
+)
+depends=(
+  gnutls
+  ha-glue
+)
+optdepends=(
+  lynx
+  net-tools
+  openssh
+  swig
+  valgrind
+  w3m
+)
+makedepends=(
+  docbook-xsl
+  libxslt
+  lynx
+  net-tools
+  openssh
+  swig
+  valgrind
+  w3m
+)
+options=!libtool
+source=(
+  http://hg.linux-ha.org/$_pkgname-STABLE_$_pkgver/archive/STABLE-$pkgver.tar.bz2
+  $pkgname.service
+)
+sha512sums=(
+  e38083b87c56a72eb8925ac42adeabb92618608e92218a63960ec0d0bca264f92a8e9c3ebfb0589cc4538da1a82b268b5cc9ee5a51ed33057c969e694e16b27d
+  d14013b4ee133ed07e17fa6e09cae1f9f7bdbabaadfda9b9bb8ed25d4d5ff2f3d419f344195c6d5211da33293d5fe5ad64dbc8be6e1a02f7fa21563f54907a20
+)
+
+prepare() {
+  cd $srcdir/${_pkgname^}-3-0-STABLE-$pkgver
+  mv configure.{in,ac}
+  sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|;
+          s|AM_INIT_AUTOMAKE(heartbeat, $HAPKGVERSION)|AM_INIT_AUTOMAKE|;
+         ' configure.ac
+  sed -i "s|AC_INIT(GNUmakefile)|AC_INIT(heartbeat, $pkgver)|;
+         " configure.ac
+  sed -i 's|INCLUDES|AM_CPPFLAGS|;
+         ' {contrib/{drbd-outdate-peer,ipfail,mlock},cts,heartbeat,lib/{apphb,hbclient,plugins/{HB{auth,comm,compress},quorum{,d},tiebreaker}},membership/{ccm,quorumd},replace,telecom/apphbd,tools}/Makefile.am
+}
+
+build() {
+  cd $srcdir/${_pkgname^}-3-0-STABLE-$pkgver
+  setarch $CARCH ./bootstrap
+  setarch $CARCH ./configure --prefix=/usr\
+    --disable-fatal-warnings\
+    --enable-static=no\
+    --enable-valgrind\
+    --libdir=/usr/lib\
+    --localstatedir=/var\
+    --sysconfdir=/etc
+  setarch $CARCH make
+}
+
+package() {
+  cd $srcdir/${_pkgname^}-3-0-STABLE-$pkgver
+  setarch $CARCH make DESTDIR=$pkgdir install
+
+  install -d $pkgdir/usr/lib/systemd/system
+  install -Dm644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/pacemaker/PKGBUILD b/pcr/pacemaker/PKGBUILD
new file mode 100644
index 000000000..2cd0be84c
--- /dev/null
+++ b/pcr/pacemaker/PKGBUILD
@@ -0,0 +1,83 @@
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+
+pkgname=ha-pacemaker
+_pkgname=${pkgname:3}
+pkgver=1.1.9
+pkgrel=3
+pkgdesc='Cluster resource manager'
+arch=(
+  i686
+  x86_64
+  mips64el
+)
+url=http://linux-ha.org/wiki/${_pkgname^}
+license=GPL2
+depends=(
+  corosync
+  ha-heartbeat
+  ha-resourceagent
+  libqb
+)
+optdepens=(
+  inkscape
+  lynx
+  openssh
+  valgrind
+  w3m
+)
+makedepends=(
+  help2man
+  inkscape
+  libxslt
+  lynx
+  openssh
+  valgrind
+  w3m
+)
+options=(!libtool)
+source=https://github.com/ClusterLabs/$_pkgname/archive/${_pkgname^}-$pkgver.tar.gz
+sha512sums=97d13cf722aea9cba1ce344afc3137d9edc15a978d2a7acc44179c4859ecb18f800312caf02c9574b0fab528cd6e2c3e4876a1ffde8a08c2500c0ba816cdf071
+
+prepare() {
+  cd $srcdir/$_pkgname-${_pkgname^}-$pkgver
+  sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|;
+          s|AM_INIT_AUTOMAKE($PACKAGE_NAME, $PACKAGE_VERSION)|AM_INIT_AUTOMAKE|;
+         ' configure.ac
+  sed -i 's|INCLUDES|AM_CPPFLAGS|;
+         ' {cib,crmd,cts,lib/{cib,cluster,common,fencing,lrmd,pengine,services,transition},mcp,pengine,replace,tools}/Makefile.am
+}
+
+build() {
+  cd $srcdir/$_pkgname-${_pkgname^}-$pkgver
+  setarch $CARCH ./autogen.sh
+  setarch $CARCH ./configure --prefix=/usr\
+    --enable-fatal-warnings=yes\
+    --disable-static\
+    --enable-systemd\
+    --enable-upstart\
+    --libdir=/usr/lib\
+    --libexecdir=/usr/lib\
+    --localstatedir=/var\
+    --sysconfdir=/etc\
+    --with-acl\
+    --with-ais\
+    --with-cibsecrets\
+    --with-cman\
+    --with-corosync\
+    --with-cs-quorum\
+    --with-esmtp\
+    --with-heartbeat\
+    --with-lcrso-dir=/usr/lib/lcrso\
+    --with-nagios\
+    --with-profiling\
+    --with-snmp\
+    --without-gcov
+  setarch $CARCH make
+}
+
+package() {
+  cd $srcdir/$_pkgname-${_pkgname^}-$pkgver
+  setarch $CARCH make DESTDIR=$pkgdir install
+
+  mv $pkgdir/usr/sbin/cibsecret{,-pacemaker}
+}
diff --git a/pcr/resource-agent/PKGBUILD b/pcr/resource-agent/PKGBUILD
new file mode 100644
index 000000000..15438769a
--- /dev/null
+++ b/pcr/resource-agent/PKGBUILD
@@ -0,0 +1,68 @@
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+
+pkgname=ha-resourceagent
+_pkgname=${pkgname:3}
+_xname=${_pkgname::8}
+_yname=${_pkgname:8}
+_Name=${_xname^}_${_yname^}
+_name=${_xname}-${_yname}s
+pkgver=3.9.5
+pkgrel=3
+pkgdesc='Standardized interface for a cluster resource'
+arch=(
+  i686
+  x86_64
+  mips64el
+)
+url=http://linux-ha.org/wiki/$_Name
+license=GPL
+depends=ha-glue
+optdepends=(
+  net-tools
+  openssh
+)
+makedepends=(
+  #libxslt
+  libvirt
+  net-tools
+  openssh
+)
+source=(
+  https://github.com/ClusterLabs/$_name/archive/v$pkgver.tar.gz
+  ha-ldirector.service
+)
+sha512sums=(
+  668955de7a80577a1fb599d03b0a47589a00aed3017b532931b5132b877e45778c590f26d3057ee763c35973b0f6b032e2f74ebdf0b5f45b5e402b0f13b8ff4e
+  9e257b31305657a5164eebf6893d84496ef5dc5e80058dda5cd250c847c8247e10410cca99f0a481fa461487198fa59640e09d1e81fc3199a54f3ec85c56d9a3
+)
+
+prepare() {
+  cd $srcdir/$_name-$pkgver
+  sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|;
+         ' configure.ac
+  sed -i 's|INCLUDES|AM_CPPFLAGS|;
+         ' {heartbeat,tools}/Makefile.am
+}
+
+build() {
+  cd $srcdir/$_name-$pkgver
+  setarch $CARCH ./autogen.sh
+  setarch $CARCH ./configure --prefix=/usr\
+    --enable-fatal-warnings\
+    --enable-libnet\
+    --libdir=/usr/lib\
+    --localstatedir=/var\
+    --sysconfdir=/etc\
+    --with-ocf-root=/usr/lib/ocf
+  setarch $CARCH make
+}
+
+package() {
+  cd $srcdir/$_name-$pkgver
+  setarch $CARCH make DESTDIR=$pkgdir install
+
+  install -d $pkgdir/usr/lib/systemd/system
+  install -Dm644 $srcdir/ha-ldirector.service $pkgdir/usr/lib/systemd/system
+}
+
+# vim:set ts=2 sw=2 et:
-- 
cgit v1.2.3