Merge branch 'master' of git+ssh://openadk.org/git/openadk

package/php/files/php.ini

@@ -247,7 +247,7 @@ default_mimetype = "text/html"
 ; see documentation for security issues.  The alternate is to use the
 ; cgi.force_redirect configuration below
 ; lighttpd: must be the same as server.document-root
-doc_root = /srv/www/htdocs
+;doc_root = /srv/www/htdocs
 
 ; The directory under which PHP opens the script using /~username used only
 ; if nonempty.

package/python2/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		python2
 PKG_VERSION:=		2.7.5
-PKG_RELEASE:=		6
+PKG_RELEASE:=		7
 PKG_MD5SUM:=		b4f01a1d0ba0b46b05c73b2ac909b1df
 PKG_DESCR:=		Python scripting language (Version 2)
 PKG_SECTION:=		lang
@@ -97,7 +97,7 @@ CONFIGURE_ARGS:=	--with-threads \
 
 HOST_STYLE:=		auto
 HOST_CONFIGURE_ARGS:=	--with-threads \
-			--enable-shared \
+			--disable-shared \
 			--disable-toolbox-glue \
 			--without-cxx-main