~alpine/aports

main/drbd-utils: upgrade to 8.9.6 v1 PROPOSED

Roland Kammerer
Roland Kammerer: 1
 main/drbd-utils: upgrade to 8.9.6

 2 files changed, 5 insertions(+), 22 deletions(-)
Export patchset (mbox)
How do I use this?

Copy & paste the following snippet into your terminal to import this patchset into git:

curl -s https://lists.alpinelinux.org/~alpine/aports/patches/2245/mbox | git am -3
Learn more about email & git

[alpine-aports] [PATCH 1/1] main/drbd-utils: upgrade to 8.9.6 Export this patch

Roland Kammerer
- New upstream release
- Removed busybox-mv patch, I merged that upstream
---
 main/drbd-utils/APKBUILD         | 14 +++++---------
 main/drbd-utils/busybox-mv.patch | 13 -------------
 2 files changed, 5 insertions(+), 22 deletions(-)
 delete mode 100644 main/drbd-utils/busybox-mv.patch

diff --git a/main/drbd-utils/APKBUILD b/main/drbd-utils/APKBUILD
index 1c79572..692c6ba 100644
--- a/main/drbd-utils/APKBUILD
+++ b/main/drbd-utils/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=drbd-utils
pkgver=8.9.5
pkgrel=2
pkgver=8.9.6
pkgrel=1
pkgdesc="Network-based RAID 1"
url="http://www.drbd.org"
arch="all"
@@ -13,7 +13,6 @@ install=
provides="drbd"
subpackages="$pkgname-doc $pkgname-pacemaker"
source="http://oss.linbit.com/drbd/drbd-utils-$pkgver.tar.gz
	busybox-mv.patch
	drbdsetup-permissions.patch
	drbd.initd"

@@ -62,15 +61,12 @@ pacemaker() {
	mv "$pkgdir"/usr/lib/ocf "$subpkgdir"/usr/lib
}

md5sums="197b56c27df329d42c54efda56634e09  drbd-utils-8.9.5.tar.gz
9bc7ecc7e6b336782f6a09c3366bf590  busybox-mv.patch
md5sums="76ed6d3190cd77b00890f3365353124b  drbd-utils-8.9.6.tar.gz
a3043b04ca494d206fffb4e2d57d2a4a  drbdsetup-permissions.patch
37a3e196fab9b4f568f79b3bfdee3081  drbd.initd"
sha256sums="2ca852d250df15089cdfe63c1bfb0aa9203bdf82c3cfd54b86108cc7135aeccd  drbd-utils-8.9.5.tar.gz
ea7e76b4deb327c13b2efce7ed3b5a03440de3c721eb0565fd64bf99d34e6b24  busybox-mv.patch
sha256sums="297b77c9b3f88de2e7dae459234f2753ea4fc2805282b2d276e35cf51e292913  drbd-utils-8.9.6.tar.gz
c091d3e655aefefbd9f7e50621b008b862275968181ecc23353b884111c49330  drbdsetup-permissions.patch
9ea7427be45fc184cb4a74b6a7b0d688859d38c7a35a96c6c586dedaf4ce30df  drbd.initd"
sha512sums="3e391a42effa6906beac5a4eade24df23782f1f2717c7e49b4e70b84ca22890cd51e75d8fe5bed43324e33452d8fd1d6db3fd98bea12baf93cba49e9179ec0e2  drbd-utils-8.9.5.tar.gz
22da5e241a6e33868ad91edb44ca51381a05909151a2e3f945efff1568903d415b77689231a6df5ff9c1e4b095d6a8bb82fc725336d65fb191036c7e97b2e3bb  busybox-mv.patch
sha512sums="cbdeeb7b298bc21de0d2188566362d7a634a72df243403f4bc91d5836c757f15ee86314b1385860aecda5657be5dc6309f2481b0403012bde841dd0618188938  drbd-utils-8.9.6.tar.gz
562ae8eee03148666fb6e6e700c1eb9086f6901e176ea6cd007e3ac4e39d1cdaf967064de74dc1ad620155996dc7011bd0e2abd1c9595ff9bf5f4413673726f3  drbdsetup-permissions.patch
bb465e32273aaba0b86ae681bc94c58bb51f542221f51ced197e22b316ce1bc9a0b4fe1f43af07ef13b3f0946466a43218f0a2ab7f4210adbb00174a503b64d7  drbd.initd"
diff --git a/main/drbd-utils/busybox-mv.patch b/main/drbd-utils/busybox-mv.patch
deleted file mode 100644
index 74fc9fa..0000000
--- a/main/drbd-utils/busybox-mv.patch
@@ -1,13 +0,0 @@
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
-- 
2.6.4



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---
View this thread in the archives