[arch-commits] Commit in sslh/repos (18 files)

Sébastien Luttringer seblu at archlinux.org
Thu Aug 21 14:39:34 UTC 2014


    Date: Thursday, August 21, 2014 @ 16:39:34
  Author: seblu
Revision: 117711

archrelease: copy trunk to community-i686, community-x86_64

Added:
  sslh/repos/community-i686/PKGBUILD
    (from rev 117710, sslh/trunk/PKGBUILD)
  sslh/repos/community-i686/sslh-fork.service
    (from rev 117710, sslh/trunk/sslh-fork.service)
  sslh/repos/community-i686/sslh-select.service
    (from rev 117710, sslh/trunk/sslh-select.service)
  sslh/repos/community-i686/sslh.conf
    (from rev 117710, sslh/trunk/sslh.conf)
  sslh/repos/community-i686/sslh.install
    (from rev 117710, sslh/trunk/sslh.install)
  sslh/repos/community-x86_64/PKGBUILD
    (from rev 117710, sslh/trunk/PKGBUILD)
  sslh/repos/community-x86_64/sslh-fork.service
    (from rev 117710, sslh/trunk/sslh-fork.service)
  sslh/repos/community-x86_64/sslh-select.service
    (from rev 117710, sslh/trunk/sslh-select.service)
  sslh/repos/community-x86_64/sslh.conf
    (from rev 117710, sslh/trunk/sslh.conf)
  sslh/repos/community-x86_64/sslh.install
    (from rev 117710, sslh/trunk/sslh.install)
Deleted:
  sslh/repos/community-i686/PKGBUILD
  sslh/repos/community-i686/sslh-fork.service
  sslh/repos/community-i686/sslh-select.service
  sslh/repos/community-i686/sslh.install
  sslh/repos/community-x86_64/PKGBUILD
  sslh/repos/community-x86_64/sslh-fork.service
  sslh/repos/community-x86_64/sslh-select.service
  sslh/repos/community-x86_64/sslh.install

--------------------------------------+
 /PKGBUILD                            |  100 +++++++++++++++++++++++++++++++++
 /sslh-fork.service                   |   22 +++++++
 /sslh-select.service                 |   20 ++++++
 /sslh.install                        |   64 +++++++++++++++++++++
 community-i686/PKGBUILD              |   45 --------------
 community-i686/sslh-fork.service     |   10 ---
 community-i686/sslh-select.service   |    9 --
 community-i686/sslh.conf             |   29 +++++++++
 community-i686/sslh.install          |   13 ----
 community-x86_64/PKGBUILD            |   45 --------------
 community-x86_64/sslh-fork.service   |   10 ---
 community-x86_64/sslh-select.service |    9 --
 community-x86_64/sslh.conf           |   29 +++++++++
 community-x86_64/sslh.install        |   13 ----
 14 files changed, 264 insertions(+), 154 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2014-08-21 14:39:06 UTC (rev 117710)
+++ community-i686/PKGBUILD	2014-08-21 14:39:34 UTC (rev 117711)
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer: Sébastien Luttringer
-# Contributor: Le_suisse <lesuisse.dev+aur at gmail dot com>
-# Contributor: Jason Rodriguez <jason-aur at catloaf.net>
-
-pkgname=sslh
-pkgver=1.16
-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=('libcap' 'libconfig')
-backup=('etc/sslh.conf')
-install=$pkgname.install
-source=("http://www.rutschle.net/tech/$pkgname-v$pkgver.tar.gz"
-       'sslh-select.service'
-       'sslh-fork.service')
-md5sums=('1e85b84eb82a96b81de9b1e637a3e795'
-         '67e8c9511508673254afa3e1ca61ff89'
-         'a4402244a4d819beb3c6dc7ff031084e')
-
-build() {
-  cd $pkgname-v$pkgver
-  make VERSION=\"v$pkgver\" USELIBCAP=1
-}
-
-package() {
-  # manually install to have both ssl-fork and ssl-select
-  cd $pkgname-v$pkgver
-  install -Dm 0755 sslh-fork "$pkgdir/usr/bin/sslh-fork"
-  install -Dm 0755 sslh-select "$pkgdir/usr/bin/sslh-select"
-  ln -s sslh-fork "$pkgdir/usr/bin/sslh"
-  # install manpage
-  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"
-  # 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 et:

Copied: sslh/repos/community-i686/PKGBUILD (from rev 117710, sslh/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2014-08-21 14:39:34 UTC (rev 117711)
@@ -0,0 +1,50 @@
+# $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.16
+pkgrel=3
+pkgdesc='SSL/SSH/OpenVPN/XMPP/tinc port multiplexer'
+arch=('i686' '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/$pkgname-v$pkgver.tar.gz"
+        'sslh.conf'
+        'sslh-select.service'
+        'sslh-fork.service')
+md5sums=('c6e7d1cb0adb15f6efe480e36d98c560'
+         'd5405c7ca7e1813e4d49a473e5834640'
+         'eebafa2f6c1b3f88ade8e0a3c054e1b8'
+         '77e84cac50178eb389f7b25387c1f403')
+
+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
+  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 et:

Deleted: community-i686/sslh-fork.service
===================================================================
--- community-i686/sslh-fork.service	2014-08-21 14:39:06 UTC (rev 117710)
+++ community-i686/sslh-fork.service	2014-08-21 14:39:34 UTC (rev 117711)
@@ -1,10 +0,0 @@
-[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

Copied: sslh/repos/community-i686/sslh-fork.service (from rev 117710, sslh/trunk/sslh-fork.service)
===================================================================
--- community-i686/sslh-fork.service	                        (rev 0)
+++ community-i686/sslh-fork.service	2014-08-21 14:39:34 UTC (rev 117711)
@@ -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

Deleted: community-i686/sslh-select.service
===================================================================
--- community-i686/sslh-select.service	2014-08-21 14:39:06 UTC (rev 117710)
+++ community-i686/sslh-select.service	2014-08-21 14:39:34 UTC (rev 117711)
@@ -1,9 +0,0 @@
-[Unit]
-Description=SSL/SSH multiplexer
-After=network.target
-
-[Service]
-ExecStart=/usr/bin/sslh-select -f -F /etc/sslh.conf
-
-[Install]
-WantedBy=multi-user.target

Copied: sslh/repos/community-i686/sslh-select.service (from rev 117710, sslh/trunk/sslh-select.service)
===================================================================
--- community-i686/sslh-select.service	                        (rev 0)
+++ community-i686/sslh-select.service	2014-08-21 14:39:34 UTC (rev 117711)
@@ -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-i686/sslh.conf (from rev 117710, sslh/trunk/sslh.conf)
===================================================================
--- community-i686/sslh.conf	                        (rev 0)
+++ community-i686/sslh.conf	2014-08-21 14:39:34 UTC (rev 117711)
@@ -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:

Deleted: community-i686/sslh.install
===================================================================
--- community-i686/sslh.install	2014-08-21 14:39:06 UTC (rev 117710)
+++ community-i686/sslh.install	2014-08-21 14:39:34 UTC (rev 117711)
@@ -1,13 +0,0 @@
-#!/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:

Copied: sslh/repos/community-i686/sslh.install (from rev 117710, sslh/trunk/sslh.install)
===================================================================
--- community-i686/sslh.install	                        (rev 0)
+++ community-i686/sslh.install	2014-08-21 14:39:34 UTC (rev 117711)
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+post_install() {
+  getent passwd sslh >/dev/null || useradd -M -d /var/empty -r -U -M sslh
+  :
+}
+
+# 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
+    post_install "$1"
+    cat << EOF
+===> sslh may runs as unprivileged sslh user. Check your setup.
+EOF
+  fi
+}
+
+# arg 1:  the old package version
+post_remove() {
+  userdel -f sslh &>/dev/null
+  groupdel sslh &>/dev/null
+  :
+}
+
+# vim:set ts=2 sw=2 ft=sh et:

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2014-08-21 14:39:06 UTC (rev 117710)
+++ community-x86_64/PKGBUILD	2014-08-21 14:39:34 UTC (rev 117711)
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer: Sébastien Luttringer
-# Contributor: Le_suisse <lesuisse.dev+aur at gmail dot com>
-# Contributor: Jason Rodriguez <jason-aur at catloaf.net>
-
-pkgname=sslh
-pkgver=1.16
-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=('libcap' 'libconfig')
-backup=('etc/sslh.conf')
-install=$pkgname.install
-source=("http://www.rutschle.net/tech/$pkgname-v$pkgver.tar.gz"
-       'sslh-select.service'
-       'sslh-fork.service')
-md5sums=('1e85b84eb82a96b81de9b1e637a3e795'
-         '67e8c9511508673254afa3e1ca61ff89'
-         'a4402244a4d819beb3c6dc7ff031084e')
-
-build() {
-  cd $pkgname-v$pkgver
-  make VERSION=\"v$pkgver\" USELIBCAP=1
-}
-
-package() {
-  # manually install to have both ssl-fork and ssl-select
-  cd $pkgname-v$pkgver
-  install -Dm 0755 sslh-fork "$pkgdir/usr/bin/sslh-fork"
-  install -Dm 0755 sslh-select "$pkgdir/usr/bin/sslh-select"
-  ln -s sslh-fork "$pkgdir/usr/bin/sslh"
-  # install manpage
-  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"
-  # 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 et:

Copied: sslh/repos/community-x86_64/PKGBUILD (from rev 117710, sslh/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2014-08-21 14:39:34 UTC (rev 117711)
@@ -0,0 +1,50 @@
+# $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.16
+pkgrel=3
+pkgdesc='SSL/SSH/OpenVPN/XMPP/tinc port multiplexer'
+arch=('i686' '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/$pkgname-v$pkgver.tar.gz"
+        'sslh.conf'
+        'sslh-select.service'
+        'sslh-fork.service')
+md5sums=('c6e7d1cb0adb15f6efe480e36d98c560'
+         'd5405c7ca7e1813e4d49a473e5834640'
+         'eebafa2f6c1b3f88ade8e0a3c054e1b8'
+         '77e84cac50178eb389f7b25387c1f403')
+
+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
+  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 et:

Deleted: community-x86_64/sslh-fork.service
===================================================================
--- community-x86_64/sslh-fork.service	2014-08-21 14:39:06 UTC (rev 117710)
+++ community-x86_64/sslh-fork.service	2014-08-21 14:39:34 UTC (rev 117711)
@@ -1,10 +0,0 @@
-[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

Copied: sslh/repos/community-x86_64/sslh-fork.service (from rev 117710, sslh/trunk/sslh-fork.service)
===================================================================
--- community-x86_64/sslh-fork.service	                        (rev 0)
+++ community-x86_64/sslh-fork.service	2014-08-21 14:39:34 UTC (rev 117711)
@@ -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

Deleted: community-x86_64/sslh-select.service
===================================================================
--- community-x86_64/sslh-select.service	2014-08-21 14:39:06 UTC (rev 117710)
+++ community-x86_64/sslh-select.service	2014-08-21 14:39:34 UTC (rev 117711)
@@ -1,9 +0,0 @@
-[Unit]
-Description=SSL/SSH multiplexer
-After=network.target
-
-[Service]
-ExecStart=/usr/bin/sslh-select -f -F /etc/sslh.conf
-
-[Install]
-WantedBy=multi-user.target

Copied: sslh/repos/community-x86_64/sslh-select.service (from rev 117710, sslh/trunk/sslh-select.service)
===================================================================
--- community-x86_64/sslh-select.service	                        (rev 0)
+++ community-x86_64/sslh-select.service	2014-08-21 14:39:34 UTC (rev 117711)
@@ -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-x86_64/sslh.conf (from rev 117710, sslh/trunk/sslh.conf)
===================================================================
--- community-x86_64/sslh.conf	                        (rev 0)
+++ community-x86_64/sslh.conf	2014-08-21 14:39:34 UTC (rev 117711)
@@ -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:

Deleted: community-x86_64/sslh.install
===================================================================
--- community-x86_64/sslh.install	2014-08-21 14:39:06 UTC (rev 117710)
+++ community-x86_64/sslh.install	2014-08-21 14:39:34 UTC (rev 117711)
@@ -1,13 +0,0 @@
-#!/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:

Copied: sslh/repos/community-x86_64/sslh.install (from rev 117710, sslh/trunk/sslh.install)
===================================================================
--- community-x86_64/sslh.install	                        (rev 0)
+++ community-x86_64/sslh.install	2014-08-21 14:39:34 UTC (rev 117711)
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+post_install() {
+  getent passwd sslh >/dev/null || useradd -M -d /var/empty -r -U -M sslh
+  :
+}
+
+# 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
+    post_install "$1"
+    cat << EOF
+===> sslh may runs as unprivileged sslh user. Check your setup.
+EOF
+  fi
+}
+
+# arg 1:  the old package version
+post_remove() {
+  userdel -f sslh &>/dev/null
+  groupdel sslh &>/dev/null
+  :
+}
+
+# vim:set ts=2 sw=2 ft=sh et:




More information about the arch-commits mailing list