3:33 p.m.
Author: robert
Update of /cvs/extras/rpms/php-idn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13741/devel
Modified Files:
.cvsignore sources
Added Files:
idn.ini php-idn-1.1-gcc41.patch php-idn.spec
Log Message:
auto-import php-idn-1.1-6 on branch devel from php-idn-1.1-6.src.rpm
--- NEW FILE idn.ini ---
; Enable idn extension module
extension=idn.so
php-idn-1.1-gcc41.patch:
--- NEW FILE php-idn-1.1-gcc41.patch ---
GCC 4.1 compiler warnings fixed. Thanx to Robert Scheck.
--- idn/idn.c 2004/12/18 15:38:43 0.31
+++ idn/idn.c 2006/01/05 16:23:37 0.32
@@ -24,7 +24,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: idn.c,v 0.31 2004/12/18 15:38:43 turbo Exp $ */
+/* $Id: idn.c,v 0.32 2006/01/05 16:23:37 turbo Exp $ */
/* {{{ PHP defines and includes
@@ -202,7 +202,7 @@ PHP_MINFO_FUNCTION(idn)
{
php_info_print_table_start();
php_info_print_table_row(2, "IDN support", "enabled");
- php_info_print_table_row(2, "RCS Version", "$Id: idn.c,v 0.31 2004/12/18
15:38:43 turbo Exp $" );
+ php_info_print_table_row(2, "RCS Version", "$Id: idn.c,v 0.32 2006/01/05
16:23:37 turbo Exp $" );
php_info_print_table_row(2, "LibIDN version", STRINGPREP_VERSION);
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
@@ -891,7 +891,6 @@ PHP_FUNCTION(tld_get)
PHP_FUNCTION(tld_get_table)
{
const Tld_table * tld_table = NULL;
- int rc;
int ok = 0;
int ok_loop = 0;
zval **yyinput;
@@ -910,8 +909,8 @@ PHP_FUNCTION(tld_get_table)
tld_table = tld_default_table((*yyinput)->value.str.val, NULL);
if (tld_table) {
if(array_init(return_value) == SUCCESS)
- if(add_assoc_string(return_value, "name", tld_table->name, 1) == SUCCESS)
- if(add_assoc_string(return_value, "version", tld_table->version, 1) ==
SUCCESS)
+ if(add_assoc_string(return_value, "name", (char *) tld_table->name, 1) ==
SUCCESS)
+ if(add_assoc_string(return_value, "version", (char *) tld_table->version,
1) == SUCCESS)
if(add_assoc_long(return_value, "nvalid", tld_table->nvalid) == SUCCESS)
{
MAKE_STD_ZVAL(intervals);
if (array_init(intervals) == SUCCESS) {
--- NEW FILE php-idn.spec ---
%define default_apiver 20041225
Summary: PHP API for GNU LibIDN
Name: php-idn
Version: 1.1
Release: 6%{?dist}
License: GPL
Group: Development/Languages
Source0: http://php-idn.bayour.com/idn_%{version}.tar.gz
Source1: idn.ini
Patch0: php-idn-1.1-gcc41.patch
URL: http://php-idn.bayour.com/
BuildRequires: php-devel >= 4.3.0, libidn-devel >= 0.4.0, autoconf, automake
Requires: php-api = %((echo %{default_apiver}; php -i 2>/dev/null | sed -n 's/^PHP
API => //p') | tail -1)
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
This is the PHP API for the GNU LibIDN software
made by Simon Josefsson. It's intention is to
have international characters in the DNS system.
%prep
%setup -q -n idn-%{version}
%patch0 -p1 -b .gcc41
export PHP_RPATH=no
phpize
%configure
%build
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install-modules INSTALL_ROOT=$RPM_BUILD_ROOT
install -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/php.d/idn.ini
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%doc CHANGES CREDITS GPL README.documentation THANX_TO idn.php
%{_libdir}/php/modules/idn.so
%config(noreplace) %{_sysconfdir}/php.d/idn.ini
%changelog
* Sat Jun 17 2006 Robert Scheck <robert(a)fedoraproject.org> 1.1-6
- Changes to match with Fedora Packaging Guidelines (#194479)
* Sat Mar 11 2006 Robert Scheck <robert(a)fedoraproject.org> 1.1-5
- Rebuilt against PHP 5.1.2 and gcc 4.1
- Require the virtual php-api instead the current PHP version
* Fri Sep 16 2005 Robert Scheck <robert(a)fedoraproject.org> 1.1-4
- Rebuilt against PHP 5.0.5 and glibc 2.4
* Wed Apr 06 2005 Robert Scheck <robert(a)fedoraproject.org> 1.1-3
- Rebuilt against PHP 5.0.4
* Mon Mar 21 2005 Robert Scheck <robert(a)fedoraproject.org> 1.1-2
- Rebuilt against gcc 4.0
* Sun Dec 19 2004 Robert Scheck <robert(a)fedoraproject.org> 1.1-1
- Rebuilt against PHP 5.0.3
- Upgrade to 1.1 and some spec file cleanup
* Sat Dec 18 2004 Robert Scheck <robert(a)fedoraproject.org> 1.0-5
- Improved patch for rebuilding with PHP 4 and 5
* Sat Nov 20 2004 Robert Scheck <robert(a)fedoraproject.org> 1.0-4
- Rebuilt against PHP 5.0.2
* Fri Sep 24 2004 Robert Scheck <robert(a)fedoraproject.org> 1.0-3
- Rebuilt against PHP 4.3.9
* Wed Jul 14 2004 Robert Scheck <robert(a)fedoraproject.org> 1.0-2
- Rebuilt against PHP 4.3.8
* Fri Jun 04 2004 Robert Scheck <robert(a)fedoraproject.org> 1.0-1
- Upgrade to 1.0
* Fri Apr 16 2004 Robert Scheck <robert(a)fedoraproject.org> 0.9-1
- Upgrade to 0.9
- Initial spec file for Red Hat Linux and Fedora Core
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-idn/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 17 Jun 2006 20:32:29 -0000 1.1
+++ .cvsignore 17 Jun 2006 20:33:05 -0000 1.2
@@ -0,0 +1 @@
+idn_1.1.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-idn/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 17 Jun 2006 20:32:29 -0000 1.1
+++ sources 17 Jun 2006 20:33:05 -0000 1.2
@@ -0,0 +1 @@
+5767e959d9a2ec22880f46eb344d6836 idn_1.1.tar.gz