From ef65adf9a99962c28c87d514f747edf8a9a2c0e3 Mon Sep 17 00:00:00 2001
From: CrazyMax <1951866+crazy-max@users.noreply.github.com>
Date: Sat, 25 Nov 2023 22:36:17 +0100
Subject: [PATCH 1/4] update README

---
 README.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index d7a252b..4f395f4 100644
--- a/README.md
+++ b/README.md
@@ -149,9 +149,10 @@ docker compose up -d
 
 ## Contributing
 
-Want to contribute? Awesome! The most basic way to show your support is to star the project, or to raise issues. You
-can also support this project by [**becoming a sponsor on GitHub**](https://github.com/sponsors/crazy-max) or by making
-a [Paypal donation](https://www.paypal.me/crazyws) to ensure this journey continues indefinitely!
+Want to contribute? Awesome! The most basic way to show your support is to star
+the project, or to raise issues. You can also support this project by [**becoming a sponsor on GitHub**](https://github.com/sponsors/crazy-max)
+or by making a [PayPal donation](https://www.paypal.me/crazyws) to ensure this
+journey continues indefinitely!
 
 Thanks again for your support, it is much appreciated! :pray:
 

From a1c5ceb4a288ee44671750d1647416342c4b2f90 Mon Sep 17 00:00:00 2001
From: CrazyMax <1951866+crazy-max@users.noreply.github.com>
Date: Sat, 25 Nov 2023 22:37:14 +0100
Subject: [PATCH 2/4] msmtp 1.8.25

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 91fc0d3..ca8fe1f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG MSMTP_VERSION=1.8.23
+ARG MSMTP_VERSION=1.8.25
 ARG ALPINE_VERSION=3.17
 ARG XX_VERSION=1.2.1
 

From 3cc4a4978ea3101744fb346057dc7bbd460f1305 Mon Sep 17 00:00:00 2001
From: CrazyMax <1951866+crazy-max@users.noreply.github.com>
Date: Sat, 25 Nov 2023 22:37:29 +0100
Subject: [PATCH 3/4] Alpine Linux 3.18

---
 Dockerfile | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ca8fe1f..ce22f85 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,29 +1,28 @@
 # syntax=docker/dockerfile:1
 
 ARG MSMTP_VERSION=1.8.25
-ARG ALPINE_VERSION=3.17
+ARG ALPINE_VERSION=3.18
 ARG XX_VERSION=1.2.1
 
 FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
 FROM --platform=$BUILDPLATFORM alpine:${ALPINE_VERSION} AS base
 COPY --from=xx / /
-RUN apk --update --no-cache add clang curl file make pkgconf tar xz
+RUN apk --update --no-cache add clang curl file lld make musl-dev pkgconfig tar xz
 ARG MSMTP_VERSION
 WORKDIR /src
 RUN curl -sSL "https://marlam.de/msmtp/releases/msmtp-$MSMTP_VERSION.tar.xz" | tar xJv --strip 1
 
 FROM base AS builder
-ENV XX_CC_PREFER_LINKER=ld
 ARG TARGETPLATFORM
 RUN xx-apk --no-cache --no-scripts add g++ gettext-dev gnutls-dev libidn2-dev
 RUN <<EOT
-set -ex
-CXX=xx-clang++ ./configure --host=$(xx-clang --print-target-triple) --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-make -j$(nproc)
-make install
-xx-verify /usr/bin/msmtp
-xx-verify /usr/bin/msmtpd
-file /usr/bin/msmtpd
+  set -ex
+  CC=xx-clang CXX=xx-clang++ ./configure --host=$(xx-clang --print-target-triple) --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  make -j$(nproc)
+  make install
+  xx-verify /usr/bin/msmtp
+  xx-verify /usr/bin/msmtpd
+  file /usr/bin/msmtpd
 EOT
 
 FROM crazymax/alpine-s6:${ALPINE_VERSION}-2.2.0.3

From ae36bf9ac16d9b7a917fa63987050ddf0b0f1e44 Mon Sep 17 00:00:00 2001
From: CrazyMax <1951866+crazy-max@users.noreply.github.com>
Date: Sat, 25 Nov 2023 22:37:50 +0100
Subject: [PATCH 4/4] update xx to 1.3.0

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index ce22f85..c98247f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@
 
 ARG MSMTP_VERSION=1.8.25
 ARG ALPINE_VERSION=3.18
-ARG XX_VERSION=1.2.1
+ARG XX_VERSION=1.3.0
 
 FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
 FROM --platform=$BUILDPLATFORM alpine:${ALPINE_VERSION} AS base