rpms/php/devel php-5.1.4-gnusrc.patch, NONE, 1.1 php-5.1.4-warnings.patch, NONE, 1.1 php.spec, 1.109, 1.110
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu May 18 13:37:04 UTC 2006
Author: jorton
Update of /cvs/dist/rpms/php/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10889
Modified Files:
php.spec
Added Files:
php-5.1.4-gnusrc.patch php-5.1.4-warnings.patch
Log Message:
* Thu May 18 2006 Joe Orton <jorton at redhat.com> 5.1.4-5
- provide mod_php (#187891)
- provide php-cli (#192196)
- use correct LDAP fix (#181518)
- define _GNU_SOURCE in php_config.h and leave it defined
- drop (circular) dependency on php-pear
php-5.1.4-gnusrc.patch:
Zend/zend_alloc.h | 3 ---
configure.in | 2 ++
ext/interbase/interbase.c | 1 -
ext/pdo_firebird/firebird_driver.c | 1 -
ext/posix/posix.c | 4 +---
ext/session/mod_files.c | 1 +
ext/standard/file.c | 1 -
ext/zlib/zlib_fopen_wrapper.c | 1 -
main/php.h | 1 +
main/streams/cast.c | 1 -
main/streams/memory.c | 1 -
main/streams/streams.c | 1 -
12 files changed, 5 insertions(+), 13 deletions(-)
--- NEW FILE php-5.1.4-gnusrc.patch ---
--- php-5.1.4/configure.in.gnusrc
+++ php-5.1.4/configure.in
@@ -39,6 +39,8 @@
AC_CONFIG_HEADER(main/php_config.h)
+AC_DEFINE([_GNU_SOURCE], 1, [Define to enable GNU C Library extensions])
+
MAJOR_VERSION=5
MINOR_VERSION=1
RELEASE_VERSION=4
--- php-5.1.4/Zend/zend_alloc.h.gnusrc
+++ php-5.1.4/Zend/zend_alloc.h
@@ -125,10 +125,7 @@
#else
-#undef _GNU_SOURCE
-#define _GNU_SOURCE
#include <string.h>
-#undef _GNU_SOURCE
/* Standard wrapper macros */
#define emalloc(size) malloc(size)
--- php-5.1.4/ext/session/mod_files.c.gnusrc
+++ php-5.1.4/ext/session/mod_files.c
@@ -18,6 +18,7 @@
/* $Id: mod_files.c,v 1.100.2.3 2006/04/18 00:31:45 iliaa Exp $ */
+#include "php_config.h"
#include "php.h"
#include <sys/stat.h>
--- php-5.1.4/ext/posix/posix.c.gnusrc
+++ php-5.1.4/ext/posix/posix.c
@@ -18,9 +18,7 @@
/* $Id: posix.c,v 1.70.2.3 2006/01/01 12:50:12 sniper Exp $ */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "php_config.h"
#include "php.h"
#include <unistd.h>
--- php-5.1.4/ext/standard/file.c.gnusrc
+++ php-5.1.4/ext/standard/file.c
@@ -118,7 +118,6 @@
#ifdef HAVE_FNMATCH
#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
#endif
#include <fnmatch.h>
#endif
--- php-5.1.4/ext/interbase/interbase.c.gnusrc
+++ php-5.1.4/ext/interbase/interbase.c
@@ -24,7 +24,6 @@
#include "config.h"
#endif
-#define _GNU_SOURCE
#include "php.h"
--- php-5.1.4/ext/zlib/zlib_fopen_wrapper.c.gnusrc
+++ php-5.1.4/ext/zlib/zlib_fopen_wrapper.c
@@ -19,7 +19,6 @@
/* $Id: zlib_fopen_wrapper.c,v 1.46.2.1 2006/01/01 12:50:17 sniper Exp $ */
-#define _GNU_SOURCE
#include "php.h"
#include "php_zlib.h"
--- php-5.1.4/ext/pdo_firebird/firebird_driver.c.gnusrc
+++ php-5.1.4/ext/pdo_firebird/firebird_driver.c
@@ -22,7 +22,6 @@
#include "config.h"
#endif
-#define _GNU_SOURCE
#include "php.h"
#include "php_ini.h"
--- php-5.1.4/main/php.h.gnusrc
+++ php-5.1.4/main/php.h
@@ -30,6 +30,7 @@
#define PHP_HAVE_STREAMS
#define YYDEBUG 0
+#include "php_config.h"
#include "php_version.h"
#include "zend.h"
#include "zend_qsort.h"
--- php-5.1.4/main/streams/memory.c.gnusrc
+++ php-5.1.4/main/streams/memory.c
@@ -18,7 +18,6 @@
/* $Id: memory.c,v 1.8.2.6 2006/03/18 19:57:00 helly Exp $ */
-#define _GNU_SOURCE
#include "php.h"
/* Memory streams use a dynamic memory buffer to emulate a stream.
--- php-5.1.4/main/streams/streams.c.gnusrc
+++ php-5.1.4/main/streams/streams.c
@@ -21,7 +21,6 @@
/* $Id: streams.c,v 1.82.2.6 2006/04/22 17:17:40 wez Exp $ */
-#define _GNU_SOURCE
#include "php.h"
#include "php_globals.h"
#include "php_network.h"
--- php-5.1.4/main/streams/cast.c.gnusrc
+++ php-5.1.4/main/streams/cast.c
@@ -18,7 +18,6 @@
/* $Id: cast.c,v 1.12.2.1 2006/01/01 12:50:18 sniper Exp $ */
-#define _GNU_SOURCE
#include "php.h"
#include "php_globals.h"
#include "php_network.h"
php-5.1.4-warnings.patch:
bz2/bz2_filter.c | 6 +++---
zlib/zlib_filter.c | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
--- NEW FILE php-5.1.4-warnings.patch ---
--- php-5.1.4/ext/bz2/bz2_filter.c.warnings
+++ php-5.1.4/ext/bz2/bz2_filter.c
@@ -274,7 +274,7 @@
/* Create this filter */
data = pecalloc(1, sizeof(php_bz2_filter_data), persistent);
if (!data) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %d bytes.", sizeof(php_bz2_filter_data));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %zd bytes.", sizeof(php_bz2_filter_data));
return NULL;
}
@@ -287,14 +287,14 @@
data->strm.avail_out = data->outbuf_len = data->inbuf_len = 2048;
data->strm.next_in = data->inbuf = (char *) pemalloc(data->inbuf_len, persistent);
if (!data->inbuf) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %d bytes.", data->inbuf_len);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %zd bytes.", data->inbuf_len);
pefree(data, persistent);
return NULL;
}
data->strm.avail_in = 0;
data->strm.next_out = data->outbuf = (char *) pemalloc(data->outbuf_len, persistent);
if (!data->outbuf) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %d bytes.", data->outbuf_len);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %zd bytes.", data->outbuf_len);
pefree(data->inbuf, persistent);
pefree(data, persistent);
return NULL;
--- php-5.1.4/ext/zlib/zlib_filter.c.warnings
+++ php-5.1.4/ext/zlib/zlib_filter.c
@@ -275,7 +275,7 @@
/* Create this filter */
data = pecalloc(1, sizeof(php_zlib_filter_data), persistent);
if (!data) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %d bytes.", sizeof(php_zlib_filter_data));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %zd bytes.", sizeof(php_zlib_filter_data));
return NULL;
}
@@ -287,14 +287,14 @@
data->strm.avail_out = data->outbuf_len = data->inbuf_len = 2048;
data->strm.next_in = data->inbuf = (Bytef *) pemalloc(data->inbuf_len, persistent);
if (!data->inbuf) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %d bytes.", data->inbuf_len);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %zd bytes.", data->inbuf_len);
pefree(data, persistent);
return NULL;
}
data->strm.avail_in = 0;
data->strm.next_out = data->outbuf = (Bytef *) pemalloc(data->outbuf_len, persistent);
if (!data->outbuf) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %d bytes.", data->outbuf_len);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %zd bytes.", data->outbuf_len);
pefree(data->inbuf, persistent);
pefree(data, persistent);
return NULL;
Index: php.spec
===================================================================
RCS file: /cvs/dist/rpms/php/devel/php.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- php.spec 8 May 2006 12:18:33 -0000 1.109
+++ php.spec 18 May 2006 13:37:01 -0000 1.110
@@ -4,7 +4,7 @@
Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
Name: php
Version: 5.1.4
-Release: 3
+Release: 5
License: The PHP License v3.01
Group: Development/Languages
URL: http://www.php.net/
@@ -13,7 +13,8 @@
Source50: php.conf
Source51: php.ini
-Patch4: php-4.2.2-cxx.patch
+Patch1: php-5.1.4-gnusrc.patch
+Patch2: php-5.1.4-warnings.patch
Patch5: php-4.3.3-install.patch
Patch6: php-5.0.4-norpath.patch
Patch7: php-4.3.2-libtool15.patch
@@ -42,8 +43,10 @@
Obsoletes: php-dbg, mod_php, php3, phpfi, stronghold-php, php-openssl
# Enforce Apache module ABI compatibility
Requires: httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo missing-httpd-devel)
-Requires: file >= 4.0, php-pear
+Requires: file >= 4.0
Provides: php-api = %{apiver}
+Provides: mod_php = %{version}-%{release}
+Provides: php-cli = %{version}-%{release}
# Provides for all builtin modules:
Provides: php-bz2, php-calendar, php-ctype, php-curl, php-date, php-exif
Provides: php-ftp, php-gettext, php-gmp, php-hash, php-iconv, php-libxml
@@ -259,7 +262,8 @@
%prep
%setup -q
-#patch4 -p1 -b .cxx
+%patch1 -p1 -b .gnusrc
+%patch2 -p1 -b .warnings
%patch5 -p1 -b .install
%patch6 -p1 -b .norpath
%patch7 -p1 -b .libtool15
@@ -308,7 +312,8 @@
./buildconf --force
CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -Wno-pointer-sign"
-export CFLAGS
+CPPFLAGS="-DLDAP_DEPRECATED=1"
+export CFLAGS CPPFLAGS
# Install extension modules in %{_libdir}/php/modules.
EXTENSION_DIR=%{_libdir}/php/modules; export EXTENSION_DIR
@@ -560,6 +565,13 @@
%files pdo -f files.pdo
%changelog
+* Thu May 18 2006 Joe Orton <jorton at redhat.com> 5.1.4-5
+- provide mod_php (#187891)
+- provide php-cli (#192196)
+- use correct LDAP fix (#181518)
+- define _GNU_SOURCE in php_config.h and leave it defined
+- drop (circular) dependency on php-pear
+
* Mon May 8 2006 Joe Orton <jorton at redhat.com> 5.1.4-3
- update to 5.1.4
More information about the fedora-cvs-commits
mailing list