diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2019-08-15 19:30:06 +0200 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2019-08-15 19:49:25 +0200 |
| commit | bebc6a749717ed42496e4f5dcf65a6096fdca32b (patch) | |
| tree | dcda8afbe8e137abe218c8bb402945fc3bf991f3 | |
| parent | 900ea77e7a09bb9f78e5e10f128bd264be5b50a7 (diff) | |
main/opensmtpd: upgrade to 6.4.2p1 and switch to libressl
OpenSMTPD completely dropped support of OpenSSL in favour of LibreSSL.
See https://poolp.org/posts/2018-11-03/opensmtpd-released-and-upcoming-filters-preview/
| -rw-r--r-- | main/opensmtpd/APKBUILD | 20 | ||||
| -rw-r--r-- | main/opensmtpd/smtpd.conf.patch | 19 |
2 files changed, 27 insertions, 12 deletions
diff --git a/main/opensmtpd/APKBUILD b/main/opensmtpd/APKBUILD index 3d8d8ccfe70..dd94444eab0 100644 --- a/main/opensmtpd/APKBUILD +++ b/main/opensmtpd/APKBUILD @@ -3,23 +3,22 @@ # Contributor: Shiz <hi@shiz.me> # Maintainer: Jonathan Curran <jonathan@curran.in> pkgname=opensmtpd -pkgver=6.0.3p1 -pkgrel=4 -pkgdesc="secure, reliable, lean, and easy-to configure SMTP server" +pkgver=6.4.2p1 +pkgrel=0 +pkgdesc="Secure, reliable, lean, and easy-to configure SMTP server" url="http://www.opensmtpd.org" arch="all" license="ISC" -depends="!postfix" +depends="!postfix ca-certificates" makedepends="automake autoconf libtool mdocml db-dev libasr-dev libevent-dev - fts-dev zlib-dev openssl-dev bison flex-dev" + fts-dev zlib-dev libressl-dev bison flex-dev" install="$pkgname.pre-install" subpackages="$pkgname-doc" source="https://www.opensmtpd.org/archives/$pkgname-$pkgver.tar.gz smtpd.initd aliases autoconf-decl-checks.patch - fix-segfault-in-crypt_checkpass.patch - openssl-1.1.patch + smtpd.conf.patch " options="suid !check" @@ -47,8 +46,6 @@ build() { package() { make DESTDIR="$pkgdir" -C "$builddir" install - sed -i 's#/etc/mail#/etc/smtpd#g' "$pkgdir"/etc/smtpd/smtpd.conf - install -Dm755 "$srcdir"/smtpd.initd "$pkgdir"/etc/init.d/smtpd install -Dm644 "$srcdir"/aliases "$pkgdir"/etc/smtpd/aliases @@ -59,9 +56,8 @@ package() { rmdir "$pkgdir"/usr/bin } -sha512sums="e579818a0ddbe637deb5a4e40f43eaf797783903ceac18fd89a57581b135b9e407d424e1a70ff7b4b06a0ee50bafb6e8ab2451371917887904b06ff1b55d320f opensmtpd-6.0.3p1.tar.gz +sha512sums="45b071523a46c441fd436acee44ea841a88ebe93f6b76284ef948fc97535cf73a2962b9a030bffa288227ab8ef90944755748d0036f919df9493d562c1afb694 opensmtpd-6.4.2p1.tar.gz a53c9854f71e55011566d3c96ce6321e11d00706c4180eb8ec4358b38c97d63cb7fcf3bb3c0b69365a8568a385bdb3ec1bc700d5f4463f8d6695a3d46b283c1d smtpd.initd 51d47b34eb3d728daa45f29d6434cc75db28dfa69b6fb3ecd873121df85b296a2d2c81016d765a07778aa26a496e4b29c09a30b82678cf42596a536734b5deca aliases 37104cc605569f142ceffa902f200e8a7e9e1114ebe5394ed1eac0ed6ce25454e1610270921c45246de8396eee04b7c8ab5a112a231036a6ef14e7e229b264e3 autoconf-decl-checks.patch -cd6b60e478703890af1112d93c2d2ac0c87c5ad394d91a7903ca11532c4d2c8763330a8c20ef9b8d5a79632760faee5ee1437a43d37d1727aef2e1431d1d030c fix-segfault-in-crypt_checkpass.patch -fb5a07cac0b07806d9fa2b5ac87e004da9f0d894cd00526b703fdfd23c94499d2464ae383ba65891232e9a4f2a582af1d6285c5ceb2cca61bbfbec6344cdc46b openssl-1.1.patch" +14ff3d4f56aee3a31551ea535c4a5bf9b760f0f11bc269225d7b176d5031294716133cbf4555a92e76cc6e33de89454435562672ddaf1ab365e61085eb1e4d53 smtpd.conf.patch" diff --git a/main/opensmtpd/smtpd.conf.patch b/main/opensmtpd/smtpd.conf.patch new file mode 100644 index 00000000000..aa5e4b86358 --- /dev/null +++ b/main/opensmtpd/smtpd.conf.patch @@ -0,0 +1,19 @@ +"listen on localhost" and "listen on all" doesn't work on Linux + +--- a/smtpd/smtpd.conf ++++ b/smtpd/smtpd.conf +@@ -3,11 +3,11 @@ + # This is the smtpd server system-wide configuration file. + # See smtpd.conf(5) for more information. + +-table aliases file:/etc/mail/aliases ++table aliases file:/etc/smtpd/aliases + +-# To accept external mail, replace with: listen on all ++# To accept external mail, add something like: listen on eth0 + # +-listen on localhost ++listen on lo + + action "local" mbox alias <aliases> + action "relay" relay |