X-Original-To: alpine-aports@mail.alpinelinux.org Delivered-To: alpine-aports@mail.alpinelinux.org Received: from mail.alpinelinux.org (dallas-a1.alpinelinux.org [127.0.0.1]) by mail.alpinelinux.org (Postfix) with ESMTP id 48DD4DC01AF for ; Fri, 5 Feb 2016 13:15:16 +0000 (UTC) Received: from zimbra13.linbit.com (zimbra13.linbit.com [212.69.166.240]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id 522B0DC0075 for ; Fri, 5 Feb 2016 13:15:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by zimbra13.linbit.com (Postfix) with ESMTP id C5FBB3E4510; Fri, 5 Feb 2016 14:15:08 +0100 (CET) Received: from zimbra13.linbit.com ([127.0.0.1]) by localhost (zimbra13.linbit.com [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id c1Mn8SkPZRi5; Fri, 5 Feb 2016 14:15:08 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by zimbra13.linbit.com (Postfix) with ESMTP id A805D3E453E; Fri, 5 Feb 2016 14:15:08 +0100 (CET) X-Virus-Scanned: amavisd-new at linbit.com Received: from zimbra13.linbit.com ([127.0.0.1]) by localhost (zimbra13.linbit.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id IOe2tVuBFRGR; Fri, 5 Feb 2016 14:15:08 +0100 (CET) Received: from aperol.at.linbit. (tuerlsteher.linbit.com [86.59.100.100]) by zimbra13.linbit.com (Postfix) with ESMTPSA id 689503E4510; Fri, 5 Feb 2016 14:15:08 +0100 (CET) From: Roland Kammerer To: alpine-aports@lists.alpinelinux.org Cc: Roland Kammerer Subject: [alpine-aports] [PATCH 1/1] testing/drbd9-grsec: upgrade to 9.0.1 Date: Fri, 5 Feb 2016 14:14:58 +0100 Message-Id: <1454678098-22515-1-git-send-email-roland.kammerer@linbit.com> X-Mailer: git-send-email 2.7.0.rc3 X-Virus-Scanned: ClamAV using ClamSMTP X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: - 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 e6f968b..4174fdd 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 76345f8..0000000 --- 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 $@ -- 2.6.4 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---