[arch-commits] Commit in sslh/trunk (6 files)

Sébastien Luttringer seblu at archlinux.org
Thu Jun 15 00:56:59 UTC 2017 

    Date: Thursday, June 15, 2017 @ 00:56:58
  Author: seblu
Revision: 236872

upgpkg: sslh 1.18-2

Added:
  sslh/trunk/PKGBUILD.next
    (from rev 236871, sslh/trunk/next/PKGBUILD)
  sslh/trunk/sslh-fork.service.next
    (from rev 236871, sslh/trunk/next/sslh-fork.service)
  sslh/trunk/sslh-select.service.next
    (from rev 236871, sslh/trunk/next/sslh-select.service)
  sslh/trunk/sslh.cfg
    (from rev 236871, sslh/trunk/next/sslh.cfg)
  sslh/trunk/sslh.install.next
    (from rev 236871, sslh/trunk/next/sslh.install)
Deleted:
  sslh/trunk/next/

--------------------------+
 PKGBUILD.next            |   71 +++++++++++++++++++++++++++++++++++++++++++++
 sslh-fork.service.next   |   12 +++++++
 sslh-select.service.next |   11 ++++++
 sslh.cfg                 |   29 ++++++++++++++++++
 sslh.install.next        |   24 +++++++++++++++
 5 files changed, 147 insertions(+)

Copied: sslh/trunk/PKGBUILD.next (from rev 236871, sslh/trunk/next/PKGBUILD)
===================================================================
--- PKGBUILD.next	                        (rev 0)
+++ PKGBUILD.next	2017-06-15 00:56:58 UTC (rev 236872)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Sébastien "Seblu" Luttringer <seblu at archlinux.org>
+# Contributor: Le_suisse <lesuisse.dev+aur at gmail dot com>
+# Contributor: Jason Rodriguez <jason-aur at catloaf.net>
+
+pkgname=sslh
+pkgver=1.18
+pkgrel=1.2
+pkgdesc='SSL/SSH/OpenVPN/XMPP/tinc port multiplexer'
+arch=('i686' 'x86_64')
+url='http://www.rutschle.net/tech/sslh.shtml'
+license=('GPL2')
+makedepends=('systemd')
+depends=('libcap' 'libconfig' 'libsystemd')
+backup=('etc/sslh.cfg')
+install=$pkgname.install
+source=("http://www.rutschle.net/tech/sslh/$pkgname-v$pkgver.tar.gz"{,.asc}
+        'sslh-master.zip'
+        'sslh.cfg'
+        'sslh.sysusers'
+        'sslh.service'
+        'sslh-select.service'
+        'sslh-fork.service')
+validpgpkeys=('CDDDBADBEA4B72748E007D326C056F7AC7934136') # Yves Rutschle <yves at rutschle.net>
+md5sums=('0e3568d5d234516c634d4df156473298'
+         'SKIP'
+         '5cfde7884d5c9d7a8b7b971b3f37e94b'
+         'd5405c7ca7e1813e4d49a473e5834640'
+         'f39544277a30595d4b7476b3f87ebbcf'
+         'e66490eacc9cb586e48e4e0562ac25e3'
+         '7f95dc8ce4c8dfbe5cd0b1cabb8acb31'
+         'ea5733ec4c68709a813e84b4403e342a')
+
+build() {
+  #cd $pkgname-v$pkgver
+  cd sslh-master
+  #FIXME: https://github.com/yrutschle/sslh/issues/103
+  export CFLAGS=''
+  make VERSION=\"v$pkgver\" USELIBCAP=1 USESYSTEMD=1 all systemd-sslh-generator
+}
+
+#check() {
+#  cd $pkgname-v$pkgver
+#  make test
+#}
+
+package() {
+  # default arch config
+  install -Dm 644 sslh.cfg "$pkgdir/etc/sslh.cfg"
+  # manually install to have both ssl-fork and ssl-select
+  #cd $pkgname-v$pkgver
+  cd sslh-master
+  install -Dm 755 sslh-fork "$pkgdir/usr/bin/sslh-fork"
+  install -Dm 755 sslh-select "$pkgdir/usr/bin/sslh-select"
+  ln -s sslh-fork "$pkgdir/usr/bin/sslh"
+  # install manpage
+  install -Dm 644 sslh.8.gz "$pkgdir/usr/share/man/man8/sslh.8.gz"
+  ln -s sslh.8.gz "$pkgdir/usr/share/man/man8/sslh-fork.8.gz"
+  ln -s sslh.8.gz "$pkgdir/usr/share/man/man8/sslh-select.8.gz"
+  # install examples files
+  install -Dm 644 basic.cfg "$pkgdir/usr/share/doc/$pkgname/basic.cfg"
+  install -Dm 644 example.cfg "$pkgdir/usr/share/doc/$pkgname/example.cfg"
+  # systemd
+  install -dm 755 "$pkgdir"/usr/lib/{systemd/system,sysusers.d}
+  install -Dm 755 systemd-sslh-generator "$pkgdir/usr/lib/systemd/system-generators/systemd-sslh-generator"
+  cd "$pkgdir"
+  install -Dm 644 "$srcdir"/sslh{,-fork,-select}.service usr/lib/systemd/system
+  install -Dm 644 "$srcdir"/sslh.sysusers usr/lib/sysusers.d/sslh.conf
+}
+
+# vim:set ts=2 sw=2 et:

Copied: sslh/trunk/sslh-fork.service.next (from rev 236871, sslh/trunk/next/sslh-fork.service)
===================================================================
--- sslh-fork.service.next	                        (rev 0)
+++ sslh-fork.service.next	2017-06-15 00:56:58 UTC (rev 236872)
@@ -0,0 +1,12 @@
+[Unit]
+Description=SSL/SSH multiplexer (fork mode)
+Conflicts=sslh-select.service sslh.socket
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/sslh-fork -F
+KillMode=process
+PIDFile=/run/sslh.pid
+
+[Install]
+WantedBy=multi-user.target

Copied: sslh/trunk/sslh-select.service.next (from rev 236871, sslh/trunk/next/sslh-select.service)
===================================================================
--- sslh-select.service.next	                        (rev 0)
+++ sslh-select.service.next	2017-06-15 00:56:58 UTC (rev 236872)
@@ -0,0 +1,11 @@
+[Unit]
+Description=SSL/SSH multiplexer (select mode)
+Conflicts=sslh-fork.service sslh.socket
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/sslh-select -F
+PIDFile=/run/sslh.pid
+
+[Install]
+WantedBy=multi-user.target

Copied: sslh/trunk/sslh.cfg (from rev 236871, sslh/trunk/next/sslh.cfg)
===================================================================
--- sslh.cfg	                        (rev 0)
+++ sslh.cfg	2017-06-15 00:56:58 UTC (rev 236872)
@@ -0,0 +1,29 @@
+# Default Arch configuration
+# You can find more examples in /usr/share/doc/sslh
+
+verbose: false;
+foreground: true;
+inetd: false;
+numeric: false;
+transparent: false;
+timeout: 2;
+user: "sslh";
+pidfile: "/run/sslh.pid";
+
+
+listen:
+(
+    { host: "::0"; port: "443"; }
+);
+
+protocols:
+(
+     { name: "ssh"; service: "ssh"; host: "localhost"; port: "22"; probe: "builtin"; },
+     { name: "openvpn"; host: "localhost"; port: "1194"; probe: "builtin"; },
+     { name: "xmpp"; host: "localhost"; port: "5222"; probe: "builtin"; },
+     { name: "http"; host: "localhost"; port: "80"; probe: "builtin"; },
+     { name: "ssl"; host: "localhost"; port: "8443"; probe: "builtin"; },
+     { name: "anyprot"; host: "localhost"; port: "8443"; probe: "builtin"; }
+);
+
+# vim:set ts=4 sw=4 et:

Copied: sslh/trunk/sslh.install.next (from rev 236871, sslh/trunk/next/sslh.install)
===================================================================
--- sslh.install.next	                        (rev 0)
+++ sslh.install.next	2017-06-15 00:56:58 UTC (rev 236872)
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  if (( "$(vercmp $2 1.14-1)" <= 0 )); then
+    cat << EOF
+===> sslh systemd service has been splitted in sslh-fork.service and sslh-select.service
+EOF
+  fi
+  if (( "$(vercmp $2 1.16-3)" < 0 )); then
+    cat << EOF
+===> sslh may runs as unprivileged sslh user. Check your setup.
+EOF
+  fi
+  if (( "$(vercmp $2 1.18-2)" < 0 )); then
+    cat << EOF
+===> Default config path is now /etc/sslh.cfg (as required by systemd generator)
+===> Rename your /etc/sslh.conf into /etc/sslh.cfg
+EOF
+  fi
+}
+
+# vim:set ts=2 sw=2 ft=sh et:

More information about the arch-commits mailing list