main/drbd-utils: rename from drbd and upgrade to 8.9.4

fixes #4920

5 files changed, 55 insertions, 36 deletions

diff --git a/main/drbd/APKBUILD b/main/drbd-utils/APKBUILD
index bab5f18c71..252b159e2e 100644
--- a/main/drbd/APKBUILD
+++ b/main/drbd-utils/APKBUILD
@@ -1,21 +1,22 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=drbd
-pkgver=8.4.3
-pkgbase=${pkgver%.*}
-pkgrel=2
+pkgname=drbd-utils
+pkgver=8.9.4
+pkgrel=0
 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"
+makedepends="$depends_dev linux-headers libxslt"
 install=
+provides="drbd"
 subpackages="$pkgname-doc $pkgname-pacemaker"
-source="http://oss.linbit.com/$pkgname/$pkgbase/$pkgname-$pkgver.tar.gz
+source="http://oss.linbit.com/drbd/drbd-utils-$pkgver.tar.gz
+	busybox-mv.patch
 	bits_per_long.patch
-	$pkgname.initd"
+	drbd.initd"
 
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -27,12 +28,12 @@ prepare() {
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
 		esac
 	done
-	sed -i "s/mv --force/mv -f/" drbd/Makefile || return 1
 }
 
 build() {
 	cd "$_builddir"
 	./configure --prefix=/usr \
+		--sbindir=/sbin \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
@@ -50,8 +51,8 @@ build() {
 package() {
 	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
-        install -m755 -D "$srcdir/$pkgname.initd" \
-		"$pkgdir/etc/init.d/$pkgname" || return 1
+        install -m755 -D "$srcdir/drbd.initd" \
+		"$pkgdir/etc/init.d/drbd" || return 1
 }
 
 pacemaker() {
@@ -61,12 +62,15 @@ pacemaker() {
 	mv "$pkgdir"/usr/lib/ocf "$subpkgdir"/usr/lib
 }
 
-md5sums="0c54a69603fa28b41de5fb33e03fd9e8  drbd-8.4.3.tar.gz
-8b289fddf94aff469879f0263ffbb294  bits_per_long.patch
+md5sums="8671f86d366288ea082ac1b4571eaa4d  drbd-utils-8.9.4.tar.gz
+9bc7ecc7e6b336782f6a09c3366bf590  busybox-mv.patch
+504756f76c96c02439d39d73c6965cb5  bits_per_long.patch
 37a3e196fab9b4f568f79b3bfdee3081  drbd.initd"
-sha256sums="abeb09309b77b533b8e738a601d703b338dce6e4d6cf59741e2f0693fbf94527  drbd-8.4.3.tar.gz
-fab540bc721b5f759b33bf8bea04d2b25cf9dc64657483afdfb821dec5b6ee79  bits_per_long.patch
+sha256sums="38929279d1bf549fd1ade4ce6773a6fe209db51bbb0efe7bf6d2b7871ba0afbc  drbd-utils-8.9.4.tar.gz
+ea7e76b4deb327c13b2efce7ed3b5a03440de3c721eb0565fd64bf99d34e6b24  busybox-mv.patch
+f6864221863adb6398f1278c0139dfaad05d9a049740b691c85a520c1b0cd10e  bits_per_long.patch
 9ea7427be45fc184cb4a74b6a7b0d688859d38c7a35a96c6c586dedaf4ce30df  drbd.initd"
-sha512sums="cdc90bdd9491fe6d29e3b779d69ba2aac1aacdb336586f1ef414d0a0195d922dbefa8b2d9c4868a2476998a713c893403344a2934c7768ff6f4ba9f13bb7277a  drbd-8.4.3.tar.gz
-a567bedd4064da2c74c39174e13ca9920219128e55185311909ced884129d40dfc6f3cac552cbe669c48ce24a2db6c461219df91168e27554eaa45c3765edc71  bits_per_long.patch
+sha512sums="4a662921d8c823f3dfce5d0bfb58441231441929fd70447aad9b40f1d84aa9b82a93d034ef6db34b352902519042218000338927a1dfec46953bdb602d205a3b  drbd-utils-8.9.4.tar.gz
+22da5e241a6e33868ad91edb44ca51381a05909151a2e3f945efff1568903d415b77689231a6df5ff9c1e4b095d6a8bb82fc725336d65fb191036c7e97b2e3bb  busybox-mv.patch
+6d54d89c3f85ae8b1e49e05a6fcc7d88bd504c8e2614923c282c48bd6fa6fcbf704ee5c51d3ea809ba9cc5e1cc377da55ffe68d065a27f68e7ee15b6fe7d9d37  bits_per_long.patch
 bb465e32273aaba0b86ae681bc94c58bb51f542221f51ced197e22b316ce1bc9a0b4fe1f43af07ef13b3f0946466a43218f0a2ab7f4210adbb00174a503b64d7  drbd.initd"
diff --git a/main/drbd-utils/bits_per_long.patch b/main/drbd-utils/bits_per_long.patch
new file mode 100644
index 0000000000..f6b580eedb
--- /dev/null
+++ b/main/drbd-utils/bits_per_long.patch
@@ -0,0 +1,22 @@
+diff --git a/user/shared/drbd_endian.h b/user/shared/drbd_endian.h
+index 69f7145..515c942 100644
+--- a/user/shared/drbd_endian.h
++++ b/user/shared/drbd_endian.h
+@@ -13,12 +13,17 @@
+ 
+ #include <stdint.h>
+ #include <endian.h>
++#include <limits.h>
+ 
+ #ifndef BITS_PER_LONG
+ # if defined(__SIZEOF_LONG__)
+ #  define BITS_PER_LONG (__SIZEOF_LONG__ * 8)
+ # elif defined(__WORDSIZE)
+ #  define BITS_PER_LONG __WORDSIZE
++# elif ULONG_MAX == 0xffffffffffffffff
++#  define BITS_PER_LONG 64
++# elif ULONG_MAX == 0xffffffff
++#  define BITS_PER_LONG 32
+ # else /* wtf is wrong with your libc headers? */
+ #  error "neither BITS_PER_LONG, __SIZEOF_LONG__, nor __WORDSIZE defined"
+ # endif
diff --git a/main/drbd-utils/busybox-mv.patch b/main/drbd-utils/busybox-mv.patch
new file mode 100644
index 0000000000..74fc9faa1c
--- /dev/null
+++ b/main/drbd-utils/busybox-mv.patch
@@ -0,0 +1,13 @@
+diff --git a/user/shared/Makefile.in b/user/shared/Makefile.in
+index 8b8be16..3240089 100644
+--- a/user/shared/Makefile.in
++++ b/user/shared/Makefile.in
+@@ -84,7 +84,7 @@ drbd_buildtag.c:
+ 		grep return $@ ;						\
+ 	fi ;									\
+ 	echo -e "\t\t\" build by $$USER@$$HOSTNAME, `date "+%F %T"`\";\n}";	\
+-	mv --force $@.new $@
++	mv -f $@.new $@
+ 
+ drbdmeta_scanner.c: drbdmeta_scanner.fl drbdmeta_parser.h
+ 	flex -s -odrbdmeta_scanner.c drbdmeta_scanner.fl
diff --git a/main/drbd/drbd.initd b/main/drbd-utils/drbd.initd
index 0126e156d3..0126e156d3 100644
--- a/main/drbd/drbd.initd
+++ b/main/drbd-utils/drbd.initd
diff --git a/main/drbd/bits_per_long.patch b/main/drbd/bits_per_long.patch
deleted file mode 100644
index 7b094817a4..0000000000
--- a/main/drbd/bits_per_long.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./user/drbd_endian.h.orig
-+++ ./user/drbd_endian.h
-@@ -13,9 +13,16 @@
- 
- #include <stdint.h>
- #include <endian.h>
-+#include <limits.h>
- 
- #ifndef BITS_PER_LONG
--# define BITS_PER_LONG __WORDSIZE
-+# ifdef __WORDSIZE
-+#  define BITS_PER_LONG __WORDSIZE
-+# elif ULONG_MAX == 0xffffffffffffffff
-+#  define BITS_PER_LONG 64
-+# elif ULONG_MAX == 0xffffffff
-+#  define BITS_PER_LONG 32
-+# endif
- #endif
- 
- /* linux/byteorder/swab.h */