The package rpms/znc.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/znc.git/commit/?id=dc252de4f0262cab2....
Change: +%ifarch aarch64
Thanks.
Full change: ============
commit dc252de4f0262cab21ca9845209d4a99a939e186 Author: Neil Hanlon neil@shrug.pw Date: Mon Sep 2 19:26:00 2024 -0400
fix: aarch64 build fails due to parallelism
diff --git a/znc.spec b/znc.spec index 1eb5457..493ab27 100644 --- a/znc.spec +++ b/znc.spec @@ -134,6 +134,11 @@ sed -ie 's!/usr/local/!/usr/!' man/znc.1 sed -e 's/"openssl"/"openssl11"/g' -i configure %endif
+# NOTE(neil): 2024-09-02 aarch64 responds badly to building on large machines +%ifarch aarch64 +%global _smp_build_ncpus 1 +%endif + %cmake \ %if 0%{?with_modperl} -DWANT_PERL=1 \
commit ef1895867bc284e4d76d141cfb6a9c32eb53e34b Author: Neil Hanlon neil@second-stage-turbine-blade.potato.shrug.pw Date: Sun Aug 25 18:15:41 2024 -0400
fix ftbfs, fti, CVE-2024-39844, switch to cmake
- switch to pure cmake (1.9.0 turned configure into a wrapper which dropped options) - resolve ftbfs, fti, new version (#226393 #2301380 #2292226) - resolve CVE-2024-39844 (#2295622)
diff --git a/0001-Use-system-wide-crypto-policy.patch b/0001-Use-system-wide-crypto-policy.patch index ca64213..6688c49 100644 --- a/0001-Use-system-wide-crypto-policy.patch +++ b/0001-Use-system-wide-crypto-policy.patch @@ -30,5 +30,3 @@ index 577f69c..f413f96 100644 + return "PROFILE=SYSTEM"; } #endif --- - diff --git a/znc.spec b/znc.spec index 71da541..1eb5457 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@
Name: znc Version: 1.9.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: An advanced IRC bouncer
# Automatically converted from old format: ASL 2.0 - review is highly recommended. @@ -27,19 +27,25 @@ Source2: gpgkey-5AE420CC0209989E.asc # https://fedoraproject.org/wiki/Packaging:CryptoPolicies Patch0: 0001-Use-system-wide-crypto-policy.patch
-BuildRequires: make -BuildRequires: automake BuildRequires: c-ares-devel +BuildRequires: cmake BuildRequires: cyrus-sasl-devel BuildRequires: gcc-c++ BuildRequires: gettext-devel BuildRequires: gnupg2 BuildRequires: libicu-devel +BuildRequires: make + %if 0%{?fedora} || 0%{?rhel} >= 8 BuildRequires: openssl-devel >= 0.9.8 %else BuildRequires: openssl11-devel %endif + +%if 0%{?fedora} >= 41 +BuildRequires: openssl-devel-engine +%endif + BuildRequires: perl(ExtUtils::Embed)
%if 0%{?rhel} && 0%{?rhel} <= 9 @@ -119,8 +125,6 @@ gpgv2 --homedir "$gpghome" --quiet --keyring $key.gpg %{SOURCE1} %{SOURCE0} rm -rf "$gpghome" $key.gpg # Cleanup tmp gpg home dir and dearmored key
%autosetup -p1 -%dnl %setup -n znc-1.7.5-rc1 -%dnl %patch0 -p1
# The manual page references /usr/local/; fix that sed -ie 's!/usr/local/!/usr/!' man/znc.1 @@ -130,25 +134,23 @@ sed -ie 's!/usr/local/!/usr/!' man/znc.1 sed -e 's/"openssl"/"openssl11"/g' -i configure %endif
-%configure \ - --with-module-prefix=%{_libdir}/znc \ - --with-systemdsystemunitdir=%{_unitdir} \ +%cmake \ %if 0%{?with_modperl} - --enable-perl \ -%else - --disable-perl \ -%endif # 0%{?with_modperl} + -DWANT_PERL=1 \ +%endif %if 0%{?with_modpython} - --enable-python \ -%else # 0%{?with_modpython} - --disable-python \ -%endif # 0%{?with_modpython} - --enable-ipv6 --enable-cyrus --enable-tcl --with-tcl=%{_libdir} -%make_build V=1 + -DWANT_PYTHON=1 \ +%endif + -DWANT_SYSTEMD=1 \ + -DSYSTEMD_DIR=%{_unitdir} \ + -DWANT_IPV6=1 \ + -DWANT_CYRUS=1 \ + -DWANT_TCL=1
+%cmake_build
%install -%make_install +%cmake_install install -d "%{buildroot}%{_sharedstatedir}/znc" %py_byte_compile %{__python3} %{buildroot}%{_libdir}/znc/
@@ -222,6 +224,11 @@ getent passwd znc >/dev/null || \
%changelog +* Sun Aug 25 2024 Neil Hanlon neil@shrug.pw - 1.9.1-4 +- switch to pure cmake (1.9.0 turned configure into a wrapper which dropped options) +- resolve ftbfs, fti, new version (#226393 #2301380 #2292226) +- resolve CVE-2024-39844 (#2295622) + * Wed Jul 24 2024 Miroslav Suchý msuchy@redhat.com - 1.9.1-3 - convert license to SPDX
commit 377a89607ddad7f441e1eed19439546e8f5c7ae4 Author: Neil Hanlon neil@second-stage-turbine-blade.potato.shrug.pw Date: Sun Aug 25 17:33:41 2024 -0400
rebase system crypto policy patch
diff --git a/0001-Use-system-wide-crypto-policy.patch b/0001-Use-system-wide-crypto-policy.patch index 04b4cfa..ca64213 100644 --- a/0001-Use-system-wide-crypto-policy.patch +++ b/0001-Use-system-wide-crypto-policy.patch @@ -9,34 +9,26 @@ Reference: https://fedoraproject.org/wiki/Packaging:CryptoPolicies 1 file changed, 3 insertions(+), 14 deletions(-)
diff --git a/src/Socket.cpp b/src/Socket.cpp -index fa510462..e40c76ea 100644 +index 577f69c..f413f96 100644 --- a/src/Socket.cpp +++ b/src/Socket.cpp -@@ -28,21 +28,10 @@ +@@ -28,15 +28,11 @@ #endif
#ifdef HAVE_LIBSSL -// Copypasted from -// https://wiki.mozilla.org/Security/Server_Side_TLS#Intermediate_compatibility... --// at 2018-04-01 +-// at 2024-02-08 (version 5.7) +// Use system-wide crypto policy +// https://fedoraproject.org/wiki/Packaging:CryptoPolicies static CString ZNC_DefaultCipher() { -- return "ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-" -- "ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-" -- "AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-" -- "SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-" -- "RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:" -- "ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-" -- "SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:" -- "DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:" -- "ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:" -- "AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-" -- "SHA:DES-CBC3-SHA:!DSS"; + // This is TLS1.2 only, because TLS1.3 ciphers are probably not configurable here yet +- return "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:" +- "ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:" +- "ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:" +- "DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305"; + return "PROFILE=SYSTEM"; } #endif - -- -2.19.0.rc0
commit 50de202dd6518cae3c184def9481da4cdaa70c00 Merge: c87edda dd25b47 Author: Nick Bebout nb@fedoraproject.org Date: Sun Aug 25 23:58:56 2024 +0000
Merge #5 `Fix improperly commented out macros in %prep`
commit c87eddaf82d4a174a08562832b58decdc072d06b Author: Miroslav Suchý msuchy@redhat.com Date: Wed Jul 24 18:12:30 2024 +0200
convert ASL 2.0 license to SPDX
This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4
diff --git a/znc.spec b/znc.spec index 31548fe..cbfe82f 100644 --- a/znc.spec +++ b/znc.spec @@ -13,10 +13,11 @@
Name: znc Version: 1.9.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An advanced IRC bouncer
-License: ASL 2.0 +# Automatically converted from old format: ASL 2.0 - review is highly recommended. +License: Apache-2.0 URL: https://znc.in Source0: %{url}/releases/archive/%{name}-%{version}.tar.gz Source1: %{url}/releases/archive/%{name}-%{version}.tar.gz.sig @@ -221,6 +222,9 @@ getent passwd znc >/dev/null || \
%changelog +* Wed Jul 24 2024 Miroslav Suchý msuchy@redhat.com - 1.9.1-3 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering releng@fedoraproject.org - 1.9.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
commit 5c51e0f7fa994c5128363b4c495ea6087951a6e1 Author: Fedora Release Engineering releng@fedoraproject.org Date: Sat Jul 20 10:55:45 2024 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
diff --git a/znc.spec b/znc.spec index 77fac1e..31548fe 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@
Name: znc Version: 1.9.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An advanced IRC bouncer
License: ASL 2.0 @@ -221,6 +221,9 @@ getent passwd znc >/dev/null || \
%changelog +* Sat Jul 20 2024 Fedora Release Engineering releng@fedoraproject.org - 1.9.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jul 17 2024 Nick Bebout nb@fedoraproject.org - 1.9.1-1 - Update to 1.9.1
commit ecf25c9c57596709e11e6bd89d31596936ec463e Author: Nick Bebout nebebout@F6B36X3.usi.edu Date: Wed Jul 17 13:55:01 2024 -0500
Add signature
diff --git a/sources b/sources index d1bb994..03f8b97 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (znc-1.9.1.tar.gz) = 939eafbb2f20569d1b15b66e38b7da7a5210f2023e6fc98018566bd757d62d8ef2682d4b4e3b326a933a99cd7d9d65596ff0e2c43a2315c70e27c64f02d526a6 +SHA512 (znc-1.9.1.tar.gz.sig) = f9c0134ed8248828871d5ff8d0fc72a7b94426871ad75957aa675274a9da1a8957fae09603cee03729b33d42e14fcbf5f1952867fa38fef4e2860d62944af488
commit dda90e644127c5389a68f9908194e160e5f8504e Author: Nick Bebout nebebout@F6B36X3.usi.edu Date: Wed Jul 17 13:49:20 2024 -0500
Update to 1.9.1
diff --git a/sources b/sources index 29a7d20..d1bb994 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (znc-1.8.2.tar.gz) = e821647b50698c3a82fad039e69943e030bf644d8f8e82afa87c6c11da44761bceecddd510a7a956a1b487b1cca6ee46e8ac8818ea03127f0f1ff8f5d1a1a7f9 -SHA512 (znc-1.8.2.tar.gz.sig) = c4fb2817a54155cef19702e3f48ba845350209019445d7b056d303c708ddf8931eea308a0ec84d58f02be0cb932b663c3d2a732c48112205dbe953f8b08423cb +SHA512 (znc-1.9.1.tar.gz) = 939eafbb2f20569d1b15b66e38b7da7a5210f2023e6fc98018566bd757d62d8ef2682d4b4e3b326a933a99cd7d9d65596ff0e2c43a2315c70e27c64f02d526a6 diff --git a/znc.spec b/znc.spec index 88616b6..77fac1e 100644 --- a/znc.spec +++ b/znc.spec @@ -12,8 +12,8 @@ %endif # 0%{?fedora} || 0%{?rhel} >= 7
Name: znc -Version: 1.8.2 -Release: 28%{?dist} +Version: 1.9.1 +Release: 1%{?dist} Summary: An advanced IRC bouncer
License: ASL 2.0 @@ -221,6 +221,9 @@ getent passwd znc >/dev/null || \
%changelog +* Wed Jul 17 2024 Nick Bebout nb@fedoraproject.org - 1.9.1-1 +- Update to 1.9.1 + * Tue Jun 18 2024 Python Maint python-maint@redhat.com - 1.8.2-28 - Rebuilt for Python 3.13
commit dd25b4741db914aa1243c300e900da6987a3edde Author: Michal Domonkos mdomonko@redhat.com Date: Fri May 31 09:56:35 2024 +0200
Fix improperly commented out macros in %prep
Since RPM 4.20, %prep is no longer implemented as a special "hack" [1] but is now a regular build scriptlet, meaning that %setup or %patch are now treated as regular macros and thus will be expanded even in comments (as documented in [2]).
Our spec has these so fix them up to unbreak the build on F41.
[1] https://github.com/rpm-software-management/rpm/issues/2205 [2] https://rpm-software-management.github.io/rpm/manual/spec.html
diff --git a/znc.spec b/znc.spec index 88616b6..5cfaa0e 100644 --- a/znc.spec +++ b/znc.spec @@ -118,8 +118,8 @@ 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 -n znc-1.7.5-rc1 -#%patch0 -p1 +%dnl %setup -n znc-1.7.5-rc1 +%dnl %patch0 -p1
# The manual page references /usr/local/; fix that sed -ie 's!/usr/local/!/usr/!' man/znc.1
commit 6527f23bb74ce6bcec10e06ed2f46638a8c3c28b Author: Python Maint python-maint@redhat.com Date: Tue Jun 18 09:39:37 2024 +0200
Rebuilt for Python 3.13
diff --git a/znc.spec b/znc.spec index e420266..88616b6 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@
Name: znc Version: 1.8.2 -Release: 27%{?dist} +Release: 28%{?dist} Summary: An advanced IRC bouncer
License: ASL 2.0 @@ -221,6 +221,9 @@ getent passwd znc >/dev/null || \
%changelog +* Tue Jun 18 2024 Python Maint python-maint@redhat.com - 1.8.2-28 +- Rebuilt for Python 3.13 + * Wed Jun 12 2024 Jitka Plesnikova jplesnik@redhat.com - 1.8.2-27 - Perl 5.40 rebuild
commit 26dfea74b0bfb0e8ce04f8be106f92174562a7a2 Author: Jitka Plesnikova jplesnik@redhat.com Date: Wed Jun 12 12:53:36 2024 +0200
Perl 5.40 rebuild
diff --git a/znc.spec b/znc.spec index 97fff9a..e420266 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@
Name: znc Version: 1.8.2 -Release: 26%{?dist} +Release: 27%{?dist} Summary: An advanced IRC bouncer
License: ASL 2.0 @@ -221,6 +221,9 @@ getent passwd znc >/dev/null || \
%changelog +* Wed Jun 12 2024 Jitka Plesnikova jplesnik@redhat.com - 1.8.2-27 +- Perl 5.40 rebuild + * Fri Jun 07 2024 Python Maint python-maint@redhat.com - 1.8.2-26 - Rebuilt for Python 3.13
commit 0c6101912165e86baa6f9175eb0c5c5b61c2486e Author: Python Maint python-maint@redhat.com Date: Fri Jun 7 09:12:54 2024 +0200
Rebuilt for Python 3.13
diff --git a/znc.spec b/znc.spec index 0b6ee16..97fff9a 100644 --- a/znc.spec +++ b/znc.spec @@ -13,7 +13,7 @@
Name: znc Version: 1.8.2 -Release: 25%{?dist} +Release: 26%{?dist} Summary: An advanced IRC bouncer
License: ASL 2.0 @@ -221,6 +221,9 @@ getent passwd znc >/dev/null || \
%changelog +* Fri Jun 07 2024 Python Maint python-maint@redhat.com - 1.8.2-26 +- Rebuilt for Python 3.13 + * Wed Jan 31 2024 Pete Walter pwalter@fedoraproject.org - 1.8.2-25 - Rebuild for ICU 74
arch-excludes@lists.fedoraproject.org
-
githook-noreply＠fedoraproject.org