From owner-svn-ports-head@freebsd.org Wed Aug 26 08:40:22 2015 Return-Path: Delivered-To: svn-ports-head@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 D150199A924; Wed, 26 Aug 2015 08:40:22 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 B64D6AC8; Wed, 26 Aug 2015 08:40:22 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7Q8eMww044192; Wed, 26 Aug 2015 08:40:22 GMT (envelope-from ehaupt@FreeBSD.org) Received: (from ehaupt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7Q8eM8r044189; Wed, 26 Aug 2015 08:40:22 GMT (envelope-from ehaupt@FreeBSD.org) Message-Id: <201508260840.t7Q8eM8r044189@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ehaupt set sender to ehaupt@FreeBSD.org using -f From: Emanuel Haupt Date: Wed, 26 Aug 2015 08:40:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r395351 - in head/net/citrix_ica: . 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-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Aug 2015 08:40:22 -0000 Author: ehaupt Date: Wed Aug 26 08:40:21 2015 New Revision: 395351 URL: https://svnweb.freebsd.org/changeset/ports/395351 Log: - Restore functionality of ICA_CERTS (was broken after r391627) [1] - Adjust wfcmgr wrapper to run the now renamed configuration utility configmgr. Retain name to avoid possible namespace collision due to its generic name. - Make various scripts executable PR: 194900 [1] Submitted by: Helge Oldach Modified: head/net/citrix_ica/Makefile head/net/citrix_ica/files/wfcmgr.in head/net/citrix_ica/pkg-plist Modified: head/net/citrix_ica/Makefile ============================================================================== --- head/net/citrix_ica/Makefile Wed Aug 26 07:52:58 2015 (r395350) +++ head/net/citrix_ica/Makefile Wed Aug 26 08:40:21 2015 (r395351) @@ -3,7 +3,7 @@ PORTNAME= citrix_ica PORTVERSION= 13.2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net comms linux MASTER_SITES= # DISTNAME= linuxx86-13.2.0.322243 @@ -26,6 +26,7 @@ CDIR= ${PREFIX}/ICAClient CERTDIR= ${CDIR}/keystore/cacerts PLIST_SUB= MOZILLA_HOME=${MOZILLA_HOME} + .if defined(ICA_CERTS) PLIST_SUB+= HAVE_ICA_CERTS="" ICA_CERTS="${ICA_CERTS}" CERTDIR="${CERTDIR}" .else @@ -41,6 +42,14 @@ SUB_LIST= CDIR=${CDIR} IGNORE=May not be redistributed due to licensing. Please visit http://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-13-2.html accept their license and download ${DISTFILES} into ${DISTDIR} .endif +.if defined(ICA_CERTS) +.for f in ${ICA_CERTS} +PLIST_FILES+= ${CERTDIR}/${f} +HASH_${f}!= openssl x509 -noout -hash -in ${DISTDIR}/${f} +PLIST_FILES+= ${CERTDIR}/${HASH_${f}}.0 +.endfor +.endif + pre-fetch: .if defined(ICA_CERTS) .for f in ${ICA_CERTS} @@ -76,12 +85,13 @@ do-install: ${MKDIR} ${STAGEDIR}${CDIR} ${MKDIR} ${STAGEDIR}${CDIR}/config cd ${WRKDIR}/linuxx86/linuxx86.cor/ && ${COPYTREE_SHARE} . ${STAGEDIR}${CDIR} - cp ${WRKDIR}/setupwfc ${STAGEDIR}${CDIR} + ${CP} ${WRKDIR}/setupwfc ${STAGEDIR}${CDIR} .if defined(ICA_CERTS) ${MKDIR} ${STAGEDIR}${CERTDIR} .for f in ${ICA_CERTS} ${INSTALL_DATA} ${DISTDIR}/${f} ${STAGEDIR}${CERTDIR} + ${LN} -sf ${f} ${STAGEDIR}${CERTDIR}/$$(openssl x509 -noout -hash -in ${DISTDIR}/${f}).0 .endfor .endif Modified: head/net/citrix_ica/files/wfcmgr.in ============================================================================== --- head/net/citrix_ica/files/wfcmgr.in Wed Aug 26 07:52:58 2015 (r395350) +++ head/net/citrix_ica/files/wfcmgr.in Wed Aug 26 08:40:21 2015 (r395351) @@ -1,3 +1,3 @@ #!/bin/sh export ICAROOT=%%CDIR%% -exec $ICAROOT/wfcmgr +exec $ICAROOT/util/configmgr Modified: head/net/citrix_ica/pkg-plist ============================================================================== --- head/net/citrix_ica/pkg-plist Wed Aug 26 07:52:58 2015 (r395350) +++ head/net/citrix_ica/pkg-plist Wed Aug 26 08:40:21 2015 (r395351) @@ -472,31 +472,31 @@ %%WEBPLUGIN_DIR%%/usb/ctxusbd.rc %%WEBPLUGIN_DIR%%/usb/ica-usb.rules %%WEBPLUGIN_DIR%%/usb/usb.conf -%%WEBPLUGIN_DIR%%/util/DeleteCompleteFlashCache.sh -%%WEBPLUGIN_DIR%%/util/configmgr -%%WEBPLUGIN_DIR%%/util/conncenter -%%WEBPLUGIN_DIR%%/util/ctx_app_bind -%%WEBPLUGIN_DIR%%/util/ctx_rehash -%%WEBPLUGIN_DIR%%/util/echo_cmd -%%WEBPLUGIN_DIR%%/util/gst_aud_play -%%WEBPLUGIN_DIR%%/util/gst_aud_read -%%WEBPLUGIN_DIR%%/util/gst_play -%%WEBPLUGIN_DIR%%/util/gst_read -%%WEBPLUGIN_DIR%%/util/hdxcheck.sh -%%WEBPLUGIN_DIR%%/util/hinst -%%WEBPLUGIN_DIR%%/util/icalicense.sh -%%WEBPLUGIN_DIR%%/util/libgstflatstm.so -%%WEBPLUGIN_DIR%%/util/lurdump -%%WEBPLUGIN_DIR%%/util/new_store -%%WEBPLUGIN_DIR%%/util/nslaunch -%%WEBPLUGIN_DIR%%/util/pac.js -%%WEBPLUGIN_DIR%%/util/pacexec -%%WEBPLUGIN_DIR%%/util/pnabrowse -%%WEBPLUGIN_DIR%%/util/pnabrowse_launch -%%WEBPLUGIN_DIR%%/util/storebrowse -%%WEBPLUGIN_DIR%%/util/sunraymac.sh -%%WEBPLUGIN_DIR%%/util/what -%%WEBPLUGIN_DIR%%/util/xcapture +@(,,00555) %%WEBPLUGIN_DIR%%/util/DeleteCompleteFlashCache.sh +@(,,00555) %%WEBPLUGIN_DIR%%/util/configmgr +@(,,00555) %%WEBPLUGIN_DIR%%/util/conncenter +@(,,00555) %%WEBPLUGIN_DIR%%/util/ctx_app_bind +@(,,00555) %%WEBPLUGIN_DIR%%/util/ctx_rehash +@(,,00555) %%WEBPLUGIN_DIR%%/util/echo_cmd +@(,,00555) %%WEBPLUGIN_DIR%%/util/gst_aud_play +@(,,00555) %%WEBPLUGIN_DIR%%/util/gst_aud_read +@(,,00555) %%WEBPLUGIN_DIR%%/util/gst_play +@(,,00555) %%WEBPLUGIN_DIR%%/util/gst_read +@(,,00555) %%WEBPLUGIN_DIR%%/util/hdxcheck.sh +@(,,00555) %%WEBPLUGIN_DIR%%/util/hinst +@(,,00555) %%WEBPLUGIN_DIR%%/util/icalicense.sh +@(,,00555) %%WEBPLUGIN_DIR%%/util/libgstflatstm.so +@(,,00555) %%WEBPLUGIN_DIR%%/util/lurdump +@(,,00555) %%WEBPLUGIN_DIR%%/util/new_store +@(,,00555) %%WEBPLUGIN_DIR%%/util/nslaunch +@(,,00555) %%WEBPLUGIN_DIR%%/util/pac.js +@(,,00555) %%WEBPLUGIN_DIR%%/util/pacexec +@(,,00555) %%WEBPLUGIN_DIR%%/util/pnabrowse +@(,,00555) %%WEBPLUGIN_DIR%%/util/pnabrowse_launch +@(,,00555) %%WEBPLUGIN_DIR%%/util/storebrowse +@(,,00555) %%WEBPLUGIN_DIR%%/util/sunraymac.sh +@(,,00555) %%WEBPLUGIN_DIR%%/util/what +@(,,00555) %%WEBPLUGIN_DIR%%/util/xcapture @(,,00555) %%WEBPLUGIN_DIR%%/wfica bin/wfcmgr bin/wfica