diff options
30 files changed, 249 insertions, 180 deletions
diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile index 055a1c149..3f0a72b04 100644 --- a/package/cfgfs/Makefile +++ b/package/cfgfs/Makefile @@ -27,7 +27,7 @@ $(eval $(call PKG_template,CFGFS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG CONFIG_STYLE:= manual INSTALL_STYLE:= manual -TARGET_CFLAGS+= -static-libgcc +TARGET_LDFLAGS+= -static-libgcc do-install: ${INSTALL_DIR} ${IDIR_CFGFS}/sbin diff --git a/package/curl/Makefile b/package/curl/Makefile index a39a93d2c..c73662175 100644 --- a/package/curl/Makefile +++ b/package/curl/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= curl -PKG_VERSION:= 7.24.0 +PKG_VERSION:= 7.28.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= b93420f80a2baaa61a0f45214eddc2ba +PKG_MD5SUM:= cbdc0a79bdf6e657dd387c3d88d802e3 PKG_DESCR:= a client-side URL transfer tool PKG_SECTION:= www PKG_DEPENDS:= libcurl @@ -24,7 +24,7 @@ PKGSC_LIBCURL_DEV:= devel PKG_FLAVOURS_CURL:= WITH_IPV6 PKGFD_WITH_IPV6:= enable IPv6 support -PKG_CHOICES_CURL:= WITHOUT_SSL WITH_OPENSSL WITH_GNUTLS +PKG_CHOICES_LIBCURL:= WITHOUT_SSL WITH_OPENSSL WITH_GNUTLS PKGCD_WITHOUT_SSL:= use no SSL PKGCD_WITH_OPENSSL:= use OpenSSL for crypto PKGCS_WITH_OPENSSL:= libopenssl ca-certificates libgmp @@ -39,15 +39,15 @@ $(eval $(call PKG_template,CURL,curl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS $(eval $(call PKG_template,LIBCURL,libcurl,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBCURL},${PKGSD_LIBCURL},${PKGSC_LIBCURL})) $(eval $(call PKG_template,LIBCURL_DEV,libcurl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBCURL_DEV},${PKGSC_LIBCURL_DEV})) -ifeq (${ADK_PACKAGE_CURL_WITHOUT_SSL},y) +ifeq (${ADK_PACKAGE_LIBCURL_WITHOUT_SSL},y) CONFIGURE_ARGS+= --without-ssl \ --without-gnutls endif -ifeq (${ADK_PACKAGE_CURL_WITH_OPENSSL},y) +ifeq (${ADK_PACKAGE_LIBCURL_WITH_OPENSSL},y) CONFIGURE_ARGS+= --with-ssl="${STAGING_TARGET_DIR}/usr" \ --without-gnutls endif -ifeq (${ADK_PACKAGE_CURL_WITH_GNUTLS},y) +ifeq (${ADK_PACKAGE_LIBCURL_WITH_GNUTLS},y) CONFIGURE_ARGS+= --with-gnutls="${STAGING_TARGET_DIR}/usr" \ --without-ssl endif diff --git a/package/curl/patches/patch-configure b/package/curl/patches/patch-configure deleted file mode 100644 index b930df6e4..000000000 --- a/package/curl/patches/patch-configure +++ /dev/null @@ -1,25 +0,0 @@ ---- curl-7.22.0.orig/configure 2011-09-12 22:22:04.000000000 +0200 -+++ curl-7.22.0/configure 2011-10-15 03:05:05.000000000 +0200 -@@ -20641,14 +20641,6 @@ fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi - -- if test "$OPENSSL_ENABLED" = "1"; then -- if test -n "$LIB_OPENSSL"; then -- -- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_OPENSSL" -- export LD_LIBRARY_PATH -- { $as_echo "$as_me:${as_lineno-$LINENO}: Added $LIB_OPENSSL to LD_LIBRARY_PATH" >&5 --$as_echo "$as_me: Added $LIB_OPENSSL to LD_LIBRARY_PATH" >&6;} -- fi - - # - -@@ -21230,7 +21222,6 @@ $as_echo "$as_me: WARNING: $tst_warns" > - - fi - --fi - - - diff --git a/package/curl/patches/patch-ltmain_sh b/package/curl/patches/patch-ltmain_sh index 5b2293c22..07db5c668 100644 --- a/package/curl/patches/patch-ltmain_sh +++ b/package/curl/patches/patch-ltmain_sh @@ -1,6 +1,6 @@ ---- curl-7.22.0.orig/ltmain.sh 2011-09-12 22:21:51.000000000 +0200 -+++ curl-7.22.0/ltmain.sh 2011-10-15 03:03:37.000000000 +0200 -@@ -5840,7 +5840,7 @@ func_mode_link () +--- curl-7.28.0.orig/ltmain.sh 2012-08-16 19:20:36.000000000 +0200 ++++ curl-7.28.0/ltmain.sh 2012-10-14 14:00:11.000000000 +0200 +@@ -5853,7 +5853,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=*| \ diff --git a/package/libgd/Makefile b/package/libgd/Makefile index f291c70cf..79f40aec1 100644 --- a/package/libgd/Makefile +++ b/package/libgd/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= gd PKG_VERSION:= 2.0.35 -PKG_RELEASE:= 2 +PKG_RELEASE:= 1 PKG_MD5SUM:= 982963448dc36f20cb79b6e9ba6fdede PKG_DESCR:= A library for the dynamic creation of images PKG_SECTION:= libs @@ -23,7 +23,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBGD,libgd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBGD_DEV,libgd-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBGD_DEV},${PKGSC_LIBGD_DEV})) -CONFIGURE_ENV+= LIBPNG12_CONFIG="${STAGING_TARGET_DIR}/usr/bin/libpng12-config" +#CONFIGURE_ENV+= LIBPNG12_CONFIG="${STAGING_TARGET_DIR}/usr/bin/libpng12-config" CONFIGURE_ARGS+= --without-x \ --without-freetype \ --with-jpeg=${STAGING_TARGET_DIR}/usr \ diff --git a/package/libgd/patches/patch-Makefile_in b/package/libgd/patches/patch-Makefile_in deleted file mode 100644 index c36a6b4a6..000000000 --- a/package/libgd/patches/patch-Makefile_in +++ /dev/null @@ -1,29 +0,0 @@ -$Id$ ---- gd-2.0.34.orig/Makefile.in 2007-02-03 02:41:46.000000000 +0100 -+++ gd-2.0.34/Makefile.in 2007-02-20 20:56:27.000000000 +0100 -@@ -78,7 +78,7 @@ am_libgd_la_OBJECTS = gd.lo gdfx.lo gd_s - gd_io.lo gd_io_dp.lo gd_gif_in.lo gd_gif_out.lo gd_io_file.lo \ - gd_io_ss.lo gd_jpeg.lo gd_png.lo gd_ss.lo gd_topal.lo \ - gd_wbmp.lo gdcache.lo gdfontg.lo gdfontl.lo gdfontmb.lo \ -- gdfonts.lo gdfontt.lo gdft.lo gdhelpers.lo gdkanji.lo \ -+ gdfonts.lo gdfontt.lo gdft.lo gdhelpers.lo \ - gdtables.lo gdxpm.lo wbmp.lo - libgd_la_OBJECTS = $(am_libgd_la_OBJECTS) - binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) -@@ -344,7 +344,7 @@ bin_SCRIPTS = bdftogd config/gdlib-confi - EXTRA_DIST = README-JPEG.TXT README.TXT configure.pl bdftogd demoin.png err.out index.html install-item makefile.sample readme.jpn entities.html entities.tcl - include_HEADERS = gd.h gdfx.h gd_io.h gdcache.h gdfontg.h gdfontl.h gdfontmb.h gdfonts.h gdfontt.h entities.h - lib_LTLIBRARIES = libgd.la --libgd_la_SOURCES = gd.c gdfx.c gd_security.c gd_gd.c gd_gd2.c gd_io.c gd_io_dp.c gd_gif_in.c gd_gif_out.c gd_io_file.c gd_io_ss.c gd_jpeg.c gd_png.c gd_ss.c gd_topal.c gd_wbmp.c gdcache.c gdfontg.c gdfontl.c gdfontmb.c gdfonts.c gdfontt.c gdft.c gdhelpers.c gdhelpers.h gdkanji.c gdtables.c gdxpm.c jisx0208.h wbmp.c wbmp.h -+libgd_la_SOURCES = gd.c gdfx.c gd_security.c gd_gd.c gd_gd2.c gd_io.c gd_io_dp.c gd_gif_in.c gd_gif_out.c gd_io_file.c gd_io_ss.c gd_jpeg.c gd_png.c gd_ss.c gd_topal.c gd_wbmp.c gdcache.c gdfontg.c gdfontl.c gdfontmb.c gdfonts.c gdfontt.c gdft.c gdhelpers.c gdhelpers.h gdtables.c gdxpm.c jisx0208.h wbmp.c wbmp.h - libgd_la_LDFLAGS = -version-info 2:0:0 $(XTRA_LDFLAGS) - libgd_la_LIBADD = $(LTLIBICONV) - LDADD = ./libgd.la $(LIBICONV) -@@ -594,7 +594,6 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdft.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdfx.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdhelpers.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdkanji.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdparttopng.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdtables.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdtest.Po@am__quote@ diff --git a/package/libgd/patches/patch-config_hin b/package/libgd/patches/patch-config_hin deleted file mode 100644 index e5752c060..000000000 --- a/package/libgd/patches/patch-config_hin +++ /dev/null @@ -1,12 +0,0 @@ ---- gd-2.0.35.orig/config.hin 2006-10-09 16:22:22.000000000 +0200 -+++ gd-2.0.35/config.hin 2011-04-01 13:40:40.551811181 +0200 -@@ -99,6 +99,9 @@ - /* Define to the one symbol short name of this package. */ - #undef PACKAGE_TARNAME - -+/* Define to the home page for this package. */ -+#undef PACKAGE_URL -+ - /* Define to the version of this package. */ - #undef PACKAGE_VERSION - diff --git a/package/libgd/patches/patch-config_ltmain_sh b/package/libgd/patches/patch-config_ltmain_sh deleted file mode 100644 index 9e40639f8..000000000 --- a/package/libgd/patches/patch-config_ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- gd-2.0.35.orig/config/ltmain.sh 2006-10-09 16:22:22.000000000 +0200 -+++ gd-2.0.35/config/ltmain.sh 2011-04-01 14:15:35.561818573 +0200 -@@ -1671,7 +1671,7 @@ EOF - # -pg 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*|-pg| \ -- -t[45]*|-txscale*|@*) -+ -t[45]*|-txscale*|@*|-fstack-protector*|-flto*) - - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. diff --git a/package/libgd/patches/patch-gd_io_h b/package/libgd/patches/patch-gd_io_h new file mode 100644 index 000000000..1d083673c --- /dev/null +++ b/package/libgd/patches/patch-gd_io_h @@ -0,0 +1,10 @@ +--- gd-2.0.36.orig/gd_io.h 2007-11-27 09:30:34.000000000 +0100 ++++ gd-2.0.36/gd_io.h 2012-10-14 16:10:30.000000000 +0200 +@@ -26,6 +26,7 @@ typedef struct gdIOCtx + + void (*gd_free) (struct gdIOCtx *); + ++ void *data; + } + gdIOCtx; + diff --git a/package/lighttpd/Makefile b/package/lighttpd/Makefile index 5c476b2b8..1b99fb2e4 100644 --- a/package/lighttpd/Makefile +++ b/package/lighttpd/Makefile @@ -9,17 +9,42 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 7907b7167d639b8a8daab97e223249d5 PKG_DESCR:= a lightweight web server PKG_SECTION:= www -PKG_DEPENDS:= libpcre libxml2 libsqlite libopenssl -PKG_BUILDDEP:= pcre libxml2 sqlite openssl +PKG_DEPENDS:= libgcc PKG_URL:= http://www.lighttpd.net/ PKG_SITES:= http://download.lighttpd.net/lighttpd/releases-1.4.x/ PKG_MULTI:= 1 -PKG_SUBPKGS:= LIGHTTPD LIGHTTPD_MOD_ACCESSLOG LIGHTTPD_MOD_ALIAS LIGHTTPD_MOD_AUTH -PKG_SUBPKGS+= LIGHTTPD_MOD_CGI LIGHTTPD_MOD_EVASIVE LIGHTTPD_MOD_EXPIRE LIGHTTPD_MOD_FASTCGI +PKG_FLAVOURS_LIGHTTPD:= WITH_IPV6 WITH_SSL +PKGFD_WITH_IPV6:= enable IPv6 support +PKGFD_WITH_SSL:= enable SSL support +PKGFB_WITH_SSL:= openssl +PKGFS_WITH_SSL:= libopenssl + +PKG_SUBPKGS:= LIGHTTPD LIGHTTPD_MOD_ALIAS LIGHTTPD_MOD_AUTH +PKG_SUBPKGS+= LIGHTTPD_MOD_CGI LIGHTTPD_MOD_DIRLISTING LIGHTTPD_MOD_EVASIVE LIGHTTPD_MOD_EXPIRE LIGHTTPD_MOD_FASTCGI PKG_SUBPKGS+= LIGHTTPD_MOD_PROXY LIGHTTPD_MOD_REDIRECT LIGHTTPD_MOD_REWRITE LIGHTTPD_MOD_SETENV PKG_SUBPKGS+= LIGHTTPD_MOD_SIMPLE_VHOST LIGHTTPD_MOD_SSI LIGHTTPD_MOD_STATUS LIGHTTPD_MOD_USERTRACK PKG_SUBPKGS+= LIGHTTPD_MOD_WEBDAV +PKGSD_LIGHTTPD_MOD_ALIAS:= alias support +PKGSD_LIGHTTPD_MOD_AUTH:= authentication support +PKGSD_LIGHTTPD_MOD_CGI:= CGI support +PKGSD_LIGHTTPD_MOD_DIRLISTING:= Dirlisting support +PKGSB_LIGHTTPD_MOD_DIRLISTING:= pcre +PKGSS_LIGHTTPD_MOD_DIRLISTING:= libpcre +PKGSD_LIGHTTPD_MOD_EVASIVE:= Evasive support +PKGSD_LIGHTTPD_MOD_EXPIRE:= Expire support +PKGSD_LIGHTTPD_MOD_FASTCGI:= FastCGI support +PKGSD_LIGHTTPD_MOD_PROXY:= Proxy support +PKGSD_LIGHTTPD_MOD_REDIRECT:= Redirect support +PKGSD_LIGHTTPD_MOD_REWRITE:= Rewrite support +PKGSD_LIGHTTPD_MOD_SETENV:= Setenv support +PKGSD_LIGHTTPD_MOD_SIMPLE_VHOST:= Simple Vhost support +PKGSD_LIGHTTPD_MOD_SSI:= SSI support +PKGSD_LIGHTTPD_MOD_STATUS:= Status support +PKGSD_LIGHTTPD_MOD_USERTRACK:= Usertracking support +PKGSD_LIGHTTPD_MOD_WEBDAV:= Webdav support +PKGSB_LIGHTTPD_MOD_WEBDAV:= libxml2 sqlite +PKGSS_LIGHTTPD_MOD_WEBDAV:= libxml2 libsqlite include $(TOPDIR)/mk/package.mk @@ -34,25 +59,27 @@ ${2}-install: endef $(eval $(call PKG_template,LIGHTTPD,lighttpd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIGHTTPD_MOD_ALIAS,lighttpd-mod-alias,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIGHTTPD_MOD_AUTH,lighttpd-mod-auth,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIGHTTPD_MOD_CGI,lighttpd-mod-cgi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIGHTTPD_MOD_EVASIVE,lighttpd-mod-evasive,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIGHTTPD_MOD_EXPIRE,lighttpd-mod-expire,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIGHTTPD_MOD_FASTCGI,lighttpd-mod-fastcgi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIGHTTPD_MOD_PROXY,lighttpd-mod-proxy,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIGHTTPD_MOD_REDIRECT,lighttpd-mod-redirect,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIGHTTPD_MOD_REWRITE,lighttpd-mod-rewrite,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIGHTTPD_MOD_SETENV,lighttpd-mod-setenv,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIGHTTPD_MOD_SIMPLE_VHOST,lighttpd-mod-simple-vhost,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIGHTTPD_MOD_SSI,lighttpd-mod-ssi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIGHTTPD_MOD_STATUS,lighttpd-mod-status,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIGHTTPD_MOD_USERTRACK,lighttpd-mod-usertrack,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIGHTTPD_MOD_WEBDAV,lighttpd-mod-webdav,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIGHTTPD_MOD_ALIAS,lighttpd-mod-alias,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_ALIAS},${PKG_SECTION})) +$(eval $(call PKG_template,LIGHTTPD_MOD_AUTH,lighttpd-mod-auth,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_AUTH},${PKG_SECTION})) +$(eval $(call PKG_template,LIGHTTPD_MOD_CGI,lighttpd-mod-cgi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_CGI},${PKG_SECTION})) +$(eval $(call PKG_template,LIGHTTPD_MOD_DIRLISTING,lighttpd-mod-dirlisting,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_DIRLISTING},${PKG_SECTION})) +$(eval $(call PKG_template,LIGHTTPD_MOD_EVASIVE,lighttpd-mod-evasive,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_EVASIVE},${PKG_SECTION})) +$(eval $(call PKG_template,LIGHTTPD_MOD_EXPIRE,lighttpd-mod-expire,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_EXPIRE},${PKG_SECTION})) +$(eval $(call PKG_template,LIGHTTPD_MOD_FASTCGI,lighttpd-mod-fastcgi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_FASTCGI},${PKG_SECTION})) +$(eval $(call PKG_template,LIGHTTPD_MOD_PROXY,lighttpd-mod-proxy,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_PROXY},${PKG_SECTION})) +$(eval $(call PKG_template,LIGHTTPD_MOD_REDIRECT,lighttpd-mod-redirect,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_REDIRECT},${PKG_SECTION})) +$(eval $(call PKG_template,LIGHTTPD_MOD_REWRITE,lighttpd-mod-rewrite,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_REWRITE},${PKG_SECTION})) +$(eval $(call PKG_template,LIGHTTPD_MOD_SETENV,lighttpd-mod-setenv,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_SETENV},${PKG_SECTION})) +$(eval $(call PKG_template,LIGHTTPD_MOD_SIMPLE_VHOST,lighttpd-mod-simple-vhost,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_SIMPLE_VHOST},${PKG_SECTION})) +$(eval $(call PKG_template,LIGHTTPD_MOD_SSI,lighttpd-mod-ssi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_SSI},${PKG_SECTION})) +$(eval $(call PKG_template,LIGHTTPD_MOD_STATUS,lighttpd-mod-status,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_STATUS},${PKG_SECTION})) +$(eval $(call PKG_template,LIGHTTPD_MOD_USERTRACK,lighttpd-mod-usertrack,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_USERTRACK},${PKG_SECTION})) +$(eval $(call PKG_template,LIGHTTPD_MOD_WEBDAV,lighttpd-mod-webdav,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_WEBDAV},${PKG_SECTION})) $(eval $(call PKG_mod_template,LIGHTTPD_MOD_ALIAS,alias)) $(eval $(call PKG_mod_template,LIGHTTPD_MOD_AUTH,auth)) $(eval $(call PKG_mod_template,LIGHTTPD_MOD_CGI,cgi)) +$(eval $(call PKG_mod_template,LIGHTTPD_MOD_DIRLISTING,dirlisting)) $(eval $(call PKG_mod_template,LIGHTTPD_MOD_EVASIVE,evasive)) $(eval $(call PKG_mod_template,LIGHTTPD_MOD_EXPIRE,expire)) $(eval $(call PKG_mod_template,LIGHTTPD_MOD_FASTCGI,fastcgi)) @@ -66,11 +93,11 @@ $(eval $(call PKG_mod_template,LIGHTTPD_MOD_STATUS,status)) $(eval $(call PKG_mod_template,LIGHTTPD_MOD_USERTRACK,usertrack)) $(eval $(call PKG_mod_template,LIGHTTPD_MOD_WEBDAV,webdav)) -TARGET_CPPFLAGS+= -I$(STAGING_TARGET_DIR)/usr/include/libxml2 -CONFIGURE_ENV+= PCRE_LIB="-lpcre" +#TARGET_CPPFLAGS+= -I$(STAGING_TARGET_DIR)/usr/include/libxml2 CONFIGURE_ARGS+= --libdir=/usr/lib/lighttpd \ --sysconfdir=/etc/lighttpd \ --without-attr \ + --without-zlib \ --without-bzip2 \ --without-fam \ --without-gdbm \ @@ -78,10 +105,34 @@ CONFIGURE_ARGS+= --libdir=/usr/lib/lighttpd \ --without-lua \ --without-memcache \ --without-mysql \ - --without-valgrind \ - --with-pcre \ - --with-webdav-props \ - --with-openssl='${STAGING_TARGET_DIR}/usr' + --without-valgrind + +ifneq ($(ADK_PACKAGE_LIGHTTPD_MOD_WEBDAV),) +CONFIGURE_ARGS+= --with-webdav-props \ + --with-webdav-locks +else +CONFIGURE_ARGS+= --without-webdav-props \ + --without-webdav-locks +endif + +ifneq ($(ADK_PACKAGE_LIGHTTPD_MOD_SSI)$(ADK_PACKAGE_LIGHTTPD_MOD_DIRLISTING)$(ADK_PACKAGE_LIGHTTPD_MOD_REWRITE)$(ADK_PACKAGE_LIGHTTPD_MOD_REDIRECT),) +CONFIGURE_ARGS+= --with-pcre +CONFIGURE_ENV+= PCRE_LIB="-lpcre" +else +CONFIGURE_ARGS+= --without-pcre +endif + +ifneq ($(ADK_PACKAGE_LIGHTTPD_WITH_IPV6),) +CONFIGURE_ARGS+= --enable-ipv6 +else +CONFIGURE_ARGS+= --disable-ipv6 +endif +ifneq ($(ADK_PACKAGE_LIGHTTPD_WITH_SSL),) +CONFIGURE_ARGS+= --with-openssl +else +CONFIGURE_ARGS+= --without-openssl +endif + post-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m} ${INSTALL_DIR} $(IDIR_LIGHTTPD)/etc/lighttpd/conf.d @@ -90,7 +141,7 @@ post-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m} ${CP} ${WRKBUILD}/doc/config/conf.d/*.conf \ $(IDIR_LIGHTTPD)/etc/lighttpd/conf.d ${INSTALL_DIR} $(IDIR_LIGHTTPD)/usr/lib/lighttpd - for m in dirlisting indexfile staticfile accesslog; do \ + for m in indexfile staticfile accesslog; do \ $(CP) $(WRKINST)/usr/lib/lighttpd/mod_$$m.so $(IDIR_LIGHTTPD)/usr/lib/lighttpd/ ; \ done ${INSTALL_DIR} $(IDIR_LIGHTTPD)/usr/sbin diff --git a/package/lighttpd/files/lighttpd.conf b/package/lighttpd/files/lighttpd.conf index 3c114d35f..ba28d2ab7 100644 --- a/package/lighttpd/files/lighttpd.conf +++ b/package/lighttpd/files/lighttpd.conf @@ -311,9 +311,9 @@ index-file.names += ( ## disable range requests for pdf files ## workaround for a bug in the Acrobat Reader plugin. ## -$HTTP["url"] =~ "\.pdf$" { - server.range-requests = "disable" -} +#$HTTP["url"] =~ "\.pdf$" { +# server.range-requests = "disable" +#} ## ## url handling modules (rewrite, redirect) @@ -355,7 +355,7 @@ include "conf.d/mime.conf" ## ## directory listing configuration ## -include "conf.d/dirlisting.conf" +# include "conf.d/dirlisting.conf" ## ## Should lighttpd follow symlinks? diff --git a/package/lighttpd/patches/patch-src_configfile_c b/package/lighttpd/patches/patch-src_configfile_c new file mode 100644 index 000000000..51e88094f --- /dev/null +++ b/package/lighttpd/patches/patch-src_configfile_c @@ -0,0 +1,16 @@ +--- lighttpd-1.4.31.orig/src/configfile.c 2011-12-06 21:01:49.000000000 +0100 ++++ lighttpd-1.4.31/src/configfile.c 2012-10-14 12:48:45.000000000 +0200 +@@ -1159,11 +1159,13 @@ int config_read(server *srv, const char + modules = prepends; + + /* append default modules */ ++ /* disable mod_dirlisting, needs pcre bloat + if (NULL == array_get_element(modules->value, "mod_dirlisting")) { + ds = data_string_init(); + buffer_copy_string_len(ds->value, CONST_STR_LEN("mod_dirlisting")); + array_insert_unique(modules->value, (data_unset *)ds); + } ++ */ + + if (NULL == array_get_element(modules->value, "mod_staticfile")) { + ds = data_string_init(); diff --git a/package/pcre/Makefile b/package/pcre/Makefile index da4403f77..5638f8967 100644 --- a/package/pcre/Makefile +++ b/package/pcre/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= pcre -PKG_VERSION:= 8.02 +PKG_VERSION:= 8.31 PKG_RELEASE:= 1 -PKG_MD5SUM:= 214462e9718e3f9197cba114dc6b00b8 +PKG_MD5SUM:= fab1bb3b91a4c35398263a5c1e0858c1 PKG_DESCR:= a Perl Compatible Regular Expression library PKG_SECTION:= libs PKG_URL:= http://www.pcre.org/ diff --git a/package/pcre/patches/patch-ltmain_sh b/package/pcre/patches/patch-ltmain_sh deleted file mode 100644 index b655e96af..000000000 --- a/package/pcre/patches/patch-ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- pcre-8.02.orig/ltmain.sh 2010-03-19 11:21:04.000000000 +0100 -+++ pcre-8.02/ltmain.sh 2011-01-14 21:12:27.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/php/Makefile b/package/php/Makefile index 0453f5f57..49893aaa7 100644 --- a/package/php/Makefile +++ b/package/php/Makefile @@ -4,13 +4,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:= php -PKG_VERSION:= 5.3.15 +PKG_VERSION:= 5.4.7 PKG_RELEASE:= 1 -PKG_MD5SUM:= 7c885c79a611b89f3a1095fce6eae5c6 +PKG_MD5SUM:= 94661b761dcfdfdd5108e8b12e0dd4f8 PKG_DESCR:= PHP language interpreter PKG_SECTION:= lang -PKG_DEPENDS:= libopenssl zlib libpthread -PKG_BUILDDEP:= openssl zlib +PKG_DEPENDS:= libpthread librt libgcc PHP_URL:= http://www.php.net/ PKG_SITES:= http://de.php.net/distributions/ PKG_MULTI:= 1 @@ -19,34 +18,46 @@ PKG_SUBPKGS:= PHP PHP_CLI PHP_FASTCGI PKGSD_PHP_FASTCGI:= PHP for FastCGI usage PKGSD_PHP_CLI:= PHP CLI -#PKG_FLAVOURS_PHP:= MOD_CURL MOD_GD MOD_GMP MOD_LDAP MOD_MYSQL -PKG_FLAVOURS_PHP:= MOD_CURL MOD_GMP MOD_LDAP MOD_MYSQL -PKG_FLAVOURS_PHP+= MOD_PGSQL MOD_SQLITE MOD_XML +PKG_FLAVOURS_PHP:= MOD_BZ2 MOD_CURL MOD_FTP MOD_GD MOD_GMP MOD_MYSQL +PKG_FLAVOURS_PHP+= MOD_OPENSSL MOD_PGSQL MOD_SESSION MOD_SQLITE MOD_SOCKETS MOD_XML MOD_ZLIB +PKGFD_MOD_BZ2:= Bzip2 support +PKGFB_MOD_BZ2:= bzip2 +PKGFS_MOD_BZ2:= bzip2 PKGFD_MOD_CURL:= Curl support PKGFB_MOD_CURL:= curl PKGFS_MOD_CURL:= libcurl -#PKGFD_MOD_GD:= Gd support -#PKGFB_MOD_GD:= libgd libpng -#PKGFS_MOD_GD:= libgd libpng +PKGFD_MOD_FTP:= FTP support +PKGFD_MOD_GD:= Gd support +PKGFB_MOD_GD:= libgd libpng jpeg +PKGFS_MOD_GD:= libgd libpng libjpeg PKGFD_MOD_GMP:= GMP support PKGFB_MOD_GMP:= gmp PKGFS_MOD_GMP:= libgmp -PKGFD_MOD_LDAP:= LDAP support -PKGFB_MOD_LDAP:= openldap -PKGFS_MOD_LDAP:= libopenldap +# segfaults php -m +#PKGFD_MOD_LDAP:= LDAP support +#PKGFB_MOD_LDAP:= openldap +#PKGFS_MOD_LDAP:= libopenldap PKGFD_MOD_MYSQL:= MySQL support PKGFS_MOD_MYSQL:= libmysqlclient PKGFB_MOD_MYSQL:= mysql +PKGFD_MOD_OPENSSL:= OpenSSL support +PKGFB_MOD_OPENSSL:= openssl +PKGFS_MOD_OPENSSL:= libopenssl PKGFD_MOD_PGSQL:= PGSQL support PKGFB_MOD_PGSQL:= postgresql PKGFS_MOD_PGSQL:= libpq +PKGFD_MOD_SESSION:= Session support PKGFD_MOD_SQLITE:= SQlite support PKGFB_MOD_SQLITE:= sqlite PKGFS_MOD_SQLITE:= libsqlite +PKGFD_MOD_SOCKETS:= Socket support PKGFD_MOD_XML:= XML support PKGFB_MOD_XML:= expat PKGFS_MOD_XML:= libexpat +PKGFD_MOD_ZLIB:= ZLIB support +PKGFB_MOD_ZLIB:= zlib +PKGFS_MOD_ZLIB:= zlib PKG_ARCH_DEPENDS:= !cris !avr32 PKG_HOST_DEPENDS:= !cygwin @@ -63,25 +74,20 @@ INSTALL_MODS_$${ADK_PACKAGE_${1}}+= ${2}-install ${2}-install: ${INSTALL_DIR} $$(IDIR_$(1))/usr/lib/php - ${INSTALL_DATA} $(WRKBUILD)/modules/$(2).so $$(IDIR_$(1))/usr/lib/php + for m in ${2}; do \ + ${INSTALL_DATA} $(WRKBUILD)/modules/$$$${m}.so $$(IDIR_$(1))/usr/lib/php ;\ + done endef PKG_CONFIGURE_OPTS:= \ --with-config-file-path=/etc \ - --enable-magic-quotes \ - --enable-ftp=shared \ - --enable-session=shared \ - --enable-sockets=shared \ --enable-cli \ --enable-cgi \ - --enable-fastcgi \ - --enable-force-cgi-redirect \ - --enable-discard-path \ + --disable-hash \ --disable-mbstring \ --disable-mbregex \ --disable-phar \ --disable-libxml \ - --disable-spl \ --disable-short-tags \ --disable-ctype \ --disable-simplexml \ @@ -92,61 +98,85 @@ PKG_CONFIGURE_OPTS:= \ --disable-xmlreader \ --disable-xmlwriter \ --disable-dom \ + --disable-json \ --without-pear \ --without-gettext \ --without-iconv \ --without-libxml-dir \ - --with-kerberos=no \ - --with-openssl=shared,"$(STAGING_TARGET_DIR)/usr" \ - --with-openssl-dir="$(STAGING_TARGET_DIR)/usr" \ - --with-zlib="$(STAGING_TARGET_DIR)/usr" \ - --with-zlib-dir="$(STAGING_TARGET_DIR)/usr" \ + --with-pcre-regex=no \ + --with-kerberos=no +ifneq ($(ADK_PACKAGE_PHP_MOD_BZ2),) +PKG_CONFIGURE_OPTS+= --with-bz2=shared,"$(STAGING_TARGET_DIR)/usr" +else +PKG_CONFIGURE_OPTS+= --without-bz2 +endif ifneq ($(ADK_PACKAGE_PHP_MOD_CURL),) PKG_CONFIGURE_OPTS+= --with-curl=shared,"$(STAGING_TARGET_DIR)/usr" else PKG_CONFIGURE_OPTS+= --without-curl endif -#ifneq ($(ADK_PACKAGE_PHP_MOD_GD),) -#PKG_CONFIGURE_OPTS+= --with-gd=shared,"$(STAGING_TARGET_DIR)/usr" \ - --without-jpeg-dir \ +ifneq ($(ADK_PACKAGE_PHP_MOD_FTP),) +PKG_CONFIGURE_OPTS+= --enable-ftp=shared +else +PKG_CONFIGURE_OPTS+= --disable-ftp +endif +ifneq ($(ADK_PACKAGE_PHP_MOD_GD),) +PKG_CONFIGURE_OPTS+= --with-gd=shared,"$(STAGING_TARGET_DIR)/usr" \ --with-png-dir="$(STAGING_TARGET_DIR)/usr" \ + --with-jpeg-dir="$(STAGING_TARGET_DIR)/usr" \ --without-freetype-dir \ --without-xpm-dir \ --without-ttf \ --without-t1lib \ --enable-gd-native-ttf \ --disable-gd-jis-conv -#else +else PKG_CONFIGURE_OPTS+= --without-gd -#endif +endif ifneq ($(ADK_PACKAGE_PHP_MOD_GMP),) PKG_CONFIGURE_OPTS+= --with-gmp=shared,"$(STAGING_TARGET_DIR)/usr" else PKG_CONFIGURE_OPTS+= --without-gmp endif -ifneq ($(ADK_PACKAGE_PHP_MOD_LDAP),) -PKG_CONFIGURE_OPTS+= --with-ldap=shared,"$(STAGING_TARGET_DIR)/usr" \ - --with-ldap-sasl="$(STAGING_TARGET_DIR)/usr" -else +#ifneq ($(ADK_PACKAGE_PHP_MOD_LDAP),) +#PKG_CONFIGURE_OPTS+= --with-ldap=shared,"$(STAGING_TARGET_DIR)/usr" \ +# --with-ldap-sasl="$(STAGING_TARGET_DIR)/usr" +#else PKG_CONFIGURE_OPTS+= --without-ldap -endif +#endif ifneq ($(ADK_PACKAGE_PHP_MOD_MYSQL),) PKG_CONFIGURE_OPTS+= --with-mysql=shared,"$(STAGING_TARGET_DIR)/usr" else PKG_CONFIGURE_OPTS+= --without-mysql endif +ifneq ($(ADK_PACKAGE_PHP_MOD_OPENSSL),) +PKG_CONFIGURE_OPTS+= --with-openssl=shared,"$(STAGING_TARGET_DIR)/usr" \ + --with-openssl-dir="$(STAGING_TARGET_DIR)/usr" +else +PKG_CONFIGURE_OPTS+= --without-openssl +endif ifneq ($(ADK_PACKAGE_PHP_MOD_PGSQL),) PKG_CONFIGURE_OPTS+= --with-pgsql=shared,"$(STAGING_TARGET_DIR)/usr" else PKG_CONFIGURE_OPTS+= --without-pgsql endif +ifneq ($(ADK_PACKAGE_PHP_MOD_SESSION),) +PKG_CONFIGURE_OPTS+= --enable-session=shared +else +PKG_CONFIGURE_OPTS+= --without-session +endif ifneq ($(ADK_PACKAGE_PHP_MOD_SQLITE),) -PKG_CONFIGURE_OPTS+= --without-sqlite +PKG_CONFIGURE_OPTS+= --with-sqlite3="$(STAGING_TARGET_DIR)/usr" PKG_CONFIGURE_OPTS+= --with-pdo-sqlite=shared,"$(STAGING_TARGET_DIR)/usr" PKG_CONFIGURE_OPTS+= --enable-pdo=shared else -PKG_CONFIGURE_OPTS+= --without-sqlite +PKG_CONFIGURE_OPTS+= --without-sqlite3 --without-pdo-sqlite +endif +ifneq ($(ADK_PACKAGE_PHP_MOD_SOCKETS),) +PKG_CONFIGURE_OPTS+= --enable-sockets=shared +else +PKG_CONFIGURE_OPTS+= --without-sockets endif ifneq ($(ADK_PACKAGE_PHP_MOD_XML),) PKG_CONFIGURE_OPTS+= --enable-xml=shared,"$(STAGING_TARGET_DIR)/usr" \ @@ -154,12 +184,18 @@ PKG_CONFIGURE_OPTS+= --enable-xml=shared,"$(STAGING_TARGET_DIR)/usr" \ else PKG_CONFIGURE_OPTS+= --disable-xml endif +ifneq ($(ADK_PACKAGE_PHP_MOD_ZLIB),) +PKG_CONFIGURE_OPTS+= --with-zlib=shared,"$(STAGING_TARGET_DIR)/usr" +else +PKG_CONFIGURE_OPTS+= --without-zlib +endif +$(eval $(call PKG_template,PHP_MOD_BZ2,php-mod-bz2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,PHP_MOD_CURL,php-mod-curl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,PHP_MOD_FTP,php-mod-ftp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,PHP_MOD_GD,php-mod-gd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,PHP_MOD_GMP,php-mod-gmp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,PHP_MOD_LDAP,php-mod-ldap,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +#$(eval $(call PKG_template,PHP_MOD_LDAP,php-mod-ldap,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,PHP_MOD_MYSQL,php-mod-mysql,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,PHP_MOD_OPENSSL,php-mod-openssl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,PHP_MOD_PGSQL,php-mod-pgsql,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) @@ -167,19 +203,22 @@ $(eval $(call PKG_template,PHP_MOD_SESSION,php-mod-session,$(PKG_VERSION)-${PKG_ $(eval $(call PKG_template,PHP_MOD_SOCKETS,php-mod-sockets,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,PHP_MOD_SQLITE,php-mod-sqlite,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,PHP_MOD_XML,php-mod-xml,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,PHP_MOD_ZLIB,php-mod-zlib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_mod_template,PHP_MOD_BZ2,bz2)) $(eval $(call PKG_mod_template,PHP_MOD_CURL,curl)) $(eval $(call PKG_mod_template,PHP_MOD_FTP,ftp)) $(eval $(call PKG_mod_template,PHP_MOD_GD,gd)) $(eval $(call PKG_mod_template,PHP_MOD_GMP,gmp)) -$(eval $(call PKG_mod_template,PHP_MOD_LDAP,ldap)) +#$(eval $(call PKG_mod_template,PHP_MOD_LDAP,ldap)) $(eval $(call PKG_mod_template,PHP_MOD_MYSQL,mysql)) $(eval $(call PKG_mod_template,PHP_MOD_OPENSSL,openssl)) $(eval $(call PKG_mod_template,PHP_MOD_PGSQL,pgsql)) $(eval $(call PKG_mod_template,PHP_MOD_SESSION,session)) $(eval $(call PKG_mod_template,PHP_MOD_SOCKETS,sockets)) -$(eval $(call PKG_mod_template,PHP_MOD_SQLITE,pdo)) +$(eval $(call PKG_mod_template,PHP_MOD_SQLITE,pdo pdo_sqlite)) $(eval $(call PKG_mod_template,PHP_MOD_XML,xml)) +$(eval $(call PKG_mod_template,PHP_MOD_ZLIB,zlib)) INSTALL_STYLE:= manual TARGET_LDFLAGS+= -L$(STAGING_TARGET_DIR)/usr/lib/mysql @@ -190,11 +229,11 @@ do-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m} ${INSTALL_DIR} $(IDIR_PHP)/etc ${INSTALL_DATA} ./files/php.ini $(IDIR_PHP)/etc ${INSTALL_DIR} $(IDIR_PHP_CLI)/usr/bin - ${INSTALL_DIR} $(IDIR_PHP_CLI)/etc - ${INSTALL_DATA} ./files/php.ini $(IDIR_PHP_CLI)/etc + #${INSTALL_DIR} $(IDIR_PHP_CLI)/etc + #${INSTALL_DATA} ./files/php.ini $(IDIR_PHP_CLI)/etc ${INSTALL_BIN} $(WRKBUILD)/sapi/cli/php $(IDIR_PHP_CLI)/usr/bin/php - ${INSTALL_DIR} $(IDIR_PHP_FASTCGI)/etc - ${INSTALL_DATA} ./files/php.ini $(IDIR_PHP_FASTCGI)/etc + #${INSTALL_DIR} $(IDIR_PHP_FASTCGI)/etc + #${INSTALL_DATA} ./files/php.ini $(IDIR_PHP_FASTCGI)/etc ${INSTALL_DIR} $(IDIR_PHP_FASTCGI)/usr/bin ${INSTALL_BIN} $(WRKBUILD)/sapi/cgi/php-cgi \ $(IDIR_PHP_FASTCGI)/usr/bin/php diff --git a/package/php/files/php-mod-bz2.postinst b/package/php/files/php-mod-bz2.postinst new file mode 100644 index 000000000..f90b37fa3 --- /dev/null +++ b/package/php/files/php-mod-bz2.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +echo "extension=bz2.so" >> $IPKG_INSTROOT/etc/php.ini diff --git a/package/php/files/php-mod-curl.postinst b/package/php/files/php-mod-curl.postinst new file mode 100644 index 000000000..5c00bdaa1 --- /dev/null +++ b/package/php/files/php-mod-curl.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +echo "extension=curl.so" >> $IPKG_INSTROOT/etc/php.ini diff --git a/package/php/files/php-mod-ftp.postinst b/package/php/files/php-mod-ftp.postinst new file mode 100644 index 000000000..02d0a56b4 --- /dev/null +++ b/package/php/files/php-mod-ftp.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +echo "extension=ftp.so" >> $IPKG_INSTROOT/etc/php.ini diff --git a/package/php/files/php-mod-gd.postinst b/package/php/files/php-mod-gd.postinst new file mode 100644 index 000000000..79f17af24 --- /dev/null +++ b/package/php/files/php-mod-gd.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +echo "extension=gd.so" >> $IPKG_INSTROOT/etc/php.ini diff --git a/package/php/files/php-mod-gmp.postinst b/package/php/files/php-mod-gmp.postinst new file mode 100644 index 000000000..5f1828f1d --- /dev/null +++ b/package/php/files/php-mod-gmp.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +echo "extension=gmp.so" >> $IPKG_INSTROOT/etc/php.ini diff --git a/package/php/files/php-mod-ldap.postinst b/package/php/files/php-mod-ldap.postinst new file mode 100644 index 000000000..9d6d31117 --- /dev/null +++ b/package/php/files/php-mod-ldap.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +echo "extension=ldap.so" >> $IPKG_INSTROOT/etc/php.ini diff --git a/package/php/files/php-mod-mysql.postinst b/package/php/files/php-mod-mysql.postinst new file mode 100644 index 000000000..b3c23e843 --- /dev/null +++ b/package/php/files/php-mod-mysql.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +echo "extension=mysql.so" >> $IPKG_INSTROOT/etc/php.ini diff --git a/package/php/files/php-mod-openssl.postinst b/package/php/files/php-mod-openssl.postinst new file mode 100644 index 000000000..475426577 --- /dev/null +++ b/package/php/files/php-mod-openssl.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +echo "extension=openssl.so" >> $IPKG_INSTROOT/etc/php.ini diff --git a/package/php/files/php-mod-pgsql.postinst b/package/php/files/php-mod-pgsql.postinst new file mode 100644 index 000000000..30effb1b6 --- /dev/null +++ b/package/php/files/php-mod-pgsql.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +echo "extension=pgsql.so" >> $IPKG_INSTROOT/etc/php.ini diff --git a/package/php/files/php-mod-session.postinst b/package/php/files/php-mod-session.postinst new file mode 100644 index 000000000..ef08f8da2 --- /dev/null +++ b/package/php/files/php-mod-session.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +echo "extension=session.so" >> $IPKG_INSTROOT/etc/php.ini diff --git a/package/php/files/php-mod-sockets.postinst b/package/php/files/php-mod-sockets.postinst new file mode 100644 index 000000000..db06a6f22 --- /dev/null +++ b/package/php/files/php-mod-sockets.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +echo "extension=sockets.so" >> $IPKG_INSTROOT/etc/php.ini diff --git a/package/php/files/php-mod-sqlite.postinst b/package/php/files/php-mod-sqlite.postinst new file mode 100644 index 000000000..523f74337 --- /dev/null +++ b/package/php/files/php-mod-sqlite.postinst @@ -0,0 +1,4 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +echo "extension=pdo.so" >> $IPKG_INSTROOT/etc/php.ini +echo "extension=pdo_sqlite.so" >> $IPKG_INSTROOT/etc/php.ini diff --git a/package/php/files/php-mod-xml.postinst b/package/php/files/php-mod-xml.postinst new file mode 100644 index 000000000..934984f84 --- /dev/null +++ b/package/php/files/php-mod-xml.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +echo "extension=xml.so" >> $IPKG_INSTROOT/etc/php.ini diff --git a/package/php/files/php-mod-zlib.postinst b/package/php/files/php-mod-zlib.postinst new file mode 100644 index 000000000..3f04a3714 --- /dev/null +++ b/package/php/files/php-mod-zlib.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +echo "extension=zlib.so" >> $IPKG_INSTROOT/etc/php.ini diff --git a/package/php/files/php.ini b/package/php/files/php.ini index b41be8776..903bb432e 100644 --- a/package/php/files/php.ini +++ b/package/php/files/php.ini @@ -17,8 +17,6 @@ implicit_flush = Off unserialize_callback_func= serialize_precision = 100 -allow_call_time_pass_reference = On - safe_mode = Off safe_mode_gid = Off |