diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-04-24 11:27:18 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-04-24 11:27:18 -0300 |
| commit | a3ba265c32b1de731745e1abc812f5d21bcd6aaf (patch) | |
| tree | e1302d14a6a73b6a674d2389d6427acb6b9ea870 /community/sslh | |
| parent | 2792638784d70e22bfff1827f7e283c3158e58cf (diff) | |
| parent | 9988621f899d7d4ae5fd0a4a32a4ba3abc5a527d (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/gtranslator/PKGBUILD
community-testing/gtranslator/gtranslator.changelog
extra/emelfm2/PKGBUILD
extra/wireshark/PKGBUILD
extra/xfce4-diskperf-plugin/PKGBUILD
extra/xfce4-mount-plugin/PKGBUILD
extra/xfce4-wavelan-plugin/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/lib32-openssl/PKGBUILD
testing/anjuta-extras/PKGBUILD
testing/anjuta/PKGBUILD
testing/gdl/PKGBUILD
testing/lv2/PKGBUILD
Diffstat (limited to 'community/sslh')
| -rw-r--r-- | community/sslh/PKGBUILD | 10 | ||||
| -rw-r--r-- | community/sslh/sslh.conf | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/community/sslh/PKGBUILD b/community/sslh/PKGBUILD index 297188a87..5c74ce8df 100644 --- a/community/sslh/PKGBUILD +++ b/community/sslh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 69412 2012-04-15 23:37:55Z seblu $ +# $Id: PKGBUILD 69659 2012-04-22 00:48:23Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Le_suisse <lesuisse.dev+aur at gmail dot com> # Contributor: Jason Rodriguez <jason-aur@catloaf.net> pkgname=sslh -pkgver=1.10 -pkgrel=6 +pkgver=1.11 +pkgrel=1 pkgdesc='SSL/SSH/OpenVPN/XMPP/tinc port multiplexer' arch=('i686' 'x86_64' 'mips64el') url='http://www.rutschle.net/tech/sslh.shtml' @@ -15,9 +15,9 @@ source=("http://www.rutschle.net/tech/$pkgname-$pkgver.tar.gz" 'sslh.rc' 'sslh.conf' 'sslh.service') -md5sums=('bc34e9a4770d634633e70589c72708cc' +md5sums=('4ea599f0fa31ae235646e5a200b8f8fb' 'f64da291e97f1a99c33cb6ebf939b95b' - '808199410bd6ab67421bf3544f805d1a' + 'a098fb6b03a3435b223e16aed0e65e0b' 'ee8a4fcfc1f6839f7c93deb6f59f7fd6') build() { diff --git a/community/sslh/sslh.conf b/community/sslh/sslh.conf index eb79e7c51..b22a325ef 100644 --- a/community/sslh/sslh.conf +++ b/community/sslh/sslh.conf @@ -1,3 +1,3 @@ # vim:set ts=2 sw=2 ft=sh noet: -DAEMON_OPTS='-p 192.168.0.1:443 --ssh 127.0.0.1:22 --ssl 127.0.0.1:443 -u nobody -P /var/lock/sslh.lock' +DAEMON_OPTS='-p 192.168.0.1:443 --ssh 127.0.0.1:22 --ssl 127.0.0.1:443 -u nobody' |