From c7463dd3f6857af03af871bea754535feb0af3e6 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Sun, 15 Jan 2023 19:39:25 +0000 Subject: user/netqmail: support STARTTLS, manage conflict with ssmtp --- user/netqmail/APKBUILD | 73 +++++++++++++++++++++++++++----------------------- 1 file changed, 39 insertions(+), 34 deletions(-) (limited to 'user/netqmail/APKBUILD') diff --git a/user/netqmail/APKBUILD b/user/netqmail/APKBUILD index 9be7d7c68..a450db304 100644 --- a/user/netqmail/APKBUILD +++ b/user/netqmail/APKBUILD @@ -2,17 +2,17 @@ # Maintainer: Laurent Bercot pkgname=netqmail pkgver=1.06 -pkgrel=7 +pkgrel=8 pkgdesc="The qmail mail transfer agent (community version)" url="http://www.netqmail.org/" arch="all" license="Public-Domain" options="suid !check" # suid programs (qmail-queue); no test suite -depends="execline s6 s6-networking" +depends="execline s6 s6-networking smtpd-starttls-proxy ca-certificates !ssmtp" makedepends="groff utmps-dev" subpackages="$pkgname-doc $pkgname-openrc" provider_priority=1 -provides="sendmail" +provides=/usr/sbin/sendmail install="$pkgname.post-install $pkgname.pre-deinstall" source="http://www.netqmail.org/$pkgname-$pkgver.tar.gz 0001-DESTDIR.patch @@ -22,7 +22,7 @@ source="http://www.netqmail.org/$pkgname-$pkgver.tar.gz 0005-CVE-2005-1513.patch qmail.run smtpd.run - smtpsd.run + smtpd-notls.run $pkgname.confd $pkgname.initd" @@ -30,13 +30,13 @@ makeservicedir() { mkdir -p -m 0755 "$1"/log "$1"/env { - echo '#!/bin/execlineb -P' - echo - echo 's6-setuidgid qmaill' - echo 's6-envdir ../env' - echo 'importas -u IP IP' - echo 'exec -c' - echo "s6-log t $4" + echo '#!/bin/execlineb -P' + echo + echo 's6-setuidgid qmaill' + echo 's6-envdir ../env' + echo 'importas -u IP IP' + echo 'exec -c' + echo "s6-log t $4" } > "$1"/log/run echo "$2" > "$1"/notification-fd cp -f "$3" "$1"/run @@ -47,21 +47,26 @@ makeservicedir() mkfifo -m 0600 "$1"/supervise/control dd if=/dev/zero of="$1"/supervise/status bs=35 count=1 if test $5 -eq 0 ; then - echo /var/qmail/bin:/usr/bin:/usr/sbin:/bin:/sbin > "$1"/env/PATH - echo "$2" > "$1"/env/QMAIL_NOTIFY_FD + echo /var/qmail/bin:/usr/bin:/usr/sbin:/bin:/sbin > "$1"/env/PATH + echo "$2" > "$1"/env/QMAIL_NOTIFY_FD else - echo 110 > "$1"/env/UID - echo 200 > "$1"/env/GID - echo > "$1"/env/GIDLIST - if test $5 -eq 6 ; then - mkdir -p -m 0755 "$1"/data/rules/ip6/::_0 - touch "$1"/data/rules/ip6/::_0/allow - sed -i -e 's/s6-tcpserver /s6-tcpserver6 /' "$1"/run - elif test $5 -eq 4 ; then - mkdir -p -m 0755 "$1"/data/rules/ip4/0.0.0.0_0 - touch "$1"/data/rules/ip4/0.0.0.0_0/allow - sed -i -e 's/s6-tcpserver /s6-tcpserver4 /' "$1"/run - fi + echo 110 > "$1"/env/UID + echo 200 > "$1"/env/GID + echo > "$1"/env/GIDLIST + if "$6" ; then + echo 116 > "$1"/env/TLS_UID + echo 200 > "$1"/env/TLS_GID + echo /etc/ssl/certs > "$1"/env/CADIR + fi + if test $5 -eq 6 ; then + mkdir -p -m 0755 "$1"/data/rules/ip6/::_0 + touch "$1"/data/rules/ip6/::_0/allow + sed -i -e 's/s6-tcpserver /s6-tcpserver6 /' "$1"/run + elif test $5 -eq 4 ; then + mkdir -p -m 0755 "$1"/data/rules/ip4/0.0.0.0_0 + touch "$1"/data/rules/ip4/0.0.0.0_0/allow + sed -i -e 's/s6-tcpserver /s6-tcpserver4 /' "$1"/run + fi fi chmod 0755 "$1"/run "$1"/log/run } @@ -95,11 +100,11 @@ package() { mv -f "$pkgdir"/var/qmail/doc "$pkgdir/usr/share/doc/$pkgname-$pkgver" echo 255 > "$pkgdir"/var/qmail/control/concurrencylocal echo 255 > "$pkgdir"/var/qmail/control/concurrencyremote - makeservicedir "$pkgdir"/var/qmail/services/qmail 7 "$srcdir"/qmail.run 'n20 s1000000 /var/log/qmail' 0 - makeservicedir "$pkgdir"/etc/qmail/services/smtpd4-skeleton 3 "$srcdir"/smtpd.run '/var/log/smtpd-$IP' 4 - makeservicedir "$pkgdir"/etc/qmail/services/smtpd6-skeleton 3 "$srcdir"/smtpd.run '/var/log/smtpd-$IP' 6 - makeservicedir "$pkgdir"/etc/qmail/services/smtpsd4-skeleton 3 "$srcdir"/smtpsd.run '/var/log/smtpsd-$IP' 4 - makeservicedir "$pkgdir"/etc/qmail/services/smtpsd6-skeleton 3 "$srcdir"/smtpsd.run '/var/log/smtpsd-$IP' 6 + makeservicedir "$pkgdir"/var/qmail/services/qmail 7 "$srcdir"/qmail.run 'n20 s1000000 /var/log/qmail' 0 false + makeservicedir "$pkgdir"/etc/qmail/services/smtpd4-skeleton 3 "$srcdir"/smtpd.run '/var/log/smtpd-$IP' 4 true + makeservicedir "$pkgdir"/etc/qmail/services/smtpd6-skeleton 3 "$srcdir"/smtpd.run '/var/log/smtpd-$IP' 6 true + makeservicedir "$pkgdir"/etc/qmail/services/smtpd4-skeleton-notls 3 "$srcdir"/smtpd-notls.run '/var/log/smtpd-$IP' 4 false + makeservicedir "$pkgdir"/etc/qmail/services/smtpd6-skeleton-notls 3 "$srcdir"/smtpd-notls.run '/var/log/smtpd-$IP' 6 false } sha512sums="de40a6d8fac502bd785010434d99b99f2c0524e10aea3d0f2a0d35c70fce91e991eb1fb8f20a1276eb56d7e73130ea5e2c178f6075d138af47b28d9ca6e6046b netqmail-1.06.tar.gz @@ -109,7 +114,7 @@ cbebdc72c7cc5c437531c9277534ae552c6d044a83b36e3f3ce60ab5563c55eb814d6c543cc0997a b32a8a36c8ab8872abd4f1a117482f064a6d631a6bb2ba75cafe61743bef09f923d26935d9514eec33a7dec5aeb3d0b517d677e55924859d2db5233bc11f9f11 0004-notifyfd.patch ac8406c1d16ce2e55e47bc83ca6e095833a54de73cecee222cad3fcececa518386b95a11cb0c9c2dcc6851bae28aa539b11069305aa887a291177bf177ee7b01 0005-CVE-2005-1513.patch 954a905bac5e3bc49f180dc0de7f6ee4c4ae8f94dd400ee4b06d3c944f1ff1cfc44bddccb07ae439f2523ad06fcb89023e57d091737da88f836013757794e931 qmail.run -c0cd244af4d8186305c51b0e93960bdb1ea6ce40f1adf20c4f72419aa7498e35649590919ebd16547a0313676bf9171c9efea2ff8ac3a5c773b18473a972a977 smtpd.run -719c4ce5ad93cddeafbb734cffeec3fd959d3f374e44e1f34e9a25d638303dd97df41642d3df5c7a069a8db47d1e31c32a16ecd2d04b72860c4e00bbba0c9fcf smtpsd.run -80ee7e8b3c1ca7cdb00044e6fdd5b9c6a39fd9c882b470f4968c79b974c95e48946a1a3a8b79d9d0ed134ecf09b1185823bf6d022f8b17168e34c18f44ddd16f netqmail.confd -7600285e70511447b11161a2fc1ca11debc5adcde1d76583d4c715e9710cab876f8be158fd8e034d480588d3d4978c42a9254c29f2db70913105ab009cab6479 netqmail.initd" +37d99446cc21e4fe12c6bb78aaff64b93d59935257d660ff31be4a3ebb122a86f3db9afb6f6abc3934fca864eb108469669e4b32b8a4b21ec055d67175f69496 smtpd.run +9762eb50173f81ecb9b01a958457a60ef4814b4c474afe9976187b84818b69f627583a130e61fed8bfbf9e4859819bae983ebe8f27300d9ae6090a9a6d3b3881 smtpd-notls.run +57c30023fa479b88923712c5688469d61f70af3fc7c0d48eb445696f3b8a67e9279814932539e6958660d4ddecdce3dc804fbbde9613dab74001de25f9ef9bad netqmail.confd +f634f6118ea7ed1966b59ca7bdb21ca83e30084bebbc362a4de1d58c44cf14560732029e28ae9bea617005729b06d9677f35c2c96ea075f5972d23b4cb021e7f netqmail.initd" -- cgit v1.2.3-70-g09d2