public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/kdelibs3] rawhide: Drop pcre1 support on F45 as it is no longer available
@ 2026-08-10  0:45 Mamoru TASAKA
  0 siblings, 0 replies; only message in thread
From: Mamoru TASAKA @ 2026-08-10  0:45 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/kdelibs3
            Branch : rawhide
            Commit : 60a1d1b845b064386f106b7b55cb9fda4278ff66
            Author : Mamoru TASAKA <mtasaka@fedoraproject.org>
            Date   : 2026-08-06T22:44:45+09:00
            Stats  : +92/-1 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/kdelibs3/c/60a1d1b845b064386f106b7b55cb9fda4278ff66?branch=rawhide

            Log:
            Drop pcre1 support on F45 as it is no longer available

Support openssl 4

---
diff --git a/kdelibs-3.5.10-openssl4.patch b/kdelibs-3.5.10-openssl4.patch
new file mode 100644
index 0000000..6d44e21
--- /dev/null
+++ b/kdelibs-3.5.10-openssl4.patch
@@ -0,0 +1,79 @@
+--- kdelibs-3.5.10/kio/Makefile.am.openssl-4	2005-10-11 00:05:44.000000000 +0900
++++ kdelibs-3.5.10/kio/Makefile.am	2026-08-06 21:36:30.428013120 +0900
+@@ -32,6 +32,7 @@ libkio_la_LIBADD = kssl/libkssl.la kio/l
+ 	kio/libksycoca.la bookmarks/libkbookmarks.la kfile/libkfile.la \
+ 	../kdeui/libkdeui.la ../kdesu/libkdesu.la \
+ 	../kwallet/client/libkwalletclient.la \
++	$(LIBSSL) \
+ 	$(LIBZ) $(LIBFAM) $(LIBVOLMGT) $(ACL_LIBS)
+ 
+ kde_mime_DATA = magic
+--- kdelibs-3.5.10/kio/kssl/ksslcertificate.cc.openssl-4	2026-08-06 17:09:08.570106988 +0900
++++ kdelibs-3.5.10/kio/kssl/ksslcertificate.cc	2026-08-06 18:16:41.503868674 +0900
+@@ -207,8 +207,13 @@ int n, i;
+ 
+ 	rc += "\n";
+ 	rc += i18n("Signature Contents:");
++#if OPENSSL_VERSION_NUMBER >= 0x40000000L
++	n = ASN1_STRING_length(signature);
++	s = (char *)ASN1_STRING_get0_data(signature);
++#else
+ 	n = signature->length;
+ 	s = (char *)signature->data;
++#endif
+ 	for (i = 0; i < n; i++) {
+ 		if (i%20 != 0) rc += ":";
+ 		else rc += "\n";
+@@ -1029,7 +1034,11 @@ QByteArray qba;
+ #ifdef KSSL_HAVE_SSL
+ #if OPENSSL_VERSION_NUMBER >= 0x10000000L
+ 	NETSCAPE_X509 nx;
++#if OPENSSL_VERSION_NUMBER >= 0x40000000L
++	ASN1_OCTET_STRING *hdr = ASN1_OCTET_STRING_new();
++#else
+ 	ASN1_OCTET_STRING hdr;
++#endif
+ #else
+   ASN1_HEADER ah;
+   ASN1_OCTET_STRING os;
+@@ -1037,9 +1046,14 @@ QByteArray qba;
+ 	KTempFile ktf;
+ 
+ #if OPENSSL_VERSION_NUMBER >= 0x10000000L
++#if OPENSSL_VERSION_NUMBER >= 0x40000000L
++	ASN1_OCTET_STRING_set(hdr, (unsigned char *)NETSCAPE_CERT_HDR, strlen(NETSCAPE_CERT_HDR));
++	nx.header = hdr;
++#else
+ 	hdr.data = (unsigned char *)NETSCAPE_CERT_HDR;
+ 	hdr.length = strlen(NETSCAPE_CERT_HDR);
+ 	nx.header = &hdr;
++#endif
+ 	nx.cert = getCert();
+ 
+ 	d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&nx);
+@@ -1063,6 +1077,9 @@ QByteArray qba;
+ 	qf.close();
+ 	delete[] buf;
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x40000000L
++	ASN1_OCTET_STRING_free(hdr);
++#endif
+ 	ktf.unlink();
+ 
+ #endif
+--- kdelibs-3.5.10/kio/kssl/ksslutils.cc.openssl-4	2026-08-06 17:09:08.571770469 +0900
++++ kdelibs-3.5.10/kio/kssl/ksslutils.cc	2026-08-06 18:17:35.189618895 +0900
+@@ -40,8 +40,13 @@ int y=0,M=0,d=0,h=0,m=0,s=0;
+ QDate qdate;
+ QTime qtime;
+  
++#if OPENSSL_VERSION_NUMBER >= 0x40000000L
++  i = ASN1_STRING_length(tm);
++  v = (char *)ASN1_STRING_get0_data(tm);
++#else
+   i = tm->length;
+   v = (char *)tm->data;
++#endif
+  
+   if (i < 10) goto auq_err;
+   if (v[i-1] == 'Z') gmt=1;

diff --git a/kdelibs3.spec b/kdelibs3.spec
index 0ded746..4b61359 100644
--- a/kdelibs3.spec
+++ b/kdelibs3.spec
@@ -21,7 +21,7 @@
 Summary: KDE 3 Libraries
 Name:    kdelibs3
 Version: 3.5.10
-Release: 136%{?dist}
+Release: 137%{?dist}
 
 License: LGPL-2.0-only
 Url: http://www.kde.org/
@@ -180,6 +180,8 @@ Patch308: kdelibs3-c99-2.patch
 # tweak autoconfigury so that it builds with autoconf 2.72
 # https://src.fedoraproject.org/rpms/kdebase3/c/91233a5b909d09775930236bd21556faa993176f?branch=rawhide
 Patch309: kde3-autoconf-2.72.patch
+# Support openssl 4
+Patch310: kdelibs-3.5.10-openssl4.patch
 
 Requires: /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem
 Requires: hicolor-icon-theme
@@ -206,7 +208,9 @@ Requires: hunspell
 
 BuildRequires: gcc-c++
 BuildRequires: gettext
+%if 0%{?fedora} < 45
 BuildRequires: pcre-devel
+%endif
 BuildRequires: cups-devel cups
 BuildRequires: %{qt3}-devel %{qt3}-devel-docs
 BuildRequires: arts-devel >= %{arts_ev}
@@ -381,6 +385,7 @@ This package includes tools kgrantpty and kpac_dhcp_helper.
 %patch -P307 -p1 -b .libxml2_2_12_0
 %patch -P 308 -p1
 %patch -P 309 -p1
+%patch -P 310 -p1 -b .openssl-4
 
 make -f admin/Makefile.common cvs
 
@@ -414,6 +419,9 @@ export CXXFLAGS="%{optflags} -Wno-deprecated-declarations -Wno-narrowing -std=gn
 %if "%{_lib}" == "lib64"
   --enable-libsuffix="64" \
 %endif
+%if %{?fedora} >= 45
+   --disable-pcre \
+%endif
    --enable-cups \
    --enable-mitshm \
    --enable-pie \
@@ -722,6 +730,10 @@ fi
 %attr(4755,root,root) %{_bindir}/kpac_dhcp_helper
 
 %changelog
+* Thu Aug 06 2026 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.5.10-137
+- Drop pcre1 support on F45 as it is no longer available
+- Support openssl 4
+
 * Thu Jul 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.10-136
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
 

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-08-10  0:45 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-10  0:45 [rpms/kdelibs3] rawhide: Drop pcre1 support on F45 as it is no longer available Mamoru TASAKA

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox