From owner-svn-ports-all@freebsd.org Tue Sep 13 15:29:03 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E6623BD9595; Tue, 13 Sep 2016 15:29:03 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A8A5C8BD; Tue, 13 Sep 2016 15:29:03 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8DFT2m0023103; Tue, 13 Sep 2016 15:29:02 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8DFT2Er023100; Tue, 13 Sep 2016 15:29:02 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201609131529.u8DFT2Er023100@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Tue, 13 Sep 2016 15:29:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r422017 - in head/net/ssvnc: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Sep 2016 15:29:04 -0000 Author: marino Date: Tue Sep 13 15:29:02 2016 New Revision: 422017 URL: https://svnweb.freebsd.org/changeset/ports/422017 Log: net/ssvnc: Document and configure SSL, fix build for LibreSSL While here, modernize and cleanup the port and honor flags Added: head/net/ssvnc/files/patch-vncstorepw_Makefile (contents, props changed) head/net/ssvnc/files/patch-vncstorepw_ultravnc__dsm__helper.c (contents, props changed) Modified: head/net/ssvnc/Makefile Modified: head/net/ssvnc/Makefile ============================================================================== --- head/net/ssvnc/Makefile Tue Sep 13 15:28:14 2016 (r422016) +++ head/net/ssvnc/Makefile Tue Sep 13 15:29:02 2016 (r422017) @@ -17,24 +17,24 @@ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= stunnel:security/stunnel \ xterm:x11/xterm -OPTIONS_DEFINE= DOCS ULTRAFTP -ULTRAFTP_DESC= UltraVNC File Transfer support (Java required) - -USES= gmake imake:env jpeg perl5 tk:wrapper -USE_OPENSSL= yes +USES= gmake imake:env jpeg perl5 ssl tk:wrapper USE_PERL5= run USE_XORG= xi xmu xt xaw ice xpm xext sm +CFLAGS+= -I${OPENSSLINC} +LDFLAGS+= -L${OPENSSLLIB} + +OPTIONS_DEFINE= DOCS ULTRAFTP +OPTIONS_SUB= yes + +ULTRAFTP_DESC= UltraVNC File Transfer support (Java required) +ULTRAFTP_USE= JAVA=yes MAKE_ENV+= ROOT=${STAGEDIR} .include -.if ${PORT_OPTIONS:MULTRAFTP} -USE_JAVA= yes -PLIST_SUB+= ULTRAFTP="" -.else +.if ! ${PORT_OPTIONS:MULTRAFTP} MAKE_ARGS+= JSRC="" -PLIST_SUB+= ULTRAFTP="@comment " .endif .if ! ${PORT_OPTIONS:MDOCS} @@ -42,13 +42,14 @@ MAKE_ARGS+= DOCS="" .endif post-patch: - @${REINPLACE_CMD} -e 's|grep Linux|grep ${OPSYS}|' ${WRKSRC}/scripts/util/ss_vncviewer - @${REINPLACE_CMD} -e 's|[[:<:]]ssvnc[[:>:]]|ssvnc-gui|' ${WRKSRC}/man/man1/ssvnc.1 - @${REINPLACE_CMD} -e 's|/usr/local/bin|${LOCALBASE}/bin|' \ - -e 's|^CC =|CC ?=|' ${WRKSRC}/vncstorepw/Makefile + @${REINPLACE_CMD} -e 's|grep Linux|grep ${OPSYS}|' \ + ${WRKSRC}/scripts/util/ss_vncviewer + @${REINPLACE_CMD} -e 's|[[:<:]]ssvnc[[:>:]]|ssvnc-gui|' \ + ${WRKSRC}/man/man1/ssvnc.1 do-configure: - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} config + (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ + ${MAKE_CMD} ${MAKE_ARGS} config) post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ssvnc/*.so Added: head/net/ssvnc/files/patch-vncstorepw_Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/ssvnc/files/patch-vncstorepw_Makefile Tue Sep 13 15:29:02 2016 (r422017) @@ -0,0 +1,38 @@ +--- vncstorepw/Makefile.orig 2010-04-22 03:22:40 UTC ++++ vncstorepw/Makefile +@@ -7,8 +7,6 @@ UNWRAP = unwrap.so + LIMACC = lim_accept.so + ULTDSM = ultravnc_dsm_helper + +-# gcc must be used: +-CC = gcc + + all: $(CMD) $(UNWRAP) $(LIMACC) $(ULTDSM) + +@@ -21,7 +19,7 @@ $(UNWRAP): unwrap.c + if [ `uname` = "Darwin" ]; then \ + PATH=$$PATH:$(EPATH) $(CC) -o $(UNWRAP) -dynamiclib -fPIC unwrap.c; \ + else \ +- PATH=$$PATH:$(EPATH) $(CC) -o $(UNWRAP) -shared -fPIC unwrap.c; \ ++ PATH=$$PATH:$(EPATH) $(CC) -o $(UNWRAP) -shared $(CFLAGS) -fPIC unwrap.c; \ + fi + @ls -l $(UNWRAP) + +@@ -29,7 +27,7 @@ $(LIMACC): lim_accept.c + if [ `uname` = "Darwin" ]; then \ + PATH=$$PATH:$(EPATH) $(CC) -o $(LIMACC) -dynamiclib -fPIC -nostartfiles lim_accept.c; \ + else \ +- PATH=$$PATH:$(EPATH) $(CC) -o $(LIMACC) -shared -fPIC -nostartfiles lim_accept.c; \ ++ PATH=$$PATH:$(EPATH) $(CC) -o $(LIMACC) -shared $(CFLAGS) -fPIC -nostartfiles lim_accept.c; \ + fi + @ls -l $(LIMACC) + +@@ -39,7 +37,7 @@ $(ULTDSM): ultravnc_dsm_helper.c + if [ `uname` = "SunOS" ]; then \ + PATH=$$PATH:$(EPATH) $(CC) -o $(ULTDSM) $(CPP_SSL) ultravnc_dsm_helper.c $(LD_SSL) -lssl -lcrypto -lsocket -lnsl; \ + else \ +- PATH=$$PATH:$(EPATH) $(CC) -o $(ULTDSM) $(CPP_SSL) ultravnc_dsm_helper.c $(LD_SSL) -lssl -lcrypto; \ ++ PATH=$$PATH:$(EPATH) $(CC) -o $(ULTDSM) $(CPP_SSL) ultravnc_dsm_helper.c $(CFLAGS) $(LDFLAGS) -lssl -lcrypto; \ + fi + PATH=$$PATH:$(EPATH) strip $(ULTDSM) + @ls -l $(ULTDSM) Added: head/net/ssvnc/files/patch-vncstorepw_ultravnc__dsm__helper.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/ssvnc/files/patch-vncstorepw_ultravnc__dsm__helper.c Tue Sep 13 15:29:02 2016 (r422017) @@ -0,0 +1,13 @@ +--- vncstorepw/ultravnc_dsm_helper.c.orig 2010-04-23 04:29:43 UTC ++++ vncstorepw/ultravnc_dsm_helper.c +@@ -413,8 +413,10 @@ void enc_do(char *ciph, char *keyfile, c + p++; + if (strstr(p, "md5+") == p) { + Digest = EVP_md5(); p += strlen("md5+"); ++#ifndef OPENSSL_NO_SHA0 + } else if (strstr(p, "sha+") == p) { + Digest = EVP_sha(); p += strlen("sha+"); ++#endif + } else if (strstr(p, "sha1+") == p) { + Digest = EVP_sha1(); p += strlen("sha1+"); + } else if (strstr(p, "ripe+") == p) {