aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorRoland Kammerer <roland.kammerer@linbit.com>2018-01-16 14:50:48 +0100
committerTimo Teräs <timo.teras@iki.fi>2018-02-01 20:17:11 +0000
commitb17a94bf5d1d09f65332464ac8804dbb48408bd0 (patch)
tree1b40f3bd724a8f1b5e6830eda057939789eb61c9 /main
parent276ca6d7cc59d983039f5acf923c94d7f8d63277 (diff)
downloadaports-b17a94bf5d1d09f65332464ac8804dbb48408bd0.tar.bz2
aports-b17a94bf5d1d09f65332464ac8804dbb48408bd0.tar.xz
main/drbd9-hardened: upgrade to 9.0.11
- New upstream release - 9.0.10 intentionally skipped (broken because of compat code) - Includes compat code including linux 4.14
Diffstat (limited to 'main')
-rw-r--r--main/drbd9-hardened/0001-build-fix-building-on-alpine.patch22
-rw-r--r--main/drbd9-hardened/APKBUILD10
2 files changed, 28 insertions, 4 deletions
diff --git a/main/drbd9-hardened/0001-build-fix-building-on-alpine.patch b/main/drbd9-hardened/0001-build-fix-building-on-alpine.patch
new file mode 100644
index 0000000000..93ddd13c0b
--- /dev/null
+++ b/main/drbd9-hardened/0001-build-fix-building-on-alpine.patch
@@ -0,0 +1,22 @@
+From b7d0c3abe2df11174cf275f06bb3e0210047cfc3 Mon Sep 17 00:00:00 2001
+From: Roland Kammerer <roland.kammerer@linbit.com>
+Date: Tue, 16 Jan 2018 14:28:47 +0100
+Subject: [PATCH 1/1] build: fix building on alpine
+
+---
+ drbd/Kbuild | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drbd/Kbuild b/drbd/Kbuild
+index e63cefc1..e7263600 100644
+--- a/drbd/Kbuild
++++ b/drbd/Kbuild
+@@ -150,4 +150,4 @@ $(obj)/drbd_buildtag.c: $(filter-out drbd_buildtag.o,$(drbd-y))
+ buildinfo="reproducible build, `date -u -d@${SOURCE_DATE_EPOCH} "+%F %T"`" ; \
+ fi ; \
+ echo -e "\t\t\" $$buildinfo\";\n}"; \
+- mv --force $@.new $@
++ mv -f $@.new $@
+--
+2.15.1
+
diff --git a/main/drbd9-hardened/APKBUILD b/main/drbd9-hardened/APKBUILD
index 63b924beb8..b8b5404934 100644
--- a/main/drbd9-hardened/APKBUILD
+++ b/main/drbd9-hardened/APKBUILD
@@ -8,13 +8,13 @@ _kpkg=linux-$_flavor
_kver=4.9.73
_kpkgrel=0
-_usver=9.0.9
+_usver=9.0.11
# 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=0
+_mypkgrel=1
_kernelver=$_kver-r$_kpkgrel
_abi_release=${_kver}-${_kpkgrel}-${_flavor}
@@ -32,7 +32,8 @@ makedepends="linux-${_flavor}-dev bash"
install=""
subpackages=""
provides="${_usname}9-grsec=${pkgver}-r${pkgrel}"
-source="https://links.linbit.com/sources/$_usname/${_usver%.*}/$_usname-$_usver-$_usrel.tar.gz"
+source="https://links.linbit.com/sources/$_usname/${_usver%.*}/$_usname-$_usver-$_usrel.tar.gz
+ 0001-build-fix-building-on-alpine.patch"
_builddir=$srcdir/$_usname-$_usver-$_usrel
prepare() {
@@ -69,4 +70,5 @@ package() {
make DESTDIR="$pkgdir" install || return 1
}
-sha512sums="64e98eb055c3007231faf00b3b16d47a339d5aa2301e328a86c943d8d31cb73802e7d187a94bf84947750f98442370d8eb366a4675472050a1c0c095868152d5 drbd-9.0.9-1.tar.gz"
+sha512sums="fdfc63e190b89c02683d5c3fe9fd60dfb81ea28e7635642d38453ba1e397324fdc15f8d2850955d6b77784d3aa6460e3fefb828f00c85be9d00865e7b05a0d36 drbd-9.0.11-1.tar.gz
+5928bd53fa76493de85c1db420f68702a4638337c21feb317ddde94182d8218c758b3a736efa0f0357c9970ccf8575efb496830ac542b31c093580c5ae8a47f4 0001-build-fix-building-on-alpine.patch"