Re: svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/fileinfo/libmagic/apprentice.c branches/PHP_5_3/ext/fileinfo/libmagic/apptype.c
branches/PHP_5_3/ext/fileinfo/libmagic/ascmagic.c branches/PHP_5_3/ext/fileinfo/libmagic/cdf.c branches/PHP_5_3/ext/fileinfo/libmagic/cdf_time.c
branches/PHP_5_3/ext/fileinfo/libmagic/compress.c branches/PHP_5_3/ext/fileinfo/libmagic/file.h branches/PHP_5_3/ext/fileinfo/libmagic/fsmagic.c
branches/PHP_5_3/ext/fileinfo/libmagic/funcs.c branches/PHP_5_3/ext/
| From: | Johannes Schlüter | Date: | Mon, 25 Jan 2010 10:17:24 +0000 |
| Subject: | Re: svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/fileinfo/libmagic/apprentice.c branches/PHP_5_3/ext/fileinfo/libmagic/apptype.c branches/PHP_5_3/ext/fileinfo/libmagic/ascmagic.c branches/PHP_5_3/ext/fileinfo/libmagic/cdf.c branches/PHP_5_3/ext/fileinfo/libmagic/cdf_time.c branches/PHP_5_3/ext/fileinfo/libmagic/compress.c branches/PHP_5_3/ext/fileinfo/libmagic/file.h branches/PHP_5_3/ext/fileinfo/libmagic/fsmagic.c branches/PHP_5_3/ext/fileinfo/libmagic/funcs.c branches/PHP_5_3/ext/ |
||
| References: | 1 | Groups: | php.cvs |
| Request: | Send a blank email to php-cvs+get-61609@lists.php.net to get a copy of this message | ||
Hi,
On Sat, 2009-12-26 at 15:00 +0000, Mikko Koppanen wrote:
> mkoppanen Sat, 26 Dec 2009 15:00:21 +0000
>
> Revision:
> http://svn.php.net/viewvc?view=revision&revision=292654
>
> Log:
> Upgrade bundled libmagic to 5.03 (fixes CDF parsing related issues)
> Clean up / remove whitespace differences to make next merge easier
> Removed unnecessary files from trunk
is ext/fileinfo/libmagic.patch applied/still valid? If it was applied
I'd expect that at least some offsets changed so that it has to be
updated in svn. Revisions 292682 (spprintf the dbname) and 292693 (-
Fixed ZTS build) also seem to be missing from the patch.
johannes
> Changed paths:
> U php/php-src/branches/PHP_5_3/NEWS
> U php/php-src/branches/PHP_5_3/ext/fileinfo/libmagic/apprentice.c
> U php/php-src/branches/PHP_5_3/ext/fileinfo/libmagic/apptype.c
> U php/php-src/branches/PHP_5_3/ext/fileinfo/libmagic/ascmagic.c
> U php/php-src/branches/PHP_5_3/ext/fileinfo/libmagic/cdf.c
> U php/php-src/branches/PHP_5_3/ext/fileinfo/libmagic/cdf_time.c
> U php/php-src/branches/PHP_5_3/ext/fileinfo/libmagic/compress.c
> U php/php-src/branches/PHP_5_3/ext/fileinfo/libmagic/file.h
> U php/php-src/branches/PHP_5_3/ext/fileinfo/libmagic/fsmagic.c
> U php/php-src/branches/PHP_5_3/ext/fileinfo/libmagic/funcs.c
> U php/php-src/branches/PHP_5_3/ext/fileinfo/libmagic/is_tar.c
> U php/php-src/branches/PHP_5_3/ext/fileinfo/libmagic/magic.c
> U php/php-src/branches/PHP_5_3/ext/fileinfo/libmagic/magic.h
> U php/php-src/branches/PHP_5_3/ext/fileinfo/libmagic/patchlevel.h
> U php/php-src/branches/PHP_5_3/ext/fileinfo/libmagic/print.c
> U php/php-src/branches/PHP_5_3/ext/fileinfo/libmagic/readcdf.c
> U php/php-src/branches/PHP_5_3/ext/fileinfo/libmagic/readelf.c
> U php/php-src/branches/PHP_5_3/ext/fileinfo/libmagic/softmagic.c
> U php/php-src/trunk/ext/fileinfo/libmagic/apprentice.c
> U php/php-src/trunk/ext/fileinfo/libmagic/apptype.c
> U php/php-src/trunk/ext/fileinfo/libmagic/ascmagic.c
> U php/php-src/trunk/ext/fileinfo/libmagic/cdf.c
> U php/php-src/trunk/ext/fileinfo/libmagic/cdf_time.c
> U php/php-src/trunk/ext/fileinfo/libmagic/compress.c
> D php/php-src/trunk/ext/fileinfo/libmagic/file.c
> U php/php-src/trunk/ext/fileinfo/libmagic/file.h
> D php/php-src/trunk/ext/fileinfo/libmagic/file_opts.h
> U php/php-src/trunk/ext/fileinfo/libmagic/funcs.c
> D php/php-src/trunk/ext/fileinfo/libmagic/getopt_long.c
> U php/php-src/trunk/ext/fileinfo/libmagic/is_tar.c
> U php/php-src/trunk/ext/fileinfo/libmagic/magic.c
> U php/php-src/trunk/ext/fileinfo/libmagic/magic.h
> U php/php-src/trunk/ext/fileinfo/libmagic/print.c
> U php/php-src/trunk/ext/fileinfo/libmagic/readcdf.c
> U php/php-src/trunk/ext/fileinfo/libmagic/readelf.c
> U php/php-src/trunk/ext/fileinfo/libmagic/softmagic.c
>
> --
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php