Date: Monday, February 4, 2013 @ 15:24:41 Author: seblu Revision: 83699
archrelease: copy trunk to community-i686, community-x86_64 Added: sslh/repos/community-i686/PKGBUILD (from rev 83698, sslh/trunk/PKGBUILD) sslh/repos/community-i686/sslh-fork.service (from rev 83698, sslh/trunk/sslh-fork.service) sslh/repos/community-i686/sslh-select.service (from rev 83698, sslh/trunk/sslh-select.service) sslh/repos/community-i686/sslh.install (from rev 83698, sslh/trunk/sslh.install) sslh/repos/community-x86_64/PKGBUILD (from rev 83698, sslh/trunk/PKGBUILD) sslh/repos/community-x86_64/sslh-fork.service (from rev 83698, sslh/trunk/sslh-fork.service) sslh/repos/community-x86_64/sslh-select.service (from rev 83698, sslh/trunk/sslh-select.service) sslh/repos/community-x86_64/sslh.install (from rev 83698, sslh/trunk/sslh.install) Deleted: sslh/repos/community-i686/PKGBUILD sslh/repos/community-i686/sslh.conf sslh/repos/community-i686/sslh.rc sslh/repos/community-x86_64/PKGBUILD sslh/repos/community-x86_64/sslh.conf sslh/repos/community-x86_64/sslh.rc --------------------------------------+ community-i686/PKGBUILD | 93 +++++++++++++++------------------ community-i686/sslh-fork.service | 10 +++ community-i686/sslh-select.service | 9 +++ community-i686/sslh.conf | 3 - community-i686/sslh.install | 13 ++++ community-i686/sslh.rc | 34 ------------ community-x86_64/PKGBUILD | 93 +++++++++++++++------------------ community-x86_64/sslh-fork.service | 10 +++ community-x86_64/sslh-select.service | 9 +++ community-x86_64/sslh.conf | 3 - community-x86_64/sslh.install | 13 ++++ community-x86_64/sslh.rc | 34 ------------ 12 files changed, 154 insertions(+), 170 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2013-02-04 14:24:24 UTC (rev 83698) +++ community-i686/PKGBUILD 2013-02-04 14:24:41 UTC (rev 83699) @@ -1,48 +0,0 @@ -# $Id$ -# Maintainer: Sébastien Luttringer <se...@archlinux.org> -# Contributor: Le_suisse <lesuisse.dev+aur at gmail dot com> -# Contributor: Jason Rodriguez <jason-...@catloaf.net> - -pkgname=sslh -pkgver=1.14 -pkgrel=1 -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') -source=("http://www.rutschle.net/tech/$pkgname-$pkgver.tar.gz" - 'sslh.rc' - 'sslh.conf') -md5sums=('36e64bd6c7d0a299d5acd1109988099b' - 'c2a0c7c58d091acf5b4672f58066ee8f' - 'c51c63d2b28080bae4c1c7a0c469bab7') - -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" - 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" - # install systemd service - install -Dm 644 scripts/systemd.sslh.service \ - "$pkgdir/usr/lib/systemd/system/sslh.service" -} - -# vim:set ts=2 sw=2 ft=sh et: Copied: sslh/repos/community-i686/PKGBUILD (from rev 83698, sslh/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2013-02-04 14:24:41 UTC (rev 83699) @@ -0,0 +1,45 @@ +# $Id$ +# Maintainer: Sébastien Luttringer <se...@archlinux.org> +# Contributor: Le_suisse <lesuisse.dev+aur at gmail dot com> +# Contributor: Jason Rodriguez <jason-...@catloaf.net> + +pkgname=sslh +pkgver=1.14 +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/sslh.conf') +install=$pkgname.install +source=("http://www.rutschle.net/tech/$pkgname-$pkgver.tar.gz" + 'sslh-select.service' + 'sslh-fork.service') +md5sums=('36e64bd6c7d0a299d5acd1109988099b' + '67e8c9511508673254afa3e1ca61ff89' + 'a4402244a4d819beb3c6dc7ff031084e') + +build() { + cd $pkgname-$pkgver + make VERSION=\"v$pkgver\" +} + +package() { + # manually install to have both ssl-fork and ssl-select + cd $pkgname-$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/sslh-fork.service (from rev 83698, sslh/trunk/sslh-fork.service) =================================================================== --- community-i686/sslh-fork.service (rev 0) +++ community-i686/sslh-fork.service 2013-02-04 14:24:41 UTC (rev 83699) @@ -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 Copied: sslh/repos/community-i686/sslh-select.service (from rev 83698, sslh/trunk/sslh-select.service) =================================================================== --- community-i686/sslh-select.service (rev 0) +++ community-i686/sslh-select.service 2013-02-04 14:24:41 UTC (rev 83699) @@ -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 Deleted: community-i686/sslh.conf =================================================================== --- community-i686/sslh.conf 2013-02-04 14:24:24 UTC (rev 83698) +++ community-i686/sslh.conf 2013-02-04 14:24:41 UTC (rev 83699) @@ -1,3 +0,0 @@ -# vim:set ts=2 sw=2 ft=sh noet: - -DAEMON_OPTS='-F /etc/sslh.conf' Copied: sslh/repos/community-i686/sslh.install (from rev 83698, sslh/trunk/sslh.install) =================================================================== --- community-i686/sslh.install (rev 0) +++ community-i686/sslh.install 2013-02-04 14:24:41 UTC (rev 83699) @@ -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: Deleted: community-i686/sslh.rc =================================================================== --- community-i686/sslh.rc 2013-02-04 14:24:24 UTC (rev 83698) +++ community-i686/sslh.rc 2013-02-04 14:24:41 UTC (rev 83699) @@ -1,34 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/${0##*/} - -DAEMON=/usr/bin/sslh -PID=$(pidof -o %PPID $DAEMON) -DAEMON_OPTS="--background $DAEMON_OPTS" - -case "$1" in - start) - stat_busy "Starting ${0##*/} daemon" - [[ ! $PID ]] && $DAEMON $DAEMON_OPTS && add_daemon ${0##*/} && stat_done && exit 0 - stat_fail - ;; - stop) - stat_busy "Stopping ${0##*/} daemon" - [[ $PID ]] && kill $PID &> /dev/null && rm_daemon ${0##*/} && stat_done && exit 0 - stat_fail - ;; - restart) - $0 stop - $0 start - exit 0 - ;; - *) - echo "usage: ${0##*/} {start|stop|restart}" >&2 - ;; -esac - -exit 1 - -# vim:set ts=2 sw=2 ft=sh et: Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2013-02-04 14:24:24 UTC (rev 83698) +++ community-x86_64/PKGBUILD 2013-02-04 14:24:41 UTC (rev 83699) @@ -1,48 +0,0 @@ -# $Id$ -# Maintainer: Sébastien Luttringer <se...@archlinux.org> -# Contributor: Le_suisse <lesuisse.dev+aur at gmail dot com> -# Contributor: Jason Rodriguez <jason-...@catloaf.net> - -pkgname=sslh -pkgver=1.14 -pkgrel=1 -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') -source=("http://www.rutschle.net/tech/$pkgname-$pkgver.tar.gz" - 'sslh.rc' - 'sslh.conf') -md5sums=('36e64bd6c7d0a299d5acd1109988099b' - 'c2a0c7c58d091acf5b4672f58066ee8f' - 'c51c63d2b28080bae4c1c7a0c469bab7') - -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" - 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" - # install systemd service - install -Dm 644 scripts/systemd.sslh.service \ - "$pkgdir/usr/lib/systemd/system/sslh.service" -} - -# vim:set ts=2 sw=2 ft=sh et: Copied: sslh/repos/community-x86_64/PKGBUILD (from rev 83698, sslh/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2013-02-04 14:24:41 UTC (rev 83699) @@ -0,0 +1,45 @@ +# $Id$ +# Maintainer: Sébastien Luttringer <se...@archlinux.org> +# Contributor: Le_suisse <lesuisse.dev+aur at gmail dot com> +# Contributor: Jason Rodriguez <jason-...@catloaf.net> + +pkgname=sslh +pkgver=1.14 +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/sslh.conf') +install=$pkgname.install +source=("http://www.rutschle.net/tech/$pkgname-$pkgver.tar.gz" + 'sslh-select.service' + 'sslh-fork.service') +md5sums=('36e64bd6c7d0a299d5acd1109988099b' + '67e8c9511508673254afa3e1ca61ff89' + 'a4402244a4d819beb3c6dc7ff031084e') + +build() { + cd $pkgname-$pkgver + make VERSION=\"v$pkgver\" +} + +package() { + # manually install to have both ssl-fork and ssl-select + cd $pkgname-$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/sslh-fork.service (from rev 83698, sslh/trunk/sslh-fork.service) =================================================================== --- community-x86_64/sslh-fork.service (rev 0) +++ community-x86_64/sslh-fork.service 2013-02-04 14:24:41 UTC (rev 83699) @@ -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 Copied: sslh/repos/community-x86_64/sslh-select.service (from rev 83698, sslh/trunk/sslh-select.service) =================================================================== --- community-x86_64/sslh-select.service (rev 0) +++ community-x86_64/sslh-select.service 2013-02-04 14:24:41 UTC (rev 83699) @@ -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 Deleted: community-x86_64/sslh.conf =================================================================== --- community-x86_64/sslh.conf 2013-02-04 14:24:24 UTC (rev 83698) +++ community-x86_64/sslh.conf 2013-02-04 14:24:41 UTC (rev 83699) @@ -1,3 +0,0 @@ -# vim:set ts=2 sw=2 ft=sh noet: - -DAEMON_OPTS='-F /etc/sslh.conf' Copied: sslh/repos/community-x86_64/sslh.install (from rev 83698, sslh/trunk/sslh.install) =================================================================== --- community-x86_64/sslh.install (rev 0) +++ community-x86_64/sslh.install 2013-02-04 14:24:41 UTC (rev 83699) @@ -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: Deleted: community-x86_64/sslh.rc =================================================================== --- community-x86_64/sslh.rc 2013-02-04 14:24:24 UTC (rev 83698) +++ community-x86_64/sslh.rc 2013-02-04 14:24:41 UTC (rev 83699) @@ -1,34 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/${0##*/} - -DAEMON=/usr/bin/sslh -PID=$(pidof -o %PPID $DAEMON) -DAEMON_OPTS="--background $DAEMON_OPTS" - -case "$1" in - start) - stat_busy "Starting ${0##*/} daemon" - [[ ! $PID ]] && $DAEMON $DAEMON_OPTS && add_daemon ${0##*/} && stat_done && exit 0 - stat_fail - ;; - stop) - stat_busy "Stopping ${0##*/} daemon" - [[ $PID ]] && kill $PID &> /dev/null && rm_daemon ${0##*/} && stat_done && exit 0 - stat_fail - ;; - restart) - $0 stop - $0 start - exit 0 - ;; - *) - echo "usage: ${0##*/} {start|stop|restart}" >&2 - ;; -esac - -exit 1 - -# vim:set ts=2 sw=2 ft=sh et: