[arch-commits] Commit in amavisd-new/repos/community-any (8 files)

Thore Bödecker foxxx0 at archlinux.org
Mon Aug 12 09:28:54 UTC 2019


    Date: Monday, August 12, 2019 @ 09:28:54
  Author: foxxx0
Revision: 499013

archrelease: copy trunk to community-any

Added:
  amavisd-new/repos/community-any/PKGBUILD
    (from rev 499012, amavisd-new/trunk/PKGBUILD)
  amavisd-new/repos/community-any/amavisd.service
    (from rev 499012, amavisd-new/trunk/amavisd.service)
  amavisd-new/repos/community-any/amavisd.sysusers
    (from rev 499012, amavisd-new/trunk/amavisd.sysusers)
  amavisd-new/repos/community-any/amavisd.tmpfiles
    (from rev 499012, amavisd-new/trunk/amavisd.tmpfiles)
Deleted:
  amavisd-new/repos/community-any/PKGBUILD
  amavisd-new/repos/community-any/amavisd.service
  amavisd-new/repos/community-any/amavisd.sysusers
  amavisd-new/repos/community-any/amavisd.tmpfiles

------------------+
 PKGBUILD         |  173 +++++++++++++++++++++++++++--------------------------
 amavisd.service  |   34 +++++-----
 amavisd.sysusers |    2 
 amavisd.tmpfiles |    4 -
 4 files changed, 109 insertions(+), 104 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-08-12 09:28:50 UTC (rev 499012)
+++ PKGBUILD	2019-08-12 09:28:54 UTC (rev 499013)
@@ -1,84 +0,0 @@
-# Maintainer: Thore Bödecker <foxxx0 at archlinux.org>
-# Contributor: Yardena Cohen <yardenack at gmail dot com>
-
-pkgname=amavisd-new
-_pkgname=amavis
-pkgver=2.12.0
-pkgrel=1
-pkgdesc="High-performance interface between mailer (MTA) and content checkers"
-arch=('any')
-url="https://gitlab.com/amavis/amavis"
-license=('GPL')
-depends=(
-    'perl>=5.8.2'
-    'perl-archive-zip>=1.14'
-    'perl-convert-tnef'
-    'perl-convert-uulib>=1.4-5'
-    'perl-mime-tools'
-    'perl-mailtools>=1.58'
-    'perl-net-libidn'
-    'perl-net-server>=0.88'
-    'perl-io-socket-inet6'
-    'perl-io-stringy'
-    'perl-unix-syslog>=1.1-4'
-    'perl-mail-dkim>=0.31'
-    'perl-berkeleydb>=0.42'
-    'bzip2'
-    'gzip'
-)
-optdepends=(
-    'arj:        Decoder for: .arj .exe'
-    'lrzip:      Decoder for: .lrz'
-    'lz4:        Decoder for: .lz4'
-    'lzo:        Decoder for: .lzo'
-    'p7zip:      Decoder for: .7z'
-    'unrar:      Decoder for: .rar'
-    'rpmextract: Decoder for: .rpm'
-)
-backup=('etc/amavisd/amavisd.conf' 'etc/amavisd/amavisd-custom.conf')
-source=("${url}/-/archive/v${pkgver}/amavis-v${pkgver}.tar.bz2"
-        "amavisd.service"
-        "amavisd.sysusers"
-        "amavisd.tmpfiles")
-sha512sums=('f8d2dfb6e7d694c76c0ebca7592a3c85ff9b4911cbe43b3eb6d5002541bf036adfbf47c18df4b10c72bcceee0d8701b8c474e6432c5c136ca25170e42098d844'
-            '5028913479808c02a74682987ed5289d094c1ae2e37874b8c45a6abcc825f2e9d9a46acf9ee010897a5a41e5f9256507cc4d7b9e535c46b03cc06b560dddd908'
-            '8933d8457989c949845c0dabd2bed58680adbf87c920f05a59fd136acdd6da84b4d5b48c4c71dfbc0b047be005a70f665138d6397c1b09e0c746903c1d19fc11'
-            '1320d2416151e3340dc9a40b2b516835a5a4966c7db58268a005ee3f5701790851cdf3a2897c6fb9d4e95847d8c0c170e64f8a668ae999fd143de02f6fae8b52')
-
-prepare() {
-    sed -i \
-        -e "s/# @bypass_virus_checks_maps = (1)/@bypass_virus_checks_maps = (1)/g" \
-        -e "s/# @bypass_spam_checks_maps  = (1)/@bypass_spam_checks_maps = (1)/g" \
-        -e "s/\\\$daemon_user  = 'vscan'/\\\$daemon_user  = 'amavis'/g" \
-        -e "s/\\\$daemon_group = 'vscan'/\\\$daemon_group = 'amavis'/g" \
-        -e "sX# \\\$MYHOME = '/var/amavis'X\\\$MYHOME = '/var/spool/amavis'Xg" \
-        -e "sX\\\$QUARANTINEDIR = '/var/virusmails'X\\\$QUARANTINEDIR = \"\\\$MYHOME/virus\"Xg" \
-        -e "sX# \\\$pid_file  = \"\\\$MYHOME/var/amavisd.pid\"X\\\$pid_file = \"/run/amavis/pid\"Xg" \
-        -e "sX# \\\$lock_file = \"\\\$MYHOME/var/amavisd.lock\"X\\\$lock_file = \"/run/amavis/lock\"Xg" \
-        -e "sX\\\$unix_socketname = \"\\\$MYHOME/amavisd.sock\"X\\\$unix_socketname = \"/run/amavis/sock\"Xg" \
-        "${srcdir}/${_pkgname}-v${pkgver}/amavisd.conf"
-
-    sed -i \
-        -e "sX\\\$socketname = '/var/amavis/amavisd.sock'X\\\$socketname = '/var/spool/amavis/amavisd.sock'Xg" \
-        "${srcdir}/${_pkgname}-v${pkgver}/amavisd-release"
-}
-
-package() {
-    cd "${srcdir}/${_pkgname}-v${pkgver}"
-    install -D -m755 JpegTester.pm               "${pkgdir}/usr/share/perl5/vendor_perl/JpegTester.pm"
-    install -D -m644 LDAP.ldif                   "${pkgdir}/etc/openldap/schema/amavisd-new.ldif"
-    install -D -m644 LDAP.schema                 "${pkgdir}/etc/openldap/schema/amavisd-new.schema"
-    install -D -m750 -o 333 -g 333 -d            "${pkgdir}/var/spool/amavis/"
-    install -D -m750 -o 333 -g 333 -d            "${pkgdir}/var/spool/amavis/db"
-    install -D -m750 -o 333 -g 333 -d            "${pkgdir}/var/spool/amavis/tmp"
-    install -D -m750 -o 333 -g 333 -d            "${pkgdir}/var/spool/amavis/var"
-    install -D -m750 -o 333 -g 333 -d            "${pkgdir}/var/spool/amavis/virus"
-
-    install -D -m644 -t "${pkgdir}/etc/amavisd"             amavisd{.conf,-custom.conf,.conf-default}
-    install -D -m644 -t "${pkgdir}/usr/share/doc/amavis"    amavisd-new-{qmqpqq,courier}.patch
-    install -D -m755 -t "${pkgdir}/usr/bin"                 p0f-analyzer.pl amavisd{,-{agent,nanny,release,signer,snmp-subagent{,-zmq}}}
-
-    install -D -m644 "${srcdir}/amavisd.service"  "${pkgdir}/usr/lib/systemd/system/amavisd.service"
-    install -D -m644 "${srcdir}/amavisd.sysusers" "${pkgdir}/usr/lib/sysusers.d/amavisd.conf"
-    install -D -m644 "${srcdir}/amavisd.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/amavisd.conf"
-}

Copied: amavisd-new/repos/community-any/PKGBUILD (from rev 499012, amavisd-new/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-08-12 09:28:54 UTC (rev 499013)
@@ -0,0 +1,89 @@
+# Maintainer: Thore Bödecker <foxxx0 at archlinux.org>
+# Contributor: Yardena Cohen <yardenack at gmail dot com>
+
+pkgname=amavisd-new
+_pkgname=amavis
+pkgver=2.12.0
+pkgrel=2
+pkgdesc="High-performance interface between mailer (MTA) and content checkers"
+arch=('any')
+url="https://gitlab.com/amavis/amavis"
+license=('GPL')
+depends=(
+    'perl>=5.8.2'
+    'perl-archive-zip>=1.14'
+    'perl-convert-tnef'
+    'perl-convert-uulib>=1.4-5'
+    'perl-mime-tools'
+    'perl-mailtools>=1.58'
+    'perl-net-libidn'
+    'perl-net-server>=0.88'
+    'perl-io-socket-inet6'
+    'perl-io-stringy'
+    'perl-unix-syslog>=1.1-4'
+    'perl-mail-dkim>=0.31'
+    'perl-berkeleydb>=0.42'
+    'perl-json'
+    'perl-http-message'
+    'perl-libwww'
+    'perl-lwp-protocol-https'
+    'perl-net-ssleay'
+    'bzip2'
+    'gzip'
+)
+optdepends=(
+    'arj:        Decoder for: .arj .exe'
+    'lrzip:      Decoder for: .lrz'
+    'lz4:        Decoder for: .lz4'
+    'lzo:        Decoder for: .lzo'
+    'p7zip:      Decoder for: .7z'
+    'unrar:      Decoder for: .rar'
+    'rpmextract: Decoder for: .rpm'
+)
+backup=('etc/amavisd/amavisd.conf' 'etc/amavisd/amavisd-custom.conf')
+source=("${url}/-/archive/v${pkgver}/amavis-v${pkgver}.tar.bz2"
+        "amavisd.service"
+        "amavisd.sysusers"
+        "amavisd.tmpfiles")
+sha512sums=('f8d2dfb6e7d694c76c0ebca7592a3c85ff9b4911cbe43b3eb6d5002541bf036adfbf47c18df4b10c72bcceee0d8701b8c474e6432c5c136ca25170e42098d844'
+            '5028913479808c02a74682987ed5289d094c1ae2e37874b8c45a6abcc825f2e9d9a46acf9ee010897a5a41e5f9256507cc4d7b9e535c46b03cc06b560dddd908'
+            '8933d8457989c949845c0dabd2bed58680adbf87c920f05a59fd136acdd6da84b4d5b48c4c71dfbc0b047be005a70f665138d6397c1b09e0c746903c1d19fc11'
+            '1320d2416151e3340dc9a40b2b516835a5a4966c7db58268a005ee3f5701790851cdf3a2897c6fb9d4e95847d8c0c170e64f8a668ae999fd143de02f6fae8b52')
+
+prepare() {
+    sed -i \
+        -e "s/# @bypass_virus_checks_maps = (1)/@bypass_virus_checks_maps = (1)/g" \
+        -e "s/# @bypass_spam_checks_maps  = (1)/@bypass_spam_checks_maps = (1)/g" \
+        -e "s/\\\$daemon_user  = 'vscan'/\\\$daemon_user  = 'amavis'/g" \
+        -e "s/\\\$daemon_group = 'vscan'/\\\$daemon_group = 'amavis'/g" \
+        -e "sX# \\\$MYHOME = '/var/amavis'X\\\$MYHOME = '/var/spool/amavis'Xg" \
+        -e "sX\\\$QUARANTINEDIR = '/var/virusmails'X\\\$QUARANTINEDIR = \"\\\$MYHOME/virus\"Xg" \
+        -e "sX# \\\$pid_file  = \"\\\$MYHOME/var/amavisd.pid\"X\\\$pid_file = \"/run/amavis/pid\"Xg" \
+        -e "sX# \\\$lock_file = \"\\\$MYHOME/var/amavisd.lock\"X\\\$lock_file = \"/run/amavis/lock\"Xg" \
+        -e "sX\\\$unix_socketname = \"\\\$MYHOME/amavisd.sock\"X\\\$unix_socketname = \"/run/amavis/sock\"Xg" \
+        "${srcdir}/${_pkgname}-v${pkgver}/amavisd.conf"
+
+    sed -i \
+        -e "sX\\\$socketname = '/var/amavis/amavisd.sock'X\\\$socketname = '/var/spool/amavis/amavisd.sock'Xg" \
+        "${srcdir}/${_pkgname}-v${pkgver}/amavisd-release"
+}
+
+package() {
+    cd "${srcdir}/${_pkgname}-v${pkgver}"
+    install -D -m755 JpegTester.pm               "${pkgdir}/usr/share/perl5/vendor_perl/JpegTester.pm"
+    install -D -m644 LDAP.ldif                   "${pkgdir}/etc/openldap/schema/amavisd-new.ldif"
+    install -D -m644 LDAP.schema                 "${pkgdir}/etc/openldap/schema/amavisd-new.schema"
+    install -D -m750 -o 333 -g 333 -d            "${pkgdir}/var/spool/amavis/"
+    install -D -m750 -o 333 -g 333 -d            "${pkgdir}/var/spool/amavis/db"
+    install -D -m750 -o 333 -g 333 -d            "${pkgdir}/var/spool/amavis/tmp"
+    install -D -m750 -o 333 -g 333 -d            "${pkgdir}/var/spool/amavis/var"
+    install -D -m750 -o 333 -g 333 -d            "${pkgdir}/var/spool/amavis/virus"
+
+    install -D -m644 -t "${pkgdir}/etc/amavisd"             amavisd{.conf,-custom.conf,.conf-default}
+    install -D -m644 -t "${pkgdir}/usr/share/doc/amavis"    amavisd-new-{qmqpqq,courier}.patch
+    install -D -m755 -t "${pkgdir}/usr/bin"                 p0f-analyzer.pl amavisd{,-{agent,nanny,release,signer,snmp-subagent{,-zmq}}}
+
+    install -D -m644 "${srcdir}/amavisd.service"  "${pkgdir}/usr/lib/systemd/system/amavisd.service"
+    install -D -m644 "${srcdir}/amavisd.sysusers" "${pkgdir}/usr/lib/sysusers.d/amavisd.conf"
+    install -D -m644 "${srcdir}/amavisd.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/amavisd.conf"
+}

Deleted: amavisd.service
===================================================================
--- amavisd.service	2019-08-12 09:28:50 UTC (rev 499012)
+++ amavisd.service	2019-08-12 09:28:54 UTC (rev 499013)
@@ -1,17 +0,0 @@
-[Unit]
-Description=Amavisd Daemon
-Wants=spamassassin.service
-After=network.target
-
-[Service]
-PIDFile=/run/amavis/pid
-User=amavis
-Group=amavis
-RuntimeDirectory=amavis
-RuntimeDirectoryMode=750
-ExecStart=/usr/bin/amavisd -c /etc/amavisd/amavisd.conf foreground
-ExecReload=/usr/bin/amavisd -c /etc/amavisd/amavisd.conf reload
-PrivateTmp=true
-
-[Install]
-WantedBy=multi-user.target

Copied: amavisd-new/repos/community-any/amavisd.service (from rev 499012, amavisd-new/trunk/amavisd.service)
===================================================================
--- amavisd.service	                        (rev 0)
+++ amavisd.service	2019-08-12 09:28:54 UTC (rev 499013)
@@ -0,0 +1,17 @@
+[Unit]
+Description=Amavisd Daemon
+Wants=spamassassin.service
+After=network.target
+
+[Service]
+PIDFile=/run/amavis/pid
+User=amavis
+Group=amavis
+RuntimeDirectory=amavis
+RuntimeDirectoryMode=750
+ExecStart=/usr/bin/amavisd -c /etc/amavisd/amavisd.conf foreground
+ExecReload=/usr/bin/amavisd -c /etc/amavisd/amavisd.conf reload
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target

Deleted: amavisd.sysusers
===================================================================
--- amavisd.sysusers	2019-08-12 09:28:50 UTC (rev 499012)
+++ amavisd.sysusers	2019-08-12 09:28:54 UTC (rev 499013)
@@ -1 +0,0 @@
-u amavis 333 - /var/spool/amavis

Copied: amavisd-new/repos/community-any/amavisd.sysusers (from rev 499012, amavisd-new/trunk/amavisd.sysusers)
===================================================================
--- amavisd.sysusers	                        (rev 0)
+++ amavisd.sysusers	2019-08-12 09:28:54 UTC (rev 499013)
@@ -0,0 +1 @@
+u amavis 333 - /var/spool/amavis

Deleted: amavisd.tmpfiles
===================================================================
--- amavisd.tmpfiles	2019-08-12 09:28:50 UTC (rev 499012)
+++ amavisd.tmpfiles	2019-08-12 09:28:54 UTC (rev 499013)
@@ -1,2 +0,0 @@
-d /var/spool/amavis       0750 amavis amavis -
-d /var/spool/amavis/virus 0750 amavis amavis -

Copied: amavisd-new/repos/community-any/amavisd.tmpfiles (from rev 499012, amavisd-new/trunk/amavisd.tmpfiles)
===================================================================
--- amavisd.tmpfiles	                        (rev 0)
+++ amavisd.tmpfiles	2019-08-12 09:28:54 UTC (rev 499013)
@@ -0,0 +1,2 @@
+d /var/spool/amavis       0750 amavis amavis -
+d /var/spool/amavis/virus 0750 amavis amavis -


More information about the arch-commits mailing list