[rpms/libetpan] rawhide: 1.10

[rpms/libetpan] rawhide: 1.10

[Mamoru TASAKA]

A new commit has been pushed.

Repo   : rpms/libetpan
Branch : rawhide
Commit : d846b9a92c34dd5d7c5e7fccfc74316aa1afc7f3
Author : Mamoru TASAKA <mtasaka@fedoraproject.org>
Date   : 2026-05-31T15:57:40+09:00
Stats  : +9/-199 in 8 file(s)
URL    : https://src.fedoraproject.org/rpms/libetpan/c/d846b9a92c34dd5d7c5e7fccfc74316aa1afc7f3?branch=rawhide

Log:
1.10

---
diff --git a/.gitignore b/.gitignore
index 3b83629..d3c2f58 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1 @@
-/libetpan-1.5.tar.gz
-/libetpan-1.6.tar.gz
-/libetpan-1.7.2.tar.gz
-/libetpan-1.8.tar.gz
-/libetpan-1.9.1.tar.gz
-/libetpan-1.9.2.tar.gz
-/libetpan-1.9.3.tar.gz
-/libetpan-1.9.4.tar.gz
+/libetpan-*.tar.gz

diff --git a/libetpan-1.9.4-0001-Detect-extra-data-after-STARTTLS-response-and-exit-3.patch b/libetpan-1.9.4-0001-Detect-extra-data-after-STARTTLS-response-and-exit-3.patch
deleted file mode 100644
index d889378..0000000
--- a/libetpan-1.9.4-0001-Detect-extra-data-after-STARTTLS-response-and-exit-3.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 1002a0121a8f5a9aee25357769807f2c519fa50b Mon Sep 17 00:00:00 2001
-From: Damian Poddebniak <duesee@users.noreply.github.com>
-Date: Fri, 24 Jul 2020 19:39:53 +0200
-Subject: [PATCH 1/2] Detect extra data after STARTTLS response and exit (#387)
-
----
- src/low-level/imap/mailimap.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/low-level/imap/mailimap.c b/src/low-level/imap/mailimap.c
-index bb17119..4ffcf55 100644
---- a/src/low-level/imap/mailimap.c
-+++ b/src/low-level/imap/mailimap.c
-@@ -2428,6 +2428,13 @@ int mailimap_starttls(mailimap * session)
- 
-   mailimap_response_free(response);
- 
-+  // Detect if the server send extra data after the STARTTLS response.
-+  // This *may* be a "response injection attack".
-+  if (session->imap_stream->read_buffer_len != 0) {
-+      // Since it is also an IMAP protocol violation, exit.
-+      return MAILIMAP_ERROR_STARTTLS;
-+  }
-+
-   switch (error_code) {
-   case MAILIMAP_RESP_COND_STATE_OK:
-     return MAILIMAP_NO_ERROR;
--- 
-2.26.2
-

diff --git a/libetpan-1.9.4-0002-Detect-extra-data-after-STARTTLS-responses-in-SMTP-a.patch b/libetpan-1.9.4-0002-Detect-extra-data-after-STARTTLS-responses-in-SMTP-a.patch
deleted file mode 100644
index a39f2cb..0000000
--- a/libetpan-1.9.4-0002-Detect-extra-data-after-STARTTLS-responses-in-SMTP-a.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 298460a2adaabd2f28f417a0f106cb3b68d27df9 Mon Sep 17 00:00:00 2001
-From: Fabian Ising <Murgeye@users.noreply.github.com>
-Date: Fri, 24 Jul 2020 19:40:48 +0200
-Subject: [PATCH 2/2] Detect extra data after STARTTLS responses in SMTP and
- POP3 and exit (#388)
-
-* Detect extra data after STLS response and return error
-
-* Detect extra data after SMTP STARTTLS response and return error
----
- src/low-level/pop3/mailpop3.c | 8 ++++++++
- src/low-level/smtp/mailsmtp.c | 8 ++++++++
- 2 files changed, 16 insertions(+)
-
-diff --git a/src/low-level/pop3/mailpop3.c b/src/low-level/pop3/mailpop3.c
-index ab9535b..e2124bf 100644
---- a/src/low-level/pop3/mailpop3.c
-+++ b/src/low-level/pop3/mailpop3.c
-@@ -959,6 +959,14 @@ int mailpop3_stls(mailpop3 * f)
- 
-   if (r != RESPONSE_OK)
-     return MAILPOP3_ERROR_STLS_NOT_SUPPORTED;
-+
-+  // Detect if the server send extra data after the STLS response.
-+  // This *may* be a "response injection attack".
-+  if (f->pop3_stream->read_buffer_len != 0) {
-+    // Since it is also protocol violation, exit.
-+    // There is no error type for STARTTLS errors in POP3
-+    return MAILPOP3_ERROR_SSL;
-+  }
-   
-   return MAILPOP3_NO_ERROR;
- }
-diff --git a/src/low-level/smtp/mailsmtp.c b/src/low-level/smtp/mailsmtp.c
-index b7fc459..3145cad 100644
---- a/src/low-level/smtp/mailsmtp.c
-+++ b/src/low-level/smtp/mailsmtp.c
-@@ -1111,6 +1111,14 @@ int mailesmtp_starttls(mailsmtp * session)
-     return MAILSMTP_ERROR_STREAM;
-   r = read_response(session);
- 
-+  // Detect if the server send extra data after the STARTTLS response.
-+  // This *may* be a "response injection attack".
-+  if (session->stream->read_buffer_len != 0) {
-+    // Since it is also protocol violation, exit.
-+    // There is no general error type for STARTTLS errors in SMTP
-+    return MAILSMTP_ERROR_SSL;
-+  }
-+
-   switch (r) {
-   case 220:
-     return MAILSMTP_NO_ERROR;
--- 
-2.26.2
-

diff --git a/libetpan-1.9.4-mailbox_data_status-info_list-invalid-free.patch b/libetpan-1.9.4-mailbox_data_status-info_list-invalid-free.patch
deleted file mode 100644
index b1219b3..0000000
--- a/libetpan-1.9.4-mailbox_data_status-info_list-invalid-free.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- libetpan-1.9.4.orig/src/low-level/imap/mailimap_types.c	2019-11-02 02:58:50.000000000 +0900
-+++ libetpan-1.9.4/src/low-level/imap/mailimap_types.c	2022-11-23 14:58:47.075176654 +0900
-@@ -1389,9 +1389,12 @@ void
- mailimap_mailbox_data_status_free(struct mailimap_mailbox_data_status * info)
- {
-   mailimap_mailbox_free(info->st_mailbox);
--  clist_foreach(info->st_info_list, (clist_func) mailimap_status_info_free,
-+  if (info->st_info_list)
-+  {
-+  	clist_foreach(info->st_info_list, (clist_func) mailimap_status_info_free,
- 		 NULL);
--  clist_free(info->st_info_list);
-+  	clist_free(info->st_info_list);
-+  }
-   free(info);
- }
- 

diff --git a/libetpan-configure-c99.patch b/libetpan-configure-c99.patch
deleted file mode 100644
index 3578177..0000000
--- a/libetpan-configure-c99.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Add a fake pthread_create prototype to avoid an implicit function
-declaration.  Otherwise the configure check result will change with
-future compilers.
-
-Submitted upstream: <https://github.com/dinhvh/libetpan/pull/423>
-
-diff --git a/configure.ac b/configure.ac
-index 542f3bb0d12afca9..39bbc8b641897afb 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -482,7 +482,7 @@ elif test "x$enable_threads" = "xyes"; then
-   checkpthread=yes
- 
-   AC_MSG_CHECKING([for pthread_create with libc])
--  AC_TRY_LINK([], [pthread_create();], 
-+  AC_TRY_LINK([char pthread_create(void);], [pthread_create();],
-                   [pthflag=yes; checkpthread=no], 
-                   [pthflag=no])
-   AC_MSG_RESULT($pthflag)

diff --git a/libetpan-pr447-fix-poll-logical-op.patch b/libetpan-pr447-fix-poll-logical-op.patch
deleted file mode 100644
index 5bb6122..0000000
--- a/libetpan-pr447-fix-poll-logical-op.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 25288ce11c6e9a4b777739acae0d5e74f91983be Mon Sep 17 00:00:00 2001
-From: Mamoru TASAKA <mtasaka@fedoraproject.org>
-Date: Tue, 28 May 2024 12:32:46 +0900
-Subject: [PATCH] FIX: operator precedence related to poll
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes the following warnings:
-
-```
-connect.c:162:19: warning: suggest parentheses around comparison in operand of ‘&’ [-Wparentheses]
-mailstream_ssl.c:368:32: warning: self-comparison always evaluates to false [-Wtautological-compare]
-mailstream_ssl.c:368:32: warning: suggest parentheses around comparison in operand of ‘&’ [-Wparentheses]
-```
----
- src/data-types/connect.c        | 2 +-
- src/data-types/mailstream_ssl.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/data-types/connect.c b/src/data-types/connect.c
-index e17a5e03..23a2fd14 100644
---- a/src/data-types/connect.c
-+++ b/src/data-types/connect.c
-@@ -159,7 +159,7 @@ static int wait_connect(int s, int r, time_t timeout_seconds)
-     return -1;
-   }
-   
--  if (pfd.revents & POLLOUT != POLLOUT) {
-+  if ((pfd.revents & POLLOUT) != POLLOUT) {
-     return -1;
-   }
- #endif
-diff --git a/src/data-types/mailstream_ssl.c b/src/data-types/mailstream_ssl.c
-index bd680ae5..deb7df7f 100644
---- a/src/data-types/mailstream_ssl.c
-+++ b/src/data-types/mailstream_ssl.c
-@@ -365,7 +365,7 @@ static int wait_SSL_connect(int s, int want_read, time_t timeout_seconds)
-     return -1;
-   }
- 
--  if (pfd.revents & pfd.events != pfd.events) {
-+  if ((pfd.revents & pfd.events) != pfd.events) {
-     return -1;
-   }
- #endif

diff --git a/libetpan.spec b/libetpan.spec
index 1adacdd..140b486 100644
--- a/libetpan.spec
+++ b/libetpan.spec
@@ -1,6 +1,6 @@
 Name:           libetpan
-Version:        1.9.4
-Release:        19%{?dist}
+Version:        1.10
+Release:        0.100%{?dist}
 Summary:        Portable, efficient middle-ware for different kinds of mail access
 
 # src/bsd/getopt.c BSD-4-Clause (not used)
@@ -13,20 +13,6 @@ Source0:        https://github.com/dinhviethoa/%{name}/archive/%{version}/%{name
 Patch10:        libetpan-1.9.2-cryptopolicy.patch
 # Upstream patches
 #
-# CVE-2020-15953
-# https://github.com/dinhvh/libetpan/issues/386
-# Detect extra data after STARTTLS response and exit
-# https://github.com/dinhvh/libetpan/pull/387
-Patch101:       libetpan-1.9.4-0001-Detect-extra-data-after-STARTTLS-response-and-exit-3.patch
-# Detect extra data after STARTTLS responses in SMTP and POP3 and exit
-# https://github.com/dinhvh/libetpan/pull/388
-Patch102:       libetpan-1.9.4-0002-Detect-extra-data-after-STARTTLS-responses-in-SMTP-a.patch
-# https://github.com/dinhvh/libetpan/issues/420
-Patch103:       libetpan-1.9.4-mailbox_data_status-info_list-invalid-free.patch
-# https://github.com/dinhvh/libetpan/pull/423
-Patch104:       libetpan-configure-c99.patch
-# https://github.com/dinhvh/libetpan/pull/447
-Patch105:		libetpan-pr447-fix-poll-logical-op.patch
 
 BuildRequires:  gcc-c++
 BuildRequires:  liblockfile-devel
@@ -59,15 +45,12 @@ with %{name}.
 %prep
 %setup -q
 
+find . -name \*.gz -delete
+
 #%patch0 -b .libetpan-config-script
 sed -i.flags libetpan.pc.in \
     -e 's|-letpan@LIBSUFFIX@.*$|-letpan@LIBSUFFIX@|'
 %patch -P10 -p1 -b .crypto-policy
-%patch -P101 -p1 -b .CVE-2020-15953-1
-%patch -P102 -p1 -b .CVE-2020-15953-2
-%patch -P103 -p1 -b .CVE-2022-4121.tmp
-%patch -P104 -p1 -b .c99
-%patch -P105 -p1 -b .logical_op
 
 # 2013-08-05 F20 development, bz 992070: The configure scripts adds some
 # extra libs to the GnuTLS link options, which cause rebuilds to fail, since
@@ -86,9 +69,7 @@ cp -p %{_bindir}/libtool .
     --disable-static \
     --with-gnutls=yes \
     --with-openssl=no \
-%if 0%{?fedora} >= 41
     --with-poll=yes \
-%endif
     %{nil}
 
 %make_build
@@ -119,6 +100,9 @@ iconv -f iso8859-1 -t utf-8 ChangeLog > ChangeLog.conv && mv -f ChangeLog.conv C
 %{_libdir}/%{name}.so
 
 %changelog
+* Sun May 31 2026 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.10-1
+- 1.10
+
 * Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.4-19
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
 

diff --git a/sources b/sources
index d81c928..854bab7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libetpan-1.9.4.tar.gz) = 7b7047d084fb4ce0c91821c2ad78e921d6d009106851afb7f5b068713c84ebe6926f6bf7a7423f263eeebef617511e44f6b65448d892bbc058c447235fd55c0f
+SHA512 (libetpan-1.10.tar.gz) = 64e6d5c160700053833e626da3b63a69a83b98a7879b7d879e2c343dd84aade6791c6becbce48a9c30156ce42b0fda5d8c56d67573833390224650a9e9eed517