rpm/xauth
SHA256
1
0
Fork 0
forked from pool/xauth
Code Pull Requests Activity

- Update to version 1.1.3

Browse Source 
* config: Add missing AC_CONFIG_SRCDIR
  * Variable scope reductions, as suggested by cppcheck
  * Remove unnecessary casts from malloc() calls
  * Handle -Wempty-body warning for WRITES() macro
  * configure: Use AC_SYS_LARGEFILE to enable large file support
  * configure: raise minimum autoconf requirement to 2.70
  * unifdef hpux
  * unifdef Lynx
- adjusted xauth-tolerant-hostname-changes.diff

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xauth?expand=0&rev=20
This commit is contained in:
Stefan Dirsch 2024-03-04 04:12:11 +00:00 committed by Git OBS Bridge
parent 4da7e88803
commit 1841083ad2
5 changed files with 50 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
xauth-1.1.2.tar.xz (Stored with Git LFS)
View File

Binary file not shown.

BIN
xauth-1.1.3.tar.xz (Stored with Git LFS) Normal file
View File

Binary file not shown.

59
xauth-tolerant-hostname-changes.diff
View File

@ -1,8 +1,8 @@
Index: xauth-1.0.8/gethost.c Index: xauth-1.1.3/gethost.c
=================================================================== ===================================================================
--- xauth-1.0.8.orig/gethost.c --- xauth-1.1.3.orig/gethost.c
+++ xauth-1.0.8/gethost.c +++ xauth-1.1.3/gethost.c
@@ -156,7 +156,8 @@ struct addrlist *get_address_info ( @@ -150,7 +150,8 @@ struct addrlist *get_address_info (
int family, int family,
const char *fulldpyname, const char *fulldpyname,
int prefix, int prefix,
@ -12,7 +12,7 @@ Index: xauth-1.0.8/gethost.c
{ {
struct addrlist *retval = NULL; struct addrlist *retval = NULL;
int len = 0; int len = 0;
@@ -183,7 +184,7 @@ struct addrlist *get_address_info ( @@ -176,7 +177,7 @@ struct addrlist *get_address_info (
if (prefix == 0 && (strncmp (fulldpyname, "unix:", 5) == 0 || if (prefix == 0 && (strncmp (fulldpyname, "unix:", 5) == 0 ||
fulldpyname[0] == ':')) { fulldpyname[0] == ':')) {
@ -21,7 +21,7 @@ Index: xauth-1.0.8/gethost.c
len = 0; len = 0;
} else { } else {
src = buf; src = buf;
@@ -233,7 +234,7 @@ struct addrlist *get_address_info ( @@ -252,7 +253,7 @@ struct addrlist *get_address_info (
src = &(sin->sin_addr); src = &(sin->sin_addr);
if (*(const in_addr_t *) src == htonl(INADDR_LOOPBACK)) { if (*(const in_addr_t *) src == htonl(INADDR_LOOPBACK)) {
family = FamilyLocal; family = FamilyLocal;
@ -30,7 +30,7 @@ Index: xauth-1.0.8/gethost.c
src = buf; src = buf;
len = strlen (buf); len = strlen (buf);
} else } else
@@ -248,7 +249,7 @@ struct addrlist *get_address_info ( @@ -267,7 +268,7 @@ struct addrlist *get_address_info (
if (!IN6_IS_ADDR_V4MAPPED((const struct in6_addr *)src)) { if (!IN6_IS_ADDR_V4MAPPED((const struct in6_addr *)src)) {
if (IN6_IS_ADDR_LOOPBACK((const struct in6_addr *)src)) { if (IN6_IS_ADDR_LOOPBACK((const struct in6_addr *)src)) {
family = FamilyLocal; family = FamilyLocal;
@ -39,7 +39,7 @@ Index: xauth-1.0.8/gethost.c
src = buf; src = buf;
len = strlen (buf); len = strlen (buf);
} else } else
@@ -303,7 +304,7 @@ struct addrlist *get_address_info ( @@ -322,7 +323,7 @@ struct addrlist *get_address_info (
src = (char *) &hostinetaddr; src = (char *) &hostinetaddr;
if (*(const in_addr_t *) src == htonl(INADDR_LOOPBACK)) { if (*(const in_addr_t *) src == htonl(INADDR_LOOPBACK)) {
family = FamilyLocal; family = FamilyLocal;
@ -48,10 +48,10 @@ Index: xauth-1.0.8/gethost.c
src = buf; src = buf;
len = strlen (buf); len = strlen (buf);
} else { } else {
Index: xauth-1.0.8/parsedpy.c Index: xauth-1.1.3/parsedpy.c
=================================================================== ===================================================================
--- xauth-1.0.8.orig/parsedpy.c --- xauth-1.1.3.orig/parsedpy.c
+++ xauth-1.0.8/parsedpy.c +++ xauth-1.1.3/parsedpy.c
@@ -70,20 +70,23 @@ copystring (const char *src, int len) @@ -70,20 +70,23 @@ copystring (const char *src, int len)
@ -96,11 +96,11 @@ Index: xauth-1.0.8/parsedpy.c
family = FamilyInternet; family = FamilyInternet;
} }
#endif #endif
Index: xauth-1.0.8/process.c Index: xauth-1.1.3/process.c
=================================================================== ===================================================================
--- xauth-1.0.8.orig/process.c --- xauth-1.1.3.orig/process.c
+++ xauth-1.0.8/process.c +++ xauth-1.1.3/process.c
@@ -470,7 +470,7 @@ read_auth_entries(FILE *fp, Bool numeric @@ -491,7 +491,7 @@ read_auth_entries(FILE *fp, Bool numeric
} }
static Bool static Bool
@ -109,7 +109,7 @@ Index: xauth-1.0.8/process.c
{ {
int family; int family;
char *host = NULL, *rest = NULL; char *host = NULL, *rest = NULL;
@@ -490,11 +490,13 @@ get_displayname_auth(const char *display @@ -511,11 +511,13 @@ get_displayname_auth(const char *display
prelen = (cp - displayname); prelen = (cp - displayname);
if (!parse_displayname (displayname + ((prelen > 0) ? prelen + 1 : 0), if (!parse_displayname (displayname + ((prelen > 0) ? prelen + 1 : 0),
@ -124,28 +124,29 @@ Index: xauth-1.0.8/process.c
if (addrlist_head) { if (addrlist_head) {
char buf[40]; /* want to hold largest display num */ char buf[40]; /* want to hold largest display num */
unsigned short dpylen; unsigned short dpylen;
@@ -1240,13 +1242,18 @@ iterdpy (const char *inputfilename, int @@ -1288,6 +1290,12 @@ iterdpy (const char *inputfilename, int
Xauth *tmp_auth; int errors = 0;
AuthList *proto_head, *proto;
AuthList *l, *next; /*
-
+ /*
+ * get saved local address from environment in case the host + * get saved local address from environment in case the host
+ * name has changed after the credential was added. + * name has changed after the credential was added.
+ */ + */
+ char *xlocalhostname = getenv("XAUTHLOCALHOSTNAME"); + char *xlocalhostname = getenv("XAUTHLOCALHOSTNAME");
+ +
/* + /*
* iterate * iterate
*/ */
for (i = start; i < argc; i++) { for (int i = start; i < argc; i++) {
const char *displayname = argv[i]; @@ -1296,7 +1304,7 @@ iterdpy (const char *inputfilename, int
AuthList *next;
int status;
- if (!get_displayname_auth (displayname, &proto_head)) { - if (!get_displayname_auth (displayname, &proto_head)) {
+ if (!get_displayname_auth (displayname, &proto_head, xlocalhostname)) { + if (!get_displayname_auth (displayname, &proto_head, xlocalhostname)) {
prefix (inputfilename, lineno); prefix (inputfilename, lineno);
baddisplayname (displayname, argv[0]); baddisplayname (displayname, argv[0]);
errors++; errors++;
@@ -1601,7 +1608,7 @@ do_add(const char *inputfilename, int li @@ -1659,7 +1667,7 @@ do_add(const char *inputfilename, int li
} }
} }
@ -154,10 +155,10 @@ Index: xauth-1.0.8/process.c
prefix (inputfilename, lineno); prefix (inputfilename, lineno);
baddisplayname (dpyname, argv[0]); baddisplayname (dpyname, argv[0]);
free (key); free (key);
Index: xauth-1.0.8/xauth.h Index: xauth-1.1.3/xauth.h
=================================================================== ===================================================================
--- xauth-1.0.8.orig/xauth.h --- xauth-1.1.3.orig/xauth.h
+++ xauth-1.0.8/xauth.h +++ xauth-1.1.3/xauth.h
@@ -48,10 +48,10 @@ struct addrlist { @@ -48,10 +48,10 @@ struct addrlist {
}; };

14
xauth.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Mon Mar 4 03:59:59 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
- Update to version 1.1.3
* config: Add missing AC_CONFIG_SRCDIR
* Variable scope reductions, as suggested by cppcheck
* Remove unnecessary casts from malloc() calls
* Handle -Wempty-body warning for WRITES() macro
* configure: Use AC_SYS_LARGEFILE to enable large file support
* configure: raise minimum autoconf requirement to 2.70
* unifdef hpux
* unifdef Lynx
- adjusted xauth-tolerant-hostname-changes.diff
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Feb 26 12:04:39 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org> Mon Feb 26 12:04:39 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>

4
xauth.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package xauth # spec file for package xauth
# #
# Copyright (c) 2022 SUSE LLC # Copyright (c) 2024 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -17,7 +17,7 @@
Name: xauth Name: xauth
Version: 1.1.2 Version: 1.1.3
Release: 0 Release: 0
Summary: Utility to edit and display the X authorization information Summary: Utility to edit and display the X authorization information
License: MIT License: MIT