From 63f0077bd2e714acf3df4f7be8148e751f916e26 Mon Sep 17 00:00:00 2001
From: freswa <freswa@9fca08f4-af9d-4005-b8df-a31f2cc04f65>
Date: Sat, 23 Oct 2021 14:24:04 +0000
Subject: [PATCH] fix use after free

Credits @diabonas
https://github.com/neomutt/neomutt/pull/3090


git-svn-id: file:///srv/repos/svn-community/svn@1032960 9fca08f4-af9d-4005-b8df-a31f2cc04f65
---
 neomutt/trunk/PKGBUILD | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/neomutt/trunk/PKGBUILD b/neomutt/trunk/PKGBUILD
index 8181269ffc70..297ecf96be8c 100644
--- a/neomutt/trunk/PKGBUILD
+++ b/neomutt/trunk/PKGBUILD
@@ -6,7 +6,7 @@
 # Contributor: Leonidas Spyropoulos <artafinde@gmail.com>
 pkgname=neomutt
 pkgver=20211022
-pkgrel=1
+pkgrel=2
 pkgdesc='A version of mutt with added features'
 url='https://neomutt.org/'
 license=('GPL')
@@ -21,15 +21,20 @@ makedepends=('git' 'gnupg' 'libxslt' 'docbook-xsl' 'w3m')
 _github='https://github.com/neomutt/neomutt'
 source=("$pkgname-$pkgver.tar.gz::$_github/archive/$pkgver.tar.gz"
         "$pkgname-$pkgver.tar.gz.sig::$_github/releases/download/$pkgver/$pkgver.tar.gz.sig"
-        "default-ca-certificates.patch")
+        "default-ca-certificates.patch"
+        "neomutt-20211022_fix-fs-72525.patch::$_github/commit/a4a02a4afde1ec38dbbcfd6c4015634ca5d96138.patch")
 sha256sums=('49aa5029665c6819e708276b9efa1ca71ec5afe870eb9f08e656107d234941e6'
             'SKIP'
-            '571716b8979e9b43328416c3c56eff228b6c58355d7c080b8987ea89c6360776')
+            '571716b8979e9b43328416c3c56eff228b6c58355d7c080b8987ea89c6360776'
+            '14bc9137451c4fa4248ce28a4c809689d66ae8d99c52ce22bf031c837956c70a')
 validpgpkeys=('86C2397270DD7A561263CA4E5FAF0A6EE7371805') # Richard Russon (flatcap) <rich@flatcap.org>
 
 prepare() {
     cd "$pkgname-$pkgver"
     patch -Np1 -i "$srcdir/default-ca-certificates.patch"
+
+    # Fix crash when composing emails with PGP enabled (FS#72525, https://github.com/neomutt/neomutt/pull/3090)
+    patch -Np1 -i "$srcdir/neomutt-20211022_fix-fs-72525.patch"
 }
 
 build() {