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])
                     &&
f5fe7f569826da02bd3a'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/services/version-control.scm'>
<input type='hidden' name='id' value='cf6a25ae73cd9b9675f2f5fe7f569826da02bd3a'/><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=cf6a25ae73cd9b9675f2f5fe7f569826da02bd3a'>root</a>/<a href='/guix/log/gnu?id=cf6a25ae73cd9b9675f2f5fe7f569826da02bd3a'>gnu</a>/<a href='/guix/log/gnu/services?id=cf6a25ae73cd9b9675f2f5fe7f569826da02bd3a'>services</a>/<a href='/guix/log/gnu/services/version-control.scm?id=cf6a25ae73cd9b9675f2f5fe7f569826da02bd3a'>version-control.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/version-control.scm?id=cf6a25ae73cd9b9675f2f5fe7f569826da02bd3a&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-01-10 11:49:13 +0100'>2023-01-10</span></td><td><a href='/guix/commit/gnu/services/version-control.scm?id=22e9b01bdaa8184aa08f03542798750bc587b457'>services: git-daemon: Deprecate 'git-daemon-service' procedure.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/version-control.scm
(git-daemon-service): Define with 'define-deprecated'
* doc/guix.texi (Version Control Services): Replace with
'git-daemon-service-type'

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Bruno Victal</td></tr>
<tr><td><span title='2022-11-17 12:00:32 +0000'>2022-11-17</span></td><td><a href='/guix/commit/gnu/services/version-control.scm?id=35ef5fca0ac997680e47942e25f403fb3ec54c7d'>services: gitolite: Use the correct variable for the user-group.</a><span class='msg-avail'>...<span class='msg-tooltip'>The default value for &lt;gitolite-configuration&gt; has "git" for both the values
of the user and the group, as costumary, which means that unless someone uses
a custom configuration and chooses different strings for user and group, this
wouldn't show up.

* gnu/services/version-control.scm (gitolite-accounts): Use the correct
variable for the name of a (user-group ...).

Signed-off-by: Christopher Baines &lt;mail@cbaines.net&gt;
</span></span></td><td>EuAndreh</td></tr>