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

[David Runge]

    Date: Sunday, January 28, 2018 @ 20:32:25
  Author: dvzrv
Revision: 287649

upgpkg: mailman 2.1.25-2

Adding patch to add needed CGI params for nginx (FS#56865).
Simplifying installation of systemd services and timers.

Added:
  mailman/trunk/02-mailman-2.1.25-nginx-headers.patch
Modified:
  mailman/trunk/PKGBUILD

---------------------------------------+
 02-mailman-2.1.25-nginx-headers.patch |   16 ++++++++++++++++
 PKGBUILD                              |   22 +++++++++-------------
 2 files changed, 25 insertions(+), 13 deletions(-)

Added: 02-mailman-2.1.25-nginx-headers.patch
===================================================================
--- 02-mailman-2.1.25-nginx-headers.patch	                        (rev 0)
+++ 02-mailman-2.1.25-nginx-headers.patch	2018-01-28 20:32:25 UTC (rev 287649)
@@ -0,0 +1,16 @@
+diff -ruN mailman-2.1.25-a/src/common.c mailman-2.1.25-b/src/common.c
+--- mailman-2.1.25-a/src/common.c	2017-10-26 23:07:01.000000000 +0200
++++ mailman-2.1.25-b/src/common.c	2018-01-27 19:25:52.870021686 +0100
+@@ -192,6 +192,12 @@
+         "SERVER_NAME=",
+         "SERVER_PORT=",
+         "USER=",
++        "CONTENT_LENGTH=",
++        "DOCUMENT_ROOT=",
++        "SERVER_PROTOCOL=",
++        "REQUEST_SCHEME=",
++        "HTTPS=",
++        "REMOTE_PORT=",
+         NULL
+ };
+ 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-28 20:28:36 UTC (rev 287648)
+++ PKGBUILD	2018-01-28 20:32:25 UTC (rev 287649)
@@ -4,7 +4,7 @@
 
 pkgname=mailman
 pkgver=2.1.25
-pkgrel=1
+pkgrel=2
 pkgdesc='The GNU Mailing List Manager'
 arch=(x86_64)
 license=('GPL')
@@ -35,6 +35,7 @@
         'mailman-senddigests.service'
         'mailman-senddigests.timer'
         '01-mailman-2.1-build.patch'
+        '02-mailman-2.1.25-nginx-headers.patch'
         )
 validpgpkeys=('C638CAEF0AC21563736B5A22555B975E953B8693') # Mark Sapiro <mark at msapiro.net>
 md5sums=('90bceec891f828a2f834ed438ce2b547'
@@ -57,7 +58,8 @@
          '3af65082d3cd4d5746944890c7a72962'
          '350dac1e350691e3d9cb8f99fd4b669a'
          '52917f62441ac5d950789e8f8af28f09'
-         'ed04d062379eb21e39ce1e70e6b1ade2')
+         'ed04d062379eb21e39ce1e70e6b1ade2'
+         '7d2f5de6edee6daa9d8029776423b542')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -119,18 +121,12 @@
   # profiles
   install -Dm 755 $pkgname.profile.sh "$pkgdir/etc/profile.d/$pkgname.sh"
   install -Dm 755 $pkgname.profile.csh "$pkgdir/etc/profile.d/$pkgname.csh"
-  # systemd
-  install -Dm 644 $pkgname.service \
-    "$pkgdir/usr/lib/systemd/system/$pkgname.service"
-  install -Dm 644 $pkgname.sysusers \
+  # systemd timers and services
+  install -t "${pkgdir}/usr/lib/systemd/system/" \
+    -vDm644 ${pkgname}*.{service,timer}
+  # sysusers.d
+  install -vDm 644 $pkgname.sysusers \
     "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
-  # timers (not enaled by default)
-  for _f in checkdbs disabled senddigests mailpasswds gatenews nightlygzip cullbadshunt; do
-    install -Dm 644 mailman-$_f.timer \
-      "$pkgdir/usr/lib/systemd/system/mailman-$_f.timer"
-    install -Dm 644 mailman-$_f.service \
-      "$pkgdir/usr/lib/systemd/system/mailman-$_f.service"
-  done
 }
 
 # vim:set ts=2 sw=2 et: