diff --git a/debian/changelog b/debian/changelog index 04f11eab8..edaa07297 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ linux-2.6 (2.6.36-1~experimental.2) UNRELEASED; urgency=low [ Ben Hutchings ] * Enable PM_ADVANCED_DEBUG (Closes: #603254) + * Disable X.25 protocol and related drivers. This 10 year old experiment + has stalled and is a source of security bugs. -- maximilian attems Wed, 31 Oct 2010 13:23:11 +0200 diff --git a/debian/config/alpha/config b/debian/config/alpha/config index 0f9e1bdaa..8fae88fb5 100644 --- a/debian/config/alpha/config +++ b/debian/config/alpha/config @@ -726,9 +726,6 @@ CONFIG_DLCI=m CONFIG_DLCI_MAX=8 CONFIG_SDLA=m CONFIG_CYCLADES_SYNC=m -CONFIG_CYCLOMX_X25=y -CONFIG_LAPBETHER=m -CONFIG_X25_ASY=m ## ## file: drivers/net/wireless/Kconfig @@ -1088,11 +1085,6 @@ CONFIG_LAPB=m ## CONFIG_WAN_ROUTER=m -## -## file: net/x25/Kconfig -## -CONFIG_X25=m - ## ## file: sound/drivers/Kconfig ## diff --git a/debian/config/armel/config.iop32x b/debian/config/armel/config.iop32x index dbf3a21a1..5c47a8ae6 100644 --- a/debian/config/armel/config.iop32x +++ b/debian/config/armel/config.iop32x @@ -696,11 +696,6 @@ CONFIG_IPX_INTERN=y ## CONFIG_WIRELESS_EXT=y -## -## file: net/x25/Kconfig -## -# CONFIG_X25 is not set - ## ## file: sound/drivers/Kconfig ## diff --git a/debian/config/armel/config.ixp4xx b/debian/config/armel/config.ixp4xx index 624028e41..6dd263b9d 100644 --- a/debian/config/armel/config.ixp4xx +++ b/debian/config/armel/config.ixp4xx @@ -772,11 +772,6 @@ CONFIG_LAPB=m ## CONFIG_WAN_ROUTER=m -## -## file: net/x25/Kconfig -## -CONFIG_X25=m - ## ## file: sound/drivers/Kconfig ## diff --git a/debian/config/armel/config.kirkwood b/debian/config/armel/config.kirkwood index 4a87f8454..fceec7e9d 100644 --- a/debian/config/armel/config.kirkwood +++ b/debian/config/armel/config.kirkwood @@ -623,11 +623,6 @@ CONFIG_ROSE=m ## CONFIG_WAN_ROUTER=m -## -## file: net/x25/Kconfig -## -CONFIG_X25=m - ## ### file: drivers/staging/xgifb/Kconfig ## diff --git a/debian/config/armel/config.orion5x b/debian/config/armel/config.orion5x index 7b21f1f51..492b9acac 100644 --- a/debian/config/armel/config.orion5x +++ b/debian/config/armel/config.orion5x @@ -585,8 +585,3 @@ CONFIG_ROSE=m ## CONFIG_WAN_ROUTER=m -## -## file: net/x25/Kconfig -## -CONFIG_X25=m - diff --git a/debian/config/armel/config.versatile b/debian/config/armel/config.versatile index 96011bc3b..4bc0be90b 100644 --- a/debian/config/armel/config.versatile +++ b/debian/config/armel/config.versatile @@ -456,8 +456,3 @@ CONFIG_IPX_INTERN=y ## # CONFIG_WAN_ROUTER is not set -## -## file: net/x25/Kconfig -## -# CONFIG_X25 is not set - diff --git a/debian/config/config b/debian/config/config index 1e8b59376..d9d6510ec 100644 --- a/debian/config/config +++ b/debian/config/config @@ -1803,9 +1803,10 @@ CONFIG_HDLC_RAW_ETH=m CONFIG_HDLC_CISCO=m CONFIG_HDLC_FR=m CONFIG_HDLC_PPP=m -CONFIG_HDLC_X25=m +# CONFIG_HDLC_X25 is not set # CONFIG_PC300TOO is not set CONFIG_WAN_ROUTER_DRIVERS=m +# CONFIG_CYCLOMX_X25 is not set ## ## file: drivers/net/wimax/i2400m/Kconfig @@ -4183,6 +4184,11 @@ CONFIG_WIRELESS_EXT=y CONFIG_LIB80211=m # CONFIG_LIB80211_DEBUG is not set +## +## file: net/x25/Kconfig +## +# CONFIG_X25 is not set + ## ## file: net/xfrm/Kconfig ## diff --git a/debian/config/hppa/config b/debian/config/hppa/config index 15323f14d..b022a5406 100644 --- a/debian/config/hppa/config +++ b/debian/config/hppa/config @@ -661,11 +661,6 @@ CONFIG_IP_PNP_BOOTP=y ## # CONFIG_WAN_ROUTER is not set -## -## file: net/x25/Kconfig -## -# CONFIG_X25 is not set - ## ## file: sound/drivers/Kconfig ## diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index dcdaec7e7..48c9c83dc 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -906,9 +906,6 @@ CONFIG_DSCC4_PCI_RST=y CONFIG_DLCI=m CONFIG_DLCI_MAX=8 CONFIG_CYCLADES_SYNC=m -CONFIG_CYCLOMX_X25=y -CONFIG_LAPBETHER=m -CONFIG_X25_ASY=m CONFIG_SBNI=m # CONFIG_SBNI_MULTILINE is not set @@ -1458,11 +1455,6 @@ CONFIG_LAPB=m ## CONFIG_WAN_ROUTER=m -## -## file: net/x25/Kconfig -## -CONFIG_X25=m - ## ## file: sound/drivers/Kconfig ## diff --git a/debian/config/m68k/config b/debian/config/m68k/config index 338cf8645..150d7caea 100644 --- a/debian/config/m68k/config +++ b/debian/config/m68k/config @@ -294,11 +294,6 @@ CONFIG_SYSFS=y ## # CONFIG_WAN_ROUTER is not set -## -## file: net/x25/Kconfig -## -# CONFIG_X25 is not set - ## ## file: net/xfrm/Kconfig ## diff --git a/debian/config/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta index 6ba75e1e5..d1446c055 100644 --- a/debian/config/mips/config.4kc-malta +++ b/debian/config/mips/config.4kc-malta @@ -717,9 +717,6 @@ CONFIG_DLCI=m CONFIG_DLCI_MAX=8 CONFIG_WAN_ROUTER_DRIVERS=m CONFIG_CYCLADES_SYNC=m -CONFIG_CYCLOMX_X25=y -CONFIG_LAPBETHER=m -CONFIG_X25_ASY=m ## ## file: drivers/net/wireless/Kconfig diff --git a/debian/config/mips/config.5kc-malta b/debian/config/mips/config.5kc-malta index 152326829..3fa5c9799 100644 --- a/debian/config/mips/config.5kc-malta +++ b/debian/config/mips/config.5kc-malta @@ -744,7 +744,6 @@ CONFIG_HDLC_RAW_ETH=m CONFIG_HDLC_CISCO=m CONFIG_HDLC_FR=m CONFIG_HDLC_PPP=m -CONFIG_HDLC_X25=m CONFIG_PCI200SYN=m CONFIG_WANXL=m CONFIG_PC300=m @@ -758,9 +757,6 @@ CONFIG_DLCI=m CONFIG_DLCI_MAX=8 CONFIG_WAN_ROUTER_DRIVERS=m CONFIG_CYCLADES_SYNC=m -CONFIG_CYCLOMX_X25=y -CONFIG_LAPBETHER=m -CONFIG_X25_ASY=m ## ## file: drivers/net/wireless/Kconfig diff --git a/debian/config/mips/config.sb1-bcm91250a b/debian/config/mips/config.sb1-bcm91250a index a578f0a46..e4bf5d94d 100644 --- a/debian/config/mips/config.sb1-bcm91250a +++ b/debian/config/mips/config.sb1-bcm91250a @@ -766,11 +766,6 @@ CONFIG_IP_PNP_BOOTP=y ## # CONFIG_WAN_ROUTER is not set -## -## file: net/x25/Kconfig -## -# CONFIG_X25 is not set - ## ## file: unknown ## diff --git a/debian/config/mips/config.sb1a-bcm91480b b/debian/config/mips/config.sb1a-bcm91480b index 85219f71a..a71750e39 100644 --- a/debian/config/mips/config.sb1a-bcm91480b +++ b/debian/config/mips/config.sb1a-bcm91480b @@ -788,11 +788,6 @@ CONFIG_IP_PNP_BOOTP=y ## # CONFIG_WAN_ROUTER is not set -## -## file: net/x25/Kconfig -## -# CONFIG_X25 is not set - ## ## file: unknown ## diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config index 7fe2d7d7b..d120e6961 100644 --- a/debian/config/powerpc/config +++ b/debian/config/powerpc/config @@ -586,9 +586,6 @@ CONFIG_DSCC4=m CONFIG_DLCI=m CONFIG_DLCI_MAX=8 CONFIG_CYCLADES_SYNC=m -CONFIG_CYCLOMX_X25=y -CONFIG_LAPBETHER=m -CONFIG_X25_ASY=m ## ## file: drivers/net/wireless/Kconfig @@ -905,11 +902,6 @@ CONFIG_LAPB=m ## CONFIG_WAN_ROUTER=m -## -## file: net/x25/Kconfig -## -CONFIG_X25=m - ## ## file: sound/aoa/Kconfig ## diff --git a/debian/config/s390/config b/debian/config/s390/config index ec0bcb890..af241c844 100644 --- a/debian/config/s390/config +++ b/debian/config/s390/config @@ -199,8 +199,3 @@ CONFIG_AFIUCV=m ## # CONFIG_WAN_ROUTER is not set -## -## file: net/x25/Kconfig -## -# CONFIG_X25 is not set - diff --git a/debian/config/sparc/config b/debian/config/sparc/config index b81eeef2d..2f732b54e 100644 --- a/debian/config/sparc/config +++ b/debian/config/sparc/config @@ -587,11 +587,6 @@ CONFIG_IPX=m ## # CONFIG_WAN_ROUTER is not set -## -## file: net/x25/Kconfig -## -# CONFIG_X25 is not set - ## ## file: sound/drivers/Kconfig ##