Merge remote-tracking branch 'origin/master' into obsd

3 files changed, 19 insertions, 9 deletions

diff --git a/.gitignore b/.gitignore
index 4010eee..d13f3c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,9 @@ autom4te.cache/
 autoscan.log
 ChangeLog
 compile
+confdefs.h
+conftest.c
+conftest.err
 config.guess
 config.h
 config.h.in
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 58db6f6..95ac489 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@
 # Please see the ci-templates documentation for details:
 # https://freedesktop.pages.freedesktop.org/ci-templates/
 
-.templates_sha: &template_sha 34f4ade99434043f88e164933f570301fd18b125 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
+.templates_sha: &template_sha 185ede0e9b9b1924b92306ab8b882a6294e92613 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
 
 
 include:
@@ -31,8 +31,8 @@ variables:
   # The tag should be updated each time the list of packages is updated.
   # Changing a tag forces the associated image to be rebuilt.
   # Note: the tag has no meaning, we use a date format purely for readability
-  FDO_DISTRIBUTION_TAG:  '2022-05-10.0'
-  FDO_DISTRIBUTION_PACKAGES: 'git gcc pkgconf autoconf automake make xutils-dev xmlto xorg-sgml-doctools w3m xsltproc fop'
+  FDO_DISTRIBUTION_TAG:  '2023-10-13.1'
+  FDO_DISTRIBUTION_PACKAGES: 'git gcc pkgconf autoconf automake make libc-dev xutils-dev xmlto xorg-sgml-doctools w3m xsltproc fop xz-utils'
 
 
 #
@@ -97,3 +97,9 @@ build:
     - make check
     - make distcheck
     - popd > /dev/null
+  artifacts:
+    name: "automake-logs-$CI_JOB_NAME"
+    when: always
+    expire_in: 1 week
+    paths:
+      - _builddir/config.log
diff --git a/Xtrans.c b/Xtrans.c
index 448f1c4..178698b 100644
--- a/Xtrans.c
+++ b/Xtrans.c
@@ -204,8 +204,9 @@ TRANS(ParseAddress) (const char *address,
 
     char	*mybuf, *tmpptr = NULL;
     const char	*_protocol = NULL;
-    char	*_host, *_port;
+    const char	*_host, *_port;
     char	hostnamebuf[256];
+    char	*_host_buf;
     int		_host_len;
     size_t	len;
 
@@ -294,7 +295,7 @@ TRANS(ParseAddress) (const char *address,
 
     /* Get the host part */
 
-    _host = mybuf;
+    _host = _host_buf = mybuf;
 
     if ((mybuf = strrchr (mybuf,':')) == NULL)
     {
@@ -317,10 +318,10 @@ TRANS(ParseAddress) (const char *address,
     /* hostname in IPv6 [numeric_addr]:0 form? */
     else if ( (_host_len > 3) &&
       ((strcmp(_protocol, "tcp") == 0) || (strcmp(_protocol, "inet6") == 0))
-      && (*_host == '[') && (*(_host + _host_len - 1) == ']') ) {
+      && (_host_buf[0] == '[') && (_host_buf[_host_len - 1] == ']') ) {
 	struct sockaddr_in6 sin6;
 
-	*(_host + _host_len - 1) = '\0';
+	_host_buf[_host_len - 1] = '\0';
 
 	/* Verify address is valid IPv6 numeric form */
 	if (inet_pton(AF_INET6, _host + 1, &sin6) == 1) {
@@ -329,7 +330,7 @@ TRANS(ParseAddress) (const char *address,
 	    _protocol = "inet6";
 	} else {
 	    /* It's not, restore it just in case some other code can use it. */
-	    *(_host + _host_len - 1) = ']';
+	    _host_buf[_host_len - 1] = ']';
 	}
     }
 #endif
@@ -1351,7 +1352,7 @@ int TRANS(GetHostname) (char *buf, int maxlen)
     uname (&name);
     len = strlen (name.nodename);
     if (len >= maxlen) len = maxlen - 1;
-    strncpy (buf, name.nodename, len);
+    memcpy (buf, name.nodename, len);
     buf[len] = '\0';
 #else
     buf[0] = '\0';