rpms/php/F-11 php-5.3.0-libedit.patch, NONE, 1.1 php.spec, 1.178, 1.179
Tom Callaway
spot at fedoraproject.org
Tue Nov 17 22:19:17 UTC 2009
- Previous message: rpms/xorg-x11-drv-ivtv/F-12 xorg-x11-drv-ivtv.spec, 1.14, 1.15 sources, 1.4, 1.5 xf86-video-ivtv.patch, 1.1, NONE
- Next message: rpms/php/F-12 php-5.3.0-libedit.patch, NONE, 1.1 php.spec, 1.183, 1.184
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: spot
Update of /cvs/pkgs/rpms/php/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9522/F-11
Modified Files:
php.spec
Added Files:
php-5.3.0-libedit.patch
Log Message:
use libedit instead of readline to avoid licensing issues
php-5.3.0-libedit.patch:
ext/readline/config.m4 | 2 +-
ext/readline/readline.c | 4 +++-
sapi/cli/php_cli.c | 5 ++++-
sapi/cli/php_cli_readline.c | 4 +++-
4 files changed, 11 insertions(+), 4 deletions(-)
--- NEW FILE php-5.3.0-libedit.patch ---
diff -up php-5.3.0/ext/readline/config.m4.BAD php-5.3.0/ext/readline/config.m4
--- php-5.3.0/ext/readline/config.m4.BAD 2009-11-17 16:14:45.289616920 -0500
+++ php-5.3.0/ext/readline/config.m4 2009-11-17 16:14:59.588616924 -0500
@@ -55,7 +55,7 @@ if test "$PHP_READLINE" && test "$PHP_RE
elif test "$PHP_LIBEDIT" != "no"; then
for i in $PHP_LIBEDIT /usr/local /usr; do
- test -f $i/include/readline/readline.h && LIBEDIT_DIR=$i && break
+ test -f $i/include/editline/readline.h && LIBEDIT_DIR=$i && break
done
if test -z "$LIBEDIT_DIR"; then
diff -up php-5.3.0/ext/readline/readline.c.BAD php-5.3.0/ext/readline/readline.c
--- php-5.3.0/ext/readline/readline.c.BAD 2009-11-17 16:15:30.151716204 -0500
+++ php-5.3.0/ext/readline/readline.c 2009-11-17 16:16:27.902715621 -0500
@@ -33,8 +33,10 @@
#define rl_completion_matches completion_matches
#endif
+#ifdef HAVE_LIBEDIT
+#include <editline/readline.h>
+#else
#include <readline/readline.h>
-#ifndef HAVE_LIBEDIT
#include <readline/history.h>
#endif
diff -up php-5.3.0/sapi/cli/php_cli.c.BAD php-5.3.0/sapi/cli/php_cli.c
--- php-5.3.0/sapi/cli/php_cli.c.BAD 2009-11-17 16:16:51.421617342 -0500
+++ php-5.3.0/sapi/cli/php_cli.c 2009-11-17 16:17:35.026715984 -0500
@@ -76,8 +76,11 @@
#endif
#if (HAVE_LIBREADLINE || HAVE_LIBEDIT) && !defined(COMPILE_DL_READLINE)
+
+#if HAVE_LIBEDIT
+#include <editline/readline.h>
+#else
#include <readline/readline.h>
-#if !HAVE_LIBEDIT
#include <readline/history.h>
#endif
#include "php_cli_readline.h"
diff -up php-5.3.0/sapi/cli/php_cli_readline.c.BAD php-5.3.0/sapi/cli/php_cli_readline.c
--- php-5.3.0/sapi/cli/php_cli_readline.c.BAD 2009-11-17 16:17:51.398715697 -0500
+++ php-5.3.0/sapi/cli/php_cli_readline.c 2009-11-17 16:18:19.241715654 -0500
@@ -49,8 +49,10 @@
#include <unixlib/local.h>
#endif
+#if HAVE_LIBEDIT
+#include <editline/readline.h>
+#else
#include <readline/readline.h>
-#if !HAVE_LIBEDIT
#include <readline/history.h>
#endif
Index: php.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php/F-11/php.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -p -r1.178 -r1.179
--- php.spec 13 Nov 2009 13:28:39 -0000 1.178
+++ php.spec 17 Nov 2009 22:19:16 -0000 1.179
@@ -7,7 +7,7 @@
Summary: PHP scripting language for creating dynamic web sites
Name: php
Version: 5.2.11
-Release: 1%{?dist}
+Release: 2%{?dist}
License: PHP
Group: Development/Languages
URL: http://www.php.net/
@@ -25,6 +25,7 @@ Patch4: php-5.2.8-phpize64.patch
Patch5: php-5.2.0-includedir.patch
Patch6: php-5.2.4-embed.patch
Patch7: php-5.2.8-recode.patch
+Patch8: php-5.3.0-libedit.patch
# Fixes for extension modules
Patch20: php-4.3.11-shutdown.patch
@@ -45,7 +46,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
BuildRequires: bzip2-devel, curl-devel >= 7.9, db4-devel, gmp-devel
BuildRequires: httpd-devel >= 2.0.46-1, pam-devel
BuildRequires: libstdc++-devel, openssl-devel, sqlite-devel >= 3.0.0
-BuildRequires: zlib-devel, pcre-devel >= 6.6, smtpdaemon, readline-devel
+BuildRequires: zlib-devel, pcre-devel >= 6.6, smtpdaemon, libedit-devel
BuildRequires: bzip2, perl, libtool >= 1.4.3, gcc-c++
Obsoletes: php-dbg, php3, phpfi, stronghold-php
Requires: httpd-mmn = %{httpd_mmn}
@@ -414,6 +415,7 @@ support for using the recode library to
%patch5 -p1 -b .includedir
%patch6 -p1 -b .embed
%patch7 -p1 -b .recode
+%patch8 -p1 -b .libedit
%patch20 -p1 -b .shutdown
%patch21 -p1 -b .macropen
@@ -576,7 +578,8 @@ build --enable-force-cgi-redirect \
--with-pdo-dblib=shared,%{_prefix} \
--enable-json=shared \
--enable-zip=shared \
- --with-readline \
+ --without-readline \
+ --with-libedit \
--enable-dbase=shared \
--with-pspell=shared \
--with-mcrypt=shared,%{_prefix} \
@@ -803,6 +806,9 @@ rm files.* macros.php
%files interbase -f files.interbase
%changelog
+* Tue Nov 17 2009 Tom "spot" Callaway <tcallawa at redhat.com> 5.2.11-2
+- link to libedit rather than readline to avoid licensing issues
+
* Fri Nov 13 2009 Tim Jackson <rpm at timj.co.uk> 5.2.11-1
- update to 5.2.11
- add fix for upstream PHP bug #49098 (regression in 5.2.9+)
- Previous message: rpms/xorg-x11-drv-ivtv/F-12 xorg-x11-drv-ivtv.spec, 1.14, 1.15 sources, 1.4, 1.5 xf86-video-ivtv.patch, 1.1, NONE
- Next message: rpms/php/F-12 php-5.3.0-libedit.patch, NONE, 1.1 php.spec, 1.183, 1.184
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list