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); +