Tue Feb 5 00:07:38 PST 2013

4 files changed, 46 insertions, 17 deletions

diff --git a/community/sslh/PKGBUILD b/community/sslh/PKGBUILD
index 023a11422..ed60e5e8a 100644
--- a/community/sslh/PKGBUILD
+++ b/community/sslh/PKGBUILD
@@ -1,36 +1,31 @@
-# $Id: PKGBUILD 81431 2012-12-20 23:33:39Z seblu $
+# $Id: PKGBUILD 83699 2013-02-04 14:24:41Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@archlinux.org>
 # Contributor: Le_suisse <lesuisse.dev+aur at gmail dot com>
 # Contributor: Jason Rodriguez <jason-aur@catloaf.net>
 
 pkgname=sslh
 pkgver=1.14
-pkgrel=1
+pkgrel=2
 pkgdesc='SSL/SSH/OpenVPN/XMPP/tinc port multiplexer'
 arch=('i686' 'x86_64')
 url='http://www.rutschle.net/tech/sslh.shtml'
 license=('GPL2')
 depends=('libconfig')
-backup=('etc/conf.d/sslh' 'etc/sslh.conf')
+backup=('etc/sslh.conf')
+install=$pkgname.install
 source=("http://www.rutschle.net/tech/$pkgname-$pkgver.tar.gz"
-        'sslh.rc'
-        'sslh.conf')
+       'sslh-select.service'
+       'sslh-fork.service')
 md5sums=('36e64bd6c7d0a299d5acd1109988099b'
-         'c2a0c7c58d091acf5b4672f58066ee8f'
-         'c51c63d2b28080bae4c1c7a0c469bab7')
+         '67e8c9511508673254afa3e1ca61ff89'
+         'a4402244a4d819beb3c6dc7ff031084e')
 
 build() {
   cd $pkgname-$pkgver
-  # fix archlinux path in manpage
-  sed -i 's/init.d/rc.d/' sslh.pod
-  sed -i 's+/etc/default+/etc/conf.d+' sslh.pod
   make VERSION=\"v$pkgver\"
 }
 
 package() {
-  # install initscripts
-  install -Dm 755 sslh.rc "$pkgdir/etc/rc.d/sslh"
-  install -Dm 644 sslh.conf "$pkgdir/etc/conf.d/sslh"
   # manually install to have both ssl-fork and ssl-select
   cd $pkgname-$pkgver
   install -Dm 0755 sslh-fork "$pkgdir/usr/bin/sslh-fork"
@@ -40,9 +35,11 @@ package() {
   install -Dm 0644 sslh.8.gz "$pkgdir/usr/share/man/man8/sslh.8.gz"
   # install example file
   install -Dm 0644 example.cfg "$pkgdir/etc/sslh.conf"
-  # install systemd service
-  install -Dm 644 scripts/systemd.sslh.service \
-    "$pkgdir/usr/lib/systemd/system/sslh.service"
+  # systemd
+  install -Dm 644 $srcdir/sslh-fork.service \
+    "$pkgdir/usr/lib/systemd/system/sslh-fork.service"
+  install -Dm 644 $srcdir/sslh-select.service \
+    "$pkgdir/usr/lib/systemd/system/sslh-select.service"
 }
 
-# vim:set ts=2 sw=2 ft=sh et:
+# vim:set ts=2 sw=2 et:
diff --git a/community/sslh/sslh-fork.service b/community/sslh/sslh-fork.service
new file mode 100644
index 000000000..cbfc41686
--- /dev/null
+++ b/community/sslh/sslh-fork.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=SSL/SSH multiplexer
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/sslh-fork -f -F /etc/sslh.conf
+KillMode=process
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/sslh/sslh-select.service b/community/sslh/sslh-select.service
new file mode 100644
index 000000000..43f4f2787
--- /dev/null
+++ b/community/sslh/sslh-select.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=SSL/SSH multiplexer
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/sslh-select -f -F /etc/sslh.conf
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/sslh/sslh.install b/community/sslh/sslh.install
new file mode 100644
index 000000000..46ce7beae
--- /dev/null
+++ b/community/sslh/sslh.install
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  if [ "$(vercmp $2 1.14-1)" -le 0 ]; then
+    cat << EOF
+===> sslh systemd service has been splitted in sslh-fork.service and sslh-select.service
+EOF
+    fi
+}
+
+# vim:set ts=2 sw=2 ft=sh et: