mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-28 05:29:48 +00:00
Update to 5.2.3 release.
This commit is contained in:
Alex Dupre
parent
bf6f8018d6
commit
c2a72b04bb
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=192729
@ -6,15 +6,12 @@
|
||||
#
|
||||
|
||||
PORTNAME= php5
|
||||
PORTVERSION= 5.2.2
|
||||
PORTVERSION= 5.2.3
|
||||
PORTREVISION?= 0
|
||||
CATEGORIES?= lang devel www
|
||||
MASTER_SITES= ${MASTER_SITE_PHP:S,$,:release,} \
|
||||
http://downloads.php.net/ilia/:rc \
|
||||
http://downloads.php.net/jani/:rc
|
||||
MASTER_SITE_SUBDIR= distributions/:release
|
||||
DISTNAME= php-${PORTVERSION:S/.r/RC/}
|
||||
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:release
|
||||
MASTER_SITES= ${MASTER_SITE_PHP}
|
||||
MASTER_SITE_SUBDIR= distributions
|
||||
DISTNAME= php-${PORTVERSION}
|
||||
|
||||
MAINTAINER?= ale@FreeBSD.org
|
||||
COMMENT?= PHP Scripting Language (Apache Module and CLI)
|
||||
@ -60,8 +57,7 @@ PATCH_DIST_STRIP= -p1
|
||||
|
||||
.if !defined(WITHOUT_SUHOSIN)
|
||||
PATCHFILES+= suhosin-patch-${PORTVERSION}-0.9.6.2.patch.gz:suhosin
|
||||
PATCH_SITES+= http://www.hardened-php.net/suhosin/_media/:suhosin \
|
||||
${MASTER_SITE_LOCAL:S/%SUBDIR%\//erwin\/:suhosin/}
|
||||
PATCH_SITES+= http://www.hardened-php.net/suhosin/_media/:suhosin
|
||||
PLIST_SUB+= SUHOSIN=""
|
||||
.else
|
||||
PLIST_SUB+= SUHOSIN="@comment "
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
MD5 (php-5.2.2.tar.bz2) = d084337867d70b50a10322577be0e44e
|
||||
SHA256 (php-5.2.2.tar.bz2) = cd69e73c46e1d171ac0cf27b7ee492c3bf8f6b45a763a77fd0cb79d5afa9f407
|
||||
SIZE (php-5.2.2.tar.bz2) = 7310926
|
||||
MD5 (suhosin-patch-5.2.2-0.9.6.2.patch.gz) = 081fe08d584820a6ece1fe2e8629711f
|
||||
SHA256 (suhosin-patch-5.2.2-0.9.6.2.patch.gz) = 932d8155028686b96d3ebf89215dab7cd9353ac72f9ea82c252d0999fb4bd864
|
||||
SIZE (suhosin-patch-5.2.2-0.9.6.2.patch.gz) = 22850
|
||||
MD5 (php-5.2.2-mail-header.patch) = 6b2562b5230b1f85a2ccb292e124a91a
|
||||
SHA256 (php-5.2.2-mail-header.patch) = 5394732be1953c7eedc2de9529d10971d85959af6352c8a67b4561124ddc8df5
|
||||
SIZE (php-5.2.2-mail-header.patch) = 3420
|
||||
MD5 (php-5.2.3.tar.bz2) = eb50b751c8e1ced05bd012d5a0e4dec3
|
||||
SHA256 (php-5.2.3.tar.bz2) = eedffda5069caa801a7fec217c77619657416a5fcaefb79ba4620432f0befe29
|
||||
SIZE (php-5.2.3.tar.bz2) = 7417635
|
||||
MD5 (suhosin-patch-5.2.3-0.9.6.2.patch.gz) = f217d04f9513222e48cea6588ac65b89
|
||||
SHA256 (suhosin-patch-5.2.3-0.9.6.2.patch.gz) = 214c43e4808483f0700f36ffa57aba909a669cb335c179d46c1e8f765d70bd1f
|
||||
SIZE (suhosin-patch-5.2.3-0.9.6.2.patch.gz) = 22789
|
||||
MD5 (php-5.2.3-mail-header.patch) = c48ef565c02a2aeb6aadd3d12cea7bb8
|
||||
SHA256 (php-5.2.3-mail-header.patch) = dc80159705c2e2806fdab1632d573218383487dce3ad5aa700e92b909dcd03e5
|
||||
SIZE (php-5.2.3-mail-header.patch) = 3420
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
--- configure.in.orig Sat Jan 20 10:52:51 2007
|
||||
+++ configure.in Sat Jan 20 10:55:48 2007
|
||||
@@ -227,7 +227,6 @@
|
||||
--- configure.in.orig Mon Jun 4 08:08:43 2007
|
||||
+++ configure.in Mon Jun 4 08:13:47 2007
|
||||
@@ -233,7 +233,6 @@
|
||||
dnl .
|
||||
dnl -------------------------------------------------------------------------
|
||||
|
||||
@ -8,15 +8,15 @@
|
||||
PHP_HELP_SEPARATOR([SAPI modules:])
|
||||
PHP_SHLIB_SUFFIX_NAMES
|
||||
PHP_SAPI=default
|
||||
@@ -252,7 +251,6 @@
|
||||
@@ -258,7 +257,6 @@
|
||||
|
||||
if test "$enable_maintainer_zts" = "yes"; then
|
||||
PTHREADS_ASSIGN_VARS
|
||||
- PTHREADS_FLAGS
|
||||
fi
|
||||
|
||||
if test "$PHP_ENABLE_FASTCGI" = "yes"; then
|
||||
@@ -1100,7 +1098,7 @@
|
||||
divert(3)
|
||||
@@ -1123,7 +1121,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"`
|
||||
@ -25,7 +25,7 @@
|
||||
|
||||
exec_prefix=$old_exec_prefix
|
||||
libdir=$old_libdir
|
||||
@@ -1271,25 +1269,22 @@
|
||||
@@ -1295,22 +1293,19 @@
|
||||
INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag"
|
||||
CXXFLAGS="$CXXFLAGS $standard_libtool_flag"
|
||||
|
||||
@ -35,16 +35,12 @@
|
||||
+install_targets="$PHP_INSTALL_CLI_TARGET $PHP_INSTALL_CGI_TARGET $install_modules install-build install-headers install-programs $install_pear"
|
||||
|
||||
case $PHP_SAPI in
|
||||
- cgi)
|
||||
+ apache)
|
||||
install_targets="install-sapi $install_targets"
|
||||
;;
|
||||
- cli)
|
||||
- install_targets="$PHP_INSTALL_CLI_TARGET $install_targets"
|
||||
- ;;
|
||||
- *)
|
||||
- install_targets="install-sapi $PHP_INSTALL_CLI_TARGET $install_targets"
|
||||
+ apache2handler)
|
||||
+ apache|apache2handler)
|
||||
+ install_targets="install-sapi $install_targets"
|
||||
;;
|
||||
esac
|
||||
|
||||
@ -12,9 +12,9 @@
|
||||
AC_DEFINE_UNQUOTED(PHP_FCGI_STATIC, $PHP_FCGI_STATIC, [ ])
|
||||
AC_MSG_RESULT($PHP_ENABLE_FASTCGI)
|
||||
|
||||
- INSTALL_IT="@echo \"Installing PHP CGI into: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)\$(EXEEXT)"
|
||||
- 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, $PHP_FCGI_FILES cgi_main.c getopt.c, , '$(SAPI_CGI_PATH)')
|
||||
+ INSTALL_CGI="@echo \"Installing PHP CGI into: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)"
|
||||
+ 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, $PHP_FCGI_FILES cgi_main.c getopt.c,, cgi)
|
||||
+ PHP_ADD_SOURCES(/main, internal_functions.c,,cgi)
|
||||
|
||||
|
||||
@ -6,15 +6,12 @@
|
||||
#
|
||||
|
||||
PORTNAME= php5
|
||||
PORTVERSION= 5.2.2
|
||||
PORTVERSION= 5.2.3
|
||||
PORTREVISION?= 0
|
||||
CATEGORIES?= lang devel www
|
||||
MASTER_SITES= ${MASTER_SITE_PHP:S,$,:release,} \
|
||||
http://downloads.php.net/ilia/:rc \
|
||||
http://downloads.php.net/jani/:rc
|
||||
MASTER_SITE_SUBDIR= distributions/:release
|
||||
DISTNAME= php-${PORTVERSION:S/.r/RC/}
|
||||
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:release
|
||||
MASTER_SITES= ${MASTER_SITE_PHP}
|
||||
MASTER_SITE_SUBDIR= distributions
|
||||
DISTNAME= php-${PORTVERSION}
|
||||
|
||||
MAINTAINER?= ale@FreeBSD.org
|
||||
COMMENT?= PHP Scripting Language (Apache Module and CLI)
|
||||
@ -60,8 +57,7 @@ PATCH_DIST_STRIP= -p1
|
||||
|
||||
.if !defined(WITHOUT_SUHOSIN)
|
||||
PATCHFILES+= suhosin-patch-${PORTVERSION}-0.9.6.2.patch.gz:suhosin
|
||||
PATCH_SITES+= http://www.hardened-php.net/suhosin/_media/:suhosin \
|
||||
${MASTER_SITE_LOCAL:S/%SUBDIR%\//erwin\/:suhosin/}
|
||||
PATCH_SITES+= http://www.hardened-php.net/suhosin/_media/:suhosin
|
||||
PLIST_SUB+= SUHOSIN=""
|
||||
.else
|
||||
PLIST_SUB+= SUHOSIN="@comment "
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
MD5 (php-5.2.2.tar.bz2) = d084337867d70b50a10322577be0e44e
|
||||
SHA256 (php-5.2.2.tar.bz2) = cd69e73c46e1d171ac0cf27b7ee492c3bf8f6b45a763a77fd0cb79d5afa9f407
|
||||
SIZE (php-5.2.2.tar.bz2) = 7310926
|
||||
MD5 (suhosin-patch-5.2.2-0.9.6.2.patch.gz) = 081fe08d584820a6ece1fe2e8629711f
|
||||
SHA256 (suhosin-patch-5.2.2-0.9.6.2.patch.gz) = 932d8155028686b96d3ebf89215dab7cd9353ac72f9ea82c252d0999fb4bd864
|
||||
SIZE (suhosin-patch-5.2.2-0.9.6.2.patch.gz) = 22850
|
||||
MD5 (php-5.2.2-mail-header.patch) = 6b2562b5230b1f85a2ccb292e124a91a
|
||||
SHA256 (php-5.2.2-mail-header.patch) = 5394732be1953c7eedc2de9529d10971d85959af6352c8a67b4561124ddc8df5
|
||||
SIZE (php-5.2.2-mail-header.patch) = 3420
|
||||
MD5 (php-5.2.3.tar.bz2) = eb50b751c8e1ced05bd012d5a0e4dec3
|
||||
SHA256 (php-5.2.3.tar.bz2) = eedffda5069caa801a7fec217c77619657416a5fcaefb79ba4620432f0befe29
|
||||
SIZE (php-5.2.3.tar.bz2) = 7417635
|
||||
MD5 (suhosin-patch-5.2.3-0.9.6.2.patch.gz) = f217d04f9513222e48cea6588ac65b89
|
||||
SHA256 (suhosin-patch-5.2.3-0.9.6.2.patch.gz) = 214c43e4808483f0700f36ffa57aba909a669cb335c179d46c1e8f765d70bd1f
|
||||
SIZE (suhosin-patch-5.2.3-0.9.6.2.patch.gz) = 22789
|
||||
MD5 (php-5.2.3-mail-header.patch) = c48ef565c02a2aeb6aadd3d12cea7bb8
|
||||
SHA256 (php-5.2.3-mail-header.patch) = dc80159705c2e2806fdab1632d573218383487dce3ad5aa700e92b909dcd03e5
|
||||
SIZE (php-5.2.3-mail-header.patch) = 3420
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
--- configure.in.orig Sat Jan 20 10:52:51 2007
|
||||
+++ configure.in Sat Jan 20 10:55:48 2007
|
||||
@@ -227,7 +227,6 @@
|
||||
--- configure.in.orig Mon Jun 4 08:08:43 2007
|
||||
+++ configure.in Mon Jun 4 08:13:47 2007
|
||||
@@ -233,7 +233,6 @@
|
||||
dnl .
|
||||
dnl -------------------------------------------------------------------------
|
||||
|
||||
@ -8,15 +8,15 @@
|
||||
PHP_HELP_SEPARATOR([SAPI modules:])
|
||||
PHP_SHLIB_SUFFIX_NAMES
|
||||
PHP_SAPI=default
|
||||
@@ -252,7 +251,6 @@
|
||||
@@ -258,7 +257,6 @@
|
||||
|
||||
if test "$enable_maintainer_zts" = "yes"; then
|
||||
PTHREADS_ASSIGN_VARS
|
||||
- PTHREADS_FLAGS
|
||||
fi
|
||||
|
||||
if test "$PHP_ENABLE_FASTCGI" = "yes"; then
|
||||
@@ -1100,7 +1098,7 @@
|
||||
divert(3)
|
||||
@@ -1123,7 +1121,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"`
|
||||
@ -25,7 +25,7 @@
|
||||
|
||||
exec_prefix=$old_exec_prefix
|
||||
libdir=$old_libdir
|
||||
@@ -1271,25 +1269,22 @@
|
||||
@@ -1295,22 +1293,19 @@
|
||||
INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag"
|
||||
CXXFLAGS="$CXXFLAGS $standard_libtool_flag"
|
||||
|
||||
@ -35,16 +35,12 @@
|
||||
+install_targets="$PHP_INSTALL_CLI_TARGET $PHP_INSTALL_CGI_TARGET $install_modules install-build install-headers install-programs $install_pear"
|
||||
|
||||
case $PHP_SAPI in
|
||||
- cgi)
|
||||
+ apache)
|
||||
install_targets="install-sapi $install_targets"
|
||||
;;
|
||||
- cli)
|
||||
- install_targets="$PHP_INSTALL_CLI_TARGET $install_targets"
|
||||
- ;;
|
||||
- *)
|
||||
- install_targets="install-sapi $PHP_INSTALL_CLI_TARGET $install_targets"
|
||||
+ apache2handler)
|
||||
+ apache|apache2handler)
|
||||
+ install_targets="install-sapi $install_targets"
|
||||
;;
|
||||
esac
|
||||
|
||||
@ -12,9 +12,9 @@
|
||||
AC_DEFINE_UNQUOTED(PHP_FCGI_STATIC, $PHP_FCGI_STATIC, [ ])
|
||||
AC_MSG_RESULT($PHP_ENABLE_FASTCGI)
|
||||
|
||||
- INSTALL_IT="@echo \"Installing PHP CGI into: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)\$(EXEEXT)"
|
||||
- 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, $PHP_FCGI_FILES cgi_main.c getopt.c, , '$(SAPI_CGI_PATH)')
|
||||
+ INSTALL_CGI="@echo \"Installing PHP CGI into: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)"
|
||||
+ 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, $PHP_FCGI_FILES cgi_main.c getopt.c,, cgi)
|
||||
+ PHP_ADD_SOURCES(/main, internal_functions.c,,cgi)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user