bye-bye php-5.3; prodded by aja@

This commit is contained in:
robert 2015-06-10 12:53:49 +00:00
parent 75e3ec1c13
commit ba015519fd
70 changed files with 0 additions and 2486 deletions

View File

@ -1,26 +0,0 @@
# $OpenBSD: Makefile,v 1.82 2014/11/15 10:17:44 robert Exp $
BROKEN-hppa = no __sync_bool_compare_and_swap support nor asm fallback
# XXX use the bundled libtool because it needs some specific options we
# don't have.
USE_LIBTOOL= No
PV= 5.3
V= ${PV}.29
SUHOSIN_PHPV= 5.3.24
SUHOSIN_P_V= 5.3.x-0.9.10.5
REVISION= 1
INI_TEMPLATES= development production
AUTOCONF_VERSION= 2.13
# sqlite
MULTI_PACKAGES+= -sqlite
COMMENT-sqlite= sqlite database access extensions for php5
CONFIGURE_ARGS+= --with-sqlite=shared,${LOCALBASE} --enable-sqlite-utf8
LIB_DEPENDS-sqlite= databases/sqlite
WANTLIB-sqlite= sqlite>=8 pthread
.include <bsd.port.mk>

View File

@ -1,6 +0,0 @@
SHA256 (php-5.3.29.tar.bz2) = xOHPaXKyqcfyd3oYSX2Dv3E82+yrtl0/9iukQa67AJE=
SHA256 (suhosin-0.9.33.tgz) = hlsccrrppacQ/gsHoGNVVs5sg4ZT7DZNKipub1lFKcU=
SHA256 (suhosin-patch-5.3.24-5.3.x-0.9.10.5.patch.gz) = XehBSfrL88P3UqkHwZ5p4PVp1x+ssDTOk4yXAE8ZN2s=
SIZE (php-5.3.29.tar.bz2) = 11396771
SIZE (suhosin-0.9.33.tgz) = 104488
SIZE (suhosin-patch-5.3.24-5.3.x-0.9.10.5.patch.gz) = 40805

View File

@ -1,70 +0,0 @@
$OpenBSD: patch-aclocal_m4,v 1.9 2014/04/21 14:37:03 ajacoutot Exp $
--- aclocal.m4.orig.port Wed Jun 5 16:29:58 2013
+++ aclocal.m4 Sat Jun 15 15:28:25 2013
@@ -194,7 +194,7 @@ dnl the path is interpreted relative to the top build-
dnl
dnl which array to append to?
AC_DEFUN([PHP_ADD_SOURCES],[
- PHP_ADD_SOURCES_X($1, $2, $3, ifelse($4,cli,PHP_CLI_OBJS,ifelse($4,sapi,PHP_SAPI_OBJS,PHP_GLOBAL_OBJS)))
+ PHP_ADD_SOURCES_X($1, $2, $3, ifelse($4,cli,PHP_CLI_OBJS,ifelse($4,sapi,PHP_SAPI_OBJS,ifelse($4,cgi,PHP_CGI_OBJS,ifelse($4,fpm,PHP_FPM_OBJS,PHP_GLOBAL_OBJS)))))
])
dnl
@@ -973,15 +973,8 @@ dnl ---------------------------------------------- Sha
if test "$3" != "shared" && test "$3" != "yes" && test "$4" = "cli"; then
dnl ---------------------------------------------- CLI static module
[PHP_]translit($1,a-z_-,A-Z__)[_SHARED]=no
- case "$PHP_SAPI" in
- cgi|embed[)]
- PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,)
- EXT_STATIC="$EXT_STATIC $1"
- ;;
- *[)]
- PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cli)
- ;;
- esac
+ PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cgi)
+ PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,fpm)
EXT_CLI_STATIC="$EXT_CLI_STATIC $1"
fi
PHP_ADD_BUILD_DIR($ext_builddir)
@@ -1031,12 +1024,6 @@ You either need to build $1 shared or build $2 statica
build to be successful.
])
fi
- if test "x$is_it_enabled" = "xno" && test "x$3" != "xtrue"; then
- AC_MSG_ERROR([
-You've configured extension $1, which depends on extension $2,
-but you've either not enabled $2, or have disabled it.
-])
- fi
dnl Some systems require that we link $2 to $1 when building
])
@@ -2331,7 +2318,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
AC_MSG_ERROR([OpenSSL version 0.9.6 or greater required.])
fi
- if test -n "$OPENSSL_LIBS" && test -n "$OPENSSL_INCS"; then
+ if test -n "$OPENSSL_LIBS"; then
PHP_EVAL_LIBLINE($OPENSSL_LIBS, $1)
PHP_EVAL_INCLINE($OPENSSL_INCS)
fi
@@ -4332,7 +4319,7 @@ bsdi[[45]]*)
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+ finish_cmds=
shlibpath_var=LD_LIBRARY_PATH
sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
@@ -4657,7 +4644,7 @@ openbsd*)
*) need_version=no ;;
esac
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ finish_cmds=''
shlibpath_var=LD_LIBRARY_PATH
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
case $host_os in

View File

@ -1,60 +0,0 @@
$OpenBSD: patch-configure_in,v 1.6 2012/01/21 23:34:35 sthen Exp $
--- configure.in.orig.port Wed Jan 18 13:57:25 2012
+++ configure.in Wed Jan 18 13:57:25 2012
@@ -968,7 +968,7 @@ enable_static=yes
case $php_build_target in
program|static)
- standard_libtool_flag='-prefer-non-pic -static'
+ standard_libtool_flag=''
if test -z "$PHP_MODULES" && test -z "$PHP_ZEND_EX"; then
enable_shared=no
fi
@@ -977,10 +977,10 @@ case $php_build_target in
enable_static=no
case $with_pic in
yes)
- standard_libtool_flag='-prefer-pic'
+ standard_libtool_flag=''
;;
no)
- standard_libtool_flag='-prefer-non-pic'
+ standard_libtool_flag=''
;;
esac
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -avoid-version -module"
@@ -1171,7 +1171,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfdir`
EXPANDED_DATADIR=$datadir
EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"`
EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"`
-INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR
+INCLUDE_PATH=.:$libdir
exec_prefix=$old_exec_prefix
libdir=$old_libdir
@@ -1383,7 +1383,7 @@ else
pharcmd_install=
fi;
-all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_CLI_TARGET) $pharcmd"
+all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_CLI_TARGET) \$(PHP_CGI_TARGET) \$(PHP_FPM_TARGET) $pharcmd"
install_targets="$install_modules install-build install-headers install-programs $install_pear $pharcmd_install"
case $PHP_SAPI in
@@ -1428,7 +1428,7 @@ esac
PHP_ADD_SOURCES(Zend, \
zend_language_parser.c zend_language_scanner.c \
zend_ini_parser.c zend_ini_scanner.c \
- zend_alloc.c zend_compile.c zend_constants.c zend_dynamic_array.c \
+ zend_compile.c zend_constants.c zend_dynamic_array.c \
zend_execute_API.c zend_highlight.c zend_llist.c \
zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \
zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \
@@ -1450,6 +1450,7 @@ else
fi
PHP_ADD_SOURCES_X(Zend, zend_execute.c,,PHP_GLOBAL_OBJS,,$flag)
+PHP_ADD_SOURCES_X(Zend, zend_alloc.c,,PHP_GLOBAL_OBJS,,"-O0")
PHP_ADD_BUILD_DIR(main main/streams)
PHP_ADD_BUILD_DIR(sapi/$PHP_SAPI sapi/cli)

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-ext_gd_config_m4,v 1.8 2014/01/11 15:01:56 sthen Exp $
--- ext/gd/config.m4.orig.port Tue Dec 10 19:04:57 2013
+++ ext/gd/config.m4 Sat Jan 11 14:26:07 2014
@@ -162,7 +162,7 @@ AC_DEFUN([PHP_GD_FREETYPE2],[
if test "$PHP_FREETYPE_DIR" != "no"; then
for i in $PHP_FREETYPE_DIR /usr/local /usr; do
- if test -f "$i/include/freetype2/freetype/freetype.h"; then
+ if test -f "$i/include/freetype2/freetype/freetype.h" -o -f "$i/include/freetype2/freetype.h"; then
FREETYPE2_DIR=$i
FREETYPE2_INC_DIR=$i/include/freetype2
break

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-ext_gd_gdcache_h,v 1.2 2011/06/18 19:49:50 sthen Exp $
--- ext/gd/gdcache.h.orig.port Wed Sep 26 16:44:16 2007
+++ ext/gd/gdcache.h Sat Jun 18 12:14:48 2011
@@ -41,6 +41,7 @@
/*********************************************************/
#if (!defined(_OSD_POSIX) && !defined(__FreeBSD__)) && HAVE_MALLOC_H
+#elif !defined(__OpenBSD__)
#include <malloc.h>
#else
#include <stdlib.h> /* BS2000/OSD defines malloc() & friends in stdlib.h */

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-ext_gd_libgd_gdcache_h,v 1.2 2011/06/18 19:49:50 sthen Exp $
--- ext/gd/libgd/gdcache.h.orig.port Wed Sep 26 16:44:16 2007
+++ ext/gd/libgd/gdcache.h Sat Jun 18 12:14:49 2011
@@ -41,7 +41,7 @@
/*********************************************************/
#include <stdlib.h>
-#ifdef HAVE_MALLOC_H
+#if (!defined(__OpenBSD__)) && HAVE_MALLOC_H
#include <malloc.h>
#endif
#ifndef NULL

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-ext_gd_libgd_gdkanji_c,v 1.2 2011/06/18 19:49:50 sthen Exp $
--- ext/gd/libgd/gdkanji.c.orig.port Wed Sep 26 16:44:16 2007
+++ ext/gd/libgd/gdkanji.c Sat Jun 18 12:14:49 2011
@@ -362,7 +362,7 @@ do_convert (unsigned char *to, unsigned char *from, co
from_len = strlen ((const char *) from) + 1;
to_len = BUFSIZ;
- if ((int) iconv(cd, (char **) &from, &from_len, (char **) &to, &to_len) == -1)
+ if ((int) iconv(cd, (const char **) &from, &from_len, (char **) &to, &to_len) == -1)
{
#ifdef HAVE_ERRNO_H
if (errno == EINVAL)

View File

@ -1,75 +0,0 @@
$OpenBSD: patch-ext_iconv_iconv_c,v 1.3 2011/06/18 19:49:50 sthen Exp $
--- ext/iconv/iconv.c.orig.port Wed Dec 1 14:03:36 2010
+++ ext/iconv/iconv.c Sat Jun 18 12:14:49 2011
@@ -334,7 +334,7 @@ static php_iconv_err_t _php_iconv_appendl(smart_str *d
out_p = (d)->c + (d)->len;
- if (iconv(cd, (char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
+ if (iconv(cd, (const char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
#if ICONV_SUPPORTS_ERRNO
switch (errno) {
case EINVAL:
@@ -498,7 +498,7 @@ PHP_ICONV_API php_iconv_err_t php_iconv_string(const c
out_p = out_buf;
while (in_left > 0) {
- result = iconv(cd, (char **) &in_p, &in_left, (char **) &out_p, &out_left);
+ result = iconv(cd, (const char **) &in_p, &in_left, (char **) &out_p, &out_left);
out_size = bsz - out_left;
if (result == (size_t)(-1)) {
if (errno == E2BIG && in_left > 0) {
@@ -612,7 +612,7 @@ static php_iconv_err_t _php_iconv_strlen(unsigned int
prev_in_left = in_left;
- if (iconv(cd, (char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
+ if (iconv(cd, (const char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
if (prev_in_left == in_left) {
break;
}
@@ -733,7 +733,7 @@ static php_iconv_err_t _php_iconv_substr(smart_str *pr
prev_in_left = in_left;
- if (iconv(cd1, (char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
+ if (iconv(cd1, (const char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
if (prev_in_left == in_left) {
break;
}
@@ -865,7 +865,7 @@ static php_iconv_err_t _php_iconv_strpos(unsigned int
prev_in_left = in_left;
- if (iconv(cd, (char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
+ if (iconv(cd, (const char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
if (prev_in_left == in_left) {
#if ICONV_SUPPORTS_ERRNO
switch (errno) {
@@ -1114,7 +1114,7 @@ static php_iconv_err_t _php_iconv_mime_encode(smart_st
out_left = out_size - out_reserved;
- if (iconv(cd, (char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
+ if (iconv(cd, (const char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
#if ICONV_SUPPORTS_ERRNO
switch (errno) {
case EINVAL:
@@ -1214,7 +1214,7 @@ static php_iconv_err_t _php_iconv_mime_encode(smart_st
out_p = buf;
out_left = out_size;
- if (iconv(cd, (char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
+ if (iconv(cd, (const char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
#if ICONV_SUPPORTS_ERRNO
switch (errno) {
case EINVAL:
@@ -2542,7 +2542,7 @@ static int php_iconv_stream_filter_append_bucket(
tcnt = self->stub_len;
while (tcnt > 0) {
- if (iconv(self->cd, &pt, &tcnt, &pd, &ocnt) == (size_t)-1) {
+ if (iconv(self->cd, (const char **)&pt, &tcnt, &pd, &ocnt) == (size_t)-1) {
#if ICONV_SUPPORTS_ERRNO
switch (errno) {
case EILSEQ:

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-ext_imap_config_m4,v 1.1 2013/08/08 18:52:40 robert Exp $
--- ext/imap/config.m4.orig.port Thu Aug 8 16:50:57 2013
+++ ext/imap/config.m4 Thu Aug 8 16:51:34 2013
@@ -180,7 +180,7 @@ if test "$PHP_IMAP" != "no"; then
],[])
CPPFLAGS=$old_CPPFLAGS
- PHP_CHECK_LIBRARY(pam, pam_start,
+ PHP_CHECK_LIBRARY(pam, DISABLEDpam_start,
[
PHP_ADD_LIBRARY(pam,, IMAP_SHARED_LIBADD)
AC_DEFINE(HAVE_LIBPAM,1,[ ])

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-ext_mysqlnd_config9_m4,v 1.5 2012/01/21 23:34:35 sthen Exp $
--- ext/mysqlnd/config9.m4.orig.port Tue Sep 6 17:38:22 2011
+++ ext/mysqlnd/config9.m4 Wed Jan 18 14:01:40 2012
@@ -16,6 +16,7 @@ if test -z "$PHP_ZLIB_DIR"; then
fi
dnl If some extension uses mysqlnd it will get compiled in PHP core
+PHP_MYSQLND_ENABLED="yes"
if test "$PHP_MYSQLND" != "no" || test "$PHP_MYSQLND_ENABLED" = "yes"; then
mysqlnd_ps_sources="mysqlnd_ps.c mysqlnd_ps_codec.c"
mysqlnd_base_sources="mysqlnd.c mysqlnd_charset.c mysqlnd_wireprotocol.c \

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-ext_odbc_config_m4,v 1.2 2011/06/18 19:49:50 sthen Exp $
--- ext/odbc/config.m4.orig.port Tue Jul 31 14:02:00 2007
+++ ext/odbc/config.m4 Sat Jun 18 12:14:50 2011
@@ -373,7 +373,6 @@ PHP_ARG_WITH(iodbc,,
if test "$PHP_IODBC" = "yes"; then
PHP_IODBC=/usr/local
fi
- PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
PHP_ADD_INCLUDE($PHP_IODBC/include, 1)
ODBC_TYPE=iodbc
ODBC_INCLUDE=-I$PHP_IODBC/include

View File

@ -1,11 +0,0 @@
--- ext/openssl/config0.m4.orig.port Fri Mar 18 18:47:09 2011
+++ ext/openssl/config0.m4 Fri Jan 13 18:01:58 2012
@@ -16,7 +16,7 @@ if test "$PHP_OPENSSL" != "no"; then
PHP_SETUP_KERBEROS(OPENSSL_SHARED_LIBADD)
fi
- AC_CHECK_LIB(ssl, DSA_get_default_method, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later]))
+ AC_CHECK_LIB(ssl, DSA_get_default_method, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later]),, [-lcrypto])
AC_CHECK_LIB(crypto, X509_free, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later]))
PHP_SETUP_OPENSSL(OPENSSL_SHARED_LIBADD,

View File

@ -1,17 +0,0 @@
$OpenBSD: patch-ext_openssl_openssl_c,v 1.4 2014/04/19 12:06:44 sthen Exp $
--- ext/openssl/openssl.c.orig.port Sat Apr 19 06:03:12 2014
+++ ext/openssl/openssl.c Sat Apr 19 06:03:45 2014
@@ -881,11 +881,13 @@ static int php_openssl_load_rand_file(const char * fil
if (file == NULL) {
file = RAND_file_name(buffer, sizeof(buffer));
+#ifdef HAVE_SSL_RAND_EGD
} else if (RAND_egd(file) > 0) {
/* if the given filename is an EGD socket, don't
* write anything back to it */
*egdsocket = 1;
return SUCCESS;
+#endif
}
if (file == NULL || !RAND_load_file(file, -1)) {
if (RAND_status() == 0) {

View File

@ -1,30 +0,0 @@
$OpenBSD: patch-ext_spl_php_spl_c,v 1.4 2012/01/21 23:34:35 sthen Exp $
--- ext/spl/php_spl.c.orig.port Sun Jan 1 13:15:04 2012
+++ ext/spl/php_spl.c Wed Jan 18 13:57:26 2012
@@ -737,7 +737,7 @@ PHP_FUNCTION(spl_object_hash)
PHPAPI void php_spl_object_hash(zval *obj, char *result TSRMLS_DC) /* {{{*/
{
- intptr_t hash_handle, hash_handlers;
+ zend_intptr_t hash_handle, hash_handlers;
char *hex;
if (!SPL_G(hash_mask_init)) {
@@ -745,13 +745,13 @@ PHPAPI void php_spl_object_hash(zval *obj, char *resul
php_mt_srand(GENERATE_SEED() TSRMLS_CC);
}
- SPL_G(hash_mask_handle) = (intptr_t)(php_mt_rand(TSRMLS_C) >> 1);
- SPL_G(hash_mask_handlers) = (intptr_t)(php_mt_rand(TSRMLS_C) >> 1);
+ SPL_G(hash_mask_handle) = (zend_intptr_t)(php_mt_rand(TSRMLS_C) >> 1);
+ SPL_G(hash_mask_handlers) = (zend_intptr_t)(php_mt_rand(TSRMLS_C) >> 1);
SPL_G(hash_mask_init) = 1;
}
- hash_handle = SPL_G(hash_mask_handle)^(intptr_t)Z_OBJ_HANDLE_P(obj);
- hash_handlers = SPL_G(hash_mask_handlers)^(intptr_t)Z_OBJ_HT_P(obj);
+ hash_handle = SPL_G(hash_mask_handle)^(zend_intptr_t)Z_OBJ_HANDLE_P(obj);
+ hash_handlers = SPL_G(hash_mask_handlers)^(zend_intptr_t)Z_OBJ_HT_P(obj);
spprintf(&hex, 32, "%016x%016x", hash_handle, hash_handlers);

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-ext_spl_php_spl_h,v 1.3 2011/06/18 19:49:50 sthen Exp $
--- ext/spl/php_spl.h.orig.port Sun Jan 3 09:23:27 2010
+++ ext/spl/php_spl.h Sat Jun 18 12:14:51 2011
@@ -67,8 +67,8 @@ ZEND_BEGIN_MODULE_GLOBALS(spl)
HashTable * autoload_functions;
int autoload_running;
int autoload_extensions_len;
- intptr_t hash_mask_handle;
- intptr_t hash_mask_handlers;
+ zend_intptr_t hash_mask_handle;
+ zend_intptr_t hash_mask_handlers;
int hash_mask_init;
ZEND_END_MODULE_GLOBALS(spl)

View File

@ -1,25 +0,0 @@
$OpenBSD: patch-ext_standard_config_m4,v 1.3 2011/06/18 19:49:50 sthen Exp $
--- ext/standard/config.m4.orig.port Thu Jun 17 11:22:03 2010
+++ ext/standard/config.m4 Sat Jun 18 12:14:51 2011
@@ -370,16 +370,16 @@ dnl
dnl Detect library functions needed by php dns_xxx functions
dnl ext/standard/php_dns.h will collect these in a single define: HAVE_FULL_DNS_FUNCS
dnl
-PHP_CHECK_FUNC(res_nsearch, resolv, bind, socket)
-PHP_CHECK_FUNC(dns_search, resolv, bind, socket)
-PHP_CHECK_FUNC(dn_expand, resolv, bind, socket)
-PHP_CHECK_FUNC(dn_skipname, resolv, bind, socket)
+PHP_CHECK_FUNC(res_nsearch, resolv, socket)
+PHP_CHECK_FUNC(dns_search, resolv, socket)
+PHP_CHECK_FUNC(dn_expand, resolv, socket)
+PHP_CHECK_FUNC(dn_skipname, resolv, socket)
dnl
dnl These are old deprecated functions
dnl
-PHP_CHECK_FUNC(res_search, resolv, bind, socket)
+PHP_CHECK_FUNC(res_search, resolv, socket)
dnl
dnl Check if atof() accepts NAN

View File

@ -1,33 +0,0 @@
$OpenBSD: patch-ext_tidy_config_m4,v 1.2 2011/06/18 19:49:50 sthen Exp $
--- ext/tidy/config.m4.orig.port Wed Sep 26 16:44:16 2007
+++ ext/tidy/config.m4 Sat Jun 18 12:14:51 2011
@@ -14,12 +14,12 @@ if test "$PHP_TIDY" != "no"; then
fi
for i in $TIDY_SEARCH_DIRS; do
- if test -f $i/include/tidy/tidy.h; then
+ if test -f $i/include/tidyp/tidyp.h; then
TIDY_DIR=$i
- TIDY_INCDIR=$i/include/tidy
- elif test -f $i/include/tidy.h; then
+ TIDY_INCDIR=$i/include/tidyp
+ elif test -f $i/include/tidyp.h; then
TIDY_DIR=$i
- TIDY_INCDIR=$i/include
+ TIDY_INCDIR=$i/include/tidyp
fi
done
@@ -29,10 +29,10 @@ if test "$PHP_TIDY" != "no"; then
TIDY_LIBDIR=$TIDY_DIR/$PHP_LIBDIR
- PHP_ADD_LIBRARY_WITH_PATH(tidy, $TIDY_LIBDIR, TIDY_SHARED_LIBADD)
+ PHP_ADD_LIBRARY_WITH_PATH(tidyp, $TIDY_LIBDIR, TIDY_SHARED_LIBADD)
PHP_ADD_INCLUDE($TIDY_INCDIR)
- PHP_CHECK_LIBRARY(tidy,tidyOptGetDoc,
+ PHP_CHECK_LIBRARY(tidyp,tidyOptGetDoc,
[
AC_DEFINE(HAVE_TIDYOPTGETDOC,1,[ ])
],[],[])

View File

@ -1,13 +0,0 @@
$OpenBSD: patch-ext_tidy_tidy_c,v 1.6 2014/01/12 22:03:45 sthen Exp $
--- ext/tidy/tidy.c.orig.port Sun Jan 12 21:53:52 2014
+++ ext/tidy/tidy.c Sun Jan 12 21:56:13 2014
@@ -31,7 +31,8 @@
#include "ext/standard/info.h"
#include "safe_mode.h"
-#include "tidy.h"
+#include "tidyp.h"
+#define tidyReleaseDate() tidyVersion()
#include "buffio.h"
/* compatibility with older versions of libtidy */

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-ext_xmlrpc_libxmlrpc_encodings_c,v 1.3 2011/06/18 19:49:50 sthen Exp $
--- ext/xmlrpc/libxmlrpc/encodings.c.orig.port Wed Sep 26 16:44:16 2007
+++ ext/xmlrpc/libxmlrpc/encodings.c Sat Jun 18 12:14:51 2011
@@ -78,7 +78,7 @@ static char* convert(const char* src, int src_len, int
if(outbuf) {
out_ptr = (char*)outbuf;
while(inlenleft) {
- st = iconv(ic, (char**)&src, &inlenleft, &out_ptr, &outlenleft);
+ st = iconv(ic, (const char**)&src, &inlenleft, &out_ptr, &outlenleft);
if(st == -1) {
if(errno == E2BIG) {
int diff = out_ptr - outbuf;

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-main_php_h,v 1.4 2012/05/08 21:29:16 sthen Exp $
--- main/php.h.orig.port Fri May 4 01:28:40 2012
+++ main/php.h Fri May 4 01:28:41 2012
@@ -141,7 +141,7 @@ char *strtok_r(char *s, const char *delim, char **last
END_EXTERN_C()
#endif
-#ifndef HAVE_SOCKLEN_T
+#if !defined(HAVE_SOCKLEN_T) && !defined(__OpenBSD__)
typedef unsigned int socklen_t;
#endif

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-main_php_ini_c,v 1.3 2012/01/21 23:34:35 sthen Exp $
--- main/php_ini.c.orig.port Sun Jan 1 13:15:04 2012
+++ main/php_ini.c Wed Jan 18 14:03:17 2012
@@ -599,7 +599,7 @@ int php_init_config(TSRMLS_D)
/* If still no ini file found, search for php.ini file in search path */
if (!fh.handle.fp) {
- fh.handle.fp = php_fopen_with_path("php.ini", "r", php_ini_search_path, &php_ini_opened_path TSRMLS_CC);
+ fh.handle.fp = php_fopen_with_path("php-${PV}.ini", "r", php_ini_search_path, &php_ini_opened_path TSRMLS_CC);
if (fh.handle.fp) {
fh.filename = php_ini_opened_path;
}

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-main_php_open_temporary_file_c,v 1.3 2011/06/18 19:49:50 sthen Exp $
--- main/php_open_temporary_file.c.orig.port Sun Feb 7 20:15:58 2010
+++ main/php_open_temporary_file.c Sat Jun 18 12:14:52 2011
@@ -138,7 +138,7 @@ static int php_do_open_temporary_file(const char *path
trailing_slash = "/";
}
- if (spprintf(&opened_path, 0, "%s%s%sXXXXXX", new_state.cwd, trailing_slash, pfx) >= MAXPATHLEN) {
+ if (spprintf(&opened_path, 0, "%s%s%sXXXXXXXXXX", new_state.cwd, trailing_slash, pfx) >= MAXPATHLEN) {
efree(opened_path);
free(new_state.cwd);
return -1;

View File

@ -1,506 +0,0 @@
$OpenBSD: patch-php_ini-development,v 1.6 2014/03/20 13:02:19 ajacoutot Exp $
--- php.ini-development.orig.port Tue Dec 10 20:04:57 2013
+++ php.ini-development Thu Mar 20 13:36:43 2014
@@ -793,11 +793,8 @@ default_mimetype = "text/html"
;;;;;;;;;;;;;;;;;;;;;;;;;
; UNIX: "/path1:/path2"
-;include_path = ".:/php/includes"
+include_path = ".:OPENBSD_INCLUDE_PATH"
;
-; Windows: "\path1;\path2"
-;include_path = ".;c:\php\includes"
-;
; PHP's default setting for include_path is ".;/path/to/php/pear"
; http://php.net/include-path
@@ -819,6 +816,7 @@ user_dir =
; extension_dir = "./"
; On windows:
; extension_dir = "ext"
+extension_dir = "MODULES_DIR"
; Whether or not to enable the dl() function. The dl() function does NOT work
; properly in multithreaded servers, such as IIS or Zeus, and is automatically
@@ -899,7 +897,7 @@ max_file_uploads = 20
; Whether to allow the treatment of URLs (like http:// or ftp://) as files.
; http://php.net/allow-url-fopen
-allow_url_fopen = On
+allow_url_fopen = Off
; Whether to allow include/require to open URLs (like http:// or ftp://) as files.
; http://php.net/allow-url-include
@@ -1005,7 +1003,7 @@ default_socket_timeout = 60
[Date]
; Defines the default timezone used by the date functions
; http://php.net/date.timezone
-;date.timezone =
+date.timezone = UTC
; http://php.net/date.default-latitude
;date.default_latitude = 31.7667
@@ -1091,16 +1089,6 @@ pdo_mysql.default_socket=
define_syslog_variables = Off
[mail function]
-; For Win32 only.
-; http://php.net/smtp
-SMTP = localhost
-; http://php.net/smtp-port
-smtp_port = 25
-
-; For Win32 only.
-; http://php.net/sendmail-from
-;sendmail_from = me@example.com
-
; For Unix only. You may supply arguments as well (default: "sendmail -t -i").
; http://php.net/sendmail-path
;sendmail_path =
@@ -1906,6 +1894,446 @@ ldap.max_links = -1
[dba]
;dba.default_handler=
+
+[suhosin]
+
+; -----------------------------------------------------------------------------
+; Logging Options
+
+; Defines what classes of security alerts are logged to the syslog daemon.
+; Logging of errors of the class S_MEMORY are always logged to syslog, no
+; matter what this configuration says, because a corrupted heap could mean that
+; the other logging options will malfunction during the logging process.
+;suhosin.log.syslog =
+
+; Defines the syslog facility that is used when ALERTs are logged to syslog.
+;suhosin.log.syslog.facility =
+
+; Defines the syslog priority that is used when ALERTs are logged to syslog.
+;suhosin.log.syslog.priority =
+
+; Defines what classes of security alerts are logged through the SAPI error log.
+;suhosin.log.sapi =
+
+; Defines what classes of security alerts are logged through the external
+; logging.
+;suhosin.log.script =
+
+; Defines what classes of security alerts are logged through the defined PHP
+; script.
+;suhosin.log.phpscript = 0
+
+; Defines the full path to a external logging script. The script is called with
+; 2 parameters. The first one is the alert class in string notation and the
+; second parameter is the log message. This can be used for example to mail
+; failing MySQL queries to your email address, because on a production system
+; these things should never happen.
+;suhosin.log.script.name =
+
+; Defines the full path to a PHP logging script. The script is called with 2
+; variables registered in the current scope: SUHOSIN_ERRORCLASS and
+; SUHOSIN_ERROR. The first one is the alert class and the second variable is
+; the log message. This can be used for example to mail attempted remote URL
+; include attacks to your email address.
+;suhosin.log.phpscript.name =
+
+; Undocumented
+;suhosin.log.phpscript.is_safe = Off
+
+; When the Hardening-Patch logs an error the log message also contains the IP
+; of the attacker. Usually this IP is retrieved from the REMOTE_ADDR SAPI
+; environment variable. With this switch it is possible to change this behavior
+; to read the IP from the X-Forwarded-For HTTP header. This is f.e. necessary
+; when your PHP server runs behind a reverse proxy.
+;suhosin.log.use-x-forwarded-for = Off
+
+; -----------------------------------------------------------------------------
+; Executor Options
+
+; Defines the maximum stack depth allowed by the executor before it stops the
+; script. Without this function an endless recursion in a PHP script could
+; crash the PHP executor or trigger the configured memory_limit. A value of
+; "0" disables this feature.
+;suhosin.executor.max_depth = 0
+
+; Defines how many "../" an include filename needs to contain to be considered
+; an attack and stopped. A value of "2" will block "../../etc/passwd", while a
+; value of "3" will allow it. Most PHP applications should work flawlessly with
+; values "4" or "5". A value of "0" disables this feature.
+;suhosin.executor.include.max_traversal = 0
+
+; Comma separated whitelist of URL schemes that are allowed to be included from
+; include or require statements. Additionally to URL schemes it is possible to
+; specify the beginning of allowed URLs. (f.e.: php://stdin) If no whitelist is
+; specified, then the blacklist is evaluated.
+;suhosin.executor.include.whitelist =
+
+; Comma separated blacklist of URL schemes that are not allowed to be included
+; from include or require statements. Additionally to URL schemes it is
+; possible to specify the beginning of allowed URLs. (f.e.: php://stdin) If no
+; blacklist and no whitelist is specified all URL schemes are forbidden.
+;suhosin.executor.include.blacklist =
+
+; Defines if PHP is allows to run code from files that are writable by the
+; current process. If a file is created or modified by a PHP process, there
+; is a potential danger of code injection. Only turn this on if you are sure
+; that your application does not require writable PHP files.
+;suhosin.executor.include.allow_writable_files = On
+
+; Comma separated whitelist of functions that are allowed to be called. If the
+; whitelist is empty the blacklist is evaluated, otherwise calling a function
+; not in the whitelist will terminate the script and get logged.
+;suhosin.executor.func.whitelist =
+
+; Comma separated blacklist of functions that are not allowed to be called. If
+; no whitelist is given, calling a function within the blacklist will terminate
+; the script and get logged.
+;suhosin.executor.func.blacklist =
+
+; Comma separated whitelist of functions that are allowed to be called from
+; within eval(). If the whitelist is empty the blacklist is evaluated,
+; otherwise calling a function not in the whitelist will terminate the script
+; and get logged.
+;suhosin.executor.eval.whitelist =
+
+; Comma separated blacklist of functions that are not allowed to be called from
+; within eval(). If no whitelist is given, calling a function within the
+; blacklist will terminate the script and get logged.
+;suhosin.executor.eval.blacklist =
+
+; eval() is a very dangerous statement and therefore you might want to disable
+; it completely. Deactivating it will however break lots of scripts. Because
+; every violation is logged, this allows finding all places where eval() is
+; used.
+;suhosin.executor.disable_eval = Off
+
+; The /e modifier inside preg_replace() allows code execution. Often it is the
+; cause for remote code execution exploits. It is wise to deactivate this
+; feature and test where in the application it is used. The developer using the
+; /e modifier should be made aware that he should use preg_replace_callback()
+; instead.
+;suhosin.executor.disable_emodifier = Off
+
+; This flag reactivates symlink() when open_basedir is used, which is disabled
+; by default in Suhosin >= 0.9.6. Allowing symlink() while open_basedir is used
+; is actually a security risk.
+;suhosin.executor.allow_symlink = Off
+
+; -----------------------------------------------------------------------------
+; Misc Options
+
+; If you fear that Suhosin breaks your application, you can activate Suhosin's
+; simulation mode with this flag. When Suhosin runs in simulation mode,
+; violations are logged as usual, but nothing is blocked or removed from the
+; request. (Transparent features are NOT deactivated in simulation mode.)
+; (since v0.9.30 affects (dis)allowed functions)
+;suhosin.simulation = Off
+
+; APC 3.0.12(p1/p2) uses reserved resources without requesting a resource slot
+; first. It always uses resource slot 0. If Suhosin got this slot assigned APC
+; will overwrite the information Suhosin stores in this slot. When this flag is
+; set Suhosin will request 2 Slots and use the second one. This allows working
+; correctly with these buggy APC versions.
+;suhosin.apc_bug_workaround = Off
+
+; When a SQL Query fails scripts often spit out a bunch of useful information
+; for possible attackers. When this configuration directive is turned on, the
+; script will silently terminate, after the problem has been logged. (This is
+; not yet supported)
+;suhosin.sql.bailout_on_error = Off
+
+; This is an experimental feature for shared environments. With this
+; configuration option it is possible to specify a prefix that is automatically
+; prepended to the database username, whenever a database connection is made.
+; (Unless the username starts with the prefix)
+;suhosin.sql.user_prefix =
+
+; This is an experimental feature for shared environments. With this
+; configuration option it is possible to specify a postfix that is
+; automatically appended to the database username, whenever a database
+; connection is made. (Unless the username end with the postfix)
+;
+; With this feature it is possible for shared hosters to disallow customers to
+; connect with the usernames of other customers. This feature is experimental,
+; because support for PDO and PostgreSQL are not yet implemented.
+;suhosin.sql.user_postfix =
+
+; This directive controls if multiple headers are allowed or not in a header()
+; call. By default the Hardening-Patch forbids this. (HTTP headers spanning
+; multiple lines are still allowed).
+;suhosin.multiheader = Off
+
+; This directive controls if the mail() header protection is activated or not
+; and to what degree it is activated. The appended table lists the possible
+; activation levels.
+suhosin.mail.protect = 1
+
+; As long scripts are not running within safe_mode they are free to change the
+; memory_limit to whatever value they want. Suhosin changes this fact and
+; disallows setting the memory_limit to a value greater than the one the script
+; started with, when this option is left at 0. A value greater than 0 means
+; that Suhosin will disallows scripts setting the memory_limit to a value above
+; this configured hard limit. This is for example usefull if you want to run
+; the script normaly with a limit of 16M but image processing scripts may raise
+; it to 20M.
+;suhosin.memory_limit = 0
+
+; -----------------------------------------------------------------------------
+; Transparent Encryption Options
+
+; Flag that decides if the transparent session encryption is activated or not.
+;suhosin.session.encrypt = On
+
+; Session data can be encrypted transparently. The encryption key used consists
+; of this user defined string (which can be altered by a script via ini_set())
+; and optionally the User-Agent, the Document-Root and 0-4 Octects of the
+; REMOTE_ADDR.
+;suhosin.session.cryptkey =
+
+; Flag that decides if the transparent session encryption key depends on the
+; User-Agent field. (When activated this feature transparently adds a little
+; bit protection against session fixation/hijacking attacks)
+;suhosin.session.cryptua = On
+
+; Flag that decides if the transparent session encryption key depends on the
+; Documentroot field.
+;suhosin.session.cryptdocroot = On
+
+; Number of octets (0-4) from the REMOTE_ADDR that the transparent session
+; encryption key depends on. Keep in mind that this should not be used on sites
+; that have visitors from big ISPs, because their IP address often changes
+; during a session. But this feature might be interesting for admin interfaces
+; or intranets. When used wisely this is a transparent protection against
+; session hijacking/fixation.
+;suhosin.session.cryptraddr = 0
+
+; Number of octets (0-4) from the REMOTE_ADDR that have to match to decrypt the
+; session. The difference to suhosin.session.cryptaddr is, that the IP is not
+; part of the encryption key, so that the same session can be used for
+; different areas with different protection levels on the site.
+;suhosin.session.checkraddr = 0
+
+; Flag that decides if the transparent cookie encryption is activated or not.
+;suhosin.cookie.encrypt = 0
+
+; Cookies can be encrypted transparently. The encryption key used consists of
+; this user defined string and optionally the User-Agent, the Document-Root and
+; 0-4 Octects of the REMOTE_ADDR.
+;suhosin.cookie.cryptkey =
+
+; Flag that decides if the transparent session encryption key depends on the
+; User-Agent field. (When activated this feature transparently adds a little
+; bit protection against session fixation/hijacking attacks (if only session
+; cookies are allowed))
+;suhosin.cookie.cryptua = On
+
+; Flag that decides if the transparent cookie encryption key depends on the
+; Documentroot field.
+;suhosin.cookie.cryptdocroot = On
+
+; Number of octets (0-4) from the REMOTE_ADDR that the transparent cookie
+; encryption key depends on. Keep in mind that this should not be used on sites
+; that have visitors from big ISPs, because their IP address often changes
+; during a session. But this feature might be interesting for admin interfaces
+; or intranets. When used wisely this is a transparent protection against
+; session hijacking/fixation.
+;suhosin.cookie.cryptraddr = 0
+
+; Number of octets (0-4) from the REMOTE_ADDR that have to match to decrypt the
+; cookie. The difference to suhosin.cookie.cryptaddr is, that the IP is not
+; part of the encryption key, so that the same cookie can be used for different
+; areas with different protection levels on the site.
+;suhosin.cookie.checkraddr = 0
+
+; In case not all cookies are supposed to get encrypted this is a comma
+; separated list of cookie names that should get encrypted. All other cookies
+; will not get touched.
+;suhosin.cookie.cryptlist =
+
+; In case some cookies should not be crypted this is a comma separated list of
+; cookies that do not get encrypted. All other cookies will be encrypted.
+;suhosin.cookie.plainlist =
+
+; -----------------------------------------------------------------------------
+; Filtering Options
+
+; Defines the reaction of Suhosin on a filter violation.
+;suhosin.filter.action =
+
+; Defines the maximum depth an array variable may have, when registered through
+; the COOKIE.
+;suhosin.cookie.max_array_depth = 50
+
+; Defines the maximum length of array indices for variables registered through
+; the COOKIE.
+;suhosin.cookie.max_array_index_length = 64
+
+; Defines the maximum length of variable names for variables registered through
+; the COOKIE. For array variables this is the name in front of the indices.
+;suhosin.cookie.max_name_length = 64
+
+; Defines the maximum length of the total variable name when registered through
+; the COOKIE. For array variables this includes all indices.
+;suhosin.cookie.max_totalname_length = 256
+
+; Defines the maximum length of a variable that is registered through the
+; COOKIE.
+;suhosin.cookie.max_value_length = 10000
+
+; Defines the maximum number of variables that may be registered through the
+; COOKIE.
+;suhosin.cookie.max_vars = 100
+
+; When set to On ASCIIZ chars are not allowed in variables.
+;suhosin.cookie.disallow_nul = 1
+
+; Defines the maximum depth an array variable may have, when registered through
+; the URL
+;suhosin.get.max_array_depth = 50
+
+; Defines the maximum length of array indices for variables registered through
+; the URL
+;suhosin.get.max_array_index_length = 64
+
+; Defines the maximum length of variable names for variables registered through
+; the URL. For array variables this is the name in front of the indices.
+;suhosin.get.max_name_length = 64
+
+; Defines the maximum length of the total variable name when registered through
+; the URL. For array variables this includes all indices.
+;suhosin.get.max_totalname_length = 256
+
+; Defines the maximum length of a variable that is registered through the URL.
+;suhosin.get.max_value_length = 512
+
+; Defines the maximum number of variables that may be registered through the
+; URL.
+;suhosin.get.max_vars = 100
+
+; When set to On ASCIIZ chars are not allowed in variables.
+;suhosin.get.disallow_nul = 1
+
+; Defines the maximum depth an array variable may have, when registered through
+; a POST request.
+;suhosin.post.max_array_depth = 50
+
+; Defines the maximum length of array indices for variables registered through
+; a POST request.
+;suhosin.post.max_array_index_length = 64
+
+; Defines the maximum length of variable names for variables registered through
+; a POST request. For array variables this is the name in front of the indices.
+;suhosin.post.max_name_length = 64
+
+; Defines the maximum length of the total variable name when registered through
+; a POST request. For array variables this includes all indices.
+;suhosin.post.max_totalname_length = 256
+
+; Defines the maximum length of a variable that is registered through a POST
+; request.
+;suhosin.post.max_value_length = 1000000
+
+; Defines the maximum number of variables that may be registered through a POST
+; request.
+;suhosin.post.max_vars = 1000
+
+; When set to On ASCIIZ chars are not allowed in variables.
+;suhosin.post.disallow_nul = 1
+
+; Defines the maximum depth an array variable may have, when registered through
+; GET , POST or COOKIE. This setting is also an upper limit for the separate
+; GET, POST, COOKIE configuration directives.
+;suhosin.request.max_array_depth = 50
+
+; Defines the maximum length of array indices for variables registered through
+; GET, POST or COOKIE. This setting is also an upper limit for the separate
+; GET, POST, COOKIE configuration directives.
+;suhosin.request.max_array_index_length = 64
+
+; Defines the maximum length of variable names for variables registered through
+; the COOKIE, the URL or through a POST request. This is the complete name
+; string, including all indicies. This setting is also an upper limit for the
+; separate GET, POST, COOKIE configuration directives.
+;suhosin.request.max_totalname_length = 256
+
+; Defines the maximum length of a variable that is registered through the
+; COOKIE, the URL or through a POST request. This setting is also an upper
+; limit for the variable origin specific configuration directives.
+;suhosin.request.max_value_length = 1000000
+
+; Defines the maximum number of variables that may be registered through the
+; COOKIE, the URL or through a POST request. This setting is also an upper
+; limit for the variable origin specific configuration directives.
+;suhosin.request.max_vars = 1000
+
+; Defines the maximum name length (excluding possible array indicies) of
+; variables that may be registered through the COOKIE, the URL or through a
+; POST request. This setting is also an upper limit for the variable origin
+; specific configuration directives.
+;suhosin.request.max_varname_length = 64
+
+; When set to On ASCIIZ chars are not allowed in variables.
+;suhosin.request.disallow_nul = 1
+
+; When set to On the dangerous characters <>"'` are urlencoded when found
+; not encoded in the server variables REQUEST_URI and QUERY_STRING. This
+; will protect against some XSS vulnerabilities.
+;suhosin.server.encode = 1
+
+; When set to On the dangerous characters <>"'` are replaced with ? in
+; the server variables PHP_SELF, PATH_TRANSLATED and PATH_INFO. This will
+; protect against some XSS vulnerabilities.
+;suhosin.server.strip = 1
+
+; Defines the maximum number of files that may be uploaded with one request.
+;suhosin.upload.max_uploads = 25
+
+; When set to On it is not possible to upload ELF executables.
+;suhosin.upload.disallow_elf = 1
+
+; When set to On it is not possible to upload binary files.
+;suhosin.upload.disallow_binary = 0
+
+; When set to On binary content is removed from the uploaded files.
+;suhosin.upload.remove_binary = 0
+
+; This defines the full path to a verification script for uploaded files. The
+; script gets the temporary filename supplied and has to decide if the upload
+; is allowed. A possible application for this is to scan uploaded files for
+; viruses. The called script has to write a 1 as first line to standard output
+; to allow the upload. Any other value or no output at all will result in the
+; file being deleted.
+;suhosin.upload.verification_script =
+
+; Specifies the maximum length of the session identifier that is allowed. When
+; a longer session identifier is passed a new session identifier will be
+; created. This feature is important to fight bufferoverflows in 3rd party
+; session handlers.
+;suhosin.session.max_id_length = 128
+
+; Undocumented: Controls if suhosin coredumps when the optional suhosin patch
+; detects a bufferoverflow, memory corruption or double free. This is only
+; for debugging purposes and should not be activated.
+;suhosin.coredump = Off
+
+; Undocumented: Controls if the encryption keys specified by the configuration
+; are shown in the phpinfo() output or if they are hidden from it
+;suhosin.protectkey = 1
+
+; Controls if suhosin loads in stealth mode when it is not the only
+; zend_extension (Required for full compatibility with certain encoders
+; that consider open source untrusted. e.g. ionCube, Zend)
+;suhosin.stealth = 1
+
+; Controls if suhosin's ini directives are changeable per directory
+; because the admin might want to allow some features to be controlable
+; by .htaccess and some not. For example the logging capabilities can
+; break safemode and open_basedir restrictions when .htaccess support is
+; allowed and the admin forgot to fix their values in httpd.conf
+; An empty value or a 0 will result in all directives not allowed in
+; .htaccess. The string "legcprsum" will allow logging, execution, get,
+; post, cookie, request, sql, upload, misc features in .htaccess
+;suhosin.perdir = "0"
[xsl]
; Write operations from within XSLT are disabled by default.

View File

@ -1,489 +0,0 @@
$OpenBSD: patch-php_ini-production,v 1.8 2014/03/20 13:02:19 ajacoutot Exp $
--- php.ini-production.orig.port Tue Dec 10 20:04:57 2013
+++ php.ini-production Thu Mar 20 13:36:51 2014
@@ -793,11 +793,8 @@ default_mimetype = "text/html"
;;;;;;;;;;;;;;;;;;;;;;;;;
; UNIX: "/path1:/path2"
-;include_path = ".:/php/includes"
+include_path = ".:OPENBSD_INCLUDE_PATH"
;
-; Windows: "\path1;\path2"
-;include_path = ".;c:\php\includes"
-;
; PHP's default setting for include_path is ".;/path/to/php/pear"
; http://php.net/include-path
@@ -819,6 +816,7 @@ user_dir =
; extension_dir = "./"
; On windows:
; extension_dir = "ext"
+extension_dir = "MODULES_DIR"
; Whether or not to enable the dl() function. The dl() function does NOT work
; properly in multithreaded servers, such as IIS or Zeus, and is automatically
@@ -899,7 +897,7 @@ max_file_uploads = 20
; Whether to allow the treatment of URLs (like http:// or ftp://) as files.
; http://php.net/allow-url-fopen
-allow_url_fopen = On
+allow_url_fopen = Off
; Whether to allow include/require to open URLs (like http:// or ftp://) as files.
; http://php.net/allow-url-include
@@ -1005,7 +1003,7 @@ default_socket_timeout = 60
[Date]
; Defines the default timezone used by the date functions
; http://php.net/date.timezone
-;date.timezone =
+date.timezone = UTC
; http://php.net/date.default-latitude
;date.default_latitude = 31.7667
@@ -1906,6 +1904,446 @@ ldap.max_links = -1
[dba]
;dba.default_handler=
+
+[suhosin]
+
+; -----------------------------------------------------------------------------
+; Logging Options
+
+; Defines what classes of security alerts are logged to the syslog daemon.
+; Logging of errors of the class S_MEMORY are always logged to syslog, no
+; matter what this configuration says, because a corrupted heap could mean that
+; the other logging options will malfunction during the logging process.
+;suhosin.log.syslog =
+
+; Defines the syslog facility that is used when ALERTs are logged to syslog.
+;suhosin.log.syslog.facility =
+
+; Defines the syslog priority that is used when ALERTs are logged to syslog.
+;suhosin.log.syslog.priority =
+
+; Defines what classes of security alerts are logged through the SAPI error log.
+;suhosin.log.sapi =
+
+; Defines what classes of security alerts are logged through the external
+; logging.
+;suhosin.log.script =
+
+; Defines what classes of security alerts are logged through the defined PHP
+; script.
+;suhosin.log.phpscript = 0
+
+; Defines the full path to a external logging script. The script is called with
+; 2 parameters. The first one is the alert class in string notation and the
+; second parameter is the log message. This can be used for example to mail
+; failing MySQL queries to your email address, because on a production system
+; these things should never happen.
+;suhosin.log.script.name =
+
+; Defines the full path to a PHP logging script. The script is called with 2
+; variables registered in the current scope: SUHOSIN_ERRORCLASS and
+; SUHOSIN_ERROR. The first one is the alert class and the second variable is
+; the log message. This can be used for example to mail attempted remote URL
+; include attacks to your email address.
+;suhosin.log.phpscript.name =
+
+; Undocumented
+;suhosin.log.phpscript.is_safe = Off
+
+; When the Hardening-Patch logs an error the log message also contains the IP
+; of the attacker. Usually this IP is retrieved from the REMOTE_ADDR SAPI
+; environment variable. With this switch it is possible to change this behavior
+; to read the IP from the X-Forwarded-For HTTP header. This is f.e. necessary
+; when your PHP server runs behind a reverse proxy.
+;suhosin.log.use-x-forwarded-for = Off
+
+; -----------------------------------------------------------------------------
+; Executor Options
+
+; Defines the maximum stack depth allowed by the executor before it stops the
+; script. Without this function an endless recursion in a PHP script could
+; crash the PHP executor or trigger the configured memory_limit. A value of
+; "0" disables this feature.
+;suhosin.executor.max_depth = 0
+
+; Defines how many "../" an include filename needs to contain to be considered
+; an attack and stopped. A value of "2" will block "../../etc/passwd", while a
+; value of "3" will allow it. Most PHP applications should work flawlessly with
+; values "4" or "5". A value of "0" disables this feature.
+;suhosin.executor.include.max_traversal = 0
+
+; Comma separated whitelist of URL schemes that are allowed to be included from
+; include or require statements. Additionally to URL schemes it is possible to
+; specify the beginning of allowed URLs. (f.e.: php://stdin) If no whitelist is
+; specified, then the blacklist is evaluated.
+;suhosin.executor.include.whitelist =
+
+; Comma separated blacklist of URL schemes that are not allowed to be included
+; from include or require statements. Additionally to URL schemes it is
+; possible to specify the beginning of allowed URLs. (f.e.: php://stdin) If no
+; blacklist and no whitelist is specified all URL schemes are forbidden.
+;suhosin.executor.include.blacklist =
+
+; Defines if PHP is allows to run code from files that are writable by the
+; current process. If a file is created or modified by a PHP process, there
+; is a potential danger of code injection. Only turn this on if you are sure
+; that your application does not require writable PHP files.
+;suhosin.executor.include.allow_writable_files = On
+
+; Comma separated whitelist of functions that are allowed to be called. If the
+; whitelist is empty the blacklist is evaluated, otherwise calling a function
+; not in the whitelist will terminate the script and get logged.
+;suhosin.executor.func.whitelist =
+
+; Comma separated blacklist of functions that are not allowed to be called. If
+; no whitelist is given, calling a function within the blacklist will terminate
+; the script and get logged.
+;suhosin.executor.func.blacklist =
+
+; Comma separated whitelist of functions that are allowed to be called from
+; within eval(). If the whitelist is empty the blacklist is evaluated,
+; otherwise calling a function not in the whitelist will terminate the script
+; and get logged.
+;suhosin.executor.eval.whitelist =
+
+; Comma separated blacklist of functions that are not allowed to be called from
+; within eval(). If no whitelist is given, calling a function within the
+; blacklist will terminate the script and get logged.
+;suhosin.executor.eval.blacklist =
+
+; eval() is a very dangerous statement and therefore you might want to disable
+; it completely. Deactivating it will however break lots of scripts. Because
+; every violation is logged, this allows finding all places where eval() is
+; used.
+;suhosin.executor.disable_eval = Off
+
+; The /e modifier inside preg_replace() allows code execution. Often it is the
+; cause for remote code execution exploits. It is wise to deactivate this
+; feature and test where in the application it is used. The developer using the
+; /e modifier should be made aware that he should use preg_replace_callback()
+; instead.
+;suhosin.executor.disable_emodifier = Off
+
+; This flag reactivates symlink() when open_basedir is used, which is disabled
+; by default in Suhosin >= 0.9.6. Allowing symlink() while open_basedir is used
+; is actually a security risk.
+;suhosin.executor.allow_symlink = Off
+
+; -----------------------------------------------------------------------------
+; Misc Options
+
+; If you fear that Suhosin breaks your application, you can activate Suhosin's
+; simulation mode with this flag. When Suhosin runs in simulation mode,
+; violations are logged as usual, but nothing is blocked or removed from the
+; request. (Transparent features are NOT deactivated in simulation mode.)
+; (since v0.9.30 affects (dis)allowed functions)
+;suhosin.simulation = Off
+
+; APC 3.0.12(p1/p2) uses reserved resources without requesting a resource slot
+; first. It always uses resource slot 0. If Suhosin got this slot assigned APC
+; will overwrite the information Suhosin stores in this slot. When this flag is
+; set Suhosin will request 2 Slots and use the second one. This allows working
+; correctly with these buggy APC versions.
+;suhosin.apc_bug_workaround = Off
+
+; When a SQL Query fails scripts often spit out a bunch of useful information
+; for possible attackers. When this configuration directive is turned on, the
+; script will silently terminate, after the problem has been logged. (This is
+; not yet supported)
+;suhosin.sql.bailout_on_error = Off
+
+; This is an experimental feature for shared environments. With this
+; configuration option it is possible to specify a prefix that is automatically
+; prepended to the database username, whenever a database connection is made.
+; (Unless the username starts with the prefix)
+;suhosin.sql.user_prefix =
+
+; This is an experimental feature for shared environments. With this
+; configuration option it is possible to specify a postfix that is
+; automatically appended to the database username, whenever a database
+; connection is made. (Unless the username end with the postfix)
+;
+; With this feature it is possible for shared hosters to disallow customers to
+; connect with the usernames of other customers. This feature is experimental,
+; because support for PDO and PostgreSQL are not yet implemented.
+;suhosin.sql.user_postfix =
+
+; This directive controls if multiple headers are allowed or not in a header()
+; call. By default the Hardening-Patch forbids this. (HTTP headers spanning
+; multiple lines are still allowed).
+;suhosin.multiheader = Off
+
+; This directive controls if the mail() header protection is activated or not
+; and to what degree it is activated. The appended table lists the possible
+; activation levels.
+suhosin.mail.protect = 1
+
+; As long scripts are not running within safe_mode they are free to change the
+; memory_limit to whatever value they want. Suhosin changes this fact and
+; disallows setting the memory_limit to a value greater than the one the script
+; started with, when this option is left at 0. A value greater than 0 means
+; that Suhosin will disallows scripts setting the memory_limit to a value above
+; this configured hard limit. This is for example usefull if you want to run
+; the script normaly with a limit of 16M but image processing scripts may raise
+; it to 20M.
+;suhosin.memory_limit = 0
+
+; -----------------------------------------------------------------------------
+; Transparent Encryption Options
+
+; Flag that decides if the transparent session encryption is activated or not.
+;suhosin.session.encrypt = On
+
+; Session data can be encrypted transparently. The encryption key used consists
+; of this user defined string (which can be altered by a script via ini_set())
+; and optionally the User-Agent, the Document-Root and 0-4 Octects of the
+; REMOTE_ADDR.
+;suhosin.session.cryptkey =
+
+; Flag that decides if the transparent session encryption key depends on the
+; User-Agent field. (When activated this feature transparently adds a little
+; bit protection against session fixation/hijacking attacks)
+;suhosin.session.cryptua = On
+
+; Flag that decides if the transparent session encryption key depends on the
+; Documentroot field.
+;suhosin.session.cryptdocroot = On
+
+; Number of octets (0-4) from the REMOTE_ADDR that the transparent session
+; encryption key depends on. Keep in mind that this should not be used on sites
+; that have visitors from big ISPs, because their IP address often changes
+; during a session. But this feature might be interesting for admin interfaces
+; or intranets. When used wisely this is a transparent protection against
+; session hijacking/fixation.
+;suhosin.session.cryptraddr = 0
+
+; Number of octets (0-4) from the REMOTE_ADDR that have to match to decrypt the
+; session. The difference to suhosin.session.cryptaddr is, that the IP is not
+; part of the encryption key, so that the same session can be used for
+; different areas with different protection levels on the site.
+;suhosin.session.checkraddr = 0
+
+; Flag that decides if the transparent cookie encryption is activated or not.
+;suhosin.cookie.encrypt = 0
+
+; Cookies can be encrypted transparently. The encryption key used consists of
+; this user defined string and optionally the User-Agent, the Document-Root and
+; 0-4 Octects of the REMOTE_ADDR.
+;suhosin.cookie.cryptkey =
+
+; Flag that decides if the transparent session encryption key depends on the
+; User-Agent field. (When activated this feature transparently adds a little
+; bit protection against session fixation/hijacking attacks (if only session
+; cookies are allowed))
+;suhosin.cookie.cryptua = On
+
+; Flag that decides if the transparent cookie encryption key depends on the
+; Documentroot field.
+;suhosin.cookie.cryptdocroot = On
+
+; Number of octets (0-4) from the REMOTE_ADDR that the transparent cookie
+; encryption key depends on. Keep in mind that this should not be used on sites
+; that have visitors from big ISPs, because their IP address often changes
+; during a session. But this feature might be interesting for admin interfaces
+; or intranets. When used wisely this is a transparent protection against
+; session hijacking/fixation.
+;suhosin.cookie.cryptraddr = 0
+
+; Number of octets (0-4) from the REMOTE_ADDR that have to match to decrypt the
+; cookie. The difference to suhosin.cookie.cryptaddr is, that the IP is not
+; part of the encryption key, so that the same cookie can be used for different
+; areas with different protection levels on the site.
+;suhosin.cookie.checkraddr = 0
+
+; In case not all cookies are supposed to get encrypted this is a comma
+; separated list of cookie names that should get encrypted. All other cookies
+; will not get touched.
+;suhosin.cookie.cryptlist =
+
+; In case some cookies should not be crypted this is a comma separated list of
+; cookies that do not get encrypted. All other cookies will be encrypted.
+;suhosin.cookie.plainlist =
+
+; -----------------------------------------------------------------------------
+; Filtering Options
+
+; Defines the reaction of Suhosin on a filter violation.
+;suhosin.filter.action =
+
+; Defines the maximum depth an array variable may have, when registered through
+; the COOKIE.
+;suhosin.cookie.max_array_depth = 50
+
+; Defines the maximum length of array indices for variables registered through
+; the COOKIE.
+;suhosin.cookie.max_array_index_length = 64
+
+; Defines the maximum length of variable names for variables registered through
+; the COOKIE. For array variables this is the name in front of the indices.
+;suhosin.cookie.max_name_length = 64
+
+; Defines the maximum length of the total variable name when registered through
+; the COOKIE. For array variables this includes all indices.
+;suhosin.cookie.max_totalname_length = 256
+
+; Defines the maximum length of a variable that is registered through the
+; COOKIE.
+;suhosin.cookie.max_value_length = 10000
+
+; Defines the maximum number of variables that may be registered through the
+; COOKIE.
+;suhosin.cookie.max_vars = 100
+
+; When set to On ASCIIZ chars are not allowed in variables.
+;suhosin.cookie.disallow_nul = 1
+
+; Defines the maximum depth an array variable may have, when registered through
+; the URL
+;suhosin.get.max_array_depth = 50
+
+; Defines the maximum length of array indices for variables registered through
+; the URL
+;suhosin.get.max_array_index_length = 64
+
+; Defines the maximum length of variable names for variables registered through
+; the URL. For array variables this is the name in front of the indices.
+;suhosin.get.max_name_length = 64
+
+; Defines the maximum length of the total variable name when registered through
+; the URL. For array variables this includes all indices.
+;suhosin.get.max_totalname_length = 256
+
+; Defines the maximum length of a variable that is registered through the URL.
+;suhosin.get.max_value_length = 512
+
+; Defines the maximum number of variables that may be registered through the
+; URL.
+;suhosin.get.max_vars = 100
+
+; When set to On ASCIIZ chars are not allowed in variables.
+;suhosin.get.disallow_nul = 1
+
+; Defines the maximum depth an array variable may have, when registered through
+; a POST request.
+;suhosin.post.max_array_depth = 50
+
+; Defines the maximum length of array indices for variables registered through
+; a POST request.
+;suhosin.post.max_array_index_length = 64
+
+; Defines the maximum length of variable names for variables registered through
+; a POST request. For array variables this is the name in front of the indices.
+;suhosin.post.max_name_length = 64
+
+; Defines the maximum length of the total variable name when registered through
+; a POST request. For array variables this includes all indices.
+;suhosin.post.max_totalname_length = 256
+
+; Defines the maximum length of a variable that is registered through a POST
+; request.
+;suhosin.post.max_value_length = 1000000
+
+; Defines the maximum number of variables that may be registered through a POST
+; request.
+;suhosin.post.max_vars = 1000
+
+; When set to On ASCIIZ chars are not allowed in variables.
+;suhosin.post.disallow_nul = 1
+
+; Defines the maximum depth an array variable may have, when registered through
+; GET , POST or COOKIE. This setting is also an upper limit for the separate
+; GET, POST, COOKIE configuration directives.
+;suhosin.request.max_array_depth = 50
+
+; Defines the maximum length of array indices for variables registered through
+; GET, POST or COOKIE. This setting is also an upper limit for the separate
+; GET, POST, COOKIE configuration directives.
+;suhosin.request.max_array_index_length = 64
+
+; Defines the maximum length of variable names for variables registered through
+; the COOKIE, the URL or through a POST request. This is the complete name
+; string, including all indicies. This setting is also an upper limit for the
+; separate GET, POST, COOKIE configuration directives.
+;suhosin.request.max_totalname_length = 256
+
+; Defines the maximum length of a variable that is registered through the
+; COOKIE, the URL or through a POST request. This setting is also an upper
+; limit for the variable origin specific configuration directives.
+;suhosin.request.max_value_length = 1000000
+
+; Defines the maximum number of variables that may be registered through the
+; COOKIE, the URL or through a POST request. This setting is also an upper
+; limit for the variable origin specific configuration directives.
+;suhosin.request.max_vars = 1000
+
+; Defines the maximum name length (excluding possible array indicies) of
+; variables that may be registered through the COOKIE, the URL or through a
+; POST request. This setting is also an upper limit for the variable origin
+; specific configuration directives.
+;suhosin.request.max_varname_length = 64
+
+; When set to On ASCIIZ chars are not allowed in variables.
+;suhosin.request.disallow_nul = 1
+
+; When set to On the dangerous characters <>"'` are urlencoded when found
+; not encoded in the server variables REQUEST_URI and QUERY_STRING. This
+; will protect against some XSS vulnerabilities.
+;suhosin.server.encode = 1
+
+; When set to On the dangerous characters <>"'` are replaced with ? in
+; the server variables PHP_SELF, PATH_TRANSLATED and PATH_INFO. This will
+; protect against some XSS vulnerabilities.
+;suhosin.server.strip = 1
+
+; Defines the maximum number of files that may be uploaded with one request.
+;suhosin.upload.max_uploads = 25
+
+; When set to On it is not possible to upload ELF executables.
+;suhosin.upload.disallow_elf = 1
+
+; When set to On it is not possible to upload binary files.
+;suhosin.upload.disallow_binary = 0
+
+; When set to On binary content is removed from the uploaded files.
+;suhosin.upload.remove_binary = 0
+
+; This defines the full path to a verification script for uploaded files. The
+; script gets the temporary filename supplied and has to decide if the upload
+; is allowed. A possible application for this is to scan uploaded files for
+; viruses. The called script has to write a 1 as first line to standard output
+; to allow the upload. Any other value or no output at all will result in the
+; file being deleted.
+;suhosin.upload.verification_script =
+
+; Specifies the maximum length of the session identifier that is allowed. When
+; a longer session identifier is passed a new session identifier will be
+; created. This feature is important to fight bufferoverflows in 3rd party
+; session handlers.
+;suhosin.session.max_id_length = 128
+
+; Undocumented: Controls if suhosin coredumps when the optional suhosin patch
+; detects a bufferoverflow, memory corruption or double free. This is only
+; for debugging purposes and should not be activated.
+;suhosin.coredump = Off
+
+; Undocumented: Controls if the encryption keys specified by the configuration
+; are shown in the phpinfo() output or if they are hidden from it
+;suhosin.protectkey = 1
+
+; Controls if suhosin loads in stealth mode when it is not the only
+; zend_extension (Required for full compatibility with certain encoders
+; that consider open source untrusted. e.g. ionCube, Zend)
+;suhosin.stealth = 1
+
+; Controls if suhosin's ini directives are changeable per directory
+; because the admin might want to allow some features to be controlable
+; by .htaccess and some not. For example the logging capabilities can
+; break safemode and open_basedir restrictions when .htaccess support is
+; allowed and the admin forgot to fix their values in httpd.conf
+; An empty value or a 0 will result in all directives not allowed in
+; .htaccess. The string "legcprsum" will allow logging, execution, get,
+; post, cookie, request, sql, upload, misc features in .htaccess
+;suhosin.perdir = "0"
[xsl]
; Write operations from within XSLT are disabled by default.

View File

@ -1,23 +0,0 @@
$OpenBSD: patch-sapi_apache_mod_php5_c,v 1.3 2011/06/18 19:49:50 sthen Exp $
--- sapi/apache/mod_php5.c.orig.port Sat Jun 18 12:14:47 2011
+++ sapi/apache/mod_php5.c Sat Jun 18 12:14:53 2011
@@ -956,12 +956,19 @@ static void php_child_exit_handler(server_rec *s, pool
*/
static void php_init_handler(server_rec *s, pool *p)
{
+ char *ini;
+
register_cleanup(p, NULL, (void (*)(void *))apache_php_module_shutdown_wrapper, (void (*)(void *))php_module_shutdown_for_exec);
if (!apache_php_initialized) {
apache_php_initialized = 1;
#ifdef ZTS
tsrm_startup(1, 1, 0, NULL);
#endif
+
+ if ((ini = getenv("PHP_INI_PATH"))) {
+ apache_sapi_module.php_ini_path_override = ini;
+ }
+
sapi_startup(&apache_sapi_module);
php_apache_startup(&apache_sapi_module);
}

View File

@ -1,7 +0,0 @@
$OpenBSD: patch-sapi_cgi_Makefile_frag,v 1.2 2011/06/18 19:49:50 sthen Exp $
--- sapi/cgi/Makefile.frag.orig.port Wed Sep 26 16:44:16 2007
+++ sapi/cgi/Makefile.frag Sat Jun 18 12:14:53 2011
@@ -1,2 +1,2 @@
-$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
+$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_CGI_OBJS)
$(BUILD_CGI)

View File

@ -1,25 +0,0 @@
$OpenBSD: patch-sapi_cgi_cgi_main_c,v 1.6 2012/08/05 12:00:54 sthen Exp $
--- sapi/cgi/cgi_main.c.orig.port Sat Jul 21 10:36:15 2012
+++ sapi/cgi/cgi_main.c Sat Jul 21 10:36:15 2012
@@ -1487,6 +1487,7 @@ int main(int argc, char *argv[])
char *orig_optarg = php_optarg;
char *script_file = NULL;
int ini_entries_len = 0;
+ char *ini;
/* end of temporary locals */
#ifdef ZTS
@@ -1539,8 +1540,12 @@ int main(int argc, char *argv[])
tsrm_ls = ts_resource(0);
#endif
+ if ((ini = getenv("PHP_INI_PATH"))) {
+ cgi_sapi_module.php_ini_path_override = ini;
+ } else {
+ cgi_sapi_module.php_ini_path_override = NULL;
+ }
sapi_startup(&cgi_sapi_module);
- cgi_sapi_module.php_ini_path_override = NULL;
#ifdef PHP_WIN32
_fmode = _O_BINARY; /* sets default for file streams to binary */

View File

@ -1,54 +0,0 @@
$OpenBSD: patch-sapi_cgi_config9_m4,v 1.3 2011/06/18 19:49:50 sthen Exp $
--- sapi/cgi/config9.m4.orig.port Mon Oct 1 13:40:54 2007
+++ sapi/cgi/config9.m4 Sat Jun 18 12:14:53 2011
@@ -8,7 +8,6 @@ PHP_ARG_ENABLE(cgi,,
dnl
dnl CGI setup
dnl
-if test "$PHP_SAPI" = "default"; then
AC_MSG_CHECKING(whether to build CGI binary)
if test "$PHP_CGI" != "no"; then
AC_MSG_RESULT(yes)
@@ -54,8 +53,9 @@ if test "$PHP_SAPI" = "default"; then
dnl Set install target and select SAPI
INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)"
- PHP_SELECT_SAPI(cgi, program, cgi_main.c fastcgi.c,, '$(SAPI_CGI_PATH)')
-
+ PHP_ADD_SOURCES(/main, internal_functions.c,,cgi)
+ PHP_ADD_SOURCES(/sapi/cgi, $PHP_FCGI_FILES cgi_main.c fastcgi.c,, cgi)
+
case $host_alias in
*aix*)
BUILD_CGI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
@@ -64,17 +64,26 @@ if test "$PHP_SAPI" = "default"; then
BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
;;
*)
- BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
+ BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
;;
esac
+ PHP_CGI_TARGET="\$(SAPI_CGI_PATH)"
PHP_SUBST(BUILD_CGI)
+ PHP_SUBST(PHP_CGI_OBJS)
+ PHP_SUBST(PHP_CGI_TARGET)
- elif test "$PHP_CLI" != "no"; then
+ if test "$PHP_SAPI" = "default" ; then
+ PHP_BUILD_PROGRAM($SAPI_CGI_PATH)
+ fi
+ else
AC_MSG_RESULT(no)
- OVERALL_TARGET=
- PHP_SAPI=cli
+ if test "$PHP_SAPI" = "default" ; then
+ if test "$PHP_SAPI_CLI" != "no" ; then
+ OVERALL_TARGET=
+ PHP_SAPI=cli
else
AC_MSG_ERROR([No SAPIs selected.])
fi
+ fi
fi

View File

@ -1,24 +0,0 @@
$OpenBSD: patch-sapi_cli_php_cli_c,v 1.4 2012/01/13 18:02:54 sthen Exp $
--- sapi/cli/php_cli.c.orig.port Fri Jan 13 18:01:57 2012
+++ sapi/cli/php_cli.c Fri Jan 13 18:01:59 2012
@@ -656,6 +656,7 @@ int main(int argc, char *argv[])
char *exec_direct=NULL, *exec_run=NULL, *exec_begin=NULL, *exec_end=NULL;
const char *param_error=NULL;
int hide_argv = 0;
+ char *ini;
/* end of temporary locals */
#ifdef ZTS
void ***tsrm_ls;
@@ -701,7 +702,11 @@ int main(int argc, char *argv[])
#endif
cli_sapi_module.ini_defaults = sapi_cli_ini_defaults;
- cli_sapi_module.php_ini_path_override = NULL;
+ if ((ini = getenv("PHP_INI_PATH"))) {
+ cli_sapi_module.php_ini_path_override = strdup(ini);
+ } else {
+ cli_sapi_module.php_ini_path_override = NULL;
+ }
cli_sapi_module.phpinfo_as_text = 1;
sapi_startup(&cli_sapi_module);

View File

@ -1,11 +0,0 @@
--- sapi/fpm/Makefile.frag.orig.port Sat Oct 8 22:04:10 2011
+++ sapi/fpm/Makefile.frag Wed Jan 18 13:57:26 2012
@@ -4,7 +4,7 @@ $(builddir)/fpm:
@mkdir -p $(builddir)/fpm
@mkdir -p $(builddir)/fpm/events
-$(SAPI_FPM_PATH): $(builddir)/fpm $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(SAPI_EXTRA_DEPS)
+$(SAPI_FPM_PATH): $(builddir)/fpm $(PHP_GLOBAL_OBJS) $(PHP_FPM_OBJS) $(SAPI_EXTRA_DEPS)
$(BUILD_FPM)
$(builddir)/fpm/fpm_conf.lo: $(builddir)/../../main/build-defs.h

View File

@ -1,44 +0,0 @@
--- sapi/fpm/config.m4.orig.port Thu Jul 12 23:17:37 2012
+++ sapi/fpm/config.m4 Sat Jul 21 10:36:15 2012
@@ -595,7 +595,9 @@ if test "$PHP_FPM" != "no"; then
PHP_FPM_CFLAGS="-I$abs_srcdir/sapi/fpm"
- INSTALL_IT=":"
+ if test "$PHP_SAPI" = "default"; then
+ PHP_SAPI="fpm"
+ fi
PHP_FPM_FILES="fpm/fastcgi.c \
fpm/fpm.c \
fpm/fpm_children.c \
@@ -627,7 +629,8 @@ if test "$PHP_FPM" != "no"; then
fpm/events/port.c \
"
- PHP_SELECT_SAPI(fpm, program, $PHP_FPM_FILES $PHP_FPM_TRACE_FILES, $PHP_FPM_CFLAGS, '$(SAPI_FPM_PATH)')
+ PHP_ADD_SOURCES(sapi/fpm, $PHP_FPM_FILES $PHP_FPM_TRACE_FILES, $PHP_FPM_CFLAGS, fpm)
+ PHP_ADD_SOURCES(/main, internal_functions.c,,fpm)
case $host_alias in
*aix*)
@@ -637,11 +640,19 @@ if test "$PHP_FPM" != "no"; then
BUILD_FPM="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
;;
*)
- BUILD_FPM="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
+ BUILD_FPM="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_FPM_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
;;
esac
+ PHP_FPM_TARGET="\$(SAPI_FPM_PATH)"
+ PHP_INSTALL_FPM_TARGET="install-fpm"
PHP_SUBST(BUILD_FPM)
+ PHP_SUBST(PHP_FPM_OBJS)
+ PHP_SUBST(PHP_FPM_TARGET)
+ PHP_SUBST(PHP_INSTALL_FPM_TARGET)
+ if test "$PHP_SAPI" = "fpm" ; then
+ PHP_BUILD_PROGRAM($SAPI_FPM_PATH)
+ fi
else
AC_MSG_RESULT(no)
fi

View File

@ -1,103 +0,0 @@
$OpenBSD: patch-sapi_fpm_fpm_fpm_atomic_h,v 1.2 2012/11/28 10:47:12 sthen Exp $
Add support for mips
Fix types for sparc64
--- sapi/fpm/fpm/fpm_atomic.h.orig.port Wed Nov 21 20:07:23 2012
+++ sapi/fpm/fpm/fpm_atomic.h Fri Nov 23 15:40:43 2012
@@ -77,10 +77,10 @@ static inline atomic_uint_t atomic_cmp_set(atomic_t *l
}
/* }}} */
-#if (__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 2))
-
#elif ( __arm__ || __arm ) /* W-Mark Kubacki */
+#if (__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 2))
+
#if (__arch64__ || __arch64)
typedef int64_t atomic_int_t;
typedef uint64_t atomic_uint_t;
@@ -101,7 +101,7 @@ typedef uint32_t atomic_uint_t;
typedef uint64_t atomic_uint_t;
typedef volatile atomic_uint_t atomic_t;
-static inline int atomic_cas_64(atomic_t *lock, atomic_uint_t old, atomic_uint_t new) /* {{{ */
+static inline atomic_uint_t atomic_cas_64(atomic_t *lock, atomic_uint_t old, atomic_uint_t new) /* {{{ */
{
__asm__ __volatile__("casx [%2], %3, %0 " : "=&r"(new) : "0"(new), "r"(lock), "r"(old): "memory");
@@ -118,7 +118,7 @@ static inline atomic_uint_t atomic_cmp_set(atomic_t *l
typedef uint32_t atomic_uint_t;
typedef volatile atomic_uint_t atomic_t;
-static inline int atomic_cas_32(atomic_t *lock, atomic_uint_t old, atomic_uint_t new) /* {{{ */
+static inline atomic_uint_t atomic_cas_32(atomic_t *lock, atomic_uint_t old, atomic_uint_t new) /* {{{ */
{
__asm__ __volatile__("cas [%2], %3, %0 " : "=&r"(new) : "0"(new), "r"(lock), "r"(old): "memory");
@@ -136,6 +136,64 @@ static inline atomic_uint_t atomic_cmp_set(atomic_t *l
#else /* #if (__sparcv9 || __sparcv9__) */
#error Sparc v8 and predecessors are not and will not be supported (see bug report 53310)
#endif /* #if (__sparcv9 || __sparcv9__) */
+
+#elif ( __mips__ || __mips64__ )
+
+#if (__LP64__ || _LP64)
+typedef uint64_t atomic_uint_t;
+typedef volatile atomic_uint_t atomic_t;
+
+static inline atomic_uint_t atomic_cas_64(atomic_t *lock, atomic_uint_t old, atomic_uint_t new) /* {{{ */
+{
+ atomic_uint_t v;
+
+ __asm__ __volatile__ (
+ "\t.set\tnoreorder\n"
+ "\tlld\t%0, 0(%1)\n"
+ "\tbne\t%0, %2, 1f\n"
+ "\tnop\n"
+ "\tscd\t%3, 0(%1)\n"
+ "1:\n"
+ "\t.set\treorder\n" :
+ "=r" (v) : "r" (lock), "r" (old), "r" (new) : "memory");
+
+ return v;
+}
+/* }}} */
+
+static inline atomic_uint_t atomic_cmp_set(atomic_t *lock, atomic_uint_t old, atomic_uint_t set) /* {{{ */
+{
+ return (atomic_cas_64(lock, old, set)==old);
+}
+/* }}} */
+#else
+typedef uint32_t atomic_uint_t;
+typedef volatile atomic_uint_t atomic_t;
+
+static inline atomic_uint_t atomic_cas_32(atomic_t *lock, atomic_uint_t old, atomic_uint_t new) /* {{{ */
+{
+ atomic_uint_t v;
+
+ __asm__ __volatile__ (
+ "\t.set\tnoreorder\n"
+ "\tll\t%0, 0(%1)\n"
+ "\tbne\t%0, %2, 1f\n"
+ "\tnop\n"
+ "\tsc\t%3, 0(%1)\n"
+ "1:\n"
+ "\t.set\treorder\n" :
+ "=r" (v) : "r" (lock), "r" (old), "r" (new) : "memory");
+
+ return v;
+}
+/* }}} */
+
+static inline atomic_uint_t atomic_cmp_set(atomic_t *lock, atomic_uint_t old, atomic_uint_t set) /* {{{ */
+{
+ return (atomic_cas_32(lock, old, set)==old);
+}
+/* }}} */
+#endif
#else

View File

@ -1,34 +0,0 @@
$OpenBSD: patch-sapi_fpm_php-fpm_conf_in,v 1.6 2014/09/11 19:09:01 robert Exp $
--- sapi/fpm/php-fpm.conf.in.orig.port Thu Sep 11 20:56:35 2014
+++ sapi/fpm/php-fpm.conf.in Thu Sep 11 20:57:03 2014
@@ -148,7 +148,7 @@ group = @php_fpm_group@
; specific port;
; '/path/to/unix/socket' - to listen on a unix socket.
; Note: This value is mandatory.
-listen = 127.0.0.1:9000
+listen = /var/www/run/php-fpm.sock
; Set listen(2) backlog. A value of '-1' means unlimited.
; Default Value: 128 (-1 on FreeBSD and OpenBSD)
@@ -159,9 +159,9 @@ listen = 127.0.0.1:9000
; BSD-derived systems allow connections regardless of permissions.
; Default Values: user and group are set as the running user
; mode is set to 0660
-;listen.owner = @php_fpm_user@
-;listen.group = @php_fpm_group@
-;listen.mode = 0660
++listen.owner = www
++listen.group = www
++listen.mode = 0660
; List of ipv4 addresses of FastCGI clients which are allowed to connect.
; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
@@ -453,7 +453,7 @@ pm.max_spare_servers = 3
; possible. However, all PHP paths will be relative to the chroot
; (error_log, sessions.save_path, ...).
; Default Value: not set
-;chroot =
+chroot = /var/www
; Chdir to this directory at the start.
; Note: relative path can be used.

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-scripts_Makefile_frag,v 1.2 2011/06/18 19:49:50 sthen Exp $
--- scripts/Makefile.frag.orig.port Tue Jul 13 18:24:13 2010
+++ scripts/Makefile.frag Sat Jun 18 12:14:54 2011
@@ -3,8 +3,8 @@
# Build environment install
#
-phpincludedir = $(includedir)/php
-phpbuilddir = $(libdir)/build
+phpincludedir = $(peardir)/include
+phpbuilddir = $(peardir)/build
BUILD_FILES = \
scripts/phpize.m4 \

View File

@ -1,30 +0,0 @@
$OpenBSD: patch-scripts_php-config_in,v 1.3 2012/04/28 08:34:56 sthen Exp $
--- scripts/php-config.in.orig.port Wed Apr 18 22:25:28 2012
+++ scripts/php-config.in Wed Apr 18 22:21:44 2012
@@ -1,11 +1,11 @@
#! /bin/sh
SED="@SED@"
-prefix="@prefix@"
+prefix=OPENBSD_PEAR_ROOT
exec_prefix="@exec_prefix@"
version="@PHP_VERSION@"
vernum="@PHP_VERSION_ID@"
-include_dir="@includedir@/php"
+include_dir="@PEAR_INSTALLDIR@/include"
includes="-I$include_dir -I$include_dir/main -I$include_dir/TSRM -I$include_dir/Zend -I$include_dir/ext -I$include_dir/ext/date/lib"
ldflags="@PHP_LDFLAGS@"
libs="@EXTRA_LIBS@"
@@ -23,10 +23,10 @@ php_sapis="@PHP_INSTALLED_SAPIS@"
for sapi in $php_sapis; do
case $sapi in
cli)
- php_cli_binary="@bindir@/${program_prefix}php${program_suffix}${exe_extension}"
+ php_cli_binary="OPENBSD_PREFIX/bin/php${program_suffix}"
;;
cgi)
- php_cgi_binary="@bindir@/${program_prefix}php-cgi${program_suffix}${exe_extension}"
+ php_cgi_binary="OPENBSD_PREFIX/bin/php-cgi${program_suffix}"
;;
esac
done

View File

@ -1,17 +0,0 @@
$OpenBSD: patch-scripts_phpize_in,v 1.2 2011/06/18 19:49:50 sthen Exp $
--- scripts/phpize.in.orig.port Wed Jun 24 08:42:33 2009
+++ scripts/phpize.in Sat Jun 18 12:14:54 2011
@@ -1,10 +1,10 @@
#!/bin/sh
# Variable declaration
-prefix='@prefix@'
+prefix=@PEAR_INSTALLDIR@
exec_prefix="`eval echo @exec_prefix@`"
-phpdir="`eval echo @libdir@`/build"
-includedir="`eval echo @includedir@`/php"
+phpdir="$prefix/build"
+includedir="$prefix/include"
builddir="`pwd`"
SED="@SED@"

View File

@ -1,6 +0,0 @@
PHP-FPM (FastCGI Process Manager) is an alternative PHP FastCGI
implementation with some additional features useful for sites of
any size, especially busier sites.
PHP-FPM also handles running processes in a chroot jail and this
is enabled in the example php-fpm.conf file; adjust this if needed.

View File

@ -1,4 +0,0 @@
@comment $OpenBSD: PFRAG.no-no_suhosin-main,v 1.1.1.1 2010/06/27 20:28:45 robert Exp $
share/php-${PV}/include/main/suhosin_globals.h
share/php-${PV}/include/main/suhosin_logo.h
share/php-${PV}/include/main/suhosin_patch.h

View File

@ -1,7 +0,0 @@
@comment $OpenBSD: PLIST-bz2,v 1.5 2012/01/29 14:53:21 espie Exp $
@option no-default-conflict
@conflict php-bz2->=5.3,<5.4
@conflict php5-bz2->=5.2
lib/php-${PV}/modules/bz2.so
share/examples/php-${PV}/bz2.ini
@sample ${SYSCONFDIR}/php-${PV}.sample/bz2.ini

View File

@ -1,7 +0,0 @@
@comment $OpenBSD: PLIST-curl,v 1.5 2012/01/29 14:53:21 espie Exp $
@option no-default-conflict
@conflict php-curl->=5.3,<5.4
@conflict php5-curl->=5.2
lib/php-${PV}/modules/curl.so
share/examples/php-${PV}/curl.ini
@sample ${SYSCONFDIR}/php-${PV}.sample/curl.ini

View File

@ -1,7 +0,0 @@
@comment $OpenBSD: PLIST-dba,v 1.5 2012/01/29 14:53:21 espie Exp $
@option no-default-conflict
@conflict php-dba->=5.3,<5.4
@conflict php5-dba->=5.2
lib/php-${PV}/modules/dba.so
share/examples/php-${PV}/dba.ini
@sample ${SYSCONFDIR}/php-${PV}.sample/dba.ini

View File

@ -1,4 +0,0 @@
@comment $OpenBSD: PLIST-fastcgi,v 1.3 2012/01/29 14:53:21 espie Exp $
@option no-default-conflict
@conflict php-fastcgi->=5.3,<5.4
@bin bin/php-fastcgi-${PV}

View File

@ -1,6 +0,0 @@
@comment $OpenBSD: PLIST-fpm,v 1.3 2013/10/12 10:44:23 espie Exp $
@man man/man8/php-fpm-${PV}.8
@bin sbin/php-fpm-${PV}
share/examples/php-${PV}/php-fpm.conf
@sample ${SYSCONFDIR}/php-fpm.conf
@rcscript ${RCDIR}/php_fpm

View File

@ -1,7 +0,0 @@
@comment $OpenBSD: PLIST-gd,v 1.5 2012/01/29 14:53:21 espie Exp $
@option no-default-conflict
@conflict php-gd->=5.3,<5.4
@conflict php5-gd->=5.2
lib/php-${PV}/modules/gd.so
share/examples/php-${PV}/gd.ini
@sample ${SYSCONFDIR}/php-${PV}.sample/gd.ini

View File

@ -1,7 +0,0 @@
@comment $OpenBSD: PLIST-gmp,v 1.5 2012/01/29 14:53:21 espie Exp $
@option no-default-conflict
@conflict php-gmp->=5.3,<5.4
@conflict php5-gmp->=5.2
lib/php-${PV}/modules/gmp.so
share/examples/php-${PV}/gmp.ini
@sample ${SYSCONFDIR}/php-${PV}.sample/gmp.ini

View File

@ -1,9 +0,0 @@
@comment $OpenBSD: PLIST-imap,v 1.5 2012/01/29 14:53:21 espie Exp $
@option no-default-conflict
@conflict php-imap->=5.3,<5.4
@conflict php5-imap->=5.2
lib/php-${PV}/modules/imap.so
share/examples/php-${PV}/imap.ini
@comment etc/master.passwd
@comment etc/spwd.db
@sample ${SYSCONFDIR}/php-${PV}.sample/imap.ini

View File

@ -1,6 +0,0 @@
@comment $OpenBSD: PLIST-intl,v 1.1 2013/10/24 18:20:39 landry Exp $
@option no-default-conflict
@conflict php-intl->=5.3,<5.4
lib/php-${PV}/modules/intl.so
share/examples/php-${PV}/intl.ini
@sample ${SYSCONFDIR}/php-${PV}.sample/intl.ini

View File

@ -1,7 +0,0 @@
@comment $OpenBSD: PLIST-ldap,v 1.5 2012/01/29 14:53:21 espie Exp $
@option no-default-conflict
@conflict php-ldap->=5.3,<5.4
@conflict php5-ldap->=5.2
lib/php-${PV}/modules/ldap.so
share/examples/php-${PV}/ldap.ini
@sample ${SYSCONFDIR}/php-${PV}.sample/ldap.ini

View File

@ -1,371 +0,0 @@
@comment $OpenBSD: PLIST-main,v 1.10 2014/07/14 08:02:07 ajacoutot Exp $
@option no-default-conflict
@conflict php->=5.3,<5.4
@conflict php5-core->=5.2
@conflict php5-core-fastcgi->=5.2
@conflict php-pdo_sqlite->=5.3,<5.4
@conflict php5-pdo_sqlite->=5.2
@pkgpath lang/php/5.3
@pkgpath lang/php/5.3,-pdo_sqlite
@extraunexec rm -f ${SYSCONFDIR}/php-${PV}/php-${PV}.sample/*
!%%no_suhosin%%
@mode 1700
@owner www
@group www
@sample /var/www/tmp/
@mode
@owner
@group
@bin bin/php-${PV}
bin/php-config-${PV}
bin/phpize-${PV}
lib/php-${PV}/
lib/php-${PV}/libphp5.so
lib/php-${PV}/modules/
@man man/man1/php-${PV}.1
@man man/man1/php-config-${PV}.1
@man man/man1/phpize-${PV}.1
share/examples/php-${PV}/
@sample /var/www/conf/modules.sample/
share/examples/php-${PV}/php.conf
@sample /var/www/conf/modules.sample/php-${PV}.conf
share/examples/php-${PV}/php.ini-development
share/examples/php-${PV}/php.ini-production
@sample ${SYSCONFDIR}/php-${PV}.ini
share/php-${PV}/
share/php-${PV}/build/
share/php-${PV}/build/Makefile.global
share/php-${PV}/build/acinclude.m4
share/php-${PV}/build/config.guess
share/php-${PV}/build/config.sub
share/php-${PV}/build/libtool.m4
share/php-${PV}/build/ltmain.sh
share/php-${PV}/build/mkdep.awk
share/php-${PV}/build/phpize.m4
share/php-${PV}/build/run-tests.php
share/php-${PV}/build/scan_makefile_in.awk
share/php-${PV}/build/shtool
share/php-${PV}/include/
share/php-${PV}/include/TSRM/
share/php-${PV}/include/TSRM/TSRM.h
share/php-${PV}/include/TSRM/acconfig.h
share/php-${PV}/include/TSRM/readdir.h
share/php-${PV}/include/TSRM/tsrm_config.h
share/php-${PV}/include/TSRM/tsrm_config.w32.h
share/php-${PV}/include/TSRM/tsrm_config_common.h
share/php-${PV}/include/TSRM/tsrm_nw.h
share/php-${PV}/include/TSRM/tsrm_strtok_r.h
share/php-${PV}/include/TSRM/tsrm_virtual_cwd.h
share/php-${PV}/include/TSRM/tsrm_win32.h
share/php-${PV}/include/Zend/
share/php-${PV}/include/Zend/acconfig.h
share/php-${PV}/include/Zend/zend.h
share/php-${PV}/include/Zend/zend_API.h
share/php-${PV}/include/Zend/zend_alloc.h
share/php-${PV}/include/Zend/zend_build.h
share/php-${PV}/include/Zend/zend_builtin_functions.h
share/php-${PV}/include/Zend/zend_closures.h
share/php-${PV}/include/Zend/zend_compile.h
share/php-${PV}/include/Zend/zend_config.h
share/php-${PV}/include/Zend/zend_config.nw.h
share/php-${PV}/include/Zend/zend_config.w32.h
share/php-${PV}/include/Zend/zend_constants.h
share/php-${PV}/include/Zend/zend_dynamic_array.h
share/php-${PV}/include/Zend/zend_errors.h
share/php-${PV}/include/Zend/zend_exceptions.h
share/php-${PV}/include/Zend/zend_execute.h
share/php-${PV}/include/Zend/zend_extensions.h
share/php-${PV}/include/Zend/zend_fast_cache.h
share/php-${PV}/include/Zend/zend_float.h
share/php-${PV}/include/Zend/zend_gc.h
share/php-${PV}/include/Zend/zend_globals.h
share/php-${PV}/include/Zend/zend_globals_macros.h
share/php-${PV}/include/Zend/zend_hash.h
share/php-${PV}/include/Zend/zend_highlight.h
share/php-${PV}/include/Zend/zend_indent.h
share/php-${PV}/include/Zend/zend_ini.h
share/php-${PV}/include/Zend/zend_ini_parser.h
share/php-${PV}/include/Zend/zend_ini_scanner.h
share/php-${PV}/include/Zend/zend_ini_scanner_defs.h
share/php-${PV}/include/Zend/zend_interfaces.h
share/php-${PV}/include/Zend/zend_istdiostream.h
share/php-${PV}/include/Zend/zend_iterators.h
share/php-${PV}/include/Zend/zend_language_parser.h
share/php-${PV}/include/Zend/zend_language_scanner.h
share/php-${PV}/include/Zend/zend_language_scanner_defs.h
share/php-${PV}/include/Zend/zend_list.h
share/php-${PV}/include/Zend/zend_llist.h
share/php-${PV}/include/Zend/zend_modules.h
share/php-${PV}/include/Zend/zend_multibyte.h
share/php-${PV}/include/Zend/zend_multiply.h
share/php-${PV}/include/Zend/zend_object_handlers.h
share/php-${PV}/include/Zend/zend_objects.h
share/php-${PV}/include/Zend/zend_objects_API.h
share/php-${PV}/include/Zend/zend_operators.h
share/php-${PV}/include/Zend/zend_ptr_stack.h
share/php-${PV}/include/Zend/zend_qsort.h
share/php-${PV}/include/Zend/zend_stack.h
share/php-${PV}/include/Zend/zend_static_allocator.h
share/php-${PV}/include/Zend/zend_stream.h
share/php-${PV}/include/Zend/zend_strtod.h
share/php-${PV}/include/Zend/zend_ts_hash.h
share/php-${PV}/include/Zend/zend_types.h
share/php-${PV}/include/Zend/zend_variables.h
share/php-${PV}/include/Zend/zend_vm.h
share/php-${PV}/include/Zend/zend_vm_def.h
share/php-${PV}/include/Zend/zend_vm_execute.h
share/php-${PV}/include/Zend/zend_vm_opcodes.h
share/php-${PV}/include/ext/
share/php-${PV}/include/ext/date/
share/php-${PV}/include/ext/date/lib/
share/php-${PV}/include/ext/date/lib/timelib.h
share/php-${PV}/include/ext/date/lib/timelib_config.h
share/php-${PV}/include/ext/date/lib/timelib_structs.h
share/php-${PV}/include/ext/date/php_date.h
share/php-${PV}/include/ext/dom/
share/php-${PV}/include/ext/dom/xml_common.h
share/php-${PV}/include/ext/ereg/
share/php-${PV}/include/ext/ereg/php_ereg.h
share/php-${PV}/include/ext/ereg/php_regex.h
share/php-${PV}/include/ext/ereg/regex/
share/php-${PV}/include/ext/ereg/regex/cclass.h
share/php-${PV}/include/ext/ereg/regex/cname.h
share/php-${PV}/include/ext/ereg/regex/regex.h
share/php-${PV}/include/ext/ereg/regex/regex2.h
share/php-${PV}/include/ext/ereg/regex/utils.h
share/php-${PV}/include/ext/filter/
share/php-${PV}/include/ext/filter/php_filter.h
share/php-${PV}/include/ext/gd/
share/php-${PV}/include/ext/gd/gdcache.h
share/php-${PV}/include/ext/gd/libgd/
share/php-${PV}/include/ext/gd/libgd/gd.h
share/php-${PV}/include/ext/gd/libgd/gd_compat.h
share/php-${PV}/include/ext/gd/libgd/gd_intern.h
share/php-${PV}/include/ext/gd/libgd/gd_io.h
share/php-${PV}/include/ext/gd/libgd/gdcache.h
share/php-${PV}/include/ext/gd/libgd/gdfontg.h
share/php-${PV}/include/ext/gd/libgd/gdfontl.h
share/php-${PV}/include/ext/gd/libgd/gdfontmb.h
share/php-${PV}/include/ext/gd/libgd/gdfonts.h
share/php-${PV}/include/ext/gd/libgd/gdfontt.h
share/php-${PV}/include/ext/gd/libgd/gdhelpers.h
share/php-${PV}/include/ext/gd/libgd/jisx0208.h
share/php-${PV}/include/ext/gd/libgd/wbmp.h
share/php-${PV}/include/ext/gd/php_gd.h
share/php-${PV}/include/ext/hash/
share/php-${PV}/include/ext/hash/php_hash.h
share/php-${PV}/include/ext/hash/php_hash_adler32.h
share/php-${PV}/include/ext/hash/php_hash_crc32.h
share/php-${PV}/include/ext/hash/php_hash_gost.h
share/php-${PV}/include/ext/hash/php_hash_haval.h
share/php-${PV}/include/ext/hash/php_hash_md.h
share/php-${PV}/include/ext/hash/php_hash_ripemd.h
share/php-${PV}/include/ext/hash/php_hash_salsa.h
share/php-${PV}/include/ext/hash/php_hash_sha.h
share/php-${PV}/include/ext/hash/php_hash_snefru.h
share/php-${PV}/include/ext/hash/php_hash_tiger.h
share/php-${PV}/include/ext/hash/php_hash_types.h
share/php-${PV}/include/ext/hash/php_hash_whirlpool.h
share/php-${PV}/include/ext/iconv/
share/php-${PV}/include/ext/iconv/php_have_bsd_iconv.h
share/php-${PV}/include/ext/iconv/php_have_glibc_iconv.h
share/php-${PV}/include/ext/iconv/php_have_ibm_iconv.h
share/php-${PV}/include/ext/iconv/php_have_iconv.h
share/php-${PV}/include/ext/iconv/php_have_libiconv.h
share/php-${PV}/include/ext/iconv/php_iconv.h
share/php-${PV}/include/ext/iconv/php_iconv_aliased_libiconv.h
share/php-${PV}/include/ext/iconv/php_iconv_supports_errno.h
share/php-${PV}/include/ext/iconv/php_php_iconv_h_path.h
share/php-${PV}/include/ext/iconv/php_php_iconv_impl.h
share/php-${PV}/include/ext/json/
share/php-${PV}/include/ext/json/php_json.h
share/php-${PV}/include/ext/libxml/
share/php-${PV}/include/ext/libxml/php_libxml.h
share/php-${PV}/include/ext/mbstring/
share/php-${PV}/include/ext/mbstring/libmbfl/
share/php-${PV}/include/ext/mbstring/libmbfl/config.h
share/php-${PV}/include/ext/mbstring/libmbfl/mbfl/
share/php-${PV}/include/ext/mbstring/libmbfl/mbfl/eaw_table.h
share/php-${PV}/include/ext/mbstring/libmbfl/mbfl/mbfilter.h
share/php-${PV}/include/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.h
share/php-${PV}/include/ext/mbstring/libmbfl/mbfl/mbfilter_pass.h
share/php-${PV}/include/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.h
share/php-${PV}/include/ext/mbstring/libmbfl/mbfl/mbfl_allocators.h
share/php-${PV}/include/ext/mbstring/libmbfl/mbfl/mbfl_consts.h
share/php-${PV}/include/ext/mbstring/libmbfl/mbfl/mbfl_convert.h
share/php-${PV}/include/ext/mbstring/libmbfl/mbfl/mbfl_defs.h
share/php-${PV}/include/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h
share/php-${PV}/include/ext/mbstring/libmbfl/mbfl/mbfl_filter_output.h
share/php-${PV}/include/ext/mbstring/libmbfl/mbfl/mbfl_ident.h
share/php-${PV}/include/ext/mbstring/libmbfl/mbfl/mbfl_language.h
share/php-${PV}/include/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.h
share/php-${PV}/include/ext/mbstring/libmbfl/mbfl/mbfl_string.h
share/php-${PV}/include/ext/mbstring/mbstring.h
share/php-${PV}/include/ext/mbstring/oniguruma/
share/php-${PV}/include/ext/mbstring/oniguruma/oniguruma.h
share/php-${PV}/include/ext/mbstring/php_mbregex.h
share/php-${PV}/include/ext/mbstring/php_onig_compat.h
share/php-${PV}/include/ext/mysqli/
share/php-${PV}/include/ext/mysqli/php_mysqli_structs.h
share/php-${PV}/include/ext/mysqlnd/
share/php-${PV}/include/ext/mysqlnd/config-win.h
share/php-${PV}/include/ext/mysqlnd/mysqlnd.h
share/php-${PV}/include/ext/mysqlnd/mysqlnd_block_alloc.h
share/php-${PV}/include/ext/mysqlnd/mysqlnd_charset.h
share/php-${PV}/include/ext/mysqlnd/mysqlnd_debug.h
share/php-${PV}/include/ext/mysqlnd/mysqlnd_enum_n_def.h
share/php-${PV}/include/ext/mysqlnd/mysqlnd_libmysql_compat.h
share/php-${PV}/include/ext/mysqlnd/mysqlnd_net.h
share/php-${PV}/include/ext/mysqlnd/mysqlnd_portability.h
share/php-${PV}/include/ext/mysqlnd/mysqlnd_priv.h
share/php-${PV}/include/ext/mysqlnd/mysqlnd_result.h
share/php-${PV}/include/ext/mysqlnd/mysqlnd_result_meta.h
share/php-${PV}/include/ext/mysqlnd/mysqlnd_statistics.h
share/php-${PV}/include/ext/mysqlnd/mysqlnd_structs.h
share/php-${PV}/include/ext/mysqlnd/mysqlnd_wireprotocol.h
share/php-${PV}/include/ext/mysqlnd/php_mysqlnd.h
share/php-${PV}/include/ext/mysqlnd/php_mysqlnd_config.h
share/php-${PV}/include/ext/pcre/
share/php-${PV}/include/ext/pcre/pcrelib/
share/php-${PV}/include/ext/pcre/pcrelib/config.h
share/php-${PV}/include/ext/pcre/pcrelib/pcre.h
share/php-${PV}/include/ext/pcre/pcrelib/pcre_internal.h
share/php-${PV}/include/ext/pcre/pcrelib/pcreposix.h
share/php-${PV}/include/ext/pcre/pcrelib/ucp.h
share/php-${PV}/include/ext/pcre/php_pcre.h
share/php-${PV}/include/ext/pdo/
share/php-${PV}/include/ext/pdo/php_pdo.h
share/php-${PV}/include/ext/pdo/php_pdo_driver.h
share/php-${PV}/include/ext/session/
share/php-${PV}/include/ext/session/mod_files.h
share/php-${PV}/include/ext/session/mod_user.h
share/php-${PV}/include/ext/session/php_session.h
share/php-${PV}/include/ext/sockets/
share/php-${PV}/include/ext/sockets/php_sockets.h
share/php-${PV}/include/ext/spl/
share/php-${PV}/include/ext/spl/php_spl.h
share/php-${PV}/include/ext/spl/spl_array.h
share/php-${PV}/include/ext/spl/spl_directory.h
share/php-${PV}/include/ext/spl/spl_dllist.h
share/php-${PV}/include/ext/spl/spl_engine.h
share/php-${PV}/include/ext/spl/spl_exceptions.h
share/php-${PV}/include/ext/spl/spl_fixedarray.h
share/php-${PV}/include/ext/spl/spl_functions.h
share/php-${PV}/include/ext/spl/spl_heap.h
share/php-${PV}/include/ext/spl/spl_iterators.h
share/php-${PV}/include/ext/spl/spl_observer.h
share/php-${PV}/include/ext/sqlite/
share/php-${PV}/include/ext/sqlite/libsqlite/
share/php-${PV}/include/ext/sqlite/libsqlite/src/
share/php-${PV}/include/ext/sqlite3/
share/php-${PV}/include/ext/sqlite3/libsqlite/
share/php-${PV}/include/ext/sqlite3/libsqlite/sqlite3.h
share/php-${PV}/include/ext/standard/
share/php-${PV}/include/ext/standard/base64.h
share/php-${PV}/include/ext/standard/basic_functions.h
share/php-${PV}/include/ext/standard/crc32.h
share/php-${PV}/include/ext/standard/credits.h
share/php-${PV}/include/ext/standard/credits_ext.h
share/php-${PV}/include/ext/standard/credits_sapi.h
share/php-${PV}/include/ext/standard/crypt_blowfish.h
share/php-${PV}/include/ext/standard/crypt_freesec.h
share/php-${PV}/include/ext/standard/css.h
share/php-${PV}/include/ext/standard/cyr_convert.h
share/php-${PV}/include/ext/standard/datetime.h
share/php-${PV}/include/ext/standard/dl.h
share/php-${PV}/include/ext/standard/exec.h
share/php-${PV}/include/ext/standard/file.h
share/php-${PV}/include/ext/standard/flock_compat.h
share/php-${PV}/include/ext/standard/fsock.h
share/php-${PV}/include/ext/standard/head.h
share/php-${PV}/include/ext/standard/html.h
share/php-${PV}/include/ext/standard/info.h
share/php-${PV}/include/ext/standard/md5.h
share/php-${PV}/include/ext/standard/microtime.h
share/php-${PV}/include/ext/standard/pack.h
share/php-${PV}/include/ext/standard/pageinfo.h
share/php-${PV}/include/ext/standard/php_array.h
share/php-${PV}/include/ext/standard/php_assert.h
share/php-${PV}/include/ext/standard/php_browscap.h
share/php-${PV}/include/ext/standard/php_crypt.h
share/php-${PV}/include/ext/standard/php_crypt_r.h
share/php-${PV}/include/ext/standard/php_dir.h
share/php-${PV}/include/ext/standard/php_dns.h
share/php-${PV}/include/ext/standard/php_ext_syslog.h
share/php-${PV}/include/ext/standard/php_filestat.h
share/php-${PV}/include/ext/standard/php_fopen_wrappers.h
share/php-${PV}/include/ext/standard/php_ftok.h
share/php-${PV}/include/ext/standard/php_http.h
share/php-${PV}/include/ext/standard/php_image.h
share/php-${PV}/include/ext/standard/php_incomplete_class.h
share/php-${PV}/include/ext/standard/php_iptc.h
share/php-${PV}/include/ext/standard/php_lcg.h
share/php-${PV}/include/ext/standard/php_link.h
share/php-${PV}/include/ext/standard/php_mail.h
share/php-${PV}/include/ext/standard/php_math.h
share/php-${PV}/include/ext/standard/php_metaphone.h
share/php-${PV}/include/ext/standard/php_rand.h
share/php-${PV}/include/ext/standard/php_smart_str.h
share/php-${PV}/include/ext/standard/php_smart_str_public.h
share/php-${PV}/include/ext/standard/php_standard.h
share/php-${PV}/include/ext/standard/php_string.h
share/php-${PV}/include/ext/standard/php_type.h
share/php-${PV}/include/ext/standard/php_uuencode.h
share/php-${PV}/include/ext/standard/php_var.h
share/php-${PV}/include/ext/standard/php_versioning.h
share/php-${PV}/include/ext/standard/proc_open.h
share/php-${PV}/include/ext/standard/quot_print.h
share/php-${PV}/include/ext/standard/scanf.h
share/php-${PV}/include/ext/standard/sha1.h
share/php-${PV}/include/ext/standard/streamsfuncs.h
share/php-${PV}/include/ext/standard/uniqid.h
share/php-${PV}/include/ext/standard/url.h
share/php-${PV}/include/ext/standard/url_scanner_ex.h
share/php-${PV}/include/ext/standard/winver.h
share/php-${PV}/include/ext/xml/
share/php-${PV}/include/ext/xml/expat_compat.h
share/php-${PV}/include/ext/xml/php_xml.h
share/php-${PV}/include/include/
share/php-${PV}/include/main/
share/php-${PV}/include/main/SAPI.h
share/php-${PV}/include/main/build-defs.h
share/php-${PV}/include/main/fopen_wrappers.h
share/php-${PV}/include/main/logos.h
share/php-${PV}/include/main/php.h
share/php-${PV}/include/main/php3_compat.h
share/php-${PV}/include/main/php_compat.h
share/php-${PV}/include/main/php_config.h
share/php-${PV}/include/main/php_content_types.h
share/php-${PV}/include/main/php_getopt.h
share/php-${PV}/include/main/php_globals.h
share/php-${PV}/include/main/php_ini.h
share/php-${PV}/include/main/php_logos.h
share/php-${PV}/include/main/php_main.h
share/php-${PV}/include/main/php_memory_streams.h
share/php-${PV}/include/main/php_network.h
share/php-${PV}/include/main/php_open_temporary_file.h
share/php-${PV}/include/main/php_output.h
share/php-${PV}/include/main/php_reentrancy.h
share/php-${PV}/include/main/php_scandir.h
share/php-${PV}/include/main/php_streams.h
share/php-${PV}/include/main/php_syslog.h
share/php-${PV}/include/main/php_ticks.h
share/php-${PV}/include/main/php_variables.h
share/php-${PV}/include/main/php_version.h
share/php-${PV}/include/main/rfc1867.h
share/php-${PV}/include/main/safe_mode.h
share/php-${PV}/include/main/snprintf.h
share/php-${PV}/include/main/spprintf.h
share/php-${PV}/include/main/streams/
share/php-${PV}/include/main/streams/php_stream_context.h
share/php-${PV}/include/main/streams/php_stream_filter_api.h
share/php-${PV}/include/main/streams/php_stream_glob_wrapper.h
share/php-${PV}/include/main/streams/php_stream_mmap.h
share/php-${PV}/include/main/streams/php_stream_plain_wrapper.h
share/php-${PV}/include/main/streams/php_stream_transport.h
share/php-${PV}/include/main/streams/php_stream_userspace.h
share/php-${PV}/include/main/streams/php_streams_int.h
share/php-${PV}/include/main/win32_internal_function_disabled.h
share/php-${PV}/include/main/win95nt.h
@sample ${SYSCONFDIR}/php-${PV}/
@sample ${SYSCONFDIR}/php-${PV}.sample/

View File

@ -1,7 +0,0 @@
@comment $OpenBSD: PLIST-mcrypt,v 1.5 2012/01/29 14:53:21 espie Exp $
@option no-default-conflict
@conflict php-mcrypt->=5.3,<5.4
@conflict php5-mcrypt->=5.2
lib/php-${PV}/modules/mcrypt.so
share/examples/php-${PV}/mcrypt.ini
@sample ${SYSCONFDIR}/php-${PV}.sample/mcrypt.ini

View File

@ -1,7 +0,0 @@
@comment $OpenBSD: PLIST-mssql,v 1.5 2012/01/29 14:53:21 espie Exp $
@option no-default-conflict
@conflict php-mssql->=5.3,<5.4
@conflict php5-mssql->=5.2
lib/php-${PV}/modules/mssql.so
share/examples/php-${PV}/mssql.ini
@sample ${SYSCONFDIR}/php-${PV}.sample/mssql.ini

View File

@ -1,7 +0,0 @@
@comment $OpenBSD: PLIST-mysql,v 1.5 2012/01/29 14:53:21 espie Exp $
@option no-default-conflict
@conflict php-mysql->=5.3,<5.4
@conflict php5-mysql->=5.2
lib/php-${PV}/modules/mysql.so
share/examples/php-${PV}/mysql.ini
@sample ${SYSCONFDIR}/php-${PV}.sample/mysql.ini

View File

@ -1,7 +0,0 @@
@comment $OpenBSD: PLIST-mysqli,v 1.5 2012/01/29 14:53:21 espie Exp $
@option no-default-conflict
@conflict php-mysqli->=5.3,<5.4
@conflict php5-mysqli->=5.2
lib/php-${PV}/modules/mysqli.so
share/examples/php-${PV}/mysqli.ini
@sample ${SYSCONFDIR}/php-${PV}.sample/mysqli.ini

View File

@ -1,7 +0,0 @@
@comment $OpenBSD: PLIST-odbc,v 1.5 2012/01/29 14:53:21 espie Exp $
@option no-default-conflict
@conflict php-odbc->=5.3,<5.4
@conflict php5-odbc->=5.2
lib/php-${PV}/modules/odbc.so
share/examples/php-${PV}/odbc.ini
@sample ${SYSCONFDIR}/php-${PV}.sample/odbc.ini

View File

@ -1,9 +0,0 @@
@comment $OpenBSD: PLIST-pcntl,v 1.2 2012/01/29 14:53:21 espie Exp $
@option no-default-conflict
@conflict php-pcntl->=5.3,<5.4
@conflict php5-pcntl->=5.2
@conflict pecl-pcntl-*
@pkgpath www/pecl-pcntl
lib/php-${PV}/modules/pcntl.so
share/examples/php-${PV}/pcntl.ini
@sample ${SYSCONFDIR}/php-${PV}.sample/pcntl.ini

View File

@ -1,7 +0,0 @@
@comment $OpenBSD: PLIST-pdo_dblib,v 1.5 2012/01/29 14:53:21 espie Exp $
@option no-default-conflict
@conflict php-pdo_dblib->=5.3,<5.4
@conflict php5-pdo_dblib->=5.2
lib/php-${PV}/modules/pdo_dblib.so
share/examples/php-${PV}/pdo_dblib.ini
@sample ${SYSCONFDIR}/php-${PV}.sample/pdo_dblib.ini

View File

@ -1,7 +0,0 @@
@comment $OpenBSD: PLIST-pdo_mysql,v 1.5 2012/01/29 14:53:21 espie Exp $
@option no-default-conflict
@conflict php-pdo_mysql->=5.3,<5.4
@conflict php5-pdo_mysql->=5.2
lib/php-${PV}/modules/pdo_mysql.so
share/examples/php-${PV}/pdo_mysql.ini
@sample ${SYSCONFDIR}/php-${PV}.sample/pdo_mysql.ini

View File

@ -1,7 +0,0 @@
@comment $OpenBSD: PLIST-pdo_pgsql,v 1.5 2012/01/29 14:53:21 espie Exp $
@option no-default-conflict
@conflict php-pdo_pgsql->=5.3,<5.4
@conflict php5-pdo_pgsql->=5.2
lib/php-${PV}/modules/pdo_pgsql.so
share/examples/php-${PV}/pdo_pgsql.ini
@sample ${SYSCONFDIR}/php-${PV}.sample/pdo_pgsql.ini

View File

@ -1,7 +0,0 @@
@comment $OpenBSD: PLIST-pgsql,v 1.5 2012/01/29 14:53:21 espie Exp $
@option no-default-conflict
@conflict php-pgsql->=5.3,<5.4
@conflict php5-pgsql->=5.2
lib/php-${PV}/modules/pgsql.so
share/examples/php-${PV}/pgsql.ini
@sample ${SYSCONFDIR}/php-${PV}.sample/pgsql.ini

View File

@ -1,7 +0,0 @@
@comment $OpenBSD: PLIST-pspell,v 1.5 2012/01/29 14:53:21 espie Exp $
@option no-default-conflict
@conflict php-pspell->=5.3,<5.4
@conflict php5-pspell->=5.2
lib/php-${PV}/modules/pspell.so
share/examples/php-${PV}/pspell.ini
@sample ${SYSCONFDIR}/php-${PV}.sample/pspell.ini

View File

@ -1,7 +0,0 @@
@comment $OpenBSD: PLIST-shmop,v 1.5 2012/01/29 14:53:21 espie Exp $
@option no-default-conflict
@conflict php-shmop->=5.3,<5.4
@conflict php5-shmop->=5.2
lib/php-${PV}/modules/shmop.so
share/examples/php-${PV}/shmop.ini
@sample ${SYSCONFDIR}/php-${PV}.sample/shmop.ini

View File

@ -1,7 +0,0 @@
@comment $OpenBSD: PLIST-snmp,v 1.5 2012/01/29 14:53:21 espie Exp $
@option no-default-conflict
@conflict php-snmp->=5.3,<5.4
@conflict php5-snmp->=5.2
lib/php-${PV}/modules/snmp.so
share/examples/php-${PV}/snmp.ini
@sample ${SYSCONFDIR}/php-${PV}.sample/snmp.ini

View File

@ -1,7 +0,0 @@
@comment $OpenBSD: PLIST-soap,v 1.5 2012/01/29 14:53:21 espie Exp $
@option no-default-conflict
@conflict php-soap->=5.3,<5.4
@conflict php5-soap->=5.2
lib/php-${PV}/modules/soap.so
share/examples/php-${PV}/soap.ini
@sample ${SYSCONFDIR}/php-${PV}.sample/soap.ini

View File

@ -1,7 +0,0 @@
@comment $OpenBSD: PLIST-sqlite,v 1.5 2012/01/29 14:53:21 espie Exp $
@option no-default-conflict
@conflict php-sqlite->=5.3,<5.4
@conflict php5-sqlite->=5.2
lib/php-${PV}/modules/sqlite.so
share/examples/php-${PV}/sqlite.ini
@sample ${SYSCONFDIR}/php-${PV}.sample/sqlite.ini

View File

@ -1,7 +0,0 @@
@comment $OpenBSD: PLIST-tidy,v 1.5 2012/01/29 14:53:21 espie Exp $
@option no-default-conflict
@conflict php-tidy->=5.3,<5.4
@conflict php5-tidy->=5.2
lib/php-${PV}/modules/tidy.so
share/examples/php-${PV}/tidy.ini
@sample ${SYSCONFDIR}/php-${PV}.sample/tidy.ini

View File

@ -1,7 +0,0 @@
@comment $OpenBSD: PLIST-xmlrpc,v 1.5 2012/01/29 14:53:21 espie Exp $
@option no-default-conflict
@conflict php-xmlrpc->=5.3,<5.4
@conflict php5-xmlrpc->=5.2
lib/php-${PV}/modules/xmlrpc.so
share/examples/php-${PV}/xmlrpc.ini
@sample ${SYSCONFDIR}/php-${PV}.sample/xmlrpc.ini

View File

@ -1,7 +0,0 @@
@comment $OpenBSD: PLIST-xsl,v 1.5 2012/01/29 14:53:21 espie Exp $
@option no-default-conflict
@conflict php-xsl->=5.3,<5.4
@conflict php5-xsl->=5.2
lib/php-${PV}/modules/xsl.so
share/examples/php-${PV}/xsl.ini
@sample ${SYSCONFDIR}/php-${PV}.sample/xsl.ini

View File

@ -1,8 +0,0 @@
@comment $OpenBSD: PLIST-zip,v 1.1 2012/06/16 12:51:07 sthen Exp $
@option no-default-conflict
@conflict php-zip->=5.3,<5.4
@conflict pecl-zip-*
@pkgpath archivers/pecl-zip
lib/php-${PV}/modules/zip.so
share/examples/php-${PV}/zip.ini
@sample ${SYSCONFDIR}/php-${PV}.sample/zip.ini

View File

@ -1,12 +0,0 @@
#!/bin/sh
#
# $OpenBSD: php_fpm.rc,v 1.2 2012/05/19 02:49:45 william Exp $
daemon="${TRUEPREFIX}/sbin/php-fpm-${PV}"
. /etc/rc.d/rc.subr
pexp="php-fpm-${PV}: master.*"
rc_reload=NO
rc_cmd $1