Date: Monday, November 20, 2017 @ 21:26:45
Author: arojas
Revision: 267642
archrelease: copy trunk to community-staging-x86_64
Added:
sslh/repos/community-staging-x86_64/
sslh/repos/community-staging-x86_64/PKGBUILD
(from rev 267641, sslh/trunk/PKGBUILD)
sslh/repos/community-staging-x86_64/PKGBUILD.next
(from rev 267641, sslh/trunk/PKGBUILD.next)
sslh/repos/community-staging-x86_64/sslh-fork.service
(from rev 267641, sslh/trunk/sslh-fork.service)
sslh/repos/community-staging-x86_64/sslh-fork.service.next
(from rev 267641, sslh/trunk/sslh-fork.service.next)
sslh/repos/community-staging-x86_64/sslh-select.service
(from rev 267641, sslh/trunk/sslh-select.service)
sslh/repos/community-staging-x86_64/sslh-select.service.next
(from rev 267641, sslh/trunk/sslh-select.service.next)
sslh/repos/community-staging-x86_64/sslh.cfg
(from rev 267641, sslh/trunk/sslh.cfg)
sslh/repos/community-staging-x86_64/sslh.conf
(from rev 267641, sslh/trunk/sslh.conf)
sslh/repos/community-staging-x86_64/sslh.install
(from rev 267641, sslh/trunk/sslh.install)
sslh/repos/community-staging-x86_64/sslh.install.next
(from rev 267641, sslh/trunk/sslh.install.next)
sslh/repos/community-staging-x86_64/sslh.service
(from rev 267641, sslh/trunk/sslh.service)
sslh/repos/community-staging-x86_64/sslh.sysusers
(from rev 267641, sslh/trunk/sslh.sysusers)
--------------------------+
PKGBUILD | 52 ++++++++++++++++++++++++++++++++
PKGBUILD.next | 71 +++++++++++++++++++++++++++++++++++++++++++++
sslh-fork.service | 11 ++++++
sslh-fork.service.next | 12 +++++++
sslh-select.service | 10 ++++++
sslh-select.service.next | 11 ++++++
sslh.cfg | 29 ++++++++++++++++++
sslh.conf | 29 ++++++++++++++++++
sslh.install | 18 +++++++++++
sslh.install.next | 24 +++++++++++++++
sslh.service | 15 +++++++++
sslh.sysusers | 1
12 files changed, 283 insertions(+)
Copied: sslh/repos/community-staging-x86_64/PKGBUILD (from rev 267641,
sslh/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2017-11-20 21:26:45 UTC (rev 267642)
@@ -0,0 +1,52 @@
+# $Id: PKGBUILD 171217 2016-04-16 22:11:23Z seblu $
+# Maintainer: Sébastien "Seblu" Luttringer <se...@archlinux.org>
+# Contributor: Le_suisse <lesuisse.dev+aur at gmail dot com>
+# Contributor: Jason Rodriguez <jason-...@catloaf.net>
+
+pkgname=sslh
+pkgver=1.18
+pkgrel=4
+pkgdesc='SSL/SSH/OpenVPN/XMPP/tinc port multiplexer'
+arch=('x86_64')
+url='http://www.rutschle.net/tech/sslh.shtml'
+license=('GPL2')
+depends=('libcap' 'libconfig')
+backup=('etc/sslh.conf')
+install=$pkgname.install
+source=("http://www.rutschle.net/tech/sslh/$pkgname-v$pkgver.tar.gz";
+ 'sslh.conf'
+ 'sslh.sysusers'
+ 'sslh-select.service'
+ 'sslh-fork.service')
+md5sums=('0e3568d5d234516c634d4df156473298'
+ 'd5405c7ca7e1813e4d49a473e5834640'
+ 'f39544277a30595d4b7476b3f87ebbcf'
+ '0f3f9e3ac2ac4b576d684b21b566aeb9'
+ '4e64f0850ec9bd44071ae8d5369316e5')
+
+build() {
+ cd $pkgname-v$pkgver
+ make VERSION=\"v$pkgver\" USELIBCAP=1
+}
+
+package() {
+ # default arch config
+ install -Dm 644 sslh.conf "$pkgdir/etc/sslh.conf"
+ # manually install to have both ssl-fork and ssl-select
+ cd $pkgname-v$pkgver
+ 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"
+ # 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
+ cd "$pkgdir"
+ install -dm 755 usr/lib/{systemd/system,sysusers.d}
+ 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/repos/community-staging-x86_64/PKGBUILD.next (from rev 267641,
sslh/trunk/PKGBUILD.next)
===================================================================
--- community-staging-x86_64/PKGBUILD.next (rev 0)
+++ community-staging-x86_64/PKGBUILD.next 2017-11-20 21:26:45 UTC (rev
267642)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Sébastien "Seblu" Luttringer <se...@archlinux.org>
+# Contributor: Le_suisse <lesuisse.dev+aur at gmail dot com>
+# Contributor: Jason Rodriguez <jason-...@catloaf.net>
+
+pkgname=sslh
+pkgver=1.18
+pkgrel=1.2
+pkgdesc='SSL/SSH/OpenVPN/XMPP/tinc port multiplexer'
+arch=('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
<y...@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/repos/community-staging-x86_64/sslh-fork.service (from rev 267641,
sslh/trunk/sslh-fork.service)
===================================================================
--- community-staging-x86_64/sslh-fork.service (rev 0)
+++ community-staging-x86_64/sslh-fork.service 2017-11-20 21:26:45 UTC (rev
267642)
@@ -0,0 +1,11 @@
+[Unit]
+Description=SSL/SSH multiplexer
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/sslh-fork -F/etc/sslh.conf
+KillMode=process
+PIDFile=/run/sslh.pid
+
+[Install]
+WantedBy=multi-user.target
Copied: sslh/repos/community-staging-x86_64/sslh-fork.service.next (from rev
267641, sslh/trunk/sslh-fork.service.next)
===================================================================
--- community-staging-x86_64/sslh-fork.service.next
(rev 0)
+++ community-staging-x86_64/sslh-fork.service.next 2017-11-20 21:26:45 UTC
(rev 267642)
@@ -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/repos/community-staging-x86_64/sslh-select.service (from rev
267641, sslh/trunk/sslh-select.service)
===================================================================
--- community-staging-x86_64/sslh-select.service
(rev 0)
+++ community-staging-x86_64/sslh-select.service 2017-11-20 21:26:45 UTC
(rev 267642)
@@ -0,0 +1,10 @@
+[Unit]
+Description=SSL/SSH multiplexer
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/sslh-select -F/etc/sslh.conf
+PIDFile=/run/sslh.pid
+
+[Install]
+WantedBy=multi-user.target
Copied: sslh/repos/community-staging-x86_64/sslh-select.service.next (from rev
267641, sslh/trunk/sslh-select.service.next)
===================================================================
--- community-staging-x86_64/sslh-select.service.next
(rev 0)
+++ community-staging-x86_64/sslh-select.service.next 2017-11-20 21:26:45 UTC
(rev 267642)
@@ -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/repos/community-staging-x86_64/sslh.cfg (from rev 267641,
sslh/trunk/sslh.cfg)
===================================================================
--- community-staging-x86_64/sslh.cfg (rev 0)
+++ community-staging-x86_64/sslh.cfg 2017-11-20 21:26:45 UTC (rev 267642)
@@ -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/repos/community-staging-x86_64/sslh.conf (from rev 267641,
sslh/trunk/sslh.conf)
===================================================================
--- community-staging-x86_64/sslh.conf (rev 0)
+++ community-staging-x86_64/sslh.conf 2017-11-20 21:26:45 UTC (rev 267642)
@@ -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/repos/community-staging-x86_64/sslh.install (from rev 267641,
sslh/trunk/sslh.install)
===================================================================
--- community-staging-x86_64/sslh.install (rev 0)
+++ community-staging-x86_64/sslh.install 2017-11-20 21:26:45 UTC (rev
267642)
@@ -0,0 +1,18 @@
+#!/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
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
Copied: sslh/repos/community-staging-x86_64/sslh.install.next (from rev 267641,
sslh/trunk/sslh.install.next)
===================================================================
--- community-staging-x86_64/sslh.install.next (rev 0)
+++ community-staging-x86_64/sslh.install.next 2017-11-20 21:26:45 UTC (rev
267642)
@@ -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:
Copied: sslh/repos/community-staging-x86_64/sslh.service (from rev 267641,
sslh/trunk/sslh.service)
===================================================================
--- community-staging-x86_64/sslh.service (rev 0)
+++ community-staging-x86_64/sslh.service 2017-11-20 21:26:45 UTC (rev
267642)
@@ -0,0 +1,15 @@
+[Unit]
+Description=SSL/SSH multiplexer (socket mode)
+Conflicts=sslh-fork.service sslh-select.service
+Requires=sslh.socket
+PartOf=sslh.socket
+
+[Service]
+ExecStart=/usr/bin/sslh -F -f -P/tmp/pid
+KillMode=process
+CapabilityBoundingSet=CAP_NET_BIND_SERVICE CAP_NET_ADMIN CAP_SETGID CAP_SETUID
+PrivateTmp=true
+PrivateDevices=true
+ProtectSystem=full
+ProtectHome=true
+User=sslh
Copied: sslh/repos/community-staging-x86_64/sslh.sysusers (from rev 267641,
sslh/trunk/sslh.sysusers)
===================================================================
--- community-staging-x86_64/sslh.sysusers (rev 0)
+++ community-staging-x86_64/sslh.sysusers 2017-11-20 21:26:45 UTC (rev
267642)
@@ -0,0 +1 @@
+u sslh - - -
