Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv24968
Modified Files:
php5.info php5.patch
Log Message:
Update deps for libjpeg and libpng, update to libxml2 2.9.0+ New ABI Patch,
update for new upcoming apache 2.4.x
Index: php5.info
===================================================================
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/php5.info,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- php5.info 23 May 2013 17:59:06 -0000 1.13
+++ php5.info 7 Aug 2013 23:21:32 -0000 1.14
@@ -1,10 +1,10 @@
Info2: <<
Package: php5
Version: 5.4.4
-Revision: 15.1
+Revision: 15.2
Type: sapiver (20100525)
###
-BuildDepends: fink (>= 0.34.99.git), automake1.11, apache2-prefork-dev,
aspell-dev, coreutils, cyrus-sasl2-dev, db53-aes, enchant1-dev, expat1,
file-dev, freetds (>= 1:0.91-1), freetds-dev, freetype219, gd2, glib2-dev,
gmp5, libapr.0-dev, libc-client1-dev, libcurl4, libevent2, libgcrypt,
libicu36-dev, libjpeg8, libmcrypt, libmhash2, libonig2-dev, libodbc3-dev,
libpcre1, libpng15, libtidy-0.99.0-dev, libtool2, libxml2, libxslt,
mysql-unified-dev | libmysqlclient18-dev, libnetsnmp30-dev, netcat,
openldap24-dev, openssl100-dev, postgresql91-dev, qdbm14, re2c, recode-dev,
sed, sqlite3-dev, wrap
+BuildDepends: fink (>= 0.34.99.git), automake1.11, apache2-prefork-dev |
apache2-dev, aspell-dev, coreutils, cyrus-sasl2-dev, db53-aes, enchant1-dev,
expat1, file-dev, freetds (>= 1:0.91-1), freetds-dev, freetype219, gd2,
glib2-dev, gmp5, libapr.0-dev, libc-client1-dev, libcurl4, libevent2,
libgcrypt, libicu36-dev, libjpeg9, libmcrypt, libmhash2, libonig2-dev,
libodbc3-dev, libpcre1, libpng16, libtidy-0.99.0-dev, libtool2, libxml2 (>>
2.9.0), libxslt, mysql-unified-dev | libmysqlclient18-dev, libnetsnmp30-dev,
netcat, openldap24-dev, openssl100-dev, postgresql91-dev, qdbm14, re2c,
recode-dev, sed, sqlite3-dev, wrap
Depends: libapache2-mod-php5 (= %v-%r) | libapache2-mod-php5filter (= %v-%r) |
php5-cgi (= %v-%r) | php5-fpm (= %v-%r), php5-common (= %v-%r)
###
CustomMirror: <<
@@ -69,7 +69,7 @@
Source: mirror:custom:distributions/php-%v.tar.gz
Source-MD5: 8366c3626f2275ab8c7ef5e2d6bc5bd7
PatchFile: %n.patch
-PatchFile-MD5: 450807d4fa22c773daff254dbfd4656e
+PatchFile-MD5: 798409a461203126e261cbe443827f71
PatchScript: <<
sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1
@@ -144,6 +144,7 @@
patch -p1 < fink/patches/giconv_is_inferior.patch
patch -p1 < fink/patches/gd-libJPEG-Version.patch
patch -p1 < fink/patches/php-5.2.4-embed-darwin.patch
+ patch -p1 < fink/patches/libxml2_ABIfix.patch
<<
UseMaxBuildJobs: false
###
@@ -850,7 +851,7 @@
<<
SplitOff22: <<
Package: %N-gd
- Depends: dpkg (>= 1.15), ucf, phpapi-%type_raw[sapiver], %N-common (=
%v-%r), freetype219-shlibs, gd2-shlibs, libjpeg8-shlibs, libpng15-shlibs
+ Depends: dpkg (>= 1.15), ucf, phpapi-%type_raw[sapiver], %N-common (=
%v-%r), freetype219-shlibs, gd2-shlibs, libjpeg9-shlibs, libpng16-shlibs
Files: <<
share/php5/gd
lib/php5/%type_raw[sapiver]/gd.so
@@ -2661,7 +2662,7 @@
SplitOff80: <<
Package: libapache2-mod-%N
Provides: phpapi-%type_raw[sapiver]
- Depends: dpkg (>= 1.15), ucf, %N-common (= %v-%r), apache2-mpm-prefork,
apache2.2-common, bzip2-shlibs, db53-aes-shlibs, libapr.0-shlibs,
libaprutil.0-shlibs, libgettext8-shlibs, libiconv, libonig2-shlibs,
libpcre1-shlibs, libxml2-shlibs, openssl100-shlibs, qdbm14-shlibs
+ Depends: dpkg (>= 1.15), ucf, %N-common (= %v-%r), apache2-mpm-prefork |
apache2, apache2.2-common | apache2, bzip2-shlibs, db53-aes-shlibs,
libapr.0-shlibs, libaprutil.0-shlibs, libgettext8-shlibs, libiconv,
libonig2-shlibs, libpcre1-shlibs, libxml2-shlibs, openssl100-shlibs,
qdbm14-shlibs
Conflicts: libapache2-mod-%Nfilter
Replaces: libapache2-mod-%Nfilter
ConfFiles: <<
@@ -2769,7 +2770,7 @@
SplitOff81: <<
Package: libapache2-mod-%Nfilter
Provides: phpapi-%type_raw[sapiver]
- Depends: dpkg (>= 1.15), ucf, %N-common (= %v-%r), apache2-mpm-prefork,
apache2.2-common, bzip2-shlibs, db53-aes-shlibs, libapr.0-shlibs,
libaprutil.0-shlibs, libgettext8-shlibs, libiconv, libonig2-shlibs,
libpcre1-shlibs, libxml2-shlibs, openssl100-shlibs, qdbm14-shlibs
+ Depends: dpkg (>= 1.15), ucf, %N-common (= %v-%r), apache2-mpm-prefork |
apache2, apache2.2-common | apache2, bzip2-shlibs, db53-aes-shlibs,
libapr.0-shlibs, libaprutil.0-shlibs, libgettext8-shlibs, libiconv,
libonig2-shlibs, libpcre1-shlibs, libxml2-shlibs, openssl100-shlibs,
qdbm14-shlibs
Conflicts: libapache2-mod-%N
Replaces: libapache2-mod-%N
ConfFiles: <<
Index: php5.patch
===================================================================
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/php5.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- php5.patch 6 May 2013 17:52:07 -0000 1.9
+++ php5.patch 7 Aug 2013 23:21:32 -0000 1.10
@@ -2261,6 +2261,61 @@
+
+ if (LIBXML(stream_context)) {
+ /* the steam_context resource will be released by resource list
destructor */
+diff -ruN php-5.4.4.orig/fink/patches/libxml2_ABIfix.patch
php-5.4.4/fink/patches/libxml2_ABIfix.patch
+--- php-5.4.4.orig/fink/patches/libxml2_ABIfix.patch 1969-12-31
17:00:00.000000000 -0700
++++ php-5.4.4/fink/patches/libxml2_ABIfix.patch 2013-08-07
16:02:00.000000000 -0600
+@@ -0,0 +1,51 @@
++diff -ruN php-5.4.4.orig/ext/dom/documenttype.c
php-5.4.4.fixed/ext/dom/documenttype.c
++--- php-5.4.4.orig/ext/dom/documenttype.c 2012-06-12 22:54:23.000000000
-0600
+++++ php-5.4.4.fixed/ext/dom/documenttype.c 2013-08-07 15:50:52.000000000
-0600
++@@ -205,7 +205,7 @@
++ if (buff != NULL) {
++ xmlNodeDumpOutput (buff, NULL, (xmlNodePtr) intsubset,
0, 0, NULL);
++ xmlOutputBufferFlush(buff);
++- ZVAL_STRINGL(*retval, buff->buffer->content,
buff->buffer->use, 1);
+++ ZVAL_STRINGL(*retval, xmlBufContent(buff->buffer),
xmlBufUse(buff->buffer), 1);
++ (void)xmlOutputBufferClose(buff);
++ return SUCCESS;
++ }
++diff -ruN php-5.4.4.orig/ext/dom/node.c php-5.4.4.fixed/ext/dom/node.c
++--- php-5.4.4.orig/ext/dom/node.c 2012-06-12 22:54:23.000000000 -0600
+++++ php-5.4.4.fixed/ext/dom/node.c 2013-08-07 15:42:42.000000000 -0600
++@@ -1895,9 +1895,9 @@
++ RETVAL_FALSE;
++ } else {
++ if (mode == 0) {
++- ret = buf->buffer->use;
+++ ret = xmlBufUse(buf->buffer);
++ if (ret > 0) {
++- RETVAL_STRINGL((char *) buf->buffer->content,
ret, 1);
+++ RETVAL_STRINGL((char *)
xmlBufContent(buf->buffer), ret, 1);
++ } else {
++ RETVAL_EMPTY_STRING();
++ }
++diff -ruN php-5.4.4.orig/ext/simplexml/simplexml.c
php-5.4.4.fixed/ext/simplexml/simplexml.c
++--- php-5.4.4.orig/ext/simplexml/simplexml.c 2012-06-12 22:54:23.000000000
-0600
+++++ php-5.4.4.fixed/ext/simplexml/simplexml.c 2013-08-07 15:58:50.000000000
-0600
++@@ -1417,7 +1417,7 @@
++
++ xmlNodeDumpOutput(outbuf, (xmlDocPtr)
sxe->document->ptr, node, 0, 0, ((xmlDocPtr) sxe->document->ptr)->encoding);
++ xmlOutputBufferFlush(outbuf);
++- RETVAL_STRINGL((char *)outbuf->buffer->content,
outbuf->buffer->use, 1);
+++ RETVAL_STRINGL((char *)xmlBufContent(outbuf->buffer),
xmlBufUse(outbuf->buffer), 1);
++ xmlOutputBufferClose(outbuf);
++ }
++ } else {
++diff -ruN php-5.4.4.orig/ext/xmlwriter/php_xmlwriter.c
php-5.4.4.fixed/ext/xmlwriter/php_xmlwriter.c
++--- php-5.4.4.orig/ext/xmlwriter/php_xmlwriter.c 2012-06-12
22:54:23.000000000 -0600
+++++ php-5.4.4.fixed/ext/xmlwriter/php_xmlwriter.c 2013-08-07
16:01:14.000000000 -0600
++@@ -1914,7 +1914,7 @@
++ }
++ output_bytes = xmlTextWriterFlush(ptr);
++ if (buffer) {
++- RETVAL_STRING((char *) buffer->content, 1);
+++ RETVAL_STRING((char *) xmlBufContent(buffer), 1);
++ if (empty) {
++ xmlBufferEmpty(buffer);
++ }
diff -ruN php-5.4.4.orig/fink/patches/lp564920-fix-big-files.patch
php-5.4.4/fink/patches/lp564920-fix-big-files.patch
--- php-5.4.4.orig/fink/patches/lp564920-fix-big-files.patch 1969-12-31
17:00:00.000000000 -0700
+++ php-5.4.4/fink/patches/lp564920-fix-big-files.patch 2012-06-12
13:19:24.000000000 -0600
------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with <2% overhead.
Download for free and get started troubleshooting in minutes.
http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
