From d64df24da257a575b60f875245e7e3efd14e17e8 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Thu, 14 Feb 2019 12:27:36 -0600 Subject: [PATCH 1/3] Remove crypto policies patch on epel7 --- znc.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/znc.spec b/znc.spec index fe52ee7..8621820 100644 --- a/znc.spec +++ b/znc.spec @@ -17,7 +17,7 @@ Name: znc Version: 1.7.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 @@ -27,7 +27,7 @@ Source1: %{url}/releases/%{name}-%{version}.tar.gz.sig Source2: gpgkey-5AE420CC0209989E.asc # Use system-wide crypto policy # https://fedoraproject.org/wiki/Packaging:CryptoPolicies -Patch0: 0001-Use-system-wide-crypto-policy.patch +# Patch0: 0001-Use-system-wide-crypto-policy.patch BuildRequires: automake BuildRequires: c-ares-devel @@ -123,7 +123,8 @@ 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 -%autosetup -p1 +%setup +#%autosetup -p1 # The manual page references /usr/local/; fix that sed -ie 's!/usr/local/!/usr/!' man/znc.1 @@ -220,6 +221,9 @@ getent passwd znc >/dev/null || \ %changelog +* Thu Feb 14 2019 Nick Bebout - 1.7.2-2 +- Don't use system crypto policy on epel7 + * Tue Jan 29 2019 Jason L Tibbitts III - 1.7.2-1 - Update to 1.7.2. - Fix three paths in the manpage (#1624519). From 5c03d164471fd90cc158d2e152de572bf31c0ee8 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Fri, 8 Mar 2019 07:13:03 -0800 Subject: [PATCH 2/3] Rebuilt to change main python from 3.4 to 3.6 --- znc.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/znc.spec b/znc.spec index 8621820..060d815 100644 --- a/znc.spec +++ b/znc.spec @@ -17,7 +17,7 @@ Name: znc Version: 1.7.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An advanced IRC bouncer License: ASL 2.0 @@ -97,7 +97,7 @@ Provides: perl(ZNC::Module) = %{version}-%{release} Summary: Python3 module for ZNC %if 0%{?rhel} -BuildRequires: python34-devel +BuildRequires: python%{python3_pkgversion}-devel %else BuildRequires: python3-devel %endif # 0%{?rhel} @@ -105,7 +105,7 @@ BuildRequires: swig Requires: %{name} = %{version}-%{release} %if 0%{?rhel} -Requires: python34 +Requires: python%{python3_pkgversion} %else Requires: python3 %endif # 0%{?rhel} @@ -221,6 +221,9 @@ getent passwd znc >/dev/null || \ %changelog +* Fri Mar 08 2019 Troy Dawson - 1.7.2-3 +- Rebuilt to change main python from 3.4 to 3.6 + * Thu Feb 14 2019 Nick Bebout - 1.7.2-2 - Don't use system crypto policy on epel7 From 0fb057213e6299316b8df0eff63c15f1b8a94dc4 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Fri, 19 Jun 2020 21:40:51 -0500 Subject: [PATCH 3/3] Update to 1.8.1 to fix CVE-2020-13775 --- sources | 4 ++-- znc.spec | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sources b/sources index c2d3bfd..5c16f3d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (znc-1.8.0.tar.gz) = f0b9e0e8d7229d79c3fa00826067624d4e3a1ac1062419d5d5564404817f2a9c9047d52c3dccf01ac02333361798fbd8893bd9d55195f7e118416ef2374707dc -SHA512 (znc-1.8.0.tar.gz.sig) = 4d293a94f878ebb8dd96345b049cd0f2a634cc5a845cbf1a21eb1c6be67832a1eeb1c1917294cb02de751ba5fd320c676eadfa175b563fa3064e5193b7385c7c +SHA512 (znc-1.8.1.tar.gz) = 87713ca05621806a399abc23f45671746578f6487561666704bb2ed1cd1863159a42ef4344eea95c9e7dc13d131b669eeabedda37e919d0bad6a05103ad80a16 +SHA512 (znc-1.8.1.tar.gz.sig) = 95ea0cb8e5de0a09fdabfd8ed825216c8908434808898bfcff24b8faad657506f6b434179fa90ce7b40088e9e54433d99f1a9e254a02fcf37e5c8f28ab5a4156 diff --git a/znc.spec b/znc.spec index e1a74c6..534dbd8 100644 --- a/znc.spec +++ b/znc.spec @@ -12,7 +12,7 @@ %endif # 0%{?fedora} || 0%{?rhel} >= 7 Name: znc -Version: 1.8.0 +Version: 1.8.1 Release: 1%{?dist} Summary: An advanced IRC bouncer @@ -218,6 +218,10 @@ getent passwd znc >/dev/null || \ %changelog +* Fri Jun 19 2020 Nick Bebout - 1.8.1-1 +- Update to 1.8.1 +- Fix CVE-2020-13775 possible crash/NULL pointer dereference + * Wed May 20 2020 Nick Bebout - 1.8.0-1 - Update to 1.8.0 - Fix systemd unit file to require network-online.target