Mail archive
alpine-aports

[alpine-aports] [PATCH 1/3] main/drbd-utils: upgrade to 8.9.5

From: Roland Kammerer <roland.kammerer_at_linbit.com>
Date: Tue, 29 Dec 2015 16:07:34 +0100

- Upgrade to new upstream version.
- Remove musl specific bits_per_long patch, fixed upstream.
---
 main/drbd-utils/APKBUILD            | 12 ++++--------
 main/drbd-utils/bits_per_long.patch | 22 ----------------------
 2 files changed, 4 insertions(+), 30 deletions(-)
 delete mode 100644 main/drbd-utils/bits_per_long.patch
diff --git a/main/drbd-utils/APKBUILD b/main/drbd-utils/APKBUILD
index 252b159..f8b3243 100644
--- a/main/drbd-utils/APKBUILD
+++ b/main/drbd-utils/APKBUILD
_at_@ -1,7 +1,7 @@
 # Contributor: Leonardo Arena <rnalrd_at_alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa_at_alpinelinux.org>
 pkgname=drbd-utils
-pkgver=8.9.4
+pkgver=8.9.5
 pkgrel=0
 pkgdesc="Network-based RAID 1"
 url="http://www.drbd.org"
_at_@ -15,7 +15,6 @@ provides="drbd"
 subpackages="$pkgname-doc $pkgname-pacemaker"
 source="http://oss.linbit.com/drbd/drbd-utils-$pkgver.tar.gz
 	busybox-mv.patch
-	bits_per_long.patch
 	drbd.initd"
 
 
_at_@ -62,15 +61,12 @@ pacemaker() {
 	mv "$pkgdir"/usr/lib/ocf "$subpkgdir"/usr/lib
 }
 
-md5sums="8671f86d366288ea082ac1b4571eaa4d  drbd-utils-8.9.4.tar.gz
+md5sums="197b56c27df329d42c54efda56634e09  drbd-utils-8.9.5.tar.gz
 9bc7ecc7e6b336782f6a09c3366bf590  busybox-mv.patch
-504756f76c96c02439d39d73c6965cb5  bits_per_long.patch
 37a3e196fab9b4f568f79b3bfdee3081  drbd.initd"
-sha256sums="38929279d1bf549fd1ade4ce6773a6fe209db51bbb0efe7bf6d2b7871ba0afbc  drbd-utils-8.9.4.tar.gz
+sha256sums="2ca852d250df15089cdfe63c1bfb0aa9203bdf82c3cfd54b86108cc7135aeccd  drbd-utils-8.9.5.tar.gz
 ea7e76b4deb327c13b2efce7ed3b5a03440de3c721eb0565fd64bf99d34e6b24  busybox-mv.patch
-f6864221863adb6398f1278c0139dfaad05d9a049740b691c85a520c1b0cd10e  bits_per_long.patch
 9ea7427be45fc184cb4a74b6a7b0d688859d38c7a35a96c6c586dedaf4ce30df  drbd.initd"
-sha512sums="4a662921d8c823f3dfce5d0bfb58441231441929fd70447aad9b40f1d84aa9b82a93d034ef6db34b352902519042218000338927a1dfec46953bdb602d205a3b  drbd-utils-8.9.4.tar.gz
+sha512sums="3e391a42effa6906beac5a4eade24df23782f1f2717c7e49b4e70b84ca22890cd51e75d8fe5bed43324e33452d8fd1d6db3fd98bea12baf93cba49e9179ec0e2  drbd-utils-8.9.5.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
deleted file mode 100644
index f6b580e..0000000
--- a/main/drbd-utils/bits_per_long.patch
+++ /dev/null
_at_@ -1,22 +0,0 @@
-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
-_at_@ -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
-- 
2.6.4
---
Unsubscribe:  alpine-aports+unsubscribe_at_lists.alpinelinux.org
Help:         alpine-aports+help_at_lists.alpinelinux.org
---
Received on Tue Dec 29 2015 - 16:07:34 GMT