diff --git a/packages/3rdparty/multimedia/vdr-xineliboutput/build b/packages/3rdparty/multimedia/vdr-xineliboutput/build index f63b726368..9d837432c1 100755 --- a/packages/3rdparty/multimedia/vdr-xineliboutput/build +++ b/packages/3rdparty/multimedia/vdr-xineliboutput/build @@ -47,4 +47,5 @@ make mpg2c \ make VDRDIR="../$VDR_DIR" \ LIBDIR="." \ + LDFLAGS="-lm" \ LOCALEDIR="./locale" diff --git a/packages/linux/meta b/packages/linux/meta index 1d01daed6f..481e87cc2b 100644 --- a/packages/linux/meta +++ b/packages/linux/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="linux" -PKG_VERSION="3.6.8" +PKG_VERSION="3.6.9" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/linux/patches/linux-3.6.8-003-no_dev_console.patch b/packages/linux/patches/linux-3.6.9-003-no_dev_console.patch similarity index 100% rename from packages/linux/patches/linux-3.6.8-003-no_dev_console.patch rename to packages/linux/patches/linux-3.6.9-003-no_dev_console.patch diff --git a/packages/linux/patches/linux-3.6.8-004_lower_undefined_mode_timeout.patch b/packages/linux/patches/linux-3.6.9-004_lower_undefined_mode_timeout.patch similarity index 100% rename from packages/linux/patches/linux-3.6.8-004_lower_undefined_mode_timeout.patch rename to packages/linux/patches/linux-3.6.9-004_lower_undefined_mode_timeout.patch diff --git a/packages/linux/patches/linux-3.6.8-006_enable_utf8.patch b/packages/linux/patches/linux-3.6.9-006_enable_utf8.patch similarity index 100% rename from packages/linux/patches/linux-3.6.8-006_enable_utf8.patch rename to packages/linux/patches/linux-3.6.9-006_enable_utf8.patch diff --git a/packages/linux/patches/linux-3.6.8-007_die_floppy_die.patch b/packages/linux/patches/linux-3.6.9-007_die_floppy_die.patch similarity index 100% rename from packages/linux/patches/linux-3.6.8-007_die_floppy_die.patch rename to packages/linux/patches/linux-3.6.9-007_die_floppy_die.patch diff --git a/packages/linux/patches/linux-3.6.8-009_disable_i8042_check_on_apple_mac.patch b/packages/linux/patches/linux-3.6.9-009_disable_i8042_check_on_apple_mac.patch similarity index 100% rename from packages/linux/patches/linux-3.6.8-009_disable_i8042_check_on_apple_mac.patch rename to packages/linux/patches/linux-3.6.9-009_disable_i8042_check_on_apple_mac.patch diff --git a/packages/linux/patches/linux-3.6.8-053-spinelplus-remote-0.1.patch b/packages/linux/patches/linux-3.6.9-053-spinelplus-remote-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.6.8-053-spinelplus-remote-0.1.patch rename to packages/linux/patches/linux-3.6.9-053-spinelplus-remote-0.1.patch diff --git a/packages/linux/patches/linux-3.6.8-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.84c13.patch b/packages/linux/patches/linux-3.6.9-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.94c13.patch similarity index 100% rename from packages/linux/patches/linux-3.6.8-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.84c13.patch rename to packages/linux/patches/linux-3.6.9-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.94c13.patch diff --git a/packages/linux/patches/linux-3.6.8-203-stb0899_enable_low_symbol_rate.patch b/packages/linux/patches/linux-3.6.9-203-stb0899_enable_low_symbol_rate.patch similarity index 100% rename from packages/linux/patches/linux-3.6.8-203-stb0899_enable_low_symbol_rate.patch rename to packages/linux/patches/linux-3.6.9-203-stb0899_enable_low_symbol_rate.patch diff --git a/packages/linux/patches/linux-3.6.8-204-add_Formosa_eHome_Infrared_Receiver.patch b/packages/linux/patches/linux-3.6.9-204-add_Formosa_eHome_Infrared_Receiver.patch similarity index 100% rename from packages/linux/patches/linux-3.6.8-204-add_Formosa_eHome_Infrared_Receiver.patch rename to packages/linux/patches/linux-3.6.9-204-add_Formosa_eHome_Infrared_Receiver.patch diff --git a/packages/linux/patches/linux-3.6.8-205-add_Adaptec_eHome_Infrared_Receiver.patch b/packages/linux/patches/linux-3.6.9-205-add_Adaptec_eHome_Infrared_Receiver.patch similarity index 100% rename from packages/linux/patches/linux-3.6.8-205-add_Adaptec_eHome_Infrared_Receiver.patch rename to packages/linux/patches/linux-3.6.9-205-add_Adaptec_eHome_Infrared_Receiver.patch diff --git a/packages/linux/patches/linux-3.6.8-210-dvbsky.patch b/packages/linux/patches/linux-3.6.9-210-dvbsky.patch similarity index 100% rename from packages/linux/patches/linux-3.6.8-210-dvbsky.patch rename to packages/linux/patches/linux-3.6.9-210-dvbsky.patch diff --git a/packages/linux/patches/linux-3.6.8-212-mantis_stb0899_faster_lock.patch b/packages/linux/patches/linux-3.6.9-212-mantis_stb0899_faster_lock.patch similarity index 100% rename from packages/linux/patches/linux-3.6.8-212-mantis_stb0899_faster_lock.patch rename to packages/linux/patches/linux-3.6.9-212-mantis_stb0899_faster_lock.patch diff --git a/packages/linux/patches/linux-3.6.8-213-cinergy_s2_usb_r2.patch b/packages/linux/patches/linux-3.6.9-213-cinergy_s2_usb_r2.patch similarity index 100% rename from packages/linux/patches/linux-3.6.8-213-cinergy_s2_usb_r2.patch rename to packages/linux/patches/linux-3.6.9-213-cinergy_s2_usb_r2.patch diff --git a/packages/linux/patches/linux-3.6.8-215-technisat-usb2-module.patch b/packages/linux/patches/linux-3.6.9-215-technisat-usb2-module.patch similarity index 100% rename from packages/linux/patches/linux-3.6.8-215-technisat-usb2-module.patch rename to packages/linux/patches/linux-3.6.9-215-technisat-usb2-module.patch diff --git a/packages/linux/patches/linux-3.6.8-221-ngene-octopus.patch b/packages/linux/patches/linux-3.6.9-221-ngene-octopus.patch similarity index 100% rename from packages/linux/patches/linux-3.6.8-221-ngene-octopus.patch rename to packages/linux/patches/linux-3.6.9-221-ngene-octopus.patch diff --git a/packages/linux/patches/linux-3.6.8-601-RPi_support-ff1c7e1.patch b/packages/linux/patches/linux-3.6.9-601-RPi_support-ff1c7e1.patch similarity index 100% rename from packages/linux/patches/linux-3.6.8-601-RPi_support-ff1c7e1.patch rename to packages/linux/patches/linux-3.6.9-601-RPi_support-ff1c7e1.patch diff --git a/packages/linux/patches/linux-3.6.8-603-RPi_add_LIRC_RPi_support.patch b/packages/linux/patches/linux-3.6.9-603-RPi_add_LIRC_RPi_support.patch similarity index 100% rename from packages/linux/patches/linux-3.6.8-603-RPi_add_LIRC_RPi_support.patch rename to packages/linux/patches/linux-3.6.9-603-RPi_add_LIRC_RPi_support.patch diff --git a/packages/linux/patches/linux-3.6.8-700-jmicron_1_0_8_5.patch b/packages/linux/patches/linux-3.6.9-700-jmicron_1_0_8_5.patch similarity index 100% rename from packages/linux/patches/linux-3.6.8-700-jmicron_1_0_8_5.patch rename to packages/linux/patches/linux-3.6.9-700-jmicron_1_0_8_5.patch diff --git a/packages/linux/patches/linux-3.6.8-920-r8168_8.034.00.patch b/packages/linux/patches/linux-3.6.9-920-r8168_8.034.00.patch similarity index 100% rename from packages/linux/patches/linux-3.6.8-920-r8168_8.034.00.patch rename to packages/linux/patches/linux-3.6.9-920-r8168_8.034.00.patch diff --git a/packages/linux/patches/linux-3.6.8-921-Removed-MCE-customer-code-restriction-in-rc6-decode.patch b/packages/linux/patches/linux-3.6.9-921-Removed-MCE-customer-code-restriction-in-rc6-decode.patch similarity index 100% rename from packages/linux/patches/linux-3.6.8-921-Removed-MCE-customer-code-restriction-in-rc6-decode.patch rename to packages/linux/patches/linux-3.6.9-921-Removed-MCE-customer-code-restriction-in-rc6-decode.patch diff --git a/packages/linux/patches/linux-3.6.8-999.21-hdmi-fix_channel_allocation_array_wrong_order.patch b/packages/linux/patches/linux-3.6.9-999.21-hdmi-fix_channel_allocation_array_wrong_order.patch similarity index 100% rename from packages/linux/patches/linux-3.6.8-999.21-hdmi-fix_channel_allocation_array_wrong_order.patch rename to packages/linux/patches/linux-3.6.9-999.21-hdmi-fix_channel_allocation_array_wrong_order.patch diff --git a/packages/linux/patches/linux-3.6.8-999.22-HDMI-Enable_HBR_feature_on_Intel_chips.patch b/packages/linux/patches/linux-3.6.9-999.22-HDMI-Enable_HBR_feature_on_Intel_chips.patch similarity index 100% rename from packages/linux/patches/linux-3.6.8-999.22-HDMI-Enable_HBR_feature_on_Intel_chips.patch rename to packages/linux/patches/linux-3.6.9-999.22-HDMI-Enable_HBR_feature_on_Intel_chips.patch diff --git a/packages/linux/patches/linux-3.6.8-999.23-HDMI-Setup_channel_mapping_for_non_pcm_audio.patch b/packages/linux/patches/linux-3.6.9-999.23-HDMI-Setup_channel_mapping_for_non_pcm_audio.patch similarity index 100% rename from packages/linux/patches/linux-3.6.8-999.23-HDMI-Setup_channel_mapping_for_non_pcm_audio.patch rename to packages/linux/patches/linux-3.6.9-999.23-HDMI-Setup_channel_mapping_for_non_pcm_audio.patch diff --git a/packages/linux/unpack b/packages/linux/unpack index 2e1e963205..10beb98aaa 100755 --- a/packages/linux/unpack +++ b/packages/linux/unpack @@ -37,7 +37,6 @@ sed -i -e "s|^HOSTCC[[:space:]]*=.*$|HOSTCC = $HOST_CC|" \ $LINUX/Makefile cp $KERNEL_CFG_FILE $LINUX/.config -#sed -i -e "s|^CONFIG_INITRAMFS_SOURCE=.*$|CONFIG_INITRAMFS_SOURCE=\"$ROOT/$PKG_DIR/config/initramfs\"|" \ sed -i -e "s|^CONFIG_INITRAMFS_SOURCE=.*$|CONFIG_INITRAMFS_SOURCE=\"$ROOT/$BUILD/image/initramfs.cpio\"|" \ $LINUX/.config @@ -54,8 +53,8 @@ sed -i -e "s|^CONFIG_INITRAMFS_SOURCE=.*$|CONFIG_INITRAMFS_SOURCE=\"$ROOT/$BUILD # dont install some debug stuff on release builds if [ ! "$DEVTOOLS" = yes ]; then sed -i -e "s|^CONFIG_DEBUG_FS=.*$|# CONFIG_DEBUG_FS is not set|" $LINUX/.config - sed -i -e "s|^CONFIG_NET_SCHED=.*$|# CONFIG_NET_SCHED is not set|" $LINUX/.config - sed -i -e "s|^CONFIG_NET_SCH_NETEM=.*$|# CONFIG_NET_SCH_NETEM is not set|" $LINUX/.config +# sed -i -e "s|^CONFIG_NET_SCHED=.*$|# CONFIG_NET_SCHED is not set|" $LINUX/.config +# sed -i -e "s|^CONFIG_NET_SCH_NETEM=.*$|# CONFIG_NET_SCH_NETEM is not set|" $LINUX/.config fi # copy some extra firmware to linux tree diff --git a/packages/mediacenter/xbmc-addon-xvdr/meta b/packages/mediacenter/xbmc-addon-xvdr/meta index bc88545e3d..1ee45bcf08 100644 --- a/packages/mediacenter/xbmc-addon-xvdr/meta +++ b/packages/mediacenter/xbmc-addon-xvdr/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-addon-xvdr" -PKG_VERSION="1d8f64c" +PKG_VERSION="a7d185d" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc-pvr-addons/meta b/packages/mediacenter/xbmc-pvr-addons/meta index 14d07717af..e02dc1c99d 100644 --- a/packages/mediacenter/xbmc-pvr-addons/meta +++ b/packages/mediacenter/xbmc-pvr-addons/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-pvr-addons" -PKG_VERSION="252fbbe" +PKG_VERSION="d3671de" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta index 376596388b..d8d54e2abe 100644 --- a/packages/mediacenter/xbmc-theme-Confluence/meta +++ b/packages/mediacenter/xbmc-theme-Confluence/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-theme-Confluence" -PKG_VERSION="0a4df7b" +PKG_VERSION="e979ca9" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc-theme-Confluence/patches/xbmc-theme-Confluence-0a4df7b-001-add_oe_settings_to_homescreen.patch b/packages/mediacenter/xbmc-theme-Confluence/patches/xbmc-theme-Confluence-e979ca9-001-add_oe_settings_to_homescreen.patch similarity index 100% rename from packages/mediacenter/xbmc-theme-Confluence/patches/xbmc-theme-Confluence-0a4df7b-001-add_oe_settings_to_homescreen.patch rename to packages/mediacenter/xbmc-theme-Confluence/patches/xbmc-theme-Confluence-e979ca9-001-add_oe_settings_to_homescreen.patch diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta index 4afba364df..865bed92f1 100644 --- a/packages/mediacenter/xbmc/meta +++ b/packages/mediacenter/xbmc/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="0a4df7b" +PKG_VERSION="e979ca9" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/patches/xbmc-0a4df7b-001-add_support_to_specify_GIT_REV-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-e979ca9-001-add_support_to_specify_GIT_REV-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-0a4df7b-001-add_support_to_specify_GIT_REV-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-e979ca9-001-add_support_to_specify_GIT_REV-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-0a4df7b-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-e979ca9-303-fix_libdvd_xFLAGS-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-0a4df7b-303-fix_libdvd_xFLAGS-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-e979ca9-303-fix_libdvd_xFLAGS-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-0a4df7b-311-fix_rsxs_build-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-e979ca9-311-fix_rsxs_build-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-0a4df7b-311-fix_rsxs_build-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-e979ca9-311-fix_rsxs_build-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-0a4df7b-321-texturepacker-hostflags-and-rework.patch b/packages/mediacenter/xbmc/patches/xbmc-e979ca9-321-texturepacker-hostflags-and-rework.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-0a4df7b-321-texturepacker-hostflags-and-rework.patch rename to packages/mediacenter/xbmc/patches/xbmc-e979ca9-321-texturepacker-hostflags-and-rework.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-0a4df7b-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-e979ca9-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-0a4df7b-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-e979ca9-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-0a4df7b-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-e979ca9-452-change_lcd_content-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-0a4df7b-452-change_lcd_content-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-e979ca9-452-change_lcd_content-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-0a4df7b-453-add_openelec.tv_RSS_news-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-e979ca9-453-add_openelec.tv_RSS_news-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-0a4df7b-453-add_openelec.tv_RSS_news-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-e979ca9-453-add_openelec.tv_RSS_news-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-0a4df7b-454-disable_backslash-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-e979ca9-454-disable_backslash-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-0a4df7b-454-disable_backslash-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-e979ca9-454-disable_backslash-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-0a4df7b-457-fix_connection_check-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-e979ca9-457-fix_connection_check-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-0a4df7b-457-fix_connection_check-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-e979ca9-457-fix_connection_check-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-0a4df7b-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-e979ca9-463-add_remote_devinput-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-0a4df7b-463-add_remote_devinput-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-e979ca9-463-add_remote_devinput-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-0a4df7b-990.01-PR1179.patch b/packages/mediacenter/xbmc/patches/xbmc-e979ca9-990.01-PR1179.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-0a4df7b-990.01-PR1179.patch rename to packages/mediacenter/xbmc/patches/xbmc-e979ca9-990.01-PR1179.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-0a4df7b-999-include_unistd.h.patch b/packages/mediacenter/xbmc/patches/xbmc-e979ca9-999-include_unistd.h.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-0a4df7b-999-include_unistd.h.patch rename to packages/mediacenter/xbmc/patches/xbmc-e979ca9-999-include_unistd.h.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.6-999-24c62ea.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.6-999-24c62ea.patch new file mode 100644 index 0000000000..8d3d920f28 --- /dev/null +++ b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.6-999-24c62ea.patch @@ -0,0 +1,27 @@ +From 24c62ea7a5df44804be88150aa0c45e6796b5da9 Mon Sep 17 00:00:00 2001 +From: Janne Grunau +Date: Wed, 5 Dec 2012 19:56:36 +0100 +Subject: [PATCH] h264: slice-mt: get last_pic_dropable from master context + +Fixes fate-h264-conformance-cvnlfi2_sony_h and smllwebdl.mkv from +https://github.com/OpenELEC/OpenELEC.tv/issues/1557 . +--- + libavcodec/h264.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libavcodec/h264.c b/libavcodec/h264.c +index 618acb7..a93d07e 100644 +--- a/libavcodec/h264.c ++++ b/libavcodec/h264.c +@@ -2682,7 +2682,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0) + h->mb_mbaff = 0; + h->mb_aff_frame = 0; + last_pic_structure = s0->picture_structure; +- last_pic_dropable = s->dropable; ++ last_pic_dropable = s0->dropable; + s->dropable = h->nal_ref_idc == 0; + if (h->sps.frame_mbs_only_flag) { + s->picture_structure = PICT_FRAME; +-- +1.7.10 + diff --git a/packages/network/libnl/build b/packages/network/libnl/build index 0648b097f7..79e0bae1db 100755 --- a/packages/network/libnl/build +++ b/packages/network/libnl/build @@ -31,6 +31,6 @@ cd $PKG_BUILD --enable-shared \ --disable-cli \ -make +make V=1 $MAKEINSTALL diff --git a/packages/network/libnl/meta b/packages/network/libnl/meta index 91c72ff353..d06e95a1f0 100644 --- a/packages/network/libnl/meta +++ b/packages/network/libnl/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="libnl" -PKG_VERSION="3.2.14" +PKG_VERSION="3.2.16" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="LGPL" diff --git a/packages/network/samba/patches/samba-3.6.9-400-reset_ntlmv2.patch b/packages/network/samba/patches/samba-3.6.9-400-reset_ntlmv2.patch deleted file mode 100644 index 33f2560d5b..0000000000 --- a/packages/network/samba/patches/samba-3.6.9-400-reset_ntlmv2.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- samba-3.6.8/source3/param/loadparm.c 2012-09-14 02:12:09.000000000 -0600 -+++ samba-3.6.8-b/source3/param/loadparm.c 2012-11-25 15:53:07.543125017 -0700 -@@ -5336,7 +5336,7 @@ - Globals.bClientPlaintextAuth = False; /* Do NOT use a plaintext password even if is requested by the server */ - Globals.bLanmanAuth = False; /* Do NOT use the LanMan hash, even if it is supplied */ - Globals.bNTLMAuth = True; /* Do use NTLMv1 if it is supplied by the client (otherwise NTLMv2) */ -- Globals.bClientNTLMv2Auth = True; /* Client should always use use NTLMv2, as we can't tell that the server supports it, but most modern servers do */ -+ Globals.bClientNTLMv2Auth = False; /* Client should always use use NTLMv2, as we can't tell that the server supports it, but most modern servers do */ - /* Note, that we will also use NTLM2 session security (which is different), if it is available */ - - Globals.map_to_guest = 0; /* By Default, "Never" */ diff --git a/packages/network/wpa_supplicant/meta b/packages/network/wpa_supplicant/meta index 68960c5b37..72ea4ff238 100644 --- a/packages/network/wpa_supplicant/meta +++ b/packages/network/wpa_supplicant/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="wpa_supplicant" -PKG_VERSION="1.0" +PKG_VERSION="1.1" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/network/wpa_supplicant/patches/wpa_supplicant-1.0-wpagui-getopt.patch b/packages/network/wpa_supplicant/patches/wpa_supplicant-1.0-wpagui-getopt.patch deleted file mode 100644 index ed1930b217..0000000000 --- a/packages/network/wpa_supplicant/patches/wpa_supplicant-1.0-wpagui-getopt.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up wpa_supplicant-1.0-rc1/wpa_supplicant/wpa_gui-qt4/wpagui.cpp.getopt wpa_supplicant-1.0-rc1/wpa_supplicant/wpa_gui-qt4/wpagui.cpp ---- wpa_supplicant-1.0-rc1/wpa_supplicant/wpa_gui-qt4/wpagui.cpp.getopt 2012-01-10 16:28:43.451307760 -0600 -+++ wpa_supplicant-1.0-rc1/wpa_supplicant/wpa_gui-qt4/wpagui.cpp 2012-01-10 16:28:53.999175893 -0600 -@@ -12,10 +12,7 @@ - * See README and COPYING for more details. - */ - --#ifdef __MINGW32__ --/* Need to get getopt() */ - #include --#endif - - #ifdef CONFIG_NATIVE_WINDOWS - #include diff --git a/packages/network/wpa_supplicant/patches/wpa_supplicant-1.0-assoc-timeout.patch b/packages/network/wpa_supplicant/patches/wpa_supplicant-1.1-assoc-timeout.patch similarity index 100% rename from packages/network/wpa_supplicant/patches/wpa_supplicant-1.0-assoc-timeout.patch rename to packages/network/wpa_supplicant/patches/wpa_supplicant-1.1-assoc-timeout.patch diff --git a/packages/network/wpa_supplicant/patches/wpa_supplicant-1.0-dbus-service-file-args.patch b/packages/network/wpa_supplicant/patches/wpa_supplicant-1.1-dbus-service-file-args.patch similarity index 100% rename from packages/network/wpa_supplicant/patches/wpa_supplicant-1.0-dbus-service-file-args.patch rename to packages/network/wpa_supplicant/patches/wpa_supplicant-1.1-dbus-service-file-args.patch diff --git a/packages/network/wpa_supplicant/patches/wpa_supplicant-1.0-flush-debug-output.patch b/packages/network/wpa_supplicant/patches/wpa_supplicant-1.1-flush-debug-output.patch similarity index 100% rename from packages/network/wpa_supplicant/patches/wpa_supplicant-1.0-flush-debug-output.patch rename to packages/network/wpa_supplicant/patches/wpa_supplicant-1.1-flush-debug-output.patch diff --git a/packages/network/wpa_supplicant/patches/wpa_supplicant-1.0-libnl3-includes.patch b/packages/network/wpa_supplicant/patches/wpa_supplicant-1.1-libnl3-includes.patch similarity index 100% rename from packages/network/wpa_supplicant/patches/wpa_supplicant-1.0-libnl3-includes.patch rename to packages/network/wpa_supplicant/patches/wpa_supplicant-1.1-libnl3-includes.patch diff --git a/packages/network/wpa_supplicant/patches/wpa_supplicant-1.0-openssl-more-algs.patch b/packages/network/wpa_supplicant/patches/wpa_supplicant-1.1-openssl-more-algs.patch similarity index 100% rename from packages/network/wpa_supplicant/patches/wpa_supplicant-1.0-openssl-more-algs.patch rename to packages/network/wpa_supplicant/patches/wpa_supplicant-1.1-openssl-more-algs.patch diff --git a/packages/network/wpa_supplicant/patches/wpa_supplicant-1.0-quiet-scan-results-message.patch b/packages/network/wpa_supplicant/patches/wpa_supplicant-1.1-quiet-scan-results-message.patch similarity index 100% rename from packages/network/wpa_supplicant/patches/wpa_supplicant-1.0-quiet-scan-results-message.patch rename to packages/network/wpa_supplicant/patches/wpa_supplicant-1.1-quiet-scan-results-message.patch diff --git a/packages/network/wpa_supplicant/patches/wpa_supplicant-1.0-squelch-driver-disconnect-spam.patch b/packages/network/wpa_supplicant/patches/wpa_supplicant-1.1-squelch-driver-disconnect-spam.patch similarity index 100% rename from packages/network/wpa_supplicant/patches/wpa_supplicant-1.0-squelch-driver-disconnect-spam.patch rename to packages/network/wpa_supplicant/patches/wpa_supplicant-1.1-squelch-driver-disconnect-spam.patch diff --git a/packages/sysutils/kmod/meta b/packages/sysutils/kmod/meta index 1ca8de2b03..ccf1e046c4 100644 --- a/packages/sysutils/kmod/meta +++ b/packages/sysutils/kmod/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="kmod" -PKG_VERSION="11" +PKG_VERSION="12" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/toolchain/devel/flex/build b/packages/toolchain/devel/flex/build index 617adc4730..16e475818b 100755 --- a/packages/toolchain/devel/flex/build +++ b/packages/toolchain/devel/flex/build @@ -38,6 +38,6 @@ make install cat > $ROOT/$TOOLCHAIN/bin/lex << "EOF" #!/bin/sh -exec flex -l "$@" +exec flex "$@" EOF chmod -v 755 $ROOT/$TOOLCHAIN/bin/lex diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf index 799a09a6cd..54c08bce9e 100644 --- a/projects/ATV/linux/linux.i386.conf +++ b/projects/ATV/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.6.8 Kernel Configuration +# Linux/i386 3.6.9 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -667,7 +667,14 @@ CONFIG_NETFILTER=y # CONFIG_NETFILTER_NETLINK=y CONFIG_NETFILTER_NETLINK_LOG=y -# CONFIG_NF_CONNTRACK is not set +CONFIG_NF_CONNTRACK=y +# CONFIG_NF_CONNTRACK_PROCFS is not set +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_BROADCAST=m +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CT_NETLINK=y CONFIG_NETFILTER_XTABLES=y # @@ -678,48 +685,66 @@ CONFIG_NETFILTER_XTABLES=y # # Xtables targets # -CONFIG_NETFILTER_XT_TARGET_LOG=m +# CONFIG_NETFILTER_XT_TARGET_LOG is not set # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set # CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set # # Xtables matches # +# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set +# CONFIG_NETFILTER_XT_MATCH_STATE is not set # CONFIG_IP_SET is not set # CONFIG_IP_VS is not set # # IP: Netfilter Configuration # -# CONFIG_NF_DEFRAG_IPV4 is not set -CONFIG_IP_NF_IPTABLES=y -CONFIG_IP_NF_FILTER=y -# CONFIG_IP_NF_TARGET_REJECT is not set +CONFIG_NF_DEFRAG_IPV4=m +CONFIG_NF_CONNTRACK_IPV4=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m # CONFIG_IP_NF_TARGET_ULOG is not set +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +# CONFIG_NF_NAT_TFTP is not set +# CONFIG_NF_NAT_AMANDA is not set +# CONFIG_NF_NAT_PPTP is not set +# CONFIG_NF_NAT_H323 is not set +CONFIG_NF_NAT_SIP=m # CONFIG_IP_NF_MANGLE is not set # CONFIG_IP_NF_RAW is not set # # IPv6: Netfilter Configuration # -# CONFIG_NF_DEFRAG_IPV6 is not set -CONFIG_IP6_NF_IPTABLES=y +CONFIG_NF_DEFRAG_IPV6=m +CONFIG_NF_CONNTRACK_IPV6=m +CONFIG_IP6_NF_IPTABLES=m # CONFIG_IP6_NF_MATCH_IPV6HEADER is not set -CONFIG_IP6_NF_FILTER=y -# CONFIG_IP6_NF_TARGET_REJECT is not set +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_REJECT=m # CONFIG_IP6_NF_MANGLE is not set # CONFIG_IP6_NF_RAW is not set +# CONFIG_BRIDGE_NF_EBTABLES is not set # CONFIG_IP_DCCP is not set # CONFIG_IP_SCTP is not set # CONFIG_RDS is not set # CONFIG_TIPC is not set # CONFIG_ATM is not set # CONFIG_L2TP is not set -# CONFIG_BRIDGE is not set +CONFIG_STP=y +CONFIG_BRIDGE=y +CONFIG_BRIDGE_IGMP_SNOOPING=y # CONFIG_NET_DSA is not set CONFIG_VLAN_8021Q=m # CONFIG_VLAN_8021Q_GVRP is not set # CONFIG_DECNET is not set +CONFIG_LLC=y # CONFIG_LLC2 is not set # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -782,7 +807,7 @@ CONFIG_NET_ACT_POLICE=y CONFIG_NET_ACT_GACT=y CONFIG_GACT_PROB=y CONFIG_NET_ACT_MIRRED=y -CONFIG_NET_ACT_IPT=y +CONFIG_NET_ACT_IPT=m CONFIG_NET_ACT_NAT=y CONFIG_NET_ACT_PEDIT=y # CONFIG_NET_ACT_SIMP is not set diff --git a/projects/Fusion/linux/linux.i386.conf b/projects/Fusion/linux/linux.i386.conf index fb95521eec..c8c54642d1 100644 --- a/projects/Fusion/linux/linux.i386.conf +++ b/projects/Fusion/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.6.8 Kernel Configuration +# Linux/i386 3.6.9 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -670,7 +670,14 @@ CONFIG_NETFILTER=y # CONFIG_NETFILTER_NETLINK=y CONFIG_NETFILTER_NETLINK_LOG=y -# CONFIG_NF_CONNTRACK is not set +CONFIG_NF_CONNTRACK=y +# CONFIG_NF_CONNTRACK_PROCFS is not set +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_BROADCAST=m +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CT_NETLINK=y CONFIG_NETFILTER_XTABLES=y # @@ -681,48 +688,66 @@ CONFIG_NETFILTER_XTABLES=y # # Xtables targets # -CONFIG_NETFILTER_XT_TARGET_LOG=m +# CONFIG_NETFILTER_XT_TARGET_LOG is not set # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set # CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set # # Xtables matches # +# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set +# CONFIG_NETFILTER_XT_MATCH_STATE is not set # CONFIG_IP_SET is not set # CONFIG_IP_VS is not set # # IP: Netfilter Configuration # -# CONFIG_NF_DEFRAG_IPV4 is not set -CONFIG_IP_NF_IPTABLES=y -CONFIG_IP_NF_FILTER=y -# CONFIG_IP_NF_TARGET_REJECT is not set +CONFIG_NF_DEFRAG_IPV4=m +CONFIG_NF_CONNTRACK_IPV4=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m # CONFIG_IP_NF_TARGET_ULOG is not set +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +# CONFIG_NF_NAT_TFTP is not set +# CONFIG_NF_NAT_AMANDA is not set +# CONFIG_NF_NAT_PPTP is not set +# CONFIG_NF_NAT_H323 is not set +CONFIG_NF_NAT_SIP=m # CONFIG_IP_NF_MANGLE is not set # CONFIG_IP_NF_RAW is not set # # IPv6: Netfilter Configuration # -# CONFIG_NF_DEFRAG_IPV6 is not set -CONFIG_IP6_NF_IPTABLES=y +CONFIG_NF_DEFRAG_IPV6=m +CONFIG_NF_CONNTRACK_IPV6=m +CONFIG_IP6_NF_IPTABLES=m # CONFIG_IP6_NF_MATCH_IPV6HEADER is not set -CONFIG_IP6_NF_FILTER=y -# CONFIG_IP6_NF_TARGET_REJECT is not set +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_REJECT=m # CONFIG_IP6_NF_MANGLE is not set # CONFIG_IP6_NF_RAW is not set +# CONFIG_BRIDGE_NF_EBTABLES is not set # CONFIG_IP_DCCP is not set # CONFIG_IP_SCTP is not set # CONFIG_RDS is not set # CONFIG_TIPC is not set # CONFIG_ATM is not set # CONFIG_L2TP is not set -# CONFIG_BRIDGE is not set +CONFIG_STP=y +CONFIG_BRIDGE=y +CONFIG_BRIDGE_IGMP_SNOOPING=y # CONFIG_NET_DSA is not set CONFIG_VLAN_8021Q=m # CONFIG_VLAN_8021Q_GVRP is not set # CONFIG_DECNET is not set +CONFIG_LLC=y # CONFIG_LLC2 is not set # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -785,7 +810,7 @@ CONFIG_NET_ACT_POLICE=y CONFIG_NET_ACT_GACT=y CONFIG_GACT_PROB=y CONFIG_NET_ACT_MIRRED=y -CONFIG_NET_ACT_IPT=y +CONFIG_NET_ACT_IPT=m CONFIG_NET_ACT_NAT=y CONFIG_NET_ACT_PEDIT=y # CONFIG_NET_ACT_SIMP is not set @@ -2296,6 +2321,8 @@ CONFIG_DVB_STV6110x=m # CONFIG_DVB_DRXK=m CONFIG_DVB_TDA18271C2DD=m +CONFIG_DVB_STV0367DD=m +CONFIG_DVB_TDA18212DD=m # # DVB-S (satellite) frontends diff --git a/projects/Fusion/linux/linux.x86_64.conf b/projects/Fusion/linux/linux.x86_64.conf index a4ea664a27..29df64ec85 100644 --- a/projects/Fusion/linux/linux.x86_64.conf +++ b/projects/Fusion/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.6.8 Kernel Configuration +# Linux/x86_64 3.6.9 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -631,7 +631,14 @@ CONFIG_NETFILTER=y # CONFIG_NETFILTER_NETLINK=y CONFIG_NETFILTER_NETLINK_LOG=y -# CONFIG_NF_CONNTRACK is not set +CONFIG_NF_CONNTRACK=y +# CONFIG_NF_CONNTRACK_PROCFS is not set +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_BROADCAST=m +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CT_NETLINK=y CONFIG_NETFILTER_XTABLES=y # @@ -642,48 +649,66 @@ CONFIG_NETFILTER_XTABLES=y # # Xtables targets # -CONFIG_NETFILTER_XT_TARGET_LOG=m +# CONFIG_NETFILTER_XT_TARGET_LOG is not set # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set # CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set # # Xtables matches # +# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set +# CONFIG_NETFILTER_XT_MATCH_STATE is not set # CONFIG_IP_SET is not set # CONFIG_IP_VS is not set # # IP: Netfilter Configuration # -# CONFIG_NF_DEFRAG_IPV4 is not set -CONFIG_IP_NF_IPTABLES=y -CONFIG_IP_NF_FILTER=y -# CONFIG_IP_NF_TARGET_REJECT is not set +CONFIG_NF_DEFRAG_IPV4=m +CONFIG_NF_CONNTRACK_IPV4=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m # CONFIG_IP_NF_TARGET_ULOG is not set +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +# CONFIG_NF_NAT_TFTP is not set +# CONFIG_NF_NAT_AMANDA is not set +# CONFIG_NF_NAT_PPTP is not set +# CONFIG_NF_NAT_H323 is not set +CONFIG_NF_NAT_SIP=m # CONFIG_IP_NF_MANGLE is not set # CONFIG_IP_NF_RAW is not set # # IPv6: Netfilter Configuration # -# CONFIG_NF_DEFRAG_IPV6 is not set -CONFIG_IP6_NF_IPTABLES=y +CONFIG_NF_DEFRAG_IPV6=m +CONFIG_NF_CONNTRACK_IPV6=m +CONFIG_IP6_NF_IPTABLES=m # CONFIG_IP6_NF_MATCH_IPV6HEADER is not set -CONFIG_IP6_NF_FILTER=y -# CONFIG_IP6_NF_TARGET_REJECT is not set +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_REJECT=m # CONFIG_IP6_NF_MANGLE is not set # CONFIG_IP6_NF_RAW is not set +# CONFIG_BRIDGE_NF_EBTABLES is not set # CONFIG_IP_DCCP is not set # CONFIG_IP_SCTP is not set # CONFIG_RDS is not set # CONFIG_TIPC is not set # CONFIG_ATM is not set # CONFIG_L2TP is not set -# CONFIG_BRIDGE is not set +CONFIG_STP=y +CONFIG_BRIDGE=y +CONFIG_BRIDGE_IGMP_SNOOPING=y # CONFIG_NET_DSA is not set CONFIG_VLAN_8021Q=m # CONFIG_VLAN_8021Q_GVRP is not set # CONFIG_DECNET is not set +CONFIG_LLC=y # CONFIG_LLC2 is not set # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -746,7 +771,7 @@ CONFIG_NET_ACT_POLICE=y CONFIG_NET_ACT_GACT=y CONFIG_GACT_PROB=y CONFIG_NET_ACT_MIRRED=y -CONFIG_NET_ACT_IPT=y +CONFIG_NET_ACT_IPT=m CONFIG_NET_ACT_NAT=y CONFIG_NET_ACT_PEDIT=y # CONFIG_NET_ACT_SIMP is not set @@ -2245,6 +2270,8 @@ CONFIG_DVB_STV6110x=m # CONFIG_DVB_DRXK=m CONFIG_DVB_TDA18271C2DD=m +CONFIG_DVB_STV0367DD=m +CONFIG_DVB_TDA18212DD=m # # DVB-S (satellite) frontends diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf index b2aebc11a9..55909ef093 100644 --- a/projects/Generic/linux/linux.i386.conf +++ b/projects/Generic/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.6.8 Kernel Configuration +# Linux/i386 3.6.9 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -676,7 +676,14 @@ CONFIG_NETFILTER=y # CONFIG_NETFILTER_NETLINK=y CONFIG_NETFILTER_NETLINK_LOG=y -# CONFIG_NF_CONNTRACK is not set +CONFIG_NF_CONNTRACK=y +# CONFIG_NF_CONNTRACK_PROCFS is not set +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_BROADCAST=m +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CT_NETLINK=y CONFIG_NETFILTER_XTABLES=y # @@ -687,48 +694,66 @@ CONFIG_NETFILTER_XTABLES=y # # Xtables targets # -CONFIG_NETFILTER_XT_TARGET_LOG=m +# CONFIG_NETFILTER_XT_TARGET_LOG is not set # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set # CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set # # Xtables matches # +# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set +# CONFIG_NETFILTER_XT_MATCH_STATE is not set # CONFIG_IP_SET is not set # CONFIG_IP_VS is not set # # IP: Netfilter Configuration # -# CONFIG_NF_DEFRAG_IPV4 is not set -CONFIG_IP_NF_IPTABLES=y -CONFIG_IP_NF_FILTER=y -# CONFIG_IP_NF_TARGET_REJECT is not set +CONFIG_NF_DEFRAG_IPV4=m +CONFIG_NF_CONNTRACK_IPV4=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m # CONFIG_IP_NF_TARGET_ULOG is not set +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +# CONFIG_NF_NAT_TFTP is not set +# CONFIG_NF_NAT_AMANDA is not set +# CONFIG_NF_NAT_PPTP is not set +# CONFIG_NF_NAT_H323 is not set +CONFIG_NF_NAT_SIP=m # CONFIG_IP_NF_MANGLE is not set # CONFIG_IP_NF_RAW is not set # # IPv6: Netfilter Configuration # -# CONFIG_NF_DEFRAG_IPV6 is not set -CONFIG_IP6_NF_IPTABLES=y +CONFIG_NF_DEFRAG_IPV6=m +CONFIG_NF_CONNTRACK_IPV6=m +CONFIG_IP6_NF_IPTABLES=m # CONFIG_IP6_NF_MATCH_IPV6HEADER is not set -CONFIG_IP6_NF_FILTER=y -# CONFIG_IP6_NF_TARGET_REJECT is not set +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_REJECT=m # CONFIG_IP6_NF_MANGLE is not set # CONFIG_IP6_NF_RAW is not set +# CONFIG_BRIDGE_NF_EBTABLES is not set # CONFIG_IP_DCCP is not set # CONFIG_IP_SCTP is not set # CONFIG_RDS is not set # CONFIG_TIPC is not set # CONFIG_ATM is not set # CONFIG_L2TP is not set -# CONFIG_BRIDGE is not set +CONFIG_STP=y +CONFIG_BRIDGE=y +CONFIG_BRIDGE_IGMP_SNOOPING=y # CONFIG_NET_DSA is not set CONFIG_VLAN_8021Q=m # CONFIG_VLAN_8021Q_GVRP is not set # CONFIG_DECNET is not set +CONFIG_LLC=y # CONFIG_LLC2 is not set # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -791,7 +816,7 @@ CONFIG_NET_ACT_POLICE=y CONFIG_NET_ACT_GACT=y CONFIG_GACT_PROB=y CONFIG_NET_ACT_MIRRED=y -CONFIG_NET_ACT_IPT=y +CONFIG_NET_ACT_IPT=m CONFIG_NET_ACT_NAT=y CONFIG_NET_ACT_PEDIT=y # CONFIG_NET_ACT_SIMP is not set @@ -2381,6 +2406,8 @@ CONFIG_DVB_STV6110x=m # CONFIG_DVB_DRXK=m CONFIG_DVB_TDA18271C2DD=m +CONFIG_DVB_STV0367DD=m +CONFIG_DVB_TDA18212DD=m # # DVB-S (satellite) frontends diff --git a/projects/Generic_OSS/linux/linux.i386.conf b/projects/Generic_OSS/linux/linux.i386.conf index ea00940c94..bb1c6f9014 100644 --- a/projects/Generic_OSS/linux/linux.i386.conf +++ b/projects/Generic_OSS/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.6.8 Kernel Configuration +# Linux/i386 3.6.9 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -676,7 +676,14 @@ CONFIG_NETFILTER=y # CONFIG_NETFILTER_NETLINK=y CONFIG_NETFILTER_NETLINK_LOG=y -# CONFIG_NF_CONNTRACK is not set +CONFIG_NF_CONNTRACK=y +# CONFIG_NF_CONNTRACK_PROCFS is not set +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_BROADCAST=m +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CT_NETLINK=y CONFIG_NETFILTER_XTABLES=y # @@ -687,48 +694,66 @@ CONFIG_NETFILTER_XTABLES=y # # Xtables targets # -CONFIG_NETFILTER_XT_TARGET_LOG=m +# CONFIG_NETFILTER_XT_TARGET_LOG is not set # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set # CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set # # Xtables matches # +# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set +# CONFIG_NETFILTER_XT_MATCH_STATE is not set # CONFIG_IP_SET is not set # CONFIG_IP_VS is not set # # IP: Netfilter Configuration # -# CONFIG_NF_DEFRAG_IPV4 is not set -CONFIG_IP_NF_IPTABLES=y -CONFIG_IP_NF_FILTER=y -# CONFIG_IP_NF_TARGET_REJECT is not set +CONFIG_NF_DEFRAG_IPV4=m +CONFIG_NF_CONNTRACK_IPV4=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m # CONFIG_IP_NF_TARGET_ULOG is not set +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +# CONFIG_NF_NAT_TFTP is not set +# CONFIG_NF_NAT_AMANDA is not set +# CONFIG_NF_NAT_PPTP is not set +# CONFIG_NF_NAT_H323 is not set +CONFIG_NF_NAT_SIP=m # CONFIG_IP_NF_MANGLE is not set # CONFIG_IP_NF_RAW is not set # # IPv6: Netfilter Configuration # -# CONFIG_NF_DEFRAG_IPV6 is not set -CONFIG_IP6_NF_IPTABLES=y +CONFIG_NF_DEFRAG_IPV6=m +CONFIG_NF_CONNTRACK_IPV6=m +CONFIG_IP6_NF_IPTABLES=m # CONFIG_IP6_NF_MATCH_IPV6HEADER is not set -CONFIG_IP6_NF_FILTER=y -# CONFIG_IP6_NF_TARGET_REJECT is not set +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_REJECT=m # CONFIG_IP6_NF_MANGLE is not set # CONFIG_IP6_NF_RAW is not set +# CONFIG_BRIDGE_NF_EBTABLES is not set # CONFIG_IP_DCCP is not set # CONFIG_IP_SCTP is not set # CONFIG_RDS is not set # CONFIG_TIPC is not set # CONFIG_ATM is not set # CONFIG_L2TP is not set -# CONFIG_BRIDGE is not set +CONFIG_STP=y +CONFIG_BRIDGE=y +CONFIG_BRIDGE_IGMP_SNOOPING=y # CONFIG_NET_DSA is not set CONFIG_VLAN_8021Q=m # CONFIG_VLAN_8021Q_GVRP is not set # CONFIG_DECNET is not set +CONFIG_LLC=y # CONFIG_LLC2 is not set # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -791,7 +816,7 @@ CONFIG_NET_ACT_POLICE=y CONFIG_NET_ACT_GACT=y CONFIG_GACT_PROB=y CONFIG_NET_ACT_MIRRED=y -CONFIG_NET_ACT_IPT=y +CONFIG_NET_ACT_IPT=m CONFIG_NET_ACT_NAT=y CONFIG_NET_ACT_PEDIT=y # CONFIG_NET_ACT_SIMP is not set @@ -2379,6 +2404,8 @@ CONFIG_DVB_STV6110x=m # CONFIG_DVB_DRXK=m CONFIG_DVB_TDA18271C2DD=m +CONFIG_DVB_STV0367DD=m +CONFIG_DVB_TDA18212DD=m # # DVB-S (satellite) frontends diff --git a/projects/ION/linux/linux.i386.conf b/projects/ION/linux/linux.i386.conf index 066eb2776d..397aadfb14 100644 --- a/projects/ION/linux/linux.i386.conf +++ b/projects/ION/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.6.8 Kernel Configuration +# Linux/i386 3.6.9 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -672,7 +672,14 @@ CONFIG_NETFILTER=y # CONFIG_NETFILTER_NETLINK=y CONFIG_NETFILTER_NETLINK_LOG=y -# CONFIG_NF_CONNTRACK is not set +CONFIG_NF_CONNTRACK=y +# CONFIG_NF_CONNTRACK_PROCFS is not set +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_BROADCAST=m +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CT_NETLINK=y CONFIG_NETFILTER_XTABLES=y # @@ -683,48 +690,66 @@ CONFIG_NETFILTER_XTABLES=y # # Xtables targets # -CONFIG_NETFILTER_XT_TARGET_LOG=m +# CONFIG_NETFILTER_XT_TARGET_LOG is not set # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set # CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set # # Xtables matches # +# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set +# CONFIG_NETFILTER_XT_MATCH_STATE is not set # CONFIG_IP_SET is not set # CONFIG_IP_VS is not set # # IP: Netfilter Configuration # -# CONFIG_NF_DEFRAG_IPV4 is not set -CONFIG_IP_NF_IPTABLES=y -CONFIG_IP_NF_FILTER=y -# CONFIG_IP_NF_TARGET_REJECT is not set +CONFIG_NF_DEFRAG_IPV4=m +CONFIG_NF_CONNTRACK_IPV4=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m # CONFIG_IP_NF_TARGET_ULOG is not set +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +# CONFIG_NF_NAT_TFTP is not set +# CONFIG_NF_NAT_AMANDA is not set +# CONFIG_NF_NAT_PPTP is not set +# CONFIG_NF_NAT_H323 is not set +CONFIG_NF_NAT_SIP=m # CONFIG_IP_NF_MANGLE is not set # CONFIG_IP_NF_RAW is not set # # IPv6: Netfilter Configuration # -# CONFIG_NF_DEFRAG_IPV6 is not set -CONFIG_IP6_NF_IPTABLES=y +CONFIG_NF_DEFRAG_IPV6=m +CONFIG_NF_CONNTRACK_IPV6=m +CONFIG_IP6_NF_IPTABLES=m # CONFIG_IP6_NF_MATCH_IPV6HEADER is not set -CONFIG_IP6_NF_FILTER=y -# CONFIG_IP6_NF_TARGET_REJECT is not set +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_REJECT=m # CONFIG_IP6_NF_MANGLE is not set # CONFIG_IP6_NF_RAW is not set +# CONFIG_BRIDGE_NF_EBTABLES is not set # CONFIG_IP_DCCP is not set # CONFIG_IP_SCTP is not set # CONFIG_RDS is not set # CONFIG_TIPC is not set # CONFIG_ATM is not set # CONFIG_L2TP is not set -# CONFIG_BRIDGE is not set +CONFIG_STP=y +CONFIG_BRIDGE=y +CONFIG_BRIDGE_IGMP_SNOOPING=y # CONFIG_NET_DSA is not set CONFIG_VLAN_8021Q=m # CONFIG_VLAN_8021Q_GVRP is not set # CONFIG_DECNET is not set +CONFIG_LLC=y # CONFIG_LLC2 is not set # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -787,7 +812,7 @@ CONFIG_NET_ACT_POLICE=y CONFIG_NET_ACT_GACT=y CONFIG_GACT_PROB=y CONFIG_NET_ACT_MIRRED=y -CONFIG_NET_ACT_IPT=y +CONFIG_NET_ACT_IPT=m CONFIG_NET_ACT_NAT=y CONFIG_NET_ACT_PEDIT=y # CONFIG_NET_ACT_SIMP is not set @@ -2269,6 +2294,8 @@ CONFIG_DVB_STV6110x=m # CONFIG_DVB_DRXK=m CONFIG_DVB_TDA18271C2DD=m +CONFIG_DVB_STV0367DD=m +CONFIG_DVB_TDA18212DD=m # # DVB-S (satellite) frontends diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf index c37a5fd472..2cdf9191c8 100644 --- a/projects/ION/linux/linux.x86_64.conf +++ b/projects/ION/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.6.8 Kernel Configuration +# Linux/x86_64 3.6.9 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -619,7 +619,14 @@ CONFIG_NETFILTER=y # CONFIG_NETFILTER_NETLINK=y CONFIG_NETFILTER_NETLINK_LOG=y -# CONFIG_NF_CONNTRACK is not set +CONFIG_NF_CONNTRACK=y +# CONFIG_NF_CONNTRACK_PROCFS is not set +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_BROADCAST=m +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CT_NETLINK=y CONFIG_NETFILTER_XTABLES=y # @@ -630,48 +637,66 @@ CONFIG_NETFILTER_XTABLES=y # # Xtables targets # -CONFIG_NETFILTER_XT_TARGET_LOG=m +# CONFIG_NETFILTER_XT_TARGET_LOG is not set # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set # CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set # # Xtables matches # +# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set +# CONFIG_NETFILTER_XT_MATCH_STATE is not set # CONFIG_IP_SET is not set # CONFIG_IP_VS is not set # # IP: Netfilter Configuration # -# CONFIG_NF_DEFRAG_IPV4 is not set -CONFIG_IP_NF_IPTABLES=y -CONFIG_IP_NF_FILTER=y -# CONFIG_IP_NF_TARGET_REJECT is not set +CONFIG_NF_DEFRAG_IPV4=m +CONFIG_NF_CONNTRACK_IPV4=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m # CONFIG_IP_NF_TARGET_ULOG is not set +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +# CONFIG_NF_NAT_TFTP is not set +# CONFIG_NF_NAT_AMANDA is not set +# CONFIG_NF_NAT_PPTP is not set +# CONFIG_NF_NAT_H323 is not set +CONFIG_NF_NAT_SIP=m # CONFIG_IP_NF_MANGLE is not set # CONFIG_IP_NF_RAW is not set # # IPv6: Netfilter Configuration # -# CONFIG_NF_DEFRAG_IPV6 is not set -CONFIG_IP6_NF_IPTABLES=y +CONFIG_NF_DEFRAG_IPV6=m +CONFIG_NF_CONNTRACK_IPV6=m +CONFIG_IP6_NF_IPTABLES=m # CONFIG_IP6_NF_MATCH_IPV6HEADER is not set -CONFIG_IP6_NF_FILTER=y -# CONFIG_IP6_NF_TARGET_REJECT is not set +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_REJECT=m # CONFIG_IP6_NF_MANGLE is not set # CONFIG_IP6_NF_RAW is not set +# CONFIG_BRIDGE_NF_EBTABLES is not set # CONFIG_IP_DCCP is not set # CONFIG_IP_SCTP is not set # CONFIG_RDS is not set # CONFIG_TIPC is not set # CONFIG_ATM is not set # CONFIG_L2TP is not set -# CONFIG_BRIDGE is not set +CONFIG_STP=y +CONFIG_BRIDGE=y +CONFIG_BRIDGE_IGMP_SNOOPING=y # CONFIG_NET_DSA is not set CONFIG_VLAN_8021Q=m # CONFIG_VLAN_8021Q_GVRP is not set # CONFIG_DECNET is not set +CONFIG_LLC=y # CONFIG_LLC2 is not set # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -734,7 +759,7 @@ CONFIG_NET_ACT_POLICE=y CONFIG_NET_ACT_GACT=y CONFIG_GACT_PROB=y CONFIG_NET_ACT_MIRRED=y -CONFIG_NET_ACT_IPT=y +CONFIG_NET_ACT_IPT=m CONFIG_NET_ACT_NAT=y CONFIG_NET_ACT_PEDIT=y # CONFIG_NET_ACT_SIMP is not set @@ -2204,6 +2229,8 @@ CONFIG_DVB_STV6110x=m # CONFIG_DVB_DRXK=m CONFIG_DVB_TDA18271C2DD=m +CONFIG_DVB_STV0367DD=m +CONFIG_DVB_TDA18212DD=m # # DVB-S (satellite) frontends diff --git a/projects/Intel/linux/linux.i386.conf b/projects/Intel/linux/linux.i386.conf index 2dc29863d0..9bd5142df0 100644 --- a/projects/Intel/linux/linux.i386.conf +++ b/projects/Intel/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.6.8 Kernel Configuration +# Linux/i386 3.6.9 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -674,7 +674,14 @@ CONFIG_NETFILTER=y # CONFIG_NETFILTER_NETLINK=y CONFIG_NETFILTER_NETLINK_LOG=y -# CONFIG_NF_CONNTRACK is not set +CONFIG_NF_CONNTRACK=y +# CONFIG_NF_CONNTRACK_PROCFS is not set +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_BROADCAST=m +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CT_NETLINK=y CONFIG_NETFILTER_XTABLES=y # @@ -685,48 +692,66 @@ CONFIG_NETFILTER_XTABLES=y # # Xtables targets # -CONFIG_NETFILTER_XT_TARGET_LOG=m +# CONFIG_NETFILTER_XT_TARGET_LOG is not set # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set # CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set # # Xtables matches # +# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set +# CONFIG_NETFILTER_XT_MATCH_STATE is not set # CONFIG_IP_SET is not set # CONFIG_IP_VS is not set # # IP: Netfilter Configuration # -# CONFIG_NF_DEFRAG_IPV4 is not set -CONFIG_IP_NF_IPTABLES=y -CONFIG_IP_NF_FILTER=y -# CONFIG_IP_NF_TARGET_REJECT is not set +CONFIG_NF_DEFRAG_IPV4=m +CONFIG_NF_CONNTRACK_IPV4=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m # CONFIG_IP_NF_TARGET_ULOG is not set +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +# CONFIG_NF_NAT_TFTP is not set +# CONFIG_NF_NAT_AMANDA is not set +# CONFIG_NF_NAT_PPTP is not set +# CONFIG_NF_NAT_H323 is not set +CONFIG_NF_NAT_SIP=m # CONFIG_IP_NF_MANGLE is not set # CONFIG_IP_NF_RAW is not set # # IPv6: Netfilter Configuration # -# CONFIG_NF_DEFRAG_IPV6 is not set -CONFIG_IP6_NF_IPTABLES=y +CONFIG_NF_DEFRAG_IPV6=m +CONFIG_NF_CONNTRACK_IPV6=m +CONFIG_IP6_NF_IPTABLES=m # CONFIG_IP6_NF_MATCH_IPV6HEADER is not set -CONFIG_IP6_NF_FILTER=y -# CONFIG_IP6_NF_TARGET_REJECT is not set +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_REJECT=m # CONFIG_IP6_NF_MANGLE is not set # CONFIG_IP6_NF_RAW is not set +# CONFIG_BRIDGE_NF_EBTABLES is not set # CONFIG_IP_DCCP is not set # CONFIG_IP_SCTP is not set # CONFIG_RDS is not set # CONFIG_TIPC is not set # CONFIG_ATM is not set # CONFIG_L2TP is not set -# CONFIG_BRIDGE is not set +CONFIG_STP=y +CONFIG_BRIDGE=y +CONFIG_BRIDGE_IGMP_SNOOPING=y # CONFIG_NET_DSA is not set CONFIG_VLAN_8021Q=m # CONFIG_VLAN_8021Q_GVRP is not set # CONFIG_DECNET is not set +CONFIG_LLC=y # CONFIG_LLC2 is not set # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -789,7 +814,7 @@ CONFIG_NET_ACT_POLICE=y CONFIG_NET_ACT_GACT=y CONFIG_GACT_PROB=y CONFIG_NET_ACT_MIRRED=y -CONFIG_NET_ACT_IPT=y +CONFIG_NET_ACT_IPT=m CONFIG_NET_ACT_NAT=y CONFIG_NET_ACT_PEDIT=y # CONFIG_NET_ACT_SIMP is not set @@ -2286,6 +2311,8 @@ CONFIG_DVB_STV6110x=m # CONFIG_DVB_DRXK=m CONFIG_DVB_TDA18271C2DD=m +CONFIG_DVB_STV0367DD=m +CONFIG_DVB_TDA18212DD=m # # DVB-S (satellite) frontends diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf index 98ed2a16f7..b978c2a047 100644 --- a/projects/Intel/linux/linux.x86_64.conf +++ b/projects/Intel/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.6.8 Kernel Configuration +# Linux/x86_64 3.6.9 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -622,7 +622,14 @@ CONFIG_NETFILTER=y # CONFIG_NETFILTER_NETLINK=y CONFIG_NETFILTER_NETLINK_LOG=y -# CONFIG_NF_CONNTRACK is not set +CONFIG_NF_CONNTRACK=y +# CONFIG_NF_CONNTRACK_PROCFS is not set +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_BROADCAST=m +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CT_NETLINK=y CONFIG_NETFILTER_XTABLES=y # @@ -633,48 +640,66 @@ CONFIG_NETFILTER_XTABLES=y # # Xtables targets # -CONFIG_NETFILTER_XT_TARGET_LOG=m +# CONFIG_NETFILTER_XT_TARGET_LOG is not set # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set # CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set # # Xtables matches # +# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set +# CONFIG_NETFILTER_XT_MATCH_STATE is not set # CONFIG_IP_SET is not set # CONFIG_IP_VS is not set # # IP: Netfilter Configuration # -# CONFIG_NF_DEFRAG_IPV4 is not set -CONFIG_IP_NF_IPTABLES=y -CONFIG_IP_NF_FILTER=y -# CONFIG_IP_NF_TARGET_REJECT is not set +CONFIG_NF_DEFRAG_IPV4=m +CONFIG_NF_CONNTRACK_IPV4=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m # CONFIG_IP_NF_TARGET_ULOG is not set +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +# CONFIG_NF_NAT_TFTP is not set +# CONFIG_NF_NAT_AMANDA is not set +# CONFIG_NF_NAT_PPTP is not set +# CONFIG_NF_NAT_H323 is not set +CONFIG_NF_NAT_SIP=m # CONFIG_IP_NF_MANGLE is not set # CONFIG_IP_NF_RAW is not set # # IPv6: Netfilter Configuration # -# CONFIG_NF_DEFRAG_IPV6 is not set -CONFIG_IP6_NF_IPTABLES=y +CONFIG_NF_DEFRAG_IPV6=m +CONFIG_NF_CONNTRACK_IPV6=m +CONFIG_IP6_NF_IPTABLES=m # CONFIG_IP6_NF_MATCH_IPV6HEADER is not set -CONFIG_IP6_NF_FILTER=y -# CONFIG_IP6_NF_TARGET_REJECT is not set +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_REJECT=m # CONFIG_IP6_NF_MANGLE is not set # CONFIG_IP6_NF_RAW is not set +# CONFIG_BRIDGE_NF_EBTABLES is not set # CONFIG_IP_DCCP is not set # CONFIG_IP_SCTP is not set # CONFIG_RDS is not set # CONFIG_TIPC is not set # CONFIG_ATM is not set # CONFIG_L2TP is not set -# CONFIG_BRIDGE is not set +CONFIG_STP=y +CONFIG_BRIDGE=y +CONFIG_BRIDGE_IGMP_SNOOPING=y # CONFIG_NET_DSA is not set CONFIG_VLAN_8021Q=m # CONFIG_VLAN_8021Q_GVRP is not set # CONFIG_DECNET is not set +CONFIG_LLC=y # CONFIG_LLC2 is not set # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -737,7 +762,7 @@ CONFIG_NET_ACT_POLICE=y CONFIG_NET_ACT_GACT=y CONFIG_GACT_PROB=y CONFIG_NET_ACT_MIRRED=y -CONFIG_NET_ACT_IPT=y +CONFIG_NET_ACT_IPT=m CONFIG_NET_ACT_NAT=y CONFIG_NET_ACT_PEDIT=y # CONFIG_NET_ACT_SIMP is not set @@ -2222,6 +2247,8 @@ CONFIG_DVB_STV6110x=m # CONFIG_DVB_DRXK=m CONFIG_DVB_TDA18271C2DD=m +CONFIG_DVB_STV0367DD=m +CONFIG_DVB_TDA18212DD=m # # DVB-S (satellite) frontends diff --git a/projects/RPi/linux/linux.arm.conf b/projects/RPi/linux/linux.arm.conf index 26c2118797..42020b53fd 100644 --- a/projects/RPi/linux/linux.arm.conf +++ b/projects/RPi/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.6.8 Kernel Configuration +# Linux/arm 3.6.9 Kernel Configuration # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -480,29 +480,23 @@ CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y # CONFIG_UNIX_DIAG is not set -CONFIG_XFRM=y -CONFIG_XFRM_ALGO=y -CONFIG_XFRM_USER=y -# CONFIG_XFRM_SUB_POLICY is not set -# CONFIG_XFRM_MIGRATE is not set -# CONFIG_XFRM_STATISTICS is not set -CONFIG_NET_KEY=y -# CONFIG_NET_KEY_MIGRATE is not set +# CONFIG_XFRM_USER is not set +# CONFIG_NET_KEY is not set CONFIG_INET=y CONFIG_IP_MULTICAST=y # CONFIG_IP_ADVANCED_ROUTER is not set CONFIG_IP_ROUTE_CLASSID=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y -# CONFIG_IP_PNP_BOOTP is not set -CONFIG_IP_PNP_RARP=y +CONFIG_IP_PNP_BOOTP=y +# CONFIG_IP_PNP_RARP is not set # CONFIG_NET_IPIP is not set # CONFIG_NET_IPGRE_DEMUX is not set CONFIG_IP_MROUTE=y CONFIG_IP_PIMSM_V1=y CONFIG_IP_PIMSM_V2=y # CONFIG_ARPD is not set -CONFIG_SYN_COOKIES=y +# CONFIG_SYN_COOKIES is not set # CONFIG_INET_AH is not set # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set @@ -511,8 +505,10 @@ CONFIG_INET_TUNNEL=m # CONFIG_INET_XFRM_MODE_TRANSPORT is not set # CONFIG_INET_XFRM_MODE_TUNNEL is not set # CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -# CONFIG_INET_DIAG is not set +CONFIG_INET_LRO=y +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +# CONFIG_INET_UDP_DIAG is not set # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_CUBIC=y CONFIG_DEFAULT_TCP_CONG="cubic" @@ -539,18 +535,93 @@ CONFIG_IPV6_NDISC_NODETYPE=y # CONFIG_IPV6_MROUTE is not set # CONFIG_NETWORK_SECMARK is not set # CONFIG_NETWORK_PHY_TIMESTAMPING is not set -# CONFIG_NETFILTER is not set +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +# CONFIG_NETFILTER_ADVANCED is not set + +# +# Core Netfilter Configuration +# +CONFIG_NETFILTER_NETLINK=y +CONFIG_NETFILTER_NETLINK_LOG=y +CONFIG_NF_CONNTRACK=y +# CONFIG_NF_CONNTRACK_PROCFS is not set +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_BROADCAST=m +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CT_NETLINK=y +CONFIG_NETFILTER_XTABLES=y + +# +# Xtables combined modules +# +# CONFIG_NETFILTER_XT_MARK is not set + +# +# Xtables targets +# +# CONFIG_NETFILTER_XT_TARGET_LOG is not set +# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set +# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set + +# +# Xtables matches +# +# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set +# CONFIG_NETFILTER_XT_MATCH_STATE is not set +# CONFIG_IP_SET is not set +# CONFIG_IP_VS is not set + +# +# IP: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV4=m +CONFIG_NF_CONNTRACK_IPV4=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m +# CONFIG_IP_NF_TARGET_ULOG is not set +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +# CONFIG_NF_NAT_TFTP is not set +# CONFIG_NF_NAT_AMANDA is not set +# CONFIG_NF_NAT_PPTP is not set +# CONFIG_NF_NAT_H323 is not set +CONFIG_NF_NAT_SIP=m +# CONFIG_IP_NF_MANGLE is not set +# CONFIG_IP_NF_RAW is not set + +# +# IPv6: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV6=m +CONFIG_NF_CONNTRACK_IPV6=m +CONFIG_IP6_NF_IPTABLES=m +# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_REJECT=m +# CONFIG_IP6_NF_MANGLE is not set +# CONFIG_IP6_NF_RAW is not set +# CONFIG_BRIDGE_NF_EBTABLES is not set # CONFIG_IP_DCCP is not set # CONFIG_IP_SCTP is not set # CONFIG_RDS is not set # CONFIG_TIPC is not set # CONFIG_ATM is not set # CONFIG_L2TP is not set -# CONFIG_BRIDGE is not set +CONFIG_STP=y +CONFIG_BRIDGE=y +CONFIG_BRIDGE_IGMP_SNOOPING=y # CONFIG_NET_DSA is not set -CONFIG_VLAN_8021Q=y +CONFIG_VLAN_8021Q=m # CONFIG_VLAN_8021Q_GVRP is not set # CONFIG_DECNET is not set +CONFIG_LLC=y # CONFIG_LLC2 is not set # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -613,6 +684,7 @@ CONFIG_NET_ACT_POLICE=y CONFIG_NET_ACT_GACT=y CONFIG_GACT_PROB=y CONFIG_NET_ACT_MIRRED=y +CONFIG_NET_ACT_IPT=m CONFIG_NET_ACT_NAT=y CONFIG_NET_ACT_PEDIT=y # CONFIG_NET_ACT_SIMP is not set @@ -631,30 +703,28 @@ CONFIG_BQL=y # # Network testing # -CONFIG_NET_PKTGEN=m +# CONFIG_NET_PKTGEN is not set # CONFIG_HAMRADIO is not set # CONFIG_CAN is not set # CONFIG_IRDA is not set -CONFIG_BT=y -CONFIG_BT_RFCOMM=y +CONFIG_BT=m +CONFIG_BT_RFCOMM=m CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=y -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_HIDP=y +# CONFIG_BT_BNEP is not set +CONFIG_BT_HIDP=m # # Bluetooth device drivers # -CONFIG_BT_HCIBTUSB=y +CONFIG_BT_HCIBTUSB=m # CONFIG_BT_HCIBTSDIO is not set # CONFIG_BT_HCIUART is not set -CONFIG_BT_HCIBCM203X=y -CONFIG_BT_HCIBPA10X=y -CONFIG_BT_HCIBFUSB=y +CONFIG_BT_HCIBCM203X=m +CONFIG_BT_HCIBPA10X=m +CONFIG_BT_HCIBFUSB=m # CONFIG_BT_HCIVHCI is not set # CONFIG_BT_MRVL is not set -CONFIG_BT_ATH3K=y +CONFIG_BT_ATH3K=m # CONFIG_AF_RXRPC is not set CONFIG_WIRELESS=y CONFIG_WIRELESS_EXT=y diff --git a/projects/Ultra/linux/linux.x86_64.conf b/projects/Ultra/linux/linux.x86_64.conf index 00a409098b..7841cf515b 100644 --- a/projects/Ultra/linux/linux.x86_64.conf +++ b/projects/Ultra/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.6.8 Kernel Configuration +# Linux/x86_64 3.6.9 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -619,7 +619,14 @@ CONFIG_NETFILTER=y # CONFIG_NETFILTER_NETLINK=y CONFIG_NETFILTER_NETLINK_LOG=y -# CONFIG_NF_CONNTRACK is not set +CONFIG_NF_CONNTRACK=y +# CONFIG_NF_CONNTRACK_PROCFS is not set +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_BROADCAST=m +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CT_NETLINK=y CONFIG_NETFILTER_XTABLES=y # @@ -630,48 +637,66 @@ CONFIG_NETFILTER_XTABLES=y # # Xtables targets # -CONFIG_NETFILTER_XT_TARGET_LOG=m +# CONFIG_NETFILTER_XT_TARGET_LOG is not set # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set # CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set # # Xtables matches # +# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set +# CONFIG_NETFILTER_XT_MATCH_STATE is not set # CONFIG_IP_SET is not set # CONFIG_IP_VS is not set # # IP: Netfilter Configuration # -# CONFIG_NF_DEFRAG_IPV4 is not set -CONFIG_IP_NF_IPTABLES=y -CONFIG_IP_NF_FILTER=y -# CONFIG_IP_NF_TARGET_REJECT is not set +CONFIG_NF_DEFRAG_IPV4=m +CONFIG_NF_CONNTRACK_IPV4=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m # CONFIG_IP_NF_TARGET_ULOG is not set +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +# CONFIG_NF_NAT_TFTP is not set +# CONFIG_NF_NAT_AMANDA is not set +# CONFIG_NF_NAT_PPTP is not set +# CONFIG_NF_NAT_H323 is not set +CONFIG_NF_NAT_SIP=m # CONFIG_IP_NF_MANGLE is not set # CONFIG_IP_NF_RAW is not set # # IPv6: Netfilter Configuration # -# CONFIG_NF_DEFRAG_IPV6 is not set -CONFIG_IP6_NF_IPTABLES=y +CONFIG_NF_DEFRAG_IPV6=m +CONFIG_NF_CONNTRACK_IPV6=m +CONFIG_IP6_NF_IPTABLES=m # CONFIG_IP6_NF_MATCH_IPV6HEADER is not set -CONFIG_IP6_NF_FILTER=y -# CONFIG_IP6_NF_TARGET_REJECT is not set +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_REJECT=m # CONFIG_IP6_NF_MANGLE is not set # CONFIG_IP6_NF_RAW is not set +# CONFIG_BRIDGE_NF_EBTABLES is not set # CONFIG_IP_DCCP is not set # CONFIG_IP_SCTP is not set # CONFIG_RDS is not set # CONFIG_TIPC is not set # CONFIG_ATM is not set # CONFIG_L2TP is not set -# CONFIG_BRIDGE is not set +CONFIG_STP=y +CONFIG_BRIDGE=y +CONFIG_BRIDGE_IGMP_SNOOPING=y # CONFIG_NET_DSA is not set CONFIG_VLAN_8021Q=m # CONFIG_VLAN_8021Q_GVRP is not set # CONFIG_DECNET is not set +CONFIG_LLC=y # CONFIG_LLC2 is not set # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -734,7 +759,7 @@ CONFIG_NET_ACT_POLICE=y CONFIG_NET_ACT_GACT=y CONFIG_GACT_PROB=y CONFIG_NET_ACT_MIRRED=y -CONFIG_NET_ACT_IPT=y +CONFIG_NET_ACT_IPT=m CONFIG_NET_ACT_NAT=y CONFIG_NET_ACT_PEDIT=y # CONFIG_NET_ACT_SIMP is not set diff --git a/projects/Virtual/linux/linux.i386.conf b/projects/Virtual/linux/linux.i386.conf index d7cf34a5bc..5408003fc9 100644 --- a/projects/Virtual/linux/linux.i386.conf +++ b/projects/Virtual/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.6.8 Kernel Configuration +# Linux/i386 3.6.9 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -672,7 +672,14 @@ CONFIG_NETFILTER=y # CONFIG_NETFILTER_NETLINK=y CONFIG_NETFILTER_NETLINK_LOG=y -# CONFIG_NF_CONNTRACK is not set +CONFIG_NF_CONNTRACK=y +# CONFIG_NF_CONNTRACK_PROCFS is not set +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_BROADCAST=m +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CT_NETLINK=y CONFIG_NETFILTER_XTABLES=y # @@ -683,48 +690,66 @@ CONFIG_NETFILTER_XTABLES=y # # Xtables targets # -CONFIG_NETFILTER_XT_TARGET_LOG=m +# CONFIG_NETFILTER_XT_TARGET_LOG is not set # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set # CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set # # Xtables matches # +# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set +# CONFIG_NETFILTER_XT_MATCH_STATE is not set # CONFIG_IP_SET is not set # CONFIG_IP_VS is not set # # IP: Netfilter Configuration # -# CONFIG_NF_DEFRAG_IPV4 is not set -CONFIG_IP_NF_IPTABLES=y -CONFIG_IP_NF_FILTER=y -# CONFIG_IP_NF_TARGET_REJECT is not set +CONFIG_NF_DEFRAG_IPV4=m +CONFIG_NF_CONNTRACK_IPV4=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m # CONFIG_IP_NF_TARGET_ULOG is not set +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +# CONFIG_NF_NAT_TFTP is not set +# CONFIG_NF_NAT_AMANDA is not set +# CONFIG_NF_NAT_PPTP is not set +# CONFIG_NF_NAT_H323 is not set +CONFIG_NF_NAT_SIP=m # CONFIG_IP_NF_MANGLE is not set # CONFIG_IP_NF_RAW is not set # # IPv6: Netfilter Configuration # -# CONFIG_NF_DEFRAG_IPV6 is not set -CONFIG_IP6_NF_IPTABLES=y +CONFIG_NF_DEFRAG_IPV6=m +CONFIG_NF_CONNTRACK_IPV6=m +CONFIG_IP6_NF_IPTABLES=m # CONFIG_IP6_NF_MATCH_IPV6HEADER is not set -CONFIG_IP6_NF_FILTER=y -# CONFIG_IP6_NF_TARGET_REJECT is not set +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_REJECT=m # CONFIG_IP6_NF_MANGLE is not set # CONFIG_IP6_NF_RAW is not set +# CONFIG_BRIDGE_NF_EBTABLES is not set # CONFIG_IP_DCCP is not set # CONFIG_IP_SCTP is not set # CONFIG_RDS is not set # CONFIG_TIPC is not set # CONFIG_ATM is not set # CONFIG_L2TP is not set -# CONFIG_BRIDGE is not set +CONFIG_STP=y +CONFIG_BRIDGE=y +CONFIG_BRIDGE_IGMP_SNOOPING=y # CONFIG_NET_DSA is not set CONFIG_VLAN_8021Q=m # CONFIG_VLAN_8021Q_GVRP is not set # CONFIG_DECNET is not set +CONFIG_LLC=y # CONFIG_LLC2 is not set # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -787,7 +812,7 @@ CONFIG_NET_ACT_POLICE=y CONFIG_NET_ACT_GACT=y CONFIG_GACT_PROB=y CONFIG_NET_ACT_MIRRED=y -CONFIG_NET_ACT_IPT=y +CONFIG_NET_ACT_IPT=m CONFIG_NET_ACT_NAT=y CONFIG_NET_ACT_PEDIT=y # CONFIG_NET_ACT_SIMP is not set @@ -2288,6 +2313,8 @@ CONFIG_DVB_STV6110x=m # CONFIG_DVB_DRXK=m CONFIG_DVB_TDA18271C2DD=m +CONFIG_DVB_STV0367DD=m +CONFIG_DVB_TDA18212DD=m # # DVB-S (satellite) frontends diff --git a/projects/Virtual/linux/linux.x86_64.conf b/projects/Virtual/linux/linux.x86_64.conf index 5442ac38bb..d5ad20c519 100644 --- a/projects/Virtual/linux/linux.x86_64.conf +++ b/projects/Virtual/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.6.8 Kernel Configuration +# Linux/x86_64 3.6.9 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -619,7 +619,14 @@ CONFIG_NETFILTER=y # CONFIG_NETFILTER_NETLINK=y CONFIG_NETFILTER_NETLINK_LOG=y -# CONFIG_NF_CONNTRACK is not set +CONFIG_NF_CONNTRACK=y +# CONFIG_NF_CONNTRACK_PROCFS is not set +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_BROADCAST=m +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CT_NETLINK=y CONFIG_NETFILTER_XTABLES=y # @@ -630,48 +637,66 @@ CONFIG_NETFILTER_XTABLES=y # # Xtables targets # -CONFIG_NETFILTER_XT_TARGET_LOG=m +# CONFIG_NETFILTER_XT_TARGET_LOG is not set # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set # CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set # # Xtables matches # +# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set +# CONFIG_NETFILTER_XT_MATCH_STATE is not set # CONFIG_IP_SET is not set # CONFIG_IP_VS is not set # # IP: Netfilter Configuration # -# CONFIG_NF_DEFRAG_IPV4 is not set -CONFIG_IP_NF_IPTABLES=y -CONFIG_IP_NF_FILTER=y -# CONFIG_IP_NF_TARGET_REJECT is not set +CONFIG_NF_DEFRAG_IPV4=m +CONFIG_NF_CONNTRACK_IPV4=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m # CONFIG_IP_NF_TARGET_ULOG is not set +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +# CONFIG_NF_NAT_TFTP is not set +# CONFIG_NF_NAT_AMANDA is not set +# CONFIG_NF_NAT_PPTP is not set +# CONFIG_NF_NAT_H323 is not set +CONFIG_NF_NAT_SIP=m # CONFIG_IP_NF_MANGLE is not set # CONFIG_IP_NF_RAW is not set # # IPv6: Netfilter Configuration # -# CONFIG_NF_DEFRAG_IPV6 is not set -CONFIG_IP6_NF_IPTABLES=y +CONFIG_NF_DEFRAG_IPV6=m +CONFIG_NF_CONNTRACK_IPV6=m +CONFIG_IP6_NF_IPTABLES=m # CONFIG_IP6_NF_MATCH_IPV6HEADER is not set -CONFIG_IP6_NF_FILTER=y -# CONFIG_IP6_NF_TARGET_REJECT is not set +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_REJECT=m # CONFIG_IP6_NF_MANGLE is not set # CONFIG_IP6_NF_RAW is not set +# CONFIG_BRIDGE_NF_EBTABLES is not set # CONFIG_IP_DCCP is not set # CONFIG_IP_SCTP is not set # CONFIG_RDS is not set # CONFIG_TIPC is not set # CONFIG_ATM is not set # CONFIG_L2TP is not set -# CONFIG_BRIDGE is not set +CONFIG_STP=y +CONFIG_BRIDGE=y +CONFIG_BRIDGE_IGMP_SNOOPING=y # CONFIG_NET_DSA is not set CONFIG_VLAN_8021Q=m # CONFIG_VLAN_8021Q_GVRP is not set # CONFIG_DECNET is not set +CONFIG_LLC=y # CONFIG_LLC2 is not set # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -734,7 +759,7 @@ CONFIG_NET_ACT_POLICE=y CONFIG_NET_ACT_GACT=y CONFIG_GACT_PROB=y CONFIG_NET_ACT_MIRRED=y -CONFIG_NET_ACT_IPT=y +CONFIG_NET_ACT_IPT=m CONFIG_NET_ACT_NAT=y CONFIG_NET_ACT_PEDIT=y # CONFIG_NET_ACT_SIMP is not set @@ -2223,6 +2248,8 @@ CONFIG_DVB_STV6110x=m # CONFIG_DVB_DRXK=m CONFIG_DVB_TDA18271C2DD=m +CONFIG_DVB_STV0367DD=m +CONFIG_DVB_TDA18212DD=m # # DVB-S (satellite) frontends