[php-pecl-oauth] fix PHP PECL #22337
François Kooman
fkooman at fedoraproject.org
Sun Jun 19 14:30:25 UTC 2011
commit 4711cd52c78626b0a8a0db7092c317fc5a42ae5d
Author: F. Kooman <fkooman at tuxed.net>
Date: Sun Jun 19 16:29:40 2011 +0200
fix PHP PECL #22337
php-pecl-oauth.spec | 12 ++++++++++--
php-pecl-oauth_fix_ssl_bug_22337.patch | 13 +++++++++++++
2 files changed, 23 insertions(+), 2 deletions(-)
---
diff --git a/php-pecl-oauth.spec b/php-pecl-oauth.spec
index d4b6b3b..b416008 100644
--- a/php-pecl-oauth.spec
+++ b/php-pecl-oauth.spec
@@ -5,12 +5,16 @@
Name: php-pecl-oauth
Version: 1.1.0
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: PHP OAuth consumer extension
Group: Development/Languages
License: BSD
URL: http://pecl.php.net/package/oauth
Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
+
+# Fix for http://pecl.php.net/bugs/bug.php?id=22337 (in trunk)
+Patch0: %{name}_fix_ssl_bug_22337.patch
+
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: php-devel
@@ -38,7 +42,8 @@ usernames and passwords.
%prep
%setup -q -c
-
+cd %{pecl_name}-%{version}
+%patch0 -p0
%build
cd %{pecl_name}-%{version}
@@ -88,6 +93,9 @@ php -n \
%{pecl_xmldir}/%{name}.xml
%changelog
+* Sun Jun 19 2011 F. Kooman <fkooman at tuxed.net> - 1.1.0-6
+- add fix for http://pecl.php.net/bugs/bug.php?id=22337
+
* Mon Jun 13 2011 F. Kooman <fkooman at tuxed.net> - 1.1.0-5
- remove php_apiver marco, was not used
diff --git a/php-pecl-oauth_fix_ssl_bug_22337.patch b/php-pecl-oauth_fix_ssl_bug_22337.patch
new file mode 100644
index 0000000..7ac380f
--- /dev/null
+++ b/php-pecl-oauth_fix_ssl_bug_22337.patch
@@ -0,0 +1,13 @@
+Index: provider.c
+===================================================================
+--- provider.c (revision 308495)
++++ provider.c (revision 308598)
+@@ -424,6 +424,8 @@
+ if(proto && Z_STRLEN_PP(proto)) {
+ spprintf(&tmp, 0, "%s://%s%s", Z_STRVAL_PP(proto), Z_STRVAL_PP(host), Z_STRVAL_PP(uri));
+ } else {
++ SEPARATE_ZVAL(port);
++ convert_to_long_ex(port);
+ spprintf(&tmp, 0, "http%s://%s%s", Z_LVAL_PP(port)==443?"s":"", Z_STRVAL_PP(host), Z_STRVAL_PP(uri));
+ }
+ return tmp;
More information about the scm-commits
mailing list