public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Than Ngo <than@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/kdelibs] rawhide: Fix rhbz#2504172, FTBFS with openssl4
Date: Wed, 12 Aug 2026 12:49:06 GMT	[thread overview]
Message-ID: <178653894673.1.4410682557666097294.rpms-kdelibs-9d34e0c50346@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/kdelibs
Branch : rawhide
Commit : 9d34e0c503464856a47e0a5163002be10139990e
Author : Than Ngo <than@redhat.com>
Date   : 2026-08-12T14:48:41+02:00
Stats  : +48/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/kdelibs/c/9d34e0c503464856a47e0a5163002be10139990e?branch=rawhide

Log:
Fix rhbz#2504172, FTBFS with openssl4

---
diff --git a/kdelibs-openssl-ftbfs-openssl.patch b/kdelibs-openssl-ftbfs-openssl.patch
new file mode 100644
index 0000000..4879e90
--- /dev/null
+++ b/kdelibs-openssl-ftbfs-openssl.patch
@@ -0,0 +1,36 @@
+diff -up kdelibs-4.14.38/kio/kssl/ksslcertificate.cpp.ftbfs-openssl kdelibs-4.14.38/kio/kssl/ksslcertificate.cpp
+--- kdelibs-4.14.38/kio/kssl/ksslcertificate.cpp.ftbfs-openssl	2026-08-11 08:45:23.311951369 +0200
++++ kdelibs-4.14.38/kio/kssl/ksslcertificate.cpp	2026-08-11 08:58:34.038310272 +0200
+@@ -57,6 +57,7 @@
+ #include <openssl/x509v3.h>
+ #include <openssl/x509_vfy.h>
+ #include <openssl/pem.h>
++#include <openssl/asn1.h>
+ #undef crypt
+ #endif
+ 
+@@ -209,8 +210,8 @@ QString KSSLCertificate::getSignatureTex
+ 
+     rc += '\n';
+     rc += i18n("Signature Contents:");
+-    n = sig->length;
+-    s = (char *)sig->data;
++    n = ASN1_STRING_length(sig);
++    s = (char *)ASN1_STRING_get0_data(sig);
+     for (i = 0; i < n; ++i) {
+         if (i%20 != 0) {
+             rc += ':';
+diff -up kdelibs-4.14.38/kio/kssl/ksslutils.cpp.ftbfs-openssl kdelibs-4.14.38/kio/kssl/ksslutils.cpp
+--- kdelibs-4.14.38/kio/kssl/ksslutils.cpp.ftbfs-openssl	2026-08-11 08:58:55.792926230 +0200
++++ kdelibs-4.14.38/kio/kssl/ksslutils.cpp	2026-08-11 08:59:50.030726202 +0200
+@@ -40,8 +40,8 @@ int y=0,M=0,d=0,h=0,m=0,s=0;
+ QDate qdate;
+ QTime qtime;
+  
+-  i = tm->length;
+-  v = (char *)tm->data;
++  i = ASN1_STRING_length(tm);
++  v = (char *)ASN1_STRING_get0_data(tm);
+  
+   if (i < 10) goto auq_err;
+   if (v[i-1] == 'Z') gmt=1;

diff --git a/kdelibs.spec b/kdelibs.spec
index c7682dc..3069a18 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -56,7 +56,7 @@ Summary: KDE Libraries
 # shipped with kde applications, version...
 %global apps_version 17.08.3
 Version: 4.14.38
-Release: 54%{?dist}
+Release: 55%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -242,6 +242,9 @@ Patch75: kdelibs-4.14.38-stdint.patch
 # Fix compilation with libxml2 2.12.0
 Patch76: kdelibs-4.14.38-libxml2-2_12_0.patch
 
+# Fix FTBFS with openssl
+Patch77: kdelibs-openssl-ftbfs-openssl.patch
+
 ## upstream
 ## security fixes from the 4.14 branch:
 # Security: remove support for $(...) in config keys with [$e] marker.
@@ -550,6 +553,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
 %endif
 %patch -P75 -p1 -b .stdint
 %patch -P76 -p1 -b .xml2
+%patch -P77 -p1 -b .ftbfs-openssl
 
 # upstream patches
 %patch -P100 -p1 -b .CVE-2019-14744
@@ -562,6 +566,9 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
 %patch -P301 -p1 -b .abrt
 %endif
 
+# Append crypto linking directly to kio/CMakeLists.txt
+sed -i '/target_link_libraries/,/)/ s/kdecore/kdecore crypto/' kio/CMakeLists.txt
+
 # FTBFS Workaround for new cmake
 cat << 'EOF' > cmake4-kde4-compat.cmake
 cmake_policy(VERSION 3.10...3.30)
@@ -585,6 +592,7 @@ find . -type f \( -name "CMakeLists.txt" -o -name "*.cmake" \) -exec sed -i \
 mkdir %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} \
+  -Wno-dev \
   -DHUPNP_ENABLED:BOOL=ON \
   -DKAUTH_BACKEND:STRING="PolkitQt-1" \
   -DKDE_DISTRIBUTION_TEXT="%{version}-%{release}%{?fedora: Fedora}%{?rhel: Red Hat Enterprise Linux}" \
@@ -935,6 +943,9 @@ time xvfb-run -a dbus-launch --exit-with-session make -C %{_target_platform}/ te
 
 
 %changelog
+* Wed Aug 12 2026 Than Ngo <than@redhat.com> - 6:4.14.38-55
+- Fix rhbz#2504172, FTBFS with openssl4
+
 * Thu Jul 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 6:4.14.38-54
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
 

                 reply	other threads:[~2026-08-12 12:49 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=178653894673.1.4410682557666097294.rpms-kdelibs-9d34e0c50346@fedoraproject.org \
    --to=than@redhat.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