diff options
-rw-r--r-- | .SRCINFO | 12 | ||||
-rw-r--r-- | PKGBUILD | 29 | ||||
-rw-r--r-- | milter-spamd.service | 15 | ||||
-rw-r--r-- | milter-spamd.sysusers | 2 |
4 files changed, 32 insertions, 26 deletions
@@ -1,8 +1,6 @@ -# Generated by mksrcinfo v8 -# Mon Aug 14 07:22:58 UTC 2017 pkgbase = milter-spamd pkgdesc = Sendmail milter that reject mail inline using SpamAssassin spamd. - pkgver = 0.8 + pkgver = 0.9 pkgrel = 1 url = https://www.benzedrine.ch/milter-spamd.html install = milter-spamd.install @@ -11,10 +9,12 @@ pkgbase = milter-spamd license = BSD makedepends = libmilter depends = spamassassin - source = http://www.benzedrine.ch/milter-spamd-0.8.tar.gz + source = http://www.benzedrine.ch/milter-spamd-0.9.tar.gz source = milter-spamd.service - sha256sums = 84acfa4ba3b84927f94b2bea427ac3e52d8079f553792bbf24bf96331235dec9 - sha256sums = 8214094704464d6cc15f9365b48f60c79b5c450f25d45c25585f41b308a27827 + source = milter-spamd.sysusers + sha256sums = b900b233d7c532ff34ba94688cf5241310ac498a750958d839266011791a5a6d + sha256sums = 29378f9cf016b6908c7c800ca15cc5fa7136f37c5f343c129b9d032124388883 + sha256sums = 3ca976f4a8a62bf6298b52af2b113a0413446a463d990716cddbc25b987a1d0a pkgname = milter-spamd @@ -1,6 +1,6 @@ # Maintainer: Filip <fila pruda com> pkgname=milter-spamd -pkgver=0.8 +pkgver=0.9 pkgrel=1 pkgdesc="Sendmail milter that reject mail inline using SpamAssassin spamd." arch=('x86_64' 'i686') @@ -9,25 +9,32 @@ license=('BSD') depends=('spamassassin') makedepends=('libmilter') - install=milter-spamd.install -source=("http://www.benzedrine.ch/${pkgname}-${pkgver}.tar.gz" "milter-spamd.service") +source=("http://www.benzedrine.ch/$pkgname-$pkgver.tar.gz" + "milter-spamd.service" + "milter-spamd.sysusers") + +sha256sums=('b900b233d7c532ff34ba94688cf5241310ac498a750958d839266011791a5a6d' + '29378f9cf016b6908c7c800ca15cc5fa7136f37c5f343c129b9d032124388883' + '3ca976f4a8a62bf6298b52af2b113a0413446a463d990716cddbc25b987a1d0a') -sha256sums=('84acfa4ba3b84927f94b2bea427ac3e52d8079f553792bbf24bf96331235dec9' '8214094704464d6cc15f9365b48f60c79b5c450f25d45c25585f41b308a27827') +prepare() { + cd "$srcdir/$pkgname-$pkgver" + sed -i 's/umask(0177);/umask(0117);/' milter-spamd.c +} build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" make -f Makefile.linux } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - #make DESTDIR="${pkgdir}/" install - - install -Dm755 "milter-spamd" "${pkgdir}/usr/bin/milter-spamd" - install -Dm644 "milter-spamd.8" "${pkgdir}/usr/share/man/man8/milter-spamd.8" + cd "$srcdir/$pkgname-$pkgver" - install -Dm644 "${srcdir}/milter-spamd.service" "${pkgdir}/usr/lib/systemd/system/milter-spamd.service" + install -Dm755 "milter-spamd" "$pkgdir/usr/bin/milter-spamd" + install -Dm644 "milter-spamd.8" "$pkgdir/usr/share/man/man8/milter-spamd.8" + install -Dm644 "$srcdir/milter-spamd.sysusers" "$pkgdir/usr/lib/sysusers.d/milter-spamd.conf" + install -Dm644 "$srcdir/milter-spamd.service" "$pkgdir/usr/lib/systemd/system/milter-spamd.service" } diff --git a/milter-spamd.service b/milter-spamd.service index 960d7b21032c..ebbc54e374ae 100644 --- a/milter-spamd.service +++ b/milter-spamd.service @@ -1,18 +1,15 @@ [Unit] Description = Milter for SpamAssassin Wants = spamassassin.service -After = network.target -After = spamassassin.service -Before = postfix.service - +After=network.target spamassassin.service [Service] Type = forking -User = postfix -Group = postfix -Environment = SOCKET=unix:/var/spool/postfix/private/milter-spamd -ExecStart = /usr/bin/milter-spamd -p $SOCKET -U spamd -#Restart= always +User = milter-spamd +Group = mail +RuntimeDirectory=milter-spamd +RuntimeDirectoryMode=0710 +ExecStart = /usr/bin/milter-spamd -p /run/milter-spamd/milter-spamd.sock -U spamd [Install] WantedBy = multi-user.target diff --git a/milter-spamd.sysusers b/milter-spamd.sysusers new file mode 100644 index 000000000000..34c6a24eda30 --- /dev/null +++ b/milter-spamd.sysusers @@ -0,0 +1,2 @@ +u milter-spamd - - - +m milter-spamd mail |