[arch-commits] Commit in nullmailer/repos/community-x86_64 (6 files)
Eli Schwartz
eschwartz at archlinux.org
Wed Feb 7 23:06:30 UTC 2018
Date: Wednesday, February 7, 2018 @ 23:06:29
Author: eschwartz
Revision: 290095
archrelease: copy trunk to community-x86_64
Added:
nullmailer/repos/community-x86_64/PKGBUILD
(from rev 290094, nullmailer/trunk/PKGBUILD)
nullmailer/repos/community-x86_64/nullmailer.install
(from rev 290094, nullmailer/trunk/nullmailer.install)
nullmailer/repos/community-x86_64/nullmailer.sysusers
(from rev 290094, nullmailer/trunk/nullmailer.sysusers)
nullmailer/repos/community-x86_64/nullmailer.tmpfiles
(from rev 290094, nullmailer/trunk/nullmailer.tmpfiles)
Deleted:
nullmailer/repos/community-x86_64/PKGBUILD
nullmailer/repos/community-x86_64/nullmailer.install
---------------------+
PKGBUILD | 85 +++++++++++++++++++++++++++-----------------------
nullmailer.install | 40 ++---------------------
nullmailer.sysusers | 1
nullmailer.tmpfiles | 9 +++++
4 files changed, 62 insertions(+), 73 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-02-07 23:06:02 UTC (rev 290094)
+++ PKGBUILD 2018-02-07 23:06:29 UTC (rev 290095)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer : Martin Wimpress <code at flexion.org>
-# Contributor: Roberto Alsina <ralsina at kde.org>
-# Contributor: Kurt J. Bosch <kjb-temp-2009 at alpenjodel.de>
-
-pkgname=nullmailer
-pkgver=2.0
-pkgrel=2
-pkgdesc="Simple relay-only mail transport agent."
-arch=('i686' 'x86_64')
-url="http://www.untroubled.org/nullmailer/"
-license=("GPL")
-provides=('smtp-forwarder')
-conflicts=('smtp-forwarder' 'smtp-server')
-depends=('gnutls')
-options=(emptydirs)
-install=nullmailer.install
-source=("http://www.untroubled.org/nullmailer/archive/${pkgname}-${pkgver}.tar.gz")
-md5sums=('e35e8248056fd21a2e464d34116c44a2')
-
-build() {
- cd ${pkgname}-${pkgver}
- ./configure \
- --prefix=/usr \
- --libexecdir=/usr/lib/${pkgname} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --sbindir=/usr/bin \
- --enable-tls
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- make DESTDIR="${pkgdir}" install
-
- install -Dm644 scripts/nullmailer.service "$pkgdir"/usr/lib/systemd/system/nullmailer.service
-}
Copied: nullmailer/repos/community-x86_64/PKGBUILD (from rev 290094, nullmailer/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-02-07 23:06:29 UTC (rev 290095)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer : Martin Wimpress <code at flexion.org>
+# Contributor: Roberto Alsina <ralsina at kde.org>
+# Contributor: Kurt J. Bosch <kjb-temp-2009 at alpenjodel.de>
+
+pkgname=nullmailer
+pkgver=2.0
+pkgrel=3
+pkgdesc="Simple relay-only mail transport agent."
+arch=('x86_64')
+url="https://www.untroubled.org/nullmailer/"
+license=("GPL")
+provides=('smtp-forwarder')
+conflicts=('smtp-forwarder' 'smtp-server')
+depends=('gnutls')
+options=(emptydirs)
+install=nullmailer.install
+source=("https://www.untroubled.org/nullmailer/archive/${pkgname}-${pkgver}.tar.gz"
+ "nullmailer.sysusers"
+ "nullmailer.tmpfiles")
+md5sums=('e35e8248056fd21a2e464d34116c44a2'
+ 'fa9c9f9194d4ffbe0c6cd9e325f0f34a'
+ '52e15c34a0a2187688da1f4d1a9cc784')
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure \
+ --prefix=/usr \
+ --libexecdir=/usr/lib/${pkgname} \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --sbindir=/usr/bin \
+ --enable-tls
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+
+ # covered by tmpfiles with fixed ownership
+ rm -rf "${pkgdir}"/var
+
+ install -Dm644 scripts/nullmailer.service "${pkgdir}"/usr/lib/systemd/system/nullmailer.service
+ install -Dm644 "${srcdir}"/nullmailer.sysusers "${pkgdir}"/usr/lib/sysusers.d/nullmailer.conf
+ install -Dm644 "${srcdir}"/nullmailer.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/nullmailer.conf
+}
Deleted: nullmailer.install
===================================================================
--- nullmailer.install 2018-02-07 23:06:02 UTC (rev 290094)
+++ nullmailer.install 2018-02-07 23:06:29 UTC (rev 290095)
@@ -1,35 +0,0 @@
-post_install() {
- if ! getent passwd nullmail > /dev/null; then
- echo "==> Creating nullmail user"
- usr/bin/useradd --comment "nullmailer MTA" --shell /bin/sh --home /var/spool/nullmailer --system --user-group nullmail
- fi
-
- echo "==> Creating trigger fifo"
- rm -f var/spool/nullmailer/trigger && mkfifo -m 600 var/spool/nullmailer/trigger
-
- echo "==> Fixing permissions"
- chown nullmail var/spool/nullmailer/*
- chown nullmail usr/bin/nullmailer-queue
- chmod u+s usr/bin/nullmailer-queue
- chown nullmail usr/bin/mailq
- chmod u+s usr/bin/mailq
- if ! [ -s etc/nullmailer/me ]; then
- echo "==> Configuring"
- hostnamectl --static > etc/nullmailer/me
- fi
- if ! [ -s etc/nullmailer/remotes ]; then
- echo "smarthost.example.org smtp --port=25 --auth-login --user=user --pass=pass" > etc/nullmailer/remotes
- chgrp nullmail etc/nullmailer/remotes
- chmod 640 etc/nullmailer/remotes
- fi
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- systemctl stop nullmailer
- # Leave the 'queue' directory intact
- rm -rf var/service/nullmailer/{tmp,trigger}
-}
Copied: nullmailer/repos/community-x86_64/nullmailer.install (from rev 290094, nullmailer/trunk/nullmailer.install)
===================================================================
--- nullmailer.install (rev 0)
+++ nullmailer.install 2018-02-07 23:06:29 UTC (rev 290095)
@@ -0,0 +1,5 @@
+pre_remove() {
+ systemctl stop nullmailer
+ # Leave the 'queue' directory intact
+ rm -rf var/service/nullmailer/{tmp,trigger}
+}
Copied: nullmailer/repos/community-x86_64/nullmailer.sysusers (from rev 290094, nullmailer/trunk/nullmailer.sysusers)
===================================================================
--- nullmailer.sysusers (rev 0)
+++ nullmailer.sysusers 2018-02-07 23:06:29 UTC (rev 290095)
@@ -0,0 +1 @@
+u nullmail - "nullmailer MTA" /var/spool/nullmailer
Copied: nullmailer/repos/community-x86_64/nullmailer.tmpfiles (from rev 290094, nullmailer/trunk/nullmailer.tmpfiles)
===================================================================
--- nullmailer.tmpfiles (rev 0)
+++ nullmailer.tmpfiles 2018-02-07 23:06:29 UTC (rev 290095)
@@ -0,0 +1,9 @@
+d /var/spool/nullmailer - nullmail nullmail - -
+d /var/spool/nullmailer/failed 0700 nullmail nullmail - -
+d /var/spool/nullmailer/queue 0700 nullmail nullmail - -
+d /var/spool/nullmailer/tmp 0700 nullmail nullmail - -
+p /var/spool/nullmailer/trigger 0600 nullmail nullmail - -
+z /usr/bin/mailq 4755 nullmail - - -
+z /usr/bin/nullmailer-queue 4755 nullmail - - -
+f /etc/nullmailer/me - - - - %H
+f /etc/nullmailer/remotes 0640 - nullmail - smarthost.example.org smtp --port=25 --auth-login --user=user --pass=pass
More information about the arch-commits
mailing list