From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Wed, 19 Jan 2011 09:53:52 +0000 (+0100)
Subject: Fix download URL for openid.
X-Git-Tag: xorg/1.1.0~186
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=91a3c52142f3fef6d6074fa94413d4492dcca1d3;p=platal.git

Fix download URL for openid.

Note: PHP-OpenId 2.1.3 is not available anymore. We need to test openid
authentication using the new version of openid.

Note2: Packaging from github suxx: it contains both a version number (in
the URL) and a commit-id (in the package content). This is just
unmaintainable and will break again and again in the future.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
---

diff --git a/Makefile b/Makefile
index 0041ae2..4171e6b 100644
--- a/Makefile
+++ b/Makefile
@@ -122,10 +122,10 @@ wiki/pub/skins/empty:
 
 get-wiki:
 	@if ! test -d wiki; then                                          \
-	    wget http://www.pmwiki.org/pub/pmwiki/pmwiki-latest.tgz;      \
-	    tar -xzvf pmwiki-latest.tgz;                                  \
-	    rm pmwiki-latest.tgz;                                         \
-	    mv pmwiki-* wiki;                                             \
+		wget http://www.pmwiki.org/pub/pmwiki/pmwiki-latest.tgz;      \
+		tar -xzvf pmwiki-latest.tgz;                                  \
+		rm pmwiki-latest.tgz;                                         \
+		mv pmwiki-* wiki;                                             \
 	fi
 
 ##
@@ -135,14 +135,17 @@ get-wiki:
 openid: get-openid spool/openid/store
 
 # There is no obvious way to automatically use the latest version
-OPENID_VERSION = 2.1.3
+OPENID_VERSION = 2.2.2
+OPENID_COMMIT  = 782224d
 get-openid:
 	@if ! test -d include/Auth; then                                  \
-	    wget http://openidenabled.com/files/php-openid/packages/php-openid-$(OPENID_VERSION).tar.bz2; \
-	    tar -xjf php-openid-$(OPENID_VERSION).tar.bz2;                \
-	    mv php-openid-$(OPENID_VERSION)/Auth include/;                \
-	    rm php-openid-$(OPENID_VERSION).tar.bz2;                      \
-	    rm -r php-openid-$(OPENID_VERSION);                           \
+		wget --no-check-certificate                                   \
+			https://github.com/openid/php-openid/tarball/$(OPENID_VERSION) \
+			-O php-openid-$(OPENID_VERSION).tar.gz; \
+		tar -xzf php-openid-$(OPENID_VERSION).tar.gz;                \
+		mv openid-php-openid-$(OPENID_COMMIT)/Auth include/;                \
+		rm php-openid-$(OPENID_VERSION).tar.gz;                      \
+		rm -r openid-php-openid-$(OPENID_COMMIT);                           \
 	fi
 
 spool/openid/store: