Attachment 94173 Details for Bug 132268 – file.diff

[patch] file.diff

file.diff (text/plain), 6.77 KB, created by Martin Matuska on 2009-03-02 21:30:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Matuska

Created: 2009-03-02 21:30:00 UTC

Size: 6.77 KB

patch

obsolete

>Index: ports/ftp/php5-curl/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/ftp/php5-curl/Makefile,v
>retrieving revision 1.4
>diff -u -r1.4 Makefile
>--- ports/ftp/php5-curl/Makefile	23 Jan 2009 15:42:44 -0000	1.4
>+++ ports/ftp/php5-curl/Makefile	2 Mar 2009 17:29:59 -0000
>@@ -10,6 +10,5 @@
> MASTERDIR=	${.CURDIR}/../../lang/php5
> 
> PKGNAMESUFFIX=	-curl
>-PORTREVISION=	1
> 
> .include "${MASTERDIR}/Makefile"
>Index: ports/graphics/php5-gd/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/graphics/php5-gd/Makefile,v
>retrieving revision 1.2
>diff -u -r1.2 Makefile
>--- ports/graphics/php5-gd/Makefile	4 Feb 2009 06:42:35 -0000	1.2
>+++ ports/graphics/php5-gd/Makefile	2 Mar 2009 17:29:59 -0000
>@@ -5,7 +5,6 @@
> # $FreeBSD: ports/graphics/php5-gd/Makefile,v 1.2 2009/02/04 06:42:35 ale Exp $
> #
> 
>-PORTREVISION=	1
> CATEGORIES=	graphics
> 
> MASTERDIR=	${.CURDIR}/../../lang/php5
>Index: ports/graphics/php5-gd/files/patch-libgd_gd.c
>===================================================================
>RCS file: ports/graphics/php5-gd/files/patch-libgd_gd.c
>diff -N ports/graphics/php5-gd/files/patch-libgd_gd.c
>--- ports/graphics/php5-gd/files/patch-libgd_gd.c	4 Feb 2009 06:42:35 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,11 +0,0 @@
>---- libgd/gd.c.orig	2009-01-05 14:54:19.000000000 +0100
>-+++ libgd/gd.c	2009-01-05 14:54:53.000000000 +0100
>-@@ -3136,7 +3136,7 @@
>- 		return NULL;
>- 	}
>- 
>--	if (!gdImageTrueColor(src) && clrBack>=gdImageColorsTotal(src)) {
>-+	if (!gdImageTrueColor(src) && (clrBack < 0 || clrBack>=gdImageColorsTotal(src))) {
>- 		return NULL;
>- 	}
>- 
>Index: ports/lang/php5/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/lang/php5/Makefile,v
>retrieving revision 1.134
>diff -u -r1.134 Makefile
>--- ports/lang/php5/Makefile	11 Dec 2008 08:46:36 -0000	1.134
>+++ ports/lang/php5/Makefile	2 Mar 2009 17:29:59 -0000
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	php5
>-PORTVERSION=	5.2.8
>+PORTVERSION=	5.2.9
> PORTREVISION?=	0
> CATEGORIES?=	lang devel www
> MASTER_SITES=	${MASTER_SITE_PHP}
>@@ -152,9 +152,21 @@
> CONFIGURE_ARGS+=--disable-ipv6
> .endif
> 
>+.if !defined(WITHOUT_SUHOSIN)
>+pre-patch:
>+	@${REINPLACE_CMD} "s|(c) 1997-2009|(c) 1997-2008|g" \
>+		${WRKSRC}/sapi/cgi/cgi_main.c \
>+		${WRKSRC}/sapi/cli/php_cli.c
>+.endif
>+
> post-patch:
> 	@${TOUCH} ${WRKSRC}/ext/php_config.h
> 	@${REINPLACE_CMD} "s|^$extension_dir$|; \1|" ${WRKSRC}/php.ini-*
>+.if !defined(WITHOUT_SUHOSIN)
>+	@${REINPLACE_CMD} "s|(c) 1997-2008|(c) 1997-2009|g" \
>+		${WRKSRC}/sapi/cgi/cgi_main.c \
>+		${WRKSRC}/sapi/cli/php_cli.c
>+.endif
> 
> pre-configure:
> 	@${CAT} ${WRKSRC}/acinclude.m4 ${WRKSRC}/build/libtool.m4 > ${WRKSRC}/aclocal.m4
>Index: ports/lang/php5/distinfo
>===================================================================
>RCS file: /home/pcvs/ports/lang/php5/distinfo,v
>retrieving revision 1.42
>diff -u -r1.42 distinfo
>--- ports/lang/php5/distinfo	11 Dec 2008 08:46:36 -0000	1.42
>+++ ports/lang/php5/distinfo	2 Mar 2009 17:29:59 -0000
>@@ -1,6 +1,6 @@
>-MD5 (php-5.2.8.tar.bz2) = 8760a833cf10433d3e72271ab0d0eccf
>-SHA256 (php-5.2.8.tar.bz2) = a70600e13410213a637f1c9825e9c0d45c64de8cefb1929f8f5aa761b20b2b67
>-SIZE (php-5.2.8.tar.bz2) = 9827180
>+MD5 (php-5.2.9.tar.bz2) = 280d6cda7f72a4fc6de42fda21ac2db7
>+SHA256 (php-5.2.9.tar.bz2) = 30166dda7c3d8bdcb2753ab79260be25454cdf3673d681b7651f8d32006ee2a6
>+SIZE (php-5.2.9.tar.bz2) = 10203122
> MD5 (suhosin-patch-5.2.7-0.9.6.3.patch.gz) = d455c3dd5b652046dbac2951a58f64fa
> SHA256 (suhosin-patch-5.2.7-0.9.6.3.patch.gz) = 85e6262f53014e393977d1efed2d3a7e686767a07f96b14b2c3f126f694aee46
> SIZE (suhosin-patch-5.2.7-0.9.6.3.patch.gz) = 23125
>Index: ports/lang/php5/pkg-plist
>===================================================================
>RCS file: /home/pcvs/ports/lang/php5/pkg-plist,v
>retrieving revision 1.27
>diff -u -r1.27 pkg-plist
>--- ports/lang/php5/pkg-plist	8 Dec 2008 13:27:50 -0000	1.27
>+++ ports/lang/php5/pkg-plist	2 Mar 2009 17:29:59 -0000
>@@ -77,7 +77,6 @@
> include/php/ext/pcre/pcrelib/pcre_internal.h
> include/php/ext/pcre/pcrelib/pcreposix.h
> include/php/ext/pcre/pcrelib/ucp.h
>-include/php/ext/pcre/pcrelib/ucptable.h
> include/php/ext/pcre/php_pcre.h
> include/php/ext/standard/base64.h
> include/php/ext/standard/basic_functions.h
>Index: ports/lang/php5/files/patch-ext_date_lib_timelib_structs.h
>===================================================================
>RCS file: ports/lang/php5/files/patch-ext_date_lib_timelib_structs.h
>diff -N ports/lang/php5/files/patch-ext_date_lib_timelib_structs.h
>--- ports/lang/php5/files/patch-ext_date_lib_timelib_structs.h	9 Dec 2005 19:41:39 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,11 +0,0 @@
>---- ext/date/lib/timelib_structs.h.orig	Wed Dec  7 11:11:39 2005
>-+++ ext/date/lib/timelib_structs.h	Wed Dec  7 11:11:53 2005
>-@@ -21,7 +21,7 @@
>- #ifndef __TIMELIB_STRUCTS_H__
>- #define __TIMELIB_STRUCTS_H__
>- 
>--#include <timelib_config.h>
>-+#include "timelib_config.h"
>- 
>- #ifdef HAVE_SYS_TYPES_H
>- #include <sys/types.h>
>Index: ports/mail/php5-imap/files/patch-php_imap.c
>===================================================================
>RCS file: ports/mail/php5-imap/files/patch-php_imap.c
>diff -N ports/mail/php5-imap/files/patch-php_imap.c
>--- ports/mail/php5-imap/files/patch-php_imap.c	30 Dec 2008 10:12:32 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,11 +0,0 @@
>---- php_imap.c.orig	2008-12-30 11:06:18.000000000 +0100
>-+++ php_imap.c	2008-12-30 11:06:56.000000000 +0100
>-@@ -2172,7 +2172,7 @@
>- 
>- 	/* rfc822_parse_adrlist() modifies passed string. Copy it. */
>- 	str_copy = estrndup(Z_STRVAL_PP(str), Z_STRLEN_PP(str));
>--	rfc822_parse_adrlist(&env->to, str_copy, defaulthost);
>-+	rfc822_parse_adrlist(&env->to, str_copy, Z_STRVAL_PP(defaulthost));
>- 	efree(str_copy);
>- 
>- 	array_init(return_value);
>Index: ports/net/php5-ldap/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/net/php5-ldap/Makefile,v
>retrieving revision 1.2
>diff -u -r1.2 Makefile
>--- ports/net/php5-ldap/Makefile	5 Jan 2009 19:04:28 -0000	1.2
>+++ ports/net/php5-ldap/Makefile	2 Mar 2009 17:29:59 -0000
>@@ -5,7 +5,6 @@
> # $FreeBSD: ports/net/php5-ldap/Makefile,v 1.2 2009/01/05 19:04:28 delphij Exp $
> #
> 
>-PORTREVISION=	1
> CATEGORIES=	net
> 
> MASTERDIR=	${.CURDIR}/../../lang/php5
>Index: ports/net-mgmt/php5-snmp/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/net-mgmt/php5-snmp/Makefile,v
>retrieving revision 1.3
>diff -u -r1.3 Makefile
>--- ports/net-mgmt/php5-snmp/Makefile	29 Mar 2008 11:02:36 -0000	1.3
>+++ ports/net-mgmt/php5-snmp/Makefile	2 Mar 2009 17:29:59 -0000
>@@ -5,7 +5,6 @@
> # $FreeBSD: ports/net-mgmt/php5-snmp/Makefile,v 1.3 2008/03/29 11:02:36 kuriyama Exp $
> #
> 
>-PORTREVISION=	2
> CATEGORIES=	net-mgmt
> 
> MASTERDIR=	${.CURDIR}/../../lang/php5

Actions: View | Diff

Attachments on bug 132268: 94173