https://www.mediawiki.org/wiki/Special:Code/MediaWiki/111979
Revision: 111979 Author: wikinaut Date: 2012-02-20 23:14:08 +0000 (Mon, 20 Feb 2012) Log Message: ----------- convenience version 1.001 for Extension:OpenID. Dropped the method of downloading and patching; instead I have setup a regular fork and new branch mw-extension-openid on Github https://github.com/Wikinaut/php-openid/tree/mw-extension-openid which includes the former patch for making the library PHP 5.3.x compatible. Everyone can now see what is actually downloaded, and can compare it (there are no changes except the former patch) with the previous php-openid-2.2.2 version. The former patch file has been deleted, a new sha1 checksum is calculated and compared. Modified Paths: -------------- trunk/extensions/OpenID/Makefile trunk/extensions/OpenID/README.OpenID-mediawiki-extension Added Paths: ----------- trunk/extensions/OpenID/php-openid-mw-extension-openid.tar.gz.sha1 Removed Paths: ------------- trunk/extensions/OpenID/patches/php-openid-2.2.2.patch trunk/extensions/OpenID/php-openid-2.2.2.tar.gz.sha1 Modified: trunk/extensions/OpenID/Makefile =================================================================== --- trunk/extensions/OpenID/Makefile 2012-02-20 23:13:34 UTC (rev 111978) +++ trunk/extensions/OpenID/Makefile 2012-02-20 23:14:08 UTC (rev 111979) @@ -1,9 +1,7 @@ -PHP_OPENID_VERSION=2.2.2 -SUBDIR=openid-php-openid-782224d +PHP_OPENID_VERSION=mw-extension-openid +SUBDIR=Wikinaut-php-openid-e46daed SHELL = /bin/sh -# how to make that one predictable easily? - # http://www.mediawiki.org/wiki/Extension:OpenID # # This makefile automates the installation of a prerequisite for the MediaWiki OpenID extension. @@ -29,8 +27,9 @@ # svn checkout svn+ssh://[email protected]/svnroot/mediawiki/trunk/extensions/OpenID OpenID # # STEP 2 -# The makefile downloads the openid-php library from http://www.openidenabled.com/php-openid/ -# and applies a patch to avoid PHP errors because Call-time pass-by-reference is deprecated +# The makefile downloads the php-openid library see http://www.openidenabled.com/php-openid/ +# from the fork version https://github.com/Wikinaut/php-openid/tree/mw-extension-openid +# which contains a patch to avoid PHP errors because Call-time pass-by-reference is deprecated # since PHP 5.3.x see https://github.com/openid/php-openid/issues#issue/8 and # the patch and fork of user kost https://github.com/openid/php-openid/pull/44/files # @@ -50,32 +49,17 @@ # initially written by Brion Vibber # 20110203 T. Gries # 20111014 added a test whether "patch" (program) exists before starting it blindly +# 20120220 removed the patch and checks +# pointing to and downloading the already patched version +# from https://github.com/Wikinaut/php-openid/tree/mw-extension-openid -install: check-if-patch-exists Auth +install: Auth -# test if "patch" program is installed -# some distributions don't have it installed by default -# -# as suggested in -# http://stackoverflow.com/questions/592620/check-if-a-program-exists-from-a-bash-script -# we use "hash" to test existence of "patch" - -check-if-patch-exists: - @if $(SHELL) -c 'hash patch' >/dev/null 2>&1; then \ - # echo "... The 'patch' program exists." ; \ - true; \ - else \ - echo "... The 'patch' program does not exist on your system. Please install it before running make."; \ - false; \ - fi - Auth: php-openid-$(PHP_OPENID_VERSION).tar.gz check-php-openid-sha1 @echo "... Extracting php-openid-$(PHP_OPENID_VERSION).tar.gz:" tar -xzf php-openid-$(PHP_OPENID_VERSION).tar.gz $(SUBDIR)/Auth rm -f php-openid-$(PHP_OPENID_VERSION).tar.gz mv $(SUBDIR)/Auth ./ - @echo "... Patching php-openid-$(PHP_OPENID_VERSION) files in the Auth subdirectory:" - patch -p1 -d Auth < patches/php-openid-$(PHP_OPENID_VERSION).patch rmdir $(SUBDIR) @echo -e "\n\ ... Now almost everything is ready for making your MediaWiki OpenID-aware.\n\ @@ -85,7 +69,7 @@ php-openid-$(PHP_OPENID_VERSION).tar.gz: @echo "... Downloading the PHP library for OpenID:" - wget --no-check-certificate https://github.com/openid/php-openid/tarball/$(PHP_OPENID_VERSION) -O php-openid-$(PHP_OPENID_VERSION).tar.gz + wget --no-check-certificate https://github.com/Wikinaut/php-openid/tarball/$(PHP_OPENID_VERSION) -O php-openid-$(PHP_OPENID_VERSION).tar.gz check-php-openid-sha1: @if $(SHELL) -c "sha1sum -c php-openid-$(PHP_OPENID_VERSION).tar.gz.sha1" >/dev/null 2>&1; then \ Modified: trunk/extensions/OpenID/README.OpenID-mediawiki-extension =================================================================== --- trunk/extensions/OpenID/README.OpenID-mediawiki-extension 2012-02-20 23:13:34 UTC (rev 111978) +++ trunk/extensions/OpenID/README.OpenID-mediawiki-extension 2012-02-20 23:14:08 UTC (rev 111979) @@ -1,5 +1,5 @@ MediaWiki OpenID extension README.OpenID-mediawiki-extension file -version 1.000 20120212 +version 1.001 20120220 Homepage and manual http://www.mediawiki.org/wiki/Extension:OpenID Please check OpenID.setup.php for the current program version number @@ -118,10 +118,8 @@ cd $IP/extensions/OpenID make -The makefile downloads the openid-php library from http://www.openidenabled.com/php-openid/ -and applies a patch to avoid PHP errors because Call-time pass-by-reference is deprecated -since PHP 5.3.x see https://github.com/openid/php-openid/issues#issue/8 and -the patch and fork of user kost https://github.com/openid/php-openid/pull/44/files +The makefile downloads the openid-php library from +https://github.com/Wikinaut/php-openid/tree/mw-extension-openid . Version 0.3 and below of this extension used a different database structure that was pretty inefficient. If you installed this extension before, you should @@ -466,6 +464,8 @@ into that account now == CHANGES == +* 1.001 convenience release with download of the version for PHP 5.3.x + from https://github.com/Wikinaut/php-openid/tree/mw-extension-openid * 1.000 release version * 0.947 using jQuery closure for redirect * 0.946 fixed the problem of broken automatic redirect to OpenID provider login Deleted: trunk/extensions/OpenID/patches/php-openid-2.2.2.patch =================================================================== --- trunk/extensions/OpenID/patches/php-openid-2.2.2.patch 2012-02-20 23:13:34 UTC (rev 111978) +++ trunk/extensions/OpenID/patches/php-openid-2.2.2.patch 2012-02-20 23:14:08 UTC (rev 111979) @@ -1,81 +0,0 @@ -diff -bru _Auth//OpenID/Consumer.php Auth//OpenID/Consumer.php ---- _Auth//OpenID/Consumer.php 2010-04-29 22:41:05.000000000 +0200 -+++ Auth//OpenID/Consumer.php 2011-02-03 12:17:42.000000000 +0100 -@@ -666,7 +666,7 @@ - '_completeInvalid'); - - return call_user_func_array(array($this, $method), -- array($message, &$endpoint, $return_to)); -+ array($message, $endpoint, $return_to)); - } - - /** -@@ -1181,7 +1181,7 @@ - // oidutil.log('Performing discovery on %s' % (claimed_id,)) - list($unused, $services) = call_user_func($this->discoverMethod, - $claimed_id, -- &$this->fetcher); -+ $this->fetcher); - - if (!$services) { - return new Auth_OpenID_FailureResponse(null, -diff -bru _Auth//OpenID/Server.php Auth//OpenID/Server.php ---- _Auth//OpenID/Server.php 2010-04-29 22:41:05.000000000 +0200 -+++ Auth//OpenID/Server.php 2011-02-03 12:18:56.000000000 +0100 -@@ -1704,7 +1704,7 @@ - { - if (method_exists($this, "openid_" . $request->mode)) { - $handler = array($this, "openid_" . $request->mode); -- return call_user_func($handler, &$request); -+ return call_user_func($handler, $request); - } - return null; - } -diff -bru _Auth//OpenID/TrustRoot.php Auth//OpenID/TrustRoot.php ---- _Auth//OpenID/TrustRoot.php 2010-04-29 22:41:05.000000000 +0200 -+++ Auth//OpenID/TrustRoot.php 2011-02-03 12:19:24.000000000 +0100 -@@ -413,7 +413,7 @@ - } - - call_user_func_array($discover_function, -- array($relying_party_url, &$fetcher)); -+ array($relying_party_url, $fetcher)); - - $return_to_urls = array(); - $matching_endpoints = Auth_OpenID_extractReturnURL($endpoints); -diff -bru _Auth//Yadis/Manager.php Auth//Yadis/Manager.php ---- _Auth//Yadis/Manager.php 2010-04-29 22:41:05.000000000 +0200 -+++ Auth//Yadis/Manager.php 2011-02-03 12:20:44.000000000 +0100 -@@ -413,7 +413,7 @@ - - list($yadis_url, $services) = call_user_func($discover_cb, - $this->url, -- &$fetcher); -+ $fetcher); - - $manager = $this->createManager($services, $yadis_url); - } -diff -bru _Auth//Yadis/XRDS.php Auth//Yadis/XRDS.php ---- _Auth//Yadis/XRDS.php 2010-04-29 22:41:05.000000000 +0200 -+++ Auth//Yadis/XRDS.php 2011-02-03 12:19:58.000000000 +0100 -@@ -429,7 +429,7 @@ - - foreach ($filters as $filter) { - -- if (call_user_func_array($filter, array(&$service))) { -+ if (call_user_func_array($filter, array($service))) { - $matches++; - - if ($filter_mode == SERVICES_YADIS_MATCH_ANY) { -diff -bru _Auth//Yadis/Yadis.php Auth//Yadis/Yadis.php ---- _Auth//Yadis/Yadis.php 2010-04-29 22:41:05.000000000 +0200 -+++ Auth//Yadis/Yadis.php 2011-02-03 12:20:26.000000000 +0100 -@@ -141,7 +141,7 @@ - } - - $yadis_result = call_user_func_array($discover_func, -- array($input_url, &$fetcher)); -+ array($input_url, $fetcher)); - - if ($yadis_result === null) { - return array($input_url, array()); Deleted: trunk/extensions/OpenID/php-openid-2.2.2.tar.gz.sha1 =================================================================== --- trunk/extensions/OpenID/php-openid-2.2.2.tar.gz.sha1 2012-02-20 23:13:34 UTC (rev 111978) +++ trunk/extensions/OpenID/php-openid-2.2.2.tar.gz.sha1 2012-02-20 23:14:08 UTC (rev 111979) @@ -1 +0,0 @@ -009715779b32b42223292ecb5939112bc65334b7 php-openid-2.2.2.tar.gz Added: trunk/extensions/OpenID/php-openid-mw-extension-openid.tar.gz.sha1 =================================================================== --- trunk/extensions/OpenID/php-openid-mw-extension-openid.tar.gz.sha1 (rev 0) +++ trunk/extensions/OpenID/php-openid-mw-extension-openid.tar.gz.sha1 2012-02-20 23:14:08 UTC (rev 111979) @@ -0,0 +1 @@ +54208aa1eb4828a63a20890de695b6431595af67 php-openid-mw-extension-openid.tar.gz _______________________________________________ MediaWiki-CVS mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
