diff options
| author | Valery Kartel <valery.kartel@gmail.com> | 2018-06-17 14:27:12 +0300 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-06-19 10:05:30 +0000 |
| commit | 0f0d36a1d0940a200f7c5cae3622aaad9d1c02a8 (patch) | |
| tree | 7c17b4ecff3f103a678cec30bf0ec8c086ceb677 | |
| parent | 2e92fb26cb2f88314844744ceec8488ad9976cfe (diff) | |
| download | alpine_aports-0f0d36a1d0940a200f7c5cae3622aaad9d1c02a8.tar.bz2 alpine_aports-0f0d36a1d0940a200f7c5cae3622aaad9d1c02a8.tar.xz alpine_aports-0f0d36a1d0940a200f7c5cae3622aaad9d1c02a8.zip | |
community/exim: fix hardcoded bounce_message charset
change hardcoded charset from 'us-ascii' to 'utf-8' to be able to create
multilingual bounce messages.
| -rw-r--r-- | community/exim/APKBUILD | 4 | ||||
| -rw-r--r-- | community/exim/bounce-charset.patch | 29 |
2 files changed, 32 insertions, 1 deletions
diff --git a/community/exim/APKBUILD b/community/exim/APKBUILD index 818bdb1275..216f7abcdc 100644 --- a/community/exim/APKBUILD +++ b/community/exim/APKBUILD | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | # Maintainer: Jesse Young <jlyo@jlyo.org> | 6 | # Maintainer: Jesse Young <jlyo@jlyo.org> |
| 7 | pkgname=exim | 7 | pkgname=exim |
| 8 | pkgver=4.91 | 8 | pkgver=4.91 |
| 9 | pkgrel=0 | 9 | pkgrel=1 |
| 10 | pkgdesc="Message Transfer Agent" | 10 | pkgdesc="Message Transfer Agent" |
| 11 | url="http://www.exim.org" | 11 | url="http://www.exim.org" |
| 12 | arch="all" | 12 | arch="all" |
| @@ -21,6 +21,7 @@ install="exim.pre-install" | |||
| 21 | subpackages="$pkgname-cdb $pkgname-dbmdb $pkgname-dnsdb $pkgname-sqlite $pkgname-mysql $pkgname-postgresql | 21 | subpackages="$pkgname-cdb $pkgname-dbmdb $pkgname-dnsdb $pkgname-sqlite $pkgname-mysql $pkgname-postgresql |
| 22 | $pkgname-utils $pkgname-scripts::noarch $pkgname-doc" | 22 | $pkgname-utils $pkgname-scripts::noarch $pkgname-doc" |
| 23 | source="https://ftp.exim.org/pub/exim/exim4/$pkgname-$pkgver.tar.xz | 23 | source="https://ftp.exim.org/pub/exim/exim4/$pkgname-$pkgver.tar.xz |
| 24 | bounce-charset.patch | ||
| 24 | exim.Makefile | 25 | exim.Makefile |
| 25 | exim.confd | 26 | exim.confd |
| 26 | exim.initd | 27 | exim.initd |
| @@ -115,6 +116,7 @@ dbmdb() { _mv_ext dbmdb; } | |||
| 115 | dnsdb() { _mv_ext dnsdb; } | 116 | dnsdb() { _mv_ext dnsdb; } |
| 116 | 117 | ||
| 117 | sha512sums="35b34dda8dd0f27c0429e6eb8409756ecd3cf9e535bac421d696b1560db0ff3bf4cd0e4a00bc0b7e32137d31bb5de20776c7c1830ec125aa36b5c4376b0c71a2 exim-4.91.tar.xz | 118 | sha512sums="35b34dda8dd0f27c0429e6eb8409756ecd3cf9e535bac421d696b1560db0ff3bf4cd0e4a00bc0b7e32137d31bb5de20776c7c1830ec125aa36b5c4376b0c71a2 exim-4.91.tar.xz |
| 119 | 517447ac989a8de27cca74d544bdbeed6667442d1a229efaaef0a2b2878afb754602ece7c5e9983778224cc052f6d38209a65ef95712a16309d7b72c0e277fa8 bounce-charset.patch | ||
| 118 | e9524d3a2cc230b4ecb3b098f53247121b9582fc7807b1549c5a3fd54bb416b837c4e09476f2e01dca03d590a968c40bf90d4b6a9f8a4abad082fdec91916a0f exim.Makefile | 120 | e9524d3a2cc230b4ecb3b098f53247121b9582fc7807b1549c5a3fd54bb416b837c4e09476f2e01dca03d590a968c40bf90d4b6a9f8a4abad082fdec91916a0f exim.Makefile |
| 119 | bb6f5ead067af19ace661cc92bcd428da97570aedd1f9dc5b61a34e7e3fb3e028be6c96d51df73353bdfcaf69a3ee053fb03d245f868d63ebf518aa96ec82d66 exim.confd | 121 | bb6f5ead067af19ace661cc92bcd428da97570aedd1f9dc5b61a34e7e3fb3e028be6c96d51df73353bdfcaf69a3ee053fb03d245f868d63ebf518aa96ec82d66 exim.confd |
| 120 | 3769e74a54566362bcdf57c45fbf7d130d7a7529fbc40befce431eef0387df117c71a5b57779c507e30d5b125913b5f26c9d16b17995521a1d94997be6dc3e02 exim.initd | 122 | 3769e74a54566362bcdf57c45fbf7d130d7a7529fbc40befce431eef0387df117c71a5b57779c507e30d5b125913b5f26c9d16b17995521a1d94997be6dc3e02 exim.initd |
diff --git a/community/exim/bounce-charset.patch b/community/exim/bounce-charset.patch new file mode 100644 index 0000000000..ce4be0324b --- /dev/null +++ b/community/exim/bounce-charset.patch | |||
| @@ -0,0 +1,29 @@ | |||
| 1 | --- a/src/deliver.c 2018-04-15 02:18:10.000000000 +0300 | ||
| 2 | +++ b/src/deliver.c 2018-06-15 14:01:58.196926447 +0300 | ||
| 3 | @@ -7291,7 +7291,7 @@ | ||
| 4 | "MIME-Version: 1.0\n\n" | ||
| 5 | |||
| 6 | "--%s\n" | ||
| 7 | - "Content-type: text/plain; charset=us-ascii\n\n" | ||
| 8 | + "Content-type: text/plain; charset=utf-8\n\n" | ||
| 9 | |||
| 10 | "This message was created automatically by mail delivery software.\n" | ||
| 11 | " ----- The following addresses had successful delivery notifications -----\n", | ||
| 12 | @@ -7560,7 +7560,7 @@ | ||
| 13 | |||
| 14 | /* output human readable part as text/plain section */ | ||
| 15 | fprintf(f, "--%s\n" | ||
| 16 | - "Content-type: text/plain; charset=us-ascii\n\n", | ||
| 17 | + "Content-type: text/plain; charset=utf-8\n\n", | ||
| 18 | bound); | ||
| 19 | |||
| 20 | if ((emf_text = next_emf(emf, US"intro"))) | ||
| 21 | @@ -8163,7 +8163,7 @@ | ||
| 22 | |||
| 23 | /* output human readable part as text/plain section */ | ||
| 24 | fprintf(f, "--%s\n" | ||
| 25 | - "Content-type: text/plain; charset=us-ascii\n\n", | ||
| 26 | + "Content-type: text/plain; charset=utf-8\n\n", | ||
| 27 | bound); | ||
| 28 | |||
| 29 | if ((wmf_text = next_emf(wmf, US"intro"))) | ||