summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-08-20 20:42:19 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2009-08-20 20:42:19 +0200
commitd07acf5eacf62cd8b5495f12e3b37427050270c9 (patch)
treea0f4d7869e37ede1ca386ac428c75bf4b34d80f4 /package
parent70c44baa23fbf86a888f6f37a75bca10a631a01c (diff)
parent4a0a9fe7fee9d7032adc62e244a23d37013816e3 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package')
-rw-r--r--package/Config.in5
-rw-r--r--package/Depends.mk11
-rw-r--r--package/Makefile1
-rw-r--r--package/apr/Config.in4
-rw-r--r--package/asterisk/Config.in20
-rw-r--r--package/asterisk/Makefile13
-rw-r--r--package/atftp/Config.in2
-rw-r--r--package/avahi/Config.in4
-rw-r--r--package/axtls/Config.in2
-rwxr-xr-xpackage/base-files/extra/init1
-rw-r--r--package/bc/Config.in2
-rw-r--r--package/bind/Config.in16
-rw-r--r--package/bogofilter/Config.in8
-rw-r--r--package/busybox/config/networking/Config.in2
-rw-r--r--package/busybox/patches/003-ip-config.patch18
-rw-r--r--package/cfgfs/Config.in3
-rw-r--r--package/cfgfs/Makefile11
-rw-r--r--package/cfgfs/src/fwcf.sh41
-rw-r--r--package/collectd/Config.in8
-rw-r--r--package/curl/Config.in4
-rw-r--r--package/cyrus-sasl/Config.in2
-rw-r--r--package/dhcp/Config.in2
-rw-r--r--package/dropbear/Config.in2
-rw-r--r--package/e2fsprogs/Config.in4
-rw-r--r--package/expat/Config.in2
-rw-r--r--package/faad2/Config.in2
-rw-r--r--package/fetchmail/Config.in4
-rw-r--r--package/flac/Config.in2
-rw-r--r--package/freeradius-client/Config.in2
-rw-r--r--package/freeradius-server/Config.in56
-rw-r--r--package/freetype/Config.in2
-rw-r--r--package/git/Config.in9
-rw-r--r--package/git/Makefile37
-rw-r--r--package/git/patches/patch-Makefile32
-rw-r--r--package/gmp/Config.in2
-rw-r--r--package/gnutls/Config.in10
-rw-r--r--package/gsm/Config.in4
-rw-r--r--package/hostapd/Config.in2
-rw-r--r--package/iptables/Config.in4
-rw-r--r--package/irssi/Config.in4
-rw-r--r--package/jpeg/Config.in2
-rw-r--r--package/kismet/Config.in2
-rw-r--r--package/knock/Config.in2
-rw-r--r--package/libdb/Config.in2
-rw-r--r--package/libshout/Config.in2
-rw-r--r--package/libtirpc/Makefile8
-rw-r--r--package/libtool/Config.in2
-rw-r--r--package/libtorrent/Config.in2
-rw-r--r--package/lighttpd/Config.in66
-rw-r--r--package/lua/Config.in2
-rw-r--r--package/mini_httpd/Config.in2
-rw-r--r--package/miredo/Config.in6
-rw-r--r--package/mksh/Config.in4
-rw-r--r--package/mpd/Config.in30
-rw-r--r--package/mysql/Config.in6
-rw-r--r--package/nano/Config.in4
-rw-r--r--package/ncurses/Config.in2
-rw-r--r--package/ndisc/Config.in10
-rw-r--r--package/olsrd/Config.in16
-rw-r--r--package/opencdk/Config.in2
-rw-r--r--package/opensips/Config.in92
-rw-r--r--package/openssl/Config.in6
-rw-r--r--package/openswan/Config.in20
-rw-r--r--package/openswan/Makefile70
-rw-r--r--package/openswan/patches/patch-Makefile_inc19
-rw-r--r--package/openswan/patches/patch-programs_Makefile_program6
-rw-r--r--package/openswan/patches/patch-programs_ikeping_ikeping_c6
-rw-r--r--package/openvpn/Config.in14
-rw-r--r--package/openvpn/Makefile6
-rw-r--r--package/osiris/Config.in2
-rw-r--r--package/pcre/Config.in2
-rw-r--r--package/php/Config.in28
-rw-r--r--package/pmacct/Config.in2
-rw-r--r--package/popt/Config.in2
-rw-r--r--package/portmap/Config.in2
-rw-r--r--package/postgresql/Config.in2
-rw-r--r--package/ppp/Config.in14
-rw-r--r--package/quagga/Config.in30
-rw-r--r--package/readline/Config.in2
-rw-r--r--package/rp-pppoe/Config.in2
-rw-r--r--package/rrdcollect/Config.in8
-rw-r--r--package/rrs/Config.in2
-rw-r--r--package/samba/Config.in2
-rw-r--r--package/sane-backends/Config.in116
-rw-r--r--package/shorewall-common/Config.in4
-rw-r--r--package/shorewall-shell/Config.in2
-rw-r--r--package/speex/Config.in4
-rw-r--r--package/sqlite/Config.in4
-rw-r--r--package/squid/Config.in34
-rw-r--r--package/subversion/Config.in4
-rw-r--r--package/tcp_wrappers/Config.in2
-rw-r--r--package/tinyproxy/Config.in12
-rw-r--r--package/tntnet/Config.in4
-rw-r--r--package/ulogd/Config.in20
-rw-r--r--package/updatedd/Config.in18
-rw-r--r--package/usbutils/Config.in2
-rw-r--r--package/util-linux-ng/Config.in2
-rw-r--r--package/weechat/Config.in4
-rw-r--r--package/wpa_supplicant/Config.in4
99 files changed, 623 insertions, 484 deletions
diff --git a/package/Config.in b/package/Config.in
index 889f58686..a563b9a75 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -202,7 +202,7 @@ source "package/wput/Config.in"
endmenu
menu "IPv6"
-depends ADK_IPV6
+depends on ADK_IPV6
source "package/6tunnel/Config.in"
source "package/aiccu/Config.in"
source "package/miredo/Config.in"
@@ -246,6 +246,7 @@ menu "Misc"
source "package/cups/Config.in"
source "package/fakeidentd/Config.in"
source "package/gkrellmd/Config.in"
+source "package/git/Config.in"
source "package/net-snmp/Config.in"
source "package/nut/Config.in"
source "package/openldap/Config.in"
@@ -453,7 +454,7 @@ source "package/zlib/Config.in"
endmenu
menu "X"
-depends ADK_X11
+depends on ADK_X11
source "package/xorg-server/Config.in"
source "package/xf86-video-geode/Config.in"
diff --git a/package/Depends.mk b/package/Depends.mk
index 9a45f5823..ef792d9df 100644
--- a/package/Depends.mk
+++ b/package/Depends.mk
@@ -47,6 +47,7 @@ gatling-compile: libowfat-compile libiconv-compile
gcc-compile: gmp-compile mpfr-compile
gdb-compile: ncurses-compile readline-compile
gettext-compile: libiconv-compile libpthread-compile
+git-compile: openssl-compile curl-compile expat-compile
gkrellmd-compile: glib-compile
glib-compile: gettext-compile libiconv-compile
gmediaserver-compile: id3lib-compile libupnp-compile
@@ -245,22 +246,12 @@ apr-compile: libpthread-compile
endif
asterisk-compile: ncurses-compile openssl-compile zlib-compile curl-compile popt-compile
-ifneq ($(ADK_PACKAGE_ASTERISK_CHAN_BLUETOOTH),)
-asterisk-compile: bluez-compile
-endif
ifneq ($(ADK_PACKAGE_ASTERISK_CODEC_SPEEX),)
asterisk-compile: speex-compile
endif
ifneq ($(ADK_PACKAGE_ASTERISK_PGSQL),)
asterisk-compile: postgresql-compile
endif
-ifneq ($(ADK_PACKAGE_ASTERISK_MYSQL),)
-asterisk-compile: mysql-compile
-endif
-ifneq ($(ADK_PACKAGE_ASTERISK_SQLITE),)
-asterisk-compile: sqlite-compile
-endif
-
freeradius-client-compile: openssl-compile
freeradius-server-compile: libtool-compile openssl-compile
diff --git a/package/Makefile b/package/Makefile
index 3b00cfb0b..cb96c5adc 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -102,6 +102,7 @@ package-$(ADK_PACKAGE_GCC) += gcc
package-$(ADK_PACKAGE_GDB) += gdb
package-$(ADK_PACKAGE_GDBSERVER) += gdbserver
package-$(ADK_PACKAGE_GETTEXT) += gettext
+package-$(ADK_PACKAGE_GIT) += git
package-$(ADK_PACKAGE_GKRELLMD) += gkrellmd
package-$(ADK_PACKAGE_GLIB) += glib
ifeq (${ADK_TARGET_LIB_GLIBC},y)
diff --git a/package/apr/Config.in b/package/apr/Config.in
index 0cee1afbc..5a875e10e 100644
--- a/package/apr/Config.in
+++ b/package/apr/Config.in
@@ -8,9 +8,9 @@ config ADK_PACKAGE_APR
http://apr.apache.org
config ADK_PACKAGE_APR_THREADING
- prompt " Enable threading support"
+ prompt "Enable threading support"
bool
default n
- depends ADK_PACKAGE_APR
+ depends on ADK_PACKAGE_APR
help
Enable threading support in APR.
diff --git a/package/asterisk/Config.in b/package/asterisk/Config.in
index 70c88064f..72f8b6bca 100644
--- a/package/asterisk/Config.in
+++ b/package/asterisk/Config.in
@@ -12,7 +12,7 @@ config ADK_PACKAGE_ASTERISK_CHAN_MGCP
prompt "asterisk-chan-mgcp.............. Media Gateway Control Protocol implementation"
tristate
default n
- depends ADK_PACKAGE_ASTERISK
+ depends on ADK_PACKAGE_ASTERISK
help
Media Gateway Control Protocol implementation for Asterisk
@@ -20,7 +20,7 @@ config ADK_PACKAGE_ASTERISK_CHAN_SKINNY
prompt "asterisk-chan-skinny............ Skinny Client Control Protocol implementation"
tristate
default n
- depends ADK_PACKAGE_ASTERISK
+ depends on ADK_PACKAGE_ASTERISK
help
Skinny Client Control Protocol implementation for Asterisk
@@ -28,7 +28,7 @@ config ADK_PACKAGE_ASTERISK_CHAN_IAX2
prompt "asterisk-chan-iax2.............. Support for the Inter Asterisk Protocol"
tristate
default n
- depends ADK_PACKAGE_ASTERISK
+ depends on ADK_PACKAGE_ASTERISK
help
IAX2 allows trunking communication channels together.
@@ -39,7 +39,7 @@ config ADK_PACKAGE_ASTERISK_CODEC_SPEEX
prompt "asterisk-codec-speex............ Speex/PCM16 Codec Translator"
tristate
default n
- depends ADK_PACKAGE_ASTERISK
+ depends on ADK_PACKAGE_ASTERISK
select ADK_PACKAGE_LIBSPEEX
help
The Speex speech compression codec for Asterisk
@@ -48,7 +48,7 @@ config ADK_PACKAGE_ASTERISK_CODEC_GSM
prompt "asterisk-codec-gsm.............. GSM Codec"
tristate
default n
- depends ADK_PACKAGE_ASTERISK
+ depends on ADK_PACKAGE_ASTERISK
help
The GSM codec for Asterisk
@@ -56,7 +56,7 @@ config ADK_PACKAGE_ASTERISK_PBX_DUNDI
prompt "asterisk-pbx-dundi.............. Distributed Universal Number Discovery (DUNDi) support"
tristate
default n
- depends ADK_PACKAGE_ASTERISK
+ depends on ADK_PACKAGE_ASTERISK
help
Distributed Universal Number Discovery (DUNDi) support for Asterisk
@@ -64,7 +64,7 @@ config ADK_PACKAGE_ASTERISK_RES_AGI
prompt "asterisk-res-agi................ Asterisk Gateway Interface module"
tristate
default n
- depends ADK_PACKAGE_ASTERISK
+ depends on ADK_PACKAGE_ASTERISK
help
Asterisk Gateway Interface module
@@ -72,7 +72,7 @@ config ADK_PACKAGE_ASTERISK_PGSQL
prompt "asterisk-pgsql.................. PostgreSQL modules"
tristate
default n
- depends ADK_PACKAGE_ASTERISK
+ depends on ADK_PACKAGE_ASTERISK
select ADK_PACKAGE_LIBPQ
help
PostgreSQL modules for Asterisk
@@ -81,7 +81,7 @@ config ADK_PACKAGE_ASTERISK_SOUNDS
prompt "asterisk-sounds................. Sound files"
tristate
default n
- depends ADK_PACKAGE_ASTERISK
+ depends on ADK_PACKAGE_ASTERISK
help
Sound files for Asterisk
@@ -89,7 +89,7 @@ config ADK_PACKAGE_ASTERISK_VOICEMAIL
prompt "asterisk-voicemail.............. Voicemail support"
tristate
default n
- depends ADK_PACKAGE_ASTERISK
+ depends on ADK_PACKAGE_ASTERISK
help
Voicemail related modules for Asterisk
diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index e5d428ed5..c3f9e0cef 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -4,12 +4,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= asterisk
-PKG_VERSION:= 1.4.25.1
+PKG_VERSION:= 1.4.26
PKG_RELEASE:= 1
-PKG_MD5SUM:= 1b42210127d6622c90fc5338de2b4aa9
+PKG_MD5SUM:= f54d6685533a149a0241c3468a88e02a
PKG_DESCR:= Open Source PBX
PKG_SECTION:= net
-PKG_DEPENDS:= libncurses libpthread
+PKG_DEPENDS:= libncurses libpthread libopenssl libcurl
PKG_URL:= http://www.asterisk.org
PKG_SITES:= http://downloads.digium.com/pub/telephony/asterisk/releases/
@@ -60,7 +60,6 @@ CONFIGURE_ARGS= --with-z=${STAGING_DIR}/usr \
--without-oss \
--without-pri \
--without-pwlib \
- --without-qt \
--without-tds \
--without-termcap \
--without-tinfo \
@@ -79,12 +78,6 @@ CONFIGURE_ARGS+= --with-ogg=${STAGING_DIR}/usr \
--with-vorbis=${STAGING_DIR}/usr
TLDFLAGS+= -logg
endif
-ifneq (${ADK_PACKAGE_ASTERISK_RADIUS},)
-CONFIGURE_ARGS+= --with-radius=${STAGING_DIR}/usr
-endif
-ifneq (${ADK_PACKAGE_ASTERISK_GNUTLS},)
-CONFIGURE_ARGS+= --with-gnutls=${STAGING_DIR}/usr
-endif
ifneq (${ADK_PACKAGE_ASTERISK_CURL},)
CONFIGURE_ARGS+= --with-curl=${STAGING_DIR}/usr
else
diff --git a/package/atftp/Config.in b/package/atftp/Config.in
index 11e1c02b2..8d48e2094 100644
--- a/package/atftp/Config.in
+++ b/package/atftp/Config.in
@@ -3,7 +3,7 @@
config ADK_COMPILE_ATFTP
tristate
default n
- depends ADK_PACKAGE_ATFTP || ADK_PACKAGE_ATFTPD
+ depends on ADK_PACKAGE_ATFTP || ADK_PACKAGE_ATFTPD
select ADK_PACKAGE_LIBREADLINE
config ADK_PACKAGE_ATFTP
diff --git a/package/avahi/Config.in b/package/avahi/Config.in
index 260096bb6..53d0e1ff8 100644
--- a/package/avahi/Config.in
+++ b/package/avahi/Config.in
@@ -1,7 +1,7 @@
config ADK_COMPILE_AVAHI
tristate
default n
- depends ADK_PACKAGE_AVAHI_DAEMON || ADK_PACKAGE_AVAHI_DNSCONFD || ADK_PACKAGE_LIBAVAHI
+ depends on ADK_PACKAGE_AVAHI_DAEMON || ADK_PACKAGE_AVAHI_DNSCONFD || ADK_PACKAGE_LIBAVAHI
config ADK_PACKAGE_AVAHI_DAEMON
prompt "avahi-daemon...................... An mDNS/DNS-SD (ZeroConf) implementation (daemon)"
@@ -28,7 +28,7 @@ config ADK_PACKAGE_AVAHI_DNSCONFD
tristate
default n
select ADK_COMPILE_AVAHI
- depends ADK_PACKAGE_AVAHI_DAEMON
+ depends on ADK_PACKAGE_AVAHI_DAEMON
help
Avahi is a system which facilitates service discovery on a local network --
this means that you can plug your laptop or computer into a network and
diff --git a/package/axtls/Config.in b/package/axtls/Config.in
index 5d1459da9..7c99a9617 100644
--- a/package/axtls/Config.in
+++ b/package/axtls/Config.in
@@ -1,7 +1,7 @@
config ADK_COMPILE_AXTLS
tristate
default n
- depends ADK_PACKAGE_LIBAXTLS || ADK_PACKAGE_AXHTTPD
+ depends on ADK_PACKAGE_LIBAXTLS || ADK_PACKAGE_AXHTTPD
config ADK_PACKAGE_AXHTTPD
prompt "axhttpd........................... small embedded webserver"
diff --git a/package/base-files/extra/init b/package/base-files/extra/init
index 65f33e3d6..f8021f286 100755
--- a/package/base-files/extra/init
+++ b/package/base-files/extra/init
@@ -1,4 +1,5 @@
#!/bin/sh
+echo "Starting system"
export PATH=/bin:/sbin:/usr/bin:/usr/sbin
mount -nt proc proc /proc
size=$(awk '/MemTotal:/ { if ($2 > 16000) { print 4096 } else { print 2048 }}' /proc/meminfo)
diff --git a/package/bc/Config.in b/package/bc/Config.in
index cae451a06..20a7d15c4 100644
--- a/package/bc/Config.in
+++ b/package/bc/Config.in
@@ -1,6 +1,6 @@
config ADK_COMPILE_BC
tristate
- depends ADK_PACKAGE_BC || ADK_PACKAGE_DC
+ depends on ADK_PACKAGE_BC || ADK_PACKAGE_DC
default n
config ADK_PACKAGE_BC
diff --git a/package/bind/Config.in b/package/bind/Config.in
index 1286057ba..b561312fc 100644
--- a/package/bind/Config.in
+++ b/package/bind/Config.in
@@ -12,7 +12,7 @@ config ADK_PACKAGE_BIND_RNDC
prompt "bind-rndc......................... Bind administration tools (rndc & rndc-confgen only)"
tristate
default n
- depends ADK_DUMMY_BIND
+ depends on ADK_DUMMY_BIND
select ADK_COMPILE_BIND
select ADK_PACKAGE_LIBBIND
help
@@ -23,7 +23,7 @@ config ADK_PACKAGE_BIND_CHECK
prompt "bind-check........................ Bind administration tools (named-checkconf & named-checkzone only)"
tristate
default n
- depends ADK_DUMMY_BIND
+ depends on ADK_DUMMY_BIND
select ADK_COMPILE_BIND
select ADK_PACKAGE_LIBBIND
help
@@ -34,7 +34,7 @@ config ADK_PACKAGE_BIND_DNSSEC
prompt "bind-dnssec....................... Bind administration tools (dnssec-keygen & dnssec-signzone only)"
tristate
default n
- depends ADK_DUMMY_BIND
+ depends on ADK_DUMMY_BIND
select ADK_COMPILE_BIND
select ADK_PACKAGE_LIBBIND
help
@@ -45,7 +45,7 @@ config ADK_PACKAGE_BIND_HOST
prompt "bind-host......................... A simple DNS client"
tristate
default n
- depends ADK_DUMMY_BIND
+ depends on ADK_DUMMY_BIND
select ADK_COMPILE_BIND
select ADK_PACKAGE_LIBBIND
help
@@ -57,7 +57,7 @@ config ADK_PACKAGE_BIND_DIG
prompt "bind-dig.......................... A DNS client"
tristate
default n
- depends ADK_DUMMY_BIND
+ depends on ADK_DUMMY_BIND
select ADK_COMPILE_BIND
select ADK_PACKAGE_LIBBIND
help
@@ -69,7 +69,7 @@ config ADK_PACKAGE_BIND_CLIENT
prompt "bind-client....................... A dynamic DNS client"
tristate
default n
- depends ADK_DUMMY_BIND
+ depends on ADK_DUMMY_BIND
select ADK_COMPILE_BIND
select ADK_PACKAGE_LIBBIND
help
@@ -80,7 +80,7 @@ config ADK_PACKAGE_BIND_SERVER
prompt "bind-server....................... A DNS server"
tristate
default n
- depends ADK_DUMMY_BIND
+ depends on ADK_DUMMY_BIND
select ADK_COMPILE_BIND
select ADK_PACKAGE_LIBBIND
help
@@ -91,7 +91,7 @@ config ADK_PACKAGE_LIBBIND
prompt "libbind........................... Support library for the bind tools and dns server/client."
tristate
default n
- depends ADK_DUMMY_BIND
+ depends on ADK_DUMMY_BIND
select ADK_COMPILE_BIND
help
http://www.isc.org/sw/bind/
diff --git a/package/bogofilter/Config.in b/package/bogofilter/Config.in
index 1dfb7d2d5..922f17376 100644
--- a/package/bogofilter/Config.in
+++ b/package/bogofilter/Config.in
@@ -12,15 +12,15 @@ config ADK_PACKAGE_BOGOFILTER
config ADK_PACKAGE_BOGOFILTER_BOGOUTIL
- prompt " include bogoutil in firmware image and package file"
+ prompt "include bogoutil in firmware image and package file"
bool
default n
- depends ADK_PACKAGE_BOGOFILTER
+ depends on ADK_PACKAGE_BOGOFILTER
config ADK_PACKAGE_BOGOFILTER_BOGOTUNE
- prompt " include bogotune in firmware image and package file"
+ prompt "include bogotune in firmware image and package file"
bool
default n
- depends ADK_PACKAGE_BOGOFILTER
+ depends on ADK_PACKAGE_BOGOFILTER
diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in
index 3bd3e1e8f..ca92ac7f9 100644
--- a/package/busybox/config/networking/Config.in
+++ b/package/busybox/config/networking/Config.in
@@ -338,6 +338,7 @@ config BUSYBOX_FEATURE_IFUPDOWN_IP_BUILTIN
bool "Use busybox ip applet"
default y
depends on BUSYBOX_FEATURE_IFUPDOWN_IP
+ depends on !ADK_PACKAGE_IP
select BUSYBOX_IP
select BUSYBOX_FEATURE_IP_ADDRESS
select BUSYBOX_FEATURE_IP_LINK
@@ -456,6 +457,7 @@ config BUSYBOX_FEATURE_INETD_RPC
config BUSYBOX_IP
bool "ip"
default y
+ depends on !ADK_PACKAGE_IP
help
The "ip" applet is a TCP/IP interface configuration and routing
utility. You generally don't need "ip" to use busybox with
diff --git a/package/busybox/patches/003-ip-config.patch b/package/busybox/patches/003-ip-config.patch
new file mode 100644
index 000000000..8c32dafe6
--- /dev/null
+++ b/package/busybox/patches/003-ip-config.patch
@@ -0,0 +1,18 @@
+diff -Nur busybox-1.13.4.orig/networking/Config.in busybox-1.13.4/networking/Config.in
+--- busybox-1.13.4.orig/networking/Config.in 2008-11-09 18:27:59.000000000 +0100
++++ busybox-1.13.4/networking/Config.in 2009-08-12 23:12:27.132893048 +0200
+@@ -338,10 +338,10 @@
+ bool "Use busybox ip applet"
+ default y
+ depends on FEATURE_IFUPDOWN_IP
+- select IP
+- select FEATURE_IP_ADDRESS
+- select FEATURE_IP_LINK
+- select FEATURE_IP_ROUTE
++ #select IP
++ #select FEATURE_IP_ADDRESS
++ #select FEATURE_IP_LINK
++ #select FEATURE_IP_ROUTE
+ help
+ Use the busybox iproute "ip" applet to implement "ifupdown".
+
diff --git a/package/cfgfs/Config.in b/package/cfgfs/Config.in
index 78051901b..e3412a458 100644
--- a/package/cfgfs/Config.in
+++ b/package/cfgfs/Config.in
@@ -4,7 +4,8 @@ config ADK_PACKAGE_CFGFS
select BUSYBOX_COMM
select BUSYBOX_MD5SUM
select BUSYBOX_FEATURE_SORT_BIG
- depends on ADK_LINUX_X86_ALIX1C || ADK_LINUX_CRIS_FOXBOARD
+ depends on ADK_LINUX_X86_ALIX1C || ADK_LINUX_CRIS_FOXBOARD || \
+ ADK_LINUX_MIPS_RB532
default y
help
Adopted from FreeWRT fwcf
diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile
index 1485cb9d9..790f536fc 100644
--- a/package/cfgfs/Makefile
+++ b/package/cfgfs/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= cfgfs
PKG_VERSION:= 1.0.6
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_DESCR:= compressed config filesystem
PKG_SECTION:= base
@@ -27,14 +27,5 @@ do-install:
${INSTALL_DIR} ${IDIR_CFGFS}/sbin
${INSTALL_BIN} ${WRKBUILD}/fwcf.sh ${IDIR_CFGFS}/sbin/cfgfs
${INSTALL_BIN} ${WRKBUILD}/fwcf.helper.out ${IDIR_CFGFS}/sbin/cfgfs.helper
-ifeq ($(ARCH),cris)
- ${INSTALL_BIN} ${WRKBUILD}/mtd ${IDIR_CFGFS}/sbin/mtd
- echo '#!/bin/sh' > ${IDIR_CFGFS}/sbin/cfgfs.write
- echo 'mtd -F write - cfgfs' >> ${IDIR_CFGFS}/sbin/cfgfs.write
-else
- echo '#!/bin/sh' > ${IDIR_CFGFS}/sbin/cfgfs.write
- echo 'cat > /dev/sda2' >> ${IDIR_CFGFS}/sbin/cfgfs.write
-endif
- chmod 755 ${IDIR_CFGFS}/sbin/cfgfs.write
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/cfgfs/src/fwcf.sh b/package/cfgfs/src/fwcf.sh
index fcaaf80a0..84eef3780 100644
--- a/package/cfgfs/src/fwcf.sh
+++ b/package/cfgfs/src/fwcf.sh
@@ -114,10 +114,12 @@ EOF
esac
# find backend device, first try to find partition with ID 88
+mtd=0
part=$(fdisk -l|awk '$5 == 88 { print $1 }')
if [ -z $part ]; then
# otherwise search for MTD device with name cfgfs
part=/dev/mtd$(fgrep '"cfgfs"' /proc/mtd 2>/dev/null | sed 's/^mtd\([^:]*\):.*$/\1/')ro
+ mtd=1
fi
if [[ ! -e $part ]]; then
@@ -127,7 +129,11 @@ fi
if test $1 = erase; then
dd if="$part" 2>&1 | md5sum 2>&1 >/dev/urandom
- cfgfs.helper -Me | cfgfs.write
+ if [ $mtd -eq 1 ]; then
+ cfgfs.helper -Me | mtd -F write - cfgfs
+ else
+ cfgfs.helper -Me | cat > $part
+ fi
exit $?
fi
@@ -153,7 +159,12 @@ if test $1 = setup; then
unclean=2
else
x=$(dd if="$part" bs=4 count=1 2>/dev/null)
- [[ "$x" = "FWCF" ]] || cfgfs.helper -Me | cfgfs.write
+ [[ "$x" = "FWCF" ]] || \
+ if [ $mtd -eq 1 ]; then
+ cfgfs.helper -Me | mtd -F write - cfgfs
+ else
+ cfgfs.helper -Me | cat > $part
+ fi
if ! cfgfs.helper -U /tmp/.cfgfs/temp <"$part"; then
unclean=1
echo 'cfgfs: error: cannot extract'
@@ -246,9 +257,16 @@ if test $1 = commit; then
[[ "$x" = "$y" ]] && rm "../temp/$f"
done
rv=0
- if ! ( cfgfs.helper -M /tmp/.cfgfs/temp | cfgfs.write ); then
- echo 'cfgfs: error: cannot write to $part!'
- rv=6
+ if [ $mtd -eq 1 ]; then
+ if ! ( cfgfs.helper -M /tmp/.cfgfs/temp | mtd -F write - cfgfs ); then
+ echo 'cfgfs: error: cannot write to $part!'
+ rv=6
+ fi
+ else
+ if ! ( cfgfs.helper -M /tmp/.cfgfs/temp | cat > $part ); then
+ echo 'cfgfs: error: cannot write to $part!'
+ rv=6
+ fi
fi
umount /tmp/.cfgfs/temp
exit $rv
@@ -368,9 +386,16 @@ if test $1 = restore; then
rm -rf /tmp/.cfgfs.restore
exit 12
fi
- if ! ( cfgfs.helper -MD dump | cfgfs.write ); then
- echo 'cfgfs: error: cannot write to $part!'
- exit 6
+ if [ $mtd -eq 1 ]; then
+ if ! ( cfgfs.helper -MD dump | mtd -F write - cfgfs ); then
+ echo 'cfgfs: error: cannot write to $part!'
+ exit 6
+ fi
+ else
+ if ! ( cfgfs.helper -MD dump | cat > $part ); then
+ echo 'cfgfs: error: cannot write to $part!'
+ exit 6
+ fi
fi
cd /
rm -rf /tmp/.cfgfs.restore
diff --git a/package/collectd/Config.in b/package/collectd/Config.in
index f645ee403..d040e581c 100644
--- a/package/collectd/Config.in
+++ b/package/collectd/Config.in
@@ -15,22 +15,22 @@ config ADK_PACKAGE_COLLECTD_CPU
prompt "Enable cpu support"
bool
default y
- depends ADK_PACKAGE_COLLECTD
+ depends on ADK_PACKAGE_COLLECTD
config ADK_PACKAGE_COLLECTD_LOAD
prompt "Enable load support"
bool
default y
- depends ADK_PACKAGE_COLLECTD
+ depends on ADK_PACKAGE_COLLECTD
config ADK_PACKAGE_COLLECTD_MEMORY
prompt "Enable memory support"
bool
default y
- depends ADK_PACKAGE_COLLECTD
+ depends on ADK_PACKAGE_COLLECTD
config ADK_PACKAGE_COLLECTD_PING
prompt "Enable ping support"
bool
default y
- depends ADK_PACKAGE_COLLECTD
+ depends on ADK_PACKAGE_COLLECTD
diff --git a/package/curl/Config.in b/package/curl/Config.in
index a74a823e2..b5d42ea1f 100644
--- a/package/curl/Config.in
+++ b/package/curl/Config.in
@@ -1,7 +1,7 @@
config ADK_COMPILE_CURL
tristate
default n
- depends ADK_PACKAGE_LIBCURL
+ depends on ADK_PACKAGE_LIBCURL
config ADK_PACKAGE_LIBCURL
prompt "libcurl........................... A client-side URL transfer library"
@@ -19,7 +19,7 @@ config ADK_PACKAGE_CURL
prompt "curl............................ A client-side URL transfer tool"
tristate
default n
- depends ADK_PACKAGE_LIBCURL
+ depends on ADK_PACKAGE_LIBCURL
help
A client-side URL transfer tool.
diff --git a/package/cyrus-sasl/Config.in b/package/cyrus-sasl/Config.in
index 6a03bbfb4..2b4657e5a 100644
--- a/package/cyrus-sasl/Config.in
+++ b/package/cyrus-sasl/Config.in
@@ -1,7 +1,7 @@
config ADK_COMPILE_CYRUS_SASL
tristate
default n
- depends ADK_PACKAGE_LIBSASL2
+ depends on ADK_PACKAGE_LIBSASL2
config ADK_PACKAGE_LIBSASL2
prompt "libsasl2.......................... General purpose authentication library"
diff --git a/package/dhcp/Config.in b/package/dhcp/Config.in
index 42fbf67f0..f58191e64 100644
--- a/package/dhcp/Config.in
+++ b/package/dhcp/Config.in
@@ -1,7 +1,7 @@
config ADK_COMPILE_DHCP
tristate
default n
- depends ADK_PACKAGE_DHCP_RELAY || ADK_PACKAGE_DHCP_SERVER
+ depends on ADK_PACKAGE_DHCP_RELAY || ADK_PACKAGE_DHCP_SERVER
config ADK_PACKAGE_DHCP_RELAY
prompt "dhcp-relay........................ ISC DHCP relay"
diff --git a/package/dropbear/Config.in b/package/dropbear/Config.in
index 0729a7422..ea087b8bb 100644
--- a/package/dropbear/Config.in
+++ b/package/dropbear/Config.in
@@ -11,4 +11,4 @@ config ADK_PACKAGE_DBCONVERT
prompt "dropbearconvert................. Utility for converting SSH keys"
tristate
default n
- depends ADK_PACKAGE_DROPBEAR
+ depends on ADK_PACKAGE_DROPBEAR
diff --git a/package/e2fsprogs/Config.in b/package/e2fsprogs/Config.in
index 6638f88fc..0dff689d1 100644
--- a/package/e2fsprogs/Config.in
+++ b/package/e2fsprogs/Config.in
@@ -13,14 +13,14 @@ config ADK_PACKAGE_E2FSPROGS
config ADK_PACKAGE_LIBUUID
prompt "libuuid......................... UUID library"
- depends ADK_PACKAGE_E2FSPROGS
+ depends on ADK_PACKAGE_E2FSPROGS
tristate
default n
help
config ADK_PACKAGE_LIBCOM_ERR
prompt "libcom_err...................... Common error library"
- depends ADK_PACKAGE_E2FSPROGS
+ depends on ADK_PACKAGE_E2FSPROGS
tristate
default n
help
diff --git a/package/expat/Config.in b/package/expat/Config.in
index 861777a94..209d357b7 100644
--- a/package/expat/Config.in
+++ b/package/expat/Config.in
@@ -1,7 +1,7 @@
config ADK_COMPILE_EXPAT
tristate
default n
- depends ADK_PACKAGE_LIBEXPAT
+ depends on ADK_PACKAGE_LIBEXPAT
config ADK_PACKAGE_LIBEXPAT
prompt "libexpat.......................... A fast, non-validating, stream-oriented XML parsing library"
diff --git a/package/faad2/Config.in b/package/faad2/Config.in
index 21d3194c3..8d554727d 100644
--- a/package/faad2/Config.in
+++ b/package/faad2/Config.in
@@ -1,7 +1,7 @@
config ADK_COMPILE_FAAD2
tristate
default n
- depends ADK_PACKAGE_LIBFAAD2
+ depends on ADK_PACKAGE_LIBFAAD2
config ADK_PACKAGE_LIBFAAD2
prompt "libfaad2.......................... MP4 decoding library"
diff --git a/package/fetchmail/Config.in b/package/fetchmail/Config.in
index fa7f1bfe2..5319a963f 100644
--- a/package/fetchmail/Config.in
+++ b/package/fetchmail/Config.in
@@ -9,8 +9,8 @@ config ADK_PACKAGE_FETCHMAIL
Known to be full of security holes, beware.
config ADK_PACKAGE_FETCHMAIL_SSL
- bool " Enable SSL/TLS support"
- depends ADK_PACKAGE_FETCHMAIL
+ bool "Enable SSL/TLS support"
+ depends on ADK_PACKAGE_FETCHMAIL
select ADK_PACKAGE_LIBOPENSSL
default n
help
diff --git a/package/flac/Config.in b/package/flac/Config.in
index bef5c0876..346e70e75 100644
--- a/package/flac/Config.in
+++ b/package/flac/Config.in
@@ -1,7 +1,7 @@
config ADK_COMPILE_FLAC
tristate
default n
- depends ADK_PACKAGE_LIBFLAC
+ depends on ADK_PACKAGE_LIBFLAC
config ADK_PACKAGE_LIBFLAC
prompt "libflac........................... Free Lossless Audio Codec library"
diff --git a/package/freeradius-client/Config.in b/package/freeradius-client/Config.in
index 79325a755..987c52c0a 100644
--- a/package/freeradius-client/Config.in
+++ b/package/freeradius-client/Config.in
@@ -1,7 +1,7 @@
config ADK_COMPILE_FREERADIUS_CLIENT
tristate
default n
- depends ADK_PACKAGE_LIBFREERADIUS_CLIENT
+ depends on ADK_PACKAGE_LIBFREERADIUS_CLIENT
config ADK_PACKAGE_FREERADIUS_CLIENT
prompt "freeradius-client................. RADIUS client"
diff --git a/package/freeradius-server/Config.in b/package/freeradius-server/Config.in
index 56fcf16ea..d7dc0cb03 100644
--- a/package/freeradius-server/Config.in
+++ b/package/freeradius-server/Config.in
@@ -10,89 +10,89 @@ config ADK_PACKAGE_FREERADIUS_SERVER
http://www.freeradius.org/
config ADK_PACKAGE_FREERADIUS_DEMOCERTS
- prompt " freeradius-democerts.......... Demo certificates to test the server"
+ prompt "freeradius-democerts.......... Demo certificates to test the server"
tristate
default n
- depends ADK_PACKAGE_FREERADIUS_SERVER
+ depends on ADK_PACKAGE_FREERADIUS_SERVER
config ADK_PACKAGE_FREERADIUS_MOD_CHAP
- prompt " freeradius-mod-chap........... CHAP module"
+ prompt "freeradius-mod-chap........... CHAP module"
tristate
default n
- depends ADK_PACKAGE_FREERADIUS_SERVER
+ depends on ADK_PACKAGE_FREERADIUS_SERVER
config ADK_PACKAGE_FREERADIUS_MOD_DETAIL
- prompt " freeradius-mod-detail......... Detailed accounting module"
+ prompt "freeradius-mod-detail......... Detailed accounting module"
tristate
default n
- depends ADK_PACKAGE_FREERADIUS_SERVER
+ depends on ADK_PACKAGE_FREERADIUS_SERVER
config ADK_PACKAGE_FREERADIUS_MOD_DIGEST
- prompt " freeradius-mod-digest......... Digest authentication"
+ prompt "freeradius-mod-digest......... Digest authentication"
tristate
default n
- depends ADK_PACKAGE_FREERADIUS_SERVER
+ depends on ADK_PACKAGE_FREERADIUS_SERVER
config ADK_PACKAGE_FREERADIUS_MOD_FILES
- prompt " freeradius-mod-files.......... Module using local files for authorization"
+ prompt "freeradius-mod-files.......... Module using local files for authorization"
tristate
default y
- depends ADK_PACKAGE_FREERADIUS_SERVER
+ depends on ADK_PACKAGE_FREERADIUS_SERVER
config ADK_PACKAGE_FREERADIUS_MOD_LDAP
- prompt " freeradius-mod-ldap........... LDAP module"
+ prompt "freeradius-mod-ldap........... LDAP module"
tristate
default n
select ADK_PACKAGE_LIBOPENLDAP
- depends ADK_PACKAGE_FREERADIUS_SERVER
+ depends on ADK_PACKAGE_FREERADIUS_SERVER
config ADK_PACKAGE_FREERADIUS_MOD_MSCHAP
- prompt " freeradius-mod-mschap......... MS-CHAP and MS-CHAPv2 module"
+ prompt "freeradius-mod-mschap......... MS-CHAP and MS-CHAPv2 module"
tristate
default n
- depends ADK_PACKAGE_FREERADIUS_SERVER
+ depends on ADK_PACKAGE_FREERADIUS_SERVER
config ADK_PACKAGE_FREERADIUS_MOD_PAP
- prompt " freeradius-mod-pap............ PAP module"
+ prompt "freeradius-mod-pap............ PAP module"
tristate
default n
- depends ADK_PACKAGE_FREERADIUS_SERVER
+ depends on ADK_PACKAGE_FREERADIUS_SERVER
config ADK_PACKAGE_FREERADIUS_MOD_PREPROCESS
- prompt " freeradius-mod-preprocess..... Request pre-processing module"
+ prompt "freeradius-mod-preprocess..... Request pre-processing module"
tristate
default n
- depends ADK_PACKAGE_FREERADIUS_SERVER
+ depends on ADK_PACKAGE_FREERADIUS_SERVER
config ADK_PACKAGE_FREERADIUS_MOD_REALM
- prompt " freeradius-mod-realm.......... Realms handling module"
+ prompt "freeradius-mod-realm.......... Realms handling module"
tristate
default n
- depends ADK_PACKAGE_FREERADIUS_SERVER
+ depends on ADK_PACKAGE_FREERADIUS_SERVER
config ADK_PACKAGE_FREERADIUS_MOD_SQL
- prompt " freeradius-mod-sql............ Base SQL module"
+ prompt "freeradius-mod-sql............ Base SQL module"
tristate
default n
- depends ADK_PACKAGE_FREERADIUS_SERVER
+ depends on ADK_PACKAGE_FREERADIUS_SERVER
config ADK_PACKAGE_FREERADIUS_MOD_SQL_MYSQL
- prompt " freeradius-mod-sql-mysql.... MySQL module"
+ prompt "freeradius-mod-sql-mysql.... MySQL module"
tristate
default n
depends on ADK_CXX
- depends ADK_PACKAGE_FREERADIUS_MOD_SQL
+ depends on ADK_PACKAGE_FREERADIUS_MOD_SQL
select ADK_PACKAGE_LIBMYSQLCLIENT
config ADK_PACKAGE_FREERADIUS_MOD_SQL_PGSQL
- prompt " freeradius-mod-sql-pgsql.... PostgreSQL module"
+ prompt "freeradius-mod-sql-pgsql.... PostgreSQL module"
tristate
default n
- depends ADK_PACKAGE_FREERADIUS_MOD_SQL
+ depends on ADK_PACKAGE_FREERADIUS_MOD_SQL
select ADK_PACKAGE_LIBPQ
config ADK_PACKAGE_FREERADIUS_UTILS
- prompt " freeradius-utils.............. Misc. client utilities"
+ prompt "freeradius-utils.............. Misc. client utilities"
tristate
default n
- depends ADK_PACKAGE_FREERADIUS_SERVER
+ depends on ADK_PACKAGE_FREERADIUS_SERVER
diff --git a/package/freetype/Config.in b/package/freetype/Config.in
index f860e7ce0..408998aa8 100644
--- a/package/freetype/Config.in
+++ b/package/freetype/Config.in
@@ -1,7 +1,7 @@
config ADK_COMPILE_FREETYPE
tristate
default n
- depends ADK_PACKAGE_LIBFREETYPE
+ depends on ADK_PACKAGE_LIBFREETYPE
config ADK_PACKAGE_LIBFREETYPE
tristate "libfreetype....................... A free, high-quality and portable font engine"
diff --git a/package/git/Config.in b/package/git/Config.in
new file mode 100644
index 000000000..0ee3e3ea3
--- /dev/null
+++ b/package/git/Config.in
@@ -0,0 +1,9 @@
+config ADK_PACKAGE_GIT
+ prompt "git............................... fast version control system"
+ tristate
+ select ADK_PACKAGE_LIBOPENSSL
+ select ADK_PACKAGE_LIBCURL
+ select ADK_PACKAGE_LIBEXPAT
+ default n
+ help
+ Fast version control system.
diff --git a/package/git/Makefile b/package/git/Makefile
new file mode 100644
index 000000000..9df88b92b
--- /dev/null
+++ b/package/git/Makefile
@@ -0,0 +1,37 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:= git
+PKG_VERSION:= 1.6.3.3
+PKG_RELEASE:= 1
+PKG_MD5SUM:= a634d76881f3bd6b92cb1892ea5f88fe
+PKG_DESCR:= fast version control system
+PKG_SECTION:= misc
+PKG_DEPENDS:= openssl curl
+PKG_URL:= http://git-scm.com
+PKG_SITES:= http://kernel.org/pub/software/scm/git/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,GIT,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+TCFLAGS+= -DNO_NSEC -DNO_TCLTK -DNO_PERL
+CONFIGURE_STYLE:= gnu
+CONFIGURE_ENV+= ac_cv_c_c99_format=yes \
+ ac_cv_fread_reads_directories=no \
+ ac_cv_snprintf_returns_bogus=no
+BUILD_STYLE:= auto
+INSTALL_STYLE:= auto
+
+post-install:
+ $(INSTALL_DIR) $(IDIR_GIT)/usr/bin $(IDIR_GIT)/usr/sbin/git-core
+ $(CP) $(WRKINST)/usr/bin/git $(IDIR_GIT)/usr/bin
+ $(CP) $(WRKINST)/usr/bin/git-shell $(IDIR_GIT)/usr/bin
+ $(CP) $(WRKINST)/usr/bin/git-receive-pack $(IDIR_GIT)/usr/bin
+ $(CP) $(WRKINST)/usr/bin/git-upload-pack $(IDIR_GIT)/usr/bin
+ $(CP) $(WRKINST)/usr/bin/git-upload-archive $(IDIR_GIT)/usr/bin
+ ${CP} $(WRKINST)/usr/sbin/git-core/* $(IDIR_GIT)/usr/sbin/git-core
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/git/patches/patch-Makefile b/package/git/patches/patch-Makefile
new file mode 100644
index 000000000..46b1488e5
--- /dev/null
+++ b/package/git/patches/patch-Makefile
@@ -0,0 +1,32 @@
+use symlinks instead of hardlinks
+--- git-1.6.3.3.orig/Makefile 2009-06-22 08:24:25.000000000 +0200
++++ git-1.6.3.3/Makefile 2009-07-24 20:59:26.186421458 +0200
+@@ -215,7 +215,7 @@ bindir_relative = bin
+ bindir = $(prefix)/$(bindir_relative)
+ mandir = share/man
+ infodir = share/info
+-gitexecdir = libexec/git-core
++gitexecdir = bin
+ sharedir = $(prefix)/share
+ template_dir = share/git-core/templates
+ htmldir = share/doc/git-doc
+@@ -1239,7 +1239,6 @@ builtin-help.o: builtin-help.c common-cm
+
+ $(BUILT_INS): git$X
+ $(QUIET_BUILT_IN)$(RM) $@ && \
+- ln git$X $@ 2>/dev/null || \
+ ln -s git$X $@ 2>/dev/null || \
+ cp git$X $@
+
+@@ -1554,11 +1553,9 @@ endif
+ execdir=$$(cd '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' && pwd) && \
+ { $(RM) "$$execdir/git-add$X" && \
+ test -z "$(NO_CROSS_DIRECTORY_HARDLINKS)" && \
+- ln "$$bindir/git$X" "$$execdir/git-add$X" 2>/dev/null || \
+ cp "$$bindir/git$X" "$$execdir/git-add$X"; } && \
+ { for p in $(filter-out git-add$X,$(BUILT_INS)); do \
+ $(RM) "$$execdir/$$p" && \
+- ln "$$execdir/git-add$X" "$$execdir/$$p" 2>/dev/null || \
+ ln -s "git-add$X" "$$execdir/$$p" 2>/dev/null || \
+ cp "$$execdir/git-add$X" "$$execdir/$$p" || exit; \
+ done; } && \
diff --git a/package/gmp/Config.in b/package/gmp/Config.in
index e681b6519..9ef3f1e4a 100644
--- a/package/gmp/Config.in
+++ b/package/gmp/Config.in
@@ -1,7 +1,7 @@
config ADK_COMPILE_GMP
tristate
default n
- depends ADK_PACKAGE_LIBGMP
+ depends on ADK_PACKAGE_LIBGMP
config ADK_PACKAGE_LIBGMP
prompt "libgmp............................ GNU multiprecision arithmetic library"
diff --git a/package/gnutls/Config.in b/package/gnutls/Config.in
index ffe1125b0..83db1d706 100644
--- a/package/gnutls/Config.in
+++ b/package/gnutls/Config.in
@@ -1,7 +1,7 @@
config ADK_COMPILE_GNUTLS
tristate
default n
- depends ADK_PACKAGE_LIBGNUTLS
+ depends on ADK_PACKAGE_LIBGNUTLS
config ADK_PACKAGE_LIBGNUTLS
prompt "libgnutls......................... The GNU TLS library"
@@ -41,7 +41,7 @@ config ADK_PACKAGE_LIBGNUTLS_EXTRA
prompt "libgnutls-extra................... The GNU TLS extra library"
tristate
default n
- depends ADK_PACKAGE_LIBGNUTLS
+ depends on ADK_PACKAGE_LIBGNUTLS
select ADK_PACKAGE_LIBOPENCDK
select ADK_PACKAGE_LIBLZO
help
@@ -58,7 +58,7 @@ config ADK_PACKAGE_LIBGNUTLS_OPENSSL
prompt "libgnutls-openssl................. The GNU TLS OpenSSL compatibility layer library"
tristate
default n
- depends ADK_PACKAGE_LIBGNUTLS
+ depends on ADK_PACKAGE_LIBGNUTLS
help
GnuTLS is a project that aims to develop a library which provides a
secure layer, over a reliable transport layer. Currently the GnuTLS
@@ -73,7 +73,7 @@ config ADK_PACKAGE_LIBGNUTLSXX
tristate
default n
depends on ADK_CXX
- depends ADK_PACKAGE_LIBGNUTLS
+ depends on ADK_PACKAGE_LIBGNUTLS
help
GnuTLS is a project that aims to develop a library which provides a
secure layer, over a reliable transport layer. Currently the GnuTLS
@@ -104,7 +104,7 @@ config ADK_PACKAGE_GNUTLS_UTILS
prompt "gnutls-utils...................... The GNU TLS utilities"
tristate
default n
- depends ADK_PACKAGE_LIBGNUTLS
+ depends on ADK_PACKAGE_LIBGNUTLS
select ADK_PACKAGE_LIBGNUTLS_EXTRA
help
GnuTLS is a project that aims to develop a library which provides a
diff --git a/package/gsm/Config.in b/package/gsm/Config.in
index 77bf91626..9af1d7dda 100644
--- a/package/gsm/Config.in
+++ b/package/gsm/Config.in
@@ -1,7 +1,7 @@
config ADK_COMPILE_GSM
tristate
default n
- depends ADK_PACKAGE_LIBGSM
+ depends on ADK_PACKAGE_LIBGSM
config ADK_PACKAGE_LIBGSM
prompt "libgsm............................ A GSM 06.10 full-rate speech transcoding implementation (library)"
@@ -20,7 +20,7 @@ config ADK_PACKAGE_GSM_UTILS
prompt "gsm-utils....................... A GSM 06.10 full-rate speech transcoding implementation (utilities)"
tristate
default n
- depends ADK_PACKAGE_LIBGSM
+ depends on ADK_PACKAGE_LIBGSM
help
An implementation of the European GSM 06.10 provisional standard
for full-rate speech transcoding, prI-ETS 300 036, which uses
diff --git a/package/hostapd/Config.in b/package/hostapd/Config.in
index 562f1f23c..bd0ec3865 100644
--- a/package/hostapd/Config.in
+++ b/package/hostapd/Config.in
@@ -1,7 +1,7 @@
config ADK_COMPILE_HOSTAPD
tristate
default n
- depends ADK_PACKAGE_HOSTAPD || ADK_PACKAGE_HOSTAPD_UTILS
+ depends on ADK_PACKAGE_HOSTAPD || ADK_PACKAGE_HOSTAPD_UTILS
config ADK_PACKAGE_HOSTAPD
prompt "hostapd........................... An IEEE 802.11 AP, IEEE 802.1x/WPA/WPA2/EAP/RADIUS Authenticator"
diff --git a/package/iptables/Config.in b/package/iptables/Config.in
index bf7fd0ebb..5b82599ad 100644
--- a/package/iptables/Config.in
+++ b/package/iptables/Config.in
@@ -1,7 +1,7 @@
config ADK_COMPILE_IPTABLES
bool
default n
- depends ADK_PACKAGE_IPTABLES || ADK_PACKAGE_IP6TABLES
+ depends on ADK_PACKAGE_IPTABLES || ADK_PACKAGE_IP6TABLES
config ADK_PACKAGE_IPTABLES
prompt "iptables.......................... IPv4 firewall administration tool"
@@ -25,7 +25,7 @@ config ADK_PACKAGE_IPTABLES_UTILS
prompt "iptables-utils.................. Save and restore utilities"
tristate
default n
- depends ADK_PACKAGE_IPTABLES
+ depends on ADK_PACKAGE_IPTABLES
help
iptables-save and iptables-restore for Iptables (IPv4)
diff --git a/package/irssi/Config.in b/package/irssi/Config.in
index 44fa5d5a4..79047c471 100644
--- a/package/irssi/Config.in
+++ b/package/irssi/Config.in
@@ -10,8 +10,8 @@ config ADK_PACKAGE_IRSSI
http://irssi.org
config ADK_PACKAGE_IRSSI_SSL
- bool " Enable SSL/TLS support"
- depends ADK_PACKAGE_IRSSI
+ bool "Enable SSL/TLS support"
+ depends on ADK_PACKAGE_IRSSI
select ADK_PACKAGE_LIBOPENSSL
default n
help
diff --git a/package/jpeg/Config.in b/package/jpeg/Config.in
index 4d05a0761..4fe390d21 100644
--- a/package/jpeg/Config.in
+++ b/package/jpeg/Config.in
@@ -1,7 +1,7 @@
config ADK_COMPILE_JPEG
tristate
default n
- depends ADK_PACKAGE_LIBJPEG
+ depends on ADK_PACKAGE_LIBJPEG
config ADK_PACKAGE_LIBJPEG
prompt "libjpeg........................... The Independent JPEG Group's JPEG runtime library"
diff --git a/package/kismet/Config.in b/package/kismet/Config.in
index 84b256509..2583f88d2 100644
--- a/package/kismet/Config.in
+++ b/package/kismet/Config.in
@@ -1,7 +1,7 @@
config ADK_COMPILE_KISMET
tristate
default n
- depends ADK_PACKAGE_KISMET_CLIENT || ADK_PACKAGE_KISMET_DRONE || ADK_PACKAGE_KISMET_SERVER
+ depends on ADK_PACKAGE_KISMET_CLIENT || ADK_PACKAGE_KISMET_DRONE || ADK_PACKAGE_KISMET_SERVER
config ADK_PACKAGE_KISMET_CLIENT
prompt "kismet-client..................... The Kismet client"
diff --git a/package/knock/Config.in b/package/knock/Config.in
index ada7f06c8..291ea3b0d 100644
--- a/package/knock/Config.in
+++ b/package/knock/Config.in
@@ -1,7 +1,7 @@
config ADK_COMPILE_KNOCK
tristate
default n
- depends ADK_PACKAGE_KNOCK || ADK_PACKAGE_KNOCKD
+ depends on ADK_PACKAGE_KNOCK || ADK_PACKAGE_KNOCKD
config ADK_PACKAGE_KNOCK
prompt "knock............................. A port-knocking client"
diff --git a/package/libdb/Config.in b/package/libdb/Config.in
index f8360bee8..510311508 100644
--- a/package/libdb/Config.in
+++ b/package/libdb/Config.in
@@ -1,7 +1,7 @@
config ADK_COMPILE_DB
tristate
default n
- depends ADK_PACKAGE_LIBDB
+ depends on ADK_PACKAGE_LIBDB
config ADK_PACKAGE_LIBDB
prompt "libdb............................. Berkeley DB"
diff --git a/package/libshout/Config.in b/package/libshout/Config.in
index 9c9aaf3d5..2a34f2c1b 100644
--- a/package/libshout/Config.in
+++ b/package/libshout/Config.in
@@ -1,7 +1,7 @@
config ADK_COMPILE_LIBSHOUT
tristate
default n
- depends ADK_PACKAGE_LIBSHOUT
+ depends on ADK_PACKAGE_LIBSHOUT
config ADK_PACKAGE_LIBSHOUT
prompt "libshout.......................... Streaming library"
diff --git a/package/libtirpc/Makefile b/package/libtirpc/Makefile
index 0a8ee70e8..08d0d765e 100644
--- a/package/libtirpc/Makefile
+++ b/package/libtirpc/Makefile
@@ -16,11 +16,19 @@ DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2
include ${TOPDIR}/mk/package.mk
+ifeq (${ADK_IPV6},y)
+PKG_DEPENDS+= libgssglue
+endif
+
$(eval $(call PKG_template,LIBTIRPC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_STYLE:= autotool gnu
ifneq (${ADK_COMPILE_NFS_UTILS_WITH_KERBEROS},y)
+ifneq (${ADK_IPV6},y)
CONFIGURE_ARGS+= --disable-gss
+else
+CONFIGURE_ARGS+= --enable-gss
+endif
endif
BUILD_STYLE:= auto
INSTALL_STYLE:= auto
diff --git a/package/libtool/Config.in b/package/libtool/Config.in
index aed0c9640..5d26b838b 100644
--- a/package/libtool/Config.in
+++ b/package/libtool/Config.in
@@ -1,6 +1,6 @@
config ADK_COMPILE_LIBTOOL
tristate
- depends ADK_PACKAGE_LIBLTDL
+ depends on ADK_PACKAGE_LIBLTDL
config ADK_PACKAGE_LIBLTDL
prompt "libltdl........................... A generic dynamic object loading library"
diff --git a/package/libtorrent/Config.in b/package/libtorrent/Config.in
index be20ecbea..ab8ae5585 100644
--- a/package/libtorrent/Config.in
+++ b/package/libtorrent/Config.in
@@ -22,7 +22,7 @@ config ADK_COMPILE_LIBTORRENT_WITH_STDCXX
config ADK_COMPILE_LIBTORRENT_WITH_UCLIBCXX
bool "Embedded uClibc++ library"
select ADK_PACKAGE_UCLIBCXX
- depends ADK_BROKEN
+ depends on ADK_BROKEN
help
endchoice
diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in
index 6eea65df2..b56fa8bff 100644
--- a/package/lighttpd/Config.in
+++ b/package/lighttpd/Config.in
@@ -11,103 +11,103 @@ config ADK_PACKAGE_LIGHTTPD
http://www.lighttpd.net/
config ADK_COMPILE_LIGHTTPD_WITH_OPENSSL
- bool " Use OpenSSL for https support"
+ bool "Use OpenSSL for https support"
default y
depends on ADK_PACKAGE_LIGHTTPD
select ADK_PACKAGE_LIBOPENSSL
config ADK_PACKAGE_LIGHTTPD_MOD_ACCESSLOG
- prompt " lighttpd-mod-accesslog........ Access logging module"
+ prompt "lighttpd-mod-accesslog........ Access logging module"
tristate
default n
- depends ADK_PACKAGE_LIGHTTPD
+ depends on ADK_PACKAGE_LIGHTTPD
config ADK_PACKAGE_LIGHTTPD_MOD_ALIAS
- prompt " lighttpd-mod-alias............ Directory alias module"
+ prompt "lighttpd-mod-alias............ Directory alias module"
tristate
default n
- depends ADK_PACKAGE_LIGHTTPD
+ depends on ADK_PACKAGE_LIGHTTPD
config ADK_PACKAGE_LIGHTTPD_MOD_AUTH
- prompt " lighttpd-mod-auth............. Authentication module"
+ prompt "lighttpd-mod-auth............. Authentication module"
tristate
default n
- depends ADK_PACKAGE_LIGHTTPD
+ depends on ADK_PACKAGE_LIGHTTPD
config ADK_PACKAGE_LIGHTTPD_MOD_CGI
- prompt " lighttpd-mod-cgi.............. CGI module"
+ prompt "lighttpd-mod-cgi.............. CGI module"
tristate
default n
- depends ADK_PACKAGE_LIGHTTPD
+ depends on ADK_PACKAGE_LIGHTTPD
config ADK_PACKAGE_LIGHTTPD_MOD_EVASIVE
- prompt " lighttpd-mod-evasive.......... Evasive module"
+ prompt "lighttpd-mod-evasive.......... Evasive module"
tristate
default n
- depends ADK_PACKAGE_LIGHTTPD
+ depends on ADK_PACKAGE_LIGHTTPD
config ADK_PACKAGE_LIGHTTPD_MOD_EXPIRE
- prompt " lighttpd-mod-expire........... Expire module"
+ prompt "lighttpd-mod-expire........... Expire module"
tristate
default n
- depends ADK_PACKAGE_LIGHTTPD
+ depends on ADK_PACKAGE_LIGHTTPD
config ADK_PACKAGE_LIGHTTPD_MOD_FASTCGI
- prompt " lighttpd-mod-fastcgi.......... FastCGI module"
+ prompt "lighttpd-mod-fastcgi.......... FastCGI module"
tristate
default n
- depends ADK_PACKAGE_LIGHTTPD
+ depends on ADK_PACKAGE_LIGHTTPD
config ADK_PACKAGE_LIGHTTPD_MOD_PROXY
- prompt " lighttpd-mod-proxy............ Proxy module"
+ prompt "lighttpd-mod-proxy............ Proxy module"
tristate
default n
- depends ADK_PACKAGE_LIGHTTPD
+ depends on ADK_PACKAGE_LIGHTTPD
config ADK_PACKAGE_LIGHTTPD_MOD_REDIRECT
- prompt " lighttpd-mod-redirect......... URL redirection module"
+ prompt "lighttpd-mod-redirect......... URL redirection module"
tristate
default n
- depends ADK_PACKAGE_LIGHTTPD
+ depends on ADK_PACKAGE_LIGHTTPD
config ADK_PACKAGE_LIGHTTPD_MOD_REWRITE
- prompt " lighttpd-mod-rewrite.......... URL rewriting module"
+ prompt "lighttpd-mod-rewrite.......... URL rewriting module"
tristate
default n
- depends ADK_PACKAGE_LIGHTTPD
+ depends on ADK_PACKAGE_LIGHTTPD
config ADK_PACKAGE_LIGHTTPD_MOD_SETENV
- prompt " lighttpd-mod-setenv........... Environment variable setting module"
+ prompt "lighttpd-mod-setenv........... Environment variable setting module"
tristate
default n
- depends ADK_PACKAGE_LIGHTTPD
+ depends on ADK_PACKAGE_LIGHTTPD
config ADK_PACKAGE_LIGHTTPD_MOD_SIMPLE_VHOST
- prompt " lighttpd-mod-simple-vhost..... Simple virtual hosting module"
+ prompt "lighttpd-mod-simple-vhost..... Simple virtual hosting module"
tristate
default n
- depends ADK_PACKAGE_LIGHTTPD
+ depends on ADK_PACKAGE_LIGHTTPD
config ADK_PACKAGE_LIGHTTPD_MOD_SSI
- prompt " lighttpd-mod-ssi.............. SSI module"
+ prompt "lighttpd-mod-ssi.............. SSI module"
tristate
default n
- depends ADK_PACKAGE_LIGHTTPD
+ depends on ADK_PACKAGE_LIGHTTPD
config ADK_PACKAGE_LIGHTTPD_MOD_STATUS
- prompt " lighttpd-mod-status........... Server status display module"
+ prompt "lighttpd-mod-status........... Server status display module"
tristate
default n
- depends ADK_PACKAGE_LIGHTTPD
+ depends on ADK_PACKAGE_LIGHTTPD
config ADK_PACKAGE_LIGHTTPD_MOD_USERTRACK
- prompt " lighttpd-mod-usertrack........ User tracking module"
+ prompt "lighttpd-mod-usertrack........ User tracking module"
tristate
default n
- depends ADK_PACKAGE_LIGHTTPD
+ depends on ADK_PACKAGE_LIGHTTPD
config ADK_PACKAGE_LIGHTTPD_MOD_WEBDAV
- prompt " lighttpd-mod-webdav........... webdav module"
+ prompt "lighttpd-mod-webdav........... webdav module"
tristate
default n
- depends ADK_PACKAGE_LIGHTTPD
+ depends on ADK_PACKAGE_LIGHTTPD
diff --git a/package/lua/Config.in b/package/lua/Config.in
index 1fbff9ebe..580d82217 100644
--- a/package/lua/Config.in
+++ b/package/lua/Config.in
@@ -3,7 +3,7 @@
config ADK_COMPILE_LUA
tristate
default n
- depends ADK_PACKAGE_LIBLUA
+ depends on ADK_PACKAGE_LIBLUA
config ADK_PACKAGE_LIBLUA
prompt "liblua............................ LUA programming language shared libraries"
diff --git a/package/mini_httpd/Config.in b/package/mini_httpd/Config.in
index 3922f14cd..bd83fdb09 100644
--- a/package/mini_httpd/Config.in
+++ b/package/mini_httpd/Config.in
@@ -1,7 +1,7 @@
config ADK_COMPILE_MINI_HTTPD
tristate
default n
- depends ADK_PACKAGE_MINI_HTTPD || ADK_PACKAGE_MINI_HTTPD_OPENSSL
+ depends on ADK_PACKAGE_MINI_HTTPD || ADK_PACKAGE_MINI_HTTPD_OPENSSL
config ADK_PACKAGE_MINI_HTTPD
prompt "mini-httpd........................ A small web server"
diff --git a/package/miredo/Config.in b/package/miredo/Config.in
index 928e06c5d..8fb215c06 100644
--- a/package/miredo/Config.in
+++ b/package/miredo/Config.in
@@ -3,13 +3,13 @@ config ADK_COMPILE_MIREDO
default n
depends on ADK_CXX
depends on ADK_IPV6
- depends ADK_PACKAGE_MIREDO || ADK_PACKAGE_MIREDO_SERVER
+ depends on ADK_PACKAGE_MIREDO || ADK_PACKAGE_MIREDO_SERVER
config ADK_PACKAGE_MIREDO
prompt "miredo............................ Teredo (IPv6 tunneling over UDP through NAT) client and relay daemon"
tristate
default n
- depends ADK_IPV6
+ depends on ADK_IPV6
depends on ADK_CXX
select ADK_COMPILE_MIREDO
select ADK_KPACKAGE_KMOD_IPV6
@@ -23,7 +23,7 @@ config ADK_PACKAGE_MIREDO_SERVER
prompt "miredo-server..................... Teredo (IPv6 tunneling over UDP through NAT) server daemon"
tristate
default n
- depends ADK_IPV6
+ depends on ADK_IPV6
depends on ADK_CXX
select ADK_COMPILE_MIREDO
select ADK_KPACKAGE_KMOD_IPV6
diff --git a/package/mksh/Config.in b/package/mksh/Config.in
index 39f792af3..50578b0d2 100644
--- a/package/mksh/Config.in
+++ b/package/mksh/Config.in
@@ -21,8 +21,8 @@ config ADK_PACKAGE_MKSH
http://mirbsd.de/mksh
config ADK_PACKAGE_MKSH_FULL
- bool " Include all features"
- depends ADK_PACKAGE_MKSH
+ bool "Include all features"
+ depends on ADK_PACKAGE_MKSH
default y
help
Disable this to remove a few functions from mksh to make it smaller.
diff --git a/package/mpd/Config.in b/package/mpd/Config.in
index 259df005f..89a98f24e 100644
--- a/package/mpd/Config.in
+++ b/package/mpd/Config.in
@@ -15,28 +15,28 @@ config ADK_PACKAGE_MPD
http://www.musicpd.org/
config ADK_COMPILE_MPD_WITH_MP3
- prompt " MP3 support"
+ prompt "MP3 support"
bool
default y
- depends ADK_PACKAGE_MPD
+ depends on ADK_PACKAGE_MPD
select ADK_PACKAGE_LIBMAD
select ADK_PACKAGE_LIBID3TAG
help
Enable mp3 support (libmad).
config ADK_COMPILE_MPD_WITH_MP4
- prompt " MP4/AAC support"
+ prompt "MP4/AAC support"
bool
default y
- depends ADK_PACKAGE_MPD
+ depends on ADK_PACKAGE_MPD
select ADK_PACKAGE_LIBFAAD2
help
Enable mp4/aac support (libfaad2).
config ADK_COMPILE_MPD_OGG
- prompt " Ogg/Vorbis Support"
+ prompt "Ogg/Vorbis Support"
tristate
- depends ADK_PACKAGE_MPD
+ depends on ADK_PACKAGE_MPD
select ADK_COMPILE_MPD_WITH_OGG if ADK_COMPILE_MPD_OGG_FLOAT
select ADK_COMPILE_MPD_WITH_TREMOR if ADK_COMPILE_MPD_OGG_FIXED
default y
@@ -55,8 +55,8 @@ endchoice
config ADK_COMPILE_MPD_WITH_OGG
bool
default n
- depends ADK_PACKAGE_MPD
- depends ADK_COMPILE_MPD_OGG_FLOAT
+ depends on ADK_PACKAGE_MPD
+ depends on ADK_COMPILE_MPD_OGG_FLOAT
select ADK_PACKAGE_LIBOGG
select ADK_PACKAGE_LIBVORBIS
help
@@ -65,28 +65,28 @@ config ADK_COMPILE_MPD_WITH_OGG
config ADK_COMPILE_MPD_WITH_TREMOR
bool
default n
- depends ADK_PACKAGE_MPD
- depends ADK_COMPILE_MPD_OGG_FIXED
+ depends on ADK_PACKAGE_MPD
+ depends on ADK_COMPILE_MPD_OGG_FIXED
select ADK_PACKAGE_LIBVORBISIDEC
help
Enable ogg support (tremor).
Can not be used with shout plugin.
config ADK_COMPILE_MPD_WITH_FLAC
- prompt " FLAC Support"
+ prompt "FLAC Support"
bool
default y
- depends ADK_PACKAGE_MPD
+ depends on ADK_PACKAGE_MPD
select ADK_PACKAGE_LIBFLAC
help
Enable flac support (libflac).
config ADK_COMPILE_MPD_WITH_SHOUT
- prompt " Shout Support (Streaming support)"
+ prompt "Shout Support (Streaming support)"
bool
default y
- depends ADK_PACKAGE_MPD
- depends ADK_COMPILE_MPD_WITH_OGG
+ depends on ADK_PACKAGE_MPD
+ depends on ADK_COMPILE_MPD_WITH_OGG
select ADK_PACKAGE_LIBSHOUT
select ADK_PACKAGE_LIBVORBISENC
select ADK_PACKAGE_LIBLAME
diff --git a/package/mysql/Config.in b/package/mysql/Config.in
index 14b27169e..411823eb7 100644
--- a/package/mysql/Config.in
+++ b/package/mysql/Config.in
@@ -1,8 +1,8 @@
config ADK_COMPILE_MYSQL
tristate
default n
- depends ADK_PACKAGE_LIBMYSQLCLIENT
- depends ADK_CXX
+ depends on ADK_PACKAGE_LIBMYSQLCLIENT
+ depends on ADK_CXX
select ADK_PACKAGE_LIBNCURSES
select ADK_PACKAGE_ZLIB
select ADK_PACKAGE_LIBREADLINE
@@ -11,7 +11,7 @@ config ADK_PACKAGE_LIBMYSQLCLIENT
prompt "libmysqlclient.................... MySQL client library"
tristate
default n
- depends ADK_CXX
+ depends on ADK_CXX
select ADK_COMPILE_MYSQL
help
MySQL client library.
diff --git a/package/nano/Config.in b/package/nano/Config.in
index 7b164fa22..9ba6cc157 100644
--- a/package/nano/Config.in
+++ b/package/nano/Config.in
@@ -9,10 +9,10 @@ config ADK_PACKAGE_NANO
http://www.nano-editor.org/
config ADK_PACKAGE_NANO_TINY
- prompt " only compile a minimal nano (using --enable-tiny)"
+ prompt "only compile a minimal nano (using --enable-tiny)"
bool
default y
- depends ADK_PACKAGE_NANO
+ depends on ADK_PACKAGE_NANO
help
If not selected, nano will support justify, line wrapping, tab completion and multiple open file buffers.
diff --git a/package/ncurses/Config.in b/package/ncurses/Config.in
index 4847013b6..e5526dbcc 100644
--- a/package/ncurses/Config.in
+++ b/package/ncurses/Config.in
@@ -1,6 +1,6 @@
config ADK_COMPILE_NCURSES
tristate
- depends ADK_PACKAGE_LIBNCURSES
+ depends on ADK_PACKAGE_LIBNCURSES
config ADK_PACKAGE_LIBNCURSES
prompt "libncurses........................ Terminal handling library"
diff --git a/package/ndisc/Config.in b/package/ndisc/Config.in
index e7cafd5ee..c5723d37b 100644
--- a/package/ndisc/Config.in
+++ b/package/ndisc/Config.in
@@ -3,14 +3,14 @@
config ADK_COMPILE_NDISC6
tristate
default n
- depends ADK_IPV6
- depends ADK_PACKAGE_NDISC6 || ADK_PACKAGE_RDISC6 || ADK_PACKAGE_TCPTRACEROUTE6
+ depends on ADK_IPV6
+ depends on ADK_PACKAGE_NDISC6 || ADK_PACKAGE_RDISC6 || ADK_PACKAGE_TCPTRACEROUTE6
config ADK_PACKAGE_NDISC6
prompt "ndisc6............................ An ICMPv6 neighbour discovery tool"
tristate
default n
- depends ADK_IPV6
+ depends on ADK_IPV6
select ADK_COMPILE_NDISC6
help
@@ -22,7 +22,7 @@ config ADK_PACKAGE_RDISC6
prompt "rdisc6............................ An ICMPv6 router discovery tool"
tristate
default n
- depends ADK_IPV6
+ depends on ADK_IPV6
select ADK_COMPILE_NDISC6
help
@@ -34,7 +34,7 @@ config ADK_PACKAGE_TCPTRACEROUTE6
prompt "tcptraceroute6.................... A TCP/IPv6-based traceroute implementation"
tristate
default n
- depends ADK_IPV6
+ depends on ADK_IPV6
select ADK_COMPILE_NDISC6
help
diff --git a/package/olsrd/Config.in b/package/olsrd/Config.in
index c715b9ada..4d8d47429 100644
--- a/package/olsrd/Config.in
+++ b/package/olsrd/Config.in
@@ -10,27 +10,27 @@ config ADK_PACKAGE_OLSRD
http://www.olsr.org/
config ADK_PACKAGE_OLSRD_MOD_DYN_GW
- prompt " olsrd-mod-dyn-gw.............. Dynamic internet gateway plugin"
+ prompt "olsrd-mod-dyn-gw.............. Dynamic internet gateway plugin"
tristate
default n
- depends ADK_PACKAGE_OLSRD
+ depends on ADK_PACKAGE_OLSRD
config ADK_PACKAGE_OLSRD_MOD_HTTPINFO
- prompt " olsrd-mod-httpinfo............ Small informative web server plugin"
+ prompt "olsrd-mod-httpinfo............ Small informative web server plugin"
tristate
default n
- depends ADK_PACKAGE_OLSRD
+ depends on ADK_PACKAGE_OLSRD
config ADK_PACKAGE_OLSRD_MOD_NAMESERVICE
- prompt " olsrd-mod-nameservice......... Lightweight hostname resolver plugin"
+ prompt "olsrd-mod-nameservice......... Lightweight hostname resolver plugin"
tristate
default n
- depends ADK_PACKAGE_OLSRD
+ depends on ADK_PACKAGE_OLSRD
config ADK_PACKAGE_OLSRD_MOD_TAS
- prompt " olsrd-mod-tas................. Tiny Application Server (TAS) plugin for olsrd"
+ prompt "olsrd-mod-tas................. Tiny Application Server (TAS) plugin for olsrd"
tristate
default n
- depends ADK_PACKAGE_OLSRD
+ depends on ADK_PACKAGE_OLSRD
#endmenu
diff --git a/package/opencdk/Config.in b/package/opencdk/Config.in
index dffbc2b32..ce8fdf27c 100644
--- a/package/opencdk/Config.in
+++ b/package/opencdk/Config.in
@@ -1,7 +1,7 @@
config ADK_PACKAGE_OPENCDK
tristate
default n
- depends ADK_PACKAGE_LIBOPENCDK
+ depends on ADK_PACKAGE_LIBOPENCDK
config ADK_PACKAGE_LIBOPENCDK
prompt "libopencdk........................ The Open Crypto Development Kit library"
diff --git a/package/opensips/Config.in b/package/opensips/Config.in
index bc03bd78a..31c565218 100644
--- a/package/opensips/Config.in
+++ b/package/opensips/Config.in
@@ -10,186 +10,186 @@ config ADK_PACKAGE_OPENSIPS
configurable, free SIP server.
config ADK_PACKAGE_OPENSIPS_MOD_ACCOUNTING
- prompt " opensips-mod-acc............... Accounting support"
+ prompt "opensips-mod-acc............... Accounting support"
tristate
default n
- depends ADK_PACKAGE_OPENSIPS
+ depends on ADK_PACKAGE_OPENSIPS
help
Enable accounting support
config ADK_PACKAGE_OPENSIPS_MOD_AUTH
- prompt " opensips-mod-auth.............. Authentication support"
+ prompt "opensips-mod-auth.............. Authentication support"
tristate
default n
- depends ADK_PACKAGE_OPENSIPS
+ depends on ADK_PACKAGE_OPENSIPS
help
Enable authentication support
config ADK_PACKAGE_OPENSIPS_MOD_AUTH_DB
- prompt " opensips-mod-auth-db......... Authentication with database support"
+ prompt "opensips-mod-auth-db......... Authentication with database support"
tristate
default n
- depends ADK_PACKAGE_OPENSIPS_MOD_AUTH
+ depends on ADK_PACKAGE_OPENSIPS_MOD_AUTH
help
Enable authentication with database support
config ADK_PACKAGE_OPENSIPS_MOD_AVPOPS
- prompt " opensips-mod-avpops............ AVP options support"
+ prompt "opensips-mod-avpops............ AVP options support"
tristate
default n
- depends ADK_PACKAGE_OPENSIPS
+ depends on ADK_PACKAGE_OPENSIPS
help
Enable AVP options support
config ADK_PACKAGE_OPENSIPS_MOD_DISPATCHER
- prompt " opensips-mod-dispatcher........ dispatcher support"
+ prompt "opensips-mod-dispatcher........ dispatcher support"
tristate
default n
- depends ADK_PACKAGE_OPENSIPS
+ depends on ADK_PACKAGE_OPENSIPS
help
Enable dispatcher options support
config ADK_PACKAGE_OPENSIPS_MOD_DIVERSION
- prompt " opensips-mod-diversion......... diversion support"
+ prompt "opensips-mod-diversion......... diversion support"
tristate
default n
- depends ADK_PACKAGE_OPENSIPS
+ depends on ADK_PACKAGE_OPENSIPS
help
Enable diversion options support
config ADK_PACKAGE_OPENSIPS_MOD_FLATSTORE
- prompt " opensips-mod-flatstore......... flatstore support"
+ prompt "opensips-mod-flatstore......... flatstore support"
tristate
default n
- depends ADK_PACKAGE_OPENSIPS
+ depends on ADK_PACKAGE_OPENSIPS
help
Enable flatstore support
config ADK_PACKAGE_OPENSIPS_MOD_GFLAGS
- prompt " opensips-mod-gflags............ gflags support"
+ prompt "opensips-mod-gflags............ gflags support"
tristate
default n
- depends ADK_PACKAGE_OPENSIPS
+ depends on ADK_PACKAGE_OPENSIPS
help
Enable GFlags support
config ADK_PACKAGE_OPENSIPS_MOD_GROUP
- prompt " opensips-mod-group............. group support"
+ prompt "opensips-mod-group............. group support"
tristate
default n
- depends ADK_PACKAGE_OPENSIPS
+ depends on ADK_PACKAGE_OPENSIPS
help
Enable group support
config ADK_PACKAGE_OPENSIPS_MOD_MEDIAPROXY
- prompt " opensips-mod-mediaproxy........ Mediaproxy support"
+ prompt "opensips-mod-mediaproxy........ Mediaproxy support"
tristate
default n
- depends ADK_PACKAGE_OPENSIPS
+ depends on ADK_PACKAGE_OPENSIPS
help
Enable mediaproxy support
config ADK_PACKAGE_OPENSIPS_MOD_MSILO
- prompt " opensips-mod-msilo............. MSilo support"
+ prompt "opensips-mod-msilo............. MSilo support"
tristate
default n
- depends ADK_PACKAGE_OPENSIPS
+ depends on ADK_PACKAGE_OPENSIPS
help
Enable msilo support
config ADK_PACKAGE_OPENSIPS_MOD_NATHELPER
- prompt " opensips-mod-nathelper......... NAT helper support"
+ prompt "opensips-mod-nathelper......... NAT helper support"
tristate
default n
- depends ADK_PACKAGE_OPENSIPS
+ depends on ADK_PACKAGE_OPENSIPS
help
NAT helper support
config ADK_PACKAGE_OPENSIPS_MOD_OPTIONS
- prompt " opensips-mod-options........... options support"
+ prompt "opensips-mod-options........... options support"
tristate
default n
- depends ADK_PACKAGE_OPENSIPS
+ depends on ADK_PACKAGE_OPENSIPS
help
Enable options support
config ADK_PACKAGE_OPENSIPS_MOD_PDT
- prompt " opensips-mod-pdt............... PDT support"
+ prompt "opensips-mod-pdt............... PDT support"
tristate
default n
- depends ADK_PACKAGE_OPENSIPS
+ depends on ADK_PACKAGE_OPENSIPS
help
Enable pdt support
config ADK_PACKAGE_OPENSIPS_MOD_PERMISSIONS
- prompt " opensips-mod-permissions....... Permissions support"
+ prompt "opensips-mod-permissions....... Permissions support"
tristate
default n
- depends ADK_PACKAGE_OPENSIPS
+ depends on ADK_PACKAGE_OPENSIPS
help
Enable permissions support
config ADK_PACKAGE_OPENSIPS_MOD_PIKE
- prompt " opensips-mod-pike.............. PIKE support"
+ prompt "opensips-mod-pike.............. PIKE support"
tristate
default n
- depends ADK_PACKAGE_OPENSIPS
+ depends on ADK_PACKAGE_OPENSIPS
help
Enable pike support
config ADK_PACKAGE_OPENSIPS_MOD_SMS
- prompt " opensips-mod-sms............... SMS support"
+ prompt "opensips-mod-sms............... SMS support"
tristate
default n
- depends ADK_PACKAGE_OPENSIPS
+ depends on ADK_PACKAGE_OPENSIPS
help
SMS support
config ADK_PACKAGE_OPENSIPS_MOD_SPEEDDIAL
- prompt " opensips-mod-speeddial......... Speed Dial support"
+ prompt "opensips-mod-speeddial......... Speed Dial support"
tristate
default n
- depends ADK_PACKAGE_OPENSIPS
+ depends on ADK_PACKAGE_OPENSIPS
help
Speed Dial support
config ADK_PACKAGE_OPENSIPS_MOD_UAC
- prompt " opensips-mod-uac............... UAC support"
+ prompt "opensips-mod-uac............... UAC support"
tristate
default n
- depends ADK_PACKAGE_OPENSIPS
+ depends on ADK_PACKAGE_OPENSIPS
help
Enable UAC support
config ADK_PACKAGE_OPENSIPS_MOD_UAC_REDIRECT
- prompt " opensips-mod-uac............... UAC redirect support"
+ prompt "opensips-mod-uac............... UAC redirect support"
tristate
default n
- depends ADK_PACKAGE_OPENSIPS
+ depends on ADK_PACKAGE_OPENSIPS
help
Enable UAC redirect support
config ADK_PACKAGE_OPENSIPS_MOD_URI
- prompt " opensips-mod-uri............... URI support"
+ prompt "opensips-mod-uri............... URI support"
tristate
default n
- depends ADK_PACKAGE_OPENSIPS
+ depends on ADK_PACKAGE_OPENSIPS
help
Enable URI support
config ADK_PACKAGE_OPENSIPS_MOD_URI_DB
- prompt " opensips-mod-uri-db............ URI database support"
+ prompt "opensips-mod-uri-db............ URI database support"
tristate
default n
- depends ADK_PACKAGE_OPENSIPS
+ depends on ADK_PACKAGE_OPENSIPS
help
Enable URI database support
config ADK_PACKAGE_OPENSIPS_MOD_XLOG
- prompt " opensips-mod-xlog.............. Logging support"
+ prompt "opensips-mod-xlog.............. Logging support"
tristate
default n
- depends ADK_PACKAGE_OPENSIPS
+ depends on ADK_PACKAGE_OPENSIPS
help
Logging support
diff --git a/package/openssl/Config.in b/package/openssl/Config.in
index 1375cc39a..172fa1355 100644
--- a/package/openssl/Config.in
+++ b/package/openssl/Config.in
@@ -1,7 +1,7 @@
config ADK_COMPILE_OPENSSL
tristate
default n
- depends ADK_PACKAGE_LIBOPENSSL
+ depends on ADK_PACKAGE_LIBOPENSSL
config ADK_PACKAGE_LIBOPENSSL
prompt "openssl........................... Open source SSL (Secure Socket Layer) libraries"
@@ -23,7 +23,7 @@ config ADK_PACKAGE_OPENSSL_UTIL
prompt "openssl-util.................... OpenSSL command line tool"
tristate
default n
- depends ADK_PACKAGE_LIBOPENSSL
+ depends on ADK_PACKAGE_LIBOPENSSL
help
The OpenSSL Project is a collaborative effort to develop a robust,
commercial-grade, full-featured, and Open Source toolkit implementing
@@ -38,4 +38,4 @@ config ADK_PACKAGE_CA_CERTS
prompt "ca-certificates................... X.509 Root CA Certs of common CAs"
tristate
default n
- depends ADK_COMPILE_OPENSSL
+ depends on ADK_COMPILE_OPENSSL
diff --git a/package/openswan/Config.in b/package/openswan/Config.in
index 9bb43fa5c..543a80f58 100644
--- a/package/openswan/Config.in
+++ b/package/openswan/Config.in
@@ -8,3 +8,23 @@ config ADK_PACKAGE_OPENSWAN
Openswan is an implementation of IPsec for Linux.
http://www.openswan.org/
+
+choice
+prompt "IPSec stack to use"
+depends on ADK_PACKAGE_OPENSWAN
+config ADK_COMPILE_OPENSWAN_WITH_NETKEY
+ prompt "NETKEY - use Linux integrated IPSec Stack"
+ select ADK_KPACKAGE_KMOD_NET_KEY
+ select ADK_KPACKAGE_KMOD_INET_XFRM_MODE_TUNNEL
+ select ADK_KPACKAGE_KMOD_INET_XFRM_MODE_TRANSPORT
+ select ADK_KPACKAGE_KMOD_INET_ESP
+ select ADK_KPACKAGE_KMOD_INET_AH
+ bool
+ help
+
+config ADK_COMPILE_OPENSWAN_WITH_KLIPS
+ prompt "KLIPS - use OpenS/WAN IPSec Stack"
+ bool
+ help
+
+endchoice
diff --git a/package/openswan/Makefile b/package/openswan/Makefile
index 2fdb07849..3c417135d 100644
--- a/package/openswan/Makefile
+++ b/package/openswan/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= openswan
-PKG_VERSION:= 2.6.21
+PKG_VERSION:= 2.6.22
PKG_RELEASE:= 1
-PKG_MD5SUM:= ba9da6c90e0f5fe856767d7510ce371f
+PKG_MD5SUM:= 9a30009bade8a1b09fba27680c87cf72
PKG_DESCR:= IPSec software
PKG_SECTION:= net
PKG_DEPENDS:= ip libgmp
@@ -18,42 +18,36 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,OPENSWAN,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-FLAGS:= ${TCFLAGS} ${TCPPFLAGS} ${TLDFLAGS}
-
-do-build:
- ${MAKE} -C ${WRKBUILD} \
- ${TARGET_CONFIGURE_OPTS} \
- KERNELSRC="${LINUX_DIR}" \
- ARCH="${ARCH}" \
- USERCOMPILE="${FLAGS}" \
- EXTRA_INCLUDE="${TCPPFLAGS}" \
- EXTRA_LIBS="${TLDFLAGS}" \
- IPSECDIR="/usr/lib/ipsec" \
- INC_USRLOCAL="/usr" \
- MODPROBE="insmod" \
- OSDEP="linux" \
- BUILDENV="linux" \
- programs
-
-do-install:
- ${MAKE} -C ${WRKBUILD} \
- ${TARGET_CONFIGURE_OPTS} \
- DESTDIR="${IDIR_OPENSWAN}" \
- KERNELSRC="${LINUX_DIR}" \
- ARCH="${ARCH}" \
- USERCOMPILE="${FLAGS}" \
- IPSECDIR="/usr/lib/ipsec" \
- INC_USRLOCAL="/usr" \
- MODPROBE="insmod" \
- OSDEP="linux" \
- BUILDENV="linux" \
- install
- rm -rf ${IDIR_OPENSWAN}/usr/share
- rm -rf ${IDIR_OPENSWAN}/usr/man
- rm -rf ${IDIR_OPENSWAN}/var
- mv ${IDIR_OPENSWAN}/etc/rc.d/init.d/ipsec \
+#ifeq ($(ADK_COMPILE_OPENSWAN_WITH_NETKEY),y)
+#XAKE_FLAGS+= USE_KLIPS=false USE_NETKEY=true
+#endif
+
+#ifeq ($(ADK_COMPILE_OPENSWAN_WITH_KLIPS),y)
+#XAKE_FLAGS+= USE_KLIPS=true USE_NETKEY=false
+#endif
+
+XAKE_FLAGS+= KERNELSRC="${LINUX_DIR}" \
+ IPSECDIR="/usr/lib/ipsec" \
+ INC_USRLOCAL="/usr" \
+ MODPROBE="insmod" \
+ OSDEP="linux" \
+ BUILDENV="linux"
+
+BUILD_STYLE:= auto
+INSTALL_STYLE:= auto
+ALL_TARGET:= programs
+
+post-install:
+ ${INSTALL_DIR} ${IDIR_OPENSWAN}/usr/lib/ipsec
+ ${INSTALL_DIR} ${IDIR_OPENSWAN}/usr/libexec/ipsec
+ ${INSTALL_DIR} ${IDIR_OPENSWAN}/etc/ipsec.d
+ ${INSTALL_DIR} ${IDIR_OPENSWAN}/usr/sbin
+ ${CP} ${WRKINST}/etc/ipsec.conf ${IDIR_OPENSWAN}/etc/
+ ${CP} ${WRKINST}/etc/ipsec.d/* ${IDIR_OPENSWAN}/etc/ipsec.d
+ ${CP} ${WRKINST}/usr/lib/ipsec/* ${IDIR_OPENSWAN}/usr/lib/ipsec
+ ${CP} ${WRKINST}/usr/libexec/ipsec/* ${IDIR_OPENSWAN}/usr/libexec/ipsec
+ ${INSTALL_BIN} ${WRKINST}/usr/sbin/ipsec ${IDIR_OPENSWAN}/usr/sbin
+ ${INSTALL_BIN} ${WRKINST}/etc/rc.d/init.d/ipsec \
${IDIR_OPENSWAN}/usr/libexec/ipsec/setup
- rm -rf ${IDIR_OPENSWAN}/etc/rc*.d
- find ${IDIR_OPENSWAN} -name \*.old -print0 | xargs -0 rm -rf
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/openswan/patches/patch-Makefile_inc b/package/openswan/patches/patch-Makefile_inc
index 653528eb9..872f21335 100644
--- a/package/openswan/patches/patch-Makefile_inc
+++ b/package/openswan/patches/patch-Makefile_inc
@@ -1,5 +1,5 @@
---- openswan-2.6.21.orig/Makefile.inc 2009-03-30 15:11:28.000000000 +0200
-+++ openswan-2.6.21/Makefile.inc 2009-06-13 14:48:55.000000000 +0200
+--- openswan-2.6.22.orig/Makefile.inc 2009-06-23 04:53:08.000000000 +0200
++++ openswan-2.6.22/Makefile.inc 2009-07-23 20:09:34.556071786 +0200
@@ -163,7 +163,7 @@ INSTALL=install
# how backup names are composed.
# Note that the install procedures will never overwrite an existing config
@@ -9,3 +9,18 @@
INSTSUIDFLAGS=--mode=u+rxs,g+rx,o+rx --group=root -b --suffix=.old
INSTMANFLAGS=
INSTCONFFLAGS=
+@@ -262,12 +262,12 @@ RH_KERNELSRC?=/lib/modules/2.6.9-1.681_F
+ # Note you need a locally running bind9 nameserver with lwres{} enabled
+ # to use this, or have the "lwres" package installed and running.
+ # This only affects conns that use DNS for keys in lookups.
+-USE_LWRES?=false
++USE_LWRES?=true
+
+ # Do a new lookup every time a connection is (re)started. This works better
+ # on hosts with some dyndns service, since DPD will cause a new dns lookup,
+ # but it could be a potential security issue if receiving spoofed dns.
+-USE_DYNAMICDNS?=true
++USE_DYNAMICDNS?=false
+
+ # Do we want all the configuration files like ipsec.conf and ipsec.secrets
+ # and any certificates to be in a single directory defined by
diff --git a/package/openswan/patches/patch-programs_Makefile_program b/package/openswan/patches/patch-programs_Makefile_program
index 74f5c8751..154fd06c2 100644
--- a/package/openswan/patches/patch-programs_Makefile_program
+++ b/package/openswan/patches/patch-programs_Makefile_program
@@ -1,6 +1,6 @@
$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- openswan-2.6.21.orig/programs/Makefile.program 2009-03-30 15:11:28.000000000 +0200
-+++ openswan-2.6.21/programs/Makefile.program 2009-06-13 14:42:38.000000000 +0200
+--- openswan-2.6.22.orig/programs/Makefile.program 2009-06-23 04:53:08.000000000 +0200
++++ openswan-2.6.22/programs/Makefile.program 2009-07-23 19:46:18.635264333 +0200
@@ -49,9 +49,9 @@ CFLAGS+=-DFINALCONFFILE=\"${FINALCONFFIL
CFLAGS+=-DFINALVARDIR=\"${FINALVARDIR}\"
@@ -14,7 +14,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
CFLAGS+= ${WERROR}
-@@ -108,67 +108,67 @@ endif
+@@ -104,67 +104,67 @@ endif
ifneq ($(NOINSTALL),true)
doinstall:: $(PROGRAM) $(CONFFILES) $(EXTRA8MAN) $(EXTRA5MAN) $(EXTRA5PROC) $(LIBFILES) $(CONFDFILES)
diff --git a/package/openswan/patches/patch-programs_ikeping_ikeping_c b/package/openswan/patches/patch-programs_ikeping_ikeping_c
index 5e8bde61b..4be18fcdb 100644
--- a/package/openswan/patches/patch-programs_ikeping_ikeping_c
+++ b/package/openswan/patches/patch-programs_ikeping_ikeping_c
@@ -1,7 +1,7 @@
$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- openswan-2.6.18.orig/programs/ikeping/ikeping.c 2008-10-06 18:52:49.000000000 +0200
-+++ openswan-2.6.18/programs/ikeping/ikeping.c 2008-10-14 13:09:06.000000000 +0200
-@@ -316,7 +316,7 @@ main(int argc, char **argv)
+--- openswan-2.6.22.orig/programs/ikeping/ikeping.c 2009-06-23 04:53:08.000000000 +0200
++++ openswan-2.6.22/programs/ikeping/ikeping.c 2009-07-23 19:46:18.643265912 +0200
+@@ -319,7 +319,7 @@ main(int argc, char **argv)
natt=0;
listen_only=0;
noDNS=0;
diff --git a/package/openvpn/Config.in b/package/openvpn/Config.in
index 18fd4f298..28d9696a2 100644
--- a/package/openvpn/Config.in
+++ b/package/openvpn/Config.in
@@ -15,19 +15,19 @@ config ADK_COMPILE_OPENVPN_WITH_SERVER
prompt "server support.................. enable to use OpenVPN as server"
bool
default y
- depends ADK_PACKAGE_OPENVPN
+ depends on ADK_PACKAGE_OPENVPN
config ADK_COMPILE_OPENVPN_WITH_HTTP
prompt "enable http proxy support....... allow tunneling through http-proxy"
bool
default y
- depends ADK_PACKAGE_OPENVPN
+ depends on ADK_PACKAGE_OPENVPN
config ADK_COMPILE_OPENVPN_WITH_OPENSSL
prompt "enable openssl.................. encryption support"
bool
default y
- depends ADK_PACKAGE_OPENVPN
+ depends on ADK_PACKAGE_OPENVPN
select ADK_PACKAGE_LIBOPENSSL
help
if unsure say "y" you really want that!
@@ -36,27 +36,27 @@ config ADK_COMPILE_OPENVPN_WITH_LZO
prompt "enable lzo...................... Enable transparent compression"
bool
default y
- depends ADK_PACKAGE_OPENVPN
+ depends on ADK_PACKAGE_OPENVPN
select ADK_PACKAGE_LIBLZO
config ADK_COMPILE_OPENVPN_WITH_PASSWORD_SAVE
prompt "Enable password saving.......... allow to read passwords for PKCS12 from file"
bool
default y
- depends ADK_PACKAGE_OPENVPN
+ depends on ADK_PACKAGE_OPENVPN
config ADK_COMPILE_OPENVPN_WITH_SMALL
prompt "Reduce executable size.......... disable OCC, usage message, and verb 4 parm list"
bool
default n
- depends ADK_PACKAGE_OPENVPN
+ depends on ADK_PACKAGE_OPENVPN
config ADK_PACKAGE_OPENVPN_EASY_RSA
prompt "openvpn-easy-rsa................ simple shell scripts to manage a Certificate Authority"
tristate
default n
select ADK_PACKAGE_OPENSSL_UTIL
- depends ADK_PACKAGE_OPENVPN
+ depends on ADK_PACKAGE_OPENVPN
help
collection of shell scripts to manage a simple CA infrastructure
diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile
index c88869999..93482c9e9 100644
--- a/package/openvpn/Makefile
+++ b/package/openvpn/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= openvpn
-PKG_VERSION:= 2.0.9
-PKG_RELEASE:= 7
-PKG_MD5SUM:= 60745008b90b7dbe25fe8337c550fec6
+PKG_VERSION:= 2.1_rc19
+PKG_RELEASE:= 1
+PKG_MD5SUM:= ba2ee667a8b7606b125b7d32f47ca578
PKG_DESCR:= Open Source VPN solution using SSL
PKG_SECTION:= net
PKG_DEPENDS:= kmod-tun
diff --git a/package/osiris/Config.in b/package/osiris/Config.in
index 84a16435a..b8bfe8210 100644
--- a/package/osiris/Config.in
+++ b/package/osiris/Config.in
@@ -1,7 +1,7 @@
config ADK_COMPILE_OSIRIS
tristate
default n
- depends ADK_PACKAGE_OSIRISD
+ depends on ADK_PACKAGE_OSIRISD
config ADK_PACKAGE_OSIRISD
prompt "osirisd........................... Host integrity monitoring system (scanning agent)"
diff --git a/package/pcre/Config.in b/package/pcre/Config.in
index 955cd3ca4..21a23884c 100644
--- a/package/pcre/Config.in
+++ b/package/pcre/Config.in
@@ -1,7 +1,7 @@
config ADK_COMPILE_PCRE
tristate
default n
- depends ADK_PACKAGE_LIBPCRE
+ depends on ADK_PACKAGE_LIBPCRE
config ADK_PACKAGE_LIBPCRE
prompt "libpcre........................... A Perl Compatible Regular Expression library"
diff --git a/package/php/Config.in b/package/php/Config.in
index 422ede8c2..57ab1f333 100644
--- a/package/php/Config.in
+++ b/package/php/Config.in
@@ -27,20 +27,20 @@ config ADK_PACKAGE_PHP_MOD_CURL
prompt "php-mod-curl..................... cURL module"
tristate
default n
- depends ADK_COMPILE_PHP
+ depends on ADK_COMPILE_PHP
select ADK_PACKAGE_LIBCURL
config ADK_PACKAGE_PHP_MOD_FTP
prompt "php-mod-ftp...................... FTP module"
tristate
default n
- depends ADK_COMPILE_PHP
+ depends on ADK_COMPILE_PHP
config ADK_PACKAGE_PHP_MOD_GD
prompt "php-mod-gd....................... GD graphics library module"
tristate
default n
- depends ADK_COMPILE_PHP
+ depends on ADK_COMPILE_PHP
select ADK_PACKAGE_LIBGD
select ADK_PACKAGE_LIBPNG
@@ -48,69 +48,69 @@ config ADK_PACKAGE_PHP_MOD_GMP
prompt "php-mod-gmp...................... GMP module"
tristate
default n
- depends ADK_COMPILE_PHP
+ depends on ADK_COMPILE_PHP
select ADK_PACKAGE_LIBGMP
config ADK_PACKAGE_PHP_MOD_LDAP
prompt "php-mod-ldap..................... LDAP module"
tristate
default n
- depends ADK_COMPILE_PHP
+ depends on ADK_COMPILE_PHP
select ADK_PACKAGE_LIBOPENLDAP
config ADK_PACKAGE_PHP_MOD_MYSQL
prompt "php-mod-mysql.................... MySQL module"
tristate
default n
- depends ADK_CXX
- depends ADK_COMPILE_PHP
+ depends on ADK_CXX
+ depends on ADK_COMPILE_PHP
select ADK_PACKAGE_LIBMYSQLCLIENT
config ADK_PACKAGE_PHP_MOD_OPENSSL
prompt "php-mod-openssl.................. OpenSSL module"
tristate
default n
- depends ADK_COMPILE_PHP
+ depends on ADK_COMPILE_PHP
select ADK_PACKAGE_LIBOPENSSL
config ADK_PACKAGE_PHP_MOD_PCRE
prompt "php-mod-pcre..................... PCRE module"
tristate
default n
- depends ADK_COMPILE_PHP
+ depends on ADK_COMPILE_PHP
select ADK_PACKAGE_LIBPCRE
config ADK_PACKAGE_PHP_MOD_PGSQL
prompt "php-mod-pgsql.................... PostgreSQL module"
tristate
default n
- depends ADK_COMPILE_PHP
+ depends on ADK_COMPILE_PHP
select ADK_PACKAGE_LIBPQ
config ADK_PACKAGE_PHP_MOD_SESSION
prompt "php-mod-session.................. Sessions module"
tristate
default n
- depends ADK_COMPILE_PHP
+ depends on ADK_COMPILE_PHP
config ADK_PACKAGE_PHP_MOD_SQLITE
prompt "php-mod-sqlite................... SQLite module"
tristate
default n
- depends ADK_COMPILE_PHP
+ depends on ADK_COMPILE_PHP
select ADK_PACKAGE_LIBSQLITE
config ADK_PACKAGE_PHP_MOD_SOCKETS
prompt "php-mod-sockets.................. Sockets module"
tristate
default n
- depends ADK_COMPILE_PHP
+ depends on ADK_COMPILE_PHP
config ADK_PACKAGE_PHP_MOD_XML
prompt "php-mod-xml...................... XML module"
tristate
default n
- depends ADK_COMPILE_PHP
+ depends on ADK_COMPILE_PHP
select ADK_PACKAGE_LIBEXPAT
endmenu
diff --git a/package/pmacct/Config.in b/package/pmacct/Config.in
index ef1e85a41..fe3e4d99d 100644
--- a/package/pmacct/Config.in
+++ b/package/pmacct/Config.in
@@ -1,7 +1,7 @@
config ADK_COMPILE_PMACCT
tristate
default n
- depends ADK_PACKAGE_PMACCTD || ADK_PACKAGE_PMACCT_CLIENT || ADK_PACKAGE_SFACCTD || ADK_PACKAGE_NFACCTD
+ depends on ADK_PACKAGE_PMACCTD || ADK_PACKAGE_PMACCT_CLIENT || ADK_PACKAGE_SFACCTD || ADK_PACKAGE_NFACCTD
config ADK_PACKAGE_PMACCTD
prompt "pmacctd....................... IP accounting daemon (libpcap based)"
diff --git a/package/popt/Config.in b/package/popt/Config.in
index 554cd3b32..a16ba04d5 100644
--- a/package/popt/Config.in
+++ b/package/popt/Config.in
@@ -1,6 +1,6 @@
config ADK_COMPILE_POPT
tristate
- depends ADK_PACKAGE_LIBPOPT
+ depends on ADK_PACKAGE_LIBPOPT
config ADK_PACKAGE_LIBPOPT
prompt "libpopt........................... Command line option parsing library"
diff --git a/package/portmap/Config.in b/package/portmap/Config.in
index ac4415a05..cc5169ce9 100644
--- a/package/portmap/Config.in
+++ b/package/portmap/Config.in
@@ -8,7 +8,7 @@ config ADK_PACKAGE_PORTMAP
to make RPC calls. Services that use RPC include NFS and NIS.
config ADK_PACKAGE_PORTMAP_LIBWRAP
- bool " Use tcp_wrappers"
+ bool "Use tcp_wrappers"
default n
depends on ADK_PACKAGE_PORTMAP
select ADK_PACKAGE_LIBWRAP
diff --git a/package/postgresql/Config.in b/package/postgresql/Config.in
index d1d0d09fe..d2e77a9c4 100644
--- a/package/postgresql/Config.in
+++ b/package/postgresql/Config.in
@@ -1,7 +1,7 @@
config ADK_COMPILE_POSTGRESQL
tristate
default n
- depends ADK_PACKAGE_LIBPQ
+ depends on ADK_PACKAGE_LIBPQ
config ADK_PACKAGE_LIBPQ
prompt "libpq............................. PostgreSQL client library"
diff --git a/package/ppp/Config.in b/package/ppp/Config.in
index 493c74e58..0969ae40a 100644
--- a/package/ppp/Config.in
+++ b/package/ppp/Config.in
@@ -10,38 +10,38 @@ config ADK_PACKAGE_PPP
# tristate
# default n
# select ADK_KPACKAGE_KMOD_PPPOATM
-# depends ADK_PACKAGE_PPP
+# depends on ADK_PACKAGE_PPP
config ADK_PACKAGE_PPP_MOD_PPPOE
prompt "ppp-mod-pppoe................... PPPoE (PPP over Ethernet) plugin"
tristate
default n
select ADK_KPACKAGE_KMOD_PPPOE
- depends ADK_PACKAGE_PPP
+ depends on ADK_PACKAGE_PPP
config ADK_PACKAGE_PPP_MOD_RADIUS
prompt "ppp-mod-radius.................. RADIUS (Remote Authentication Dial-In User Service) plugin"
tristate
default n
- depends ADK_PACKAGE_PPP
+ depends on ADK_PACKAGE_PPP
config ADK_PACKAGE_PPP_MOD_CHAT
prompt "chat............................ Utility to establish conversation with other PPP servers (via a modem)"
tristate
default n
- depends ADK_PACKAGE_PPP
+ depends on ADK_PACKAGE_PPP
config ADK_PACKAGE_PPP_MOD_PPPDUMP
prompt "pppdump......................... Utility to read PPP record file"
tristate
default n
- depends ADK_PACKAGE_PPP
+ depends on ADK_PACKAGE_PPP
config ADK_PACKAGE_PPP_MOD_PPPSTATS
prompt "pppstats........................ Utility to report PPP statistics"
tristate
default n
- depends ADK_PACKAGE_PPP
+ depends on ADK_PACKAGE_PPP
config ADK_PACKAGE_PPP_MOD_PPPUMTS
prompt "GPRS/UMTS support............... Package with scripts and dependencies to run UMTS/GRPS"
@@ -49,4 +49,4 @@ config ADK_PACKAGE_PPP_MOD_PPPUMTS
default n
select ADK_PACKAGE_COMGT
select ADK_KPACKAGE_KMOD_USB_SERIAL
- depends ADK_PACKAGE_PPP
+ depends on ADK_PACKAGE_PPP
diff --git a/package/quagga/Config.in b/package/quagga/Config.in
index 93ae9a2f4..446d7ab9e 100644
--- a/package/quagga/Config.in
+++ b/package/quagga/Config.in
@@ -3,7 +3,7 @@
config ADK_PACKAGE_QUAGGA
prompt "quagga............................ The Quagga Software Routing Suite"
tristate
- depends ADK_IPV6
+ depends on ADK_IPV6
default n
help
A routing software package that provides TCP/IP based routing services
@@ -13,53 +13,53 @@ config ADK_PACKAGE_QUAGGA
http://www.quagga.net/
config ADK_PACKAGE_QUAGGA_BGPD
- prompt " quagga-bgpd................... BGPv4, BGPv4+, BGPv4- routing engine"
+ prompt "quagga-bgpd................... BGPv4, BGPv4+, BGPv4- routing engine"
tristate
default n
- depends ADK_PACKAGE_QUAGGA
+ depends on ADK_PACKAGE_QUAGGA
help
A BGPv4, BGPv4+, BGPv4- routing engine for use with Quagga routing
software.
config ADK_PACKAGE_QUAGGA_OSPFD
- prompt " quagga-ospfd.................. OSPFv2 routing engine"
+ prompt "quagga-ospfd.................. OSPFv2 routing engine"
tristate
default n
- depends ADK_PACKAGE_QUAGGA
+ depends on ADK_PACKAGE_QUAGGA
help
An OSPFv2 (IPv4) routing engine for use with Quagga routing software.
config ADK_PACKAGE_QUAGGA_OSPF6D
- prompt " quagga-ospf6d................. OSPFv3 routing engine"
+ prompt "quagga-ospf6d................. OSPFv3 routing engine"
tristate
default n
- depends ADK_PACKAGE_QUAGGA
- depends ADK_IPV6
+ depends on ADK_PACKAGE_QUAGGA
+ depends on ADK_IPV6
help
An OSPFv3 (IPv6) routing engine for use with Quagga routing software.
config ADK_PACKAGE_QUAGGA_RIPD
- prompt " quagga-ripd................... RIP routing engine"
+ prompt "quagga-ripd................... RIP routing engine"
tristate
default n
- depends ADK_PACKAGE_QUAGGA
+ depends on ADK_PACKAGE_QUAGGA
help
A RIP (IPv4) routing engine for use with Quagga routing software.
config ADK_PACKAGE_QUAGGA_RIPNGD
- prompt " quagga-ripngd................. RIPNG routing engine"
+ prompt "quagga-ripngd................. RIPNG routing engine"
tristate
default n
- depends ADK_PACKAGE_QUAGGA
- depends ADK_IPV6
+ depends on ADK_PACKAGE_QUAGGA
+ depends on ADK_IPV6
help
A RIPNG (IPv6) routing engine for use with Quagga routing software.
config ADK_PACKAGE_QUAGGA_VTYSH
- prompt " quagga-vtysh.................. integrated shell for Quagga routing software"
+ prompt "quagga-vtysh.................. integrated shell for Quagga routing software"
tristate
default n
- depends ADK_PACKAGE_QUAGGA
+ depends on ADK_PACKAGE_QUAGGA
select ADK_PACKAGE_LIBREADLINE
select ADK_PACKAGE_LIBNCURSES
help
diff --git a/package/readline/Config.in b/package/readline/Config.in
index aa126e21f..c46e6fe22 100644
--- a/package/readline/Config.in
+++ b/package/readline/Config.in
@@ -1,7 +1,7 @@
config ADK_COMPILE_READLINE
tristate
default n
- depends ADK_PACKAGE_LIBREADLINE
+ depends on ADK_PACKAGE_LIBREADLINE
config ADK_PACKAGE_LIBREADLINE
prompt "libreadline....................... Command lines edition library"
diff --git a/package/rp-pppoe/Config.in b/package/rp-pppoe/Config.in
index 439d582ee..6d27ecb4b 100644
--- a/package/rp-pppoe/Config.in
+++ b/package/rp-pppoe/Config.in
@@ -3,7 +3,7 @@
config ADK_COMPILE_RP_PPPOE
tristate
default n
- depends ADK_PACKAGE_PPPOE_CLIENT || ADK_PACKAGE_PPPOE_RELAY || ADK_PACKAGE_PPPOE_SERVER || ADK_PACKAGE_PPPOE_SNIFF
+ depends on ADK_PACKAGE_PPPOE_CLIENT || ADK_PACKAGE_PPPOE_RELAY || ADK_PACKAGE_PPPOE_SERVER || ADK_PACKAGE_PPPOE_SNIFF
config ADK_PACKAGE_PPPOE_CLIENT
prompt "pppoe-client...................... PPPoE (PPP over Ethernet) client"
diff --git a/package/rrdcollect/Config.in b/package/rrdcollect/Config.in
index a6935c706..1c35e092a 100644
--- a/package/rrdcollect/Config.in
+++ b/package/rrdcollect/Config.in
@@ -1,8 +1,8 @@
config ADK_PACKAGE_RRDCOLLECT
- prompt " rrdcollect...................... Round-Robin Database (RRD) collecting daemon"
+ prompt "rrdcollect...................... Round-Robin Database (RRD) collecting daemon"
tristate
default n
- depends ADK_PACKAGE_LIBRRD || ADK_PACKAGE_LIBRRD1
+ depends on ADK_PACKAGE_LIBRRD || ADK_PACKAGE_LIBRRD1
help
RRDcollect is a daemon which polls ceratin files in /proc/
directory, gathering data and storing it inside RRDtool's
@@ -15,10 +15,10 @@ config ADK_PACKAGE_RRDCOLLECT
This package contains only the deamon program.
config ADK_PACKAGE_RRDCOLLECT_EXAMPLE
- prompt " rrdcollect-example.......... Example setup for RRD collecting daemon above"
+ prompt "rrdcollect-example.......... Example setup for RRD collecting daemon above"
tristate
default n
- depends ADK_PACKAGE_RRDCOLLECT
+ depends on ADK_PACKAGE_RRDCOLLECT
help
RRDcollect is a daemon which polls ceratin files in /proc/
directory, gathering data and storing it inside RRDtool's
diff --git a/package/rrs/Config.in b/package/rrs/Config.in
index 6fe48d0fd..901492074 100644
--- a/package/rrs/Config.in
+++ b/package/rrs/Config.in
@@ -1,7 +1,7 @@
config ADK_COMPILE_RRS
tristate
default n
- depends ADK_PACKAGE_RRS || ADK_PACKAGE_RRS_NOSSL
+ depends on ADK_PACKAGE_RRS || ADK_PACKAGE_RRS_NOSSL
config ADK_PACKAGE_RRS
prompt "rrs............................... A reverse (connecting) remote shell, with SSL support"
diff --git a/package/samba/Config.in b/package/samba/Config.in
index f548a5e2b..b26d2791e 100644
--- a/package/samba/Config.in
+++ b/package/samba/Config.in
@@ -1,7 +1,7 @@
config ADK_COMPILE_SAMBA
tristate
default n
- depends ADK_PACKAGE_SAMBA || ADK_PACKAGE_SAMBA_CLIENT || ADK_PACKAGE_SMBFS
+ depends on ADK_PACKAGE_SAMBA || ADK_PACKAGE_SAMBA_CLIENT || ADK_PACKAGE_SMBFS
config ADK_PACKAGE_SAMBA
prompt "samba............................. NetBIOS/SMB file and print server"
diff --git a/package/sane-backends/Config.in b/package/sane-backends/Config.in
index dd0e2522f..de3c1ecd2 100644
--- a/package/sane-backends/Config.in
+++ b/package/sane-backends/Config.in
@@ -20,7 +20,7 @@ config ADK_PACKAGE_SANE_BACKEND_ABATON
prompt "sane-backend-abaton............. Scanner Access Now Easy (ABATON)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -31,7 +31,7 @@ config ADK_PACKAGE_SANE_BACKEND_AGFAFOCUS
prompt "sane-backend-agfafocus.......... Scanner Access Now Easy (AGFAFOCUS)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -42,7 +42,7 @@ config ADK_PACKAGE_SANE_BACKEND_APPLE
prompt "sane-backend-apple.............. Scanner Access Now Easy (APPLE)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -53,7 +53,7 @@ config ADK_PACKAGE_SANE_BACKEND_ARTEC_EPLUS48U
prompt "sane-backend-artec-eplus48u..... Scanner Access Now Easy (ARTEC_EPLUS48U)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -64,7 +64,7 @@ config ADK_PACKAGE_SANE_BACKEND_ARTEC
prompt "sane-backend-artec.............. Scanner Access Now Easy (ARTEC)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -75,7 +75,7 @@ config ADK_PACKAGE_SANE_BACKEND_AS6E
prompt "sane-backend-as6e............... Scanner Access Now Easy (AS6E)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -86,7 +86,7 @@ config ADK_PACKAGE_SANE_BACKEND_AVISION
prompt "sane-backend-avision............ Scanner Access Now Easy (AVISION)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -97,7 +97,7 @@ config ADK_PACKAGE_SANE_BACKEND_BH
prompt "sane-backend-bh................. Scanner Access Now Easy (BH)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -108,7 +108,7 @@ config ADK_PACKAGE_SANE_BACKEND_CANON630U
prompt "sane-backend-canon630u.......... Scanner Access Now Easy (CANON630U)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -119,7 +119,7 @@ config ADK_PACKAGE_SANE_BACKEND_CANON
prompt "sane-backend-canon.............. Scanner Access Now Easy (CANON)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -130,7 +130,7 @@ config ADK_PACKAGE_SANE_BACKEND_COOLSCAN2
prompt "sane-backend-coolscan2.......... Scanner Access Now Easy (COOLSCAN2)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -141,7 +141,7 @@ config ADK_PACKAGE_SANE_BACKEND_COOLSCAN
prompt "sane-backend-coolscan........... Scanner Access Now Easy (COOLSCAN)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -152,7 +152,7 @@ config ADK_PACKAGE_SANE_BACKEND_DC25
prompt "sane-backend-dc25............... Scanner Access Now Easy (DC25)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -163,7 +163,7 @@ config ADK_PACKAGE_SANE_BACKEND_DMC
prompt "sane-backend-dmc................ Scanner Access Now Easy (DMC)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -174,7 +174,7 @@ config ADK_PACKAGE_SANE_BACKEND_EPSON
prompt "sane-backend-epson.............. Scanner Access Now Easy (EPSON)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -185,7 +185,7 @@ config ADK_PACKAGE_SANE_BACKEND_FUJITSU
prompt "sane-backend-fujitsu............ Scanner Access Now Easy (FUJITSU)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -196,7 +196,7 @@ config ADK_PACKAGE_SANE_BACKEND_GENESYS
prompt "sane-backend-genesys............ Scanner Access Now Easy (GENESYS)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -207,7 +207,7 @@ config ADK_PACKAGE_SANE_BACKEND_GT68XX
prompt "sane-backend-gt68xx............. Scanner Access Now Easy (GT68XX)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -218,7 +218,7 @@ config ADK_PACKAGE_SANE_BACKEND_HP3500
prompt "sane-backend-hp3500............. Scanner Access Now Easy (HP3500)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -229,7 +229,7 @@ config ADK_PACKAGE_SANE_BACKEND_HP4200
prompt "sane-backend-hp4200............. Scanner Access Now Easy (HP4200)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -240,7 +240,7 @@ config ADK_PACKAGE_SANE_BACKEND_HP5400
prompt "sane-backend-hp5400............. Scanner Access Now Easy (HP5400)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -251,7 +251,7 @@ config ADK_PACKAGE_SANE_BACKEND_HP
prompt "sane-backend-hp................. Scanner Access Now Easy (HP)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -262,7 +262,7 @@ config ADK_PACKAGE_SANE_BACKEND_IBM
prompt "sane-backend-ibm................ Scanner Access Now Easy (IBM)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -273,7 +273,7 @@ config ADK_PACKAGE_SANE_BACKEND_LEO
prompt "sane-backend-leo................ Scanner Access Now Easy (LEO)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -284,7 +284,7 @@ config ADK_PACKAGE_SANE_BACKEND_LEXMARK
prompt "sane-backend-lexmark............ Scanner Access Now Easy (LEXMARK)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -295,7 +295,7 @@ config ADK_PACKAGE_SANE_BACKEND_MA1509
prompt "sane-backend-ma1509............. Scanner Access Now Easy (MA1509)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -306,7 +306,7 @@ config ADK_PACKAGE_SANE_BACKEND_MATSUSHITA
prompt "sane-backend-matsushita......... Scanner Access Now Easy (MATSUSHITA)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -317,7 +317,7 @@ config ADK_PACKAGE_SANE_BACKEND_MICROTEK2
prompt "sane-backend-microtek2.......... Scanner Access Now Easy (MICROTEK2)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -328,7 +328,7 @@ config ADK_PACKAGE_SANE_BACKEND_MICROTEK
prompt "sane-backend-microtek........... Scanner Access Now Easy (MICROTEK)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -339,7 +339,7 @@ config ADK_PACKAGE_SANE_BACKEND_MUSTEK
prompt "sane-backend-mustek............. Scanner Access Now Easy (MUSTEK)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -350,7 +350,7 @@ config ADK_PACKAGE_SANE_BACKEND_MUSTEK_USB2
prompt "sane-backend-mustek-usb2........ Scanner Access Now Easy (MUSTEK_USB2)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -361,7 +361,7 @@ config ADK_PACKAGE_SANE_BACKEND_MUSTEK_USB
prompt "sane-backend-mustek-usb......... Scanner Access Now Easy (MUSTEK_USB)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -372,7 +372,7 @@ config ADK_PACKAGE_SANE_BACKEND_NEC
prompt "sane-backend-nec................ Scanner Access Now Easy (NEC)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -383,7 +383,7 @@ config ADK_PACKAGE_SANE_BACKEND_NIASH
prompt "sane-backend-niash.............. Scanner Access Now Easy (NIASH)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -394,7 +394,7 @@ config ADK_PACKAGE_SANE_BACKEND_PIE
prompt "sane-backend-pie................ Scanner Access Now Easy (PIE)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -405,7 +405,7 @@ config ADK_PACKAGE_SANE_BACKEND_PIXMA
prompt "sane-backend-pixma.............. Scanner Access Now Easy (PIXMA)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -416,7 +416,7 @@ config ADK_PACKAGE_SANE_BACKEND_PLUSTEK_PP
prompt "sane-backend-plustek-pp......... Scanner Access Now Easy (PLUSTEK_PP)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -426,7 +426,7 @@ config ADK_PACKAGE_SANE_BACKEND_PLUSTEK
prompt "sane-backend-plustek............ Scanner Access Now Easy (PLUSTEK)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -437,7 +437,7 @@ config ADK_PACKAGE_SANE_BACKEND_QCAM
prompt "sane-backend-qcam............... Scanner Access Now Easy (QCAM)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -448,7 +448,7 @@ config ADK_PACKAGE_SANE_BACKEND_RICOH
prompt "sane-backend-ricoh.............. Scanner Access Now Easy (RICOH)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -459,7 +459,7 @@ config ADK_PACKAGE_SANE_BACKEND_S9036
prompt "sane-backend-s9036.............. Scanner Access Now Easy (S9036)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -470,7 +470,7 @@ config ADK_PACKAGE_SANE_BACKEND_SCEPTRE
prompt "sane-backend-sceptre............ Scanner Access Now Easy (SCEPTRE)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -481,7 +481,7 @@ config ADK_PACKAGE_SANE_BACKEND_SHARP
prompt "sane-backend-sharp.............. Scanner Access Now Easy (SHARP)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -492,7 +492,7 @@ config ADK_PACKAGE_SANE_BACKEND_SM3600
prompt "sane-backend-sm3600............. Scanner Access Now Easy (SM3600)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -503,7 +503,7 @@ config ADK_PACKAGE_SANE_BACKEND_SM3840
prompt "sane-backend-sm3840............. Scanner Access Now Easy (SM3840)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -514,7 +514,7 @@ config ADK_PACKAGE_SANE_BACKEND_SNAPSCAN
prompt "sane-backend-snapscan........... Scanner Access Now Easy (SNAPSCAN)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -525,7 +525,7 @@ config ADK_PACKAGE_SANE_BACKEND_SP15C
prompt "sane-backend-sp15c.............. Scanner Access Now Easy (SP15C)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -536,7 +536,7 @@ config ADK_PACKAGE_SANE_BACKEND_ST400
prompt "sane-backend-st400.............. Scanner Access Now Easy (ST400)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -547,7 +547,7 @@ config ADK_PACKAGE_SANE_BACKEND_STV680
prompt "sane-backend-stv680............. Scanner Access Now Easy (STV680)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -558,7 +558,7 @@ config ADK_PACKAGE_SANE_BACKEND_TAMARACK
prompt "sane-backend-tamarack........... Scanner Access Now Easy (TAMARACK)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -569,7 +569,7 @@ config ADK_PACKAGE_SANE_BACKEND_TECO1
prompt "sane-backend-teco1.............. Scanner Access Now Easy (TECO1)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -580,7 +580,7 @@ config ADK_PACKAGE_SANE_BACKEND_TECO2
prompt "sane-backend-teco2.............. Scanner Access Now Easy (TECO2)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -591,7 +591,7 @@ config ADK_PACKAGE_SANE_BACKEND_TECO3
prompt "sane-backend-teco3.............. Scanner Access Now Easy (TECO3)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -602,7 +602,7 @@ config ADK_PACKAGE_SANE_BACKEND_TEST
prompt "sane-backend-test............... Scanner Access Now Easy (TEST)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -613,7 +613,7 @@ config ADK_PACKAGE_SANE_BACKEND_U12
prompt "sane-backend-u12................ Scanner Access Now Easy (U12)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -624,7 +624,7 @@ config ADK_PACKAGE_SANE_BACKEND_UMAX1220U
prompt "sane-backend-umax1220u.......... Scanner Access Now Easy (UMAX1220U)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -635,7 +635,7 @@ config ADK_PACKAGE_SANE_BACKEND_UMAX_PP
prompt "sane-backend-umax-pp............ Scanner Access Now Easy (UMAX_PP)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
@@ -645,7 +645,7 @@ config ADK_PACKAGE_SANE_BACKEND_UMAX
prompt "sane-backend-umax............... Scanner Access Now Easy (UMAX)"
tristate
default n
- depends ADK_PACKAGE_SANE_BACKENDS
+ depends on ADK_PACKAGE_SANE_BACKENDS
select ADK_PACKAGE_LIBUSB
help
SANE (Scanner Access Now Easy) is a universal scanner interface.
diff --git a/package/shorewall-common/Config.in b/package/shorewall-common/Config.in
index d45386d64..59296e1fe 100644
--- a/package/shorewall-common/Config.in
+++ b/package/shorewall-common/Config.in
@@ -17,7 +17,7 @@ config ADK_PACKAGE_SHOREWALL_STRIPCONF
prompt "Strip shorewall configuration files"
bool
default n
- depends ADK_PACKAGE_SHOREWALL
+ depends on ADK_PACKAGE_SHOREWALL
help
To save space, all shorewall files in /etc/shorewall will get striped.
This means that all comments, empty lines etc. are removed.
@@ -29,7 +29,7 @@ config ADK_PACKAGE_SHOREWALL_STRIPSHARED
prompt "Strip shared shorewall files (macros & actions mainly)"
bool
default y
- depends ADK_PACKAGE_SHOREWALL
+ depends on ADK_PACKAGE_SHOREWALL
help
To save space, all shared shorewall files in /usr/share/shorewall
will get striped. This means that all comments, empty lines etc.
diff --git a/package/shorewall-shell/Config.in b/package/shorewall-shell/Config.in
index 76270351b..03f119786 100644
--- a/package/shorewall-shell/Config.in
+++ b/package/shorewall-shell/Config.in
@@ -1,7 +1,7 @@
config ADK_PACKAGE_SHOREWALL_SHELL
prompt "shorewall-shell................. shorewall shell compiler"
tristate
- depends ADK_PACKAGE_SHOREWALL
+ depends on ADK_PACKAGE_SHOREWALL
default y
help
http://www.shorewall.net/
diff --git a/package/speex/Config.in b/package/speex/Config.in
index f9cfe97ba..6fa3d9995 100644
--- a/package/speex/Config.in
+++ b/package/speex/Config.in
@@ -1,8 +1,8 @@
config ADK_COMPILE_SPEEX
tristate
default n
- depends ADK_CXX
- depends ADK_PACKAGE_LIBSPEEX
+ depends on ADK_CXX
+ depends on ADK_PACKAGE_LIBSPEEX
config ADK_PACKAGE_LIBSPEEX
prompt "libspeex.......................... Open source patent-free speech compression codec"
diff --git a/package/sqlite/Config.in b/package/sqlite/Config.in
index b534356b6..870f02c82 100644
--- a/package/sqlite/Config.in
+++ b/package/sqlite/Config.in
@@ -1,7 +1,7 @@
config ADK_COMPILE_SQLITE
tristate
default n
- depends ADK_PACKAGE_LIBSQLITE
+ depends on ADK_PACKAGE_LIBSQLITE
config ADK_PACKAGE_LIBSQLITE
prompt "libsqlite......................... Self-contained, embeddable, zero-configuration SQL database engine"
@@ -42,7 +42,7 @@ config ADK_PACKAGE_SQLITE_CLI
prompt "sqlite-cli...................... Command line interface for SQLite"
tristate
default n
- depends ADK_PACKAGE_LIBSQLITE
+ depends on ADK_PACKAGE_LIBSQLITE
help
SQLite is a small C library that implements a self-contained, embeddable,
zero-configuration SQL database engine. Features include:
diff --git a/package/squid/Config.in b/package/squid/Config.in
index bdace2a49..483b27468 100644
--- a/package/squid/Config.in
+++ b/package/squid/Config.in
@@ -3,7 +3,7 @@ config ADK_PACKAGE_SQUID
prompt "squid............................. full-featured Web proxy cache"
tristate
default n
- depends ADK_CXX
+ depends on ADK_CXX
select ADK_PACKAGE_LIBOPENSSL
help
Squid is a high-performance proxy caching server for web clients,
@@ -16,58 +16,58 @@ config ADK_PACKAGE_SQUID
menu "squid............................. proxy and web cache modules"
config ADK_PACKAGE_SQUID_MOD_BASIC_AUTH_GETPWNAM
- prompt " squid-mod-basic-auth-getpwnam....... getpwnam basic authentication helper"
+ prompt "squid-mod-basic-auth-getpwnam....... getpwnam basic authentication helper"
tristate
- depends ADK_PACKAGE_SQUID
+ depends on ADK_PACKAGE_SQUID
help
Password basic authentication helper
config ADK_PACKAGE_SQUID_MOD_BASIC_AUTH_NCSA
- prompt " squid-mod-basic-auth-ncsa........... NCSA basic authentication helper"
+ prompt "squid-mod-basic-auth-ncsa........... NCSA basic authentication helper"
tristate
- depends ADK_PACKAGE_SQUID
+ depends on ADK_PACKAGE_SQUID
help
NCSA basic authentication helper
config ADK_PACKAGE_SQUID_MOD_BASIC_AUTH_SMB
- prompt " squid-mod-basic-auth-smb............ Samba basic authentication helper"
+ prompt "squid-mod-basic-auth-smb............ Samba basic authentication helper"
tristate
- depends ADK_PACKAGE_SQUID
+ depends on ADK_PACKAGE_SQUID
help
Samba basic authentication helper
config ADK_PACKAGE_SQUID_MOD_DIGEST_AUTH_PASSWORD
- prompt " squid-mod-digest-auth-password...... Password digest authentication ehlper"
+ prompt "squid-mod-digest-auth-password...... Password digest authentication ehlper"
tristate
- depends ADK_PACKAGE_SQUID
+ depends on ADK_PACKAGE_SQUID
help
Password digest authentication helper
config ADK_PACKAGE_SQUID_MOD_EXTERNAL_ACL_IP_USER
- prompt " squid-mod-external-acl-ip_user...... IP user external ACL helper"
+ prompt "squid-mod-external-acl-ip_user...... IP user external ACL helper"
tristate
- depends ADK_PACKAGE_SQUID
+ depends on ADK_PACKAGE_SQUID
help
IP user external ACL helper
config ADK_PACKAGE_SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP
- prompt " squid-mod-external-acl-unix-group... Unix group external ACL helper"
+ prompt "squid-mod-external-acl-unix-group... Unix group external ACL helper"
tristate
- depends ADK_PACKAGE_SQUID
+ depends on ADK_PACKAGE_SQUID
help
Unix group external ACL helper
config ADK_PACKAGE_SQUID_MOD_NTLM_AUTH_FAKEAUTH
- prompt " squid-mod-ntlm-auth-fakeauth........ Fakeauth NTLM authentication helper"
+ prompt "squid-mod-ntlm-auth-fakeauth........ Fakeauth NTLM authentication helper"
tristate
- depends ADK_PACKAGE_SQUID
+ depends on ADK_PACKAGE_SQUID
help
Fakeauth NTLM authentication helper
config ADK_PACKAGE_SQUID_MOD_NTLM_AUTH_SMB_AUTH
- prompt " squid-mod-ntlm-auth-smb-auth........ Samba NTLM authentication helper"
+ prompt "squid-mod-ntlm-auth-smb-auth........ Samba NTLM authentication helper"
tristate
- depends ADK_PACKAGE_SQUID
+ depends on ADK_PACKAGE_SQUID
help
Samba NTLM authentication helper
diff --git a/package/subversion/Config.in b/package/subversion/Config.in
index 4ab4537dc..a7bb57950 100644
--- a/package/subversion/Config.in
+++ b/package/subversion/Config.in
@@ -12,10 +12,10 @@ config ADK_PACKAGE_SUBVERSION
http://subversion.tigris.org
config ADK_PACKAGE_SUBVERSION_NEON
- prompt " Enable interaction with remote repositories over WebDAV"
+ prompt "Enable interaction with remote repositories over WebDAV"
bool
default n
- depends ADK_PACKAGE_SUBVERSION
+ depends on ADK_PACKAGE_SUBVERSION
select ADK_PACKAGE_NEON
help
Allows a Subversion client to interact with remote
diff --git a/package/tcp_wrappers/Config.in b/package/tcp_wrappers/Config.in
index 7da5381fb..0066cad78 100644
--- a/package/tcp_wrappers/Config.in
+++ b/package/tcp_wrappers/Config.in
@@ -1,7 +1,7 @@
config ADK_COMPILE_TCP_WRAPPERS
bool
default n
- depends ADK_PACKAGE_LIBWRAP
+ depends on ADK_PACKAGE_LIBWRAP
config ADK_PACKAGE_LIBWRAP
prompt "libwrap........................... Security wrapper library for TCP services"
diff --git a/package/tinyproxy/Config.in b/package/tinyproxy/Config.in
index c7182965b..293d8ec69 100644
--- a/package/tinyproxy/Config.in
+++ b/package/tinyproxy/Config.in
@@ -10,21 +10,21 @@ config ADK_PACKAGE_TINYPROXY
http://tinyproxy.sourceforge.net
config ADK_COMPILE_TINYPROXY_WITH_TRANSPARENT_PROXY
- prompt " Enable transparent proxying"
+ prompt "Enable transparent proxying"
bool
default y
- depends ADK_PACKAGE_TINYPROXY
+ depends on ADK_PACKAGE_TINYPROXY
config ADK_COMPILE_TINYPROXY_WITH_FILTER
- prompt " Enable filtering support"
+ prompt "Enable filtering support"
bool
default y
- depends ADK_PACKAGE_TINYPROXY
+ depends on ADK_PACKAGE_TINYPROXY
config ADK_COMPILE_TINYPROXY_WITH_UPSTREAM
- prompt " Enable upstream support"
+ prompt "Enable upstream support"
bool
default y
- depends ADK_PACKAGE_TINYPROXY
+ depends on ADK_PACKAGE_TINYPROXY
#endmenu
diff --git a/package/tntnet/Config.in b/package/tntnet/Config.in
index 9abab9b82..0d4391674 100644
--- a/package/tntnet/Config.in
+++ b/package/tntnet/Config.in
@@ -24,13 +24,13 @@ config ADK_COMPILE_TNTNET_WITHOUT_OPENSSL
config ADK_COMPILE_TNTNET_WITH_OPENSSL
bool "enable openssl encryption support"
- depends ADK_PACKAGE_TNTNET
+ depends on ADK_PACKAGE_TNTNET
select ADK_PACKAGE_LIBOPENSSL
help
config ADK_COMPILE_TNTNET_WITH_GNUTLS
bool "enable gnutls encryption support"
- depends ADK_PACKAGE_TNTNET
+ depends on ADK_PACKAGE_TNTNET
select ADK_PACKAGE_LIBGNUTLS
help
diff --git a/package/ulogd/Config.in b/package/ulogd/Config.in
index e725f2807..dc0949777 100644
--- a/package/ulogd/Config.in
+++ b/package/ulogd/Config.in
@@ -11,38 +11,38 @@ config ADK_PACKAGE_ULOGD
http://gnumonks.org/projects/ulogd
config ADK_PACKAGE_ULOGD_MOD_MYSQL
- prompt " ulogd-mod-mysql............... Output plugin for logging into a MySQL database"
+ prompt "ulogd-mod-mysql............... Output plugin for logging into a MySQL database"
tristate
default n
depends on ADK_CXX
- depends ADK_PACKAGE_ULOGD
+ depends on ADK_PACKAGE_ULOGD
select ADK_PACKAGE_LIBMYSQLCLIENT
config ADK_PACKAGE_ULOGD_MOD_PCAP
- prompt " ulogd-mod-pcap................. Output plugin for logging into pcap format"
+ prompt "ulogd-mod-pcap................. Output plugin for logging into pcap format"
tristate
default n
- depends ADK_PACKAGE_ULOGD
+ depends on ADK_PACKAGE_ULOGD
select ADK_PACKAGE_LIBPCAP
config ADK_PACKAGE_ULOGD_MOD_PGSQL
- prompt " ulogd-mod-pgsql............... Output plugin for logging into a PostgreSQL database"
+ prompt "ulogd-mod-pgsql............... Output plugin for logging into a PostgreSQL database"
tristate
default n
- depends ADK_PACKAGE_ULOGD
+ depends on ADK_PACKAGE_ULOGD
select ADK_PACKAGE_LIBPQ
config ADK_PACKAGE_ULOGD_MOD_SQLITE
- prompt " ulogd-mod-sqlite.............. Output plugin for logging into an SQLite database"
+ prompt "ulogd-mod-sqlite.............. Output plugin for logging into an SQLite database"
tristate
default n
- depends ADK_PACKAGE_ULOGD
+ depends on ADK_PACKAGE_ULOGD
select ADK_PACKAGE_LIBSQLITE
config ADK_PACKAGE_ULOGD_MOD_EXTRA
- prompt " ulogd-mod-extra............... All other plugins"
+ prompt "ulogd-mod-extra............... All other plugins"
tristate
default n
- depends ADK_PACKAGE_ULOGD
+ depends on ADK_PACKAGE_ULOGD
#endmenu
diff --git a/package/updatedd/Config.in b/package/updatedd/Config.in
index 763961614..08e800d59 100644
--- a/package/updatedd/Config.in
+++ b/package/updatedd/Config.in
@@ -14,54 +14,54 @@ config ADK_PACKAGE_UPDATEDD
config ADK_PACKAGE_UPDATEDD_MOD_CHANGEIP
prompt "updatedd-mod-changeip........... changeip.com"
tristate
- depends ADK_PACKAGE_UPDATEDD
+ depends on ADK_PACKAGE_UPDATEDD
default n
config ADK_PACKAGE_UPDATEDD_MOD_DYNDNS
prompt "updatedd-mod-dyndns............. dyndns.org"
tristate
- depends ADK_PACKAGE_UPDATEDD
+ depends on ADK_PACKAGE_UPDATEDD
default n
config ADK_PACKAGE_UPDATEDD_MOD_EURODYNDNS
prompt "updatedd-mod-eurodyndns......... eurodyndns.org"
tristate
- depends ADK_PACKAGE_UPDATEDD
+ depends on ADK_PACKAGE_UPDATEDD
default n
config ADK_PACKAGE_UPDATEDD_MOD_HN
prompt "updatedd-mod-hn................. hn.org"
tristate
- depends ADK_PACKAGE_UPDATEDD
+ depends on ADK_PACKAGE_UPDATEDD
default n
config ADK_PACKAGE_UPDATEDD_MOD_NOIP
prompt "updatedd-mod-noip............... no-ip.com"
tristate
- depends ADK_PACKAGE_UPDATEDD
+ depends on ADK_PACKAGE_UPDATEDD
default n
config ADK_PACKAGE_UPDATEDD_MOD_ODS
prompt "updatedd-mod-ods................ ods.org"
tristate
- depends ADK_PACKAGE_UPDATEDD
+ depends on ADK_PACKAGE_UPDATEDD
default n
config ADK_PACKAGE_UPDATEDD_MOD_OVH
prompt "updatedd-mod-ovh................ ovh.com"
tristate
- depends ADK_PACKAGE_UPDATEDD
+ depends on ADK_PACKAGE_UPDATEDD
default n
config ADK_PACKAGE_UPDATEDD_MOD_REGFISH
prompt "updatedd-mod-regfish............ regfish.com"
tristate
- depends ADK_PACKAGE_UPDATEDD
+ depends on ADK_PACKAGE_UPDATEDD
default n
config ADK_PACKAGE_UPDATEDD_MOD_TZO
prompt "updatedd-mod-tzo................ tzo.com"
tristate
- depends ADK_PACKAGE_UPDATEDD
+ depends on ADK_PACKAGE_UPDATEDD
default n
diff --git a/package/usbutils/Config.in b/package/usbutils/Config.in
index e73eb1008..8b80238ea 100644
--- a/package/usbutils/Config.in
+++ b/package/usbutils/Config.in
@@ -1,6 +1,6 @@
config ADK_COMPILE_USBUTILS
tristate
- depends ADK_PACKAGE_LSUSB
+ depends on ADK_PACKAGE_LSUSB
config ADK_PACKAGE_LSUSB
prompt "lsusb............................. USB devices listing program"
diff --git a/package/util-linux-ng/Config.in b/package/util-linux-ng/Config.in
index 705c3cbff..8c39f0a55 100644
--- a/package/util-linux-ng/Config.in
+++ b/package/util-linux-ng/Config.in
@@ -1,7 +1,7 @@
config ADK_COMPILE_UTIL_LINUX_NG
tristate
default n
- depends ADK_PACKAGE_FDISK || ADK_PACKAGE_SWAP_UTILS
+ depends on ADK_PACKAGE_FDISK || ADK_PACKAGE_SWAP_UTILS
config ADK_PACKAGE_FDISK
prompt "fdisk............................. Partition table manipulation utility"
diff --git a/package/weechat/Config.in b/package/weechat/Config.in
index 0945c9dc9..4073c3979 100644
--- a/package/weechat/Config.in
+++ b/package/weechat/Config.in
@@ -15,12 +15,12 @@ config ADK_COMPILE_WEECHAT_WITH_TLS
prompt " Enable TLS support"
bool
select ADK_PACKAGE_LIBGNUTLS
- depends ADK_PACKAGE_WEECHAT
+ depends on ADK_PACKAGE_WEECHAT
config ADK_COMPILE_WEECHAT_WITH_LUA
prompt " Enable LUA scripting"
bool
select ADK_PACKAGE_LIBLUA
- depends ADK_PACKAGE_WEECHAT
+ depends on ADK_PACKAGE_WEECHAT
#endmenu
diff --git a/package/wpa_supplicant/Config.in b/package/wpa_supplicant/Config.in
index 325b71bf1..b0044856a 100644
--- a/package/wpa_supplicant/Config.in
+++ b/package/wpa_supplicant/Config.in
@@ -18,13 +18,13 @@ default ADK_COMPILE_WPA_SUPPLICANT_WITH_OPENSSL
config ADK_COMPILE_WPA_SUPPLICANT_WITH_OPENSSL
bool "enable openssl encryption support"
- depends ADK_PACKAGE_WPA_SUPPLICANT
+ depends on ADK_PACKAGE_WPA_SUPPLICANT
select ADK_PACKAGE_LIBOPENSSL
help
config ADK_COMPILE_WPA_SUPPLICANT_WITH_INCLUDED
bool "enable included encryption support"
- depends ADK_PACKAGE_WPA_SUPPLICANT
+ depends on ADK_PACKAGE_WPA_SUPPLICANT
help
endchoice