From b56ec1afff48ed0b0c91aa70f4a28b44e4fad8f7 Mon Sep 17 00:00:00 2001
From: Roland Kammerer <roland.kammerer@linbit.com>
Date: Fri, 5 Feb 2016 14:14:58 +0100
Subject: testing/drbd9-grsec: upgrade to 9.0.1

- New upstream release
- Removed busybox-mv patch, I merged that upstream
---
 testing/drbd9-grsec/APKBUILD         | 23 ++++++++++++-----------
 testing/drbd9-grsec/busybox-mv.patch |  8 --------
 2 files changed, 12 insertions(+), 19 deletions(-)
 delete mode 100644 testing/drbd9-grsec/busybox-mv.patch

diff --git a/testing/drbd9-grsec/APKBUILD b/testing/drbd9-grsec/APKBUILD
index e6f968bc78..4174fdd39b 100644
--- a/testing/drbd9-grsec/APKBUILD
+++ b/testing/drbd9-grsec/APKBUILD
@@ -8,8 +8,13 @@ _kpkg=linux-$_flavor
 _kver=4.1.15
 _kpkgrel=5
 
-_usver=9.0.0
-_mypkgrel=0
+_usver=9.0.1
+# upstream now also has a -rel in the tar-balls
+# set it here for "source", but don't mangle it into pkgrel/_mypkgrel
+# if there is a new upstream rel (eg. 9.0.1-2), we just increase _mypkgrel
+_usrel=1
+
+_mypkgrel=1
 
 _kernelver=$_kver-r$_kpkgrel
 _abi_release=${_kver}-${_kpkgrel}-${_flavor}
@@ -26,10 +31,9 @@ depends_dev=""
 makedepends="linux-grsec-dev"
 install=""
 subpackages=""
-source="http://oss.linbit.com/$_usname/${_usver%.*}/$_usname-$_usver.tar.gz
-        busybox-mv.patch"
+source="http://oss.linbit.com/$_usname/${_usver%.*}/$_usname-$_usver-$_usrel.tar.gz"
 
-_builddir=$srcdir/$_usname-$_usver
+_builddir=$srcdir/$_usname-$_usver-$_usrel
 prepare() {
 	local i
 	# verify the kernel version
@@ -64,9 +68,6 @@ package() {
 	make DESTDIR="$pkgdir" install || return 1
 }
 
-md5sums="62706c1b57bf399071272dad0d267421  drbd-9.0.0.tar.gz
-0ce3796e13ae3d271a1a3bac8ace1603  busybox-mv.patch"
-sha256sums="0dc6e37492dcc8a960311b3b0b7e2d17bd1afff146756cdd80d5477c17d7dffc  drbd-9.0.0.tar.gz
-49898fdf26f8d6bfc8f0a433ca3c17bd0f860f65119ae7f0144eba5977cf30f8  busybox-mv.patch"
-sha512sums="a86fbf199ad58aa5458323ca7e42e827516d3a61b871b6eeabf3507547cbec76e713d2276d9e6b4c5d984ec86263516f5feeda871b012f32fd5b49de9489b549  drbd-9.0.0.tar.gz
-bcaa7a126cffc5219ecdb9a9bcee8b32312a8d7ed3233360a0393788eb10c5ebe321b607f1f060acf9aa02092b274964437c72bb6bf73d35fa79a7daf27c16d2  busybox-mv.patch"
+md5sums="0d1d50e225ee0c8058af4fe1442d5242  drbd-9.0.1-1.tar.gz"
+sha256sums="f0862fffa5d73c433598fe1957bab61a2ae7ae1c4c7c0cecbef760e67a65fe20  drbd-9.0.1-1.tar.gz"
+sha512sums="0deb07d5c0217d35f85902064725311b3b74fe53ccb7faddb16624654c04edb44fb9462b0d967b1eb618a658ed66d32e71aa2b2048aa3fcd43a95d0f099f55d4  drbd-9.0.1-1.tar.gz"
diff --git a/testing/drbd9-grsec/busybox-mv.patch b/testing/drbd9-grsec/busybox-mv.patch
deleted file mode 100644
index 76345f8e3f..0000000000
--- a/testing/drbd9-grsec/busybox-mv.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/drbd/Kbuild
-+++ b/drbd/Kbuild
-@@ -131,4 +131,4 @@
- 		exit 1;								\
- 	fi ;									\
- 	echo -e "\t\t\" build by $$USER@$$HOSTNAME, `date "+%F %T"`\";\n}";	\
--	mv --force $@.new $@
-+	mv -f $@.new $@
-- 
cgit v1.2.3