diff options
Diffstat (limited to 'package')
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................. |