From 0acd32966d0410e030e316b0a2225712a40d2708 Mon Sep 17 00:00:00 2001 From: Leonardo Arena Date: Thu, 25 May 2017 10:13:56 +0000 Subject: main/open-iscsi: upgrade to 2.0.874 --- main/open-iscsi/APKBUILD | 48 +++++++++------------ main/open-iscsi/ldflags.patch | 38 +++++++++++++++++ main/open-iscsi/musl-fixes.patch | 91 +++++++++++++++++++++++++--------------- 3 files changed, 114 insertions(+), 63 deletions(-) create mode 100644 main/open-iscsi/ldflags.patch (limited to 'main/open-iscsi') diff --git a/main/open-iscsi/APKBUILD b/main/open-iscsi/APKBUILD index 3fd5cec365..1fcb1c127a 100644 --- a/main/open-iscsi/APKBUILD +++ b/main/open-iscsi/APKBUILD @@ -1,39 +1,38 @@ # Maintainer: Leonardo Arena pkgname=open-iscsi -pkgver=2.0.873 -_realver=${pkgver%.*}-${pkgver##*.} -pkgrel=6 +pkgver=2.0.874 +pkgrel=0 pkgdesc="High performance, transport independent, multi-platform iSCSI initiator" url="http://www.open-iscsi.org" arch="all" license="GPL2" -depends= -makedepends="libressl-dev linux-headers" -install="" +makedepends="autoconf automake libressl-dev libtool linux-headers open-isns-dev + util-linux-dev" +options="!check" subpackages="$pkgname-doc" -source="http://arch.p5n.pp.ru/~sergej/dl/$pkgname-${_realver}.tar.gz - musl-fixes.patch +source="$pkgname-$pkgver.tar.gz::https://github.com/open-iscsi/open-iscsi/archive/$pkgver.tar.gz iscsid.initd iscsid.confd - iscsid.conf" - -builddir="$srcdir"/$pkgname-$_realver + iscsid.conf + musl-fixes.patch + ldflags.patch + " +builddir="$srcdir"/$pkgname-$pkgver prepare() { - default_prepare || return 1 - update_config_guess || return 1 + default_prepare # include iscsistart in the package - sed -i -e '/^PROGRAMS = /s/$/ usr\/iscsistart/' Makefile || return 1 + sed -i -e '/^PROGRAMS = /s/$/ usr\/iscsistart/' Makefile } build() { cd "$builddir" - make user || return 1 + make user } package() { cd "$builddir" - make DESTDIR="$pkgdir" install_user || return 1 + make DESTDIR="$pkgdir" install_user mkdir -p $pkgdir/usr/bin mkdir -p $pkgdir/usr/sbin mv $pkgdir/sbin/iscsi-iname $pkgdir/usr/bin @@ -45,18 +44,9 @@ package() { install -Dm644 "$srcdir"/iscsid.conf "$pkgdir"/etc/iscsi/iscsid.conf } -md5sums="8b8316d7c9469149a6cc6234478347f7 open-iscsi-2.0-873.tar.gz -93d493b1ad4fb2d246eb532446aa164d musl-fixes.patch -c6a0c15c0c21b13915179fb7e0cf0003 iscsid.initd -b762b687d4628791b4362df22cf22d34 iscsid.confd -49c29d08c08e74699724f1fb3de21a6c iscsid.conf" -sha256sums="7dd9f2f97da417560349a8da44ea4fcfe98bfd5ef284240a2cc4ff8e88ac7cd9 open-iscsi-2.0-873.tar.gz -57d6b4040a9b43c8a8864fb3e1c25ac48b78427265f4487744685a9a2b1b2954 musl-fixes.patch -38edede472f478ce01f40e3557c315de3f3ecf1d0c0dbab2883517840a7186b5 iscsid.initd -673bf4744efc3276d372587c996270821d39dcdc0bf27a13691ea6b0e814b6d0 iscsid.confd -0e1db9b03693a1090cfd7b28a790f83ec6615984608b0cf8465aa91db2437e23 iscsid.conf" -sha512sums="4e67116cb7dd49381c9279645e5a661f05596ae6be3b832772089828b3764ca2d04b5dea1bcc337071efb52c3c75a6fb943136c659ee59500f3a198ed0dcea6b open-iscsi-2.0-873.tar.gz -e45ce5deec9d3861568e0be3390827da525b523b6d0a47a99f85becb4416e3a26f5e17f077a891c43ae90e621fa8d357123b9b3573a731788fac2c12b40239a6 musl-fixes.patch +sha512sums="66d8a52b6401229d51873f1ee0f4e7259a8ed584800403a41741c7eeedc0ec21a2b116671cb7259f60918d083ffb46d76860236a1b10fbb94a4c1d61bddae1ae open-iscsi-2.0.874.tar.gz e16d0abf117c0c282e98abb14893923609dc6078f770facd0578ad72ce6e3fc7b9c84a39628c1246d955ba6bb204fb902bcba6d5959ac755fee7e2a85da181df iscsid.initd 075bb9cb783be7ccbc799947e0e042b85310d40b3045141dc1be40ca84ed1cc0e1e54559df501c512c179e28375314b27a03c15d9a6d4b1cabd428b2279985d3 iscsid.confd -3686d31c5642e611c0c0c61f0f42a33030a74b518a2a108f004b9bd34b2b98d8e29ee2416a5b9cc447ab0449bdc94158b2323d977e7b7d2930dd4dcf0866da68 iscsid.conf" +3686d31c5642e611c0c0c61f0f42a33030a74b518a2a108f004b9bd34b2b98d8e29ee2416a5b9cc447ab0449bdc94158b2323d977e7b7d2930dd4dcf0866da68 iscsid.conf +9120d8e0a594f7337eb748ef655ebe915356fc4519b2cb58d9a6a5a2002059c0e9eb31e33e3e8b2242ae2fb9538a5233d17cdf0afd50c56aef3922335ebcd7d3 musl-fixes.patch +85f1245237fae8e10bb119b079000fe0f950b4771c198f5f2fec83b8d923931ef835a0611908967c080d9ae1f511bde29204be095abe997a7325cb70d264d548 ldflags.patch" diff --git a/main/open-iscsi/ldflags.patch b/main/open-iscsi/ldflags.patch new file mode 100644 index 0000000000..b46771c2a1 --- /dev/null +++ b/main/open-iscsi/ldflags.patch @@ -0,0 +1,38 @@ +diff --git a/usr/Makefile b/usr/Makefile +index c1866b6..b73e792 100644 +--- a/usr/Makefile ++++ b/usr/Makefile +@@ -54,14 +54,14 @@ all: $(PROGRAMS) + + iscsid: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(DISCOVERY_SRCS) \ + iscsid.o session_mgmt.o discoveryd.o mntcheck.o +- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lisns -lcrypto -lrt -lmount ++ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lisns -lcrypto -lrt -lmount $(LDFLAGS) + + iscsiadm: $(ISCSI_LIB_SRCS) $(DISCOVERY_SRCS) iscsiadm.o session_mgmt.o mntcheck.o +- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lisns -lcrypto -lmount ++ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lisns -lcrypto -lmount $(LDFLAGS) + + iscsistart: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \ + iscsistart.o statics.o +- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lrt ++ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lrt $(LDFLAGS) + clean: + rm -f *.o $(PROGRAMS) .depend $(LIBSYS) + +diff --git a/utils/Makefile b/utils/Makefile +index f65f1e7..472a1b4 100644 +--- a/utils/Makefile ++++ b/utils/Makefile +@@ -7,7 +7,7 @@ PROGRAMS = iscsi-iname + all: $(PROGRAMS) + + iscsi-iname: md5.o iscsi-iname.o +- $(CC) $(CFLAGS) $(LDFLAGS) $^ $(DBM_LIB) -o $@ ++ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(DBM_LIB) -o $@ $(LDFLAGS) + + clean: + rm -f *.o $(PROGRAMS) .depend +-- +2.13.0 + diff --git a/main/open-iscsi/musl-fixes.patch b/main/open-iscsi/musl-fixes.patch index f101eda6dd..5a3158e5df 100644 --- a/main/open-iscsi/musl-fixes.patch +++ b/main/open-iscsi/musl-fixes.patch @@ -1,26 +1,19 @@ ---- ./utils/open-isns/isns.h.orig -+++ ./utils/open-isns/isns.h -@@ -13,6 +13,7 @@ - #include - #include +diff --git a/iscsiuio/src/unix/libs/bnx2x.c b/iscsiuio/src/unix/libs/bnx2x.c +index 19cbcec..ad2d6ba 100644 +--- a/iscsiuio/src/unix/libs/bnx2x.c ++++ b/iscsiuio/src/unix/libs/bnx2x.c +@@ -36,6 +36,7 @@ + * bnx2x.c - bnx2x user space driver + * + */ ++#include + #include #include -+#include - - #include - #include "types.h" ---- ./utils/fwparam_ibft/fwparam_ppc.c.orig -+++ ./utils/fwparam_ibft/fwparam_ppc.c -@@ -356,7 +356,7 @@ - * Sort the nics into "natural" order. The proc fs - * device-tree has them in somewhat random, or reversed order. - */ -- qsort(niclist, nic_count, sizeof(char *), (__compar_fn_t)nic_cmp); -+ qsort(niclist, nic_count, sizeof(char *), (int (*)(const void *, const void *))nic_cmp); - - snprintf(prefix, sizeof(prefix), "%s/%s", devtree, "aliases"); - dev_count = 0; ---- ./usr/idbm.c.orig -+++ ./usr/idbm.c + #include +diff --git a/usr/idbm.c b/usr/idbm.c +index 3b8a5a2..579b145 100644 +--- a/usr/idbm.c ++++ b/usr/idbm.c @@ -25,6 +25,7 @@ #include #include @@ -29,30 +22,44 @@ #include #include #include ---- ./usr/iscsiadm.c.orig 2012-05-21 02:59:24.000000000 +0200 -+++ ./usr/iscsiadm.c 2016-07-20 22:00:54.430451701 +0200 -@@ -2403,6 +2403,7 @@ main(int argc, char **argv) - int tpgt = PORTAL_GROUP_TAG_UNKNOWN, killiscsid=-1, do_show=0; +diff --git a/usr/iscsi_net_util.c b/usr/iscsi_net_util.c +index 06df9b3..777e4e2 100644 +--- a/usr/iscsi_net_util.c ++++ b/usr/iscsi_net_util.c +@@ -30,7 +30,7 @@ + #include + #include + #include +-#include ++#include + + #include "sysdeps.h" + #include "ethtool-copy.h" +diff --git a/usr/iscsiadm.c b/usr/iscsiadm.c +index 9602f6c..ba6e873 100644 +--- a/usr/iscsiadm.c ++++ b/usr/iscsiadm.c +@@ -3263,6 +3263,7 @@ main(int argc, char **argv) int packet_size=32, ping_count=1, ping_interval=0; int do_discover = 0, sub_mode = -1; + int portal_type = -1; + int argerror = 0; struct sigaction sa_old; struct sigaction sa_new; struct list_head ifaces; -@@ -2553,7 +2554,11 @@ main(int argc, char **argv) - return 0; +@@ -3426,6 +3427,11 @@ main(int argc, char **argv) + break; case 'h': usage(0); -- } -+ ++ break; + case '?': + log_error("unrecognized character '%c'", optopt); + argerror = 1; -+ } ++ break; + } if (name && value) { - param = idbm_alloc_user_param(name, value); -@@ -2568,8 +2573,7 @@ main(int argc, char **argv) +@@ -3441,8 +3447,7 @@ main(int argc, char **argv) } } @@ -61,4 +68,20 @@ + if (argerror) { rc = ISCSI_ERR_INVAL; goto free_ifaces; - + } +diff --git a/utils/fwparam_ibft/fwparam_ppc.c b/utils/fwparam_ibft/fwparam_ppc.c +index c298b8c..da14ee2 100644 +--- a/utils/fwparam_ibft/fwparam_ppc.c ++++ b/utils/fwparam_ibft/fwparam_ppc.c +@@ -356,7 +356,7 @@ static int loop_devs(const char *devtree) + * Sort the nics into "natural" order. The proc fs + * device-tree has them in somewhat random, or reversed order. + */ +- qsort(niclist, nic_count, sizeof(char *), (__compar_fn_t)nic_cmp); ++ qsort(niclist, nic_count, sizeof(char *), (int (*)(const void *, const void *))nic_cmp); + + snprintf(prefix, sizeof(prefix), "%s/%s", devtree, "aliases"); + dev_count = 0; +-- +2.13.0 + -- cgit v1.2.3