sync the x86-2.6 config with the brcm-2.6 one

[openwrt.git] / package / Config.in

diff --git a/package/Config.in b/package/Config.in
index 995c52d..3f4b994 100644 (file)
--- a/package/Config.in
+++ b/package/Config.in
@@ -9,14 +9,18 @@ source "package/dnsmasq/Config.in"
 source "package/ipkg/Config.in"
 source "package/iptables/Config.in"
 source "package/mtd/Config.in"
 source "package/ipkg/Config.in"
 source "package/iptables/Config.in"
 source "package/mtd/Config.in"

+source "package/nvram/Config.in"

 
 comment "Applications"
 
 comment "Applications"

+source "package/deco/Config.in"
+source "package/gpsd/Config.in"

 source "package/haserl/Config.in"
 source "package/lcd4linux/Config.in"
 source "package/less/Config.in"
 source "package/lua/Config.in"
 source "package/microperl/Config.in"
 source "package/monit/Config.in"
 source "package/haserl/Config.in"
 source "package/lcd4linux/Config.in"
 source "package/less/Config.in"
 source "package/lua/Config.in"
 source "package/microperl/Config.in"
 source "package/monit/Config.in"

+source "package/nano/Config.in"

 source "package/osiris/Config.in"
 source "package/php4/Config.in"
 source "package/php5/Config.in"
 source "package/osiris/Config.in"
 source "package/php4/Config.in"
 source "package/php5/Config.in"


@@ -33,7 +37,9 @@ endmenu
 source "package/screen/Config.in"
 
 comment "Networking"
 source "package/screen/Config.in"
 
 comment "Networking"

+source "package/6tunnel/Config.in"

 source "package/aiccu/Config.in"
 source "package/aiccu/Config.in"

+source "package/aircrack/Config.in"

 source "package/amwall/Config.in"
 source "package/arpd/Config.in"
 source "package/arptables/Config.in"
 source "package/amwall/Config.in"
 source "package/arpd/Config.in"
 source "package/arptables/Config.in"


@@ -62,7 +68,9 @@ source "package/howl/Config.in"
 source "package/hostapd/Config.in"
 source "package/htpdate/Config.in"
 source "package/iproute2/Config.in"
 source "package/hostapd/Config.in"
 source "package/htpdate/Config.in"
 source "package/iproute2/Config.in"

+source "package/iperf/Config.in"

 source "package/ipset/Config.in"
 source "package/ipset/Config.in"

+source "package/iptraf/Config.in"

 source "package/kismet/Config.in"
 source "package/l2tpd/Config.in"
 source "package/lighttpd/Config.in"
 source "package/kismet/Config.in"
 source "package/l2tpd/Config.in"
 source "package/lighttpd/Config.in"


@@ -70,6 +78,8 @@ source "package/linux-atm/Config.in"
 source "package/maradns/Config.in"
 source "package/mini_httpd/Config.in"
 source "package/mini_sendmail/Config.in"
 source "package/maradns/Config.in"
 source "package/mini_httpd/Config.in"
 source "package/mini_sendmail/Config.in"

+source "package/miredo/Config.in"
+source "package/mtr/Config.in"

 source "package/ndisc/Config.in"
 source "package/net-snmp/Config.in"
 source "package/netstat-nat/Config.in"
 source "package/ndisc/Config.in"
 source "package/net-snmp/Config.in"
 source "package/netstat-nat/Config.in"


@@ -82,6 +92,7 @@ source "package/openntpd/Config.in"
 source "package/openssh/Config.in"
 source "package/openswan/Config.in"
 source "package/openvpn/Config.in"
 source "package/openssh/Config.in"
 source "package/openswan/Config.in"
 source "package/openvpn/Config.in"

+source "package/p910nd/Config.in"

 source "package/parprouted/Config.in"
 source "package/pmacct/Config.in"
 source "package/portmap/Config.in"
 source "package/parprouted/Config.in"
 source "package/pmacct/Config.in"
 source "package/portmap/Config.in"


@@ -92,15 +103,21 @@ source "package/pptp/Config.in"
 source "package/pptpd/Config.in"
 source "package/quagga/Config.in"
 source "package/radvd/Config.in"
 source "package/pptpd/Config.in"
 source "package/quagga/Config.in"
 source "package/radvd/Config.in"

+source "package/rarpd/Config.in"
+source "package/reaim/Config.in"

 source "package/robocfg/Config.in"
 source "package/robocfg/Config.in"

+source "package/rrs/Config.in"

 source "package/rsync/Config.in"
 source "package/samba/Config.in"
 source "package/rsync/Config.in"
 source "package/samba/Config.in"

+source "package/scdp/Config.in"

 source "package/ser/Config.in"
 source "package/shat/Config.in"
 source "package/siproxd/Config.in"
 source "package/sipsak/Config.in"
 source "package/snort/Config.in"
 source "package/ser/Config.in"
 source "package/shat/Config.in"
 source "package/siproxd/Config.in"
 source "package/sipsak/Config.in"
 source "package/snort/Config.in"

+source "package/socat/Config.in"

 source "package/ssmtp/Config.in"
 source "package/ssmtp/Config.in"

+source "package/srelay/Config.in"

 source "package/tcpdump/Config.in"
 source "package/tinc/Config.in"
 source "package/tor/Config.in"
 source "package/tcpdump/Config.in"
 source "package/tinc/Config.in"
 source "package/tor/Config.in"


@@ -109,20 +126,24 @@ source "package/ulogd/Config.in"
 source "package/updatedd/Config.in"
 source "package/vsftpd/Config.in"
 source "package/vtun/Config.in"
 source "package/updatedd/Config.in"
 source "package/vsftpd/Config.in"
 source "package/vtun/Config.in"

+source "package/wificonf/Config.in"
+source "package/wifidog/Config.in"

 source "package/wireless-tools/Config.in"
 source "package/wireless-tools/Config.in"

+source "package/wiviz/Config.in"

 source "package/wol/Config.in"
 source "package/wol/Config.in"

+source "package/wondershaper/Config.in"

 source "package/wpa_supplicant/Config.in"
 source "package/wput/Config.in"
 source "package/wpa_supplicant/Config.in"
 source "package/wput/Config.in"

+source "package/wrt-radauth/Config.in"

 source "package/xinetd/Config.in"
 source "package/xinetd/Config.in"

-source "package/wificonf/Config.in"
-source "package/wiviz/Config.in"
-source "package/wondershaper/Config.in"
+source "package/xsupplicant/Config.in"

 
 comment "Libraries"
 source "package/cgilib/Config.in"
 source "package/glib/Config.in"
 source "package/id3lib/Config.in"
 source "package/libamsel/Config.in"
 
 comment "Libraries"
 source "package/cgilib/Config.in"
 source "package/glib/Config.in"
 source "package/id3lib/Config.in"
 source "package/libamsel/Config.in"

+source "package/libao/Config.in"

 source "package/libart/Config.in"
 source "package/curl/Config.in" # libcurl
 source "package/libdaemon/Config.in"
 source "package/libart/Config.in"
 source "package/curl/Config.in" # libcurl
 source "package/libdaemon/Config.in"


@@ -131,6 +152,7 @@ source "package/libdnet/Config.in"
 source "package/libelf/Config.in"
 source "package/libevent/Config.in"
 source "package/expat/Config.in" # libexpat
 source "package/libelf/Config.in"
 source "package/libevent/Config.in"
 source "package/expat/Config.in" # libexpat

+source "package/flac/Config.in"  # libflac

 source "package/freetype/Config.in"  # libfreetype
 source "package/libgcrypt/Config.in"
 source "package/libgd/Config.in"
 source "package/freetype/Config.in"  # libfreetype
 source "package/libgcrypt/Config.in"
 source "package/libgd/Config.in"


@@ -139,13 +161,16 @@ source "package/gmp/Config.in"  # libgmp
 source "package/gnutls/Config.in" ## libgnutls
 source "package/libgpg-error/Config.in"
 source "package/libid3tag/Config.in"
 source "package/gnutls/Config.in" ## libgnutls
 source "package/libgpg-error/Config.in"
 source "package/libid3tag/Config.in"

+source "package/jpeg/Config.in"  # libjpeg

 source "package/libtool/Config.in"  # libltdl
 source "package/lzo/Config.in"  # liblzo
 source "package/libtool/Config.in"  # libltdl
 source "package/lzo/Config.in"  # liblzo

+source "package/libmad/Config.in"

 source "package/matrixssl/Config.in"  # libmatrixssl
 source "package/mysql/Config.in"  # limysqlclient
 source "package/ncurses/Config.in"  # libncurses
 source "package/libnet/Config.in"
 source "package/libnids/Config.in"
 source "package/matrixssl/Config.in"  # libmatrixssl
 source "package/mysql/Config.in"  # limysqlclient
 source "package/ncurses/Config.in"  # libncurses
 source "package/libnet/Config.in"
 source "package/libnids/Config.in"

+source "package/libogg/Config.in"

 source "package/opencdk/Config.in"  # libopencdk
 source "package/openldap/Config.in"  # libopenldap
 source "package/openssl/Config.in"  # libopenssl
 source "package/opencdk/Config.in"  # libopencdk
 source "package/openldap/Config.in"  # libopenldap
 source "package/openssl/Config.in"  # libopenssl


@@ -164,6 +189,8 @@ source "package/sqlite2/Config.in" # libsqlite2
 source "package/libtasn1/Config.in"
 source "package/libupnp/Config.in"
 source "package/libusb/Config.in"
 source "package/libtasn1/Config.in"
 source "package/libupnp/Config.in"
 source "package/libusb/Config.in"

+source "package/libvorbis/Config.in"
+source "package/libvorbisidec/Config.in"

 source "package/libxml2/Config.in"
 source "package/libxslt/Config.in"
 source "package/uclibc++/Config.in"
 source "package/libxml2/Config.in"
 source "package/libxslt/Config.in"
 source "package/uclibc++/Config.in"


@@ -172,8 +199,10 @@ source "package/irssi/Config.in"
 
 comment "Multimedia ---"
 source "package/gmediaserver/Config.in"
 
 comment "Multimedia ---"
 source "package/gmediaserver/Config.in"

-source "package/mt-daapd/Config.in"
+source "package/icecast/Config.in"

 source "package/mpd/Config.in"
 source "package/mpd/Config.in"

+source "package/mt-daapd/Config.in"
+source "package/palantir/Config.in"

 source "package/setpwc/Config.in"
 
 comment "Serial communications & terminal emulation ---"
 source "package/setpwc/Config.in"
 
 comment "Serial communications & terminal emulation ---"


@@ -187,14 +216,14 @@ source "package/madwifi-tools/Config.in"
 source "package/usbutils/Config.in"  # lsusb
 source "package/strace/Config.in"
 
 source "package/usbutils/Config.in"  # lsusb
 source "package/strace/Config.in"
 

-# what are we going to do with both of you

 comment "FileSystems related ---"
 source "package/dosfstools/Config.in"
 source "package/e2fsprogs/Config.in"
 source "package/fuse/Config.in"
 source "package/shfs/Config.in"
 comment "FileSystems related ---"
 source "package/dosfstools/Config.in"
 source "package/e2fsprogs/Config.in"
 source "package/fuse/Config.in"
 source "package/shfs/Config.in"

+source "package/util-linux/Config.in"

 
 

-comment "Bluetooth related"
+comment "Bluetooth related ---"

 source "package/bluez-libs/Config.in"
 source "package/bluez-utils/Config.in"
 
 source "package/bluez-libs/Config.in"
 source "package/bluez-utils/Config.in"