--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: buster-pu: package nvidia-graphics-drivers-legacy-390xx/390.144-1~deb10u1
- From: Andreas Beckmann <anbe@debian.org>
- Date: Mon, 26 Jul 2021 11:15:33 +0200
- Message-id: <162729093351.26301.13282575754087660224.reportbug@zam504.zam.kfa-juelich.de>
Package: release.debian.org
Severity: normal
Tags: buster
User: release.debian.org@packages.debian.org
Usertags: pu
Hi,
this is a new upstream release fixing some CVEs.
Further packaging changes (as in all driver variants in sid):
* adding Recommends on the libnvidia*-encode1 library. Several
multimedia applications are built with nvidia encode support and can
dlopen the library at runtime (if available) to use hardware
acceleration for video encoding
* computing the Vcs-Git branch while generating debian/control,
something I usually forgot to update when forking off a new driver
source package
This is a rebuild of the package in sid with no further changes.
The package is already uploaded.
Andreas
diff --git a/debian/changelog b/debian/changelog
index 4f625b6c..dd03e4e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,28 @@
+nvidia-graphics-drivers-legacy-390xx (390.144-1~deb10u1) buster; urgency=medium
+
+ * Rebuild for buster.
+
+ -- Andreas Beckmann <anbe@debian.org> Mon, 26 Jul 2021 10:50:49 +0200
+
+nvidia-graphics-drivers-legacy-390xx (390.144-1) unstable; urgency=medium
+
+ * New upstream legacy branch release 390.144 (2021-07-20).
+ * Fixed CVE-2021-1093, CVE-2021-1094, CVE-2021-1095. (Closes: #991353)
+ https://nvidia.custhelp.com/app/answers/detail/a_id/5211
+ - Worked around a bug in Meson builds of libglvnd 1.3.0 that caused the
+ nvidia_icd.json file to be installed in the wrong location.
+
+ [ Andreas Beckmann ]
+ * Refresh patches.
+ * nvidia-legacy-390xx-driver-libs: Add Recommends:
+ libnvidia-legacy-390xx-encode1 (460.91.03-1). (Closes: #989885)
+ * debian/gen-control.pl: Support substitutions in the Vcs-Git field
+ (460.91.03-1).
+ * Compute and substitute the Git branch instead of hardcoding it
+ (460.91.03-1).
+
+ -- Andreas Beckmann <anbe@debian.org> Wed, 21 Jul 2021 18:15:32 +0200
+
nvidia-graphics-drivers-legacy-390xx (390.143-1~deb10u1) buster; urgency=medium
* Rebuild for buster.
diff --git a/debian/control b/debian/control
index 0a5e7ed2..d5d11358 100644
--- a/debian/control
+++ b/debian/control
@@ -280,6 +280,7 @@ Recommends:
libgles-${nvidia-}1 (= ${binary:Version}),
libgles-${nvidia-}2 (= ${binary:Version}),
lib${nvidia}-cfg1 (= ${binary:Version}),
+ lib${nvidia}-encode1 (= ${binary:Version}),
${nvidia}-vulkan-icd (= ${binary:Version}) [amd64 i386],
Provides:
nvidia-driver-libs-any,
@@ -816,12 +817,12 @@ Pre-Depends:
${misc:Pre-Depends}
Depends:
${shlibs:Depends}, ${misc:Depends}
-Description: NVIDIA PTX JIT Compiler${nvidia:VariantDesc}
+Description: NVIDIA PTX JIT Compiler library${nvidia:VariantDesc}
The Compute Unified Device Architecture (CUDA) enables NVIDIA
graphics processing units (GPUs) to be used for massively parallel
general purpose computation.
.
- This package contains the runtime PTX JIT compiler library.
+ This package contains the runtime PTX JIT Compiler library.
Package: libnvidia-legacy-390xx-nvcuvid1
Architecture: i386 amd64 armhf
diff --git a/debian/control.in b/debian/control.in
index e5808800..4578ee3c 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -6,7 +6,7 @@ Uploaders:
Andreas Beckmann <anbe@debian.org>,
Luca Boccassi <bluca@debian.org>,
Vcs-Browser: https://salsa.debian.org/nvidia-team/nvidia-graphics-drivers
-Vcs-Git: https://salsa.debian.org/nvidia-team/nvidia-graphics-drivers.git -b 390xx/master
+Vcs-Git: https://salsa.debian.org/nvidia-team/nvidia-graphics-drivers.git${Vcs-Git:Branch}
Build-Depends:
debhelper-compat (= 12),
dpkg-dev (>= 1.18.8),
@@ -279,6 +279,7 @@ Recommends:
libgles-${nvidia-}1 (= ${binary:Version}),
libgles-${nvidia-}2 (= ${binary:Version}),
lib${nvidia}-cfg1 (= ${binary:Version}),
+ lib${nvidia}-encode1 (= ${binary:Version}),
${nvidia}-vulkan-icd (= ${binary:Version}) [amd64 i386],
Provides:
nvidia-driver-libs-any,
@@ -984,12 +985,12 @@ Pre-Depends:
${misc:Pre-Depends}
Depends:
${shlibs:Depends}, ${misc:Depends}
-Description: NVIDIA PTX JIT Compiler${nvidia:VariantDesc}
+Description: NVIDIA PTX JIT Compiler library${nvidia:VariantDesc}
The Compute Unified Device Architecture (CUDA) enables NVIDIA
graphics processing units (GPUs) to be used for massively parallel
general purpose computation.
.
- This package contains the runtime PTX JIT compiler library.
+ This package contains the runtime PTX JIT Compiler library.
Package: lib${nvidia-if-variant}nvcuvid1
Architecture: i386 amd64 armhf
diff --git a/debian/control.md5sum b/debian/control.md5sum
index 577ad1e6..2d97cbc9 100644
--- a/debian/control.md5sum
+++ b/debian/control.md5sum
@@ -1,5 +1,5 @@
-a1db8e174e35b30f771fffdf4690ea8b debian/control
-0a204645020c143be44b04bd5daf7b85 debian/control.in
-db12f898b07cdaf431ad34bd68a1662e debian/gen-control.pl
-e0a6daa55d2509f44d21bbb591ccbad1 debian/rules
+ccb4a54a66486aa141901ef3093865aa debian/control
+fae2dc9728a38fc5ded69c9bc53a5d07 debian/control.in
+8489c83cfe0171c9de6d052c01a6d19b debian/gen-control.pl
+8dc9440f4cfc0543f6aa774bf181e3c0 debian/rules
181fae6bc60df1e667ef475560be4fdf debian/rules.defs
diff --git a/debian/copyright b/debian/copyright
index 72ae9cfb..0f7b57cc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -14,7 +14,7 @@ Disclaimer:
permitted, and the binaries are not distributed with source code.
Files: *
-Copyright: 1993-2020 NVIDIA Corporation. All rights reserved.
+Copyright: 1993-2021 NVIDIA Corporation. All rights reserved.
License: NVIDIA-graphics-drivers
Files: debian/*
diff --git a/debian/gen-control.pl b/debian/gen-control.pl
index 1e84b6bd..37e42484 100755
--- a/debian/gen-control.pl
+++ b/debian/gen-control.pl
@@ -62,6 +62,7 @@ print "# run \`make -f debian/rules debian/control'.\n";
my $src_fields = $control->get_source();
$src_fields->{'Source'} = $substvars->substvars($src_fields->{'Source'});
+$src_fields->{'Vcs-Git'} = $substvars->substvars($src_fields->{'Vcs-Git'});
$src_fields->output(\*STDOUT);
foreach my $pkg_fields ($control->get_packages()) {
diff --git a/debian/module/debian/patches/arm-outer-sync.patch b/debian/module/debian/patches/arm-outer-sync.patch
index c2cfb88b..69b25d06 100644
--- a/debian/module/debian/patches/arm-outer-sync.patch
+++ b/debian/module/debian/patches/arm-outer-sync.patch
@@ -5,7 +5,7 @@ Description: Redefine WRITE_COMBINE_FLUSH on ARM on kernel >= 4.3
is defined. Fall back to no memory barrier at all if that is not configured.
--- a/common/inc/nv-linux.h
+++ b/common/inc/nv-linux.h
-@@ -470,7 +470,13 @@ extern int nv_pat_mode;
+@@ -469,7 +469,13 @@ extern int nv_pat_mode;
#if defined(CONFIG_OUTER_CACHE)
#define OUTER_FLUSH_RANGE(start, end) outer_flush_range((start),(end))
#endif
diff --git a/debian/module/debian/patches/cc_version_check-gcc5.patch b/debian/module/debian/patches/cc_version_check-gcc5.patch
index 88a5249c..fbdb8c66 100644
--- a/debian/module/debian/patches/cc_version_check-gcc5.patch
+++ b/debian/module/debian/patches/cc_version_check-gcc5.patch
@@ -5,7 +5,7 @@ Description: ignore __GNUC_MINOR__ from GCC 5 onwards
--- a/conftest.sh
+++ b/conftest.sh
-@@ -4442,7 +4442,7 @@ case "$6" in
+@@ -4581,7 +4581,7 @@ case "$6" in
kernel_cc_minor=`echo ${kernel_cc_version} | cut -d '.' -f 2`
echo "
diff --git a/debian/module/debian/patches/conftest-verbose.patch b/debian/module/debian/patches/conftest-verbose.patch
index 4fae8ce8..1d07bf60 100644
--- a/debian/module/debian/patches/conftest-verbose.patch
+++ b/debian/module/debian/patches/conftest-verbose.patch
@@ -3,7 +3,7 @@ Description: dump the generated conftest headers
--- a/Kbuild
+++ b/Kbuild
-@@ -117,6 +117,16 @@ NV_CONFTEST_HEADERS += $(obj)/conftest/h
+@@ -114,6 +114,16 @@ NV_CONFTEST_HEADERS += $(obj)/conftest/h
NV_CONFTEST_HEADERS += $(NV_CONFTEST_COMPILE_TEST_HEADERS)
@@ -20,7 +20,7 @@ Description: dump the generated conftest headers
#
# Generate a header file for a single conftest compile test. Each compile test
# header depends on conftest.sh, as well as the generated conftest/headers.h
-@@ -141,6 +151,8 @@ define NV_GENERATE_COMPILE_TEST_HEADER
+@@ -138,6 +148,8 @@ define NV_GENERATE_COMPILE_TEST_HEADER
@mkdir -p $(obj)/conftest
@# concatenate /dev/null to prevent cat from hanging when $$^ is empty
@cat $$^ /dev/null > $$@
@@ -29,7 +29,7 @@ Description: dump the generated conftest headers
endef
#
-@@ -160,13 +172,17 @@ $(eval $(call NV_GENERATE_COMPILE_TEST_H
+@@ -157,13 +169,17 @@ $(eval $(call NV_GENERATE_COMPILE_TEST_H
$(eval $(call NV_GENERATE_COMPILE_TEST_HEADER,symbols,$(NV_CONFTEST_SYMBOL_COMPILE_TESTS)))
$(eval $(call NV_GENERATE_COMPILE_TEST_HEADER,types,$(NV_CONFTEST_TYPE_COMPILE_TESTS)))
diff --git a/debian/module/debian/patches/ignore_xen_on_arm.patch b/debian/module/debian/patches/ignore_xen_on_arm.patch
index fa28dbab..150aa69f 100644
--- a/debian/module/debian/patches/ignore_xen_on_arm.patch
+++ b/debian/module/debian/patches/ignore_xen_on_arm.patch
@@ -24,7 +24,7 @@ Description: Undef CONFIG_XEN and CONFIG_XEN_DOM0 if building on ARM
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 9)
#error "This driver does not support kernels older than 2.6.9!"
#elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 7, 0)
-@@ -285,7 +290,7 @@ NV_STATUS nvos_forward_error_to_cray(str
+@@ -284,7 +289,7 @@ NV_STATUS nvos_forward_error_to_cray(str
* NVIDIA graphics driver has no way of knowing and is unlikely
* to work correctly.
*/
diff --git a/debian/module/debian/patches/include-swiotlb-header-on-arm.patch b/debian/module/debian/patches/include-swiotlb-header-on-arm.patch
index 88357d22..6ea5a4e3 100644
--- a/debian/module/debian/patches/include-swiotlb-header-on-arm.patch
+++ b/debian/module/debian/patches/include-swiotlb-header-on-arm.patch
@@ -6,7 +6,7 @@ Description: Include linux/swiotlb.h if CONFIG_ARM is defined
--- a/common/inc/nv-linux.h
+++ b/common/inc/nv-linux.h
-@@ -182,7 +182,7 @@ static inline uid_t __kuid_val(kuid_t ui
+@@ -181,7 +181,7 @@ static inline uid_t __kuid_val(kuid_t ui
#endif
#endif
diff --git a/debian/module/debian/patches/kernel-5.7.0-set-memory-array.patch b/debian/module/debian/patches/kernel-5.7.0-set-memory-array.patch
index 5c50840b..5146010a 100644
--- a/debian/module/debian/patches/kernel-5.7.0-set-memory-array.patch
+++ b/debian/module/debian/patches/kernel-5.7.0-set-memory-array.patch
@@ -54,7 +54,7 @@ Bug-Debian: https://bugs.debian.org/960735
#if defined(NV_ASM_SET_MEMORY_H_PRESENT)
#if defined(NV_ASM_PGTABLE_TYPES_H_PRESENT)
#include <asm/pgtable_types.h>
-@@ -1881,7 +1887,7 @@ compile_test() {
+@@ -1869,7 +1875,7 @@ compile_test() {
# Determine if atomic_long_t and associated functions are defined
# Added in 2.6.16 2006-01-06 d3cb487149bd706aa6aeb02042332a450978dc1c
CODE="
@@ -63,7 +63,7 @@ Bug-Debian: https://bugs.debian.org/960735
void conftest_atomic_long(void) {
atomic_long_t data;
atomic_long_read(&data);
-@@ -1895,7 +1901,7 @@ compile_test() {
+@@ -1883,7 +1889,7 @@ compile_test() {
atomic64_type)
# Determine if atomic64_t and associated functions are defined
CODE="
@@ -72,7 +72,7 @@ Bug-Debian: https://bugs.debian.org/960735
void conftest_atomic64(void) {
atomic64_t data;
atomic64_read(&data);
-@@ -3585,7 +3591,7 @@ compile_test() {
+@@ -3584,7 +3590,7 @@ compile_test() {
# 2008-01-25 9ee85241fdaab358dff1d8647f20a478cfa512a1
#
CODE="
diff --git a/debian/module/debian/patches/use-kbuild-flags.patch b/debian/module/debian/patches/use-kbuild-flags.patch
index 3d15f726..6b2b729d 100644
--- a/debian/module/debian/patches/use-kbuild-flags.patch
+++ b/debian/module/debian/patches/use-kbuild-flags.patch
@@ -5,7 +5,7 @@ Description: use KBUILD_CFLAGS and (KBUILD_)LDFLAGS
--- a/Kbuild
+++ b/Kbuild
-@@ -104,6 +104,7 @@ NV_CONFTEST_CMD := /bin/sh $(NV_CONFTEST
+@@ -101,6 +101,7 @@ NV_CONFTEST_CMD := /bin/sh $(NV_CONFTEST
"$(CC)" "$(HOST_CC)" $(ARCH) $(NV_KERNEL_SOURCES) $(NV_KERNEL_OUTPUT)
NV_CONFTEST_CFLAGS := $(shell $(NV_CONFTEST_CMD) build_cflags)
@@ -15,8 +15,8 @@ Description: use KBUILD_CFLAGS and (KBUILD_)LDFLAGS
NV_CONFTEST_COMPILE_TEST_HEADERS += $(obj)/conftest/functions.h
--- a/nvidia/nvidia.Kbuild
+++ b/nvidia/nvidia.Kbuild
-@@ -88,7 +88,7 @@ NVIDIA_INTERFACE := nvidia/nv-interface.
- always += $(NVIDIA_INTERFACE)
+@@ -93,7 +93,7 @@ always += $(NVIDIA_INTERFACE)
+ always-y += $(NVIDIA_INTERFACE)
$(obj)/$(NVIDIA_INTERFACE): $(addprefix $(obj)/,$(NVIDIA_OBJECTS))
- $(LD) -r -o $@ $^
@@ -37,8 +37,8 @@ Description: use KBUILD_CFLAGS and (KBUILD_)LDFLAGS
# Kbuild's "clean" rule won't clean up the conftest headers on its own, and
--- a/nvidia-modeset/nvidia-modeset.Kbuild
+++ b/nvidia-modeset/nvidia-modeset.Kbuild
-@@ -70,7 +70,7 @@ NVIDIA_MODESET_INTERFACE := nvidia-modes
- always += $(NVIDIA_MODESET_INTERFACE)
+@@ -75,7 +75,7 @@ always += $(NVIDIA_MODESET_INTERFACE)
+ always-y += $(NVIDIA_MODESET_INTERFACE)
$(obj)/$(NVIDIA_MODESET_INTERFACE): $(addprefix $(obj)/,$(NVIDIA_MODESET_OBJECTS))
- $(LD) -r -o $@ $^
diff --git a/debian/module/debian/patches/use-kbuild-gcc-plugins.patch b/debian/module/debian/patches/use-kbuild-gcc-plugins.patch
index 65e18e1c..a21c7c35 100644
--- a/debian/module/debian/patches/use-kbuild-gcc-plugins.patch
+++ b/debian/module/debian/patches/use-kbuild-gcc-plugins.patch
@@ -4,7 +4,7 @@ Description: ignore GCC plugins
CONFIG_GCC_PLUGIN_STRUCTLEAK and CONFIG_GCC_PLUGIN_RANDSTRUCT.
--- a/Kbuild
+++ b/Kbuild
-@@ -104,7 +104,7 @@ NV_CONFTEST_CMD := /bin/sh $(NV_CONFTEST
+@@ -101,7 +101,7 @@ NV_CONFTEST_CMD := /bin/sh $(NV_CONFTEST
"$(CC)" "$(HOST_CC)" $(ARCH) $(NV_KERNEL_SOURCES) $(NV_KERNEL_OUTPUT)
NV_CONFTEST_CFLAGS := $(shell $(NV_CONFTEST_CMD) build_cflags)
diff --git a/debian/rules b/debian/rules
index d87de133..ae4edee5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -375,6 +375,7 @@ debian/control-real: $(CONTROL_FILES)
-V'nvidia-if-variant=$(nvidia_if_variant)' \
-V'nvidia:Variant=$(-variant)' \
-V'libcuda1=$(libcuda1)' \
+ -V'Vcs-Git:Branch=$(if $(variant), -b $(subst legacy-,,$(variant))/master)' \
$(foreach a,$(ARCH_CANDIDATES),-V'arch:$a=$(filter $a,$(DRIVER_ARCH_LIST))') \
-- \
debian/control.in > debian/control.new
--- End Message ---