diff --git a/debian/lib/python/debian_linux/gencontrol.py b/debian/lib/python/debian_linux/gencontrol.py index 2665a1d..53312a9 100644 --- a/debian/lib/python/debian_linux/gencontrol.py +++ b/debian/lib/python/debian_linux/gencontrol.py @@ -189,8 +189,6 @@ class PackagesBundle: package.meta_rules_check_packages = check_packages for name in ( - 'NEWS', - 'bug-presubj', 'lintian-overrides', 'maintscript', 'postinst', diff --git a/debian/rules b/debian/rules index 57421a0..fc26c10 100755 --- a/debian/rules +++ b/debian/rules @@ -73,8 +73,6 @@ clean-generated: debian/control.md5sum \ debian/linux-headers-*.maintscript \ debian/linux-headers-*.postinst \ - debian/linux-image-*.NEWS \ - debian/linux-image-*.bug-presubj \ debian/linux-image-*.lintian-overrides \ debian/linux-image-*.maintscript \ debian/linux-image-*.postinst \ diff --git a/debian/rules.d/tools/power/cpupower/Makefile b/debian/rules.d/tools/power/cpupower/Makefile index e1efe1e..e24ee1d 100644 --- a/debian/rules.d/tools/power/cpupower/Makefile +++ b/debian/rules.d/tools/power/cpupower/Makefile @@ -9,8 +9,6 @@ MAKE_CPUPOWER += STRIP=true MAKE_CPUPOWER += CROSS='$(CROSS_COMPILE)' -MAKE_CPUPOWER += PACKAGE_BUGREPORT='Debian\ \(reportbug\ linux-cpupower\)' - MAKE_CPUPOWER += libdir=/usr/lib/$(DEB_HOST_MULTIARCH) all: diff --git a/debian/rules.real b/debian/rules.real index 078d5fc..1cb3baa 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -366,17 +366,8 @@ endif xz -9k < $(DIR)/System.map > $(DESTDIR)/$(SYSTEM_MAP_PATH) echo "ffffffffffffffff B The real System.map is compressed into /$(SYSTEM_MAP_PATH)" > $(DESTDIR)/boot/System.map-$(REAL_VERSION) rm $(DESTDIR)/lib/firmware -rf - +$(MAKE_SELF) \ - binary_image_bug \ - DESTDIR='$(DESTDIR)' PACKAGE_NAME='$(PACKAGE_NAME)' REAL_VERSION='$(REAL_VERSION)' $(dh_binary_post) -binary_image_bug: - dh_installdirs usr/share/bug/$(PACKAGE_NAME) - dh_install debian/templates/image.bug/* usr/share/bug/$(PACKAGE_NAME) - chmod 755 $(DESTDIR)/usr/share/bug/$(PACKAGE_NAME)/script - printf "RELEASE='$(REAL_VERSION)'\nDISTRIBUTOR='$(DEB_VENDOR)'\nSOURCEVERSION='$(SOURCEVERSION)'\nPACKAGE_NAME='$(PACKAGE_NAME)'\nPACKAGE_VERSION='$(SOURCEVERSION)'" > $(DESTDIR)/usr/share/bug/$(PACKAGE_NAME)/info - build_source: binary_source: BUILDDEB_ARGS = -Zxz -z0 diff --git a/debian/templates/image.NEWS.j2 b/debian/templates/image.NEWS.j2 deleted file mode 100644 index d07bf6f..0000000 --- a/debian/templates/image.NEWS.j2 +++ /dev/null @@ -1,110 +0,0 @@ -{% if arch in ('ppc64', 'ppc64el') %} -linux (6.10-1~exp2) unstable; urgency=medium - - * From Linux 6.10, the default kernel on ppc64 and ppc64el - architectures uses 4k page size. - - After rebooting, you need to re-create all swap files or partitions. - They depend on the page size and will be not longer usable. See - mkswap(8) on how to do that. - - Some file systems might be incompatible with the smaller page size. - At least btrfs created with default settings is known to be affected - and they will not work with this kernel any more. - - A btrfs file system can be checked with file(1) (use file -s). It - will show: - BTRFS Filesystem sectorsize 65536 - If this number is larger then 4096, the file system can not be - mounted with the default kernel anymore. - - If you are affected and require the 64k page size of older kernels, - you can install linux-image-powerpc64-64k or - linux-image-powerpc64el-64k packages. - - -- Bastian Blank Thu, 11 Jul 2024 11:12:35 +0200 - -{% endif %} -linux (5.10.46-4) unstable; urgency=medium - - * From Linux 5.10.46-4, unprivileged calls to bpf() are disabled by - default, mitigating several security issues. However, an admin can - still change this setting later on, if needed, by writing 0 or 1 to - the kernel.unprivileged_bpf_disabled sysctl. - - If you prefer to keep unprivileged calls to bpf() enabled, set the - sysctl: - - kernel.unprivileged_bpf_disabled = 0 - - which is the upstream default. - - -- Salvatore Bonaccorso Mon, 02 Aug 2021 22:59:24 +0200 - -linux (5.10~rc7-1~exp2) unstable; urgency=medium - - * From Linux 5.10, all users are allowed to create user namespaces by - default. This will allow programs such as web browsers and container - managers to create more restricted sandboxes for untrusted or - less-trusted code, without the need to run as root or to use a - setuid-root helper. - - The previous Debian default was to restrict this feature to processes - running as root, because it exposed more security issues in the - kernel. However, the security benefits of more widespread sandboxing - probably now outweigh this risk. - - If you prefer to keep this feature restricted, set the sysctl: - - kernel.unprivileged_userns_clone = 0 - - -- Ben Hutchings Sun, 13 Dec 2020 17:11:36 +0100 - -linux-latest (86) unstable; urgency=medium - - * From Linux 4.13.10-1, AppArmor is enabled by default. This allows - defining a "profile" for each installed program that can mitigate - security vulnerabilities in it. However, an incorrect profile might - disable some functionality of the program. - - In case you suspect that an AppArmor profile is incorrect, see - and - consider reporting a bug in the package providing the profile. The - profile may be part of the program's package or apparmor-profiles. - - -- Ben Hutchings Thu, 30 Nov 2017 20:08:25 +0000 - -linux-latest (81) unstable; urgency=medium - - * From Linux 4.10, the old 'virtual syscall' interface on 64-bit PCs - (amd64) is disabled. This breaks chroot environments and containers - that use (e)glibc 2.13 and earlier, including those based on Debian 7 - or RHEL/CentOS 6. To re-enable it, set the kernel parameter: - vsyscall=emulate - - -- Ben Hutchings Fri, 30 Jun 2017 23:50:03 +0100 - -linux-latest (76) unstable; urgency=medium - - * From Linux 4.8, several changes have been made in the kernel - configuration to 'harden' the system, i.e. to mitigate security bugs. - Some changes may cause legitimate applications to fail, and can be - reverted by run-time configuration: - - On most architectures, the /dev/mem device can no longer be used to - access devices that also have a kernel driver. This breaks dosemu - and some old user-space graphics drivers. To allow this, set the - kernel parameter: iomem=relaxed - - The kernel log is no longer readable by unprivileged users. To - allow this, set the sysctl: kernel.dmesg_restrict=0 - - -- Ben Hutchings Sat, 29 Oct 2016 02:05:32 +0100 - -linux-latest (75) unstable; urgency=medium - - * From Linux 4.7, the iptables connection tracking system will no longer - automatically load helper modules. If your firewall configuration - depends on connection tracking helpers, you should explicitly load the - required modules. For more information, see - . - - -- Ben Hutchings Sat, 29 Oct 2016 01:53:18 +0100 diff --git a/debian/templates/image.bug/control b/debian/templates/image.bug/control deleted file mode 100644 index b60912c..0000000 --- a/debian/templates/image.bug/control +++ /dev/null @@ -1,2 +0,0 @@ -Submit-As: src:linux -Package-Status: firmware-amd-graphics firmware-atheros firmware-bnx2 firmware-bnx2x firmware-brcm80211 firmware-cavium firmware-intelwimax firmware-intel-sound firmware-ipw2x00 firmware-ivtv firmware-iwlwifi firmware-libertas firmware-linux-nonfree firmware-misc-nonfree firmware-myricom firmware-netxen firmware-qlogic firmware-realtek firmware-samsung firmware-siano firmware-ti-connectivity xen-hypervisor diff --git a/debian/templates/image.bug/include-0version b/debian/templates/image.bug/include-0version deleted file mode 100644 index b5b32bf..0000000 --- a/debian/templates/image.bug/include-0version +++ /dev/null @@ -1,9 +0,0 @@ -add_0version() { - echo '** Version:' >&3 - cat /proc/version >&3 - echo >&3 -} - -ask_0version() { - true -} diff --git a/debian/templates/image.bug/include-1cmdline b/debian/templates/image.bug/include-1cmdline deleted file mode 100644 index 3fcc940..0000000 --- a/debian/templates/image.bug/include-1cmdline +++ /dev/null @@ -1,9 +0,0 @@ -add_1cmdline() { - echo '** Command line:' >&3 - cat /proc/cmdline >&3 - echo >&3 -} - -ask_1cmdline() { - true -} diff --git a/debian/templates/image.bug/include-1tainted b/debian/templates/image.bug/include-1tainted deleted file mode 100644 index 8ae5e47..0000000 --- a/debian/templates/image.bug/include-1tainted +++ /dev/null @@ -1,42 +0,0 @@ -_check() { - if [ $(($tainted & 1<<$1)) -ne 0 ]; then - result_short="$result_short$2" - result_long="$result_long * $3\n" - fi -} - -add_1tainted() { - tainted=$(cat /proc/sys/kernel/tainted) - if [ "$tainted" -gt 0 ]; then - local result_short result_long - # Use debian/bin/update-bug-taint-list to update this - _check 0 P 'proprietary module was loaded' - _check 1 F 'module was force loaded' - _check 2 S 'kernel running on an out of specification system' - _check 3 R 'module was force unloaded' - _check 4 M 'processor reported a Machine Check Exception (MCE)' - _check 5 B 'bad page referenced or some unexpected page flags' - _check 6 U 'taint requested by userspace application' - _check 7 D 'kernel died recently, i.e. there was an OOPS or BUG' - _check 8 A 'ACPI table overridden by user' - _check 9 W 'kernel issued warning' - _check 10 C 'staging driver was loaded' - _check 11 I 'workaround for bug in platform firmware applied' - _check 12 O 'externally-built ("out-of-tree") module was loaded' - _check 13 E 'unsigned module was loaded' - _check 14 L 'soft lockup occurred' - _check 15 K 'kernel has been live patched' - _check 16 X 'auxiliary taint, defined for and used by distros' - _check 17 T 'kernel was built with the struct randomization plugin' - _check 18 N 'an in-kernel test has been run' - echo "** Tainted: $result_short ($tainted)" >&3 - printf "$result_long" >&3 - else - echo '** Not tainted' >&3 - fi - echo >&3 -} - -ask_1tainted() { - true -} diff --git a/debian/templates/image.bug/include-dmesg b/debian/templates/image.bug/include-dmesg deleted file mode 100644 index 634dc99..0000000 --- a/debian/templates/image.bug/include-dmesg +++ /dev/null @@ -1,21 +0,0 @@ -add_dmesg() { - local got_log= - echo '** Kernel log:' >&3 - if [ "$(cat /proc/sys/kernel/dmesg_restrict)" = 0 ]; then - dmesg > >(tail -n 100 >&3) && got_log=y - elif command -v sudo >/dev/null; then - yesno "Use sudo to read the kernel log? " yep - if [ "$REPLY" = yep ]; then - sudo dmesg > >(tail -n 100 >&3) && got_log=y - fi - fi - test "$got_log" || echo 'Unable to read kernel log; any relevant messages should be attached' >&3 - echo >&3 -} - -ask_dmesg() { - # Remind the user to attach the kernel log. This should also trigger - # a reminder in some MUAs if the user tries to send without it. - echo '** Kernel log: boot messages should be attached' >&3 - echo >&3 -} diff --git a/debian/templates/image.bug/include-model b/debian/templates/image.bug/include-model deleted file mode 100644 index 1914d6c..0000000 --- a/debian/templates/image.bug/include-model +++ /dev/null @@ -1,60 +0,0 @@ -grep_model() { - case "$(uname -m)" in - alpha) - grep -E '^(system (type|variation|revision)|platform string)\b' /proc/cpuinfo - ;; - arm*) - grep -E '^(Processor|Hardware|Revision)\b' /proc/cpuinfo - ;; - x86_64) - local found= - for name in {sys,product,chassis,bios,board}_{vendor,name,version}; do - if [ -f /sys/class/dmi/id/$name ]; then - echo -n "$name: " - cat /sys/class/dmi/id/$name - found=y - fi - done - test -n "$found" - ;; - mips|mips64) - grep -E '^(system type|cpu model)\b' /proc/cpuinfo - ;; - parisc|parisc64) - grep -E '^(model|[hs]version)\b' /proc/cpuinfo - ;; - ppc|ppc64|ppc64le) - grep -E -i '^(board|machine|model|motherboard|platform|revision|vendor)\b' /proc/cpuinfo - ;; - s390|s390x) - grep -E '^processor\b' /proc/cpuinfo - ;; - sparc|sparc64) - grep -E '^(cpu|fpu|pmu|prom|type)\b' /proc/cpuinfo - ;; - sh4|sh4a) - grep -E '^(machine|cpu)\b' /proc/cpuinfo - ;; - *) - false - ;; - esac - - # Device Tree model - if [ -r /proc/device-tree/model ]; then - echo "Device Tree model:" $(cat /proc/device-tree/model) - fi -} - -add_model() { - local found= - echo '** Model information' >&3 - grep_model >&3 2>/dev/null || echo "not available" >&3 - echo >&3 -} - -ask_model() { - # This is still valid as long as the bug is being reported on the same - # system. - test $same_system = nop || add_model -} diff --git a/debian/templates/image.bug/include-modules b/debian/templates/image.bug/include-modules deleted file mode 100644 index 22271c9..0000000 --- a/debian/templates/image.bug/include-modules +++ /dev/null @@ -1,13 +0,0 @@ -add_modules() { - echo '** Loaded modules:' >&3 - # List modules along with any taint flags. - # We should be able to tell cut to use an empty output delimiter, but - # currently (coreutils 8.13-3) this results in null bytes in the output. - cut -d' ' -f1,7 /proc/modules | sed 's/ //' >&3 - echo >&3 -} - -ask_modules() { - true -} - diff --git a/debian/templates/image.bug/include-network b/debian/templates/image.bug/include-network deleted file mode 100644 index 89d9cb9..0000000 --- a/debian/templates/image.bug/include-network +++ /dev/null @@ -1,69 +0,0 @@ -_list_etc_network_interfaces() { - local file - - for file in /etc/network/interfaces /etc/network/interfaces.d/*; do - if ! [ -f "$file" ]; then - continue - fi - case "${file##*/}" in - *[^-a-zA-Z0-9_]*) - continue - ;; - esac - echo "$file" - done -} - -_add_etc_network_interfaces() { - local file - test -f /etc/network/interfaces || return 0 - - echo '** Network interface configuration:' >&3 - - while read file; do - if ! [ -r "$file" ]; then - echo "*** $file: unreadable" >&3 - echo >&3 - continue - fi - echo "*** $file:" >&3 - # Hide passwords/keys - awk '$1 ~ /key|pass|^wpa-(anonymous|identity|phase|pin|private|psk)/ { gsub(".", "*", $2); } - $1 == "ethtool-wol" { gsub(".", "*", $3); } - !/^[[:space:]]*\#/ { print; } - ' <"$file" >&3 - echo >&3 - done < <(_list_etc_network_interfaces) -} - -add_network() { - yesno "Include network configuration and status from this computer? " nop - test $REPLY = yep || return 0 - - _add_etc_network_interfaces - echo '** Network status:' >&3 - if command -v ip >/dev/null; then - echo '*** IP interfaces and addresses:' >&3 - ip address show >&3 - echo >&3 - fi - echo '*** Device statistics:' >&3 - cat /proc/net/dev >&3 - echo >&3 - if command -v netstat >/dev/null; then - echo '*** Protocol statistics:' >&3 - netstat -s >&3 || true - echo >&3 - fi - echo >&3 -} - -ask_network() { - test $same_system = yep || return 0 - test -f /etc/network/interfaces || return 0 - - yesno "Include network configuration from this computer? " nop - test $REPLY = yep || return 0 - - _add_etc_network_interfaces -} diff --git a/debian/templates/image.bug/include-pci b/debian/templates/image.bug/include-pci deleted file mode 100644 index 8e6528e..0000000 --- a/debian/templates/image.bug/include-pci +++ /dev/null @@ -1,12 +0,0 @@ -add_pci() { - echo '** PCI devices:' >&3 - lspci -nnvv >&3 2>/dev/null || echo 'not available' >&3 - echo >&3 -} - -ask_pci() { - # This information shouldn't vary much between kernel versions, so - # include it anyway. - test $same_system = nop || add_pci -} - diff --git a/debian/templates/image.bug/include-pstore b/debian/templates/image.bug/include-pstore deleted file mode 100644 index 43285bd..0000000 --- a/debian/templates/image.bug/include-pstore +++ /dev/null @@ -1,77 +0,0 @@ -_add_pstore_log() { - if [ $# -le 3 ]; then - return - fi - - local backend="$1" - local event="$2" - local date="$3" - - yesno "Include log of $event at $(date -d @$date +%c) stored by $backend?" yep - if [ $REPLY != yep ]; then - return - fi - - echo >&3 - echo "*** Log of $event at $(date -d @$date -Iseconds) from $backend" >&3 - - shift 3 - for file in "$@"; do - tail -n +2 "$file" | sed 's/^<.>//' >&3 - done -} - -add_pstore() { - local backend - local i - local j - local file - local date - local head - local event - local log_files - - if ! mountpoint -q /sys/fs/pstore; then - return 0 - fi - - set -- /sys/fs/pstore/dmesg-*-1 - backend=${1#*/dmesg-} - backend=${backend%-1} - if [ "$backend" = '*' ]; then - return 0 - fi - - i=1 - while [ -f /sys/fs/pstore/dmesg-$backend-$i ]; do - file=/sys/fs/pstore/dmesg-$backend-$i - head="$(head -1 "$file")" - - # Is this the first part of a log? - if [ "x${head% Part1}" != "x$head" ]; then - # Flush previous log, if any - _add_pstore_log "$backend" "$event" "$date" $log_files - - event="${head% Part1}" - date=$(stat -c %Y $file) - log_files= - j=1 - fi - - if [ "x$head" = "x$event Part$j" ]; then - # Each part is prepended to the list, because they're numbered - # backward in log history - log_files="$file $log_files" - j=$((j + 1)) - fi - - i=$((i + 1)) - done - - # Flush last log, if any - _add_pstore_log "$backend" "$event" "$date" $log_files -} - -ask_pstore() { - add_pstore -} diff --git a/debian/templates/image.bug/include-usb b/debian/templates/image.bug/include-usb deleted file mode 100644 index e8eb67e..0000000 --- a/debian/templates/image.bug/include-usb +++ /dev/null @@ -1,11 +0,0 @@ -add_usb() { - echo '** USB devices:' >&3 - lsusb >&3 2>/dev/null || echo 'not available' >&3 - echo >&3 -} - -ask_usb() { - # This information shouldn't vary much between kernel versions, so - # include it anyway. - test $same_system = nop || add_usb -} diff --git a/debian/templates/image.bug/presubj b/debian/templates/image.bug/presubj deleted file mode 100644 index 59b891a..0000000 --- a/debian/templates/image.bug/presubj +++ /dev/null @@ -1,8 +0,0 @@ -Please ensure that you are currently running the kernel version that you -are reporting on. This will allow your bug report to include useful -diagnostic information about the running kernel. - -If you are reporting that the kernel fails to boot, please use a digital -camera, serial console or netconsole to record the boot messages and -attach these to your report. You can use the kernel parameter -'boot_delay=1000' to slow down the boot messages. diff --git a/debian/templates/image.bug/script b/debian/templates/image.bug/script deleted file mode 100644 index 8e0b5d5..0000000 --- a/debian/templates/image.bug/script +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash -set -e - -PATH=/sbin:/bin:/usr/sbin:/usr/bin - -dir="$(dirname $0)" - -. "$dir"/info - -for file in "$dir"/include-*; do - name="$(echo $file | sed -e 's,^.*/include-,,')" - hooks+=($name) - . "$file" -done - -if [ "$RELEASE" == "$(uname -r)" ]; then - running_ver="$(uname -v)" - running_ver="${running_ver#* $DISTRIBUTOR }" - running_ver="${running_ver%% *}" - if [ "$running_ver" != "$SOURCEVERSION" ]; then - cat <