From 5f6a424cb69d31b3f173e050cef935cf22f96e91 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Oct 03 2021 16:08:03 +0000 Subject: Version 8.4.0. - Drop upstreamed -qt-deprecated and -openssl3 patches. - Add -pclose patch to avoid zombie processes. --- diff --git a/pl.spec b/pl.spec index e665ee5..5ddc50a 100644 --- a/pl.spec +++ b/pl.spec @@ -17,8 +17,8 @@ %endif Name: pl -Version: 8.2.4 -Release: 3%{?dist} +Version: 8.4.0 +Release: 1%{?dist} Summary: SWI-Prolog - Edinburgh compatible Prolog compiler #LICENSE: BSD #library/qsave.pl BSD @@ -88,11 +88,9 @@ Patch0: swipl-8.2.0-Remove-files-locations-from-swipl-1-manual.patch Patch1: swipl-8.2.1-Fix-JNI.patch # Unbundle libstemmer Patch2: swipl-8.2.0-unbundle-libstemmer.patch -# Silence some Qt deprecation warnings -Patch3: swipl-8.2.3-qt-deprecated.patch -# Don't use RSA_SSLV23_PADDING with OpenSSL 3.x -# https://github.com/SWI-Prolog/packages-ssl/issues/160 -Patch4: swipl-8.2.4-openssl3.patch +# Fix popen/pclose mismatch +# https://github.com/SWI-Prolog/swipl-devel/pull/888 +Patch3: swipl-8.4.0-pclose.patch BuildRequires: cmake BuildRequires: findutils @@ -262,7 +260,11 @@ in Prolog. In both setups it provides a re-entrant bidirectional interface. %prep %global docdir doc-install -%autosetup -p1 -n swipl-%{version} +%autosetup -N -n swipl-%{version} +%patch0 -p1 +%patch1 -p1 -b .jni +%patch2 -p1 +%patch3 -p1 # Fix the installation path on 64-bit systems if [ "%{_lib}" = "lib64" ]; then @@ -283,8 +285,8 @@ popd cp -p %{SOURCE2} . # Adjustments to take into account the new location of JNI stuff -sed --in-place=.jni -e 's#LIBDIR#%{_libdir}#g' packages/jpl/jpl.pl -sed --in-place=.jni -e 's#LIBDIR#"%{_libdir}/swipl-jpl"#g' packages/jpl/src/main/java/org/jpl7/JPL.java +sed -i 's#LIBDIR#%{_libdir}#g' packages/jpl/jpl.pl +sed -i.jni -e 's#LIBDIR#"%{_libdir}/swipl-jpl"#g' packages/jpl/src/main/java/org/jpl7/JPL.java # Find junit.jar sed --in-place 's,\(%{_datadir}/java/junit\)4\.jar,\1.jar,' \ @@ -368,6 +370,7 @@ popd # Remove stuff we do not want to package rm %{buildroot}%{_libdir}/swipl-%{version}/{LICENSE,README.md} rm %{buildroot}%{_libdir}/swipl-%{version}/customize/README.md +rm %{buildroot}%{_libdir}/swipl-%{version}/lib/swiplserver/LICENSE %files @@ -415,6 +418,7 @@ rm %{buildroot}%{_libdir}/swipl-%{version}/customize/README.md %{_libdir}/swipl-%{version}/lib/%{swipl_arch}/rdf_db.so %{_libdir}/swipl-%{version}/lib/%{swipl_arch}/readline4pl.so %{_libdir}/swipl-%{version}/lib/%{swipl_arch}/readutil.so +%{_libdir}/swipl-%{version}/lib/%{swipl_arch}/redis4pl.so %{_libdir}/swipl-%{version}/lib/%{swipl_arch}/rlimit.so %{_libdir}/swipl-%{version}/lib/%{swipl_arch}/sgml2pl.so %{_libdir}/swipl-%{version}/lib/%{swipl_arch}/sha4pl.so @@ -436,6 +440,7 @@ rm %{buildroot}%{_libdir}/swipl-%{version}/customize/README.md %{_libdir}/swipl-%{version}/lib/%{swipl_arch}/websocket.so %{_libdir}/swipl-%{version}/lib/%{swipl_arch}/yaml4pl.so %{_libdir}/swipl-%{version}/lib/%{swipl_arch}/zlib4pl.so +%{_libdir}/swipl-%{version}/lib/swiplserver/ %{_libdir}/swipl-%{version}/library/ %{_libdir}/swipl-%{version}/swipl.home @@ -491,6 +496,11 @@ rm %{buildroot}%{_libdir}/swipl-%{version}/customize/README.md %changelog +* Sat Oct 2 2021 Jerry James - 8.4.0-1 +- Version 8.4.0 +- Drop upstreamed -qt-deprecated and -openssl3 patches +- Add -pclose patch to avoid zombie processes + * Thu Sep 16 2021 Jerry James - 8.2.4-3 - Add -openssl3 patch to fix FTBFS with OpenSSL 3.0.0 diff --git a/repackage.sh b/repackage.sh old mode 100644 new mode 100755 diff --git a/sources b/sources index d906ff2..537080d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (userguide.html.tgz) = baa16d8f06a666e77ef45aaf7708e877710bfcb8fc0fb519bc70c54619c45def2d2ab4feaa0f1a1875b2a2270e8907551b63582da1b4beaa5b50f013a41d7ab9 -SHA512 (swipl-8.2.4_repackaged.tar.gz) = c6d7a4173df7504d24f53f5a2c914fb49f2c608ca56d799a6dcb3fcafb3d260177addd820517fdfd628d43df0bfd675c9de0cc9f59dfdb4f8c245dfe389d2524 +SHA512 (swipl-8.4.0_repackaged.tar.gz) = 1725fc4078aa9de9619643a890ea267d6e5f17d03cec7083d81aacd3b97534bb15fac0c5822ddab87e5e8ffd5af1848e9b0865056a9897cc10f9a6cf8a58a9ba diff --git a/swipl-8.2.3-qt-deprecated.patch b/swipl-8.2.3-qt-deprecated.patch deleted file mode 100644 index 5ab7f15..0000000 --- a/swipl-8.2.3-qt-deprecated.patch +++ /dev/null @@ -1,25 +0,0 @@ -Silence some deprecation warnings. - ---- swipl-8.2.3/packages/swipl-win/ParenMatching.cpp.orig 2020-11-04 06:02:43.000000000 -0700 -+++ swipl-8.2.3/packages/swipl-win/ParenMatching.cpp 2020-11-23 09:44:33.888327758 -0700 -@@ -84,9 +84,9 @@ QString ParenMatching::range::plainText( - e = doc->findBlock(end); - QTextStream s(&x); - if (b != e) { -- s << b.text().mid(b.position() - beg) << endl; -+ s << b.text().mid(b.position() - beg) << Qt::endl; - for (b = b.next(); b != e; b = b.next()) -- s << b.text() << endl; -+ s << b.text() << Qt::endl; - s << b.text().left(end - b.position()); - } - else -@@ -105,7 +105,7 @@ QString ParenMatching::range::linesText( - if (b != doc->end()) { - QTextStream s(&x); - for ( ; b != e; b = b.next()) -- s << b.text() << endl; -+ s << b.text() << Qt::endl; - if (b != doc->end()) - s << b.text(); - } diff --git a/swipl-8.2.4-openssl3.patch b/swipl-8.2.4-openssl3.patch deleted file mode 100644 index f912757..0000000 --- a/swipl-8.2.4-openssl3.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/packages/ssl/crypto4pl.c 2020-12-29 07:36:23.000000000 -0700 -+++ b/packages/ssl/crypto4pl.c 2021-09-15 13:26:07.011819892 -0600 -@@ -848,7 +848,9 @@ get_padding(term_t t, crypt_mode_t mode, - { if ( a == ATOM_pkcs1 && mode == RSA_MODE ) *padding = RSA_PKCS1_PADDING; - else if ( a == ATOM_pkcs1_oaep && mode == RSA_MODE ) *padding = RSA_PKCS1_OAEP_PADDING; - else if ( a == ATOM_none && mode == RSA_MODE ) *padding = RSA_NO_PADDING; -+#ifdef RSA_SSLV23_PADDING - else if ( a == ATOM_sslv23 && mode == RSA_MODE ) *padding = RSA_SSLV23_PADDING; -+#endif - else if ( a == ATOM_none && mode == EVP_MODE ) *padding = 0; - else if ( a == ATOM_block && mode == EVP_MODE ) *padding = 1; - else return PL_domain_error("padding", t); diff --git a/swipl-8.4.0-pclose.patch b/swipl-8.4.0-pclose.patch new file mode 100644 index 0000000..bbc0f46 --- /dev/null +++ b/swipl-8.4.0-pclose.patch @@ -0,0 +1,11 @@ +--- a/src/os/pl-cstack.c 2021-09-30 06:47:14.000000000 -0600 ++++ b/src/os/pl-cstack.c 2021-10-02 20:46:40.273377664 -0600 +@@ -371,7 +371,7 @@ addr2line(const char *fname, uintptr_t o + + *o = '\0'; + +- fclose(fd); ++ pclose(fd); + return o > buf; + } + }