Sun Jun 24 00:04:11 UTC 2012

6 files changed, 72 insertions, 9 deletions

diff --git a/community/exim/PKGBUILD b/community/exim/PKGBUILD
index 2678ea80e..a4fc221fa 100644
--- a/community/exim/PKGBUILD
+++ b/community/exim/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 71941 2012-06-03 21:58:45Z lfleischer $
+# $Id: PKGBUILD 72787 2012-06-22 12:50:29Z dreisner $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=exim
 pkgver=4.80
-pkgrel=1
+pkgrel=2
 pkgdesc="Message Transfer Agent"
 arch=('x86_64' 'i686')
 url='http://www.exim.org/'
@@ -21,13 +21,23 @@ source=("http://mirror.switch.ch/ftp/mirror/exim/exim/exim4/exim-$pkgver.tar.bz2
         exim
         exim.logrotate
         exim.conf.d
-        exim.Makefile)
+        exim.Makefile
+        exim-submission@.service
+        exim.service
+        exim@.service
+        exim.socket
+        exim-submission.socket)
 sha256sums=('787b6defd37fa75311737bcfc42e9e2b2cc62c5d027eed35bb7d800b2d9a0984'
             '932c9149b6809c70e94c1256e28325d197bbf80d27322793e217d4b692d49c5a'
             '48457622b22de9721efe9f143a88e5f5ce833b792d2e757237b6cdb74a1708e6'
             '7f1408f9c5d905968e665941f5c5efcf9da53e7a0bbef6c66220343bc2ae994b'
             '0209c701f8696a9628d43c1684105eadd35d1caba199b94e3a54a4d26cecff01'
-            '7d1e062c907a06293eee40a3139f70c74a055374b234fb8c431ea68362bdda55')
+            '7d1e062c907a06293eee40a3139f70c74a055374b234fb8c431ea68362bdda55'
+            '32def7387aaa040b994c0d399c6053dc42d9da4c8c8f0a34d33da653be27e324'
+            '99aaf3c960396fc08ec918fdca1cf73850960f6c519982d1a653f2e673754445'
+            '0436411932d6b6268db54a84e4ffc209bde0fa7567442d8e3d138557eeccbad4'
+            '3e3d8b6be2741d2587a496196c08b3f2ffa05b5803b2bf9fb49359cef3a98d26'
+            'd3bb58f0fbeaaa33c812a823708664bbcd828da7d24e2a098f84a15aee443fee')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -39,10 +49,10 @@ build() {
 package() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  install -Dm0644 ../exim.logrotate "${pkgdir}/etc/logrotate.d/exim"
-  install -Dm0644 ../exim.conf.d "${pkgdir}/etc/conf.d/exim"
+  install -Dm0644 $srcdir/exim.logrotate "${pkgdir}/etc/logrotate.d/exim"
+  install -Dm0644 $srcdir/exim.conf.d "${pkgdir}/etc/conf.d/exim"
   install -Dm0644 doc/exim.8 "${pkgdir}/usr/share/man/man8/exim.8"
-  install -Dm0755 ../exim "${pkgdir}/etc/rc.d/exim"
+  install -Dm0755 $srcdir/exim "${pkgdir}/etc/rc.d/exim"
 
   mkdir -p "${pkgdir}/var/spool/exim/db" "${pkgdir}/etc/mail" \
     "${pkgdir}/var/log/exim" "${pkgdir}/usr"/{lib,sbin}
@@ -68,6 +78,11 @@ package() {
   # fhs compliancy
   ln -s ../sbin/exim ../lib/sendmail
 
-  mkdir -p "$pkgdir/etc/rc.d"
-  cp "$srcdir/exim" "$pkgdir/etc/rc.d"
+  install -Dm0644 "$srcdir/exim-submission@.service" \
+    "${pkgdir}/usr/lib/systemd/system/exim-submission@.service"
+  install -Dm0644 "$srcdir/exim.service" "${pkgdir}/usr/lib/systemd/system/exim.service"
+  install -Dm0644 "$srcdir/exim@.service" "${pkgdir}/usr/lib/systemd/system/exim@.service"
+  install -Dm0644 "$srcdir/exim.socket" "${pkgdir}/usr/lib/systemd/system/exim.socket"
+  install -Dm0644 "$srcdir/exim-submission.socket" \
+    "${pkgdir}/usr/lib/systemd/system/exim-submission.socket"
 }
diff --git a/community/exim/exim-submission.socket b/community/exim/exim-submission.socket
new file mode 100644
index 000000000..b9593e2ef
--- /dev/null
+++ b/community/exim/exim-submission.socket
@@ -0,0 +1,10 @@
+[Unit]
+Description=Exim Mail Transfer Agent (message submission)
+Conflicts=exim.service
+
+[Socket]
+ListenStream=587
+Accept=yes
+
+[Install]
+WantedBy=sockets.target
diff --git a/community/exim/exim-submission@.service b/community/exim/exim-submission@.service
new file mode 100644
index 000000000..8b1d056a8
--- /dev/null
+++ b/community/exim/exim-submission@.service
@@ -0,0 +1,11 @@
+# It doesn't make sense for this to be separate from exim@.service
+# However, I couldn't think of a way to have two .socket files point
+# to it ([Socket] Service= is rejected if Accept=yes is set).
+
+[Unit]
+Description=Exim Mail Daemon per-connection server (message submission)
+
+[Service]
+ExecStart=-/usr/sbin/exim -bs
+StandardInput=socket
+StandardError=syslog
diff --git a/community/exim/exim.service b/community/exim/exim.service
new file mode 100644
index 000000000..de52fd14f
--- /dev/null
+++ b/community/exim/exim.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Exim Mail Daemon
+
+[Service]
+PIDFile=/var/run/exim.pid
+ExecStart=/usr/sbin/exim -bdf -q30m
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/exim/exim.socket b/community/exim/exim.socket
new file mode 100644
index 000000000..36d28684f
--- /dev/null
+++ b/community/exim/exim.socket
@@ -0,0 +1,10 @@
+[Unit]
+Description=Exim Mail Transfer Agent
+Conflicts=exim.service
+
+[Socket]
+ListenStream=25
+Accept=yes
+
+[Install]
+WantedBy=sockets.target
diff --git a/community/exim/exim@.service b/community/exim/exim@.service
new file mode 100644
index 000000000..120485b8b
--- /dev/null
+++ b/community/exim/exim@.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=Exim Mail Daemon per-connection server
+
+[Service]
+ExecStart=-/usr/sbin/exim -bs
+StandardInput=socket
+StandardError=syslog