From: Paul Bredbury <brebs@sent.com>
To: alpine-aports@lists.alpinelinux.org
Cc: Paul Bredbury <brebs@sent.com>
Subject: [alpine-aports] [PATCH] community/exim: upgrade to 4.92
Date: Sun, 10 Feb 2019 20:27:09 +0000
Message-Id: <20190210202709.20635-1-brebs@sent.com>
Precedence: list
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Replaced bounce-charset.patch with a sed command, for compatibility with this version.
---
 community/exim/APKBUILD             | 10 +++++-----
 community/exim/bounce-charset.patch | 29 -----------------------------
 2 files changed, 5 insertions(+), 34 deletions(-)
 delete mode 100644 community/exim/bounce-charset.patch

diff --git a/community/exim/APKBUILD b/community/exim/APKBUILD
index 5e0e13e39b..899080f6c4 100644
--- a/community/exim/APKBUILD
+++ b/community/exim/APKBUILD
@@ -5,8 +5,8 @@
 # Contributor: Jesse Young <jlyo@jlyo.org>
 # Maintainer: Jesse Young <jlyo@jlyo.org>
 pkgname=exim
-pkgver=4.91
-pkgrel=3
+pkgver=4.92
+pkgrel=0
 pkgdesc="Message Transfer Agent"
 url="https://www.exim.org"
 arch="all"
@@ -21,7 +21,6 @@ install="exim.pre-install"
 subpackages="$pkgname-cdb $pkgname-dbmdb $pkgname-dnsdb $pkgname-sqlite $pkgname-mysql $pkgname-postgresql
 	$pkgname-utils $pkgname-scripts::noarch $pkgname-doc $pkgname-openrc"
 source="https://ftp.exim.org/pub/exim/exim4/$pkgname-$pkgver.tar.xz
-	bounce-charset.patch
 	exim.Makefile
 	exim.confd
 	exim.initd
@@ -49,6 +48,8 @@ prepare() {
 		-e 's/-lnsl//g' \
 		-e 's/^HAVE_ICONV.*$//' \
 		OS/Makefile-Linux
+
+	sed -i -e "s/charset=us-ascii/charset=utf-8/g" src/deliver.c
 }
 
 build() {
@@ -115,8 +116,7 @@ cdb() { _mv_ext cdb; }
 dbmdb() { _mv_ext dbmdb; }
 dnsdb() { _mv_ext dnsdb; }
 
-sha512sums="35b34dda8dd0f27c0429e6eb8409756ecd3cf9e535bac421d696b1560db0ff3bf4cd0e4a00bc0b7e32137d31bb5de20776c7c1830ec125aa36b5c4376b0c71a2  exim-4.91.tar.xz
-517447ac989a8de27cca74d544bdbeed6667442d1a229efaaef0a2b2878afb754602ece7c5e9983778224cc052f6d38209a65ef95712a16309d7b72c0e277fa8  bounce-charset.patch
+sha512sums="62c327e6184a358ba7f0dbc38b44d2537234be91727a5bfac97e74af64a8d77e376b3221dcfdd8f6eca7d812f9233595503dc6e50e2972bed40a1b74eb209c31  exim-4.92.tar.xz
 f764a09ac7b6dfa34a5cd8bf5ad8b5fea355ac3b21a14f7218c84804bce420c6212cbebd2811fa40b0034dba626f0c9b293de77dbd634432edd31b237003515e  exim.Makefile
 bb6f5ead067af19ace661cc92bcd428da97570aedd1f9dc5b61a34e7e3fb3e028be6c96d51df73353bdfcaf69a3ee053fb03d245f868d63ebf518aa96ec82d66  exim.confd
 3769e74a54566362bcdf57c45fbf7d130d7a7529fbc40befce431eef0387df117c71a5b57779c507e30d5b125913b5f26c9d16b17995521a1d94997be6dc3e02  exim.initd
diff --git a/community/exim/bounce-charset.patch b/community/exim/bounce-charset.patch
deleted file mode 100644
index ce4be0324b..0000000000
--- a/community/exim/bounce-charset.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/src/deliver.c	2018-04-15 02:18:10.000000000 +0300
-+++ b/src/deliver.c	2018-06-15 14:01:58.196926447 +0300
-@@ -7291,7 +7291,7 @@
- 	"MIME-Version: 1.0\n\n"
- 
- 	"--%s\n"
--	"Content-type: text/plain; charset=us-ascii\n\n"
-+	"Content-type: text/plain; charset=utf-8\n\n"
- 
- 	"This message was created automatically by mail delivery software.\n"
- 	" ----- The following addresses had successful delivery notifications -----\n",
-@@ -7560,7 +7560,7 @@
- 
-       /* output human readable part as text/plain section */
-       fprintf(f, "--%s\n"
--	  "Content-type: text/plain; charset=us-ascii\n\n",
-+	  "Content-type: text/plain; charset=utf-8\n\n",
- 	bound);
- 
-       if ((emf_text = next_emf(emf, US"intro")))
-@@ -8163,7 +8163,7 @@
- 
-         /* output human readable part as text/plain section */
-         fprintf(f, "--%s\n"
--	    "Content-type: text/plain; charset=us-ascii\n\n",
-+	    "Content-type: text/plain; charset=utf-8\n\n",
- 	  bound);
- 
-         if ((wmf_text = next_emf(wmf, US"intro")))
-- 
2.20.1



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---