--- module-init-tools-3.3-pre11.orig/extra/update-modules +++ module-init-tools-3.3-pre11/extra/update-modules @@ -0,0 +1,13 @@ +#!/bin/sh -e + +exec >&2 + +echo "" +echo "************************************************************************" +echo "*" +echo "* The update-modules command is deprecated and should not be used!" +echo "*" +echo "************************************************************************" +echo "" + +exit 0 --- module-init-tools-3.3-pre11.orig/extra/installarchconf +++ module-init-tools-3.3-pre11/extra/installarchconf @@ -0,0 +1,48 @@ +#!/bin/sh + +archmodel() { + local arch=$(dpkg-architecture -qDEB_HOST_ARCH) + case $arch in + i[0-9]86) arch=i386 ;; + x86_64|amd64) arch=x86_64 ;; + lpia) arch=i386 ;; + arm*) arch=arm ;; + mips*) arch=mips ;; + s390x) arch=s390 ;; + parisc64) arch=parisc ;; + sparc64) arch=sparc ;; + ppc64) arch=powerpc.generic ;; + ppc|powerpc) arch="powerpc.*" ;; + m68k) arch="m68k.*" ;; + esac + echo $arch +} + +if [ -z "$1" ]; then + echo "Usage: $0 DESTINATION_DIRECTORY" + exit 1 +fi + +arch=$(archmodel) + +for file in extra/modprobe.d/arch/$arch; do + if [ ! -f $file -a "$(echo $file)" = "$file" ]; then + cat <. --- module-init-tools-3.3-pre11.orig/extra/update-modules.8 +++ module-init-tools-3.3-pre11/extra/update-modules.8 @@ -0,0 +1,28 @@ +.TH UPDATE-MODULES 8 "9 July 2007" "Debian GNU/Linux" "Debian" +.SH NAME +update\-modules \- obsolete command +.SH SYNOPSIS +.B update\-modules +.SH DESCRIPTION +.B update\-modules +is an obsolete command which does nothing. +Any program calling it should be fixed. +.PP +Note that the file +.I /etc/modprobe.conf +is not the exact equivalent of +\fI/etc/modules.conf\fR. +It is not required for module-init-tools and is not generated any more. In fact, +most people should not create that file since \fI/etc/modprobe.d/*\fR would be +ignored in this case but Debian packages store their additional configuration +files in \fI/etc/modprobe.d/\fR. +.SH "SEE ALSO" +.BR depmod (1) +.BR modprobe (8) +.BR modprobe.conf (5) +.SH BUGS +This program should be removed after modutils will have been removed +from the distribution and no package will try to use it anymore. +.SH AUTHOR +This manual page was written by Marco d'Itri <\fImd@linux.it\fP> +for the Debian GNU/Linux system. --- module-init-tools-3.3-pre11.orig/extra/dupestest +++ module-init-tools-3.3-pre11/extra/dupestest @@ -0,0 +1,11 @@ +#!/bin/sh + +# This scripts verifies that no name is present both in common and +# arch-specific configurations. + +for archfile in modprobe.d/arch/*; do + echo "Checking $archfile..." + cat modprobe.d/aliases $archfile \ + | awk '/^[^#]/ {print $2}' | sort | uniq --repeated +done + --- module-init-tools-3.3-pre11.orig/extra/modules.5 +++ module-init-tools-3.3-pre11/extra/modules.5 @@ -0,0 +1,14 @@ +.TH MODULES 5 "Version 1.2" "Debian GNU/Linux" +.SH NAME +/etc/modules - kernel modules to load at boot time +.SH DESCRIPTION +.PP +The +.B /etc/modules +file contains the names of kernel modules that are to be loaded at boot +time, one per line. Arguments can be given in the same line as the module +name. Lines beginning with a '#' are ignored. +.SH "SEE ALSO" +.BR depmod (8) +.BR modprobe (8) +.BR modprobe.conf (5) --- module-init-tools-3.3-pre11.orig/extra/modprobe.d/blacklist-watchdog +++ module-init-tools-3.3-pre11/extra/modprobe.d/blacklist-watchdog @@ -0,0 +1,39 @@ +# 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 ixp2000_wdt +blacklist ixp4xx_wdt +blacklist machzwd +blacklist mixcomwd +blacklist mpc8xx_wdt +blacklist mpcore_wdt +blacklist mv64x60_wdt +blacklist pcwd +blacklist pcwd_pci +blacklist pcwd_usb +blacklist s3c2410_wdt +blacklist sa1100_wdt +blacklist sbc60xxwdt +blacklist sb8360 +blacklist sc1200wdt +blacklist sc520_wdt +blacklist scx200_wdt +blacklist shwdt +blacklist softdog +blacklist w83627hf_wdt +blacklist w83877f_wdt +blacklist w83977f_wdt +blacklist wafer5823wdt +blacklist wdt +blacklist wdt_pci --- module-init-tools-3.3-pre11.orig/extra/modprobe.d/blacklist-framebuffer +++ module-init-tools-3.3-pre11/extra/modprobe.d/blacklist-framebuffer @@ -0,0 +1,30 @@ +# 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 vga16fb +blacklist vt8623fb --- module-init-tools-3.3-pre11.orig/extra/modprobe.d/blacklist-amd76-edac +++ module-init-tools-3.3-pre11/extra/modprobe.d/blacklist-amd76-edac @@ -0,0 +1,5 @@ +# 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 --- module-init-tools-3.3-pre11.orig/extra/modprobe.d/options +++ module-init-tools-3.3-pre11/extra/modprobe.d/options @@ -0,0 +1,13 @@ +# Enable double-buffering so gstreamer et. al. work +options quickcam compatible=2 + +# Default hostap to managed mode +options hostap_pci iw_mode=2 +options hostap_cs iw_mode=2 + +# Stop auto-association. +# LP: #264104 +options ipw2200 associate=0 + +# XXX: Ignore HPA by default. Needs to be revisted in jaunty +options libata ignore_hpa=1 --- module-init-tools-3.3-pre11.orig/extra/modprobe.d/aliases +++ module-init-tools-3.3-pre11/extra/modprobe.d/aliases @@ -0,0 +1,167 @@ +# These are the standard aliases for devices and kernel drivers. +# This file does not need to be modified. +# +# Please file a bug against module-init-tools if a package needs a entry +# in this file. + +# network protocols ########################################################## +alias net-pf-1 unix +alias net-pf-2 ipv4 +alias net-pf-3 ax25 +alias net-pf-4 ipx +alias net-pf-5 appletalk +alias net-pf-6 netrom +alias net-pf-7 bridge +alias net-pf-8 atm +alias net-pf-9 x25 +alias net-pf-10 ipv6 +alias net-pf-11 rose +alias net-pf-12 decnet +# 13 NETBEUI +alias net-pf-15 af_key +alias net-pf-16 af_netlink +alias net-pf-17 af_packet +# 18 ASH +alias net-pf-19 af_econet +alias net-pf-20 atm +# 22 SNA +alias net-pf-23 irda +alias net-pf-24 pppoe +alias net-pf-25 wanrouter +alias net-pf-26 llc +alias net-pf-31 bluetooth + +alias net-pf-16-proto-1 wire +alias net-pf-16-proto-3 ip_queue +alias net-pf-16-proto-4 tcp_diag +alias net-pf-16-proto-8 scsi_transport_iscsi +alias net-pf-16-proto-9 audit +alias net-pf-16-proto-11 cn +alias net-pf-16-proto-13 ip6_queue + +# executables formats ######################################################## +install binfmt-0000 /bin/true +alias binfmt-204 binfmt_aout +alias binfmt-263 binfmt_aout +alias binfmt-264 binfmt_aout +alias binfmt-267 binfmt_aout +alias binfmt-387 binfmt_aout + +# block devices ############################################################## +alias block-major-3-* ide_generic +alias block-major-8-* sd_mod +alias block-major-9-* md +alias block-major-11-* sr_mod +alias block-major-22-* ide_generic +alias block-major-33-* ide_generic +alias block-major-34-* ide_generic +alias block-major-37-* ide_tape +alias block-major-44-* ftl +alias block-major-46-* pcd +alias block-major-47-* pf +alias block-major-56-* ide_generic +alias block-major-57-* ide_generic +alias block-major-58-* lvm_mod +alias block-major-88-* ide_generic +alias block-major-89-* ide_generic +alias block-major-90-* ide_generic +alias block-major-91-* ide_generic +alias block-major-93-* nftl +alias block-major-97-* pg + +# character devices ########################################################## +alias char-major-9-* st +alias char-major-10-1 psmouse +alias char-major-10-139 openprom +alias char-major-10-157 applicom +alias char-major-10-181 toshiba +alias char-major-10-183 hw_random +alias char-major-10-187 irnet +alias char-major-10-189 ussp +alias char-major-10-250 hci_vhci +alias char-major-13-0 joydev +alias char-major-13-1 joydev +alias char-major-13-2 joydev +alias char-major-13-3 joydev +alias char-major-13-32 mousedev +alias char-major-13-33 mousedev +alias char-major-13-34 mousedev +alias char-major-13-35 mousedev +alias char-major-13-63 mousedev +alias char-major-13-64 evdev +alias char-major-13-65 evdev +alias char-major-13-66 evdev +alias char-major-13-67 evdev +alias char-major-19-* cyclades +alias char-major-20-* cyclades +alias char-major-22-* pcxx +alias char-major-23-* pcxx +alias char-major-27-* ftape +alias char-major-34-* scc +alias char-major-35-* tclmidi +alias char-major-48-* riscom8 +alias char-major-49-* riscom8 +alias char-major-57-* esp +alias char-major-58-* esp +alias char-major-63-* kdebug +alias char-major-67-* coda +alias char-major-75-* specialix +alias char-major-76-* specialix +alias char-major-81-* videodev +alias char-major-83-* vtx +alias char-major-89-* i2c_dev +alias char-major-90-* mtdchar +alias char-major-96-* pt +alias char-major-97-* pg +alias char-major-107-* 3dfx +alias char-major-109-* lvm_mod +alias char-major-166-* cdc_acm +alias char-major-171-0 raw1394 +alias char-major-171-1 video1394 +alias char-major-171-2 dv1394 +alias char-major-171-3 amdtp +alias char-major-180-* usbcore +alias char-major-195-* nvidia +alias char-major-200-* vxspec +alias char-major-202-* msr +alias char-major-203-* cpuid +alias char-major-206-* osst +alias char-major-208-* ussp +alias char-major-227-* tub3270 +#alias char-major-240-* usb-serial +#alias char-major-240-* hsfserial +#alias char-major-241-* hsfserial + +# misc ####################################################################### +alias xfrm-type-2-4 xfrm4_tunnel +alias xfrm-type-2-50 esp4 +alias xfrm-type-2-51 ah4 +alias xfrm-type-2-108 ipcomp +alias xfrm-type-10-41 xfrm6_tunnel +alias xfrm-type-10-50 esp6 +alias xfrm-type-10-51 ah6 +alias xfrm-type-10-108 ipcomp6 + +alias bt-proto-0 l2cap +alias bt-proto-2 sco +alias bt-proto-3 rfcomm +alias bt-proto-4 bnep +alias bt-proto-5 cmtp +alias bt-proto-6 hidp +alias bt-proto-7 avdtp + +alias cipcb0 cipcb +alias cipcb1 cipcb +alias cipcb2 cipcb +alias cipcb3 cipcb +alias dummy0 dummy +alias dummy1 dummy +alias plip0 plip +alias plip1 plip +alias slip0 slip +alias slip1 slip +alias tunl0 ipip +alias gre0 ip_gre + +alias usbdevfs usbcore + --- module-init-tools-3.3-pre11.orig/extra/modprobe.d/isapnp +++ module-init-tools-3.3-pre11/extra/modprobe.d/isapnp @@ -0,0 +1,10 @@ +# These aliases are needed here because themodules themselves are +# not providing them. +alias pnp:dPNP0510 irtty-sir +alias pnp:dPNP0511 irtty-sir +alias pnp:dPNP0700 floppy +alias pnp:dPNP0800 pcspkr +alias pnp:dPNP0b00 rtc +alias pnp:dPNP0303 atkbd +alias pnp:dPNP0f13 psmouse +alias pnp:dPNPb02f analog --- module-init-tools-3.3-pre11.orig/extra/modprobe.d/blacklist +++ module-init-tools-3.3-pre11/extra/modprobe.d/blacklist @@ -0,0 +1,45 @@ +# 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 --- module-init-tools-3.3-pre11.orig/extra/modprobe.d/arch/m68k.generic +++ module-init-tools-3.3-pre11/extra/modprobe.d/arch/m68k.generic @@ -0,0 +1,7 @@ +alias char-major-4-0 m68kserial +alias char-major-6-0 lp_intern +alias char-major-10-4 amigamouse +alias char-major-10-5 atarimouse +alias char-major-10-7 amigamouse +alias char-major-10-10 macmouse + --- module-init-tools-3.3-pre11.orig/extra/modprobe.d/arch/i386 +++ module-init-tools-3.3-pre11/extra/modprobe.d/arch/i386 @@ -0,0 +1,4 @@ +alias parport_lowlevel parport_pc + +alias binfmt-0064 binfmt_aout + --- module-init-tools-3.3-pre11.orig/extra/modprobe.d/arch/m68k.amiga +++ module-init-tools-3.3-pre11/extra/modprobe.d/arch/m68k.amiga @@ -0,0 +1,20 @@ +alias block-major-2-* amiflop + +alias char-major-4-0 m68kserial +alias char-major-4-64 amiga_ser +# The serial drivers below register to the first free minor! +#alias char-major-4-65 ser_mfc +#alias char-major-4-65 ser_ioext +#alias char-major-4-65 ser_whippet +alias char-major-6-0 lp_intern +# The parallel drivers below register to the first free minor! +#alias char-major-6-1 lp_mfc +#alias char-major-6-1 lp_ioext +alias char-major-10-4 amigamouse +alias char-major-10-5 atarimouse +alias char-major-10-7 amigamouse +alias char-major-10-10 macmouse +alias char-major-14-* dmasound + +alias parport_lowlevel parport_amiga + --- module-init-tools-3.3-pre11.orig/extra/modprobe.d/arch/powerpc.apus +++ module-init-tools-3.3-pre11/extra/modprobe.d/arch/powerpc.apus @@ -0,0 +1,4 @@ +alias block-major-2-* amiflop + +alias char-major-4-* amiserial + --- module-init-tools-3.3-pre11.orig/extra/modprobe.d/arch/m68k.atari +++ module-init-tools-3.3-pre11/extra/modprobe.d/arch/m68k.atari @@ -0,0 +1,20 @@ +alias block-major-2-* ataflop +alias block-major-28-* acsi + +alias char-major-4-0 m68kserial +alias char-major-4-64 atari_MFPser +alias char-major-4-65 atari_SCC +alias char-major-4-66 atari_MFPser +alias char-major-4-67 atari_SCC +alias char-major-4-68 atari_SCC +alias char-major-4-69 atari_MIDI +alias char-major-6-0 lp_intern +alias char-major-10-4 amigamouse +alias char-major-10-5 atarimouse +alias char-major-10-7 amigamouse +alias char-major-10-10 macmouse +alias char-major-14-* dmasound +alias char-major-28-* acsi_slm + +alias scsi-hostadapter atari_scsi + --- module-init-tools-3.3-pre11.orig/extra/modprobe.d/arch/powerpc.pmac +++ module-init-tools-3.3-pre11/extra/modprobe.d/arch/powerpc.pmac @@ -0,0 +1,2 @@ +alias char-major-4-* pmac_zilog + --- module-init-tools-3.3-pre11.orig/extra/modprobe.d/arch/ia64 +++ module-init-tools-3.3-pre11/extra/modprobe.d/arch/ia64 @@ -0,0 +1,2 @@ +alias parport_lowlevel parport_pc + --- module-init-tools-3.3-pre11.orig/extra/modprobe.d/arch/sparc +++ module-init-tools-3.3-pre11/extra/modprobe.d/arch/sparc @@ -0,0 +1,2 @@ +alias parport_lowlevel parport_pc + --- module-init-tools-3.3-pre11.orig/extra/modprobe.d/arch/x86_64 +++ module-init-tools-3.3-pre11/extra/modprobe.d/arch/x86_64 @@ -0,0 +1,4 @@ +alias parport_lowlevel parport_pc + +alias binfmt-0064 ia32_aout + --- module-init-tools-3.3-pre11.orig/extra/modprobe.d/arch/mips +++ module-init-tools-3.3-pre11/extra/modprobe.d/arch/mips @@ -0,0 +1,2 @@ +alias parport_lowlevel parport_pc + --- module-init-tools-3.3-pre11.orig/extra/modprobe.d/arch/parisc +++ module-init-tools-3.3-pre11/extra/modprobe.d/arch/parisc @@ -0,0 +1,6 @@ +alias parport_lowlevel parport_pc + +alias binfmt-0107 binfmt_som +alias binfmt-0108 binfmt_som +alias binfmt-010b binfmt_som + --- module-init-tools-3.3-pre11.orig/extra/modprobe.d/arch/alpha +++ module-init-tools-3.3-pre11/extra/modprobe.d/arch/alpha @@ -0,0 +1,2 @@ +alias parport_lowlevel parport_pc + --- module-init-tools-3.3-pre11.orig/extra/modprobe.d/arch/powerpc.generic +++ module-init-tools-3.3-pre11/extra/modprobe.d/arch/powerpc.generic @@ -0,0 +1 @@ + --- module-init-tools-3.3-pre11.orig/extra/modprobe.d/arch/s390 +++ module-init-tools-3.3-pre11/extra/modprobe.d/arch/s390 @@ -0,0 +1,21 @@ +# For details concering configuration options of S/390 specific drivers +# see the "LINUX for S/390 Device Drivers and Installation Commands" book +# on http://oss.software.ibm.com/developerworks/opensource/linux390/docu.html + +install block-major-2-* /bin/true + +install char-major-4-* /bin/true +install char-major-6-* /bin/true + +#alias tr0 lcs +#alias tr0 qeth +#alias eth0 lcs +#alias eth0 qeth +alias hsi0 qeth +alias ctc0 ctc +alias ctc1 ctc +alias ctc2 ctc +alias escon0 ctc +alias iucv0 netiucv +alias iucv1 netiucv + --- module-init-tools-3.3-pre11.orig/extra/depmod.d/ubuntu.conf +++ module-init-tools-3.3-pre11/extra/depmod.d/ubuntu.conf @@ -0,0 +1 @@ +search updates ubuntu built-in --- module-init-tools-3.3-pre11.orig/debian/rules +++ module-init-tools-3.3-pre11/debian/rules @@ -0,0 +1,131 @@ +#!/usr/bin/make -f +SHELL+= -e + +BUILD_UDEB := 1 +DISABLE_ZLIB := --disable-zlib + + + +# for dpkg-cross +DEB_BUILD_GNU_TYPE = $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_HOST_GNU_TYPE = $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +ifneq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) +CONFARGS := --host=$(DEB_HOST_GNU_TYPE) +endif + +include debian/scripts/vars + +BUILD_DIR := $(SOURCE_DIR)/$(TAR_DIR) +B := $(BUILD_DIR) +O := $(BUILD_DIR)/obj +D := $(CURDIR)/debian/module-init-tools + + +all: build + +unpack: $(STAMP_DIR)/unpack +$(STAMP_DIR)/unpack: + $(MAKE) -f debian/sys-build.mk source.make + touch $@ + +# used by the maintainer +unpack.nopatch: + $(MAKE) -f debian/sys-build.mk source.build + +# used by the maintainer +diff: + $(MAKE) -f debian/sys-build.mk make-diff + +clean: + $(MAKE) -f debian/sys-build.mk source.clean + dh_clean + + +configure: $(STAMP_DIR)/configure +$(STAMP_DIR)/configure: $(STAMP_DIR)/unpack + dh_testdir + ln -sf /usr/share/misc/config.sub /usr/share/misc/config.guess $B/ + NOISY=1 \ + $(MAKE) -f debian/sys-build.mk source.command SOURCE_CMD=" \ + rm -f config.status config.log && \ + mkdir obj/ && cd obj/ && \ + CFLAGS='-Os -DCONFIG_NO_BACKWARDS_COMPAT' \ + ../configure --prefix=/ $(DISABLE_ZLIB) $(CONFARGS) \ + " +ifdef BUILD_UDEB + NOISY=1 \ + $(MAKE) -f debian/sys-build.mk source.command SOURCE_CMD=" \ + mkdir obj-udeb/ && cd obj-udeb/ && \ + CFLAGS='-Os -fomit-frame-pointer -DCONFIG_NO_BACKWARDS_COMPAT' \ + ../configure --prefix=/ --disable-zlib $(CONFARGS) \ + " +endif + touch $@ + + +build: $(STAMP_DIR)/build +$(STAMP_DIR)/build: $(STAMP_DIR)/configure + dh_testdir + NOISY=1 \ + $(MAKE) -f debian/sys-build.mk source.command SOURCE_CMD=" \ + cd obj && $(MAKE) \ + " +ifdef BUILD_UDEB + NOISY=1 \ + $(MAKE) -f debian/sys-build.mk source.command SOURCE_CMD=" \ + cd obj-udeb && $(MAKE) lsmod insmod depmod modprobe \ + " +endif + touch $@ + +install: $(STAMP_DIR)/build checkroot + dh_testdir + dh_clean -k + + dh_installdirs bin/ sbin/ etc/modprobe.d/arch/ etc/depmod.d/ lib/modules/ + dh_install --sourcedir=$O -p module-init-tools + ( \ + cd extra/modprobe.d/ && \ + find . -name '.' -o -name '.*' -prune \ + -o -name arch -prune \ + -o -print | \ + cpio -pvd --preserve-modification-time \ + $D/etc/modprobe.d/ \ + ) + cp extra/depmod.d/ubuntu.conf $D/etc/depmod.d/ + + install --mode=755 extra/update-modules $D/sbin/ + sh extra/installarchconf $D/etc/modprobe.d/arch/ + +ifdef BUILD_UDEB + dh_installdirs bin/ sbin/ etc/modprobe.d/ -p module-init-tools-udeb + dh_install --sourcedir=$O-udeb -p module-init-tools-udeb + cat $D/etc/modprobe.d/arch/* extra/modprobe.d/aliases \ + extra/modprobe.d/blacklist extra/modprobe.d/blacklist-* \ + extra/modprobe.d/isapnp extra/modprobe.d/options \ + > $D-udeb/etc/modprobe.d/aliases || true +endif + +binary-arch: install + dh_testdir + dh_testroot + dh_installchangelogs $B/ChangeLog + dh_installdocs + dh_installman extra/*.5 extra/*.8 $B/obj/*.5 $B/obj/*.8 + dh_installinit --no-start --update-rcd-params="start 15 S ." + dh_link bin/lsmod sbin/lsmod + dh_strip + + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_builddeb + +binary: binary-arch + +checkroot: + test root = "`whoami`" + +.PHONY: binary binary-arch binary-indep unpack configure build clean checkroot --- module-init-tools-3.3-pre11.orig/debian/sys-build.mk +++ module-init-tools-3.3-pre11/debian/sys-build.mk @@ -0,0 +1,167 @@ +#!/usr/bin/make -f +# Separate tarball/patch build system by Adam Heath + +# The magic targets that you need to concern yourself with are: +# +# source.build: Unpacks upstream tarballs, optionally applies patches +# to fix the upstream patches, then applies upstream +# patches. +# source.make: Applies debian patches. +# source.clean: Cleans the build directory, then unfixes the upstream +# patches. +# source.compile: Will compile the source for you. Please check +# debian/scripts/vars. +# source.cmd: When calling this target, if you define a variable +# SOURCE_CMD, it will run that command in the build +# tree. +# make-diff: Generates debian.diff in the current directory which +# contains all edits that are currently in the build +# tree. +# +# Nothing in this file should require any editting. Please look at +# debian/scripts/vars for things to change for the local environment. +# +# debian/rules target command +# ---------------------------------------------------------------- +# clean: $(MAKE) -f debian/sys-build.mk source.clean +# build: $(MAKE) -f debian/sys-build.mk source.compile +# for simple systems. +# build: $(MAKE) -f debian/sys-build.mk source.make +# and, in the rules file, you can +# build the targets you want. +SHELL=/bin/bash +ifndef NOISY +.SILENT: +endif + +include debian/scripts/vars +# remove quotes +DIFF_EXCLUDE:=$(patsubst %,-x %,$(shell echo $(DIFF_EXCLUDE))) + +ifdef TAR_DIR +BUILD_TREE=$(SOURCE_DIR)/$(TAR_DIR) +else +BUILD_TREE=$(SOURCE_DIR) +endif + +SOURCE_CMD=: + +ifdef CLEAN_IGNORE + CLEAN_CMD=- + CLEAN_SH= +else + CLEAN_CMD= + CLEAN_SH= +endif +ifndef CLEAN_TARGET + CLEAN_TARGET=clean +endif + +foo: + echo $(DIFF_EXCLUDE) + +make-diff: + mv $(BUILD_TREE) bak + $(MAKE) -f debian/sys-build.mk source.clean + $(MAKE) -f debian/sys-build.mk source.make + mv $(BUILD_TREE) $(BUILD_TREE).orig + mv bak $(BUILD_TREE) + +ifdef TAR_DIR +ifdef CLEAN_TARGET_EXTERNAL + $(CLEAN_CMD)$(MAKE) -f debian/rules $(CLEAN_TARGET_EXTERNAL) +else + $(CLEAN_CMD)$(MAKE) -C $(BUILD_TREE) $(CLEAN_TARGET) +endif + -(cd $(SOURCE_DIR);diff -ruN $(TAR_DIR).orig $(TAR_DIR) $(DIFF_EXCLUDE)) > debian.diff +else +ifdef CLEAN_TARGET_EXTERNAL + $(CLEAN_CMD)$(MAKE) -f debian/rules $(CLEAN_TARGET_EXTERNAL) +else + $(CLEAN_CMD)for a in $(BUILD_TREE)/*;do $(MAKE) -C $$a $(CLEAN_TARGET);done +endif + -(diff -ruN $(BUILD_TREE).orig $(BUILD_TREE) $(DIFF_EXCLUDE)) > debian.diff + if [ ! -s debian.diff ];then\ + rm debian.diff;\ + fi +endif + rm -rf $(BUILD_TREE).orig + +patchapply: $(STAMP_DIR)/patchapply +$(STAMP_DIR)/patchapply: $(STAMP_DIR)/source.build $(STAMP_DIR) + $(SHELL) debian/scripts/lib patch.apply + touch $@ + rm -f $(STAMP_DIR)/patchunapply + +patchunapply: $(STAMP_DIR)/patchunapply +$(STAMP_DIR)/patchunapply: $(STAMP_DIR)/source.build $(STAMP_DIR) + $(SHELL) debian/scripts/lib patch.unapply + touch $@ + rm -f $(STAMP_DIR)/patchapply + +.export: SOURCE_TREE + +# +# The rules that really do the work all start with $(STAMPDIR) +# This little trick allows us to use stamp files to keep us from +# having to rerun long targets over and over. It also puts +# all stamp files in one place, for easy cleaning. +# +# If a stampdir rule depends on something else, be sure it is +# another stampdir rule. Depending on base rule won't work. +# + +source.build: $(STAMP_DIR)/source.build +STAMP_DIR_TARGETS+= $(STAMP_DIR)/source.build +$(STAMP_DIR)/source.build: $(STAMP_DIR)/source.unpack $(STAMP_DIR)/source.patch $(STAMP_DIR) + touch $@ + +source.make: $(STAMP_DIR)/source.make +STAMP_DIR_TARGETS+= $(STAMP_DIR)/source.make +$(STAMP_DIR)/source.make: $(STAMP_DIR)/source.build $(STAMP_DIR)/patchapply $(STAMP_DIR) + touch $@ + +source.unpack: $(STAMP_DIR)/source.unpack +STAMP_DIR_TARGETS+= $(STAMP_DIR)/source.unpack +$(STAMP_DIR)/source.unpack: $(STAMP_DIR) + $(SHELL) debian/scripts/source.unpack + touch $@ + +source.patch: $(STAMP_DIR)/source.patch +STAMP_DIR_TARGETS+= $(STAMP_DIR)/source.patch +$(STAMP_DIR)/source.patch: $(STAMP_DIR)/source.unpack $(STAMP_DIR)/fix.source.patch $(STAMP_DIR) + $(SHELL) debian/scripts/lib source.patch + touch $@ + +fix.source.patch: $(STAMP_DIR)/fix.source.patch +STAMP_DIR_TARGETS+= $(STAMP_DIR)/fix.source.patch +$(STAMP_DIR)/fix.source.patch: $(STAMP_DIR) + $(SHELL) debian/scripts/lib fix.source.patch + touch $@ + +unfix.source.patch: $(STAMP_DIR)/unfix.source.patch +STAMP_DIR_TARGETS+= $(STAMP_DIR)/unfix.source.patch +$(STAMP_DIR)/unfix.source.patch: $(STAMP_DIR) + $(SHELL) debian/scripts/lib unfix.source.patch + touch $@ + +source.compile: $(STAMP_DIR)/source.compile +STAMP_DIR_TARGETS+= $(STAMP_DIR)/source.compile +$(STAMP_DIR)/source.compile: $(STAMP_DIR)/source.make $(STAMP_DIR) + $(MAKE) -C $(BUILD_TREE) $(BUILD_TARGET) + touch $@ + +source.command: + (cd $(BUILD_TREE); $(SOURCE_CMD)) + +DIR_TARGETS+=$(STAMP_DIR) +$(STAMP_DIR_TARGETS): $(STAMP_DIR) + +$(DIR_TARGETS)/: + mkdir -p $@ + +source.clean: unfix.source.patch + $(SHELL) debian/scripts/lib source.clean + rm -f $(STAMP_DIR_TARGETS) + rm -rf $(STAMP_DIR) + $(MAKE) -C debian/scripts clean --- module-init-tools-3.3-pre11.orig/debian/module-init-tools.init +++ module-init-tools-3.3-pre11/debian/module-init-tools.init @@ -0,0 +1,65 @@ +#!/bin/sh -e +### BEGIN INIT INFO +# Provides: module-init-tools +# Required-Start: +# Required-Stop: +# Should-Start: checkroot +# Should-stop: +# Default-Start: S +# Default-Stop: +# Short-Description: Process /etc/modules. +# Description: Load the modules listed in /etc/modules. +### END INIT INFO + +# Silently exit if the kernel does not support modules or needs modutils. +[ -f /proc/modules ] || exit 0 +[ ! -f /proc/ksyms ] || exit 0 +[ -x /sbin/modprobe ] || exit 0 + +. /etc/default/rcS +. /lib/lsb/init-functions + +PATH="/sbin:/bin" + +KVER=$(uname -r) +KMAJ=${KVER%${KVER#*.*[^.]}} +KMAJ=${KMAJ%.} + +if [ -e /etc/modules-$KVER ]; then + MODULES_FILE=/etc/modules-$KVER +elif [ -e /etc/modules-$KMAJ ]; then + MODULES_FILE=/etc/modules-$KMAJ +else + MODULES_FILE=/etc/modules +fi + +load_module() { + local module args + module="$1" + args="$2" + + if [ "$VERBOSE" != no ]; then + log_action_msg "Loading kernel module $module" + modprobe $module $args || true + else + modprobe $module $args > /dev/null 2>&1 || true + fi +} + +if [ "$VERBOSE" = no ]; then + log_action_begin_msg 'Loading kernel modules' +fi + +# Loop over every line in /etc/modules. +log_begin_msg 'Loading manual drivers...' +grep '^[^#]' $MODULES_FILE | \ +while read module args; do + [ "$module" ] || continue + load_module "$module" "$args" +done + +if [ "$VERBOSE" = no ]; then + log_action_end_msg 0 +fi + +exit 0 --- module-init-tools-3.3-pre11.orig/debian/module-init-tools.install +++ module-init-tools-3.3-pre11/debian/module-init-tools.install @@ -0,0 +1,2 @@ +lsmod /bin/ +insmod modprobe rmmod depmod modinfo /sbin/ --- module-init-tools-3.3-pre11.orig/debian/compat +++ module-init-tools-3.3-pre11/debian/compat @@ -0,0 +1 @@ +4 --- module-init-tools-3.3-pre11.orig/debian/copyright +++ module-init-tools-3.3-pre11/debian/copyright @@ -0,0 +1,10 @@ +This package was debianized by Christopher L Cheney +and Marco d'Itri on Thu, 19 Dec 2002 21:15:05 +0100. + +It was downloaded from http://www.kerneltools.org/ . + +Upstream Authors: Jon Masters + Rusty Russell + Adam J. Richter + +Copyright: GPL (please see /usr/share/common-licenses/GPL-2). --- module-init-tools-3.3-pre11.orig/debian/module-init-tools.postrm +++ module-init-tools-3.3-pre11/debian/module-init-tools.postrm @@ -0,0 +1,24 @@ +#!/bin/sh -e + +remove_etc_files() { + rm -f /etc/modules /etc/modprobe.d/arch-aliases + rmdir --ignore-fail-on-non-empty /etc/modprobe.d/ +} + +case "$1" in + purge) + remove_etc_files + ;; + + remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + + *) + echo "$0 called with unknown argument '$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 --- module-init-tools-3.3-pre11.orig/debian/module-init-tools.preinst +++ module-init-tools-3.3-pre11/debian/module-init-tools.preinst @@ -0,0 +1,75 @@ +#!/bin/sh -e + +undivert_man() { + DSECTION=${2:-8} + for locale in '' fr/; do + dpkg-divert --remove --rename --package module-init-tools --divert \ + /usr/share/man/${locale}man$DSECTION/$1.modutils.$DSECTION.gz \ + /usr/share/man/${locale}man$DSECTION/$1.$DSECTION.gz > /dev/null + done +} + +# Remove a no-longer used conffile +rm_conffile() { + PKGNAME="$1" + CONFFILE="$2" + if [ -e "$CONFFILE" ]; then + md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`" + old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE '{s/ obsolete$//;s/.* //p}\"`" + if [ "$md5sum" != "$old_md5sum" ]; then + echo "Obsolete conffile $CONFFILE has been modified by you." + echo "Saving as $CONFFILE.dpkg-bak ..." + mv -f "$CONFFILE" "$CONFFILE".dpkg-bak + else + echo "Removing obsolete conffile $CONFFILE ..." + rm -f "$CONFFILE" + fi + fi +} + +upgrade_quirks() { + [ "$2" ] || return 0 + + # obsolete conffile that never did what we wanted anyway + if dpkg --compare-versions $2 lt-nl 3.3-pre11-4ubuntu14 \ + && dpkg --compare-versions $2 ge 3.3-pre11-4ubuntu11 + then + rm_conffile module-init-tools /etc/modprobe.d/blacklist-e1000e + fi + + dpkg --compare-versions $2 lt 3.1-pre11-1 || return 0 + # remove an obsolete conffile, which was replaced by .../x86_64 + if [ "$(dpkg --print-architecture)" = amd64 ]; then + rm_conffile module-init-tools /etc/modprobe.d/arch/i386 + fi + + dpkg --compare-versions $2 lt 3.2-pre9-4 || return 0 + rm -f /usr/share/man/man8/kallsyms.8.gz /usr/share/man/man8/ksyms.8.gz + for cmd in kallsyms ksyms; do + undivert_man $cmd + done + + dpkg --compare-versions $2 lt 3.1-pre2-1 || return 0 + echo 'Upgrading from packages older than 3.1-pre2-1 is not supported.' + echo 'Please purge module-init-tools before installing this package.' + exit 1 +} + +case "$1" in + install|upgrade) + + upgrade_quirks "$@" + ;; + + abort-upgrade) + ;; + + *) + echo "$0 called with unknown argument '$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 --- module-init-tools-3.3-pre11.orig/debian/control +++ module-init-tools-3.3-pre11/debian/control @@ -0,0 +1,26 @@ +Source: module-init-tools +Section: admin +Priority: important +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Marco d'Itri +Build-Depends: debhelper (>> 4.2), bzip2, autotools-dev, docbook-to-man +Standards-Version: 3.7.2.2 + +Package: module-init-tools +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.0-6) +Replaces: hotplug (>= 0.0.20040329) +Conflicts: modutils +Description: tools for managing Linux kernel modules + This package contains a set of programs for loading, inserting, and + removing kernel modules for Linux (versions 2.5.48 and above). It serves + the same function that the "modutils" package serves for Linux 2.4. + +Package: module-init-tools-udeb +Section: debian-installer +Priority: extra +Architecture: any +XC-Package-Type: udeb +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: tools for managing Linux kernel modules + This is the debian-installer version of module-init-tools. --- module-init-tools-3.3-pre11.orig/debian/changelog +++ module-init-tools-3.3-pre11/debian/changelog @@ -0,0 +1,1020 @@ +module-init-tools (3.3-pre11-4ubuntu17.2) intrepid-proposed; urgency=low + + [ Andy Whitcroft ] + + * Blacklist vt8623fb video framebuffer driver. By default we want all + framebuffer drivers blacklisted but this one is missing. + LP: #208137 + + -- Tim Gardner Thu, 26 Feb 2009 07:26:35 -0700 + +module-init-tools (3.3-pre11-4ubuntu17.1) intrepid-proposed; urgency=low + + [ Andy Whitcroft ] + + * Ensure we install blacklist-amd76-edac from LP: #297750, to ensure we + never fall foul of this internal list install all of the modprobe.d + files with the exception of the arch directory. + LP: #297750 + + -- Tim Gardner Tue, 16 Dec 2008 15:27:19 +0000 + +module-init-tools (3.3-pre11-4ubuntu17) intrepid-proposed; urgency=low + + [ Andy Whitcroft ] + + * Add a blacklist entry for the amd76x_edac which prevents the + AGP aperture being initialised. + LP: #297750 + + -- Tim Gardner Thu, 04 Dec 2008 14:55:23 -0700 + +module-init-tools (3.3-pre11-4ubuntu16) intrepid; urgency=low + + * Add ignore_hpa=1 option for libata to get prior functionality and + consistency. + + -- Ben Collins Tue, 14 Oct 2008 11:45:32 -0400 + +module-init-tools (3.3-pre11-4ubuntu15) intrepid; urgency=low + + * Added ipw2200 modprobe option 'associate=0' to stop auto-association. + -LP: #264104 + + -- Tim Gardner Mon, 13 Oct 2008 10:45:16 -0600 + +module-init-tools (3.3-pre11-4ubuntu14) intrepid; urgency=low + + * debian/module-init-tools.preinst: + - update the rm_conffile() function to the one currently in common use + - call rm_conffile for /etc/modprobe.d/blacklist-e1000e to clean up + after ourselves + + -- Steve Langasek Mon, 06 Oct 2008 10:25:44 +0000 + +module-init-tools (3.3-pre11-4ubuntu13) intrepid; urgency=low + + * Remove e1000e blacklist as this was not sufficient to prevent + installation of the module since its normally installed in the + initrd. The kernel was uploaded instead with the e1000e + module disabled. + + -- Tim Gardner Wed, 24 Sep 2008 20:45:46 +0000 + +module-init-tools (3.3-pre11-4ubuntu12) intrepid; urgency=low + + * Compile with -Os instead of -O2, making things smaller really helps + speed things up. Oh, would somebody pick that Gentoo developer up off + the floor; anyone would think I just shattered their religion or + something. + + -- Scott James Remnant Wed, 24 Sep 2008 09:31:13 -0700 + +module-init-tools (3.3-pre11-4ubuntu11) intrepid; urgency=low + + * Added a rule to actually copy blacklist-e1000e to the package directory. + + -- Tim Gardner Tue, 23 Sep 2008 19:23:29 +0000 + +module-init-tools (3.3-pre11-4ubuntu10) intrepid; urgency=low + + * Temporarily blacklist e1000e. + The e1000e driver is currently believed to cause onboard flash checksum errors in + the 2.6.26 through 2.6.27-rc7 series kernels. These checksum errors + can become severe enough to permanently disable the operation of the + ICH8/ICH9 based e1000e NICs. + + For reference, please see: + + http://bugzilla.kernel.org/show_bug.cgi?id=11382 + http://news.opensuse.org/2008/09/22/serious-e1000e-driver-issue-in-sle-11-beta-1-and-opensuse-111-beta-1 + https://bugs.launchpad.net/suse/+source/linux/+bug/263555 + + This is hopefully a temporary measure. + LP: #263555 + + -- Tim Gardner Tue, 23 Sep 2008 16:43:51 +0000 + +module-init-tools (3.3-pre11-4ubuntu9) intrepid; urgency=low + + * extra/modprobe.d/blacklist: Blacklist snd_pcsp by default. It has an + extraordinarily low quality and is not useful at all for real audio + playback. It causes a lot of hangs and pain, and workarounds in ALSA and + PulseAudio have been insufficient. (LP: #246969) + + -- Martin Pitt Tue, 12 Aug 2008 17:31:29 +0200 + +module-init-tools (3.3-pre11-4ubuntu8) intrepid; urgency=low + + * extra/modprobe.d/blacklist-framebuffer: + - Add lxfb module. LP: #237186. + + -- Scott James Remnant Mon, 14 Jul 2008 10:18:11 +0100 + +module-init-tools (3.3-pre11-4ubuntu7) intrepid; urgency=low + + * patches/last_good_boot: Detect when we are booted with last-good-boot in + /proc/cmdline, and set-version appropriate (so we get the right modules). + Can still be overriden by --set-version= and is ignored in initramfs (-d + /scripts) + + -- Ben Collins Fri, 20 Jun 2008 14:21:20 -0400 + +module-init-tools (3.3-pre11-4ubuntu6) intrepid; urgency=low + + * Blacklist snd_aw2, which is a new driver that conflicts with an existing + dvb driver. + + -- Ben Collins Wed, 18 Jun 2008 14:11:06 -0400 + +module-init-tools (3.3-pre11-4ubuntu5) hardy; urgency=low + + [ Luka Renko ] + + * Blacklist garmin_gps driver: most applications now have + proper Garmin USB support, so serial emulation is not + needed anymore. + LP #114565 + + -- Tim Gardner Mon, 25 Feb 2008 20:47:50 +0000 + +module-init-tools (3.3-pre11-4ubuntu4) hardy; urgency=low + + * Blacklist asus_acpi in favor of asus-laptop + LP #184721 + + -- Tim Gardner Wed, 13 Feb 2008 11:31:20 -0700 + +module-init-tools (3.3-pre11-4ubuntu3) hardy; urgency=low + + * Create /etc/depmod.d/ubuntu.conf to control the order + of module searching. This solves the problem where there + are duplicate modules in the kernel as well as linux-ubuntu-modules. + The search order is updates, ubuntu, built-in, then everything else. + + -- Tim Gardner Fri, 1 Feb 2008 10:13:50 -0700 + +module-init-tools (3.3-pre11-4ubuntu2) hardy; urgency=low + + * Blacklist bcm43xx, prism54. + LP #185719 + + -- Fri, 01 Feb 2008 14:54:43 +0000 + +module-init-tools (3.3-pre11-4ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + + extra/installarchconf: + - Install i386 archmap on lpia as well. + + debian/control: + - DebianMaintainerField foo + - Add Replaces: hotplug + + debian/module-init-tools.postinst: + - Add upgrade quirks (removing a pre-dapper one in the process) + + debian/module-init-tools.init: + - log_message_start that we're "loading manual drivers". + - Remove /lib/modules/boot support. + - Don't warn about modprobe.conf not including modprobe.d (since we + include it regardless) + + debian/rules: + - Install the following files into etc/modprobe.d: + extra/modprobe.d/blacklist + extra/modprobe.d/blacklist-framebuffer + extra/modprobe.d/blacklist-watchdog + extra/modprobe.d/isapnp + extra/modprobe.d/options + - Add those modprobe.d files to the udeb, too. + - Start at 15 S instead of 20 S. + + extra/modprobe.d/blacklist-framebuffer: + - Blacklist framebuffer modules. + + extra/modprobe.d/isapnp: + - Add some modaliases missing from the kernel modules. + + extra/modprobe.d/blacklist: + - Add additional blaclists (see rationale in the file). + + extra/modprobe.d/blacklist-watchdog: + - Don't load watchdog modules by default (should be loaded by a watchdog + daemon). + + extra/modprobe.d/options: + - Add a few options to pass by default to certain modules. (see + description in the file). + + debian/patches/silence_modprobe: + - Add -Q option to modprobe (to suppress warnings and errors). + + debian/patches/modprobe_conf_and_directory: + - Don't ignore the modprobe.d directory if modprobe.conf is present. + + -- Soren Hansen Tue, 23 Oct 2007 11:10:38 +0200 + +module-init-tools (3.3-pre11-4) unstable; urgency=high + + * Try harder to clean up the diversions. Apparently some old dpkg version + used to leave around diverted files which got removed. (Closes: #428650) + * Clean up after modutils by deleting /etc/rcS.d/S20modutils. + * Make update-modules complain about its uselessness. + + -- Marco d'Itri Sun, 08 Jul 2007 22:59:13 +0200 + +module-init-tools (3.3-pre11-3) unstable; urgency=high + + * The modutils diversions must be removed in postinst, because preinst + is run before the old files are removed. (Closes: #428650) + + -- Marco d'Itri Wed, 13 Jun 2007 13:39:07 +0200 + +module-init-tools (3.3-pre11-2) unstable; urgency=high + + * Disabled modutils compatibility, now the package conflicts with it. + * Removed the modutils_extension patch and extra/fixmanpages, which + dealt with modutils. + * New patch insmod-segv: prevents insmod from segfaulting if called without + an explicit path, courtesy of Mikko Ylinen. (Closes: #425458) + * Add .orig to the list of forbidden extensions. (See #295755.) + * Removed from preinst the code needed to upgrade from pre-sarge versions + of the package (< 3.1-pre2-1). + * Stop installing the TODO, FAQ, generate-modprobe.conf and modprobe.devfs + files because they are useless. + * New patch use_blacklist_doc to document the --use-blacklist command line + parameter. + + -- Marco d'Itri Wed, 13 Jun 2007 04:11:34 +0200 + +module-init-tools (3.3-pre11-1) unstable; urgency=medium + + * New upstream release. (Closes: #421115) + * Removed patch hotplug_blacklist: /etc/hotplug/blacklist.d/ is not + supported anymore. + * Removed backported patches: cmdline_opts_fix, format_64bit_fix. + * Depend on docbook-to-man, since pre-build man pages are not in the + upstream tree anymore. + * Fixed misc documentation issues. (Closes: #348121, #401972, #401973) + * New alias: binfmt-0064 [x86_64]. (Closes: #421978) + * Removed alias: binfmt-332 [x86]. + + -- Marco d'Itri Sun, 20 May 2007 19:44:47 +0200 + +module-init-tools (3.3-pre4-2ubuntu4) gutsy; urgency=low + + * Remove mptbase mpt_channel_mapping workaround. Fixed in mptbase in + recent kernels instead. + + -- Soren Hansen Mon, 01 Oct 2007 09:01:14 +0200 + +module-init-tools (3.3-pre4-2ubuntu3) gutsy; urgency=low + + * extra/installarchconf: Install i386 archmap on lpia as well. + + -- Adam Conrad Wed, 1 Aug 2007 23:02:27 +1000 + +module-init-tools (3.3-pre4-2ubuntu2) gutsy; urgency=low + + * Remove blacklist for 818x and 8180 drivers. + * Default mptbase to mpt_channel_mapping=1 to workaround bug #112860 + + -- Ben Collins Thu, 17 May 2007 20:24:50 -0400 + +module-init-tools (3.3-pre4-2ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + - Add modprobe.d/options + modprobe.d/isapnp + modprobe.d/blacklist-watchdog + modprobe.d/blacklist-framebuffer + modprobe.d/blacklist + - debian/rules: + - install extra modprobe.d files + - use the above modprobe.d files in udeb + - start at 15 S instead of 20 S + - Preserve debian/patches/silence_modprobe and modprobe_conf_and_directory. + - Remove debian/patches/hotplug_blacklist. + - debian/control Ubuntu maintainer foobar. + - debian/module-init-tools.init: remove /lib/modules/boot support. + - debian/module-init-tools.postinst: preserve ipv6 blacklist removal. + + -- Fabio M. Di Nitto Wed, 16 May 2007 10:07:03 +0200 + +module-init-tools (3.3-pre4-2) unstable; urgency=medium + + * New aliases: net-pf-16-proto-*. (Closes: #411048) + + -- Marco d'Itri Sun, 18 Feb 2007 17:53:37 +0100 + +module-init-tools (3.3-pre4-1) unstable; urgency=medium + + * New upstream release (3.3-pre6), only bug fixes. + * Added patch cmdline_opts_fix to prevent passing command line options + to modules depended on. From Altlinux. (Closes: #336205) + * Added patch format_64bit_fix to fix a possible bug on some 64 bit + architectures. From Altlinux. + * Moved modprobe.conf to modprobe.d/ in the udeb to stop ignoring other + files in the directory. + + -- Marco d'Itri Sat, 6 Jan 2007 16:01:00 +0100 + +module-init-tools (3.3-pre3-1ubuntu7) feisty; urgency=low + + * yes another one to make it even harder.. + + -- Fabio M. Di Nitto Tue, 03 Apr 2007 14:41:19 +0200 + +module-init-tools (3.3-pre3-1ubuntu6) feisty; urgency=low + + * and make damn sure we remove the blacklist-ipv6 file. + + -- Fabio M. Di Nitto Tue, 03 Apr 2007 14:37:30 +0200 + +module-init-tools (3.3-pre3-1ubuntu5) feisty; urgency=low + + * Revert change from 3.3-pre3-1ubuntu4 + + -- Fabio M. Di Nitto Tue, 03 Apr 2007 14:30:19 +0200 + +module-init-tools (3.3-pre3-1ubuntu4) feisty; urgency=low + + * blacklist ipv6. + (Closes LP: #24828) + + -- Fabio M. Di Nitto Fri, 30 Mar 2007 09:07:04 +0200 + +module-init-tools (3.3-pre3-1ubuntu3) feisty; urgency=low + + * Fix thinko in previous upload, proper names are r818x and + r8187. (Ubuntu: #78255, #88430) + + -- Kyle McMartin Tue, 6 Mar 2007 22:06:29 +0000 + +module-init-tools (3.3-pre3-1ubuntu2) feisty; urgency=low + + * Blacklist {rtl818x,rtl8187} drivers. (Ubuntu: #78255, #88430) + + -- Kyle McMartin Tue, 27 Feb 2007 15:05:15 -0500 + +module-init-tools (3.3-pre3-1ubuntu1) feisty; urgency=low + + * Merge from debian unstable, remaining changes: + - automatically combine /etc/modprobe.conf and /etc/modprobe.d + - drop support for /lib/modules/boot + - drop support for /etc/hotplug/blacklist.d + - add -Q option to increase modprobe silence + - various extra modprobe.d options, including blacklists + + -- Scott James Remnant Tue, 28 Nov 2006 10:36:10 +0000 + +module-init-tools (3.3-pre3-1) unstable; urgency=medium + + * New upstream release. + * patches/hotplug_blacklist: fixed typo. (Closes: #382443) + * Only use LSB message functions in the init script to properly support + usplash. Based on code contributed by David Härdeman (see #384916). + * New alias: char-major-10-187. + + -- Marco d'Itri Tue, 14 Nov 2006 15:23:46 +0100 + +module-init-tools (3.2.2-3ubuntu4) feisty; urgency=low + + * Remove blacklist-pata. Feisty kernel has switched some ide drivers to pata + now, and we want them to work. + + -- Ben Collins Mon, 20 Nov 2006 08:47:28 -0500 + +module-init-tools (3.2.2-3ubuntu3) edgy; urgency=low + + * Restore more dropped merge patches (this one went VERY wrong): + - configuration files in the udev + - changes to init position and script + - replaces on hotplug + + -- Scott James Remnant Wed, 5 Jul 2006 00:49:01 +0100 + +module-init-tools (3.2.2-3ubuntu2) edgy; urgency=low + + * Restore configuration files dropped by the merge. + * Add blacklist-pata which we'll use to select between IDE subsystem and + PATA/libata drivers for PATA/IDE controllers. + + -- Scott James Remnant Fri, 30 Jun 2006 01:17:05 +0100 + +module-init-tools (3.2.2-3ubuntu1) edgy; urgency=low + + * Merge from Debian unstable. + - Keep our modprobe_conf_and_directory and silence_modprobe patches. + - Retain drop of hotplug_blacklist patch. + + -- Scott James Remnant Wed, 7 Jun 2006 23:14:21 +0100 + +module-init-tools (3.2.2-3) unstable; urgency=medium + + * Do not run anymore depmod -A in the init script. (Closes: #358239) + All packages installing kernel modules will need to run depmod in their + maintainer scripts. + * Build-depend on autotools-dev to get recent config.{sub,guess} files. + (Closes: #357954) + * Remove /etc/modprobe.d/arch-aliases when the package is purged. + (Closes: #355699) + * Added patch always_apply_blacklist from the Ubuntu package, to make + blacklist directives apply to user-defined aliases too. + + -- Marco d'Itri Sat, 3 Jun 2006 14:10:21 +0200 + +module-init-tools (3.2.2-2) unstable; urgency=medium + + * Added patch fix_wildcards from upstream 3.3-pre1, to fix matching + [a-b] expressions in aliases. (Closes: #350915) + * Updated the runparts_like_names patch to ignore CVS directories. + + -- Marco d'Itri Sun, 5 Feb 2006 12:35:34 +0100 + +module-init-tools (3.2.2-1ubuntu7) dapper; urgency=low + + * Don't convert dashes to underscores within the shell glob choice + characters, these are illegal in module names but quite useful in + wildcards (mostly for usb_storage). + + -- Scott James Remnant Fri, 5 May 2006 15:51:16 +0100 + +module-init-tools (3.2.2-1ubuntu6) dapper; urgency=low + + * Apply the blacklist to all aliases, not just those defined by the + kernel. We frequently ship some in /etc/modprobe.d (like the isapnp + ones) and still want blacklisting to work. + + -- Scott James Remnant Wed, 12 Apr 2006 08:23:27 +0100 + +module-init-tools (3.2.2-1ubuntu5) dapper; urgency=low + + * Don't ignore the modprobe.d directory if modprobe.conf is present, + just load all of them; this behaviour is very confusing for most users. + + -- Scott James Remnant Mon, 3 Apr 2006 19:54:39 +0100 + +module-init-tools (3.2.2-1ubuntu4) dapper; urgency=low + + * Set the default mode of hostap devices to managed in + /etc/modprobe.d/options + + -- Scott James Remnant Mon, 3 Apr 2006 19:05:26 +0100 + +module-init-tools (3.2.2-1ubuntu3) dapper; urgency=low + + * Change the third Loading modules to "Loading manual drivers" + + -- Scott James Remnant Tue, 7 Feb 2006 11:08:25 +0000 + +module-init-tools (3.2.2-1ubuntu2) dapper; urgency=low + + * Add new /etc/modprobe.d/options file and include option for quickcam.ko + to enable double-buffering and thus work with gstreamer and friends. + + -- Scott James Remnant Mon, 9 Jan 2006 07:54:28 +0000 + +module-init-tools (3.2.2-1ubuntu1) dapper; urgency=low + + * Resynchronise with Debian. + - Drop input_table_size patch, included upstream. + - Drop use_blacklist patch, included upstream. + + -- Scott James Remnant Thu, 15 Dec 2005 02:27:23 +0000 + +module-init-tools (3.2.2-1) unstable; urgency=medium + + * New upstream release. + + Fixed the documentation about modprobe and wildcards. (Closes: #328527) + + Adds modules.inputmap support for 2.6.15 kernels. + * Remove the /sbin/k{all,}syms symlinks *before* undiverting the + modutils binaries in postrm (see #333522). (Closes: #342042) + + -- Marco d'Itri Mon, 28 Nov 2005 12:33:45 +0100 + +module-init-tools (3.2.1-0ubuntu6) dapper; urgency=low + + * Rename /etc/modprobe.d/framebuffer to blacklist-framebuffer. + * Rename /etc/modprobe.d/watchdog to blacklist-watchdog. + + -- Scott James Remnant Mon, 5 Dec 2005 16:39:21 +0000 + +module-init-tools (3.2.1-0ubuntu5) dapper; urgency=low + + * Separate the watchdog driver blacklist into a separate file, and update + to include all drivers in the current kernel source (whether or not we + build them). + * Include new /etc/modprobe.d/framebuffer file that blacklists all of the + framebuffer drivers (list compiled by hand). + + -- Scott James Remnant Thu, 1 Dec 2005 17:07:06 +0000 + +module-init-tools (3.2.1-0ubuntu4) dapper; urgency=low + + * Update debian/patches/silence_modprobe to pass -Q down to further + modprobe calls, and include the behavior of -q as well; also document + it in the manpage. + * Update debian/patches/use_blacklist to include manpage documentation. + + -- Scott James Remnant Thu, 1 Dec 2005 14:35:50 +0000 + +module-init-tools (3.2.1-0ubuntu3) dapper; urgency=low + + * Correct patch system damage. + + -- Scott James Remnant Thu, 1 Dec 2005 00:10:11 +0000 + +module-init-tools (3.2.1-0ubuntu2) dapper; urgency=low + + * Restore debian/patches/silence_modprobe, it was used after all and I + just suck at grep. + + -- Scott James Remnant Wed, 30 Nov 2005 17:06:08 +0000 + +module-init-tools (3.2.1-0ubuntu1) dapper; urgency=low + + * New upstream release: + - macio device support. + - modprobe locks before seeing if module is in kernel and spins when + parallel attempts fail. + * Move init script to S:S15 in line with dapper boot streamlining. + * Drop debian/patches/check_status, superseded upstream. + * Drop debian/patches/module_locking, superseded upstream. + * Drop debian/patches/silence_modprobe, not used. + * Add debian/patches/input_table_size which adds new swbit field to + input device structure, required for 2.6.15 + * Add debian/patches/use_blacklist which adds a modprobe -b option to + apply blacklists to module names on the command line. + + -- Scott James Remnant Wed, 30 Nov 2005 13:50:31 +0000 + +module-init-tools (3.2-pre9-4ubuntu2) dapper; urgency=low + + * Clean up the init script: + - Don't run depmod at boot, if you install your own modules you should + run depmod afterwards to make sure the files are up to date. + - Drop support for /lib/modules/boot, we'll pick one or the other and + the modprobe arguments used are marked deprecated. + - Remove warning about modprobe.conf not including modprobe.d, + doing things like this during the boot sequence is silly as the + messages just scroll past + + -- Scott James Remnant Wed, 9 Nov 2005 19:02:15 -0500 + +module-init-tools (3.2-pre9-4ubuntu1) dapper; urgency=low + + * Manual merge with Debian: + - Reduce lsb-base dependency version to that currently available + in dapper and adjust init script to match + - Keep usplash timeout setting. + - Keep fix to stop the init script exiting when depmod can't refresh + modules.dep, such as when on a read-only filesystem. + - Keep silence_modprobe patch, adjusting line numbers. + * Drop Debian's hotplug_blacklist patch during dapper development to + make sure we don't rely on this internally. + * Turn the old hotplug blacklist file into /etc/modprobe.d/blacklist + and weed it while we were in there. + * Copy isapnp aliases from old hotplug package to be installed in + /etc/modprobe.d; drop parport_pc from this file as that driver now + generates the right aliases. Thus this package Replaces hotplug so + it can overwrite that file. + + -- Scott James Remnant Mon, 7 Nov 2005 14:45:40 -0500 + +module-init-tools (3.2-pre9-4) unstable; urgency=high + + * Added two patches to prevent errors when concurrently loading modules. + (Closes: #333522) + * Removed the diversions for kallsyms(8) and ksyms(8). + + -- Marco d'Itri Sun, 6 Nov 2005 12:14:39 +0100 + +module-init-tools (3.2-pre9-3) unstable; urgency=medium + + * Added LSB data to the init script. + + -- Marco d'Itri Sun, 23 Oct 2005 12:42:34 +0200 + +module-init-tools (3.2-pre9-2) unstable; urgency=medium + + * Fixed debian/rules to not break if there are no arch-specific aliases. + + -- Marco d'Itri Sat, 8 Oct 2005 19:48:01 +0200 + +module-init-tools (3.2-pre9-1) unstable; urgency=medium + + * New upstream release. + * Removed the out of date French man pages from the source package. + * Added *temporary* support for /etc/hotplug/blacklist.d/. + * Added -* to every {char,block}-major- alias without a minor. + * Removed some unneeded aliases from the main aliases file. + * Added SuSE patch blacklist-warn.diff to warn when a blacklisted module + is not loaded. + + -- Marco d'Itri Sun, 25 Sep 2005 13:43:37 +0200 + +module-init-tools (3.2-pre8-1) unstable; urgency=medium + + * New upstream release. + * Switched the init script to lsb-base. (Closes: #294766) + * Added cross-compilation support to extra/installarchconf. (Closes: #308164) + * Added symlinks for kallsyms(8) and ksyms(8). (Closes: #304690) + + -- Marco d'Itri Wed, 3 Aug 2005 19:27:39 +0200 + +module-init-tools (3.2-pre1-2) unstable; urgency=high + + * Fixed the init script to not depend on /sbin/kernelversion, which is + part of modutils. (Closes: #292116) + + -- Marco d'Itri Wed, 26 Jan 2005 21:55:43 +0100 + +module-init-tools (3.2-pre1-1) unstable; urgency=medium + + * Make the init script support > 2.6 kernels too. (Closes: #282584) + * Added support for dpkg-cross, by NIIBE Yutaka. (Closes: #283722) + * Changed ide-probe-mod to ide-generic in the standard aliases file to + support kernels >= 2.6.7. (Closes: #291523) + * Added updated French man pages from Pierre Machard. (Closes: #283412) + * Removed aliases which now are provided by the kernel: loop, rd, xd, + floppy, swim3, rtc, nvram, ppdev, agpgart, obsolete CD drivers, wdt, + softdog, ide-tape, sg, tun, 8250, snd, soundcore, lp, isofs, ppp_generic. + This allowed removing arch/m68k.mac. + It would be nice if the maintainers for the doorstop kernel trees added + proper MODULE_ALIAS_* macros to their drivers. + + -- Marco d'Itri Mon, 24 Jan 2005 13:48:20 +0100 + +module-init-tools (3.1-rel-2) unstable; urgency=medium + + * Added patch no_man_rebuild: prevents rebuilding the man pages. + + -- Marco d'Itri Sun, 21 Nov 2004 02:19:36 +0100 + +module-init-tools (3.1-rel-1) unstable; urgency=medium + + * New upstream release. + + Fixes -t documentation. (Closes: #276660) + * Stop installing French man pages, because they are out of date. + * Removed patch manpage_warnings which has been merged upstream. + + -- Marco d'Itri Sat, 20 Nov 2004 18:05:26 +0100 + +module-init-tools (3.1-pre6-1) unstable; urgency=medium + + * New upstream release. + + Patches merged upstream and removed from the package: + modinfo.8_missing_word, modprobe.devfs_apm, robust_modprobe.d. + + Do not follow symlinks. (Closes: #270106) + + Fixes --show-depends documentation. (Closes: #274758) + * Removed patch disable_modprobe_locking because it only hides a kernel + bug which has been fixed since (see #259056). + * New aliases: xfrm-type-2-4, xfrm-type-10-41. + + -- Marco d'Itri Sat, 9 Oct 2004 01:59:42 +0200 + +module-init-tools (3.1-pre5-7) unstable; urgency=medium + + * Fixed a very obscure postinst failure. (Closes: #269481) + * Fixed a very obscure preinst failure. + * Silence md5sum in preinst. + * New patch manpage_warnings: adds warnings about modprobe.conf vs. + modprobe.d usage in the init script and the update-modprobe, modprobe + and modprobe.conf man pages, by Eduard Bloch. (Closes: Bug#269305) + + -- Marco d'Itri Sun, 12 Sep 2004 19:12:45 +0200 + +module-init-tools (3.1-pre5-6) unstable; urgency=high + + * Removed the autofs4 alias. (Closes: #267065, #261026) + + -- Marco d'Itri Fri, 20 Aug 2004 16:39:33 +0200 + +module-init-tools (3.1-pre5-5) unstable; urgency=high + + * Divert French man pages too. (Closes: #263735) + + -- Marco d'Itri Thu, 19 Aug 2004 13:58:26 +0200 + +module-init-tools (3.1-pre5-4) unstable; urgency=high + + * Added french man pages translated by Pierre Machard. (Closes: #263735) + * Fix "update-modules force". (Closes: #266127) + * Removed aliases tty-ldisc-*, md-personality-* and ppp-compress-* + because they are supplied by modern kernels. (Closes: #262481) + * New alias: autofs4. (Closes: #261026) + * Ignore *,v files in /etc/modprobe.d/. (Closes: #265805) + * Create /etc/modprobe.d/ before using it in preinst. (Closes: #261045) + * New patch: modinfo.8_missing_word. (Closes: #265965) + * New patch: robust_modprobe.d transforms some fatal errors in warnings. + (Closes: #261961) + * New patch: disable_modprobe_locking (see #259056). + + -- Marco d'Itri Wed, 18 Aug 2004 17:04:39 +0200 + +module-init-tools (3.1-pre5-3) unstable; urgency=medium + + * Updated patch runparts_like_names to accept anything but dot files, + dpkg files and backup~ files. (Closes: #260169) + * Run depmod -a when upgrading from 3.1-pre4-1. (Closes: #260180) + * New aliases: bt-proto-6, bt-proto-7, char-major-10-183. + + -- Marco d'Itri Wed, 21 Jul 2004 01:24:41 +0200 + +module-init-tools (3.1-pre5-2) unstable; urgency=medium + + * Fixed the installation of the arch file on sparc64 systems. + (Closes: #257833) + * Added patch runparts_like_names to make modprobe use only files + matching /^[a-zA-Z0-9_-]+$/ (by Joey Hess, code extracted from + the run-parts tool). (Closes: #259486) + + -- Marco d'Itri Fri, 16 Jul 2004 19:46:58 +0200 + +module-init-tools (3.1-pre5-1) unstable; urgency=high + + * New upstream release. + depmod does not follow the "build" symlink anymore. + (Closes: #257469, #257481, #257392, #257484, #257510) + * Removed /etc/modprobe.d/crypto because it's useless. + + -- Marco d'Itri Tue, 6 Jul 2004 01:16:00 +0200 + +module-init-tools (3.1-pre4-1) unstable; urgency=high + + * New upstream release. + + -- Marco d'Itri Wed, 23 Jun 2004 12:20:58 +0200 + +module-init-tools (3.1-pre2-2) unstable; urgency=high + + * New patch: open_ro which opens the files RO and probably breaks locking. + (Closes: #255180) + * New patch: ignore_arch_directory to ignore everything in + /etc/modprobe.d/arch/. + + -- Marco d'Itri Sat, 19 Jun 2004 17:26:37 +0200 + +module-init-tools (3.1-pre2-1) unstable; urgency=medium + + * New upstream release. (Closes: #254204) + * Now /etc/modprobe.d/ is processed by modprobe. This means that + /etc/modprobe.conf and /lib/modules/modprobe.conf are not needed + anymore and update-modules is now a no-op. Executable scripts in + /etc/modprobe.d/ are not supported anymore. + /etc/modprobe.conf will be removed or moved to /etc/modprobe.d/. + * /etc/modprobe.devfs is now installed as an example file: I don't think + it works as is on debian, I do not know how it's supposed to work + now that /etc/modprobe.conf does not exist anymore and I could not + find anybody using it. + * Updated char-major-4 in arch/powerpc.pmac. (Closes: #252602) + + -- Marco d'Itri Thu, 17 Jun 2004 17:14:17 +0200 + +module-init-tools (3.0-pre10-4) unstable; urgency=high + + * Added again module-init-tools.udeb. (Closes: #250048) + + -- Marco d'Itri Fri, 21 May 2004 18:32:31 +0200 + +module-init-tools (3.0-pre10-3) unstable; urgency=high + + * Removed module-init-tools.udeb. (Closes: #242337, #242826) + * Removed the irda-dongle-* aliases because the kernel provides his own. + (Closes: #243207) + * Added an alias for gre0. + * Fixed support for /lib/modules/*/boot/. (Closes: #243061, #242544) + + -- Marco d'Itri Sun, 16 May 2004 18:12:23 +0200 + +module-init-tools (3.0-pre10-2) unstable; urgency=high + + * Created module-init-tools.udeb. (Closes: #239301) + + -- Marco d'Itri Tue, 23 Mar 2004 00:58:12 +0100 + +module-init-tools (3.0-pre10-1) unstable; urgency=medium + + * New upstream release. + Reverted the change of semantics of -q. (Closes: #232222) + * Do not add /usr to the init script $PATH. (Closes: #230764) + + -- Marco d'Itri Sat, 21 Feb 2004 22:26:55 +0100 + +module-init-tools (3.0-pre9-1) unstable; urgency=medium + + * New upstream release. + * Fix psaux and cdc_acm aliases. (Closes: #227428) + + -- Marco d'Itri Fri, 30 Jan 2004 23:08:05 +0100 + +module-init-tools (3.0-pre5-1) unstable; urgency=medium + + * New upstream release. (Closes: #226199) + * Make Eduard Bloch happier. (Closes: #225236) + + -- Marco d'Itri Tue, 6 Jan 2004 17:02:37 +0100 + +module-init-tools (3.0-pre4-1) unstable; urgency=medium + + * New upstream release. + * Create /lib/modules/. (Closes: #225372) + + -- Marco d'Itri Fri, 2 Jan 2004 23:03:21 +0100 + +module-init-tools (3.0-pre2-1) unstable; urgency=medium + + * New upstream release. + * Optionally use /etc/modules-2.6 instead of /etc/modules. (Closes: #225005) + + -- Marco d'Itri Thu, 25 Dec 2003 02:24:30 +0100 + +module-init-tools (0.9.15-pre4-1) unstable; urgency=medium + + * New upstream release. + + -- Marco d'Itri Tue, 25 Nov 2003 01:56:44 +0100 + +module-init-tools (0.9.15-pre3-2) unstable; urgency=high + + * Remove debugging code from update-modules. (Closes: #218544) + + -- Marco d'Itri Sat, 1 Nov 2003 02:20:37 +0100 + +module-init-tools (0.9.15-pre3-1) unstable; urgency=high + + * New upstream release. (Closes: #215202, #215614, #217647) + * Added support for hppa64 and s390x. (Closes: #211088, #216569) + Removed /etc/modprobe.d/arch/sparc64, the sparc configuration fragment + will be used instead. + * Fix bogus message when /etc/modules contains lines with only blanks. + (Closes: #216295) + * Install config files for the right architecture only. (Closes: #215548) + + -- Marco d'Itri Fri, 31 Oct 2003 17:25:22 +0100 + +module-init-tools (0.9.15-pre2-2) unstable; urgency=medium + + * Added support for sparc64 and a generic file. (Closes: #214128) + * Fixed a postrm bug triggered by upgrading without modutils being + installed. (Closes: #214126) + * New aliases: pg, acm, msr, cpuid, tub3270, usbcore, scanner, toshiba, + evdev, coda, specialix, videodev, vtx. + + -- Marco d'Itri Sun, 5 Oct 2003 14:33:13 +0200 + +module-init-tools (0.9.15-pre2-1) unstable; urgency=medium + + * New upstream release. (Closes: #213128) + * Fix preinst bug triggered by upgrade without modutils being installed. + (Closes: #213073) + + -- Marco d'Itri Tue, 30 Sep 2003 21:52:07 +0200 + +module-init-tools (0.9.15-pre1-1) unstable; urgency=medium + + * New upstream release. + * Added support for hppa, ia64, mips and sparc. (Closes: #212700, #211088) + * Added support for IrDA modules. + * Removed obsolete aliases busmouse, msbusmouse and atixlmouse. + + -- Marco d'Itri Thu, 25 Sep 2003 15:42:07 +0200 + +module-init-tools (0.9.14-1) unstable; urgency=medium + + * New upstream release. + Support multiple arguments to modprobe -r. (Closes: #207808) + * Fix small bugs in the init script. (Closes: #206413) + * Follow symlinks in /etc/modprobe.d/. + + -- Marco d'Itri Fri, 12 Sep 2003 22:06:24 +0200 + +module-init-tools (0.9.13-rel-1) unstable; urgency=medium + + * New upstream release. + Adds -V/--version arguments to insmod. (Closes: #201652) + * Fix /lib/modules/$KVER/boot the init script. (Closes: #205052) + * Fix the i386 serial module alias. (Closes: #200816) + * Add IPSEC-related aliases. (Closes: #203654) + * Add all known net-pf-* aliases. + + -- Marco d'Itri Mon, 18 Aug 2003 05:47:26 +0200 + +module-init-tools (0.9.13-pre-1) unstable; urgency=high + + * Add symlinks for kallsyms and ksyms. (Closes: #195013) + * Always use syscall(2) instead of the _syscall2() kernel macro. + + -- Marco d'Itri Sat, 14 Jun 2003 17:04:25 +0200 + +module-init-tools (0.9.12-1) unstable; urgency=medium + + * New upstream release. (Closes: #194316, #181996, #191493, #187123) + * s/ipsec/af_key/ in the aliases file. (Closes: #188804) + * s/.old/.modutils/ in the manpage. (Closes: #193832) + + -- Marco d'Itri Mon, 26 May 2003 18:17:07 +0200 + +module-init-tools (0.9.11-1) unstable; urgency=medium + + * New upstream release. (Closes: #181996, #184567) + + -- Marco d'Itri Sun, 30 Mar 2003 01:37:03 +0100 + +module-init-tools (0.9.10-2) unstable; urgency=medium + + * Install a init script and conflict with old modutils (see #173381). + + -- Marco d'Itri Sun, 9 Mar 2003 22:05:49 +0100 + +module-init-tools (0.9.10-1) unstable; urgency=low + + * New upstream release. + + -- Marco d'Itri Tue, 25 Feb 2003 12:57:36 +0100 + +module-init-tools (0.9.9-1) unstable; urgency=low + + * New upstream release. (Closes: #177842) + * Make generate-modprobe.conf with debian paths. (Closes: #177409) + + -- Marco d'Itri Sat, 1 Feb 2003 18:19:19 +0100 + +module-init-tools (0.9.8-1) unstable; urgency=low + + * New upstream release. (Closes: #176935) + * Improve description. (Closes: #176909) + + -- Marco d'Itri Thu, 16 Jan 2003 02:53:18 +0100 + +module-init-tools (0.9.7-1) unstable; urgency=medium + + * New upstream release. + + -- Marco d'Itri Sat, 28 Dec 2002 12:09:07 +0100 + +module-init-tools (0.9.6-1) unstable; urgency=low + + * New upstream release. + + -- Marco d'Itri Thu, 26 Dec 2002 12:35:41 +0100 + +module-init-tools (0.9.5-6) unstable; urgency=low + + * I surrender to dpkg-divert. Users will be forced to purge old versions + of this packages before installing this one (Closes: #173942). + * Remove useless "you have to be root" check from update-modules + (Closes: #174188, #174179). + + -- Marco d'Itri Tue, 24 Dec 2002 20:22:15 +0100 + +module-init-tools (0.9.5-5) unstable; urgency=low + + * *Really* fix depmod. + * Fix upgrade from old packages (Closes:# 173942). + + -- Marco d'Itri Mon, 23 Dec 2002 02:56:00 +0100 + +module-init-tools (0.9.5-3) unstable; urgency=low + + * Fixed modutils-compatibility code in depmod. + + -- Marco d'Itri Sun, 22 Dec 2002 18:59:44 +0100 + +module-init-tools (0.9.5-2) unstable; urgency=low + + * Undivert diversions from < 0.9.5 packages. + * Update the default /etc/modprobe.d/ files with all known default aliases. + + -- Marco d'Itri Sat, 21 Dec 2002 20:22:04 +0100 + +module-init-tools (0.9.5-1) unstable; urgency=low + + * New upstream release. + + -- Marco d'Itri Thu, 19 Dec 2002 21:15:05 +0100 + +module-init-tools (0.9.4-1) unstable; urgency=low + + * New Upstream. + * Updated description. (Closes: #171944) + + -- Christopher L Cheney Mon, 16 Dec 2002 20:00:00 -0600 + +module-init-tools (0.9.1-1) unstable; urgency=low + + * New Upstream. + Fixed undefined reference to `__ia64_syscall'. (Closes: #171380) + + -- Christopher L Cheney Thu, 5 Dec 2002 19:00:00 -0600 + +module-init-tools (0.8+0.9-beta-1) unstable; urgency=low + + * New Upstream. + Corrected system type matching. (Closes: #171118) + + -- Christopher L Cheney Mon, 2 Dec 2002 14:00:00 -0600 + +module-init-tools (0.8-1) unstable; urgency=low + + * New Upstream. + + -- Christopher L Cheney Wed, 27 Nov 2002 21:00:00 -0600 + +module-init-tools (0.7-1) unstable; urgency=low + + * Initial Release. + + -- Christopher L Cheney Thu, 21 Nov 2002 20:00:00 -0600 + --- module-init-tools-3.3-pre11.orig/debian/module-init-tools-udeb.install +++ module-init-tools-3.3-pre11/debian/module-init-tools-udeb.install @@ -0,0 +1,2 @@ +lsmod /bin/ +insmod depmod modprobe /sbin/ --- module-init-tools-3.3-pre11.orig/debian/module-init-tools.postinst +++ module-init-tools-3.3-pre11/debian/module-init-tools.postinst @@ -0,0 +1,161 @@ +#!/bin/sh -e + +create_etc_modules() { + if [ ! -e /etc/modules ]; then + cat < /etc/modules +# /etc/modules: kernel modules to load at boot time. +# +# This file contains the names of kernel modules that should be loaded +# at boot time, one per line. Lines beginning with "#" are ignored. + +EOT + chmod 644 /etc/modules + fi +} + +archmodel() { + local arch=$(uname -m) + case $arch in + i[0-9]86) arch=i386 ;; + x86_64|amd64) arch=x86_64 ;; + arm*) arch=arm ;; + mips*) arch=mips ;; + # 64 bit variants of some architectures are treated like the 32 bit + s390x) arch=s390 ;; + parisc64) arch=parisc ;; + sparc64) arch=sparc ;; + # these architectures have variants with wildly different hardware + ppc64) arch=powerpc.generic ;; + ppc|powerpc) + if [ -f /proc/cpuinfo ]; then + model=$(sed -ne 's/^machine[[:space:]]*:[[:space:]]*//p' /proc/cpuinfo) + else + echo "/proc/cpuinfo does not exist, assuming generic powerpc system" + fi + case "$model" in + Amiga*) arch="powerpc.apus" ;; + Power*) arch="powerpc.pmac" ;; + *) arch="powerpc.generic" ;; + esac + ;; + m68k) + if [ -f /proc/hardware ]; then + model=$(sed -ne 's/^Model:[[:space:]]*//p' /proc/hardware) + else + echo "/proc/hardware does not exist, assuming generic m68k system" + fi + case "$model" in + Atari*) arch="m68k.atari" ;; + Amiga*) arch="m68k.amiga" ;; + *) arch="m68k.generic" ;; + esac + ;; + esac + + echo $arch +} + +create_arch_symlink() { + cd /etc/modprobe.d/ + + model=$(archmodel) + oldmodel=$model + + while [ ! -f arch/$model ]; do + oldmodel=$model + model=${oldmodel%.*}.generic + [ "$model" = "$oldmodel" ] && break + echo "Configuration for $oldmodel not found, trying $model" + done + + ARCHCONFFILE=arch/$model + if [ -f $ARCHCONFFILE ]; then + ln -sf $ARCHCONFFILE arch-aliases + else + echo "Architecture-specific config file not found" + fi +} + +remove_compat_symlinks() { + for file in /bin/lsmod.modutils /sbin/ksyms /sbin/kallsyms; do + [ -L $file ] && rm $file + done + return 0 +} + +undivert_gen() { + DEXT=${3:-modutils} + dpkg-divert --remove --rename --package module-init-tools \ + --divert $2/$1.$DEXT $2/$1 > /dev/null +} + +undivert_man() { + DSECTION=${2:-8} + for locale in '' fr/; do + dpkg-divert --remove --rename --package module-init-tools --divert \ + /usr/share/man/${locale}man$DSECTION/$1.modutils.$DSECTION.gz \ + /usr/share/man/${locale}man$DSECTION/$1.$DSECTION.gz > /dev/null + done +} + +big_modutils_cleanup() { + remove_compat_symlinks + + # When a diverted file is removed from a package, old version of dpkg forget + # to delete it. See #428650 for the gory details. + rm -f /usr/share/man/fr/man5/modules.modutils.5.gz \ + /usr/share/man/fr/man8/*.modutils.8.gz + undivert_man modules 5 + + for cmd in depmod insmod update-modules modinfo; do + undivert_gen $cmd /sbin + undivert_man $cmd + done + for cmd in kallsyms ksyms; do + undivert_gen $cmd /sbin + done + for cmd in lsmod modprobe rmmod; do + rm -f /sbin/$cmd.modutils + undivert_gen $cmd /sbin Lmodutils + undivert_man $cmd + done + + # modutils forgets to delete this file on purge + rm -f /etc/rcS.d/S20modutils +} + +upgrade_quirks() { + [ "$2" ] || return 0 + if dpkg --compare-versions "$2" le "3.2.2-3ubuntu3"; then + rm -f /etc/modprobe.d/blacklist-pata + fi + if dpkg --compare-versions "$2" eq "3.3-pre3-1ubuntu4"; then + rm -f /etc/modprobe.d/blacklist-ipv6 + fi + dpkg --compare-versions $2 lt 3.3-pre11-4 || return 0 + # finally remove the diversions of modutils + big_modutils_cleanup + + return 0 +} + +case "$1" in + configure) + create_etc_modules + create_arch_symlink + + upgrade_quirks "$@" + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "$0 called with unknown argument '$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 --- module-init-tools-3.3-pre11.orig/debian/scripts/source.unpack +++ module-init-tools-3.3-pre11/debian/scripts/source.unpack @@ -0,0 +1,32 @@ +#!/bin/sh +make -C debian/scripts sh.vars +. debian/scripts/sh.vars +. debian/scripts/lib + +mkdir -p $STAMP_DIR/upstream/tarballs/ $SOURCE_DIR +if [ ! -z "$SRC_TAR_DIR" -a -d "$SRC_TAR_DIR" ];then + files=$(find $SRC_TAR_DIR -type f|sort) +else + VER=$(dpkg-parsechangelog 2>&1|egrep ^Version|cut -d " " -f 2|cut -d "-" -f 1) + SRC=$(dpkg-parsechangelog 2>&1|egrep ^Source|cut -d " " -f 2-) + files=../${SRC}_${VER}.orig.tar.gz +fi +for f in $files;do + stampfile=$STAMP_DIR/upstream/tarballs/`basename $f` + if [ ! -e $stampfile ];then + START $f + if extract_tar ${SOURCE_DIR:-.} $f > $stampfile.log;then + if [ x$SOURCE_DIR = x ];then + mkdir -p $STAMP_DIR/upstream/files/tarballs + cp $stampfile.log $STAMP_DIR/upstream/files/tarballs/`basename $f`.list + fi + OK $f + touch $stampfile + else + FAILED $f + exit 1 + fi + else + ALREADY_DONE $f + fi +done --- module-init-tools-3.3-pre11.orig/debian/scripts/getglibcversion +++ module-init-tools-3.3-pre11/debian/scripts/getglibcversion @@ -0,0 +1,56 @@ +#!/bin/sh +# GNU C library version detection shell script. +# Copyright 1999 Branden Robinson. +# Licensed under the GNU General Public License, version 2. See the file +# /usr/share/common-licenses/GPL or . + +# This script probably makes about a billion too many assumptions, but it's +# better than hardcoding the glibc version on a per-architecture basis. + +set -e + +usage () { + echo "Usage: getglibcversion [option]" + echo " Where [option] may be one of:" + echo " --major return major version only" + echo " --minor return minor version only" + echo " --point return ittybitty version only" + echo "With no option, returns major.minor.ittybitty ."; +} + +case $# in + 0) ;; + 1) case $1 in + --help) usage + exit 0 ;; + --major) RETURN=1 ;; + --minor) RETURN=2 ;; + --point) RETURN=3 ;; + *) exec 1>&2 + usage + exit 1 ;; + esac ;; + *) exec 1>&2 + usage + exit 1 ;; +esac + +LIBCLIST=$(cd /lib && ls libc-*.so) + +case $(echo $LIBCLIST | wc -l | awk '{print $1}') in + 0) echo "No GNU C library found! Aborting." >&2 + exit 1 ;; + 1) ;; + *) echo "Multiple versions of GNU C library found! Aborting." >&2 + exit 1 ;; +esac + +LIBCVERSION=$(echo $LIBCLIST | sed 's/libc-//;s/\.so//') + +if [ -z $RETURN ]; then + echo $LIBCVERSION +else + echo $LIBCVERSION | cut -d. -f$RETURN +fi + +exit 0 --- module-init-tools-3.3-pre11.orig/debian/scripts/messages +++ module-init-tools-3.3-pre11/debian/scripts/messages @@ -0,0 +1,29 @@ +fix.source.patch:START:"Fixing upstream patch $1" +fix.source.patch:OK:"successful." +fix.source.patch:FAILED:"failed!" +fix.source.patch:ALREADY_DONE:"upstream patch fixup $1 already applied!" + +unfix.source.patch:START:"Unfixing upstream patch $1 +unfix.source.patch:OK:"successful." +unfix.source.patch:FAILED:"failed! +unfix.source.patch:ALREADY_DONE:"upstream patch fixup $1 already reversed!" + +patch.unapply:START:"Reversing patch $1" +patch.unapply:OK:"successful." +patch.unapply:FAILED:"failed!" +patch.unapply:ALREADY_DONE:"Patch $1 not applied!" + +patch.apply:START:"Applying patch $1" +patch.apply:OK:"successful." +patch.apply:FAILED:"failed!" +patch.apply:ALREADY_DONE:"Patch $1 already applied!" + +source.patch:START:"Applying upstream patch $1" +source.patch:OK:"successful." +source.patch:FAILED:"failed!" +source.patch:ALREADY_DONE:"upstream patch $1 already applied!" + +source.unpack:START:"Extracting upstream tarball $1" +source.unpack:OK:"successful." +source.unpack:FAILED:"failed!" +source.unpack:ALREADY_DONE:"upstream tarball $1 already extracted!" --- module-init-tools-3.3-pre11.orig/debian/scripts/vars +++ module-init-tools-3.3-pre11/debian/scripts/vars @@ -0,0 +1,31 @@ +# This file is NOT a shell script. +# +# This file gets included by both debian/rules (make) AND the scripts in +# debian/scripts (bash) +# + +# Where to cd to to unpack all the tarballs. +SOURCE_DIR=build-tree +# For a single pkg, this is the directory that is embedded in the tarball. +# For multiple pkgs, this is null. +TAR_DIR=module-init-tools-3.3-pre11 +# Where to place all the stamp files. This directory can be removed, and +# all the targets will then be rerun. +STAMP_DIR=debian/stampdir +# When sys-build.mk is used to build the source, this is the target(s) to +# run. +BUILD_TARGET= +# When cleaning the source, during diff generation, if this is set, this +# target will be called in debian/rules. This allows for pkgs that have +# complicated cleaning rules. +CLEAN_TARGET_EXTERNAL= +# Whether to die if the source cleaning fails. +CLEAN_IGNORE=yes +# The clean target to run. Defaults to clean. +CLEAN_TARGET= +# Files to exclude from the diff. +DIFF_EXCLUDE="" +# Where the patches are located(duh!). +PATCH_DIR=debian/patches +SRC_PATCH_DIR=upstream/patches +SRC_TAR_DIR=upstream/tarballs --- module-init-tools-3.3-pre11.orig/debian/scripts/vars.build +++ module-init-tools-3.3-pre11/debian/scripts/vars.build @@ -0,0 +1,17 @@ +#!/usr/bin/make -f + +sed_cmd='' +cat $1 | while read REPLY; do + case "$REPLY" in + \#*|"") continue;; + *) + var=$(echo $REPLY|sed 's/\([^=]*\)=.*/\1/') + eval $REPLY + if [ $2 = "make" ]; then + eval echo "$var=\$$var" + else + eval echo "$var=\\\"\$$var\\\"" + fi + ;; + esac +done --- module-init-tools-3.3-pre11.orig/debian/scripts/archmap +++ module-init-tools-3.3-pre11/debian/scripts/archmap @@ -0,0 +1,22 @@ +#!/bin/sh +# i486 i386 i486 i586 pentium pentiumpro +if [ $(basename $0) = archmap ];then + if [ -z $1 ];then + arch=$(dpkg --print-gnu-build-architecture) + else + arch=$1 + fi +else + if [ -z $arch ];then + arch=$(dpkg --print-gnu-build-architecture) + fi +fi +set -- $(egrep ".* $arch( .*|$)" debian/scripts/archmap) +if [ -z $2 ];then + arch=$arch +else + arch=$2 +fi +if [ $(basename $0) = archmap ];then + echo $arch +fi --- module-init-tools-3.3-pre11.orig/debian/scripts/Makefile +++ module-init-tools-3.3-pre11/debian/scripts/Makefile @@ -0,0 +1,11 @@ +#!/usr/bin/make -f +all: sh.vars mk.vars + +clean: + rm -f sh.vars mk.vars + +mk.vars: vars.build vars + $(SHELL) vars.build vars make > $@ +sh.vars: vars.build vars + $(SHELL) vars.build vars shell > $@ + --- module-init-tools-3.3-pre11.orig/debian/scripts/lib +++ module-init-tools-3.3-pre11/debian/scripts/lib @@ -0,0 +1,198 @@ +#!/bin/sh +if [ $(basename $0) = lib ];then + make -C debian/scripts sh.vars + . debian/scripts/sh.vars +fi +fetchmsg() { + local msg + msg=$1;shift + eval echo $(sed -ne "s/^$(BASENAME):$msg://p" debian/scripts/messages) +} +START() { + echo -n "$(fetchmsg START "$@") " +} +OK() { + fetchmsg OK "$@" +} +FAILED() { + fetchmsg FAILED "$@" +} +ALREADY_DONE() { + fetchmsg ALREADY_DONE "$@" +} + +BASENAME() { + local base + if [ "$cmd" ];then + base=$cmd + else + base=${0##*/} + fi + if [ x$base = x ];then + echo "Danger, Will Robinson, Danger!" 1>&2 + echo "Bash is very confused." 1>&2 + exit 1 + fi + if [ x$base = xlib ];then + echo "You can't call this directly." 1>&2 + echo "This is a library that should be sourced." 1>&2 + exit 1 + fi + echo $base +} +file2cat() { + $(decompress_prog $1) $1 +} +debug() { + echo "$@" + eval "$@" +} +decompress_prog() { + local which + which="cat" + [ $1 != ${1%.tgz} -o $1 != ${1%.gz} -o $1 != ${1%.Z} ] && which="gunzip -c" + [ $1 != ${1%.bz2} ] && which="bunzip2 -c" + [ $1 != ${1%.bz} ] && which="bunzip -c" + echo $which +} +compress_ext() { + local which + which="" + [ $1 != ${1%.gz} ] && which=gz + [ $1 != ${1%.Z} ] && which=Z + [ $1 != ${1%.bz2} ] && which=bz2 + [ $1 != ${1%.bz} ] && which=bz + echo $which +} +filetype_detect() { + local which f + which="" + f=$(echo "$1" | sed 's|:::.*||') + [ $f != ${f%.jar} ] && which=jarfile + [ $f != ${f%.zip} ] && which=zipfile + [ $f != ${f%.tgz} ] && which=tarball + [ $f != ${f%.tar.$(compress_ext $f)} ] && which=tarball + [ $f != ${f%.tar} ] && which=tarball + [ $f != ${f%.diff.$(compress_ext $f)} -o $1 != ${1%.patch.$(compress_ext $1)} ] && which=patch + [ $f != ${f%.diff} -o $1 != ${1%.patch} ] && which=patch + [ $f != ${f%.dsc} ] && which=dsc + echo $which +} +extract_tar() { + local which file dir curd + dir="$1" + shift + curd=$(pwd) + while [ $# -gt 0 ];do + file="$1" + [ "$file" = "${1#/}" ] && file="$curd/$file" + case "$(filetype_detect $file)" in + "jarfile") (cd $dir;fastjar -xf $file);; + "zipfile") (cd $dir;miniunzip -x $file);; + "tarball") $(decompress_prog $file) $file | (cd $dir;tar xvf -);; + *) echo "unsupported tarball";; + esac + shift + done +} + +do.patching() { + filetmpl=\$d/\$f + reversesort="" + reversepatch="" + + case "$cmd" in + source.patch) + mkdir -p $SOURCE_DIR/$TAR_DIR + patch_dirs="$SRC_PATCH_DIR $SRC_ADD_PATCH_DIR" + stampfiletmpl=\$STAMP_DIR/\$d/\$f + logtmpl=\$STAMP_DIR/log/\$d/\$f + dirprep="\$STAMP_DIR/log/\$d \$STAMP_DIR/\$d" + patchapplydirtmpl=\$SOURCE_DIR/\$TAR_DIR + ;; + patch.apply) + mkdir -p $SOURCE_DIR/$TAR_DIR $STAMP_DIR/patches + patch_dirs="$PATCH_DIR $ADD_PATCH_DIR" + stampfiletmpl=\$STAMP_DIR/patches/\$f + logtmpl=\$STAMP_DIR/log/\$d/\$f + dirprep=\$STAMP_DIR/log/\$d + patchapplydirtmpl=\$SOURCE_DIR/\$TAR_DIR + ;; + fix.source.patch) + if [ "$DBS_UNIFIED" -o ! -e debian/fixpatch ];then + exit + fi + mkdir -p $STAMP_DIR/fixpatch + patch_dirs=debian/fixpatch + stampfiletmpl="$STAMP_DIR/fixpatch/\$(basename \$f)" + logtmpl=\$STAMP_DIR/log/fixpatch/\$f + dirprep=\$STAMP_DIR/log/fixpatch + patchapplydirtmpl=upstream + ;; + unfix.source.patch) + if [ "$DBS_UNIFIED" -o ! -e debian/fixpatch ];then + exit + fi + mkdir -p $STAMP_DIR/fixpatch + patch_dirs=debian/fixpatch + stampfiletmpl="$STAMP_DIR/fixpatch/\$(basename \$f)" + logtmpl=\$STAMP_DIR/log/fixpatch/\$f + dirprep=\$STAMP_DIR/log/fixpatch + patchapplydirtmpl=upstream + reversesort=-r + reversepatch=-R + ;; + esac + for d in $patch_dirs;do + if [ ! -d $d ];then + continue + fi + eval mkdir -p $dirprep + for f in `(cd $d >/dev/null;find -type f ! -name 'chk-*' 2>/dev/null )|sort $reversesort`;do + eval stampfile=$stampfiletmpl + eval log=$logtmpl + eval file=$filetmpl + eval patchapplydir=$patchapplydirtmpl + if [ ! -e $stampfile ];then + START $file + if file2cat $file | (cd $patchapplydir;patch -p1 $reversepatch) > $log;then + OK $file + touch $stampfile + else + FAILED $file + exit 1 + fi + else + ALREADY_DONE $file + fi + done + done + +} +# +# External api functions. +# + +source.clean() { + if [ "$DBS_UNIFIED" ];then + exit + fi + rm -rf $SOURCE_DIR $STAMP_DIR/upstream $STAMP_DIR/patches + rm -f $STAMP_DIR/{source.{clean,build,make}} + return +if [ x$SOURCE_DIR = x ];then + files=`find -type f -maxdepth 1 -mindepth 1` + dirs=`find -type d -maxdepth 1 -mindepth 1 ! -name 'debian' ! -name 'upstream'` + echo files=\"$files\" + echo dirs=\"$dirs\" +fi + +} +source.patch() { cmd=source.patch; do.patching; } +fix.source.patch() { cmd=fix.source.patch; do.patching; } +unfix.source.patch() { cmd=unfix.source.patch; do.patching; } +patch.apply() { cmd=patch.apply; do.patching; } + +if [ $(basename $0) = lib ];then + $1 +fi --- module-init-tools-3.3-pre11.orig/debian/patches/modprobe_conf_and_directory +++ module-init-tools-3.3-pre11/debian/patches/modprobe_conf_and_directory @@ -0,0 +1,27 @@ +diff -urNw module-init-tools-3.3-pre11~/doc/modprobe.conf.sgml module-init-tools-3.3-pre11/doc/modprobe.conf.sgml +--- module-init-tools-3.3-pre11~/doc/modprobe.conf.sgml 2007-10-23 11:25:27.526495397 +0200 ++++ module-init-tools-3.3-pre11/doc/modprobe.conf.sgml 2007-10-23 11:29:31.417540341 +0200 +@@ -33,7 +33,7 @@ + Because the modprobe command can add or + remove extra more than one module, due to module dependencies, + we need a method of specifying what options are to be used with +- those modules. /etc/modprobe.conf (or, if that does not exist, all files under the /etc/modprobe.d directory) specifies ++ those modules. /etc/modprobe.conf and all files under the /etc/modprobe.d directory) specify + those options, as required. It can also be used to create + convenient aliases: alternate names for a module. Finally, it + can override the normal modprobe behavior +diff -urNw module-init-tools-3.3-pre11~/modprobe.c module-init-tools-3.3-pre11/modprobe.c +--- module-init-tools-3.3-pre11~/modprobe.c 2007-10-23 11:25:27.654496995 +0200 ++++ module-init-tools-3.3-pre11/modprobe.c 2007-10-23 11:26:55.287591082 +0200 +@@ -1256,9 +1256,8 @@ + + /* Try defaults. */ + for (i = 0; i < ARRAY_SIZE(default_configs); i++) { +- if (read_config(default_configs[i], name, dump_only, removing, +- options, commands, aliases, blacklist)) +- return; ++ read_config(default_configs[i], name, dump_only, removing, ++ options, commands, aliases, blacklist); + } + } + --- module-init-tools-3.3-pre11.orig/debian/patches/insmod-segv +++ module-init-tools-3.3-pre11/debian/patches/insmod-segv @@ -0,0 +1,31 @@ +>From ee490d42a183a692d20b696de32e623a535cf2de Mon Sep 17 00:00:00 2001 +From: Mikko Ylinen +Date: Tue, 22 May 2007 15:10:15 +0300 +Subject: [PATCH] insmod: Fix segmentation fault triggered by a usage of NULL pointer + + Since commit a5644bb415e4bf53d6e13739b67c783a3ae4d119, variable p is not + assigned to argv[0] if no '/'s are found by strrchr(). This causes a + segmentation fault if insmod is called directly (i.e., 'insmod' instead of + '/my/path/../../sbin/insmod'). + + Signed-off-by: Mikko Ylinen +--- + insmod.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/insmod.c b/insmod.c +index 481cfca..9fdc28b 100644 +--- a/insmod.c ++++ b/insmod.c +@@ -115,7 +115,7 @@ int main(int argc, char *argv[]) + exit(1); + } + +- (p = strrchr(argv[0], '/')) ? p++ : argv[0]; ++ p = (p = strrchr(argv[0], '/')) ? p+1 : argv[0]; + if (strstr(p, "insmod.static")) + try_old_version("insmod.static", argv); + else +-- +1.5.1.4 + --- module-init-tools-3.3-pre11.orig/debian/patches/ignore_arch_directory +++ module-init-tools-3.3-pre11/debian/patches/ignore_arch_directory @@ -0,0 +1,25 @@ +diff -ruN module-init-tools-3.3-pre11.orig/doc/modprobe.sgml module-init-tools-3.3-pre11/doc/modprobe.sgml +--- module-init-tools-3.3-pre11.orig/doc/modprobe.sgml 2007-03-22 08:36:02.000000000 +0100 ++++ module-init-tools-3.3-pre11/doc/modprobe.sgml 2007-05-20 19:19:27.000000000 +0200 +@@ -78,6 +78,7 @@ + (see + modprobe.conf5 + ). ++ All files in the \fI/etc/modprobe.d/arch/\fR directory are ignored. + + + Note that this version of modprobe does not +diff -ruN module-init-tools-3.3-pre11.orig/modprobe.c module-init-tools-3.3-pre11/modprobe.c +--- module-init-tools-3.3-pre11.orig/modprobe.c 2007-05-20 19:19:40.000000000 +0200 ++++ module-init-tools-3.3-pre11/modprobe.c 2007-05-20 19:18:24.000000000 +0200 +@@ -1211,6 +1211,10 @@ + DIR *dir; + int ret = 0; + ++ /* ignore everything in this directory */ ++ if (streq(filename, "/etc/modprobe.d/arch")) ++ return 1; ++ + /* Reiser4 has file/directory duality: treat it as both. */ + dir = opendir(filename); + if (dir) { --- module-init-tools-3.3-pre11.orig/debian/patches/use_blacklist_doc +++ module-init-tools-3.3-pre11/debian/patches/use_blacklist_doc @@ -0,0 +1,23 @@ +diff -ruN module-init-tools-3.3-pre11.orig/doc/modprobe.sgml module-init-tools-3.3-pre11/doc/modprobe.sgml +--- module-init-tools-3.3-pre11.orig/doc/modprobe.sgml 2007-06-13 04:18:32.000000000 +0200 ++++ module-init-tools-3.3-pre11/doc/modprobe.sgml 2007-06-13 04:18:30.000000000 +0200 +@@ -180,6 +180,19 @@ + + + ++ ++ ++ ++ This option causes modprobe to ++ apply the blacklist commands in the ++ configuration file (if any) to module names as well. ++ It is usually used by ++ udev7 ++ . ++ ++ ++ ++ + + + --- module-init-tools-3.3-pre11.orig/debian/patches/last_good_boot +++ module-init-tools-3.3-pre11/debian/patches/last_good_boot @@ -0,0 +1,61 @@ +--- module-init-tools-3.3-pre11/modprobe.c 2007-03-22 03:36:02.000000000 -0400 ++++ modprobe.c 2008-06-20 13:31:03.000000000 -0400 +@@ -1405,6 +1429,31 @@ + return 0; + } + ++static void check_last_good_boot(struct utsname *uts) ++{ ++ FILE *cline; ++ DIR *dir; ++ char buf[1024]; ++ const char last[] = "last-good-boot"; ++ ++ if ((dir = opendir("/scripts"))) { ++ closedir(dir); ++ return; ++ } ++ ++ if (!(cline = fopen("/proc/cmdline", "r"))) ++ return; ++ ++ if (fread(buf, 1, sizeof(buf), cline)) { ++ if (strstr(buf, last)) { ++ strncpy(uts->release, last, sizeof(last)); ++ uts->release[sizeof(last)-1] = '\0'; ++ } ++ } ++ ++ fclose(cline); ++} ++ + int main(int argc, char *argv[]) + { + struct utsname buf; +@@ -1430,6 +1472,7 @@ + char *newname = NULL; + char *aliasfilename, *symfilename; + errfn_t error = fatal; ++ int set_version = 0; + + /* Prepend options from environment. */ + argv = merge_args(getenv("MODPROBE_OPTIONS"), argv, &argc); +@@ -1456,6 +1499,7 @@ + case 'S': + strncpy(buf.release, optarg, sizeof(buf.release)); + buf.release[sizeof(buf.release)-1] = '\0'; ++ set_version = 1; + break; + case 'C': + if (is_devfs_call(argv)) { +@@ -1543,6 +1592,10 @@ + } + } + ++ /* UBUNTU: During last-good-boot, we override kversion */ ++ if (!set_version) ++ check_last_good_boot(&buf); ++ + /* If stderr not open, go to syslog */ + if (log || fstat(STDERR_FILENO, &statbuf) != 0) { + openlog("modprobe", LOG_CONS, LOG_DAEMON); --- module-init-tools-3.3-pre11.orig/debian/patches/always_apply_blacklist +++ module-init-tools-3.3-pre11/debian/patches/always_apply_blacklist @@ -0,0 +1,29 @@ +diff -ruNp module-init-tools-3.2.2~/modprobe.c module-init-tools-3.2.2/modprobe.c +--- module-init-tools-3.2.2~/modprobe.c 2006-04-12 08:22:05.000000000 +0100 ++++ module-init-tools-3.2.2/modprobe.c 2006-04-12 08:22:17.000000000 +0100 +@@ -1642,10 +1642,10 @@ int main(int argc, char *argv[]) + read_config(aliasfilename, modulearg, 0, + remove, &modoptions, &commands, + &aliases, &blacklist); +- aliases = apply_blacklist(aliases, blacklist); + } + } + ++ aliases = apply_blacklist(aliases, blacklist); + if (aliases) { + errfn_t err = error; + +diff -ruN module-init-tools-3.3-pre11.orig/doc/modprobe.conf.sgml module-init-tools-3.3-pre11/doc/modprobe.conf.sgml +--- module-init-tools-3.3-pre11.orig/doc/modprobe.conf.sgml 2007-06-13 04:14:34.000000000 +0200 ++++ module-init-tools-3.3-pre11/doc/modprobe.conf.sgml 2007-06-13 04:14:23.000000000 +0200 +@@ -184,6 +184,10 @@ + blacklist keyword indicates that all of + that particular module's internal aliases are to be ignored. + ++ ++ On Debian and Ubuntu systems this keyword applies to user-defined ++ aliases as well. ++ + + + --- module-init-tools-3.3-pre11.orig/debian/patches/runparts_like_names +++ module-init-tools-3.3-pre11/debian/patches/runparts_like_names @@ -0,0 +1,41 @@ +diff -ruN module-init-tools-3.1-pre5.orig/modprobe.c module-init-tools-3.1-pre5/modprobe.c +--- module-init-tools-3.1-pre5.orig/modprobe.c 2004-07-21 01:21:36.000000000 +0200 ++++ module-init-tools-3.1-pre5/modprobe.c 2004-07-21 01:21:32.000000000 +0200 +@@ -38,6 +38,7 @@ + #include + #include + #include ++#include + + #define streq(a,b) (strcmp((a),(b)) == 0) + #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) +@@ -1052,6 +1053,20 @@ + return 1; + } + ++/* Is the name of this file or directory acceptable to us? */ ++static int valid_file_name(const char *filename) ++{ ++ static regex_t *re = NULL; ++ ++ if (!re) { ++ re = NOFAIL(malloc(sizeof(regex_t))); ++ if (regcomp(re, "(^\\.|^CVS|(\\.dpkg-(old|dist|new)|~|,v|.orig)$)", ++ REG_EXTENDED|REG_NOSUB) != 0) ++ fatal("regcomp failed: %s\n", strerror(errno)); ++ } ++ return regexec(re, filename, 0, NULL, 0); ++} ++ + /* Simple format, ignore lines starting with #, one command per line. + Returns NULL or resolved alias. */ + static int read_config(const char *filename, +@@ -1074,7 +1089,7 @@ + struct dirent *i; + + while ((i = readdir(dir)) != NULL) { +- if (!streq(i->d_name,".") && !streq(i->d_name,"..")) { ++ if (valid_file_name(i->d_name)) { + char sub[strlen(filename) + 1 + + strlen(i->d_name) + 1]; + --- module-init-tools-3.3-pre11.orig/debian/patches/silence_modprobe +++ module-init-tools-3.3-pre11/debian/patches/silence_modprobe @@ -0,0 +1,82 @@ +diff -urNw module-init-tools-3.3-pre11~/doc/modprobe.sgml module-init-tools-3.3-pre11/doc/modprobe.sgml +--- module-init-tools-3.3-pre11~/doc/modprobe.sgml 2007-10-23 11:34:11.961042886 +0200 ++++ module-init-tools-3.3-pre11/doc/modprobe.sgml 2007-10-23 11:37:13.119304620 +0200 +@@ -36,6 +36,7 @@ + + + ++ + modulename + modulename + +@@ -195,6 +196,16 @@ + + + ++ ++ ++ ++ ++ As with the addition that all warnings ++ and errors are also silenced. ++ ++ ++ ++ + + + +diff -urNw module-init-tools-3.3-pre11~/modprobe.c module-init-tools-3.3-pre11/modprobe.c +--- module-init-tools-3.3-pre11~/modprobe.c 2007-10-23 11:34:12.013043535 +0200 ++++ module-init-tools-3.3-pre11/modprobe.c 2007-10-23 11:37:57.583859755 +0200 +@@ -65,6 +65,9 @@ + /* Do we use syslog or stderr for messages? */ + static int log; + ++/* Do we want to be chatty or not? */ ++static int silent; ++ + static void message(const char *prefix, const char *fmt, va_list *arglist) + { + char *buf, *buf2; +@@ -72,9 +75,9 @@ + vasprintf(&buf, fmt, *arglist); + asprintf(&buf2, "%s%s", prefix, buf); + +- if (log) ++ if ((log) && (!silent)) + syslog(LOG_NOTICE, "%s", buf2); +- else ++ else if (!silent) + fprintf(stderr, "%s", buf2); + free(buf2); + free(buf); +@@ -120,7 +123,7 @@ + static void print_usage(const char *progname) + { + fprintf(stderr, +- "Usage: %s [-v] [-V] [-C config-file] [-n] [-i] [-q] [-b] [-o ] [ --dump-modversions ] [parameters...]\n" ++ "Usage: %s [-v] [-V] [-C config-file] [-n] [-i] [-q] [-Q] [-b] [-o ] [ --dump-modversions ] [parameters...]\n" + "%s -r [-n] [-i] [-v] ...\n" + "%s -l -t [ -a ...]\n", + progname, progname, progname); +@@ -1406,6 +1409,7 @@ + { "show-depends", 0, NULL, 'D' }, + { "first-time", 0, NULL, 3 }, + { "use-blacklist", 0, NULL, 'b' }, ++ { "silent", 0, NULL, 'Q' }, + { NULL, 0, NULL, 0 } }; + + #define MODPROBE_DEVFSD_CONF "/etc/modprobe.devfs" +@@ -1504,6 +1508,11 @@ + unknown_silent = 1; + add_to_env_var("-q"); + break; ++ case 'Q': ++ silent = 1; ++ unknown_silent = 1; ++ add_to_env_var("-Q"); ++ break; + case 'D': + dry_run = 1; + ignore_proc = 1; --- module-init-tools-3.3-pre11.orig/debian/patches/fix_8bit +++ module-init-tools-3.3-pre11/debian/patches/fix_8bit @@ -0,0 +1,21 @@ +diff -ruN module-init-tools-3.3-pre11.orig/doc/depmod.sgml module-init-tools-3.3-pre11/doc/depmod.sgml +--- module-init-tools-3.3-pre11.orig/doc/depmod.sgml 2007-03-22 08:36:02.000000000 +0100 ++++ module-init-tools-3.3-pre11/doc/depmod.sgml 2007-05-20 19:36:15.000000000 +0200 +@@ -125,7 +125,7 @@ + + + This option overrides the default configuration file +- (/etc/depmod.conf or /etc/depmod.d/ if that isn’t found). ++ (/etc/depmod.conf or /etc/depmod.d/ if that isn't found). + + + +@@ -180,7 +180,7 @@ + + + In verbose mode depmod will print (to stdout) +- all the symbols each module depends on and the module’s file name ++ all the symbols each module depends on and the module's file name + which provides that symbol. + + --- module-init-tools-3.3-pre11.orig/debian/patches/blacklist-warn.diff +++ module-init-tools-3.3-pre11/debian/patches/blacklist-warn.diff @@ -0,0 +1,14 @@ +--- a/modprobe.c 2005-08-22 10:10:22.000000000 +0000 ++++ b/modprobe.c 2005-08-22 15:49:51.000000000 +0000 +@@ -725,8 +725,10 @@ + find_blacklist(const char *modname, const struct module_blacklist *blacklist) + { + while (blacklist) { +- if (strcmp(blacklist->modulename, modname) == 0) ++ if (strcmp(blacklist->modulename, modname) == 0) { ++ warn("Not loading blacklisted module %s\n", modname); + return 1; ++ } + blacklist = blacklist->next; + } + return 0; --- module-init-tools-3.3-pre11.orig/debian/patches/fix_sgml +++ module-init-tools-3.3-pre11/debian/patches/fix_sgml @@ -0,0 +1,56 @@ +diff -ruN module-init-tools-3.3-pre11.orig/doc/depmod.conf.sgml module-init-tools-3.3-pre11/doc/depmod.conf.sgml +--- module-init-tools-3.3-pre11.orig/doc/depmod.conf.sgml 2007-03-22 08:36:02.000000000 +0100 ++++ module-init-tools-3.3-pre11/doc/depmod.conf.sgml 2007-05-20 20:33:24.000000000 +0200 +@@ -21,13 +21,11 @@ + 2005-09-23 + + +- depmod.d +- 5 + depmod.conf + 5 + + +- depmod.confdepmod.d Configuration file/directory for depmod ++ depmod.conf Configuration file/directory for depmod + + + DESCRIPTION +diff -ruN module-init-tools-3.3-pre11.orig/doc/modinfo.sgml module-init-tools-3.3-pre11/doc/modinfo.sgml +--- module-init-tools-3.3-pre11.orig/doc/modinfo.sgml 2007-03-22 08:36:02.000000000 +0100 ++++ module-init-tools-3.3-pre11/doc/modinfo.sgml 2007-05-20 20:32:34.000000000 +0200 +@@ -98,6 +98,7 @@ + + + ++ + + Provide information about a kernel other than the running one. This + is particularly useful for distributions needing to extract +@@ -106,7 +107,7 @@ + are needed by various modules in a new kernel for which you must + make an initrd image prior to booting. + +- ++ + + + +diff -ruN module-init-tools-3.3-pre11.orig/doc/modprobe.conf.sgml module-init-tools-3.3-pre11/doc/modprobe.conf.sgml +--- module-init-tools-3.3-pre11.orig/doc/modprobe.conf.sgml 2007-03-22 08:36:02.000000000 +0100 ++++ module-init-tools-3.3-pre11/doc/modprobe.conf.sgml 2007-05-20 20:33:11.000000000 +0200 +@@ -21,13 +21,11 @@ + 2005-06-01 + + +- modprobe.d +- 5 + modprobe.conf + 5 + + +- modprobe.confmodprobe.d Configuration file/directory for modprobe ++ modprobe.conf Configuration file/directory for modprobe + + + DESCRIPTION