public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Filipe Rosset <rosset.filipe@gmail.com>
To: git-commits@fedoraproject.org
Subject: [rpms/znc] rawhide: Update to 1.10.2 + fix build with OpenSSL4+
Date: Sat, 22 Aug 2026 19:00:28 GMT	[thread overview]
Message-ID: <178742522843.1.3549139256613546879.rpms-znc-a7086a4e3f11@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/znc
            Branch : rawhide
            Commit : a7086a4e3f11791f30c02bd95c1e631f9768f8df
            Author : Filipe Rosset <rosset.filipe@gmail.com>
            Date   : 2026-08-01T23:04:43-03:00
            Stats  : +78/-13 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/znc/c/a7086a4e3f11791f30c02bd95c1e631f9768f8df?branch=rawhide

            Log:
            Update to 1.10.2 + fix build with OpenSSL4+

Enable Argon2 and i18n support

Resolves: rhbz#2369074
Resolves: rhbz#2505395

---
diff --git a/.gitignore b/.gitignore
index c0b1006..6e71bb8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /znc-*.tar.gz
 /znc-*.tar.gz.sig
 /gpgkey-5AE420CC0209989E.asc
+/key.gpg

diff --git a/2024.patch b/2024.patch
new file mode 100644
index 0000000..9ba4a69
--- /dev/null
+++ b/2024.patch
@@ -0,0 +1,49 @@
+From c6b7fece1ec318c67ed8afa80ef914a135180a4f Mon Sep 17 00:00:00 2001
+From: Ravi Kant Sharma <ravi.kant.sharma@canonical.com>
+Date: Tue, 16 Jun 2026 10:08:17 +0200
+Subject: [PATCH] Fix build error with OpenSSL 4
+
+---
+ src/SSLVerifyHost.cpp | 4 ++--
+ src/Utils.cpp         | 5 ++++-
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/src/SSLVerifyHost.cpp b/src/SSLVerifyHost.cpp
+index ccc20898e2..99b215bc23 100644
+--- a/src/SSLVerifyHost.cpp
++++ b/src/SSLVerifyHost.cpp
+@@ -306,8 +306,8 @@ typedef enum {
+ static HostnameValidationResult matches_common_name(const char* hostname,
+                                                     const X509* server_cert) {
+     int common_name_loc = -1;
+-    X509_NAME_ENTRY* common_name_entry = nullptr;
+-    ASN1_STRING* common_name_asn1 = nullptr;
++    const X509_NAME_ENTRY* common_name_entry = nullptr;
++    const ASN1_STRING* common_name_asn1 = nullptr;
+     CONST_ASN1_STRING_DATA char* common_name_str = nullptr;
+ 
+     // Find the position of the CN field in the Subject field of the certificate
+diff --git a/src/Utils.cpp b/src/Utils.cpp
+index ed2c9c8386..744f61d195 100644
+--- a/src/Utils.cpp
++++ b/src/Utils.cpp
+@@ -129,7 +129,8 @@ void CUtils::GenerateCert(FILE* pOut) {
+     sEmailAddr += "@";
+     sEmailAddr += sHostName;
+ 
+-    X509_NAME* pName = X509_get_subject_name(pCert.get());
++    X509_NAME* pName = X509_NAME_new();
++    if (!pName) return;
+     X509_NAME_add_entry_by_txt(pName, "OU", MBSTRING_ASC,
+                                (unsigned char*)pLogName, -1, -1, 0);
+     X509_NAME_add_entry_by_txt(pName, "CN", MBSTRING_ASC,
+@@ -137,7 +138,9 @@ void CUtils::GenerateCert(FILE* pOut) {
+     X509_NAME_add_entry_by_txt(pName, "emailAddress", MBSTRING_ASC,
+                                (unsigned char*)sEmailAddr.c_str(), -1, -1, 0);
+ 
++    X509_set_subject_name(pCert.get(), pName);
+     X509_set_issuer_name(pCert.get(), pName);
++    X509_NAME_free(pName);
+ 
+     if (!X509_sign(pCert.get(), pKey.get(), EVP_sha256())) return;
+ 

diff --git a/sources b/sources
index 473bf75..d5ddf6e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
-SHA512 (znc-1.10.1.tar.gz) = f125eef5a9f8bfcd278951971638fe8a937261001bfd8f6438fc51fda666b97c00780c5c6f1a921b3db79cb7656bc9675eb3881b18b22b7738e0976ebcca7cb3
-SHA512 (znc-1.10.1.tar.gz.sig) = a85b65dacce72d51cda4260ff881496c82b77dabf273fda1c3f536360950755700b352a6d22bac01c808abae13c4b686a2e5f36b0351e0b77ec032057caee311
+SHA512 (key.gpg) = 6a73850d00e89c7f7609c51e8c58fb8557666c6a5c20e2d47c108382096c99aec0400e26e634f8977f6001063e4195f0b4a06b0600d56c7eb03a3a4790ea04eb
+SHA512 (znc-1.10.2.tar.gz) = cc9012bb669d1f4e98e1765cfdd41dcd49033f391ac702c0b28dcae76bdd74a452e2036fde0d8b65686e9859605632a29682c942377952249e90e2992490f348
+SHA512 (znc-1.10.2.tar.gz.sig) = 379d59ad28624c944f93674bfb2f93ff9d89da20e82fee2d2bfeb3f01a0ea3a46878fb9e3ba9095b1252b32d4527a61aac8e8b442cbca3611674dacb469d65e5

diff --git a/znc.spec b/znc.spec
index 677d733..1d1ef09 100644
--- a/znc.spec
+++ b/znc.spec
@@ -12,8 +12,8 @@
 %endif # 0%{?fedora} || 0%{?rhel} >= 7
 
 Name:           znc
-Version:        1.10.1
-Release:        7%{?dist}
+Version:        1.10.2
+Release:        1%{?dist}
 Summary:        An advanced IRC bouncer
 
 # Automatically converted from old format: ASL 2.0 - review is highly recommended.
@@ -26,13 +26,19 @@ Source2:        gpgkey-5AE420CC0209989E.asc
 # Use system-wide crypto policy
 # https://fedoraproject.org/wiki/Packaging:CryptoPolicies
 Patch0:         0001-Use-system-wide-crypto-policy.patch
+# Fix the build with OpenSSL4+
+# https://github.com/znc/znc/pull/2024
+Patch1:         2024.patch
 
+BuildRequires:  boost-devel
 BuildRequires:  c-ares-devel
 BuildRequires:  cmake
 BuildRequires:  cyrus-sasl-devel
 BuildRequires:  gcc-c++
+BuildRequires:  gettext
 BuildRequires:  gettext-devel
 BuildRequires:  gnupg2
+BuildRequires:  libargon2-devel
 BuildRequires:  libicu-devel
 BuildRequires:  make
 
@@ -42,11 +48,8 @@ BuildRequires:  openssl-devel >= 0.9.8
 BuildRequires:  openssl11-devel
 %endif
 
-%if 0%{?fedora} >= 41
-BuildRequires:  openssl-devel-engine
-%endif
-
 BuildRequires:  perl(ExtUtils::Embed)
+BuildRequires:  pkgconfig
 
 %if 0%{?rhel} && 0%{?rhel} <= 9
 Obsoletes:      znc-extra <= %{version}-%{release}
@@ -62,10 +65,14 @@ DCC bouncing, Perl and C++ module support to name a few.
 
 %package devel
 Summary:        Development files needed to compile ZNC modules
-Requires:       %{name} = %{version}-%{release} pkgconfig
-Requires:       openssl-devel c-ares-devel glibc-devel libicu-devel%{?_isa}
-BuildRequires: pkgconfig
-Requires:       gcc-c++ redhat-rpm-config
+Requires:       %{name} = %{version}-%{release}
+Requires:       c-ares-devel
+Requires:       gcc-c++
+Requires:       glibc-devel
+Requires:       libicu-devel%{?_isa}
+Requires:       openssl-devel
+Requires:       pkgconfig
+Requires:       redhat-rpm-config
 
 %description devel
 All includes and program files you need to compile your own znc
@@ -170,6 +177,7 @@ install -d "%{buildroot}%{_sharedstatedir}/znc"
 install -m0644 -D znc.sysusers.conf %{buildroot}%{_sysusersdir}/znc.conf
 
 
+%find_lang %{name} --all-name
 
 
 %post
@@ -184,7 +192,7 @@ install -m0644 -D znc.sysusers.conf %{buildroot}%{_sysusersdir}/znc.conf
 %systemd_preun znc.service
 
 
-%files
+%files -f %{name}.lang
 %doc ChangeLog.md NOTICE README.md
 %license LICENSE
 %{_bindir}/znc
@@ -235,6 +243,12 @@ install -m0644 -D znc.sysusers.conf %{buildroot}%{_sysusersdir}/znc.conf
 
 
 %changelog
+* Sun Aug 02 2026 Filipe Rosset <rosset.filipe@gmail.com> - 1.10.2-1
+- Update to 1.10.2 + fix build with OpenSSL4+
+- Enable Argon2 and i18n support
+- Resolves: rhbz#2369074
+- Resolves: rhbz#2505395
+
 * Thu Jul 23 2026 Jitka Plesnikova <jplesnik@redhat.com> - 1.10.1-7
 - Perl 5.44 rebuild
 

                 reply	other threads:[~2026-08-22 19:00 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178742522843.1.3549139256613546879.rpms-znc-a7086a4e3f11@fedoraproject.org \
    --to=rosset.filipe@gmail.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox