Subject: [alpine-aports] [PATCH 1/2] main/drbd-utils: improved deps, dropped 8.3

From: Roland Kammerer <[email-masked]>
Date: Thu, 14 Jan 2016 18:09:15 +0100

- Add docbook-xls as build dependency: This speeds up the build process
  dramatically.
- dropped depends_dev to avoid build warning.
- dropped drbd-8.3 support: Also speeds up building, and nobody cares about
  drbd-8.3 anymore. Linux mainline contains 8.4 for a long time.
---
 main/drbd-utils/APKBUILD | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/main/drbd-utils/APKBUILD b/main/drbd-utils/APKBUILD
index e850805..1c79572 100644
--- a/main/drbd-utils/APKBUILD
+++ b/main/drbd-utils/APKBUILD
@@ -2,14 +2,13 @@
 # Maintainer: Natanael Copa <[email-masked]>
 pkgname=drbd-utils
 pkgver=8.9.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Network-based RAID 1"
 url="http://www.drbd.org"
 arch="all"
 license="GPL"
 depends="bash"
-depends_dev="bash bison flex"
-makedepends="$depends_dev linux-headers libxslt"
+makedepends="bash bison flex linux-headers libxslt docbook-xsl"
 install=
 provides="drbd"
 subpackages="$pkgname-doc $pkgname-pacemaker"
@@ -43,7 +42,8 @@ build() {
 		--without-heartbeat \
 		--without-rgmanager \
 		--without-xen \
-		--without-bashcompletion
+		--without-bashcompletion\
+		--without-83support
 
 	make || return 1
 }
-- 
2.6.4

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---

---

From: Roland Kammerer <[email-masked]>
Date: Thu, 14 Jan 2016 18:09:16 +0100

This is mainly a version upgrade, that also drops a now unused patch I already
merged upstream. Also add "dockbook-xsl" to decrease build time.
---
 testing/drbdmanage/APKBUILD   | 22 +++++++++-------------
 testing/drbdmanage/path.patch | 11 -----------
 2 files changed, 9 insertions(+), 24 deletions(-)
 delete mode 100644 testing/drbdmanage/path.patch

diff --git a/testing/drbdmanage/APKBUILD b/testing/drbdmanage/APKBUILD
index 04fc8bb..67b0306 100644
--- a/testing/drbdmanage/APKBUILD
+++ b/testing/drbdmanage/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Roland Kammerer <[email-masked]>
 _usname=drbdmanage
 pkgname=$_usname
-pkgver=0.90
+pkgver=0.91
 pkgrel=0
 pkgdesc="DRBD9 Cluster Management Tool"
 url="http://www.drbd.org"
@@ -10,12 +10,11 @@ arch="noarch"
 license="GPL"
 depends="python py-gobject dbus py-dbus lvm2"
 depends_dev=""
-makedepends="python-dev libxslt help2man py-gobject drbd-utils"
+makedepends="python-dev libxslt docbook-xsl help2man py-gobject drbd-utils"
 install=""
 subpackages="$pkgname-doc"
 source="http://oss.linbit.com/$_usname/$_usname-$pkgver.tar.gz
-        rm-systemd-and-bash.patch
-	path.patch"
+        rm-systemd-and-bash.patch"
 
 _builddir=$srcdir/$_usname-$pkgver
 prepare() {
@@ -46,12 +45,9 @@ doc() {
 }

-md5sums="fc4bee4c909c23d5114fd15b15c11422  drbdmanage-0.90.tar.gz
-24c95b3312a4ee69e7225bdb0e19b4ed  rm-systemd-and-bash.patch
-1b42bc4f74bd15d9ebba45d37ba81ab6  path.patch"
-sha256sums="7041128052beb2615e447d579f678fe52ed54182ee1e1f72237f4bb2bdbb86be  drbdmanage-0.90.tar.gz
-14bc5ac238ccd56794f24f21ed5bbe2d957edb725b4cb0889d1f539e4c187e23  rm-systemd-and-bash.patch
-3ac85bdf5b2bdaaef7728c42e465de6f7a6b80828e02163337b5d4b9df1b5145  path.patch"
-sha512sums="ef26beebf3f9acdfd4d63981429afeb29ce25d0be803887914029d870193ff00582fb741ce9e6005f2f4e5202231fdd67c5751f495d574e4bb6eef605a73b1b6  drbdmanage-0.90.tar.gz
-ca8108c2a46b6cac54bc0b811547107329d34f58462075010d5af7c7b0c3cdbf58061e80057b54f095f0dedde54b3b8cb99b5b0aab21960e7c0d47b01528037e  rm-systemd-and-bash.patch
-f8a6c0c667333355e684a593dd1eec233e5a83943b1e911cd32b3c7fbf22047ddc9638e9a3c022c7c7a11ce1de55e6f39654bab8564eb5356d3b596552c79b67  path.patch"
+md5sums="5f005ccc1ec9968fbf760436f573d721  drbdmanage-0.91.tar.gz
+24c95b3312a4ee69e7225bdb0e19b4ed  rm-systemd-and-bash.patch"
+sha256sums="7beae8e8ba7f257d6c918daa0eadf061b8aaad6b801297e8af41b5e39cf45bf3  drbdmanage-0.91.tar.gz
+14bc5ac238ccd56794f24f21ed5bbe2d957edb725b4cb0889d1f539e4c187e23  rm-systemd-and-bash.patch"
+sha512sums="ea9a29ff9fc2f513ac895b09e23552ea6477cefa834b2248cb7d91fa5d8b3a1fac5593b22575f85b0071486c7d36db5bb39e0ffd8c18c24b578d3535576bd0b1  drbdmanage-0.91.tar.gz
+ca8108c2a46b6cac54bc0b811547107329d34f58462075010d5af7c7b0c3cdbf58061e80057b54f095f0dedde54b3b8cb99b5b0aab21960e7c0d47b01528037e  rm-systemd-and-bash.patch"
diff --git a/testing/drbdmanage/path.patch b/testing/drbdmanage/path.patch
deleted file mode 100644
index 4868bf9..0000000
--- a/testing/drbdmanage/path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/drbdmanage/server.py
-+++ b/drbdmanage/server.py
-@@ -165,7 +165,7 @@
-         KEY_MIN_PORT_NR    : str(DEFAULT_MIN_PORT_NR),
-         KEY_MAX_PORT_NR    : str(DEFAULT_MAX_PORT_NR),
-         KEY_MAX_FAIL_COUNT : str(DEFAULT_MAX_FAIL_COUNT),
--        KEY_DRBDADM_PATH   : "/usr/sbin",
-+        KEY_DRBDADM_PATH   : "/sbin",
-         KEY_EXTEND_PATH    : "/sbin:/usr/sbin:/bin:/usr/bin",
-         KEY_DRBD_CONFPATH  : "/var/lib/drbd.d",
-         KEY_DRBDCTRL_VG    : DEFAULT_VG,
-- 
2.6.4

---