Date: Fri, 3 Feb 2012 12:39:01 +0900 From: Svyatoslav Lempert <svyatoslav.lempert@gmail.com> To: freebsd-ports@freebsd.org Subject: lang/php52 : help me solve patch working directory problem Message-ID: <CAERaTk_39Zmnz4nVGJH=6qxzqaMwcJwxRm2BErNZRVgG_k77mA@mail.gmail.com>
next in thread | raw e-mail | index | archive | help
--f46d0401fc57ecff0d04b8070e91 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable 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-securi= ty-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?=3D | ${TAR} -xf - ${EXTSUBDIR} +# We need extract all for BACKPORTS patch +#EXTRACT_AFTER_ARGS?=3D | ${TAR} -xf - ${EXTSUBDIR} + +PATCH_WRKSRC=3D ${WRKDIR}/${DISTNAME} +PATCH_DIST_STRIP+=3D -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 =3D=3D=3D> =C2=A0Applying FreeBSD patches for php52-gettext-5.2.17_7 =3D=3D=3D> =C2=A0 Applying FreeBSD patch /usr/ports/devel/php52-gettext/files/patch-config.m4 Hmm... =C2=A0Looks like a unified diff to me... The text leading up to this was: -------------------------- |--- config.m4.orig =C2=A0 =C2=A0 Tue Jul 27 23:58:02 2004 |+++ config.m4 =C2=A0Tue 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 --f46d0401fc57ecff0d04b8070e91 Content-Type: application/octet-stream; name="php52_7.patch" Content-Disposition: attachment; filename="php52_7.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gy6nv5np0 ZGlmZiAtTnJ1IHBocDUyLm9sZC9NYWtlZmlsZSBwaHA1Mi9NYWtlZmlsZQotLS0gcGhwNTIub2xk L01ha2VmaWxlCTIwMTItMDEtMTggMTc6Mjc6MDkuMDAwMDAwMDAwICswMDAwCisrKyBwaHA1Mi9N YWtlZmlsZQkyMDEyLTAyLTAyIDE5OjM0OjI1LjAwMDAwMDAwMCArMDAwMApAQCAtNyw3ICs3LDcg QEAKIAogUE9SVE5BTUU9CXBocDUyCiBQT1JUVkVSU0lPTj0JNS4yLjE3Ci1QT1JUUkVWSVNJT049 CTYKK1BPUlRSRVZJU0lPTj0JNwogQ0FURUdPUklFUz89CWxhbmcgZGV2ZWwgd3d3CiBNQVNURVJf U0lURVM9CSR7TUFTVEVSX1NJVEVfUEhQfQogTUFTVEVSX1NJVEVfU1VCRElSPQlkaXN0cmlidXRp b25zCkBAIC0xODYsMTAgKzE4Niw3IEBACiBDT05GSUdVUkVfQVJHUys9LS1kaXNhYmxlLWlwdjYK IC5lbmRpZgogCi0uaWYgZGVmaW5lZChXSVRIX0JBQ0tQT1JUUykKLVBBVENIRklMRVMrPQlwaHA1 Mi1iYWNrcG9ydHMtc2VjdXJpdHktMjAxMjAxMTcucGF0Y2gKLVBBVENIX1NJVEVTKz0JaHR0cDov L3BocDUyLWJhY2twb3J0cy5nb29nbGVjb2RlLmNvbS9maWxlcy8KLS5lbHNlCisuaWYgIWRlZmlu ZWQoV0lUSF9CQUNLUE9SVFMpCiBGT1JCSURERU49CVZ1bG5lcmFibGUgc2luY2UgMjAxMS0wMS0x MywgaHR0cDovL3BvcnRhdWRpdC5mcmVlYnNkLm9yZy8zNzYxZGYwMi0wZjljLTExZTAtYmVjYy0w MDIyMTU2ZTg3OTQuaHRtbAogLmVuZGlmCiAKQEAgLTIzMSw0ICsyMjgsOSBAQAogLmVsc2UKIC5p bmNsdWRlICIke01BU1RFUkRJUn0vTWFrZWZpbGUuZXh0IgogLmVuZGlmCisKKyMgQkFDS1BPUlRT IHBhdGNoIGZvciBsYW5nL3BocDUyIGFuZCBhbGwgcGhwNTItZXh0ZW5zaW9ucworUEFUQ0hGSUxF Uys9CXBocDUyLWJhY2twb3J0cy1zZWN1cml0eS0yMDEyMDExNy5wYXRjaAorUEFUQ0hfU0lURVMr PQlodHRwOi8vcGhwNTItYmFja3BvcnRzLmdvb2dsZWNvZGUuY29tL2ZpbGVzLworCiAuaW5jbHVk ZSA8YnNkLnBvcnQucG9zdC5taz4KZGlmZiAtTnJ1IHBocDUyLm9sZC9NYWtlZmlsZS5leHQgcGhw NTIvTWFrZWZpbGUuZXh0Ci0tLSBwaHA1Mi5vbGQvTWFrZWZpbGUuZXh0CTIwMTEtMTEtMDkgMTU6 MjU6MzYuMDAwMDAwMDAwICswMDAwCisrKyBwaHA1Mi9NYWtlZmlsZS5leHQJMjAxMi0wMi0wMiAx OTozODoyMS4wMDAwMDAwMDAgKzAwMDAKQEAgLTExLDcgKzExLDEyIEBACiBQQVRDSERJUj0JJHsu Q1VSRElSfS9maWxlcwogUExJU1Q9CQkke05PTkVYSVNURU5UfQogCi1FWFRSQUNUX0FGVEVSX0FS R1M/PQl8ICR7VEFSfSAteGYgLSAke0VYVFNVQkRJUn0KKyMgV2UgbmVlZCBleHRyYWN0IGFsbCBm b3IgQkFDS1BPUlRTIHBhdGNoCisjRVhUUkFDVF9BRlRFUl9BUkdTPz0JfCAke1RBUn0gLXhmIC0g JHtFWFRTVUJESVJ9CisKK1BBVENIX1dSS1NSQz0JJHtXUktESVJ9LyR7RElTVE5BTUV9CitQQVRD SF9ESVNUX1NUUklQKz0JLXAxCisjUEFUQ0hfREVCVUc9CXllcwogCiAuaWYgJHtQSFBfTU9ETkFN RX0gPT0gImJjbWF0aCIKIENPTkZJR1VSRV9BUkdTKz0tLWVuYWJsZS1iY21hdGgK --f46d0401fc57ecff0d04b8070e91--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAERaTk_39Zmnz4nVGJH=6qxzqaMwcJwxRm2BErNZRVgG_k77mA>