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])
                     &&
f64fdc1919c7d26b6e13b'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/services/lirc.scm'>
<input type='hidden' name='id' value='54edc96c4d85c55feb0f64fdc1919c7d26b6e13b'/><input type='hidden' name='showmsg' value='1'/><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=54edc96c4d85c55feb0f64fdc1919c7d26b6e13b&amp;showmsg=1'>root</a>/<a href='/guix/log/gnu?id=54edc96c4d85c55feb0f64fdc1919c7d26b6e13b&amp;showmsg=1'>gnu</a>/<a href='/guix/log/gnu/services?id=54edc96c4d85c55feb0f64fdc1919c7d26b6e13b&amp;showmsg=1'>services</a>/<a href='/guix/log/gnu/services/lirc.scm?id=54edc96c4d85c55feb0f64fdc1919c7d26b6e13b&amp;showmsg=1'>lirc.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/services/lirc.scm?id=54edc96c4d85c55feb0f64fdc1919c7d26b6e13b'>Collapse</a>)</th><th class='left'>Author</th></tr>
<tr class='logheader'><td><span title='2023-03-03 17:55:34 +0100'>2023-03-03</span></td><td class='logsubject'><a href='/guix/commit/gnu/services/lirc.scm?id=e24555234a2914ccd2f6291f9ca95f60f137d74f'>services: lirc: Deprecate 'lirc-service' procedure.</a></td><td>Bruno Victal</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* doc/guix.texi (Miscellaneous Services): Replace 'lirc-service' with 'lirc-service-type'.
Document &lt;lirc-configuration&gt;.
* gnu/services/lirc.scm (&lt;lirc-configuration&gt;): Set default values based on
the arguments from the now deprecated 'lirc-service' procedure.
(lirc-service-type): Set default value.
(lirc-service): Deprecate procedure.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;


</td></tr>