From: "Steven M. Schweda" <sms@antinode.info>
Subject: Do not ignore extra fields containing Unix Timestamps
Bug-Debian: https://bugs.debian.org/842993
X-Debian-version: 6.0-21

--- a/process.c
+++ b/process.c
@@ -2914,10 +2914,13 @@
             break;
 
           case EF_IZUNIX2:
-            if (have_new_type_eb == 0) {
-                flags &= ~0x0ff;        /* ignore any previous IZUNIX field */
+            if (have_new_type_eb == 0) {        /* (< 1) */
                 have_new_type_eb = 1;
             }
+            if (have_new_type_eb <= 1) {
+                /* Ignore any prior (EF_IZUNIX/EF_PKUNIX) UID/GID. */
+                flags &= 0x0ff;
+            }
 #ifdef IZ_HAVE_UXUIDGID
             if (have_new_type_eb > 1)
                 break;          /* IZUNIX3 overrides IZUNIX2 e.f. block ! */
@@ -2933,6 +2936,8 @@
             /* new 3rd generation Unix ef */
             have_new_type_eb = 2;
 
+            /* Ignore any prior EF_IZUNIX/EF_PKUNIX/EF_IZUNIX2 UID/GID. */
+            flags &= 0x0ff;
         /*
           Version       1 byte      version of this extra field, currently 1
           UIDSize       1 byte      Size of UID field
@@ -2953,8 +2958,6 @@
                 uid_size = *((EB_HEADSIZE + 1) + ef_buf);
                 gid_size = *((EB_HEADSIZE + uid_size + 2) + ef_buf);
 
-                flags &= ~0x0ff;      /* ignore any previous UNIX field */
-
                 if ( read_ux3_value((EB_HEADSIZE + 2) + ef_buf,
                                     uid_size, &z_uidgid[0])
                     &&
 action='/guix/log/gnu/packages/c.scm'>
<input type='hidden' name='id' value='5427db0dc0c625b6fbc33dc78e456b6cdd6e95d2'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=5427db0dc0c625b6fbc33dc78e456b6cdd6e95d2'>root</a>/<a href='/guix/log/gnu?id=5427db0dc0c625b6fbc33dc78e456b6cdd6e95d2'>gnu</a>/<a href='/guix/log/gnu/packages?id=5427db0dc0c625b6fbc33dc78e456b6cdd6e95d2'>packages</a>/<a href='/guix/log/gnu/packages/c.scm?id=5427db0dc0c625b6fbc33dc78e456b6cdd6e95d2'>c.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/c.scm?id=5427db0dc0c625b6fbc33dc78e456b6cdd6e95d2&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-03-24 23:44:12 +0100'>2019-03-24</span></td><td><a href='/guix/commit/gnu/packages/c.scm?id=011ec1e51bc970173654babe63f8ec2fcec42eef'>gnu: Add udunits.</a><span class='msg-avail'>...</span></td><td>Ricardo Wurmus</td></tr>
<tr><td><span title='2019-01-31 18:39:19 +0200'>2019-01-31</span></td><td><a href='/guix/commit/gnu/packages/c.scm?id=9117d6df87f2c31c91a78b2969434880c3afad2c'>gnu: tcc: Fix building on armhf-linux.</a><span class='msg-avail'>...</span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2019-01-31 17:47:44 +0200'>2019-01-31</span></td><td><a href='/guix/commit/gnu/packages/c.scm?id=0270b24b65a06547d43e77eebed0e19ad8ab6e15'>gnu: tcc: Mark aarch64-linux as supported.</a><span class='msg-avail'>...</span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2018-11-21 17:38:00 +0100'>2018-11-21</span></td><td><a href='/guix/commit/gnu/packages/c.scm?id=bf6859e45ad33aa631fc231b23df2d56aff97360'>gnu: libbytesize: Make .mo file builds reproducible.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-11-08 10:08:09 +0100'>2018-11-08</span></td><td><a href='/guix/commit/gnu/packages/c.scm?id=9c30cba431ccc36462f91652b624ae0068d77491'>gnu: pcc: Use INVOKE.</a><span class='msg-avail'>...</span></td><td>Ricardo Wurmus</td></tr>
<tr><td><span title='2018-10-24 04:56:23 +0200'>2018-10-24</span></td><td><a href='/guix/commit/gnu/packages/c.scm?id=94617bddb01b9e295f82a59550ee983341d59288'>gnu: libbytesize: Update to 1.4.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2018-08-27 14:46:26 +0200'>2018-08-27</span></td><td><a href='/guix/commit/gnu/packages/c.scm?id=4715f92ef0b9650cc4075c69f17aa51e84da3f21'>Update email for Pierre Neidhardt.</a><span class='msg-avail'>...</span></td><td>Pierre Neidhardt</td></tr>
<tr><td><span title='2018-07-30 21:51:43 +0200'>2018-07-30</span></td><td><a href='/guix/commit/gnu/packages/c.scm?id=c229fb3d8813d2941d3fceaf1c196337f9e97de6'>gnu: Add libbytesize.</a><span class='msg-avail'>...</span></td><td>Pierre Neidhardt</td></tr>
<tr><td><span title='2018-04-30 23:41:21 +0200'>2018-04-30</span></td><td><a href='/guix/commit/gnu/packages/c.scm?id=350f50cbd35b6d1544734a4c6b2d7d43df4ac03c'>gnu: tcc-wrapper: Use Guile 2.2.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-01-19 13:19:33 +0100'>2018-01-19</span></td><td><a href='/guix/commit/gnu/packages/c.scm?id=5d0bd1fbbf00c3f8a06fc64b29f801780f4d46b2'>gnu: tcc: Update to 0.9.27.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>