Index: head/net/sslh/pkg-plist =================================================================== --- head/net/sslh/pkg-plist (revision 333034) +++ head/net/sslh/pkg-plist (nonexistent) @@ -1,2 +0,0 @@ -sbin/sslh-fork -sbin/sslh-select Property changes on: head/net/sslh/pkg-plist ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/net/sslh/Makefile =================================================================== --- head/net/sslh/Makefile (revision 333034) +++ head/net/sslh/Makefile (revision 333035) @@ -1,53 +1,42 @@ # Created by: Jui-Nan Lin # $FreeBSD$ PORTNAME= sslh -PORTVERSION= 1.13 -PORTREVISION= 1 +PORTVERSION= 1.15 CATEGORIES= net MASTER_SITES= http://www.rutschle.net/tech/ MAINTAINER= olivier@cochard.me -COMMENT= A ssl/ssh multiplexer +COMMENT= SSL/SSH multiplexer -LICENSE= GPLv2 +LICENSE= GPLv2 -DISTFILES= ${PORTNAME}-${PORTVERSION}b.tar.gz +LIB_DEPENDS= libconfig.so:${PORTSDIR}/devel/libconfig -LIB_DEPENDS= config:${PORTSDIR}/devel/libconfig - USES= gmake perl5 USE_PERL5= build -OPTIONS_DEFINE= MANPAGES EXAMPLES -OPTIONS_DEFAULT= MANPAGES EXAMPLES +OPTIONS_DEFINE= EXAMPLES +OPTIONS_DEFAULT= EXAMPLES -CFLAGS+= -I${LOCALBASE}/include -MAKE_ENV+= LIBS="-L${LOCALBASE}/lib" +CFLAGS= -I${LOCALBASE}/include +LDFLAGS= -L${LOCALBASE}/lib -NO_STAGE= yes -.include +PLIST_FILES= sbin/sslh-fork \ + sbin/sslh-select \ + etc/sslh.conf.sample \ + man/man8/sslh.8.gz -.if ${PORT_OPTIONS:MMANPAGES} -MAN8= sslh.8 -.endif - USE_RC_SUBR= sslh PORTEXAMPLES= example.cfg -MANCOMPRESSED= yes do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/sslh-fork ${PREFIX}/sbin - @${INSTALL_PROGRAM} ${WRKSRC}/sslh-select ${PREFIX}/sbin - #@${MKDIR} ${VARDIR}/run/${PORTNAME} - #@${CHOWN} -R nobody:nobody ${VARDIR}/run/${PORTNAME} -.if ${PORT_OPTIONS:MMANPAGES} - @${INSTALL_MAN} ${WRKSRC}/sslh.8.gz ${MANPREFIX}/man/man8 -.endif -.if ${PORT_OPTIONS:MEXAMPLES} - @${MKDIR} ${EXAMPLESDIR} - @${INSTALL_DATA} ${WRKSRC}/${PORTEXAMPLES} ${EXAMPLESDIR} -.endif + ${INSTALL_PROGRAM} ${WRKSRC}/sslh-fork ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_PROGRAM} ${WRKSRC}/sslh-select ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_DATA} ${WRKSRC}/basic.cfg ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample + ${INSTALL_MAN} ${WRKSRC}/sslh.8.gz ${STAGEDIR}${MANPREFIX}/man/man8 + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${PORTEXAMPLES:S,^,${WRKSRC}/,} ${STAGEDIR}${EXAMPLESDIR}/ .include Index: head/net/sslh/distinfo =================================================================== --- head/net/sslh/distinfo (revision 333034) +++ head/net/sslh/distinfo (revision 333035) @@ -1,2 +1,2 @@ -SHA256 (sslh-1.13b.tar.gz) = e6493b53767b542652e99e64a1bceeded1d01a5e7a083fde9d67e7550f9c0eec -SIZE (sslh-1.13b.tar.gz) = 30986 +SHA256 (sslh-1.15.tar.gz) = fc854cc5d95be2c50293e655b7427032ece74ebef1f7f0119c0fc3e207109ccd +SIZE (sslh-1.15.tar.gz) = 33241 Index: head/net/sslh/files/patch-Makefile =================================================================== --- head/net/sslh/files/patch-Makefile (revision 333034) +++ head/net/sslh/files/patch-Makefile (nonexistent) @@ -1,24 +0,0 @@ ---- ./Makefile.orig 2012-06-03 02:10:16.959537483 +0200 -+++ ./Makefile 2012-06-03 02:10:20.312769958 +0200 -@@ -4,7 +4,7 @@ - USELIBCONFIG=1 # Use libconfig? (necessary to use configuration files) - USELIBWRAP= # Use libwrap? - COV_TEST= # Perform test coverage? --PREFIX=/usr/local -+PREFIX ?=/usr/local - - MAN=sslh.8.gz # man page name - -@@ -15,10 +15,9 @@ - CFLAGS_COV=-fprofile-arcs -ftest-coverage - endif - --CC = gcc --CFLAGS=-Wall -g $(CFLAGS_COV) -+CC ?= gcc -+CFLAGS ?=-Wall -g $(CFLAGS_COV) - --LIBS= - OBJS=common.o sslh-main.o probe.o - - ifneq ($(strip $(USELIBWRAP)),) Property changes on: head/net/sslh/files/patch-Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/net/sslh/files/sslh.in =================================================================== --- head/net/sslh/files/sslh.in (revision 333034) +++ head/net/sslh/files/sslh.in (revision 333035) @@ -1,76 +1,57 @@ #!/bin/sh # $FreeBSD$ # # sslh startup script # # PROVIDE: sslh # REQUIRE: login # KEYWORD: shutdown - # # Add the following to /etc/rc.conf[.local] to enable this service # # sslh_enable="YES" # # You can fine tune others variables too: +# You can fine tune others variables too: # sslh_mode="fork | select" # fork: stable but slow performance # select: new but high performance -# sslh_pidfile="/var/run/sslh.pid" -# sslh_ssltarget="localhost:443" -# sslh_sshtarget="localhost:22" -# sslh_sshtimeout="2" -# sslh_listening="0.0.0.0:8443" -# sslh_uid="nobody" -# sslh_flags +# sslh_fib: Routing table number sslh_precmd() { if command -v check_namevarlist > /dev/null 2>&1; then check_namevarlist fib && return 0 fi sysctl net.fibs >/dev/null 2>&1 || return 0 sslh_fib=${sslh_fib:-"NONE"} case "$sslh_fib" in [Nn][Oo][Nn][Ee]) ;; *) command="setfib -F ${sslh_fib} ${command}" ;; esac } . /etc/rc.subr name="sslh" rcvar=sslh_enable start_precmd="sslh_precmd" -stop_postcmd="sslh_postcmd" load_rc_config $name - sslh_enable=${sslh_enable:-"NO"} sslh_mode=${sslh_mode:-"fork"} -sslh_listening=${sslh_listening:-"0.0.0.0:443"} -sslh_sshtarget=${sslh_sshtarget:-"localhost:22"} -sslh_ssltarget=${sslh_ssltarget:-"localhost:8443"} -sslh_sshtimeout=${sslh_sshtimeout:-"2"} -sslh_openvpntarget=${sslh_openvpntarget:-"localhost:1193"} -sslh_xmpptarget=${sslh_xmpptarget:-"localhost:5222"} -sslh_tinctarget=${sslh_tinctarget:-"localhost:655"} -pidfile=${sslh_pidfile:-"/var/run/sslh.pid"} -command="%%PREFIX%%/sbin/${name}-${sslh_mode}" -command_args="-t ${sslh_sshtimeout} -p ${sslh_listening} \ - --ssh ${sslh_sshtarget} --ssl ${sslh_ssltarget} -P ${pidfile} \ - --user nobody --openvpn ${sslh_openvpntarget} \ - --xmpp ${sslh_xmpptarget} --tinc ${sslh_tinctarget}" +required_files="%%PREFIX%%/etc/${name}.conf" +for value in listening sshtarget ssltarget sshtimeout openvpntarget xmpptarget tinctarget;do + eval "[ -n \"\${sslh_${value}}\" ]" && warn "${name}_${value} no more used: Configuration file available" +done -sslh_postcmd() -{ - rm -f ${pidfile} -} +command="%%PREFIX%%/sbin/${name}-${sslh_mode}" +command_args="-F %%PREFIX%%/etc/${name}.conf" run_rc_command "$1" Index: head/net/sslh/pkg-descr =================================================================== --- head/net/sslh/pkg-descr (revision 333034) +++ head/net/sslh/pkg-descr (revision 333035) @@ -1,5 +1,5 @@ sslh accepts HTTPS, SSH, OpenVPN, tinc and XMPP connections on the same port. This makes it possible to connect to any of these servers on port 443 while still serving HTTPS on that port. -WWW: http://www.rutschle.net/tech/sslh.shtml +WWW: http://www.rutschle.net/tech/sslh.shtml