[arch-commits] Commit in amavisd-new/repos/community-any (10 files)
Thore Bödecker
foxxx0 at archlinux.org
Sun Nov 26 15:00:15 UTC 2017
Date: Sunday, November 26, 2017 @ 15:00:14
Author: foxxx0
Revision: 268916
archrelease: copy trunk to community-any
Added:
amavisd-new/repos/community-any/PKGBUILD
(from rev 268915, amavisd-new/trunk/PKGBUILD)
amavisd-new/repos/community-any/amavisd.service
(from rev 268915, amavisd-new/trunk/amavisd.service)
amavisd-new/repos/community-any/amavisd.sysusers
(from rev 268915, amavisd-new/trunk/amavisd.sysusers)
amavisd-new/repos/community-any/amavisd.tmpfiles
(from rev 268915, amavisd-new/trunk/amavisd.tmpfiles)
amavisd-new/repos/community-any/fix-dkim-for-originating-mails.patch
(from rev 268915, amavisd-new/trunk/fix-dkim-for-originating-mails.patch)
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
amavisd-new/repos/community-any/fix-dkim-for-originating-mails.patch
--------------------------------------+
PKGBUILD | 176 ++++++++++++++++-----------------
amavisd.service | 34 +++---
amavisd.sysusers | 2
amavisd.tmpfiles | 4
fix-dkim-for-originating-mails.patch | 20 +--
5 files changed, 120 insertions(+), 116 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2017-11-26 14:59:49 UTC (rev 268915)
+++ PKGBUILD 2017-11-26 15:00:14 UTC (rev 268916)
@@ -1,86 +0,0 @@
-# Maintainer: Thore Bödecker <foxxx0 at archlinux.org>
-# Contributor: Yardena Cohen <yardenack at gmail dot com>
-
-pkgname=amavisd-new
-pkgver=2.11.0
-pkgrel=6
-pkgdesc="High-performance interface between mailer (MTA) and content checkers"
-arch=('any')
-url="https://www.ijs.si/software/amavisd/"
-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=("https://www.ijs.si/software/amavisd/amavisd-new-${pkgver}.tar.xz"
- "amavisd.service"
- "amavisd.sysusers"
- "amavisd.tmpfiles"
- "fix-dkim-for-originating-mails.patch")
-sha512sums=('a33292c976abf54db9475392069658c926e7a6f11a4970bbe353b34b3343388bc83b40eda4729f8efa735a3a6e23fd1ed83487f6f7ccf1e9f0903220e6d26957'
- '5028913479808c02a74682987ed5289d094c1ae2e37874b8c45a6abcc825f2e9d9a46acf9ee010897a5a41e5f9256507cc4d7b9e535c46b03cc06b560dddd908'
- '8933d8457989c949845c0dabd2bed58680adbf87c920f05a59fd136acdd6da84b4d5b48c4c71dfbc0b047be005a70f665138d6397c1b09e0c746903c1d19fc11'
- '1320d2416151e3340dc9a40b2b516835a5a4966c7db58268a005ee3f5701790851cdf3a2897c6fb9d4e95847d8c0c170e64f8a668ae999fd143de02f6fae8b52'
- '0ea12ca769eb58eacbcbb234d1ff56ba06c06149230d7f6614cf52847ba2971fc5179f1a3cc88da114d9f6c1421108b4adfbe1b2d7e0f6be1be4ac70cec21988')
-
-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}-${pkgver}/amavisd.conf"
-
- # fix ORIGINATING detection for DKIM signing
- # see: https://bugzilla.redhat.com/show_bug.cgi?id=1364730#c1
- # and: https://lists.amavis.org/pipermail/amavis-users/2016-July/004428.html
- patch -p0 "${srcdir}/${pkgname}-${pkgver}/amavisd" < fix-dkim-for-originating-mails.patch
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${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 268915, amavisd-new/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2017-11-26 15:00:14 UTC (rev 268916)
@@ -0,0 +1,90 @@
+# Maintainer: Thore Bödecker <foxxx0 at archlinux.org>
+# Contributor: Yardena Cohen <yardenack at gmail dot com>
+
+pkgname=amavisd-new
+pkgver=2.11.0
+pkgrel=7
+pkgdesc="High-performance interface between mailer (MTA) and content checkers"
+arch=('any')
+url="https://www.ijs.si/software/amavisd/"
+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=("https://www.ijs.si/software/amavisd/amavisd-new-${pkgver}.tar.xz"
+ "amavisd.service"
+ "amavisd.sysusers"
+ "amavisd.tmpfiles"
+ "fix-dkim-for-originating-mails.patch")
+sha512sums=('a33292c976abf54db9475392069658c926e7a6f11a4970bbe353b34b3343388bc83b40eda4729f8efa735a3a6e23fd1ed83487f6f7ccf1e9f0903220e6d26957'
+ '5028913479808c02a74682987ed5289d094c1ae2e37874b8c45a6abcc825f2e9d9a46acf9ee010897a5a41e5f9256507cc4d7b9e535c46b03cc06b560dddd908'
+ '8933d8457989c949845c0dabd2bed58680adbf87c920f05a59fd136acdd6da84b4d5b48c4c71dfbc0b047be005a70f665138d6397c1b09e0c746903c1d19fc11'
+ '1320d2416151e3340dc9a40b2b516835a5a4966c7db58268a005ee3f5701790851cdf3a2897c6fb9d4e95847d8c0c170e64f8a668ae999fd143de02f6fae8b52'
+ '0ea12ca769eb58eacbcbb234d1ff56ba06c06149230d7f6614cf52847ba2971fc5179f1a3cc88da114d9f6c1421108b4adfbe1b2d7e0f6be1be4ac70cec21988')
+
+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}-${pkgver}/amavisd.conf"
+
+ sed -i \
+ -e "sX\\\$socketname = '/var/amavis/amavisd.sock'X\\\$socketname = '/var/spool/amavis/amavisd.sock'Xg" \
+ "${srcdir}/${pkgname}-${pkgver}/amavisd-release"
+
+ # fix ORIGINATING detection for DKIM signing
+ # see: https://bugzilla.redhat.com/show_bug.cgi?id=1364730#c1
+ # and: https://lists.amavis.org/pipermail/amavis-users/2016-July/004428.html
+ patch -p0 "${srcdir}/${pkgname}-${pkgver}/amavisd" < fix-dkim-for-originating-mails.patch
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${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 2017-11-26 14:59:49 UTC (rev 268915)
+++ amavisd.service 2017-11-26 15:00:14 UTC (rev 268916)
@@ -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 268915, amavisd-new/trunk/amavisd.service)
===================================================================
--- amavisd.service (rev 0)
+++ amavisd.service 2017-11-26 15:00:14 UTC (rev 268916)
@@ -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 2017-11-26 14:59:49 UTC (rev 268915)
+++ amavisd.sysusers 2017-11-26 15:00:14 UTC (rev 268916)
@@ -1 +0,0 @@
-u amavis 333 - /var/spool/amavis
Copied: amavisd-new/repos/community-any/amavisd.sysusers (from rev 268915, amavisd-new/trunk/amavisd.sysusers)
===================================================================
--- amavisd.sysusers (rev 0)
+++ amavisd.sysusers 2017-11-26 15:00:14 UTC (rev 268916)
@@ -0,0 +1 @@
+u amavis 333 - /var/spool/amavis
Deleted: amavisd.tmpfiles
===================================================================
--- amavisd.tmpfiles 2017-11-26 14:59:49 UTC (rev 268915)
+++ amavisd.tmpfiles 2017-11-26 15:00:14 UTC (rev 268916)
@@ -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 268915, amavisd-new/trunk/amavisd.tmpfiles)
===================================================================
--- amavisd.tmpfiles (rev 0)
+++ amavisd.tmpfiles 2017-11-26 15:00:14 UTC (rev 268916)
@@ -0,0 +1,2 @@
+d /var/spool/amavis 0750 amavis amavis -
+d /var/spool/amavis/virus 0750 amavis amavis -
Deleted: fix-dkim-for-originating-mails.patch
===================================================================
--- fix-dkim-for-originating-mails.patch 2017-11-26 14:59:49 UTC (rev 268915)
+++ fix-dkim-for-originating-mails.patch 2017-11-26 15:00:14 UTC (rev 268916)
@@ -1,10 +0,0 @@
---- amavisd.orig Tue Apr 26 21:24:33 2016
-+++ amavisd Fri Jul 1 01:03:15 2016
-@@ -34338,6 +34329,7 @@ sub collect_some_dkim_info($) {
- $sig_ind++;
- }
- Amavis::load_policy_bank($_,$msginfo) for @bank_names;
-+ $msginfo->originating(c('originating'));
- $msginfo->dkim_signatures_valid(\@signatures_valid) if @signatures_valid;
- # if (ll(5) && $sig_ind > 0) {
- # # show which header fields are covered by which signature
Copied: amavisd-new/repos/community-any/fix-dkim-for-originating-mails.patch (from rev 268915, amavisd-new/trunk/fix-dkim-for-originating-mails.patch)
===================================================================
--- fix-dkim-for-originating-mails.patch (rev 0)
+++ fix-dkim-for-originating-mails.patch 2017-11-26 15:00:14 UTC (rev 268916)
@@ -0,0 +1,10 @@
+--- amavisd.orig Tue Apr 26 21:24:33 2016
++++ amavisd Fri Jul 1 01:03:15 2016
+@@ -34338,6 +34329,7 @@ sub collect_some_dkim_info($) {
+ $sig_ind++;
+ }
+ Amavis::load_policy_bank($_,$msginfo) for @bank_names;
++ $msginfo->originating(c('originating'));
+ $msginfo->dkim_signatures_valid(\@signatures_valid) if @signatures_valid;
+ # if (ll(5) && $sig_ind > 0) {
+ # # show which header fields are covered by which signature
More information about the arch-commits
mailing list