1
0
forked from pool/mutt

Accepting request 1110464 from server:mail

- Update to mutt 2.2.12 (bsc#1215189 for CVE-2023-4874,
  bsc#1215191 for CVE-2023-4875)
  * 2.2.12 (2023-09-09):
    Bug fix release.
  * 2.2.11 (2023-08-18):
    Bug fix release.

OBS-URL: https://build.opensuse.org/request/show/1110464
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mutt?expand=0&rev=114
This commit is contained in:
Ana Guerrero 2023-09-12 19:03:47 +00:00 committed by Git OBS Bridge
commit 24c4c925e4
12 changed files with 40 additions and 30 deletions

View File

@ -7,7 +7,7 @@
--- configure.ac
+++ configure.ac 2020-01-14 13:04:28.102878757 +0000
@@ -297,7 +297,7 @@ main ()
@@ -299,7 +299,7 @@ main ()
mutt_cv_slang=$withval
if test -d $withval/include/slang; then
CPPFLAGS="$CPPFLAGS -I${withval}/include/slang"
@ -16,7 +16,7 @@
CPPFLAGS="$CPPFLAGS -I${withval}/include"
fi
LDFLAGS="$LDFLAGS -L${withval}/lib"
@@ -746,8 +746,12 @@ AC_ARG_WITH(ssl, AS_HELP_STRING([--with-
@@ -748,8 +748,12 @@ AC_ARG_WITH(ssl, AS_HELP_STRING([--with-
else
if test "$with_ssl" != "yes"
then
@ -31,7 +31,7 @@
fi
saved_LIBS="$LIBS"
@@ -834,8 +838,12 @@ AC_ARG_WITH(sasl, AS_HELP_STRING([--with
@@ -836,8 +840,12 @@ AC_ARG_WITH(sasl, AS_HELP_STRING([--with
if test "$with_sasl" != "yes"
then

View File

@ -6,7 +6,7 @@ Index: init.h
--- init.h
+++ init.h 2020-01-14 13:28:27.408149074 +0000
@@ -4845,6 +4845,7 @@ struct option_t MuttVars[] = {
@@ -4843,6 +4843,7 @@ struct option_t MuttVars[] = {
** Also see $$copy_decode_weed, $$pipe_decode_weed, $$print_decode_weed.
*/
{ "wrap", DT_NUM, R_PAGER_FLOW, {.p=&Wrap}, {.l=0} },

View File

@ -6,7 +6,7 @@
--- init.h
+++ init.h 2020-01-14 13:12:26.725982952 +0000
@@ -3482,6 +3482,13 @@ struct option_t MuttVars[] = {
@@ -3479,6 +3479,13 @@ struct option_t MuttVars[] = {
** .pp
** Also see the $$force_name variable.
*/
@ -22,7 +22,7 @@
** .pp
--- mutt.h
+++ mutt.h 2020-01-14 13:07:33.727426389 +0000
@@ -540,6 +540,7 @@ enum
@@ -539,6 +539,7 @@ enum
OPTSAVEADDRESS,
OPTSAVEEMPTY,
OPTSAVENAME,

View File

@ -8,7 +8,7 @@
--- crypt-gpgme.c
+++ crypt-gpgme.c 2019-11-13 13:46:16.512388398 +0000
@@ -2723,7 +2723,7 @@ static void copy_clearsigned (gpgme_data
@@ -2733,7 +2733,7 @@ static void copy_clearsigned (gpgme_data
if (armor_header)
{

View File

@ -73,7 +73,7 @@
{
--- mutt.h
+++ mutt.h 2020-01-14 13:28:45.787807571 +0000
@@ -1222,4 +1222,7 @@ typedef struct
@@ -1221,4 +1221,7 @@ typedef struct
#include "lib.h"
#include "globals.h"
@ -230,7 +230,7 @@
+}
--- sendlib.c
+++ sendlib.c 2020-01-14 13:28:45.787807571 +0000
@@ -2580,7 +2580,11 @@ send_msg (const char *path, char **args,
@@ -2589,7 +2589,11 @@ send_msg (const char *path, char **args,
if (SendmailWait >= 0 && tempfile && *tempfile)
{
/* *tempfile will be opened as stdout */

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4d773f22422f79096f7b94b57bee45654ad9a25165dbb36463c58295b4cd3d88
size 5530411

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEiXWpszqjeRA4XFMIre92hIAxa9oFAmQfVYAACgkQre92hIAx
a9p2zQ//Q2v9dKBtkKQiphLFDNOigZanJ/9E5nDavQ6ilGqfEekA7q7f2I24e4kl
V+9RSc83uSRdPdwjJM/wVoS04hKAISBrKhwkX7PhHDczmH8ZI9k+8v7aJsA/RZtE
R0yFA1TQZ5oPHUOTI3T95vx2c5vxRNtXXX2js5AScowHa6ArI5kjTpFnYW0J2Wl4
PzK01sDFqqmANDJA/FV5ajGa/kLGkdU2KyNMsgBFZ12YpFRzdktRGRab2aGIuQ/h
AFbXSx8bfY9o7dsUnQA/9rQUfsHpuzwZx/yZlOn9qdw+nXmlyCOBxW/AxwfH6vl4
C4XM053xqjwvWKCBxNa6OglNKYNeSRUdW6xEsaRYpEbeotWGRlKN1GNJatCOkjUO
74EdheOG+WyUoTh9iUpjzGWF8R5RCnWQf/ym9RtABGqB95N1Xqlc+jkoG7Sgtz+R
ehHSH3WGS9nk6Pt5aja6+CerVQNChvQbiWij+vW+s16Qb3TmIrGyqTCbrkk7kGFG
2aE4icY3Av7sZLrLlQ5lUMcN9yye8ELmeUxCOuV9Mw1XAOwiJn2wE2QEeNEobg0v
POXtKWHiMzgbSz7rhSD6WwzzGBHn/rwijZVup8EMUXZFipigZ6gq8GnbW212ycKC
nFp8u657Rvq2wQuvCZcFVJMvzFH4r0sGqMXbgMnSrjVTE5WtFng=
=yEAn
-----END PGP SIGNATURE-----

3
mutt-2.2.12.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:043af312f64b8e56f7fd0bf77f84a205d4c498030bd9586457665c47bb18ce38
size 5539244

16
mutt-2.2.12.tar.gz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEiXWpszqjeRA4XFMIre92hIAxa9oFAmT8FT4ACgkQre92hIAx
a9rGRhAAg9fykZbbqZuf4uaFFnZxZHwokmENO9U2wxDulT/wi5l1SlnNeN5IbFQp
vU0k5aIij9rKaAwYWwY9+Josm7S1TPdmMb6AQaZXvwiv1K1ZftdP8dRtt1VWgZGy
kGkj6JEmkCHQmoPZuiP5zCu+dBoot1JaBuCsa2E/jH1hIA7XqafBxhel4/MXUGK5
LduH9NlRm9gCgqo5bnkCudSVYBKhjuJJ+4lijz7fhnld+OUhTPnOmzTywUWei+M0
OcvT63glhGiPVGxOV9UB4lS8Q37caISXbxhG6IxZC/e/xnbQ7k2+d2Bem3XcXAjZ
t2uinUurWzE1lwW6I61YdSFq93nTBicH7zsR/0QL/EPFonmxPLqAVhCPWYU72ApI
7jZZ0PyjvmwxkmKH9i5TOAP7FGbr7w/eM3At6io4q1Bw0ZDa4NlDPyEm31MxyD6K
PbSkwpVLS92g8a6WyFUmBd6NIgpwAfCVx2f0rKOGKuXGtoKebR0/MoZBRzHtCCo2
grkEopsQzjwupHse9l6FGZOwwIzVn8Snaqs5WQsOHAmIBhJ5HDj4dVtQIkdctZ0e
OOzt3jadJ1ckw7x+UGh3o25ekOWbjixSMZp6sFP4str6aybS0fsTjQX6/A4LoDCo
d+Cn09SPMVxhGHzAfJ7gf847iFvjXD3t+O0mum+fKPOsrxSmtlU=
=deR9
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Tue Sep 12 07:15:52 UTC 2023 - Dr. Werner Fink <werner@suse.de>
- Update to mutt 2.2.12 (bsc#1215189 for CVE-2023-4874,
bsc#1215191 for CVE-2023-4875)
* 2.2.12 (2023-09-09):
Bug fix release.
* 2.2.11 (2023-08-18):
Bug fix release.
-------------------------------------------------------------------
Mon Apr 17 06:49:36 UTC 2023 - Dr. Werner Fink <werner@suse.de>

View File

@ -20,7 +20,7 @@
%bcond_with mutt_openssl
%bcond_without mutt_gnutls
Name: mutt
Version: 2.2.10
Version: 2.2.12
Release: 0
Summary: Mail Program
# ftp://ftp.mutt.org/mutt/devel/

View File

@ -17,7 +17,7 @@
WHERE char *PgpVerifyCommand;
--- init.h
+++ init.h 2020-01-14 13:41:15.145875625 +0000
@@ -3872,9 +3872,18 @@ struct option_t MuttVars[] = {
@@ -3869,9 +3869,18 @@ struct option_t MuttVars[] = {
** a line quoted text if it also matches $$smileys. This mostly
** happens at the beginning of a line.
*/