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 debu