Date: Wed, 6 Nov 2013 19:42:20 +0000 (UTC) From: William Grzybowski <wg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333035 - in head/net/sslh: . files Message-ID: <201311061942.rA6JgKxj017394@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wg Date: Wed Nov 6 19:42:20 2013 New Revision: 333035 URL: http://svnweb.freebsd.org/changeset/ports/333035 Log: net/sslh: update to 1.15 - Update to 1.15 - Convert lib depends to new format - Remove MANPAGES option - Allow staging PR: ports/183700 Submitted by: Olivier Cochard-Labbe <olivier cochard.me> (maintainer) Deleted: head/net/sslh/files/patch-Makefile head/net/sslh/pkg-plist Modified: head/net/sslh/Makefile head/net/sslh/distinfo head/net/sslh/files/sslh.in head/net/sslh/pkg-descr Modified: head/net/sslh/Makefile ============================================================================== --- head/net/sslh/Makefile Wed Nov 6 19:28:08 2013 (r333034) +++ head/net/sslh/Makefile Wed Nov 6 19:42:20 2013 (r333035) @@ -2,52 +2,41 @@ # $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= config:${PORTSDIR}/devel/libconfig +LIB_DEPENDS= libconfig.so:${PORTSDIR}/devel/libconfig USES= gmake perl5 USE_PERL5= build -OPTIONS_DEFINE= MANPAGES EXAMPLES -OPTIONS_DEFAULT= MANPAGES EXAMPLES - -CFLAGS+= -I${LOCALBASE}/include -MAKE_ENV+= LIBS="-L${LOCALBASE}/lib" +OPTIONS_DEFINE= EXAMPLES +OPTIONS_DEFAULT= EXAMPLES -NO_STAGE= yes -.include <bsd.port.options.mk> +CFLAGS= -I${LOCALBASE}/include +LDFLAGS= -L${LOCALBASE}/lib -.if ${PORT_OPTIONS:MMANPAGES} -MAN8= sslh.8 -.endif +PLIST_FILES= sbin/sslh-fork \ + sbin/sslh-select \ + etc/sslh.conf.sample \ + man/man8/sslh.8.gz 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 <bsd.port.mk> Modified: head/net/sslh/distinfo ============================================================================== --- head/net/sslh/distinfo Wed Nov 6 19:28:08 2013 (r333034) +++ head/net/sslh/distinfo Wed Nov 6 19:42:20 2013 (r333035) @@ -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 Modified: head/net/sslh/files/sslh.in ============================================================================== --- head/net/sslh/files/sslh.in Wed Nov 6 19:28:08 2013 (r333034) +++ head/net/sslh/files/sslh.in Wed Nov 6 19:42:20 2013 (r333035) @@ -7,23 +7,17 @@ # 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 @@ -47,30 +41,17 @@ 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"} +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 + 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}" - -sslh_postcmd() -{ - rm -f ${pidfile} -} +command_args="-F %%PREFIX%%/etc/${name}.conf" run_rc_command "$1" Modified: head/net/sslh/pkg-descr ============================================================================== --- head/net/sslh/pkg-descr Wed Nov 6 19:28:08 2013 (r333034) +++ head/net/sslh/pkg-descr Wed Nov 6 19:42:20 2013 (r333035) @@ -2,4 +2,4 @@ sslh accepts HTTPS, SSH, OpenVPN, tinc a 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311061942.rA6JgKxj017394>