update to php-5.2.10:
This is a SECURITY FIX that fixes: Fixed bug #48378 (exif_read_data() segfaults on certain corrupted .jpeg files. Update the suhosin patch to the current one while here.
This commit is contained in:
robert
parent
6d7295f072
commit
c69e6de0f6
@ -1,12 +1,12 @@
|
|||||||
# $OpenBSD: Makefile.inc,v 1.25 2009/03/06 09:18:31 robert Exp $
|
# $OpenBSD: Makefile.inc,v 1.26 2009/06/22 11:27:00 robert Exp $
|
||||||
|
|
||||||
# This port currently only works with archs supporting dynamic loading
|
# This port currently only works with archs supporting dynamic loading
|
||||||
# and has Apache that supports DSO's.
|
# and has Apache that supports DSO's.
|
||||||
NOT_FOR_ARCHS= ${NO_SHARED_ARCHS}
|
NOT_FOR_ARCHS= ${NO_SHARED_ARCHS}
|
||||||
|
|
||||||
V= 5.2.9
|
V= 5.2.10
|
||||||
SUHOSIN_V= 0.9.27
|
SUHOSIN_V= 0.9.27
|
||||||
SUHOSIN_P_V= 0.9.6.3
|
SUHOSIN_P_V= 0.9.7
|
||||||
|
|
||||||
DISTNAME?= php-${V}
|
DISTNAME?= php-${V}
|
||||||
CATEGORIES= www lang
|
CATEGORIES= www lang
|
||||||
@ -45,7 +45,7 @@ PHP_LDFLAGS= -lstdc++ -lm
|
|||||||
.endif
|
.endif
|
||||||
|
|
||||||
CONFIGURE_STYLE= autoconf
|
CONFIGURE_STYLE= autoconf
|
||||||
AUTOCONF_VERSION= 2.52
|
AUTOCONF_VERSION= 2.13
|
||||||
CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include -pthread" \
|
CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include -pthread" \
|
||||||
LDFLAGS="-L${LOCALBASE}/lib ${PHP_LDFLAGS} -pthread" \
|
LDFLAGS="-L${LOCALBASE}/lib ${PHP_LDFLAGS} -pthread" \
|
||||||
EXTENSION_DIR=${MODULES_DIR}
|
EXTENSION_DIR=${MODULES_DIR}
|
||||||
@ -73,10 +73,10 @@ PSEUDO_FLAVORS+= no_suhosin
|
|||||||
FLAVOR?=
|
FLAVOR?=
|
||||||
.if ${FLAVOR:L:Mno_suhosin}
|
.if ${FLAVOR:L:Mno_suhosin}
|
||||||
SUPDISTFILES= suhosin-${SUHOSIN_V}.tgz:0 \
|
SUPDISTFILES= suhosin-${SUHOSIN_V}.tgz:0 \
|
||||||
suhosin-patch-${V}-${SUHOSIN_P_V}.openbsd-patch.gz:0
|
suhosin-patch-${V}-${SUHOSIN_P_V}-openbsd.patch.gz:0
|
||||||
.else
|
.else
|
||||||
DISTFILES+= suhosin-${SUHOSIN_V}.tgz:0
|
DISTFILES+= suhosin-${SUHOSIN_V}.tgz:0
|
||||||
PATCHFILES= suhosin-patch-${V}-${SUHOSIN_P_V}.openbsd-patch.gz:0
|
PATCHFILES= suhosin-patch-${V}-${SUHOSIN_P_V}-openbsd.patch.gz:0
|
||||||
PATCH_DIST_STRIP= -p1
|
PATCH_DIST_STRIP= -p1
|
||||||
CONFIGURE_ARGS+= --enable-suhosin
|
CONFIGURE_ARGS+= --enable-suhosin
|
||||||
|
|
||||||
|
|||||||
@ -1,11 +1,11 @@
|
|||||||
# $OpenBSD: Makefile,v 1.44 2009/06/03 00:50:38 sthen Exp $
|
# $OpenBSD: Makefile,v 1.45 2009/06/22 11:27:00 robert Exp $
|
||||||
|
|
||||||
COMMENT-main= server-side HTML-embedded scripting language
|
COMMENT-main= server-side HTML-embedded scripting language
|
||||||
COMMENT-fastcgi=stand-alone FastCGI version of PHP
|
COMMENT-fastcgi=stand-alone FastCGI version of PHP
|
||||||
|
|
||||||
PKGNAME= php5-core-${V}
|
PKGNAME= php5-core-${V}
|
||||||
PKGNAME-main= php5-core-${V}p2
|
PKGNAME-main= php5-core-${V}
|
||||||
PKGNAME-fastcgi=php5-fastcgi-${V}p0
|
PKGNAME-fastcgi=php5-fastcgi-${V}
|
||||||
|
|
||||||
DISTFILES= php-${V}.tar.gz
|
DISTFILES= php-${V}.tar.gz
|
||||||
|
|
||||||
|
|||||||
@ -1,15 +1,15 @@
|
|||||||
MD5 (php-5.2.9.tar.gz) = mLZHVh3GZK3v4pYQYFbPEQ==
|
MD5 (php-5.2.10.tar.gz) = hXU7opCayfrlvKUWrb2p6Q==
|
||||||
MD5 (suhosin-0.9.27.tgz) = mq4CvC0rz5uL2XzSL1aouA==
|
MD5 (suhosin-0.9.27.tgz) = mq4CvC0rz5uL2XzSL1aouA==
|
||||||
MD5 (suhosin-patch-5.2.9-0.9.6.3.openbsd-patch.gz) = b0lUcSWRVcnJCs+aRn49cA==
|
MD5 (suhosin-patch-5.2.10-0.9.7-openbsd.patch.gz) = +A280nc6mNodqwxzw2VIlQ==
|
||||||
RMD160 (php-5.2.9.tar.gz) = fjuD0xKssy/m81gR9jIj1y6KUcM=
|
RMD160 (php-5.2.10.tar.gz) = 8LIsQojdmEwr6iOH9mYVQFwDpdE=
|
||||||
RMD160 (suhosin-0.9.27.tgz) = Rr9H2vDasFNZ2mL96Kdrp8Q7Pbw=
|
RMD160 (suhosin-0.9.27.tgz) = Rr9H2vDasFNZ2mL96Kdrp8Q7Pbw=
|
||||||
RMD160 (suhosin-patch-5.2.9-0.9.6.3.openbsd-patch.gz) = tUKx/KF19TP50QKovFLmWUMNkJY=
|
RMD160 (suhosin-patch-5.2.10-0.9.7-openbsd.patch.gz) = HS4BqTXEu8noWHlvj2AEtPdZULM=
|
||||||
SHA1 (php-5.2.9.tar.gz) = ChG2QGjvAJ6JZB34wczgLb8CUL8=
|
SHA1 (php-5.2.10.tar.gz) = DXjPbm3J0IpNOucw7FjXazEZihw=
|
||||||
SHA1 (suhosin-0.9.27.tgz) = MDO9OEDHV4YXnPgkD2PZe19qzL8=
|
SHA1 (suhosin-0.9.27.tgz) = MDO9OEDHV4YXnPgkD2PZe19qzL8=
|
||||||
SHA1 (suhosin-patch-5.2.9-0.9.6.3.openbsd-patch.gz) = il4rIMrmE9hA1lVPlQukPvcZS6E=
|
SHA1 (suhosin-patch-5.2.10-0.9.7-openbsd.patch.gz) = QZdkQzCk8YL03WS+udspQG7TAMo=
|
||||||
SHA256 (php-5.2.9.tar.gz) = /HGqB+C3URy5dg0v2+Z/XFBzM/ZAxSyXSBI+ngAtI0c=
|
SHA256 (php-5.2.10.tar.gz) = qBr6vu/jcWEimR7n/zRxOiNF1XmO4VtCsnOKWGlU1js=
|
||||||
SHA256 (suhosin-0.9.27.tgz) = z1TZZY2hM6xS3lkap8KWsbL+KcuP7JR1axFYN13+VUo=
|
SHA256 (suhosin-0.9.27.tgz) = z1TZZY2hM6xS3lkap8KWsbL+KcuP7JR1axFYN13+VUo=
|
||||||
SHA256 (suhosin-patch-5.2.9-0.9.6.3.openbsd-patch.gz) = CxrEk0u6gT5OgiRF7Qca2wb38wP58wu6p/iNa9T13Hc=
|
SHA256 (suhosin-patch-5.2.10-0.9.7-openbsd.patch.gz) = b3qGz/HN0QB7okgpL2rf47fAGt/tVsLpN8h8YCELvDg=
|
||||||
SIZE (php-5.2.9.tar.gz) = 12867984
|
SIZE (php-5.2.10.tar.gz) = 11433921
|
||||||
SIZE (suhosin-0.9.27.tgz) = 115936
|
SIZE (suhosin-0.9.27.tgz) = 115936
|
||||||
SIZE (suhosin-patch-5.2.9-0.9.6.3.openbsd-patch.gz) = 23274
|
SIZE (suhosin-patch-5.2.10-0.9.7-openbsd.patch.gz) = 23026
|
||||||
|
|||||||
@ -1,7 +1,6 @@
|
|||||||
$OpenBSD: patch-aclocal_m4,v 1.9 2007/09/05 09:11:34 robert Exp $
|
--- aclocal.m4.orig Wed Jun 17 14:35:16 2009
|
||||||
--- aclocal.m4.orig Thu Aug 30 01:39:17 2007
|
+++ aclocal.m4 Mon Jun 22 13:18:01 2009
|
||||||
+++ aclocal.m4 Wed Sep 5 10:39:20 2007
|
@@ -194,7 +194,7 @@
|
||||||
@@ -194,7 +194,7 @@ dnl the path is interpreted relative to the top build-
|
|
||||||
dnl
|
dnl
|
||||||
dnl which array to append to?
|
dnl which array to append to?
|
||||||
AC_DEFUN([PHP_ADD_SOURCES],[
|
AC_DEFUN([PHP_ADD_SOURCES],[
|
||||||
@ -10,21 +9,24 @@ $OpenBSD: patch-aclocal_m4,v 1.9 2007/09/05 09:11:34 robert Exp $
|
|||||||
])
|
])
|
||||||
|
|
||||||
dnl
|
dnl
|
||||||
@@ -962,12 +962,7 @@ dnl ---------------------------------------------- Sha
|
@@ -968,15 +968,7 @@
|
||||||
if test "$3" != "shared" && test "$3" != "yes" && test "$4" = "cli"; then
|
if test "$3" != "shared" && test "$3" != "yes" && test "$4" = "cli"; then
|
||||||
dnl ---------------------------------------------- CLI static module
|
dnl ---------------------------------------------- CLI static module
|
||||||
[PHP_]translit($1,a-z_-,A-Z__)[_SHARED]=no
|
[PHP_]translit($1,a-z_-,A-Z__)[_SHARED]=no
|
||||||
- if test "$PHP_SAPI" = "cgi"; then
|
- case "$PHP_SAPI" in
|
||||||
- PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,)
|
- cgi|embed[)]
|
||||||
- EXT_STATIC="$EXT_STATIC $1"
|
- PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,)
|
||||||
- else
|
- EXT_STATIC="$EXT_STATIC $1"
|
||||||
- PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cli)
|
- ;;
|
||||||
- fi
|
- *[)]
|
||||||
+ PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cgi)
|
- PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cli)
|
||||||
|
- ;;
|
||||||
|
- esac
|
||||||
|
+ PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cgi)
|
||||||
EXT_CLI_STATIC="$EXT_CLI_STATIC $1"
|
EXT_CLI_STATIC="$EXT_CLI_STATIC $1"
|
||||||
fi
|
fi
|
||||||
PHP_ADD_BUILD_DIR($ext_builddir)
|
PHP_ADD_BUILD_DIR($ext_builddir)
|
||||||
@@ -1017,17 +1012,12 @@ You either need to build $1 shared or build $2 statica
|
@@ -1026,12 +1018,6 @@
|
||||||
build to be successful.
|
build to be successful.
|
||||||
])
|
])
|
||||||
fi
|
fi
|
||||||
@ -37,13 +39,7 @@ $OpenBSD: patch-aclocal_m4,v 1.9 2007/09/05 09:11:34 robert Exp $
|
|||||||
dnl Some systems require that we link $2 to $1 when building
|
dnl Some systems require that we link $2 to $1 when building
|
||||||
])
|
])
|
||||||
|
|
||||||
dnl -------------------------------------------------------------------------
|
@@ -2274,10 +2260,9 @@
|
||||||
dnl Checks for structures, typedefs, broken functions, etc.
|
|
||||||
+B
|
|
||||||
dnl -------------------------------------------------------------------------
|
|
||||||
|
|
||||||
dnl Internal helper macros
|
|
||||||
@@ -2265,10 +2255,9 @@ AC_DEFUN([PHP_SETUP_KERBEROS],[
|
|
||||||
if test "$PHP_KERBEROS_DIR"; then
|
if test "$PHP_KERBEROS_DIR"; then
|
||||||
found_kerberos=yes
|
found_kerberos=yes
|
||||||
PHP_ADD_LIBPATH($PHP_KERBEROS_DIR/$PHP_LIBDIR, $1)
|
PHP_ADD_LIBPATH($PHP_KERBEROS_DIR/$PHP_LIBDIR, $1)
|
||||||
@ -56,12 +52,12 @@ $OpenBSD: patch-aclocal_m4,v 1.9 2007/09/05 09:11:34 robert Exp $
|
|||||||
PHP_ADD_INCLUDE($PHP_KERBEROS_DIR/include)
|
PHP_ADD_INCLUDE($PHP_KERBEROS_DIR/include)
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
@@ -4490,7 +4479,7 @@ openbsd*)
|
@@ -4167,7 +4152,7 @@
|
||||||
*) need_version=no ;;
|
need_version=no
|
||||||
esac
|
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
|
||||||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
|
soname_spec='${libname}${release}${shared_ext}$major'
|
||||||
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
|
- finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
|
||||||
+ finish_cmds=
|
+ finish_cmds=
|
||||||
shlibpath_var=LD_LIBRARY_PATH
|
shlibpath_var=LD_LIBRARY_PATH
|
||||||
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
|
||||||
case $host_os in
|
sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user