From 68e8645dcd1ce619af6d92f3645c43b15bc5ac71 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Wed, 3 Jul 2013 00:48:29 -0700
Subject: Wed Jul  3 00:48:29 PDT 2013

---
 community/opensmtpd/PKGBUILD | 49 ++++++++++++++++++++++++++------------------
 1 file changed, 29 insertions(+), 20 deletions(-)

(limited to 'community/opensmtpd/PKGBUILD')

diff --git a/community/opensmtpd/PKGBUILD b/community/opensmtpd/PKGBUILD
index 5e588c010..e56eebe63 100644
--- a/community/opensmtpd/PKGBUILD
+++ b/community/opensmtpd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 92253 2013-06-03 11:15:25Z allan $
+# $Id: PKGBUILD 93322 2013-07-01 22:20:09Z seblu $
 # Maintainer: Sébastien Luttringer
 
 pkgname=opensmtpd
-pkgver=5.3.2p1
-pkgrel=2
+pkgver=5.3.3p1
+pkgrel=1
 pkgdesc='Free implementation of the server-side SMTP protocol'
 arch=('i686' 'x86_64')
 url='http://www.opensmtpd.org/'
@@ -11,29 +11,40 @@ license=('custom')
 depends=('libevent')
 provides=('smtp-server' 'smtp-forwarder')
 conflicts=('smtp-server' 'smtp-forwarder')
-backup=('etc/smtpd.conf' 'etc/aliases' 'etc/virtual' 'etc/secrets')
+backup=('etc/smtpd/smtpd.conf' 'etc/smtpd/aliases')
 install=opensmtpd.install
 source=("http://www.opensmtpd.org/archives/$pkgname-$pkgver.tar.gz"
         'smtpd.service'
         'smtpd.socket')
-md5sums=('8fc513dd632461f70e433103d75dbf50'
+md5sums=('795982f9b0b45c7645f897ba2ead0024'
          'a278f272d97a9fe5a8aac784a7c98d67'
          'c2c01e9ca78df3f65efe40a7c0e17ee0')
 
+prepare() {
+  cd $pkgname-$pkgver
+  sed -i 's,etc/aliases,etc/smtpd/aliases,' smtpd/smtpd.conf
+  # regen configure. don't use bootstrap script (doesn't support automake 1.14)
+  libtoolize --copy --force
+  aclocal -I m4
+  autoconf
+  autoheader
+  automake --foreign --add-missing --copy
+}
+
 build() {
   cd $pkgname-$pkgver
-  ./bootstrap
   ./configure \
     --prefix=/usr \
-    --sysconfdir=/etc \
+    --sysconfdir=/etc/smtpd \
     --sbindir=/usr/bin \
     --libexecdir=/usr/bin \
     --with-maildir=/var/spool/mail \
     --with-privsep-path=/var/empty \
     --with-sock-dir=/run \
-    --with-privsep-user=mail \
-    --with-filter-user=mail \
-    --with-queue-user=mail \
+    --with-privsep-user=smtpd \
+    --with-lookup-user=smtpd \
+    --with-queue-user=smtpq \
+    --with-filter-user=smtpf \
     --with-pam
   make
 }
@@ -41,23 +52,21 @@ build() {
 package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir/" install
+  # license
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-
-  cd "$pkgdir"
   # working directory
+  cd "$pkgdir"
   install -dm711 var/spool/smtpd
-  # license
   install -Dm644 "$srcdir/smtpd.service" usr/lib/systemd/system/smtpd.service
   install -Dm644 "$srcdir/smtpd.socket" usr/lib/systemd/system/smtpd.socket
   # remove duplicate hardlink into a subfolder
-  rm -r usr/bin/opensmtpd
-  # empty aliases file
-  install -Dm644 /dev/null "$pkgdir/etc/aliases"
-  install -Dm644 /dev/null "$pkgdir/etc/virtual"
-  install -Dm640 /dev/null "$pkgdir/etc/secrets"
+  rm -vr usr/bin/opensmtpd
+  # empty aliases file (used by default config)
+  install -Dm644 /dev/null "$pkgdir/etc/smtpd/aliases"
   # fake sendmail binary (used to be smtp-forwarder)
-  # use hardlink as upstream does...
-  ln "$pkgdir/usr/bin/smtpctl" "$pkgdir/usr/bin/sendmail"
+  # use hardlink as upstream does
+  cd "$pkgdir/usr/bin"
+  ln smtpctl "$pkgdir/usr/bin/sendmail"
 }
 
 # vim:set ts=2 sw=2 et:
-- 
cgit v1.2.3-54-g00ecf