| Index: trunk/extensions/OpenID/README.OpenID-mediawiki-extension |
| — | — | @@ -1,5 +1,5 @@ |
| 2 | 2 | MediaWiki OpenID extension README.OpenID-mediawiki-extension file |
| 3 | | -version 0.941-beta 20111011 |
| | 3 | +version 0.944-beta 20111014 |
| 4 | 4 | |
| 5 | 5 | Homepage and manual http://www.mediawiki.org/wiki/Extension:OpenID |
| 6 | 6 | |
| — | — | @@ -467,6 +467,8 @@ |
| 468 | 468 | into that account now |
| 469 | 469 | |
| 470 | 470 | == CHANGES == |
| | 471 | +* 0.944 improved the Makefile by adding a test if "patch" (program) exists |
| | 472 | + some users reported that this is not standard in all distrubtions |
| 471 | 473 | * 0.942 code cosmetic db schema updater |
| 472 | 474 | * 0.940 changed database schema updater; tested for MySQL |
| 473 | 475 | * 0.939 function name changes |
| Index: trunk/extensions/OpenID/OpenID.php |
| — | — | @@ -27,7 +27,7 @@ |
| 28 | 28 | exit( 1 ); |
| 29 | 29 | } |
| 30 | 30 | |
| 31 | | -define( 'MEDIAWIKI_OPENID_VERSION', '0.943-beta 20111013' ); |
| | 31 | +define( 'MEDIAWIKI_OPENID_VERSION', '0.944-beta 20111014' ); |
| 32 | 32 | |
| 33 | 33 | $path = dirname( __FILE__ ); |
| 34 | 34 | set_include_path( implode( PATH_SEPARATOR, array( $path ) ) . PATH_SEPARATOR . get_include_path() ); |
| Index: trunk/extensions/OpenID/Makefile |
| — | — | @@ -1,31 +1,65 @@ |
| 2 | 2 | VER=2.2.2 |
| 3 | 3 | SUBDIR=openid-php-openid-782224d |
| | 4 | +SHELL = /bin/sh |
| | 5 | + |
| 4 | 6 | # how to make that one predictable easily? |
| 5 | 7 | |
| 6 | 8 | # http://www.mediawiki.org/wiki/Extension:OpenID |
| 7 | 9 | # |
| 8 | 10 | # This makefile automates the installation of a prerequisite for the MediaWiki OpenID extension. |
| 9 | 11 | # |
| 10 | | -# First download the extension which includes this makefile from |
| 11 | | -# http://www.mediawiki.org/wiki/Special:ExtensionDistributor/OpenID |
| | 12 | +# MediaWiki OpenID extensions depends on the |
| | 13 | +# OpenIDEnabled.com PHP library for OpenID which in turn depends on the |
| | 14 | +# OpenIDEnabled.com PHP library for YADIS. |
| 12 | 15 | # |
| 13 | | -# MediaWiki OpenID depends on the OpenIDEnabled.com PHP library for OpenID, |
| 14 | | -# which in turn depends on the OpenIDEnabled.com PHP library for YADIS. |
| | 16 | +# STEP 1: |
| | 17 | +# Get the extension by method (a) or (b) or (c). |
| 15 | 18 | # |
| 16 | | -# Installation: |
| | 19 | +# (a) First download the MediaWiki OpenID extension which includes this makefile from |
| | 20 | +# http://www.mediawiki.org/wiki/Special:ExtensionDistributor/OpenID |
| 17 | 21 | # |
| 18 | | -# cd $IP/extensions/OpenID |
| 19 | | -# make |
| | 22 | +# or by checking out from SVN as explained in (b) or (c) |
| 20 | 23 | # |
| | 24 | +# (b) anonymous users checkout using this command: |
| | 25 | +# cd $IP/extensions |
| | 26 | +# svn checkout svn://svn.wikimedia.org/svnroot/mediawiki/trunk/extensions/OpenID OpenID |
| | 27 | +# |
| | 28 | +# (c) developers however checkout using this command: |
| | 29 | +# cd $IP/extensions |
| | 30 | +# svn checkout svn+ssh://USERNAME@svn.wikimedia.org/svnroot/mediawiki/trunk/extensions/OpenID OpenID |
| | 31 | +# |
| | 32 | +# STEP 2 |
| 21 | 33 | # The makefile downloads the openid-php library from http://www.openidenabled.com/php-openid/ |
| 22 | 34 | # and applies a patch to avoid PHP errors because Call-time pass-by-reference is deprecated |
| 23 | 35 | # since PHP 5.3.x see https://github.com/openid/php-openid/issues#issue/8 and |
| 24 | 36 | # the patch and fork of user kost https://github.com/openid/php-openid/pull/44/files |
| 25 | 37 | # |
| 26 | | -# T. Gries 20110203 |
| | 38 | +# Go to the extensions/OpenID subdirectors and start the installation |
| | 39 | +# which also downloads and patches the pre-requisites: |
| | 40 | +# |
| | 41 | +# cd $IP/extensions/OpenID |
| | 42 | +# make |
| | 43 | +# |
| | 44 | +# initially written by Brion Vibber |
| | 45 | +# 20110203 T. Gries |
| | 46 | +# 20111014 added a test whether "patch" (program) exists before starting it blindly |
| 27 | 47 | |
| 28 | | -php-openid: Auth |
| | 48 | +install: check-if-patch-exists Auth |
| 29 | 49 | |
| | 50 | +# test if "patch" program is installed |
| | 51 | +# some distributions don't have it installed by default |
| | 52 | +# alternative rule: patch-exists: ; patch --version >/dev/null |
| | 53 | +# http://www.gnu.org/s/hello/manual/make/Standard-Targets.html |
| | 54 | + |
| | 55 | +check-if-patch-exists: |
| | 56 | + @if $(SHELL) -c 'which patch' >/dev/null 2>&1; then \ |
| | 57 | + # echo "...The 'patch' program exists." ; \ |
| | 58 | + true; \ |
| | 59 | + else \ |
| | 60 | + echo "...The 'patch' program does not exist on your system. Please install it before running make."; \ |
| | 61 | + false; \ |
| | 62 | + fi |
| | 63 | + |
| 30 | 64 | Auth: php-openid-$(VER).tar.gz |
| 31 | 65 | tar -xzf php-openid-$(VER).tar.gz $(SUBDIR)/Auth |
| 32 | 66 | rm -f php-openid-$(VER).tar.gz |