From owner-svn-ports-head@FreeBSD.ORG Mon Aug 18 18:41:02 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 09B29F69; Mon, 18 Aug 2014 18:41:02 +0000 (UTC) Received: from svn.freebsd.org (svn.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 E82E13724; Mon, 18 Aug 2014 18:41:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7IIf15E027646; Mon, 18 Aug 2014 18:41:01 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7IIf171027637; Mon, 18 Aug 2014 18:41:01 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <201408181841.s7IIf171027637@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Mon, 18 Aug 2014 18:41:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r365337 - in head/net-im: skype skype-devel skype-devel/files skype/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.18-1 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: Mon, 18 Aug 2014 18:41:02 -0000 Author: mandree Date: Mon Aug 18 18:41:00 2014 New Revision: 365337 URL: http://svnweb.freebsd.org/changeset/ports/365337 QAT: https://qat.redports.org/buildarchive/r365337/ Log: STAGE. Fix skype.sh launcher script, using "$@" instead of the unsafe $@, and fixing its shebang line to /bin/sh. Modified: head/net-im/skype-devel/Makefile head/net-im/skype-devel/files/skype.sh.in head/net-im/skype/Makefile head/net-im/skype/files/skype.sh.in Modified: head/net-im/skype-devel/Makefile ============================================================================== --- head/net-im/skype-devel/Makefile Mon Aug 18 18:37:30 2014 (r365336) +++ head/net-im/skype-devel/Makefile Mon Aug 18 18:41:00 2014 (r365337) @@ -9,13 +9,13 @@ MASTER_SITES= http://download.skype.com/ PKGNAMESUFFIX= -devel DISTNAME= skype_static-${DISTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= P2P VoIP software, development version CONFLICTS= skype-[0-9]* OPTIONS_DEFINE= VIDEO NVIDIA_GL -VIDEO_DESC=[broken] Video support +VIDEO_DESC= [broken] Video support NVIDIA_GL_DESC= libGL provided by NVidia binary drivers OPTIONS_DEFAULT= VIDEO @@ -37,8 +37,6 @@ PLIST_SUB+= SKYPEDIR=${SKYPEDIR} SUB_FILES= skype.sh SUB_LIST+= SKYPEDIR=${SKYPEDIR} -NO_STAGE= yes -.include .include .if ${PORT_OPTIONS:MNVIDIA_GL} @@ -78,21 +76,21 @@ IGNORE= ${IGNORE_MSG} .endif do-install: - @${INSTALL} -d ${PREFIX}/share/applications - @${INSTALL_DATA} ${WRKSRC}/skype.desktop ${PREFIX}/share/applications/ - @${INSTALL_DATA} ${WRKSRC}/icons/SkypeBlue_48x48.png ${PREFIX}/share/pixmaps/skype.png - @cd ${WRKSRC}/ && ${MKDIR} ${PREFIX}/${SKYPEDIR} && ${COPYTREE_SHARE} "avatars icons sounds lang" ${PREFIX}/${SKYPEDIR}/ + @${INSTALL} -d ${STAGEDIR}${PREFIX}/share/applications + @${INSTALL_DATA} ${WRKSRC}/skype.desktop ${STAGEDIR}${PREFIX}/share/applications/ + @${INSTALL_DATA} ${WRKSRC}/icons/SkypeBlue_48x48.png ${STAGEDIR}${PREFIX}/share/pixmaps/skype.png + @cd ${WRKSRC}/ && ${MKDIR} ${STAGEDIR}${PREFIX}/${SKYPEDIR} && ${COPYTREE_SHARE} "avatars icons sounds lang" ${STAGEDIR}${PREFIX}/${SKYPEDIR}/ # The binary main program - @${INSTALL_PROGRAM} ${WRKSRC}/skype ${PREFIX}/${SKYPEDIR}/ + @${INSTALL_PROGRAM} ${WRKSRC}/skype ${STAGEDIR}${PREFIX}/${SKYPEDIR}/ # The wrapper for main program - @${INSTALL_SCRIPT} ${WRKDIR}/skype.sh ${PREFIX}/bin/skype - @${CHMOD} a+rx ${PREFIX}/bin/skype + @${INSTALL_SCRIPT} ${WRKDIR}/skype.sh ${STAGEDIR}${PREFIX}/bin/skype + @${CHMOD} a+rx ${STAGEDIR}${PREFIX}/bin/skype .if ${PORT_OPTIONS:MDOCS} - @${INSTALL} -d ${DOCSDIR} - @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} + @${INSTALL} -d ${STAGEDIR}${DOCSDIR} + @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .endif @${CAT} ${PKGMESSAGE} Modified: head/net-im/skype-devel/files/skype.sh.in ============================================================================== --- head/net-im/skype-devel/files/skype.sh.in Mon Aug 18 18:37:30 2014 (r365336) +++ head/net-im/skype-devel/files/skype.sh.in Mon Aug 18 18:41:00 2014 (r365337) @@ -1,3 +1,2 @@ -#!/compat/linux/bin/sh -%%VIDEO%%%%PREFIX%%/%%SKYPEDIR%%/skype --resources=%%PREFIX%%/%%SKYPEDIR%% $@ - +#!/bin/sh +exec %%VIDEO%%%%PREFIX%%/%%SKYPEDIR%%/skype --resources=%%PREFIX%%/%%SKYPEDIR%% "$@" Modified: head/net-im/skype/Makefile ============================================================================== --- head/net-im/skype/Makefile Mon Aug 18 18:37:30 2014 (r365336) +++ head/net-im/skype/Makefile Mon Aug 18 18:41:00 2014 (r365337) @@ -9,7 +9,7 @@ CATEGORIES= net-im MASTER_SITES= http://download.skype.com/linux/ DISTNAME= skype_static-${DISTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= P2P VoIP software CONFLICTS= skype-devel-[0-9]* @@ -21,7 +21,7 @@ OPTIONS_DEFAULT= VIDEO NO_BUILD= yes -USES= tar:bzip2 +USES= tar:bzip2 USE_LINUX= yes USE_LINUX_APPS+=alsalib alsa-plugins-oss expat fontconfig libasyncns \ libsigcpp20 @@ -34,7 +34,6 @@ PLIST_SUB+= SKYPEDIR=${SKYPEDIR} SUB_FILES= skype.sh SUB_LIST+= SKYPEDIR=${SKYPEDIR} -NO_STAGE= yes .include .include @@ -75,21 +74,20 @@ IGNORE= ${IGNORE_MSG} .endif do-install: - @${INSTALL} -d ${PREFIX}/share/applications - @${INSTALL_DATA} ${WRKSRC}/skype.desktop ${PREFIX}/share/applications/ - @${INSTALL_DATA} ${WRKSRC}/icons/SkypeBlue_48x48.png ${PREFIX}/share/pixmaps/skype.png - @cd ${WRKSRC}/ && ${MKDIR} ${PREFIX}/${SKYPEDIR} && ${COPYTREE_SHARE} "avatars icons sounds lang" ${PREFIX}/${SKYPEDIR}/ + @${INSTALL} -d ${STAGEDIR}${PREFIX}/share/applications + @${INSTALL_DATA} ${WRKSRC}/skype.desktop ${STAGEDIR}${PREFIX}/share/applications/ + @${INSTALL_DATA} ${WRKSRC}/icons/SkypeBlue_48x48.png ${STAGEDIR}${PREFIX}/share/pixmaps/skype.png + @cd ${WRKSRC}/ && ${MKDIR} ${STAGEDIR}${PREFIX}/${SKYPEDIR} && ${COPYTREE_SHARE} "avatars icons sounds lang" ${STAGEDIR}${PREFIX}/${SKYPEDIR}/ # The binary main program - @${INSTALL_PROGRAM} ${WRKSRC}/skype ${PREFIX}/${SKYPEDIR}/ + @${INSTALL_PROGRAM} ${WRKSRC}/skype ${STAGEDIR}${PREFIX}/${SKYPEDIR}/ # The wrapper for main program - @${INSTALL_SCRIPT} ${WRKDIR}/skype.sh ${PREFIX}/bin/skype + @${INSTALL_SCRIPT} ${WRKDIR}/skype.sh ${STAGEDIR}${PREFIX}/bin/skype .if ${PORT_OPTIONS:MDOCS} - @${INSTALL} -d ${DOCSDIR} - @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} + @${INSTALL} -d ${STAGEDIR}${DOCSDIR} + @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .endif - @${CAT} ${PKGMESSAGE} .include Modified: head/net-im/skype/files/skype.sh.in ============================================================================== --- head/net-im/skype/files/skype.sh.in Mon Aug 18 18:37:30 2014 (r365336) +++ head/net-im/skype/files/skype.sh.in Mon Aug 18 18:41:00 2014 (r365337) @@ -1,3 +1,2 @@ -#!/compat/linux/bin/sh -%%VIDEO%%%%PREFIX%%/%%SKYPEDIR%%/skype --resources=%%PREFIX%%/%%SKYPEDIR%% $@ - +#!/bin/sh +exec %%VIDEO%%%%PREFIX%%/%%SKYPEDIR%%/skype --resources=%%PREFIX%%/%%SKYPEDIR%% "$@"