Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info

IkiWiki/Plugin/htmlscrubber.pm

@@ -22,12 +22,12 @@ sub import { #{{{
 		"dav", "dict", "dns", "fax", "go", "h323", "im", "imap",
 		"ldap", "mid", "news", "nfs", "nntp", "pop", "pres",
 		"sip", "sips", "snmp", "tel", "urn", "wais", "xmpp",
-		"z39.50r", "z39.50s",
+		"z39\.50r", "z39\.50s",
 		# Selected unofficial schemes
 		"aim", "callto", "cvs", "ed2k", "feed", "fish", "gg",
 		"irc", "ircs", "lastfm", "ldaps", "magnet", "mms",
 		"msnim", "notes", "rsync", "secondlife", "skype", "ssh",
-		"sftp", "sms", "steam", "webcal", "ymsgr",
+		"sftp", "sms", "webcal", "ymsgr",
 	);
 	# data is a special case. Allow data:image/*, but
 	# disallow data:text/javascript and everything else.

debian/changelog

@@ -23,7 +23,12 @@ ikiwiki (2.31.3) unstable; urgency=high
   * meta: Check that the urls provided for authorurl, permalink, and openid
     are safe and can't contain javascript.
 
- -- Josh Triplett <josh@freedesktop.org>  Sun, 10 Feb 2008 13:59:00 -0800
+  [ Josh Triplett ]
+  * Match literal '.' in URI schemas containing '.', rather than matching any
+    character.
+  * Do not allow the steam: URI scheme.
+
+ -- Josh Triplett <josh@freedesktop.org>  Sun, 10 Feb 2008 14:48:48 -0800
 
 ikiwiki (2.31.2) unstable; urgency=high