diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-17 10:22:56 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-17 10:22:56 +0200 |
commit | 16d51ac66fa18675d49ef64f4a3c1dbe53b5711a (patch) | |
tree | 90b40c53d4904cf506c7ee3e45455ff97782fa66 /community/sslh | |
parent | 0be48442ebb71571ec0ab1bbf27bf4a0759ed19b (diff) | |
parent | 0fb510ac9b1defac6c3d54a68eccd7e18635b474 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/dee/PKGBUILD
community-testing/openttd/PKGBUILD
extra/llvm/PKGBUILD
testing/calligra/PKGBUILD
testing/gdk-pixbuf2/PKGBUILD
testing/gdk-pixbuf2/gdk-pixbuf2.install
testing/gdm/PKGBUILD
testing/gnome-screensaver/PKGBUILD
testing/gnome-screensaver/gnome-screensaver.install
testing/xf86-video-ati/PKGBUILD
Diffstat (limited to 'community/sslh')
-rw-r--r-- | community/sslh/PKGBUILD | 29 | ||||
-rw-r--r-- | community/sslh/sslh.rc | 4 | ||||
-rw-r--r-- | community/sslh/sslh.service | 9 |
3 files changed, 30 insertions, 12 deletions
diff --git a/community/sslh/PKGBUILD b/community/sslh/PKGBUILD index 2f882aa11..297188a87 100644 --- a/community/sslh/PKGBUILD +++ b/community/sslh/PKGBUILD @@ -1,22 +1,24 @@ -# $Id$ -# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net> +# $Id: PKGBUILD 69412 2012-04-15 23:37:55Z 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=5 +pkgrel=6 pkgdesc='SSL/SSH/OpenVPN/XMPP/tinc port multiplexer' arch=('i686' 'x86_64' 'mips64el') url='http://www.rutschle.net/tech/sslh.shtml' license=('GPL2') backup=('etc/conf.d/sslh') -source=("http://www.rutschle.net/tech/${pkgname}-${pkgver}.tar.gz" +source=("http://www.rutschle.net/tech/$pkgname-$pkgver.tar.gz" 'sslh.rc' - 'sslh.conf') + 'sslh.conf' + 'sslh.service') md5sums=('bc34e9a4770d634633e70589c72708cc' - '0680f09267c33205acf16ac6d4adf926' - '808199410bd6ab67421bf3544f805d1a') + 'f64da291e97f1a99c33cb6ebf939b95b' + '808199410bd6ab67421bf3544f805d1a' + 'ee8a4fcfc1f6839f7c93deb6f59f7fd6') build() { cd $pkgname-$pkgver @@ -27,10 +29,17 @@ build() { } package() { - install -D -m 755 sslh.rc "${pkgdir}/etc/rc.d/sslh" - install -D -m 644 sslh.conf "${pkgdir}/etc/conf.d/sslh" + # install initscripts + install -Dm 755 sslh.rc "$pkgdir/etc/rc.d/sslh" + install -Dm 644 sslh.conf "$pkgdir/etc/conf.d/sslh" + # install systemd service + install -Dm 644 sslh.service "$pkgdir/usr/lib/systemd/system/sslh.service" + # manually install to have both ssl-fork and ssl-select cd $pkgname-$pkgver - make PREFIX="$pkgdir/usr" install + 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 -Dm 0644 sslh.8.gz "$pkgdir/usr/share/man/man8/sslh.8.gz" } # vim:set ts=2 sw=2 ft=sh et: diff --git a/community/sslh/sslh.rc b/community/sslh/sslh.rc index 05b03bc3e..9c31435a0 100644 --- a/community/sslh/sslh.rc +++ b/community/sslh/sslh.rc @@ -5,7 +5,7 @@ . /etc/conf.d/${0##*/} NAME=sslh -DAEMON=/usr/sbin/sslh +DAEMON=/usr/bin/sslh PID=$(pidof -o %PPID $DAEMON) case "$1" in @@ -24,7 +24,7 @@ case "$1" in $0 start exit 0 ;; - *) + *) echo "usage: ${0##*/} {start|stop|restart}" >&2 ;; esac diff --git a/community/sslh/sslh.service b/community/sslh/sslh.service new file mode 100644 index 000000000..7ccad70e9 --- /dev/null +++ b/community/sslh/sslh.service @@ -0,0 +1,9 @@ +[Unit] +Description=SSL/SSH multiplexer + +[Service] +EnvironmentFile=/etc/conf.d/sslh +ExecStart=/usr/bin/sslh --foreground $DAEMON_OPTS + +[Install] +WantedBy=multi-user.target |