From b3e5bd23753bfb6b9d2ff100dff8652ccb72bbb2 Mon Sep 17 00:00:00 2001
From: Celeste <20312-Celeste@users.gitlab.alpinelinux.org>
Date: Mon, 6 Jan 2025 03:08:22 +0000
Subject: [PATCH] testing/mailutils: upgrade to 3.18

---
 testing/mailutils/APKBUILD              | 13 +++++++------
 testing/mailutils/format-security.patch | 20 ++++++++++++++++++++
 2 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100644 testing/mailutils/format-security.patch

diff --git a/testing/mailutils/APKBUILD b/testing/mailutils/APKBUILD
index c181c107753..1af7845c3aa 100644
--- a/testing/mailutils/APKBUILD
+++ b/testing/mailutils/APKBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Celeste <cielesti@protonmail.com>
 maintainer="Celeste <cielesti@protonmail.com>"
 pkgname=mailutils
-pkgver=3.17
-pkgrel=1
+pkgver=3.18
+pkgrel=0
 pkgdesc="GNU swiss army knife of electronic mail handling"
 url="https://mailutils.org/"
 arch="all"
@@ -26,6 +26,7 @@ subpackages="
 	"
 source="https://ftp.gnu.org/gnu/mailutils/mailutils-$pkgver.tar.xz
 	disable-koi8-r-test.patch
+	format-security.patch
 	"
 # they pretty much all pass, but the test suite takes an hour
 options="!check"
@@ -53,10 +54,9 @@ package() {
 	make DESTDIR="$pkgdir" install
 
 	cd "$pkgdir"
-	# rm usr/lib/charset.alias
 	# No need for these to be suid/sgid root.
-	chmod u-s usr/sbin/mda
-	chmod g-s usr/bin/dotlock
+	chmod -c u-s usr/sbin/mda
+	chmod -c g-s usr/bin/dotlock
 }
 
 libs() {
@@ -83,6 +83,7 @@ servers() {
 }
 
 sha512sums="
-e4080d9674444c3e077aa72f825a0373a4750d187a04a488449e89f6fec19d9309a118412e91745575eb90d05fa541f8d2626a8fd5e8ac10710aa1f7a0ff3193  mailutils-3.17.tar.xz
+77718e41d77556b59d7eeee4b80fca658c32f949dd87e09848a559eb6470254c9562208e49b62e5027522eebb5eaaf7eb9dc12ec02424f4144cceee5ef695ca9  mailutils-3.18.tar.xz
 fd628287a8b70b84e4fe477f3fed157308f1a0e803dfd65390d90a7ad40023155559b284e29ceb95dd3c854fce4e3a22a651d8de99b49db7c9d4b3682003cf2c  disable-koi8-r-test.patch
+4a73fd79d01efcf94dd3f6853afc796521f2867f977b0579a94a81bfc4671bac9173ee2747f6c1296a5a8b1877881036cc31e6c67929b2b7d9c692f05cb9d180  format-security.patch
 "
diff --git a/testing/mailutils/format-security.patch b/testing/mailutils/format-security.patch
new file mode 100644
index 00000000000..ef88f77e197
--- /dev/null
+++ b/testing/mailutils/format-security.patch
@@ -0,0 +1,20 @@
+--- a/libmailutils/diag/debug.c
++++ b/libmailutils/diag/debug.c
+@@ -511,7 +511,7 @@
+ 	{
+ 	  if (delim)
+ 	    {
+-	      rc = mu_stream_printf (str, delim);
++	      rc = mu_stream_printf (str, "%s", delim);
+ 	      if (rc)
+ 		break;
+ 	    }
+@@ -564,7 +564,7 @@
+ 	{
+ 	  if (delim)
+ 	    {
+-	      rc = mu_stream_printf (str, delim);
++	      rc = mu_stream_printf (str, "%s", delim);
+ 	      if (rc)
+ 		break;
+ 	    }