From 08440d4030d660e40024eb2551c0c250fe5f06f1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pali=20Roh=C3=A1r?= Date: Wed, 12 Sep 2012 13:17:41 +0200 Subject: [PATCH] Enable more netfilter modules --- .../debian/patches/rx51_defconfig.diff | 143 +++++++++++--------- 1 file changed, 81 insertions(+), 62 deletions(-) diff --git a/kernel-power-2.6.28/debian/patches/rx51_defconfig.diff b/kernel-power-2.6.28/debian/patches/rx51_defconfig.diff index 9c78d5a..856b828 100644 --- a/kernel-power-2.6.28/debian/patches/rx51_defconfig.diff +++ b/kernel-power-2.6.28/debian/patches/rx51_defconfig.diff @@ -1,5 +1,5 @@ ---- kernel-power-2.6.28/arch/arm/configs/rx51_defconfig 2012-01-07 10:28:59.445346942 +0100 -+++ kernel-power-2.6.28/arch/arm/configs/rx51_defconfig 2012-01-07 10:30:09.121345857 +0100 +--- kernel-power/arch/arm/configs/rx51_defconfig.orig 2012-09-12 13:07:32.411477937 +0200 ++++ kernel-power/arch/arm/configs/rx51_defconfig 2012-09-12 13:15:10.371462598 +0200 @@ -36,17 +36,21 @@ CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 @@ -203,53 +203,72 @@ CONFIG_NETFILTER_XTABLES=m -# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set -# CONFIG_NETFILTER_XT_TARGET_MARK is not set +-# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set +-# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set +-# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set +-# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set +-# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set +-# CONFIG_NETFILTER_XT_MATCH_DCCP is not set +-# CONFIG_NETFILTER_XT_MATCH_DSCP is not set +-# CONFIG_NETFILTER_XT_MATCH_ESP is not set +-# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set +-# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set +-# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set +-# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set +-# CONFIG_NETFILTER_XT_MATCH_MAC is not set +-# CONFIG_NETFILTER_XT_MATCH_MARK is not set +-# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set +-# CONFIG_NETFILTER_XT_MATCH_OWNER is not set +-# CONFIG_NETFILTER_XT_MATCH_POLICY is not set +-# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set +-# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set +-# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set +-# CONFIG_NETFILTER_XT_MATCH_REALM is not set +-# CONFIG_NETFILTER_XT_MATCH_RECENT is not set +-# CONFIG_NETFILTER_XT_MATCH_SCTP is not set +-# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set +-# CONFIG_NETFILTER_XT_MATCH_STRING is not set +-# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set +-# CONFIG_NETFILTER_XT_MATCH_TIME is not set +-# CONFIG_NETFILTER_XT_MATCH_U32 is not set +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m +CONFIG_NETFILTER_XT_TARGET_CONNMARK=m -+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set ++CONFIG_NETFILTER_XT_TARGET_DSCP=m +CONFIG_NETFILTER_XT_TARGET_MARK=m - # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set - # CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set - # CONFIG_NETFILTER_XT_TARGET_RATEEST is not set --# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set ++CONFIG_NETFILTER_XT_TARGET_NFLOG=m ++CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m ++CONFIG_NETFILTER_XT_TARGET_RATEEST=m +CONFIG_NETFILTER_XT_TARGET_TCPMSS=m -+# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set - # CONFIG_NETFILTER_XT_MATCH_COMMENT is not set -+# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set ++CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=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_DCCP is not set - # CONFIG_NETFILTER_XT_MATCH_DSCP is not set - # CONFIG_NETFILTER_XT_MATCH_ESP is not set - # CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set --# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set ++CONFIG_NETFILTER_XT_MATCH_DCCP=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_IPRANGE=m - # CONFIG_NETFILTER_XT_MATCH_LENGTH is not set --# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set --# CONFIG_NETFILTER_XT_MATCH_MAC is not set ++CONFIG_NETFILTER_XT_MATCH_LENGTH=m +CONFIG_NETFILTER_XT_MATCH_LIMIT=m +CONFIG_NETFILTER_XT_MATCH_MAC=m - # CONFIG_NETFILTER_XT_MATCH_MARK is not set --# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set --# CONFIG_NETFILTER_XT_MATCH_OWNER is not set --# CONFIG_NETFILTER_XT_MATCH_POLICY is not set ++CONFIG_NETFILTER_XT_MATCH_MARK=m +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m +CONFIG_NETFILTER_XT_MATCH_OWNER=m +CONFIG_NETFILTER_XT_MATCH_POLICY=m - # CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set - # CONFIG_NETFILTER_XT_MATCH_QUOTA is not set - # CONFIG_NETFILTER_XT_MATCH_RATEEST is not set - # CONFIG_NETFILTER_XT_MATCH_REALM is not set - # CONFIG_NETFILTER_XT_MATCH_RECENT is not set - # CONFIG_NETFILTER_XT_MATCH_SCTP is not set ++CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m ++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_SCTP=m +CONFIG_NETFILTER_XT_MATCH_STATE=m - # CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set - # CONFIG_NETFILTER_XT_MATCH_STRING is not set --# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set ++CONFIG_NETFILTER_XT_MATCH_STATISTIC=m ++CONFIG_NETFILTER_XT_MATCH_STRING=m +CONFIG_NETFILTER_XT_MATCH_TCPMSS=m - # CONFIG_NETFILTER_XT_MATCH_TIME is not set --# CONFIG_NETFILTER_XT_MATCH_U32 is not set ++CONFIG_NETFILTER_XT_MATCH_TIME=m +CONFIG_NETFILTER_XT_MATCH_U32=m # CONFIG_IP_VS is not set @@ -283,8 +302,8 @@ +CONFIG_NF_NAT_PROTO_GRE=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_TFTP=m ++CONFIG_NF_NAT_AMANDA=m +CONFIG_NF_NAT_PPTP=m +CONFIG_NF_NAT_H323=m +CONFIG_NF_NAT_SIP=m @@ -436,7 +455,7 @@ # CONFIG_BLK_DEV_UB is not set CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 -@@ -865,8 +865,8 @@ +@@ -710,8 +863,8 @@ CONFIG_BLK_DEV_SD=m # CONFIG_CHR_DEV_ST is not set # CONFIG_CHR_DEV_OSST is not set @@ -551,7 +570,7 @@ CONFIG_HWMON=y # CONFIG_HWMON_VID is not set # CONFIG_SENSORS_AD7414 is not set -@@ -1218,8 +1421,31 @@ +@@ -1218,8 +1422,31 @@ CONFIG_VIDEO_SMIAREGS=m # CONFIG_SOC_CAMERA is not set CONFIG_V4L_USB_DRIVERS=y @@ -585,7 +604,7 @@ # CONFIG_VIDEO_PVRUSB2 is not set # CONFIG_VIDEO_EM28XX is not set # CONFIG_VIDEO_USBVISION is not set -@@ -1250,9 +1476,10 @@ +@@ -1250,9 +1477,10 @@ # Graphics support # CONFIG_PVR=m @@ -599,7 +618,7 @@ # CONFIG_VGASTATE is not set # CONFIG_VIDEO_OUTPUT_CONTROL is not set CONFIG_FB=y -@@ -1324,7 +1551,12 @@ +@@ -1324,7 +1552,12 @@ # # CONFIG_VGA_CONSOLE is not set CONFIG_DUMMY_CONSOLE=y @@ -613,7 +632,7 @@ # CONFIG_LOGO is not set CONFIG_SOUND=y # CONFIG_SOUND_OSS_CORE is not set -@@ -1347,7 +1579,12 @@ +@@ -1347,7 +1580,12 @@ # CONFIG_SND_MPU401 is not set CONFIG_SND_ARM=y CONFIG_SND_SPI=y @@ -627,7 +646,7 @@ CONFIG_SND_SOC=y CONFIG_SND_OMAP_SOC=y CONFIG_SND_OMAP_SOC_MCBSP=y -@@ -1402,8 +1639,8 @@ +@@ -1402,8 +1640,8 @@ CONFIG_USB_ARCH_HAS_OHCI=y CONFIG_USB_ARCH_HAS_EHCI=y CONFIG_USB=y @@ -638,7 +657,7 @@ # # Miscellaneous USB options -@@ -1413,8 +1650,8 @@ +@@ -1413,8 +1651,8 @@ CONFIG_USB_DYNAMIC_MINORS=y CONFIG_USB_SUSPEND=y CONFIG_USB_OTG=y @@ -649,7 +668,7 @@ CONFIG_USB_MON=y # CONFIG_USB_WUSB is not set # CONFIG_USB_WUSB_CBAF is not set -@@ -1449,10 +1686,10 @@ +@@ -1449,10 +1687,10 @@ # # USB Device Class drivers # @@ -664,7 +683,7 @@ # # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; -@@ -1486,7 +1723,49 @@ +@@ -1486,7 +1724,49 @@ # # USB port drivers # @@ -715,7 +734,7 @@ # # USB Miscellaneous drivers -@@ -1534,14 +1813,15 @@ +@@ -1534,14 +1814,15 @@ # CONFIG_USB_GADGET_DUMMY_HCD is not set CONFIG_USB_GADGET_DUALSPEED=y CONFIG_USB_ZERO=m @@ -735,7 +754,7 @@ # CONFIG_USB_CDC_COMPOSITE is not set CONFIG_USB_G_NOKIA=m CONFIG_USB_G_SOFTUPD=m -@@ -1550,9 +1830,12 @@ +@@ -1550,9 +1831,12 @@ # OTG and related infrastructure # CONFIG_USB_OTG_UTILS=y @@ -749,7 +768,7 @@ CONFIG_MMC=m # CONFIG_MMC_DEBUG is not set CONFIG_MMC_UNSAFE_RESUME=y -@@ -1595,6 +1878,7 @@ +@@ -1595,6 +1879,7 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=y # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set @@ -757,7 +776,7 @@ CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=m -@@ -1680,14 +1964,28 @@ +@@ -1680,14 +1965,28 @@ # CONFIG_EXT2_FS_XIP is not set CONFIG_EXT3_FS=m # CONFIG_EXT3_FS_XATTR is not set @@ -789,7 +808,7 @@ # CONFIG_OCFS2_FS is not set CONFIG_DNOTIFY=y CONFIG_INOTIFY=y -@@ -1699,14 +1997,17 @@ +@@ -1699,14 +1998,17 @@ CONFIG_QFMT_V2=y CONFIG_QUOTACTL=y # CONFIG_AUTOFS_FS is not set @@ -810,7 +829,7 @@ # # DOS/FAT/NT Filesystems -@@ -1716,7 +2017,9 @@ +@@ -1716,7 +2018,9 @@ CONFIG_VFAT_FS=m CONFIG_FAT_DEFAULT_CODEPAGE=437 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" @@ -821,7 +840,7 @@ # # Pseudo filesystems -@@ -1731,12 +2034,19 @@ +@@ -1731,12 +2035,19 @@ # CONFIG_CONFIGFS_FS is not set # @@ -842,7 +861,7 @@ # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set -@@ -1748,6 +2058,9 @@ +@@ -1748,6 +2059,9 @@ CONFIG_UBIFS_FS_ZLIB=y # CONFIG_UBIFS_FS_DEBUG is not set CONFIG_CRAMFS=y @@ -852,7 +871,7 @@ # CONFIG_VXFS_FS is not set # CONFIG_MINIX_FS is not set # CONFIG_OMFS_FS is not set -@@ -1771,7 +2084,12 @@ +@@ -1771,7 +2085,12 @@ CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_RPCSEC_GSS_SPKM3 is not set # CONFIG_SMB_FS is not set @@ -866,7 +885,7 @@ # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set -@@ -1795,14 +2113,14 @@ +@@ -1795,14 +2114,14 @@ # CONFIG_ULTRIX_PARTITION is not set # CONFIG_SUN_PARTITION is not set # CONFIG_KARMA_PARTITION is not set @@ -883,7 +902,7 @@ # CONFIG_NLS_CODEPAGE_852 is not set # CONFIG_NLS_CODEPAGE_855 is not set # CONFIG_NLS_CODEPAGE_857 is not set -@@ -1833,10 +2151,10 @@ +@@ -1833,10 +2152,10 @@ # CONFIG_NLS_ISO8859_9 is not set # CONFIG_NLS_ISO8859_13 is not set # CONFIG_NLS_ISO8859_14 is not set @@ -896,7 +915,7 @@ # CONFIG_DLM is not set # -@@ -1929,17 +2247,20 @@ +@@ -1929,17 +2248,20 @@ # CONFIG_CRYPTO_FIPS is not set CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_ALGAPI2=y @@ -919,7 +938,7 @@ # CONFIG_CRYPTO_TEST is not set # -@@ -1947,7 +2268,7 @@ +@@ -1947,7 +2269,7 @@ # # CONFIG_CRYPTO_CCM is not set # CONFIG_CRYPTO_GCM is not set @@ -928,7 +947,7 @@ # # Block modes -@@ -1958,12 +2279,12 @@ +@@ -1958,12 +2280,12 @@ CONFIG_CRYPTO_ECB=y # CONFIG_CRYPTO_LRW is not set CONFIG_CRYPTO_PCBC=m @@ -943,7 +962,7 @@ # CONFIG_CRYPTO_XCBC is not set # -@@ -1977,9 +2298,9 @@ +@@ -1977,9 +2299,9 @@ # CONFIG_CRYPTO_RMD160 is not set # CONFIG_CRYPTO_RMD256 is not set # CONFIG_CRYPTO_RMD320 is not set @@ -956,7 +975,7 @@ # CONFIG_CRYPTO_TGR192 is not set # CONFIG_CRYPTO_WP512 is not set -@@ -1989,7 +2310,7 @@ +@@ -1989,7 +2311,7 @@ CONFIG_CRYPTO_AES=y # CONFIG_CRYPTO_ANUBIS is not set CONFIG_CRYPTO_ARC4=y @@ -965,7 +984,7 @@ # CONFIG_CRYPTO_CAMELLIA is not set # CONFIG_CRYPTO_CAST5 is not set # CONFIG_CRYPTO_CAST6 is not set -@@ -2000,7 +2321,8 @@ +@@ -2000,7 +2322,8 @@ # CONFIG_CRYPTO_SEED is not set # CONFIG_CRYPTO_SERPENT is not set # CONFIG_CRYPTO_TEA is not set @@ -975,7 +994,7 @@ # # Compression -@@ -2021,7 +2343,7 @@ +@@ -2021,7 +2344,7 @@ CONFIG_CRC_CCITT=y CONFIG_CRC16=y # CONFIG_CRC_T10DIF is not set -- 1.7.9.5