From 598c0e0e797c74df5aa0e7f9613559345458d3266d116853963a896b14ba0aab Mon Sep 17 00:00:00 2001 From: Lee Duncan Date: Wed, 5 Jun 2019 18:04:08 +0000 Subject: [PATCH 1/3] Accepting request 707903 from home:lee_duncan:branches:network - Added latest upstream changes, including: - iscsiuio: Stop using /var directory for PIDfile and locks - iscsiuio: improve daemon synchronization (bsc#1135070) - fix pipe notification code - add systemd support for iscsiuio - make iscsid systemd usage optional - fix possible discovery hang timeout - fix iscsiuio systemd disablement Updating: * open-iscsi-SUSE-latest.diff.bz2 OBS-URL: https://build.opensuse.org/request/show/707903 OBS-URL: https://build.opensuse.org/package/show/network/open-iscsi?expand=0&rev=129 --- open-iscsi-SUSE-latest.diff.bz2 | 4 ++-- open-iscsi.changes | 14 ++++++++++++++ open-iscsi.spec | 4 +++- temp-memcpy-fix.patch | 13 +++++++++++++ 4 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 temp-memcpy-fix.patch diff --git a/open-iscsi-SUSE-latest.diff.bz2 b/open-iscsi-SUSE-latest.diff.bz2 index 24f3916..3740bd5 100644 --- a/open-iscsi-SUSE-latest.diff.bz2 +++ b/open-iscsi-SUSE-latest.diff.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:89da3af87975bfd7ce3e92eea9f1b5a3cbdeba66e8f426ac1885f4c0a9f7ba67 -size 11002 +oid sha256:f21f0ba451f7a55644360b3c1955b5b6a4812555096c569ebb7e40bb500e1922 +size 14053 diff --git a/open-iscsi.changes b/open-iscsi.changes index 041ed20..fdf5019 100644 --- a/open-iscsi.changes +++ b/open-iscsi.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Tue Jun 4 17:45:40 UTC 2019 - Lee Duncan + +- Added latest upstream changes, including: + - iscsiuio: Stop using /var directory for PIDfile and locks + - iscsiuio: improve daemon synchronization (bsc#1135070) + - fix pipe notification code + - add systemd support for iscsiuio + - make iscsid systemd usage optional + - fix possible discovery hang timeout + - fix iscsiuio systemd disablement + Updating: + * open-iscsi-SUSE-latest.diff.bz2 + ------------------------------------------------------------------- Tue Mar 26 17:43:23 UTC 2019 - Lee Duncan diff --git a/open-iscsi.spec b/open-iscsi.spec index 8455427..8e2eb54 100644 --- a/open-iscsi.spec +++ b/open-iscsi.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -26,6 +26,7 @@ Group: Productivity/Networking/Other Url: http://www.open-iscsi.com Source: %{name}-2.0.%{iscsi_release}.tar.bz2 Patch1: %{name}-SUSE-latest.diff.bz2 +Patch2: temp-memcpy-fix.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bison @@ -108,6 +109,7 @@ the libopeniscsiusr library. %prep %setup -q -n %{name}-2.0.%{iscsi_release} %patch1 -p1 +%patch2 -p1 %build [ -z "$SOURCE_DATE_EPOCH" ] || export KBUILD_BUILD_TIMESTAMP=@$SOURCE_DATE_EPOCH diff --git a/temp-memcpy-fix.patch b/temp-memcpy-fix.patch new file mode 100644 index 0000000..e40e59b --- /dev/null +++ b/temp-memcpy-fix.patch @@ -0,0 +1,13 @@ +diff --git a/iscsiuio/src/unix/nic_utils.c b/iscsiuio/src/unix/nic_utils.c +index aad679ecfabc..c2d96a6cdd5b 100644 +--- a/iscsiuio/src/unix/nic_utils.c ++++ b/iscsiuio/src/unix/nic_utils.c +@@ -611,7 +611,7 @@ static int from_uio_find_associated_host(nic_t *nic, int uio_minor, + break; + } + +- strncpy(name, ++ memcpy(name, + parsed_name + + extract_name_offset[path_iterator], name_size); + From 70fd9b9017b51778e1094d9c78d82670b0d3a3acb33a41abd1768fe4655d5747 Mon Sep 17 00:00:00 2001 From: Lee Duncan Date: Wed, 5 Jun 2019 18:20:00 +0000 Subject: [PATCH 2/3] Accepting request 707905 from home:lee_duncan:branches:network removed accidently-added temp patch OBS-URL: https://build.opensuse.org/request/show/707905 OBS-URL: https://build.opensuse.org/package/show/network/open-iscsi?expand=0&rev=130 --- open-iscsi.spec | 2 -- temp-memcpy-fix.patch | 13 ------------- 2 files changed, 15 deletions(-) delete mode 100644 temp-memcpy-fix.patch diff --git a/open-iscsi.spec b/open-iscsi.spec index 8e2eb54..81c241a 100644 --- a/open-iscsi.spec +++ b/open-iscsi.spec @@ -26,7 +26,6 @@ Group: Productivity/Networking/Other Url: http://www.open-iscsi.com Source: %{name}-2.0.%{iscsi_release}.tar.bz2 Patch1: %{name}-SUSE-latest.diff.bz2 -Patch2: temp-memcpy-fix.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bison @@ -109,7 +108,6 @@ the libopeniscsiusr library. %prep %setup -q -n %{name}-2.0.%{iscsi_release} %patch1 -p1 -%patch2 -p1 %build [ -z "$SOURCE_DATE_EPOCH" ] || export KBUILD_BUILD_TIMESTAMP=@$SOURCE_DATE_EPOCH diff --git a/temp-memcpy-fix.patch b/temp-memcpy-fix.patch deleted file mode 100644 index e40e59b..0000000 --- a/temp-memcpy-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/iscsiuio/src/unix/nic_utils.c b/iscsiuio/src/unix/nic_utils.c -index aad679ecfabc..c2d96a6cdd5b 100644 ---- a/iscsiuio/src/unix/nic_utils.c -+++ b/iscsiuio/src/unix/nic_utils.c -@@ -611,7 +611,7 @@ static int from_uio_find_associated_host(nic_t *nic, int uio_minor, - break; - } - -- strncpy(name, -+ memcpy(name, - parsed_name + - extract_name_offset[path_iterator], name_size); - From c95b156d0a801f2f3d6cfe7f61cdd32e3bbc9b62f3cf34c618ee06b93e1fd933 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 13 Jun 2019 13:16:22 +0000 Subject: [PATCH 3/3] Accepting request 709448 from home:dimstar:Factory Allow OBS to pick better candidates to shorten rebuild queues OBS-URL: https://build.opensuse.org/request/show/709448 OBS-URL: https://build.opensuse.org/package/show/network/open-iscsi?expand=0&rev=131 --- open-iscsi.changes | 6 ++++++ open-iscsi.spec | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/open-iscsi.changes b/open-iscsi.changes index fdf5019..1d689fc 100644 --- a/open-iscsi.changes +++ b/open-iscsi.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 12 14:24:16 UTC 2019 - Dominique Leuenberger + +- BuildRequire pkgconfig(systemd) instead of systemd: allow OBS to + shortcut the build queues by allowing usage of systemd-mini + ------------------------------------------------------------------- Tue Jun 4 17:45:40 UTC 2019 - Lee Duncan diff --git a/open-iscsi.spec b/open-iscsi.spec index 81c241a..1ae0478 100644 --- a/open-iscsi.spec +++ b/open-iscsi.spec @@ -40,8 +40,8 @@ BuildRequires: open-isns-devel BuildRequires: openssl-devel BuildRequires: pkg-config BuildRequires: suse-module-tools -BuildRequires: systemd -BuildRequires: systemd-devel +BuildRequires: pkgconfig(systemd) +BuildRequires: pkgconfig(libsystemd) Requires(post): coreutils Requires: libopeniscsiusr0_2_0 = %{version} %{?systemd_requires}