summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/busybox/config/coreutils/Config.in6
-rw-r--r--package/busybox/config/miscutils/Config.in2
-rw-r--r--package/glib/Makefile13
-rw-r--r--package/glib/patches/patch-Makefile_in16
-rw-r--r--package/glib/patches/patch-gio_gdbus-2_0_codegen_config_py9
-rw-r--r--package/glib/patches/patch-gio_gnetworkmonitor_c11
-rw-r--r--package/glib/patches/patch-gio_gnetworkmonitornetlink_c10
-rw-r--r--package/glib/patches/patch-glib_gstrfuncs_c15
-rw-r--r--package/glib/patches/patch-gmodule-2_0_pc_in10
-rw-r--r--package/glib/patches/patch-gmodule-export-2_0_pc_in10
-rw-r--r--package/glib/patches/patch-ltmain_sh11
-rw-r--r--package/libaudiofile/Makefile13
-rw-r--r--package/libaudiofile/patches/patch-audiofile-config_in13
-rw-r--r--package/libffi/Makefile10
-rw-r--r--package/libmms/Makefile10
-rw-r--r--package/libmms/patches/patch-ltmain_sh11
-rw-r--r--package/libmms/patches/patch-src_mmsio_h10
-rw-r--r--package/libmpdclient/Makefile8
-rw-r--r--package/lighttpd/Makefile5
-rw-r--r--package/lighttpd/files/conf.d/access_log.conf27
-rw-r--r--package/lighttpd/files/conf.d/auth.conf27
-rw-r--r--package/lighttpd/files/conf.d/cgi.conf33
-rw-r--r--package/lighttpd/files/conf.d/cml.conf27
-rw-r--r--package/lighttpd/files/conf.d/compress.conf31
-rw-r--r--package/lighttpd/files/conf.d/debug.conf47
-rw-r--r--package/lighttpd/files/conf.d/dirlisting.conf55
-rw-r--r--package/lighttpd/files/conf.d/evhost.conf22
-rw-r--r--package/lighttpd/files/conf.d/expire.conf22
-rw-r--r--package/lighttpd/files/conf.d/fastcgi.conf135
-rw-r--r--package/lighttpd/files/conf.d/geoip.conf26
-rw-r--r--package/lighttpd/files/conf.d/magnet.conf22
-rw-r--r--package/lighttpd/files/conf.d/mime.conf77
-rw-r--r--package/lighttpd/files/conf.d/mysql_vhost.conf47
-rw-r--r--package/lighttpd/files/conf.d/proxy.conf35
-rw-r--r--package/lighttpd/files/conf.d/rrdtool.conf21
-rw-r--r--package/lighttpd/files/conf.d/scgi.conf51
-rw-r--r--package/lighttpd/files/conf.d/secdownload.conf35
-rw-r--r--package/lighttpd/files/conf.d/simple_vhost.conf28
-rw-r--r--package/lighttpd/files/conf.d/ssi.conf16
-rw-r--r--package/lighttpd/files/conf.d/status.conf24
-rw-r--r--package/lighttpd/files/conf.d/trigger_b4_dl.conf70
-rw-r--r--package/lighttpd/files/conf.d/userdir.conf37
-rw-r--r--package/lighttpd/files/conf.d/webdav.conf33
-rw-r--r--package/mpc/Makefile6
-rw-r--r--package/mpd/Makefile25
-rw-r--r--package/mpd/patches/patch-src_db_SimpleDatabasePlugin_cxx91
-rw-r--r--package/mpd/patches/patch-src_db_simple_db_plugin_c89
-rw-r--r--package/mpd/patches/patch-src_decoder_ffmpeg_decoder_plugin_c127
-rw-r--r--package/mpd/patches/patch-src_thread_Id_hxx11
-rw-r--r--package/php/Makefile7
-rw-r--r--package/php/patches/patch-ext_gd_libgd_gd_compat_c10
51 files changed, 1157 insertions, 350 deletions
diff --git a/package/busybox/config/coreutils/Config.in b/package/busybox/config/coreutils/Config.in
index 8c1eeb317..923e7cb73 100644
--- a/package/busybox/config/coreutils/Config.in
+++ b/package/busybox/config/coreutils/Config.in
@@ -60,17 +60,20 @@ config BUSYBOX_FEATURE_DATE_COMPAT
With this option off, 'date DATE' is 'date -s DATE' support
the same format. With it on, 'date DATE' additionally supports
MMDDhhmm[[YY]YY][.ss] format.
+
config BUSYBOX_HOSTID
bool "hostid"
default y
help
hostid prints the numeric identifier (in hexadecimal) for
the current host.
+
config BUSYBOX_ID
bool "id"
default y
help
id displays the current user and group ID names.
+
config BUSYBOX_GROUPS
bool "groups"
default y
@@ -128,17 +131,20 @@ config BUSYBOX_FEATURE_TR_EQUIV
replace all instances of 'a' with 'xyz'. This option is mainly
useful for cases when no other way of expressing a character
is possible.
+
config BUSYBOX_BASE64
bool "base64"
default y
help
Base64 encode and decode
+
config BUSYBOX_WHO
bool "who"
default y
depends on BUSYBOX_FEATURE_UTMP
help
who is used to show who is logged on.
+
config BUSYBOX_USERS
bool "users"
default y
diff --git a/package/busybox/config/miscutils/Config.in b/package/busybox/config/miscutils/Config.in
index 0a837cb64..4c05e5dae 100644
--- a/package/busybox/config/miscutils/Config.in
+++ b/package/busybox/config/miscutils/Config.in
@@ -747,7 +747,7 @@ config BUSYBOX_WALL
config BUSYBOX_WATCHDOG
bool "watchdog"
- default n
+ default y
depends on !BUSYBOX_DISABLE_WATCHDOG
select BUSYBOX_PLATFORM_LINUX
help
diff --git a/package/glib/Makefile b/package/glib/Makefile
index ac93c981a..6c7d113e6 100644
--- a/package/glib/Makefile
+++ b/package/glib/Makefile
@@ -4,14 +4,14 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= glib
-PKG_VERSION:= 2.28.1
-PKG_RELEASE:= 5
-PKG_EXTRAVER:= 2.28
-PKG_MD5SUM:= 9f6e85e1e38490c3956f4415bcd33e6e
+PKG_VERSION:= 2.36.4
+PKG_RELEASE:= 1
+PKG_EXTRAVER:= 2.36
+PKG_MD5SUM:= 2f4b15f7ef43d8702d067ab987bf7aba
PKG_DESCR:= low-level core library that forms the basis of GTK+
PKG_SECTION:= libs
PKG_DEPENDS:= libpthread
-PKG_BUILDDEP:= gettext-tiny libiconv-tiny glib-host zlib
+PKG_BUILDDEP:= libffi gettext-tiny libiconv-tiny glib-host zlib
PKG_URL:= http://www.gtk.org/
PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/glib/${PKG_EXTRAVER}/
PKG_NOPARALLEL:= 1
@@ -21,6 +21,8 @@ ifeq ($(ADK_STATIC),y)
PKG_OPTS+= libonly
endif
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz
+
include ${TOPDIR}/mk/host.mk
include ${TOPDIR}/mk/package.mk
@@ -28,6 +30,7 @@ $(eval $(call HOST_template,GLIB,glib,${PKG_VERSION}-${PKG_RELEASE}))
$(eval $(call PKG_template,GLIB,glib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
HOST_STYLE:= auto
+TARGET_CPPFLAGS+= -D_GNU_SOURCE
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
CONFIGURE_ARGS+= --disable-mem-pools \
--disable-rebuilds \
diff --git a/package/glib/patches/patch-Makefile_in b/package/glib/patches/patch-Makefile_in
index b53217f1e..92e1eb072 100644
--- a/package/glib/patches/patch-Makefile_in
+++ b/package/glib/patches/patch-Makefile_in
@@ -1,11 +1,11 @@
---- glib-2.28.1.orig/Makefile.in 2011-02-18 16:22:03.000000000 +0100
-+++ glib-2.28.1/Makefile.in 2013-10-31 19:55:48.000000000 +0100
-@@ -422,7 +422,7 @@ EXTRA_DIST = ChangeLog.pre-2-20 ChangeLo
- gio-2.0-uninstalled.pc.in gio-unix-2.0-uninstalled.pc.in
+--- glib-2.36.4.orig/Makefile.in 2013-08-07 16:43:05.000000000 +0200
++++ glib-2.36.4/Makefile.in 2013-11-19 11:35:29.000000000 +0100
+@@ -686,7 +686,7 @@ EXTRA_DIST = ChangeLog.pre-2-20 ChangeLo
+ gio-unix-2.0.pc.in gio-windows-2.0.pc.in check-abis.sh
TEST_PROGS =
ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
--SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs
-+SUBDIRS = . m4macros glib gmodule gthread gobject gio po
- DIST_SUBDIRS = $(SUBDIRS) build
+-SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs \
++SUBDIRS = . m4macros glib gmodule gthread gobject gio po \
+ $(am__append_1)
+ DIST_SUBDIRS = $(SUBDIRS) build $(am__append_2)
bin_SCRIPTS = glib-gettextize
- AM_CPPFLAGS = \
diff --git a/package/glib/patches/patch-gio_gdbus-2_0_codegen_config_py b/package/glib/patches/patch-gio_gdbus-2_0_codegen_config_py
new file mode 100644
index 000000000..e7df26bee
--- /dev/null
+++ b/package/glib/patches/patch-gio_gdbus-2_0_codegen_config_py
@@ -0,0 +1,9 @@
+--- glib-2.36.4.orig/gio/gdbus-2.0/codegen/config.py 2013-08-07 16:43:20.000000000 +0200
++++ glib-2.36.4/gio/gdbus-2.0/codegen/config.py 2013-11-29 16:50:05.000000000 +0100
+@@ -23,5 +23,5 @@
+
+ DATADIR = "${prefix}/share"
+ DATADIR = DATADIR.replace(
+- "${prefix}", "/usr/local")
++ "${prefix}", "/usr")
+ VERSION = "2.36.4"
diff --git a/package/glib/patches/patch-gio_gnetworkmonitor_c b/package/glib/patches/patch-gio_gnetworkmonitor_c
new file mode 100644
index 000000000..8147a2247
--- /dev/null
+++ b/package/glib/patches/patch-gio_gnetworkmonitor_c
@@ -0,0 +1,11 @@
+--- glib-2.36.4.orig/gio/gnetworkmonitor.c 2013-05-07 20:26:07.000000000 +0200
++++ glib-2.36.4/gio/gnetworkmonitor.c 2013-11-29 16:58:28.000000000 +0100
+@@ -18,6 +18,8 @@
+ * Boston, MA 02111-1307, USA.
+ */
+
++#include <string.h>
++
+ #include "config.h"
+ #include "glib.h"
+ #include "glibintl.h"
diff --git a/package/glib/patches/patch-gio_gnetworkmonitornetlink_c b/package/glib/patches/patch-gio_gnetworkmonitornetlink_c
new file mode 100644
index 000000000..a3cac9834
--- /dev/null
+++ b/package/glib/patches/patch-gio_gnetworkmonitornetlink_c
@@ -0,0 +1,10 @@
+--- glib-2.36.4.orig/gio/gnetworkmonitornetlink.c 2013-08-07 16:36:32.000000000 +0200
++++ glib-2.36.4/gio/gnetworkmonitornetlink.c 2013-11-29 17:14:56.000000000 +0100
+@@ -22,6 +22,7 @@
+
+ #include <errno.h>
+ #include <unistd.h>
++#include <string.h>
+
+ #include "gnetworkmonitornetlink.h"
+ #include "gcredentials.h"
diff --git a/package/glib/patches/patch-glib_gstrfuncs_c b/package/glib/patches/patch-glib_gstrfuncs_c
deleted file mode 100644
index ec0543675..000000000
--- a/package/glib/patches/patch-glib_gstrfuncs_c
+++ /dev/null
@@ -1,15 +0,0 @@
---- glib-2.28.1.orig/glib/gstrfuncs.c 2011-02-16 03:55:33.000000000 +0100
-+++ glib-2.28.1/glib/gstrfuncs.c 2013-11-06 18:24:29.973270200 +0100
-@@ -1423,12 +1423,6 @@ g_strsignal (gint signum)
- #ifdef HAVE_STRSIGNAL
- const char *msg_locale;
-
--#if defined(G_OS_BEOS) || defined(G_WITH_CYGWIN)
--extern const char *strsignal(int);
--#else
-- /* this is declared differently (const) in string.h on BeOS */
-- extern char *strsignal (int sig);
--#endif /* !G_OS_BEOS && !G_WITH_CYGWIN */
- msg_locale = strsignal (signum);
- if (g_get_charset (NULL))
- return msg_locale;
diff --git a/package/glib/patches/patch-gmodule-2_0_pc_in b/package/glib/patches/patch-gmodule-2_0_pc_in
deleted file mode 100644
index db8446fed..000000000
--- a/package/glib/patches/patch-gmodule-2_0_pc_in
+++ /dev/null
@@ -1,10 +0,0 @@
---- glib-2.28.1.orig/gmodule-2.0.pc.in 2010-04-13 15:33:16.000000000 +0200
-+++ glib-2.28.1/gmodule-2.0.pc.in 2011-03-25 19:49:39.000000000 +0100
-@@ -9,6 +9,6 @@ Name: GModule
- Description: Dynamic module loader for GLib
- Requires: glib-2.0
- Version: @VERSION@
--Libs: -L${libdir} @G_MODULE_LDFLAGS@ -lgmodule-2.0 @G_THREAD_LIBS@
-+Libs: -L${libdir} -lgmodule-2.0 @G_THREAD_LIBS@
- Libs.private: @G_MODULE_LIBS@
- Cflags: @G_THREAD_CFLAGS@
diff --git a/package/glib/patches/patch-gmodule-export-2_0_pc_in b/package/glib/patches/patch-gmodule-export-2_0_pc_in
deleted file mode 100644
index bf61551fd..000000000
--- a/package/glib/patches/patch-gmodule-export-2_0_pc_in
+++ /dev/null
@@ -1,10 +0,0 @@
---- glib-2.28.1.orig/gmodule-export-2.0.pc.in 2010-04-13 15:33:16.000000000 +0200
-+++ glib-2.28.1/gmodule-export-2.0.pc.in 2011-03-25 19:49:59.000000000 +0100
-@@ -9,6 +9,6 @@ Name: GModule
- Description: Dynamic module loader for GLib
- Requires: glib-2.0
- Version: @VERSION@
--Libs: -L${libdir} @G_MODULE_LDFLAGS@ -lgmodule-2.0 @G_THREAD_LIBS@
-+Libs: -L${libdir} -lgmodule-2.0 @G_THREAD_LIBS@
- Libs.private: @G_MODULE_LIBS@
- Cflags: @G_THREAD_CFLAGS@
diff --git a/package/glib/patches/patch-ltmain_sh b/package/glib/patches/patch-ltmain_sh
deleted file mode 100644
index b69b349d4..000000000
--- a/package/glib/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- glib-2.28.1.orig/ltmain.sh 2011-02-08 13:25:07.000000000 +0100
-+++ glib-2.28.1/ltmain.sh 2013-10-31 19:37:51.000000000 +0100
-@@ -5840,7 +5840,7 @@ func_mode_link ()
- # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-- -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
-+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*)
- func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
- func_append compile_command " $arg"
diff --git a/package/libaudiofile/Makefile b/package/libaudiofile/Makefile
index 32ee2216a..7973627ab 100644
--- a/package/libaudiofile/Makefile
+++ b/package/libaudiofile/Makefile
@@ -4,14 +4,13 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= audiofile
-PKG_VERSION:= 0.2.7
-PKG_RELEASE:= 3
-PKG_MD5SUM:= a39be317a7b1971b408805dc5e371862
+PKG_VERSION:= 0.3.6
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 2731d79bec0acef3d30d2fc86b0b72fd
PKG_DESCR:= audiofile library
PKG_SECTION:= libs
-PKG_BUILDDEP:= autotool
-PKG_URL:= http://www.68k.org/~michael/audiofile/
-PKG_SITES:= http://www.68k.org/~michael/audiofile/
+PKG_URL:= http://audiofile.68k.org/
+PKG_SITES:= http://audiofile.68k.org/
PKG_LIBNAME:= libaudiofile
PKG_OPTS:= dev
@@ -19,8 +18,8 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBAUDIOFILE,libaudiofile,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-AUTOTOOL_STYLE:= autoreconf
CONFIGURE_ENV+= ac_cv_linux_vers=2
+TARGET_CPPFLAGS+= -D_GNU_SOURCE -D_POSIX_SOURCE
libaudiofile-install:
${INSTALL_DIR} ${IDIR_LIBAUDIOFILE}/usr/lib
diff --git a/package/libaudiofile/patches/patch-audiofile-config_in b/package/libaudiofile/patches/patch-audiofile-config_in
deleted file mode 100644
index fe1acc715..000000000
--- a/package/libaudiofile/patches/patch-audiofile-config_in
+++ /dev/null
@@ -1,13 +0,0 @@
---- audiofile-0.2.7.orig/audiofile-config.in 2010-03-12 09:57:54.000000000 +0100
-+++ audiofile-0.2.7/audiofile-config.in 2013-10-27 19:45:25.000000000 +0100
-@@ -45,7 +45,9 @@ while test $# -gt 0; do
- echo $includes
- ;;
- --libs)
-- libdirs=-L@libdir@
-+ if test @libdir@ != /usr/libdir ; then
-+ libdirs=-L@libdir@
-+ fi
- echo $libdirs -laudiofile -lm
- ;;
- *)
diff --git a/package/libffi/Makefile b/package/libffi/Makefile
index 234e86dde..c6708e628 100644
--- a/package/libffi/Makefile
+++ b/package/libffi/Makefile
@@ -4,23 +4,29 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= libffi
-PKG_VERSION:= 3.0.11
+PKG_VERSION:= 3.0.13
PKG_RELEASE:= 1
-PKG_MD5SUM:= f69b9693227d976835b4857b1ba7d0e3
+PKG_MD5SUM:= 45f3b6dbc9ee7c7dfbbbc5feba571529
PKG_DESCR:= Foreign Function Interface library
PKG_SECTION:= libs
+PKG_BUILDDEP:= libffi-host
PKG_URL:= http://sourceware.org/libffi/
PKG_SITES:= ftp://sourceware.org/pub/libffi/
PKG_OPTS:= dev
+include ${TOPDIR}/mk/host.mk
include ${TOPDIR}/mk/package.mk
+$(eval $(call HOST_template,LIBFFI,libffi,${PKG_VERSION}-${PKG_RELEASE}))
$(eval $(call PKG_template,LIBFFI,libffi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+HOST_STYLE:= auto
+HOST_CONFIGURE_ARGS+= --disable-builddir
CONFIGURE_ARGS+= --disable-builddir
libffi-install:
${INSTALL_DIR} ${IDIR_LIBFFI}/usr/lib
${CP} ${WRKINST}/usr/lib/libffi.so* ${IDIR_LIBFFI}/usr/lib
+include ${TOPDIR}/mk/host-bottom.mk
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libmms/Makefile b/package/libmms/Makefile
index 3e7ec8135..9e2c2108a 100644
--- a/package/libmms/Makefile
+++ b/package/libmms/Makefile
@@ -4,13 +4,13 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= libmms
-PKG_VERSION:= 0.5
-PKG_RELEASE:= 2
-PKG_MD5SUM:= cf83053ec891f14e73a04c84d9de08ee
+PKG_VERSION:= 0.6.2
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 9f63aa363deb4874e072a45850161bff
PKG_DESCR:= common library for parsing mms:// type network streams
PKG_SECTION:= libs
-PKG_URL:= https://launchpad.net/libmms
-PKG_SITES:= http://launchpad.net/libmms/trunk/0.5/+download/
+PKG_URL:= http://libmms.sourceforge.net/
+PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libmms/}
PKG_OPTS:= dev
include ${TOPDIR}/mk/package.mk
diff --git a/package/libmms/patches/patch-ltmain_sh b/package/libmms/patches/patch-ltmain_sh
deleted file mode 100644
index 709251ce3..000000000
--- a/package/libmms/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- libmms-0.5.orig/ltmain.sh 2009-11-03 10:26:05.000000000 +0100
-+++ libmms-0.5/ltmain.sh 2011-01-15 22:44:48.000000000 +0100
-@@ -4765,7 +4765,7 @@ func_mode_link ()
- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
- # @file GCC response files
- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
- func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
- func_append compile_command " $arg"
diff --git a/package/libmms/patches/patch-src_mmsio_h b/package/libmms/patches/patch-src_mmsio_h
deleted file mode 100644
index 9c2889900..000000000
--- a/package/libmms/patches/patch-src_mmsio_h
+++ /dev/null
@@ -1,10 +0,0 @@
---- libmms-0.5.orig/src/mmsio.h 2009-10-31 13:35:28.000000000 +0100
-+++ libmms-0.5/src/mmsio.h 2013-09-17 19:11:25.000000000 +0200
-@@ -1,6 +1,7 @@
- #ifndef __MMS_IO_H__
- #define __MMS_IO_H__
-
-+#include <fcntl.h>
- #include "mms_config.h"
-
- /* On 64 bit file offset capable systems, libmms' configure script adds
diff --git a/package/libmpdclient/Makefile b/package/libmpdclient/Makefile
index 9949a1622..7535b62bb 100644
--- a/package/libmpdclient/Makefile
+++ b/package/libmpdclient/Makefile
@@ -4,16 +4,16 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= libmpdclient
-PKG_VERSION:= 2.8
-PKG_RELEASE:= 2
-PKG_MD5SUM:= 79f6c810c291fa4f382a92c8e25123de
+PKG_VERSION:= 2.9
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 4b101a36e5c0cf967dc063391260ddbf
PKG_DESCR:= library for interfacing MPD
PKG_SECTION:= libs
PKG_URL:= http://www.musicpd.org/
PKG_SITES:= http://www.musicpd.org/download/libmpdclient/2/
PKG_OPTS:= dev
-DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz
include $(TOPDIR)/mk/package.mk
diff --git a/package/lighttpd/Makefile b/package/lighttpd/Makefile
index 966ddeb9b..0abbe5999 100644
--- a/package/lighttpd/Makefile
+++ b/package/lighttpd/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= lighttpd
-PKG_VERSION:= 1.4.32
+PKG_VERSION:= 1.4.33
PKG_RELEASE:= 1
-PKG_MD5SUM:= d2eaf2ed77670bd25597f61c3a28c074
+PKG_MD5SUM:= 16e7c85a11a660213be4f83a9a1b752d
PKG_DESCR:= a lightweight web server
PKG_SECTION:= www
PKG_DEPENDS:= libgcc
@@ -138,6 +138,7 @@ post-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m}
${INSTALL_DIR} $(IDIR_LIGHTTPD)/etc/lighttpd/conf.d
${INSTALL_DATA} ./files/lighttpd.conf $(IDIR_LIGHTTPD)/etc/lighttpd
${INSTALL_DATA} ./files/modules.conf $(IDIR_LIGHTTPD)/etc/lighttpd
+ ${CP} ./files/conf.d $(IDIR_LIGHTTPD)/etc/lighttpd
${CP} ${WRKBUILD}/doc/config/conf.d/*.conf \
$(IDIR_LIGHTTPD)/etc/lighttpd/conf.d
${INSTALL_DIR} $(IDIR_LIGHTTPD)/usr/lib/lighttpd
diff --git a/package/lighttpd/files/conf.d/access_log.conf b/package/lighttpd/files/conf.d/access_log.conf
new file mode 100644
index 000000000..fe150749a
--- /dev/null
+++ b/package/lighttpd/files/conf.d/access_log.conf
@@ -0,0 +1,27 @@
+#######################################################################
+##
+## Corresponding documentation:
+##
+## http://www.lighttpd.net/documentation/access.html
+##
+server.modules += ( "mod_accesslog" )
+
+##
+## Default access log.
+##
+#accesslog.filename = log_root + "/access.log"
+
+##
+## The default format produces CLF compatible output.
+## For available parameters see access.txt
+##
+#accesslog.format = "%h %l %u %t \"%r\" %b %>s \"%{User-Agent}i\" \"%{Referer}i\""
+
+##
+## If you want to log to syslog you have to unset the
+## accesslog.use-syslog setting and uncomment the next line.
+##
+accesslog.use-syslog = "enable"
+
+#
+#######################################################################
diff --git a/package/lighttpd/files/conf.d/auth.conf b/package/lighttpd/files/conf.d/auth.conf
new file mode 100644
index 000000000..1d3d69c01
--- /dev/null
+++ b/package/lighttpd/files/conf.d/auth.conf
@@ -0,0 +1,27 @@
+#######################################################################
+##
+## Authentication Module
+## -----------------------
+##
+## See http://www.lighttpd.net/documentation/authentification.html
+## for more info.
+##
+
+#auth.backend = "plain"
+#auth.backend.plain.userfile = "/etc/lighttpd/lighttpd.user"
+#auth.backend.plain.groupfile = "/etc/lighttpd/lighttpd.group"
+
+#auth.backend.ldap.hostname = "localhost"
+#auth.backend.ldap.base-dn = "dc=my-domain,dc=com"
+#auth.backend.ldap.filter = "(uid=$)"
+
+#auth.require = ( "/server-status" =>
+# (
+# "method" => "digest",
+# "realm" => "Server Status",
+# "require" => "valid-user"
+# ),
+# )
+
+##
+#######################################################################
diff --git a/package/lighttpd/files/conf.d/cgi.conf b/package/lighttpd/files/conf.d/cgi.conf
new file mode 100644
index 000000000..ed2779999
--- /dev/null
+++ b/package/lighttpd/files/conf.d/cgi.conf
@@ -0,0 +1,33 @@
+#######################################################################
+##
+## CGI modules
+## ---------------
+##
+## http://www.lighttpd.net/documentation/cgi.html
+##
+server.modules += ( "mod_cgi" )
+
+##
+## Plain old CGI handling
+##
+## For PHP don't forget to set cgi.fix_pathinfo = 1 in the php.ini.
+##
+cgi.assign = ( ".pl" => "/usr/bin/perl",
+ ".cgi" => "/usr/bin/perl",
+ ".rb" => "/usr/bin/ruby",
+ ".erb" => "/usr/bin/eruby",
+ ".py" => "/usr/bin/python" )
+
+##
+## to get the old cgi-bin behavior of apache
+##
+## Note: make sure that mod_alias is loaded if you uncomment the
+## next line. (see modules.conf)
+##
+#alias.url += ( "/cgi-bin" => server_root + "/cgi-bin" )
+#$HTTP["url"] =~ "^/cgi-bin" {
+# cgi.assign = ( "" => "" )
+#}
+
+##
+#######################################################################
diff --git a/package/lighttpd/files/conf.d/cml.conf b/package/lighttpd/files/conf.d/cml.conf
new file mode 100644
index 000000000..8054ea632
--- /dev/null
+++ b/package/lighttpd/files/conf.d/cml.conf
@@ -0,0 +1,27 @@
+#######################################################################
+##
+## CML Module
+## ---------------
+##
+## see http://www.lighttpd.net/documentation/cml.html
+##
+server.modules += ( "mod_cml" )
+index-file.names += ( "index.cml" )
+
+##
+## The file extension that is bound to the cml-module.
+##
+cml.extension = ".cml"
+
+##
+## Memcached hosts used for memcache* functions.
+##
+#cml.memcache-hosts = ( "127.0.0.1:11211" )
+
+##
+## A cml file that is executed for each request.
+##
+#cml.power-magnet = server_root + "/htdocs/powermagnet.cml"
+
+##
+#######################################################################
diff --git a/package/lighttpd/files/conf.d/compress.conf b/package/lighttpd/files/conf.d/compress.conf
new file mode 100644
index 000000000..8ea4248cb
--- /dev/null
+++ b/package/lighttpd/files/conf.d/compress.conf
@@ -0,0 +1,31 @@
+#######################################################################
+##
+## Output Compression
+## --------------------
+##
+## see http://www.lighttpd.net/documentation/compress.html
+##
+server.modules += ( "mod_compress" )
+
+##
+## where should the compressed files be cached?
+## see the base config for the declaration of the variable.
+##
+## This directory should be changed per vhost otherwise you can
+## run into trouble with overlapping filenames
+##
+compress.cache-dir = cache_dir + "/compress"
+
+##
+## FileTypes to compress.
+##
+compress.filetype = ("text/plain", "text/html")
+
+##
+## Maximum filesize that will be compressed.
+## Default is 0, which means unlimited file size.
+##
+#compress.max-filesize = 0
+
+##
+#######################################################################
diff --git a/package/lighttpd/files/conf.d/debug.conf b/package/lighttpd/files/conf.d/debug.conf
new file mode 100644
index 000000000..80bbea00b
--- /dev/null
+++ b/package/lighttpd/files/conf.d/debug.conf
@@ -0,0 +1,47 @@
+#######################################################################
+##
+## Debug options
+## ---------------
+##
+## Enable those options for debugging the behavior
+##
+## The settings can be set per location/vhost.
+##
+
+##
+## log-request-handling allows you to track the request
+## handing inside lighttpd.
+##
+#debug.log-request-handling = "enable"
+
+##
+## log all request headers.
+##
+#debug.log-request-header = "enable"
+
+##
+## similar to log-request-header.
+## but only logs if we encountered an error.
+## (return codes 400 and 5xx)
+##
+#debug.log-request-header-on-error = "enable"
+
+##
+## log the header we send out to the client.
+##
+#debug.log-response-header = "enable"
+
+##
+## log if a file wasnt found in the error log.
+##
+#debug.log-file-not-found = "enable"
+
+##
+## debug conditionals handling
+##
+#debug.log-condition-handling = "enable"
+
+#
+#######################################################################
+
+
diff --git a/package/lighttpd/files/conf.d/dirlisting.conf b/package/lighttpd/files/conf.d/dirlisting.conf
new file mode 100644
index 000000000..53a18a266
--- /dev/null
+++ b/package/lighttpd/files/conf.d/dirlisting.conf
@@ -0,0 +1,55 @@
+#######################################################################
+##
+## Dirlisting Module
+## -------------------
+##
+## See http://www.lighttpd.net/documentation/dirlisting.html
+##
+
+##
+## Enabled Directory listing
+##
+dir-listing.activate = "disable"
+
+##
+## Hide dot files from the listing?
+## By default they are listed.
+##
+dir-listing.hide-dotfiles = "disable"
+
+##
+## list of regular expressions. Files that match any of the specified
+## regular expressions will be excluded from directory listings.
+##
+dir-listing.exclude = ( "~$" )
+
+##
+## set a encoding for the generated directory listing
+##
+## If you file-system is not using ASCII you have to set the encoding of
+## the filenames as they are put into the HTML listing AS IS (with XML
+## encoding)
+##
+dir-listing.encoding = "UTF-8"
+
+##
+## Specify the url to an optional CSS file.
+##
+#dir-listing.external-css = "/dirindex.css"
+
+##
+## Include HEADER.txt files above the directory listing.
+## You can disable showing the HEADER.txt in the listing.
+##
+dir-listing.hide-header-file = "disable"
+dir-listing.show-header = "disable"
+
+##
+## Include README.txt files above the directory listing.
+## You can disable showing the README.txt in the listing.
+##
+dir-listing.hide-readme-file = "disable"
+dir-listing.show-readme = "disable"
+
+##
+#######################################################################
diff --git a/package/lighttpd/files/conf.d/evhost.conf b/package/lighttpd/files/conf.d/evhost.conf
new file mode 100644
index 000000000..6da89c1fa
--- /dev/null
+++ b/package/lighttpd/files/conf.d/evhost.conf
@@ -0,0 +1,22 @@
+#######################################################################
+##
+## Enhanced virtual hosting
+## --------------------------
+##
+## See http://www.lighttpd.net/documentation/evhost.html
+##
+server.modules += ( "mod_evhost" )
+
+##
+## define a pattern for the host url finding
+## %% => % sign
+## %0 => domain name + tld
+## %1 => tld
+## %2 => domain name without tld
+## %3 => subdomain 1 name
+## %4 => subdomain 2 name
+##
+evhost.path-pattern = vhosts_dir + "/%3/htdocs/"
+
+##
+#######################################################################
diff --git a/package/lighttpd/files/conf.d/expire.conf b/package/lighttpd/files/conf.d/expire.conf
new file mode 100644
index 000000000..0ca0ab23f
--- /dev/null
+++ b/package/lighttpd/files/conf.d/expire.conf
@@ -0,0 +1,22 @@
+#######################################################################
+##
+## Expire Module
+## ---------------
+##
+## See http://www.lighttpd.net/documentation/expire.html
+##
+server.modules += ( "mod_expire" )
+
+##
+## assignes a expiration to all files below the specified path. The
+## specification of the time is made up of:
+##
+## <access|modification> <number> <years|months|days|hours|minutes|seconds>
+##
+#expire.url = (
+# "/buggy/" => "access 2 hours",
+# "/images/" => "access plus 1 seconds 2 minutes"
+#)
+
+##
+#######################################################################
diff --git a/package/lighttpd/files/conf.d/fastcgi.conf b/package/lighttpd/files/conf.d/fastcgi.conf
new file mode 100644
index 000000000..fa9317f54
--- /dev/null
+++ b/package/lighttpd/files/conf.d/fastcgi.conf
@@ -0,0 +1,135 @@
+#######################################################################
+##
+## FastCGI Module
+## ---------------
+##
+## http://www.lighttpd.net/documentation/fastcgi.html
+##
+server.modules += ( "mod_fastcgi" )
+
+##
+## PHP Example
+## For PHP don't forget to set cgi.fix_pathinfo = 1 in the php.ini.
+##
+## The number of php processes you will get can be easily calculated:
+##
+## num-procs = max-procs * ( 1 + PHP_FCGI_CHILDREN )
+##
+## for the php-num-procs example it means you will get 17*5 = 85 php
+## processes. you always should need this high number for your very
+## busy sites. And if you have a lot of RAM. :)
+##
+#fastcgi.server = ( ".php" =>
+# ( "php-local" =>
+# (
+# "socket" => socket_dir + "/php-fastcgi-1.socket",
+# "bin-path" => server_root + "/cgi-bin/php5",
+# "max-procs" => 1,
+# "broken-scriptfilename" => "enable",
+# )
+# ),
+# ( "php-tcp" =>
+# (
+# "host" => "127.0.0.1",
+# "port" => 9999,
+# "check-local" => "disable",
+# "broken-scriptfilename" => "enable",
+# )
+# ),
+#
+# ( "php-num-procs" =>
+# (
+# "socket" => socket_dir + "/php-fastcgi-2.socket",
+# "bin-path" => server_root + "/cgi-bin/php5",
+# "bin-environment" => (
+# "PHP_FCGI_CHILDREN" => "16",
+# "PHP_FCGI_MAX_REQUESTS" => "10000",
+# ),
+# "max-procs" => 5,
+# "broken-scriptfilename" => "enable",
+# )
+# ),
+# )
+
+##
+## Ruby on Rails Example
+##
+## Normally you only run one Rails application on one vhost.
+##
+#$HTTP["host"] == "rails1.example.com" {
+# server.document-root = server_root + "/rails/someapp/public"
+# server.error-handler-404 = "/dispatch.fcgi"
+# fastcgi.server = ( ".fcgi" =>
+# ("someapp" =>
+# ( "socket" => socket_dir + "/someapp-fcgi.socket",
+# "bin-path" => server_root + "/rails/someapp/public/dispatch.fcgi",
+# "bin-environment" => (
+# "RAILS_ENV" => "production",
+# "TMP" => home_dir + "/rails/someapp",
+# ),
+# )
+# )
+# )
+#}
+
+##
+## Another example with multiple rails applications on one vhost.
+##
+## http://blog.lighttpd.net/articles/2005/11/23/lighttpd-1-4-8-and-multiple-rails-apps
+##
+#$HTTP["host"] == "rails2.example.com" {
+# $HTTP["url"] =~ "^/someapp1" {
+# server.document-root = server_root + "/rails/someapp1/public"
+# server.error-handler-404 = "/dispatch.fcgi"
+# fastcgi.server = ( ".fcgi" =>
+# ("someapp1" =>
+# ( "socket" => socket_dir + "/someapp1-fcgi.socket",
+# "bin-path" => server_root + "/rails/someapp1/public/dispatch.fcgi",
+# "bin-environment" => (
+# "RAILS_ENV" => "production",
+# "TMP" => home_dir + "/rails/someapp1",
+# ),
+# "strip-request-uri" => "/someapp1/"
+# )
+# )
+# )
+# }
+#
+# $HTTP["url"] =~ "^/someapp2" {
+# server.document-root = server_root + "/rails/someapp2/public"
+# server.error-handler-404 = "/dispatch.fcgi"
+# fastcgi.server = ( ".fcgi" =>
+# ("someapp2" =>
+# ( "socket" => socket_dir + "/someapp2-fcgi.socket",
+# "bin-path" => server_root + "/rails/someapp2/public/dispatch.fcgi",
+# "bin-environment" => (
+# "RAILS_ENV" => "production",
+# "TMP" => home_dir + "/rails/someapp2",
+# ),
+# "strip-request-uri" => "/someapp2/"
+# )
+# )
+# )
+# }
+#}
+
+## chrooted webserver + external PHP
+##
+## $ spawn-fcgi -f /usr/bin/php-cgi -p 2000 -a 127.0.0.1 -C 8
+##
+## webserver chrooted to /srv/www/
+## php running outside the chroot
+#
+fastcgi.server = (
+ ".php" => ((
+ "host" => "127.0.0.1",
+ "port" => "2000",
+ "docroot" => "/srv/www/htdocs/"
+)))
+#
+#server.chroot = "/srv/www"
+#server.document-root = "/servers/wwww.example.org/htdocs/"
+#
+
+##
+#######################################################################
diff --git a/package/lighttpd/files/conf.d/geoip.conf b/package/lighttpd/files/conf.d/geoip.conf
new file mode 100644
index 000000000..5b5b28b69
--- /dev/null
+++ b/package/lighttpd/files/conf.d/geoip.conf
@@ -0,0 +1,26 @@
+#######################################################################
+##
+## GeoIP Module
+## ---------------
+##
+## mod_geoip is a module for fast ip/location lookups. It uses MaxMind
+## GeoIP / GeoCity databases. If the ip was found in the database the
+## module sets the appropriate environments variables to the request,
+## thus making other modules/fcgi be informed.
+##
+server.modules += ( "mod_geoip" )
+
+##
+## mod_geoip will determine the database type automatically so if you
+## enter GeoCity databse path it will load GeoCity Env.
+##
+#geoip.db-filename = "/path/to/GeoCityLite.dat"
+
+##
+## If enabled, mod_geoip will load the database binary file to memory
+## for very fast lookups. The only penalty is memory usage.
+##
+#geoip.memory-cache = "disable"
+
+##
+#######################################################################
diff --git a/package/lighttpd/files/conf.d/magnet.conf b/package/lighttpd/files/conf.d/magnet.conf
new file mode 100644
index 000000000..1ebf529bc
--- /dev/null
+++ b/package/lighttpd/files/conf.d/magnet.conf
@@ -0,0 +1,22 @@
+#######################################################################
+##
+## Magnet Module
+## ---------------
+##
+## see http://trac.lighttpd.net/trac/wiki/Docs%3AModMagnet
+##
+server.modules += ( "mod_magnet" )
+
+##
+##
+##
+#magnet.attract-raw-url-to = ( )
+
+##
+## as an example for that see the mod_magnet docs and
+## http://pixel.global-banlist.de./
+##
+#magnet.attract-physical-path-to = ( conf_dir + "/cleanurl.lua" )
+
+##
+#######################################################################
diff --git a/package/lighttpd/files/conf.d/mime.conf b/package/lighttpd/files/conf.d/mime.conf
new file mode 100644
index 000000000..a3c6f0c32
--- /dev/null
+++ b/package/lighttpd/files/conf.d/mime.conf
@@ -0,0 +1,77 @@
+#######################################################################
+##
+## MimeType handling
+## -------------------
+##
+## http://www.lighttpd.net/documentation/configuration.html#mimetypes
+##
+## Use the "Content-Type" extended attribute to obtain mime type if
+## possible
+##
+mimetype.use-xattr = "disable"
+
+##
+## mimetype mapping
+##
+mimetype.assign = (
+ ".pdf" => "application/pdf",
+ ".sig" => "application/pgp-signature",
+ ".spl" => "application/futuresplash",
+ ".class" => "application/octet-stream",
+ ".ps" => "application/postscript",
+ ".torrent" => "application/x-bittorrent",
+ ".dvi" => "application/x-dvi",
+ ".gz" => "application/x-gzip",
+ ".pac" => "application/x-ns-proxy-autoconfig",
+ ".swf" => "application/x-shockwave-flash",
+ ".tar.gz" => "application/x-tgz",
+ ".tgz" => "application/x-tgz",
+ ".tar" => "application/x-tar",
+ ".zip" => "application/zip",
+ ".mp3" => "audio/mpeg",
+ ".m3u" => "audio/x-mpegurl",
+ ".wma" => "audio/x-ms-wma",
+ ".wax" => "audio/x-ms-wax",
+ ".ogg" => "application/ogg",
+ ".wav" => "audio/x-wav",
+ ".gif" => "image/gif",
+ ".jpg" => "image/jpeg",
+ ".jpeg" => "image/jpeg",
+ ".png" => "image/png",
+ ".xbm" => "image/x-xbitmap",
+ ".xpm" => "image/x-xpixmap",
+ ".xwd" => "image/x-xwindowdump",
+ ".css" => "text/css",
+ ".html" => "text/html",
+ ".htm" => "text/html",
+ ".js" => "text/javascript",
+ ".asc" => "text/plain",
+ ".c" => "text/plain",
+ ".cpp" => "text/plain",
+ ".log" => "text/plain",
+ ".conf" => "text/plain",
+ ".text" => "text/plain",
+ ".txt" => "text/plain",
+ ".spec" => "text/plain",
+ ".dtd" => "text/xml",
+ ".xml" => "text/xml",
+ ".mpeg" => "video/mpeg",
+ ".mpg" => "video/mpeg",
+ ".mov" => "video/quicktime",
+ ".qt" => "video/quicktime",
+ ".avi" => "video/x-msvideo",
+ ".asf" => "video/x-ms-asf",
+ ".asx" => "video/x-ms-asf",
+ ".wmv" => "video/x-ms-wmv",
+ ".bz2" => "application/x-bzip",
+ ".tbz" => "application/x-bzip-compressed-tar",
+ ".tar.bz2" => "application/x-bzip-compressed-tar",
+ ".rpm" => "application/x-rpm",
+ # make the default mime type application/octet-stream.
+ "" => "application/octet-stream",
+ )
+
+
+#
+#######################################################################
+
diff --git a/package/lighttpd/files/conf.d/mysql_vhost.conf b/package/lighttpd/files/conf.d/mysql_vhost.conf
new file mode 100644
index 000000000..63550c4e4
--- /dev/null
+++ b/package/lighttpd/files/conf.d/mysql_vhost.conf
@@ -0,0 +1,47 @@
+#######################################################################
+##
+## Virtual hosting with MySQL
+## ----------------------------
+##
+## http://www.lighttpd.net/documentation/mysqlvhost.html
+##
+server.modules += ( "mod_mysql_vhost" )
+
+##
+## Either set the the socket or host (and port)
+##
+## Local path to the mysql socket
+##
+#mysql-vhost.sock = "/var/lib/mysql/mysql.sock"
+
+##
+## Host of the MySQL server.
+##
+#mysql-vhost.hostname = "localhost"
+
+##
+## Optional: port to use.
+##
+#mysql-vhost.port = 3306
+
+##
+## Name of the database
+##
+mysql-vhost.db = "lighttpd"
+
+##
+## SQL User/Password for the connection
+##
+mysql-vhost.user = "lighttpd"
+mysql-vhost.pass = "secret"
+
+##
+## The query to get the needed informations from the database.
+##
+## It doesnt matter how you name the fields the first field is always used
+## as the document root.
+##
+mysql-vhost.sql = "SELECT docroot FROM domains WHERE domain='?'"
+
+##
+#######################################################################
diff --git a/package/lighttpd/files/conf.d/proxy.conf b/package/lighttpd/files/conf.d/proxy.conf
new file mode 100644
index 000000000..f0552c215
--- /dev/null
+++ b/package/lighttpd/files/conf.d/proxy.conf
@@ -0,0 +1,35 @@
+#######################################################################
+##
+## Proxy Module
+## ---------------
+##
+## http://www.lighttpd.net/documentation/proxy.html
+##
+server.modules += ( "mod_proxy" )
+
+##
+## a value between 0 and 65535 to set the debug-level in the Proxy module.
+## Currently only 0 and 1 are used. Use 1 to enable some debug output, 0 to
+## disable it.
+##
+#proxy.debug = 1
+
+##
+## might be one of 'hash', 'round-robin' or 'fair' (default).
+##
+#proxy.balance = "fair"
+
+##
+## Handle all jsp requests via 192.168.0.101
+##
+#proxy.server = ( ".jsp" =>
+# ( "tomcat" =>
+# (
+# "host" => "192.168.0.101",
+# "port" => 80
+# )
+# )
+# )
+
+##
+#######################################################################
diff --git a/package/lighttpd/files/conf.d/rrdtool.conf b/package/lighttpd/files/conf.d/rrdtool.conf
new file mode 100644
index 000000000..c29013bde
--- /dev/null
+++ b/package/lighttpd/files/conf.d/rrdtool.conf
@@ -0,0 +1,21 @@
+#######################################################################
+##
+## RRD Tool Module
+## -----------------
+##
+## see http://www.lighttpd.net/documentation/rrdtool.html
+##
+server.modules += ( "mod_rrdtool" )
+
+##
+## Path to the rrdtool binary.
+##
+rrdtool.binary = "/usr/bin/rrdtool"
+
+##
+## Path to the rrdtool database. You can override this in conditionals.
+##
+rrdtool.db-name = "/var/lib/lighttpd/lighttpd.rrd"
+
+##
+#######################################################################
diff --git a/package/lighttpd/files/conf.d/scgi.conf b/package/lighttpd/files/conf.d/scgi.conf
new file mode 100644
index 000000000..3fcf280f2
--- /dev/null
+++ b/package/lighttpd/files/conf.d/scgi.conf
@@ -0,0 +1,51 @@
+#######################################################################
+##
+## FastCGI Module
+## ---------------
+##
+## http://www.lighttpd.net/documentation/scgi.html
+##
+server.modules += ( "mod_scgi" )
+
+##
+## Ruby on Rails Example
+##
+## Normally you only run one Rails application on one vhost.
+##
+#$HTTP["host"] == "rails1.example.com" {
+# server.document-root = server_root + "/rails/someapp/public"
+# server.error-handler-404 = "/dispatch.fcgi"
+# scgi.server = ( ".scgi" =>
+# ("scgi-someapp" =>
+# ( "socket" => socket_dir + "/someapp-scgi.socket",
+# "bin-path" => server_root + "/rails/someapp/public/dispatch.scgi",
+# "bin-environment" => (
+# "RAILS_ENV" => "production",
+# "TMP" => home_dir + "/rails/someapp",
+# ),
+# )
+# )
+# )
+#}
+
+##
+## 2nd Ruby on Rails Example
+##
+## This time we launch the rails application via scgi_rails externally.
+##
+#$HTTP["host"] == "rails2.example.com" {
+# server.document-root = server_root + "/rails/someapp/public"
+# server.error-handler-404 = "/dispatch.scgi"
+# scgi.server = ( ".scgi" =>
+# ( "scgi-tcp" =>
+# (
+# "host" => "127.0.0.1",
+# "port" => 9998,
+# "check-local" => "disable",
+# )
+# )
+# )
+#}
+
+##
+#######################################################################
diff --git a/package/lighttpd/files/conf.d/secdownload.conf b/package/lighttpd/files/conf.d/secdownload.conf
new file mode 100644
index 000000000..2d4d11a8b
--- /dev/null
+++ b/package/lighttpd/files/conf.d/secdownload.conf
@@ -0,0 +1,35 @@
+#######################################################################
+##
+## Secure Download Module
+## ------------------------
+##
+## see http://www.lighttpd.net/documentation/secdownload.html
+##
+server.modules += ( "mod_secdownload" )
+
+##
+## Document root for the download area.
+## The directory should not be below your normal
+## document root!
+##
+#secdownload.document-root = server_root + "/downloads"
+
+##
+## Secret string that will be used for the checksum calculation.
+##
+#secdownload.secret = ""
+
+##
+## How long is the secret valid?
+##
+## Default: 60 seconds
+##
+#secdownload.timeout = 60
+
+##
+## Prefix for the download area.
+##
+#secdownload.uri-prefix = "/download/"
+
+##
+#######################################################################
diff --git a/package/lighttpd/files/conf.d/simple_vhost.conf b/package/lighttpd/files/conf.d/simple_vhost.conf
new file mode 100644
index 000000000..220331e02
--- /dev/null
+++ b/package/lighttpd/files/conf.d/simple_vhost.conf
@@ -0,0 +1,28 @@
+#######################################################################
+##
+## Simple Virtual hosting
+## ------------------------
+##
+## http://www.lighttpd.net/documentation/simple-vhost.html
+##
+server.modules += ( "mod_simple_vhost" )
+
+## If you want name-based virtual hosting add the next three settings and load
+## mod_simple_vhost
+##
+## document-root =
+## virtual-server-root + virtual-server-default-host + virtual-server-docroot
+## or
+## virtual-server-root + http-host + virtual-server-docroot
+##
+simple-vhost.server-root = vhosts_dir + "/"
+simple-vhost.default-host = "default.example.com"
+simple-vhost.document-root = "/htdocs/"
+
+##
+## Print some errors for finding the document-root
+##
+#simple-vhost.debug = "enable"
+
+##
+#######################################################################
diff --git a/package/lighttpd/files/conf.d/ssi.conf b/package/lighttpd/files/conf.d/ssi.conf
new file mode 100644
index 000000000..a82d1a5b6
--- /dev/null
+++ b/package/lighttpd/files/conf.d/ssi.conf
@@ -0,0 +1,16 @@
+#######################################################################
+##
+## Server Side Includes
+## -----------------------
+##
+## see /usr/share/doc/packages/lighttpd/ssi.html
+##
+server.modules += ( "mod_ssi" )
+
+##
+## which extensions should be ran through mod_ssi.
+##
+ssi.extension = ( ".shtml" )
+
+##
+#######################################################################
diff --git a/package/lighttpd/files/conf.d/status.conf b/package/lighttpd/files/conf.d/status.conf
new file mode 100644
index 000000000..946939f49
--- /dev/null
+++ b/package/lighttpd/files/conf.d/status.conf
@@ -0,0 +1,24 @@
+#######################################################################
+##
+## Status Module
+## ---------------
+##
+## see http://www.lighttpd.net/documentation/status.html
+##
+server.modules += ( "mod_status" )
+
+$HTTP["remoteip"] == "127.0.0.0/8" {
+##
+## configure urls for the various parts of the module.
+##
+ status.status-url = "/server-status"
+ status.config-url = "/server-config"
+ status.statistics-url = "/server-statistics"
+##
+## add JavaScript which allows client-side sorting for the connection
+## overview
+##
+ status.enable-sort = "enable"
+}
+##
+#######################################################################
diff --git a/package/lighttpd/files/conf.d/trigger_b4_dl.conf b/package/lighttpd/files/conf.d/trigger_b4_dl.conf
new file mode 100644
index 000000000..1efd3fdbd
--- /dev/null
+++ b/package/lighttpd/files/conf.d/trigger_b4_dl.conf
@@ -0,0 +1,70 @@
+#######################################################################
+##
+## Trigger before download
+## ---------------
+##
+## - if user requests ''download-url'' directly, the request is denied
+## and he is redirected to ''deny-url'
+## - if user visits ''trigger-url'' before requesting ''download-url'',
+## access is granted
+## - if user visits ''download-url'' again after ''trigger-timeout'' has
+## elapsed, the request is denied and he is redirected to ''deny-url''
+##
+## http://www.lighttpd.net/documentation/trigger_b4_dl.html
+##
+server.modules += ( "mod_mod_trigger_b4_dl" )
+
+##
+## To store the trigger state you can either use a local GDBM
+## file or memcached(s).
+##
+
+##
+## Path to the local GDBM file.
+##
+trigger-before-download.gdbm-filename = home_dir + "/trigger.db"
+
+##
+## List of memcached servers.
+##
+#trigger-before-download.memcache-hosts = ( "127.0.0.1:11211" )
+
+##
+## URL prefix a visitor has to visit before downloading is allowed
+##
+trigger-before-download.trigger-url = "^/trigger/"
+
+##
+## URL Prefix of the proteced area.
+##
+trigger-before-download.download-url = "^/download/"
+
+##
+##
+## The deny url.
+##
+trigger-before-download.deny-url = "http://www.example.com/index.html"
+
+##
+## How long the "ticket" of the user will be valid.
+##
+## Value in seconds.
+##
+trigger-before-download.trigger-timeout = 10
+
+##
+## Normally the memcached key will be the remote ip of the request
+## If you store other data in the memcached aswell and want to avoid
+## key collisions you can configure a memcache-namespace.
+##
+## The key for the request will be memcache-namespace + remote_ip than.
+##
+#trigger-before-download.memcache-namespace = "t4bdl_"
+
+##
+## If set to 1, the module will log some debug informations.
+##
+#trigger-before-download.debug = 0
+
+##
+#######################################################################
diff --git a/package/lighttpd/files/conf.d/userdir.conf b/package/lighttpd/files/conf.d/userdir.conf
new file mode 100644
index 000000000..1e3691e1a
--- /dev/null
+++ b/package/lighttpd/files/conf.d/userdir.conf
@@ -0,0 +1,37 @@
+#######################################################################
+##
+## Userdir Module
+## ----------------
+##
+## for all details see:
+## http://www.lighttpd.net/documentation/userdir.html
+##
+server.modules += ( "mod_userdir" )
+
+##
+## usually it should be set to "public_html" to take ~/public_html/ as
+## the document root
+## Default: empty (document root is the home directory)
+##
+userdir.path = "public_html"
+
+##
+## If set, don't check /etc/passwd for homedir
+## Default: empty
+#userdir.basepath = server_root + "/users/"
+
+##
+## list of usernames which may not use this feature
+## Default: empty (all users may use it)
+##
+#userdir.exclude-user = ( "root", "postmaster" )
+
+##
+## if set, only users from this list may use the feature
+## Default: empty (all users may use it)
+##
+#userdir.include-user = ("user1", "user2")
+
+##
+#######################################################################
+
diff --git a/package/lighttpd/files/conf.d/webdav.conf b/package/lighttpd/files/conf.d/webdav.conf
new file mode 100644
index 000000000..2c373357c
--- /dev/null
+++ b/package/lighttpd/files/conf.d/webdav.conf
@@ -0,0 +1,33 @@
+#######################################################################
+##
+## WebDAV Module
+## ---------------
+##
+## http://www.lighttpd.net/documentation/webdav.html
+##
+server.modules += ( "mod_webdav" )
+
+$HTTP["url"] =~ "^/dav($|/)" {
+ ##
+ ## enable webdav for this location
+ ##
+ webdav.activate = "enable"
+
+ ##
+ ## By default the webdav url is writable.
+ ## Uncomment the following line if you want to make it readonly.
+ ##
+ #webdav.is-readonly = "enable"
+
+ ##
+ ## Log the XML Request bodies for debugging
+ ##
+ #webdav.log-xml = "disable"
+
+ ##
+ ##
+ ##
+ webdav.sqlite-db-name = home_dir + "/webdav.db"
+}
+##
+#######################################################################
diff --git a/package/mpc/Makefile b/package/mpc/Makefile
index bd5d240ac..321badd27 100644
--- a/package/mpc/Makefile
+++ b/package/mpc/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= mpc
-PKG_VERSION:= 0.23
+PKG_VERSION:= 0.25
PKG_RELEASE:= 1
-PKG_MD5SUM:= 2b2c093e80b37fc5717caf319986c52b
+PKG_MD5SUM:= 76aec8e973e3c6c131e9e9f2ad8f34c3
PKG_DESCR:= music player client
PKG_SECTION:= multimedia
PKG_DEPENDS:= libmpdclient
@@ -14,7 +14,7 @@ PKG_BUILDDEP:= libmpdclient
PKG_URL:= http://www.musicpd.org/
PKG_SITES:= http://www.musicpd.org/download/mpc/0/
-DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz
include $(TOPDIR)/mk/package.mk
diff --git a/package/mpd/Makefile b/package/mpd/Makefile
index 7814fbeb6..46a1262c4 100644
--- a/package/mpd/Makefile
+++ b/package/mpd/Makefile
@@ -4,16 +4,17 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= mpd
-PKG_VERSION:= 0.17.6
-PKG_RELEASE:= 4
-PKG_MD5SUM:= d0da6a6a1d9cf1e8710b6082f6ef7849
+PKG_VERSION:= 0.18.5
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 63bcf6ce338caa2ae2cd6dc8e9710d5c
PKG_DESCR:= A music player daemon
PKG_SECTION:= multimedia
PKG_DEPENDS:= glib libstdcxx libgcc libiconv
PKG_FDEPENDS:= glib libstdcxx libgcc libiconv
PKG_BUILDDEP:= glib
PKG_URL:= http://www.musicpd.org/
-PKG_SITES:= http://www.musicpd.org/download/mpd/0.17/
+PKG_SITES:= http://www.musicpd.org/download/mpd/0.18/
+PKG_NEED_CXX:= 1
PKG_ARCH_DEPENDS:= !avr32 !m68k
@@ -22,6 +23,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz
PKG_FLAVOURS_MPD:= WITH_ALSA WITH_AO WITH_MP3 WITH_MP4 WITH_TREMOR
PKG_FLAVOURS_MPD+= WITH_OGG WITH_FLAC WITH_WAV WITH_MMS WITH_FFMPEG
PKG_FLAVOURS_MPD+= WITH_SHOUT WITH_CURL WITH_SAMPLERATE WITH_HTTPD
+PKG_FLAVOURS_MPD+= WITH_OPUS
PKGFD_WITH_ALSA:= enable ALSA output
PKGFS_WITH_ALSA:= alsa-lib
@@ -103,6 +105,13 @@ ifeq ($(ADK_PACKAGE_MPD_WITH_SAMPLERATE),y)
PKG_FDEPENDS+= libsamplerate
endif
+PKGFD_WITH_OPUS:= enable OPUS support
+PKGFS_WITH_OPUS:= libopus
+PKGFB_WITH_OPUS:= opus
+ifeq ($(ADK_PACKAGE_MPD_WITH_OPUS),y)
+PKG_FDEPENDS+= libopus
+endif
+
PKGFD_WITH_HTTPD:= enable HTTP output
include ${TOPDIR}/mk/package.mk
@@ -116,8 +125,10 @@ CONFIGURE_ARGS+= --disable-jack \
--disable-fifo \
--disable-pulse \
--disable-oss \
+ --disable-bzip2 \
--disable-mpc \
--disable-wavpack \
+ --disable-modplug \
--disable-sqlite \
--disable-mpg123 \
--disable-soundcloud \
@@ -214,6 +225,12 @@ else
CONFIGURE_ARGS+= --disable-lsr
endif
+ifneq (${ADK_PACKAGE_MPD_WITH_OPUS},)
+CONFIGURE_ARGS+= --enable-opus
+else
+CONFIGURE_ARGS+= --disable-opus
+endif
+
mpd-install:
${INSTALL_DIR} ${IDIR_MPD}/usr/bin ${IDIR_MPD}/etc/mpd/playlists
${INSTALL_BIN} ${WRKINST}/usr/bin/mpd ${IDIR_MPD}/usr/bin
diff --git a/package/mpd/patches/patch-src_db_SimpleDatabasePlugin_cxx b/package/mpd/patches/patch-src_db_SimpleDatabasePlugin_cxx
new file mode 100644
index 000000000..0f28de720
--- /dev/null
+++ b/package/mpd/patches/patch-src_db_SimpleDatabasePlugin_cxx
@@ -0,0 +1,91 @@
+--- mpd-0.18.5.orig/src/db/SimpleDatabasePlugin.cxx 2013-11-22 00:33:30.000000000 +0100
++++ mpd-0.18.5/src/db/SimpleDatabasePlugin.cxx 2013-11-30 19:17:55.000000000 +0100
+@@ -35,6 +35,9 @@
+
+ #include <sys/types.h>
+ #include <errno.h>
++#include <sys/mount.h>
++#include <mntent.h>
++#include <string.h>
+
+ static constexpr Domain simple_db_domain("simple_db");
+
+@@ -95,8 +98,8 @@ SimpleDatabase::Check(Error &error) cons
+ return false;
+ }
+
+- /* Check if we can write to the directory */
+- if (!CheckAccess(dirPath, X_OK | W_OK)) {
++ /* Check if we can change into the directory */
++ if (!CheckAccess(dirPath, X_OK)) {
+ const int e = errno;
+ const std::string dirPath_utf8 = dirPath.ToUTF8();
+ error.FormatErrno(e, "Can't create db file in \"%s\"",
+@@ -122,9 +125,9 @@ SimpleDatabase::Check(Error &error) cons
+ return false;
+ }
+
+- /* And check that we can write to it */
+- if (!CheckAccess(path, R_OK | W_OK)) {
+- error.FormatErrno("Can't open db file \"%s\" for reading/writing",
++ /* And check that we can read it */
++ if (!CheckAccess(path, R_OK)) {
++ error.FormatErrno("Can't open db file \"%s\" for reading",
+ path_utf8.c_str());
+ return false;
+ }
+@@ -281,6 +284,10 @@ SimpleDatabase::GetStats(const DatabaseS
+ bool
+ SimpleDatabase::Save(Error &error)
+ {
++ struct mntent *mnt;
++ int remount;
++ FILE *f;
++
+ db_lock();
+
+ LogDebug(simple_db_domain, "removing empty directories from DB");
+@@ -293,6 +300,26 @@ SimpleDatabase::Save(Error &error)
+
+ LogDebug(simple_db_domain, "writing DB");
+
++ remount = 0;
++ /* check if /data is mounted read-only */
++ if ((f = setmntent("/proc/mounts", "r")) == NULL)
++ error.Format(simple_db_domain, "Checking /proc/mounts failed");
++
++ while ((mnt = getmntent(f)) != NULL) {
++ if (strcmp(mnt->mnt_dir, "/data") == 0 &&
++ hasmntopt(mnt, MNTOPT_RO) != NULL) {
++ remount = 1;
++ }
++ }
++ endmntent(f);
++
++ if (remount) {
++ if (mount("","/data",0,MS_REMOUNT,0)<0) {
++ error.Format(simple_db_domain, "Remounting /data rw failed");
++ }
++ LogDebug(simple_db_domain, "Mounted /data successfully in read-write mode");
++ }
++
+ FILE *fp = FOpen(path, FOpenMode::WriteText);
+ if (!fp) {
+ error.FormatErrno("unable to write to db file \"%s\"",
+@@ -310,6 +337,16 @@ SimpleDatabase::Save(Error &error)
+
+ fclose(fp);
+
++ if (remount) {
++ sync();
++ if (mount("","/data",0,MS_REMOUNT|MS_RDONLY,0)<0) {
++ error.Format(simple_db_domain, "Remounting /data ro failed");
++ }
++ LogDebug(simple_db_domain, "Mounted /data successfully in read-only mode");
++ }
++
++ LogDebug(simple_db_domain, "Successfully written database");
++
+ struct stat st;
+ if (StatFile(path, st))
+ mtime = st.st_mtime;
diff --git a/package/mpd/patches/patch-src_db_simple_db_plugin_c b/package/mpd/patches/patch-src_db_simple_db_plugin_c
deleted file mode 100644
index 55ebba670..000000000
--- a/package/mpd/patches/patch-src_db_simple_db_plugin_c
+++ /dev/null
@@ -1,89 +0,0 @@
---- mpd-0.17.6.orig/src/db/simple_db_plugin.c 2013-08-01 09:15:41.000000000 +0200
-+++ mpd-0.17.6/src/db/simple_db_plugin.c 2013-10-17 17:51:34.000000000 +0200
-@@ -28,6 +28,9 @@
- #include "conf.h"
- #include "directory.h"
-
-+#include <sys/mount.h>
-+#include <mntent.h>
-+#include <string.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <unistd.h>
-@@ -128,8 +131,8 @@ simple_db_check(struct simple_db *db, GE
- return false;
- }
-
-- /* Check if we can write to the directory */
-- if (access(dirPath, X_OK | W_OK)) {
-+ /* Check if we can change into the directory */
-+ if (access(dirPath, X_OK)) {
- g_set_error(error_r, simple_db_quark(), errno,
- "Can't create db file in \"%s\": %s",
- dirPath, g_strerror(errno));
-@@ -159,9 +162,9 @@ simple_db_check(struct simple_db *db, GE
- }
-
- /* And check that we can write to it */
-- if (access(db->path, R_OK | W_OK)) {
-+ if (access(db->path, R_OK)) {
- g_set_error(error_r, simple_db_quark(), errno,
-- "Can't open db file \"%s\" for reading/writing: %s",
-+ "Can't open db file \"%s\" for reading: %s",
- db->path, g_strerror(errno));
- return false;
- }
-@@ -305,6 +308,9 @@ simple_db_save(struct db *_db, GError **
- {
- struct simple_db *db = (struct simple_db *)_db;
- struct directory *music_root = db->root;
-+ struct mntent *mnt;
-+ int remount;
-+ FILE *f;
-
- db_lock();
-
-@@ -317,6 +323,26 @@ simple_db_save(struct db *_db, GError **
- db_unlock();
-
- g_debug("writing DB");
-+
-+ remount = 0;
-+ /* check if /data is mounted read-only */
-+ if ((f = setmntent("/proc/mounts", "r")) == NULL)
-+ g_message("Checking /proc/mounts failed");
-+
-+ while ((mnt = getmntent(f)) != NULL) {
-+ if (strcmp(mnt->mnt_dir, "/data") == 0 &&
-+ hasmntopt(mnt, MNTOPT_RO) != NULL) {
-+ remount = 1;
-+ }
-+ }
-+ endmntent(f);
-+
-+ if (remount) {
-+ if (mount("","/data",0,MS_REMOUNT,0)<0) {
-+ g_error("Remounting /data rw failed");
-+ }
-+ g_message("Mounted /data successfully in read-write mode");
-+ }
-
- FILE *fp = fopen(db->path, "w");
- if (!fp) {
-@@ -338,6 +364,16 @@ simple_db_save(struct db *_db, GError **
-
- fclose(fp);
-
-+ if (remount) {
-+ sync();
-+ if (mount("","/data",0,MS_REMOUNT|MS_RDONLY,0)<0) {
-+ g_error("Remounting /data ro failed");
-+ }
-+ g_message("Mounted /data successfully in read-only mode");
-+ }
-+
-+ g_message("Successfully written database to file: %s", db->path);
-+
- struct stat st;
- if (stat(db->path, &st) == 0)
- db->mtime = st.st_mtime;
diff --git a/package/mpd/patches/patch-src_decoder_ffmpeg_decoder_plugin_c b/package/mpd/patches/patch-src_decoder_ffmpeg_decoder_plugin_c
deleted file mode 100644
index e9568905c..000000000
--- a/package/mpd/patches/patch-src_decoder_ffmpeg_decoder_plugin_c
+++ /dev/null
@@ -1,127 +0,0 @@
---- mpd-0.17.6.orig/src/decoder/ffmpeg_decoder_plugin.c 2013-08-04 14:20:16.000000000 +0200
-+++ mpd-0.17.6/src/decoder/ffmpeg_decoder_plugin.c 2013-10-15 16:26:29.000000000 +0200
-@@ -255,7 +255,8 @@ copy_interleave_frame2(uint8_t *dest, ui
- static int
- copy_interleave_frame(const AVCodecContext *codec_context,
- const AVFrame *frame,
-- uint8_t *buffer, size_t buffer_size)
-+ uint8_t **output_buffer,
-+ uint8_t **global_buffer, int *global_buffer_size)
- {
- int plane_size;
- const int data_size =
-@@ -263,18 +264,26 @@ copy_interleave_frame(const AVCodecConte
- codec_context->channels,
- frame->nb_samples,
- codec_context->sample_fmt, 1);
-- if (buffer_size < (size_t)data_size)
-- /* buffer is too small - shouldn't happen */
-- return AVERROR(EINVAL);
-
- if (av_sample_fmt_is_planar(codec_context->sample_fmt) &&
- codec_context->channels > 1) {
-- copy_interleave_frame2(buffer, frame->extended_data,
-+ if(*global_buffer_size < data_size) {
-+ av_freep(global_buffer);
-+
-+ *global_buffer = (uint8_t*)av_malloc(data_size);
-+
-+ if (!*global_buffer)
-+ /* Not enough memory - shouldn't happen */
-+ return AVERROR(ENOMEM);
-+ *global_buffer_size = data_size;
-+ }
-+ *output_buffer = *global_buffer;
-+ copy_interleave_frame2(*output_buffer, frame->extended_data,
- frame->nb_samples,
- codec_context->channels,
- av_get_bytes_per_sample(codec_context->sample_fmt));
- } else {
-- memcpy(buffer, frame->extended_data[0], data_size);
-+ *output_buffer = frame->extended_data[0];
- }
-
- return data_size;
-@@ -285,7 +294,8 @@ static enum decoder_command
- ffmpeg_send_packet(struct decoder *decoder, struct input_stream *is,
- const AVPacket *packet,
- AVCodecContext *codec_context,
-- const AVRational *time_base)
-+ const AVRational *time_base,
-+ uint8_t **buffer, int *buffer_size)
- {
- if (packet->pts >= 0 && packet->pts != (int64_t)AV_NOPTS_VALUE)
- decoder_timestamp(decoder,
-@@ -299,8 +309,7 @@ ffmpeg_send_packet(struct decoder *decod
- #endif
-
- #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53,25,0)
-- uint8_t aligned_buffer[(AVCODEC_MAX_AUDIO_FRAME_SIZE * 3) / 2 + 16];
-- const size_t buffer_size = sizeof(aligned_buffer);
-+ uint8_t *output_buffer;
- #else
- /* libavcodec < 0.8 needs an aligned buffer */
- uint8_t audio_buf[(AVCODEC_MAX_AUDIO_FRAME_SIZE * 3) / 2 + 16];
-@@ -316,7 +325,7 @@ ffmpeg_send_packet(struct decoder *decod
- packet_size > 0 &&
- #endif
- cmd == DECODE_COMMAND_NONE) {
-- int audio_size = buffer_size;
-+ int audio_size = 0;
- #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53,25,0)
-
- AVFrame *frame = avcodec_alloc_frame();
-@@ -332,12 +341,11 @@ ffmpeg_send_packet(struct decoder *decod
- if (len >= 0 && got_frame) {
- audio_size = copy_interleave_frame(codec_context,
- frame,
-- aligned_buffer,
-- buffer_size);
-+ &output_buffer,
-+ buffer, buffer_size);
- if (audio_size < 0)
- len = audio_size;
-- } else if (len >= 0)
-- len = -1;
-+ }
-
- #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 28, 0)
- avcodec_free_frame(&frame);
-@@ -373,7 +381,7 @@ ffmpeg_send_packet(struct decoder *decod
- continue;
-
- cmd = decoder_data(decoder, is,
-- aligned_buffer, audio_size,
-+ output_buffer, audio_size,
- codec_context->bit_rate / 1000);
- }
- return cmd;
-@@ -589,6 +597,9 @@ ffmpeg_decode(struct decoder *decoder, s
- decoder_initialized(decoder, &audio_format,
- input->seekable, total_time);
-
-+ uint8_t *interleaved_buffer = NULL;
-+ int interleaved_buffer_size = 0;
-+
- enum decoder_command cmd;
- do {
- AVPacket packet;
-@@ -599,7 +610,8 @@ ffmpeg_decode(struct decoder *decoder, s
- if (packet.stream_index == audio_stream)
- cmd = ffmpeg_send_packet(decoder, input,
- &packet, codec_context,
-- &av_stream->time_base);
-+ &av_stream->time_base,
-+ &interleaved_buffer, &interleaved_buffer_size);
- else
- cmd = decoder_get_command(decoder);
-
-@@ -620,6 +632,8 @@ ffmpeg_decode(struct decoder *decoder, s
- }
- } while (cmd != DECODE_COMMAND_STOP);
-
-+ av_freep(&interleaved_buffer);
-+
- avcodec_close(codec_context);
- #if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53,17,0)
- avformat_close_input(&format_context);
diff --git a/package/mpd/patches/patch-src_thread_Id_hxx b/package/mpd/patches/patch-src_thread_Id_hxx
new file mode 100644
index 000000000..dabee4007
--- /dev/null
+++ b/package/mpd/patches/patch-src_thread_Id_hxx
@@ -0,0 +1,11 @@
+--- mpd-0.18.5.orig/src/thread/Id.hxx 2013-11-18 23:50:46.000000000 +0100
++++ mpd-0.18.5/src/thread/Id.hxx 2013-11-29 20:50:36.000000000 +0100
+@@ -84,7 +84,7 @@ public:
+ #ifdef WIN32
+ return id == other.id;
+ #else
+- return ::pthread_equal(id, other.id);
++ return pthread_equal(id, other.id);
+ #endif
+ }
+
diff --git a/package/php/Makefile b/package/php/Makefile
index 88d51ceb9..fd72d9de5 100644
--- a/package/php/Makefile
+++ b/package/php/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= php
-PKG_VERSION:= 5.4.21
+PKG_VERSION:= 5.5.6
PKG_RELEASE:= 1
-PKG_MD5SUM:= cc8da0d18683e3a83b332f264af7ca83
+PKG_MD5SUM:= 82968eac50c523ecf7a05855cb5c3d0a
PKG_DESCR:= PHP language interpreter
PKG_SECTION:= lang
PKG_DEPENDS:= libpthread librt libgcc
@@ -91,6 +91,7 @@ PKG_CONFIGURE_OPTS:= \
--with-config-file-path=/etc \
--enable-cli \
--enable-cgi \
+ --enable-opcache=no \
--disable-hash \
--disable-mbstring \
--disable-mbregex \
@@ -191,7 +192,7 @@ endif
ifneq ($(ADK_PACKAGE_PHP_MOD_SOCKETS),)
PKG_CONFIGURE_OPTS+= --enable-sockets=shared
else
-PKG_CONFIGURE_OPTS+= --without-sockets
+PKG_CONFIGURE_OPTS+= --enable-sockets=no
endif
ifneq ($(ADK_PACKAGE_PHP_MOD_XML),)
PKG_CONFIGURE_OPTS+= --enable-xml=shared,"$(STAGING_TARGET_DIR)/usr" \
diff --git a/package/php/patches/patch-ext_gd_libgd_gd_compat_c b/package/php/patches/patch-ext_gd_libgd_gd_compat_c
deleted file mode 100644
index 971de9db6..000000000
--- a/package/php/patches/patch-ext_gd_libgd_gd_compat_c
+++ /dev/null
@@ -1,10 +0,0 @@
---- php-5.4.17.orig/ext/gd/libgd/gd_compat.c 2013-07-03 08:10:53.000000000 +0200
-+++ php-5.4.17/ext/gd/libgd/gd_compat.c 2013-07-17 13:09:52.000000000 +0200
-@@ -5,6 +5,7 @@
- #endif
-
- #ifdef HAVE_GD_JPG
-+# include <stdio.h>
- # include <jpeglib.h>
- #endif
-