[packages/libetpan] Up to 1.10.1
arekm
arekm at pld-linux.org
Tue Oct 20 21:56:33 CEST 2026
commit 9c1cdcb30be0cf23ebfce80ac0c53465d8584fe6
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Tue Oct 20 21:55:02 2026 +0200
Up to 1.10.1
Fixes CVE-2020-15953, CVE-2022-4121
libetpan-link.patch | 20 ++++++++++++++------
libetpan-pc.patch | 6 +++---
libetpan.spec | 24 ++++++++++++++++--------
3 files changed, 33 insertions(+), 17 deletions(-)
---
diff --git a/libetpan.spec b/libetpan.spec
index bf1fe9a..6109d1d 100644
--- a/libetpan.spec
+++ b/libetpan.spec
@@ -6,17 +6,17 @@
Summary: Portable mail access library
Summary(pl.UTF-8): Przenośna biblioteka dostępu do poczty
Name: libetpan
-Version: 1.9.4
-Release: 2
+Version: 1.10.1
+Release: 1
License: BSD
Group: Libraries
-Source0: https://github.com/dinhviethoa/libetpan/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 66bc8ccb241123aa61d405a576763a44
+Source0: https://github.com/dinhvh/libetpan/archive/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 60ef6f4b74a66b49a7cacf95a60efa16
Patch0: %{name}-link.patch
Patch1: %{name}-db.patch
Patch2: %{name}-pc.patch
-URL: https://github.com/dinhviethoa/libetpan
-BuildRequires: autoconf >= 2.61
+URL: https://github.com/dinhvh/libetpan
+BuildRequires: autoconf >= 2.69
BuildRequires: automake
BuildRequires: curl-devel
BuildRequires: cyrus-sasl-devel >= 2
@@ -27,6 +27,8 @@ BuildRequires: expat-devel
BuildRequires: liblockfile-devel
BuildRequires: libtool
%{?with_lmdb:BuildRequires: lmdb-devel}
+# doc/Makefile.am renders the API docs with lynx
+BuildRequires: lynx
BuildRequires: openjade
%{?with_openssl:BuildRequires: openssl-devel}
BuildRequires: pkgconfig
@@ -95,7 +97,13 @@ Statyczna biblioteka libEtPan.
%{__automake}
%configure \
--enable-ipv6 \
-%if %{without openssl}
+%if %{with lmdb}
+ --enable-lmdb \
+%endif
+%if %{with openssl}
+ --with-openssl \
+ --without-gnutls
+%else
--with-gnutls \
--without-openssl
%endif
@@ -124,7 +132,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc COPYRIGHT ChangeLog NEWS README.md
%attr(755,root,root) %{_libdir}/libetpan.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libetpan.so.20
+%attr(755,root,root) %ghost %{_libdir}/libetpan.so.26
%files devel
%defattr(644,root,root,755)
diff --git a/libetpan-link.patch b/libetpan-link.patch
index 11b8f23..7fc7d16 100644
--- a/libetpan-link.patch
+++ b/libetpan-link.patch
@@ -1,5 +1,9 @@
---- libetpan-1.7.2/configure.ac~ 2016-05-26 07:27:47.000000000 +0200
-+++ libetpan-1.7.2/configure.ac 2016-08-05 14:44:19.882952496 +0200
+# configure places library flags in LDFLAGS, where --as-needed discards them,
+# and its curl/expat link tests call the functions without a prototype, which
+# GCC 15 rejects; either way HAVE_CURL/HAVE_EXPAT end up undefined.
+
+--- libetpan-1.10.1/configure.ac.orig 2026-10-20 21:51:18.333332661 +0200
++++ libetpan-1.10.1/configure.ac 2026-10-20 21:51:18.415555162 +0200
@@ -255,7 +255,7 @@
if test "x$with_gnutls" = "xyes"; then
AC_DEFINE([USE_GNUTLS],1, [Define to use GnuTLS])
@@ -9,15 +13,17 @@
else
GNUTLSLIB=""
fi
-@@ -618,12 +618,12 @@ else
+@@ -640,12 +640,13 @@
AC_CHECK_HEADER(curl/curl.h, [libcurl=yes])
if test "x$libcurl" = "xyes"; then
AC_MSG_CHECKING([whether curl-config hints compiles and links fine])
- OLDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS `$libcurlconfig --libs 2>/dev/null`"
+- AC_TRY_LINK([], [curl_easy_init();], [libcurl=yes], [libcurl=no])
+ OLDLIBS="$LIBS"
+ LIBS="$LIBS `$libcurlconfig --libs 2>/dev/null`"
- AC_TRY_LINK([], [curl_easy_init();], [libcurl=yes], [libcurl=no])
++ AC_TRY_LINK([#include <curl/curl.h>], [curl_easy_init();],
++ [libcurl=yes], [libcurl=no])
AC_MSG_RESULT([$libcurl])
if test "x$libcurl" = "xno"; then
- LDFLAGS="$OLDFLAGS"
@@ -25,15 +31,17 @@
fi
fi
-@@ -673,12 +673,12 @@ else
+@@ -695,12 +696,13 @@
AC_CHECK_HEADER(expat.h, [libexpat=yes])
if test "x$libexpat" = "xyes"; then
AC_MSG_CHECKING([whether libexpat compiles and links fine])
- OLDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -lexpat"
+- AC_TRY_LINK([], [XML_SetElementHandler();], [libexpat=yes], [libexpat=no])
+ OLDLIBS="$LIBS"
+ LIBS="$LIBS -lexpat"
- AC_TRY_LINK([], [XML_SetElementHandler();], [libexpat=yes], [libexpat=no])
++ AC_TRY_LINK([#include <expat.h>], [XML_ParserCreate(NULL);],
++ [libexpat=yes], [libexpat=no])
AC_MSG_RESULT([$libexpat])
if test "x$libexpat" = "xno"; then
- LDFLAGS="$OLDFLAGS"
diff --git a/libetpan-pc.patch b/libetpan-pc.patch
index 525d350..23149de 100644
--- a/libetpan-pc.patch
+++ b/libetpan-pc.patch
@@ -1,10 +1,10 @@
---- libetpan-1.9.4/libetpan.pc.in.orig 2019-11-01 18:58:50.000000000 +0100
-+++ libetpan-1.9.4/libetpan.pc.in 2020-05-14 18:34:36.122143355 +0200
+--- libetpan-1.10.1/libetpan.pc.in.orig
++++ libetpan-1.10.1/libetpan.pc.in
@@ -6,5 +6,6 @@
Name: libetpan
Description: Libetpan C library.
Version: @VERSION@
--Libs: -L${libdir} -letpan at LIBSUFFIX@ @LDFLAGS@ @SSLLIBS@ @GNUTLSLIB@ @LIBICONV@ @DBLIB@ @LIBS@ @SASLLIBS@
+-Libs: -L${libdir} -letpan at LIBSUFFIX@ @SSLLIBS@ @GNUTLSLIB@ @LIBICONV@ @DBLIB@ @LIBS@ @SASLLIBS@
+Libs: -L${libdir} -letpan at LIBSUFFIX@
+Libs.private: @SSLLIBS@ @GNUTLSLIB@ @LIBICONV@ @DBLIB@ @LIBS@ @SASLLIBS@
Cflags: -I${includedir}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libetpan.git/commitdiff/9c1cdcb30be0cf23ebfce80ac0c53465d8584fe6
More information about the pld-cvs-commit
mailing list