From 9bb8e0abd5d67a316401458bf118532df1979e9a2595091a5c1afc7f2aaa98a7 Mon Sep 17 00:00:00 2001 From: Lee Duncan Date: Fri, 31 Jan 2020 22:15:53 +0000 Subject: [PATCH 1/3] Accepting request 769142 from home:lee_duncan:branches:Base:System - Update to version 0.100: * Updated ChangeLog with latest fixes * Create and use pythong unittest framework * Ignore SO lib * Handle restarting test harness server correctly * Fix mdebug.c so it compiles when enabled. * Running make twice should not rebuild everything * Change isns_portal_string() to use static mem * Adding python compiled files * fixed issues with old openssl usage * Added debugging, moved .cvsignore to .gitignore * Preparing for version v0.100 * Fix problem with parsing IPv6 Addresses with brakcets. * General cleanup for the compiler. * Travis-CI and Coverity Scan setup * openssl: handle newer version with ifdefs * Remove old compiler option, and add "-Werror". * Change isns_portal_string() to return allocated string. * add tags to ignored list of files * Fix compiler complaint about possible alignment issue OBS-URL: https://build.opensuse.org/request/show/769142 OBS-URL: https://build.opensuse.org/package/show/Base:System/open-isns?expand=0&rev=27 --- _service | 4 ++-- _servicedata | 2 +- open-isns-0.100.tar.xz | 3 +++ open-isns.changes | 24 ++++++++++++++++++++++++ open-isns.spec | 4 ++-- 5 files changed, 32 insertions(+), 5 deletions(-) create mode 100644 open-isns-0.100.tar.xz diff --git a/_service b/_service index 3ac2cf9..ebe5623 100644 --- a/_service +++ b/_service @@ -4,8 +4,8 @@ https://github.com/open-iscsi/open-isns.git open-isns - 0.99 - v0.99 + 0.100 + v0.100 enable diff --git a/_servicedata b/_servicedata index 1560872..adf4b3f 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/open-iscsi/open-isns.git - cfdbcff867ee580a71bc9c18c3a38a6057df0150 \ No newline at end of file + 0ad95d07e4d272fed2af2c614b37c6e64c8945b2 \ No newline at end of file diff --git a/open-isns-0.100.tar.xz b/open-isns-0.100.tar.xz new file mode 100644 index 0000000..8f8325f --- /dev/null +++ b/open-isns-0.100.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0139aeb7bdeb252e0df849d496f979202c47d4f5129a15a868ad6cc503da701a +size 231032 diff --git a/open-isns.changes b/open-isns.changes index 8c23375..8cdc26b 100644 --- a/open-isns.changes +++ b/open-isns.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Fri Jan 31 22:05:13 UTC 2020 - lduncan@suse.com + +- Update to version 0.100: + * Updated ChangeLog with latest fixes + * Create and use pythong unittest framework + * Ignore SO lib + * Handle restarting test harness server correctly + * Fix mdebug.c so it compiles when enabled. + * Running make twice should not rebuild everything + * Change isns_portal_string() to use static mem + * Adding python compiled files + * fixed issues with old openssl usage + * Added debugging, moved .cvsignore to .gitignore + * Preparing for version v0.100 + * Fix problem with parsing IPv6 Addresses with brakcets. + * General cleanup for the compiler. + * Travis-CI and Coverity Scan setup + * openssl: handle newer version with ifdefs + * Remove old compiler option, and add "-Werror". + * Change isns_portal_string() to return allocated string. + * add tags to ignored list of files + * Fix compiler complaint about possible alignment issue + ------------------------------------------------------------------- Mon Oct 28 17:28:34 UTC 2019 - Lee Duncan diff --git a/open-isns.spec b/open-isns.spec index 39e4d8c..aef2609 100644 --- a/open-isns.spec +++ b/open-isns.spec @@ -1,7 +1,7 @@ # # spec file for package open-isns # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ Name: open-isns Summary: Partial Implementation of iSNS iSCSI registration License: LGPL-2.1-or-later Group: System/Kernel -Version: 0.99 +Version: 0.100 Release: 0 Source: %{name}-%{version}.tar.xz Url: https://github.com/open-iscsi/%{name} From 43647539bda2389d7bba4467d92550430c9b79631b1175afe3cec74368602db3 Mon Sep 17 00:00:00 2001 From: Lee Duncan Date: Fri, 31 Jan 2020 22:37:03 +0000 Subject: [PATCH 2/3] Accepting request 769144 from home:lee_duncan:branches:Base:System - Update to version 0.100: * Updated ChangeLog with latest fixes * Create and use pythong unittest framework * Ignore SO lib * Handle restarting test harness server correctly * Fix mdebug.c so it compiles when enabled. * Running make twice should not rebuild everything * Change isns_portal_string() to use static mem * Adding python compiled files * fixed issues with old openssl usage * Added debugging, moved .cvsignore to .gitignore * Preparing for version v0.100 * Fix problem with parsing IPv6 Addresses with brakcets. * General cleanup for the compiler. * Travis-CI and Coverity Scan setup * openssl: handle newer version with ifdefs * Remove old compiler option, and add "-Werror". * Change isns_portal_string() to return allocated string. * add tags to ignored list of files * Fix compiler complaint about possible alignment issue Replacing open-isns-0.99.tar.xz with open-isns-0.100.tar.xz. Also, added latest (not yet tagged) fixes from upstream, adding patch: * open-isns-updates.diff.bz2 - Updated SPEC file %_lto_cflags definition so that it does not cause recursion. - Move back "%global _lto_cflags ..." line as it's needed for the following error: E: lto-no-text-in-archive (Badness: 10000) /usr/lib64/libisns.a. The recursion in macro was caused by fact that the macro was not defined for some time in prjconfig. - Had to address build issue in OBS, resulting in this package not building, with message (folding done by me): + exec rpmbuild -ba --define '_srcdefattr (-,root,root)' --nosignature \ --define '_build_create_debug 1' \ --define 'disturl obs://build.opensuse.org/Base:System/openSUSE_Factory/93a92c971e76cbf08ebb7afd9a4de7be-open-isns' \ /home/abuild/rpmbuild/SOURCES/open-isns.spec error: /home/abuild/rpmbuild/SOURCES/open-isns.spec: \ line 63: Too many levels of recursion in macro expansion. It is likely caused by recursive macro declaration. Line 63 was the "%configure" call, but I believe recursion is caused by redefinition of _lto_cflags. To fix this, I reverted the "Use FAT LTO ..." commit, removing the "%global _lto_cflags ..." line. - removal of SuSEfirewall2 service, since SuSEfirewall2 has been replaced by firewalld, see [1]. [1]: https://lists.opensuse.org/opensuse-factory/2019-01/msg00490.html - Use FAT LTO objects in order to provide proper static library (boo#1133271). - Update to version 0.99: * Update version to v0.99, and fill in ChangeLog * util.h: endian.h is available on musl on linux * Added README info about testing without security. * Support building/testing for with-security=no * Define 'free()' for isns_free() * Fix error with SCN Deregister when not registered. * Cleanup: reformat and add some print statements. * Fix error with type of node in GetNext test. * Add testing information to the README. Which replaced open-isns-0.98.tar.gz with open-isns-0.99.tar.xz Also added the _service* files to manage updates. - Update from version 0.97 to 0.98, which includes some testing and openssl fixes, updating the SPEC file and replacing the release tarball (bsc#1056696) - Fix RPM groups. Replace %__-type macro indirections and old $RPM shell variables. - Updated to version 0.97, replacing main tarball - Updated to version 0.96, replacing main tarball, and removing both patches: D open-isns-Update-GPL-license-information.patch D open-isns-Install-isns_config.5.patch - Updated SPEC file dependencies so early install works (bsc#958567) - Updated COPYING and README files for updated GNU license, adding: open-isns-Update-GPL-license-information.patch - Updated spec file to install hdrs and library file - Also must install isns_config.5, added upstream patch: open-isns-open-isns-Install-isns_config.5.patch - Initial creation of Build Service project, using version 0.95 of open-isns from github.com/gonzoleeman/open-isns OBS-URL: https://build.opensuse.org/request/show/769144 OBS-URL: https://build.opensuse.org/package/show/Base:System/open-isns?expand=0&rev=28 --- open-isns-0.99.tar.xz | 3 --- open-isns-updates.diff.bz2 | 3 +++ open-isns.changes | 4 ++++ open-isns.spec | 2 ++ 4 files changed, 9 insertions(+), 3 deletions(-) delete mode 100644 open-isns-0.99.tar.xz create mode 100644 open-isns-updates.diff.bz2 diff --git a/open-isns-0.99.tar.xz b/open-isns-0.99.tar.xz deleted file mode 100644 index e691231..0000000 --- a/open-isns-0.99.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6d4b1929525c498bd5b64444d10cc2388f881bb59e247d43e8f5626eff34aa67 -size 219236 diff --git a/open-isns-updates.diff.bz2 b/open-isns-updates.diff.bz2 new file mode 100644 index 0000000..f29da4c --- /dev/null +++ b/open-isns-updates.diff.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3801804763eda4826dca32be83e4ad904ff9c97bb48fcf6e9369c0ee3d5f5e07 +size 2274 diff --git a/open-isns.changes b/open-isns.changes index 8cdc26b..af1055e 100644 --- a/open-isns.changes +++ b/open-isns.changes @@ -21,6 +21,10 @@ Fri Jan 31 22:05:13 UTC 2020 - lduncan@suse.com * Change isns_portal_string() to return allocated string. * add tags to ignored list of files * Fix compiler complaint about possible alignment issue + Replacing open-isns-0.99.tar.xz with open-isns-0.100.tar.xz. + Also, added latest (not yet tagged) fixes from upstream, + adding patch: + * open-isns-updates.diff.bz2 ------------------------------------------------------------------- Mon Oct 28 17:28:34 UTC 2019 - Lee Duncan diff --git a/open-isns.spec b/open-isns.spec index aef2609..20d58e0 100644 --- a/open-isns.spec +++ b/open-isns.spec @@ -23,6 +23,7 @@ Group: System/Kernel Version: 0.100 Release: 0 Source: %{name}-%{version}.tar.xz +Patch1: %{name}-updates.diff.bz2 Url: https://github.com/open-iscsi/%{name} BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf @@ -55,6 +56,7 @@ Files to develop an application using the open-isns library. %prep %setup -n %{name}-%{version} +%patch1 -p1 %build %global _lto_cflags %{?_lto_cflags} -ffat-lto-objects From 745abfc465fef5c8ba2e19272fcf2c815fc00916736f4eaf7757391c2233aa12 Mon Sep 17 00:00:00 2001 From: Lee Duncan Date: Sat, 1 Feb 2020 18:31:03 +0000 Subject: [PATCH 3/3] Accepting request 769281 from home:lee_duncan:branches:Base:System Resubmitting with 586 fix OBS-URL: https://build.opensuse.org/request/show/769281 OBS-URL: https://build.opensuse.org/package/show/Base:System/open-isns?expand=0&rev=29 --- open-isns-fix-586-time.patch | 25 +++++++++++++++++++++++++ open-isns.changes | 5 +++-- open-isns.spec | 2 ++ 3 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 open-isns-fix-586-time.patch diff --git a/open-isns-fix-586-time.patch b/open-isns-fix-586-time.patch new file mode 100644 index 0000000..4132da7 --- /dev/null +++ b/open-isns-fix-586-time.patch @@ -0,0 +1,25 @@ +diff -aurp a/configure.ac b/configure.ac +--- a/configure.ac 2020-01-23 13:02:36.000000000 -0800 ++++ b/configure.ac 2020-02-01 10:14:08.853538750 -0800 +@@ -17,7 +17,7 @@ AC_PATH_PROG(SH, sh) + dnl C Compiler features + AC_C_INLINE + if test "$GCC" = "yes"; then +- CFLAGS="-Wall -Werror -Wextra $CFLAGS" ++ CFLAGS="-Wall -Wextra $CFLAGS" + CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" + fi + +Only in ./open-isns-0.100: .configure.ac.swp +diff -aurp a/isnsdd.c b/isnsdd.c +--- a/isnsdd.c 2020-01-23 13:02:36.000000000 -0800 ++++ b/isnsdd.c 2020-02-01 10:14:04.277547782 -0800 +@@ -401,7 +401,7 @@ check_portal_registration(__attribute__( + continue; + + last_modified = isns_object_last_modified(obj); +- if (last_modified + 2 * interval > now) { ++ if ((time_t)(last_modified + 2 * interval) > now) { + good_portals++; + continue; + } diff --git a/open-isns.changes b/open-isns.changes index af1055e..054f277 100644 --- a/open-isns.changes +++ b/open-isns.changes @@ -23,8 +23,9 @@ Fri Jan 31 22:05:13 UTC 2020 - lduncan@suse.com * Fix compiler complaint about possible alignment issue Replacing open-isns-0.99.tar.xz with open-isns-0.100.tar.xz. Also, added latest (not yet tagged) fixes from upstream, - adding patch: - * open-isns-updates.diff.bz2 + adding patch, and add in a 586-fix, adding: + * open-isns-updates.diff.bz2, and + * open-isns-fix-586-time.patch ------------------------------------------------------------------- Mon Oct 28 17:28:34 UTC 2019 - Lee Duncan diff --git a/open-isns.spec b/open-isns.spec index 20d58e0..50075c8 100644 --- a/open-isns.spec +++ b/open-isns.spec @@ -24,6 +24,7 @@ Version: 0.100 Release: 0 Source: %{name}-%{version}.tar.xz Patch1: %{name}-updates.diff.bz2 +Patch2: %{name}-fix-586-time.patch Url: https://github.com/open-iscsi/%{name} BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf @@ -57,6 +58,7 @@ Files to develop an application using the open-isns library. %prep %setup -n %{name}-%{version} %patch1 -p1 +%patch2 -p1 %build %global _lto_cflags %{?_lto_cflags} -ffat-lto-objects