Hello community,

here is the log from the commit of package xauth for openSUSE:Factory checked 
in at 2019-07-16 08:39:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xauth (Old)
 and      /work/SRC/openSUSE:Factory/.xauth.new.1887 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "xauth"

Tue Jul 16 08:39:17 2019 rev:9 rq:714833 version:1.1

Changes:
--------
--- /work/SRC/openSUSE:Factory/xauth/xauth.changes      2017-02-07 
11:56:19.422348701 +0100
+++ /work/SRC/openSUSE:Factory/.xauth.new.1887/xauth.changes    2019-07-16 
08:39:18.851056150 +0200
@@ -1,0 +2,9 @@
+Fri Jul 12 10:41:09 UTC 2019 - Stefan Dirsch <sndir...@suse.com>
+
+- Update to version 1.1
+  * This release fixes a race condition where an existing
+    authority file would be unlinked (possibly causing other
+    clients to fail to connect), and fixes sorting and merging
+    of authority file entries.
+
+-------------------------------------------------------------------

Old:
----
  xauth-1.0.10.tar.bz2

New:
----
  xauth-1.1.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ xauth.spec ++++++
--- /var/tmp/diff_new_pack.TxSIH3/_old  2019-07-16 08:39:19.291055929 +0200
+++ /var/tmp/diff_new_pack.TxSIH3/_new  2019-07-16 08:39:19.295055927 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package xauth
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,12 +12,12 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 Name:           xauth
-Version:        1.0.10
+Version:        1.1
 Release:        0
 Summary:        Utility to edit and display the X authorization information
 License:        MIT
@@ -53,7 +53,7 @@
 
 %files
 %defattr(-,root,root)
-%doc ChangeLog COPYING README
+%doc ChangeLog COPYING README.md
 %{_bindir}/xauth
 %{_mandir}/man1/xauth.1%{?ext_man}
 

++++++ xauth-1.0.10.tar.bz2 -> xauth-1.1.tar.bz2 ++++++
++++ 6891 lines of diff (skipped)
++++    retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/xauth-1.0.10/ChangeLog new/xauth-1.1/ChangeLog
--- old/xauth-1.0.10/ChangeLog  2017-01-29 22:14:44.000000000 +0100
+++ new/xauth-1.1/ChangeLog     2019-07-11 20:55:33.000000000 +0200
@@ -1,3 +1,103 @@
+commit e97992671b3870878709a1c01991488965b61b94
+Author: Adam Jackson <a...@redhat.com>
+Date:   Thu Jul 11 13:49:26 2019 -0400
+
+    xauth 1.1
+
+commit 0932418d9b47e8240160bcbacbdc38b9bc9870d3
+Author: Adam Jackson <a...@redhat.com>
+Date:   Tue Jun 18 12:03:33 2019 -0400
+
+    process: Close a window where no authority file would exist
+    
+    unlink()ing the old auth file before link()ing the temp to the new is
+    just silly. rename() is atomic and will happily clobber the destination,
+    and the only thing link() can give you here is the ability to fail on
+    filesystems that don't support hardlinks.
+    
+    Fixes: xorg/app/xauth#2
+
+commit 42239054b088dcdfc637880a8edf39b841c5ea51
+Author: Michal Srb <m...@suse.com>
+Date:   Thu May 31 15:12:36 2018 +0200
+
+    Sort entries from most specific to most generic.
+    
+    There is no point in adding entry or merging lists if a FamilyWild entry 
would
+    end in front of any entry, or entry without display number would end in 
front
+    of entry with number.
+    
+    This sorts all entries in order:
+      * FamilyWild without display number
+      * FamilyWild with display number
+      * Other family without display number
+      * Other family with display number
+    
+    The order of the entries in each category is kept.
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 06a21f7c3d5eb5dc9a86418e87946cc7ac83e437
+Author: Michal Srb <m...@suse.com>
+Date:   Thu May 31 15:12:35 2018 +0200
+
+    Merge only entries with equal dpy and protoname.
+    
+    Merging two lists, or adding entry a into list acts unexpectedly if the 
list
+    contains FamilyWild or entry with an empty display numbers. For example:
+    
+      > xauth list
+      #ffff#6f70656e737573652d74756d626c6577656564#:  MIT-MAGIC-COOKIE-1  
1500d80327733252cc42ba469138a259
+    
+      > xauth add test/unix:2 MIT-MAGIC-COOKIE-1 
aabbccddeeff00112233445566778899
+      > xauth list
+      test/unix:2  MIT-MAGIC-COOKIE-1  aabbccddeeff00112233445566778899
+    
+    This is because merge_entries compares entries using `match_auth`, which
+    follows the same rules as XauGetBestAuthByAddr. Following these rules is 
good
+    when filtering the output of `xauth list`, but for merging we should 
compare
+    for equality. It used to be done that way before commit 1555fff4. That 
commit
+    changed it to improve the `xauth list` behavior, but did not seem consider 
the
+    impact on merge.
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 673d42c5ffbbb07ad6b9b3d99a9cc78198999dd1
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date:   Wed Nov 21 16:58:33 2018 -0800
+
+    Update configure.ac bug URL for gitlab migration
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit fa5c2797921b2b0c6dcdde5cf1832a90a0a9dfbf
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date:   Fri Nov 16 21:03:57 2018 -0800
+
+    Update README for gitlab migration
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 4a3a9fc5271cd04ab9123e4713d00b161daf0b6a
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date:   Sat May 5 14:58:15 2018 -0700
+
+    Change fall through comment in process.c to match gcc's requirements
+    
+    Needs to match one of the regexps shown under
+    
https://gcc.gnu.org/onlinedocs/gcc-7.3.0/gcc/Warning-Options.html#index-Wimplicit-fallthrough
+    
+    Silences warning from gcc 7.3:
+    process.c: In function ‘dump_entry’:
+    process.c:1007:9: warning: this statement may fall through 
[-Wimplicit-fallthrough=]
+          if (dpyname) {
+             ^
+    process.c:1012:4: note: here
+        default:
+        ^~~~~~~
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
 commit 536d1003a5c4d5ac24cd3b8afd10492e4e6242df
 Author: Matt Turner <matts...@gmail.com>
 Date:   Sun Jan 29 13:09:12 2017 -0800
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/xauth-1.0.10/Makefile.am new/xauth-1.1/Makefile.am
--- old/xauth-1.0.10/Makefile.am        2017-01-29 22:11:07.000000000 +0100
+++ new/xauth-1.1/Makefile.am   2019-07-11 20:55:28.000000000 +0200
@@ -51,3 +51,5 @@
        $(CHANGELOG_CMD)
 
 dist-hook: ChangeLog INSTALL
+
+EXTRA_DIST = README.md
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/xauth-1.0.10/README new/xauth-1.1/README
--- old/xauth-1.0.10/README     2017-01-29 22:00:12.000000000 +0100
+++ new/xauth-1.1/README        1970-01-01 01:00:00.000000000 +0100
@@ -1,71 +0,0 @@
-
-    I. OVERVIEW
-
-The xauth program is used to edit and display the authorization
-information used in connecting to the X server.
-The underlying "Authorization Protocol for X" is described in the
-README file of the libXau module of X11.
-
-    II. BUILDING
-
-Use "./autogen.sh" to configure the package and "make" to compile it.
-A black box check for the correctness of the package can be initiated
-by "make check" (make sure to install "cmdtest" from
-http://liw.fi/cmdtest/). The installation is done by "make install".
-
-   III. COMMUNICATION
-
-All questions regarding this software should be directed at the
-Xorg mailing list:
-
-        http://lists.freedesktop.org/mailman/listinfo/xorg
-
-Please submit bug reports to the Xorg bugzilla:
-
-        https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-
-The master development code repository can be found at:
-
-        git://anongit.freedesktop.org/git/xorg/app/xauth
-
-        http://cgit.freedesktop.org/xorg/app/xauth
-
-For patch submission instructions, see:
-
-       http://www.x.org/wiki/Development/Documentation/SubmittingPatches
-
-For more information on the git code manager, see:
-
-        http://wiki.x.org/wiki/GitPage
-
-
-   IV. RELEASING
-
-This section describes how to release a new version of xauth to the
-public. A detailed description of this process can be found at
-http://www.x.org/wiki/Development/Documentation/ReleaseHOWTO with a
-few clarification below.
-
-Remember, that the last commit _must_ include the version string in
-its diff (not the commit message). This is typically done by
-incrementing the version string in configure.ac.
-
-For releasing under Fedora make sure, that
-/usr/share/util-macros/INSTALL exists. If not, then please create that
-file.
-
-To release a new version of xauth, please follow this steps:
-
- * git clone ssh://git.freedesktop.org/git/xorg/app/xauth
- * cd xauth ; ./autogen.sh ; make ; make check
- * follow ReleaseHowto inside this directory.
-
-Ignore these errors shown during release.sh:
-
-   /bin/sh: ../.changelog.tmp: Permission denied
-   git directory not found: installing possibly empty changelog.
-
-   cp: cannot create regular file '../.INSTALL.tmp': Permission denied
-   util-macros "pkgdatadir" from xorg-macros.pc not found: installing possibly 
empty INSTALL.
-
-[eof]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/xauth-1.0.10/README.md new/xauth-1.1/README.md
--- old/xauth-1.0.10/README.md  1970-01-01 01:00:00.000000000 +0100
+++ new/xauth-1.1/README.md     2019-07-11 20:55:28.000000000 +0200
@@ -0,0 +1,65 @@
+I. OVERVIEW
+-----------
+
+The xauth program is used to edit and display the authorization
+information used in connecting to the X server.
+The underlying "Authorization Protocol for X" is described in the
+README file of the libXau module of X11.
+
+II. BUILDING
+------------
+
+Use "./autogen.sh" to configure the package and "make" to compile it.
+A black box check for the correctness of the package can be initiated
+by "make check" (make sure to install "cmdtest" from
+http://liw.fi/cmdtest/). The installation is done by "make install".
+
+III. COMMUNICATION
+------------------
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+  https://lists.x.org/mailman/listinfo/xorg
+
+The master development code repository can be found at:
+
+  https://gitlab.freedesktop.org/xorg/app/xauth
+
+Please submit bug reports and requests to merge patches there.
+
+For patch submission instructions, see:
+
+  https://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
+IV. RELEASING
+-------------
+
+This section describes how to release a new version of xauth to the
+public. A detailed description of this process can be found at
+https://www.x.org/wiki/Development/Documentation/ReleaseHOWTO with a
+few clarification below.
+
+Remember, that the last commit _must_ include the version string in
+its diff (not the commit message). This is typically done by
+incrementing the version string in configure.ac.
+
+For releasing under Fedora make sure, that
+/usr/share/util-macros/INSTALL exists. If not, then please create that
+file.
+
+To release a new version of xauth, please follow this steps:
+
+ * git clone ssh://git.freedesktop.org/git/xorg/app/xauth
+ * cd xauth ; ./autogen.sh ; make ; make check
+ * follow ReleaseHowto inside this directory.
+
+Ignore these errors shown during release.sh:
+
+    /bin/sh: ../.changelog.tmp: Permission denied
+    git directory not found: installing possibly empty changelog.
+    
+    cp: cannot create regular file '../.INSTALL.tmp': Permission denied
+    util-macros "pkgdatadir" from xorg-macros.pc not found: installing 
possibly empty INSTALL.
+
+[eof]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/xauth-1.0.10/compile new/xauth-1.1/compile
--- old/xauth-1.0.10/compile    2017-01-29 22:14:41.000000000 +0100
+++ new/xauth-1.1/compile       2019-07-11 20:55:31.000000000 +0200
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
 # Written by Tom Tromey <tro...@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -255,7 +255,8 @@
     echo "compile $scriptversion"
     exit $?
     ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
     func_cl_wrapper "$@"      # Doesn't return...
     ;;
 esac
@@ -339,9 +340,9 @@
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/xauth-1.0.10/configure.ac new/xauth-1.1/configure.ac
--- old/xauth-1.0.10/configure.ac       2017-01-29 22:11:19.000000000 +0100
+++ new/xauth-1.1/configure.ac  2019-07-11 20:55:28.000000000 +0200
@@ -22,8 +22,8 @@
 
 AC_PREREQ([2.60])
 AC_INIT([xauth],
-       [1.0.10],
-       [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+       [1.1],
+       [https://gitlab.freedesktop.org/xorg/app/xauth/issues],
        [xauth])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/xauth-1.0.10/missing new/xauth-1.1/missing
--- old/xauth-1.0.10/missing    2017-01-29 22:14:41.000000000 +0100
+++ new/xauth-1.1/missing       2019-07-11 20:55:31.000000000 +0200
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Common wrapper for a few potentially missing GNU programs.
 
-scriptversion=2013-10-28.13; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
 # Originally written by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -101,9 +101,9 @@
   exit $st
 fi
 
-perl_URL=http://www.perl.org/
-flex_URL=http://flex.sourceforge.net/
-gnu_software_URL=http://www.gnu.org/software
+perl_URL=https://www.perl.org/
+flex_URL=https://github.com/westes/flex
+gnu_software_URL=https://www.gnu.org/software
 
 program_details ()
 {
@@ -207,9 +207,9 @@
 exit $st
 
 # Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/xauth-1.0.10/process.c new/xauth-1.1/process.c
--- old/xauth-1.0.10/process.c  2017-01-29 22:00:12.000000000 +0100
+++ new/xauth-1.1/process.c     2019-07-11 20:55:28.000000000 +0200
@@ -890,19 +890,11 @@
                         "%s:  unable to write authority file %s\n",
                         ProgramName, temp_name);
            } else {
-               (void) unlink (xauth_filename);
-#if defined(WIN32) || defined(__UNIXOS2__)
-               if (rename(temp_name, xauth_filename) == -1)
-#else
-               /* Attempt to rename() if link() fails, since this may be on a 
FS that does not support hard links */
-               if (link (temp_name, xauth_filename) == -1 && rename(temp_name, 
xauth_filename) == -1)
-#endif
-               {
+               if (rename(temp_name, xauth_filename) == -1) {
                    fprintf (stderr,
-                    "%s:  unable to link authority file %s, use %s\n",
+                    "%s:  unable to rename authority file %s, use %s\n",
                             ProgramName, xauth_filename, temp_name);
-               } else {
-                   (void) unlink (temp_name);
+                    unlink(temp_name);
                }
            }
        }
@@ -1008,7 +1000,7 @@
                fprintf (fp, "%s", dpyname);
                break;
            }
-           /* else fall through to default */
+           /* else fall through */
          default:
            fprintf (fp, "#%04x#", auth->family);
            fprintfhex (fp, auth->address_length, auth->address);
@@ -1057,16 +1049,22 @@
 
 
 static int
-eq_auth(Xauth *a, Xauth *b)
+eq_auth_dpy_and_name(Xauth *a, Xauth *b)
 {
     return((a->family == b->family &&
            a->address_length == b->address_length &&
            a->number_length == b->number_length &&
            a->name_length == b->name_length &&
-           a->data_length == b->data_length &&
            memcmp(a->address, b->address, a->address_length) == 0 &&
            memcmp(a->number, b->number, a->number_length) == 0 &&
-           memcmp(a->name, b->name, a->name_length) == 0 &&
+           memcmp(a->name, b->name, a->name_length) == 0) ? 1 : 0);
+}
+
+static int
+eq_auth(Xauth *a, Xauth *b)
+{
+    return((eq_auth_dpy_and_name(a, b) &&
+           a->data_length == b->data_length &&
            memcmp(a->data, b->data, a->data_length) == 0) ? 1 : 0);
 }
 
@@ -1100,17 +1098,6 @@
     return 1;
 }
 
-/* return non-zero iff display and authorization type are the same */
-
-static int
-match_auth(register Xauth *a, register Xauth *b)
-{
-    return ((match_auth_dpy(a, b)
-            && a->name_length == b->name_length
-            && memcmp(a->name, b->name, a->name_length) == 0) ? 1 : 0);
-}
-
-
 static int
 merge_entries(AuthList **firstp, AuthList *second, int *nnewp, int *nreplp)
 {
@@ -1144,7 +1131,7 @@
 
        a = first;
        for (;;) {
-           if (match_auth (a->auth, b->auth)) {  /* found a duplicate */
+           if (eq_auth_dpy_and_name (a->auth, b->auth)) {  /* found a 
duplicate */
                AuthList tmp;           /* swap it in for old one */
                tmp = *a;
                *a = *b;
@@ -1175,6 +1162,45 @@
 
 }
 
+static void
+sort_entries(AuthList **firstp)
+{
+    /* Insert sort, in each pass it removes auth records of certain */
+    /* cathegory from the given list and inserts them into the sorted list. */
+
+    AuthList *sorted = NULL, *sorted_tail = NULL;
+    AuthList *prev, *iter, *next;
+
+    #define SORT_OUT(EXPRESSION) { \
+       prev = NULL; \
+       for (iter = *firstp; iter; iter = next) { \
+           next = iter->next; \
+           if (EXPRESSION) { \
+               if (prev) \
+                   prev->next = next; \
+               else \
+                   *firstp = next; \
+               if (sorted_tail == NULL) { \
+                   sorted = sorted_tail = iter; \
+               } else { \
+                   sorted_tail->next = iter; \
+                   sorted_tail = iter; \
+               } \
+               iter->next = NULL; \
+           } else { \
+               prev = iter; \
+           } \
+       } \
+    }
+
+    SORT_OUT(iter->auth->family != FamilyWild && iter->auth->number_length != 
0);
+    SORT_OUT(iter->auth->family != FamilyWild && iter->auth->number_length == 
0);
+    SORT_OUT(iter->auth->family == FamilyWild && iter->auth->number_length != 
0);
+    SORT_OUT(iter->auth->family == FamilyWild && iter->auth->number_length == 
0);
+
+    *firstp = sorted;
+}
+
 static Xauth *
 copyAuth(Xauth *auth)
 {
@@ -1513,6 +1539,7 @@
          printf ("%d entries read in:  %d new, %d replacement%s\n",
                  nentries, nnew, nrepl, nrepl != 1 ? "s" : "");
        if (nentries > 0) xauth_modified = True;
+       sort_entries(&xauth_head);
     }
 
     return 0;
@@ -1661,6 +1688,7 @@
        fprintf (stderr, "unable to merge in added record\n");
        return 1;
     }
+    sort_entries(&xauth_head);
 
     xauth_modified = True;
     return 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/xauth-1.0.10/test-driver new/xauth-1.1/test-driver
--- old/xauth-1.0.10/test-driver        2017-01-29 22:14:41.000000000 +0100
+++ new/xauth-1.1/test-driver   2019-07-11 20:55:31.000000000 +0200
@@ -1,9 +1,9 @@
 #! /bin/sh
 # test-driver - basic testsuite driver script.
 
-scriptversion=2013-07-13.22; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 2011-2014 Free Software Foundation, Inc.
+# Copyright (C) 2011-2018 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -140,9 +140,9 @@
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:


Reply via email to