From nobody@FreeBSD.org  Sat Jun  2 23:16:42 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 92087106566B
	for <freebsd-gnats-submit@FreeBSD.org>; Sat,  2 Jun 2012 23:16:42 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 722BD8FC19
	for <freebsd-gnats-submit@FreeBSD.org>; Sat,  2 Jun 2012 23:16:42 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q52NGgXE084525
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 2 Jun 2012 23:16:42 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id q52NGfPb084524;
	Sat, 2 Jun 2012 23:16:41 GMT
	(envelope-from nobody)
Message-Id: <201206022316.q52NGfPb084524@red.freebsd.org>
Date: Sat, 2 Jun 2012 23:16:41 GMT
From: Olivier Cochard-Labb <olivier@cochard.me>
To: freebsd-gnats-submit@FreeBSD.org
Subject: net/sslh update to 1.13 (with option-ng, license and clang compatible)
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         168614
>Category:       ports
>Synopsis:       net/sslh update to 1.13 (with option-ng, license and clang compatible)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    sylvio
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jun 02 23:20:10 UTC 2012
>Closed-Date:    Sun Jun 03 00:24:32 UTC 2012
>Last-Modified:  Sun Jun 03 00:24:32 UTC 2012
>Originator:     Olivier Cochard-Labb
>Release:        9.0
>Organization:
BSD Router Project
>Environment:
FreeBSD laptop.bsdrp.net 9.0-RELEASE FreeBSD 9.0-RELEASE #2: Sun Apr 22 11:59:27 CEST 2012     root@laptop.bsdrp.net:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
Hi,
here is an update for net/sslh to 1.13 (with libwrap and libconfig support).
Regarding the port himself: It's compliant to the new options-ng, license and clang too.
Regards,

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN sslh.orig/Makefile sslh/Makefile
--- sslh.orig/Makefile	2012-06-02 21:04:12.000000000 +0200
+++ sslh/Makefile	2012-06-03 00:56:43.000000000 +0200
@@ -6,35 +6,53 @@
 #
 
 PORTNAME=	sslh
-PORTVERSION=	1.11
+PORTVERSION=	1.13
 CATEGORIES=	net
 MASTER_SITES=	http://www.rutschle.net/tech/
 
 MAINTAINER=	olivier@cochard.me
 COMMENT=	A ssl/ssh multiplexer
 
+LICENSE=    GPLv2
+
+DISTFILES=	${PORTNAME}-${PORTVERSION}b.tar.gz
+
+LIB_DEPENDS=	config:${PORTSDIR}/devel/libconfig
+USE_LDCONFIG=	yes
+
 USE_GMAKE=	yes
 USE_PERL5_BUILD=	yes
 
-.if !defined(NO_INSTALL_MANPAGES)
+OPTIONS_DEFINE=	MANPAGES EXAMPLES
+OPTIONS_DEFAULT=	MANPAGES EXAMPLES
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MMANPAGES}
 MAN8=		sslh.8
 .endif
 
-VARDIR=		/var
-PLIST_SUB=	VARDIR=${VARDIR}
-
 USE_RC_SUBR=	sslh
 
+PORTEXAMPLES=	example.cfg
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|^PREFIX=/usr/local|PREFIX=${PREFIX}|g' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's|<libconfig.h>|\"${LOCALBASE}/include/libconfig.h\"|g' ${WRKSRC}/sslh-main.c
+	@${REINPLACE_CMD} -e 's|-lconfig|-L${LOCALBASE}/lib -lconfig|g' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's|-lwrap|-L/usr/lib -lwrap|g' ${WRKSRC}/Makefile
 
 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 !defined(NO_INSTALL_MANPAGES)
+	#@${MKDIR} ${VARDIR}/run/${PORTNAME}
+	#@${CHOWN} -R nobody:nobody ${VARDIR}/run/${PORTNAME}
+.if ${PORT_OPTIONS:MMANPAGES}
 	@${INSTALL_MAN} ${WRKSRC}/sslh.8 ${MANPREFIX}/man/man8
 .endif
+.if ${PORT_OPTIONS:MEXAMPLES}
+	@${MKDIR} ${EXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/${PORTEXAMPLES} ${EXAMPLESDIR}
+.endif
 
 .include <bsd.port.mk>
diff -ruN sslh.orig/distinfo sslh/distinfo
--- sslh.orig/distinfo	2012-06-02 21:04:12.000000000 +0200
+++ sslh/distinfo	2012-06-02 22:41:37.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (sslh-1.11.tar.gz) = e1bf699ac2990954462926c26140b8ae40dabe107bb9aef89967a52c7e141e54
-SIZE (sslh-1.11.tar.gz) = 25779
+SHA256 (sslh-1.13b.tar.gz) = e6493b53767b542652e99e64a1bceeded1d01a5e7a083fde9d67e7550f9c0eec
+SIZE (sslh-1.13b.tar.gz) = 30986
diff -ruN sslh.orig/files/patch-Makefile sslh/files/patch-Makefile
--- sslh.orig/files/patch-Makefile	2012-06-02 21:04:12.000000000 +0200
+++ sslh/files/patch-Makefile	2012-06-03 00:44:20.000000000 +0200
@@ -1,6 +1,11 @@
---- Makefile.old	2011-12-02 10:16:46.000000000 +0000
-+++ Makefile	2011-12-02 10:18:04.000000000 +0000
-@@ -5,7 +5,7 @@
+--- Makefile.orig	2012-05-18 20:45:27.000000000 +0200
++++ Makefile	2012-06-03 00:37:34.000000000 +0200
+@@ -2,11 +2,11 @@
+ 
+ VERSION="v1.13b"
+ USELIBCONFIG=1	# Use libconfig? (necessary to use configuration files)
+-USELIBWRAP=	# Use libwrap?
++USELIBWRAP=1	# Use libwrap?
  COV_TEST= 	# Perform test coverage?
  PREFIX=/usr/local
  
@@ -9,7 +14,25 @@
  
  # End of configuration -- the rest should take care of
  # itself
-@@ -46,7 +46,7 @@
+@@ -15,7 +15,7 @@
+     CFLAGS_COV=-fprofile-arcs -ftest-coverage
+ endif
+ 
+-CC = gcc
++CC ?= gcc
+ CFLAGS=-Wall -g $(CFLAGS_COV)
+ 
+ LIBS=
+@@ -27,7 +27,7 @@
+ endif
+ 
+ ifneq ($(strip $(USELIBCONFIG)),)
+-	LIBS:=$(LIBS) -lconfig
++	LIBS:=$(LIBS) -L/usr/local/lib -lconfig
+ 	CFLAGS:=$(CFLAGS) -DLIBCONFIG
+ endif
+ 
+@@ -51,7 +51,7 @@
  	$(CC) $(CFLAGS) -o echosrv echosrv.o common.o $(LIBS)
  
  $(MAN): sslh.pod Makefile
diff -ruN sslh.orig/files/sslh.in sslh/files/sslh.in
--- sslh.orig/files/sslh.in	2012-06-02 21:04:12.000000000 +0200
+++ sslh/files/sslh.in	2012-06-03 01:02:58.000000000 +0200
@@ -59,10 +59,10 @@
 sslh_xmpptarget=${sslh_xmpptarget:-"localhost:5222"}
 sslh_tinctarget=${sslh_tinctarget:-"localhost:655"}
 
-pidfile=${sslh_pidfile:-"/var/run/sslh/sslh.pid"}
+pidfile=${sslh_pidfile:-"/var/run/sslh.pid"}
 command="%%PREFIX%%/sbin/${name}-${sslh_mode}"
 command_args="-t ${sslh_sshtimeout} -p ${sslh_listening} \
-	--ssl ${sslh_ssltarget} --ssh ${sslh_sshtarget} -P ${pidfile} \
+	--ssh ${sslh_sshtarget} --ssl ${sslh_ssltarget} -P ${pidfile} \
 	--user nobody --openvpn ${sslh_openvpntarget} \
 	--xmpp ${sslh_xmpptarget} --tinc ${sslh_tinctarget}"
 
diff -ruN sslh.orig/pkg-plist sslh/pkg-plist
--- sslh.orig/pkg-plist	2012-06-02 21:04:12.000000000 +0200
+++ sslh/pkg-plist	2012-06-03 00:56:22.000000000 +0200
@@ -1,3 +1,2 @@
 sbin/sslh-fork
 sbin/sslh-select
-@dirrmtry %%VARDIR%%/run/sslh


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->sylvio 
Responsible-Changed-By: sylvio 
Responsible-Changed-When: Sat Jun 2 23:31:02 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=168614 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/168614: commit references a PR
Date: Sun,  3 Jun 2012 00:17:48 +0000 (UTC)

 bapt        2012-06-03 00:17:34 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net/sslh             Makefile distinfo pkg-plist 
     net/sslh/files       patch-Makefile sslh.in 
   Log:
   update to 1.13
   convert to optionsng
   add license
   fix build with clang
   
   PR:             ports/168614
   Submitted by:   Olivier Cochard-Labbé <olivier@cochard.me>
   
   Revision  Changes    Path
   1.6       +24 -10    ports/net/sslh/Makefile
   1.5       +2 -2      ports/net/sslh/distinfo
   1.3       +19 -15    ports/net/sslh/files/patch-Makefile
   1.5       +3 -3      ports/net/sslh/files/sslh.in
   1.2       +0 -1      ports/net/sslh/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: bapt 
State-Changed-When: Sun Jun 3 00:24:32 UTC 2012 
State-Changed-Why:  
Committed with major changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=168614 
>Unformatted:
