From a04518d9f27c87a82e0a129207a73008b62287c8353d1437bbf6566962adce06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sun, 10 Nov 2019 10:53:31 +0000 Subject: [PATCH 1/4] Accepting request 747025 from home:lee_duncan:branches:network - Use SPEC-file macro for systemd generator directory, since the libexec macro is changing from /usr/lib to /usr/libexec. OBS-URL: https://build.opensuse.org/request/show/747025 OBS-URL: https://build.opensuse.org/package/show/network/open-iscsi?expand=0&rev=148 --- open-iscsi.changes | 6 ++++++ open-iscsi.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/open-iscsi.changes b/open-iscsi.changes index b520a22..66fe513 100644 --- a/open-iscsi.changes +++ b/open-iscsi.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Nov 9 17:44:09 UTC 2019 - Lee Duncan + +- Use SPEC-file macro for systemd generator directory, since + the libexec macro is changing from /usr/lib to /usr/libexec. + ------------------------------------------------------------------- Fri Nov 1 19:08:01 UTC 2019 - Lee Duncan diff --git a/open-iscsi.spec b/open-iscsi.spec index d1f7e37..ec9ddfa 100644 --- a/open-iscsi.spec +++ b/open-iscsi.spec @@ -179,7 +179,7 @@ fi %{_unitdir}/iscsid.service %{_unitdir}/iscsid.socket %{_unitdir}/iscsi.service -%{_libexecdir}/systemd/system-generators/ibft-rule-generator +%{_systemdgeneratordir}/ibft-rule-generator %{_sbindir}/rciscsi %{_sbindir}/rciscsid /sbin/iscsid From be784e1a4d1b5ac9ae8f25cf779bfdc4c5a7e578e99f4ec190cc0326c143e25a Mon Sep 17 00:00:00 2001 From: Lee Duncan Date: Thu, 14 Nov 2019 21:09:16 +0000 Subject: [PATCH 2/4] Accepting request 748763 from home:lee_duncan:branches:network - Merged in latest upstream (2.1.0), including more fixes for iscsiuio, and cleanup/bug-fixes of new CHAP code. This replaces open-iscsi-2.0.878-suse.tar.bz2 with open-iscsi-2.1.0-suse.tar.bz2, and it resets open-iscsi-SUSE-latest.diff.bz2 with fixes after 2.1.0-suse. OBS-URL: https://build.opensuse.org/request/show/748763 OBS-URL: https://build.opensuse.org/package/show/network/open-iscsi?expand=0&rev=149 --- open-iscsi-2.0.878-suse.tar.bz2 | 3 --- open-iscsi-2.1.0-suse.tar.bz2 | 3 +++ open-iscsi-SUSE-latest.diff.bz2 | 4 ++-- open-iscsi.changes | 9 +++++++++ open-iscsi.spec | 9 +++++---- 5 files changed, 19 insertions(+), 9 deletions(-) delete mode 100644 open-iscsi-2.0.878-suse.tar.bz2 create mode 100644 open-iscsi-2.1.0-suse.tar.bz2 diff --git a/open-iscsi-2.0.878-suse.tar.bz2 b/open-iscsi-2.0.878-suse.tar.bz2 deleted file mode 100644 index e156077..0000000 --- a/open-iscsi-2.0.878-suse.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bb9fef8a61daf6146e48a4b6267c08b96be5b4a5a0024d3bf620647d8e74741c -size 478699 diff --git a/open-iscsi-2.1.0-suse.tar.bz2 b/open-iscsi-2.1.0-suse.tar.bz2 new file mode 100644 index 0000000..e27079a --- /dev/null +++ b/open-iscsi-2.1.0-suse.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:db378d808e09665cb72762e8297d91297e166aedbf439b1c89563d78565a6536 +size 478014 diff --git a/open-iscsi-SUSE-latest.diff.bz2 b/open-iscsi-SUSE-latest.diff.bz2 index 6108bf2..1f82a91 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:a9636bd980cf62900d948cbc79ef58b6f1e18c61335ed2f7ec4448c56af4708a -size 4060 +oid sha256:d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 +size 14 diff --git a/open-iscsi.changes b/open-iscsi.changes index 66fe513..9aacadd 100644 --- a/open-iscsi.changes +++ b/open-iscsi.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Nov 14 20:53:57 UTC 2019 - Lee Duncan + +- Merged in latest upstream (2.1.0), including more fixes for + iscsiuio, and cleanup/bug-fixes of new CHAP code. + This replaces open-iscsi-2.0.878-suse.tar.bz2 with + open-iscsi-2.1.0-suse.tar.bz2, and it resets + open-iscsi-SUSE-latest.diff.bz2 with fixes after 2.1.0-suse. + ------------------------------------------------------------------- Sat Nov 9 17:44:09 UTC 2019 - Lee Duncan diff --git a/open-iscsi.spec b/open-iscsi.spec index ec9ddfa..629adb2 100644 --- a/open-iscsi.spec +++ b/open-iscsi.spec @@ -16,15 +16,16 @@ # -%define iscsi_release 878-suse +%define iscsi_minor_release 1 +%define iscsi_patch_release 0-suse Name: open-iscsi -Version: 2.0.878 +Version: 2.1.0 Release: 0 Summary: Linux iSCSI Software Initiator License: GPL-2.0-or-later Group: Productivity/Networking/Other Url: http://www.open-iscsi.com -Source: %{name}-2.0.%{iscsi_release}.tar.bz2 +Source: %{name}-2.%{iscsi_minor_release}.%{iscsi_patch_release}.tar.bz2 Patch1: %{name}-SUSE-latest.diff.bz2 BuildRequires: autoconf BuildRequires: automake @@ -106,7 +107,7 @@ include files and documentation. These are used to compile against the libopeniscsiusr library. %prep -%setup -q -n %{name}-2.0.%{iscsi_release} +%setup -q -n %{name}-2.%{iscsi_minor_release}.%{iscsi_patch_release} %patch1 -p1 %build From 4f9338264f0b411585adaf45c524bc667e8fa929cab8de425191c5040b6d0219 Mon Sep 17 00:00:00 2001 From: Lee Duncan Date: Sat, 16 Nov 2019 01:29:09 +0000 Subject: [PATCH 3/4] Accepting request 749012 from home:lee_duncan:branches:network Note that this also updates the version of libopeniscsiusr, since the version numbers of it and open-iscsi are kept in sync. Lastly, the libopeniscsiusr sub-package updates the library version from 0_2_0 to 0_2_1. Also, updated the Summary lines in the spec file that started with "iSCSI ...", since rpmlint didn't like them starting with a non-capital letter. OBS-URL: https://build.opensuse.org/request/show/749012 OBS-URL: https://build.opensuse.org/package/show/network/open-iscsi?expand=0&rev=150 --- open-iscsi-SUSE-latest.diff.bz2 | 4 ++-- open-iscsi.changes | 8 ++++++++ open-iscsi.spec | 22 +++++++++++----------- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/open-iscsi-SUSE-latest.diff.bz2 b/open-iscsi-SUSE-latest.diff.bz2 index 1f82a91..04c7a41 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:d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 -size 14 +oid sha256:657981107099f3052c0efe2b4d65553298c0407e57411be2bcb8b9a624ff747b +size 305 diff --git a/open-iscsi.changes b/open-iscsi.changes index 9aacadd..74aebb2 100644 --- a/open-iscsi.changes +++ b/open-iscsi.changes @@ -6,6 +6,14 @@ Thu Nov 14 20:53:57 UTC 2019 - Lee Duncan This replaces open-iscsi-2.0.878-suse.tar.bz2 with open-iscsi-2.1.0-suse.tar.bz2, and it resets open-iscsi-SUSE-latest.diff.bz2 with fixes after 2.1.0-suse. + Note that this also updates the version of libopeniscsiusr, + since the version numbers of it and open-iscsi are + kept in sync. Lastly, the libopeniscsiusr sub-package + updates the library version from 0_2_0 to 0_2_1. + + Also, updated the Summary lines in the spec file that + started with "iSCSI ...", since rpmlint didn't like + them starting with a non-capital letter. ------------------------------------------------------------------- Sat Nov 9 17:44:09 UTC 2019 - Lee Duncan diff --git a/open-iscsi.spec b/open-iscsi.spec index 629adb2..9bbd1bb 100644 --- a/open-iscsi.spec +++ b/open-iscsi.spec @@ -44,7 +44,7 @@ BuildRequires: suse-module-tools BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(systemd) Requires(post): coreutils -Requires: libopeniscsiusr0_2_0 = %{version} +Requires: libopeniscsiusr0_2_1 = %{version} %{?systemd_requires} %description @@ -62,18 +62,18 @@ connection-level error processing, Nop-In and Nop-Out handling. It comes with a daemon process called iscsid, and a management utility, iscsiadm. -%package -n libopeniscsiusr0_2_0 -Version: 2.0.878 +%package -n libopeniscsiusr0_2_1 +Version: 2.1.0 Release: 0 -Summary: iSCSI User-level Library +Summary: The iSCSI User-level Library Group: System/Libraries -Obsoletes: libopeniscsiusr0_1_0 +Obsoletes: libopeniscsiusr0_2_0 -%description -n libopeniscsiusr0_2_0 +%description -n libopeniscsiusr0_2_1 The iSCSI user-space API from the open-iscsi project. %package -n iscsiuio -Version: 0.7.8.4 +Version: 0.7.8.6 Release: 0 Summary: Linux Broadcom NetXtremem II iscsi server Group: Productivity/Networking/Other @@ -97,7 +97,7 @@ The communication to the driver is done via user-space I/O (Kernel module name %package devel Version: 2.0.878 Release: 0 -Summary: iSCSI User-level Library Development Library and Include files +Summary: The iSCSI User-level Library Development Library and Include files Group: Development/Libraries/C and C++ Requires: %{name} = %{version} @@ -155,8 +155,8 @@ fi %preun %{service_del_preun iscsid.socket iscsid.service iscsi.service} -%post -n libopeniscsiusr0_2_0 -p /sbin/ldconfig -%postun -n libopeniscsiusr0_2_0 -p /sbin/ldconfig +%post -n libopeniscsiusr0_2_1 -p /sbin/ldconfig +%postun -n libopeniscsiusr0_2_1 -p /sbin/ldconfig %post -n iscsiuio %{service_add_post iscsiuio.socket iscsiuio.service} @@ -201,7 +201,7 @@ fi %{_mandir}/man8/iscsi_fw_login.8%{ext_man} %{_udevrulesdir}/50-iscsi-firmware-login.rules -%files -n libopeniscsiusr0_2_0 +%files -n libopeniscsiusr0_2_1 %{_libdir}/libopeniscsiusr.so.* %files -n iscsiuio From c8b36d6ec5a100532cedc486b3a8de1d96cdb9cdb77a6c7250e931388794beb0 Mon Sep 17 00:00:00 2001 From: Lee Duncan Date: Mon, 18 Nov 2019 23:39:07 +0000 Subject: [PATCH 4/4] Accepting request 749403 from home:lee_duncan:branches:network New version of open-iscsi from upstream: 2.1.0. OBS-URL: https://build.opensuse.org/request/show/749403 OBS-URL: https://build.opensuse.org/package/show/network/open-iscsi?expand=0&rev=151 --- open-iscsi-2.1.0-suse.tar.bz2 | 4 ++-- open-iscsi-SUSE-latest.diff.bz2 | 4 ++-- open-iscsi.changes | 9 +++------ open-iscsi.spec | 25 +++++++++++++------------ 4 files changed, 20 insertions(+), 22 deletions(-) diff --git a/open-iscsi-2.1.0-suse.tar.bz2 b/open-iscsi-2.1.0-suse.tar.bz2 index e27079a..12b1cd9 100644 --- a/open-iscsi-2.1.0-suse.tar.bz2 +++ b/open-iscsi-2.1.0-suse.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:db378d808e09665cb72762e8297d91297e166aedbf439b1c89563d78565a6536 -size 478014 +oid sha256:db548401a533671350bf0420431e6b36c78cbcb1b482df363a5eecfb8cfb1f49 +size 477941 diff --git a/open-iscsi-SUSE-latest.diff.bz2 b/open-iscsi-SUSE-latest.diff.bz2 index 04c7a41..1f82a91 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:657981107099f3052c0efe2b4d65553298c0407e57411be2bcb8b9a624ff747b -size 305 +oid sha256:d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 +size 14 diff --git a/open-iscsi.changes b/open-iscsi.changes index 74aebb2..4d5207e 100644 --- a/open-iscsi.changes +++ b/open-iscsi.changes @@ -1,19 +1,16 @@ ------------------------------------------------------------------- -Thu Nov 14 20:53:57 UTC 2019 - Lee Duncan +Mon Nov 18 17:42:09 UTC 2019 - Lee Duncan - Merged in latest upstream (2.1.0), including more fixes for iscsiuio, and cleanup/bug-fixes of new CHAP code. This replaces open-iscsi-2.0.878-suse.tar.bz2 with open-iscsi-2.1.0-suse.tar.bz2, and it resets open-iscsi-SUSE-latest.diff.bz2 with fixes after 2.1.0-suse. - Note that this also updates the version of libopeniscsiusr, - since the version numbers of it and open-iscsi are - kept in sync. Lastly, the libopeniscsiusr sub-package - updates the library version from 0_2_0 to 0_2_1. Also, updated the Summary lines in the spec file that started with "iSCSI ...", since rpmlint didn't like - them starting with a non-capital letter. + them starting with a non-capital letter, and updated the + version number for iscsiuio to match the code. ------------------------------------------------------------------- Sat Nov 9 17:44:09 UTC 2019 - Lee Duncan diff --git a/open-iscsi.spec b/open-iscsi.spec index 9bbd1bb..68ca567 100644 --- a/open-iscsi.spec +++ b/open-iscsi.spec @@ -17,7 +17,8 @@ %define iscsi_minor_release 1 -%define iscsi_patch_release 0-suse +%define iscsi_patch_release 0 +%define iscsi_patch_release_suse %{iscsi_patch_release}-suse Name: open-iscsi Version: 2.1.0 Release: 0 @@ -25,7 +26,7 @@ Summary: Linux iSCSI Software Initiator License: GPL-2.0-or-later Group: Productivity/Networking/Other Url: http://www.open-iscsi.com -Source: %{name}-2.%{iscsi_minor_release}.%{iscsi_patch_release}.tar.bz2 +Source: %{name}-2.%{iscsi_minor_release}.%{iscsi_patch_release_suse}.tar.bz2 Patch1: %{name}-SUSE-latest.diff.bz2 BuildRequires: autoconf BuildRequires: automake @@ -44,7 +45,7 @@ BuildRequires: suse-module-tools BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(systemd) Requires(post): coreutils -Requires: libopeniscsiusr0_2_1 = %{version} +Requires: libopeniscsiusr0_2_0 = %{version} %{?systemd_requires} %description @@ -62,14 +63,14 @@ connection-level error processing, Nop-In and Nop-Out handling. It comes with a daemon process called iscsid, and a management utility, iscsiadm. -%package -n libopeniscsiusr0_2_1 -Version: 2.1.0 +%package -n libopeniscsiusr0_2_0 +Version: 2.%{iscsi_minor_release}.%{iscsi_patch_release} Release: 0 Summary: The iSCSI User-level Library Group: System/Libraries -Obsoletes: libopeniscsiusr0_2_0 +Obsoletes: libopeniscsiusr0_1_0 -%description -n libopeniscsiusr0_2_1 +%description -n libopeniscsiusr0_2_0 The iSCSI user-space API from the open-iscsi project. %package -n iscsiuio @@ -95,7 +96,7 @@ The communication to the driver is done via user-space I/O (Kernel module name "uio"). %package devel -Version: 2.0.878 +Version: 2.%{iscsi_minor_release}.%{iscsi_patch_release} Release: 0 Summary: The iSCSI User-level Library Development Library and Include files Group: Development/Libraries/C and C++ @@ -107,7 +108,7 @@ include files and documentation. These are used to compile against the libopeniscsiusr library. %prep -%setup -q -n %{name}-2.%{iscsi_minor_release}.%{iscsi_patch_release} +%setup -q -n %{name}-2.%{iscsi_minor_release}.%{iscsi_patch_release_suse} %patch1 -p1 %build @@ -155,8 +156,8 @@ fi %preun %{service_del_preun iscsid.socket iscsid.service iscsi.service} -%post -n libopeniscsiusr0_2_1 -p /sbin/ldconfig -%postun -n libopeniscsiusr0_2_1 -p /sbin/ldconfig +%post -n libopeniscsiusr0_2_0 -p /sbin/ldconfig +%postun -n libopeniscsiusr0_2_0 -p /sbin/ldconfig %post -n iscsiuio %{service_add_post iscsiuio.socket iscsiuio.service} @@ -201,7 +202,7 @@ fi %{_mandir}/man8/iscsi_fw_login.8%{ext_man} %{_udevrulesdir}/50-iscsi-firmware-login.rules -%files -n libopeniscsiusr0_2_1 +%files -n libopeniscsiusr0_2_0 %{_libdir}/libopeniscsiusr.so.* %files -n iscsiuio