Merge branch 'master' of ssh://earl@git.ipfire.org/pub/git/ipfire-2.x
authorJan Paul Tuecking <earl@ipfire.org>
Mon, 26 Jul 2010 17:19:11 +0000 (19:19 +0200)
committerJan Paul Tuecking <earl@ipfire.org>
Mon, 26 Jul 2010 17:19:11 +0000 (19:19 +0200)
18 files changed:
config/rootfiles/common/cpio
config/rootfiles/core/40/filelists/compat-wireless [new file with mode: 0644]
config/rootfiles/core/40/filelists/files
config/rootfiles/core/40/filelists/mkinitcpio [new symlink]
config/rootfiles/core/40/update.sh
config/syslinux/syslinux.cfg
doc/packages-list.txt
html/cgi-bin/time.cgi
langs/de/cgi-bin/de.pl
langs/en/cgi-bin/en.pl
langs/es/cgi-bin/es.pl
langs/fr/cgi-bin/fr.pl
lfs/compat-wireless
lfs/cpio
lfs/initrd
lfs/mkinitcpio
src/install+setup/install/main.c
src/patches/cpio-2.6-security_fixes-1.patch [deleted file]

index 3f201c0..53bb1e0 100644 (file)
@@ -1,14 +1,19 @@
 bin/cpio
 bin/mt
-#usr/info/cpio.info
-#usr/man/man1/cpio.1
-#usr/man/man1/mt.1
+#usr/share/info/cpio.info
 #usr/share/locale/da/LC_MESSAGES/cpio.mo
 #usr/share/locale/de/LC_MESSAGES/cpio.mo
 #usr/share/locale/es/LC_MESSAGES/cpio.mo
+#usr/share/locale/fi/LC_MESSAGES/cpio.mo
 #usr/share/locale/fr/LC_MESSAGES/cpio.mo
+#usr/share/locale/ga
+#usr/share/locale/ga/LC_MESSAGES
+#usr/share/locale/ga/LC_MESSAGES/cpio.mo
 #usr/share/locale/gl/LC_MESSAGES/cpio.mo
 #usr/share/locale/hu/LC_MESSAGES/cpio.mo
+#usr/share/locale/id
+#usr/share/locale/id/LC_MESSAGES
+#usr/share/locale/id/LC_MESSAGES/cpio.mo
 #usr/share/locale/ko/LC_MESSAGES/cpio.mo
 #usr/share/locale/nl/LC_MESSAGES/cpio.mo
 #usr/share/locale/pl/LC_MESSAGES/cpio.mo
@@ -17,4 +22,11 @@ bin/mt
 #usr/share/locale/ru/LC_MESSAGES/cpio.mo
 #usr/share/locale/sv/LC_MESSAGES/cpio.mo
 #usr/share/locale/tr/LC_MESSAGES/cpio.mo
+#usr/share/locale/uk/LC_MESSAGES/cpio.mo
+#usr/share/locale/vi
+#usr/share/locale/vi/LC_MESSAGES
+#usr/share/locale/vi/LC_MESSAGES/cpio.mo
 #usr/share/locale/zh_CN/LC_MESSAGES/cpio.mo
+#usr/share/locale/zh_TW/LC_MESSAGES/cpio.mo
+#usr/share/man/man1/cpio.1
+#usr/share/man/man1/mt.1
diff --git a/config/rootfiles/core/40/filelists/compat-wireless b/config/rootfiles/core/40/filelists/compat-wireless
new file mode 100644 (file)
index 0000000..ab7affd
--- /dev/null
@@ -0,0 +1,206 @@
+lib/modules/2.6.32.15-ipfire/kernel/compat/compat.ko
+lib/modules/2.6.32.15-ipfire/kernel/compat/compat_firmware_class.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/ath3k.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/bcm203x.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/bfusb.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/bluecard_cs.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/bpa10x.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/bt3c_cs.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/btmrvl.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/btmrvl_sdio.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/btsdio.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/btuart_cs.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/btusb.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/dtl1_cs.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/hci_uart.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/hci_vhci.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/misc/eeprom/eeprom_93cx6.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/atl1c/atl1c.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/atl1e/atl1e.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/atlx/atl1.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/atlx/atl2.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/b44.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/asix.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/catc.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/cdc-phonet.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/cdc_eem.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/cdc_ether.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/cdc_subset.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/dm9601.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/gl620a.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/hso.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/int51x1.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/kaweth.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/mcs7830.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/net1080.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/pegasus.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/plusb.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/rndis_host.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/rtl8150.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/smsc95xx.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/usbnet.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/zaurus.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/adm8211.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/at76c50x-usb.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/ath/ar9170/ar9170usb.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/ath/ath.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/ath/ath5k/ath5k.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k_common.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k_hw.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/b43/b43.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/b43legacy/b43legacy.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/ipw2x00/ipw2100.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/ipw2x00/ipw2200.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/ipw2x00/libipw.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/iwlwifi/iwl3945.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/iwlwifi/iwlagn.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/iwlwifi/iwlcore.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/iwmc3200wifi/iwmc3200wifi.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/libertas/libertas.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/libertas/libertas_cs.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/libertas/libertas_sdio.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/libertas/usb8xxx.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/libertas_tf/libertas_tf.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/mac80211_hwsim.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/mwl8k.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/p54/p54common.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/p54/p54pci.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/p54/p54usb.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rndis_wlan.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rt2x00/rt2400pci.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rt2x00/rt2500pci.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rt2x00/rt2500usb.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rt2x00/rt2800lib.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rt2x00/rt2800pci.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rt2x00/rt2800usb.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rt2x00/rt2x00lib.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rt2x00/rt2x00pci.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rt2x00/rt2x00usb.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rt2x00/rt61pci.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rt2x00/rt73usb.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rtl818x/rtl8180.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rtl818x/rtl8187.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/wl12xx/wl1251.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/wl12xx/wl1251_sdio.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/wl12xx/wl1271.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/zd1211rw/zd1211rw.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/ssb/ssb.ko
+lib/modules/2.6.32.15-ipfire/kernel/net/bluetooth/bluetooth.ko
+lib/modules/2.6.32.15-ipfire/kernel/net/bluetooth/bnep/bnep.ko
+lib/modules/2.6.32.15-ipfire/kernel/net/bluetooth/cmtp/cmtp.ko
+lib/modules/2.6.32.15-ipfire/kernel/net/bluetooth/hidp/hidp.ko
+lib/modules/2.6.32.15-ipfire/kernel/net/bluetooth/l2cap.ko
+lib/modules/2.6.32.15-ipfire/kernel/net/bluetooth/rfcomm/rfcomm.ko
+lib/modules/2.6.32.15-ipfire/kernel/net/bluetooth/sco.ko
+lib/modules/2.6.32.15-ipfire/kernel/net/mac80211/mac80211.ko
+lib/modules/2.6.32.15-ipfire/kernel/net/wireless/cfg80211.ko
+lib/modules/2.6.32.15-ipfire/kernel/net/wireless/lib80211.ko
+lib/modules/2.6.32.15-ipfire/kernel/net/wireless/lib80211_crypt_ccmp.ko
+lib/modules/2.6.32.15-ipfire/kernel/net/wireless/lib80211_crypt_tkip.ko
+lib/modules/2.6.32.15-ipfire/kernel/net/wireless/lib80211_crypt_wep.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/compat/compat.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/compat/compat_firmware_class.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/ath3k.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/bcm203x.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/bfusb.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/bluecard_cs.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/bpa10x.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/bt3c_cs.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/btmrvl.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/btmrvl_sdio.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/btsdio.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/btuart_cs.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/btusb.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/dtl1_cs.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/hci_uart.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/hci_vhci.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/misc/eeprom/eeprom_93cx6.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/atl1c/atl1c.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/atl1e/atl1e.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/atlx/atl1.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/atlx/atl2.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/b44.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/asix.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/catc.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/cdc-phonet.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/cdc_eem.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/cdc_ether.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/cdc_subset.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/dm9601.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/gl620a.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/hso.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/int51x1.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/kaweth.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/mcs7830.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/net1080.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/pegasus.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/plusb.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/rndis_host.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/rtl8150.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/smsc95xx.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/usbnet.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/zaurus.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/adm8211.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/at76c50x-usb.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/ath/ar9170/ar9170usb.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/ath/ath.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/ath/ath5k/ath5k.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k_common.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k_hw.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/b43/b43.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/b43legacy/b43legacy.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/ipw2x00/ipw2100.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/ipw2x00/ipw2200.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/ipw2x00/libipw.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/iwlwifi/iwl3945.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/iwlwifi/iwlagn.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/iwlwifi/iwlcore.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/iwmc3200wifi/iwmc3200wifi.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/libertas/libertas.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/libertas/libertas_cs.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/libertas/libertas_sdio.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/libertas/usb8xxx.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/libertas_tf/libertas_tf.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/mac80211_hwsim.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/mwl8k.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/p54/p54common.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/p54/p54pci.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/p54/p54usb.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rndis_wlan.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2400pci.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2500pci.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2500usb.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2800lib.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2800pci.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2800usb.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2x00lib.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2x00pci.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2x00usb.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt61pci.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt73usb.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rtl818x/rtl8180.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rtl818x/rtl8187.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/wl12xx/wl1251.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/wl12xx/wl1251_sdio.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/wl12xx/wl1271.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/zd1211rw/zd1211rw.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/ssb/ssb.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/net/bluetooth/bluetooth.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/net/bluetooth/bnep/bnep.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/net/bluetooth/cmtp/cmtp.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/net/bluetooth/hidp/hidp.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/net/bluetooth/l2cap.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/net/bluetooth/rfcomm/rfcomm.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/net/bluetooth/sco.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/net/mac80211/mac80211.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/net/wireless/cfg80211.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/net/wireless/lib80211.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/net/wireless/lib80211_crypt_ccmp.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/net/wireless/lib80211_crypt_tkip.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/net/wireless/lib80211_crypt_wep.ko
+etc/udev/rules.d/50-compat_firmware.rules
+lib/udev/compat_firmware.sh
index 0037af1..3722795 100644 (file)
@@ -1 +1,8 @@
 etc/system-release
+var/ipfire/langs/en.pl
+var/ipfire/langs/de.pl
+var/ipfire/langs/es.pl
+var/ipfire/langs/fr.pl
+var/ipfire/dhcp/dhcpd.conf.local
+etc/rc.d/init.d/functions
+srv/web/ipfire/cgi-bin/time.cgi
diff --git a/config/rootfiles/core/40/filelists/mkinitcpio b/config/rootfiles/core/40/filelists/mkinitcpio
new file mode 120000 (symlink)
index 0000000..f9b3fde
--- /dev/null
@@ -0,0 +1 @@
+../../../common/mkinitcpio
\ No newline at end of file
index 91ef180..6d76f58 100644 (file)
@@ -35,8 +35,12 @@ extract_files
 
 #
 #Update Language cache
-#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 
+#
+#Rebuild module dep's
+depmod 2.6.32.15-ipfire
+depmod 2.6.32.15-ipfire-xen
 #
 #Finish
 #Don't report the exitcode last command
index 15af66e..361a316 100644 (file)
@@ -4,16 +4,16 @@ PROMPT 1
 F1 boot.msg
 F2 options.msg
 DEFAULT vmlinuz 
-  APPEND ide=nodma initrd=instroot root=/dev/ram0 ramdisk_size=16384 vga=791 splash=silent ro
+  APPEND ide=nodma initrd=instroot vga=791 splash=silent ro
 LABEL novga
   KERNEL vmlinuz
-  APPEND ide=nodma initrd=instroot root=/dev/ram0 ramdisk_size=16384 ro
+  APPEND ide=nodma initrd=instroot ro
 LABEL dma
   KERNEL vmlinuz
-  APPEND initrd=instroot root=/dev/ram0 ramdisk_size=16384 vga=791 splash=silent ro
+  APPEND initrd=instroot vga=791 splash=silent ro
 LABEL unattended
   KERNEL vmlinuz
-  APPEND ide=nodma initrd=instroot root=/dev/ram0 ramdisk_size=16384 vga=791 splash=silent unattended ro
+  APPEND ide=nodma initrd=instroot vga=791 splash=silent unattended ro
 LABEL memtest
   KERNEL memtest
   APPEND -
index 62353d7..6515885 100644 (file)
 * clamav-0.96.1
 * cmake-2.4.8
 * collectd-4.9.1
-* compat-wireless-2.6.34-kmod-2.6.32.15-ipfire
-* compat-wireless-2.6.34-kmod-2.6.32.15-ipfire-xen
+* compat-wireless-2.6.34.1-kmod-2.6.32.15-ipfire
+* compat-wireless-2.6.34.1-kmod-2.6.32.15-ipfire-xen
 * coreutils-5.96
-* cpio-2.6
+* cpio-2.11
 * cpufrequtils-007
 * cryptodev-20091126-kmod-2.6.32.15-ipfire
 * cryptodev-20091126-kmod-2.6.32.15-ipfire-xen
index fb69aa3..c68eb99 100644 (file)
@@ -236,6 +236,10 @@ print "<form method='post' action='$ENV{'SCRIPT_NAME'}'>\n";
 &Header::openbox('100%', 'left', $Lang::tr{'network time'});
 print <<END
 <table width='100%'>
+<tr>
+       <td colspan='2'><strong>$Lang::tr{'ntp common settings'}</strong></td>
+</tr>
+
 <tr>
        <td><input type='checkbox' name='ENABLENTP' $checked{'ENABLENTP'}{'on'} /></td>
        <td width='100%' colspan='4' class='base'>$Lang::tr{'network time from'}</td>
@@ -272,22 +276,19 @@ print <<END
        <td>&nbsp;</td>
        <td class='base' colspan='4'><input type='checkbox' name='ENABLECLNTP' $checked{'ENABLECLNTP'}{'on'} /> $Lang::tr{'clenabled'}</td>
 </tr>
-</table>
-<table width='100%'>
-<tr>
-       <td colspan='4'><hr /><b>$Lang::tr{'update time'}</b></td>
-</tr>
 <tr>
        <td>&nbsp;</td>
-       <td class='base' colspan='3'>$Lang::tr{'set time now help'}</td>
+       <td class='base' colspan='4'><input type='checkbox' name='ENABLESETONBOOT' $checked{'ENABLESETONBOOT'}{'on'} /> $Lang::tr{'Set time on boot'}</td>
 </tr>
+</table>
+<table width='100%'>
 <tr>
-       <td class='base' colspan='4'><input type='checkbox' name='ENABLESETONBOOT' $checked{'ENABLESETONBOOT'}{'on'} /> $Lang::tr{'Set time on boot'}</td>
+       <td colspan='4'><hr /><strong>$Lang::tr{'ntp sync'}</strong></td>
 </tr>
 <tr>
        <td class='base'><input type='radio' name='UPDATE_METHOD' value='periodically' $checked{'UPDATE_METHOD'}{'periodically'} /></td>
-       <td width='15%'>$Lang::tr{'every'}: </td>
-       <td width='35%'><input type='text' name='UPDATE_VALUE' size='3' maxlength='3' value='$timesettings{'UPDATE_VALUE'}' />
+       <td width='10%'>$Lang::tr{'every'}</td>
+       <td width='45%'><input type='text' name='UPDATE_VALUE' size='3' maxlength='3' value='$timesettings{'UPDATE_VALUE'}' />
        <select name='UPDATE_PERIOD'>
                <option value='hourly' $selected{'UPDATE_PERIOD'}{'hourly'}>$Lang::tr{'hours'}</option>
                <option value='daily' $selected{'UPDATE_PERIOD'}{'daily'}>$Lang::tr{'days'}</option>
@@ -300,6 +301,13 @@ print <<END
        <td class='base'><input type='radio' name='UPDATE_METHOD' value='manually' $checked{'UPDATE_METHOD'}{'manually'} /></td>
        <td colspan='2'>$Lang::tr{'manually'}</td>
 </tr>
+<tr>
+       <td colspan='4'><hr /><strong>$Lang::tr{'update time'}</strong></td>
+</tr>
+<tr>
+       <td>&nbsp;</td>
+       <td class='base' colspan='3'>$Lang::tr{'set time now help'}</td>
+</tr>
 END
 ;
 
index 479bd35..0394315 100644 (file)
 'esp integrity' => 'ESP Integrität:',
 'esp keylife' => 'Lebensdauer des ESP Schlüssels:',
 'esp keylife should be between 1 and 24 hours' => 'ESP Schlüssel-Lebensdauer sollte zwischen 1 und 24 Stunden betragen.',
-'every' => 'Jeden',
+'every' => 'Alle',
 'exampel' => 'Beispiel',
 'exclude logfiles' => 'ohne Logdateien',
 'excluding buffers and cache' => '-/+ Puffer/Zwischenspeicher',
 'not running' => 'nicht gestartet',
 'not set' => 'nicht gesetzt',
 'november' => 'November',
+'ntp common settings' => 'Allgemeine Einstellungen',
+'ntp sync' => 'Synchronisation',
 'ntp configuration' => 'NTP-Konfiguration',
 'ntp must be enabled to have clients' => 'Um Clients annehmen zu können, muß NTP vorher aktiviert sein.',
 'ntp server' => 'NTP-Server',
index 5bfd356..55d24c4 100644 (file)
 'not set' => 'not set',
 'notes' => 'Notes',
 'november' => 'November',
+'ntp common settings' => 'Common settings',
+'ntp sync' => 'Synchronization',
 'ntp configuration' => 'NTP configuration',
 'ntp must be enabled to have clients' => 'NTP must be enabled to have clients.',
 'ntp server' => 'NTP Server',
index 3477053..5edbade 100644 (file)
 'not set' => 'no configurado',
 'notes' => 'Notas',
 'november' => 'Noviembre',
+'ntp common settings' => 'Configuraciones comunes',
+'ntp sync' => 'Sincronización',
 'ntp configuration' => 'Configuración NTP',
 'ntp must be enabled to have clients' => 'NTP debe estar configurado para tener clientes',
 'ntp server' => 'Servidor NTP',
index c18761f..2924cb7 100644 (file)
 'not set' => 'not set',
 'notes' => 'Notes',
 'november' => 'November',
+'ntp common settings' => 'Common settings',
+'ntp sync' => 'Synchronization',
 'ntp configuration' => 'NTP configuration',
 'ntp must be enabled to have clients' => 'NTP must be enabled to have clients.',
 'ntp server' => 'NTP Server',
index 59bff29..44f0fe9 100644 (file)
@@ -30,7 +30,7 @@ else
        VERSUFIX=ipfire
 endif
 
-VER        = 2.6.34
+VER        = 2.6.34.1
 
 THISAPP    = compat-wireless-$(VER)
 DL_FILE    = compat-wireless-$(VER).tar.bz2
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 951e15df527eb89f3c9deb752c709fb3
+$(DL_FILE)_MD5 = 80ceb675aeba45847258770441352af6
 
 install : $(TARGET)
 
index b2186fd..48a4393 100644 (file)
--- a/lfs/cpio
+++ b/lfs/cpio
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.6
+VER        = 2.11
 
 THISAPP    = cpio-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 76b4145f33df088a5bade3bf4373d17d
+$(DL_FILE)_MD5 = 1112bb6c45863468b5496ba128792f6c
 
 install : $(TARGET)
 
@@ -70,12 +70,9 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && sed -i "s/invalid_arg/argmatch_invalid/" src/mt.c
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-security_fixes-1.patch
        cd $(DIR_APP) && ./configure CPIO_MT_PROG=mt --prefix=/usr \
                                --bindir=/bin --libexecdir=/tmp \
                                --with-rmt=/usr/sbin/rmt
-       cd $(DIR_APP) && echo "#define HAVE_LSTAT 1" >> config.h
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
index ad8b135..cf4f280 100644 (file)
@@ -89,8 +89,13 @@ $(TARGET) :
 
        # Remove binary depmod files
        rm -rf /install/initrd/lib/modules/$(KVER)-ipfire/modules.*.bin
-           
-       mksquashfs /install/initrd /install/images/initrd
+
+       cd /install/initrd && strip --strip-all {,usr/}{,s}bin/* || true
+       cd /install/initrd && strip --strip-debug {,usr/}lib/* || true
+
+       cd /install/initrd && ln -svf sbin/init init
+
+       cd /install/initrd && find . | cpio -o -H newc | lzma > /install/images/initrd
        cd /install/initrd && find ./ -ls > $(DIR_INFO)/_build.initrd.log
 
        @$(POSTBUILD)
index 47de3ea..da0de4d 100644 (file)
@@ -73,8 +73,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && ./install.sh ""
        cp $(DIR_SRC)/config/mkinitcpio/virtio /lib/initcpio/install/
        sed -i 's|^FILELIST=.*|FILELIST="$$(mktemp)"|g' /sbin/mkinitcpio
-       sed -i 's|^HOOKS=.*|HOOKS="base udev autodetect ide usb scsi pata sata virtio filesystems"|g' /etc/mkinitcpio.conf
-       sed -i 's|^MODULES=.*|MODULES="reiser4 reiserfs ext3 ehci_hcd"|g' /etc/mkinitcpio.conf
+       sed -i 's|^HOOKS=.*|HOOKS="base udev autodetect ide usb scsi pata sata virtio"|g' /etc/mkinitcpio.conf
+       sed -i 's|^MODULES=.*|MODULES="reiser4 reiserfs ext3 ext2 ehci_hcd sd_mod"|g' /etc/mkinitcpio.conf
        sed -i 's|ide-cd|ide-cd ide-generic|g' /lib/initcpio/install/ide
        sed -i 's| gzip -9 | lzma |g' /sbin/mkinitcpio
        @rm -rf $(DIR_APP)
index ccb5264..9cf1bd5 100644 (file)
@@ -542,7 +542,7 @@ int main(int argc, char *argv[])
        replace( "/harddisk/boot/grub/grub.conf", "root=ROOT", string);
        mysystem("ln -s grub.conf /harddisk/boot/grub/menu.lst");
 
-       system("sed -e 's#harddisk\\/##g' < /proc/mounts > /harddisk/etc/mtab");
+       system("sed -e 's#/harddisk#/#g' -e 's#//#/#g'  < /proc/mounts > /harddisk/etc/mtab");
 
        snprintf(commandstring, STRING_SIZE, 
                 "/sbin/chroot /harddisk /usr/sbin/grub-install --no-floppy %s", hdparams.devnode_disk);
diff --git a/src/patches/cpio-2.6-security_fixes-1.patch b/src/patches/cpio-2.6-security_fixes-1.patch
deleted file mode 100644 (file)
index 083c785..0000000
+++ /dev/null
@@ -1,370 +0,0 @@
-Submitted By: Ken Moffat <ken@kenmoffat.uklinux.net>
-Date: 2005-07-29
-Initial Package Version: 2.6
-Upstream Status: Unknown
-Origin: from Mandrake
-Description: Vulnerability fixes, rediffed so that they all apply with
- -p1 and consolidated to single patch.  Also applicable to earlier versions.
-(1.) CAN-1999-1572 (still seems to apply to 2.6) cpio uses a 0 umask when
-creating files with -O or -F options, which creates the files with mode 0666
-and allows local users to overwrite them.  Fix originally fom debian.
-(2.) CAN-2005-1111 Race condition in 2.6 and earlier allows local users to
-modify permissions of arbitrary files via a hard-link attack.  Fix
-originally from fedora.
-(3.)  CAN-2005-1229 Directory traversal vulnerability allows remote
-attackers to write to arbitrary directories via a dot dot in a cpio file.
-Fix by Peter Vrabec at RedHat.
-
-diff -Naur cpio-2.6.vanilla/doc/cpio.1 cpio-2.6/doc/cpio.1
---- cpio-2.6.vanilla/doc/cpio.1        2004-08-30 17:21:48.000000000 +0100
-+++ cpio-2.6/doc/cpio.1        2005-07-29 13:46:42.000000000 +0100
-@@ -20,7 +20,7 @@
- [\-\-unconditional] [\-\-verbose] [\-\-block-size=blocks] [\-\-swap-halfwords]
- [\-\-io-size=bytes] [\-\-pattern-file=file] [\-\-format=format]
- [\-\-owner=[user][:.][group]] [\-\-no-preserve-owner] [\-\-message=message]
--[\-\-force\-local] [\-\-no\-absolute\-filenames] [\-\-sparse]
-+[\-\-force\-local] [\-\-absolute\-filenames] [\-\-sparse]
- [\-\-only\-verify\-crc] [\-\-quiet] [\-\-rsh-command=command] [\-\-help]
- [\-\-version] [pattern...] [< archive]
-diff -Naur cpio-2.6.vanilla/doc/cpio.info cpio-2.6/doc/cpio.info
---- cpio-2.6.vanilla/doc/cpio.info     2004-02-27 12:42:01.000000000 +0000
-+++ cpio-2.6/doc/cpio.info     2005-07-29 13:46:42.000000000 +0100
-@@ -203,7 +203,7 @@
-      [--swap-halfwords] [--io-size=bytes] [--pattern-file=file]
-      [--format=format] [--owner=[user][:.][group]]
-      [--no-preserve-owner] [--message=message] [--help] [--version]
--     [-no-absolute-filenames] [--sparse] [-only-verify-crc] [-quiet]
-+     [--absolute-filenames] [--sparse] [-only-verify-crc] [-quiet]
-      [--rsh-command=command] [pattern...] [< archive]
\1f
-@@ -358,9 +358,9 @@
-      Show numeric UID and GID instead of translating them into names
-      when using the `--verbose option'.
--`--no-absolute-filenames'
--     Create all files relative to the current directory in copy-in
--     mode, even if they have an absolute file name in the archive.
-+`--absolute-filenames'
-+     Do not strip leading file name components that contain ".." 
-+     and leading slashes from file names in copy-in mode
- `--no-preserve-owner'
-      Do not change the ownership of the files; leave them owned by the
-diff -Naur cpio-2.6.vanilla/src/copyin.c cpio-2.6/src/copyin.c
---- cpio-2.6.vanilla/src/copyin.c      2004-09-08 12:10:02.000000000 +0100
-+++ cpio-2.6/src/copyin.c      2005-07-29 13:46:42.000000000 +0100
-@@ -25,6 +25,7 @@
- #include "dstring.h"
- #include "extern.h"
- #include "defer.h"
-+#include "dirname.h"
- #include <rmt.h>
- #ifndef       FNM_PATHNAME
- #include <fnmatch.h>
-@@ -389,19 +390,26 @@
-         continue;
-       }
--      if (close (out_file_des) < 0)
--      error (0, errno, "%s", d->header.c_name);
--
-+      /*
-+       *  Avoid race condition.
-+       *  Set chown and chmod before closing the file desc.
-+       *  pvrabec@redhat.com
-+       */
-+       
-       /* File is now copied; set attributes.  */
-       if (!no_chown_flag)
--      if ((chown (d->header.c_name,
-+      if ((fchown (out_file_des,
-                   set_owner_flag ? set_owner : d->header.c_uid,
-              set_group_flag ? set_group : d->header.c_gid) < 0)
-           && errno != EPERM)
-         error (0, errno, "%s", d->header.c_name);
-       /* chown may have turned off some permissions we wanted. */
--      if (chmod (d->header.c_name, (int) d->header.c_mode) < 0)
-+      if (fchmod (out_file_des, (int) d->header.c_mode) < 0)
-       error (0, errno, "%s", d->header.c_name);
-+
-+      if (close (out_file_des) < 0)
-+      error (0, errno, "%s", d->header.c_name);
-+
-       if (retain_time_flag)
-       {
-         times.actime = times.modtime = d->header.c_mtime;
-@@ -557,6 +565,25 @@
-       write (out_file_des, "", 1);
-       delayed_seek_count = 0;
-     }
-+    
-+  /*
-+   *  Avoid race condition.
-+   *  Set chown and chmod before closing the file desc.
-+   *  pvrabec@redhat.com
-+   */
-+   
-+  /* File is now copied; set attributes.  */
-+  if (!no_chown_flag)
-+    if ((fchown (out_file_des,
-+              set_owner_flag ? set_owner : file_hdr->c_uid,
-+         set_group_flag ? set_group : file_hdr->c_gid) < 0)
-+      && errno != EPERM)
-+      error (0, errno, "%s", file_hdr->c_name);
-+  
-+  /* chown may have turned off some permissions we wanted. */
-+  if (fchmod (out_file_des, (int) file_hdr->c_mode) < 0)
-+    error (0, errno, "%s", file_hdr->c_name);
-+     
-   if (close (out_file_des) < 0)
-     error (0, errno, "%s", file_hdr->c_name);
-@@ -567,18 +594,6 @@
-              file_hdr->c_name, crc, file_hdr->c_chksum);
-     }
--  /* File is now copied; set attributes.  */
--  if (!no_chown_flag)
--    if ((chown (file_hdr->c_name,
--              set_owner_flag ? set_owner : file_hdr->c_uid,
--         set_group_flag ? set_group : file_hdr->c_gid) < 0)
--      && errno != EPERM)
--      error (0, errno, "%s", file_hdr->c_name);
--  
--  /* chown may have turned off some permissions we wanted. */
--  if (chmod (file_hdr->c_name, (int) file_hdr->c_mode) < 0)
--    error (0, errno, "%s", file_hdr->c_name);
--  
-   if (retain_time_flag)
-     {
-       struct utimbuf times;           /* For setting file times.  */
-@@ -589,7 +604,7 @@
-       if (utime (file_hdr->c_name, &times) < 0)
-       error (0, errno, "%s", file_hdr->c_name);
-     }
--  
-+    
-   tape_skip_padding (in_file_des, file_hdr->c_filesize);
-   if (file_hdr->c_nlink > 1
-       && (archive_format == arf_newascii || archive_format == arf_crcascii) )
-@@ -1335,6 +1350,53 @@
-     }
- }
-+/* Return a safer suffix of FILE_NAME, or "." if it has no safer
-+   suffix.  Check for fully specified file names and other atrocities.  */
-+
-+static const char *
-+safer_name_suffix (char const *file_name)
-+{
-+  char const *p;
-+
-+  /* Skip file system prefixes, leading file name components that contain
-+     "..", and leading slashes.  */
-+
-+  size_t prefix_len = FILE_SYSTEM_PREFIX_LEN (file_name);
-+
-+  for (p = file_name + prefix_len; *p;)
-+    {
-+      if (p[0] == '.' && p[1] == '.' && (ISSLASH (p[2]) || !p[2]))
-+      prefix_len = p + 2 - file_name;
-+
-+      do
-+      {
-+        char c = *p++;
-+        if (ISSLASH (c))
-+          break;
-+      }
-+      while (*p);
-+    }
-+
-+  for (p = file_name + prefix_len; ISSLASH (*p); p++)
-+    continue;
-+  prefix_len = p - file_name;
-+
-+  if (prefix_len)
-+    {
-+      char *prefix = alloca (prefix_len + 1);
-+      memcpy (prefix, file_name, prefix_len);
-+      prefix[prefix_len] = '\0';
-+
-+
-+      error (0, 0, _("Removing leading `%s' from member names"), prefix);
-+    }
-+
-+  if (!*p)
-+    p = ".";
-+
-+  return p;
-+}
-+
- /* Read the collection from standard input and create files
-    in the file system.  */
-@@ -1445,18 +1507,11 @@
-       /* Do we have to ignore absolute paths, and if so, does the filename
-          have an absolute path?  */
--      if (no_abs_paths_flag && file_hdr.c_name && file_hdr.c_name [0] == '/')
-+      if (!abs_paths_flag && file_hdr.c_name && file_hdr.c_name [0])
-       {
--        char *p;
-+        const char *p = safer_name_suffix (file_hdr.c_name);
--        p = file_hdr.c_name;
--        while (*p == '/')
--          ++p;
--        if (*p == '\0')
--          {
--            strcpy (file_hdr.c_name, ".");
--          }
--        else
-+        if (p != file_hdr.c_name)
-           {
-               /* Debian hack: file_hrd.c_name is sometimes set to
-                  point to static memory by code in tar.c.  This
-diff -Naur cpio-2.6.vanilla/src/copypass.c cpio-2.6/src/copypass.c
---- cpio-2.6.vanilla/src/copypass.c    2004-09-06 13:09:04.000000000 +0100
-+++ cpio-2.6/src/copypass.c    2005-07-29 13:46:07.000000000 +0100
-@@ -181,19 +181,25 @@
-               }
-             if (close (in_file_des) < 0)
-               error (0, errno, "%s", input_name.ds_string);
--            if (close (out_file_des) < 0)
--              error (0, errno, "%s", output_name.ds_string);
--
-+            /*
-+             *  Avoid race condition.
-+             *  Set chown and chmod before closing the file desc.
-+             *  pvrabec@redhat.com
-+             */
-             /* Set the attributes of the new file.  */
-             if (!no_chown_flag)
--              if ((chown (output_name.ds_string,
-+              if ((fchown (out_file_des,
-                           set_owner_flag ? set_owner : in_file_stat.st_uid,
-                     set_group_flag ? set_group : in_file_stat.st_gid) < 0)
-                   && errno != EPERM)
-                 error (0, errno, "%s", output_name.ds_string);
-             /* chown may have turned off some permissions we wanted. */
--            if (chmod (output_name.ds_string, in_file_stat.st_mode) < 0)
-+            if (fchmod (out_file_des, in_file_stat.st_mode) < 0)
-+              error (0, errno, "%s", output_name.ds_string);
-+              
-+            if (close (out_file_des) < 0)
-               error (0, errno, "%s", output_name.ds_string);
-+
-             if (reset_time_flag)
-               {
-                 times.actime = in_file_stat.st_atime;
-diff -Naur cpio-2.6.vanilla/src/extern.h cpio-2.6/src/extern.h
---- cpio-2.6.vanilla/src/extern.h      2004-09-08 11:49:57.000000000 +0100
-+++ cpio-2.6/src/extern.h      2005-07-29 13:47:34.000000000 +0100
-@@ -46,7 +46,7 @@
- extern int sparse_flag;
- extern int quiet_flag;
- extern int only_verify_crc_flag;
--extern int no_abs_paths_flag;
-+extern int abs_paths_flag;
- extern unsigned int warn_option;
- /* Values for warn_option */
-@@ -91,6 +91,7 @@
- extern char input_is_seekable;
- extern char output_is_seekable;
- extern char *program_name;
-+extern mode_t sys_umask;
- extern int (*xstat) ();
- extern void (*copy_function) ();
\f
-diff -Naur cpio-2.6.vanilla/src/global.c cpio-2.6/src/global.c
---- cpio-2.6.vanilla/src/global.c      2004-09-08 11:23:44.000000000 +0100
-+++ cpio-2.6/src/global.c      2005-07-29 13:47:34.000000000 +0100
-@@ -100,7 +100,7 @@
- int only_verify_crc_flag = false;
- /* If true, don't use any absolute paths, prefix them by `./'.  */
--int no_abs_paths_flag = false;
-+int abs_paths_flag = false;
- #ifdef DEBUG_CPIO
- /* If true, print debugging information.  */
-@@ -195,6 +195,9 @@
- /* The name this program was run with.  */
- char *program_name;
-+/* Debian hack to make the -d option honor the umask.  */
-+mode_t sys_umask;
-+
- /* A pointer to either lstat or stat, depending on whether
-    dereferencing of symlinks is done for input files.  */
- int (*xstat) ();
-diff -Naur cpio-2.6.vanilla/src/main.c cpio-2.6/src/main.c
---- cpio-2.6.vanilla/src/main.c        2004-11-23 00:42:18.000000000 +0000
-+++ cpio-2.6/src/main.c        2005-07-29 13:47:34.000000000 +0100
-@@ -41,6 +41,7 @@
- enum cpio_options {
-   NO_ABSOLUTE_FILENAMES_OPTION=256,  
-+  ABSOLUTE_FILENAMES_OPTION,  
-   NO_PRESERVE_OWNER_OPTION,      
-   ONLY_VERIFY_CRC_OPTION,        
-   RENAME_BATCH_FILE_OPTION,      
-@@ -134,6 +135,8 @@
-    N_("In copy-in mode, read additional patterns specifying filenames to extract or list from FILE"), 210},
-   {"no-absolute-filenames", NO_ABSOLUTE_FILENAMES_OPTION, 0, 0,
-    N_("Create all files relative to the current directory"), 210},
-+  {"absolute-filenames", ABSOLUTE_FILENAMES_OPTION, 0, 0,
-+   N_("do not strip leading file name components that contain \"..\" and leading slashes from file names"), 210},
-   {"only-verify-crc", ONLY_VERIFY_CRC_OPTION, 0, 0,
-    N_("When reading a CRC format archive in copy-in mode, only verify the CRC's of each file in the archive, don't actually extract the files"), 210},
-   {"rename", 'r', 0, 0,
-@@ -392,7 +395,11 @@
-       break;
-     case NO_ABSOLUTE_FILENAMES_OPTION:                /* --no-absolute-filenames */
--      no_abs_paths_flag = true;
-+      abs_paths_flag = false;
-+      break;
-+      
-+    case ABSOLUTE_FILENAMES_OPTION:           /* --absolute-filenames */
-+      abs_paths_flag = true;
-       break;
-       
-     case NO_PRESERVE_OWNER_OPTION:            /* --no-preserve-owner */
-@@ -631,7 +638,7 @@
-                     _("--append is used but no archive file name is given (use -F or -O options")));
-       CHECK_USAGE(rename_batch_file, "--rename-batch-file", "--create");
--      CHECK_USAGE(no_abs_paths_flag, "--no-absolute-pathnames", "--create");
-+      CHECK_USAGE(abs_paths_flag, "--absolute-pathnames", "--create");
-       CHECK_USAGE(input_archive_name, "-I", "--create");
-       if (archive_name && output_archive_name)
-       USAGE_ERROR ((0, 0, _("Both -O and -F are used in copy-out mode")));
-@@ -658,7 +665,7 @@
-       CHECK_USAGE(rename_flag, "--rename", "--pass-through");
-       CHECK_USAGE(append_flag, "--append", "--pass-through");
-       CHECK_USAGE(rename_batch_file, "--rename-batch-file", "--pass-through");
--      CHECK_USAGE(no_abs_paths_flag, "--no-absolute-pathnames",
-+      CHECK_USAGE(abs_paths_flag, "--absolute-pathnames",
-                 "--pass-through");
-       CHECK_USAGE(to_stdout_option, "--to-stdout", "--pass-through");
-       
-@@ -740,7 +747,6 @@
-   textdomain (PACKAGE);
-   program_name = argv[0];
--  umask (0);
- #ifdef __TURBOC__
-   _fmode = O_BINARY;          /* Put stdin and stdout in binary mode.  */
-@@ -751,6 +757,7 @@
- #endif
-   process_args (argc, argv);
-+  sys_umask = umask (0);
-   initialize_buffers ();