Stop adding BCC lines to subject

Resolves: RHEL-110823

s-nail-bcc-in-subject.patch

@@ -0,0 +1,54 @@
+From c3ef40c2b63ad7785571802c4100581ebf228a1f Mon Sep 17 00:00:00 2001
+From: Steffen Nurpmeso <steffen@sdaoden.eu>
+Date: Thu, 4 Nov 2021 20:24:30 +0100
+Subject: [PATCH] a_sendout_transfer(): FIX *mta-bcc-ok* logic on follow lines!
+ (Andreas Teuber)
+
+---
+ src/mx/sendout.c | 22 ++++++++++++++--------
+ 1 file changed, 14 insertions(+), 8 deletions(-)
+
+diff --git a/src/mx/sendout.c b/src/mx/sendout.c
+index 71a62ef89d..d83edb777d 100644
+--- a/src/mx/sendout.c
++++ b/src/mx/sendout.c
+@@ -1362,7 +1362,7 @@ a_sendout_transfer(struct sendbundle *sbp, boole resent, boole *senderror){
+    input_save = sbp->sb_input;
+    if((resent || (sbp->sb_hp != NIL && sbp->sb_hp->h_bcc != NIL)) &&
+          !ok_blook(mta_bcc_ok)){
+-      boole inhdr;
++      boole inhdr, inskip;
+       uz bufsize, bcnt, llen;
+       char *buf;
+       FILE *fp;
+@@ -1379,17 +1379,23 @@ a_sendout_transfer(struct sendbundle *sbp, boole resent, boole *senderror){
+       mx_fs_linepool_aquire(&buf, &bufsize);
+       bcnt = fsize(input_save);
+       inhdr = TRU1;
++      inskip = FAL0;
+       while(fgetline(&buf, &bufsize, &bcnt, &llen, input_save, TRU1) != NIL){
+          if(inhdr){
+             if(llen == 1 && *buf == '\n')
+                inhdr = FAL0;
+-            /* (We need _case for resent only) */
+-            else if(su_cs_starts_with_case(buf, "bcc:"))
+-               continue;
+-            /* We yet do not generate that, but place the logic today */
+-            else if(resent && su_cs_starts_with_case(buf, "resent-bcc:"))
+-               continue;
+-
++            else{
++               if(inskip && *buf == ' ')
++                  continue;
++               inskip = FAL0;
++               /* (We need _case for resent only);
++                * xxx We do not resent that yet , but place the logic today */
++               if(su_cs_starts_with_case(buf, "bcc:") ||
++                     (resent && su_cs_starts_with_case(buf, "resent-bcc:"))){
++                  inskip = TRU1;
++                  continue;
++               }
++            }
+          }
+          if(fwrite(buf, 1, llen, fp) != llen)
+             goto jewritebcc;

s-nail.spec

@@ -1,6 +1,6 @@
 Name:           s-nail
 Version:        14.9.22
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Environment for sending and receiving mail
 
 # Everything is ISC except parts coming from the original Heirloom mailx which are BSD
@@ -13,6 +13,8 @@ Source2:        steffen.asc
 
 # rhbz#2103212
 Patch0:		s-nail-testsuite.patch
+# upstream commit https://github.com/sdaoden/s-mailx/commit/c3ef40c2b63ad7785571802c4100581ebf228a1f.patch
+Patch1:		s-nail-bcc-in-subject.patch
 
 BuildRequires: make
 BuildRequires:  gnupg2
@@ -140,6 +142,10 @@ fi
 
 
 %changelog
+* Wed Oct 29 2025 Tomas Korbar <tkorbar@redhat.com> - 14.9.22-9
+- Stop adding BCC lines to subject
+- Resolves: RHEL-110823
+
 * Mon Aug 29 2022 Tomas Korbar <tkorbar@redhat.com> - 14.9.22-8
 - Fix CI configuration
 - Related: rhbz#2103212