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])
                     &&
ff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/wireservice.scm'>
<input type='hidden' name='id' value='525ed495630a9db6ef02d0c31bf767b0764d1165'/><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=525ed495630a9db6ef02d0c31bf767b0764d1165'>root</a>/<a href='/guix/log/gnu?id=525ed495630a9db6ef02d0c31bf767b0764d1165'>gnu</a>/<a href='/guix/log/gnu/packages?id=525ed495630a9db6ef02d0c31bf767b0764d1165'>packages</a>/<a href='/guix/log/gnu/packages/wireservice.scm?id=525ed495630a9db6ef02d0c31bf767b0764d1165'>wireservice.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/wireservice.scm?id=525ed495630a9db6ef02d0c31bf767b0764d1165&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-07-30 00:57:28 +0200'>2020-07-30</span></td><td><a href='/guix/commit/gnu/packages/wireservice.scm?id=43d8faf8de1683e9ed452206313509c003a619d5'>gnu: csvkit: Fix problem caused by the update of python-slugify.</a><span class='msg-avail'>...</span></td><td>Tanguy Le Carrour</td></tr>
<tr><td><span title='2020-07-12 23:08:15 +0200'>2020-07-12</span></td><td><a href='/guix/commit/gnu/packages/wireservice.scm?id=b0e7b6992f3f845e83cfbca4d700b51dba50b4d5'>gnu: Remove ".git" from "https://github/…/….git".</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-03-09 23:55:42 +0100'>2020-03-09</span></td><td><a href='/guix/commit/gnu/packages/wireservice.scm?id=ef617dedd28ffa5c32cf9e0ee2482ce32aa195f4'>gnu: csvkit: Update to 1.0.5.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>