Gentoo Archives: gentoo-commits

From: Hans de Graaff <graaff@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/graaff:master commit in: dev-ruby/authlogic-oid/files/, dev-ruby/authlogic-oid/
Date: Mon, 31 Oct 2011 18:08:37
Message-Id: 21c3d871e575d44a7c4ec05b65b3c2a30e9fa492.graaff@gentoo
1 commit: 21c3d871e575d44a7c4ec05b65b3c2a30e9fa492
2 Author: Hans de Graaff <hans <AT> degraaff <DOT> org>
3 AuthorDate: Mon Oct 31 16:49:37 2011 +0000
4 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 31 16:49:37 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/graaff.git;a=commit;h=21c3d871
7
8 Add patch to avoid OpenIdAuthentication code that got removed in later versions.
9
10 (Portage version: 2.1.10.11/git/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)
11
12 ---
13 dev-ruby/authlogic-oid/ChangeLog | 8 ++++
14 dev-ruby/authlogic-oid/Manifest | 12 ++++---
15 .../authlogic-oid/authlogic-oid-1.0.4-r2.ebuild | 36 ++++++++++++++++++
16 ...uthlogic-oid-1.0.4-open_id_authentication.patch | 38 ++++++++++++++++++++
17 4 files changed, 89 insertions(+), 5 deletions(-)
18
19 diff --git a/dev-ruby/authlogic-oid/ChangeLog b/dev-ruby/authlogic-oid/ChangeLog
20 index 51af736..d48be61 100644
21 --- a/dev-ruby/authlogic-oid/ChangeLog
22 +++ b/dev-ruby/authlogic-oid/ChangeLog
23 @@ -2,6 +2,14 @@
24 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
25 # $Header: $
26
27 +*authlogic-oid-1.0.4-r2 (31 Oct 2011)
28 +
29 + 31 Oct 2011; Hans de Graaff <graaff@g.o>
30 + +authlogic-oid-1.0.4-r2.ebuild,
31 + +files/authlogic-oid-1.0.4-open_id_authentication.patch:
32 + Add patch to avoid OpenIdAuthentication code that got removed in later
33 + versions.
34 +
35 07 Jan 2011; Hans de Graaff <graaff@g.o>
36 authlogic-oid-1.0.4-r1.ebuild:
37 Keyword ~x86-macos.
38
39 diff --git a/dev-ruby/authlogic-oid/Manifest b/dev-ruby/authlogic-oid/Manifest
40 index e3ce459..7c55873 100644
41 --- a/dev-ruby/authlogic-oid/Manifest
42 +++ b/dev-ruby/authlogic-oid/Manifest
43 @@ -1,14 +1,16 @@
44 -----BEGIN PGP SIGNED MESSAGE-----
45 Hash: SHA256
46
47 +AUX authlogic-oid-1.0.4-open_id_authentication.patch 1728 RMD160 395b4985f94a9d671e0c869d2bd66168f0f2ae0b SHA1 65f7d0d3b22c104a23e02827a19873086c135e9e SHA256 3ef9aba0e010a1820c3265ed977cfa0a84a8cf9521e1c6456d624205e347a6fd
48 DIST authlogic-oid-1.0.4.gem 24064 RMD160 551fdf9707df1929ae739fa11a31a5ebf52a611a SHA1 8222cd2d0445d2625e175f26862446068b76a9fc SHA256 a15226df0835a585e6a111f93bf941b108d135448b63d4d231530afaa0c0bfab
49 EBUILD authlogic-oid-1.0.4-r1.ebuild 846 RMD160 12a0aa2451bdb0bbc7f513b1a51c046261c61234 SHA1 d6450ebaca6f2fdea3641fb7057098617fe07579 SHA256 8aab86fcef23c6426a638bd40fbd6cdebfe438cb29bd5018527433301407648a
50 -MISC ChangeLog 905 RMD160 07c678a259fa7e5e794b73087f2cbd57d94a0e87 SHA1 b7b0d655427482996ed6cf1b925ece8d0db29874 SHA256 681003ff567df9b8a5ddbb5d7c1bb220db4e8eddc46c0419fb5667b7cd6fc16a
51 +EBUILD authlogic-oid-1.0.4-r2.ebuild 903 RMD160 41b642cdd19e397cd7a03422c30d4cf7dfe3c6a6 SHA1 9f295478b2a41f5f2667a214351d4dac5a0f2d25 SHA256 de82d0ca39dfbeae8ce1789df207244a9806b954d074689dc2c8f29ff0171fc7
52 +MISC ChangeLog 1173 RMD160 bfcf36e353a84fdef208bd577febb8262f340270 SHA1 e7d3bb2aa8acaee1dbc54b1b4ad5e6e17f389839 SHA256 d5dcb26f5148d72dae36d09bb08c57d06ba10dbe6efad53f253adb3333ab98f8
53 MISC metadata.xml 201 RMD160 bbf7920d9809941fb024d20016dbe2fb9f15ff97 SHA1 e629d21795e99a77bd0a6aded1a153fd12d5b2c5 SHA256 c90b12c6600840878686d4544dbc51d97b0715add76b40d9400415cdef6324ad
54 -----BEGIN PGP SIGNATURE-----
55 -Version: GnuPG v2.0.16 (GNU/Linux)
56 +Version: GnuPG v2.0.17 (GNU/Linux)
57
58 -iF4EAREIAAYFAk0m9hAACgkQrnu0mw69JkqE2QD8CR8N7ZwWduHjVMUG62Wv6FEb
59 -hU3KEKVUJTP94bezoeoBAIFGP8RMn9fvUs8o6Jyz7g1GRXTvza7rNl68gQ/0jwsq
60 -=UOsM
61 +iF4EAREIAAYFAk6u0aEACgkQiIP6VqMIqNe9dAD/fLInim++v3STdyjiQIG9xoku
62 +ZpqdluCVDY7ZMMN9hLoA+wbwiW7Vbc0aN3JVrTNQjEBVeqi5sC1ASJM3RLnLexCc
63 +=CYag
64 -----END PGP SIGNATURE-----
65
66 diff --git a/dev-ruby/authlogic-oid/authlogic-oid-1.0.4-r2.ebuild b/dev-ruby/authlogic-oid/authlogic-oid-1.0.4-r2.ebuild
67 new file mode 100644
68 index 0000000..e12d857
69 --- /dev/null
70 +++ b/dev-ruby/authlogic-oid/authlogic-oid-1.0.4-r2.ebuild
71 @@ -0,0 +1,36 @@
72 +# Copyright 1999-2011 Gentoo Foundation
73 +# Distributed under the terms of the GNU General Public License v2
74 +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/zentest/zentest-3.3.0.ebuild,v 1.1 2006/08/28 14:34:06 pclouds Exp $
75 +
76 +EAPI=2
77 +USE_RUBY="ruby18"
78 +
79 +RUBY_FAKEGEM_TASK_DOC="docs"
80 +
81 +RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.rdoc"
82 +
83 +RUBY_FAKEGEM_EXTRAINSTALL="init.rb"
84 +
85 +inherit ruby-fakegem
86 +
87 +DESCRIPTION="Extension of the Authlogic library to add OpenID support."
88 +HOMEPAGE="http://authlogic-oid.rubyforge.org/"
89 +LICENSE="MIT"
90 +
91 +KEYWORDS="~amd64 ~x86 ~x86-macos"
92 +SLOT="0"
93 +IUSE=""
94 +
95 +# Tests use hardcoded path to authlogic
96 +RESTRICT="test"
97 +
98 +ruby_add_bdepend "doc? ( dev-ruby/hoe )"
99 +
100 +ruby_add_rdepend ">=dev-ruby/authlogic-2.0.13"
101 +
102 +all_ruby_prepare() {
103 + # Remove reference to documenation template we don't have.
104 + sed -i -e 's/-T hanna//' Rakefile || die
105 +
106 + epatch "${FILESDIR}/${P}-open_id_authentication.patch"
107 +}
108
109 diff --git a/dev-ruby/authlogic-oid/files/authlogic-oid-1.0.4-open_id_authentication.patch b/dev-ruby/authlogic-oid/files/authlogic-oid-1.0.4-open_id_authentication.patch
110 new file mode 100644
111 index 0000000..6158e2c
112 --- /dev/null
113 +++ b/dev-ruby/authlogic-oid/files/authlogic-oid-1.0.4-open_id_authentication.patch
114 @@ -0,0 +1,38 @@
115 +commit 9b802c347f5addebcbce945af3b5f80b3ee7b214
116 +Author: Michael Reinsch <michael@××××××××.com>
117 +Date: Wed Mar 17 20:14:44 2010 +0900
118 +
119 + use OpenID to do the URL normalization; this isn't in the rails plugin anymore
120 +
121 +diff --git a/lib/authlogic_openid/acts_as_authentic.rb b/lib/authlogic_openid/acts_as_authentic.rb
122 +index 11f6fc2..7745299 100644
123 +--- a/lib/authlogic_openid/acts_as_authentic.rb
124 ++++ b/lib/authlogic_openid/acts_as_authentic.rb
125 +@@ -53,9 +53,9 @@ module AuthlogicOpenid
126 +
127 + # Set the openid_identifier field and also resets the persistence_token if this value changes.
128 + def openid_identifier=(value)
129 +- write_attribute(:openid_identifier, value.blank? ? nil : OpenIdAuthentication.normalize_identifier(value))
130 ++ write_attribute(:openid_identifier, value.blank? ? nil : OpenID.normalize_url(value))
131 + reset_persistence_token if openid_identifier_changed?
132 +- rescue OpenIdAuthentication::InvalidOpenId => e
133 ++ rescue OpenID::DiscoveryFailure => e
134 + @openid_error = e.message
135 + end
136 +
137 +diff --git a/lib/authlogic_openid/session.rb b/lib/authlogic_openid/session.rb
138 +index 1052c5b..9a348c3 100644
139 +--- a/lib/authlogic_openid/session.rb
140 ++++ b/lib/authlogic_openid/session.rb
141 +@@ -48,9 +48,9 @@ module AuthlogicOpenid
142 + end
143 +
144 + def openid_identifier=(value)
145 +- @openid_identifier = value.blank? ? nil : OpenIdAuthentication.normalize_identifier(value)
146 ++ @openid_identifier = value.blank? ? nil : OpenID.normalize_url(value)
147 + @openid_error = nil
148 +- rescue OpenIdAuthentication::InvalidOpenId => e
149 ++ rescue OpenID::DiscoveryFailure => e
150 + @openid_identifier = nil
151 + @openid_error = e.message
152 + end