From f325e615d6f2c7992296ed69753ba89612ed89e4 Mon Sep 17 00:00:00 2001 From: Chris Leech Date: Thu, 17 Sep 2020 14:24:18 -0700 Subject: [PATCH] rebase to upstream v0.100 + patches from git --- .gitignore | 1 + isns-utils.spec | 18 ++++++++++++++---- sources | 2 +- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 9bf8302..c49b84e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ open-isns-0.93.tar.bz2 /open-isns-0.94.tar.gz /open-isns-0.97.tar.gz +/open-isns-0.100.tar.gz diff --git a/isns-utils.spec b/isns-utils.spec index 8085cd5..ab1e5ad 100644 --- a/isns-utils.spec +++ b/isns-utils.spec @@ -1,6 +1,6 @@ Name: isns-utils -Version: 0.97 -Release: 12%{?dist} +Version: 0.100 +Release: 0%{?dist} Summary: The iSNS daemon and utility programs License: LGPLv2+ @@ -8,13 +8,20 @@ URL: https://github.com/open-iscsi/open-isns Source0: https://github.com/open-iscsi/open-isns/archive/v%{version}.tar.gz#/open-isns-%{version}.tar.gz Source1: isnsd.service +Patch0001: 0001-Ignore-common-build-files.patch +Patch0002: 0002-Fix-compiler-issue-when-not-in-security-mode.patch +Patch0003: 0003-Do-not-ignore-write-return-value.patch +Patch0004: 0004-Fix-586-compile-issue-and-remove-Werror.patch +Patch0005: 0005-socket.c-include-poll.h-instead-of-sys-poll.h-for-PO.patch +Patch0006: 0006-fix-compilation-without-deprecated-OpenSSL-APIs.patch +Patch0007: 0007-libisns-remove-sighold-and-sigrelse.patch + BuildRequires: gcc BuildRequires: openssl-devel automake pkgconfig systemd-devel systemd Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units - %description The iSNS package contains the daemon and tools to setup a iSNS server, and iSNS client tools. The Internet Storage Name Service (iSNS) protocol @@ -36,7 +43,7 @@ Development files for iSNS %prep -%setup -q -n open-isns-%{version} +%autosetup -p1 -n open-isns-%{version} %build @@ -103,6 +110,9 @@ install -p -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/isnsd.service %changelog +* Thu Sep 17 2020 Chris Leech - 0.100-0 +- rebase to upstream v0.100 + patches from git + * Fri Aug 21 2020 Tom Stellard - 0.97-12 - Use make macros - https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro diff --git a/sources b/sources index 7dbab5e..3a1f11c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (open-isns-0.97.tar.gz) = 78c934162d5a1d093bccd49449d4ef369b896d34309d76b4963d643a699640617c4fe064388c481c35b9be26e012f19713f3aad378af9ad88fa94c3d300e919d +SHA512 (open-isns-0.100.tar.gz) = ccf49ba1c60d46ae49b75424a966abc1f7e104c8ffa13013951a58a8f0ccaa1cf550f24fd2743fcaba1211a0ec8033c5df5249b7a108ae5974d4f1144dd3b169