diff -pruN 29-1/debian/changelog 29-1ubuntu1/debian/changelog --- 29-1/debian/changelog 2021-08-17 07:04:37.000000000 +0000 +++ 29-1ubuntu1/debian/changelog 2021-08-17 09:19:53.000000000 +0000 @@ -1,9 +1,49 @@ +kmod (29-1ubuntu1) jammy; urgency=low + + * Merge from Debian unstable (LP: #1952591). Remaining changes: + - Enable testsuite during build. + - Build with zstd compression enabled. + - Install ubuntu-specific depmod.d and modprobe.d contents. + + -- Alexandre Ghiti Tue, 17 Aug 2021 09:19:53 +0000 + kmod (29-1) unstable; urgency=medium * New upstream release. -- Marco d'Itri Tue, 17 Aug 2021 09:04:37 +0200 +kmod (28-1ubuntu5) jammy; urgency=medium + + * No-change rebuild against openssl3 + + -- Simon Chopin Wed, 24 Nov 2021 13:52:10 +0000 + +kmod (28-1ubuntu4) impish; urgency=medium + + * Enable testsuite during build. + + -- Dimitri John Ledkov Thu, 24 Jun 2021 13:42:47 +0100 + +kmod (28-1ubuntu3) impish; urgency=medium + + * Build with zstd compression enabled. LP: #1933491 + + -- Dimitri John Ledkov Thu, 24 Jun 2021 13:03:32 +0100 + +kmod (28-1ubuntu2) hirsute; urgency=medium + + * No-change rebuild to drop the udeb package. + + -- Matthias Klose Mon, 22 Feb 2021 10:34:19 +0100 + +kmod (28-1ubuntu1) hirsute; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Install ubuntu-specific depmod.d and modprobe.d contents. + + -- Steve Langasek Thu, 28 Jan 2021 17:29:30 -0800 + kmod (28-1) unstable; urgency=medium * New upstream release. @@ -11,6 +51,16 @@ kmod (28-1) unstable; urgency=medium -- Marco d'Itri Fri, 08 Jan 2021 02:37:04 +0100 +kmod (27+20200310-2ubuntu1) groovy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Install ubuntu-specific depmod.d and modprobe.d contents. + * Dropped changes, included in Debian: + - d/p/verbose_missing_bin: drop this patch to avoid spurious missing + file messages + + -- Steve Langasek Wed, 20 May 2020 16:29:45 -0700 + kmod (27+20200310-2) unstable; urgency=medium * Re-upload to unstable. @@ -32,6 +82,21 @@ kmod (27-2) unstable; urgency=medium -- Marco d'Itri Fri, 13 Mar 2020 22:53:37 +0100 +kmod (27-1ubuntu2) focal; urgency=medium + + * d/p/verbose_missing_bin: drop this patch to avoid spurious missing + file messages when running depmod -a for the first time in recent + kernels (>= 5.3.x) (LP: #1864992) + + -- Rafael David Tinoco Thu, 12 Mar 2020 13:15:28 +0000 + +kmod (27-1ubuntu1) focal; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Install ubuntu-specific depmod.d and modprobe.d contents. + + -- Steve Langasek Thu, 20 Feb 2020 09:01:03 -0800 + kmod (27-1) unstable; urgency=medium * New upstream release. @@ -39,6 +104,13 @@ kmod (27-1) unstable; urgency=medium -- Marco d'Itri Wed, 19 Feb 2020 04:56:30 +0100 +kmod (26+20191223-1ubuntu1) focal; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Install ubuntu-specific depmod.d and modprobe.d contents. + + -- Steve Langasek Thu, 13 Feb 2020 08:49:00 -0800 + kmod (26+20191223-1) unstable; urgency=medium [ Debian Janitor ] @@ -52,6 +124,15 @@ kmod (26+20191223-1) unstable; urgency=m -- Marco d'Itri Mon, 06 Jan 2020 01:59:49 +0100 +kmod (26-3ubuntu1) focal; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Install ubuntu-specific depmod.d and modprobe.d contents. + * Dropped changes, superseded in Debian: + - Fix rules to only build indep packages for binary-indep. + + -- Steve Langasek Fri, 18 Oct 2019 15:32:02 -0700 + kmod (26-3) unstable; urgency=medium * Create again /etc/modprobe.d/. (Closes: #940221) @@ -67,6 +148,25 @@ kmod (26-2) unstable; urgency=medium -- Marco d'Itri Wed, 11 Sep 2019 09:29:57 +0200 +kmod (26-1ubuntu1) eoan; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Install ubuntu-specific depmod.d and modprobe.d contents. + - Fix rules to only build indep packages for binary-indep. + - Remove /etc/modprobe.d/mlx4.conf: The kernel module mlx4_core + will automatically load the mlx4_en/mlx4_ib modules + - Drop bochs-drm from the blacklist. + - Drop i2c_i801 from the blacklist. + * Dropped changes: + - Restore the alsa-base Breaks; the version referenced is ancient so + we don't need a delta. + - Drop upstart maintainerscript migration, not needed post-bionic. + - Drop mlx4.conf removal from maintainerscripts, finished pre-bionic. + - Remove obsolete rtc module from /etc/modules on upgrade: transition + completed. + + -- Steve Langasek Tue, 30 Apr 2019 13:27:20 -0700 + kmod (26-1) unstable; urgency=medium * New upstream release. @@ -82,6 +182,45 @@ kmod (25-2) unstable; urgency=medium -- Marco d'Itri Sat, 17 Nov 2018 01:56:00 +0100 +kmod (25-1ubuntu4) disco; urgency=medium + + * Drop bochs-drm from the blacklist. (LP: #1795857) + + -- Timo Aaltonen Fri, 12 Apr 2019 11:23:05 +0300 + +kmod (25-1ubuntu3) disco; urgency=medium + + * Drop i2c_i801 from the blacklist again, things work fine with + current kernels. (LP: #1786574) + + -- Timo Aaltonen Thu, 04 Apr 2019 11:30:14 +0300 + +kmod (25-1ubuntu2) disco; urgency=medium + + * Add i2c_i801 back to d/modprobe.d/blacklist.conf again due to regressions. + (LP: #1802689, #1802135) + + -- Michael Hudson-Doyle Tue, 13 Nov 2018 10:50:02 +1300 + +kmod (25-1ubuntu1.1) cosmic; urgency=medium + + * Remove i2c_i801 from d/modprobe.d/blacklist.conf. (LP: #1786574) + + -- Michael Hudson-Doyle Wed, 24 Oct 2018 12:20:23 +1300 + +kmod (25-1ubuntu1) cosmic; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Install ubuntu-specific depmod.d and modprobe.d contents. + - Drop the alsa-base Breaks, our version is quite different. + - On upgrade, remove obsolete rtc module from /etc/modules. + - Fix rules to only build indep packages for binary-indep. + - Remove /etc/modprobe.d/mlx4.conf: The kernel module mlx4_core + will automatically load the mlx4_en/mlx4_ib modules (LP 1693503) + * Dropped transitional module-init-tools package + + -- Julian Andres Klode Mon, 28 May 2018 15:12:03 +0200 + kmod (25-1) unstable; urgency=medium * New upstream release. @@ -89,6 +228,34 @@ kmod (25-1) unstable; urgency=medium -- Marco d'Itri Sun, 21 Jan 2018 01:02:46 +0100 +kmod (24-1ubuntu3) bionic; urgency=medium + + * Remove /etc/modprobe.d/mlx4.conf: The kernel module mlx4_core will + automatically load the mlx4_en/mlx4_ib modules (LP: #1693503) + + -- Benjamin Drung Sun, 28 Jan 2018 16:34:49 +0100 + +kmod (24-1ubuntu2) artful; urgency=medium + + * Drop upstart job. + * Drop upstart specific init.d changes. + + -- Dimitri John Ledkov Tue, 15 Aug 2017 19:33:39 +0100 + +kmod (24-1ubuntu1) artful; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Install ubuntu-specific depmod.d and modprobe.d contents. + - Install /etc/modprobe.d/mlx4.conf in libkmod2-udeb for d-i. + - Install upstart job and exit the init script under upstart. + - Mark transitional module-init-tools as Multi-Arch: foreign. + - Drop the alsa-base Breaks, our version is quite different. + - On upgrade, remove obsolete rtc module from /etc/modules. + - Update libtool macros and rerun autoconf for new arches. + * Fix rules to only build indep packages for binary-indep. + + -- Andy Whitcroft Fri, 28 Apr 2017 14:19:16 +0100 + kmod (24-1) unstable; urgency=medium * New upstream release. @@ -109,6 +276,71 @@ kmod (23-1) unstable; urgency=medium -- Marco d'Itri Tue, 27 Sep 2016 01:40:32 +0200 +kmod (22-1.1ubuntu1) yakkety; urgency=low + + * Merge with Debian unstable (LP: #1578667). Remaining changes: + - Install ubuntu-specific depmod.d and modprobe.d contents. + - Install /etc/modprobe.d/mlx4.conf in libkmod2-udeb for d-i. + - Install upstart job and exit the init script under upstart. + - Mark transitional module-init-tools as Multi-Arch: foreign. + - Drop the alsa-base Breaks, our version is quite different. + - On upgrade, remove obsolete rtc module from /etc/modules. + - Update libtool macros and rerun autoconf for new arches. + * d/p/depmod-ignore-powerpc64-abiv2-toc-symbol.patch: ignore the + .TOC. symbol on ppc64el it does not need to be relocated and can be + ignored by depmod. + * drop debian/modprobe.d/blacklist-watchdog.conf as now supplied by + the primary kernel automatically. + + -- Andy Whitcroft Wed, 15 Jun 2016 11:52:42 +0300 + +kmod (22-1.1) unstable; urgency=medium + + [ Ben Hutchings ] + * Non-maintainer upload. + + [ Helmut Grohne ] + * Fix FTBFS (Closes: #819089) + + -- Ben Hutchings Mon, 04 Apr 2016 18:14:56 +0100 + +kmod (22-1ubuntu4) xenial; urgency=low + + * fix brown paper bag error in reinstated package name: + modules-init-tools -> module-init-tools. + + -- Andy Whitcroft Sun, 13 Mar 2016 13:25:20 +0000 + +kmod (22-1ubuntu3) xenial; urgency=low + + * reinstate module-init-tools transitional package. (LP: #1550741) + - as we have versioned dependancies from the kernel to this in 14.04 + removing this package throws the apt in trusty for a loop preventing + upgrades. + - note that this reverts the P/C/R combo from the previous upload. + + -- Andy Whitcroft Wed, 09 Mar 2016 10:31:51 +0000 + +kmod (22-1ubuntu2) xenial; urgency=low + + * Provides/Conflicts/Replaces: module-init-tools to fix upgrades from + 15.10 which has a strict versioned Depends: on kmod. (LP: #1550741) + + -- Andy Whitcroft Tue, 08 Mar 2016 18:20:05 +0000 + +kmod (22-1ubuntu1) xenial; urgency=low + + * Merge with Debian unstable (LP: #1541917). Remaining changes: + - Install ubuntu-specific depmod.d and modprobe.d contents. + - Install /etc/modprobe.d/mlx4.conf in libkmod2-udeb for d-i. + - Install upstart job and exit the init script under upstart. + - Mark transitional module-init-tools as Multi-Arch: foreign. + - Drop the alsa-base Breaks, our version is quite different. + - On upgrade, remove obsolete rtc module from /etc/modules. + - Update libtool macros and rerun autoconf for new arches. + + -- Andy Whitcroft Thu, 04 Feb 2016 16:20:12 +0000 + kmod (22-1) unstable; urgency=medium * New upstream release. @@ -118,6 +350,19 @@ kmod (22-1) unstable; urgency=medium -- Marco d'Itri Sun, 20 Dec 2015 17:04:10 +0100 +kmod (21-1ubuntu1) wily; urgency=medium + + * Merge with Debian unstable (LP: #1487040). Remaining changes: + - Install ubuntu-specific depmod.d and modprobe.d contents. + - Install /etc/modprobe.d/mlx4.conf in libkmod2-udeb for d-i. + - Install upstart job and exit the init script under upstart. + - Mark transitional module-init-tools as Multi-Arch: foreign. + - Drop the alsa-base Breaks, our version is quite different. + - On upgrade, remove obsolete rtc module from /etc/modules. + - Update libtool macros and rerun autoconf for new arches. + + -- Andy Whitcroft Thu, 20 Aug 2015 12:43:22 +0100 + kmod (21-1) unstable; urgency=medium * New upstream release. Fixes: @@ -135,6 +380,13 @@ kmod (20-1) unstable; urgency=medium -- Marco d'Itri Sun, 08 Mar 2015 19:10:08 +0100 +kmod (18-3ubuntu1) vivid; urgency=medium + + * Merge with Debian testing, bringing in /etc/modules migration code + so that systemd doesn't fail on old modules files with parameters. + + -- Adam Conrad Mon, 06 Apr 2015 14:12:36 -0600 + kmod (18-3) unstable; urgency=high * postinst: do not use autodie. (Closes: #762974) @@ -152,6 +404,25 @@ kmod (18-2) unstable; urgency=medium -- Marco d'Itri Wed, 17 Sep 2014 03:50:34 +0200 +kmod (18-1ubuntu2) utopic; urgency=medium + + * blacklist-framebuffer.conf: blacklist bochs-drm (LP: #1378648) + + -- Adam Conrad Tue, 14 Oct 2014 05:04:57 -0600 + +kmod (18-1ubuntu1) utopic; urgency=medium + + * Merge with Debian unstable, remaining changes: + - Install ubuntu-specific depmod.d and modprobe.d contents. + - Install /etc/modprobe.d/mlx4.conf in libkmod2-udeb for d-i. + - Install upstart job and exit the init script under upstart. + - Mark transitional module-init-tools as Multi-Arch: foreign. + - Test-guard /lib/modprobe.d/* copying in our initramfs hook. + - Drop the alsa-base Breaks, our version is quite different. + - On upgrade, remove obsolete rtc module from /etc/modules. + + -- Adam Conrad Mon, 23 Jun 2014 22:47:02 -0600 + kmod (18-1) unstable; urgency=medium * New upstream release. @@ -173,6 +444,40 @@ kmod (17-1) unstable; urgency=medium -- Marco d'Itri Thu, 01 May 2014 21:10:36 +0200 +kmod (16-2ubuntu4) utopic; urgency=medium + + * On upgrade to this version, remove rtc module from /etc/modules. rtc + is obsolete and doesn't exist anymore. This is a clean up after, + older versions of installers that unconditionally added it to modules. + LP: #1317077 + + -- Dimitri John Ledkov Wed, 07 May 2014 15:19:40 +0100 + +kmod (16-2ubuntu3) utopic; urgency=medium + + * Revert the previous change and replace with test-guarded copy. + + -- Adam Conrad Sun, 27 Apr 2014 22:38:31 -0600 + +kmod (16-2ubuntu2) utopic; urgency=high + + * Resurrect dropped post-merge change: + - Don't copy /lib/modprobe.d/* in our version of the kmod + initramfs hook; we currently don't ship anything there. + + -- Dimitri John Ledkov Sun, 27 Apr 2014 00:48:29 +0100 + +kmod (16-2ubuntu1) utopic; urgency=medium + + * Merge with Debian unstable, remaining changes: + - Install ubuntu-specific depmod.d and modprobe.d contents. + - Install /etc/modprobe.d/mlx4.conf in libkmod2-udeb for d-i. + - Install upstart job and exit the init script under upstart. + - Update libtool macros and rerun autoconf for new arches. + - Mark module-init-tools as Multi-Arch: foreign. + + -- Adam Conrad Mon, 21 Apr 2014 22:35:26 -0600 + kmod (16-2) unstable; urgency=medium * Always Build-Depend on xsltproc. (Closes: #733760) @@ -188,6 +493,58 @@ kmod (16-1) unstable; urgency=low -- Marco d'Itri Tue, 31 Dec 2013 03:56:44 +0100 +kmod (15-0ubuntu6) trusty; urgency=medium + + * debian/rules: Install mlx4.conf in the udeb as well (LP: #1305874) + * debian/kmod.upstart: Process all the modules-load.d (LP: #1302767) + + -- Adam Conrad Tue, 08 Apr 2014 13:40:16 -0600 + +kmod (15-0ubuntu5) trusty; urgency=low + + * Build-depend on gtk-doc-tools too. + + -- Matthias Klose Wed, 04 Dec 2013 20:53:33 +0100 + +kmod (15-0ubuntu4) trusty; urgency=low + + * Use dh-autoreconf. + + -- Matthias Klose Wed, 04 Dec 2013 20:32:14 +0100 + +kmod (15-0ubuntu3) trusty; urgency=low + + * Update libtool.m4. + + -- Matthias Klose Wed, 04 Dec 2013 20:08:56 +0100 + +kmod (15-0ubuntu2) trusty; urgency=low + + * Add missing build-dep on xsltproc to resolve FTBFS on all arches. + * Restore dropped check_builtin_kver to keep delta with Debian low. + + -- Adam Conrad Wed, 23 Oct 2013 23:00:46 -0600 + +kmod (15-0ubuntu1) trusty; urgency=low + + * New upstream release. (See Debian #716739) + * Drop patches included upstream: dot_kcmdline, bad_alias_assertion, + blacklist_aliased. + * Drop check_builtin_kver, this would only apply to lucid and is otherwise + unnecessary. + * Drop --disable-shared/--enable-static, this got dropped in this version + and isn't necessary any more. /bin/kmod does not dynamically link to + libkmod by default now. + + -- Martin Pitt Thu, 24 Oct 2013 06:16:30 +0200 + +kmod (9-3ubuntu1) raring; urgency=low + + * Merge with Debian unstable, bringing in a backport of upstream's + comprehensive fix for the bad alias assertion bug (LP: #1073062) + + -- Adam Conrad Thu, 18 Apr 2013 13:16:44 -0600 + kmod (9-3) unstable; urgency=low * Added backported patch dot_kcmdline: correctly parse kcmdline parameters @@ -201,6 +558,63 @@ kmod (9-3) unstable; urgency=low -- Marco d'Itri Sun, 07 Apr 2013 18:19:01 +0200 +kmod (9-2ubuntu8) raring; urgency=low + + * Add debian/patches/do_not_raise_on_null_alias to avoid + raising errors when dealing with modules whose aliases + are set to either "null" or "off" (LP: #1073062). + + -- Alberto Milone Wed, 13 Mar 2013 18:02:53 +0100 + +kmod (9-2ubuntu7) raring; urgency=low + + * Add /etc/modprobe.d/mlx4.conf for loading mlx4_en when mlx4_core + gets loaded (LP: #1115710). + + -- Scott Moser Tue, 05 Feb 2013 15:36:49 -0500 + +kmod (9-2ubuntu6) raring; urgency=low + + * Remove /etc/init/module-init-tools.conf on upgrade (LP: #1082006) + + -- Adam Conrad Thu, 24 Jan 2013 00:11:39 -0700 + +kmod (9-2ubuntu5) raring; urgency=low + + * Fix permissions on /etc/depmod.d, /etc/modprobe.d. (LP: #1082598) + + -- Anders Kaseorg Tue, 22 Jan 2013 15:06:45 +0100 + +kmod (9-2ubuntu4) raring; urgency=low + + * Drop unused build-dependency on perl, to simplify cross-building. + + -- Colin Watson Wed, 09 Jan 2013 10:41:07 +0000 + +kmod (9-2ubuntu3) raring; urgency=low + + * Add debian/patches/allow_dots_in_params to fix parsing of + commandline arguments with dots in them (closes: #689872) + + -- Adam Conrad Tue, 30 Oct 2012 21:20:10 +0000 + +kmod (9-2ubuntu2) raring; urgency=low + + * Don't copy /lib/modprobe.d/* in our version of the kmod + initramfs hook; we currently don't ship anything there. + + -- Adam Conrad Mon, 29 Oct 2012 13:27:18 +0000 + +kmod (9-2ubuntu1) raring; urgency=low + + * Sync with Debian unstable; remaining Ubuntu changes: + - Ubuntu-specific depmod.d and modprobe.d contents. + - Mark module-init-tools Multi-Arch: foreign. + - Don't install Debian's extra/aliases.conf file. + - Install upstart job instead of the sysvinit script. + + -- Adam Conrad Fri, 21 Sep 2012 16:05:32 -0600 + kmod (9-2) unstable; urgency=low * Backported upstream fixes to make modprobe work like in module-init-tools @@ -211,6 +625,13 @@ kmod (9-2) unstable; urgency=low -- Marco d'Itri Mon, 27 Aug 2012 00:40:18 +0200 +kmod (9-1ubuntu1) quantal; urgency=low + + * Initial sync with debian 9-1, remaining (module-init-tools) changes: + - Ubuntu specific depmod.d and modprobe.d contents. + + -- Andy Whitcroft Wed, 04 Jul 2012 19:18:01 +0100 + kmod (9-1) unstable; urgency=medium * New upstream release. @@ -293,3 +714,4 @@ kmod (3-1) experimental; urgency=low is renamed to /etc/init.d/module-init-tools.dpkg-bak -- Marco d'Itri Sun, 08 Jan 2012 20:47:12 +0100 + diff -pruN 29-1/debian/control 29-1ubuntu1/debian/control --- 29-1/debian/control 2021-08-17 06:57:47.000000000 +0000 +++ 29-1ubuntu1/debian/control 2021-06-24 12:03:29.000000000 +0000 @@ -1,9 +1,10 @@ Source: kmod Section: admin Priority: important -Maintainer: Marco d'Itri +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Marco d'Itri Build-Depends: debhelper-compat (= 12), liblzma-dev, libssl-dev, xsltproc, - autoconf, automake, libtool, gtk-doc-tools + autoconf, automake, libtool, gtk-doc-tools, libzstd-dev, zstd Standards-Version: 4.5.1.0 Rules-Requires-Root: no Vcs-Git: https://salsa.debian.org/md/kmod.git diff -pruN 29-1/debian/depmod.d/ubuntu.conf 29-1ubuntu1/debian/depmod.d/ubuntu.conf --- 29-1/debian/depmod.d/ubuntu.conf 1970-01-01 00:00:00.000000000 +0000 +++ 29-1ubuntu1/debian/depmod.d/ubuntu.conf 2018-10-23 21:39:33.000000000 +0000 @@ -0,0 +1 @@ +search updates ubuntu built-in diff -pruN 29-1/debian/modprobe.d/blacklist-ath_pci.conf 29-1ubuntu1/debian/modprobe.d/blacklist-ath_pci.conf --- 29-1/debian/modprobe.d/blacklist-ath_pci.conf 1970-01-01 00:00:00.000000000 +0000 +++ 29-1ubuntu1/debian/modprobe.d/blacklist-ath_pci.conf 2018-10-23 21:39:33.000000000 +0000 @@ -0,0 +1,7 @@ +# For some Atheros 5K RF MACs, the madwifi driver loads buts fails to +# correctly initialize the hardware, leaving it in a state from +# which ath5k cannot recover. To prevent this condition, stop +# madwifi from loading by default. Use Jockey to select one driver +# or the other. (Ubuntu: #315056, #323830) +blacklist ath_pci + diff -pruN 29-1/debian/modprobe.d/blacklist.conf 29-1ubuntu1/debian/modprobe.d/blacklist.conf --- 29-1/debian/modprobe.d/blacklist.conf 1970-01-01 00:00:00.000000000 +0000 +++ 29-1ubuntu1/debian/modprobe.d/blacklist.conf 2019-04-04 08:31:00.000000000 +0000 @@ -0,0 +1,52 @@ +# This file lists those modules which we don't want to be loaded by +# alias expansion, usually so some other driver will be loaded for the +# device instead. + +# evbug is a debug tool that should be loaded explicitly +blacklist evbug + +# these drivers are very simple, the HID drivers are usually preferred +blacklist usbmouse +blacklist usbkbd + +# replaced by e100 +blacklist eepro100 + +# replaced by tulip +blacklist de4x5 + +# causes no end of confusion by creating unexpected network interfaces +blacklist eth1394 + +# snd_intel8x0m can interfere with snd_intel8x0, doesn't seem to support much +# hardware on its own (Ubuntu bug #2011, #6810) +blacklist snd_intel8x0m + +# Conflicts with dvb driver (which is better for handling this device) +blacklist snd_aw2 + +# replaced by p54pci +blacklist prism54 + +# replaced by b43 and ssb. +blacklist bcm43xx + +# most apps now use garmin usb driver directly (Ubuntu: #114565) +blacklist garmin_gps + +# replaced by asus-laptop (Ubuntu: #184721) +blacklist asus_acpi + +# low-quality, just noise when being used for sound playback, causes +# hangs at desktop session start (Ubuntu: #246969) +blacklist snd_pcsp + +# ugly and loud noise, getting on everyone's nerves; this should be done by a +# nice pulseaudio bing (Ubuntu: #77010) +blacklist pcspkr + +# EDAC driver for amd76x clashes with the agp driver preventing the aperture +# from being initialised (Ubuntu: #297750). Blacklist so that the driver +# continues to build and is installable for the few cases where its +# really needed. +blacklist amd76x_edac diff -pruN 29-1/debian/modprobe.d/blacklist-firewire.conf 29-1ubuntu1/debian/modprobe.d/blacklist-firewire.conf --- 29-1/debian/modprobe.d/blacklist-firewire.conf 1970-01-01 00:00:00.000000000 +0000 +++ 29-1ubuntu1/debian/modprobe.d/blacklist-firewire.conf 2018-10-23 21:39:33.000000000 +0000 @@ -0,0 +1,10 @@ +# Select the legacy firewire stack over the new CONFIG_FIREWIRE one. + +blacklist ohci1394 +blacklist sbp2 +blacklist dv1394 +blacklist raw1394 +blacklist video1394 + +#blacklist firewire-ohci +#blacklist firewire-sbp2 diff -pruN 29-1/debian/modprobe.d/blacklist-framebuffer.conf 29-1ubuntu1/debian/modprobe.d/blacklist-framebuffer.conf --- 29-1/debian/modprobe.d/blacklist-framebuffer.conf 1970-01-01 00:00:00.000000000 +0000 +++ 29-1ubuntu1/debian/modprobe.d/blacklist-framebuffer.conf 2019-04-12 08:22:34.000000000 +0000 @@ -0,0 +1,31 @@ +# Framebuffer drivers are generally buggy and poorly-supported, and cause +# suspend failures, kernel panics and general mayhem. For this reason we +# never load them automatically. +blacklist aty128fb +blacklist atyfb +blacklist radeonfb +blacklist cirrusfb +blacklist cyber2000fb +blacklist cyblafb +blacklist gx1fb +blacklist hgafb +blacklist i810fb +blacklist intelfb +blacklist kyrofb +blacklist lxfb +blacklist matroxfb_base +blacklist neofb +blacklist nvidiafb +blacklist pm2fb +blacklist rivafb +blacklist s1d13xxxfb +blacklist savagefb +blacklist sisfb +blacklist sstfb +blacklist tdfxfb +blacklist tridentfb +#blacklist vesafb +blacklist vfb +blacklist viafb +blacklist vt8623fb +blacklist udlfb diff -pruN 29-1/debian/modprobe.d/blacklist-rare-network.conf 29-1ubuntu1/debian/modprobe.d/blacklist-rare-network.conf --- 29-1/debian/modprobe.d/blacklist-rare-network.conf 1970-01-01 00:00:00.000000000 +0000 +++ 29-1ubuntu1/debian/modprobe.d/blacklist-rare-network.conf 2018-10-23 21:39:33.000000000 +0000 @@ -0,0 +1,22 @@ +# Many less commonly used network protocols have recently had various +# security flaws discovered. In an effort to reduce the scope of future +# vulnerability exploitations, they are being blacklisted here so that +# unprivileged users cannot use them by default. System owners can still +# either modify this file, or specifically modprobe any needed protocols. + +# ax25 +alias net-pf-3 off +# netrom +alias net-pf-6 off +# x25 +alias net-pf-9 off +# rose +alias net-pf-11 off +# decnet +alias net-pf-12 off +# econet +alias net-pf-19 off +# rds +alias net-pf-21 off +# af_802154 +alias net-pf-36 off diff -pruN 29-1/debian/modprobe.d/iwlwifi.conf 29-1ubuntu1/debian/modprobe.d/iwlwifi.conf --- 29-1/debian/modprobe.d/iwlwifi.conf 1970-01-01 00:00:00.000000000 +0000 +++ 29-1ubuntu1/debian/modprobe.d/iwlwifi.conf 2018-10-23 21:39:33.000000000 +0000 @@ -0,0 +1,7 @@ +# /etc/modprobe.d/iwlwifi.conf +# iwlwifi will dyamically load either iwldvm or iwlmvm depending on the +# microcode file installed on the system. When removing iwlwifi, first +# remove the iwl?vm module and then iwlwifi. +remove iwlwifi \ +(/sbin/lsmod | grep -o -e ^iwlmvm -e ^iwldvm -e ^iwlwifi | xargs /sbin/rmmod) \ +&& /sbin/modprobe -r mac80211 diff -pruN 29-1/debian/patches/enable-subdir-testsuite.patch 29-1ubuntu1/debian/patches/enable-subdir-testsuite.patch --- 29-1/debian/patches/enable-subdir-testsuite.patch 1970-01-01 00:00:00.000000000 +0000 +++ 29-1ubuntu1/debian/patches/enable-subdir-testsuite.patch 2021-06-24 12:42:47.000000000 +0000 @@ -0,0 +1,14 @@ +Description: Enable running test suite in a subdir +Author: Dimitri John Ledkov + + +--- kmod-28.orig/Makefile.am ++++ kmod-28/Makefile.am +@@ -255,6 +255,7 @@ CREATE_ROOTFS = $(AM_V_GEN) ( $(RM) -rf + build-module-playground: + $(AM_V_GEN)if test "$(top_srcdir)" != "$(top_builddir)"; then \ + $(RM) -rf testsuite/module-playground && \ ++ mkdir -p testsuite/ && \ + cp -r $(top_srcdir)/$(MODULE_PLAYGROUND) $(top_builddir)/$(MODULE_PLAYGROUND) && \ + find $(top_builddir)/$(MODULE_PLAYGROUND) -type d -exec chmod +w {} \; ; \ + fi diff -pruN 29-1/debian/patches/series 29-1ubuntu1/debian/patches/series --- 29-1/debian/patches/series 2021-08-17 07:04:18.000000000 +0000 +++ 29-1ubuntu1/debian/patches/series 2021-08-17 09:19:53.000000000 +0000 @@ -6,3 +6,4 @@ # Debian integration aliases_conf debian_manpages +enable-subdir-testsuite.patch diff -pruN 29-1/debian/rules 29-1ubuntu1/debian/rules --- 29-1/debian/rules 2021-08-17 06:57:47.000000000 +0000 +++ 29-1ubuntu1/debian/rules 2021-06-24 12:42:44.000000000 +0000 @@ -21,6 +21,8 @@ CONFFLAGS_deb = $(CONFFLAGS) \ --enable-gtk-doc \ --with-openssl \ --with-xz \ + --with-zstd \ + --disable-test-modules \ --enable-debug CONFFLAGS_udeb = $(CONFFLAGS) \ $(subst -O2,-Os -fomit-frame-pointer,$(shell DEB_BUILD_MAINT_OPTIONS="hardening=-all" \ @@ -68,6 +70,7 @@ build-udeb/.stamp-build: build-udeb/conf override_dh_auto_build: build-deb/.stamp-build $(BUILD_UDEB_TARGET) override_dh_auto_test: + dh_auto_test --builddir=build-deb override_dh_auto_install: dh_auto_install --builddir=build-deb --destdir=$D @@ -81,8 +84,15 @@ override_dh_install: cp extra/aliases.conf $D/lib/modprobe.d/ install --mode=755 debian/kmod.initramfs-hook \ $D/usr/share/initramfs-tools/hooks/kmod + + install --mode=755 -d $D/etc/modprobe.d + install --mode=644 -t $D/etc/modprobe.d debian/modprobe.d/* + install --mode=755 -d $D/etc/depmod.d + install --mode=644 -t $D/etc/depmod.d debian/depmod.d/* + rmdir --parents --ignore-fail-on-non-empty $D/sbin/ $$(find $D/usr/ -type d -empty) ifdef BUILD_UDEB + install --mode=755 -d $(DKU)/etc/modprobe.d mv $(DU)/usr/lib/*/libkmod.so.* $(DKU)/usr/lib/ rm -r $(DU)/usr/ egrep -i '^[a-z]' extra/aliases.conf > $(DU)/etc/modprobe.d/aliases.conf