open-iscsi: update to 2.1.5.

srcpkgs/open-iscsi/template

@@ -1,7 +1,7 @@
 # Template file for 'open-iscsi'
 pkgname=open-iscsi
-version=2.1.3
-revision=2
+version=2.1.5
+revision=1
 conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -11,18 +11,17 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.open-iscsi.com/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
-checksum=5410474b23552016220d04aa181903cb50ae988f29e99cb03f3e2de86a109be4
+checksum=d8a06c1ea86d2a312d598f52c151b210a34d82445a6f522f7c2bd6581b3a99af
 
 case "$XBPS_TARGET_MACHINE" in
-	*-musl) CFLAGS+="-D_LINUX_IF_ETHER_H -Wno-error=format -Wno-error=cpp";;
+	*-musl) CFLAGS+=" -D_LINUX_IF_ETHER_H -Wno-error=format -Wno-error=cpp";;
 esac
 post_extract() {
-	sed -i '1i#include <fcntl.h>' usr/idbm.c
-	sed -i 's/(__compar_fn_t)//' utils/fwparam_ibft/fwparam_ppc.c
-	sed -i '/CC.*-o/s/$/ $(LDFLAGS)/' utils/Makefile usr/Makefile
-	sed -i 's/lib64/lib/g' libopeniscsiusr/Makefile
-	sed -i 's,<linux/if_ether.h>,<netinet/if_ether.h>,g' usr/iscsi_net_util.c
-	sed -i '1i#include <netinet/if_ether.h>' iscsiuio/src/unix/libs/bnx2x.c libopeniscsiusr/misc.c
+	vsed -i -e '/CC.*-o/s/$/ $(LDFLAGS)/' utils/Makefile usr/Makefile
+	vsed -i -e 's/lib64/lib/g' libopeniscsiusr/Makefile
+	vsed -i -e 's,<linux/if_ether.h>,<netinet/if_ether.h>,g' usr/iscsi_net_util.c
+	vsed -i -e '1i#include <netinet/if_ether.h>' iscsiuio/src/unix/libs/bnx2x.c libopeniscsiusr/misc.c
+	vsed -i -e 's:ISCSI_MAX_IFACE_LEN):ISCSI_MAX_IFACE_LEN-1):' libopeniscsiusr/idbm.c
 }
 do_configure() {
 	( cd iscsiuio && autoreconf -fi && ./configure ${configure_args} CFLAGS="-DNO_SYSTEMD" )
@@ -43,6 +42,4 @@ do_install() {
 	true >${DESTDIR}/etc/iscsi/initiatorname.iscsi
 	vsconf ${DESTDIR}/etc/iscsi/ifaces/iface.example
 	rm ${DESTDIR}/etc/iscsi/ifaces/iface.example
-
-	sed -i 's,/sbin/iscsid,/usr/bin/iscsid,' ${DESTDIR}/etc/iscsi/iscsid.conf
 }