Merge branch 'master' into next

This commit is contained in:
Arne Fitzenreiter
2009-09-15 20:09:46 +02:00
1760 changed files with 93755 additions and 4709 deletions

View File

@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.27.31
# Fri Aug 21 16:30:37 2009
# Linux kernel version: 2.6.27.31-ipfire
# Mon Sep 7 20:55:55 2009
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -3173,8 +3173,24 @@ CONFIG_CIFS_XATTR=y
#
# Partition Types
#
# CONFIG_PARTITION_ADVANCED is not set
CONFIG_PARTITION_ADVANCED=y
# CONFIG_ACORN_PARTITION is not set
# CONFIG_OSF_PARTITION is not set
# CONFIG_AMIGA_PARTITION is not set
# CONFIG_ATARI_PARTITION is not set
# CONFIG_MAC_PARTITION is not set
CONFIG_MSDOS_PARTITION=y
# CONFIG_BSD_DISKLABEL is not set
# CONFIG_MINIX_SUBPARTITION is not set
# CONFIG_SOLARIS_X86_PARTITION is not set
# CONFIG_UNIXWARE_DISKLABEL is not set
# CONFIG_LDM_PARTITION is not set
# CONFIG_SGI_PARTITION is not set
# CONFIG_ULTRIX_PARTITION is not set
# CONFIG_SUN_PARTITION is not set
# CONFIG_KARMA_PARTITION is not set
CONFIG_EFI_PARTITION=y
# CONFIG_SYSV68_PARTITION is not set
CONFIG_NLS=y
CONFIG_NLS_DEFAULT="cp850"
# CONFIG_NLS_CODEPAGE_437 is not set

View File

@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.27.25-ipfire-xen
# Sun Aug 9 16:17:27 2009
# Linux kernel version: 2.6.27.31
# Mon Sep 7 10:05:41 2009
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -252,6 +252,7 @@ CONFIG_RESOURCES_64BIT=y
CONFIG_ZONE_DMA_FLAG=1
CONFIG_BOUNCE=y
CONFIG_VIRT_TO_BUS=y
CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
# CONFIG_HIGHPTE is not set
CONFIG_MTRR=y
# CONFIG_X86_PAT is not set
@@ -926,7 +927,6 @@ CONFIG_SONY_LAPTOP=m
# CONFIG_SONYPI_COMPAT is not set
CONFIG_THINKPAD_ACPI=m
# CONFIG_THINKPAD_ACPI_DEBUG is not set
CONFIG_THINKPAD_ACPI_BAY=y
CONFIG_THINKPAD_ACPI_VIDEO=y
CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
CONFIG_INTEL_MENLOW=m
@@ -2852,6 +2852,7 @@ CONFIG_XEN_SMPBOOT=y
CONFIG_XEN_DEVMEM=y
CONFIG_XEN_BALLOON=y
CONFIG_XEN_SCRUB_PAGES=y
# CONFIG_STAGING is not set
#
# Firmware Drivers
@@ -3023,8 +3024,24 @@ CONFIG_CIFS_XATTR=y
#
# Partition Types
#
# CONFIG_PARTITION_ADVANCED is not set
CONFIG_PARTITION_ADVANCED=y
# CONFIG_ACORN_PARTITION is not set
# CONFIG_OSF_PARTITION is not set
# CONFIG_AMIGA_PARTITION is not set
# CONFIG_ATARI_PARTITION is not set
# CONFIG_MAC_PARTITION is not set
CONFIG_MSDOS_PARTITION=y
# CONFIG_BSD_DISKLABEL is not set
# CONFIG_MINIX_SUBPARTITION is not set
# CONFIG_SOLARIS_X86_PARTITION is not set
# CONFIG_UNIXWARE_DISKLABEL is not set
# CONFIG_LDM_PARTITION is not set
# CONFIG_SGI_PARTITION is not set
# CONFIG_ULTRIX_PARTITION is not set
# CONFIG_SUN_PARTITION is not set
# CONFIG_KARMA_PARTITION is not set
CONFIG_EFI_PARTITION=y
# CONFIG_SYSV68_PARTITION is not set
CONFIG_NLS=y
CONFIG_NLS_DEFAULT="cp850"
# CONFIG_NLS_CODEPAGE_437 is not set

View File

@@ -5,13 +5,14 @@ etc/ipsec.d/cacerts
etc/ipsec.d/certs
etc/ipsec.d/crls
#etc/ipsec.d/examples
#etc/ipsec.d/examples/l2tp-cert-orgWIN2KXP.conf
#etc/ipsec.d/examples/hub-spoke.conf
#etc/ipsec.d/examples/ipv6.conf
#etc/ipsec.d/examples/l2tp-cert.conf
#etc/ipsec.d/examples/l2tp-psk-orgWIN2KXP.conf
#etc/ipsec.d/examples/l2tp-psk.conf
#etc/ipsec.d/examples/linux-linux.conf
#etc/ipsec.d/examples/no_oe.conf
#etc/ipsec.d/examples/oe-exclude-dns.conf
#etc/ipsec.d/examples/sysctl.conf
#etc/ipsec.d/examples/xauth.conf
etc/ipsec.d/ocspcerts
etc/ipsec.d/policies
#etc/ipsec.d/policies/block
@@ -43,21 +44,24 @@ usr/lib/ipsec
#usr/lib/ipsec/_realsetup
#usr/lib/ipsec/_secretcensor
#usr/lib/ipsec/_startklips
#usr/lib/ipsec/_startklips.old
#usr/lib/ipsec/_startnetkey
#usr/lib/ipsec/_updown
#usr/lib/ipsec/_updown_x509
#usr/libexec
#usr/lib/ipsec/_updown.klips
#usr/lib/ipsec/_updown.klips.old
#usr/lib/ipsec/_updown.klips~
#usr/lib/ipsec/_updown.mast
#usr/lib/ipsec/_updown.mast.old
#usr/lib/ipsec/_updown.netkey
usr/libexec/ipsec
#usr/libexec/ipsec/_pluto_adns
#usr/libexec/ipsec/addconn
#usr/libexec/ipsec/auto
#usr/libexec/ipsec/barf
#usr/libexec/ipsec/calcgoo
#usr/libexec/ipsec/eroute
#usr/libexec/ipsec/ikeping
#usr/libexec/ipsec/klipsdebug
#usr/libexec/ipsec/livetest
#usr/libexec/ipsec/look
#usr/libexec/ipsec/mailkey
#usr/libexec/ipsec/manual
#usr/libexec/ipsec/newhostkey
#usr/libexec/ipsec/pf_key
#usr/libexec/ipsec/pluto
@@ -67,6 +71,7 @@ usr/libexec/ipsec
#usr/libexec/ipsec/setup
#usr/libexec/ipsec/showdefaults
#usr/libexec/ipsec/showhostkey
#usr/libexec/ipsec/showpolicy
#usr/libexec/ipsec/spi
#usr/libexec/ipsec/spigrp
#usr/libexec/ipsec/tncfg
@@ -89,7 +94,6 @@ usr/libexec/ipsec
#usr/man/man3/ipsec_bitstomask.3
#usr/man/man3/ipsec_broadcastof.3
#usr/man/man3/ipsec_copyright_notice.3
#usr/man/man3/ipsec_datatot.3
#usr/man/man3/ipsec_goodmask.3
#usr/man/man3/ipsec_hostof.3
#usr/man/man3/ipsec_initaddr.3
@@ -128,16 +132,13 @@ usr/libexec/ipsec
#usr/man/man3/ipsec_ttosa.3
#usr/man/man3/ipsec_ttosubnet.3
#usr/man/man3/ipsec_ttoul.3
#usr/man/man3/ipsec_ultoa.3
#usr/man/man3/ipsec_ultot.3
#usr/man/man3/ipsec_unspecaddr.3
#usr/man/man3/ipsec_version.3
#usr/man/man3/ipsec_version_code.3
#usr/man/man3/ipsec_version_string.3
#usr/man/man5/ipsec.conf.5
#usr/man/man5/ipsec.secrets.5
#usr/man/man5/ipsec_eroute.5
#usr/man/man5/ipsec_klipsdebug.5
#usr/man/man5/ipsec_showpolicy.8
#usr/man/man5/ipsec_spi.5
#usr/man/man5/ipsec_spigrp.5
#usr/man/man5/ipsec_tncfg.5
@@ -146,7 +147,6 @@ usr/libexec/ipsec
#usr/man/man5/ipsec_version.5
#usr/man/man5/pf_key.5
#usr/man/man8/ipsec.8
#usr/man/man8/ipsec__confread.8
#usr/man/man8/ipsec__copyright.8
#usr/man/man8/ipsec__include.8
#usr/man/man8/ipsec__keycensor.8
@@ -155,27 +155,27 @@ usr/libexec/ipsec
#usr/man/man8/ipsec__realsetup.8
#usr/man/man8/ipsec__secretcensor.8
#usr/man/man8/ipsec__startklips.8
#usr/man/man8/ipsec__startnetkey.8
#usr/man/man8/ipsec__updown.8
#usr/man/man8/ipsec__updown_x509.8
#usr/man/man8/ipsec__updown.klips.8
#usr/man/man8/ipsec__updown.mast.8
#usr/man/man8/ipsec__updown.netkey.8
#usr/man/man8/ipsec_addconn.8
#usr/man/man8/ipsec_auto.8
#usr/man/man8/ipsec_barf.8
#usr/man/man8/ipsec_calcgoo.8
#usr/man/man8/ipsec_eroute.8
#usr/man/man8/ipsec_ikeping.8
#usr/man/man8/ipsec_klipsdebug.8
#usr/man/man8/ipsec_livetest.8
#usr/man/man8/ipsec_look.8
#usr/man/man8/ipsec_mailkey.8
#usr/man/man8/ipsec_manual.8
#usr/man/man8/ipsec_newhostkey.8
#usr/man/man8/ipsec_pf_key.8
#usr/man/man8/ipsec_pluto.8
#usr/man/man8/ipsec_ranbits.8
#usr/man/man8/ipsec_rsasigkey.8
#usr/man/man8/ipsec_secrets.8
#usr/man/man8/ipsec_setup.8
#usr/man/man8/ipsec_showdefaults.8
#usr/man/man8/ipsec_showhostkey.8
#usr/man/man8/ipsec_showpolicy.8
#usr/man/man8/ipsec_spi.8
#usr/man/man8/ipsec_spigrp.8
#usr/man/man8/ipsec_tncfg.8
@@ -185,7 +185,6 @@ usr/sbin/ipsec
#usr/share/doc/openswan/index.html
#usr/share/doc/openswan/ipsec.8.html
#usr/share/doc/openswan/ipsec.conf-sample
#usr/share/doc/openswan/ipsec.conf.5.html
#usr/share/doc/openswan/ipsec.secrets.5.html
#usr/share/doc/openswan/ipsec__confread.8.html
#usr/share/doc/openswan/ipsec__copyright.8.html
@@ -196,8 +195,12 @@ usr/sbin/ipsec
#usr/share/doc/openswan/ipsec__realsetup.8.html
#usr/share/doc/openswan/ipsec__secretcensor.8.html
#usr/share/doc/openswan/ipsec__startklips.8.html
#usr/share/doc/openswan/ipsec__startnetkey.8.html
#usr/share/doc/openswan/ipsec__updown.8.html
#usr/share/doc/openswan/ipsec__updown_x509.8.html
#usr/share/doc/openswan/ipsec__updown.klips.8.html
#usr/share/doc/openswan/ipsec__updown.mast.8.html
#usr/share/doc/openswan/ipsec__updown.netkey.8.html
#usr/share/doc/openswan/ipsec_addconn.8.html
#usr/share/doc/openswan/ipsec_addrbytesof.3.html
#usr/share/doc/openswan/ipsec_addrbytesptr.3.html
#usr/share/doc/openswan/ipsec_addrcmp.3.html
@@ -216,9 +219,7 @@ usr/sbin/ipsec
#usr/share/doc/openswan/ipsec_barf.8.html
#usr/share/doc/openswan/ipsec_bitstomask.3.html
#usr/share/doc/openswan/ipsec_broadcastof.3.html
#usr/share/doc/openswan/ipsec_calcgoo.8.html
#usr/share/doc/openswan/ipsec_copyright_notice.3.html
#usr/share/doc/openswan/ipsec_datatot.3.html
#usr/share/doc/openswan/ipsec_eroute.5.html
#usr/share/doc/openswan/ipsec_eroute.8.html
#usr/share/doc/openswan/ipsec_goodmask.3.html
@@ -256,6 +257,7 @@ usr/sbin/ipsec
#usr/share/doc/openswan/ipsec_ranbits.8.html
#usr/share/doc/openswan/ipsec_rangetoa.3.html
#usr/share/doc/openswan/ipsec_rangetosubnet.3.html
#usr/share/doc/openswan/ipsec_readwriteconf.8.html
#usr/share/doc/openswan/ipsec_rsasigkey.8.html
#usr/share/doc/openswan/ipsec_sameaddr.3.html
#usr/share/doc/openswan/ipsec_sameaddrtype.3.html
@@ -264,7 +266,7 @@ usr/sbin/ipsec
#usr/share/doc/openswan/ipsec_samesubnettype.3.html
#usr/share/doc/openswan/ipsec_satot.3.html
#usr/share/doc/openswan/ipsec_secrets.8.html
#usr/share/doc/openswan/ipsec_send-pr.8.html
#usr/share/doc/openswan/ipsec_set_policy.3.html
#usr/share/doc/openswan/ipsec_setportof.3.html
#usr/share/doc/openswan/ipsec_setup.8.html
#usr/share/doc/openswan/ipsec_showdefaults.8.html
@@ -276,8 +278,7 @@ usr/sbin/ipsec
#usr/share/doc/openswan/ipsec_spi.8.html
#usr/share/doc/openswan/ipsec_spigrp.5.html
#usr/share/doc/openswan/ipsec_spigrp.8.html
#usr/share/doc/openswan/ipsec_splitkeytoid.3.html
#usr/share/doc/openswan/ipsec_starter.8.html
#usr/share/doc/openswan/ipsec_strerror.3.html
#usr/share/doc/openswan/ipsec_subnetinsubnet.3.html
#usr/share/doc/openswan/ipsec_subnetishost.3.html
#usr/share/doc/openswan/ipsec_subnetof.3.html
@@ -294,8 +295,6 @@ usr/sbin/ipsec
#usr/share/doc/openswan/ipsec_ttosa.3.html
#usr/share/doc/openswan/ipsec_ttosubnet.3.html
#usr/share/doc/openswan/ipsec_ttoul.3.html
#usr/share/doc/openswan/ipsec_ultoa.3.html
#usr/share/doc/openswan/ipsec_ultot.3.html
#usr/share/doc/openswan/ipsec_unspecaddr.3.html
#usr/share/doc/openswan/ipsec_verify.8.html
#usr/share/doc/openswan/ipsec_version.3.html
@@ -303,34 +302,3 @@ usr/sbin/ipsec
#usr/share/doc/openswan/ipsec_version_code.3.html
#usr/share/doc/openswan/ipsec_version_string.3.html
var/run/pluto
#etc/ipsec.d/examples/xauth.conf
#etc/rc.d/init.d/setup
#usr/lib/ipsec/_startklips.old
#usr/lib/ipsec/_startnetkey
#usr/lib/ipsec/_updown.klips
#usr/lib/ipsec/_updown.klips.old
#usr/lib/ipsec/_updown.klips~
#usr/lib/ipsec/_updown.mast
#usr/lib/ipsec/_updown.mast.old
#usr/lib/ipsec/_updown.netkey
#usr/libexec/ipsec/addconn
#usr/libexec/ipsec/lwdnsq
#usr/libexec/ipsec/showpolicy
#usr/man/man5/ipsec_showpolicy.8
#usr/man/man8/ipsec__startnetkey.8
#usr/man/man8/ipsec__updown.klips.8
#usr/man/man8/ipsec__updown.mast.8
#usr/man/man8/ipsec__updown.netkey.8
#usr/man/man8/ipsec_addconn.8
#usr/man/man8/ipsec_lwdnsq.8
#usr/man/man8/ipsec_showpolicy.8
#usr/share/doc/openswan/ipsec__startnetkey.8.html
#usr/share/doc/openswan/ipsec__updown.bsdkame.8.html
#usr/share/doc/openswan/ipsec__updown.klips.8.html
#usr/share/doc/openswan/ipsec__updown.mast.8.html
#usr/share/doc/openswan/ipsec__updown.netkey.8.html
#usr/share/doc/openswan/ipsec_addconn.8.html
#usr/share/doc/openswan/ipsec_readwriteconf.8.html
#usr/share/doc/openswan/ipsec_set_policy.3.html
#usr/share/doc/openswan/ipsec_strerror.3.html
#etc/ipsec.d/examples/ipv6.conf

View File

@@ -3,3 +3,8 @@ srv/web/ipfire/cgi-bin/urlfilter.cgi
etc/system-release
boot/grub/grub.conf
etc/ppp/ip-up
srv/web/ipfire/cgi-bin/mac.cgi
srv/web/ipfire/cgi-bin/dns.cgi
var/ipfire/langs/de.pl
var/ipfire/langs/en.pl
srv/web/ipfire/cgi-bin/backup.cgi

View File

@@ -54,7 +54,8 @@ rm -rf /boot/System.map-*
rm -rf /boot/config-*
rm -rf /boot/ipfirerd-*
rm -rf /boot/vmlinuz-*
rm -rf /lib/modules/
# Don't remove old xen modules. Kernel may stored outside.
rm -rf /lib/modules/*-ipfire
#
# Backup grub.conf
#
@@ -115,7 +116,7 @@ grub-install --no-floppy ${ROOT::`expr length $ROOT`-1} --recheck
#
# Rebuild Language
#
#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
#
# Add some entries to openvpn config
#

View File

@@ -3,75 +3,76 @@ boot/System.map-ipfire-xen
boot/config-KVER-ipfire-xen
boot/vmlinuz-KVER-ipfire-xen
boot/vmlinuz-ipfire-xen
#lib/firmware/atmsar11.fw
#lib/firmware/cpia2
#lib/firmware/cpia2/stv0672_vp4.bin
#lib/firmware/dabusb
#lib/firmware/dabusb/bitstream.bin
#lib/firmware/dabusb/firmware.fw
#lib/firmware/dsp56k
#lib/firmware/dsp56k/bootstrap.bin
#lib/firmware/edgeport
#lib/firmware/edgeport/boot.fw
#lib/firmware/edgeport/boot2.fw
#lib/firmware/edgeport/down.fw
#lib/firmware/edgeport/down2.fw
#lib/firmware/edgeport/down3.bin
#lib/firmware/emi26
#lib/firmware/emi26/bitstream.fw
#lib/firmware/emi26/firmware.fw
#lib/firmware/emi26/loader.fw
#lib/firmware/emi62
#lib/firmware/emi62/bitstream.fw
#lib/firmware/emi62/loader.fw
#lib/firmware/emi62/midi.fw
#lib/firmware/emi62/spdif.fw
#lib/firmware/ess
#lib/firmware/ess/maestro3_assp_kernel.fw
#lib/firmware/ess/maestro3_assp_minisrc.fw
#lib/firmware/intelliport2.bin
#lib/firmware/kaweth
#lib/firmware/kaweth/new_code.bin
#lib/firmware/kaweth/new_code_fix.bin
#lib/firmware/kaweth/trigger_code.bin
#lib/firmware/kaweth/trigger_code_fix.bin
#lib/firmware/keyspan
#lib/firmware/keyspan/mpr.fw
#lib/firmware/keyspan/usa18x.fw
#lib/firmware/keyspan/usa19.fw
#lib/firmware/keyspan/usa19qi.fw
#lib/firmware/keyspan/usa19qw.fw
#lib/firmware/keyspan/usa19w.fw
#lib/firmware/keyspan/usa28.fw
#lib/firmware/keyspan/usa28x.fw
#lib/firmware/keyspan/usa28xa.fw
#lib/firmware/keyspan/usa28xb.fw
#lib/firmware/keyspan/usa49w.fw
#lib/firmware/keyspan/usa49wlc.fw
#lib/firmware/keyspan_pda
#lib/firmware/keyspan_pda/keyspan_pda.fw
#lib/firmware/keyspan_pda/xircom_pgs.fw
#lib/firmware/korg
#lib/firmware/korg/k1212.dsp
#lib/firmware/sb16
#lib/firmware/sb16/alaw_main.csp
#lib/firmware/sb16/ima_adpcm_capture.csp
#lib/firmware/sb16/ima_adpcm_init.csp
#lib/firmware/sb16/ima_adpcm_playback.csp
#lib/firmware/sb16/mulaw_main.csp
#lib/firmware/ti_3410.fw
#lib/firmware/ti_5052.fw
#lib/firmware/tr_smctr.bin
#lib/firmware/ttusb-budget
#lib/firmware/ttusb-budget/dspbootcode.bin
#lib/firmware/vicam
#lib/firmware/vicam/firmware.fw
#lib/firmware/whiteheat.fw
#lib/firmware/whiteheat_loader.fw
#lib/firmware/yamaha
#lib/firmware/yamaha/ds1_ctrl.fw
#lib/firmware/yamaha/ds1_dsp.fw
#lib/firmware/yamaha/ds1e_ctrl.fw
#lib/firmware/KVER-ipfire-xen
#lib/firmware/KVER-ipfire-xen/atmsar11.fw
#lib/firmware/KVER-ipfire-xen/cpia2
#lib/firmware/KVER-ipfire-xen/cpia2/stv0672_vp4.bin
#lib/firmware/KVER-ipfire-xen/dabusb
#lib/firmware/KVER-ipfire-xen/dabusb/bitstream.bin
#lib/firmware/KVER-ipfire-xen/dabusb/firmware.fw
#lib/firmware/KVER-ipfire-xen/dsp56k
#lib/firmware/KVER-ipfire-xen/dsp56k/bootstrap.bin
#lib/firmware/KVER-ipfire-xen/edgeport
#lib/firmware/KVER-ipfire-xen/edgeport/boot.fw
#lib/firmware/KVER-ipfire-xen/edgeport/boot2.fw
#lib/firmware/KVER-ipfire-xen/edgeport/down.fw
#lib/firmware/KVER-ipfire-xen/edgeport/down2.fw
#lib/firmware/KVER-ipfire-xen/edgeport/down3.bin
#lib/firmware/KVER-ipfire-xen/emi26
#lib/firmware/KVER-ipfire-xen/emi26/bitstream.fw
#lib/firmware/KVER-ipfire-xen/emi26/firmware.fw
#lib/firmware/KVER-ipfire-xen/emi26/loader.fw
#lib/firmware/KVER-ipfire-xen/emi62
#lib/firmware/KVER-ipfire-xen/emi62/bitstream.fw
#lib/firmware/KVER-ipfire-xen/emi62/loader.fw
#lib/firmware/KVER-ipfire-xen/emi62/midi.fw
#lib/firmware/KVER-ipfire-xen/emi62/spdif.fw
#lib/firmware/KVER-ipfire-xen/ess
#lib/firmware/KVER-ipfire-xen/ess/maestro3_assp_kernel.fw
#lib/firmware/KVER-ipfire-xen/ess/maestro3_assp_minisrc.fw
#lib/firmware/KVER-ipfire-xen/intelliport2.bin
#lib/firmware/KVER-ipfire-xen/kaweth
#lib/firmware/KVER-ipfire-xen/kaweth/new_code.bin
#lib/firmware/KVER-ipfire-xen/kaweth/new_code_fix.bin
#lib/firmware/KVER-ipfire-xen/kaweth/trigger_code.bin
#lib/firmware/KVER-ipfire-xen/kaweth/trigger_code_fix.bin
#lib/firmware/KVER-ipfire-xen/keyspan
#lib/firmware/KVER-ipfire-xen/keyspan/mpr.fw
#lib/firmware/KVER-ipfire-xen/keyspan/usa18x.fw
#lib/firmware/KVER-ipfire-xen/keyspan/usa19.fw
#lib/firmware/KVER-ipfire-xen/keyspan/usa19qi.fw
#lib/firmware/KVER-ipfire-xen/keyspan/usa19qw.fw
#lib/firmware/KVER-ipfire-xen/keyspan/usa19w.fw
#lib/firmware/KVER-ipfire-xen/keyspan/usa28.fw
#lib/firmware/KVER-ipfire-xen/keyspan/usa28x.fw
#lib/firmware/KVER-ipfire-xen/keyspan/usa28xa.fw
#lib/firmware/KVER-ipfire-xen/keyspan/usa28xb.fw
#lib/firmware/KVER-ipfire-xen/keyspan/usa49w.fw
#lib/firmware/KVER-ipfire-xen/keyspan/usa49wlc.fw
#lib/firmware/KVER-ipfire-xen/keyspan_pda
#lib/firmware/KVER-ipfire-xen/keyspan_pda/keyspan_pda.fw
#lib/firmware/KVER-ipfire-xen/keyspan_pda/xircom_pgs.fw
#lib/firmware/KVER-ipfire-xen/korg
#lib/firmware/KVER-ipfire-xen/korg/k1212.dsp
#lib/firmware/KVER-ipfire-xen/sb16
#lib/firmware/KVER-ipfire-xen/sb16/alaw_main.csp
#lib/firmware/KVER-ipfire-xen/sb16/ima_adpcm_capture.csp
#lib/firmware/KVER-ipfire-xen/sb16/ima_adpcm_init.csp
#lib/firmware/KVER-ipfire-xen/sb16/ima_adpcm_playback.csp
#lib/firmware/KVER-ipfire-xen/sb16/mulaw_main.csp
#lib/firmware/KVER-ipfire-xen/ti_3410.fw
#lib/firmware/KVER-ipfire-xen/ti_5052.fw
#lib/firmware/KVER-ipfire-xen/tr_smctr.bin
#lib/firmware/KVER-ipfire-xen/ttusb-budget
#lib/firmware/KVER-ipfire-xen/ttusb-budget/dspbootcode.bin
#lib/firmware/KVER-ipfire-xen/vicam
#lib/firmware/KVER-ipfire-xen/vicam/firmware.fw
#lib/firmware/KVER-ipfire-xen/whiteheat.fw
#lib/firmware/KVER-ipfire-xen/whiteheat_loader.fw
#lib/firmware/KVER-ipfire-xen/yamaha
#lib/firmware/KVER-ipfire-xen/yamaha/ds1_ctrl.fw
#lib/firmware/KVER-ipfire-xen/yamaha/ds1_dsp.fw
#lib/firmware/KVER-ipfire-xen/yamaha/ds1e_ctrl.fw
#lib/modules
lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/build
@@ -142,9 +143,9 @@ lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/ac.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/asus_acpi.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/battery.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/bay.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/button.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/container.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/dock.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/fan.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/pci_slot.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/processor.ko
@@ -158,6 +159,7 @@ lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/ahci.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/ata_generic.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/ata_piix.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/libata.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_acpi.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_ali.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_amd.ko
@@ -265,10 +267,14 @@ lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/kernel/drivers/char/agp/sis-agp.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/char/agp/sworks-agp.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/char/agp/via-agp.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/char/cs5535_gpio.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/char/hangcheck-timer.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/char/hw_random
#lib/modules/KVER-ipfire-xen/kernel/drivers/char/hw_random/amd-rng.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/char/hw_random/geode-rng.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/char/hw_random/intel-rng.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/char/hw_random/rng-core.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/char/hw_random/via-rng.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/char/i8k.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/char/ipmi
#lib/modules/KVER-ipfire-xen/kernel/drivers/char/ipmi/ipmi_devintf.ko
@@ -276,11 +282,14 @@ lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/kernel/drivers/char/ipmi/ipmi_poweroff.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/char/ipmi/ipmi_si.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/char/ipmi/ipmi_watchdog.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/char/lp.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/char/nozomi.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/char/nvram.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/char/pcmcia
#lib/modules/KVER-ipfire-xen/kernel/drivers/char/pcmcia/ipwireless
#lib/modules/KVER-ipfire-xen/kernel/drivers/char/pcmcia/ipwireless/ipwireless.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/char/pcmcia/synclink_cs.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/char/ppdev.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/char/toshiba.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/clocksource
#lib/modules/KVER-ipfire-xen/kernel/drivers/clocksource/scx200_hrt.ko
@@ -291,6 +300,15 @@ lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/kernel/drivers/crypto/hifn_795x.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/crypto/padlock-aes.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/crypto/padlock-sha.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/dca
#lib/modules/KVER-ipfire-xen/kernel/drivers/dca/dca.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/dma
#lib/modules/KVER-ipfire-xen/kernel/drivers/dma/dmatest.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/dma/ioatdma.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/firewire
#lib/modules/KVER-ipfire-xen/kernel/drivers/firewire/firewire-core.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/firewire/firewire-ohci.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/firewire/firewire-sbp2.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/firmware
#lib/modules/KVER-ipfire-xen/kernel/drivers/firmware/iscsi_ibft.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/gpu
@@ -316,6 +334,8 @@ lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/kernel/drivers/gpu/drm/tdfx/tdfx.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/gpu/drm/via
#lib/modules/KVER-ipfire-xen/kernel/drivers/gpu/drm/via/via.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/gpu/drm/via_chrome9
#lib/modules/KVER-ipfire-xen/kernel/drivers/gpu/drm/via_chrome9/via_chrome9.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/hid
#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/usbhid
#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/usbhid/usbhid.ko
@@ -469,6 +489,14 @@ lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/pci/triflex.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/pci/trm290.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/pci/via82cxxx.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/ieee1394
#lib/modules/KVER-ipfire-xen/kernel/drivers/ieee1394/eth1394.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/ieee1394/ieee1394.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/ieee1394/ohci1394.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/ieee1394/pcilynx.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/ieee1394/raw1394.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/ieee1394/sbp2.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/ieee1394/video1394.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/input
#lib/modules/KVER-ipfire-xen/kernel/drivers/input/input-polldev.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/input/keyboard
@@ -484,6 +512,25 @@ lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/kernel/drivers/input/misc/keyspan_remote.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/input/misc/powermate.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/input/misc/yealink.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn
#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/capi
#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/capi/capi.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/capi/kernelcapi.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware
#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/avm
#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/avm/avm_cs.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/avm/b1.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/avm/b1dma.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/avm/b1pci.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/avm/b1pcmcia.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/avm/c4.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/avm/t1pci.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/eicon
#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/eicon/diva_idi.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/eicon/diva_mnt.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/eicon/divacapi.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/eicon/divadidd.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/eicon/divas.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/leds
#lib/modules/KVER-ipfire-xen/kernel/drivers/leds/led-class.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/leds/leds-clevo-mail.ko
@@ -495,11 +542,18 @@ lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/kernel/drivers/md
#lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-crypt.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-delay.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-least-pending.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-log.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-memcache.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-message.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-mirror.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-mod.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-multipath.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-queue-length.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-raid45.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-regions.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-round-robin.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-service-time.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-snapshot.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-zero.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/md/linear.ko
@@ -509,6 +563,22 @@ lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/kernel/drivers/md/raid1.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/md/raid10.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/md/raid456.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/media
#lib/modules/KVER-ipfire-xen/kernel/drivers/media/dvb
#lib/modules/KVER-ipfire-xen/kernel/drivers/media/dvb/dvb-core
#lib/modules/KVER-ipfire-xen/kernel/drivers/media/dvb/dvb-core/dvb-core.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/media/video
#lib/modules/KVER-ipfire-xen/kernel/drivers/media/video/compat_ioctl32.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/media/video/v4l2-common.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/media/video/v4l2-int-device.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/media/video/videodev.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/memstick
#lib/modules/KVER-ipfire-xen/kernel/drivers/memstick/core
#lib/modules/KVER-ipfire-xen/kernel/drivers/memstick/core/memstick.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/memstick/core/mspro_block.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/memstick/host
#lib/modules/KVER-ipfire-xen/kernel/drivers/memstick/host/jmb38x_ms.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/memstick/host/tifm_ms.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/message
#lib/modules/KVER-ipfire-xen/kernel/drivers/message/fusion
#lib/modules/KVER-ipfire-xen/kernel/drivers/message/fusion/mptbase.ko
@@ -576,10 +646,15 @@ lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/atp.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/b44.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/bnx2.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/bnx2x.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/bonding
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/bonding/bonding.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/bsd_comp.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/cassini.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/chelsio
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/chelsio/cxgb.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/cxgb3
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/cxgb3/cxgb3.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/de600.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/de620.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/dl2k.ko
@@ -617,10 +692,19 @@ lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/irda/via-ircc.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/irda/vlsi_ir.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/irda/w83977af_ir.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/ixgb
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/ixgb/ixgb.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/ixgbe
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/ixgbe/ixgbe.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/macvlan.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/mii.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/myri10ge
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/myri10ge/myri10ge.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/natsemi.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/ne2k-pci.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/netxen
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/netxen/netxen_nic.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/niu.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/ns83820.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/pcmcia
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/pcmcia/3c574_cs.ko
@@ -656,8 +740,13 @@ lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/qla3xxx.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/r6040.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/r8169.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/s2io.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/sb1000.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/sc92031.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/sfc
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/sfc/sfc.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/sfc/sfc_resource
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/sfc/sfc_resource/sfc_resource.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/sis190.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/sis900.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/skge.ko
@@ -669,6 +758,7 @@ lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/sungem.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/sungem_phy.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/sunhme.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/tehuti.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/tg3.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/tlan.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/tulip
@@ -859,6 +949,7 @@ lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/qla4xxx
#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/qla4xxx/qla4xxx.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/qlogicfas408.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/scsi_mod.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/scsi_transport_fc.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/scsi_transport_iscsi.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/scsi_transport_sas.ko
@@ -873,6 +964,10 @@ lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/sym53c8xx_2
#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/sym53c8xx_2/sym53c8xx.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/tmscsim.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/serial
#lib/modules/KVER-ipfire-xen/kernel/drivers/serial/jsm
#lib/modules/KVER-ipfire-xen/kernel/drivers/serial/jsm/jsm.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/serial/serial_core.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/ssb
#lib/modules/KVER-ipfire-xen/kernel/drivers/ssb/ssb.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/uio
@@ -1060,39 +1155,54 @@ lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/kernel/drivers/xen/scsiback/xen-scsibk.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/xen/scsifront
#lib/modules/KVER-ipfire-xen/kernel/drivers/xen/scsifront/xenscsi.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/xen/sfc_netfront
#lib/modules/KVER-ipfire-xen/kernel/drivers/xen/sfc_netfront/sfc_netfront.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/xen/sfc_netutil
#lib/modules/KVER-ipfire-xen/kernel/drivers/xen/sfc_netutil/sfc_netutil.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/xen/sfc_netback
#lib/modules/KVER-ipfire-xen/kernel/drivers/xen/sfc_netback/sfc_netback.ko
#lib/modules/KVER-ipfire-xen/kernel/fs
#lib/modules/KVER-ipfire-xen/kernel/fs/autofs
#lib/modules/KVER-ipfire-xen/kernel/fs/autofs/autofs.ko
#lib/modules/KVER-ipfire-xen/kernel/fs/autofs4
#lib/modules/KVER-ipfire-xen/kernel/fs/autofs4/autofs4.ko
#lib/modules/KVER-ipfire-xen/kernel/fs/cifs
#lib/modules/KVER-ipfire-xen/kernel/fs/cifs/cifs.ko
#lib/modules/KVER-ipfire-xen/kernel/fs/ecryptfs
#lib/modules/KVER-ipfire-xen/kernel/fs/ecryptfs/ecryptfs.ko
#lib/modules/KVER-ipfire-xen/kernel/fs/exportfs
#lib/modules/KVER-ipfire-xen/kernel/fs/exportfs/exportfs.ko
#lib/modules/KVER-ipfire-xen/kernel/fs/ext2
#lib/modules/KVER-ipfire-xen/kernel/fs/ext2/ext2.ko
#lib/modules/KVER-ipfire-xen/kernel/fs/ext3
#lib/modules/KVER-ipfire-xen/kernel/fs/ext3/ext3.ko
#lib/modules/KVER-ipfire-xen/kernel/fs/fat
#lib/modules/KVER-ipfire-xen/kernel/fs/fat/fat.ko
#lib/modules/KVER-ipfire-xen/kernel/fs/fuse
#lib/modules/KVER-ipfire-xen/kernel/fs/fuse/fuse.ko
#lib/modules/KVER-ipfire-xen/kernel/fs/isofs
#lib/modules/KVER-ipfire-xen/kernel/fs/isofs/isofs.ko
#lib/modules/KVER-ipfire-xen/kernel/fs/jbd
#lib/modules/KVER-ipfire-xen/kernel/fs/jbd/jbd.ko
#lib/modules/KVER-ipfire-xen/kernel/fs/jffs2
#lib/modules/KVER-ipfire-xen/kernel/fs/jffs2/jffs2.ko
#lib/modules/KVER-ipfire-xen/kernel/fs/jfs
#lib/modules/KVER-ipfire-xen/kernel/fs/jfs/jfs.ko
#lib/modules/KVER-ipfire-xen/kernel/fs/lockd
#lib/modules/KVER-ipfire-xen/kernel/fs/lockd/lockd.ko
#lib/modules/KVER-ipfire-xen/kernel/fs/mbcache.ko
#lib/modules/KVER-ipfire-xen/kernel/fs/nfs
#lib/modules/KVER-ipfire-xen/kernel/fs/nfs/nfs.ko
#lib/modules/KVER-ipfire-xen/kernel/fs/nfsd
#lib/modules/KVER-ipfire-xen/kernel/fs/nfsd/nfsd.ko
#lib/modules/KVER-ipfire-xen/kernel/fs/reiser4
#lib/modules/KVER-ipfire-xen/kernel/fs/reiser4/reiser4.ko
#lib/modules/KVER-ipfire-xen/kernel/fs/quota_v1.ko
#lib/modules/KVER-ipfire-xen/kernel/fs/quota_v2.ko
#lib/modules/KVER-ipfire-xen/kernel/fs/reiserfs
#lib/modules/KVER-ipfire-xen/kernel/fs/reiserfs/reiserfs.ko
#lib/modules/KVER-ipfire-xen/kernel/fs/smbfs
#lib/modules/KVER-ipfire-xen/kernel/fs/smbfs/smbfs.ko
#lib/modules/KVER-ipfire-xen/kernel/fs/udf
#lib/modules/KVER-ipfire-xen/kernel/fs/udf/udf.ko
#lib/modules/KVER-ipfire-xen/kernel/fs/vfat
#lib/modules/KVER-ipfire-xen/kernel/fs/vfat/vfat.ko
#lib/modules/KVER-ipfire-xen/kernel/fs/xfs
#lib/modules/KVER-ipfire-xen/kernel/fs/xfs/xfs.ko
#lib/modules/KVER-ipfire-xen/kernel/lib
#lib/modules/KVER-ipfire-xen/kernel/lib/crc-ccitt.ko
#lib/modules/KVER-ipfire-xen/kernel/lib/crc-itu-t.ko
@@ -1123,6 +1233,8 @@ lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/kernel/net/bluetooth/bluetooth.ko
#lib/modules/KVER-ipfire-xen/kernel/net/bluetooth/bnep
#lib/modules/KVER-ipfire-xen/kernel/net/bluetooth/bnep/bnep.ko
#lib/modules/KVER-ipfire-xen/kernel/net/bluetooth/cmtp
#lib/modules/KVER-ipfire-xen/kernel/net/bluetooth/cmtp/cmtp.ko
#lib/modules/KVER-ipfire-xen/kernel/net/bluetooth/hidp
#lib/modules/KVER-ipfire-xen/kernel/net/bluetooth/hidp/hidp.ko
#lib/modules/KVER-ipfire-xen/kernel/net/bluetooth/l2cap.ko
@@ -1186,6 +1298,7 @@ lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/ipt_ah.ko
#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/ipt_ecn.ko
#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/ipt_ipp2p.ko
#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/ipt_ipv4options.ko
#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/ipt_recent.ko
#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/ipt_ttl.ko
#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/iptable_filter.ko
@@ -1251,6 +1364,7 @@ lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/nf_conntrack_proto_udplite.ko
#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/nf_conntrack_sane.ko
#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/nf_conntrack_sip.ko
#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/nf_conntrack_slp.ko
#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/nf_conntrack_tftp.ko
#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/nfnetlink.ko
#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/nfnetlink_log.ko
@@ -1332,6 +1446,7 @@ lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/kernel/net/sched/sch_hfsc.ko
#lib/modules/KVER-ipfire-xen/kernel/net/sched/sch_htb.ko
#lib/modules/KVER-ipfire-xen/kernel/net/sched/sch_ingress.ko
#lib/modules/KVER-ipfire-xen/kernel/net/sched/sch_multiq.ko
#lib/modules/KVER-ipfire-xen/kernel/net/sched/sch_netem.ko
#lib/modules/KVER-ipfire-xen/kernel/net/sched/sch_prio.ko
#lib/modules/KVER-ipfire-xen/kernel/net/sched/sch_red.ko

View File

@@ -44,6 +44,7 @@
* as86-0.16.17
* asterisk-1.4.18
* atl2-2.0.5-kmod-2.6.27.31-ipfire
* atl2-2.0.5-kmod-2.6.27.31-ipfire-xen
* autoconf-2.59
* automake-1.9.6
* backup-ipfire
@@ -69,6 +70,7 @@
* cmake-2.4.8
* collectd-4.5.3
* compat-wireless-2009-06-17-kmod-2.6.27.31-ipfire
* compat-wireless-2009-06-17-kmod-2.6.27.31-ipfire-xen
* coreutils-5.96
* cpio-2.6
* cpufrequtils-005
@@ -84,6 +86,7 @@
* dnsmasq-2.47
* dosfstools-2.11
* e1000e-1.0.2.5-kmod-2.6.27.31-ipfire
* e1000e-1.0.2.5-kmod-2.6.27.31-ipfire-xen
* e2fsprogs-1.39
* ebtables-v2.0.8-2
* ed-0.2
@@ -130,6 +133,7 @@
* hostapd-0.6.9
* hplip-2.7.10
* hso-1.9-kmod-2.6.27.31-ipfire
* hso-1.9-kmod-2.6.27.31-ipfire-xen
* htop-0.8.1
* httpd-2.2.11
* hwdata
@@ -154,6 +158,7 @@
* kbd-1.12
* klibc-1.5.14
* kqemu-1.4.0pre1-kmod-2.6.27.31-ipfire
* kqemu-1.4.0pre1-kmod-2.6.27.31-ipfire-xen
* kudzu-1.2.64
* l7-protocols-2009-05-10
* lame-3.97
@@ -185,6 +190,7 @@
* libxml2-2.6.26
* libxslt-1.1.17
* linux-2.6.27.31-ipfire
* linux-2.6.27.31-ipfire-xen
* linux-atm-2.4.1
* linux-libc-headers-2.6.12.0
* lm_sensors-3.0.3
@@ -195,8 +201,10 @@
* lzo-2.02
* m4-1.4.4
* mISDN.git-9bf7deaa4b8829ab8fbccb34529a17aab2ddea93-kmod-2.6.27.31-ipfire
* mISDN.git-9bf7deaa4b8829ab8fbccb34529a17aab2ddea93-kmod-2.6.27.31-ipfire-xen
* mISDNuser.git-54928dec57bc846f2c2186f3640e69a053cd3641
* madwifi-hal-0.10.5.6-r4031-20090529-kmod-2.6.27.31-ipfire
* madwifi-hal-0.10.5.6-r4031-20090529-kmod-2.6.27.31-ipfire-xen
* make-3.81
* man-db-2.4.3
* man-pages-2.34
@@ -242,8 +250,9 @@
* openmailadmin-1.0.0
* openssh-5.2p1
* openssl-0.9.8k
* openswan-2.6.22
* openswan-2.6.22-kmod-2.6.27.31-ipfire
* openswan-2.6.23
* openswan-2.6.23-kmod-2.6.27.31-ipfire
* openswan-2.6.23-kmod-2.6.27.31-ipfire-xen
* openvpn-2.1_rc19
* p7zip_4.65
* pam_mysql-0.7RC1
@@ -319,6 +328,7 @@
* usbutils-0.72
* util-linux-2.12r
* v4l-dvb-bff77ec33116-kmod-2.6.27.31-ipfire
* v4l-dvb-bff77ec33116-kmod-2.6.27.31-ipfire-xen
* vdr-1.6.0
* vdradmin-am-3.6.4
* vim-7.0

12
html/cgi-bin/backup.cgi Normal file → Executable file
View File

@@ -189,18 +189,18 @@ foreach (@backups){
chomp($_);
my $Datei = "/var/ipfire/backup/".$_;
my @Info = stat($Datei);
my $Size = $Info[7] / 1024;
$Size = sprintf("%02d", $Size);
print "<tr><td align='center'>$Lang::tr{'backup from'} $_ $Lang::tr{'size'} $Size KB</td><td width='5'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='download' /><input type='hidden' name='FILE' value='$_' /><input type='image' alt='$Lang::tr{'download'}' title='$Lang::tr{'download'}' src='/images/package-x-generic.png' /></form></td>";
my $Size = $Info[7] / 1024 / 1024;
$Size = sprintf("%0.2f", $Size);
print "<tr><td align='center'>$Lang::tr{'backup from'} $_ $Lang::tr{'size'} $Size MB</td><td width='5'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='download' /><input type='hidden' name='FILE' value='$_' /><input type='image' alt='$Lang::tr{'download'}' title='$Lang::tr{'download'}' src='/images/package-x-generic.png' /></form></td>";
print "<td width='5'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='delete' /><input type='hidden' name='FILE' value='$_' /><input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/user-trash.png' /></form></td></tr>";
}
foreach (@backupisos){
chomp($_);
my $Datei = "/var/tmp/backupiso/".$_;
my @Info = stat($Datei);
my $Size = $Info[7] / 1024;
$Size = sprintf("%02d", $Size);
print "<tr><td align='center'>$Lang::tr{'backup from'} $_ $Lang::tr{'size'} $Size KB</td><td width='5'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='downloadiso' /><input type='hidden' name='FILE' value='$_' /><input type='image' alt='$Lang::tr{'download'}' title='$Lang::tr{'download'}' src='/images/package-x-generic.png' /></form></td>";
my $Size = $Info[7] / 1024 / 1024;
$Size = sprintf("%0.2f", $Size);
print "<tr><td align='center'>$Lang::tr{'backup from'} $_ $Lang::tr{'size'} $Size MB</td><td width='5'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='downloadiso' /><input type='hidden' name='FILE' value='$_' /><input type='image' alt='$Lang::tr{'download'}' title='$Lang::tr{'download'}' src='/images/package-x-generic.png' /></form></td>";
print "<td width='5'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='delete' /><input type='hidden' name='FILE' value='$_' /><input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/user-trash.png' /></form></td></tr>";
}
print <<END

66
html/cgi-bin/dns.cgi Normal file → Executable file
View File

@@ -63,13 +63,20 @@ if ($dnssettings{'ACTION'} eq $Lang::tr{'save'}) {
}
}
if ($dnssettings{'RECONNECT'} eq $Lang::tr{'reconnect'}) {
if ($dnssettings{'ACTION'} eq $Lang::tr{'reconnect'}) {
system("/usr/local/bin/redctrl restart >/dev/null 2>&1 &");
&Header::openbox('100%', 'left', $Lang::tr{'dns address recon'} );
print "<font class='base'>$Lang::tr{'dns address done'}</font>\n";
&Header::closebox();
}
if ($dnssettings{'ACTION'} eq $Lang::tr{'delete'}) {
system("cat /dev/null > ${General::swroot}/dns/settings &");
&Header::openbox('100%', 'left', $Lang::tr{'dns address deleted'} );
print "<font class='base'>$Lang::tr{'dns address deleted txt'}</font>\n";
&Header::closebox();
}
# DPC move error message to top so it is seen!
if ($errormessage) {
&Header::openbox('100%', 'left', $Lang::tr{'error messages'});
@@ -91,20 +98,75 @@ print <<END
</tr>
<tr>
<td width="25%"><font class='base'>$Lang::tr{'dns new 0'}</font></td>
END
;
if ($dnssettings{'ACTION'} eq $Lang::tr{'delete'}) {
print <<END
<td width="75%"><input type="text" name="DNS0" maxlength="15" value=""/></td>
END
;
} else {
print <<END
<td width="75%"><input type="text" name="DNS0" maxlength="15" value="$dnssettings{"DNS0"}"/></td>
END
;
}
print <<END
</tr>
<tr>
<td><font class='base'>$Lang::tr{'dns new 1'}</font></td>
END
;
if ($dnssettings{'ACTION'} eq $Lang::tr{'delete'}) {
print <<END
<td><input type="text" name="DNS1" maxlength="15" value=""/></td>
END
;
} else {
print <<END
<td><input type="text" name="DNS1" maxlength="15" value="$dnssettings{"DNS1"}"/></td>
END
;
}
print <<END
</tr>
<tr>
<td colspan="2"><hr /></td>
</tr>
<tr>
<td colspan="2"><div align="center">
END
;
if ($dnssettings{'ACTION'} eq $Lang::tr{'save'} && $errormessage eq "") {
print <<END
<input type='submit' name='ACTION' value='$Lang::tr{'save'}' />
&nbsp;&nbsp;&nbsp;&nbsp;
<input type='submit' name='RECONNECT' value='$Lang::tr{'reconnect'}' />
<input type='submit' name='ACTION' value='$Lang::tr{'delete'}' />
&nbsp;&nbsp;&nbsp;&nbsp;
<input type='submit' name='ACTION' value='$Lang::tr{'reconnect'}' />
END
;
} elsif ($dnssettings{'ACTION'} eq $Lang::tr{'delete'}) {
print <<END
<input type='submit' name='ACTION' value='$Lang::tr{'save'}' />
&nbsp;&nbsp;&nbsp;&nbsp;
<input type='submit' name='ACTION' value='$Lang::tr{'reconnect'}' />
END
;
} elsif ($dnssettings{'ACTION'} eq $Lang::tr{'save'}) {
print <<END
<input type='submit' name='ACTION' value='$Lang::tr{'save'}' />
END
;
} else {
print <<END
<input type='submit' name='ACTION' value='$Lang::tr{'save'}' />
&nbsp;&nbsp;&nbsp;&nbsp;
<input type='submit' name='ACTION' value='$Lang::tr{'delete'}' />
END
;
}
print <<END
</div>
</td>
</tr>

66
html/cgi-bin/mac.cgi Normal file → Executable file
View File

@@ -67,12 +67,26 @@ if ($macsettings{'ACTION'} eq $Lang::tr{'save'}) {
$errormessage = $Lang::tr{'mac address error not valid'};
}
}
if ($macsettings{'RECONNECT'} eq $Lang::tr{'reconnect'}) {
if ($macsettings{'ACTION'} eq $Lang::tr{'reconnect'}) {
system("/usr/local/bin/redctrl restart >/dev/null 2>&1 &");
&Header::openbox('100%', 'left', $Lang::tr{'mac address recon'} );
print "<font class='base'>$Lang::tr{'mac address done'}</font>\n";
&Header::closebox();
}
if ($macsettings{'ACTION'} eq $Lang::tr{'delete'} ) {
system("cat /dev/null > ${General::swroot}/mac/settings &");
&Header::openbox('100%', 'left', $Lang::tr{'mac address deleted'} );
print "<font class='base'>$Lang::tr{'mac address deleted txt'}</font>\n";
&Header::closebox();
}
if ($macsettings{'ACTION'} eq $Lang::tr{'reboot'}) {
&General::log($Lang::tr{'rebooting ipfire'});
system("/usr/local/bin/ipfirereboot boot");
&Header::openbox('100%', 'left', $Lang::tr{'rebooting ipfire'} );
print "&nbsp;&nbsp;<img src='/images/indicator.gif' /><br /><br />";
print "<meta http-equiv='refresh' content='120;'>";
&Header::closebox();
}
# DPC move error message to top so it is seen!
if ($errormessage) {
@@ -95,23 +109,69 @@ print <<END
</tr>
<tr>
<td><font class='base'>$Lang::tr{'mac new'}&nbsp;</font>
END
;
if ($macsettings{'ACTION'} eq $Lang::tr{'delete'} ) {
print <<END
<input type="text" name="MAC" maxlength="17" value=''/></td>
END
;
} else {
print <<END
<input type="text" name="MAC" maxlength="17" value='$macsettings{"MAC"}'/></td>
END
;
}
print <<END
</tr>
<tr>
<td><hr /></td>
</tr>
<tr>
<td><div align="center">
END
;
if ($macsettings{'ACTION'} eq $Lang::tr{'delete'} ) {
print <<END
<input type='submit' name='ACTION' value='$Lang::tr{'save'}' />
&nbsp;&nbsp;&nbsp;&nbsp;
<input type='submit' name='RECONNECT' value='$Lang::tr{'reconnect'}' />
<input type='submit' name='ACTION' value='$Lang::tr{'delete'}' />
&nbsp;&nbsp;&nbsp;&nbsp;
<input type='submit' name='ACTION' value='$Lang::tr{'reboot'}' />
END
;
} elsif ($macsettings{'ACTION'} eq $Lang::tr{'save'} && $errormessage eq "") {
print <<END
<input type='submit' name='ACTION' value='$Lang::tr{'save'}' />
&nbsp;&nbsp;&nbsp;&nbsp;
<input type='submit' name='ACTION' value='$Lang::tr{'delete'}' />
&nbsp;&nbsp;&nbsp;&nbsp;
<input type='submit' name='ACTION' value='$Lang::tr{'reconnect'}' />
END
;
} elsif ($macsettings{'ACTION'} eq $Lang::tr{'save'}) {
print <<END
<input type='submit' name='ACTION' value='$Lang::tr{'save'}' />
END
;
} else {
print <<END
<input type='submit' name='ACTION' value='$Lang::tr{'save'}' />
&nbsp;&nbsp;&nbsp;&nbsp;
<input type='submit' name='ACTION' value='$Lang::tr{'delete'}' />
END
;
}
print <<END
</div></td>
</tr>
</table>
END
;
&Header::closebox();
print "</form>\n";

View File

@@ -333,7 +333,6 @@
'alt system' => 'System',
'alt vpn' => 'VPNs',
'and' => 'Und',
'apcupsd' => 'APCUPSD',
'apply' => 'Jetzt anwenden',
'april' => 'April',
'archive not exist' => 'Konfigurationsarchiv existiert nicht',
@@ -642,6 +641,8 @@
'dns header' => 'DNS Server Adressen zuweisen nur mit DHCP an red0',
'dns saved' => 'Erfolgreich gespeichert!',
'dns saved txt' => 'Die beiden eingegebenen DNS Server Adressen wurde erfolgreich gespeichert.<br />Um die Änderung wirksarm zu machen müssen Sie neustarten oder wiederverbinden!',
'dns address deleted' => 'Erfolgreich gelöscht! ',
'dns address deleted txt' => 'DNS Server Adressen wurden erfolgreich gelöscht. Änderungen werden jedoch erst nach einem Neustart oder einer Wiederverbindung übernommen.',
'dns error 1' => 'Die IP Adresse vom <strong>sekundären</strong> DNS Server ist nicht gültig, bitte überprüfen Sie Ihre Eingabe!<br />Die eingegebene <strong>primäre</strong> DNS Server Adresse ist jedoch gültig.',
'dns error 0' => 'Die IP Adresse vom <strong>primären</strong> DNS Server ist nicht gültig, bitte überprüfen Sie Ihre Eingabe!<br />Die eingegebene <strong>sekundären</strong> DNS Server Adresse ist jedoch gültig.<br />',
'dns error 01' => 'Die eingegebene IP Adresse des <strong>primären</strong> wie auch des <strong>sekundären</strong> DNS Servers sind nicht gültig, bitte überprüfen Sie Ihre Eingaben!',
@@ -650,7 +651,7 @@
'dns new 0' => 'Neue <strong>primäre</strong> DNS Server IP:',
'dns new 1' => 'Neue <strong>sekundäre</strong> DNS Server IP:',
'dns address recon' => 'Es wird neu Verbunden!',
'dns address done' => 'Die DNS-Server Adressen werden übernommen.',
'dns address done' => 'Die DNS-Server Adressen Einstellungen werden übernommen.',
'do not log this port list' => 'Verwerfe diese Port-Liste kurz bevor sie protokolliert werden (reduziert Protokollgröße)',
'dod' => 'Dial-on-Demand-Modus',
'dod for dns' => 'Dial-on-Demand für DNS:',
@@ -1054,11 +1055,14 @@
'mac address error not valid' => 'Keine gültige MAC-Adresse!',
'mac address error not 00' => 'MAC-Adresse muss mit 00 beginnen!',
'mac address saved' => 'Erfolgreich gespeichert!',
'mac address saved txt' => 'Die MAC-Adresse wurde erfolgreich gespeichert, Änderungen werden jedoch erst nach einem Neustart oder einer Wiederverbindung übernommen.',
'mac address saved txt' => 'Die MAC-Adresse wurde erfolgreich gespeichert. Änderungen werden jedoch erst nach einem Neustart oder einer Wiederverbindung übernommen.',
'mac address deleted' => 'Erfolgreich gelöscht! ',
'mac address deleted txt' => 'Mac Adresse wurde erfolgreich gelöscht. Änderungen werden jedoch erst nach einem <strong>Neustart</strong> übernommen.',
'mac address recon' => 'Es wird neu Verbunden!',
'mac address done' => 'Die MAC-Adresse wird übernommen',
'mac address done' => 'Die MAC-Adressen Einstellungen werden übernommen',
'mac desc' => 'Sie können an dieser Stelle die MAC-Adresse von red0 ändern. Die Adresse muss in hexadezimal (0-9,a-f) eingegeben werden, eine gültige Eingaben ist z.B. 00-01-02-0e-b8-d6 oder 00:01:02:0e:b8:d6.',
'mac new' => 'Neue MAC-Adresse:',
'mac new' => 'Neue MAC-Adresse:',
'magic packet send to:' => 'Sende WOL-Paket an',
'mailmethod' => 'Mail Methode',
'mailprogramm' => 'Mail Programm',

View File

@@ -338,7 +338,6 @@
'alt vpn' => 'VPNs',
'and' => 'And',
'ansi t1.483' => 'TO BE REMOVED',
'apcupsd' => 'APCUPSD',
'apply' => 'Apply now',
'april' => 'April',
'archive not exist' => 'Configuration archive does not exist',
@@ -667,7 +666,9 @@
'dns title' => 'Domain Name System',
'dns header' => 'assign DNS server addresses only for DHCP on red0',
'dns saved' => 'Successfully saved!',
'dns saved txt' => 'The two entered DNS server addresses has been saved successfully.<br />You have to reboot or reconnect that the changes have effect!',
'dns saved txt' => 'The two entered DNS server addresses have been saved successfully.<br />You have to reboot or reconnect that the changes have effect!',
'dns address deleted' => 'Successfully deleted!',
'dns address deleted txt' => 'The DNS-Server addresses have been successfully deleted.<br />You have to reboot or reconnect that the changes have effect!',
'dns error 1' => 'The IP address of the <strong>secondary</strong> DNS server is not valid, please check your entries!<br />The entered <strong>primary</strong> DNS server address is valid.',
'dns error 0' => 'The IP address of the <strong>primary</strong> DNS server is not valid, please check your entries!<br />The entered <strong>secondary</strong> DNS server address is valid.',
'dns error 01' => 'The entered IP address of the <strong>primary</strong> and <strong>secondary</strong> DNS server are not valid, please check your entries!',
@@ -676,7 +677,7 @@
'dns new 0' => 'New <strong>primary</strong> DNS server IP:',
'dns new 1' => 'New <strong>secondary</strong> DNS server IP:',
'dns address recon' => 'Trying to reconnect!',
'dns address done' => 'The DNS-Server addresses are going to be saved.',
'dns address done' => 'The DNS-Server address settings are going to be saved.',
'do not log this port list' => 'Drop this port list just before they are logged (reduces log size)',
'dod' => 'Dial on Demand',
'dod for dns' => 'Dial on Demand for DNS:',
@@ -1084,9 +1085,11 @@
'mac address error not valid' => 'MAC addresse not valid!',
'mac address error not 00' => 'MAC addresse has to start with 00!',
'mac address saved' => 'Successfully saved!',
'mac address saved txt' => 'The MAC address has been successfully saved, but changes will take effect after reboot or reconnection.',
'mac address saved txt' => 'The MAC address has been successfully saved, but changes will only take effect after reboot or reconnection.',
'mac address deleted' => 'Successfully deleted!',
'mac address deleted txt' => 'The MAC address has been successfully deleted, but changes will only take effect after <strong>reboot</strong>.',
'mac address recon' => 'Trying to reconnect!',
'mac address done' => 'The MAC address will be saved.',
'mac address done' => 'The MAC address settings are going to be saved.',
'mac desc' => 'Here you are able to change the MAC address on red0. The address must be entered in hexadecimal (0-9,a-f), a valid entry is <br />e.g. 00-01-02-0e-b8-d6 or 00:01:02:0e:b8:d6.',
'mac new' => 'new MAC addresse:',
'magic packet send to:' => 'Magic packet send to:',

View File

@@ -30,7 +30,7 @@ else
VERSUFIX=ipfire
endif
VER = 2.6.22
VER = 2.6.23
THISAPP = openswan-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -51,7 +51,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 9a30009bade8a1b09fba27680c87cf72
$(DL_FILE)_MD5 = c83053471e639bf3b97e3cf7796b7e83
install : $(TARGET)

View File

@@ -79,6 +79,20 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
chroot $(MNThdd) /opt/pakfire/tmp/install.sh
rm -rf $(MNThdd)/opt/pakfire/tmp/*
#Create grub menuentry for pygrub
mkdir $(MNThdd)/boot/grub
echo "title IPFire (XEN-Kernel)" > $(MNThdd)/boot/grub/grub.conf
echo " root(hd0,0)" >> $(MNThdd)/boot/grub/grub.conf
echo " kernel /vmlinuz-$(KVER)-ipfire-xen root=/dev/xvda1 rootdelay=10 panic=10 ro" \
>> $(MNThdd)/boot/grub/grub.conf
echo " initrd /ipfirerd-$(KVER)-xen.img" >> $(MNThdd)/boot/grub/grub.conf
echo " savedefault 1" >> $(MNThdd)/boot/grub/grub.conf
ln -s grub.conf $(MNThdd)/boot/grub/menu.lst
#Copy the meta-info of linux-xen package
cp -f /install/packages/meta-linux-xen $(MNThdd)/opt/pakfire/db/installed
cp -f /install/packages/meta-linux-xen $(MNThdd)/opt/pakfire/db/meta
#Set default configuration
echo "LANGUAGE=en" >> $(MNThdd)/var/ipfire/main/settings
echo "HOSTNAME=$(SNAME)" >> $(MNThdd)/var/ipfire/main/settings
@@ -105,6 +119,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
chroot $(MNThdd) /sbin/mkinitcpio -g /boot/ipfirerd-$(KVER)-xen.img -k $(KVER)-ipfire-xen
cp -f $(MNThdd)/etc/mkinitcpio.conf.org $(MNThdd)/etc/mkinitcpio.conf
# Create a script for rebuild-initrd and setup
echo "#!/bin/bash" > $(MNThdd)/etc/rc.d/rcsysinit.d/S75firstsetup
echo "/usr/local/sbin/setup /dev/null INSTALL" >> $(MNThdd)/etc/rc.d/rcsysinit.d/S75firstsetup

38
make.sh
View File

@@ -338,17 +338,17 @@ buildipfire() {
ipfiremake pptp
ipfiremake unzip
ipfiremake which
# ipfiremake linux XEN=1
# ipfiremake atl2 XEN=1
# ipfiremake hso XEN=1
# ipfiremake e1000e XEN=1
# ipfiremake kqemu XEN=1
# ipfiremake v4l-dvb XEN=1
# ipfiremake madwifi XEN=1
## ipfiremake alsa XEN=1 KMOD=1
# ipfiremake openswan XEN=1 KMOD=1
# ipfiremake mISDN XEN=1
# ipfiremake compat-wireless XEN=1
ipfiremake linux XEN=1
ipfiremake atl2 XEN=1
ipfiremake hso XEN=1
ipfiremake e1000e XEN=1
ipfiremake kqemu XEN=1
ipfiremake v4l-dvb XEN=1
ipfiremake madwifi XEN=1
# ipfiremake alsa XEN=1 KMOD=1
ipfiremake openswan XEN=1 KMOD=1
ipfiremake mISDN XEN=1
ipfiremake compat-wireless XEN=1
ipfiremake linux
ipfiremake atl2
ipfiremake hso
@@ -713,13 +713,15 @@ buildpackages() {
ipfirepackages
# # Check if there is a loop device for building in virtual environments
# if [ -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then
# cp -f $BASEDIR/packages/linux-xen-*.ipfire $LFS/install/packages/
# ipfiremake xen-image ED=$IPFVER
# rm -rf $LFS/install/packages/linux-xen-*.ipfire
# fi
# mv $LFS/install/images/*.bz2 $BASEDIR >> $LOGFILE 2>&1
# Check if there is a loop device for building in virtual environments
if [ -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then
cp -f $BASEDIR/packages/linux-xen-*.ipfire $LFS/install/packages/
cp -f $BASEDIR/packages/meta-linux-xen $LFS/install/packages/
ipfiremake xen-image ED=$IPFVER
rm -rf $LFS/install/packages/linux-xen-*.ipfire
rm -rf $LFS/install/packages/meta-linux-xen
fi
mv $LFS/install/images/*.bz2 $BASEDIR >> $LOGFILE 2>&1
# Cleanup
stdumount

View File

@@ -28,7 +28,7 @@ int main(int argc, char *argv[]) {
}
sprintf(command, "/tmp/hddshutdown-%s", argv[1]);
sprintf(command, "/var/run/hddshutdown-%s", argv[1]);
FILE *fp = fopen(command,"r");
if( fp ) {
fclose(fp);

View File

@@ -24,7 +24,7 @@
. /opt/pakfire/lib/functions.sh
extract_files
#
KVER=2.6.25.18
KVER=2.6.27.31
ROOT=`grep "root=" /boot/grub/grub.conf | cut -d"=" -f2 | cut -d" " -f1 | tail -n 1`
MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1`
# Nur den letzten Parameter verwenden
@@ -37,26 +37,25 @@ let ENTRY=$_+1
#
# backup grub.conf
#
cp /boot/grub/grub.conf /boot/grub/grub-backup-$KVER.conf
cp /boot/grub/grub.conf /boot/grub/grub-backup-$KVER-xen.conf
#
# Add new Entry to grub.conf
#
echo "" >> /boot/grub/grub.conf
echo "title IPFire alternative Kernel:$KVER" >> /boot/grub/grub.conf
echo "title IPFire (XEN-Kernel)" >> /boot/grub/grub.conf
echo " root (hd0,0)" >> /boot/grub/grub.conf
echo " kernel /vmlinuz-$KVER-ipfire root=$ROOT rootdelay=10 panic=10 $MOUNT" >> /boot/grub/grub.conf
echo " initrd /ipfirerd-$KVER.img" >> /boot/grub/grub.conf
echo " kernel /vmlinuz-$KVER-ipfire-xen root=$ROOT rootdelay=10 panic=10 $MOUNT" >> /boot/grub/grub.conf
echo " initrd /ipfirerd-$KVER-xen.img" >> /boot/grub/grub.conf
echo " savedefault $ENTRY" >> /boot/grub/grub.conf
#
# Made initramdisk
#
mkinitcpio -k $KVER-ipfire -g /boot/ipfirerd-$KVER.img
#
# ReInstall grub
#
grub-install --no-floppy ${ROOT::`expr length $ROOT`-1}
cp -f /etc/mkinitcpio.conf.org /etc/mkinitcpio.conf
sed -i -e "s| autodetect | |g" /etc/mkinitcpio.conf
# Remove Reiser4 (not working with xen)
sed -i -e "s|reiser4 | |g" /etc/mkinitcpio.conf
mkinitcpio -k $KVER-ipfire-xen -g /boot/ipfirerd-$KVER-xen.img
#
# Create new module depency
#
depmod -a $KVER-ipfire
depmod -a $KVER-ipfire-xen

View File

@@ -23,4 +23,4 @@
#
. /opt/pakfire/lib/functions.sh
remove_files
mv -f /boot/grub/grub-backup-2.6.25.*.conf /boot/grub/grub.conf
mv -f /boot/grub/grub-backup-2.6.27.*.-xen.conf /boot/grub/grub.conf

View File

@@ -22,5 +22,6 @@
############################################################################
#
. /opt/pakfire/lib/functions.sh
./uninstall.sh
#Don't remove old xen kernel at update
#./uninstall.sh
./install.sh

View File

@@ -1,31 +0,0 @@
From: Alexey Starikovskiy <astarikovskiy@suse.de>
Subject: ACPI: EC: Limit workaround for ASUS notebooks even more
References: bnc#492658 bnc#496871 and others
Patch-Mainline: yes
Commit-ID: 235c4a59278eb07e61d909f1f0c233733034a8b3
Signed-off-by: Thomas Renninger <trenn@suse.de>
References: http://bugzilla.kernel.org/show_bug.cgi?id=11884
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Len Brown <len.brown@intel.com>
---
drivers/acpi/ec.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Index: linux-2.6.27-SLE11_BRANCH/drivers/acpi/ec.c
===================================================================
--- linux-2.6.27-SLE11_BRANCH.orig/drivers/acpi/ec.c
+++ linux-2.6.27-SLE11_BRANCH/drivers/acpi/ec.c
@@ -1017,7 +1017,8 @@ int __init acpi_ec_ecdt_probe(void)
* which needs it, has fake EC._INI method, so use it as flag.
* Keep boot_ec struct as it will be needed soon.
*/
- if (ACPI_FAILURE(acpi_get_handle(boot_ec->handle, "_INI", &dummy)))
+ if (!dmi_name_in_vendors("ASUS") ||
+ ACPI_FAILURE(acpi_get_handle(boot_ec->handle, "_INI", &dummy)))
return -ENODEV;
install:
if (!ec_install_handlers(boot_ec)) {

View File

@@ -1,42 +0,0 @@
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 19 Mar 2009 18:10:17 +0000 (-0700)
Subject: Add '-fwrapv' to gcc CFLAGS
Patch-mainline: 2.6.29
Git-commit: 68df3755e383e6fecf2354a67b08f92f18536594
References: bko#12597 bnc#487106
Add '-fwrapv' to gcc CFLAGS
This makes sure that gcc doesn't try to optimize away wrapping
arithmetic, which the kernel occasionally uses for overflow testing, ie
things like
if (ptr + offset < ptr)
which technically is undefined for non-unsigned types. See
http://bugzilla.kernel.org/show_bug.cgi?id=12597
for details.
Not all versions of gcc support it, so we need to make it conditional
(it looks like it was introduced in gcc-3.4).
Reminded-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Acked-by: Jeff Mahoney <jeffm@suse.com>
---
Makefile | 1 +
1 file changed, 1 insertion(+)
--- a/Makefile
+++ b/Makefile
@@ -341,6 +341,7 @@ KBUILD_CPPFLAGS := -D__KERNEL__ $(LINUXI
KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
-fno-strict-aliasing -fno-common \
-Werror-implicit-function-declaration
+KBUILD_CFLAGS += $(call cc-option,-fwrapv)
KBUILD_AFLAGS := -D__ASSEMBLY__
# Warn about unsupported modules in kernels built inside Autobuild

View File

@@ -1,27 +0,0 @@
From foo@baz Fri Jun 26 08:05:20 PDT 2009
Date: Fri, 26 Jun 2009 08:05:20 -0700
To: Greg KH <greg@kroah.com>
From: Greg Kroah-Hartman <gregkh@suse.de>
Subject: USB: ti_usb_3410_5052: fix duplicate device ids.
References: bnc#395775
Patch-mainline: 2.6.31
commit 1a1fab513734b3a4fca1bee8229e5ff7e1cb873c accidentally added the
device id to both tables in the driver, which causes problems as this is
only a single port device, not a multiple port device.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/usb/serial/ti_usb_3410_5052.c | 1 -
1 file changed, 1 deletion(-)
--- a/drivers/usb/serial/ti_usb_3410_5052.c
+++ b/drivers/usb/serial/ti_usb_3410_5052.c
@@ -240,7 +240,6 @@ static struct usb_device_id ti_id_table_
{ USB_DEVICE(TI_VENDOR_ID, TI_5152_BOOT_PRODUCT_ID) },
{ USB_DEVICE(TI_VENDOR_ID, TI_5052_EEPROM_PRODUCT_ID) },
{ USB_DEVICE(TI_VENDOR_ID, TI_5052_FIRMWARE_PRODUCT_ID) },
- { USB_DEVICE(IBM_VENDOR_ID, IBM_4543_PRODUCT_ID) },
};
static struct usb_device_id ti_id_table_combined[14+2*TI_EXTRA_VID_PID_COUNT+1] = {

View File

@@ -1,29 +0,0 @@
From: npiggin@suse.de
Subject: disable smtnice
References: 163880
Patch-mainline: obsolete
SLES9 has SMT nice disabled for different reasons, but in
sles10, it creates significant contention on the runq
locks. Any scheduler intensive benchmark is slow with
smt nice enabled. This patch turns it off.
Acked-by: mason@suse.de
Acked-by: okir@suse.de
---
include/linux/topology.h | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- a/include/linux/topology.h
+++ b/include/linux/topology.h
@@ -99,8 +99,7 @@ void arch_update_cpu_topology(void);
| SD_BALANCE_FORK \
| SD_BALANCE_EXEC \
| SD_WAKE_AFFINE \
- | SD_WAKE_IDLE \
- | SD_SHARE_CPUPOWER, \
+ | SD_WAKE_IDLE, \
.last_balance = jiffies, \
.balance_interval = 1, \
}

View File

@@ -55,7 +55,7 @@ Signed-off-by: Jeff Mahoney <jeffm@suse.com>
int security_task_create(unsigned long clone_flags);
int security_task_alloc(struct task_struct *p);
void security_task_free(struct task_struct *p);
@@ -2240,6 +2256,11 @@ static inline int security_dentry_open(s
@@ -2242,6 +2258,11 @@ static inline int security_dentry_open(s
{
return 0;
}
@@ -91,7 +91,7 @@ Signed-off-by: Jeff Mahoney <jeffm@suse.com>
set_to_cap_if_null(ops, task_free_security);
--- a/security/security.c
+++ b/security/security.c
@@ -615,6 +615,15 @@ int security_dentry_open(struct file *fi
@@ -612,6 +612,15 @@ int security_dentry_open(struct file *fi
return security_ops->dentry_open(file);
}

View File

@@ -11,7 +11,7 @@ Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -117,6 +117,7 @@ config SECURITY_DEFAULT_MMAP_MIN_ADDR
@@ -97,6 +97,7 @@ config SECURITY_ROOTPLUG
source security/selinux/Kconfig
source security/smack/Kconfig

View File

@@ -15,10 +15,10 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -2299,3 +2299,33 @@ void __put_mnt_ns(struct mnt_namespace *
release_mounts(&umount_list);
@@ -2357,3 +2357,33 @@ void put_mnt_ns(struct mnt_namespace *ns
kfree(ns);
}
EXPORT_SYMBOL(put_mnt_ns);
+
+char *d_namespace_path(struct dentry *dentry, struct vfsmount *vfsmnt,
+ char *buf, int buflen)
@@ -51,7 +51,7 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
+EXPORT_SYMBOL(d_namespace_path);
--- a/include/linux/mount.h
+++ b/include/linux/mount.h
@@ -134,4 +134,6 @@ extern void mark_mounts_for_expiry(struc
@@ -137,4 +137,6 @@ extern void mark_mounts_for_expiry(struc
extern spinlock_t vfsmount_lock;
extern dev_t name_to_dev_t(char *name);

View File

@@ -14,7 +14,7 @@ Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -2312,7 +2312,7 @@ char *d_namespace_path(struct dentry *de
@@ -2370,7 +2370,7 @@ char *d_namespace_path(struct dentry *de
path_get(&current->fs->root);
read_unlock(&current->fs->lock);
spin_lock(&vfsmount_lock);

View File

@@ -16,7 +16,7 @@ Signed-off-by: Jeff Mahoney <jeffm@suse.com>
--- a/security/security.c
+++ b/security/security.c
@@ -415,6 +415,7 @@ int security_inode_mknod(struct inode *d
@@ -412,6 +412,7 @@ int security_inode_mknod(struct inode *d
return 0;
return security_ops->inode_mknod(dir, dentry, mnt, mode, dev);
}

View File

@@ -217,7 +217,7 @@ Signed-off-by: John Johansen <jjohansen@suse.de> ---
static int fuse_getattr(struct vfsmount *mnt, struct dentry *entry,
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -1466,6 +1466,11 @@ static loff_t fuse_file_llseek(struct fi
@@ -1467,6 +1467,11 @@ static loff_t fuse_file_llseek(struct fi
return retval;
}
@@ -229,7 +229,7 @@ Signed-off-by: John Johansen <jjohansen@suse.de> ---
static const struct file_operations fuse_file_operations = {
.llseek = fuse_file_llseek,
.read = do_sync_read,
@@ -1479,6 +1484,7 @@ static const struct file_operations fuse
@@ -1480,6 +1485,7 @@ static const struct file_operations fuse
.fsync = fuse_fsync,
.lock = fuse_file_lock,
.flock = fuse_file_flock,
@@ -237,7 +237,7 @@ Signed-off-by: John Johansen <jjohansen@suse.de> ---
.splice_read = generic_file_splice_read,
};
@@ -1492,6 +1498,7 @@ static const struct file_operations fuse
@@ -1493,6 +1499,7 @@ static const struct file_operations fuse
.fsync = fuse_fsync,
.lock = fuse_file_lock,
.flock = fuse_file_flock,

View File

@@ -78,7 +78,7 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
}
--- a/security/security.c
+++ b/security/security.c
@@ -358,11 +358,12 @@ int security_inode_init_security(struct
@@ -355,11 +355,12 @@ int security_inode_init_security(struct
}
EXPORT_SYMBOL(security_inode_init_security);

View File

@@ -82,7 +82,7 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
}
--- a/security/security.c
+++ b/security/security.c
@@ -491,11 +491,12 @@ void security_inode_post_setxattr(struct
@@ -488,11 +488,12 @@ void security_inode_post_setxattr(struct
flags);
}

View File

@@ -18,7 +18,7 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -2437,7 +2437,8 @@ int vfs_link(struct dentry *old_dentry,
@@ -2437,7 +2437,8 @@ int vfs_link(struct dentry *old_dentry,
if (S_ISDIR(inode->i_mode))
return -EPERM;
@@ -53,7 +53,7 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
int (*inode_unlink) (struct inode *dir, struct dentry *dentry);
int (*inode_symlink) (struct inode *dir, struct dentry *dentry,
struct vfsmount *mnt, const char *old_name);
@@ -1632,8 +1635,9 @@ int security_inode_init_security(struct
@@ -1632,8 +1635,9 @@ int security_inode_init_security(struct
char **name, void **value, size_t *len);
int security_inode_create(struct inode *dir, struct dentry *dentry,
struct vfsmount *mnt, int mode);
@@ -94,7 +94,7 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
}
--- a/security/security.c
+++ b/security/security.c
@@ -366,12 +366,14 @@ int security_inode_create(struct inode *
@@ -363,12 +363,14 @@ int security_inode_create(struct inode *
return security_ops->inode_create(dir, dentry, mnt, mode);
}

View File

@@ -78,7 +78,7 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
}
--- a/security/security.c
+++ b/security/security.c
@@ -499,11 +499,11 @@ int security_inode_getxattr(struct dentr
@@ -496,11 +496,11 @@ int security_inode_getxattr(struct dentr
return security_ops->inode_getxattr(dentry, mnt, name);
}

View File

@@ -17,7 +17,7 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -2089,7 +2089,7 @@ int vfs_mkdir(struct inode *dir, struct
@@ -2089,7 +2089,7 @@ int vfs_mkdir(struct inode *dir, struct
return -EPERM;
mode &= (S_IRWXUGO|S_ISVTX);
@@ -77,7 +77,7 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
}
--- a/security/security.c
+++ b/security/security.c
@@ -389,11 +389,12 @@ int security_inode_symlink(struct inode
@@ -386,11 +386,12 @@ int security_inode_symlink(struct inode
return security_ops->inode_symlink(dir, dentry, old_name);
}
@@ -94,7 +94,7 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
int security_inode_rmdir(struct inode *dir, struct dentry *dentry)
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -2597,7 +2597,8 @@ static int selinux_inode_symlink(struct
@@ -2597,7 +2597,8 @@ static int selinux_inode_symlink(struct
return may_create(dir, dentry, SECCLASS_LNK_FILE);
}

View File

@@ -17,7 +17,7 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1994,7 +1994,7 @@ int vfs_mknod(struct inode *dir, struct
@@ -1994,7 +1994,7 @@ int vfs_mknod(struct inode *dir, struct
if (error)
return error;
@@ -26,7 +26,7 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
if (error)
return error;
@@ -2056,11 +2056,11 @@ asmlinkage long sys_mknodat(int dfd, con
@@ -2056,11 +2056,11 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
break;
case S_IFCHR: case S_IFBLK:
error = vfs_mknod(nd.path.dentry->d_inode, dentry,
@@ -59,7 +59,7 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
int (*inode_rename) (struct inode *old_dir, struct dentry *old_dentry,
struct inode *new_dir, struct dentry *new_dentry);
int (*inode_readlink) (struct dentry *dentry);
@@ -1637,7 +1638,8 @@ int security_inode_symlink(struct inode
@@ -1637,7 +1638,8 @@ int security_inode_symlink(struct inode
int security_inode_mkdir(struct inode *dir, struct dentry *dentry,
struct vfsmount *mnt, int mode);
int security_inode_rmdir(struct inode *dir, struct dentry *dentry);
@@ -79,7 +79,7 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
return 0;
--- a/security/capability.c
+++ b/security/capability.c
@@ -189,7 +189,7 @@ static int cap_inode_rmdir(struct inode
@@ -189,7 +189,7 @@ static int cap_inode_rmdir(struct inode
}
static int cap_inode_mknod(struct inode *inode, struct dentry *dentry,
@@ -90,7 +90,7 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
}
--- a/security/security.c
+++ b/security/security.c
@@ -404,11 +404,12 @@ int security_inode_rmdir(struct inode *d
@@ -401,11 +401,12 @@ int security_inode_rmdir(struct inode *d
return security_ops->inode_rmdir(dir, dentry);
}

View File

@@ -77,7 +77,7 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
}
--- a/security/security.c
+++ b/security/security.c
@@ -422,11 +422,11 @@ int security_inode_rename(struct inode *
@@ -419,11 +419,11 @@ int security_inode_rename(struct inode *
new_dir, new_dentry);
}

View File

@@ -86,7 +86,7 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
if (!capable(CAP_SETFCAP))
--- a/security/security.c
+++ b/security/security.c
@@ -506,11 +506,12 @@ int security_inode_listxattr(struct dent
@@ -503,11 +503,12 @@ int security_inode_listxattr(struct dent
return security_ops->inode_listxattr(dentry, mnt);
}

View File

@@ -86,7 +86,7 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
}
--- a/security/capability.c
+++ b/security/capability.c
@@ -198,7 +198,8 @@ static int cap_inode_mknod(struct inode
@@ -198,7 +198,8 @@ static int cap_inode_mknod(struct inode
}
static int cap_inode_rename(struct inode *old_inode, struct dentry *old_dentry,
@@ -98,7 +98,7 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
}
--- a/security/security.c
+++ b/security/security.c
@@ -417,13 +417,14 @@ int security_inode_mknod(struct inode *d
@@ -414,13 +414,14 @@ int security_inode_mknod(struct inode *d
}
int security_inode_rename(struct inode *old_dir, struct dentry *old_dentry,

View File

@@ -18,7 +18,7 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -2184,7 +2184,7 @@ int vfs_rmdir(struct inode *dir, struct
@@ -2184,7 +2184,7 @@ int vfs_rmdir(struct inode *dir, struct
if (d_mountpoint(dentry))
error = -EBUSY;
else {
@@ -47,7 +47,7 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
int (*inode_mknod) (struct inode *dir, struct dentry *dentry,
struct vfsmount *mnt, int mode, dev_t dev);
int (*inode_rename) (struct inode *old_dir, struct dentry *old_dentry,
@@ -1643,7 +1645,8 @@ int security_inode_symlink(struct inode
@@ -1643,7 +1645,8 @@ int security_inode_symlink(struct inode
struct vfsmount *mnt, const char *old_name);
int security_inode_mkdir(struct inode *dir, struct dentry *dentry,
struct vfsmount *mnt, int mode);
@@ -69,7 +69,7 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
}
--- a/security/capability.c
+++ b/security/capability.c
@@ -184,7 +184,8 @@ static int cap_inode_mkdir(struct inode
@@ -184,7 +184,8 @@ static int cap_inode_mkdir(struct inode
return 0;
}
@@ -81,7 +81,7 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
}
--- a/security/security.c
+++ b/security/security.c
@@ -399,11 +399,12 @@ int security_inode_mkdir(struct inode *d
@@ -396,11 +396,12 @@ int security_inode_mkdir(struct inode *d
return security_ops->inode_mkdir(dir, dentry, mnt, mode);
}

View File

@@ -100,7 +100,7 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
}
--- a/security/security.c
+++ b/security/security.c
@@ -441,11 +441,12 @@ int security_inode_permission(struct ino
@@ -438,11 +438,12 @@ int security_inode_permission(struct ino
return security_ops->inode_permission(inode, mask);
}

View File

@@ -150,7 +150,7 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
if (!capable(CAP_SETFCAP))
--- a/security/security.c
+++ b/security/security.c
@@ -471,20 +471,24 @@ void security_inode_delete(struct inode
@@ -468,20 +468,24 @@ void security_inode_delete(struct inode
security_ops->inode_delete(inode);
}

View File

@@ -77,7 +77,7 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
}
--- a/security/security.c
+++ b/security/security.c
@@ -382,11 +382,11 @@ int security_inode_unlink(struct inode *
@@ -379,11 +379,11 @@ int security_inode_unlink(struct inode *
}
int security_inode_symlink(struct inode *dir, struct dentry *dentry,

View File

@@ -69,7 +69,7 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
}
--- a/security/capability.c
+++ b/security/capability.c
@@ -167,7 +167,8 @@ static int cap_inode_link(struct dentry
@@ -167,7 +167,8 @@ static int cap_inode_link(struct dentry
return 0;
}
@@ -81,7 +81,7 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
}
--- a/security/security.c
+++ b/security/security.c
@@ -376,11 +376,12 @@ int security_inode_link(struct dentry *o
@@ -373,11 +373,12 @@ int security_inode_link(struct dentry *o
new_dentry, new_mnt);
}

View File

@@ -19,8 +19,10 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
security/smack/smack_lsm.c | 14 ++++++----
8 files changed, 87 insertions(+), 69 deletions(-)
--- a/fs/xattr.c
+++ b/fs/xattr.c
Index: linux-2.6.27/fs/xattr.c
===================================================================
--- linux-2.6.27.orig/fs/xattr.c
+++ linux-2.6.27/fs/xattr.c
@@ -68,7 +68,7 @@ xattr_permission(struct inode *inode, co
int
@@ -273,8 +275,10 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
mnt_drop_write(f->f_path.mnt);
}
fput(f);
--- a/include/linux/security.h
+++ b/include/linux/security.h
Index: linux-2.6.27/include/linux/security.h
===================================================================
--- linux-2.6.27.orig/include/linux/security.h
+++ linux-2.6.27/include/linux/security.h
@@ -56,9 +56,9 @@ extern void cap_bprm_apply_creds(struct
extern int cap_bprm_secureexec(struct linux_binprm *bprm);
extern int cap_inode_setxattr(struct dentry *dentry, struct vfsmount *mnt,
@@ -373,8 +377,10 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
}
static inline int security_inode_need_killpriv(struct dentry *dentry)
--- a/include/linux/xattr.h
+++ b/include/linux/xattr.h
Index: linux-2.6.27/include/linux/xattr.h
===================================================================
--- linux-2.6.27.orig/include/linux/xattr.h
+++ linux-2.6.27/include/linux/xattr.h
@@ -17,6 +17,7 @@
#include <linux/types.h>
@@ -398,8 +404,10 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
ssize_t generic_getxattr(struct dentry *dentry, const char *name, void *buffer, size_t size);
ssize_t generic_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size);
--- a/security/capability.c
+++ b/security/capability.c
Index: linux-2.6.27/security/capability.c
===================================================================
--- linux-2.6.27.orig/security/capability.c
+++ linux-2.6.27/security/capability.c
@@ -242,12 +242,13 @@ static void cap_inode_post_setxattr(stru
}
@@ -416,8 +424,10 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
{
return 0;
}
--- a/security/commoncap.c
+++ b/security/commoncap.c
Index: linux-2.6.27/security/commoncap.c
===================================================================
--- linux-2.6.27.orig/security/commoncap.c
+++ linux-2.6.27/security/commoncap.c
@@ -416,7 +416,7 @@ int cap_bprm_secureexec (struct linux_bi
int cap_inode_setxattr(struct dentry *dentry, struct vfsmount *mnt,
@@ -436,9 +446,11 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
{
if (!strcmp(name, XATTR_NAME_CAPS)) {
if (!capable(CAP_SETFCAP))
--- a/security/security.c
+++ b/security/security.c
@@ -473,12 +473,12 @@ void security_inode_delete(struct inode
Index: linux-2.6.27/security/security.c
===================================================================
--- linux-2.6.27.orig/security/security.c
+++ linux-2.6.27/security/security.c
@@ -470,12 +470,12 @@ void security_inode_delete(struct inode
int security_inode_setxattr(struct dentry *dentry, struct vfsmount *mnt,
const char *name, const void *value, size_t size,
@@ -453,7 +465,7 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
}
void security_inode_post_setxattr(struct dentry *dentry, struct vfsmount *mnt,
@@ -492,26 +492,27 @@ void security_inode_post_setxattr(struct
@@ -489,26 +489,27 @@ void security_inode_post_setxattr(struct
}
int security_inode_getxattr(struct dentry *dentry, struct vfsmount *mnt,
@@ -487,8 +499,10 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
}
int security_inode_need_killpriv(struct dentry *dentry)
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
Index: linux-2.6.27/security/selinux/hooks.c
===================================================================
--- linux-2.6.27.orig/security/selinux/hooks.c
+++ linux-2.6.27/security/selinux/hooks.c
@@ -2715,7 +2715,7 @@ static int selinux_inode_setotherxattr(s
static int selinux_inode_setxattr(struct dentry *dentry, struct vfsmount *mnt,
@@ -522,8 +536,10 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
{
if (strcmp(name, XATTR_NAME_SELINUX))
return selinux_inode_setotherxattr(dentry, name);
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
Index: linux-2.6.27/security/smack/smack_lsm.c
===================================================================
--- linux-2.6.27.orig/security/smack/smack_lsm.c
+++ linux-2.6.27/security/smack/smack_lsm.c
@@ -600,6 +600,7 @@ static int smack_inode_getattr(struct vf
* @value: unused
* @size: unused

View File

@@ -27,7 +27,7 @@ Reviewed-by: James Morris <jmorris@namei.org>
void __user *newval, size_t newlen);
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -1554,6 +1554,33 @@ void register_sysctl_root(struct ctl_tab
@@ -1552,6 +1552,33 @@ void register_sysctl_root(struct ctl_tab
spin_unlock(&sysctl_lock);
}

View File

@@ -14,6 +14,8 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
include/linux/xattr.h | 2 +-
3 files changed, 13 insertions(+), 12 deletions(-)
Index: linux-2.6.27/fs/nfsd/vfs.c
===================================================================
--- linux-2.6.27.orig/fs/nfsd/vfs.c
+++ linux-2.6.27/fs/nfsd/vfs.c
@@ -2095,6 +2095,7 @@ nfsd_get_posix_acl(struct svc_fh *fhp, i
@@ -52,6 +54,8 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
getout:
kfree(value);
Index: linux-2.6.27/fs/xattr.c
===================================================================
--- linux-2.6.27.orig/fs/xattr.c
+++ linux-2.6.27/fs/xattr.c
@@ -190,7 +190,7 @@ vfs_listxattr(struct dentry *dentry, str
@@ -81,7 +85,7 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
}
SYSCALL_DEFINE2(removexattr, const char __user *, pathname,
@@ -496,7 +496,7 @@ SYSCALL_DEFINE2(removexattr, const char
@@ -496,7 +496,7 @@ SYSCALL_DEFINE2(removexattr, const char
return error;
error = mnt_want_write(path.mnt);
if (!error) {
@@ -108,6 +112,8 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
mnt_drop_write(f->f_path.mnt);
}
fput(f);
Index: linux-2.6.27/include/linux/xattr.h
===================================================================
--- linux-2.6.27.orig/include/linux/xattr.h
+++ linux-2.6.27/include/linux/xattr.h
@@ -51,7 +51,7 @@ ssize_t xattr_getsecurity(struct inode *

View File

@@ -14,6 +14,8 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
include/linux/xattr.h | 3 ++-
3 files changed, 21 insertions(+), 14 deletions(-)
Index: linux-2.6.27/fs/nfsd/vfs.c
===================================================================
--- linux-2.6.27.orig/fs/nfsd/vfs.c
+++ linux-2.6.27/fs/nfsd/vfs.c
@@ -438,7 +438,8 @@ static ssize_t nfsd_getxattr(struct dent
@@ -78,6 +80,8 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
else {
if (!S_ISDIR(inode->i_mode) && type == ACL_TYPE_DEFAULT)
error = 0;
Index: linux-2.6.27/fs/xattr.c
===================================================================
--- linux-2.6.27.orig/fs/xattr.c
+++ linux-2.6.27/fs/xattr.c
@@ -67,8 +67,8 @@ xattr_permission(struct inode *inode, co
@@ -138,6 +142,8 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
mnt_drop_write(f->f_path.mnt);
}
fput(f);
Index: linux-2.6.27/include/linux/xattr.h
===================================================================
--- linux-2.6.27.orig/include/linux/xattr.h
+++ linux-2.6.27/include/linux/xattr.h
@@ -16,6 +16,7 @@

Some files were not shown because too many files have changed in this diff Show More