Merge branch 'master' into epel7

This commit is contained in:
Nick Bebout 2019-04-09 08:43:16 -05:00
commit dff2c39dda
2 changed files with 9 additions and 8 deletions

View File

@ -1,3 +1,3 @@
SHA512 (znc-1.7.3-rc1.tar.gz) = 24804cd135fb121b23157634c429db4675aebbf18248382b4d616c8f63b8d12d35e5cf9aaee2dabde1a85ceabb24a7f27f595fe2710cdcfc7aa27d895281ffed
SHA512 (znc-1.7.3-rc1.tar.gz.sig) = 29ef6ffc80a3c5bd4c6d79648fc1a2826501e2e8604423baaf4d66aa69e8e428a44f4edc89402dbefa4915aeea03dd9690f3403f67c44e0a91e5a3b9e0411a16
SHA512 (znc-1.7.3.tar.gz) = 4cd63be2cb3bc1e3950f38984b128c6511bd1b9fc01a00d51cfcdc46826c2dedad120d6ed8e30d9c400909e33d39b2b14579fb40ee1e3508b7f3a07eff3a15d8
SHA512 (znc-1.7.3.tar.gz.sig) = 51bc9f389968f1c625140140724e833ae44a0bacb5b57f7ac02824a4dd81de7f4108a7497424bd7a845ecbf769477cb5912481f628902633d6c7b7886b16cd9d
SHA512 (gpgkey-5AE420CC0209989E.asc) = fe1abc5c67b831fcb9af64234a0462ce84f2b6bd18179510fbbc756bd6be428ce097eab3d3715cbc5dc24c6017ac96077066ed0328b5df6305f5afe55ae39610

View File

@ -17,15 +17,13 @@
Name: znc
Version: 1.7.3
Release: 0.1%{?dist}
Release: 1%{?dist}
Summary: An advanced IRC bouncer
License: ASL 2.0
URL: https://znc.in
#Source0: %{url}/releases/%{name}-%{version}.tar.gz
#Source1: %{url}/releases/%{name}-%{version}.tar.gz.sig
Source0: %{url}/releases/%{name}-1.7.3-rc1.tar.gz
Source1: %{url}/releases/%{name}-1.7.3-rc1.tar.gz.sig
Source0: %{url}/releases/%{name}-%{version}.tar.gz
Source1: %{url}/releases/%{name}-%{version}.tar.gz.sig
Source2: gpgkey-5AE420CC0209989E.asc
# Use system-wide crypto policy
@ -126,7 +124,7 @@ gpg2 --dearmor --quiet --batch --yes $key >/dev/null
gpgv2 --homedir "$gpghome" --quiet --keyring $key.gpg %{SOURCE1} %{SOURCE0}
rm -rf "$gpghome" $key.gpg # Cleanup tmp gpg home dir and dearmored key
%setup -n znc-1.7.3-rc1
%setup
# The manual page references /usr/local/; fix that
sed -ie 's!/usr/local/!/usr/!' man/znc.1
@ -223,6 +221,9 @@ getent passwd znc >/dev/null || \
%changelog
* Tue Apr 9 2019 Nick Bebout <nb@fedoraproject.org> - 1.7.3-1
- Update to 1.7.3
* Wed Mar 27 2019 Nick Bebout <nb@fedoraproject.org> - 1.7.3-0.1
- Update to 1.7.3-rc1 to fix CVE-2019-9917