* Add a openidlogin-bg.gif to wikiicons and have the stylesheet use it for the

  OpenID login form rather than linking to a remote logo, to avoid various
  issues. Since there is not yet a license for the actual OpenID logo, this
  file is currently a blank image. Users who want to can copy
  http://openid.net/login-bg.gif into their wiki.

diff --git a/debian/changelog b/debian/changelog
index fb2d2d1475b9fbbc5c99b84afdecd499175e0cde..277245a27d68fc6978128a3fe2fad725c7c32aba 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 ikiwiki (1.44) UNRELEASED; urgency=low
 
   * Patch to fix validaton of atom feeds by fixing the category tags.
+  * Add a openidlogin-bg.gif to wikiicons and have the stylesheet use it for the
+    OpenID login form rather than linking to a remote logo, to avoid various
+    issues. Since there is not yet a license for the actual OpenID logo, this
+    file is currently a blank image. Users who want to can copy
+    http://openid.net/login-bg.gif into their wiki.
 
- -- Joey Hess <joeyh@debian.org>  Sun, 18 Feb 2007 23:40:32 -0500
+ -- Joey Hess <joeyh@debian.org>  Mon, 19 Feb 2007 18:34:58 -0500
 
 ikiwiki (1.43) unstable; urgency=low
 

diff --git a/doc/bugs/Please_don__39__t_refer_to_offsite_openid_image.mdwn b/doc/bugs/Please_don__39__t_refer_to_offsite_openid_image.mdwn
index 832ae8363bbdcc638be52c2fa391cf3c660293f1..561cd6771dfaf858c1f8b344a0f83637050ecf5f 100644 (file)
--- a/doc/bugs/Please_don__39__t_refer_to_offsite_openid_image.mdwn
+++ b/doc/bugs/Please_don__39__t_refer_to_offsite_openid_image.mdwn
@@ -1 +1,19 @@
-In style.css, please don't refer to the OpenID image on an external site.  This reference allows that site to track users of ikiwikis and other sites supporting OpenID.  Furthermore, this reference also opens up cross-site scripting vulnerabilities if the external site did something malicious.  If the image has a Free Software license, please include it in ikiwiki, in the basewiki (preferably converted from gif to png).  If the image does not have a Free Software license, please omit it, and allow users to choose to add it to their CSS themselves if they find the risks acceptable.  --[[JoshTriplett]]
\ No newline at end of file
+In style.css, please don't refer to the OpenID image on an external site.
+This reference allows that site to track users of ikiwikis and other sites
+supporting OpenID.  Furthermore, this reference also opens up cross-site
+scripting vulnerabilities if the external site did something malicious.  If
+the image has a Free Software license, please include it in ikiwiki, in the
+basewiki (preferably converted from gif to png).  If the image does not
+have a Free Software license, please omit it, and allow users to choose to
+add it to their CSS themselves if they find the risks acceptable.
+--[[JoshTriplett]]
+
+> I wasn't able to get a clear statement of the license of that graphic,
+> back when I was writing the openid support although I didn't try very hard
+> (asked on irc on their irc channel, didn't seem to get anyone who was
+> familiar with DFSG). Googling around, they seem to have not yet decided
+> on a license:
+> <http://openid.net/pipermail/general/2007-January/001421.html>
+> <http://lists.danga.com/pipermail/yadis/2005-June/000990.html>
+> 
+> Changed things around .. [[bugs/done]] --[[Joey]]

diff --git a/doc/style.css b/doc/style.css
index 3b8a24d9aa529a6db8b7bc0a52040835ddf7cad1..ef0cb9e5710164afb9850a3a16e0997a2ef0e84a 100644 (file)
--- a/doc/style.css
+++ b/doc/style.css
@@ -220,7 +220,7 @@ div.poll {
 }
 
 input#openid_url {
-       background: url(http://openid.net/login-bg.gif) no-repeat;
+       background: url(wikiicons/openidlogin-bg.gif) no-repeat;
        background-color: #fff;
        background-position: 0 50%;
        color: #000;

diff --git a/doc/wikiicons/openidlogin-bg.gif b/doc/wikiicons/openidlogin-bg.gif
new file mode 100644 (file)
index 0000000..c8f43d0
Binary files /dev/null and b/doc/wikiicons/openidlogin-bg.gif differ