commit d87bdf188fcdd0f7d1053f5dd178bea077b8a0d4
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Tue Feb 19 22:55:19 2013 +0100
- fix gd, dba; disable yp (broken, php 5.x dropped it anyway)
php4-allow-db31.patch | 66 +++++++++++++++
php4-gd.patch | 216 --------------------------------------------------
php4.spec | 5 +-
3 files changed, 70 insertions(+), 217 deletions(-)
---
diff --git a/php4.spec b/php4.spec
index 6f06494..a9b2e3a 100644
--- a/php4.spec
+++ b/php4.spec
@@ -48,6 +48,7 @@
%bcond_with system_xmlrpc_epi # use system xmlrpc-epi library
(broken on 64bit arches, see http://bugs.php.net/41611)
%bcond_without xslt # without XSLT extension module
%bcond_with yaz # without YAZ extension module
+%bcond_with yp
%bcond_without apache1 # disable building apache 1.3.x module
%bcond_without apache2 # disable building apache 2.x module
%bcond_without fcgi # disable building FCGI SAPI
@@ -1743,7 +1744,7 @@ for sapi in $sapis; do
%{?with_wddx:--enable-wddx=shared} \
%{!?with_xml:--disable-xml}%{?with_xml:--enable-xml=shared} \
%{?with_xslt:--enable-xslt=shared} \
- --enable-yp=shared \
+ %{?with_yp:--enable-yp=shared} \
--with-bz2=shared \
%{?with_cpdf:--with-cpdflib=shared} \
--with-crack=shared \
@@ -3151,11 +3152,13 @@ fi
%attr(755,root,root) %{extensionsdir}/yaz.so
%endif
+%if %{with yp}
%files yp
%defattr(644,root,root,755)
%doc ext/yp/CREDITS
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/yp.ini
%attr(755,root,root) %{extensionsdir}/yp.so
+%endif
%files zip
%defattr(644,root,root,755)
diff --git a/php4-allow-db31.patch b/php4-allow-db31.patch
index e7fdac5..f715330 100644
--- a/php4-allow-db31.patch
+++ b/php4-allow-db31.patch
@@ -16,3 +16,69 @@
])
fi
if test -n "$THIS_LIBS"; then
+diff -urN php-4.4.9.org/ext/dba/config.m4 php-4.4.9/ext/dba/config.m4
+--- php-4.4.9.org/ext/dba/config.m4 2006-11-28 12:41:35.000000000 +0100
++++ php-4.4.9/ext/dba/config.m4 2013-02-19 22:27:18.489827804 +0100
+@@ -144,7 +144,7 @@
+ ],[
+ AC_EGREP_CPP(yes,[
+ #include "$THIS_INCLUDE"
+-#if DB_VERSION_MAJOR == $1
++#if DB_VERSION_MAJOR == $1 || ($1 == 4 && DB_VERSION_MAJOR == 5)
+ yes
+ #endif
+ ],[
+@@ -201,7 +201,11 @@
+ if test "$withval" != "no"; then
+ PHP_DBA_STD_BEGIN
+ for i in $withval /usr/local/BerkeleyDB.4.2 /usr/local/BerkeleyDB.4.1
/usr/local/BerkeleyDB.4.0 /usr/local /usr; do
+- if test -f "$i/db4/db.h"; then
++ if test -f "$i/db5/db.h"; then
++ THIS_PREFIX=$i
++ THIS_INCLUDE=$i/db5/db.h
++ break
++ elif test -f "$i/db4/db.h"; then
+ THIS_PREFIX=$i
+ THIS_INCLUDE=$i/db4/db.h
+ break
+@@ -223,7 +227,7 @@
+ break
+ fi
+ done
+- PHP_DBA_DB_CHECK(4, db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4
db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
++ PHP_DBA_DB_CHECK(4, db-5.3 db-5.2 db-5.1 db-5.0 db-4.7 db-4.6 db-4.5
db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0,
(DB_ENV*)0, 0)])
+ fi
+ ])
+ AC_DBA_STD_RESULT(db4,Berkeley DB4)
+
+--- php-4.4.9/ext/dba/dba_db4.c~ 2007-12-31 08:22:46.000000000 +0100
++++ php-4.4.9/ext/dba/dba_db4.c 2013-02-19 22:49:25.452772010 +0100
+@@ -35,7 +35,11 @@
+ #include <db.h>
+ #endif
+
+-static void php_dba_db4_errcall_fcn(const char *errpfx, char *msg)
++static void php_dba_db4_errcall_fcn(
++#if (DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3))
++ const DB_ENV *dbenv,
++#endif
++ const char *errpfx, const char *msg)
+ {
+ TSRMLS_FETCH();
+
+@@ -85,14 +89,10 @@
+ filemode = Z_LVAL_PP(info->argv[0]);
+ }
+
+-#ifdef DB_FCNTL_LOCKING
+- gmode |= DB_FCNTL_LOCKING;
+-#endif
+-
+ if ((err=db_create(&dbp, NULL, 0)) == 0) {
+ dbp->set_errcall(dbp, php_dba_db4_errcall_fcn);
+ if (
+-#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
++#if (DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1))
+ (err=dbp->open(dbp, 0, info->path, NULL, type, gmode,
filemode)) == 0) {
+ #else
+ (err=dbp->open(dbp, info->path, NULL, type, gmode,
filemode)) == 0) {
diff --git a/php4-gd.patch b/php4-gd.patch
index 285ec4b..79a9535 100644
--- a/php4-gd.patch
+++ b/php4-gd.patch
@@ -24,13 +24,6 @@ diff -urN php-4.4.8.org/ext/gd/config.m4
php-4.4.8/ext/gd/config.m4
AC_DEFINE(HAVE_GD_DYNAMIC_CTX_EX, 1, [ ])
AC_DEFINE(HAVE_GD_GIF_CTX, 1, [ ])
-diff -urN php-4.4.8.org/ext/gd/CREDITS php-4.4.8/ext/gd/CREDITS
---- php-4.4.8.org/ext/gd/CREDITS 2003-03-01 02:16:00.000000000 +0100
-+++ php-4.4.8/ext/gd/CREDITS 2008-01-22 22:38:05.837148890 +0100
-@@ -1,2 +1,2 @@
- GD imaging
--Rasmus Lerdorf, Stig Bakken, Jim Winstead, Jouni Ahto, Ilia Alshanetsky,
Pierre-Alain Joye
-+Rasmus Lerdorf, Stig Bakken, Jim Winstead, Jouni Ahto, Ilia Alshanetsky,
Pierre-Alain Joye, Marcus Boerger
diff -urN php-4.4.8.org/ext/gd/gd.c php-4.4.8/ext/gd/gd.c
--- php-4.4.8.org/ext/gd/gd.c 2007-12-31 08:22:47.000000000 +0100
+++ php-4.4.8/ext/gd/gd.c 2008-01-22 22:38:05.837148890 +0100
@@ -1259,42 +1252,6 @@ diff -urN php-4.4.8.org/ext/gd/gd.c php-4.4.8/ext/gd/gd.c
diff -urN php-4.4.8.org/ext/gd/gdcache.c php-4.4.8/ext/gd/gdcache.c
--- php-4.4.8.org/ext/gd/gdcache.c 2005-01-09 22:05:31.000000000 +0100
+++ php-4.4.8/ext/gd/gdcache.c 2008-01-22 22:38:05.863816915 +0100
-@@ -1,8 +1,8 @@
--/*
-- * $Id$
-+/*
-+ * $Id$
- *
-- * Caches of pointers to user structs in which the least-recently-used
-- * element is replaced in the event of a cache miss after the cache has
-+ * Caches of pointers to user structs in which the least-recently-used
-+ * element is replaced in the event of a cache miss after the cache has
- * reached a given size.
- *
- * John Ellson ([email protected]) Oct 31, 1997
-@@ -17,17 +17,17 @@
- * The head structure has a pointer to the most-recently-used
- * element, and elements are moved to this position in the list each
- * time they are used. The head also contains pointers to three
-- * user defined functions:
-- * - a function to test if a cached userdata matches some keydata
-- * - a function to provide a new userdata struct to the cache
-+ * user defined functions:
-+ * - a function to test if a cached userdata matches some keydata
-+ * - a function to provide a new userdata struct to the cache
- * if there has been a cache miss.
- * - a function to release a userdata struct when it is
- * no longer being managed by the cache
- *
- * In the event of a cache miss the cache is allowed to grow up to
- * a specified maximum size. After the maximum size is reached then
-- * the least-recently-used element is discarded to make room for the
-- * new. The most-recently-returned value is always left at the
-+ * the least-recently-used element is discarded to make room for the
-+ * new. The most-recently-returned value is always left at the
- * beginning of the list after retrieval.
- *
- * In the current implementation the cache is traversed by a linear
@@ -59,9 +59,9 @@
int size,
gdCacheTestFn_t gdCacheTest,
@@ -1307,65 +1264,9 @@ diff -urN php-4.4.8.org/ext/gd/gdcache.c
php-4.4.8/ext/gd/gdcache.c
head = (gdCache_head_t *)pemalloc(sizeof(gdCache_head_t), 1);
head->mru = NULL;
-diff -urN php-4.4.8.org/ext/gd/gdcache.h php-4.4.8/ext/gd/gdcache.h
---- php-4.4.8.org/ext/gd/gdcache.h 2003-03-05 17:04:20.000000000 +0100
-+++ php-4.4.8/ext/gd/gdcache.h 2008-01-22 22:38:05.863816915 +0100
-@@ -1,8 +1,8 @@
--/*
-- * $Id$
-+/*
-+ * $Id$
- *
-- * Caches of pointers to user structs in which the least-recently-used
-- * element is replaced in the event of a cache miss after the cache has
-+ * Caches of pointers to user structs in which the least-recently-used
-+ * element is replaced in the event of a cache miss after the cache has
- * reached a given size.
- *
- * John Ellson ([email protected]) Oct 31, 1997
-@@ -17,17 +17,17 @@
- * The head structure has a pointer to the most-recently-used
- * element, and elements are moved to this position in the list each
- * time they are used. The head also contains pointers to three
-- * user defined functions:
-- * - a function to test if a cached userdata matches some keydata
-- * - a function to provide a new userdata struct to the cache
-+ * user defined functions:
-+ * - a function to test if a cached userdata matches some keydata
-+ * - a function to provide a new userdata struct to the cache
- * if there has been a cache miss.
- * - a function to release a userdata struct when it is
- * no longer being managed by the cache
- *
- * In the event of a cache miss the cache is allowed to grow up to
- * a specified maximum size. After the maximum size is reached then
-- * the least-recently-used element is discarded to make room for the
-- * new. The most-recently-returned value is always left at the
-+ * the least-recently-used element is discarded to make room for the
-+ * new. The most-recently-returned value is always left at the
- * beginning of the list after retrieval.
- *
- * In the current implementation the cache is traversed by a linear
diff -urN php-4.4.8.org/ext/gd/gd_ctx.c php-4.4.8/ext/gd/gd_ctx.c
--- php-4.4.8.org/ext/gd/gd_ctx.c 2007-12-31 08:22:47.000000000 +0100
+++ php-4.4.8/ext/gd/gd_ctx.c 2008-01-22 22:38:05.863816915 +0100
-@@ -1,13 +1,13 @@
- /*
- +----------------------------------------------------------------------+
-- | PHP Version 4 |
-+ | PHP Version 5 |
- +----------------------------------------------------------------------+
-- | Copyright (c) 1997-2008 The PHP Group |
-+ | Copyright (c) 1997-2007 The PHP Group |
- +----------------------------------------------------------------------+
- | This source file is subject to version 3.01 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
-- | http://www.php.net/license/3_0.txt. |
-+ | http://www.php.net/license/3_01.txt |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | [email protected] so we can mail you a copy immediately. |
@@ -15,11 +15,13 @@
| Authors: Stanislav Malyshev <[email protected]> |
+----------------------------------------------------------------------+
@@ -1519,29 +1420,6 @@ diff -urN php-4.4.8.org/ext/gd/gd_ctx.c
php-4.4.8/ext/gd/gd_ctx.c
diff -urN php-4.4.8.org/ext/gd/gdttf.c php-4.4.8/ext/gd/gdttf.c
--- php-4.4.8.org/ext/gd/gdttf.c 2005-01-09 22:05:31.000000000 +0100
+++ php-4.4.8/ext/gd/gdttf.c 2008-01-22 22:38:05.887151436 +0100
-@@ -2,7 +2,7 @@
- /* */
- /* John Ellson [email protected] */
-
--/* $Id$ */
-+/* $Id$ */
-
- #include "php.h"
-
-@@ -28,11 +28,11 @@
- /* number of fonts cached before least recently used is replaced */
- #define FONTCACHESIZE 6
-
--/* number of character glyphs cached per font before
-+/* number of character glyphs cached per font before
- least-recently-used is replaced */
- #define GLYPHCACHESIZE 120
-
--/* number of bitmaps cached per glyph before
-+/* number of bitmaps cached per glyph before
- least-recently-used is replaced */
- #define BITMAPCACHESIZE 8
-
@@ -42,15 +42,15 @@
/* ptsize below which anti-aliasing is ineffective */
#define MINANTIALIASPTSIZE 0
@@ -2323,15 +2201,6 @@ diff -urN php-4.4.8.org/ext/gd/gdttf.c
php-4.4.8/ext/gd/gdttf.c
diff -urN php-4.4.8.org/ext/gd/libgd/gd_arc_f_buggy.c
php-4.4.8/ext/gd/libgd/gd_arc_f_buggy.c
--- php-4.4.8.org/ext/gd/libgd/gd_arc_f_buggy.c 2003-03-05
17:04:20.000000000 +0100
+++ php-4.4.8/ext/gd/libgd/gd_arc_f_buggy.c 2005-08-18 14:54:43.000000000
+0200
-@@ -1,6 +1,6 @@
- /* This is potentially great stuff, but fails against the test
-- program at the end. This would probably be much more
-- efficent than the implementation currently in gd.c if the
-+ program at the end. This would probably be much more
-+ efficent than the implementation currently in gd.c if the
- errors in the output were corrected. TBB */
-
- #if 0
@@ -698,7 +698,7 @@
#define WIDTH 500
#define HEIGHT 300
@@ -2450,28 +2319,6 @@ diff -urN php-4.4.8.org/ext/gd/libgd/gd.c
php-4.4.8/ext/gd/libgd/gd.c
im->polyInts = 0;
im->polyAllocated = 0;
im->brush = 0;
-@@ -267,8 +287,8 @@
- }
-
- /* This code is taken from
http://www.acm.org/jgt/papers/SmithLyons96/hwb_rgb.html, an article
-- * on colour conversion to/from RBG and HWB colour systems.
-- * It has been modified to return the converted value as a * parameter.
-+ * on colour conversion to/from RBG and HWB colour systems.
-+ * It has been modified to return the converted value as a * parameter.
- */
-
- #define RETURN_HWB(h, w, b) {HWB->H = h; HWB->W = w; HWB->B = b; return HWB;}
-@@ -287,8 +307,8 @@
-
-
- /*
-- * Theoretically, hue 0 (pure red) is identical to hue 6 in these transforms.
Pure
-- * red always maps to 6 in this implementation. Therefore UNDEFINED can be
-+ * Theoretically, hue 0 (pure red) is identical to hue 6 in these transforms.
Pure
-+ * red always maps to 6 in this implementation. Therefore UNDEFINED can be
- * defined as 0 in situations where only unsigned numbers are desired.
- */
- typedef struct
@@ -305,8 +325,8 @@
static HWBType * RGB_to_HWB (RGBType RGB, HWBType * HWB)
{
@@ -2514,24 +2361,6 @@ diff -urN php-4.4.8.org/ext/gd/libgd/gd.c
php-4.4.8/ext/gd/libgd/gd.c
return ct;
}
-@@ -629,7 +649,7 @@
- * Given the end points of a line, and a bounding rectangle (which we
- * know to be from (0,0) to (SX,SY)), adjust the endpoints to be on
- * the edges of the rectangle if the line should be drawn at all,
-- * otherwise return a failure code
-+ * otherwise return a failure code
- */
-
- /* this does "one-dimensional" clipping: note that the second time it
-@@ -637,7 +657,7 @@
- * - the comments ignore this (if you can understand it when it's
- * looking at the X parameters, it should become clear what happens on
- * the second call!) The code is simplified from that in the article,
-- * as we know that gd images always start at (0,0)
-+ * as we know that gd images always start at (0,0)
- */
-
- static int clip_1d(int *x0, int *y0, int *x1, int *y1, int maxdim) {
@@ -664,7 +684,7 @@
}
m = (*y1 - *y0)/(double)(*x1 - *x0); /* calculate the slope of
the line */
@@ -9696,26 +9525,6 @@ diff -urN php-4.4.8.org/ext/gd/libgd/webpng.c
php-4.4.8/ext/gd/libgd/webpng.c
diff -urN php-4.4.8.org/ext/gd/libgd/xbm.c php-4.4.8/ext/gd/libgd/xbm.c
--- php-4.4.8.org/ext/gd/libgd/xbm.c 2007-12-31 08:22:47.000000000 +0100
+++ php-4.4.8/ext/gd/libgd/xbm.c 2007-08-09 14:08:29.000000000 +0200
-@@ -1,8 +1,8 @@
- /*
- +----------------------------------------------------------------------+
-- | PHP Version 4 |
-+ | PHP Version 5 |
- +----------------------------------------------------------------------+
-- | Copyright (c) 1997-2008 The PHP Group |
-+ | Copyright (c) 1997-2007 The PHP Group |
- +----------------------------------------------------------------------+
- | This source file is subject to version 3.01 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
-@@ -16,7 +16,7 @@
- +----------------------------------------------------------------------+
- */
-
--/* $Id$ */
-+/* $Id$ */
-
- #include <stdio.h>
- #include <math.h>
@@ -29,8 +29,8 @@
#define MAX_XBM_LINE_SIZE 255
@@ -9854,31 +9663,6 @@ diff -urN php-4.4.8.org/ext/gd/libgd/xbm.c
php-4.4.8/ext/gd/libgd/xbm.c
diff -urN php-4.4.8.org/ext/gd/php_gd.h php-4.4.8/ext/gd/php_gd.h
--- php-4.4.8.org/ext/gd/php_gd.h 2007-12-31 08:22:47.000000000 +0100
+++ php-4.4.8/ext/gd/php_gd.h 2008-01-22 22:38:05.897151947 +0100
-@@ -1,8 +1,8 @@
- /*
- +----------------------------------------------------------------------+
-- | PHP Version 4 |
-+ | PHP Version 5 |
- +----------------------------------------------------------------------+
-- | Copyright (c) 1997-2008 The PHP Group |
-+ | Copyright (c) 1997-2007 The PHP Group |
- +----------------------------------------------------------------------+
- | This source file is subject to version 3.01 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
-@@ -13,11 +13,11 @@
- | [email protected] so we can mail you a copy immediately. |
- +----------------------------------------------------------------------+
- | Authors: Rasmus Lerdorf <[email protected]> |
-- | Stig Bakken <[email protected]> |
-+ | Stig Bakken <[email protected]> |
- +----------------------------------------------------------------------+
- */
-
--/* $Id$ */
-+/* $Id$ */
-
- #ifndef PHP_GD_H
- #define PHP_GD_H
@@ -32,7 +32,7 @@
/* open_basedir and safe_mode checks */
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php4.git/commitdiff/d87bdf188fcdd0f7d1053f5dd178bea077b8a0d4
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
