sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- take maintainership [1]

Browse source 
- merge update to 5.3.11 from lang/php5
- mark IGNORE until lang/php5 is updated to 5.4.x and all the php53-* ports will
  be committed

Approved by:	ale [1]
This commit is contained in:
Florian Smeets 2012-05-02 21:22:47 +00:00
parent df88339773
commit 84d5b2876e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=295887
4 changed files with 13 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lang/php53/Makefile
View file

@ -6,14 +6,14 @@
#
PORTNAME= php5
PORTVERSION= 5.3.10
PORTREVISION?= 1
PORTVERSION= 5.3.11
PORTREVISION?= 0
CATEGORIES?= lang devel www
MASTER_SITES= ${MASTER_SITE_PHP}
MASTER_SITE_SUBDIR= distributions
DISTNAME= php-${PORTVERSION}
MAINTAINER= ale@FreeBSD.org
MAINTAINER= flo@FreeBSD.org
COMMENT= PHP Scripting Language
LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
@ -25,6 +25,8 @@ USE_AUTOTOOLS= autoconf
LIB_DEPENDS= pcre.1:${PORTSDIR}/devel/pcre
IGNORE= not usable until php5.4.x is in lang/php5
CONFIGURE_ARGS= \
--with-layout=GNU \
--localstatedir=/var \
@ -63,7 +65,7 @@ PATCH_SITES+= ${MASTER_SITE_LOCAL}
PATCH_SITE_SUBDIR= ale
.if !defined(WITHOUT_SUHOSIN)
PATCHFILES+= suhosin-patch-${PORTVERSION}-0.9.10.patch.gz
PATCHFILES+= suhosin-patch-5.3.x-0.9.10.patch.gz
PATCH_SITES+= http://download.suhosin.org/:suhosin
PLIST_SUB+= SUHOSIN=""
.else
@ -71,7 +73,7 @@ PLIST_SUB+= SUHOSIN="@comment "
.endif
.if defined(WITH_MAILHEAD)
PATCHFILES+= php-${PORTVERSION}-mail-header.patch
PATCHFILES+= php-5.3.x-mail-header.patch:mail
PATCH_SITES+= http://choon.net/opensource/php/:mail
.endif

12
lang/php53/distinfo
View file

@ -1,6 +1,6 @@
SHA256 (php-5.3.10.tar.bz2) = 339157af2b386534597d287da292f2545e81d9b452e8b3fe525fb2c534ff344a
SIZE (php-5.3.10.tar.bz2) = 11707402
SHA256 (suhosin-patch-5.3.10-0.9.10.patch.gz) = 4438caeab0a10c6c94aee9f7eaa703f5799f97d4e0579f43a947bb7314e38317
SIZE (suhosin-patch-5.3.10-0.9.10.patch.gz) = 40967
SHA256 (php-5.3.10-mail-header.patch) = 5cd43388b33fe5703c2c7d1de04d9b7030ee0a65d110c3793dfccb096ed2cc09
SIZE (php-5.3.10-mail-header.patch) = 3346
SHA256 (php-5.3.11.tar.bz2) = b4174c97ca8d8bcf4b52b8b9ef2c2f35e1b611a5a660e02d7cd3edf263a6bd5d
SIZE (php-5.3.11.tar.bz2) = 11396215
SHA256 (suhosin-patch-5.3.x-0.9.10.patch.gz) = 4438caeab0a10c6c94aee9f7eaa703f5799f97d4e0579f43a947bb7314e38317
SIZE (suhosin-patch-5.3.x-0.9.10.patch.gz) = 40967
SHA256 (php-5.3.x-mail-header.patch) = 5a677448b32d9f592703e2323a33facdb45e5c237dcca04aaea8ec3287f7db84
SIZE (php-5.3.x-mail-header.patch) = 3325

23
lang/php53/files/patch-ext-pcre-php_pcre.c
View file

@ -1,23 +0,0 @@
--- ext/pcre/php_pcre.c 2012/01/01 13:15:04 321634
+++ ext/pcre/php_pcre.c 2012/02/06 18:18:53 323097
@@ -241,6 +241,7 @@
char *pattern;
int do_study = 0;
int poptions = 0;
+ int count = 0;
unsigned const char *tables = NULL;
#if HAVE_SETLOCALE
char *locale = setlocale(LC_CTYPE, NULL);
@@ -252,10 +253,10 @@
back the compiled pattern, otherwise go on and compile it. */
if (zend_hash_find(&PCRE_G(pcre_cache), regex, regex_len+1, (void **)&pce) == SUCCESS) {
/*
- * We use a quick pcre_info() check to see whether cache is corrupted, and if it
+ * We use a quick pcre_fullinfo() check to see whether cache is corrupted, and if it
* is, we flush it and compile the pattern from scratch.
*/
- if (pcre_info(pce->re, NULL, NULL) == PCRE_ERROR_BADMAGIC) {
+ if (pcre_fullinfo(pce->re, NULL, PCRE_INFO_CAPTURECOUNT, &count) == PCRE_ERROR_BADMAGIC) {
zend_hash_clean(&PCRE_G(pcre_cache));
} else {
#if HAVE_SETLOCALE

11
lang/php53/files/patch-sapi_apache2filter_config.m4
View file

@ -1,11 +0,0 @@
--- sapi/apache2filter/config.m4.orig 2010-07-26 13:06:55.000000000 +0200
+++ sapi/apache2filter/config.m4 2010-07-26 13:07:19.000000000 +0200
@@ -118,7 +118,7 @@
;;
esac
- if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser"; then
+ if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then
PHP_BUILD_THREAD_SAFE
fi
AC_MSG_RESULT(yes)