diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | idn-php54.patch | 129 | ||||
| -rw-r--r-- | idn.ini | 2 | ||||
| -rw-r--r-- | idn_1.2c.tar.gz | bin | 0 -> 27975 bytes | |||
| -rw-r--r-- | php-idn.spec | 149 |
5 files changed, 284 insertions, 0 deletions
diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..1e65467 --- /dev/null +++ b/Makefile @@ -0,0 +1,4 @@ +SRCDIR := $(shell pwd) +NAME := $(shell basename $(SRCDIR)) +include ../common/Makefile + diff --git a/idn-php54.patch b/idn-php54.patch new file mode 100644 index 0000000..3eb89e6 --- /dev/null +++ b/idn-php54.patch @@ -0,0 +1,129 @@ +diff -up idn-1.2c/idn.c.php54 idn-1.2c/idn.c +--- idn-1.2c/idn.c.php54 2011-12-28 16:59:36.398415766 +0100 ++++ idn-1.2c/idn.c 2011-12-28 17:12:29.231434281 +0100 +@@ -92,7 +92,7 @@ ZEND_GET_MODULE(idn) + /* {{{ idn_functions[] + * Every user visible function must have an entry in idn_functions[]. + */ +-function_entry idn_functions[] = { ++zend_function_entry idn_functions[] = { + PHP_FE(idn_prep_name, NULL) + PHP_FE(idn_prep_kerberos5, NULL) + PHP_FE(idn_prep_node, NULL) +@@ -417,7 +417,7 @@ PHP_FUNCTION(idn_prep_name) + { + char *output; + char *charset = IDNG(default_charset); +- pval **yyinput, **yycharset; ++ zval **yyinput, **yycharset; + int argv = ZEND_NUM_ARGS(); + + if ((argv < 1) || (argv > 2) || (zend_get_parameters_ex(argv, &yyinput, &yycharset) == FAILURE)) { +@@ -443,7 +443,7 @@ PHP_FUNCTION(idn_prep_kerberos5) + { + char *output; + char *charset = IDNG(default_charset); +- pval **yyinput, **yycharset; ++ zval **yyinput, **yycharset; + int argv = ZEND_NUM_ARGS(); + + if ((argv < 1) || (argv > 2) || (zend_get_parameters_ex(argv, &yyinput, &yycharset) == FAILURE)) { +@@ -469,7 +469,7 @@ PHP_FUNCTION(idn_prep_node) + { + char *output; + char *charset = IDNG(default_charset); +- pval **yyinput, **yycharset; ++ zval **yyinput, **yycharset; + int argv = ZEND_NUM_ARGS(); + + if ((argv < 1) || (argv > 2) || (zend_get_parameters_ex(argv, &yyinput, &yycharset) == FAILURE)) { +@@ -495,7 +495,7 @@ PHP_FUNCTION(idn_prep_resource) + { + char *output; + char *charset = IDNG(default_charset); +- pval **yyinput, **yycharset; ++ zval **yyinput, **yycharset; + int argv = ZEND_NUM_ARGS(); + + if ((argv < 1) || (argv > 2) || (zend_get_parameters_ex(argv, &yyinput, &yycharset) == FAILURE)) { +@@ -521,7 +521,7 @@ PHP_FUNCTION(idn_prep_plain) + { + char *output; + char *charset = IDNG(default_charset); +- pval **yyinput, **yycharset; ++ zval **yyinput, **yycharset; + int argv = ZEND_NUM_ARGS(); + + if ((argv < 1) || (argv > 2) || (zend_get_parameters_ex(argv, &yyinput, &yycharset) == FAILURE)) { +@@ -547,7 +547,7 @@ PHP_FUNCTION(idn_prep_trace) + { + char *output; + char *charset = IDNG(default_charset); +- pval **yyinput, **yycharset; ++ zval **yyinput, **yycharset; + int argv = ZEND_NUM_ARGS(); + + if ((argv < 1) || (argv > 2) || (zend_get_parameters_ex(argv, &yyinput, &yycharset) == FAILURE)) { +@@ -573,7 +573,7 @@ PHP_FUNCTION(idn_prep_sasl) + { + char *output; + char *charset = IDNG(default_charset); +- pval **yyinput, **yycharset; ++ zval **yyinput, **yycharset; + int argv = ZEND_NUM_ARGS(); + + if ((argv < 1) || (argv > 2) || (zend_get_parameters_ex(argv, &yyinput, &yycharset) == FAILURE)) { +@@ -599,7 +599,7 @@ PHP_FUNCTION(idn_prep_iscsi) + { + char *output; + char *charset = IDNG(default_charset); +- pval **yyinput, **yycharset; ++ zval **yyinput, **yycharset; + int argv = ZEND_NUM_ARGS(); + + if ((argv < 1) || (argv > 2) || (zend_get_parameters_ex(argv, &yyinput, &yycharset) == FAILURE)) { +@@ -629,7 +629,7 @@ PHP_FUNCTION(idn_punycode_encode) + { + char *output; + char *charset = IDNG(default_charset); +- pval **yyinput, **yycharset; ++ zval **yyinput, **yycharset; + int argv = ZEND_NUM_ARGS(); + + if ((argv < 1) || (argv > 2) || (zend_get_parameters_ex(argv, &yyinput, &yycharset) == FAILURE)) { +@@ -655,7 +655,7 @@ PHP_FUNCTION(idn_punycode_decode) + { + char *output; + char *charset = IDNG(default_charset); +- pval **yyinput, **yycharset; ++ zval **yyinput, **yycharset; + int argv = ZEND_NUM_ARGS(); + + if ((argv < 1) || (argv > 2) || (zend_get_parameters_ex(argv, &yyinput, &yycharset) == FAILURE)) { +@@ -686,7 +686,7 @@ PHP_FUNCTION(idn_to_ascii) + { + char *output; + char *charset = IDNG(default_charset); +- pval **yyinput, **yycharset; ++ zval **yyinput, **yycharset; + int argv = ZEND_NUM_ARGS(); + + if ((argv < 1) || (argv > 2) || (zend_get_parameters_ex(argv, &yyinput, &yycharset) == FAILURE)) { +@@ -716,7 +716,7 @@ PHP_FUNCTION(idn_to_utf8) + { + char *output; + char *charset = IDNG(default_charset); +- pval **yyinput, **yycharset; ++ zval **yyinput, **yycharset; + int argv = ZEND_NUM_ARGS(); + + if ((argv < 1) || (argv > 2) || (zend_get_parameters_ex(argv, &yyinput, &yycharset) == FAILURE)) { +@@ -747,7 +747,7 @@ PHP_FUNCTION(idn_to_unicode) + { + char *output; + char *charset = IDNG(default_charset); +- pval **yyinput, **yycharset; ++ zval **yyinput, **yycharset; + int argv = ZEND_NUM_ARGS(); + + if ((argv < 0) || (argv > 2) || (zend_get_parameters_ex(argv, &yyinput, &yycharset) == FAILURE)) { @@ -0,0 +1,2 @@ +; Enable idn extension module +extension=idn.so diff --git a/idn_1.2c.tar.gz b/idn_1.2c.tar.gz Binary files differnew file mode 100644 index 0000000..93025ee --- /dev/null +++ b/idn_1.2c.tar.gz diff --git a/php-idn.spec b/php-idn.spec new file mode 100644 index 0000000..602b3a3 --- /dev/null +++ b/php-idn.spec @@ -0,0 +1,149 @@ +%global php_apiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1) + +Summary: PHP API for GNU LibIDN +Name: php-idn +Version: 1.2c +Release: 3%{?dist} +License: GPLv2+ +Group: Development/Languages +Source0: http://php-idn.bayour.com/idn_%{version}.tar.gz +Source1: idn.ini + +Patch0: idn-php54.patch + +URL: http://php-idn.bayour.com/ +BuildRequires: php-devel >= 4.3.0, libidn-devel >= 0.4.0, autoconf, automake, libtool +%if 0%{?rhel}%{?fedora} > 4 +%if 0%{?php_zend_api:1} +Requires: php(zend-abi) = %{php_zend_api}, php(api) = %{php_core_api} +%else +Requires: php-api = %{php_apiver} +%endif +%if 0%(echo '%{?php_zend_api}' | sed -e 's/-.*//') >= 20090626 +Requires: php-intl +%endif +%endif +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 .php54 + +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 -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/php.d/idn.ini + +%check +# No test provided by upstream, so +# minimal load test for the PHP extension +php -n \ + -d extension_dir=modules \ + -d extension=idn.so -m \ + | grep idn + + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,-) +%doc CHANGES COPYRIGHT CREDITS README.documentation THANX_TO idn.php +%if 0%{?rhel}%{?fedora} > 4 +%{_libdir}/php/modules/idn.so +%else +%{_libdir}/php4/idn.so +%endif +%config(noreplace) %{_sysconfdir}/php.d/idn.ini + +%changelog +* Wed Dec 28 2011 Remi Collet <remi@fedoraproject.org> - 1.0.1-4 +- build against php 5.4 with patch +- add minimal load test + +* Sat Jun 25 2011 Robert Scheck <robert@fedoraproject.org> 1.2c-3 +- Changed %%php_zend_api macro usage (#716054) + +* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2c-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue Apr 06 2010 Robert Scheck <robert@fedoraproject.org> 1.2c-1 +- Upgrade to 1.2c (includes a minor fix for the 1.2 release) + +* Fri Jul 31 2009 Remi Collet <Fedora@FamilleCollet.com> 1.2-7 +- rebuild for new PHP 5.3.0 ABI (20090626) +- better PHP ABI check +- use php_extdir +- patch for PHP 5.3.0 provided functions + +* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Mon Feb 23 2009 Robert Scheck <robert@fedoraproject.org> 1.2-5 +- Rebuilt against gcc 4.4 and rpm 4.6 + +* Sun Feb 10 2008 Robert Scheck <robert@fedoraproject.org> 1.2-4 +- Rebuilt against gcc 4.3 + +* Wed Aug 29 2007 Robert Scheck <robert@fedoraproject.org> 1.2-3 +- Updated the license tag according to the guidelines + +* Mon May 07 2007 Robert Scheck <robert@fedoraproject.org> 1.2-2 +- Rebuild + +* Fri Nov 24 2006 Robert Scheck <robert@fedoraproject.org> 1.2-1 +- Upgrade to 1.2b (includes a minor fix for the 1.2 release) + +* Sun Sep 03 2006 Robert Scheck <robert@fedoraproject.org> 1.1-7 +- Rebuild for Fedora Core 6 + +* Sat Jun 17 2006 Robert Scheck <robert@fedoraproject.org> 1.1-6 +- Changes to match with Fedora Packaging Guidelines (#194479) + +* Sat Mar 11 2006 Robert Scheck <robert@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@fedoraproject.org> 1.1-4 +- Rebuilt against PHP 5.0.5 and glibc 2.4 + +* Wed Apr 06 2005 Robert Scheck <robert@fedoraproject.org> 1.1-3 +- Rebuilt against PHP 5.0.4 + +* Mon Mar 21 2005 Robert Scheck <robert@fedoraproject.org> 1.1-2 +- Rebuilt against gcc 4.0 + +* Sun Dec 19 2004 Robert Scheck <robert@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@fedoraproject.org> 1.0-5 +- Improved patch for rebuilding with PHP 4 and 5 + +* Sat Nov 20 2004 Robert Scheck <robert@fedoraproject.org> 1.0-4 +- Rebuilt against PHP 5.0.2 + +* Fri Sep 24 2004 Robert Scheck <robert@fedoraproject.org> 1.0-3 +- Rebuilt against PHP 4.3.9 + +* Wed Jul 14 2004 Robert Scheck <robert@fedoraproject.org> 1.0-2 +- Rebuilt against PHP 4.3.8 + +* Fri Jun 04 2004 Robert Scheck <robert@fedoraproject.org> 1.0-1 +- Upgrade to 1.0 + +* Fri Apr 16 2004 Robert Scheck <robert@fedoraproject.org> 0.9-1 +- Upgrade to 0.9 +- Initial spec file for Red Hat Linux and Fedora Core |