lang/php52 : help me solve patch working directory problem

[Svyatoslav Lempert]

Hello,
I have a big problem with lang/php52 security patches
In the current vesion all patches does not applyed to any PHP
extensions because extenions build from not php52 port and I should
fix this soon as possible.

My patch http://php52-backports.googlecode.com/files/php52-backports-security-20120117.patch
is a single file for all sources but it work only in lang/php52 and
this totally unsecure for fixes for extensions ports such as
php52-exif, php52-zip and other.

I tried change port Makefile.ext such as

-EXTRACT_AFTER_ARGS?=	| ${TAR} -xf - ${EXTSUBDIR}
+# We need extract all for BACKPORTS patch
+#EXTRACT_AFTER_ARGS?=	| ${TAR} -xf - ${EXTSUBDIR}
+
+PATCH_WRKSRC=	${WRKDIR}/${DISTNAME}
+PATCH_DIST_STRIP+=	-p1

But this is not work (other distribution patches,
files/patch-config.m4) if port have paches in files directory because
PATCH_WRKSRC changed, for example for devel/php52-gettext

===>  Applying FreeBSD patches for php52-gettext-5.2.17_7
===>   Applying FreeBSD patch
/usr/ports/devel/php52-gettext/files/patch-config.m4
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|--- config.m4.orig     Tue Jul 27 23:58:02 2004
|+++ config.m4  Tue Jul 27 23:59:44 2004
--------------------------
File to patch:

How can I solve this problem?

I see this ways

1. disable errors for my patch (this is can't be applyed?) and do not
unpack all port files, and use -p4 strip for php-5.2.17/ext/gettext
directory only.
How can I disable error for non-existen files?

2. create patch-files for each php52 slave port (php52 extension port)
and distribute this in portstree (no download from remote server) in
files directory. This somewhat complicates the supportive but it is
more correct to my mind, but really uncomfortable.

3. Maybe possible change PATCH_WRKSRC for one patch only?

Any ports mentors, please help me, what way I should use, because I
need fix some new issues (CVE) in port. Now security fixed work only
for lang/php52 and not not work for any other.

See patch for lang/php52 in the attachment (with problem with slave ports)

With best regards,
Svyatoslav Lempert, Irkutsk, Russia
-------------- next part --------------
A non-text attachment was scrubbed...
Name: php52_7.patch
Type: application/octet-stream
Size: 1529 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-ports/attachments/20120203/c921a91a/php52_7.obj