From 2fe003dac47259aabfc7603ce60ead5a4030c80c Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 9 Jun 2015 22:22:54 +0100 Subject: Populate pagectime from mtime or inode change time, whichever is older When building ikiwiki from a tarball, the mtime (conceptually, the last modification date of the file) is preserved by tar, but the inode change time (creation/metadata-change date of *this copy* of the file) is not. This seems to lead to unstable sort ordering and unreproducible builds. The page can't possibly have been modified before it was created, so we can assume that the modification date is an upper bound for the creation date. --- IkiWiki/Render.pm | 6 +++++- debian/changelog | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index d34e39e8a..bdebaa645 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -474,7 +474,11 @@ sub find_new_files ($) { } $pagecase{lc $page}=$page; if (! exists $pagectime{$page}) { - my $ctime=(srcfile_stat($file, 1))[10]; + my @stat=srcfile_stat($file, 1); + # For the creation time of the page, take the + # inode change time (not creation time!) or + # the modification time, whichever is older. + my $ctime=($stat[10] < $stat[9] ? $stat[10] : $stat[9]); $pagectime{$page}=$ctime if defined $ctime; } } diff --git a/debian/changelog b/debian/changelog index f26cfdaab..c5a007d09 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,8 @@ ikiwiki (3.20150330) UNRELEASED; urgency=medium * Make the attachment plugin work with CGI.pm 4.x (Closes: #786586; workaround for #786587 in libcgi-pm-perl) * Add a public-domain email icon from tango-icon-theme + * Populate pagectime from either mtime or inode change time, + whichever is older, again for more reproducible builds -- Joey Hess Tue, 28 Apr 2015 12:24:08 -0400 -- cgit v1.2.3