[arch-commits] Commit in open-iscsi/trunk (2 files)

[Christian Hesse]

    Date: Wednesday, February 23, 2022 @ 10:01:41
  Author: eworm
Revision: 1136260

upgpkg: open-iscsi 2.1.6-1: new upstream release

Modified:
  open-iscsi/trunk/PKGBUILD
Deleted:
  open-iscsi/trunk/0001-Fix-compiler-error-introduced-with-recent-IPv6-commit.patch

------------------------------------------------------------------+
 0001-Fix-compiler-error-introduced-with-recent-IPv6-commit.patch |   35 ----------
 PKGBUILD                                                         |   14 ----
 2 files changed, 3 insertions(+), 46 deletions(-)

Deleted: 0001-Fix-compiler-error-introduced-with-recent-IPv6-commit.patch
===================================================================
--- 0001-Fix-compiler-error-introduced-with-recent-IPv6-commit.patch	2022-02-23 09:05:54 UTC (rev 1136259)
+++ 0001-Fix-compiler-error-introduced-with-recent-IPv6-commit.patch	2022-02-23 10:01:41 UTC (rev 1136260)
@@ -1,35 +0,0 @@
-From 424d5967e94f6adf4c0669d390779af8da0bef20 Mon Sep 17 00:00:00 2001
-From: Lee Duncan <lduncan at suse.com>
-Date: Sat, 18 Sep 2021 16:10:50 -0700
-Subject: Fix compiler error introduced with recent IPv6 commit.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit 76350316de38 ("Handle IPv6 interfaces correctly.") added
-a string copy that creates this gcc-11 error message:
-
-> gcc-11 -O2 -g -Wall -Werror -Wextra -fvisibility=hidden -fPIC -I/usr/include/kmod    -c -o idbm.o idbm.c
-> idbm.c: In function ‘_idbm_node_rec_link’:
-> idbm.c:999:17: error: ‘strncpy’ specified bound 65 equals destination size [-Werror=stringop-truncation]
->   999 |                 strncpy((*node).iface.name, iface_name, ISCSI_MAX_IFACE_LEN);
->       |                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-So copy one less character, maximum.
----
- libopeniscsiusr/idbm.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libopeniscsiusr/idbm.c b/libopeniscsiusr/idbm.c
-index b2524ed..6f57e45 100644
---- a/libopeniscsiusr/idbm.c
-+++ b/libopeniscsiusr/idbm.c
-@@ -996,7 +996,7 @@ static void _idbm_node_rec_link(struct iscsi_node *node, struct idbm_rec *recs,
- 
- 	/* use the interface name passed in, if any */
- 	if (iface_name)
--		strncpy((*node).iface.name, iface_name, ISCSI_MAX_IFACE_LEN);
-+		strncpy((*node).iface.name, iface_name, ISCSI_MAX_IFACE_LEN-1);
- 
- 	/*
- 	 * Note: because we do not add the iface.iscsi_ifacename to

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-23 09:05:54 UTC (rev 1136259)
+++ PKGBUILD	2022-02-23 10:01:41 UTC (rev 1136260)
@@ -2,7 +2,7 @@
 # Maintainer: Stefan Kirrmann <stefan.kirrmann at gmail dot com>
 
 pkgname=open-iscsi
-pkgver=2.1.5
+pkgver=2.1.6
 pkgrel=1
 pkgdesc='iSCSI userland tools'
 arch=('x86_64')
@@ -14,17 +14,9 @@
 backup=('etc/iscsi/iscsid.conf'
 	'etc/iscsi/initiatorname.iscsi')
 options=('docs')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/open-iscsi/open-iscsi/archive/$pkgver.tar.gz"
-        '0001-Fix-compiler-error-introduced-with-recent-IPv6-commit.patch')
-sha256sums=('d8a06c1ea86d2a312d598f52c151b210a34d82445a6f522f7c2bd6581b3a99af'
-            '4b0db394a45bc5a0cd68be840f0852e2d6cdba834cf2bf15e48a8ebf41e4b9d2')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/open-iscsi/open-iscsi/archive/$pkgver.tar.gz")
+sha256sums=('b67350d106696779c6bee421c60a64ade2a9dabe247dc4bd44f59c751e22d7f7')
 
-prepare() {
-  cd "$srcdir"/${pkgname}-${pkgver}
-
-  patch -Np1 < ../0001-Fix-compiler-error-introduced-with-recent-IPv6-commit.patch
-}
-
 build() {
   cd "$srcdir"/${pkgname}-${pkgver}