Merge branch 'iptables-upnpfw' into core67-merge
authorStefan Schantl <stefan.schantl@ipfire.org>
Sun, 3 Mar 2013 12:57:39 +0000 (13:57 +0100)
committerStefan Schantl <stefan.schantl@ipfire.org>
Sun, 3 Mar 2013 12:57:39 +0000 (13:57 +0100)
975 files changed:
config/acpid/power [new file with mode: 0644]
config/acpid/power.sh [new file with mode: 0644]
config/asterisk/asterisk.makeopts
config/backup/backup.pl
config/backup/include
config/backup/includes/lcr
config/backup/includes/pakfire3 [new file with mode: 0644]
config/bash/dot_bash_logout [new file with mode: 0644]
config/bash/dot_bash_profile [new file with mode: 0644]
config/bash/dot_bashrc [new file with mode: 0644]
config/cfgroot/general-functions.pl
config/collectd/collectd.conf
config/cron/crontab
config/etc/bashrc
config/etc/group
config/etc/inputrc
config/etc/modprobe.d/cfg80211
config/etc/profile
config/etc/securetty
config/etc/sysctl.conf
config/fstrim/trim [new file with mode: 0644]
config/grub/grub.conf
config/hostapd/config
config/hostapd/hostapd.conf
config/httpd/vhosts.d/ipfire-interface-ssl.conf
config/include/obsolete_videodev.h [new file with mode: 0644]
config/kernel/kernel.config.armv5tel-ipfire-kirkwood
config/kernel/kernel.config.armv5tel-ipfire-omap [new file with mode: 0644]
config/kernel/kernel.config.armv5tel-ipfire-rpi [moved from config/kernel/kernel.config.armv5tel-ipfire-versatile with 68% similarity]
config/kernel/kernel.config.i586-ipfire
config/kernel/kernel.config.i586-ipfire-pae
config/kernel/kernel.config.i586-ipfire-xen
config/madwifi/madwifi.conf [deleted file]
config/profile.d/colorls.sh [new file with mode: 0644]
config/profile.d/dircolors.sh [deleted file]
config/profile.d/extrapaths.sh
config/profile.d/glib2-locale.sh [new file with mode: 0644]
config/profile.d/i18n.sh
config/profile.d/lang.sh [new file with mode: 0644]
config/profile.d/term256.sh [new file with mode: 0644]
config/qos/makeqosscripts.pl
config/rootfiles/common/Crypt-PasswdMD5
config/rootfiles/common/IO-Socket-SSL [new file with mode: 0644]
config/rootfiles/common/armv5tel/binutils
config/rootfiles/common/armv5tel/dracut [new file with mode: 0644]
config/rootfiles/common/armv5tel/gcc
config/rootfiles/common/armv5tel/glibc
config/rootfiles/common/armv5tel/initscripts
config/rootfiles/common/armv5tel/installer [new file with mode: 0644]
config/rootfiles/common/armv5tel/linux-headers [new file with mode: 0644]
config/rootfiles/common/armv5tel/linux-kirkwood
config/rootfiles/common/armv5tel/linux-omap [new file with mode: 0644]
config/rootfiles/common/armv5tel/linux-rpi [new file with mode: 0644]
config/rootfiles/common/armv5tel/linux-versatile [deleted file]
config/rootfiles/common/armv5tel/rpi-firmware [new file with mode: 0644]
config/rootfiles/common/armv5tel/u-boot [new file with mode: 0644]
config/rootfiles/common/armv5tel/uboot [deleted file]
config/rootfiles/common/autoconf
config/rootfiles/common/automake
config/rootfiles/common/bash
config/rootfiles/common/bind
config/rootfiles/common/bridge-utils
config/rootfiles/common/cairo [new file with mode: 0644]
config/rootfiles/common/cmake
config/rootfiles/common/collectd
config/rootfiles/common/compat-wireless
config/rootfiles/common/configroot
config/rootfiles/common/conntrack-tools [new file with mode: 0644]
config/rootfiles/common/coreutils
config/rootfiles/common/curl
config/rootfiles/common/daq
config/rootfiles/common/dejavu-fonts-ttf [new file with mode: 0644]
config/rootfiles/common/dvb-firmwares [new file with mode: 0644]
config/rootfiles/common/e2fsprogs
config/rootfiles/common/file
config/rootfiles/common/fontconfig [moved from config/rootfiles/packages/fontconfig with 99% similarity]
config/rootfiles/common/fstrim [new file with mode: 0644]
config/rootfiles/common/fw_ath9k_htc [deleted file]
config/rootfiles/common/gettext
config/rootfiles/common/glib [moved from config/rootfiles/packages/glib with 60% similarity]
config/rootfiles/common/gmp
config/rootfiles/common/gmp-compat [new file with mode: 0644]
config/rootfiles/common/gnupg
config/rootfiles/common/grep
config/rootfiles/common/hddtemp [deleted file]
config/rootfiles/common/i586/acpid [new file with mode: 0644]
config/rootfiles/common/i586/binutils
config/rootfiles/common/i586/dracut [moved from config/rootfiles/common/dracut with 100% similarity]
config/rootfiles/common/i586/gcc
config/rootfiles/common/i586/glibc
config/rootfiles/common/i586/grub
config/rootfiles/common/i586/initscripts
config/rootfiles/common/i586/kqemu [deleted file]
config/rootfiles/common/i586/linux
config/rootfiles/common/i586/linux-headers [new file with mode: 0644]
config/rootfiles/common/i586/madwifi [deleted file]
config/rootfiles/common/i586/strongswan-padlock [new file with mode: 0644]
config/rootfiles/common/i586/syslinux
config/rootfiles/common/iproute2
config/rootfiles/common/iptables
config/rootfiles/common/iptstate [deleted file]
config/rootfiles/common/kudzu [deleted file]
config/rootfiles/common/less
config/rootfiles/common/libaal [deleted file]
config/rootfiles/common/libffi [new file with mode: 0644]
config/rootfiles/common/libmnl [new file with mode: 0644]
config/rootfiles/common/libsafe [deleted file]
config/rootfiles/common/libsigc++
config/rootfiles/common/libtool [new file with mode: 0644]
config/rootfiles/common/libupnp
config/rootfiles/common/linux-atm
config/rootfiles/common/linux-firmware
config/rootfiles/common/linux-libc-header [deleted file]
config/rootfiles/common/mISDNuser
config/rootfiles/common/mbr
config/rootfiles/common/misc-progs
config/rootfiles/common/mpfr [new file with mode: 0644]
config/rootfiles/common/ncurses
config/rootfiles/common/newt
config/rootfiles/common/openldap
config/rootfiles/common/openssl
config/rootfiles/common/pam
config/rootfiles/common/pango [new file with mode: 0644]
config/rootfiles/common/pciutils
config/rootfiles/common/pcre
config/rootfiles/common/pcre-compat [new file with mode: 0644]
config/rootfiles/common/pixman [new file with mode: 0644]
config/rootfiles/common/procps
config/rootfiles/common/readline
config/rootfiles/common/readline-compat [new file with mode: 0644]
config/rootfiles/common/reiser4progs [deleted file]
config/rootfiles/common/rrdtool
config/rootfiles/common/sdparm
config/rootfiles/common/sed
config/rootfiles/common/shadow
config/rootfiles/common/smartmontools
config/rootfiles/common/snort
config/rootfiles/common/squid
config/rootfiles/common/stage2
config/rootfiles/common/strongswan
config/rootfiles/common/sysfsutils
config/rootfiles/common/sysvinit
config/rootfiles/common/texinfo
config/rootfiles/common/tzdata
config/rootfiles/common/uClibc [deleted file]
config/rootfiles/common/udev
config/rootfiles/common/usbutils
config/rootfiles/common/xz
config/rootfiles/common/zlib
config/rootfiles/core/66/exclude [new file with mode: 0644]
config/rootfiles/core/66/filelists/GeoIP [moved from config/rootfiles/core/61/filelists/GeoIP with 100% similarity]
config/rootfiles/core/66/filelists/armv5tel/binutils [new symlink]
config/rootfiles/core/66/filelists/armv5tel/dracut [new symlink]
config/rootfiles/core/66/filelists/armv5tel/gcc [new symlink]
config/rootfiles/core/66/filelists/armv5tel/glibc [new symlink]
config/rootfiles/core/66/filelists/armv5tel/linux-kirkwood [new symlink]
config/rootfiles/core/66/filelists/armv5tel/linux-omap [new symlink]
config/rootfiles/core/66/filelists/armv5tel/linux-rpi [new symlink]
config/rootfiles/core/66/filelists/armv5tel/rpi-firmware [new symlink]
config/rootfiles/core/66/filelists/armv5tel/u-boot [new symlink]
config/rootfiles/core/66/filelists/armv5tel/util-linux [new symlink]
config/rootfiles/core/66/filelists/autoconf [new symlink]
config/rootfiles/core/66/filelists/automake [new symlink]
config/rootfiles/core/66/filelists/bash [new symlink]
config/rootfiles/core/66/filelists/bind [new symlink]
config/rootfiles/core/66/filelists/bridge-utils [new symlink]
config/rootfiles/core/66/filelists/cairo [new symlink]
config/rootfiles/core/66/filelists/capi4k-utils [new symlink]
config/rootfiles/core/66/filelists/cmake [new symlink]
config/rootfiles/core/66/filelists/collectd [new symlink]
config/rootfiles/core/66/filelists/compat-wireless [new symlink]
config/rootfiles/core/66/filelists/conntrack-tools [new symlink]
config/rootfiles/core/66/filelists/coreutils [new symlink]
config/rootfiles/core/66/filelists/curl [new symlink]
config/rootfiles/core/66/filelists/cyrus-sasl [new symlink]
config/rootfiles/core/66/filelists/daq [moved from config/rootfiles/core/64/filelists/daq with 100% similarity]
config/rootfiles/core/66/filelists/dejavu-fonts-ttf [new symlink]
config/rootfiles/core/66/filelists/dhcp [moved from config/rootfiles/core/63/filelists/dhcp with 100% similarity]
config/rootfiles/core/66/filelists/dvb-firmwares [new symlink]
config/rootfiles/core/66/filelists/e2fsprogs [new symlink]
config/rootfiles/core/66/filelists/file [new symlink]
config/rootfiles/core/66/filelists/files [new file with mode: 0644]
config/rootfiles/core/66/filelists/fontconfig [new symlink]
config/rootfiles/core/66/filelists/fstrim [new symlink]
config/rootfiles/core/66/filelists/gawk [new symlink]
config/rootfiles/core/66/filelists/gettext [new symlink]
config/rootfiles/core/66/filelists/glib [new symlink]
config/rootfiles/core/66/filelists/gmp [new symlink]
config/rootfiles/core/66/filelists/gmp-compat [new symlink]
config/rootfiles/core/66/filelists/gnupg [new symlink]
config/rootfiles/core/66/filelists/grep [new symlink]
config/rootfiles/core/66/filelists/hdparm [new symlink]
config/rootfiles/core/66/filelists/i586/acpi-init [new file with mode: 0644]
config/rootfiles/core/66/filelists/i586/acpid [new symlink]
config/rootfiles/core/66/filelists/i586/binutils [new symlink]
config/rootfiles/core/66/filelists/i586/dracut [new symlink]
config/rootfiles/core/66/filelists/i586/gcc [new symlink]
config/rootfiles/core/66/filelists/i586/glibc [new symlink]
config/rootfiles/core/66/filelists/i586/grub [new symlink]
config/rootfiles/core/66/filelists/i586/linux [new symlink]
config/rootfiles/core/66/filelists/i586/strongswan-padlock [new symlink]
config/rootfiles/core/66/filelists/i586/util-linux [new symlink]
config/rootfiles/core/66/filelists/inetutils [moved from config/rootfiles/core/63/filelists/inetutils with 100% similarity]
config/rootfiles/core/66/filelists/iproute2 [new symlink]
config/rootfiles/core/66/filelists/iptables [new symlink]
config/rootfiles/core/66/filelists/kbd [new symlink]
config/rootfiles/core/66/filelists/less [new symlink]
config/rootfiles/core/66/filelists/libffi [new symlink]
config/rootfiles/core/66/filelists/libmnl [new symlink]
config/rootfiles/core/66/filelists/libnl [new symlink]
config/rootfiles/core/66/filelists/libsigc++ [new symlink]
config/rootfiles/core/66/filelists/libtool [new symlink]
config/rootfiles/core/66/filelists/libupnp [new symlink]
config/rootfiles/core/66/filelists/linux-atm [new symlink]
config/rootfiles/core/66/filelists/linux-firmware [new symlink]
config/rootfiles/core/66/filelists/m4 [new symlink]
config/rootfiles/core/66/filelists/mISDNuser [new symlink]
config/rootfiles/core/66/filelists/man [new symlink]
config/rootfiles/core/66/filelists/misc-progs [new symlink]
config/rootfiles/core/66/filelists/mpfr [new symlink]
config/rootfiles/core/66/filelists/ncurses [new symlink]
config/rootfiles/core/66/filelists/newt [new symlink]
config/rootfiles/core/66/filelists/openldap [new symlink]
config/rootfiles/core/66/filelists/openssh [new symlink]
config/rootfiles/core/66/filelists/openssl [new symlink]
config/rootfiles/core/66/filelists/pam [moved from config/rootfiles/core/61/filelists/pam with 100% similarity]
config/rootfiles/core/66/filelists/pango [new symlink]
config/rootfiles/core/66/filelists/pciutils [new symlink]
config/rootfiles/core/66/filelists/pcmciautils [new symlink]
config/rootfiles/core/66/filelists/pcre [new symlink]
config/rootfiles/core/66/filelists/pcre-compat [new symlink]
config/rootfiles/core/66/filelists/pixman [new symlink]
config/rootfiles/core/66/filelists/popt [new symlink]
config/rootfiles/core/66/filelists/pptp [new symlink]
config/rootfiles/core/66/filelists/readline [new symlink]
config/rootfiles/core/66/filelists/readline-compat [new symlink]
config/rootfiles/core/66/filelists/reiserfsprogs [new symlink]
config/rootfiles/core/66/filelists/rrdtool [new symlink]
config/rootfiles/core/66/filelists/screen [new symlink]
config/rootfiles/core/66/filelists/sdparm [new symlink]
config/rootfiles/core/66/filelists/sed [new symlink]
config/rootfiles/core/66/filelists/setup [new symlink]
config/rootfiles/core/66/filelists/shadow [new symlink]
config/rootfiles/core/66/filelists/slang [new symlink]
config/rootfiles/core/66/filelists/smartmontools [new symlink]
config/rootfiles/core/66/filelists/snort [moved from config/rootfiles/core/64/filelists/snort with 100% similarity]
config/rootfiles/core/66/filelists/squid [moved from config/rootfiles/core/61/filelists/squid with 100% similarity]
config/rootfiles/core/66/filelists/stage2-partial [new file with mode: 0644]
config/rootfiles/core/66/filelists/strongswan [moved from config/rootfiles/core/60/filelists/strongswan with 100% similarity]
config/rootfiles/core/66/filelists/sysfsutils [new symlink]
config/rootfiles/core/66/filelists/sysvinit [new symlink]
config/rootfiles/core/66/filelists/texinfo [new symlink]
config/rootfiles/core/66/filelists/tzdata [new symlink]
config/rootfiles/core/66/filelists/udev [new symlink]
config/rootfiles/core/66/filelists/usbutils [new symlink]
config/rootfiles/core/66/filelists/vim [new symlink]
config/rootfiles/core/66/filelists/wget [new symlink]
config/rootfiles/core/66/filelists/wpa_supplicant [new symlink]
config/rootfiles/core/66/filelists/xz [new symlink]
config/rootfiles/core/66/filelists/zlib [new symlink]
config/rootfiles/core/66/meta [moved from config/rootfiles/core/60/meta with 100% similarity]
config/rootfiles/core/66/update.sh [new file with mode: 0644]
config/rootfiles/installer/findutils [new symlink]
config/rootfiles/installer/kudzu [deleted symlink]
config/rootfiles/installer/libsafe [deleted symlink]
config/rootfiles/installer/pcre [new symlink]
config/rootfiles/oldcore/60/exclude [moved from config/rootfiles/core/60/exclude with 100% similarity]
config/rootfiles/oldcore/60/filelists/files [moved from config/rootfiles/core/60/filelists/files with 100% similarity]
config/rootfiles/oldcore/60/filelists/strongswan [new symlink]
config/rootfiles/oldcore/60/meta [moved from config/rootfiles/core/61/meta with 100% similarity]
config/rootfiles/oldcore/60/update.sh [moved from config/rootfiles/core/60/update.sh with 100% similarity]
config/rootfiles/oldcore/61/exclude [moved from config/rootfiles/core/61/exclude with 100% similarity]
config/rootfiles/oldcore/61/filelists/GeoIP [moved from config/rootfiles/core/62/filelists/GeoIP with 100% similarity]
config/rootfiles/oldcore/61/filelists/Net-Telnet [moved from config/rootfiles/core/61/filelists/Net-Telnet with 100% similarity]
config/rootfiles/oldcore/61/filelists/files [moved from config/rootfiles/core/61/filelists/files with 100% similarity]
config/rootfiles/oldcore/61/filelists/fireinfo [moved from config/rootfiles/core/61/filelists/fireinfo with 100% similarity]
config/rootfiles/oldcore/61/filelists/logwatch [moved from config/rootfiles/core/61/filelists/logwatch with 100% similarity]
config/rootfiles/oldcore/61/filelists/openvpn [moved from config/rootfiles/core/61/filelists/openvpn with 100% similarity]
config/rootfiles/oldcore/61/filelists/pam [new symlink]
config/rootfiles/oldcore/61/filelists/php [moved from config/rootfiles/core/61/filelists/php with 100% similarity]
config/rootfiles/oldcore/61/filelists/squid [new symlink]
config/rootfiles/oldcore/61/filelists/usb_modeswitch_data [moved from config/rootfiles/core/61/filelists/usb_modeswitch_data with 100% similarity]
config/rootfiles/oldcore/61/meta [moved from config/rootfiles/core/62/meta with 100% similarity]
config/rootfiles/oldcore/61/update.sh [moved from config/rootfiles/core/61/update.sh with 100% similarity]
config/rootfiles/oldcore/62/exclude [moved from config/rootfiles/core/62/exclude with 100% similarity]
config/rootfiles/oldcore/62/filelists/GeoIP [moved from config/rootfiles/core/63/filelists/GeoIP with 100% similarity]
config/rootfiles/oldcore/62/filelists/files [moved from config/rootfiles/core/62/filelists/files with 100% similarity]
config/rootfiles/oldcore/62/filelists/hwdata [moved from config/rootfiles/core/62/filelists/hwdata with 100% similarity]
config/rootfiles/oldcore/62/filelists/php [moved from config/rootfiles/core/62/filelists/php with 100% similarity]
config/rootfiles/oldcore/62/filelists/usb_modeswitch [moved from config/rootfiles/core/62/filelists/usb_modeswitch with 100% similarity]
config/rootfiles/oldcore/62/filelists/usb_modeswitch_data [moved from config/rootfiles/core/62/filelists/usb_modeswitch_data with 100% similarity]
config/rootfiles/oldcore/62/meta [moved from config/rootfiles/core/63/meta with 100% similarity]
config/rootfiles/oldcore/62/update.sh [moved from config/rootfiles/core/62/update.sh with 100% similarity]
config/rootfiles/oldcore/63/exclude [moved from config/rootfiles/core/63/exclude with 100% similarity]
config/rootfiles/oldcore/63/filelists/GeoIP [new file with mode: 0644]
config/rootfiles/oldcore/63/filelists/apache2 [moved from config/rootfiles/core/63/filelists/apache2 with 100% similarity]
config/rootfiles/oldcore/63/filelists/dhcp [new symlink]
config/rootfiles/oldcore/63/filelists/files [moved from config/rootfiles/core/63/filelists/files with 100% similarity]
config/rootfiles/oldcore/63/filelists/fireinfo [moved from config/rootfiles/core/63/filelists/fireinfo with 100% similarity]
config/rootfiles/oldcore/63/filelists/inetutils [new symlink]
config/rootfiles/oldcore/63/meta [moved from config/rootfiles/core/64/meta with 100% similarity]
config/rootfiles/oldcore/63/update.sh [moved from config/rootfiles/core/63/update.sh with 100% similarity]
config/rootfiles/oldcore/64/exclude [moved from config/rootfiles/core/64/exclude with 100% similarity]
config/rootfiles/oldcore/64/filelists/daq [new symlink]
config/rootfiles/oldcore/64/filelists/files [moved from config/rootfiles/core/64/filelists/files with 100% similarity]
config/rootfiles/oldcore/64/filelists/snort [new symlink]
config/rootfiles/oldcore/64/meta [new file with mode: 0644]
config/rootfiles/oldcore/64/update.sh [moved from config/rootfiles/core/64/update.sh with 100% similarity]
config/rootfiles/oldcore/65/exclude [new file with mode: 0644]
config/rootfiles/oldcore/65/filelists/GeoIP [new file with mode: 0644]
config/rootfiles/oldcore/65/filelists/daq [new symlink]
config/rootfiles/oldcore/65/filelists/files [new file with mode: 0644]
config/rootfiles/oldcore/65/meta [new file with mode: 0644]
config/rootfiles/oldcore/65/update.sh [new file with mode: 0644]
config/rootfiles/packages/alsa
config/rootfiles/packages/applejuice [deleted file]
config/rootfiles/packages/asterisk
config/rootfiles/packages/bluetooth
config/rootfiles/packages/centerim [deleted file]
config/rootfiles/packages/cifs-utils [new file with mode: 0644]
config/rootfiles/packages/cups
config/rootfiles/packages/dahdi [deleted file]
config/rootfiles/packages/directfb [deleted file]
config/rootfiles/packages/ebtables
config/rootfiles/packages/elinks
config/rootfiles/packages/flac
config/rootfiles/packages/git
config/rootfiles/packages/gnump3d
config/rootfiles/packages/gpgme [new file with mode: 0644]
config/rootfiles/packages/hplip
config/rootfiles/packages/ipfireseeder [deleted file]
config/rootfiles/packages/lcr
config/rootfiles/packages/libassuan [new file with mode: 0644]
config/rootfiles/packages/libgpg-error [new file with mode: 0644]
config/rootfiles/packages/libogg
config/rootfiles/packages/libsolv
config/rootfiles/packages/libstatgrab [new file with mode: 0644]
config/rootfiles/packages/libtool [deleted file]
config/rootfiles/packages/libvorbis
config/rootfiles/packages/linux-pae
config/rootfiles/packages/linux-xen
config/rootfiles/packages/mc
config/rootfiles/packages/pakfire3 [new file with mode: 0644]
config/rootfiles/packages/pakfire3-deps [deleted file]
config/rootfiles/packages/pycurl [new file with mode: 0644]
config/rootfiles/packages/pygpgme [new file with mode: 0644]
config/rootfiles/packages/python-rssdler
config/rootfiles/packages/qemu-kqemu [deleted file]
config/rootfiles/packages/samba
config/rootfiles/packages/sarg [new file with mode: 0644]
config/rootfiles/packages/sendEmail [new file with mode: 0644]
config/rootfiles/packages/splix [deleted file]
config/rootfiles/packages/stress [new file with mode: 0644]
config/rootfiles/packages/transmission
config/rootfiles/packages/urlgrabber
config/rootfiles/packages/videolan [deleted file]
config/rootfiles/packages/w_scan
config/rpi-firmware/config.txt [new file with mode: 0644]
config/sarg/cron.daily [new file with mode: 0644]
config/sarg/cron.hourly [new file with mode: 0644]
config/sarg/cron.monthly [new file with mode: 0644]
config/sarg/cron.weekly [new file with mode: 0644]
config/sarg/sarg.conf [new file with mode: 0644]
config/sarg/update-sarg-reports [new file with mode: 0644]
config/syslinux/syslinux.cfg
config/u-boot/boot.scr [new file with mode: 0755]
config/u-boot/boot.script [new file with mode: 0755]
config/u-boot/convert_bootscript [new file with mode: 0755]
config/uClibc/busybox.config [deleted file]
config/uClibc/codesets.txt [deleted file]
config/uClibc/locales.txt [deleted file]
config/uClibc/uClibc.config-i586 [deleted file]
config/udev/10-dvb.rules [deleted file]
config/udev/25-alsa.rules [new file with mode: 0644]
config/udev/55-scsi-cdrom.rules [deleted file]
config/udev/99-codel.rules [new file with mode: 0644]
config/udev/dvb.sh [deleted file]
config/udev/enable_codel [moved from src/paks/applejuice/install.sh with 69% similarity]
config/updxlrator/download
config/updxlrator/updxlrator
config/w_scan/w_scan_start [new file with mode: 0755]
config/wpa_supplicant/config
doc/language_issues.de
doc/language_issues.en
doc/language_issues.es
doc/language_issues.fr
doc/language_issues.nl [new file with mode: 0644]
doc/language_issues.pl
doc/language_issues.ru
doc/language_missings
html/cgi-bin/backup.cgi
html/cgi-bin/ids.cgi
html/cgi-bin/logs.cgi/calamaris.dat
html/cgi-bin/media.cgi
html/cgi-bin/ovpnmain.cgi
html/cgi-bin/proxy.cgi
html/cgi-bin/qos.cgi
html/cgi-bin/routing.cgi
html/cgi-bin/services.cgi
html/cgi-bin/updatexlrator.cgi
html/cgi-bin/vpnmain.cgi
html/cgi-bin/wlanap.cgi
html/html/images/updbooster/updxl-src-microsoft.gif [new file with mode: 0644]
html/html/images/updbooster/updxl-src-windows.gif
langs/de/cgi-bin/de.pl
langs/de/install/lang_de.c
langs/en/cgi-bin/en.pl
langs/en/install/lang_en.c
langs/list
langs/nl/cgi-bin/nl.pl [new file with mode: 0644]
langs/nl/install/lang_nl.c [new file with mode: 0644]
lfs/Config
lfs/GeoIP
lfs/IO-Socket-SSL [new file with mode: 0644]
lfs/acpid [new file with mode: 0644]
lfs/alsa
lfs/apcupsd
lfs/asterisk
lfs/autoconf
lfs/automake
lfs/bash
lfs/binutils
lfs/bluetooth
lfs/bridge-utils
lfs/cairo [new file with mode: 0644]
lfs/capi4k-utils
lfs/ccache
lfs/cifs-utils [new file with mode: 0644]
lfs/cleanup-toolchain
lfs/cmake
lfs/collectd
lfs/compat-wireless
lfs/configroot
lfs/conntrack-tools [new file with mode: 0644]
lfs/core-updates
lfs/coreutils
lfs/cpufrequtils
lfs/cryptodev
lfs/curl
lfs/cyrus-imapd
lfs/cyrus-sasl
lfs/dahdi [deleted file]
lfs/daq
lfs/dbus
lfs/dejavu-fonts-ttf [moved from lfs/iptstate with 94% similarity]
lfs/dhcp
lfs/directfb
lfs/dracut
lfs/dvb-firmwares [new file with mode: 0644]
lfs/e1000
lfs/e1000e
lfs/e2fsprogs
lfs/ebtables
lfs/elinks
lfs/fake-environ
lfs/file
lfs/flash-images
lfs/fontconfig
lfs/fstrim [new file with mode: 0644]
lfs/gawk
lfs/gcc
lfs/gettext
lfs/git
lfs/glib
lfs/glibc
lfs/gmp
lfs/gmp-compat [moved from lfs/splix with 88% similarity]
lfs/gnupg
lfs/gpgme [new file with mode: 0644]
lfs/grep
lfs/grub
lfs/hdparm
lfs/hostapd
lfs/hplip
lfs/hwdata
lfs/igb
lfs/imspector
lfs/inetutils
lfs/initrd
lfs/initscripts
lfs/installer
lfs/ipfireseeder [deleted file]
lfs/iproute2
lfs/iptables
lfs/kbd
lfs/kudzu [deleted file]
lfs/kvm-kmod
lfs/lcr
lfs/less
lfs/libassuan [new file with mode: 0644]
lfs/libffi [moved from lfs/centerim with 93% similarity]
lfs/libgpg-error [new file with mode: 0644]
lfs/libmad
lfs/libmnl [new file with mode: 0644]
lfs/libnl
lfs/libogg
lfs/libsafe [deleted file]
lfs/libsigc++
lfs/libsolv
lfs/libstatgrab [new file with mode: 0644]
lfs/libtool
lfs/libupnp
lfs/libvorbis
lfs/linux
lfs/linux-firmware
lfs/linux-libc-header [deleted file]
lfs/linux-xen
lfs/linux2 [new file with mode: 0644]
lfs/m4
lfs/mISDN
lfs/mISDNuser
lfs/madwifi [deleted file]
lfs/make
lfs/man
lfs/mbr
lfs/mc
lfs/mediatomb
lfs/minidlna
lfs/miniupnpd
lfs/misc-progs
lfs/motion
lfs/mpd
lfs/mpfr [moved from lfs/reiser4progs with 93% similarity]
lfs/nagios
lfs/ncurses
lfs/netpbm
lfs/newt
lfs/nut
lfs/openldap
lfs/openssh
lfs/openssl
lfs/openvmtools
lfs/pakfire3 [new file with mode: 0644]
lfs/pakfire3-deps [deleted file]
lfs/pango [moved from lfs/fw_ath9k_htc with 90% similarity]
lfs/pciutils
lfs/pcmciautils
lfs/pcre
lfs/pcre-compat [moved from lfs/hddtemp with 91% similarity]
lfs/php
lfs/pixman [moved from lfs/libaal with 96% similarity]
lfs/popt
lfs/postfix
lfs/ppp
lfs/pptp
lfs/pycurl [moved from lfs/kqemu with 84% similarity]
lfs/pygpgme [new file with mode: 0644]
lfs/qemu
lfs/qemu-kqemu [deleted file]
lfs/r8101
lfs/r8168
lfs/r8169
lfs/readline
lfs/readline-compat [moved from lfs/applejuice with 82% similarity]
lfs/reiserfsprogs
lfs/rpi-firmware [new file with mode: 0644]
lfs/rrdtool
lfs/samba
lfs/sarg [new file with mode: 0644]
lfs/screen
lfs/sdl
lfs/sdparm
lfs/sed
lfs/sendEmail [new file with mode: 0644]
lfs/slang
lfs/smartmontools
lfs/snort
lfs/squid
lfs/stage2
lfs/streamripper
lfs/stress [new file with mode: 0644]
lfs/strip
lfs/strongswan
lfs/sysfsutils
lfs/syslinux
lfs/sysvinit
lfs/texinfo
lfs/transmission
lfs/tzdata
lfs/u-boot
lfs/udev
lfs/urlgrabber
lfs/usb-stick
lfs/util-linux
lfs/v4l-dvb
lfs/vdr
lfs/videolan [deleted file]
lfs/w_scan
lfs/wget
lfs/wpa_supplicant
lfs/xen-image
lfs/xfsprogs
lfs/xz
lfs/zlib
make.sh
src/fake-environ/Makefile
src/initscripts/init.d/acpid [new file with mode: 0644]
src/initscripts/init.d/asterisk
src/initscripts/init.d/cleanfs
src/initscripts/init.d/cpufreq
src/initscripts/init.d/firewall
src/initscripts/init.d/firstsetup
src/initscripts/init.d/fsresize
src/initscripts/init.d/halt
src/initscripts/init.d/hostapd
src/initscripts/init.d/ipfireseeder [deleted file]
src/initscripts/init.d/lcr
src/initscripts/init.d/leds
src/initscripts/init.d/minidlna [changed mode: 0755->0644]
src/initscripts/init.d/mountfs
src/initscripts/init.d/network
src/initscripts/init.d/network-vlans [changed mode: 0755->0644]
src/initscripts/init.d/networking/dhcpcd.exe
src/initscripts/init.d/networking/red
src/initscripts/init.d/networking/red.up/01-conntrack-cleanup [new file with mode: 0644]
src/initscripts/init.d/networking/red.up/98-leds [new file with mode: 0644]
src/initscripts/init.d/partresize
src/initscripts/init.d/reboot
src/initscripts/init.d/sendsignals
src/initscripts/init.d/setclock
src/initscripts/init.d/tmpfs
src/initscripts/init.d/transmission
src/initscripts/sysconfig/rc.local
src/install+setup/install/Makefile
src/install+setup/install/main.c
src/install+setup/install/mountdest.sh
src/install+setup/install/mountsource.sh
src/install+setup/install/probehw.sh [deleted file]
src/install+setup/install/probenic.sh
src/install+setup/libsmooth/Makefile
src/install+setup/libsmooth/main.c
src/install+setup/libsmooth/netstuff.c
src/install+setup/setup/main.c
src/misc-progs/Makefile
src/misc-progs/getiptstate.c [deleted file]
src/misc-progs/ipsecctrl.c
src/misc-progs/launch-ether-wake.c
src/misc-progs/rebuildhosts.c
src/misc-progs/setportfw.c
src/paks/elinks/install.sh [new file with mode: 0644]
src/paks/elinks/uninstall.sh [moved from src/paks/applejuice/uninstall.sh with 92% similarity]
src/paks/elinks/update.sh [new file with mode: 0644]
src/paks/files
src/paks/ipfireseeder/uninstall.sh [deleted file]
src/paks/linux-pae/install.sh
src/paks/linux-pae/uninstall.sh
src/paks/linux-pae/update.sh
src/paks/linux-xen/install.sh
src/paks/sarg/install.sh [moved from src/paks/ipfireseeder/install.sh with 89% similarity]
src/paks/sarg/uninstall.sh [moved from src/paks/ipfireseeder/update.sh with 98% similarity]
src/paks/sarg/update.sh [moved from src/paks/applejuice/update.sh with 100% similarity]
src/patches/bash-3.1-fixes-8.patch [deleted file]
src/patches/bash-3.1-login.patch [deleted file]
src/patches/bash-3.2-ssh_source_bash.patch [new file with mode: 0644]
src/patches/bash-4.0-paths-1.patch [new file with mode: 0644]
src/patches/bash-4.0-profile-1.patch [new file with mode: 0644]
src/patches/bash/bash32-001 [new file with mode: 0644]
src/patches/bash/bash32-002 [new file with mode: 0644]
src/patches/bash/bash32-003 [new file with mode: 0644]
src/patches/bash/bash32-004 [new file with mode: 0644]
src/patches/bash/bash32-005 [new file with mode: 0644]
src/patches/bash/bash32-006 [new file with mode: 0644]
src/patches/bash/bash32-007 [new file with mode: 0644]
src/patches/bash/bash32-008 [new file with mode: 0644]
src/patches/bash/bash32-009 [new file with mode: 0644]
src/patches/bash/bash32-010 [new file with mode: 0644]
src/patches/bash/bash32-011 [new file with mode: 0644]
src/patches/bash/bash32-012 [new file with mode: 0644]
src/patches/bash/bash32-013 [new file with mode: 0644]
src/patches/bash/bash32-014 [new file with mode: 0644]
src/patches/bash/bash32-015 [new file with mode: 0644]
src/patches/bash/bash32-016 [new file with mode: 0644]
src/patches/bash/bash32-017 [new file with mode: 0644]
src/patches/bash/bash32-018 [new file with mode: 0644]
src/patches/bash/bash32-019 [new file with mode: 0644]
src/patches/bash/bash32-020 [new file with mode: 0644]
src/patches/bash/bash32-021 [new file with mode: 0644]
src/patches/bash/bash32-022 [new file with mode: 0644]
src/patches/bash/bash32-023 [new file with mode: 0644]
src/patches/bash/bash32-024 [new file with mode: 0644]
src/patches/bash/bash32-025 [new file with mode: 0644]
src/patches/bash/bash32-026 [new file with mode: 0644]
src/patches/bash/bash32-027 [new file with mode: 0644]
src/patches/bash/bash32-028 [new file with mode: 0644]
src/patches/bash/bash32-029 [new file with mode: 0644]
src/patches/bash/bash32-030 [new file with mode: 0644]
src/patches/bash/bash32-031 [new file with mode: 0644]
src/patches/bash/bash32-032 [new file with mode: 0644]
src/patches/bash/bash32-033 [new file with mode: 0644]
src/patches/bash/bash32-034 [new file with mode: 0644]
src/patches/bash/bash32-035 [new file with mode: 0644]
src/patches/bash/bash32-036 [new file with mode: 0644]
src/patches/bash/bash32-037 [new file with mode: 0644]
src/patches/bash/bash32-038 [new file with mode: 0644]
src/patches/bash/bash32-039 [new file with mode: 0644]
src/patches/bash/bash32-040 [new file with mode: 0644]
src/patches/bash/bash32-041 [new file with mode: 0644]
src/patches/bash/bash32-042 [new file with mode: 0644]
src/patches/bash/bash32-043 [new file with mode: 0644]
src/patches/bash/bash32-044 [new file with mode: 0644]
src/patches/bash/bash32-045 [new file with mode: 0644]
src/patches/bash/bash32-046 [new file with mode: 0644]
src/patches/bash/bash32-047 [new file with mode: 0644]
src/patches/bash/bash32-048 [new file with mode: 0644]
src/patches/bash/bash32-049 [new file with mode: 0644]
src/patches/bash/bash32-050 [new file with mode: 0644]
src/patches/bash/bash32-051 [new file with mode: 0644]
src/patches/binutils-2.18-configure-1.patch [deleted file]
src/patches/ccache-3.1.6-no_compiler_mtime.patch [deleted file]
src/patches/compat-wireless-3.5-build_ath5k_only_with_pci.patch [new file with mode: 0644]
src/patches/compat-wireless-3.5-libertas_uap.patch [moved from src/patches/compat-wireless-3.0-libertas_uap.patch with 97% similarity]
src/patches/compat-wireless-3.6.8-remove_3.1_cpufreq_backport.patch [new file with mode: 0644]
src/patches/compat-wireless_codel-avoid-a-nul-rec_inv_sqrt.patch [new file with mode: 0644]
src/patches/coreutils-5.96-futimes.patch [new file with mode: 0644]
src/patches/cyrus-sasl-2.1.22-bad-elif.patch [new file with mode: 0644]
src/patches/dbus-1.0.3-compile-fix-1.patch [new file with mode: 0644]
src/patches/dhcp-3.1_linux3.patch [new file with mode: 0644]
src/patches/directfb-1.1.1-fix-mknod.patch [new file with mode: 0644]
src/patches/gcc-4.0.4-specs-1.patch [deleted file]
src/patches/gcc-4.1.2-arm-linux-soft-float.patch [deleted file]
src/patches/gcc-4.1.2-fix_linker_version_detection.patch [deleted file]
src/patches/gcc-4.1.2-gcc_eh.patch [deleted file]
src/patches/gcc-4.1.2-specs-1.patch [deleted file]
src/patches/gcc-4.4.3-startfiles_fix-1.patch [new file with mode: 0644]
src/patches/gcc-libstdc++-pic.patch [deleted file]
src/patches/gcc-sdk-libstdc++-includes.patch [deleted file]
src/patches/gcc-uclibc-conf.patch [deleted file]
src/patches/gcc-uclibc-locale.patch [deleted file]
src/patches/gcc/gcc44-build-id.patch [new file with mode: 0644]
src/patches/gcc/gcc44-c++-builtin-redecl.patch [new file with mode: 0644]
src/patches/gcc/gcc44-i386-libgomp.patch [new file with mode: 0644]
src/patches/gcc/gcc44-libtool-no-rpath.patch [new file with mode: 0644]
src/patches/gcc/gcc44-no-add-needed.patch [new file with mode: 0644]
src/patches/gcc/gcc44-pr33763.patch [new file with mode: 0644]
src/patches/gcc/gcc44-rh330771.patch [new file with mode: 0644]
src/patches/gcc/gcc44-rh533181.patch [new file with mode: 0644]
src/patches/gcc/gcc44-rh610785.patch [new file with mode: 0644]
src/patches/gcc/gcc44-unwind-debug-hook.patch [new file with mode: 0644]
src/patches/glibc-2.3.6-dont_use_origin_on_privil_exec.patch [deleted file]
src/patches/glibc-2.3.6-inotify-1.patch [deleted file]
src/patches/glibc-2.3.6-linux_types-1.patch [deleted file]
src/patches/glibc-arm-dont-use-swp.patch [new file with mode: 0644]
src/patches/glibc-cfi-entry-not-closed.patch [new file with mode: 0644]
src/patches/glibc-ports-avoid-using-asm-procinfo.patch [deleted file]
src/patches/glibc-remove-ctors-dtors-output-sections.patch [new file with mode: 0644]
src/patches/glibc-resolv-stack_chk_fail.patch [new file with mode: 0644]
src/patches/glibc-test-installation.pl-libgcc_s.patch [new file with mode: 0644]
src/patches/glibc-test-installation.pl-nss_test1.patch [new file with mode: 0644]
src/patches/glibc/glibc-aliasing.patch [new file with mode: 0644]
src/patches/glibc/glibc-fedora.patch [new file with mode: 0644]
src/patches/glibc/glibc-getlogin-r.patch [new file with mode: 0644]
src/patches/glibc/glibc-localedata.patch [new file with mode: 0644]
src/patches/glibc/glibc-recvmmsg.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh580498.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh582738.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh587360.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh593396.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh593686.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh601686.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh607010.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh607461.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh615090.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh615701.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh621959.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh623187.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh625893.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh630801.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh631011.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh641128.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh642584.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh643822.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh645672.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh646954.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh647448.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh652661.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh656014.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh656530.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh657572.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh661982.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh667974.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh676076.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh676591.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh681054.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh688720.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh688980.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh689471.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh692177.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh692838.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh694386.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh695595.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh695963.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh696472.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh697421.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh699724.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh700507.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh703480.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh703481.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh705465.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh711927.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh711987.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh712248.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh713134.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh714823.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh718057.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh726517.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh730379.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh731042.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh736346.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh737778.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh738665.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh738763.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh739184.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh739971.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh740506-2.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh740506.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh749188.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh750531.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh751750.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh752122.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh757888.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh766513.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh767146.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh767693-2.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh767693.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh767746.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh771342.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh782585.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh784402.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh785984.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh788959-2.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh788959.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh789189.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh789209.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh789238-2.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh789238.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh794817-2.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh794817.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh795498.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh797094-1.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh797094-2.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh804630.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh804689.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh808337.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh808545.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh809602.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh833716.patch [new file with mode: 0644]
src/patches/glibc/glibc-rh837026.patch [new file with mode: 0644]
src/patches/grep-2.5.1a-redhat_fixes-2.patch [deleted file]
src/patches/grub-0.90-append.patch [deleted file]
src/patches/grub-0.90-symlinkmenulst.patch [deleted file]
src/patches/grub-0.91-splashimagehelp.patch [deleted file]
src/patches/grub-0.93-configfile.patch [deleted file]
src/patches/grub-0.93-endedit.patch [deleted file]
src/patches/grub-0.93-graphics-bootterm.patch [deleted file]
src/patches/grub-0.93-special-device-names.patch [deleted file]
src/patches/grub-0.94-i2o.patch [deleted file]
src/patches/grub-0.94-installcopyonly.patch [deleted file]
src/patches/grub-0.95-graphics.patch [deleted file]
src/patches/grub-0.95-hiddenmenu-tweak.patch [deleted file]
src/patches/grub-0.95-md-mbr.patch [deleted file]
src/patches/grub-0.95-md-rework.patch [deleted file]
src/patches/grub-0.95-md.patch [deleted file]
src/patches/grub-0.95-moreraid.patch [deleted file]
src/patches/grub-0.95-nonmbr.patch [deleted file]
src/patches/grub-0.95-odirect.patch [deleted file]
src/patches/grub-0.95-recheck-bad.patch [deleted file]
src/patches/grub-0.95-splash-error-term.patch [deleted file]
src/patches/grub-0.95-staticcurses.patch [deleted file]
src/patches/grub-0.95-xpmjunk.patch [deleted file]
src/patches/grub-0.97-bz429187-cciss.patch [deleted file]
src/patches/grub-0.97-cmdline-size.patch [deleted file]
src/patches/grub-0.97-datadir.patch [deleted file]
src/patches/grub-0.97-disk_geometry-1.patch [deleted file]
src/patches/grub-0.97-dmraid-partition-names.patch [deleted file]
src/patches/grub-0.97-dmraid-recheck-bad.patch [deleted file]
src/patches/grub-0.97-dmraid.patch [deleted file]
src/patches/grub-0.97-install.in.patch [deleted file]
src/patches/grub-0.97-mactel-kbd.patch [deleted file]
src/patches/grub-0.97-mdadm-path.patch [deleted file]
src/patches/grub-0.97-mpath.patch [deleted file]
src/patches/grub-0.97-nx-multiinstall.patch [deleted file]
src/patches/grub-0.97-nxstack.patch [deleted file]
src/patches/grub-0.97-once.patch [deleted file]
src/patches/grub-0.97-prototypes.patch [deleted file]
src/patches/grub-0.97-stderr.patch [deleted file]
src/patches/grub-0.97_grub-install_virtio.patch [deleted file]
src/patches/grub-gentoo-14.patch [new file with mode: 0644]
src/patches/iptables-1.4.12-IMQ-test4.diff [moved from src/patches/iptables-1.4.6-imq_test1.patch with 60% similarity]
src/patches/iptables-1.4.14-ipp2p-0.8.2-ipfire.patch [moved from src/patches/iptables-1.4.6-ipp2p-0.8.2-pomng.patch with 99% similarity]
src/patches/iptables-1.4.6-errorno_includes.patch [deleted file]
src/patches/kudzu-link-lintl.diff [deleted file]
src/patches/kudzu-usbnet.patch [deleted file]
src/patches/kvm-kmod-2.6.38.6_remove_pvclock_scale_delta_redifinition.patch [deleted file]
src/patches/kvm-kmod-3.0b_remove_pvclock_scale_delta_redefinition.patch [deleted file]
src/patches/libmad-0.15.1b-cflags-O2.patch [new file with mode: 0644]
src/patches/libmad-0.15.1b-cflags.patch [new file with mode: 0644]
src/patches/libnl-1.1-ULONG_MAX.patch [new file with mode: 0644]
src/patches/libsafe-alpha.diff [deleted file]
src/patches/libsafe-functioncaching.diff [deleted file]
src/patches/libsigc++-gcc43.patch [new file with mode: 0644]
src/patches/linux-2.6-arm-asm-constraint.patch [new file with mode: 0644]
src/patches/linux-2.6.25.18-not_report_sysctl_1.23.patch [deleted file]
src/patches/linux-2.6.32-crypto-mv_cesa.patch [new file with mode: 0644]
src/patches/linux-2.6.32.11-option_add_vodafone_usbids.patch [deleted file]
src/patches/linux-2.6.32.45-arm_kirkwood_setups.patch [deleted file]
src/patches/linux-2.x-smsc95xx-add_mac_addr_param.patch [new file with mode: 0644]
src/patches/linux-3.0-ipp2p-0.8.2-ipfire.patch [new file with mode: 0644]
src/patches/linux-3.1-imq.patch [new file with mode: 0644]
src/patches/linux-3.2-0001-panda-wlan-fix.patch [new file with mode: 0644]
src/patches/linux-3.2-0002-panda-i2c.patch [new file with mode: 0644]
src/patches/linux-3.2-imq.patch [new file with mode: 0644]
src/patches/linux-3.2-panda-reboot.patch [new file with mode: 0644]
src/patches/linux-3.2.25-arm_kirkwood_setups.patch [new file with mode: 0644]
src/patches/linux-3.2.27-rpi_fix_dwc_common_build.patch [new file with mode: 0644]
src/patches/linux-3.2.33-ledtrig-netdev-1.patch [new file with mode: 0644]
src/patches/linux-3.2.33_ipg-fix-driver-name.patch [new file with mode: 0644]
src/patches/linux-libc-headers-2.6.12.0-inotify-3.patch [deleted file]
src/patches/mISDN_hfc-s_add_id.patch
src/patches/miniupnpd-iptcrdr.patch [deleted file]
src/patches/ncurses-5.5-fixes-1.patch [deleted file]
src/patches/netfilter_layer7_2.22_kernel3.0.patch [new file with mode: 0644]
src/patches/netpbm-10.26.46-getline.patch [new file with mode: 0644]
src/patches/openldap-gcc44-fixes.patch [new file with mode: 0644]
src/patches/pakfire3-changes-for-ipfire2.diff [new file with mode: 0644]
src/patches/pptp-1.7.2-compat.patch [new file with mode: 0644]
src/patches/python-pycurl-fix-do_curl_reset-refcount.patch [new file with mode: 0644]
src/patches/python-pycurl-no-static-libs.patch [new file with mode: 0644]
src/patches/qemu-kqemu_change-default-kqemu-bios.patch [deleted file]
src/patches/r8169_add_missing_pciids.patch
src/patches/readline-5.1-fixes-3.patch [deleted file]
src/patches/readline/readline52-001 [new file with mode: 0644]
src/patches/readline/readline52-002 [new file with mode: 0644]
src/patches/readline/readline52-003 [new file with mode: 0644]
src/patches/readline/readline52-004 [new file with mode: 0644]
src/patches/readline/readline52-005 [new file with mode: 0644]
src/patches/readline/readline52-006 [new file with mode: 0644]
src/patches/readline/readline52-007 [new file with mode: 0644]
src/patches/readline/readline52-008 [new file with mode: 0644]
src/patches/readline/readline52-009 [new file with mode: 0644]
src/patches/readline/readline52-010 [new file with mode: 0644]
src/patches/readline/readline52-011 [new file with mode: 0644]
src/patches/readline/readline52-012 [new file with mode: 0644]
src/patches/readline/readline52-013 [new file with mode: 0644]
src/patches/readline/readline52-014 [new file with mode: 0644]
src/patches/readline/readline62-001 [new file with mode: 0644]
src/patches/readline/readline62-002 [new file with mode: 0644]
src/patches/readline/readline62-003 [new file with mode: 0644]
src/patches/readline/readline62-004 [new file with mode: 0644]
src/patches/screen-4.0.3-stropts.patch [new file with mode: 0644]
src/patches/slang-1.4.9-uclibc.patch [deleted file]
src/patches/texinfo-4.8-multibyte-1.patch [deleted file]
src/patches/texinfo-4.8-tempfile_fix-2.patch [deleted file]
src/patches/uClibc-gcc4-genwctype.patch [deleted file]
src/patches/udev-125-ext4_wo_journal.patch [new file with mode: 0644]
src/patches/udev-125-netif_rename.patch [deleted file]
src/patches/udev-141_no_netif_rename.patch [new file with mode: 0644]
src/patches/udev-config-6.2_persistent-storage-fix.patch [deleted file]
src/patches/udev-config-6.2_remove-lfs-usb-rule.patch [deleted file]
src/patches/v4l-dvb_bestunar_us638x.patch [new file with mode: 0644]
src/patches/v4l-dvb_fix_tua6034_pll.patch [new file with mode: 0644]
src/patches/v4l-dvb_rtl28xx_add_usb_ids.patch [new file with mode: 0644]
src/patches/v4l-dvb_rtl28xx_commented_usb_clear_halt.patch [new file with mode: 0644]
src/patches/v4l-dvb_usbv2_dont_report_pidfilter_fail.patch [new file with mode: 0644]
src/patches/vdr-1.6.0-gcc44-fixes.patch [new file with mode: 0644]
src/patches/vdr-plugin-epgsearch-gcc44.patch [new file with mode: 0644]
src/patches/w_scan-ipfire.patch [deleted file]
src/scripts/backupiso
src/scripts/makegraphs
src/scripts/ovpn-ccd-convert [new file with mode: 0644]
src/scripts/readhash
src/scripts/scanhd
src/scripts/update-lang-cache [new file with mode: 0644]
src/scripts/vpn-watch [deleted file]
src/stripper [new file with mode: 0755]
tools/make-functions

diff --git a/config/acpid/power b/config/acpid/power
new file mode 100644 (file)
index 0000000..7406317
--- /dev/null
@@ -0,0 +1,4 @@
+# ACPID config to power down machine if powerbutton is pressed
+
+event=button/power.*
+action=/etc/acpi/actions/power.sh
diff --git a/config/acpid/power.sh b/config/acpid/power.sh
new file mode 100644 (file)
index 0000000..839a318
--- /dev/null
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# Shutdown the system immediately
+shutdown -h now
index 6fa4c11..60a311b 100644 (file)
@@ -1,26 +1,31 @@
-MENUSELECT_ADDONS=format_mp3
-MENUSELECT_APPS=app_fax app_jack app_osplookup 
+MENUSELECT_ADDONS=format_mp3 
+MENUSELECT_APPS=app_flash app_meetme app_page app_dahdiras app_fax app_jack app_osplookup app_dahdibarge 
 MENUSELECT_BRIDGES=
 MENUSELECT_CDR=cdr_adaptive_odbc cdr_odbc cdr_pgsql cdr_radius cdr_tds cdr_sqlite 
 MENUSELECT_CEL=cel_odbc cel_pgsql cel_radius cel_tds 
-MENUSELECT_CHANNELS=chan_console chan_gtalk chan_jingle chan_misdn chan_nbs chan_vpb chan_h323 
-MENUSELECT_CODECS=codec_ilbc codec_resample codec_speex 
+MENUSELECT_CHANNELS=chan_dahdi chan_console chan_gtalk chan_jingle chan_misdn chan_nbs chan_vpb chan_h323 
+MENUSELECT_CODECS=codec_dahdi codec_resample codec_speex 
 MENUSELECT_FORMATS=
 MENUSELECT_FUNCS=func_odbc func_speex 
 MENUSELECT_PBX=pbx_lua 
-MENUSELECT_RES=res_calendar_caldav res_calendar_ews res_calendar_exchange res_calendar_icalendar res_config_odbc res_http_post res_odbc res_srtp res_timing_timerfd res_ais res_config_pgsql res_config_sqlite res_jabber res_timing_kqueue 
+MENUSELECT_RES=res_calendar_caldav res_calendar_ews res_calendar_exchange res_calendar_icalendar res_config_odbc res_http_post res_odbc res_srtp res_timing_dahdi res_ais res_config_pgsql res_config_sqlite res_jabber res_timing_kqueue 
 MENUSELECT_TESTS=test_acl test_amihooks test_aoc test_app test_ast_format_str_reduce test_astobj2 test_config test_db test_devicestate test_dlinklists test_event test_expr test_func_file test_gosub test_heap test_linkedlists test_locale test_logger test_netsock2 test_pbx test_poll test_sched test_security_events test_skel test_stringfields test_strings test_substitution test_time test_utils 
 MENUSELECT_CFLAGS=LOADABLE_MODULES 
-MENUSELECT_OPTS_app_voicemail=
-MENUSELECT_UTILS=
+MENUSELECT_OPTS_app_voicemail=FILE_STORAGE 
+MENUSELECT_UTILS=astcanary aelparse astman check_expr check_expr2 conf2ael hashtest hashtest2 muted refcounter smsq stereorize streamplayer 
 MENUSELECT_AGIS=
 MENUSELECT_EMBED=
 MENUSELECT_CORE_SOUNDS=CORE-SOUNDS-EN-GSM 
 MENUSELECT_MOH=MOH-OPSOUND-GSM 
 MENUSELECT_EXTRA_SOUNDS=EXTRA-SOUNDS-EN-GSM 
-MENUSELECT_BUILD_DEPS=chan_local app_voicemail app_meetme res_monitor res_agi res_adsi res_smdi res_crypto res_pktccops res_ael_share res_fax G711_NEW_ALGORITHM 
+MENUSELECT_BUILD_DEPS=chan_local app_voicemail res_monitor res_agi res_adsi res_smdi res_crypto res_pktccops res_ael_share res_fax G711_NEW_ALGORITHM 
+MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_flash
+MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_meetme
+MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_page
+MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_dahdiras
 MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_jack
 MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_osplookup
+MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_dahdibarge
 MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_adaptive_odbc
 MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_odbc
 MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_pgsql
@@ -31,6 +36,7 @@ MENUSELECT_DEPSFAILED=MENUSELECT_CEL=cel_odbc
 MENUSELECT_DEPSFAILED=MENUSELECT_CEL=cel_pgsql
 MENUSELECT_DEPSFAILED=MENUSELECT_CEL=cel_radius
 MENUSELECT_DEPSFAILED=MENUSELECT_CEL=cel_tds
+MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_dahdi
 MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_console
 MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_gtalk
 MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_jingle
@@ -38,6 +44,7 @@ MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_misdn
 MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_nbs
 MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_vpb
 MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_h323
+MENUSELECT_DEPSFAILED=MENUSELECT_CODECS=codec_dahdi
 MENUSELECT_DEPSFAILED=MENUSELECT_CODECS=codec_resample
 MENUSELECT_DEPSFAILED=MENUSELECT_CODECS=codec_speex
 MENUSELECT_DEPSFAILED=MENUSELECT_FUNCS=func_odbc
@@ -51,7 +58,7 @@ MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_odbc
 MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_http_post
 MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_odbc
 MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_srtp
-MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_timing_timerfd
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_timing_dahdi
 MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_ais
 MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_pgsql
 MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_sqlite
index d2d6816..f9b8302 100644 (file)
@@ -62,6 +62,8 @@ elsif ($ARGV[0] eq 'exclude') {
 }
 elsif ($ARGV[0] eq 'restore') {
   system("cd / && tar -xvz -p -f /tmp/restore.ipf");
+  #Here some converter scripts to correct old Backups (before core 65)
+  system("/usr/sbin/ovpn-ccd-convert");
 }
 elsif ($ARGV[0] eq 'restoreaddon') {
   if ( -e "/tmp/$ARGV[1]" ){system("mv /tmp/$ARGV[1] /var/ipfire/backup/addons/backup/$ARGV[1]");}
index 8806640..a1d1fbc 100644 (file)
@@ -16,6 +16,7 @@
 /var/ipfire/dhcp/*
 /var/ipfire/main/*
 /var/ipfire/outgoing/groups
+/var/ipfire/outgoing/macgroups
 /var/ipfire/outgoing/rules
 /var/ipfire/outgoing/p2protocols
 /var/ipfire/ovpn
@@ -28,6 +29,8 @@
 /var/ipfire/vpn
 /var/log/ip-acct/*
 /var/log/rrd/*
+/var/log/rrd/collectd
+/var/log/rrd/vnstat
 /etc/sysconfig/firewall.local
 /etc/sysconfig/rc.local
 /root/.gitconfig
index 71f4cac..618f4c7 100644 (file)
@@ -3,3 +3,4 @@
 /var/ipfire/lcr/interface.conf
 /var/ipfire/lcr/options.conf
 /var/ipfire/lcr/routing.conf
+/var/log/lcr
diff --git a/config/backup/includes/pakfire3 b/config/backup/includes/pakfire3
new file mode 100644 (file)
index 0000000..404e92c
--- /dev/null
@@ -0,0 +1 @@
+/etc/pakfire
diff --git a/config/bash/dot_bash_logout b/config/bash/dot_bash_logout
new file mode 100644 (file)
index 0000000..d56620d
--- /dev/null
@@ -0,0 +1,10 @@
+# Begin ~/.bash_logout
+
+# Personal items to perform on logout.
+
+# Clear console to not leak any information.
+clear
+
+echo "Bye bye."
+
+# End ~/.bash_logout
diff --git a/config/bash/dot_bash_profile b/config/bash/dot_bash_profile
new file mode 100644 (file)
index 0000000..3dc099a
--- /dev/null
@@ -0,0 +1,12 @@
+# .bash_profile
+
+# Get the aliases and functions
+if [ -f ~/.bashrc ]; then
+       . ~/.bashrc
+fi
+
+# User specific environment and startup programs
+
+PATH=$PATH:$HOME/bin
+
+export PATH
diff --git a/config/bash/dot_bashrc b/config/bash/dot_bashrc
new file mode 100644 (file)
index 0000000..90b96b4
--- /dev/null
@@ -0,0 +1,18 @@
+# .bashrc
+
+# User specific aliases and functions
+
+alias rm='rm -i'
+alias cp='cp -i'
+alias mv='mv -i'
+
+# Source global definitions
+if [ -f /etc/bashrc ]; then
+       . /etc/bashrc
+fi
+
+# Automatically logout only console users after 10 minutes.
+export TMOUT=0
+if [ -z "${SSH_TTY}" ] && [ -z "${STY}" ]; then
+       export TMOUT=600
+fi
index 567f2e1..f94cdbf 100644 (file)
@@ -18,8 +18,7 @@ use strict;
 use Socket;
 use IO::Socket;
 use Net::SSLeay;
-use Net::IPv4Addr;
-
+use Net::IPv4Addr qw(:all);
 $|=1; # line buffering
 
 $General::version = 'VERSION';
@@ -212,21 +211,254 @@ sub validipormask
        return &validmask($mask);
 }
 
+sub subtocidr
+{
+       #gets: Subnet in decimal (255.255.255.0) 
+       #Gives: 24 (The cidr of network)
+       my ($byte1, $byte2, $byte3, $byte4) = split(/\./, $_[0].".0.0.0.0"); 
+       my $num = ($byte1 * 16777216) + ($byte2 * 65536) + ($byte3 * 256) + $byte4; 
+       my $bin = unpack("B*", pack("N", $num)); 
+       my $count = ($bin =~ tr/1/1/); 
+       return $count;
+}
+
+sub cidrtosub
+{
+       #gets: Cidr of network (20-30 for ccd) 
+       #Konverts 30 to 255.255.255.252 e.g
+       my $cidr=$_[0];
+    my $netmask = &Net::IPv4Addr::ipv4_cidr2msk($cidr);
+    return "$netmask";
+}
+  
+sub iporsubtodec
+{
+       #Gets: Ip address or subnetmask in decimal oder CIDR
+       #Gives: What it gets only in CIDR format
+       my $subnet=$_[0];
+       my $net;
+       my $mask;
+       my $full=0;
+       if ($subnet =~ /^(.*?)\/(.*?)$/) {
+               ($net,$mask) = split (/\//,$subnet);
+               $full=1;
+               return "$subnet";
+       }else{
+               $mask=$subnet;
+       }
+       #Subnet already in decimal and valid?
+       if ($mask=~/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/ &&(($1<=255  && $2<=$1 && $3<=$2  && $4<=$3 )))       {
+               for (my $i=8;$i<=32;$i++){
+                       if (&General::cidrtosub($i) eq $mask){
+                               if ($full == 0){return $mask;}else{
+                                                        return $net."/".$mask;
+                               }
+                       }
+               }       
+       }
+       #Subnet in binary format?
+       if ($mask=~/^(\d{1,2})$/ && (($1<=32 && $1>=8))){
+                       if($full == 0){ return &General::cidrtosub($mask);}else{
+                                                return $net."/".&General::cidrtosub($mask);
+                       }
+       }else{
+                       return 3;
+       }
+       return 3;
+}
+  
+  
+sub iporsubtocidr
+{
+       #gets: Ip Address  or subnetmask in decimal oder CIDR
+       #Gives: What it gets only in CIDR format
+       my $subnet=$_[0];
+       my $net;
+       my $mask;
+       my $full=0;
+       if ($subnet =~ /^(.*?)\/(.*?)$/) {
+               ($net,$mask) = split (/\//,$subnet);
+               $full=1;
+       }else{
+               $mask=$subnet;
+       }
+       #Subnet in decimal and valid?
+       if ($mask=~/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/ &&(($1<=255  && $2<=$1 && $3<=$2  && $4<=$3 )))       {
+               for (my $i=8;$i<=32;$i++){
+                       if (&General::cidrtosub($i) eq $mask){
+                               if ($full == 0){return &General::subtocidr($mask);}else{
+                                                        return $net."/".&General::subtocidr($mask);
+                               }
+                       }
+               }       
+       }
+       #Subnet already in binary format?
+       if ($mask=~/^(\d{1,2})$/ && (($1<=32 && $1>=8))){
+                       if($full == 0){ return $mask;}else{
+                                                return $net."/".$mask;
+                       }
+       }else{
+                       return 3;
+       }
+       return 3;
+}
+
+sub getnetworkip
+{
+       #Gets:  IP, CIDR    (10.10.10.0-255, 24)
+       #Gives:  10.10.10.0
+       my ($ccdip,$ccdsubnet) = @_;
+       my $ip_address_binary = inet_aton( $ccdip );
+       my $netmask_binary    = ~pack("N", (2**(32-$ccdsubnet))-1);
+       my $network_address    = inet_ntoa( $ip_address_binary & $netmask_binary );
+       return $network_address;
+}
+
+sub getccdbc
+{
+       #Gets: IP in Form ("192.168.0.0/24")
+       #Gives: Broadcastaddress of network
+       my $ccdnet=$_;
+       my ($ccdip,$ccdsubnet) = split "/",$ccdnet;
+       my $ip_address_binary = inet_aton( $ccdip );
+       my $netmask_binary    = ~pack("N", (2**(32-$ccdsubnet))-1);
+       my $broadcast_address  = inet_ntoa( $ip_address_binary | ~$netmask_binary );
+       return $broadcast_address;
+}
+
+sub ip2dec 
+{
+    my $ip_num;
+    my $ip=$_[0];
+    if ( $ip =~ /(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})/ ) {
+        $ip_num = (($1*256**3) + ($2*256**2) + ($3*256) + $4);
+    } else {
+        $ip_num = -1;
+    }
+    $ip_num = (($1*256**3) + ($2*256**2) + ($3*256) + $4);
+    return($ip_num);
+}
+
+sub dec2ip 
+{
+    my $ip;
+    my $ip_num=$_[0];
+       my $o1=$ip_num%256;
+       $ip_num=int($ip_num/256);
+       my $o2=$ip_num%256;
+       $ip_num=int($ip_num/256);
+       my $o3=$ip_num%256;
+       $ip_num=int($ip_num/256);
+       my $o4=$ip_num%256;
+       $ip="$o4.$o3.$o2.$o1";
+    return ($ip);
+}
+
+sub getnextip
+{
+       my $decip=&ip2dec($_[0]);
+       $decip=$decip+4;
+       return &dec2ip($decip);
+}
+
+sub getlastip
+{
+       my $decip=&ip2dec($_[0]);
+       $decip--;
+       return &dec2ip($decip);
+}
+
 sub validipandmask
 {
-       my $ipandmask = $_[0];
+       #Gets: Ip address in 192.168.0.0/24 or 192.168.0.0/255.255.255.0 and checks if subnet valid
+       #Gives: True bzw 0 if success or false 
+       my $ccdnet=$_[0];
+       my $subcidr;
+       
+       if (!($ccdnet =~ /^(.*?)\/(.*?)$/)) {
+               return 0;
+       }
+       my ($ccdip,$ccdsubnet)=split (/\//, $ccdnet);
+       #IP valid?
+       if ($ccdip=~/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/ &&(($1>0 && $1<=255 && $2>=0 && $2<=255 && $3>=0 && $3<=255 && $4<=255 ))) {
+               #Subnet in decimal and valid?
+               if ($ccdsubnet=~/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/ &&(($1<=255  && $2<=$1 && $3<=$2  && $4<=$3 )))  {
+                       for (my $i=8;$i<=32;$i++){
+                               if (&General::cidrtosub($i) eq $ccdsubnet){
+                                       return 1;
+                               }
+                       }       
+               #Subnet already in binary format?
+               }elsif ($ccdsubnet=~/^(\d{1,2})$/ && (($1<=32 && $1>=8))){
+                       return 1;
+               }else{
+                       return 0;
+               }
+               
+       }
+       return 0;
+}
 
-       # split it into number and mask.
-       if (!($ipandmask =~ /^(.*?)\/(.*?)$/)) {
-               return 0; }
-       my $ip = $1;
-       my $mask = $2;
-       # first part not a ip?
-       if (!(&validip($ip))) {
-               return 0; }
-       return &validmask($mask);
+sub checksubnets
+{
+       my %ccdconfhash=();                     
+       my @ccdconf=();                         
+       my $ccdname=$_[0];                      
+       my $ccdnet=$_[1];                       
+       my $errormessage;
+       my ($ip,$cidr)=split(/\//,$ccdnet);
+       $cidr=&iporsubtocidr($cidr);
+       #get OVPN-Subnet (dynamic range)
+       my %ovpnconf=();
+       &readhash("${General::swroot}/ovpn/settings", \%ovpnconf);
+       my ($ovpnip,$ovpncidr)= split (/\//,$ovpnconf{'DOVPN_SUBNET'});
+       $ovpncidr=&iporsubtocidr($ovpncidr);
+       #check if we try to use same network as ovpn server
+       if ("$ip/$cidr" eq "$ovpnip/$ovpncidr") {
+                       $errormessage=$errormessage.$Lang::tr{'ccd err isovpnnet'}."<br>";
+                       return $errormessage;
+       }
+       #check if we use a network-name/subnet that already exists
+       &readhasharray("${General::swroot}/ovpn/ccd.conf", \%ccdconfhash);
+       foreach my $key (keys %ccdconfhash) {
+               @ccdconf=split(/\//,$ccdconfhash{$key}[1]);
+               if ($ccdname eq $ccdconfhash{$key}[0]) 
+               {
+                       $errormessage=$errormessage.$Lang::tr{'ccd err nameexist'}."<br>";
+                       return $errormessage;
+               }
+               my ($newip,$newsub) = split(/\//,$ccdnet);
+               if (&IpInSubnet($newip,$ccdconf[0],&iporsubtodec($ccdconf[1]))) 
+               {
+                       $errormessage=$errormessage.$Lang::tr{'ccd err issubnet'}."<br>";
+                       return $errormessage;
+               }
+       }
+       #check if we use a ipsec right network which is already defined
+       my %ipsecconf=();
+       &General::readhasharray("${General::swroot}/vpn/config", \%ipsecconf);
+       foreach my $key (keys %ipsecconf){
+               if ($ipsecconf{$key}[11] ne ''){
+                       my ($ipsecip,$ipsecsub) = split (/\//, $ipsecconf{$key}[11]);
+                       $ipsecsub=&iporsubtodec($ipsecsub);
+                       if($ipsecconf{$key}[1] ne $ccdname){
+                               if ( &IpInSubnet ($ip,$ipsecip,$ipsecsub) ){
+                                       $errormessage=$Lang::tr{'ccd err isipsecnet'}." Name:  $ipsecconf{$key}[1]";
+                                       return $errormessage;
+                               }
+                       }
+               }
+       }
+       #check if we use one of ipfire's networks (green,orange,blue)
+       my %ownnet=();
+       &readhash("${General::swroot}/ethernet/settings", \%ownnet);
+       if (($ownnet{'GREEN_NETADDRESS'}        ne '' && $ownnet{'GREEN_NETADDRESS'}    ne '0.0.0.0') && &IpInSubnet($ownnet{'GREEN_NETADDRESS'},$ip,&iporsubtodec($cidr))){ $errormessage=$Lang::tr{'ccd err green'};return $errormessage;}
+       if (($ownnet{'ORANGE_NETADDRESS'}       ne '' && $ownnet{'ORANGE_NETADDRESS'}   ne '0.0.0.0') && &IpInSubnet($ownnet{'ORANGE_NETADDRESS'},$ip,&iporsubtodec($cidr))){ $errormessage=$Lang::tr{'ccd err orange'};return $errormessage;}
+       if (($ownnet{'BLUE_NETADDRESS'}         ne '' && $ownnet{'BLUE_NETADDRESS'}     ne '0.0.0.0') && &IpInSubnet($ownnet{'BLUE_NETADDRESS'},$ip,&iporsubtodec($cidr))){ $errormessage=$Lang::tr{'ccd err blue'};return $errormessage;}
+       if (($ownnet{'RED_NETADDRESS'}          ne '' && $ownnet{'RED_NETADDRESS'}              ne '0.0.0.0') && &IpInSubnet($ownnet{'RED_NETADDRESS'},$ip,&iporsubtodec($cidr))){ $errormessage=$Lang::tr{'ccd err red'};return $errormessage;}
 }
 
+
 sub validport
 {
        $_ = $_[0];
@@ -276,7 +508,7 @@ sub validhostname
        if (length ($hostname) < 1 || length ($hostname) > 63) {
                return 0;}
        # Only valid characters are a-z, A-Z, 0-9 and -
-       if ($hostname !~ /^[a-zA-Z0-9-]*$/) {
+       if ($hostname !~ /^[a-zA-Z0-9-\s]*$/) {
                return 0;}
        # First character can only be a letter or a digit
        if (substr ($hostname, 0, 1) !~ /^[a-zA-Z0-9]*$/) {
@@ -407,7 +639,12 @@ sub NextIP
                                   )
                             );
 }
-
+sub NextIP2
+{
+    return &Socket::inet_ntoa( pack("N", 4 +  unpack('N', &Socket::inet_aton(shift))
+                                  )
+                            );
+}
 sub ipcidr
 {
        my ($ip,$cidr) = &Net::IPv4Addr::ipv4_parse(shift);
@@ -465,13 +702,13 @@ sub writehasharray {
     open(FILE, ">$filename") or die "Unable to write to file $filename";
 
     foreach $key (keys %$hash) {
-       if ($key =~ /^[0-9]+$/) {
-           print FILE "$key";
-           foreach $i (0 .. $#{$hash->{$key}}) {
-               print FILE ",$hash->{$key}[$i]";
-           }
-           print FILE "\n";
-       }
+               if ($key =~ /^[0-9]+$/) {
+                       print FILE "$key";
+                       foreach $i (0 .. $#{$hash->{$key}}) {
+                               print FILE ",$hash->{$key}[$i]";
+                       }
+                       print FILE "\n";
+               }
     }
     close FILE;
     return;
index 939dd4b..67d9e19 100644 (file)
@@ -68,7 +68,7 @@ include "/etc/collectd.precache"
        Process "nmbd"
        Process "squid"
        Process "squidguard"
-       Process "pluto"
+       Process "charon"
        Process "snort"
        Process "openvpn"
        Process "qemu"
index 5cca1fa..ad90b07 100644 (file)
@@ -11,7 +11,7 @@ HOME=/
 */5 * * * *    test -x /usr/local/bin/run-parts && /usr/local/bin/run-parts /etc/fcron.cyclic
 01 * * * *     test -x /usr/local/bin/run-parts && /usr/local/bin/run-parts /etc/fcron.hourly
 &nice(10),bootrun 25 1 * * *   test -x /usr/local/bin/run-parts && /usr/local/bin/run-parts /etc/fcron.daily
-&nice(10),bootrun 47 2 * * 0   test -x /usr/local/bin/run-parts && /usr/local/bin/run-parts /etc/fcron.weekly
+&nice(10),bootrun 47 2 * * 1   test -x /usr/local/bin/run-parts && /usr/local/bin/run-parts /etc/fcron.weekly
 &nice(10),bootrun 52 3 1 * *   test -x /usr/local/bin/run-parts && /usr/local/bin/run-parts /etc/fcron.monthly
 
 # Log rotation
index e35209f..901f5d5 100644 (file)
@@ -1,46 +1,89 @@
-# Begin /etc/bashrc
-# Written for Beyond Linux From Scratch
-# by James Robertson <jameswrobertson@earthlink.net>
-# updated by Bruce Dubbs <bdubbs@linuxfromscratch.org>
+# /etc/bashrc
 
-# Make sure that the terminal is set up properly for each shell
+# System wide functions and aliases
+# Environment stuff goes in /etc/profile
 
-if [ -f /etc/profile.d/tinker-term.sh ]; then
-  source /etc/profile.d/tinker-term.sh
-fi
-
-# System wide aliases and functions.
-
-# System wide environment variables and startup programs should go into
-# /etc/profile.  Personal environment variables and startup programs
-# should go into ~/.bash_profile.  Personal aliases and functions should
-# go into ~/.bashrc
-
-# Provides a colored /bin/ls command.  Used in conjunction with code in
-# /etc/profile.
+# It's NOT a good idea to change this file unless you know what you
+# are doing. It's much better to create a custom.sh shell script in
+# /etc/profile.d/ to make custom changes to your environment, as this
+# will prevent the need for merging in future updates.
 
-alias ls='ls --color=auto'
-alias ll='ls -la'
-alias which='alias | /usr/bin/which --tty-only --read-alias --show-dot --show-tilde'
-
-# Make the shell a little bit more interactive 
-# to prevent the deletion of some files
-alias mv='mv -i'
-alias rm='rm -i'
-alias cp='cp -i'
-
-# Midnight Commander isn't compatible to UTF8.
-# So we use it in ACSII-Mode.
+# are we an interactive shell?
+if [ "$PS1" ]; then
+  if [ -z "$PROMPT_COMMAND" ]; then
+    case $TERM in
+    xterm*)
+      if [ -e /etc/sysconfig/bash-prompt-xterm ]; then
+          PROMPT_COMMAND=/etc/sysconfig/bash-prompt-xterm
+      else
+          PROMPT_COMMAND='printf "\033]0;%s@%s:%s\007" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/~}"'
+      fi
+      ;;
+    screen)
+      if [ -e /etc/sysconfig/bash-prompt-screen ]; then
+          PROMPT_COMMAND=/etc/sysconfig/bash-prompt-screen
+      else
+          PROMPT_COMMAND='printf "\033]0;%s@%s:%s\033\\" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/~}"'
+      fi
+      ;;
+    *)
+      [ -e /etc/sysconfig/bash-prompt-default ] && PROMPT_COMMAND=/etc/sysconfig/bash-prompt-default
+      ;;
+    esac
+  fi
+  # Turn on parallel history
+  shopt -s histappend
+  history -a
+  # Turn on checkwinsize
+  shopt -s checkwinsize
+  [ "$PS1" = "\\s-\\v\\\$ " ] && PS1="[\u@\h \W]\\$ "
+  # You might want to have e.g. tty in prompt (e.g. more virtual machines)
+  # and console windows
+  # If you want to do so, just add e.g.
+  # if [ "$PS1" ]; then
+  #   PS1="[\u@\h:\l \W]\\$ "
+  # fi
+  # to your custom modification shell script in /etc/profile.d/ directory
+fi
 
-alias mc='mc -a'
+if ! shopt -q login_shell ; then # We're not a login shell
+    # Need to redefine pathmunge, it get's undefined at the end of /etc/profile
+    pathmunge () {
+        case ":${PATH}:" in
+            *:"$1":*)
+                ;;
+            *)
+                if [ "$2" = "after" ] ; then
+                    PATH=$PATH:$1
+                else
+                    PATH=$1:$PATH
+                fi
+        esac
+    }
 
-# Provides prompt for non-login shells, specifically shells started
-# in the X environment. [Review the LFS archive thread titled
-# PS1 Environment Variable for a great case study behind this script
-# addendum.]
+    # By default, we want umask to get set. This sets it for non-login shell.
+    # Current threshold for system reserved uid/gids is 200
+    # You could check uidgid reservation validity in
+    # /usr/share/doc/setup-*/uidgid file
+    if [ $UID -gt 199 ] && [ "`id -gn`" = "`id -un`" ]; then
+       umask 002
+    else
+       umask 022
+    fi
 
-#export PS1="\033[0m[\033[1;33m\u\033[1;37m@\033[1;32m\]\h \033[1;31m\w\033[0m]\\$ "
-export PS1="[\u@\h \w]\\$ "
-#export PS1='\u@\h:\w\$ '
+    # Only display echos from profile.d scripts if we are no login shell
+    # and interactive - otherwise just process them to set envvars
+    for i in /etc/profile.d/*.sh; do
+        if [ -r "$i" ]; then
+            if [ "$PS1" ]; then
+                . "$i"
+            else
+                . "$i" >/dev/null
+            fi
+        fi
+    done
 
-# End /etc/bashrc
+    unset i
+    unset -f pathmunge
+fi
+# vim:ts=4:sw=4
index 3b155fa..46e4b80 100644 (file)
@@ -14,7 +14,7 @@ dialout:x:16:
 floppy:x:19:
 tape:x:20:
 utmp:x:22:
-squid:x:23:
+squid:x:23:nobody
 ntp:x:38:
 dip:x:40:
 mysql:x:41:
index 7a7908c..883686c 100644 (file)
@@ -1,42 +1,42 @@
-# Begin /etc/inputrc
+# do not bell on tab-completion
+#set bell-style none
 
-# Allow the command prompt to wrap to the next line
-set horizontal-scroll-mode Off
+set meta-flag on
+set input-meta on
+set convert-meta off
+set output-meta on
 
-# Enable 8bit input
-set meta-flag On
-set input-meta On
+# Completed names which are symbolic links to
+# directories have a slash appended.
+set mark-symlinked-directories on
 
-# Turns off 8th bit stripping
-set convert-meta Off
+$if mode=emacs
 
-# Keep the 8th bit for display
-set output-meta On
-
-# none, visible or audible
-set bell-style none
-
-# All of the following map the escape sequence of the
-# value contained inside the 1st argument to the
-# readline specific functions
-
-"\eOd": backward-word
-"\eOc": forward-word
-
-# for linux console
+# for linux console and RH/Debian xterm
 "\e[1~": beginning-of-line
 "\e[4~": end-of-line
-"\e[5~": beginning-of-history
-"\e[6~": end-of-history
+# commented out keymappings for pgup/pgdown to reach begin/end of history
+#"\e[5~": beginning-of-history
+#"\e[6~": end-of-history
+"\e[5~": history-search-backward
+"\e[6~": history-search-forward
 "\e[3~": delete-char
 "\e[2~": quoted-insert
+"\e[5C": forward-word
+"\e[5D": backward-word
+"\e[1;5C": forward-word
+"\e[1;5D": backward-word
 
-# for xterm
+# for rxvt
+"\e[8~": end-of-line
+"\eOc": forward-word
+"\eOd": backward-word
+
+# for non RH/Debian xterm, can't hurt for RH/DEbian xterm
 "\eOH": beginning-of-line
 "\eOF": end-of-line
 
-# for Konsole
+# for freebsd console
 "\e[H": beginning-of-line
 "\e[F": end-of-line
-
-# End /etc/inputrc
+$endif
index 9e04ea6..e72bedd 100644 (file)
@@ -1,2 +1 @@
-#options cfg80211 ieee80211_regdom=DE
 blacklist ieee80211
index 3c29219..2d66685 100644 (file)
@@ -1,64 +1,78 @@
-# Begin /etc/profile
-# Written for Beyond Linux From Scratch
-# by James Robertson <jameswrobertson@earthlink.net>
-# modifications by Dagmar d'Surreal <rivyqntzne@pbzpnfg.arg>
+# /etc/profile
 
-# System wide environment variables and startup programs.
+# System wide environment and startup programs, for login setup
+# Functions and aliases go in /etc/bashrc
 
-# System wide aliases and functions should go in /etc/bashrc.  Personal
-# environment variables and startup programs should go into
-# ~/.bash_profile.  Personal aliases and functions should go into
-# ~/.bashrc.
+# It's NOT a good idea to change this file unless you know what you
+# are doing. It's much better to create a custom.sh shell script in
+# /etc/profile.d/ to make custom changes to your environment, as this
+# will prevent the need for merging in future updates.
 
-# Functions to help us manage paths.  Second argument is the name of the
-# path variable to be modified (default: PATH)
-pathremove () {
-        local IFS=':'
-        local NEWPATH
-        local DIR
-        local PATHVARIABLE=${2:-PATH}
-        for DIR in ${!PATHVARIABLE} ; do
-                if [ "$DIR" != "$1" ] ; then
-                  NEWPATH=${NEWPATH:+$NEWPATH:}$DIR
-                fi
-        done
-        export $PATHVARIABLE="$NEWPATH"
+pathmunge () {
+    case ":${PATH}:" in
+        *:"$1":*)
+            ;;
+        *)
+            if [ "$2" = "after" ] ; then
+                PATH=$PATH:$1
+            else
+                PATH=$1:$PATH
+            fi
+    esac
 }
 
-pathprepend () {
-        pathremove $1 $2
-        local PATHVARIABLE=${2:-PATH}
-        export $PATHVARIABLE="$1${!PATHVARIABLE:+:${!PATHVARIABLE}}"
-}
-
-pathappend () {
-        pathremove $1 $2
-        local PATHVARIABLE=${2:-PATH}
-        export $PATHVARIABLE="${!PATHVARIABLE:+${!PATHVARIABLE}:}$1"
-}
 
+if [ -x /usr/bin/id ]; then
+    if [ -z "$EUID" ]; then
+        # ksh workaround
+        EUID=`id -u`
+        UID=`id -ru`
+    fi
+    USER="`id -un`"
+    LOGNAME=$USER
+    MAIL="/var/spool/mail/$USER"
+fi
 
-# Set the initial path
-export PATH=/bin:/usr/bin
+# Path manipulation
+if [ "$EUID" = "0" ]; then
+    pathmunge /sbin
+    pathmunge /usr/sbin
+    pathmunge /usr/local/sbin
+else
+    pathmunge /usr/local/sbin after
+    pathmunge /usr/sbin after
+    pathmunge /sbin after
+fi
 
-if [ $EUID -eq 0 ] ; then
-        pathappend /sbin:/usr/sbin
-        unset HISTFILE
+HOSTNAME=`/bin/hostname 2>/dev/null`
+HISTSIZE=1000
+if [ "$HISTCONTROL" = "ignorespace" ] ; then
+    export HISTCONTROL=ignoreboth
+else
+    export HISTCONTROL=ignoredups
 fi
 
-# Setup some environment variables.
-export HISTSIZE=1000
-export HISTIGNORE="&:[bf]g:exit"
-export PS1="[\u@\h \w]\\$ "
-#export PS1='\u@\h:\w\$ '
+export PATH USER LOGNAME MAIL HOSTNAME HISTSIZE HISTCONTROL
+
+# By default, we want umask to get set. This sets it for login shell
+# Current threshold for system reserved uid/gids is 200
+# You could check uidgid reservation validity in
+# /usr/share/doc/setup-*/uidgid file
+if [ $UID -gt 199 ] && [ "`id -gn`" = "`id -un`" ]; then
+    umask 002
+else
+    umask 022
+fi
 
-for script in /etc/profile.d/*.sh ; do
-        if [ -r $script ] ; then
-                . $script
+for i in /etc/profile.d/*.sh ; do
+    if [ -r "$i" ]; then
+        if [ "${-#*i}" != "$-" ]; then 
+            . "$i"
+        else
+            . "$i" >/dev/null 2>&1
         fi
+    fi
 done
 
-# Now to clean up
-unset pathremove pathprepend pathappend
-
-# End /etc/profile
+unset i
+unset pathmunge
index 9a6a9fd..3a69d0b 100644 (file)
@@ -5,6 +5,7 @@ tty4
 tty5
 tty6
 ttyAMA0
+ttyO2
 ttyS0
 ttyS1
 ttyS2
index 105feaa..df3ef5f 100644 (file)
@@ -23,3 +23,8 @@ net.ipv4.conf.all.log_martians = 1
 kernel.printk = 1 4 1 7
 vm.swappiness=0
 vm.mmap_min_addr = 4096
+vm.min_free_kbytes = 8192
+
+# Disable IPv6 by default.
+net.ipv6.conf.all.disable_ipv6 = 1
+net.ipv6.conf.default.disable_ipv6 = 1
diff --git a/config/fstrim/trim b/config/fstrim/trim
new file mode 100644 (file)
index 0000000..6f61a63
--- /dev/null
@@ -0,0 +1,8 @@
+#!/bin/bash
+#
+# Script to trim free space on solid state drives.
+#
+for i in / /boot /var; do
+       fstrim $i 2>&1 >/dev/null
+done
+
index 553b10d..2199bf1 100644 (file)
@@ -14,28 +14,8 @@ title IPFire
   kernel /vmlinuz-KVER-ipfire root=ROOT panic=10 MOUNT
   initrd /ipfirerd-KVER.img
   savedefault 0
-title IPFire (vesafb 640x480)
-  root (hd0,0)
-  kernel /vmlinuz-KVER-ipfire root=ROOT panic=10 vga=785 MOUNT
-  initrd /ipfirerd-KVER.img
-  savedefault 1
-title IPFire (vesafb 800x600)
-  root (hd0,0)
-  kernel /vmlinuz-KVER-ipfire root=ROOT panic=10 vga=788 MOUNT
-  initrd /ipfirerd-KVER.img
-  savedefault 2
 title IPFire (vesafb 1024x768)
   root (hd0,0)
   kernel /vmlinuz-KVER-ipfire root=ROOT panic=10 vga=791 MOUNT
   initrd /ipfirerd-KVER.img
-  savedefault 3
-title IPFire (acpi disabled)
-  root (hd0,0)
-  kernel /vmlinuz-KVER-ipfire root=ROOT panic=10 acpi=off MOUNT
-  initrd /ipfirerd-KVER.img
-  savedefault 4
-title IPFire (single Processor)
-  root (hd0,0)
-  kernel /vmlinuz-KVER-ipfire root=ROOT panic=10 nosmp MOUNT
-  initrd /ipfirerd-KVER.img
-  savedefault 5
+  savedefault 1
index 88dca15..6158e2c 100644 (file)
@@ -16,8 +16,8 @@ CONFIG_DRIVER_HOSTAP=y
 #CONFIG_DRIVER_WIRED=y
 
 # Driver interface for madwifi driver
-CONFIG_DRIVER_MADWIFI=y
-CFLAGS += -I../../madwifi # change to the madwifi source directory
+#CONFIG_DRIVER_MADWIFI=y
+#CFLAGS += -I../../madwifi # change to the madwifi source directory
 
 # Driver interface for Prism54 driver
 CONFIG_DRIVER_PRISM54=y
index 5e67dce..e1f493f 100644 (file)
@@ -1,4 +1,4 @@
-driver=madwifi
+driver=nl80211
 ######################### basic hostapd configuration ##########################
 #
 interface=blue0
index 7b10832..cc3cb1d 100644 (file)
                 Order deny,allow
                 Allow from all
        </Directory>
+
+    Alias /proxy-reports/ /var/log/sarg/
+    <Directory /var/log/sarg>
+        AllowOverride None
+        Options None
+        AuthName "IPFire - Restricted"
+        AuthType Basic
+        AuthUserFile /var/ipfire/auth/users
+        Require user admin
+    </Directory>
 </VirtualHost>
diff --git a/config/include/obsolete_videodev.h b/config/include/obsolete_videodev.h
new file mode 100644 (file)
index 0000000..c51a5f9
--- /dev/null
@@ -0,0 +1,320 @@
+/*
+ *     Video for Linux version 1 - OBSOLETE
+ *
+ *     Header file for v4l1 drivers and applications, for
+ *     Linux kernels 2.2.x or 2.4.x.
+ *
+ *     Provides header for legacy drivers and applications
+ *
+ *     See http://linuxtv.org for more info
+ *
+ */
+#ifndef __LINUX_VIDEODEV_H
+#define __LINUX_VIDEODEV_H
+
+#include <linux/types.h>
+#include <linux/ioctl.h>
+#include <linux/videodev2.h>
+
+
+#define VID_TYPE_CAPTURE       1       /* Can capture */
+#define VID_TYPE_TUNER         2       /* Can tune */
+#define VID_TYPE_TELETEXT      4       /* Does teletext */
+#define VID_TYPE_OVERLAY       8       /* Overlay onto frame buffer */
+#define VID_TYPE_CHROMAKEY     16      /* Overlay by chromakey */
+#define VID_TYPE_CLIPPING      32      /* Can clip */
+#define VID_TYPE_FRAMERAM      64      /* Uses the frame buffer memory */
+#define VID_TYPE_SCALES                128     /* Scalable */
+#define VID_TYPE_MONOCHROME    256     /* Monochrome only */
+#define VID_TYPE_SUBCAPTURE    512     /* Can capture subareas of the image */
+#define VID_TYPE_MPEG_DECODER  1024    /* Can decode MPEG streams */
+#define VID_TYPE_MPEG_ENCODER  2048    /* Can encode MPEG streams */
+#define VID_TYPE_MJPEG_DECODER 4096    /* Can decode MJPEG streams */
+#define VID_TYPE_MJPEG_ENCODER 8192    /* Can encode MJPEG streams */
+
+struct video_capability
+{
+       char name[32];
+       int type;
+       int channels;   /* Num channels */
+       int audios;     /* Num audio devices */
+       int maxwidth;   /* Supported width */
+       int maxheight;  /* And height */
+       int minwidth;   /* Supported width */
+       int minheight;  /* And height */
+};
+
+
+struct video_channel
+{
+       int channel;
+       char name[32];
+       int tuners;
+       __u32  flags;
+#define VIDEO_VC_TUNER         1       /* Channel has a tuner */
+#define VIDEO_VC_AUDIO         2       /* Channel has audio */
+       __u16  type;
+#define VIDEO_TYPE_TV          1
+#define VIDEO_TYPE_CAMERA      2
+       __u16 norm;                     /* Norm set by channel */
+};
+
+struct video_tuner
+{
+       int tuner;
+       char name[32];
+       unsigned long rangelow, rangehigh;      /* Tuner range */
+       __u32 flags;
+#define VIDEO_TUNER_PAL                1
+#define VIDEO_TUNER_NTSC       2
+#define VIDEO_TUNER_SECAM      4
+#define VIDEO_TUNER_LOW                8       /* Uses KHz not MHz */
+#define VIDEO_TUNER_NORM       16      /* Tuner can set norm */
+#define VIDEO_TUNER_STEREO_ON  128     /* Tuner is seeing stereo */
+#define VIDEO_TUNER_RDS_ON      256     /* Tuner is seeing an RDS datastream */
+#define VIDEO_TUNER_MBS_ON      512     /* Tuner is seeing an MBS datastream */
+       __u16 mode;                     /* PAL/NTSC/SECAM/OTHER */
+#define VIDEO_MODE_PAL         0
+#define VIDEO_MODE_NTSC                1
+#define VIDEO_MODE_SECAM       2
+#define VIDEO_MODE_AUTO                3
+       __u16 signal;                   /* Signal strength 16bit scale */
+};
+
+struct video_picture
+{
+       __u16   brightness;
+       __u16   hue;
+       __u16   colour;
+       __u16   contrast;
+       __u16   whiteness;      /* Black and white only */
+       __u16   depth;          /* Capture depth */
+       __u16   palette;        /* Palette in use */
+#define VIDEO_PALETTE_GREY     1       /* Linear greyscale */
+#define VIDEO_PALETTE_HI240    2       /* High 240 cube (BT848) */
+#define VIDEO_PALETTE_RGB565   3       /* 565 16 bit RGB */
+#define VIDEO_PALETTE_RGB24    4       /* 24bit RGB */
+#define VIDEO_PALETTE_RGB32    5       /* 32bit RGB */
+#define VIDEO_PALETTE_RGB555   6       /* 555 15bit RGB */
+#define VIDEO_PALETTE_YUV422   7       /* YUV422 capture */
+#define VIDEO_PALETTE_YUYV     8
+#define VIDEO_PALETTE_UYVY     9       /* The great thing about standards is ... */
+#define VIDEO_PALETTE_YUV420   10
+#define VIDEO_PALETTE_YUV411   11      /* YUV411 capture */
+#define VIDEO_PALETTE_RAW      12      /* RAW capture (BT848) */
+#define VIDEO_PALETTE_YUV422P  13      /* YUV 4:2:2 Planar */
+#define VIDEO_PALETTE_YUV411P  14      /* YUV 4:1:1 Planar */
+#define VIDEO_PALETTE_YUV420P  15      /* YUV 4:2:0 Planar */
+#define VIDEO_PALETTE_YUV410P  16      /* YUV 4:1:0 Planar */
+#define VIDEO_PALETTE_PLANAR   13      /* start of planar entries */
+#define VIDEO_PALETTE_COMPONENT 7      /* start of component entries */
+};
+
+struct video_audio
+{
+       int     audio;          /* Audio channel */
+       __u16   volume;         /* If settable */
+       __u16   bass, treble;
+       __u32   flags;
+#define VIDEO_AUDIO_MUTE       1
+#define VIDEO_AUDIO_MUTABLE    2
+#define VIDEO_AUDIO_VOLUME     4
+#define VIDEO_AUDIO_BASS       8
+#define VIDEO_AUDIO_TREBLE     16
+#define VIDEO_AUDIO_BALANCE    32
+       char    name[16];
+#define VIDEO_SOUND_MONO       1
+#define VIDEO_SOUND_STEREO     2
+#define VIDEO_SOUND_LANG1      4
+#define VIDEO_SOUND_LANG2      8
+       __u16   mode;
+       __u16   balance;        /* Stereo balance */
+       __u16   step;           /* Step actual volume uses */
+};
+
+struct video_clip
+{
+       __s32   x,y;
+       __s32   width, height;
+       struct  video_clip *next;       /* For user use/driver use only */
+};
+
+struct video_window
+{
+       __u32   x,y;                    /* Position of window */
+       __u32   width,height;           /* Its size */
+       __u32   chromakey;
+       __u32   flags;
+       struct  video_clip *clips;      /* Set only */
+       int     clipcount;
+#define VIDEO_WINDOW_INTERLACE 1
+#define VIDEO_WINDOW_CHROMAKEY 16      /* Overlay by chromakey */
+#define VIDEO_CLIP_BITMAP      -1
+/* bitmap is 1024x625, a '1' bit represents a clipped pixel */
+#define VIDEO_CLIPMAP_SIZE     (128 * 625)
+};
+
+struct video_capture
+{
+       __u32   x,y;                    /* Offsets into image */
+       __u32   width, height;          /* Area to capture */
+       __u16   decimation;             /* Decimation divider */
+       __u16   flags;                  /* Flags for capture */
+#define VIDEO_CAPTURE_ODD              0       /* Temporal */
+#define VIDEO_CAPTURE_EVEN             1
+};
+
+struct video_buffer
+{
+       void    *base;
+       int     height,width;
+       int     depth;
+       int     bytesperline;
+};
+
+struct video_mmap
+{
+       unsigned        int frame;              /* Frame (0 - n) for double buffer */
+       int             height,width;
+       unsigned        int format;             /* should be VIDEO_PALETTE_* */
+};
+
+struct video_key
+{
+       __u8    key[8];
+       __u32   flags;
+};
+
+struct video_mbuf
+{
+       int     size;           /* Total memory to map */
+       int     frames;         /* Frames */
+       int     offsets[VIDEO_MAX_FRAME];
+};
+
+#define        VIDEO_NO_UNIT   (-1)
+
+struct video_unit
+{
+       int     video;          /* Video minor */
+       int     vbi;            /* VBI minor */
+       int     radio;          /* Radio minor */
+       int     audio;          /* Audio minor */
+       int     teletext;       /* Teletext minor */
+};
+
+struct vbi_format {
+       __u32   sampling_rate;  /* in Hz */
+       __u32   samples_per_line;
+       __u32   sample_format;  /* VIDEO_PALETTE_RAW only (1 byte) */
+       __s32   start[2];       /* starting line for each frame */
+       __u32   count[2];       /* count of lines for each frame */
+       __u32   flags;
+#define        VBI_UNSYNC      1       /* can distingues between top/bottom field */
+#define        VBI_INTERLACED  2       /* lines are interlaced */
+};
+
+/* video_info is biased towards hardware mpeg encode/decode */
+/* but it could apply generically to any hardware compressor/decompressor */
+struct video_info
+{
+       __u32   frame_count;    /* frames output since decode/encode began */
+       __u32   h_size;         /* current unscaled horizontal size */
+       __u32   v_size;         /* current unscaled veritcal size */
+       __u32   smpte_timecode; /* current SMPTE timecode (for current GOP) */
+       __u32   picture_type;   /* current picture type */
+       __u32   temporal_reference;     /* current temporal reference */
+       __u8    user_data[256]; /* user data last found in compressed stream */
+       /* user_data[0] contains user data flags, user_data[1] has count */
+};
+
+/* generic structure for setting playback modes */
+struct video_play_mode
+{
+       int     mode;
+       int     p1;
+       int     p2;
+};
+
+/* for loading microcode / fpga programming */
+struct video_code
+{
+       char    loadwhat[16];   /* name or tag of file being passed */
+       int     datasize;
+       __u8    *data;
+};
+
+#define VIDIOCGCAP             _IOR('v',1,struct video_capability)     /* Get capabilities */
+#define VIDIOCGCHAN            _IOWR('v',2,struct video_channel)       /* Get channel info (sources) */
+#define VIDIOCSCHAN            _IOW('v',3,struct video_channel)        /* Set channel  */
+#define VIDIOCGTUNER           _IOWR('v',4,struct video_tuner)         /* Get tuner abilities */
+#define VIDIOCSTUNER           _IOW('v',5,struct video_tuner)          /* Tune the tuner for the current channel */
+#define VIDIOCGPICT            _IOR('v',6,struct video_picture)        /* Get picture properties */
+#define VIDIOCSPICT            _IOW('v',7,struct video_picture)        /* Set picture properties */
+#define VIDIOCCAPTURE          _IOW('v',8,int)                         /* Start, end capture */
+#define VIDIOCGWIN             _IOR('v',9, struct video_window)        /* Get the video overlay window */
+#define VIDIOCSWIN             _IOW('v',10, struct video_window)       /* Set the video overlay window - passes clip list for hardware smarts , chromakey etc */
+#define VIDIOCGFBUF            _IOR('v',11, struct video_buffer)       /* Get frame buffer */
+#define VIDIOCSFBUF            _IOW('v',12, struct video_buffer)       /* Set frame buffer - root only */
+#define VIDIOCKEY              _IOR('v',13, struct video_key)          /* Video key event - to dev 255 is to all - cuts capture on all DMA windows with this key (0xFFFFFFFF == all) */
+#define VIDIOCGFREQ            _IOR('v',14, unsigned long)             /* Set tuner */
+#define VIDIOCSFREQ            _IOW('v',15, unsigned long)             /* Set tuner */
+#define VIDIOCGAUDIO           _IOR('v',16, struct video_audio)        /* Get audio info */
+#define VIDIOCSAUDIO           _IOW('v',17, struct video_audio)        /* Audio source, mute etc */
+#define VIDIOCSYNC             _IOW('v',18, int)                       /* Sync with mmap grabbing */
+#define VIDIOCMCAPTURE         _IOW('v',19, struct video_mmap)         /* Grab frames */
+#define VIDIOCGMBUF            _IOR('v',20, struct video_mbuf)         /* Memory map buffer info */
+#define VIDIOCGUNIT            _IOR('v',21, struct video_unit)         /* Get attached units */
+#define VIDIOCGCAPTURE         _IOR('v',22, struct video_capture)      /* Get subcapture */
+#define VIDIOCSCAPTURE         _IOW('v',23, struct video_capture)      /* Set subcapture */
+#define VIDIOCSPLAYMODE                _IOW('v',24, struct video_play_mode)    /* Set output video mode/feature */
+#define VIDIOCSWRITEMODE       _IOW('v',25, int)                       /* Set write mode */
+#define VIDIOCGPLAYINFO                _IOR('v',26, struct video_info)         /* Get current playback info from hardware */
+#define VIDIOCSMICROCODE       _IOW('v',27, struct video_code)         /* Load microcode into hardware */
+#define        VIDIOCGVBIFMT           _IOR('v',28, struct vbi_format)         /* Get VBI information */
+#define        VIDIOCSVBIFMT           _IOW('v',29, struct vbi_format)         /* Set VBI information */
+
+
+#define BASE_VIDIOCPRIVATE     192             /* 192-255 are private */
+
+/* VIDIOCSWRITEMODE */
+#define VID_WRITE_MPEG_AUD             0
+#define VID_WRITE_MPEG_VID             1
+#define VID_WRITE_OSD                  2
+#define VID_WRITE_TTX                  3
+#define VID_WRITE_CC                   4
+#define VID_WRITE_MJPEG                        5
+
+/* VIDIOCSPLAYMODE */
+#define VID_PLAY_VID_OUT_MODE          0
+       /* p1: = VIDEO_MODE_PAL, VIDEO_MODE_NTSC, etc ... */
+#define VID_PLAY_GENLOCK               1
+       /* p1: 0 = OFF, 1 = ON */
+       /* p2: GENLOCK FINE DELAY value */
+#define VID_PLAY_NORMAL                        2
+#define VID_PLAY_PAUSE                 3
+#define VID_PLAY_SINGLE_FRAME          4
+#define VID_PLAY_FAST_FORWARD          5
+#define VID_PLAY_SLOW_MOTION           6
+#define VID_PLAY_IMMEDIATE_NORMAL      7
+#define VID_PLAY_SWITCH_CHANNELS       8
+#define VID_PLAY_FREEZE_FRAME          9
+#define VID_PLAY_STILL_MODE            10
+#define VID_PLAY_MASTER_MODE           11
+       /* p1: see below */
+#define                VID_PLAY_MASTER_NONE    1
+#define                VID_PLAY_MASTER_VIDEO   2
+#define                VID_PLAY_MASTER_AUDIO   3
+#define VID_PLAY_ACTIVE_SCANLINES      12
+       /* p1 = first active; p2 = last active */
+#define VID_PLAY_RESET                 13
+#define VID_PLAY_END_MARK              14
+
+
+#endif /* __LINUX_VIDEODEV_H */
+
+/*
+ * Local variables:
+ * c-basic-offset: 8
+ * End:
+ */
index 29c6514..59f7ded 100644 (file)
@@ -1,14 +1,15 @@
 #
-# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.32.45
-# Sat Oct 15 08:52:52 2011
+# Automatically generated file; DO NOT EDIT.
+# Linux/arm 3.2.35 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_HAVE_SCHED_CLOCK=y
 CONFIG_GENERIC_GPIO=y
-CONFIG_GENERIC_TIME=y
+# CONFIG_ARCH_USES_GETTIMEOFFSET is not set
 CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_HARDIRQS=y
+CONFIG_KTIME_SCALAR=y
+CONFIG_HAVE_PROC_CPU=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_LOCKDEP_SUPPORT=y
@@ -16,12 +17,17 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
+CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_VECTORS_BASE=0xffff0000
+# CONFIG_ARM_PATCH_PHYS_VIRT is not set
+CONFIG_PHYS_OFFSET=0x0
+CONFIG_GENERIC_BUG=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-CONFIG_CONSTRUCTORS=y
+CONFIG_HAVE_IRQ_WORK=y
+CONFIG_IRQ_WORK=y
 
 #
 # General setup
@@ -29,8 +35,16 @@ CONFIG_CONSTRUCTORS=y
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_CROSS_COMPILE=""
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_LZO=y
+# CONFIG_KERNEL_GZIP is not set
+CONFIG_KERNEL_LZMA=y
+# CONFIG_KERNEL_LZO is not set
+CONFIG_DEFAULT_HOSTNAME="(none)"
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
@@ -38,44 +52,56 @@ CONFIG_POSIX_MQUEUE=y
 CONFIG_POSIX_MQUEUE_SYSCTL=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
+# CONFIG_FHANDLE is not set
 # CONFIG_TASKSTATS is not set
 CONFIG_AUDIT=y
+CONFIG_HAVE_GENERIC_HARDIRQS=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_HAVE_SPARSE_IRQ=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_IRQ_CHIP=y
+CONFIG_IRQ_DOMAIN=y
+CONFIG_SPARSE_IRQ=y
 
 #
 # RCU Subsystem
 #
-CONFIG_TREE_RCU=y
-# CONFIG_TREE_PREEMPT_RCU is not set
+CONFIG_TINY_RCU=y
+# CONFIG_PREEMPT_RCU is not set
 # CONFIG_RCU_TRACE is not set
-CONFIG_RCU_FANOUT=32
-# CONFIG_RCU_FANOUT_EXACT is not set
 # CONFIG_TREE_RCU_TRACE is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=19
 # CONFIG_CGROUPS is not set
-CONFIG_SYSFS_DEPRECATED=y
-CONFIG_SYSFS_DEPRECATED_V2=y
-# CONFIG_RELAY is not set
 CONFIG_NAMESPACES=y
 CONFIG_UTS_NS=y
 CONFIG_IPC_NS=y
 # CONFIG_USER_NS is not set
 # CONFIG_PID_NS is not set
 # CONFIG_NET_NS is not set
+# CONFIG_SCHED_AUTOGROUP is not set
+CONFIG_SYSFS_DEPRECATED=y
+CONFIG_SYSFS_DEPRECATED_V2=y
+# CONFIG_RELAY is not set
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_RD_GZIP=y
 CONFIG_RD_BZIP2=y
 CONFIG_RD_LZMA=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_RD_XZ=y
+CONFIG_RD_LZO=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
-# CONFIG_EMBEDDED is not set
+# CONFIG_EXPERT is not set
 CONFIG_UID16=y
-CONFIG_SYSCTL_SYSCALL=y
+# CONFIG_SYSCTL_SYSCALL is not set
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
 CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
@@ -88,27 +114,33 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_AIO=y
+# CONFIG_EMBEDDED is not set
+CONFIG_HAVE_PERF_EVENTS=y
+CONFIG_PERF_USE_VMALLOC=y
 
 #
 # Kernel Performance Events And Counters
 #
+CONFIG_PERF_EVENTS=y
+# CONFIG_PERF_COUNTERS is not set
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_PCI_QUIRKS=y
 CONFIG_SLUB_DEBUG=y
 # CONFIG_COMPAT_BRK is not set
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
-# CONFIG_SLOB is not set
 # CONFIG_PROFILING is not set
 CONFIG_HAVE_OPROFILE=y
 # CONFIG_KPROBES is not set
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_DMA_API_DEBUG=y
 
 #
 # GCOV-based kernel profiling
 #
-CONFIG_SLOW_WORK=y
 CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
@@ -121,71 +153,113 @@ CONFIG_MODULE_FORCE_UNLOAD=y
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_BLOCK=y
 CONFIG_LBDAF=y
-# CONFIG_BLK_DEV_BSG is not set
+CONFIG_BLK_DEV_BSG=y
+CONFIG_BLK_DEV_BSGLIB=y
 # CONFIG_BLK_DEV_INTEGRITY is not set
 
 #
 # IO Schedulers
 #
 CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
 CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_CFQ=y
-# CONFIG_DEFAULT_AS is not set
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
-CONFIG_FREEZER=y
+# CONFIG_INLINE_SPIN_TRYLOCK is not set
+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK is not set
+# CONFIG_INLINE_SPIN_LOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
+CONFIG_INLINE_SPIN_UNLOCK=y
+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_READ_TRYLOCK is not set
+# CONFIG_INLINE_READ_LOCK is not set
+# CONFIG_INLINE_READ_LOCK_BH is not set
+# CONFIG_INLINE_READ_LOCK_IRQ is not set
+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
+CONFIG_INLINE_READ_UNLOCK=y
+# CONFIG_INLINE_READ_UNLOCK_BH is not set
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_WRITE_TRYLOCK is not set
+# CONFIG_INLINE_WRITE_LOCK is not set
+# CONFIG_INLINE_WRITE_LOCK_BH is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
+CONFIG_INLINE_WRITE_UNLOCK=y
+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
+# CONFIG_MUTEX_SPIN_ON_OWNER is not set
+# CONFIG_FREEZER is not set
 
 #
 # System Type
 #
 CONFIG_MMU=y
-# CONFIG_ARCH_AAEC2000 is not set
 # CONFIG_ARCH_INTEGRATOR is not set
 # CONFIG_ARCH_REALVIEW is not set
 # CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_VEXPRESS is not set
 # CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_BCMRING is not set
+# CONFIG_ARCH_HIGHBANK is not set
 # CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_CNS3XXX is not set
 # CONFIG_ARCH_GEMINI is not set
+# CONFIG_ARCH_PRIMA2 is not set
 # CONFIG_ARCH_EBSA110 is not set
 # CONFIG_ARCH_EP93XX is not set
 # CONFIG_ARCH_FOOTBRIDGE is not set
 # CONFIG_ARCH_MXC is not set
-# CONFIG_ARCH_STMP3XXX is not set
+# CONFIG_ARCH_MXS is not set
 # CONFIG_ARCH_NETX is not set
 # CONFIG_ARCH_H720X is not set
-# CONFIG_ARCH_NOMADIK is not set
 # CONFIG_ARCH_IOP13XX is not set
 # CONFIG_ARCH_IOP32X is not set
 # CONFIG_ARCH_IOP33X is not set
 # CONFIG_ARCH_IXP23XX is not set
 # CONFIG_ARCH_IXP2000 is not set
 # CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_DOVE is not set
 CONFIG_ARCH_KIRKWOOD=y
-# CONFIG_ARCH_LOKI is not set
+# CONFIG_ARCH_LPC32XX is not set
 # CONFIG_ARCH_MV78XX0 is not set
 # CONFIG_ARCH_ORION5X is not set
 # CONFIG_ARCH_MMP is not set
 # CONFIG_ARCH_KS8695 is not set
-# CONFIG_ARCH_NS9XXX is not set
 # CONFIG_ARCH_W90X900 is not set
+# CONFIG_ARCH_TEGRA is not set
+# CONFIG_ARCH_PICOXCELL is not set
 # CONFIG_ARCH_PNX4008 is not set
 # CONFIG_ARCH_PXA is not set
 # CONFIG_ARCH_MSM is not set
+# CONFIG_ARCH_SHMOBILE is not set
 # CONFIG_ARCH_RPC is not set
 # CONFIG_ARCH_SA1100 is not set
 # CONFIG_ARCH_S3C2410 is not set
 # CONFIG_ARCH_S3C64XX is not set
-# CONFIG_ARCH_S5PC1XX is not set
+# CONFIG_ARCH_S5P64X0 is not set
+# CONFIG_ARCH_S5PC100 is not set
+# CONFIG_ARCH_S5PV210 is not set
+# CONFIG_ARCH_EXYNOS is not set
 # CONFIG_ARCH_SHARK is not set
-# CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_TCC_926 is not set
 # CONFIG_ARCH_U300 is not set
+# CONFIG_ARCH_U8500 is not set
+# CONFIG_ARCH_NOMADIK is not set
 # CONFIG_ARCH_DAVINCI is not set
 # CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_BCMRING is not set
+# CONFIG_PLAT_SPEAR is not set
+# CONFIG_ARCH_VT8500 is not set
+# CONFIG_ARCH_ZYNQ is not set
+CONFIG_GPIO_PCA953X=m
+CONFIG_KEYBOARD_GPIO_POLLED=m
 
 #
 # Marvell Kirkwood Implementations
@@ -195,17 +269,34 @@ CONFIG_MACH_RD88F6192_NAS=y
 CONFIG_MACH_RD88F6281=y
 CONFIG_MACH_MV88F6281GTW_GE=y
 CONFIG_MACH_SHEEVAPLUG=y
-CONFIG_MACH_DREAMPLUG=y
+CONFIG_MACH_ESATA_SHEEVAPLUG=y
 CONFIG_MACH_GURUPLUG=y
+CONFIG_MACH_DREAMPLUG=y
 CONFIG_MACH_TS219=y
+CONFIG_MACH_TS41X=y
+CONFIG_MACH_DOCKSTAR=y
+CONFIG_MACH_OPENRD=y
 CONFIG_MACH_OPENRD_BASE=y
+CONFIG_MACH_OPENRD_CLIENT=y
+CONFIG_MACH_OPENRD_ULTIMATE=y
+CONFIG_MACH_NETSPACE_V2=y
+CONFIG_MACH_INETSPACE_V2=y
+CONFIG_MACH_NETSPACE_MAX_V2=y
+CONFIG_MACH_D2NET_V2=y
+CONFIG_MACH_NET2BIG_V2=y
+CONFIG_MACH_NET5BIG_V2=y
+CONFIG_MACH_T5325=y
+CONFIG_MACH_ICONNECT=y
 CONFIG_MACH_NAS6210=y
+
+#
+# System MMU
+#
 CONFIG_PLAT_ORION=y
 
 #
 # Processor Type
 #
-CONFIG_CPU_32=y
 CONFIG_CPU_FEROCEON=y
 # CONFIG_CPU_FEROCEON_OLD_ID is not set
 CONFIG_CPU_32v5=y
@@ -216,6 +307,7 @@ CONFIG_CPU_COPY_FEROCEON=y
 CONFIG_CPU_TLB_FEROCEON=y
 CONFIG_CPU_CP15=y
 CONFIG_CPU_CP15_MMU=y
+CONFIG_CPU_USE_DOMAINS=y
 
 #
 # Processor Features
@@ -234,15 +326,15 @@ CONFIG_ARM_L1_CACHE_SHIFT=5
 CONFIG_PCI=y
 CONFIG_PCI_SYSCALL=y
 # CONFIG_ARCH_SUPPORTS_MSI is not set
-CONFIG_PCI_LEGACY=y
 # CONFIG_PCI_DEBUG is not set
 CONFIG_PCI_STUB=m
+CONFIG_PCI_ATS=y
 CONFIG_PCI_IOV=y
+CONFIG_PCI_PRI=y
+# CONFIG_PCI_PASID is not set
 CONFIG_PCCARD=m
-# CONFIG_PCMCIA_DEBUG is not set
 CONFIG_PCMCIA=m
 CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_PCMCIA_IOCTL=y
 CONFIG_CARDBUS=y
 
 #
@@ -256,7 +348,7 @@ CONFIG_YENTA_ENE_TUNE=y
 CONFIG_YENTA_TOSHIBA=y
 CONFIG_PD6729=m
 CONFIG_I82092=m
-CONFIG_PCCARD_NONSTATIC=m
+CONFIG_PCCARD_NONSTATIC=y
 
 #
 # Kernel Features
@@ -277,34 +369,44 @@ CONFIG_AEABI=y
 # CONFIG_OABI_COMPAT is not set
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
+CONFIG_HAVE_ARCH_PFN_VALID=y
 CONFIG_HIGHMEM=y
+# CONFIG_HIGHPTE is not set
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_HAVE_MEMBLOCK=y
 CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_SPLIT_PTLOCK_CPUS=4096
+CONFIG_SPLIT_PTLOCK_CPUS=999999
+# CONFIG_COMPACTION is not set
 # CONFIG_PHYS_ADDR_T_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=0
 CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
-CONFIG_HAVE_MLOCK=y
-CONFIG_HAVE_MLOCKED_PAGE_BIT=y
 CONFIG_KSM=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_NEED_PER_CPU_KM=y
+# CONFIG_CLEANCACHE is not set
+CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_ALIGNMENT_TRAP=y
 CONFIG_UACCESS_WITH_MEMCPY=y
+CONFIG_SECCOMP=y
+CONFIG_CC_STACKPROTECTOR=y
+# CONFIG_DEPRECATED_PARAM_STRUCT is not set
 
 #
 # Boot options
 #
+CONFIG_USE_OF=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
+# CONFIG_ARM_APPENDED_DTB is not set
 CONFIG_CMDLINE=""
 # CONFIG_XIP_KERNEL is not set
 # CONFIG_KEXEC is not set
+# CONFIG_CRASH_DUMP is not set
+CONFIG_AUTO_ZRELADDR=y
 
 #
 # CPU Power Management
@@ -334,21 +436,18 @@ CONFIG_HAVE_AOUT=y
 #
 # Power management options
 #
+CONFIG_PM_RUNTIME=y
 CONFIG_PM=y
 # CONFIG_PM_DEBUG is not set
-CONFIG_PM_SLEEP=y
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
 # CONFIG_APM_EMULATION is not set
-CONFIG_PM_RUNTIME=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_CPU_PM=y
+# CONFIG_ARM_CPU_SUSPEND is not set
 CONFIG_NET=y
 
 #
 # Networking options
 #
 CONFIG_PACKET=y
-CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=m
@@ -361,17 +460,18 @@ CONFIG_NET_KEY_MIGRATE=y
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_ASK_IP_FIB_HASH=y
-# CONFIG_IP_FIB_TRIE is not set
-CONFIG_IP_FIB_HASH=y
+# CONFIG_IP_FIB_TRIE_STATS is not set
 CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_ROUTE_MULTIPATH=y
 CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_ROUTE_CLASSID=y
 # CONFIG_IP_PNP is not set
 CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=m
 CONFIG_NET_IPGRE=m
 CONFIG_NET_IPGRE_BROADCAST=y
 CONFIG_IP_MROUTE=y
+# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
 CONFIG_IP_PIMSM_V1=y
 CONFIG_IP_PIMSM_V2=y
 CONFIG_ARPD=y
@@ -400,15 +500,10 @@ CONFIG_TCP_CONG_LP=m
 CONFIG_TCP_CONG_VENO=m
 CONFIG_TCP_CONG_YEAH=m
 CONFIG_TCP_CONG_ILLINOIS=m
-# CONFIG_DEFAULT_BIC is not set
-# CONFIG_DEFAULT_CUBIC is not set
-# CONFIG_DEFAULT_HTCP is not set
-# CONFIG_DEFAULT_VEGAS is not set
-# CONFIG_DEFAULT_WESTWOOD is not set
 CONFIG_DEFAULT_RENO=y
 CONFIG_DEFAULT_TCP_CONG="reno"
 # CONFIG_TCP_MD5SIG is not set
-CONFIG_IPV6=m
+CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set
 # CONFIG_IPV6_ROUTER_PREF is not set
 # CONFIG_IPV6_OPTIMISTIC_DAD is not set
@@ -423,12 +518,14 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
 CONFIG_INET6_XFRM_MODE_BEET=m
 CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
 CONFIG_IPV6_SIT=m
+# CONFIG_IPV6_SIT_6RD is not set
 CONFIG_IPV6_NDISC_NODETYPE=y
 CONFIG_IPV6_TUNNEL=m
 CONFIG_IPV6_MULTIPLE_TABLES=y
 # CONFIG_IPV6_SUBTREES is not set
 # CONFIG_IPV6_MROUTE is not set
 # CONFIG_NETWORK_SECMARK is not set
+CONFIG_NETWORK_PHY_TIMESTAMPING=y
 CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_DEBUG is not set
 CONFIG_NETFILTER_ADVANCED=y
@@ -441,9 +538,10 @@ CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
 CONFIG_NF_CONNTRACK=m
-CONFIG_NF_CT_ACCT=y
 CONFIG_NF_CONNTRACK_MARK=y
+# CONFIG_NF_CONNTRACK_ZONES is not set
 CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
 CONFIG_NF_CT_PROTO_DCCP=m
 CONFIG_NF_CT_PROTO_GRE=m
 CONFIG_NF_CT_PROTO_SCTP=m
@@ -452,7 +550,9 @@ CONFIG_NF_CONNTRACK_AMANDA=m
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m
 CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_BROADCAST=m
 CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
 CONFIG_NF_CONNTRACK_PPTP=m
 CONFIG_NF_CONNTRACK_SANE=m
 CONFIG_NF_CONNTRACK_SIP=m
@@ -460,10 +560,24 @@ CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CT_NETLINK=m
 CONFIG_NETFILTER_TPROXY=m
 CONFIG_NETFILTER_XTABLES=m
+
+#
+# Xtables combined modules
+#
+CONFIG_NETFILTER_XT_MARK=m
+CONFIG_NETFILTER_XT_CONNMARK=m
+
+#
+# Xtables targets
+#
+CONFIG_NETFILTER_XT_TARGET_AUDIT=m
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
 CONFIG_NETFILTER_XT_TARGET_DSCP=m
 CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
 CONFIG_NETFILTER_XT_TARGET_LED=m
 CONFIG_NETFILTER_XT_TARGET_IMQ=m
 CONFIG_NETFILTER_XT_TARGET_MARK=m
@@ -471,28 +585,38 @@ CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
 CONFIG_NETFILTER_XT_TARGET_TPROXY=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+
+#
+# Xtables matches
+#
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
 CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_CPU=m
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
 CONFIG_NETFILTER_XT_MATCH_DSCP=m
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 CONFIG_NETFILTER_XT_MATCH_HL=m
 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 CONFIG_NETFILTER_XT_MATCH_MAC=m
 CONFIG_NETFILTER_XT_MATCH_MARK=m
 CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
 CONFIG_NETFILTER_XT_MATCH_OWNER=m
 CONFIG_NETFILTER_XT_MATCH_POLICY=m
 CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
@@ -501,7 +625,6 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m
 CONFIG_NETFILTER_XT_MATCH_RATEEST=m
 CONFIG_NETFILTER_XT_MATCH_REALM=m
 CONFIG_NETFILTER_XT_MATCH_RECENT=m
-CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT=y
 CONFIG_NETFILTER_XT_MATCH_SCTP=m
 CONFIG_NETFILTER_XT_MATCH_SOCKET=m
 CONFIG_NETFILTER_XT_MATCH_STATE=m
@@ -512,7 +635,7 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_TIME=m
 CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_NETFILTER_XT_MATCH_OSF=m
+# CONFIG_IP_SET is not set
 CONFIG_IP_VS=m
 CONFIG_IP_VS_IPV6=y
 # CONFIG_IP_VS_DEBUG is not set
@@ -523,8 +646,10 @@ CONFIG_IP_VS_TAB_BITS=12
 #
 # CONFIG_IP_VS_PROTO_TCP is not set
 # CONFIG_IP_VS_PROTO_UDP is not set
+# CONFIG_IP_VS_PROTO_AH_ESP is not set
 # CONFIG_IP_VS_PROTO_ESP is not set
 # CONFIG_IP_VS_PROTO_AH is not set
+# CONFIG_IP_VS_PROTO_SCTP is not set
 
 #
 # IPVS scheduler
@@ -543,6 +668,7 @@ CONFIG_IP_VS_TAB_BITS=12
 #
 # IPVS application helper
 #
+# CONFIG_IP_VS_NFCT is not set
 
 #
 # IP: Netfilter Configuration
@@ -552,7 +678,6 @@ CONFIG_NF_CONNTRACK_IPV4=m
 CONFIG_NF_CONNTRACK_PROC_COMPAT=y
 CONFIG_IP_NF_QUEUE=m
 CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
 CONFIG_IP_NF_MATCH_TTL=m
@@ -590,6 +715,7 @@ CONFIG_IP_NF_MATCH_IPP2P=m
 #
 # IPv6: Netfilter Configuration
 #
+CONFIG_NF_DEFRAG_IPV6=m
 CONFIG_NF_CONNTRACK_IPV6=m
 CONFIG_IP6_NF_QUEUE=m
 CONFIG_IP6_NF_IPTABLES=m
@@ -639,9 +765,14 @@ CONFIG_ATM_CLIP_NO_ICMP=y
 # CONFIG_ATM_LANE is not set
 CONFIG_ATM_BR2684=m
 # CONFIG_ATM_BR2684_IPFILTER is not set
+CONFIG_L2TP=m
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
 CONFIG_STP=m
 CONFIG_GARP=m
 CONFIG_BRIDGE=m
+CONFIG_BRIDGE_IGMP_SNOOPING=y
 CONFIG_NET_DSA=y
 CONFIG_NET_DSA_TAG_DSA=y
 CONFIG_NET_DSA_TAG_EDSA=y
@@ -664,6 +795,7 @@ CONFIG_LLC=m
 # CONFIG_WAN_ROUTER is not set
 # CONFIG_PHONET is not set
 CONFIG_IEEE802154=m
+CONFIG_IEEE802154_6LOWPAN=m
 CONFIG_NET_SCHED=y
 
 #
@@ -676,6 +808,7 @@ CONFIG_NET_SCH_ATM=m
 CONFIG_NET_SCH_PRIO=m
 CONFIG_NET_SCH_MULTIQ=m
 CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFB=m
 CONFIG_NET_SCH_SFQ=m
 CONFIG_NET_SCH_TEQL=m
 CONFIG_NET_SCH_TBF=m
@@ -683,6 +816,9 @@ CONFIG_NET_SCH_GRED=m
 CONFIG_NET_SCH_DSMARK=m
 CONFIG_NET_SCH_NETEM=m
 CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_CHOKE=m
+CONFIG_NET_SCH_QFQ=m
 CONFIG_NET_SCH_INGRESS=m
 
 #
@@ -692,7 +828,6 @@ CONFIG_NET_CLS=y
 CONFIG_NET_CLS_BASIC=m
 CONFIG_NET_CLS_TCINDEX=m
 CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_ROUTE=y
 CONFIG_NET_CLS_FW=m
 CONFIG_NET_CLS_U32=m
 CONFIG_CLS_U32_PERF=y
@@ -715,11 +850,15 @@ CONFIG_NET_ACT_MIRRED=m
 CONFIG_NET_ACT_IPT=m
 CONFIG_NET_ACT_NAT=m
 CONFIG_NET_ACT_PEDIT=m
-# CONFIG_NET_ACT_SIMP is not set
+CONFIG_NET_ACT_SIMP=m
 CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_ACT_CSUM=m
 CONFIG_NET_CLS_IND=y
 CONFIG_NET_SCH_FIFO=y
 # CONFIG_DCB is not set
+CONFIG_DNS_RESOLVER=y
+CONFIG_BATMAN_ADV=m
+# CONFIG_BATMAN_ADV_DEBUG is not set
 
 #
 # Network testing
@@ -770,8 +909,8 @@ CONFIG_SIGMATEL_FIR=m
 CONFIG_VLSI_FIR=m
 CONFIG_MCS_FIR=m
 CONFIG_BT=m
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
+CONFIG_BT_L2CAP=y
+CONFIG_BT_SCO=y
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BT_BNEP=m
@@ -788,6 +927,7 @@ CONFIG_BT_HCIBTSDIO=m
 CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_ATH3K=y
 CONFIG_BT_HCIUART_LL=y
 CONFIG_BT_HCIBCM203X=m
 CONFIG_BT_HCIBPA10X=m
@@ -799,19 +939,25 @@ CONFIG_BT_HCIBTUART=m
 CONFIG_BT_HCIVHCI=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
+CONFIG_BT_ATH3K=m
+CONFIG_BT_WILINK=m
 CONFIG_AF_RXRPC=m
 # CONFIG_AF_RXRPC_DEBUG is not set
 CONFIG_RXKAD=m
 CONFIG_FIB_RULES=y
 CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+CONFIG_WEXT_PRIV=y
 CONFIG_CFG80211=m
 # CONFIG_NL80211_TESTMODE is not set
 # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
 # CONFIG_CFG80211_REG_DEBUG is not set
 # CONFIG_CFG80211_DEFAULT_PS is not set
-CONFIG_CFG80211_DEFAULT_PS_VALUE=0
-CONFIG_WIRELESS_OLD_REGULATORY=y
-CONFIG_WIRELESS_EXT=y
+# CONFIG_CFG80211_INTERNAL_REGDB is not set
+CONFIG_CFG80211_WEXT=y
 CONFIG_WIRELESS_EXT_SYSFS=y
 CONFIG_LIB80211=m
 CONFIG_LIB80211_CRYPT_WEP=m
@@ -821,9 +967,9 @@ CONFIG_LIB80211_CRYPT_TKIP=m
 CONFIG_MAC80211=m
 CONFIG_MAC80211_HAS_RC=y
 CONFIG_MAC80211_RC_MINSTREL=y
-# CONFIG_MAC80211_RC_DEFAULT_PID is not set
+CONFIG_MAC80211_RC_MINSTREL_HT=y
 CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
-CONFIG_MAC80211_RC_DEFAULT="minstrel"
+CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
 CONFIG_MAC80211_MESH=y
 CONFIG_MAC80211_LEDS=y
 # CONFIG_MAC80211_DEBUG_MENU is not set
@@ -831,7 +977,13 @@ CONFIG_MAC80211_LEDS=y
 CONFIG_RFKILL=m
 CONFIG_RFKILL_LEDS=y
 CONFIG_RFKILL_INPUT=y
+CONFIG_RFKILL_REGULATOR=m
 # CONFIG_NET_9P is not set
+# CONFIG_CAIF is not set
+CONFIG_CEPH_LIB=m
+# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
+# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
+# CONFIG_NFC is not set
 
 #
 # Device Drivers
@@ -850,14 +1002,14 @@ CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
+CONFIG_REGMAP=y
+CONFIG_REGMAP_I2C=m
 CONFIG_CONNECTOR=m
 CONFIG_MTD=m
-# CONFIG_MTD_DEBUG is not set
 CONFIG_MTD_TESTS=m
-CONFIG_MTD_CONCAT=m
-CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_REDBOOT_PARTS is not set
 # CONFIG_MTD_AFS_PARTS is not set
+CONFIG_MTD_OF_PARTS=m
 CONFIG_MTD_AR7_PARTS=m
 
 #
@@ -872,7 +1024,9 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_INFTL is not set
 # CONFIG_RFD_FTL is not set
 # CONFIG_SSFDC is not set
+CONFIG_SM_FTL=m
 # CONFIG_MTD_OOPS is not set
+# CONFIG_MTD_SWAP is not set
 
 #
 # RAM/ROM/Flash chip drivers
@@ -917,12 +1071,18 @@ CONFIG_MTD_PHYSMAP=m
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
+# CONFIG_MTD_DOCG3 is not set
+CONFIG_MTD_NAND_ECC=m
+# CONFIG_MTD_NAND_ECC_SMC is not set
 CONFIG_MTD_NAND=m
 # CONFIG_MTD_NAND_VERIFY_WRITE is not set
-# CONFIG_MTD_NAND_ECC_SMC is not set
+# CONFIG_MTD_NAND_ECC_BCH is not set
+# CONFIG_MTD_SM_COMMON is not set
 # CONFIG_MTD_NAND_MUSEUM_IDS is not set
+# CONFIG_MTD_NAND_DENALI is not set
 # CONFIG_MTD_NAND_GPIO is not set
 CONFIG_MTD_NAND_IDS=m
+# CONFIG_MTD_NAND_RICOH is not set
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_CAFE is not set
 # CONFIG_MTD_NAND_NANDSIM is not set
@@ -936,19 +1096,29 @@ CONFIG_MTD_NAND_ORION=m
 #
 CONFIG_MTD_LPDDR=m
 CONFIG_MTD_QINFO_PROBE=m
-
-#
-# UBI - Unsorted block images
-#
 CONFIG_MTD_UBI=m
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
 CONFIG_MTD_UBI_BEB_RESERVE=1
 # CONFIG_MTD_UBI_GLUEBI is not set
-
-#
-# UBI debugging options
-#
 # CONFIG_MTD_UBI_DEBUG is not set
+CONFIG_DTC=y
+CONFIG_OF=y
+
+#
+# Device Tree and Open Firmware support
+#
+CONFIG_PROC_DEVICETREE=y
+CONFIG_OF_FLATTREE=y
+CONFIG_OF_EARLY_FLATTREE=y
+CONFIG_OF_ADDRESS=y
+CONFIG_OF_IRQ=y
+CONFIG_OF_DEVICE=y
+CONFIG_OF_GPIO=y
+CONFIG_OF_I2C=y
+CONFIG_OF_NET=y
+CONFIG_OF_MDIO=y
+CONFIG_OF_PCI=y
+CONFIG_OF_PCI_IRQ=y
 CONFIG_PARPORT=m
 # CONFIG_PARPORT_PC is not set
 # CONFIG_PARPORT_GSC is not set
@@ -956,14 +1126,18 @@ CONFIG_PARPORT_AX88796=m
 CONFIG_PARPORT_1284=y
 CONFIG_PARPORT_NOT_PC=y
 CONFIG_BLK_DEV=y
-# CONFIG_BLK_CPQ_DA is not set
-# CONFIG_BLK_CPQ_CISS_DA is not set
-# CONFIG_BLK_DEV_DAC960 is not set
+CONFIG_BLK_CPQ_DA=m
+CONFIG_BLK_CPQ_CISS_DA=m
+# CONFIG_CISS_SCSI_TAPE is not set
+CONFIG_BLK_DEV_DAC960=m
 # CONFIG_BLK_DEV_UMEM is not set
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 CONFIG_BLK_DEV_CRYPTOLOOP=m
+# CONFIG_BLK_DEV_DRBD is not set
 CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_OSD=m
 CONFIG_BLK_DEV_SX8=m
 # CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_RAM=y
@@ -974,15 +1148,30 @@ CONFIG_BLK_DEV_RAM_SIZE=16384
 CONFIG_ATA_OVER_ETH=m
 CONFIG_MG_DISK=m
 CONFIG_MG_DISK_RES=0
+CONFIG_BLK_DEV_RBD=m
+CONFIG_SENSORS_LIS3LV02D=m
 CONFIG_MISC_DEVICES=y
+# CONFIG_AD525X_DPOT is not set
 # CONFIG_PHANTOM is not set
+# CONFIG_INTEL_MID_PTI is not set
 # CONFIG_SGI_IOC4 is not set
 CONFIG_TIFM_CORE=m
 CONFIG_TIFM_7XX1=m
 CONFIG_ICS932S401=m
 CONFIG_ENCLOSURE_SERVICES=m
 CONFIG_HP_ILO=m
+CONFIG_APDS9802ALS=m
 CONFIG_ISL29003=m
+CONFIG_ISL29020=m
+CONFIG_SENSORS_TSL2550=m
+CONFIG_SENSORS_BH1780=m
+CONFIG_SENSORS_BH1770=m
+CONFIG_SENSORS_APDS990X=m
+CONFIG_HMC6352=m
+CONFIG_DS1682=m
+CONFIG_BMP085=m
+CONFIG_PCH_PHUB=m
+CONFIG_USB_SWITCH_FSA9480=m
 CONFIG_C2PORT=m
 
 #
@@ -995,13 +1184,28 @@ CONFIG_EEPROM_93CX6=m
 CONFIG_CB710_CORE=m
 # CONFIG_CB710_DEBUG is not set
 CONFIG_CB710_DEBUG_ASSUMPTIONS=y
+CONFIG_IWMC3200TOP=m
+# CONFIG_IWMC3200TOP_DEBUG is not set
+# CONFIG_IWMC3200TOP_DEBUGFS is not set
+
+#
+# Texas Instruments shared transport line discipline
+#
+CONFIG_TI_ST=m
+CONFIG_SENSORS_LIS3_I2C=m
+
+#
+# Altera FPGA firmware download module
+#
+# CONFIG_ALTERA_STAPL is not set
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
 
 #
 # SCSI device support
 #
-CONFIG_RAID_ATTRS=y
+CONFIG_SCSI_MOD=m
+CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=m
 CONFIG_SCSI_DMA=y
 # CONFIG_SCSI_TGT is not set
@@ -1035,15 +1239,19 @@ CONFIG_SCSI_SAS_ATTRS=m
 CONFIG_SCSI_SAS_LIBSAS=m
 CONFIG_SCSI_SAS_ATA=y
 CONFIG_SCSI_SAS_HOST_SMP=y
-CONFIG_SCSI_SAS_LIBSAS_DEBUG=y
 CONFIG_SCSI_SRP_ATTRS=m
 CONFIG_SCSI_LOWLEVEL=y
 CONFIG_ISCSI_TCP=m
+CONFIG_ISCSI_BOOT_SYSFS=m
 CONFIG_SCSI_CXGB3_ISCSI=m
+CONFIG_SCSI_CXGB4_ISCSI=m
 CONFIG_SCSI_BNX2_ISCSI=m
+CONFIG_SCSI_BNX2X_FCOE=m
 CONFIG_BE2ISCSI=m
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
+CONFIG_SCSI_HPSA=m
 CONFIG_SCSI_3W_9XXX=m
+CONFIG_SCSI_3W_SAS=m
 # CONFIG_SCSI_ACARD is not set
 CONFIG_SCSI_AACRAID=m
 CONFIG_SCSI_AIC7XXX=m
@@ -1065,6 +1273,8 @@ CONFIG_SCSI_AIC94XX=m
 # CONFIG_AIC94XX_DEBUG is not set
 CONFIG_SCSI_MVSAS=m
 CONFIG_SCSI_MVSAS_DEBUG=y
+# CONFIG_SCSI_MVSAS_TASKLET is not set
+CONFIG_SCSI_MVUMI=m
 CONFIG_SCSI_DPT_I2O=m
 # CONFIG_SCSI_ADVANSYS is not set
 CONFIG_SCSI_ARCMSR=m
@@ -1103,6 +1313,7 @@ CONFIG_SCSI_DC390T=m
 # CONFIG_SCSI_NSP32 is not set
 # CONFIG_SCSI_DEBUG is not set
 CONFIG_SCSI_PMCRAID=m
+CONFIG_SCSI_PM8001=m
 # CONFIG_SCSI_SRP is not set
 CONFIG_SCSI_BFA_FC=m
 CONFIG_SCSI_LOWLEVEL_PCMCIA=y
@@ -1116,71 +1327,105 @@ CONFIG_SCSI_DH_RDAC=m
 CONFIG_SCSI_DH_HP_SW=m
 CONFIG_SCSI_DH_EMC=m
 CONFIG_SCSI_DH_ALUA=m
-# CONFIG_SCSI_OSD_INITIATOR is not set
+CONFIG_SCSI_OSD_INITIATOR=m
+CONFIG_SCSI_OSD_ULD=m
+CONFIG_SCSI_OSD_DPRINT_SENSE=1
+# CONFIG_SCSI_OSD_DEBUG is not set
 CONFIG_ATA=m
 # CONFIG_ATA_NONSTANDARD is not set
 CONFIG_ATA_VERBOSE_ERROR=y
 CONFIG_SATA_PMP=y
+
+#
+# Controllers with non-SFF native interface
+#
 CONFIG_SATA_AHCI=m
+CONFIG_SATA_AHCI_PLATFORM=m
+CONFIG_SATA_INIC162X=m
+CONFIG_SATA_ACARD_AHCI=m
 CONFIG_SATA_SIL24=m
 CONFIG_ATA_SFF=y
-CONFIG_SATA_SVW=m
+
+#
+# SFF controllers with custom DMA interface
+#
+CONFIG_PDC_ADMA=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SX4=m
+CONFIG_ATA_BMDMA=y
+
+#
+# SATA SFF controllers with BMDMA
+#
 CONFIG_ATA_PIIX=m
 CONFIG_SATA_MV=m
 CONFIG_SATA_NV=m
-CONFIG_PDC_ADMA=m
-CONFIG_SATA_QSTOR=m
 CONFIG_SATA_PROMISE=m
-CONFIG_SATA_SX4=m
 CONFIG_SATA_SIL=m
 CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
 CONFIG_SATA_ULI=m
 CONFIG_SATA_VIA=m
 CONFIG_SATA_VITESSE=m
-CONFIG_SATA_INIC162X=m
+
+#
+# PATA SFF controllers with BMDMA
+#
 CONFIG_PATA_ALI=m
 CONFIG_PATA_AMD=m
+CONFIG_PATA_ARASAN_CF=m
 CONFIG_PATA_ARTOP=m
-CONFIG_PATA_ATP867X=m
 CONFIG_PATA_ATIIXP=m
-CONFIG_PATA_CMD640_PCI=m
+CONFIG_PATA_ATP867X=m
 CONFIG_PATA_CMD64X=m
 CONFIG_PATA_CS5520=m
 CONFIG_PATA_CS5530=m
+CONFIG_PATA_CS5536=m
 CONFIG_PATA_CYPRESS=m
 CONFIG_PATA_EFAR=m
-CONFIG_ATA_GENERIC=m
 CONFIG_PATA_HPT366=m
 CONFIG_PATA_HPT37X=m
 CONFIG_PATA_HPT3X2N=m
 CONFIG_PATA_HPT3X3=m
 CONFIG_PATA_HPT3X3_DMA=y
-CONFIG_PATA_IT821X=m
 CONFIG_PATA_IT8213=m
+CONFIG_PATA_IT821X=m
 CONFIG_PATA_JMICRON=m
-CONFIG_PATA_TRIFLEX=m
 CONFIG_PATA_MARVELL=m
-CONFIG_PATA_MPIIX=m
-CONFIG_PATA_OLDPIIX=m
 CONFIG_PATA_NETCELL=m
 CONFIG_PATA_NINJA32=m
-CONFIG_PATA_NS87410=m
 CONFIG_PATA_NS87415=m
-CONFIG_PATA_OPTI=m
+CONFIG_PATA_OLDPIIX=m
 CONFIG_PATA_OPTIDMA=m
-CONFIG_PATA_PCMCIA=m
+CONFIG_PATA_PDC2027X=m
 CONFIG_PATA_PDC_OLD=m
 CONFIG_PATA_RADISYS=m
 CONFIG_PATA_RDC=m
-CONFIG_PATA_RZ1000=m
 CONFIG_PATA_SC1200=m
+CONFIG_PATA_SCH=m
 CONFIG_PATA_SERVERWORKS=m
-CONFIG_PATA_PDC2027X=m
 CONFIG_PATA_SIL680=m
 CONFIG_PATA_SIS=m
+CONFIG_PATA_TOSHIBA=m
+CONFIG_PATA_TRIFLEX=m
 CONFIG_PATA_VIA=m
 CONFIG_PATA_WINBOND=m
-CONFIG_PATA_SCH=m
+
+#
+# PIO-only SFF controllers
+#
+CONFIG_PATA_CMD640_PCI=m
+CONFIG_PATA_MPIIX=m
+CONFIG_PATA_NS87410=m
+CONFIG_PATA_OPTI=m
+CONFIG_PATA_PCMCIA=m
+CONFIG_PATA_RZ1000=m
+
+#
+# Generic fallback / legacy drivers
+#
+CONFIG_ATA_GENERIC=m
+CONFIG_PATA_LEGACY=m
 CONFIG_MD=y
 CONFIG_BLK_DEV_MD=m
 CONFIG_MD_LINEAR=m
@@ -1188,15 +1433,19 @@ CONFIG_MD_RAID0=m
 CONFIG_MD_RAID1=m
 CONFIG_MD_RAID10=m
 CONFIG_MD_RAID456=m
-CONFIG_MD_RAID6_PQ=m
-CONFIG_ASYNC_RAID6_TEST=m
 CONFIG_MD_MULTIPATH=m
 # CONFIG_MD_FAULTY is not set
 CONFIG_BLK_DEV_DM=m
 # CONFIG_DM_DEBUG is not set
+CONFIG_DM_BUFIO=m
+CONFIG_DM_PERSISTENT_DATA=m
 CONFIG_DM_CRYPT=m
 CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_THIN_PROVISIONING=m
+# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
+# CONFIG_DM_DEBUG_SPACE_MAPS is not set
 CONFIG_DM_MIRROR=m
+CONFIG_DM_RAID=m
 CONFIG_DM_LOG_USERSPACE=m
 CONFIG_DM_ZERO=m
 CONFIG_DM_MULTIPATH=m
@@ -1204,6 +1453,8 @@ CONFIG_DM_MULTIPATH_QL=m
 CONFIG_DM_MULTIPATH_ST=m
 CONFIG_DM_DELAY=m
 CONFIG_DM_UEVENT=y
+CONFIG_DM_FLAKEY=m
+# CONFIG_TARGET_CORE is not set
 CONFIG_FUSION=y
 CONFIG_FUSION_SPI=m
 CONFIG_FUSION_FC=m
@@ -1215,26 +1466,17 @@ CONFIG_FUSION_CTL=m
 #
 # IEEE 1394 (FireWire) support
 #
-
-#
-# You can enable one or both FireWire driver stacks.
-#
-
-#
-# See the help texts for more information.
-#
 CONFIG_FIREWIRE=m
 CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_OHCI_DEBUG=y
 CONFIG_FIREWIRE_SBP2=m
 CONFIG_FIREWIRE_NET=m
-# CONFIG_IEEE1394 is not set
+# CONFIG_FIREWIRE_NOSY is not set
 # CONFIG_I2O is not set
 CONFIG_NETDEVICES=y
-CONFIG_IFB=m
-CONFIG_DUMMY=m
+CONFIG_NET_CORE=y
 CONFIG_BONDING=m
-CONFIG_MACVLAN=m
+CONFIG_DUMMY=m
 CONFIG_EQUALIZER=m
 CONFIG_IMQ=m
 # CONFIG_IMQ_BEHAVIOR_AA is not set
@@ -1242,48 +1484,104 @@ CONFIG_IMQ_BEHAVIOR_AB=y
 # CONFIG_IMQ_BEHAVIOR_BA is not set
 # CONFIG_IMQ_BEHAVIOR_BB is not set
 CONFIG_IMQ_NUM_DEVS=2
+# CONFIG_NET_FC is not set
+CONFIG_MII=m
+CONFIG_IEEE802154_DRIVERS=m
+CONFIG_IEEE802154_FAKEHARD=m
+CONFIG_IFB=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
 CONFIG_TUN=m
 CONFIG_VETH=m
 # CONFIG_ARCNET is not set
-CONFIG_PHYLIB=y
+CONFIG_ATM_DRIVERS=y
+# CONFIG_ATM_DUMMY is not set
+CONFIG_ATM_TCP=m
+CONFIG_ATM_LANAI=m
+CONFIG_ATM_ENI=m
+CONFIG_ATM_ENI_DEBUG=y
+CONFIG_ATM_ENI_TUNE_BURST=y
+CONFIG_ATM_ENI_BURST_TX_16W=y
+CONFIG_ATM_ENI_BURST_TX_8W=y
+CONFIG_ATM_ENI_BURST_TX_4W=y
+CONFIG_ATM_ENI_BURST_TX_2W=y
+CONFIG_ATM_ENI_BURST_RX_16W=y
+CONFIG_ATM_ENI_BURST_RX_8W=y
+CONFIG_ATM_ENI_BURST_RX_4W=y
+CONFIG_ATM_ENI_BURST_RX_2W=y
+CONFIG_ATM_FIRESTREAM=m
+CONFIG_ATM_ZATM=m
+# CONFIG_ATM_ZATM_DEBUG is not set
+CONFIG_ATM_NICSTAR=m
+CONFIG_ATM_NICSTAR_USE_SUNI=y
+CONFIG_ATM_NICSTAR_USE_IDT77105=y
+CONFIG_ATM_IDT77252=m
+# CONFIG_ATM_IDT77252_DEBUG is not set
+# CONFIG_ATM_IDT77252_RCV_ALL is not set
+CONFIG_ATM_IDT77252_USE_SUNI=y
+CONFIG_ATM_AMBASSADOR=m
+# CONFIG_ATM_AMBASSADOR_DEBUG is not set
+CONFIG_ATM_HORIZON=m
+# CONFIG_ATM_HORIZON_DEBUG is not set
+CONFIG_ATM_IA=m
+# CONFIG_ATM_IA_DEBUG is not set
+CONFIG_ATM_FORE200E=m
+CONFIG_ATM_FORE200E_USE_TASKLET=y
+CONFIG_ATM_FORE200E_TX_RETRY=16
+CONFIG_ATM_FORE200E_DEBUG=0
+# CONFIG_ATM_HE is not set
+CONFIG_ATM_SOLOS=m
 
 #
-# MII PHY device drivers
+# CAIF transport drivers
 #
-CONFIG_MARVELL_PHY=m
-CONFIG_DAVICOM_PHY=m
-CONFIG_QSEMI_PHY=m
-CONFIG_LXT_PHY=m
-CONFIG_CICADA_PHY=m
-CONFIG_VITESSE_PHY=m
-CONFIG_SMSC_PHY=m
-CONFIG_BROADCOM_PHY=m
-CONFIG_ICPLUS_PHY=m
-CONFIG_REALTEK_PHY=m
-CONFIG_NATIONAL_PHY=m
-CONFIG_STE10XP=m
-CONFIG_LSI_ET1011C_PHY=m
-# CONFIG_FIXED_PHY is not set
-CONFIG_MDIO_BITBANG=m
-CONFIG_MDIO_GPIO=m
-CONFIG_NET_ETHERNET=y
-CONFIG_MII=m
-CONFIG_AX88796=m
-CONFIG_AX88796_93CX6=y
-CONFIG_HAPPYMEAL=m
-# CONFIG_SUNGEM is not set
-CONFIG_CASSINI=m
+CONFIG_ETHERNET=y
+CONFIG_MDIO=m
 CONFIG_NET_VENDOR_3COM=y
+CONFIG_PCMCIA_3C574=m
+CONFIG_PCMCIA_3C589=m
 CONFIG_VORTEX=m
 CONFIG_TYPHOON=m
-CONFIG_SMC91X=m
+CONFIG_NET_VENDOR_ADAPTEC=y
+CONFIG_ADAPTEC_STARFIRE=m
+CONFIG_NET_VENDOR_ALTEON=y
+CONFIG_ACENIC=m
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+CONFIG_NET_VENDOR_AMD=y
+CONFIG_AMD8111_ETH=m
+CONFIG_PCNET32=m
+CONFIG_PCMCIA_NMCLAN=m
+CONFIG_NET_VENDOR_ATHEROS=y
+CONFIG_ATL2=m
+CONFIG_ATL1=m
+CONFIG_ATL1E=m
+CONFIG_ATL1C=m
+CONFIG_NET_VENDOR_BROADCOM=y
+CONFIG_B44=m
+CONFIG_B44_PCI_AUTOSELECT=y
+CONFIG_B44_PCICORE_AUTOSELECT=y
+CONFIG_B44_PCI=y
+CONFIG_BNX2=m
+CONFIG_CNIC=m
+CONFIG_TIGON3=m
+CONFIG_BNX2X=m
+C