summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-08 19:29:52 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-08 19:29:52 +0000
commit7cd7ff35957d99e1e4bfe27d860087c0e6c0ed2f (patch)
tree429dc9519b48c1d2a8c40766ba5e8c507f276e87
parentMerging upstream version 115.9.1esr. (diff)
downloadfirefox-esr-7cd7ff35957d99e1e4bfe27d860087c0e6c0ed2f.tar.xz
firefox-esr-7cd7ff35957d99e1e4bfe27d860087c0e6c0ed2f.zip
Adding debian version 115.9.1esr-1~deb12u1.debian/115.9.1esr-1_deb12u1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog9
-rw-r--r--debian/control12
-rw-r--r--debian/control.in12
-rwxr-xr-xdebian/rules4
4 files changed, 18 insertions, 19 deletions
diff --git a/debian/changelog b/debian/changelog
index 2b732b9aa5..bd8773777f 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~deb12u1) bookworm-security; urgency=medium
* New upstream release.
diff --git a/debian/control b/debian/control
index b3cafe46c3..d86f09f332 100644
--- a/debian/control
+++ b/debian/control
@@ -28,12 +28,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 59273b0ce5..a869fab061 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -51,19 +51,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 8c91e06567..0b48b60b65 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