diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2010-10-26 12:42:36 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-10-26 12:42:36 +0000 |
commit | 6434bb6a29a04d2a043b94acca7d038a313d44a0 (patch) | |
tree | ca3f743cfd2b506baad638066d122b1850bf005e | |
parent | f12ebd87ed8c1cc990f669293cfded64c7bea6eb (diff) | |
download | alpine_aports-6434bb6a29a04d2a043b94acca7d038a313d44a0.tar.bz2 alpine_aports-6434bb6a29a04d2a043b94acca7d038a313d44a0.tar.xz alpine_aports-6434bb6a29a04d2a043b94acca7d038a313d44a0.zip |
main/iscsitarget: upgrade to 1.4.20.2
-rw-r--r-- | main/iscsitarget-grsec/APKBUILD | 9 | ||||
-rw-r--r-- | main/iscsitarget-grsec/iscsitarget-1.4.18+linux-2.6.32.patch | 42 | ||||
-rw-r--r-- | main/iscsitarget/APKBUILD | 27 | ||||
-rw-r--r-- | main/iscsitarget/iscsitarget-0.4.15-isns-set-scn-flag.patch | 20 | ||||
-rw-r--r-- | main/iscsitarget/iscsitarget-0.4.17-build.patch | 23 |
5 files changed, 20 insertions, 101 deletions
diff --git a/main/iscsitarget-grsec/APKBUILD b/main/iscsitarget-grsec/APKBUILD index 184f8701bb..2f24bd82aa 100644 --- a/main/iscsitarget-grsec/APKBUILD +++ b/main/iscsitarget-grsec/APKBUILD | |||
@@ -11,7 +11,7 @@ _kernelver=$pkgver-r$pkgrel | |||
11 | _abi_release=$pkgver-${_flavor} | 11 | _abi_release=$pkgver-${_flavor} |
12 | _kpkgrel=$pkgrel | 12 | _kpkgrel=$pkgrel |
13 | 13 | ||
14 | _iscsiver=1.4.19 | 14 | _iscsiver=1.4.20.2 |
15 | 15 | ||
16 | pkgname=${_realname}-${_flavor} | 16 | pkgname=${_realname}-${_flavor} |
17 | pkgver=$_kver | 17 | pkgver=$_kver |
@@ -25,13 +25,13 @@ install= | |||
25 | makedepends="linux-${_flavor}-dev=${_kernelver}" | 25 | makedepends="linux-${_flavor}-dev=${_kernelver}" |
26 | subpackages= | 26 | subpackages= |
27 | source="http://downloads.sourceforge.net/$_realname/$_realname-$_iscsiver.tar.gz | 27 | source="http://downloads.sourceforge.net/$_realname/$_realname-$_iscsiver.tar.gz |
28 | iscsitarget-1.4.18+linux-2.6.32.patch | ||
29 | " | 28 | " |
30 | _ksrc=/usr/src/linux-headers-${_abi_release} | 29 | _ksrc=/usr/src/linux-headers-${_abi_release} |
31 | 30 | ||
32 | prepare() { | 31 | prepare() { |
33 | cd "$srcdir"/$_realname-$_iscsiver | 32 | cd "$srcdir"/$_realname-$_iscsiver |
34 | for i in ../*.patch; do | 33 | for i in ../*.patch; do |
34 | [ -r "$i" ] || continue | ||
35 | msg "Applying $i" | 35 | msg "Applying $i" |
36 | patch -p1 < $i || return 1 | 36 | patch -p1 < $i || return 1 |
37 | done | 37 | done |
@@ -45,8 +45,7 @@ build() { | |||
45 | 45 | ||
46 | package() { | 46 | package() { |
47 | cd "$srcdir"/$_realname-$_iscsiver | 47 | cd "$srcdir"/$_realname-$_iscsiver |
48 | make KSRC="$_ksrc" DISTDIR="$pkgdir" install-kernel || return 1 | 48 | make KSRC="$_ksrc" DESTDIR="$pkgdir" install-kernel || return 1 |
49 | } | 49 | } |
50 | 50 | ||
51 | md5sums="9beca214c28949cce1716b49fec57de4 iscsitarget-1.4.19.tar.gz | 51 | md5sums="2f23c0bfe124d79f5c20e34ef2aaff82 iscsitarget-1.4.20.2.tar.gz" |
52 | 07f6fb7a35172b3be4c4b0101983fe86 iscsitarget-1.4.18+linux-2.6.32.patch" | ||
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 f139e732e7..0000000000 --- a/main/iscsitarget-grsec/iscsitarget-1.4.18+linux-2.6.32.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | From 43227c1624e919efcd0cd035516c1776be55ac08 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Diego=20Elio=20'Flameeyes'=20Petten=C3=B2?= <flameeyes@gmail.com> | ||
3 | Date: Sun, 18 Oct 2009 12:41:28 +0200 | ||
4 | Subject: [PATCH] Fix building with Linux kernel 2.6.32 and later. | ||
5 | |||
6 | With commit 18f2ee705d98034b0f229a3202d827468d4bffd9 of the Linux kernel, | ||
7 | the sync_page_range() function has been removed. | ||
8 | |||
9 | This patch changes it to filemap_write_and_wait_range() as done for the XFS | ||
10 | driver in the kernel (commit af0f4414f343429971d33b0dd8dccc85c1f3dcd2). | ||
11 | --- | ||
12 | kernel/file-io.c | 6 ++++++ | ||
13 | 1 files changed, 6 insertions(+), 0 deletions(-) | ||
14 | |||
15 | diff --git a/kernel/file-io.c b/kernel/file-io.c | ||
16 | index dbf7b1c..e4c3fea 100644 | ||
17 | --- a/kernel/file-io.c | ||
18 | +++ b/kernel/file-io.c | ||
19 | @@ -8,6 +8,7 @@ | ||
20 | #include <linux/blkdev.h> | ||
21 | #include <linux/parser.h> | ||
22 | #include <linux/writeback.h> | ||
23 | +#include <linux/version.h> | ||
24 | |||
25 | #include "iscsi.h" | ||
26 | #include "iscsi_dbg.h" | ||
27 | @@ -88,7 +89,12 @@ static int fileio_sync(struct iet_volume *lu, struct tio *tio) | ||
28 | count = lu->blk_cnt << lu->blk_shift; | ||
29 | } | ||
30 | |||
31 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 32) | ||
32 | res = sync_page_range(inode, mapping, ppos, count); | ||
33 | +#else | ||
34 | + res = filemap_write_and_wait_range(mapping, ppos, | ||
35 | + ppos + count -1); | ||
36 | +#endif | ||
37 | if (res) { | ||
38 | eprintk("I/O error: syncing pages failed: %d\n", res); | ||
39 | return -EIO; | ||
40 | -- | ||
41 | 1.6.5 | ||
42 | |||
diff --git a/main/iscsitarget/APKBUILD b/main/iscsitarget/APKBUILD index a53e628634..7c812a112b 100644 --- a/main/iscsitarget/APKBUILD +++ b/main/iscsitarget/APKBUILD | |||
@@ -1,8 +1,8 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | 2 | ||
3 | pkgname=iscsitarget | 3 | pkgname=iscsitarget |
4 | pkgver=1.4.19 | 4 | pkgver=1.4.20.2 |
5 | pkgrel=2 | 5 | pkgrel=0 |
6 | pkgdesc="Open Source iSCSI target with professional features - userspace utils" | 6 | pkgdesc="Open Source iSCSI target with professional features - userspace utils" |
7 | url="http://iscsitarget.sourceforge.net/" | 7 | url="http://iscsitarget.sourceforge.net/" |
8 | license="GPL-2" | 8 | license="GPL-2" |
@@ -10,21 +10,28 @@ depends= | |||
10 | makedepends="openssl-dev" | 10 | makedepends="openssl-dev" |
11 | subpackages="$pkgname-doc" | 11 | subpackages="$pkgname-doc" |
12 | source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz | 12 | source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz |
13 | $pkgname-0.4.15-isns-set-scn-flag.patch | ||
14 | $pkgname-0.4.17-build.patch | ||
15 | ietd.initd | 13 | ietd.initd |
16 | ietd.confd | 14 | ietd.confd |
17 | " | 15 | " |
18 | 16 | ||
19 | build() { | 17 | _builddir="$srcdir"/$pkgname-$pkgver |
20 | cd "$srcdir"/$pkgname-$pkgver | 18 | prepare() { |
19 | cd "$_builddir" | ||
21 | for i in ../*.patch; do | 20 | for i in ../*.patch; do |
21 | [ -r "$i" ] || continue | ||
22 | msg "Applying $i" | 22 | msg "Applying $i" |
23 | patch -p1 < $i || return 1 | 23 | patch -p1 < $i || return 1 |
24 | done | 24 | done |
25 | 25 | } | |
26 | |||
27 | build() { | ||
28 | cd "$_builddir" | ||
26 | make usr || return 1 | 29 | make usr || return 1 |
27 | make DISTDIR="$pkgdir" install-usr install-doc | 30 | } |
31 | |||
32 | package() { | ||
33 | cd "$_builddir" | ||
34 | make DESTDIR="$pkgdir" install-usr install-doc | ||
28 | 35 | ||
29 | for i in etc/ietd.conf etc/initiators.*; do | 36 | for i in etc/ietd.conf etc/initiators.*; do |
30 | install -Dm640 $i "$pkgdir"/$i || return 1 | 37 | install -Dm640 $i "$pkgdir"/$i || return 1 |
@@ -33,8 +40,6 @@ build() { | |||
33 | install -Dm755 ../ietd.confd "$pkgdir"/etc/conf.d/ietd | 40 | install -Dm755 ../ietd.confd "$pkgdir"/etc/conf.d/ietd |
34 | } | 41 | } |
35 | 42 | ||
36 | md5sums="9beca214c28949cce1716b49fec57de4 iscsitarget-1.4.19.tar.gz | 43 | md5sums="2f23c0bfe124d79f5c20e34ef2aaff82 iscsitarget-1.4.20.2.tar.gz |
37 | 22512c5cf4cb62127730ce53d74ff28f iscsitarget-0.4.15-isns-set-scn-flag.patch | ||
38 | c9a9b839b3afcdecd1601511ee48a171 iscsitarget-0.4.17-build.patch | ||
39 | 9b0ca79dc47b12024c2b67d828d6d361 ietd.initd | 44 | 9b0ca79dc47b12024c2b67d828d6d361 ietd.initd |
40 | 06ba479d3533d557b8582abe6f182410 ietd.confd" | 45 | 06ba479d3533d557b8582abe6f182410 ietd.confd" |
diff --git a/main/iscsitarget/iscsitarget-0.4.15-isns-set-scn-flag.patch b/main/iscsitarget/iscsitarget-0.4.15-isns-set-scn-flag.patch deleted file mode 100644 index 4db90793d7..0000000000 --- a/main/iscsitarget/iscsitarget-0.4.15-isns-set-scn-flag.patch +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | http://bugs.gentoo.org/180619 | ||
2 | |||
3 | --- a/usr/isns.c | ||
4 | +++ b/usr/isns.c | ||
5 | @@ -215,13 +215,13 @@ | ||
6 | |||
7 | #if __BYTE_ORDER == __LITTLE_ENDIAN | ||
8 | #define set_scn_flag(x) \ | ||
9 | -{ \ | ||
10 | +({ \ | ||
11 | x = (x & 0x55555555) << 1 | (x & 0xaaaaaaaa) >> 1; \ | ||
12 | x = (x & 0x33333333) << 2 | (x & 0xcccccccc) >> 2; \ | ||
13 | x = (x & 0x0f0f0f0f) << 4 | (x & 0xf0f0f0f0) >> 4; \ | ||
14 | x = (x & 0x00ff00ff) << 8 | (x & 0xff00ff00) >> 8; \ | ||
15 | x = (x & 0x0000ffff) << 16 | (x & 0xffff0000) >> 16; \ | ||
16 | -} | ||
17 | +}) | ||
18 | #else | ||
19 | #define set_scn_flag(x) (x) | ||
20 | #endif | ||
diff --git a/main/iscsitarget/iscsitarget-0.4.17-build.patch b/main/iscsitarget/iscsitarget-0.4.17-build.patch deleted file mode 100644 index ee676a9608..0000000000 --- a/main/iscsitarget/iscsitarget-0.4.17-build.patch +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | --- a/usr/Makefile | ||
2 | +++ b/usr/Makefile | ||
3 | @@ -1,16 +1,15 @@ | ||
4 | -CFLAGS += -O2 -fno-inline -Wall -Wstrict-prototypes -g -I../include | ||
5 | +CFLAGS ?= -O2 -fno-inline -g | ||
6 | CFLAGS += -D_GNU_SOURCE # required for glibc >= 2.8 | ||
7 | +WARNFLAGS = -Wall -Wstrict-prototypes | ||
8 | +CFLAGS += $(WARNFLAGS) -I../include | ||
9 | PROGRAMS = ietd ietadm | ||
10 | -LIBS = -lcrypto | ||
11 | +LDLIBS = -lcrypto | ||
12 | |||
13 | all: $(PROGRAMS) | ||
14 | |||
15 | ietd: ietd.o iscsid.o conn.o session.o target.o message.o ctldev.o log.o chap.o event.o param.o plain.o isns.o | ||
16 | |||
17 | - $(CC) $^ -o $@ $(LIBS) | ||
18 | - | ||
19 | ietadm: ietadm.o param.o | ||
20 | - $(CC) $^ -o $@ | ||
21 | |||
22 | clean: | ||
23 | rm -f *.o $(PROGRAMS) | ||