Преглед на файлове

disable obsolete options, add a generic php package with example config

Waldemar Brodkorb преди 14 години
родител
ревизия
1e61baba6f
променени са 2 файла, в които са добавени 3 реда и са изтрити 10 реда
  1. 3 2
      package/php/Makefile
  2. 0 8
      package/php/files/php.ini

+ 3 - 2
package/php/Makefile

@@ -48,6 +48,7 @@ PKG_DESCR_FCGI:=	PHP for FastCGI usage
 
 include $(TOPDIR)/mk/package.mk
 
+$(eval $(call PKG_template,PHP,php,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,PHP_CLI,php-cli,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,PHP_FASTCGI,php-fastcgi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_FCGI},${PKG_SECTION}))
 
@@ -189,8 +190,8 @@ CONFIGURE_ENV+=		LIBS="-ldl"
 CONFIGURE_ARGS+=	$(PKG_CONFIGURE_OPTS)
 
 do-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m}
-	${INSTALL_DIR} $(IDIR_PHP_CLI)/etc
-	${INSTALL_DATA} ./files/php.ini $(IDIR_PHP_CLI)/etc/
+	${INSTALL_DIR} $(IDIR_PHP)/etc
+	${INSTALL_DATA} ./files/php.ini $(IDIR_PHP)/etc/
 	${INSTALL_DIR} $(IDIR_PHP_CLI)/usr/bin
 	${INSTALL_BIN} $(WRKBUILD)/sapi/cli/php $(IDIR_PHP_CLI)/usr/bin/php
 	${INSTALL_DIR} $(IDIR_PHP_FASTCGI)/etc

+ 0 - 8
package/php/files/php.ini

@@ -200,11 +200,6 @@ variables_order = "EGPCS"
 ; to possible security problems, if the code is not very well thought of.
 register_globals = Off
 
-; Whether or not to register the old-style input arrays, HTTP_GET_VARS
-; and friends.  If you're not using them, it's recommended to turn them off,
-; for performance reasons.
-register_long_arrays = On
-
 ; This directive tells PHP whether to declare the argv&argc variables (that
 ; would contain the GET information).  If you don't use these variables, you
 ; should turn it off for increased performance.
@@ -216,9 +211,6 @@ post_max_size = 8M
 ; Magic quotes
 ;
 
-; Magic quotes for incoming GET/POST/Cookie data.
-magic_quotes_gpc = On
-
 ; Magic quotes for runtime-generated data, e.g. data from SQL, from exec(), etc.
 magic_quotes_runtime = Off