Your message dated Mon, 19 Mar 2012 20:52:50 +0000
with message-id <[email protected]>
and subject line Bug#661569: fixed in ikiwiki 3.20120203
has caused the Debian Bug report #661569,
regarding ikiwiki: allow dropping the generator tag and or its version=
attribute from atom feeds
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
661569: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=661569
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: ikiwiki
Version: 3.20120202
Severity: wishlist
I store the static HTML output of ikiwiki for my website and blog in git
so that I can detect changes in the output that might not be desirable.
Every time I upgrade ikiwiki and rebuild my HTML, all of the atom feeds
have changed because ikiwiki hardcodes the version number in the
template. I find it a bit annoying to have to commit this before I start
a new blog post so I would like to remove it. According to RFC 4287[1],
both the generator tag itself and the version attribute are optional. I
have prepared the attached patch to allow these to be disabled.
1. http://tools.ietf.org/html/rfc4287#section-4.2.4
-- System Information:
Debian Release: wheezy/sid
APT prefers testing
APT policy: (700, 'testing'), (600, 'unstable'), (550, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_AU.utf8, LC_CTYPE=en_AU.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages ikiwiki depends on:
ii libhtml-parser-perl 3.69-1+b1
ii libhtml-scrubber-perl 0.09-1
ii libhtml-template-perl 2.10-1
ii libjson-perl 2.53-1
ii libtext-markdown-discount-perl 0.02-1
ii liburi-perl 1.59-1
ii libyaml-libyaml-perl 0.38-1
ii perl 5.14.2-7
ii python 2.7.2-10
ii python-support 1.0.14
Versions of packages ikiwiki recommends:
ii bzr 2.5.0~bzr6458-2
ii darcs 2.5.2-6+b2
ii gcc [c-compiler] 4:4.6.2-4
ii gcc-4.4 [c-compiler] 4.4.6-14
ii gcc-4.5 [c-compiler] 4.5.3-12
ii gcc-4.6 [c-compiler] 4.6.2-12
ii git [git-core] 1:1.7.9-1
ii git-core 1:1.7.9-1
ii libauthen-passphrase-perl <none>
ii libc6-dev [libc-dev] 2.13-26
ii libcgi-formbuilder-perl <none>
ii libcgi-session-perl <none>
ii libcrypt-ssleay-perl 0.58-1
ii libgravatar-url-perl <none>
ii liblwpx-paranoidagent-perl <none>
ii libmail-sendmail-perl 0.79.16-1
ii libnet-openid-consumer-perl <none>
ii librpc-xml-perl <none>
ii libterm-readline-gnu-perl <none>
ii libtimedate-perl 1.2000-1
ii libxml-simple-perl 2.18-3
ii mercurial 2.1-1
ii subversion 1.6.17dfsg-3
Versions of packages ikiwiki suggests:
pn dvipng <none>
pn file 5.10-1
pn gettext 0.18.1.1-5
pn graphviz 2.26.3-9
pn libfile-mimeinfo-perl <none>
pn libhighlight-perl <none>
pn libhtml-tree-perl 4.2-1
pn liblocale-gettext-perl 1.05-7+b1
pn libmailtools-perl 2.08-1
pn libnet-amazon-s3-perl <none>
pn libnet-inet6glue-perl 0.5-1
pn libsearch-xapian-perl 1.2.8.0-2
pn libsort-naturally-perl <none>
pn libsparkline-php <none>
pn libtext-csv-perl 1.21-1
pn libtext-multimarkdown-perl <none>
pn libtext-textile-perl <none>
pn libtext-typography-perl <none>
pn libtext-wikicreole-perl <none>
pn libtext-wikiformat-perl <none>
pn libxml-feed-perl 0.46+dfsg-1
pn perlmagick 8:6.6.9.7-6
pn po4a 0.41-1
pn polygen <none>
pn python-docutils 0.8.1-5
pn texlive <none>
pn tidy <none>
pn viewvc | gitweb | viewcvs <none>
pn xapian-omega <none>
--
bye,
pabs
http://wiki.debian.org/PaulWise
From 2e5a46a1886eed587b7df4a15837af852b107cd3 Mon Sep 17 00:00:00 2001
From: Paul Wise <[email protected]>
Date: Tue, 28 Feb 2012 11:32:45 +0800
Subject: [PATCH] Allow dropping the generator tag or the version attribute on
it.
Both the generator tag and its version attribute are optional:
http://tools.ietf.org/html/rfc4287#section-4.2.4
---
IkiWiki.pm | 16 ++++++++++++++++
IkiWiki/Plugin/inline.pm | 3 ++-
templates/atompage.tmpl | 6 ++++++
3 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/IkiWiki.pm b/IkiWiki.pm
index 2a83777..1b6cc55 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -497,6 +497,22 @@ sub getsetup () {
safe => 0,
rebuild => 0,
},
+ generator => {
+ type => "boolean",
+ default => 1,
+ description => "advertise that pages are generated using ikiwiki?",
+ advanced => 1,
+ safe => 1,
+ rebuild => 1,
+ },
+ generator_version => {
+ type => "boolean",
+ default => 1,
+ description => "advertise which version of ikiwiki was used to generate pages?",
+ advanced => 1,
+ safe => 1,
+ rebuild => 1,
+ },
}
sub defaultconfig () {
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 159cc5d..e25922c 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -668,6 +668,8 @@ sub genfeed ($$$$$@) {
}
my $template=template_depends($feedtype."page.tmpl", $page, blind_cache => 1);
+ $template->param(generator => "yes") if $config{generator};
+ $template->param(version => $IkiWiki::version) if $config{generator_version};
$template->param(
title => $page ne "index" ? pagetitle($page) : $config{wikiname},
wikiname => $config{wikiname},
@@ -677,7 +679,6 @@ sub genfeed ($$$$$@) {
guid => $guid,
feeddate => date_3339($lasttime),
feedurl => $feedurl,
- version => $IkiWiki::version,
);
run_hooks(pagetemplate => sub {
shift->(page => $page, destpage => $page,
diff --git a/templates/atompage.tmpl b/templates/atompage.tmpl
index e82b598..05a4a97 100644
--- a/templates/atompage.tmpl
+++ b/templates/atompage.tmpl
@@ -33,7 +33,13 @@
<id><TMPL_VAR PAGEURL></id>
</TMPL_IF>
<subtitle type="html"><TMPL_VAR FEEDDESC ESCAPE=HTML></subtitle>
+<TMPL_IF GENERATOR>
+<TMPL_IF VERSION>
<generator uri="http://ikiwiki.info/"; version="<TMPL_VAR VERSION>">ikiwiki</generator>
+<TMPL_ELSE>
+<generator uri="http://ikiwiki.info/";>ikiwiki</generator>
+</TMPL_IF>
+</TMPL_IF>
<updated><TMPL_VAR FEEDDATE></updated>
<TMPL_VAR CONTENT>
</feed>
--
1.7.9
signature.asc
Description: This is a digitally signed message part
--- End Message ---
--- Begin Message ---
Source: ikiwiki
Source-Version: 3.20120203
We believe that the bug you reported is fixed in the latest version of
ikiwiki, which is due to be installed in the Debian FTP archive:
ikiwiki_3.20120203.dsc
to main/i/ikiwiki/ikiwiki_3.20120203.dsc
ikiwiki_3.20120203.tar.gz
to main/i/ikiwiki/ikiwiki_3.20120203.tar.gz
ikiwiki_3.20120203_all.deb
to main/i/ikiwiki/ikiwiki_3.20120203_all.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Joey Hess <[email protected]> (supplier of updated ikiwiki package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Mon, 19 Mar 2012 14:24:43 -0400
Source: ikiwiki
Binary: ikiwiki
Architecture: source all
Version: 3.20120203
Distribution: unstable
Urgency: low
Maintainer: Joey Hess <[email protected]>
Changed-By: Joey Hess <[email protected]>
Description:
ikiwiki - a wiki compiler
Closes: 659158 660549 661198 661569
Changes:
ikiwiki (3.20120203) unstable; urgency=low
.
* osm: New plugin to embed an OpenStreetMap into a wiki page.
Supports waypoints, tags, and can even draw paths matching
wikilinks between pages containing waypoints.
Thanks to Blars Blarson and Antoine Beaupré, as well as the worldwide
OpenStreetMap community for this utter awesomeness.
* trail: New plugin to add navigation trails through pages via Next and
Previous links. Trails can easily be added to existing inlines by setting
trail=yes in the inline.
Thanks to Simon McVittie for his persistance developing this feature.
* Fix a snail mail address. Closes: #659158
* openid-jquery.js: Update URL of Wordpress favicon. Closes: #660549
* Drop the version attribute on the generator tag in Atom feeds
to make builds more reproducible. Closes: #661569 (Paul Wise)
* shortcut: Support Wikipedia's form of url-encoding for unicode
characters, which involves mojibake. Closes: #661198
* Add a few missing jquery UI icons to attachment upload widget underlay.
* URI escape filename when generating the diffurl.
* Add build-affected hook. Used by trail.
Checksums-Sha1:
ed6a0f44414fdb651c81046233e1be7c8c03820f 1812 ikiwiki_3.20120203.dsc
7b3b8085e4df55be8aeda650065798947412952b 2807717 ikiwiki_3.20120203.tar.gz
cf886401dac21712a4bef1e78d8a52da2561c4c2 1917726 ikiwiki_3.20120203_all.deb
Checksums-Sha256:
604fec282e46fcda940730ec06872a7a45849609bce19547c06d58ecc89a870c 1812
ikiwiki_3.20120203.dsc
47d3183c232115079a57fa587097741c14ad73183a57fdd9acd705bcae94760c 2807717
ikiwiki_3.20120203.tar.gz
18e20c018502528dc0a4280fb5981139850e5098a30b4bbbaa6b301998f5cf1a 1917726
ikiwiki_3.20120203_all.deb
Files:
0fd44914e1dd1ae0b64815bf76a59a03 1812 web optional ikiwiki_3.20120203.dsc
ad12f7b73a889c848b97346b66909633 2807717 web optional ikiwiki_3.20120203.tar.gz
de527d4091085c73dc816f59440ee9e4 1917726 web optional
ikiwiki_3.20120203_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQIVAwUBT2d+gMkQ2SIlEuPHAQigCQ/+P0N7NjrRNx/6EYymq78B6tlkM7dOleGg
eJcMmZyjw8Tl8Bge0ujgzvpBzTfLBlr0v7dWYGlJD5qTV/QLjm1mw2tutMkIv3PG
Zuc2pktGrwoq3Ec61V70P9jUZBybLulj71BusXyQQToWXESvCa7R0eugHypriGhF
NLEYBIL00qcfIHRU22c1tHYV6cpzorWdXzphXmuRcEo3eEc61LMbcvJXUA0v8Ky1
LlzFHAha89fHXbs6mYvxRamvRCJ1AVr56aZaPq4s9m9OCI8Y29a55mwNzHQwpvCa
w02PamUrMYPT4ZVf14sXVwNUz6J0WolOQghgIUe1MgQpZ9mXxiUKCl8nc5OtJq33
OLHcU+7H8Z1G8+jeGRglt1Pa3s/4XNLKrMtB+8Gd2OZjmfIgOs+c03iE/UAOr11M
qJGp/3+t4+n9RSK8V2/AsMQIi4Q5tBPiz50p9rAIQN1F2bHh623A6epcxN0iqjnM
0/+diF9QtLwgEehF+sFmnIQqKf6jz9QSjghulgxTLY+sdPLM2jYeQ1IjT+zzvArP
/VzC2AhztxZaZkQmGs5lSFuKBIt7XH+nd7miP0+dyFXPpMx9dpS6jBgPr50iZ4P8
c+32ljwwqkoKHYOVMAI0j8ARTm6bmxeFc/Y+BaK8+m1atP7ONMqdq0sOZD90nBqn
5kgK/DeXfeE=
=t/RA
-----END PGP SIGNATURE-----
--- End Message ---
