From owner-svn-ports-head@FreeBSD.ORG Thu Apr 25 02:52:31 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 6DDD6D5E; Thu, 25 Apr 2013 02:52:31 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 4EC131B15; Thu, 25 Apr 2013 02:52:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3P2qVch051076; Thu, 25 Apr 2013 02:52:31 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3P2qT3s051066; Thu, 25 Apr 2013 02:52:29 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201304250252.r3P2qT3s051066@svn.freebsd.org> From: Alexey Dokuchaev Date: Thu, 25 Apr 2013 02:52:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r316497 - in head/x11: nvidia-driver nvidia-driver-173 nvidia-driver-304 nvidia-driver-71 nvidia-driver-96 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.14 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: Thu, 25 Apr 2013 02:52:31 -0000 Author: danfe Date: Thu Apr 25 02:52:29 2013 New Revision: 316497 URL: http://svnweb.freebsd.org/changeset/ports/316497 Log: - Fix stack buffer overflow in nvidia_sysctl_bus_type() - While here, install nvidia-bug-report.sh per popular demand and assume that everyone now has sed(1) that supports "addr1,+N" range syntax - Spell X as X11 in port description Submitted by: glebius Modified: head/x11/nvidia-driver-173/Makefile head/x11/nvidia-driver-304/Makefile head/x11/nvidia-driver-71/Makefile head/x11/nvidia-driver-96/Makefile head/x11/nvidia-driver/Makefile head/x11/nvidia-driver/pkg-descr head/x11/nvidia-driver/pkg-plist Modified: head/x11/nvidia-driver-173/Makefile ============================================================================== --- head/x11/nvidia-driver-173/Makefile Thu Apr 25 02:46:12 2013 (r316496) +++ head/x11/nvidia-driver-173/Makefile Thu Apr 25 02:52:29 2013 (r316497) @@ -3,7 +3,7 @@ DISTVERSION= 173.14.35 # Explicitly set PORTREVISION as it can be overridden by the master port -PORTREVISION= 1 +PORTREVISION= 2 MASTERDIR= ${.CURDIR}/../nvidia-driver NO_LATEST_LINK= yes Modified: head/x11/nvidia-driver-304/Makefile ============================================================================== --- head/x11/nvidia-driver-304/Makefile Thu Apr 25 02:46:12 2013 (r316496) +++ head/x11/nvidia-driver-304/Makefile Thu Apr 25 02:52:29 2013 (r316497) @@ -3,7 +3,7 @@ DISTVERSION= 304.88 # Explicitly set PORTREVISION as it can be overridden by the master port -PORTREVISION= 0 +PORTREVISION= 1 MASTERDIR= ${.CURDIR}/../nvidia-driver NO_LATEST_LINK= yes Modified: head/x11/nvidia-driver-71/Makefile ============================================================================== --- head/x11/nvidia-driver-71/Makefile Thu Apr 25 02:46:12 2013 (r316496) +++ head/x11/nvidia-driver-71/Makefile Thu Apr 25 02:52:29 2013 (r316497) @@ -3,7 +3,7 @@ DISTVERSION= 71.86.15 # Explicitly set PORTREVISION as it can be overridden by the master port -PORTREVISION= 2 +PORTREVISION= 3 MASTERDIR= ${.CURDIR}/../nvidia-driver NO_LATEST_LINK= yes Modified: head/x11/nvidia-driver-96/Makefile ============================================================================== --- head/x11/nvidia-driver-96/Makefile Thu Apr 25 02:46:12 2013 (r316496) +++ head/x11/nvidia-driver-96/Makefile Thu Apr 25 02:52:29 2013 (r316497) @@ -3,7 +3,7 @@ DISTVERSION= 96.43.23 # Explicitly set PORTREVISION as it can be overridden by the master port -PORTREVISION= 0 +PORTREVISION= 1 MASTERDIR= ${.CURDIR}/../nvidia-driver NO_LATEST_LINK= yes Modified: head/x11/nvidia-driver/Makefile ============================================================================== --- head/x11/nvidia-driver/Makefile Thu Apr 25 02:46:12 2013 (r316496) +++ head/x11/nvidia-driver/Makefile Thu Apr 25 02:52:29 2013 (r316497) @@ -13,7 +13,7 @@ PORTNAME= nvidia-driver DISTVERSION?= 310.44 # Always try to set PORTREVISION as it can be overridden by the slave ports -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11 kld MASTER_SITES= ${MASTER_SITE_NVIDIA} # MASTER_SITE_SUBDIR it set later because it depends on NVVERSION @@ -144,6 +144,11 @@ post-patch: .SILENT ${REINPLACE_CMD} -E 's/(VM_OBJECT_)(UN)?(LOCK)/\1W\2\3/' \ ${WRKSRC}/src/nvidia_subr.c .endif +# Fix stack buffer overflow in nvidia_sysctl_bus_type() + ${REINPLACE_CMD} -E '/bus_type\[4\]/d ; \ + s/sprintf\(bus_type, (".+")/return SYSCTL_OUT(req, \1, sizeof(\1)/ ; \ + /return SYSCTL_OUT\(req, bus_type/d' \ + ${WRKSRC}/src/nvidia_sysctl.c # Process OPTIONS .if ${PORT_OPTIONS:MFREEBSD_AGP} ${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_OS_AGP)/define \1/' \ @@ -200,6 +205,7 @@ pre-su-install: @cd ${PREFIX}/${MODULESDIR} && ${MKDIR} drivers extensions post-install: .SILENT + ${INSTALL_SCRIPT} ${WRKSRC}/obj/nvidia-bug-report.sh ${PREFIX}/bin # pkg-plist is already overbloated, so use these hacks instead of PLIST_SUB's .if ${NVVERSION} < 817400 ${REINPLACE_CMD} -e '/libnvidia-cfg/d' ${TMPPLIST} @@ -223,11 +229,7 @@ post-install: .SILENT ${LN} -sf libXvMCNVIDIA.so.1 ${PREFIX}/lib/libXvMCNVIDIA_dynamic.so.1 .endif .if ${NVVERSION} >= 1952200 -. if ${OSVERSION} > 800090 ${REINPLACE_CMD} -e '/does not support PAE/,+1d' ${PKGMESSAGE} -. else # when sed(1) does not support "addr1,+N" ranges, use line numbers - ${REINPLACE_CMD} -e '26,27d' ${PKGMESSAGE} -. endif .endif PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL ${ECHO_MSG} Modified: head/x11/nvidia-driver/pkg-descr ============================================================================== --- head/x11/nvidia-driver/pkg-descr Thu Apr 25 02:46:12 2013 (r316496) +++ head/x11/nvidia-driver/pkg-descr Thu Apr 25 02:52:29 2013 (r316497) @@ -1,4 +1,4 @@ These are the official NVidia binary drivers for hardware OpenGL rendering -in X, using the GLX extensions. +in X11, using the GLX extensions. WWW: http://www.nvidia.com/object/unix.html Modified: head/x11/nvidia-driver/pkg-plist ============================================================================== --- head/x11/nvidia-driver/pkg-plist Thu Apr 25 02:46:12 2013 (r316496) +++ head/x11/nvidia-driver/pkg-plist Thu Apr 25 02:52:29 2013 (r316497) @@ -1,3 +1,4 @@ +bin/nvidia-bug-report.sh lib/.nvidia/libGL.so lib/.nvidia/libGL.so.1 @dirrm lib/.nvidia