From 0a940f0b15e8e247ccde9ec6b86b11032253dce0 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Mon, 8 Apr 2024 21:30:13 +0200
Subject: Merging debian version 115.9.1esr-1~deb12u1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 debian/changelog  |  9 +++++++++
 debian/control    | 12 ++++++------
 debian/control.in | 12 +++---------
 debian/rules      |  4 ----
 4 files changed, 18 insertions(+), 19 deletions(-)

(limited to 'debian')

diff --git a/debian/changelog b/debian/changelog
index 38bdc0bf08..9c90bd633f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+firefox-esr (115.9.1esr-1~deb12u1) bookworm-security; urgency=medium
+
+  * New upstream release.
+  * Fixes for mfsa2024-16, also known as CVE-2024-29944.
+
+  * debian/control*, debian/rules: Undo workaround for bug 1052002.
+
+ -- Mike Hommey <glandium@debian.org>  Sat, 23 Mar 2024 05:09:32 +0900
+
 firefox-esr (115.9.0esr-1~deb12u1progress7u1) graograman-security; urgency=medium
 
   * Uploading to graograman-security, remaining changes:
diff --git a/debian/control b/debian/control
index 6c49a5a60d..e54bbd7bc9 100644
--- a/debian/control
+++ b/debian/control
@@ -31,12 +31,12 @@ Build-Depends: autotools-dev,
                nasm (>= 2.14) [amd64 i386],
                rustc (>= 1.63),
                cargo (>= 0.66),
-               llvm-14-dev,
-               libclang-14-dev,
-               clang-14,
-               libc++-14-dev-wasm32,
-               libclang-rt-14-dev-wasm32,
-               lld-14,
+               llvm-dev,
+               libclang-dev,
+               clang,
+               libc++-dev-wasm32,
+               libclang-rt-dev-wasm32,
+               lld,
                cbindgen (>= 0.24.3),
                nodejs (>= 12.22.1),
                zip,
diff --git a/debian/control.in b/debian/control.in
index 92fbb1e311..dc2837b31d 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -54,19 +54,13 @@ Build-Depends: autotools-dev,
 %else
                cargo (>= 0.66),
 %endif
-%if DIST == bullseye || DIST == buster
                llvm-dev,
                libclang-dev,
                clang,
-%else
-               llvm-14-dev,
-               libclang-14-dev,
-               clang-14,
-%endif
 %if DIST != bullseye && DIST != buster
-               libc++-14-dev-wasm32,
-               libclang-rt-14-dev-wasm32,
-               lld-14,
+               libc++-dev-wasm32,
+               libclang-rt-dev-wasm32,
+               lld,
 %endif
                cbindgen (>= 0.24.3),
                nodejs (>= 12.22.1),
diff --git a/debian/rules b/debian/rules
index 59cb2d4d43..07636e8b6e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -140,10 +140,6 @@ ifeq (default,$(origin CXX))
 CXX := g++
 endif
 
-ifeq (,$(filter buster bullseye,$(DIST)))
-PATH := /usr/lib/llvm-14/bin:$(PATH)
-endif
-
 ifneq (,$(filter mips mipsel,$(DEB_HOST_ARCH)))
 CONFIGURE_FLAGS += --disable-jit
 endif
-- 
cgit v1.2.3