diff -Nru kmod-9/debian/changelog kmod-9/debian/changelog --- kmod-9/debian/changelog 2012-06-25 01:51:20.000000000 +0100 +++ kmod-9/debian/changelog 2012-07-11 17:43:16.000000000 +0100 @@ -1,3 +1,10 @@ +kmod (9-1ubuntu1) UNRELEASED; 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. diff -Nru kmod-9/debian/control kmod-9/debian/control --- kmod-9/debian/control 2012-06-25 02:03:52.000000000 +0100 +++ kmod-9/debian/control 2012-07-11 17:44:43.000000000 +0100 @@ -1,7 +1,8 @@ Source: kmod Section: admin Priority: important -Maintainer: Marco d'Itri +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Marco d'Itri Build-Depends: debhelper (>> 8.1.3), perl Standards-Version: 3.9.3.1 diff -Nru kmod-9/debian/depmod.d/ubuntu.conf kmod-9/debian/depmod.d/ubuntu.conf --- kmod-9/debian/depmod.d/ubuntu.conf 1970-01-01 01:00:00.000000000 +0100 +++ kmod-9/debian/depmod.d/ubuntu.conf 2011-03-18 18:11:07.000000000 +0000 @@ -0,0 +1 @@ +search updates ubuntu built-in diff -Nru kmod-9/debian/modprobe.d/blacklist-ath_pci.conf kmod-9/debian/modprobe.d/blacklist-ath_pci.conf --- kmod-9/debian/modprobe.d/blacklist-ath_pci.conf 1970-01-01 01:00:00.000000000 +0100 +++ kmod-9/debian/modprobe.d/blacklist-ath_pci.conf 2011-03-18 18:11:07.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 -Nru kmod-9/debian/modprobe.d/blacklist.conf kmod-9/debian/modprobe.d/blacklist.conf --- kmod-9/debian/modprobe.d/blacklist.conf 1970-01-01 01:00:00.000000000 +0100 +++ kmod-9/debian/modprobe.d/blacklist.conf 2011-03-18 18:11:07.000000000 +0000 @@ -0,0 +1,55 @@ +# 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 + +# causes failure to suspend on HP compaq nc6000 (Ubuntu: #10306) +blacklist i2c_i801 + +# 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 -Nru kmod-9/debian/modprobe.d/blacklist-firewire.conf kmod-9/debian/modprobe.d/blacklist-firewire.conf --- kmod-9/debian/modprobe.d/blacklist-firewire.conf 1970-01-01 01:00:00.000000000 +0100 +++ kmod-9/debian/modprobe.d/blacklist-firewire.conf 2011-03-18 18:11:07.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 -Nru kmod-9/debian/modprobe.d/blacklist-framebuffer.conf kmod-9/debian/modprobe.d/blacklist-framebuffer.conf --- kmod-9/debian/modprobe.d/blacklist-framebuffer.conf 1970-01-01 01:00:00.000000000 +0100 +++ kmod-9/debian/modprobe.d/blacklist-framebuffer.conf 2012-05-30 18:41:33.000000000 +0100 @@ -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 -Nru kmod-9/debian/modprobe.d/blacklist-rare-network.conf kmod-9/debian/modprobe.d/blacklist-rare-network.conf --- kmod-9/debian/modprobe.d/blacklist-rare-network.conf 1970-01-01 01:00:00.000000000 +0100 +++ kmod-9/debian/modprobe.d/blacklist-rare-network.conf 2011-03-18 18:11:07.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 -Nru kmod-9/debian/modprobe.d/blacklist-watchdog.conf kmod-9/debian/modprobe.d/blacklist-watchdog.conf --- kmod-9/debian/modprobe.d/blacklist-watchdog.conf 1970-01-01 01:00:00.000000000 +0100 +++ kmod-9/debian/modprobe.d/blacklist-watchdog.conf 2011-03-18 18:11:07.000000000 +0000 @@ -0,0 +1,50 @@ +# Watchdog drivers should not be loaded automatically, but only if a +# watchdog daemon is installed. +blacklist acquirewdt +blacklist advantechwdt +blacklist alim1535_wdt +blacklist alim7101_wdt +blacklist booke_wdt +blacklist cpu5wdt +blacklist eurotechwdt +blacklist i6300esb +blacklist i8xx_tco +blacklist ib700wdt +blacklist ibmasr +blacklist indydog +blacklist iTCO_wdt +blacklist it8712f_wdt +blacklist it87_wdt +blacklist ixp2000_wdt +blacklist ixp4xx_wdt +blacklist machzwd +blacklist mixcomwd +blacklist mpc8xx_wdt +blacklist mpcore_wdt +blacklist mv64x60_wdt +blacklist pc87413_wdt +blacklist pcwd +blacklist pcwd_pci +blacklist pcwd_usb +blacklist s3c2410_wdt +blacklist sa1100_wdt +blacklist sbc60xxwdt +blacklist sbc7240_wdt +blacklist sb8360 +blacklist sc1200wdt +blacklist sc520_wdt +blacklist sch311_wdt +blacklist scx200_wdt +blacklist shwdt +blacklist smsc37b787_wdt +blacklist softdog +blacklist twl4030_wdt +blacklist w83627hf_wdt +blacklist w83697hf_wdt +blacklist w83697ug_wdt +blacklist w83877f_wdt +blacklist w83977f_wdt +blacklist wafer5823wdt +blacklist wdt +blacklist wdt_pci +blacklist wm8350_wdt diff -Nru kmod-9/debian/rules kmod-9/debian/rules --- kmod-9/debian/rules 2012-05-14 01:01:59.000000000 +0100 +++ kmod-9/debian/rules 2012-07-04 19:32:57.000000000 +0100 @@ -99,6 +99,11 @@ install --mode=755 debian/kmod.initramfs-hook \ $D/usr/share/initramfs-tools/hooks/kmod + install --mode=644 -d $D/etc/modprobe.d + install --mode=644 -t $D/etc/modprobe.d debian/modprobe.d/* + install --mode=644 -d $D/etc/depmod.d + install --mode=644 -t $D/etc/depmod.d debian/depmod.d/* + ifdef BUILD_UDEB cd build-udeb/ && \ $(MAKE) install-exec DESTDIR=$(DKU)