Craig,
Some more code review comments.
April
components/php-5_2/tcpwrap-zts/Makefile:
- Should the with-tcpwrap directory below follow the location for
libwrap.so also,
as in components/php-5_3/tcpwrap-zts/Makefile,
and change to "/usr?"
37 CONFIGURE_OPTIONS += --with-tcpwrap=/usr/sfw
components/php-5_3/php-53.p5m:
- Remove this line:
27 <transform file path=(etc/php/.*) -> default original_name
SUNWphp52:%<1>>
- Update to the new PSARC/2012/067 case
set name=org.opensolaris.arc-caseid value=LSARC/2008/538
- Remove these lines:
102 dir path=usr/share
103 dir path=usr/share/man
104 dir path=usr/share/man/man1
- We don't need to set the mode for these files,
since 0555 the default for .*bin/.* files in transforms/defaults
141 file path=usr/php/5.3/bin/phar.phar mode=0555
145 file path=usr/php/5.3/bin/php-config mode=0555
- Can move this link entry down to where the other
link entries are:
142 link path=usr/php/5.3/bin/phar target=phar.phar
- A note here regarding the temporary use of pkglint.dupaction and when
it may be removed later would be nice:
466 link path=usr/php/bin target=5.3/bin mediator=php
mediator-version=5.3 \
467 pkg.linted.pkglint.dupaction010.2=true
468 link path=usr/php/include target=5.3/include mediator=php
mediator-version=5.3 \
469 pkg.linted.pkglint.dupaction010.2=true
470 link path=usr/php/lib target=5.3/lib mediator=php
mediator-version=5.3 \
471 pkg.linted.pkglint.dupaction010.2=true
472 link path=usr/php/man target=5.3/man mediator=php
mediator-version=5.3 \
473 pkg.linted.pkglint.dupaction010.2=true
474 link path=usr/php/modules target=5.3/modules mediator=php
mediator-version=5.3 \
475 pkg.linted.pkglint.dupaction010.2=true
components/php-5_3/php-apc.p5m
- Update this to PSARC/2012/067:
set name=org.opensolaris.arc-caseid \
value=LSARC/2008/538
components/php-5_3/php-doc.p5m:
- Update this to PSARC/2012/067:
set name=org.opensolaris.arc-caseid \
value=LSARC/2008/538
components/php-5_3/php-idn.p5m:
- Update this to PSARC/2012/067:
set name=org.opensolaris.arc-caseid \
value=LSARC/2008/538
components/php-5_3/php-memcache.p5m:
- Update this to PSARC/2012/067:
set name=org.opensolaris.arc-caseid \
value=LSARC/2008/538
Do we want this file to be preserve=renamenew and mode=0644, like its
php 5.2 counterpart?
52 file
path=etc/apache2/2.2/samples-conf.d/php5.3-memcache-stats.conf \
53 preserve=renameold
Do we want these preserve=renamenew, like their counterparts in php 5.2?
54 file path=etc/php/5.3/conf.d/memcache.ini mode=0644
preserve=renameold
55 file path=etc/php/5.3/zts-conf.d/memcache.ini mode=0644
preserve=renameold
components/php-5_3/php-mysql.p5m:
- Update this to PSARC/2012/067:
set name=org.opensolaris.arc-caseid \
value=LSARC/2008/538
components/php-5_3/php-pear.p5m:
- Update this to PSARC/2012/067:
set name=org.opensolaris.arc-caseid \
value=LSARC/2008/538
components/php-5_3/php-suhosin.p5m:
- Update this to PSARC/2012/067:
set name=org.opensolaris.arc-caseid \
value=LSARC/2008/538
- Do we want these preserve=renamenew, like the php 5.2 versions:
file path=etc/php/5.3/conf.d/suhosin.ini mode=0644 preserve=renameold
file path=etc/php/5.3/zts-conf.d/suhosin.ini mode=0644 preserve=renameold
components/php-5_3/php-tcpwrap.p5m:
- Update this to PSARC/2012/067:
set name=org.opensolaris.arc-caseid \
value=LSARC/2008/538
- The below files are preserve=renamenew in the php 5.2 versions:
file path=etc/php/5.3/conf.d/tcpwrap.ini mode=0644 preserve=renameold
file path=etc/php/5.3/zts-conf.d/tcpwrap.ini mode=0644 preserve=renameold
components/php-5_3/php-xdebug.p5m:
- Update this to PSARC/2012/067:
set name=org.opensolaris.arc-caseid \
value=LSARC/2008/538
- These files are preserve=renamenew in the php5.2 versions:
file path=etc/php/5.3/conf.d/xdebug.ini mode=0644 preserve=renameold
file path=etc/php/5.3/zts-conf.d/xdebug.ini mode=0644 preserve=renameold
On 04/20/12 09:53 AM, Craig Mohrman wrote:
php 5.3.10 is being added alongside php 5.2.17.
I'm not quite through PSARC. Some minor nits surrounding
the version control via an IPS mediator. PSARC/2012/067
But as I'm trying to get this into B15, pretty please Mike hold the gate,
I want to get this review started now because it's big.
Here is the normal webrev:
http://jurassic.us.oracle.com/net/mogo/builds3/cmohrman/userland_php-5_3_10/webrev/index.html
It's not very useful because most of the files are "new" while
in fact they are just tweaked copies of php5.2 files.
So I wrote a little script to compare these files directly
which should be helpful.
/home/cmohrman/php-cr
or
/net/hs-usca-01.sfbay/export/home1/12/cmohrman/php-cr
This uses a graphical diff tool, filemerge or meld, and a list of files
where you choose where to start.
You can interrupt the script at any point and start over.
If you want to use meld you'll need pkg:/developer/meld installed.
It's slightly nicer because it shows graphically where lines moved to
if not far away.
The script won't review all files yet because of file renames so
I'm working on a script for that now.
But this will keep someone busy for a while as is.
Many thanks to you brave soles who help review this.
craig
_______________________________________________
userland-discuss mailing list
[email protected]
http://mail.opensolaris.org/mailman/listinfo/userland-discuss
_______________________________________________
userland-discuss mailing list
[email protected]
http://mail.opensolaris.org/mailman/listinfo/userland-discuss
