Control: tags -1 patch
I am uploading a LowNMU with the attached changes to fix this.
diff -Nru carl9170fw-1.9.9-686-ge7ba7bf+dfsg/carlfw/CMakeLists.txt
carl9170fw-1.9.9-690-gc6e7ab0/carlfw/CMakeLists.txt
--- carl9170fw-1.9.9-686-ge7ba7bf+dfsg/carlfw/CMakeLists.txt 2025-08-17
17:21:47.000000000 +0200
+++ carl9170fw-1.9.9-690-gc6e7ab0/carlfw/CMakeLists.txt 2025-10-18
18:34:56.000000000 +0200
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.10)
project(carl9170.fw)
@@ -43,30 +43,14 @@
add_custom_command(
POST_BUILD
- DEPENDS carl9170.elf
+ TARGET firmware
COMMAND ${OBJCOPY}
ARGS --strip-unneeded -O binary -R .sram -R .eeprom -R .fwdsc
carl9170.elf carl9170.bin
- TARGET firmware
- BYPRODUCTS carl9170.bin
- OUTPUTS carl9170.bin)
-
-add_custom_command(
- POST_BUILD
- DEPENDS carl9170.elf
COMMAND ${OBJCOPY}
ARGS --strip-unneeded -O binary -j .fwdsc carl9170.elf carl9170.dsc
- TARGET firmware
- BYPRODUCTS carl9170.dsc
- OUTPUTS carl9170.dsc)
-
-add_custom_command(
- POST_BUILD
- DEPENDS firmware
- TARGET firmware
COMMAND cat
ARGS "carl9170.bin" "carl9170.dsc" > "carl9170.fw"
- DEPENDS carl9170.elf carl9170.bin carl9170.dsc
- OUTPUTS carl9170.fw)
+ BYPRODUCTS carl9170.bin carl9170.dsc carl9170.fw)
SET_DIRECTORY_PROPERTIES(
PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "carl9170.fw")
diff -Nru carl9170fw-1.9.9-686-ge7ba7bf+dfsg/CMakeLists.txt
carl9170fw-1.9.9-690-gc6e7ab0/CMakeLists.txt
--- carl9170fw-1.9.9-686-ge7ba7bf+dfsg/CMakeLists.txt 2025-08-17
17:21:47.000000000 +0200
+++ carl9170fw-1.9.9-690-gc6e7ab0/CMakeLists.txt 2025-10-18
18:34:56.000000000 +0200
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.10)
project(carl9170)
diff -Nru carl9170fw-1.9.9-686-ge7ba7bf+dfsg/debian/changelog
carl9170fw-1.9.9-690-gc6e7ab0/debian/changelog
--- carl9170fw-1.9.9-686-ge7ba7bf+dfsg/debian/changelog 2025-10-06
11:49:11.000000000 +0200
+++ carl9170fw-1.9.9-690-gc6e7ab0/debian/changelog 2025-12-24
01:26:58.000000000 +0100
@@ -1,3 +1,10 @@
+carl9170fw (1.9.9-690-gc6e7ab0-0.1) unstable; urgency=medium
+
+ * Non-maintainer upload
+ * Build without branch hardening (Closes: #1123920)
+
+ -- Bastian Germann <[email protected]> Wed, 24 Dec 2025 01:26:58 +0100
+
carl9170fw (1.9.9-686-ge7ba7bf+dfsg-0.1) unstable; urgency=medium
* Non-maintainer upload
diff -Nru carl9170fw-1.9.9-686-ge7ba7bf+dfsg/debian/copyright
carl9170fw-1.9.9-690-gc6e7ab0/debian/copyright
--- carl9170fw-1.9.9-686-ge7ba7bf+dfsg/debian/copyright 2025-01-05
16:12:27.000000000 +0100
+++ carl9170fw-1.9.9-690-gc6e7ab0/debian/copyright 2025-12-24
01:18:00.000000000 +0100
@@ -1,7 +1,6 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Community AR9170 Linux firmware
Upstream-Contact: [email protected]
-Files-Excluded: tools/src/eeprom_fix
Files: *
Copyright: 2000-2005 ZyDAS Technology Corporation
diff -Nru carl9170fw-1.9.9-686-ge7ba7bf+dfsg/debian/rules
carl9170fw-1.9.9-690-gc6e7ab0/debian/rules
--- carl9170fw-1.9.9-686-ge7ba7bf+dfsg/debian/rules 2025-01-05
16:12:27.000000000 +0100
+++ carl9170fw-1.9.9-690-gc6e7ab0/debian/rules 2025-12-24 01:16:08.000000000
+0100
@@ -2,6 +2,8 @@
include /usr/share/dpkg/buildopts.mk
DEB_BUILD_OPTION_PARALLEL ?= 1
+export DEB_BUILD_MAINT_OPTIONS=hardening=-branch
+
%:
dh $@ --builddirectory=carl9170-build
diff -Nru carl9170fw-1.9.9-686-ge7ba7bf+dfsg/debian/watch
carl9170fw-1.9.9-690-gc6e7ab0/debian/watch
--- carl9170fw-1.9.9-686-ge7ba7bf+dfsg/debian/watch 2025-01-05
16:18:11.000000000 +0100
+++ carl9170fw-1.9.9-690-gc6e7ab0/debian/watch 2025-12-24 01:18:53.000000000
+0100
@@ -1,3 +1,3 @@
version=4
-opts="dversionmangle=auto, mode=git, repacksuffix=+dfsg, dversionmangle=auto,
uversionmangle=s/(\d\.\d\.\d)\.(.+)\.(.+)/$1-$2-$3/, pretty=describe" \
+opts="dversionmangle=auto, mode=git, dversionmangle=auto,
uversionmangle=s/(\d\.\d\.\d)\.(.+)\.(.+)/$1-$2-$3/, pretty=describe" \
https://github.com/chunkeey/@[email protected] HEAD debian
diff -Nru carl9170fw-1.9.9-686-ge7ba7bf+dfsg/minifw/CMakeLists.txt
carl9170fw-1.9.9-690-gc6e7ab0/minifw/CMakeLists.txt
--- carl9170fw-1.9.9-686-ge7ba7bf+dfsg/minifw/CMakeLists.txt 2025-08-17
17:21:47.000000000 +0200
+++ carl9170fw-1.9.9-690-gc6e7ab0/minifw/CMakeLists.txt 2025-10-18
18:34:56.000000000 +0200
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.10)
project(miniboot.fw)
diff -Nru carl9170fw-1.9.9-686-ge7ba7bf+dfsg/tools/CMakeLists.txt
carl9170fw-1.9.9-690-gc6e7ab0/tools/CMakeLists.txt
--- carl9170fw-1.9.9-686-ge7ba7bf+dfsg/tools/CMakeLists.txt 2025-08-17
17:21:47.000000000 +0200
+++ carl9170fw-1.9.9-690-gc6e7ab0/tools/CMakeLists.txt 2025-10-18
18:34:56.000000000 +0200
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.10)
project(tools)
diff -Nru carl9170fw-1.9.9-686-ge7ba7bf+dfsg/tools/lib/CMakeLists.txt
carl9170fw-1.9.9-690-gc6e7ab0/tools/lib/CMakeLists.txt
--- carl9170fw-1.9.9-686-ge7ba7bf+dfsg/tools/lib/CMakeLists.txt 2025-08-17
17:21:47.000000000 +0200
+++ carl9170fw-1.9.9-690-gc6e7ab0/tools/lib/CMakeLists.txt 2025-10-18
18:34:56.000000000 +0200
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.10)
project(libcarlfw)
diff -Nru carl9170fw-1.9.9-686-ge7ba7bf+dfsg/tools/src/CMakeLists.txt
carl9170fw-1.9.9-690-gc6e7ab0/tools/src/CMakeLists.txt
--- carl9170fw-1.9.9-686-ge7ba7bf+dfsg/tools/src/CMakeLists.txt 2025-08-17
17:21:47.000000000 +0200
+++ carl9170fw-1.9.9-690-gc6e7ab0/tools/src/CMakeLists.txt 2025-10-18
18:34:56.000000000 +0200
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.10)
project(tools)
diff -Nru carl9170fw-1.9.9-686-ge7ba7bf+dfsg/tools/src/fwinfo.c
carl9170fw-1.9.9-690-gc6e7ab0/tools/src/fwinfo.c
--- carl9170fw-1.9.9-686-ge7ba7bf+dfsg/tools/src/fwinfo.c 2025-08-17
17:21:47.000000000 +0200
+++ carl9170fw-1.9.9-690-gc6e7ab0/tools/src/fwinfo.c 2025-10-18
18:34:56.000000000 +0200
@@ -227,7 +227,7 @@
}
static const struct {
- uint8_t magic[4];
+ uint8_t magic[4] __attribute__((__nonstring__));
uint8_t min_ver;
void (*func)(const struct carl9170fw_desc_head *, struct carlfw *);
uint16_t size;
