summaryrefslogtreecommitdiffstats
path: root/main/iscsitarget-grsec
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-10-26 12:42:36 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-10-26 12:42:36 +0000
commit6434bb6a29a04d2a043b94acca7d038a313d44a0 (patch)
treeca3f743cfd2b506baad638066d122b1850bf005e /main/iscsitarget-grsec
parentf12ebd87ed8c1cc990f669293cfded64c7bea6eb (diff)
downloadaports-6434bb6a29a04d2a043b94acca7d038a313d44a0.tar.bz2
aports-6434bb6a29a04d2a043b94acca7d038a313d44a0.tar.xz
main/iscsitarget: upgrade to 1.4.20.2
Diffstat (limited to 'main/iscsitarget-grsec')
-rw-r--r--main/iscsitarget-grsec/APKBUILD9
-rw-r--r--main/iscsitarget-grsec/iscsitarget-1.4.18+linux-2.6.32.patch42
2 files changed, 4 insertions, 47 deletions
diff --git a/main/iscsitarget-grsec/APKBUILD b/main/iscsitarget-grsec/APKBUILD
index 184f8701b..2f24bd82a 100644
--- a/main/iscsitarget-grsec/APKBUILD
+++ b/main/iscsitarget-grsec/APKBUILD
@@ -11,7 +11,7 @@ _kernelver=$pkgver-r$pkgrel
_abi_release=$pkgver-${_flavor}
_kpkgrel=$pkgrel
-_iscsiver=1.4.19
+_iscsiver=1.4.20.2
pkgname=${_realname}-${_flavor}
pkgver=$_kver
@@ -25,13 +25,13 @@ install=
makedepends="linux-${_flavor}-dev=${_kernelver}"
subpackages=
source="http://downloads.sourceforge.net/$_realname/$_realname-$_iscsiver.tar.gz
- iscsitarget-1.4.18+linux-2.6.32.patch
"
_ksrc=/usr/src/linux-headers-${_abi_release}
prepare() {
cd "$srcdir"/$_realname-$_iscsiver
for i in ../*.patch; do
+ [ -r "$i" ] || continue
msg "Applying $i"
patch -p1 < $i || return 1
done
@@ -45,8 +45,7 @@ build() {
package() {
cd "$srcdir"/$_realname-$_iscsiver
- make KSRC="$_ksrc" DISTDIR="$pkgdir" install-kernel || return 1
+ make KSRC="$_ksrc" DESTDIR="$pkgdir" install-kernel || return 1
}
-md5sums="9beca214c28949cce1716b49fec57de4 iscsitarget-1.4.19.tar.gz
-07f6fb7a35172b3be4c4b0101983fe86 iscsitarget-1.4.18+linux-2.6.32.patch"
+md5sums="2f23c0bfe124d79f5c20e34ef2aaff82 iscsitarget-1.4.20.2.tar.gz"
diff --git a/main/iscsitarget-grsec/iscsitarget-1.4.18+linux-2.6.32.patch b/main/iscsitarget-grsec/iscsitarget-1.4.18+linux-2.6.32.patch
deleted file mode 100644
index f139e732e..000000000
--- a/main/iscsitarget-grsec/iscsitarget-1.4.18+linux-2.6.32.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 43227c1624e919efcd0cd035516c1776be55ac08 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Diego=20Elio=20'Flameeyes'=20Petten=C3=B2?= <flameeyes@gmail.com>
-Date: Sun, 18 Oct 2009 12:41:28 +0200
-Subject: [PATCH] Fix building with Linux kernel 2.6.32 and later.
-
-With commit 18f2ee705d98034b0f229a3202d827468d4bffd9 of the Linux kernel,
-the sync_page_range() function has been removed.
-
-This patch changes it to filemap_write_and_wait_range() as done for the XFS
-driver in the kernel (commit af0f4414f343429971d33b0dd8dccc85c1f3dcd2).
----
- kernel/file-io.c | 6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/kernel/file-io.c b/kernel/file-io.c
-index dbf7b1c..e4c3fea 100644
---- a/kernel/file-io.c
-+++ b/kernel/file-io.c
-@@ -8,6 +8,7 @@
- #include <linux/blkdev.h>
- #include <linux/parser.h>
- #include <linux/writeback.h>
-+#include <linux/version.h>
-
- #include "iscsi.h"
- #include "iscsi_dbg.h"
-@@ -88,7 +89,12 @@ static int fileio_sync(struct iet_volume *lu, struct tio *tio)
- count = lu->blk_cnt << lu->blk_shift;
- }
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 32)
- res = sync_page_range(inode, mapping, ppos, count);
-+#else
-+ res = filemap_write_and_wait_range(mapping, ppos,
-+ ppos + count -1);
-+#endif
- if (res) {
- eprintk("I/O error: syncing pages failed: %d\n", res);
- return -EIO;
---
-1.6.5
-