diff options
author | danfe <danfe@FreeBSD.org> | 2013-04-25 02:52:29 +0000 |
---|---|---|
committer | danfe <danfe@FreeBSD.org> | 2013-04-25 02:52:29 +0000 |
commit | 65b38ffcb04a6d535d7ca9aab3652b01b23a900c (patch) | |
tree | 661a4f46aca7cdd2b1ba682204693c9806726b7c | |
parent | 9ad0c8fa87e607ae7d26f1a904b4ba79484f0812 (diff) | |
download | FreeBSD-ports-65b38ffcb04a6d535d7ca9aab3652b01b23a900c.zip FreeBSD-ports-65b38ffcb04a6d535d7ca9aab3652b01b23a900c.tar.gz |
- 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
-rw-r--r-- | x11/nvidia-driver-173/Makefile | 2 | ||||
-rw-r--r-- | x11/nvidia-driver-304/Makefile | 2 | ||||
-rw-r--r-- | x11/nvidia-driver-71/Makefile | 2 | ||||
-rw-r--r-- | x11/nvidia-driver-96/Makefile | 2 | ||||
-rw-r--r-- | x11/nvidia-driver/Makefile | 12 | ||||
-rw-r--r-- | x11/nvidia-driver/pkg-descr | 2 | ||||
-rw-r--r-- | x11/nvidia-driver/pkg-plist | 1 |
7 files changed, 13 insertions, 10 deletions
diff --git a/x11/nvidia-driver-173/Makefile b/x11/nvidia-driver-173/Makefile index 63aca9b..05d1506 100644 --- a/x11/nvidia-driver-173/Makefile +++ b/x11/nvidia-driver-173/Makefile @@ -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 diff --git a/x11/nvidia-driver-304/Makefile b/x11/nvidia-driver-304/Makefile index ceb8d09..23ba9c1 100644 --- a/x11/nvidia-driver-304/Makefile +++ b/x11/nvidia-driver-304/Makefile @@ -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 diff --git a/x11/nvidia-driver-71/Makefile b/x11/nvidia-driver-71/Makefile index 904b014..a6f9a13 100644 --- a/x11/nvidia-driver-71/Makefile +++ b/x11/nvidia-driver-71/Makefile @@ -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 diff --git a/x11/nvidia-driver-96/Makefile b/x11/nvidia-driver-96/Makefile index f06a43b..f600e39 100644 --- a/x11/nvidia-driver-96/Makefile +++ b/x11/nvidia-driver-96/Makefile @@ -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 diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile index 12c1933..51d24b5 100644 --- a/x11/nvidia-driver/Makefile +++ b/x11/nvidia-driver/Makefile @@ -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} diff --git a/x11/nvidia-driver/pkg-descr b/x11/nvidia-driver/pkg-descr index b226f36..2cc234b 100644 --- a/x11/nvidia-driver/pkg-descr +++ b/x11/nvidia-driver/pkg-descr @@ -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 diff --git a/x11/nvidia-driver/pkg-plist b/x11/nvidia-driver/pkg-plist index 46d2edb..890b9bb 100644 --- a/x11/nvidia-driver/pkg-plist +++ b/x11/nvidia-driver/pkg-plist @@ -1,3 +1,4 @@ +bin/nvidia-bug-report.sh lib/.nvidia/libGL.so lib/.nvidia/libGL.so.1 @dirrm lib/.nvidia |