[arch-commits] Commit in amavisd-new/trunk (2 files)

[Thore Bödecker]

    Date: Sunday, August 11, 2019 @ 20:44:19
  Author: foxxx0
Revision: 498970

upgpkg: amavisd-new 2.12.0-1

update to 2.12.0

Modified:
  amavisd-new/trunk/PKGBUILD
Deleted:
  amavisd-new/trunk/fix-dkim-for-originating-mails.patch

--------------------------------------+
 PKGBUILD                             |   28 +++++++++++-----------------
 fix-dkim-for-originating-mails.patch |   10 ----------
 2 files changed, 11 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-08-11 20:08:13 UTC (rev 498969)
+++ PKGBUILD	2019-08-11 20:44:19 UTC (rev 498970)
@@ -2,11 +2,12 @@
 # Contributor: Yardena Cohen <yardenack at gmail dot com>
 
 pkgname=amavisd-new
-pkgver=2.11.0
-pkgrel=7
+_pkgname=amavis
+pkgver=2.12.0
+pkgrel=1
 pkgdesc="High-performance interface between mailer (MTA) and content checkers"
 arch=('any')
-url="https://www.ijs.si/software/amavisd/"
+url="https://gitlab.com/amavis/amavis"
 license=('GPL')
 depends=(
     'perl>=5.8.2'
@@ -35,16 +36,14 @@
     '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"
+source=("${url}/-/archive/v${pkgver}/amavis-v${pkgver}.tar.bz2"
         "amavisd.service"
         "amavisd.sysusers"
-        "amavisd.tmpfiles"
-        "fix-dkim-for-originating-mails.patch")
-sha512sums=('a33292c976abf54db9475392069658c926e7a6f11a4970bbe353b34b3343388bc83b40eda4729f8efa735a3a6e23fd1ed83487f6f7ccf1e9f0903220e6d26957'
+        "amavisd.tmpfiles")
+sha512sums=('f8d2dfb6e7d694c76c0ebca7592a3c85ff9b4911cbe43b3eb6d5002541bf036adfbf47c18df4b10c72bcceee0d8701b8c474e6432c5c136ca25170e42098d844'
             '5028913479808c02a74682987ed5289d094c1ae2e37874b8c45a6abcc825f2e9d9a46acf9ee010897a5a41e5f9256507cc4d7b9e535c46b03cc06b560dddd908'
             '8933d8457989c949845c0dabd2bed58680adbf87c920f05a59fd136acdd6da84b4d5b48c4c71dfbc0b047be005a70f665138d6397c1b09e0c746903c1d19fc11'
-            '1320d2416151e3340dc9a40b2b516835a5a4966c7db58268a005ee3f5701790851cdf3a2897c6fb9d4e95847d8c0c170e64f8a668ae999fd143de02f6fae8b52'
-            '0ea12ca769eb58eacbcbb234d1ff56ba06c06149230d7f6614cf52847ba2971fc5179f1a3cc88da114d9f6c1421108b4adfbe1b2d7e0f6be1be4ac70cec21988')
+            '1320d2416151e3340dc9a40b2b516835a5a4966c7db58268a005ee3f5701790851cdf3a2897c6fb9d4e95847d8c0c170e64f8a668ae999fd143de02f6fae8b52')
 
 prepare() {
     sed -i \
@@ -57,20 +56,15 @@
         -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"
+        "${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}-${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
+        "${srcdir}/${_pkgname}-v${pkgver}/amavisd-release"
 }
 
 package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
+    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"

Deleted: fix-dkim-for-originating-mails.patch
===================================================================
--- fix-dkim-for-originating-mails.patch	2019-08-11 20:08:13 UTC (rev 498969)
+++ fix-dkim-for-originating-mails.patch	2019-08-11 20:44:19 UTC (rev 498970)
@@ -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