Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xauth for openSUSE:Factory checked in at 2026-01-07 16:00:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xauth (Old) and /work/SRC/openSUSE:Factory/.xauth.new.1928 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xauth" Wed Jan 7 16:00:44 2026 rev:16 rq:1325620 version:1.1.5 Changes: -------- --- /work/SRC/openSUSE:Factory/xauth/xauth.changes 2025-03-10 17:57:48.763734723 +0100 +++ /work/SRC/openSUSE:Factory/.xauth.new.1928/xauth.changes 2026-01-07 16:00:59.954079684 +0100 @@ -1,0 +2,8 @@ +Fri Jan 2 09:07:07 UTC 2026 - Dirk Müller <[email protected]> + +- update to 1.1.5: + * man page: fix warnings from `mandoc -T lint` and `groff + -rCHECKSTYLE=10` +- add gpg validation + +------------------------------------------------------------------- Old: ---- xauth-1.1.4.tar.xz New: ---- xauth-1.1.5.tar.xz xauth-1.1.5.tar.xz.sig xauth.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xauth.spec ++++++ --- /var/tmp/diff_new_pack.UrwQy2/_old 2026-01-07 16:01:00.498102326 +0100 +++ /var/tmp/diff_new_pack.UrwQy2/_new 2026-01-07 16:01:00.498102326 +0100 @@ -1,7 +1,7 @@ # # spec file for package xauth # -# Copyright (c) 2025 SUSE LLC +# Copyright (c) 2026 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,15 @@ Name: xauth -Version: 1.1.4 +Version: 1.1.5 Release: 0 Summary: Utility to edit and display the X authorization information License: MIT Group: System/X11/Utilities URL: https://xorg.freedesktop.org/ Source0: https://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.xz +Source1: https://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.xz.sig +Source9: xauth.keyring Patch1: xauth-tolerant-hostname-changes.diff BuildRequires: pkgconfig BuildRequires: pkgconfig(x11) ++++++ xauth-1.1.4.tar.xz -> xauth-1.1.5.tar.xz ++++++ ++++ 2325 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.1.4/ChangeLog new/xauth-1.1.5/ChangeLog --- old/xauth-1.1.4/ChangeLog 2025-03-09 01:48:47.000000000 +0100 +++ new/xauth-1.1.5/ChangeLog 2025-12-31 21:02:30.000000000 +0100 @@ -1,3 +1,71 @@ +commit 6fe9365f11181a043f151f2e67f36015c278791d +Author: Alan Coopersmith <[email protected]> +Date: Wed Dec 31 11:58:21 2025 -0800 + + xauth 1.1.5 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 1cb1d8e0284870a03970a0a45d1c8cfe7ec6a696 +Author: Alan Coopersmith <[email protected]> +Date: Sun May 18 16:31:05 2025 -0700 + + man page: fix warnings from `mandoc -T lint` and `groff -rCHECKSTYLE=10` + + mandoc: xauth.1:26:13: WARNING: cannot parse date, using it verbatim: TH xauth 1.1.4 + mandoc: xauth.1:33:2: WARNING: skipping paragraph macro: PP after SH + mandoc: xauth.1:225:2: WARNING: skipping paragraph macro: sp after PP + mandoc: xauth.1:216:2: WARNING: skipping paragraph macro: PP after SH + mandoc: xauth.1:254:2: WARNING: skipping paragraph macro: PP after SH + an.tmac:xauth.1:96: style: blank line in input + an.tmac:xauth.1:104: style: blank line in input + an.tmac:xauth.1:114: style: blank line in input + an.tmac:xauth.1:122: style: blank line in input + an.tmac:xauth.1:130: style: blank line in input + an.tmac:xauth.1:135: style: blank line in input + an.tmac:xauth.1:142: style: blank line in input + an.tmac:xauth.1:166: style: blank line in input + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xauth/-/merge_requests/28> + +commit 0d43570ad3ca169464daf4304151c9b8d7ab05b8 +Author: Michael Gilbert <[email protected]> +Date: Fri Jul 22 14:57:37 2011 -0400 + + xauth: needs cookie handling warnings in man page [Debian bug #635109] + + Reported-by: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=635109 + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xauth/-/merge_requests/27> + +commit 23735afd04ab561914aa3d5465532be0a6975fef +Author: Alan Coopersmith <[email protected]> +Date: Sun Mar 30 09:07:57 2025 -0700 + + Improve man page formatting + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xauth/-/merge_requests/26> + +commit 9e238deb87c07ecda45ad86ff1e4a49125839446 +Author: Alan Coopersmith <[email protected]> +Date: Sun Mar 23 13:14:50 2025 -0700 + + Add --help and --version options + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xauth/-/merge_requests/26> + +commit eb8b2ef585dc837558cc3f02f85cb88d2a6de5db +Author: Alan Coopersmith <[email protected]> +Date: Sun Mar 23 11:25:50 2025 -0700 + + Report unknown argument that caused error before printing usage message + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xauth/-/merge_requests/26> + commit f71ca21cf1ab840e9664b7c3e99c229bd977a6a4 Author: Alan Coopersmith <[email protected]> Date: Sat Mar 8 16:44:09 2025 -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.1.4/compile new/xauth-1.1.5/compile --- old/xauth-1.1.4/compile 2025-03-09 01:48:40.000000000 +0100 +++ new/xauth-1.1.5/compile 2025-12-31 21:02:22.000000000 +0100 @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2024-06-19.01; # UTC +scriptversion=2025-06-18.21; # UTC -# Copyright (C) 1999-2024 Free Software Foundation, Inc. +# Copyright (C) 1999-2025 Free Software Foundation, Inc. # Written by Tom Tromey <[email protected]>. # # This program is free software; you can redistribute it and/or modify @@ -37,11 +37,11 @@ file_conv= -# func_file_conv build_file lazy +# func_file_conv build_file unneeded_conversions # Convert a $build file to $host form and store it in $file # Currently only supports Windows hosts. If the determined conversion -# type is listed in (the comma separated) LAZY, no conversion will -# take place. +# type is listed in (the comma separated) UNNEEDED_CONVERSIONS, no +# conversion will take place. func_file_conv () { file=$1 @@ -51,9 +51,20 @@ # lazily determine how to convert abs files case `uname -s` in MINGW*) - file_conv=mingw + if test -n "$MSYSTEM" && (cygpath --version) >/dev/null 2>&1; then + # MSYS2 environment. + file_conv=cygwin + else + # Original MinGW environment. + file_conv=mingw + fi ;; - CYGWIN* | MSYS*) + MSYS*) + # Old MSYS environment, or MSYS2 with 32-bit MSYS2 shell. + file_conv=cygwin + ;; + CYGWIN*) + # Cygwin environment. file_conv=cygwin ;; *) @@ -63,12 +74,14 @@ fi case $file_conv/,$2, in *,$file_conv,*) + # This is the optimization mentioned above: + # If UNNEEDED_CONVERSIONS contains $file_conv, don't convert. ;; mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/* | msys/*) - file=`cygpath -m "$file" || echo "$file"` + cygwin/*) + file=`cygpath -w "$file" || echo "$file"` ;; wine/*) file=`winepath -w "$file" || echo "$file"` @@ -343,9 +356,9 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp nil t) # time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-format: "%Y-%02m-%02d.%02H" # 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.1.4/configure.ac new/xauth-1.1.5/configure.ac --- old/xauth-1.1.4/configure.ac 2025-03-09 01:48:36.000000000 +0100 +++ new/xauth-1.1.5/configure.ac 2025-12-31 21:02:17.000000000 +0100 @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.70]) AC_INIT([xauth], - [1.1.4], + [1.1.5], [https://gitlab.freedesktop.org/xorg/app/xauth/-/issues], [xauth]) AC_CONFIG_SRCDIR([xauth.c]) 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.1.4/man/xauth.man new/xauth-1.1.5/man/xauth.man --- old/xauth-1.1.4/man/xauth.man 2025-03-09 01:48:36.000000000 +0100 +++ new/xauth-1.1.5/man/xauth.man 2025-12-31 21:02:17.000000000 +0100 @@ -23,62 +23,62 @@ .\" from The Open Group. .\" .\" -.TH XAUTH 1 __xorgversion__ +.TH XAUTH 1 2025-04-13 __xorgversion__ .SH NAME xauth \- X authority file utility .SH SYNOPSIS .B xauth [ \fB\-f\fP \fIauthfile\fP ] [ \fB\-vqibn\fP ] [ \fIcommand arg ...\fP ] .SH DESCRIPTION -.PP -The \fIxauth\fP program is used to edit and display the authorization +The \fBxauth\fP program is used to edit and display the authorization information used in connecting to the X server. This program is usually used to extract authorization records from one machine and merge them in on another (as is the case when using remote logins or granting access to other users). Commands (described below) may be entered interactively, -on the \fIxauth\fP command line, or in scripts. Note that this program +on the \fBxauth\fP command line, or in scripts. Note that this program does \fBnot\fP contact the X server except when the generate command is used. -Normally \fIxauth\fP is not used to create the authority file entry in -the first place; the program that starts the X server (often \fIxdm\fP -or \fIstartx\fP) does that. +Normally \fBxauth\fP is not used to create the authority file entry in +the first place; the program that starts the X server (often \fBxdm\fP +or \fBstartx\fP) does that. .SH OPTIONS -The following options may be used with \fIxauth\fP. They may be given -individually (e.g., \fI\-q \-i\|\fP) or may combined (e.g., \fI\-qi\|\fP). +The following options may be used with \fBxauth\fP. They may be given +individually (e.g., \fB\-q \-i\|\fP) or may combined (e.g., \fB\-qi\|\fP). .TP 8 .B "\-f \fIauthfile\fP" -This option specifies the name of the authority file to use. By default, -\fIxauth\fP will use the file specified by the XAUTHORITY environment variable -or \fI\.Xauthority\fP in the user's home directory. +This option specifies the name of the authority file to use. +By default, \fBxauth\fP will use the file specified by the +\fBXAUTHORITY\fP environment variable +or \fB\.Xauthority\fP in the user's home directory. .TP 8 .B \-q -This option indicates that \fIxauth\fP should operate quietly and not print -unsolicited status messages. This is the default if an \fIxauth\fP command +This option indicates that \fBxauth\fP should operate quietly and not print +unsolicited status messages. This is the default if an \fBxauth\fP command is given on the command line or if the standard output is not directed to a terminal. .TP 8 .B \-v -This option indicates that \fIxauth\fP should operate verbosely and print +This option indicates that \fBxauth\fP should operate verbosely and print status messages indicating the results of various operations (e.g., how many -records have been read in or written out). This is the default if \fIxauth\fP +records have been read in or written out). This is the default if \fBxauth\fP is reading commands from its standard input and its standard output is directed to a terminal. .TP 8 .B \-i -This option indicates that \fIxauth\fP should ignore any authority file -locks. Normally, \fIxauth\fP will refuse to read or edit any authority files -that have been locked by other programs (usually \fIxdm\fP or another -\fIxauth\fP). +This option indicates that \fBxauth\fP should ignore any authority file +locks. Normally, \fBxauth\fP will refuse to read or edit any authority files +that have been locked by other programs (usually \fBxdm\fP or another +\fBxauth\fP). .TP 8 .B \-b -This option indicates that \fIxauth\fP should attempt to break any authority +This option indicates that \fBxauth\fP should attempt to break any authority file locks before proceeding. Use this option only to clean up stale locks. .TP 8 .B \-n -This option indicates that \fIxauth\fP should not attempt to resolve any +This option indicates that \fBxauth\fP should not attempt to resolve any hostnames, but should simply always print the host address as stored in the authority file. .TP 8 -.B \-V +.BR \-V ", " \--version This option shows the version number of the xauth executable. .SH COMMANDS The following commands may be used to manipulate authority files: @@ -91,12 +91,16 @@ of the octet, and the second digit of the pair gives the least significant 4 bits. For example, a 32 character hexkey would represent a 128-bit value. A protocol name consisting of just a -single period is treated as an abbreviation for \fIMIT-MAGIC-COOKIE-1\fP. - +single period is treated as an abbreviation for \fBMIT-MAGIC-COOKIE-1\fP. +.IP "" 8 +WARNING: This usage is considered insecure since the secret magic cookie +will be displayed in command histories and for example the output of \fBps\fP. +One should use the "merge" command (as described below) instead. +Pay attention to its warning as well. .TP 8 .B "generate \fIdisplayname protocolname\fP \fR[\fPtrusted|untrusted\fR]\fP" .B \fR[\fPtimeout \fIseconds\fP\fR]\fP \fR[\fPgroup \fIgroup-id\fP\fR]\fP \fR[\fBdata \fIhexdata\fR] - +.IP "" 8 This command is similar to add. The main difference is that instead of requiring the user to supply the key data, it connects to the server specified in \fIdisplayname\fP and uses the SECURITY extension @@ -105,8 +109,8 @@ extension, the command fails. Otherwise, an authorization entry for the indicated display using the given protocol is added to the authorization file. A protocol name consisting of just a single -period is treated as an abbreviation for \fIMIT-MAGIC-COOKIE-1\fP. - +period is treated as an abbreviation for \fBMIT-MAGIC-COOKIE-1\fP. +.IP "" 8 If the \fBtrusted\fP option is used, clients that connect using this authorization will have full run of the display, as usual. If \fBuntrusted\fP is used, clients that connect using this authorization @@ -114,7 +118,7 @@ with data belonging to trusted clients. See the SECURITY extension specification for full details on the restrictions imposed on untrusted clients. The default is \fBuntrusted\fP. - +.IP "" 8 The \fBtimeout\fP option specifies how long in seconds this authorization will be valid. If the authorization remains unused (no clients are connected with it) for longer than this time period, the @@ -122,62 +126,66 @@ it will fail. Note that the purging done by the server does \fBnot\fP delete the authorization entry from the authorization file. The default timeout is 60 seconds. - +.IP "" 8 The \fBgroup\fP option specifies the application group that clients connecting with this authorization should belong to. See the application group extension specification for more details. The default is to not belong to an application group. - +.IP "" 8 The \fBdata\fP option specifies data that the server should use to generate the authorization. Note that this is \fBnot\fP the same data that gets written to the authorization file. The interpretation of this data depends on the authorization protocol. The \fIhexdata\fP is in the same format as the \fIhexkey\fP described in the add command. The default is to send no data. - .TP 8 .RB [ n ] "extract \fIfilename displayname..." Authorization entries for each of the specified displays are written to the -indicated file. If the \fInextract\fP command is used, the entries are written +indicated file. If the \fBnextract\fP command is used, the entries are written in a numeric format suitable for non-binary transmission (such as secure electronic mail). The extracted entries can be read back in using the -\fImerge\fP and \fInmerge\fP commands. If the filename consists of +\fBmerge\fP and \fBnmerge\fP commands. If the filename consists of just a single dash, the entries will be written to the standard output. .TP 8 .RB [ n ] "list \fR[\fIdisplayname\fP...]" Authorization entries for each of the specified displays (or all if no -displays are named) are printed on the standard output. If the \fInlist\fP +displays are named) are printed on the standard output. If the \fBnlist\fP command is used, entries will be shown in the numeric format used by -the \fInextract\fP command; otherwise, they are shown in a textual format. +the \fBnextract\fP command; otherwise, they are shown in a textual format. Key data is always displayed in the hexadecimal format given in the -description of the \fIadd\fP command. +description of the \fBadd\fP command. .TP 8 .RB [ n ] "merge \fR[\fIfilename\fP...]" Authorization entries are read from the specified files and are merged into the authorization database, superseding any matching existing entries. If -the \fInmerge\fP command is used, the numeric format given in the description -of the \fIextract\fP command is used. If a filename consists of just a single +the \fBnmerge\fP command is used, the numeric format given in the description +of the \fBextract\fP command is used. If a filename consists of just a single dash, the standard input will be read if it hasn't been read before. +.IP "" 8 +WARNING: Be careful with the single dash version as depending on the +command chain (for example a combination using \fBsudo\fP), +the secret key could be exposed to prying eyes in command histories +and for example in the output of \fBps\fP. .TP 8 .B "remove \fIdisplayname\fR..." Authorization entries matching the specified displays are removed from the authority file. .TP 8 .B "source \fIfilename" -The specified file is treated as a script containing \fIxauth\fP commands +The specified file is treated as a script containing \fBxauth\fP commands to execute. Blank lines and lines beginning with a sharp sign (#) are ignored. A single dash may be used to indicate the standard input, if it hasn't already been read. .TP 8 .B "info" Information describing the authorization file, whether or not any changes -have been made, and from where \fIxauth\fP commands are being read +have been made, and from where \fBxauth\fP commands are being read is printed on the standard output. .TP 8 .B "exit" If any modifications have been made, the authority file is written out (if allowed), and the program exits. An end of file is treated as an implicit -\fIexit\fP command. +\fBexit\fP command. .TP 8 .B "quit" The program exits, ignoring any modifications. This may also be accomplished @@ -193,18 +201,17 @@ .B "?" A short list of the valid commands is printed on the standard output. .SH "DISPLAY NAMES" -Display names for the \fIadd\fP, \fI[n]extract\fP, \fI[n]list\fP, -\fI[n]merge\fP, and \fIremove\fP commands use the same format as the -DISPLAY environment variable and the common \fI\-display\fP command line +Display names for the \fBadd\fP, \fB[n]extract\fP, \fB[n]list\fP, +\fB[n]merge\fP, and \fBremove\fP commands use the same format as the +\fBDISPLAY\fP environment variable and the common \fB\-display\fP command line argument. Display-specific information (such as the screen number) is unnecessary and will be ignored. Same-machine connections (such as local-host sockets, -shared memory, and the Internet Protocol hostname \fIlocalhost\fP) are +shared memory, and the Internet Protocol hostname \fBlocalhost\fP) are referred to as \fIhostname\fP/unix:\fIdisplaynumber\fP so that local entries for different machines may be stored in one authority file. .SH EXAMPLE -.PP -The most common use for \fIxauth\fP is to extract the entry for the +The most common use for \fBxauth\fP is to extract the entry for the current display, copy it to another machine, and merge it into the user's authority file on the remote machine: .sp @@ -212,18 +219,17 @@ % xauth extract \- $DISPLAY | ssh otherhost xauth merge \- .fi .PP -.sp The following command contacts the server :0 to create an -authorization using the MIT-MAGIC-COOKIE-1 protocol. Clients that +authorization using the \fBMIT-MAGIC-COOKIE-1\fP protocol. Clients that connect with this authorization will be untrusted. .nf % xauth generate :0 . .fi .SH ENVIRONMENT -This \fIxauth\fP program uses the following environment variables: +This \fBxauth\fP program uses the following environment variables: .TP 8 .B XAUTHORITY -to get the name of the authority file to use if the \fI\-f\fP option isn't +to get the name of the authority file to use if the \fB\-f\fP option isn't used. .TP 8 .B HOME @@ -233,14 +239,17 @@ .I $HOME/.Xauthority default authority file if XAUTHORITY isn't defined. .SH "SEE ALSO" -X(__miscmansuffix__), Xsecurity(__miscmansuffix__), xhost(__appmansuffix__), -Xserver(__appmansuffix__), xdm(__appmansuffix__), startx(__appmansuffix__), -Xau(__libmansuffix__). +.BR X (__miscmansuffix__), +.BR Xsecurity (__miscmansuffix__), +.BR xhost (__appmansuffix__), +.BR Xserver (__appmansuffix__), +.BR xdm (__appmansuffix__), +.BR startx (__appmansuffix__), +.BR Xau (__libmansuffix__). .SH BUGS -.PP Users that have insecure networks should take care to use encrypted file transfer mechanisms to copy authorization entries between machines. -Similarly, the \fIMIT-MAGIC-COOKIE-1\fP protocol is not very useful in +Similarly, the \fBMIT-MAGIC-COOKIE-1\fP protocol is not very useful in insecure environments. Sites that are interested in additional security may need to use encrypted authorization mechanisms such as Kerberos. .PP 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.1.4/missing new/xauth-1.1.5/missing --- old/xauth-1.1.4/missing 2025-03-09 01:48:40.000000000 +0100 +++ new/xauth-1.1.5/missing 2025-12-31 21:02:22.000000000 +0100 @@ -1,11 +1,11 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU and other programs. -scriptversion=2024-06-07.14; # UTC +scriptversion=2025-06-18.21; # UTC # shellcheck disable=SC2006,SC2268 # we must support pre-POSIX shells -# Copyright (C) 1996-2024 Free Software Foundation, Inc. +# Copyright (C) 1996-2025 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify @@ -228,9 +228,9 @@ exit $st # Local variables: -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp nil t) # time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-format: "%Y-%02m-%02d.%02H" # 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.1.4/test-driver new/xauth-1.1.5/test-driver --- old/xauth-1.1.4/test-driver 2025-03-09 01:48:40.000000000 +0100 +++ new/xauth-1.1.5/test-driver 2025-12-31 21:02:22.000000000 +0100 @@ -1,9 +1,9 @@ #! /bin/sh # test-driver - basic testsuite driver script. -scriptversion=2024-06-19.01; # UTC +scriptversion=2025-06-18.21; # UTC -# Copyright (C) 2011-2024 Free Software Foundation, Inc. +# Copyright (C) 2011-2025 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 @@ -152,9 +152,9 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp nil t) # time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-format: "%Y-%02m-%02d.%02H" # 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.1.4/xauth.c new/xauth-1.1.5/xauth.c --- old/xauth-1.1.4/xauth.c 2025-03-09 01:48:36.000000000 +0100 +++ new/xauth-1.1.5/xauth.c 2025-12-31 21:02:17.000000000 +0100 @@ -58,7 +58,7 @@ */ _X_NORETURN static void -usage(void) +usage(int exitstatus) { static const char *prefixmsg[] = { "", @@ -69,7 +69,7 @@ " -i ignore locks on authority file", " -b break locks on authority file", " -n do not resolve host names in authority file", -" -V show version number of xauth", +" -V, --version show version number of xauth", "", "and commands have the following syntax:", "", @@ -90,7 +90,7 @@ for (const char **msg = suffixmsg; *msg; msg++) { fprintf (stderr, "%s\n", *msg); } - exit (1); + exit (exitstatus); } @@ -114,7 +114,7 @@ for (const char *flag = (arg + 1); *flag; flag++) { switch (*flag) { case 'f': /* -f authfilename */ - if (++i >= argc) usage (); + if (++i >= argc) usage (EXIT_FAILURE); authfilename = argv[i]; continue; case 'v': /* -v */ @@ -135,8 +135,19 @@ case 'V': /* -V */ puts(PACKAGE_VERSION); exit(0); + case '-': /* --help | --version */ + if (strcmp(arg, "--help") == 0) { + usage (EXIT_SUCCESS); + } + else if (strcmp(arg, "--version") == 0) { + puts(PACKAGE_STRING); + exit(EXIT_SUCCESS); + } + /* fallthrough */ default: - usage (); + fprintf(stderr, "%s: unrecognized option '-%s'\n", + ProgramName, flag); + usage (EXIT_FAILURE); } } } else {
