From f0daafa26104492bf41371cccf3a324f02aa66ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=2E=20Stani=C4=87?= Date: Thu, 7 Nov 2019 13:58:57 +0100 Subject: main/amavis: upgrade to 2.12.0 and rename from amavisd-new renamed upstream to amavis development moved to gitlab.com add perl-mail-spamassassin to depends add -openrc subpackage --- main/amavis/APKBUILD | 69 +++++++++++++++++++++++++++++++ main/amavis/amavis.pre-install | 6 +++ main/amavis/amavisd.confd | 4 ++ main/amavis/amavisd.initd | 17 ++++++++ main/amavisd-new/APKBUILD | 71 -------------------------------- main/amavisd-new/amavisd-new.pre-install | 6 --- main/amavisd-new/amavisd.confd | 4 -- main/amavisd-new/amavisd.initd | 17 -------- 8 files changed, 96 insertions(+), 98 deletions(-) create mode 100644 main/amavis/APKBUILD create mode 100755 main/amavis/amavis.pre-install create mode 100644 main/amavis/amavisd.confd create mode 100644 main/amavis/amavisd.initd delete mode 100644 main/amavisd-new/APKBUILD delete mode 100755 main/amavisd-new/amavisd-new.pre-install delete mode 100644 main/amavisd-new/amavisd.confd delete mode 100644 main/amavisd-new/amavisd.initd diff --git a/main/amavis/APKBUILD b/main/amavis/APKBUILD new file mode 100644 index 0000000000..f512a4e735 --- /dev/null +++ b/main/amavis/APKBUILD @@ -0,0 +1,69 @@ +# Contributor: Leonardo Arena +# Maintainer: Leonardo Arena +pkgname=amavis +pkgver=2.12.0 +pkgrel=0 +pkgdesc="High-performance interface between mailer (MTA) and content checkers" +url="https://gitlab.com/amavis/amavis" +arch="noarch" +license="GPL-2.0-or-later BSD" +provides="amavisd-new=$pkgver-r$pkgrel" +depends="sed file perl perl-archive-zip perl-carp perl-convert-tnef + perl-compress-raw-zlib perl-convert-uulib perl-digest-md5 perl-io + perl-exporter perl-io-compress perl-io-stringy perl-mime-tools + perl-mailtools perl-socket perl-net-libidn perl-net-server + perl-time-hires perl-unix-syslog perl-db perl-mail-dkim + perl-io-socket-inet6 + perl-mail-spamassassin + " +makedepends="" +install="$pkgname.pre-install" +options="!check" +subpackages="$pkgname-openrc" +source="https://gitlab.com/amavis/amavis/-/archive/v$pkgver/amavis-v$pkgver.tar.gz + amavisd.initd + amavisd.confd + " +pkgusers="amavis" +pkggroups="amavis" + +builddir="$srcdir"/$pkgname-v$pkgver + +package() { + cd "$builddir" + ( + HOME=/var/amavis + QUARANTINE=$HOME/quarantine + USER=amavis + GROUP=amavis + DIRS="$HOME $HOME/tmp $HOME/var $HOME/db $HOME/home $QUARANTINE" + CONFIG=/etc/amavisd.conf + + for dir in $DIRS + do + mkdir -p ${pkgdir}$dir + done + + install -m 755 -o root -D amavisd $pkgdir/usr/sbin/amavisd + install -m 755 -o root -D amavisd-nanny $pkgdir/usr/bin/amavisd-nanny + install -m 755 -o root -D amavisd-release $pkgdir/usr/bin/amavisd-release + sed -e "s:^.*\$MYHOME = .*$:\$MYHOME = '$HOME';:" \ + -e 's:^.*\$TEMPBASE = .*$:\$TEMPBASE = "\$MYHOME/tmp";:' \ + -e 's:^.*\$db_home = .*$:\$db_home = "$MYHOME/db";:' \ + -e "s:^.*\$QUARANTINEDIR = .*$:\$QUARANTINEDIR = '$QUARANTINE';:" \ + -e "s:^.*\$daemon_user = 'vscan';\(.*\)$:\$daemon_user = 'amavis';\1:" \ + -e "s:^.*\$daemon_group = 'vscan';\(.*\)$:\$daemon_group = 'amavis';\1:" < amavisd.conf > amavisd.conf.alpine + install -m 640 -o root -D amavisd.conf.alpine ${pkgdir}${CONFIG} + ) + + install -Dm755 "$srcdir"/amavisd.initd "$pkgdir"/etc/init.d/amavisd + install -Dm644 "$srcdir"/amavisd.confd "$pkgdir"/etc/conf.d/amavisd + + chown -R amavis:amavis "$pkgdir"/var/amavis + chmod -R 750 "$pkgdir"/var/amavis + chown root:amavis "$pkgdir"/etc/amavisd.conf +} + +sha512sums="310cf2391b23fcafc1e747b603a8f86ade08490ac9daab8213baf48eee7ba18bab36b2cd2b11a4235380d42f0e4ad173fe844983653666c5b1d8db622137cfe2 amavis-v2.12.0.tar.gz +6a9dd16a6b52f3d1fbd16887f29ccceddc58e88a02e681f23c1fe54b7e24feea5089d52813f4f3e87d9242daf79d2b2ea1e7c451d83d7de943403e71dc61c4e5 amavisd.initd +a5ce3583c34197f335372728cf92da23bae2cd7a9ae48daff6eaadbf66fbd5be6bb8b480b0fce1ea2b3a662b0a54d1d2f1f277d2f9a06d9630b57fa5d7ac2635 amavisd.confd" diff --git a/main/amavis/amavis.pre-install b/main/amavis/amavis.pre-install new file mode 100755 index 0000000000..e672682914 --- /dev/null +++ b/main/amavis/amavis.pre-install @@ -0,0 +1,6 @@ +#!/bin/sh + +addgroup -S amavis 2>/dev/null +adduser -S -D -h /var/amavis -s /sbin/nologin -G amavis -g amavis amavis 2>/dev/null + +exit 0 diff --git a/main/amavis/amavisd.confd b/main/amavis/amavisd.confd new file mode 100644 index 0000000000..d576300335 --- /dev/null +++ b/main/amavis/amavisd.confd @@ -0,0 +1,4 @@ +# amavisd conf.d + +user="amavis" +group="amavis" diff --git a/main/amavis/amavisd.initd b/main/amavis/amavisd.initd new file mode 100644 index 0000000000..41f731d996 --- /dev/null +++ b/main/amavis/amavisd.initd @@ -0,0 +1,17 @@ +#!/sbin/openrc-run + +pidfile="/run/$RC_SVCNAME.pid" + +name="amavisd" +command="/usr/sbin/$name" +command_args="-c /etc/amavisd.conf foreground" +command_background="yes" + +start_stop_daemon_args="--user $user:$group" + +depend() { + need net + use logger + use antivirus + before mta +} diff --git a/main/amavisd-new/APKBUILD b/main/amavisd-new/APKBUILD deleted file mode 100644 index a61070502a..0000000000 --- a/main/amavisd-new/APKBUILD +++ /dev/null @@ -1,71 +0,0 @@ -# Contributor: Leonardo Arena -# Maintainer: Leonardo Arena -pkgname=amavisd-new -pkgver=2.11.1 -pkgrel=0 -pkgdesc="High-performance interface between mailer (MTA) and content checkers" -url="http://www.ijs.si/software/amavisd" -arch="noarch" -license="GPL-2.0-or-later BSD" -depends="sed file perl perl-archive-zip perl-carp perl-convert-tnef - perl-compress-raw-zlib perl-convert-uulib perl-digest-md5 perl-io - perl-exporter perl-io-compress perl-io-stringy perl-mime-tools - perl-mailtools perl-socket perl-net-libidn perl-net-server - perl-time-hires perl-unix-syslog perl-db perl-mail-dkim - perl-io-socket-inet6 - " -makedepends="" -install="$pkgname.pre-install" -options="!check" -subpackages="" -source=" - https://www.ijs.si/software/amavisd/$pkgname-$pkgver.tar.bz2 - amavisd.initd - amavisd.confd - " -pkgusers="amavis" -pkggroups="amavis" - -_builddir="$srcdir"/$pkgname-$pkgver -build() { - return 0 -} - -package() { - cd "$_builddir" - ( - HOME=/var/amavis - QUARANTINE=$HOME/quarantine - USER=amavis - GROUP=amavis - DIRS="$HOME $HOME/tmp $HOME/var $HOME/db $HOME/home $QUARANTINE" - CONFIG=/etc/amavisd.conf - - for dir in $DIRS - do - mkdir -p ${pkgdir}$dir - done - - install -m 755 -o root -D amavisd $pkgdir/usr/sbin/amavisd - install -m 755 -o root -D amavisd-nanny $pkgdir/usr/bin/amavisd-nanny - install -m 755 -o root -D amavisd-release $pkgdir/usr/bin/amavisd-release - sed -e "s:^.*\$MYHOME = .*$:\$MYHOME = '$HOME';:" \ - -e 's:^.*\$TEMPBASE = .*$:\$TEMPBASE = "\$MYHOME/tmp";:' \ - -e 's:^.*\$db_home = .*$:\$db_home = "$MYHOME/db";:' \ - -e "s:^.*\$QUARANTINEDIR = .*$:\$QUARANTINEDIR = '$QUARANTINE';:" \ - -e "s:^.*\$daemon_user = 'vscan';\(.*\)$:\$daemon_user = 'amavis';\1:" \ - -e "s:^.*\$daemon_group = 'vscan';\(.*\)$:\$daemon_group = 'amavis';\1:" < amavisd.conf > amavisd.conf.alpine - install -m 640 -o root -D amavisd.conf.alpine ${pkgdir}${CONFIG} - ) - - install -Dm755 "$srcdir"/amavisd.initd "$pkgdir"/etc/init.d/amavisd - install -Dm644 "$srcdir"/amavisd.confd "$pkgdir"/etc/conf.d/amavisd - - chown -R amavis:amavis "$pkgdir"/var/amavis - chmod -R 750 "$pkgdir"/var/amavis - chown root:amavis "$pkgdir"/etc/amavisd.conf -} - -sha512sums="06180a4efa777af2f91781ba6e3ea302041c5dd721981d960bab24cecb160c17df8a927e95df9dd7ee5ba64004b8edd3c6c0c5ef7f96fd702d1d84e4a856ea83 amavisd-new-2.11.1.tar.bz2 -6a9dd16a6b52f3d1fbd16887f29ccceddc58e88a02e681f23c1fe54b7e24feea5089d52813f4f3e87d9242daf79d2b2ea1e7c451d83d7de943403e71dc61c4e5 amavisd.initd -a5ce3583c34197f335372728cf92da23bae2cd7a9ae48daff6eaadbf66fbd5be6bb8b480b0fce1ea2b3a662b0a54d1d2f1f277d2f9a06d9630b57fa5d7ac2635 amavisd.confd" diff --git a/main/amavisd-new/amavisd-new.pre-install b/main/amavisd-new/amavisd-new.pre-install deleted file mode 100755 index e672682914..0000000000 --- a/main/amavisd-new/amavisd-new.pre-install +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -addgroup -S amavis 2>/dev/null -adduser -S -D -h /var/amavis -s /sbin/nologin -G amavis -g amavis amavis 2>/dev/null - -exit 0 diff --git a/main/amavisd-new/amavisd.confd b/main/amavisd-new/amavisd.confd deleted file mode 100644 index d576300335..0000000000 --- a/main/amavisd-new/amavisd.confd +++ /dev/null @@ -1,4 +0,0 @@ -# amavisd conf.d - -user="amavis" -group="amavis" diff --git a/main/amavisd-new/amavisd.initd b/main/amavisd-new/amavisd.initd deleted file mode 100644 index 41f731d996..0000000000 --- a/main/amavisd-new/amavisd.initd +++ /dev/null @@ -1,17 +0,0 @@ -#!/sbin/openrc-run - -pidfile="/run/$RC_SVCNAME.pid" - -name="amavisd" -command="/usr/sbin/$name" -command_args="-c /etc/amavisd.conf foreground" -command_background="yes" - -start_stop_daemon_args="--user $user:$group" - -depend() { - need net - use logger - use antivirus - before mta -} -- cgit v1.2.3