diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2015-04-17 21:00:10 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2015-04-17 21:00:10 +0000 |
| commit | 2af5dcc160f59e3915e6f8a0c19b7650638cbd46 (patch) | |
| tree | 1fdf47022a8f664140594ff7b238feaa6d0dd6db /lang/php53 | |
| parent | Update to experimental-20150409 (diff) | |
Remove expired ports:
2015-04-15 databases/php53-sqlite3: security EOL reached 14 Aug 2014
2015-04-15 textproc/php53-simplexml: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-sybase_ct: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-pdo_mysql: security EOL reached 14 Aug 2014
2015-04-15 textproc/php53-ctype: security EOL reached 14 Aug 2014
2015-04-15 textproc/php53-wddx: security EOL reached 14 Aug 2014
2015-04-15 security/php53-filter: security EOL reached 14 Aug 2014
2015-04-15 ftp/php53-ftp: security EOL reached 14 Aug 2014
2015-04-15 net/php53-soap: security EOL reached 14 Aug 2014
2015-04-15 converters/php53-recode: security EOL reached 14 Aug 2014
2015-04-15 security/php53-openssl: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-dba: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-pdo_pgsql: security EOL reached 14 Aug 2014
2015-04-15 sysutils/php53-fileinfo: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-pdo_odbc: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-sqlite: security EOL reached 14 Aug 2014
2015-04-15 devel/php53-readline: security EOL reached 14 Aug 2014
2015-04-15 mail/php53-imap: security EOL reached 14 Aug 2014
2015-04-15 sysutils/php53-posix: security EOL reached 14 Aug 2014
2015-04-15 archivers/php53-phar: security EOL reached 14 Aug 2014
2015-04-15 graphics/php53-gd: security EOL reached 14 Aug 2014
2015-04-15 textproc/php53-xsl: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-pdo_firebird: security EOL reached 14 Aug 2014
2015-04-15 devel/mingw64-binutils: Obsolete. Migrate to devel/binutils based ports
2015-04-15 devel/cross-binutils: Obsolete. Migrate to devel/binutils based ports
2015-04-15 databases/php53-pdo_dblib: security EOL reached 14 Aug 2014
2015-04-15 devel/php53-sysvshm: security EOL reached 14 Aug 2014
2015-04-15 devel/php53-json: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-redis: requires php53, security EOL reached 14 Aug 2014
2015-04-15 textproc/php53-pspell: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-pgsql: security EOL reached 14 Aug 2014
2015-04-15 textproc/php53-xmlreader: security EOL reached 14 Aug 2014
2015-04-15 converters/php53-iconv: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-odbc: security EOL reached 14 Aug 2014
2015-04-15 ftp/php53-curl: security EOL reached 14 Aug 2014
2015-04-15 math/php53-gmp: security EOL reached 14 Aug 2014
2015-04-15 security/php53-mcrypt: security EOL reached 14 Aug 2014
2015-04-15 devel/php53-shmop: security EOL reached 14 Aug 2014
2015-04-15 math/php53-bcmath: security EOL reached 14 Aug 2014
2015-04-15 security/php53-hash: security EOL reached 14 Aug 2014
2015-04-15 devel/php53-sysvsem: security EOL reached 14 Aug 2014
2015-04-15 archivers/php53-zip: security EOL reached 14 Aug 2014
2015-04-15 graphics/php53-exif: security EOL reached 14 Aug 2014
2015-04-15 devel/php53-gettext: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-mysql: security EOL reached 14 Aug 2014
2015-04-15 textproc/php53-xmlwriter: security EOL reached 14 Aug 2014
2015-04-15 textproc/php53-xml: security EOL reached 14 Aug 2014
2015-04-15 converters/php53-mbstring: security EOL reached 14 Aug 2014
2015-04-15 devel/php53-sysvmsg: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-mysqli: security EOL reached 14 Aug 2014
2015-04-15 misc/php53-calendar: security EOL reached 14 Aug 2014
2015-04-15 devel/php53-tokenizer: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-pdo: security EOL reached 14 Aug 2014
2015-04-15 net/php53-xmlrpc: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-interbase: security EOL reached 14 Aug 2014
2015-04-15 www/php53-session: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-mssql: security EOL reached 14 Aug 2014
2015-04-15 www/php53-tidy: security EOL reached 14 Aug 2014
2015-04-15 archivers/php53-zlib: security EOL reached 14 Aug 2014
2015-04-15 net/php53-ldap: security EOL reached 14 Aug 2014
2015-04-15 net-mgmt/php53-snmp: security EOL reached 14 Aug 2014
2015-04-15 textproc/php53-dom: security EOL reached 14 Aug 2014
2015-04-15 devel/php53-pcntl: security EOL reached 14 Aug 2014
2015-04-15 archivers/php53-bz2: security EOL reached 14 Aug 2014
2015-04-15 net/php53-sockets: security EOL reached 14 Aug 2014
2015-04-15 lang/php53: security EOL reached 14 Aug 2014
2015-04-15 devel/pecl-uuid: requires php53, security EOL reached 14 Aug 2014
2015-04-15 lang/php53-extensions: security EOL reached 14 Aug 2014
2015-04-15 german/pecl-konto_check: requires php53, security EOL reached 14 Aug 2014
2015-04-17 www/moodle26: Deprecated by upstream, use www/moodle2{7,8} instead
Notes
Notes:
svn path=/head/; revision=384186
Diffstat (limited to 'lang/php53')
30 files changed, 0 insertions, 1781 deletions
diff --git a/lang/php53/Makefile b/lang/php53/Makefile deleted file mode 100644 index fba43a0b03e0..000000000000 --- a/lang/php53/Makefile +++ /dev/null @@ -1,191 +0,0 @@ -# Created by: Alex Dupre <sysadmin@alexdupre.com> -# $FreeBSD$ - -PORTNAME= php53 -PORTVERSION= 5.3.29 -PORTREVISION?= 5 -CATEGORIES?= lang devel www -MASTER_SITES= ${MASTER_SITE_PHP} -MASTER_SITE_SUBDIR= distributions -DISTNAME= php-${PORTVERSION} - -MAINTAINER= ports@FreeBSD.org -COMMENT= PHP Scripting Language - -DEPRECATED= security EOL reached 14 Aug 2014 -EXPIRATION_DATE= 2015-04-15 - -LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} - -USES= tar:bzip2 cpe -CPE_PRODUCT= php -.if !defined(PKGNAMESUFFIX) -USE_AUTOTOOLS= autoconf - -LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre - -CONFIGURE_ARGS= \ - --with-layout=GNU \ - --localstatedir=/var \ - --with-config-file-scan-dir=${PREFIX}/etc/php \ - --disable-all \ - --enable-libxml \ - --enable-mysqlnd \ - --with-libxml-dir=${LOCALBASE} \ - --with-pcre-regex=${LOCALBASE} \ - --with-zlib-dir=/usr \ - --program-prefix="" - -USE_GNOME= libxml2 - -OPTIONS_DEFINE= CLI CGI FPM APACHE AP2FILTER DEBUG SUHOSIN MULTIBYTE IPV6 \ - MAILHEAD LINKTHR - -OPTIONS_DEFAULT= CLI CGI SUHOSIN IPV6 LINKTHR - -CLI_DESC= Build CLI version -CGI_DESC= Build CGI version -FPM_DESC= Build FPM version (experimental) -APACHE_DESC= Build Apache module -AP2FILTER_DESC= Use Apache 2.x filter interface (experimental) -SUHOSIN_DESC= Suhosin protection system -MULTIBYTE_DESC= zend multibyte support -MAILHEAD_DESC= mail header patch -LINKTHR_DESC= Link thread lib (for threaded extensions) - -CONFLICTS= php52-5* php5-5* - -DESTDIRNAME= INSTALL_ROOT - -.include <bsd.port.pre.mk> - -PATCH_DIST_STRIP= -p1 - -PATCH_SITES+= ${MASTER_SITE_LOCAL} \ - http://people.freebsd.org/~flo/ -PATCH_SITE_SUBDIR= flo - -.if ${PORT_OPTIONS:MSUHOSIN} -PATCHFILES+= suhosin-patch-5.3.x-0.9.10.5.patch.gz -PLIST_SUB+= SUHOSIN="" -.else -PLIST_SUB+= SUHOSIN="@comment " -.endif - -.if ${PORT_OPTIONS:MMAILHEAD} -PATCHFILES+= php-5.3.x-mail-header.patch:mail -PATCH_SITES+= http://choon.net/opensource/php/:mail -.endif - -.if ${PORT_OPTIONS:MCLI} -PHP_SAPI+= cli -PLIST_SUB+= CLI="" -.else -PLIST_SUB+= CLI="@comment " -CONFIGURE_ARGS+=--disable-cli -.endif - -.if ${PORT_OPTIONS:MCGI} -PHP_SAPI+= cgi -PLIST_SUB+= CGI="" -.else -PLIST_SUB+= CGI="@comment " -CONFIGURE_ARGS+=--disable-cgi -.endif - -.if ${PORT_OPTIONS:MFPM} -PHP_SAPI+= fpm -USE_RC_SUBR+= php-fpm -CONFIGURE_ARGS+=--enable-fpm \ - --with-fpm-user=${WWWOWN} \ - --with-fpm-group=${WWWGRP} -PLIST_SUB+= FPM="" -.else -PLIST_SUB+= FPM="@comment " -.endif - -.if ${PORT_OPTIONS:MAPACHE} -PHP_SAPI+= mod -USE_APACHE= 22+ -.include "${PORTSDIR}/Mk/bsd.apache.mk" -.if ${PORT_OPTIONS:MAP2FILTER} -CONFIGURE_ARGS+=--with-apxs2filter=${APXS} -.else -CONFIGURE_ARGS+=--with-apxs2=${APXS} -.endif -PKGMESSAGE= ${PKGDIR}/pkg-message.mod -MODULENAME= libphp5 -SHORTMODNAME= php5 -PLIST_SUB+= APACHE="" -.else -PLIST_SUB+= APACHE="@comment " -.endif - -.if !defined(WITH_REGEX_TYPE) || ${WITH_REGEX_TYPE} == "php" -CONFIGURE_ARGS+=--with-regex=php -.elif defined(WITH_REGEX_TYPE) && ${WITH_REGEX_TYPE} == "system" -CONFIGURE_ARGS+=--with-regex=system -.endif - -.if !defined(WITH_ZEND_VM) || ${WITH_ZEND_VM} == "CALL" -CONFIGURE_ARGS+=--with-zend-vm=CALL -.elif defined(WITH_ZEND_VM) && ${WITH_ZEND_VM} == "SWITCH" -CONFIGURE_ARGS+=--with-zend-vm=SWITCH -.elif defined(WITH_ZEND_VM) && ${WITH_ZEND_VM} == "GOTO" -CONFIGURE_ARGS+=--with-zend-vm=GOTO -.endif - -CONFIGURE_ENV+= ac_cv_pthreads_lib="" \ - ac_cv_pthreads_cflags="" \ - pthreads_working="yes" \ - lt_cv_path_SED="sed" - -.if ${PORT_OPTIONS:MLINKTHR} -LIBS+= -lpthread -.endif - -.if ${PORT_OPTIONS:MDEBUG} -CONFIGURE_ARGS+=--enable-debug -.endif - -.if ${PORT_OPTIONS:MMULTIBYTE} -CONFIGURE_ARGS+=--enable-zend-multibyte -.endif - -.if empty(PORT_OPTIONS:MIPV6) -CONFIGURE_ARGS+=--disable-ipv6 -.endif - -post-patch: - @${TOUCH} ${WRKSRC}/ext/php_config.h - @${REINPLACE_CMD} -e 's|freetype/||g' ${WRKSRC}/configure - @${REINPLACE_CMD} "s|^\(extension_dir\)|; \1|" ${WRKSRC}/php.ini-* -.if ${PORT_OPTIONS:MFPM} - @${REINPLACE_CMD} -e "s|^;\(pid\)|\1|;s|^;\(pm\.[a-z_]*_servers\)|\1|" \ - ${WRKSRC}/sapi/fpm/php-fpm.conf.in -.endif - -# Work around issues with newer (>=2.64) autoconf -pre-configure: - @${REINPLACE_CMD} -E 's:^((m4_)?divert)[(]([0-9]*)[)]:\1(600\3):' \ - ${WRKSRC}/configure.in `${FIND} ${WRKSRC} -name '*.m4'` - @${RM} ${WRKSRC}/configure - @${CAT} ${WRKSRC}/acinclude.m4 ${WRKSRC}/build/libtool.m4 > ${WRKSRC}/aclocal.m4 - -post-build: - @${ECHO_CMD} "PHP_VER=53" > ${WRKDIR}/php.conf - @${ECHO_CMD} "PHP_VERSION=${PORTVERSION}" >> ${WRKDIR}/php.conf - @${ECHO_CMD} "PHP_SAPI=${PHP_SAPI}" >> ${WRKDIR}/php.conf - @${ECHO_CMD} "PHP_EXT_INC=pcre spl" >> ${WRKDIR}/php.conf - -test: build - @(cd ${WRKSRC} && ${MAKE} test) - -post-install: - @${INSTALL_DATA} ${WRKSRC}/php.ini-development ${WRKSRC}/php.ini-production \ - ${WRKDIR}/php.conf ${STAGEDIR}/${PREFIX}/etc - -.else -.include "${MASTERDIR}/Makefile.ext" -.endif -.include <bsd.port.post.mk> diff --git a/lang/php53/Makefile.ext b/lang/php53/Makefile.ext deleted file mode 100644 index 468aefe4ba67..000000000000 --- a/lang/php53/Makefile.ext +++ /dev/null @@ -1,605 +0,0 @@ -COMMENT= The ${PHP_MODNAME} shared extension for php - -USE_PHP= yes -USE_PHPEXT= yes -PHP_MODNAME= ${PKGNAMESUFFIX:S/-//} -PHP_DEFAULT= 53 -IGNORE_WITH_PHP=52 5 55 - -EXTSUBDIR= ${DISTNAME}/ext/${PHP_MODNAME} -WRKSRC= ${WRKDIR}/${EXTSUBDIR} -PATCHDIR= ${.CURDIR}/files -PLIST= ${NONEXISTENT} - -EXTRACT_AFTER_ARGS?= ${EXTSUBDIR} - -.if ${PHP_MODNAME} == "bcmath" -CONFIGURE_ARGS+=--enable-bcmath - -PHP_HEADER_DIRS=libbcmath libbcmath/src -.endif - -.if ${PHP_MODNAME} == "bz2" -CONFIGURE_ARGS+=--with-bz2=/usr -.endif - -.if ${PHP_MODNAME} == "calendar" -CONFIGURE_ARGS+=--enable-calendar -.endif - -.if ${PHP_MODNAME} == "ctype" -CONFIGURE_ARGS+=--enable-ctype -.endif - -.if ${PHP_MODNAME} == "curl" -LIB_DEPENDS+= libcurl.so:${PORTSDIR}/ftp/curl - -CONFIGURE_ARGS+=--with-curl=${LOCALBASE} -.endif - -.if ${PHP_MODNAME} == "dba" -CONFIGURE_ARGS+=--enable-dba - -OPTIONS_DEFINE= CDB DB4 DBM INIFILE FLATFILE -OPTIONS_DEFAULT= CDB INIFILE FLATFILE -OPTIONS_SINGLE= DBM -OPTIONS_SINGLE_DBM= GDBM QDBM - -CDB_DESC= cdb database support -DB4_DESC= Berkeley DB4 support -GDBM_DESC= GDBM database support -QDBM_DESC= QDBM database support -INIFILE_DESC= INI file support -FLATFILE_DESC= flatfile support - -PHP_HEADER_DIRS= libcdb libflatfile libinifile -.endif - -.if ${PHP_MODNAME} == "dom" -CONFIGURE_ARGS+=--enable-dom \ - --with-libxml-dir=${LOCALBASE} - -USE_GNOME= libxml2 -.endif - -.if ${PHP_MODNAME} == "exif" -CONFIGURE_ARGS+=--enable-exif -.endif - -.if ${PHP_MODNAME} == "fileinfo" -CONFIGURE_ARGS+=--enable-fileinfo \ - --with-pcre-dir=${LOCALBASE} - -PHP_HEADER_DIRS= libmagic -.endif - -.if ${PHP_MODNAME} == "filter" -CONFIGURE_ARGS+=--enable-filter \ - --with-pcre-dir=${LOCALBASE} -.endif - -.if ${PHP_MODNAME} == "ftp" -CONFIGURE_ARGS+=--enable-ftp \ - --with-openssl-dir=${OPENSSLBASE} - -LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl -USE_OPENSSL= yes -.endif - -.if ${PHP_MODNAME} == "gd" -LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \ - libpng.so:${PORTSDIR}/graphics/png \ - libjpeg.so:${PORTSDIR}/graphics/jpeg - -CONFIGURE_ARGS+=--with-gd \ - --with-freetype-dir=${LOCALBASE} \ - --with-jpeg-dir=${LOCALBASE} \ - --with-png-dir=${LOCALBASE} \ - --with-zlib-dir=/usr - -OPTIONS_DEFINE= T1LIB TRUETYPE JIS X11 -OPTIONS_DEFAULT= T1LIB TRUETYPE X11 - -T1LIB_DESC= Include T1lib support -TRUETYPE_DESC= TrueType string function -JIS_DESC= JIS-mapped Japanese font support - -PHP_HEADER_DIRS=libgd -.endif - -.if ${PHP_MODNAME} == "gettext" -CONFIGURE_ARGS+=--with-gettext=${LOCALBASE} - -USES+= gettext -.endif - -.if ${PHP_MODNAME} == "gmp" -LIB_DEPENDS+= libgmp.so.10:${PORTSDIR}/math/gmp - -CONFIGURE_ARGS+=--with-gmp=${LOCALBASE} -.endif - -.if ${PHP_MODNAME} == "hash" -CONFIGURE_ARGS+=--enable-hash \ - --with-mhash -.endif - -.if ${PHP_MODNAME} == "iconv" -CONFIGURE_ARGS+=--with-iconv - -USES+= iconv:translit -.endif - -.if ${PHP_MODNAME} == "imap" -OPTIONS_DEFINE= SSL -OPTIONS_DEFAULT= SSL -LIB_DEPENDS+= libc-client4.so.9:${PORTSDIR}/mail/cclient - -CONFIGURE_ARGS+=--with-imap=${LOCALBASE} \ - --with-pcre-dir=${LOCALBASE} -USE_OPENSSL= yes -.endif - -.if ${PHP_MODNAME} == "interbase" -CONFIGURE_ARGS+=--with-interbase=${LOCALBASE} - -USE_FIREBIRD= yes -.endif - -.if ${PHP_MODNAME} == "json" -CONFIGURE_ARGS+=--enable-json -.endif - -.if ${PHP_MODNAME} == "ldap" -CONFIGURE_ARGS+=--with-ldap=${LOCALBASE} - -USE_OPENLDAP= yes - -. ifdef(WANT_OPENLDAP_SASL) -CONFIGURE_ARGS+=--with-ldap-sasl -. endif -.endif - -.if ${PHP_MODNAME} == "mbstring" - -CONFIGURE_ARGS+=--enable-mbstring \ - --with-pcre-dir=${LOCALBASE} - -OPTIONS_DEFINE= REGEX -OPTIONS_DEFAULT= REGEX - -REGEX_DESC= multibyte regex support - -PHP_HEADER_DIRS=libmbfl libmbfl/filters libmbfl/mbfl libmbfl/nls -.endif - -.if ${PHP_MODNAME} == "mcrypt" -LIB_DEPENDS+= libltdl.so:${PORTSDIR}/devel/libltdl \ - libmcrypt.so:${PORTSDIR}/security/libmcrypt - -CONFIGURE_ARGS+=--with-mcrypt=${LOCALBASE} -.endif - -.if ${PHP_MODNAME} == "mssql" -LIB_DEPENDS+= libsybdb.so.5:${PORTSDIR}/databases/freetds - -CONFIGURE_ARGS+=--with-mssql=${LOCALBASE} -.endif - -.if ${PHP_MODNAME} == "mysql" -OPTIONS_DEFINE= MYSQLND -OPTIONS_DEFAULT= MYSQLND - -MYSQLND_DESC= Use MySQL Native Driver -.endif - -.if ${PHP_MODNAME} == "mysqli" -OPTIONS_DEFINE= MYSQLND -OPTIONS_DEFAULT= MYSQLND - -MYSQLND_DESC= Use MySQL Native Driver -.endif - -.if ${PHP_MODNAME} == "odbc" -CONFIGURE_ARGS+=--enable-odbc -.endif - -.if ${PHP_MODNAME} == "openssl" -CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE} - -LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl -USE_OPENSSL= yes -.endif - -.if ${PHP_MODNAME} == "pcntl" -CONFIGURE_ARGS+=--enable-pcntl -.endif - -.if ${PHP_MODNAME} == "pdo" -CONFIGURE_ARGS+=--enable-pdo -.endif - -.if ${PHP_MODNAME} == "pdo_dblib" -CONFIGURE_ARGS+=--with-pdo-dblib=${LOCALBASE} - -USE_PHP= pdo -USE_PHP_BUILD= yes - -OPTIONS_DEFINE= MSSQL - -MSSQL_DESC= Microsoft SQL Server support -.endif - -.if ${PHP_MODNAME} == "pdo_firebird" -CONFIGURE_ARGS+=--with-pdo-firebird=${LOCALBASE} - -USE_PHP= pdo -USE_PHP_BUILD= yes - -USE_FIREBIRD= yes -.endif - -.if ${PHP_MODNAME} == "pdo_mysql" -OPTIONS_DEFINE= MYSQLND -OPTIONS_DEFAULT= MYSQLND - -MYSQLND_DESC= Use MySQL Native Driver - -USE_PHP= pdo -USE_PHP_BUILD= yes -.endif - -.if ${PHP_MODNAME} == "pdo_odbc" -USE_PHP= pdo -USE_PHP_BUILD= yes -.endif - -.if ${PHP_MODNAME} == "pdo_pgsql" -USES+= pgsql - -CONFIGURE_ARGS+=--with-pdo-pgsql=${LOCALBASE} - -USE_PHP= pdo -USE_PHP_BUILD= yes -.endif - -.if ${PHP_MODNAME} == "pdo_sqlite" -USE_SQLITE= yes -CONFIGURE_ARGS+=--with-pdo-sqlite=${LOCALBASE} - -USE_PHP= pdo -USE_PHP_BUILD= yes -.endif - -.if ${PHP_MODNAME} == "pgsql" -USES+= pgsql - -CONFIGURE_ARGS+=--with-pgsql=${LOCALBASE} -.endif - -.if ${PHP_MODNAME} == "phar" -CONFIGURE_ARGS+=--enable-phar \ - --with-pcre-dir=${LOCALBASE} - -USE_PHP= hash -USE_PHP_BUILD= yes -.endif - -.if ${PHP_MODNAME} == "posix" -CONFIGURE_ARGS+=--enable-posix -.endif - -.if ${PHP_MODNAME} == "pspell" -LIB_DEPENDS+= libaspell.so:${PORTSDIR}/textproc/aspell - -CONFIGURE_ARGS+=--with-pspell=${LOCALBASE} - -# Ugly hack to load session before psell to avoid crashes -USE_PHP= session -USE_PHP_BUILD= yes -.endif - -.if ${PHP_MODNAME} == "readline" -CONFIGURE_ARGS+=--with-readline=/usr -USES+= readline -.endif - -.if ${PHP_MODNAME} == "recode" -LIB_DEPENDS+= librecode.so.3:${PORTSDIR}/converters/recode - -CONFIGURE_ARGS+=--with-recode=${LOCALBASE} -.endif - -.if ${PHP_MODNAME} == "session" -CONFIGURE_ARGS+=--enable-session -.endif - -.if ${PHP_MODNAME} == "shmop" -CONFIGURE_ARGS+=--enable-shmop -.endif - -.if ${PHP_MODNAME} == "simplexml" -CONFIGURE_ARGS+=--enable-simplexml \ - --with-libxml-dir=${LOCALBASE} - -CFLAGS+= -I${LOCALBASE}/include -USES+= pkgconfig -USE_GNOME= libxml2 -.endif - -.if ${PHP_MODNAME} == "snmp" -CONFIGURE_ARGS+=--with-snmp=${LOCALBASE} \ - --with-openssl-dir=${OPENSSLBASE} \ - --enable-ucd-snmp-hack - -LIB_DEPENDS+= libnetsnmp.so.30:${PORTSDIR}/net-mgmt/net-snmp -LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl -USE_OPENSSL= yes -.endif - -.if ${PHP_MODNAME} == "soap" -CONFIGURE_ARGS+=--enable-soap \ - --with-libxml-dir=${LOCALBASE} - -USE_GNOME= libxml2 - -USE_PHP= session -USE_PHP_BUILD= yes -.endif - -.if ${PHP_MODNAME} == "sockets" -CONFIGURE_ARGS+=--enable-sockets -.endif - -.if ${PHP_MODNAME} == "sqlite" -CONFIGURE_ARGS+=--with-sqlite - -USE_PHP= session -USE_PHP_BUILD= yes -PHP_HEADER_DIRS=libsqlite/src - -OPTIONS_DEFINE= UTF8 - -UTF8_DESC= UTF-8 support -.endif - -.if ${PHP_MODNAME} == "sqlite3" -USE_SQLITE= yes -CONFIGURE_ARGS+=--with-sqlite3=${LOCALBASE} -LDFLAGS+= -L${LOCALBASE}/lib -.endif - -.if ${PHP_MODNAME} == "sybase_ct" -LIB_DEPENDS+= libct.so.4:${PORTSDIR}/databases/freetds - -CONFIGURE_ARGS+=--with-sybase-ct=${LOCALBASE} -.endif - -.if ${PHP_MODNAME} == "sysvmsg" -CONFIGURE_ARGS+=--enable-sysvmsg -.endif - -.if ${PHP_MODNAME} == "sysvsem" -CONFIGURE_ARGS+=--enable-sysvsem -.endif - -.if ${PHP_MODNAME} == "sysvshm" -CONFIGURE_ARGS+=--enable-sysvshm -.endif - -.if ${PHP_MODNAME} == "tidy" -CONFIGURE_ARGS+=--with-tidy=${LOCALBASE} - -LIB_DEPENDS+= libtidy.so:${PORTSDIR}/www/tidy-lib -.endif - -.if ${PHP_MODNAME} == "tokenizer" -CONFIGURE_ARGS+=--enable-tokenizer -.endif - -.if ${PHP_MODNAME} == "wddx" -CONFIGURE_ARGS+=--enable-wddx \ - --with-libxml-dir=${LOCALBASE} - -USE_GNOME= libxml2 - -USE_PHP= xml session -USE_PHP_BUILD= yes -.endif - -.if ${PHP_MODNAME} == "xml" -CONFIGURE_ARGS+=--enable-xml \ - --with-libxml-dir=${LOCALBASE} - -USE_GNOME= libxml2 -.endif - -.if ${PHP_MODNAME} == "xmlreader" -CONFIGURE_ARGS+=--enable-xmlreader \ - --with-libxml-dir=${LOCALBASE} - -USE_GNOME= libxml2 - -USE_PHP= dom -USE_PHP_BUILD= yes -.endif - -.if ${PHP_MODNAME} == "xmlrpc" -CONFIGURE_ARGS+=--with-xmlrpc \ - --with-libxml-dir=${LOCALBASE} - -USES+= iconv -USE_GNOME= libxml2 - -PHP_HEADER_DIRS=libxmlrpc - -USE_PHP= xml -USE_PHP_BUILD= yes -.endif - -.if ${PHP_MODNAME} == "xmlwriter" -CONFIGURE_ARGS+=--enable-xmlwriter \ - --with-libxml-dir=${LOCALBASE} - -USE_GNOME= libxml2 -.endif - -.if ${PHP_MODNAME} == "xsl" -CONFIGURE_ARGS+=--with-xsl=${LOCALBASE} - -USE_GNOME= libxslt -USE_PHP= dom xml -USE_PHP_BUILD= yes -.endif - -.if ${PHP_MODNAME} == "zip" -CONFIGURE_ARGS+=--enable-zip \ - --with-zlib-dir=/usr \ - --with-pcre-dir=${LOCALBASE} -.endif - -.if ${PHP_MODNAME} == "zlib" -CONFIGURE_ARGS+=--with-zlib=/usr -.endif - -.include <bsd.port.pre.mk> - -.if ${PHP_MODNAME} == "dba" -. if empty(PORT_OPTIONS:MCDB) -CONFIGURE_ARGS+=--without-cdb -. endif -. if ${PORT_OPTIONS:MDB4} -CONFIGURE_ARGS+=--with-db4=${LOCALBASE} - -USE_BDB= 40+ -WITH_BDB_HIGHEST= yes -. endif -. if ${PORT_OPTIONS:MGDBM} -LIB_DEPENDS+= libgdbm.so.4:${PORTSDIR}/databases/gdbm - -CONFIGURE_ARGS+=--with-gdbm=${LOCALBASE} -. endif -. if ${PORT_OPTIONS:MQDBM} -LIB_DEPENDS+= libqdbm.so.14:${PORTSDIR}/databases/qdbm - -CONFIGURE_ARGS+=--with-qdbm=${LOCALBASE} -. endif -. if empty(PORT_OPTIONS:MINIFILE) -CONFIGURE_ARGS+=--disable-inifile -. endif -. if empty(PORT_OPTIONS:MFLATFILE) -CONFIGURE_ARGS+=--disable-flatfile -. endif -.endif - -.if ${PHP_MODNAME} == "gd" -. if ${PORT_OPTIONS:MX11} -USE_XORG= xpm -. endif - -. if ${PORT_OPTIONS:MX11} -CONFIGURE_ARGS+=--with-xpm-dir=${LOCALBASE} -. endif - -. if ${PORT_OPTIONS:MT1LIB} -LIB_DEPENDS+= libt1.so.5:${PORTSDIR}/devel/t1lib - -CONFIGURE_ARGS+=--with-t1lib=${LOCALBASE} -. endif -. if ${PORT_OPTIONS:MTRUETYPE} -CONFIGURE_ARGS+=--enable-gd-native-ttf -. endif -. if ${PORT_OPTIONS:MJIS} -CONFIGURE_ARGS+=--enable-gd-jis-conv -. endif -.endif - -.if ${PHP_MODNAME} == "imap" -. if ${PORT_OPTIONS:MSSL} -CONFIGURE_ARGS+=--with-imap-ssl=${OPENSSLBASE} -LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl -. endif -.endif - -.if ${PHP_MODNAME} == "mbstring" -. if ${PORT_OPTIONS:MREGEX} -LIB_DEPENDS+= libonig.so.1:${PORTSDIR}/devel/oniguruma4 -CONFIGURE_ARGS+=--with-onig=${LOCALBASE} -. else -CONFIGURE_ARGS+=--disable-mbregex -. endif -.endif - -.if ${PHP_MODNAME} == "mysql" -. if ${PORT_OPTIONS:MMYSQLND} -CONFIGURE_ARGS+=--with-mysql=mysqlnd -. else -CONFIGURE_ARGS+=--with-mysql=${LOCALBASE} \ - --with-zlib-dir=/usr - -USE_MYSQL= yes -. endif -.endif - -.if ${PHP_MODNAME} == "mysqli" -. if ${PORT_OPTIONS:MMYSQLND} -CONFIGURE_ARGS+=--with-mysqli=mysqlnd -. else -CONFIGURE_ARGS+=--with-mysqli=${LOCALBASE}/bin/mysql_config - -USE_MYSQL= yes -. endif -.endif - -.if ${PHP_MODNAME} == "openssl" || ${PHP_MODNAME} == "sqlite3" -post-extract: - @${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4 -.endif - -.if ${PHP_MODNAME} == "odbc" -LIB_DEPENDS+= libodbc.so.2:${PORTSDIR}/databases/unixODBC -CONFIGURE_ARGS+=--with-unixODBC=${LOCALBASE} -.endif - -.if ${PHP_MODNAME} == "pdo_dblib" -.if ${PORT_OPTIONS:MMSSQL} -LIB_DEPENDS+= libsybdb.so.5:${PORTSDIR}/databases/freetds -.else -LIB_DEPENDS+= libct.so.4:${PORTSDIR}/databases/freetds -.endif -.endif - -.if ${PHP_MODNAME} == "pdo_odbc" -LIB_DEPENDS+= libodbc.so.2:${PORTSDIR}/databases/unixODBC -CONFIGURE_ARGS+=--with-pdo-odbc=unixODBC,${LOCALBASE} -.endif - -.if ${PHP_MODNAME} == "pdo_mysql" -. if ${PORT_OPTIONS:MMYSQLND} -CONFIGURE_ARGS+=--with-pdo-mysql=mysqlnd - -USE_PHP+= mysql -. else -CONFIGURE_ARGS+=--with-pdo-mysql=${LOCALBASE} \ - --with-zlib-dir=/usr - -USE_MYSQL= yes -. endif -.endif - -.if ${PHP_MODNAME} == "sqlite" -. if ${PORT_OPTIONS:MUTF8} -CONFIGURE_ARGS+=--enable-sqlite-utf8 -. endif -.endif - -.if ${PHP_MODNAME} == "xml" -post-extract: - @${MKDIR} ${WRKSRC}/ext/xml - @${CP} ${WRKSRC}/expat_compat.h ${WRKSRC}/ext/xml -.endif - -.if ${PHP_MODNAME} == "zlib" -post-extract: - @${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4 -.endif diff --git a/lang/php53/distinfo b/lang/php53/distinfo deleted file mode 100644 index 763b4bfe0923..000000000000 --- a/lang/php53/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -SHA256 (php-5.3.29.tar.bz2) = c4e1cf6972b2a9c7f2777a18497d83bf713cdbecabb65d3ff62ba441aebb0091 -SIZE (php-5.3.29.tar.bz2) = 11396771 -SHA256 (suhosin-patch-5.3.x-0.9.10.5.patch.gz) = 5de84149facbf3c3f752a907c19e69e0f569d71facb034ce938c97004f19376b -SIZE (suhosin-patch-5.3.x-0.9.10.5.patch.gz) = 40805 -SHA256 (php-5.3.x-mail-header.patch) = 5a677448b32d9f592703e2323a33facdb45e5c237dcca04aaea8ec3287f7db84 -SIZE (php-5.3.x-mail-header.patch) = 3325 diff --git a/lang/php53/files/patch-CVE-2014-8142.patch b/lang/php53/files/patch-CVE-2014-8142.patch deleted file mode 100644 index f023909d9024..000000000000 --- a/lang/php53/files/patch-CVE-2014-8142.patch +++ /dev/null @@ -1,56 +0,0 @@ -Index: ext/standard/tests/serialize/bug68594.phpt -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ext/standard/tests/serialize/bug68594.phpt 2015-02-13 11:27:34.753347966 -0500 -@@ -0,0 +1,23 @@ -+--TEST-- -+Bug #68545 Use after free vulnerability in unserialize() -+--FILE-- -+<?php -+for ($i=4; $i<100; $i++) { -+ $m = new StdClass(); -+ -+ $u = array(1); -+ -+ $m->aaa = array(1,2,&$u,4,5); -+ $m->bbb = 1; -+ $m->ccc = &$u; -+ $m->ddd = str_repeat("A", $i); -+ -+ $z = serialize($m); -+ $z = str_replace("bbb", "aaa", $z); -+ $y = unserialize($z); -+ $z = serialize($y); -+} -+?> -+===DONE=== -+--EXPECTF-- -+===DONE=== -Index: ext/standard/var_unserializer.c -=================================================================== ---- ext/standard/var_unserializer.c 2015-02-13 11:27:34.793348294 -0500 -+++ ext/standard/var_unserializer.c 2015-02-13 11:27:34.753347966 -0500 -@@ -298,6 +298,9 @@ - } else { - /* object properties should include no integers */ - convert_to_string(key); -+ if (zend_symtable_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)==SUCCESS) { -+ var_push_dtor(var_hash, old_data); -+ } - zend_hash_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &data, - sizeof data, NULL); - } -Index: ext/standard/var_unserializer.re -=================================================================== ---- ext/standard/var_unserializer.re 2015-02-13 11:27:34.793348294 -0500 -+++ ext/standard/var_unserializer.re 2015-02-13 11:27:34.753347966 -0500 -@@ -304,6 +304,9 @@ - } else { - /* object properties should include no integers */ - convert_to_string(key); -+ if (zend_symtable_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)==SUCCESS) { -+ var_push_dtor(var_hash, old_data); -+ } - zend_hash_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &data, - sizeof data, NULL); - } diff --git a/lang/php53/files/patch-CVE-2014-9705 b/lang/php53/files/patch-CVE-2014-9705 deleted file mode 100644 index 0b4d6b1e67be..000000000000 --- a/lang/php53/files/patch-CVE-2014-9705 +++ /dev/null @@ -1,34 +0,0 @@ ---- ext/enchant/enchant.c 2015-03-16 13:42:36.063819735 -0400 -+++ ext/enchant/enchant.c 2015-03-16 13:42:36.059819705 -0400 -@@ -545,13 +545,12 @@ - - d = enchant_broker_request_dict(pbroker->pbroker, (const char *)tag); - if (d) { -+ pos = pbroker->dictcnt++; - if (pbroker->dictcnt) { - pbroker->dict = (enchant_dict **)erealloc(pbroker->dict, sizeof(enchant_dict *) * pbroker->dictcnt); -- pos = pbroker->dictcnt++; - } else { - pbroker->dict = (enchant_dict **)emalloc(sizeof(enchant_dict *)); - pos = 0; -- pbroker->dictcnt++; - } - - dict = pbroker->dict[pos] = (enchant_dict *)emalloc(sizeof(enchant_dict)); -@@ -606,14 +605,14 @@ - - d = enchant_broker_request_pwl_dict(pbroker->pbroker, (const char *)pwl); - if (d) { -+ pos = pbroker->dictcnt++; - if (pbroker->dictcnt) { -- pos = pbroker->dictcnt++; - pbroker->dict = (enchant_dict **)erealloc(pbroker->dict, sizeof(enchant_dict *) * pbroker->dictcnt); - } else { - pbroker->dict = (enchant_dict **)emalloc(sizeof(enchant_dict *)); - pos = 0; -- pbroker->dictcnt++; - } -+ - dict = pbroker->dict[pos] = (enchant_dict *)emalloc(sizeof(enchant_dict)); - dict->id = pos; - dict->pbroker = pbroker; diff --git a/lang/php53/files/patch-CVE-2015-0231.patch b/lang/php53/files/patch-CVE-2015-0231.patch deleted file mode 100644 index 535e59013104..000000000000 --- a/lang/php53/files/patch-CVE-2015-0231.patch +++ /dev/null @@ -1,56 +0,0 @@ -Index: ext/standard/tests/strings/bug68710.phpt -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ext/standard/tests/strings/bug68710.phpt 2015-02-13 11:36:32.969760122 -0500 -@@ -0,0 +1,25 @@ -+--TEST-- -+Bug #68710 Use after free vulnerability in unserialize() (bypassing the -+CVE-2014-8142 fix) -+--FILE-- -+<?php -+for ($i=4; $i<100; $i++) { -+ $m = new StdClass(); -+ -+ $u = array(1); -+ -+ $m->aaa = array(1,2,&$u,4,5); -+ $m->bbb = 1; -+ $m->ccc = &$u; -+ $m->ddd = str_repeat("A", $i); -+ -+ $z = serialize($m); -+ $z = str_replace("aaa", "123", $z); -+ $z = str_replace("bbb", "123", $z); -+ $y = unserialize($z); -+ $z = serialize($y); -+} -+?> -+===DONE=== -+--EXPECTF-- -+===DONE=== -Index: ext/standard/var_unserializer.c -=================================================================== ---- ext/standard/var_unserializer.c 2015-02-13 11:36:33.009760449 -0500 -+++ ext/standard/var_unserializer.c 2015-02-13 11:36:32.969760122 -0500 -@@ -298,7 +298,7 @@ - } else { - /* object properties should include no integers */ - convert_to_string(key); -- if (zend_symtable_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)==SUCCESS) { -+ if (zend_hash_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)==SUCCESS) { - var_push_dtor(var_hash, old_data); - } - zend_hash_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &data, -Index: ext/standard/var_unserializer.re -=================================================================== ---- ext/standard/var_unserializer.re 2015-02-13 11:36:33.009760449 -0500 -+++ ext/standard/var_unserializer.re 2015-02-13 11:36:32.969760122 -0500 -@@ -304,7 +304,7 @@ - } else { - /* object properties should include no integers */ - convert_to_string(key); -- if (zend_symtable_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)==SUCCESS) { -+ if (zend_hash_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)==SUCCESS) { - var_push_dtor(var_hash, old_data); - } - zend_hash_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &data, diff --git a/lang/php53/files/patch-CVE-2015-0273 b/lang/php53/files/patch-CVE-2015-0273 deleted file mode 100644 index d707ca3c2b0d..000000000000 --- a/lang/php53/files/patch-CVE-2015-0273 +++ /dev/null @@ -1,18 +0,0 @@ ---- ext/date/php_date.c.orig 2015-03-21 18:31:58.092700000 +0100 -+++ ext/date/php_date.c 2015-03-21 18:33:51.148505000 +0100 -@@ -2573,12 +2573,9 @@ - timelib_tzinfo *tzi; - php_timezone_obj *tzobj; - -- if (zend_hash_find(myht, "date", 5, (void**) &z_date) == SUCCESS) { -- convert_to_string(*z_date); -- if (zend_hash_find(myht, "timezone_type", 14, (void**) &z_timezone_type) == SUCCESS) { -- convert_to_long(*z_timezone_type); -- if (zend_hash_find(myht, "timezone", 9, (void**) &z_timezone) == SUCCESS) { -- convert_to_string(*z_timezone); -+ if (zend_hash_find(myht, "date", 5, (void**) &z_date) == SUCCESS && Z_TYPE_PP(z_date) == IS_STRING) { -+ if (zend_hash_find(myht, "timezone_type", 14, (void**) &z_timezone_type) == SUCCESS && Z_TYPE_PP(z_timezone_type) == IS_LONG) { -+ if (zend_hash_find(myht, "timezone", 9, (void**) &z_timezone) == SUCCESS && Z_TYPE_PP(z_timezone) == IS_STRING) { - - switch (Z_LVAL_PP(z_timezone_type)) { - case TIMELIB_ZONETYPE_OFFSET: diff --git a/lang/php53/files/patch-TSRM_threads.m4 b/lang/php53/files/patch-TSRM_threads.m4 deleted file mode 100644 index 227f6d26c9d5..000000000000 --- a/lang/php53/files/patch-TSRM_threads.m4 +++ /dev/null @@ -1,11 +0,0 @@ ---- TSRM/threads.m4.orig 2005-04-27 15:22:18.000000000 +0200 -+++ TSRM/threads.m4 2009-09-22 10:01:37.000000000 +0200 -@@ -79,7 +79,7 @@ - pthread_mutexattr_t mattr; - int data = 1; - pthread_mutexattr_init(&mattr); -- return pthread_create(&thd, NULL, thread_routine, &data); -+ return 0; - } ], [ - pthreads_working=yes - ], [ diff --git a/lang/php53/files/patch-Zend__zend.h b/lang/php53/files/patch-Zend__zend.h deleted file mode 100644 index 0fb2398f171d..000000000000 --- a/lang/php53/files/patch-Zend__zend.h +++ /dev/null @@ -1,11 +0,0 @@ ---- Zend/zend.h.orig 2008-08-15 21:47:23.000000000 +0200 -+++ Zend/zend.h 2008-09-25 22:52:50.000000000 +0200 -@@ -192,7 +192,7 @@ - # define ZEND_FASTCALL - #endif - --#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32)) && !(defined(ZTS) && defined(NETWARE)) && !(defined(ZTS) && defined(HPUX)) && !defined(DARWIN) -+#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32)) && !(defined(ZTS) && defined(NETWARE)) && !(defined(ZTS) && defined(HPUX)) && !defined(DARWIN) && !(defined(ZTS) && defined(__FreeBSD__)) - # define ZEND_ALLOCA_MAX_SIZE (32 * 1024) - # define ALLOCA_FLAG(name) \ - zend_bool name; diff --git a/lang/php53/files/patch-Zend_zend__ini.h b/lang/php53/files/patch-Zend_zend__ini.h deleted file mode 100644 index f1a55168e581..000000000000 --- a/lang/php53/files/patch-Zend_zend__ini.h +++ /dev/null @@ -1,11 +0,0 @@ ---- Zend/zend_ini.h.orig 2014-12-17 16:24:10 UTC -+++ Zend/zend_ini.h -@@ -28,7 +28,7 @@ - #define ZEND_INI_ALL (ZEND_INI_USER|ZEND_INI_PERDIR|ZEND_INI_SYSTEM) - - #ifndef XtOffsetOf --# if defined(CRAY) || (defined(__arm) && !defined(LINUX)) -+# if defined(CRAY) || (defined(__ARMCC_VERSION) && !defined(LINUX)) - # ifdef __STDC__ - # define XtOffset(p_type, field) _Offsetof(p_type, field) - # else diff --git a/lang/php53/files/patch-Zend_zend_list.c b/lang/php53/files/patch-Zend_zend_list.c deleted file mode 100644 index efa8862d1ce8..000000000000 --- a/lang/php53/files/patch-Zend_zend_list.c +++ /dev/null @@ -1,38 +0,0 @@ ---- Zend/zend_list.c.orig 2007-01-01 10:35:46.000000000 +0100 -+++ Zend/zend_list.c 2008-01-29 11:05:14.000000000 +0100 -@@ -48,7 +48,7 @@ - return index; - } - --ZEND_API int _zend_list_delete(int id TSRMLS_DC) -+ZEND_API int _zend_list_delete(ulong id TSRMLS_DC) - { - zend_rsrc_list_entry *le; - -@@ -65,7 +65,7 @@ - } - - --ZEND_API void *_zend_list_find(int id, int *type TSRMLS_DC) -+ZEND_API void *_zend_list_find(ulong id, int *type TSRMLS_DC) - { - zend_rsrc_list_entry *le; - -@@ -78,7 +78,7 @@ - } - } - --ZEND_API int _zend_list_addref(int id TSRMLS_DC) -+ZEND_API int _zend_list_addref(ulong id TSRMLS_DC) - { - zend_rsrc_list_entry *le; - -@@ -350,7 +350,7 @@ - } - - --char *zend_rsrc_list_get_rsrc_type(int resource TSRMLS_DC) -+char *zend_rsrc_list_get_rsrc_type(ulong resource TSRMLS_DC) - { - zend_rsrc_list_dtors_entry *lde; - int rsrc_type; diff --git a/lang/php53/files/patch-Zend_zend_list.h b/lang/php53/files/patch-Zend_zend_list.h deleted file mode 100644 index 308ac56b33b2..000000000000 --- a/lang/php53/files/patch-Zend_zend_list.h +++ /dev/null @@ -1,24 +0,0 @@ ---- Zend/zend_list.h.orig 2007-01-01 10:35:46.000000000 +0100 -+++ Zend/zend_list.h 2008-01-29 11:05:12.000000000 +0100 -@@ -71,9 +71,9 @@ - void zend_destroy_rsrc_list_dtors(void); - - ZEND_API int zend_list_insert(void *ptr, int type); --ZEND_API int _zend_list_addref(int id TSRMLS_DC); --ZEND_API int _zend_list_delete(int id TSRMLS_DC); --ZEND_API void *_zend_list_find(int id, int *type TSRMLS_DC); -+ZEND_API int _zend_list_addref(ulong id TSRMLS_DC); -+ZEND_API int _zend_list_delete(ulong id TSRMLS_DC); -+ZEND_API void *_zend_list_find(ulong id, int *type TSRMLS_DC); - - #define zend_list_addref(id) _zend_list_addref(id TSRMLS_CC) - #define zend_list_delete(id) _zend_list_delete(id TSRMLS_CC) -@@ -82,7 +82,7 @@ - ZEND_API int zend_register_resource(zval *rsrc_result, void *rsrc_pointer, int rsrc_type); - ZEND_API void *zend_fetch_resource(zval **passed_id TSRMLS_DC, int default_id, char *resource_type_name, int *found_resource_type, int num_resource_types, ...); - --ZEND_API char *zend_rsrc_list_get_rsrc_type(int resource TSRMLS_DC); -+ZEND_API char *zend_rsrc_list_get_rsrc_type(ulong resource TSRMLS_DC); - ZEND_API int zend_fetch_list_dtor_id(char *type_name); - - extern ZEND_API int le_index_ptr; /* list entry type for index pointers */ diff --git a/lang/php53/files/patch-acinclude.m4 b/lang/php53/files/patch-acinclude.m4 deleted file mode 100644 index d92738cdf776..000000000000 --- a/lang/php53/files/patch-acinclude.m4 +++ /dev/null @@ -1,54 +0,0 @@ ---- acinclude.m4.orig 2009-05-09 22:28:02.000000000 +0200 -+++ acinclude.m4 2009-06-25 08:08:05.000000000 +0200 -@@ -194,7 +194,7 @@ - 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 -@@ -968,15 +968,9 @@ - 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) -@@ -1026,12 +1020,6 @@ - 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 - ]) - -@@ -2303,9 +2291,9 @@ - test -z "$PHP_IMAP_SSL" && PHP_IMAP_SSL=no - - dnl Fallbacks for different configure options -- if test "$PHP_OPENSSL" != "no"; then -+ if test -n "$PHP_OPENSSL" && test "$PHP_OPENSSL" != "no"; then - PHP_OPENSSL_DIR=$PHP_OPENSSL -- elif test "$PHP_IMAP_SSL" != "no"; then -+ elif test -n "$PHP_IMAP_SSL" && test "$PHP_IMAP_SSL" != "no"; then - PHP_OPENSSL_DIR=$PHP_IMAP_SSL - fi - diff --git a/lang/php53/files/patch-configure.in b/lang/php53/files/patch-configure.in deleted file mode 100644 index d6e90018c51b..000000000000 --- a/lang/php53/files/patch-configure.in +++ /dev/null @@ -1,64 +0,0 @@ ---- configure.in.orig 2011-03-04 10:10:54.000000000 +0100 -+++ configure.in 2011-03-04 10:11:01.000000000 +0100 -@@ -302,7 +302,6 @@ - dnl . - dnl ------------------------------------------------------------------------- - --PTHREADS_CHECK - PHP_HELP_SEPARATOR([SAPI modules:]) - PHP_SHLIB_SUFFIX_NAMES - PHP_SAPI=default -@@ -327,7 +326,6 @@ - - if test "$enable_maintainer_zts" = "yes"; then - PTHREADS_ASSIGN_VARS -- PTHREADS_FLAGS - fi - - divert(3) -@@ -612,7 +610,7 @@ - ) - - dnl Some systems (like OpenSolaris) do not have nanosleep in libc --PHP_CHECK_FUNC_LIB(nanosleep, rt) -+PHP_CHECK_FUNC(nanosleep, rt) - - dnl Check for getaddrinfo, should be a better way, but... - dnl Also check for working getaddrinfo -@@ -1162,7 +1160,7 @@ - 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=.:${prefix}/share/pear - - exec_prefix=$old_exec_prefix - libdir=$old_libdir -@@ -1373,22 +1371,19 @@ - pharcmd_install= - fi; - --all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_CLI_TARGET) $pharcmd" --install_targets="$install_modules install-build install-headers install-programs $install_pear $pharcmd_install" -+all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_CLI_TARGET) \$(PHP_CGI_TARGET) \$(PHP_FPM_TARGET) $pharcmd" -+install_targets="$PHP_INSTALL_CLI_TARGET $PHP_INSTALL_CGI_TARGET $install_modules install-build install-headers install-programs $install_pear $pharcmd_install" - - case $PHP_SAPI in -- cli) -- install_targets="$PHP_INSTALL_CLI_TARGET $install_targets" -- ;; -- *) -- install_targets="install-sapi $PHP_INSTALL_CLI_TARGET $install_targets" -+ apache|apache2handler|apache2filter) -+ install_targets="install-sapi $install_targets" - ;; - esac - - PHP_SUBST(all_targets) - PHP_SUBST(install_targets) - --PHP_INSTALL_HEADERS([Zend/ TSRM/ include/ main/ main/streams/]) -+PHP_INSTALL_HEADERS([Zend/ TSRM/ main/ main/streams/]) - - PHP_ADD_SOURCES(TSRM, TSRM.c tsrm_strtok_r.c tsrm_virtual_cwd.c) - diff --git a/lang/php53/files/patch-ext_standard_image.c b/lang/php53/files/patch-ext_standard_image.c deleted file mode 100644 index be29b54b2650..000000000000 --- a/lang/php53/files/patch-ext_standard_image.c +++ /dev/null @@ -1,50 +0,0 @@ ---- ext/standard/image.c.orig 2007-10-04 15:31:11.000000000 +0200 -+++ ext/standard/image.c 2007-11-13 22:47:04.000000000 +0100 -@@ -31,9 +31,7 @@ - #endif - #include "php_image.h" - --#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) - #include "zlib.h" --#endif - - /* file type markers */ - PHPAPI const char php_sig_gif[3] = {'G', 'I', 'F'}; -@@ -80,9 +78,7 @@ - REGISTER_LONG_CONSTANT("IMAGETYPE_JP2", IMAGE_FILETYPE_JP2, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("IMAGETYPE_JPX", IMAGE_FILETYPE_JPX, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("IMAGETYPE_JB2", IMAGE_FILETYPE_JB2, CONST_CS | CONST_PERSISTENT); --#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) - REGISTER_LONG_CONSTANT("IMAGETYPE_SWC", IMAGE_FILETYPE_SWC, CONST_CS | CONST_PERSISTENT); --#endif - REGISTER_LONG_CONSTANT("IMAGETYPE_IFF", IMAGE_FILETYPE_IFF, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("IMAGETYPE_WBMP", IMAGE_FILETYPE_WBMP, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("IMAGETYPE_JPEG2000",IMAGE_FILETYPE_JPC, CONST_CS | CONST_PERSISTENT); /* keep alias */ -@@ -184,7 +180,6 @@ - } - /* }}} */ - --#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) - /* {{{ php_handle_swc - */ - static struct gfxinfo *php_handle_swc(php_stream * stream TSRMLS_DC) -@@ -255,7 +250,6 @@ - return result; - } - /* }}} */ --#endif - - /* {{{ php_handle_swf - */ -@@ -1314,11 +1308,7 @@ - result = php_handle_swf(stream TSRMLS_CC); - break; - case IMAGE_FILETYPE_SWC: --#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) - result = php_handle_swc(stream TSRMLS_CC); --#else -- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "The image is a compressed SWF file, but you do not have a static version of the zlib extension enabled"); --#endif - break; - case IMAGE_FILETYPE_PSD: - result = php_handle_psd(stream TSRMLS_CC); diff --git a/lang/php53/files/patch-ext_zlib_config0.m4 b/lang/php53/files/patch-ext_zlib_config0.m4 deleted file mode 100644 index 249c85b498d3..000000000000 --- a/lang/php53/files/patch-ext_zlib_config0.m4 +++ /dev/null @@ -1,11 +0,0 @@ ---- ext/zlib/config0.m4.orig 2010-08-26 13:19:52.000000000 +0200 -+++ ext/zlib/config0.m4 2010-08-26 13:20:11.000000000 +0200 -@@ -8,7 +8,7 @@ - PHP_ARG_WITH(zlib-dir,if the location of ZLIB install directory is defined, - [ --with-zlib-dir=<DIR> Define the location of zlib install directory], no, no) - --if test "$PHP_ZLIB" != "no" || test "$PHP_ZLIB_DIR" != "no"; then -+if test "$PHP_ZLIB" != "no"; then - PHP_NEW_EXTENSION(zlib, zlib.c zlib_fopen_wrapper.c zlib_filter.c, $ext_shared) - PHP_SUBST(ZLIB_SHARED_LIBADD) - diff --git a/lang/php53/files/patch-main__php_config.h.in b/lang/php53/files/patch-main__php_config.h.in deleted file mode 100644 index 8e9938876421..000000000000 --- a/lang/php53/files/patch-main__php_config.h.in +++ /dev/null @@ -1,12 +0,0 @@ ---- main/php_config.h.in.orig Wed Jan 11 15:25:52 2006 -+++ main/php_config.h.in Wed May 3 09:38:09 2006 -@@ -2760,6 +2760,9 @@ - /* Define if uint32_t type is present. */ - #undef HAVE_UINT32_T - -+/* Include external shared modules configurations */ -+#include "ext/php_config.h" -+ - /* Whether sprintf is broken */ - #undef ZEND_BROKEN_SPRINTF - diff --git a/lang/php53/files/patch-php.ini-development b/lang/php53/files/patch-php.ini-development deleted file mode 100644 index dadeb4b838b1..000000000000 --- a/lang/php53/files/patch-php.ini-development +++ /dev/null @@ -1,18 +0,0 @@ ---- php.ini-development.orig 2009-06-28 19:56:18.000000000 +0200 -+++ php.ini-development 2009-08-24 17:17:53.000000000 +0200 -@@ -335,6 +335,15 @@ - - ; Safe Mode - ; http://php.net/safe-mode -+; -+; SECURITY NOTE: The FreeBSD Security Officer strongly recommend that -+; the PHP Safe Mode feature not be relied upon for security, since the -+; issues Safe Mode tries to handle cannot properly be handled in PHP -+; (primarily due to PHP's use of external libraries). While many bugs -+; in Safe Mode has been fixed it's very likely that more issues exist -+; which allows a user to bypass Safe Mode restrictions. -+; For increased security we always recommend to install the Suhosin -+; extension. - safe_mode = Off - - ; By default, Safe Mode does a UID compare check when diff --git a/lang/php53/files/patch-php.ini-production b/lang/php53/files/patch-php.ini-production deleted file mode 100644 index 67d3480ad4a6..000000000000 --- a/lang/php53/files/patch-php.ini-production +++ /dev/null @@ -1,18 +0,0 @@ ---- php.ini-production.orig 2009-08-24 17:18:23.000000000 +0200 -+++ php.ini-production 2009-08-24 17:18:33.000000000 +0200 -@@ -335,6 +335,15 @@ - - ; Safe Mode - ; http://php.net/safe-mode -+; -+; SECURITY NOTE: The FreeBSD Security Officer strongly recommend that -+; the PHP Safe Mode feature not be relied upon for security, since the -+; issues Safe Mode tries to handle cannot properly be handled in PHP -+; (primarily due to PHP's use of external libraries). While many bugs -+; in Safe Mode has been fixed it's very likely that more issues exist -+; which allows a user to bypass Safe Mode restrictions. -+; For increased security we always recommend to install the Suhosin -+; extension. - safe_mode = Off - - ; By default, Safe Mode does a UID compare check when diff --git a/lang/php53/files/patch-sapi_apache2filter_config.m4 b/lang/php53/files/patch-sapi_apache2filter_config.m4 deleted file mode 100644 index ce71383f9fa4..000000000000 --- a/lang/php53/files/patch-sapi_apache2filter_config.m4 +++ /dev/null @@ -1,11 +0,0 @@ ---- sapi/apache2filter/config.m4.orig 2013-10-18 12:17:14.622544934 +0000 -+++ sapi/apache2filter/config.m4 2013-10-18 12:22:13.032234760 +0000 -@@ -68,7 +68,7 @@ - fi - - APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` -- if test -z `$APXS -q SYSCONFDIR`; then -+ if true; then - INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ - $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ - -i -n php5" diff --git a/lang/php53/files/patch-sapi_apache2handler_config.m4 b/lang/php53/files/patch-sapi_apache2handler_config.m4 deleted file mode 100644 index 149c4ef0fc80..000000000000 --- a/lang/php53/files/patch-sapi_apache2handler_config.m4 +++ /dev/null @@ -1,11 +0,0 @@ ---- sapi/apache2handler/config.m4.orig 2013-10-18 12:22:26.576545216 +0000 -+++ sapi/apache2handler/config.m4 2013-10-18 12:23:00.903131412 +0000 -@@ -67,7 +67,7 @@ - fi - - APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` -- if test -z `$APXS -q SYSCONFDIR`; then -+ if true; then - INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ - $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ - -i -n php5" diff --git a/lang/php53/files/patch-sapi_cgi_Makefile.frag b/lang/php53/files/patch-sapi_cgi_Makefile.frag deleted file mode 100644 index 26a0e4b1a3ba..000000000000 --- a/lang/php53/files/patch-sapi_cgi_Makefile.frag +++ /dev/null @@ -1,9 +0,0 @@ ---- sapi/cgi/Makefile.frag.orig Wed May 3 10:09:02 2006 -+++ sapi/cgi/Makefile.frag Wed May 3 10:08:54 2006 -@@ -1,2 +1,5 @@ --$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) -+$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_CGI_OBJS) - $(BUILD_CGI) -+ -+install-cgi: $(SAPI_CGI_PATH) -+ @$(INSTALL_CGI) diff --git a/lang/php53/files/patch-sapi_cgi_config9.m4 b/lang/php53/files/patch-sapi_cgi_config9.m4 deleted file mode 100644 index 7682dad43110..000000000000 --- a/lang/php53/files/patch-sapi_cgi_config9.m4 +++ /dev/null @@ -1,56 +0,0 @@ ---- sapi/cgi/config9.m4.orig 2007-10-01 14:40:54.000000000 +0200 -+++ sapi/cgi/config9.m4 2008-09-25 23:07:13.000000000 +0200 -@@ -8,7 +8,6 @@ - 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) -@@ -53,8 +52,9 @@ - PHP_SUBST(SAPI_CGI_PATH) - - 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)') -+ INSTALL_CGI="@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_ADD_SOURCES(sapi/cgi, cgi_main.c fastcgi.c,, cgi) -+ PHP_ADD_SOURCES(/main, internal_functions.c,,cgi) - - case $host_alias in - *aix*) -@@ -64,17 +64,29 @@ - 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_INSTALL_CGI_TARGET="install-cgi" - PHP_SUBST(BUILD_CGI) -- -- elif test "$PHP_CLI" != "no"; then -- AC_MSG_RESULT(no) -+ PHP_SUBST(INSTALL_CGI) -+ PHP_SUBST(PHP_CGI_OBJS) -+ PHP_SUBST(PHP_CGI_TARGET) -+ PHP_SUBST(PHP_INSTALL_CGI_TARGET) -+ -+ if test "$PHP_SAPI" = "default" ; then -+ PHP_BUILD_PROGRAM($SAPI_CGI_PATH) -+ fi -+ else -+ AC_MSG_RESULT(no) -+ if test "$PHP_SAPI" = "default" ; then -+ if test "$PHP_CLI" != "no" ; then - OVERALL_TARGET= - PHP_SAPI=cli - else - AC_MSG_ERROR([No SAPIs selected.]) - fi -+ fi - fi diff --git a/lang/php53/files/patch-sapi_fpm_Makefile.frag b/lang/php53/files/patch-sapi_fpm_Makefile.frag deleted file mode 100644 index 53da2da35f7c..000000000000 --- a/lang/php53/files/patch-sapi_fpm_Makefile.frag +++ /dev/null @@ -1,29 +0,0 @@ ---- sapi/fpm/Makefile.frag.orig 2011-10-08 23:04:10.000000000 +0200 -+++ sapi/fpm/Makefile.frag 2012-02-09 16:43:25.000000000 +0100 -@@ -4,14 +4,14 @@ - @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) $(FPM_EXTRA_DEPS) - $(BUILD_FPM) - - $(builddir)/fpm/fpm_conf.lo: $(builddir)/../../main/build-defs.h - - install-build: install-fpm - --install-fpm: install-sapi -+install-fpm: - @echo "Installing PHP FPM binary: $(INSTALL_ROOT)$(sbindir)/" - @$(mkinstalldirs) $(INSTALL_ROOT)$(sbindir) - @$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/log -@@ -27,6 +27,6 @@ - @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8 - @$(INSTALL_DATA) sapi/fpm/php-fpm.8 $(INSTALL_ROOT)$(mandir)/man8/php-fpm$(program_suffix).8 - -- @echo "Installing PHP FPM status page: $(INSTALL_ROOT)$(datadir)/fpm/" -- @$(mkinstalldirs) $(INSTALL_ROOT)$(datadir)/fpm -- @$(INSTALL_DATA) sapi/fpm/status.html $(INSTALL_ROOT)$(datadir)/fpm/status.html -+ @echo "Installing PHP FPM status page: $(INSTALL_ROOT)$(datadir)/php/fpm/" -+ @$(mkinstalldirs) $(INSTALL_ROOT)$(datadir)/php/fpm -+ @$(INSTALL_DATA) sapi/fpm/status.html $(INSTALL_ROOT)$(datadir)/php/fpm/status.html diff --git a/lang/php53/files/patch-sapi_fpm_config.m4 b/lang/php53/files/patch-sapi_fpm_config.m4 deleted file mode 100644 index 859db721d66e..000000000000 --- a/lang/php53/files/patch-sapi_fpm_config.m4 +++ /dev/null @@ -1,62 +0,0 @@ ---- sapi/fpm/config.m4.orig 2011-06-26 17:48:11.000000000 +0200 -+++ sapi/fpm/config.m4 2011-11-18 11:05:21.000000000 +0100 -@@ -312,7 +312,7 @@ - - AC_MSG_CHECKING([for TCP_INFO]) - -- AC_TRY_COMPILE([ #include <netinet/tcp.h> ], [struct tcp_info ti; int x = TCP_INFO;], [ -+ AC_TRY_COMPILE([ #include <netinet/tcp.h> ], [struct tcp_info ti; ti.tcpi_sacked = 0; int x = TCP_INFO;], [ - have_lq=tcp_info - AC_MSG_RESULT([yes]) - ], [ -@@ -333,7 +333,7 @@ - AC_MSG_RESULT([no]) - ]) - -- if test "$have_lq" = "tcp_info"; then -+ if test "$have_lq" = "so_listenq"; then - AC_DEFINE([HAVE_LQ_SO_LISTENQ], 1, [do we have SO_LISTENQxxx?]) - fi - fi -@@ -423,7 +423,9 @@ - - 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 \ -@@ -449,7 +451,8 @@ - fpm/zlog.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*) -@@ -459,11 +462,19 @@ - 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 diff --git a/lang/php53/files/patch-sapi_fpm_php-fpm.conf.in b/lang/php53/files/patch-sapi_fpm_php-fpm.conf.in deleted file mode 100644 index 315f2470a773..000000000000 --- a/lang/php53/files/patch-sapi_fpm_php-fpm.conf.in +++ /dev/null @@ -1,11 +0,0 @@ ---- sapi/fpm/php-fpm.conf.in.orig 2012-02-08 15:50:42.000000000 +0100 -+++ sapi/fpm/php-fpm.conf.in 2012-02-08 15:50:54.000000000 +0100 -@@ -317,7 +317,7 @@ - ; last request memory: 0 - ; - ; Note: There is a real-time FPM status monitoring sample web page available --; It's available in: @EXPANDED_DATADIR@/fpm/status.html -+; It's available in: @EXPANDED_DATADIR@/php/fpm/status.html - ; - ; Note: The value must start with a leading slash (/). The value can be - ; anything, but it may not be a good idea to use the .php extension or it diff --git a/lang/php53/files/php-fpm.in b/lang/php53/files/php-fpm.in deleted file mode 100644 index 55e2ac992408..000000000000 --- a/lang/php53/files/php-fpm.in +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: php-fpm -# REQUIRE: LOGIN -# KEYWORD: shutdown - -# -# Add the following line to /etc/rc.conf to enable php-fpm: -# php_fpm_enable="YES" -# - -. /etc/rc.subr - -name="php_fpm" -rcvar=php_fpm_enable - -load_rc_config "$name" - -: ${php_fpm_enable="NO"} - -extra_commands="reload logrotate" - -command="%%PREFIX%%/sbin/php-fpm" -pidfile="/var/run/php-fpm.pid" -sig_stop="QUIT" -sig_reload="USR2" -logrotate_cmd="php_fpm_logrotate" - -required_files="%%PREFIX%%/etc/php-fpm.conf" - -php_fpm_logrotate() { - if [ -z "$rc_pid" ]; then - _run_rc_notrunning - return 1 - fi - echo "Rotating logs $name." - kill -USR1 $rc_pid -} - -run_rc_command "$1" diff --git a/lang/php53/pkg-descr b/lang/php53/pkg-descr deleted file mode 100644 index a53cdb1bde68..000000000000 --- a/lang/php53/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -PHP, which stands for "PHP: Hypertext Preprocessor" is a widely-used Open -Source general-purpose scripting language that is especially suited for -Web development and can be embedded into HTML. Its syntax draws upon C, -Java, and Perl, and is easy to learn. The main goal of the language is to -allow web developers to write dynamically generated webpages quickly, but -you can do much more with PHP. - -WWW: http://www.php.net/ diff --git a/lang/php53/pkg-message.mod b/lang/php53/pkg-message.mod deleted file mode 100644 index 555f5b053ae8..000000000000 --- a/lang/php53/pkg-message.mod +++ /dev/null @@ -1,10 +0,0 @@ -*************************************************************** - -Make sure index.php is part of your DirectoryIndex. - -You should add the following to your Apache configuration file: - -AddType application/x-httpd-php .php -AddType application/x-httpd-php-source .phps - -*************************************************************** diff --git a/lang/php53/pkg-plist b/lang/php53/pkg-plist deleted file mode 100644 index a5de9ec56c1e..000000000000 --- a/lang/php53/pkg-plist +++ /dev/null @@ -1,243 +0,0 @@ -%%CLI%%bin/php -%%CGI%%bin/php-cgi -bin/php-config -bin/phpize -%%FPM%%sbin/php-fpm -etc/php.conf -etc/php.ini-development -etc/php.ini-production -%%FPM%%@unexec if cmp -s %D/etc/php-fpm.conf %D/etc/php-fpm.conf.default; then rm -f %D/etc/php-fpm.conf; fi -%%FPM%%etc/php-fpm.conf.default -%%FPM%%@exec cp -n %D/%F %B/php-fpm.conf -include/php/TSRM/TSRM.h -include/php/TSRM/acconfig.h -include/php/TSRM/readdir.h -include/php/TSRM/tsrm_config.h -include/php/TSRM/tsrm_config.w32.h -include/php/TSRM/tsrm_config_common.h -include/php/TSRM/tsrm_nw.h -include/php/TSRM/tsrm_strtok_r.h -include/php/TSRM/tsrm_virtual_cwd.h -include/php/TSRM/tsrm_win32.h -include/php/Zend/acconfig.h -include/php/Zend/zend.h -include/php/Zend/zend_API.h -include/php/Zend/zend_alloc.h -include/php/Zend/zend_build.h -include/php/Zend/zend_builtin_functions.h -include/php/Zend/zend_closures.h -include/php/Zend/zend_compile.h -include/php/Zend/zend_config.h -include/php/Zend/zend_config.nw.h -include/php/Zend/zend_config.w32.h -include/php/Zend/zend_constants.h -include/php/Zend/zend_dynamic_array.h -include/php/Zend/zend_errors.h -include/php/Zend/zend_exceptions.h -include/php/Zend/zend_execute.h -include/php/Zend/zend_extensions.h -include/php/Zend/zend_fast_cache.h -include/php/Zend/zend_float.h -include/php/Zend/zend_gc.h -include/php/Zend/zend_globals.h -include/php/Zend/zend_globals_macros.h -include/php/Zend/zend_hash.h -include/php/Zend/zend_highlight.h -include/php/Zend/zend_indent.h -include/php/Zend/zend_ini.h -include/php/Zend/zend_ini_parser.h -include/php/Zend/zend_ini_scanner.h -include/php/Zend/zend_ini_scanner_defs.h -include/php/Zend/zend_interfaces.h -include/php/Zend/zend_istdiostream.h -include/php/Zend/zend_iterators.h -include/php/Zend/zend_language_parser.h -include/php/Zend/zend_language_scanner.h -include/php/Zend/zend_language_scanner_defs.h -include/php/Zend/zend_list.h -include/php/Zend/zend_llist.h -include/php/Zend/zend_modules.h -include/php/Zend/zend_multibyte.h -include/php/Zend/zend_multiply.h -include/php/Zend/zend_object_handlers.h -include/php/Zend/zend_objects.h -include/php/Zend/zend_objects_API.h -include/php/Zend/zend_operators.h -include/php/Zend/zend_ptr_stack.h -include/php/Zend/zend_qsort.h -include/php/Zend/zend_stack.h -include/php/Zend/zend_static_allocator.h -include/php/Zend/zend_stream.h -include/php/Zend/zend_strtod.h -include/php/Zend/zend_ts_hash.h -include/php/Zend/zend_types.h -include/php/Zend/zend_variables.h -include/php/Zend/zend_vm.h -include/php/Zend/zend_vm_def.h -include/php/Zend/zend_vm_execute.h -include/php/Zend/zend_vm_opcodes.h -include/php/ext/date/lib/timelib.h -include/php/ext/date/lib/timelib_config.h -include/php/ext/date/lib/timelib_structs.h -include/php/ext/date/php_date.h -include/php/ext/ereg/php_ereg.h -include/php/ext/ereg/php_regex.h -include/php/ext/ereg/regex/cclass.h -include/php/ext/ereg/regex/cname.h -include/php/ext/ereg/regex/regex.h -include/php/ext/ereg/regex/regex2.h -include/php/ext/ereg/regex/utils.h -include/php/ext/libxml/php_libxml.h -include/php/ext/mysqlnd/config-win.h -include/php/ext/mysqlnd/mysqlnd.h -include/php/ext/mysqlnd/mysqlnd_block_alloc.h -include/php/ext/mysqlnd/mysqlnd_charset.h -include/php/ext/mysqlnd/mysqlnd_debug.h -include/php/ext/mysqlnd/mysqlnd_enum_n_def.h -include/php/ext/mysqlnd/mysqlnd_libmysql_compat.h -include/php/ext/mysqlnd/mysqlnd_net.h -include/php/ext/mysqlnd/mysqlnd_portability.h -include/php/ext/mysqlnd/mysqlnd_priv.h -include/php/ext/mysqlnd/mysqlnd_result.h -include/php/ext/mysqlnd/mysqlnd_result_meta.h -include/php/ext/mysqlnd/mysqlnd_statistics.h -include/php/ext/mysqlnd/mysqlnd_structs.h -include/php/ext/mysqlnd/mysqlnd_wireprotocol.h -include/php/ext/mysqlnd/php_mysqlnd.h -include/php/ext/mysqlnd/php_mysqlnd_config.h -include/php/ext/pcre/php_pcre.h -include/php/ext/spl/php_spl.h -include/php/ext/spl/spl_array.h -include/php/ext/spl/spl_directory.h -include/php/ext/spl/spl_dllist.h -include/php/ext/spl/spl_engine.h -include/php/ext/spl/spl_exceptions.h -include/php/ext/spl/spl_fixedarray.h -include/php/ext/spl/spl_functions.h -include/php/ext/spl/spl_heap.h -include/php/ext/spl/spl_iterators.h -include/php/ext/spl/spl_observer.h -include/php/ext/standard/base64.h -include/php/ext/standard/basic_functions.h -include/php/ext/standard/crc32.h -include/php/ext/standard/credits.h -include/php/ext/standard/credits_ext.h -include/php/ext/standard/credits_sapi.h -include/php/ext/standard/crypt_blowfish.h -include/php/ext/standard/crypt_freesec.h -include/php/ext/standard/css.h -include/php/ext/standard/cyr_convert.h -include/php/ext/standard/datetime.h -include/php/ext/standard/dl.h -include/php/ext/standard/exec.h -include/php/ext/standard/file.h -include/php/ext/standard/flock_compat.h -include/php/ext/standard/fsock.h -include/php/ext/standard/head.h -include/php/ext/standard/html.h -include/php/ext/standard/info.h -include/php/ext/standard/md5.h -include/php/ext/standard/microtime.h -include/php/ext/standard/pack.h -include/php/ext/standard/pageinfo.h -include/php/ext/standard/php_array.h -include/php/ext/standard/php_assert.h -include/php/ext/standard/php_browscap.h -include/php/ext/standard/php_crypt.h -include/php/ext/standard/php_crypt_r.h -include/php/ext/standard/php_dir.h -include/php/ext/standard/php_dns.h -include/php/ext/standard/php_ext_syslog.h -include/php/ext/standard/php_filestat.h -include/php/ext/standard/php_fopen_wrappers.h -include/php/ext/standard/php_ftok.h -include/php/ext/standard/php_http.h -include/php/ext/standard/php_image.h -include/php/ext/standard/php_incomplete_class.h -include/php/ext/standard/php_iptc.h -include/php/ext/standard/php_lcg.h -include/php/ext/standard/php_link.h -include/php/ext/standard/php_mail.h -include/php/ext/standard/php_math.h -include/php/ext/standard/php_metaphone.h -include/php/ext/standard/php_rand.h -include/php/ext/standard/php_smart_str.h -include/php/ext/standard/php_smart_str_public.h -include/php/ext/standard/php_standard.h -include/php/ext/standard/php_string.h -include/php/ext/standard/php_type.h -include/php/ext/standard/php_uuencode.h -include/php/ext/standard/php_var.h -include/php/ext/standard/php_versioning.h -include/php/ext/standard/proc_open.h -include/php/ext/standard/quot_print.h -include/php/ext/standard/scanf.h -include/php/ext/standard/sha1.h -include/php/ext/standard/streamsfuncs.h -include/php/ext/standard/uniqid.h -include/php/ext/standard/url.h -include/php/ext/standard/url_scanner_ex.h -include/php/ext/standard/winver.h -@exec touch %D/include/php/ext/php_config.h -@unexec [ -s %D/include/php/ext/php_config.h ] || rm %D/include/php/ext/php_config.h -include/php/main/SAPI.h -include/php/main/build-defs.h -include/php/main/fopen_wrappers.h -include/php/main/logos.h -include/php/main/php.h -include/php/main/php3_compat.h -include/php/main/php_compat.h -include/php/main/php_config.h -include/php/main/php_content_types.h -include/php/main/php_getopt.h -include/php/main/php_globals.h -include/php/main/php_ini.h -include/php/main/php_logos.h -include/php/main/php_main.h -include/php/main/php_memory_streams.h -include/php/main/php_network.h -include/php/main/php_open_temporary_file.h -include/php/main/php_output.h -include/php/main/php_reentrancy.h -include/php/main/php_scandir.h -include/php/main/php_streams.h -include/php/main/php_syslog.h -include/php/main/php_ticks.h -include/php/main/php_variables.h -include/php/main/php_version.h -include/php/main/rfc1867.h -include/php/main/safe_mode.h -include/php/main/snprintf.h -include/php/main/spprintf.h -include/php/main/streams/php_stream_context.h -include/php/main/streams/php_stream_filter_api.h -include/php/main/streams/php_stream_glob_wrapper.h -include/php/main/streams/php_stream_mmap.h -include/php/main/streams/php_streams_int.h -include/php/main/streams/php_stream_transport.h -include/php/main/streams/php_stream_userspace.h -include/php/main/streams/php_stream_plain_wrapper.h -%%SUHOSIN%%include/php/main/suhosin_globals.h -%%SUHOSIN%%include/php/main/suhosin_logo.h -%%SUHOSIN%%include/php/main/suhosin_patch.h -include/php/main/win32_internal_function_disabled.h -include/php/main/win95nt.h -lib/php/build/Makefile.global -lib/php/build/acinclude.m4 -lib/php/build/config.guess -lib/php/build/config.sub -lib/php/build/libtool.m4 -lib/php/build/ltmain.sh -lib/php/build/mkdep.awk -lib/php/build/phpize.m4 -lib/php/build/run-tests.php -lib/php/build/scan_makefile_in.awk -lib/php/build/shtool -man/man1/php-config.1.gz -man/man1/phpize.1.gz -%%CLI%%man/man1/php.1.gz -%%FPM%%man/man8/php-fpm.8.gz -%%APACHE%%%%APACHEMODDIR%%/%%AP_MODULE%% -%%APACHE%%@exec %D/sbin/apxs -e -a -n %%AP_NAME%% %f -%%APACHE%%@unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %f -%%FPM%%share/php/fpm/status.html |