r8056 - in /packages/nvidia-graphics-drivers/branches/390-stretch-backports: ./ debian/

anbe at users.alioth.debian.org anbe at users.alioth.debian.org
Sun May 13 13:09:24 BST 2018


Author: anbe
Date: Sun May 13 12:09:23 2018
New Revision: 8056

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=8056
Log:
merge changes from 390.48-3

Modified:
    packages/nvidia-graphics-drivers/branches/390-stretch-backports/   (props changed)
    packages/nvidia-graphics-drivers/branches/390-stretch-backports/debian/changelog
    packages/nvidia-graphics-drivers/branches/390-stretch-backports/debian/control
    packages/nvidia-graphics-drivers/branches/390-stretch-backports/debian/libgl1-nvidia-glx.symbols.common
    packages/nvidia-graphics-drivers/branches/390-stretch-backports/debian/libnvidia-egl-wayland1.install.in
    packages/nvidia-graphics-drivers/branches/390-stretch-backports/debian/libnvidia-egl-wayland1.links.in
    packages/nvidia-graphics-drivers/branches/390-stretch-backports/debian/libnvidia-egl-wayland1.lintian-overrides.in
    packages/nvidia-graphics-drivers/branches/390-stretch-backports/debian/nvidia-alternative.postinst.in

Propchange: packages/nvidia-graphics-drivers/branches/390-stretch-backports/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Sun May 13 12:09:23 2018
@@ -28,6 +28,6 @@
 /packages/nvidia-graphics-drivers/branches/384:7311-7695
 /packages/nvidia-graphics-drivers/branches/384-stretch:7872-7996
 /packages/nvidia-graphics-drivers/branches/387:7561-7901
-/packages/nvidia-graphics-drivers/branches/390:7733-7905
+/packages/nvidia-graphics-drivers/branches/390:7733-7905,8029-8055
 /packages/nvidia-graphics-drivers/branches/jessie:5163-5181
-/packages/nvidia-graphics-drivers/trunk:7700-8008
+/packages/nvidia-graphics-drivers/trunk:7700-8028

Modified: packages/nvidia-graphics-drivers/branches/390-stretch-backports/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/branches/390-stretch-backports/debian/changelog?rev=8056&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/branches/390-stretch-backports/debian/changelog	(original)
+++ packages/nvidia-graphics-drivers/branches/390-stretch-backports/debian/changelog	Sun May 13 12:09:23 2018
@@ -1,3 +1,13 @@
+nvidia-graphics-drivers (390.48-3) unstable; urgency=medium
+
+  * Prepare nvidia-detect for the upcoming nvidia-legacy-390xx packages.
+  * Prepare for the removal of i386/armhf support in 396.xx.
+  * Support renamed variants of libnvidia-egl-wayland1/nvidia-egl-wayland-icd
+    in legacy drivers.
+  * Restrict watch file to releases from the 390.xx legacy branch.
+
+ -- Andreas Beckmann <anbe at debian.org>  Sun, 22 Apr 2018 04:34:11 +0200
+
 nvidia-graphics-drivers (390.48-2~bpo9+3) stretch-backports; urgency=medium
 
   * Add Conflicts against glvnd-aware MESA >= 17 from stretch-backports.
@@ -32,9 +42,8 @@
 nvidia-graphics-drivers (390.48-1) unstable; urgency=medium
 
   * New upstream long lived branch release 390.48 (2018-03-28).
-    * Fixed CVE-2018-6249, CVE-2018-6253.
+    * Fixed CVE-2018-6249, CVE-2018-6253.  (Closes: #894338)
       https://nvidia.custhelp.com/app/answers/detail/a_id/4649
-      (Closes: #894338)
     - Added support for the following GPUs: Quadro GV100, Tesla
       V100-SXM2-32GB, Tesla V100-PCIE-32GB, Tesla V100-DGXS-32GB.
     - Updated the driver to prevent G-SYNC from being enabled when a

Modified: packages/nvidia-graphics-drivers/branches/390-stretch-backports/debian/control
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/branches/390-stretch-backports/debian/control?rev=8056&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/branches/390-stretch-backports/debian/control	(original)
+++ packages/nvidia-graphics-drivers/branches/390-stretch-backports/debian/control	Sun May 13 12:09:23 2018
@@ -110,7 +110,7 @@
  libgles-${nvidia}1 (= ${binary:Version}),
  libgles-${nvidia}2 (= ${binary:Version}),
  lib${nvidia}-cfg1 (= ${binary:Version}),
- nvidia-egl-wayland-icd (= ${binary:Version}),
+ ${nvidia}-egl-wayland-icd (= ${binary:Version}),
  ${nvidia}-vulkan-icd (= ${binary:Version}) [amd64 i386],
 Conflicts:
  libgldispatch0-nvidia,
@@ -170,7 +170,7 @@
  libgles-${nvidia}1 (= ${binary:Version}),
  libgles-${nvidia}2 (= ${binary:Version}),
  lib${nvidia}-cfg1 (= ${binary:Version}),
- nvidia-egl-wayland-icd (= ${binary:Version}),
+ ${nvidia}-egl-wayland-icd (= ${binary:Version}),
  ${nvidia}-nonglvnd-vulkan-icd (= ${binary:Version}) [amd64 i386],
 Conflicts:
  libgldispatch0-nvidia,
@@ -196,7 +196,7 @@
  ${nvidia}-driver-libs,
  libgl1-${nvidia}-glvnd-glx,
  ${nvidia}-vulkan-icd,
-Description: NVIDIA metapackage (non-GLVND OpenGL/GLX/EGL/GLES libraries)${nvidia:LegacyDesc}
+Description: NVIDIA metapackage (non-GLVND OpenGL/GLX/EGL/GLES libraries)${nvidia:LegacyDescShort}
  This metapackage depends on the (non-GLVND) NVIDIA binary libraries
  that provide optimized hardware acceleration of
  OpenGL/GLX/EGL/GLES applications via a direct-rendering X Server.
@@ -210,9 +210,10 @@
  ${misc:Depends}
 Conflicts:
  libgl1-${nvidia}-glx-i386,
-Description: NVIDIA metapackage (non-GLVND OpenGL/GLX/EGL/GLES 32-bit libraries)${nvidia:LegacyDescShort}
+Description: NVIDIA metapackage (non-GLVND OpenGL/EGL/etc. 32-bit libraries)${nvidia:LegacyDescShort}
  This metapackage helps the automatic installation of the 32-bit NVIDIA
- OpenGL/GLX/EGL/GLES libraries when installing ${nvidia}-driver-libs-nonglvnd
+ OpenGL/GLX/EGL/GLES libraries when installing
+ ${nvidia}-driver-libs-nonglvnd
  on amd64 with foreign architecture i386 enabled.
 
 #Package: xserver-xorg-video-${nvidia}
@@ -706,7 +707,8 @@
 Depends:
  ${misc:Depends}
 Recommends:
- libegl-${nvidia}0,
+ libegl-${nvidia}0
+ | libegl-nvidia-legacy-390xx0,
 Description: NVIDIA binary EGL driver - common files
  EGL provides a platform-agnostic mechanism for creating rendering surfaces
  for use with other graphics libraries, such as OpenGL|ES.
@@ -735,12 +737,14 @@
  This metapackage provides the NVIDIA installable client driver (ICD) for
  EGL via GLVND which supports NVIDIA GPUs.
 
+#Package: lib${nvidia}-egl-wayland1
 Package: libnvidia-egl-wayland1
 Architecture: i386 amd64 armhf
 Multi-Arch: same
 Pre-Depends:
  ${misc:Pre-Depends}
 Depends:
+ ${nvidia}-alternative (= ${binary:Version}),
  ${shlibs:Depends}, ${misc:Depends}
 Breaks:
  libnvidia-egl-wayland,
@@ -759,7 +763,8 @@
 Depends:
  ${misc:Depends}
 Recommends:
- lib${nvidia}-egl-wayland1,
+ lib${nvidia}-egl-wayland1
+ | libnvidia-legacy-390xx-egl-wayland1,
 Description: NVIDIA binary Wayland EGL external platform - common files
  EGL provides a platform-agnostic mechanism for creating rendering surfaces
  for use with other graphics libraries, such as OpenGL|ES.
@@ -767,16 +772,18 @@
  This package provides the common files for the NVIDIA implementation
  of Wayland as an EGL external platform.
 
+#Package: ${nvidia}-egl-wayland-icd
 Package: nvidia-egl-wayland-icd
 Architecture: i386 amd64 armhf
 Multi-Arch: same
 Depends:
  nvidia-egl-wayland-common,
- libegl1+eglexternalplatform | libegl-${nvidia}0 (= ${binary:Version}),
- libnvidia-egl-wayland1 (= ${binary:Version}),
- ${misc:Depends}
-Enhances:
- libegl1+eglexternalplatform,
+# libegl1+eglexternalplatform |
+ libegl-${nvidia}0 (= ${binary:Version}),
+ lib${nvidia}-egl-wayland1 (= ${binary:Version}),
+ ${misc:Depends}
+#Enhances:
+# libegl1+eglexternalplatform,
 Provides:
  egl-wayland-icd,
 Description: NVIDIA Wayland EGL external platform library (ICD)
@@ -792,9 +799,11 @@
 Depends:
  ${misc:Depends}
 Recommends:
- ${nvidia}-vulkan-icd,
+ ${nvidia}-vulkan-icd
+ | nvidia-legacy-390xx-vulkan-icd,
 Conflicts:
  libgl1-${nvidia}-glx,
+ libgl1-nvidia-legacy-390xx-glx,
  nvidia-nonglvnd-vulkan-common,
 Description: NVIDIA Vulkan driver - common files
  Vulkan is a multivendor open standard by the Khronos Group for 3D graphics.
@@ -831,9 +840,11 @@
 Depends:
  ${misc:Depends}
 Recommends:
- ${nvidia}-nonglvnd-vulkan-icd,
+ ${nvidia}-nonglvnd-vulkan-icd
+ | nvidia-legacy-390xx-nonglvnd-vulkan-icd,
 Conflicts:
  libgl1-${nvidia}-glvnd-glx,
+ libgl1-nvidia-legacy-390xx-glvnd-glx,
  nvidia-vulkan-common,
 Description: NVIDIA Vulkan driver - common files (non-GLVND variant)
  Vulkan is a multivendor open standard by the Khronos Group for 3D graphics.
@@ -858,7 +869,7 @@
  vulkan-icd,
 Conflicts:
  ${nvidia}-vulkan-icd,
-Description: NVIDIA Vulkan installable client driver (ICD) (non-GLVND variant)${nvidia:LegacyDesc}
+Description: NVIDIA Vulkan ICD (non-GLVND variant)${nvidia:LegacyDesc}
  Vulkan is a multivendor open standard by the Khronos Group for 3D graphics.
  .
  This metapackage provides the NVIDIA installable client driver (ICD) for
@@ -1298,7 +1309,8 @@
 Depends:
  ${misc:Depends}
 Recommends:
- ${nvidia}-opencl-icd,
+ ${nvidia}-opencl-icd
+ | nvidia-legacy-390xx-opencl-icd,
 Description: NVIDIA OpenCL driver - common files
  OpenCL (Open Computing Language) is a multivendor open standard for
  general-purpose parallel programming of heterogeneous systems that include

Modified: packages/nvidia-graphics-drivers/branches/390-stretch-backports/debian/libgl1-nvidia-glx.symbols.common
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/branches/390-stretch-backports/debian/libgl1-nvidia-glx.symbols.common?rev=8056&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/branches/390-stretch-backports/debian/libgl1-nvidia-glx.symbols.common	(original)
+++ packages/nvidia-graphics-drivers/branches/390-stretch-backports/debian/libgl1-nvidia-glx.symbols.common	Sun May 13 12:09:23 2018
@@ -1,4 +1,4 @@
-libGL.so.1 libgl1-mesa-glx | libgl1xxx (>= 0.2.999)
+libGL.so.1 libgl1xxx (>= 0.2.999) | libgl1-mesa-glx
  glAccum at Base 1.0.4349
  glActiveProgramEXT at Base 190
  glActiveShaderProgram at Base 260

Modified: packages/nvidia-graphics-drivers/branches/390-stretch-backports/debian/libnvidia-egl-wayland1.install.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/branches/390-stretch-backports/debian/libnvidia-egl-wayland1.install.in?rev=8056&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/branches/390-stretch-backports/debian/libnvidia-egl-wayland1.install.in	(original)
+++ packages/nvidia-graphics-drivers/branches/390-stretch-backports/debian/libnvidia-egl-wayland1.install.in	Sun May 13 12:09:23 2018
@@ -1 +1 @@
-libnvidia-egl-wayland.so.1.0.2	#LIBDIR#/
+libnvidia-egl-wayland.so.1.0.2	#LIBDIR#/#PRIVATE#/

Modified: packages/nvidia-graphics-drivers/branches/390-stretch-backports/debian/libnvidia-egl-wayland1.links.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/branches/390-stretch-backports/debian/libnvidia-egl-wayland1.links.in?rev=8056&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/branches/390-stretch-backports/debian/libnvidia-egl-wayland1.links.in	(original)
+++ packages/nvidia-graphics-drivers/branches/390-stretch-backports/debian/libnvidia-egl-wayland1.links.in	Sun May 13 12:09:23 2018
@@ -1 +1 @@
-#LIBDIR#/libnvidia-egl-wayland.so.1.0.2	#LIBDIR#/libnvidia-egl-wayland.so.1
+#LIBDIR#/#PRIVATE#/libnvidia-egl-wayland.so.1.0.2	#LIBDIR#/#PRIVATE#/libnvidia-egl-wayland.so.1

Modified: packages/nvidia-graphics-drivers/branches/390-stretch-backports/debian/libnvidia-egl-wayland1.lintian-overrides.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/branches/390-stretch-backports/debian/libnvidia-egl-wayland1.lintian-overrides.in?rev=8056&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/branches/390-stretch-backports/debian/libnvidia-egl-wayland1.lintian-overrides.in	(original)
+++ packages/nvidia-graphics-drivers/branches/390-stretch-backports/debian/libnvidia-egl-wayland1.lintian-overrides.in	Sun May 13 12:09:23 2018
@@ -3,3 +3,6 @@
 hardening-no-fortify-functions
 hardening-no-relro
 hardening-no-stackprotector
+
+# Lintian and debhelper disagree w.r.t. a library in a private directory.
+package-has-unnecessary-activation-of-ldconfig-trigger

Modified: packages/nvidia-graphics-drivers/branches/390-stretch-backports/debian/nvidia-alternative.postinst.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/branches/390-stretch-backports/debian/nvidia-alternative.postinst.in?rev=8056&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/branches/390-stretch-backports/debian/nvidia-alternative.postinst.in	(original)
+++ packages/nvidia-graphics-drivers/branches/390-stretch-backports/debian/nvidia-alternative.postinst.in	Sun May 13 12:09:23 2018
@@ -53,6 +53,7 @@
 		$(add_multiarch_slave /usr/lib "" libGLX_nvidia.so.0 /usr/lib #PRIVATE#/)
 		$(add_multiarch_slave /usr/lib "" libGLX_indirect.so.0 /usr/lib #PRIVATE#/)
 		$(add_multiarch_slave /usr/lib "" libEGL_nvidia.so.0 /usr/lib #PRIVATE#/)
+		$(add_multiarch_slave /usr/lib "" libnvidia-egl-wayland.so.1 /usr/lib #PRIVATE#/)
 		$(add_multiarch_slave /usr/lib "" libGLESv1_CM_nvidia.so.1 /usr/lib #PRIVATE#/)
 		$(add_multiarch_slave /usr/lib "" libGLESv2_nvidia.so.2 /usr/lib #PRIVATE#/)
 		$(add_multiarch_slave /usr/lib "" libcuda.so.1 /usr/lib #PRIVATE#/)




More information about the pkg-nvidia-devel mailing list