From 6d5a4512b5ee4757a474df3f5e938784da963de1 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Fri, 13 Oct 2023 13:26:49 -0700 Subject: gitlab CI: add xz-utils to container for "make distcheck" Also update to latest ci-templates Signed-off-by: Alan Coopersmith --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 58db6f6..d3c55bf 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.0' + FDO_DISTRIBUTION_PACKAGES: 'git gcc pkgconf autoconf automake make xutils-dev xmlto xorg-sgml-doctools w3m xsltproc fop xz-utils' # -- cgit v1.2.3 From 3aa3c318ded5da802e181f0d29b94ab6a692e387 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Fri, 13 Oct 2023 13:32:15 -0700 Subject: gitlab CI: collect config.log to help diagnose failures Signed-off-by: Alan Coopersmith --- .gitlab-ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d3c55bf..8735439 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 -- cgit v1.2.3 From 806f04c6e4529358f160e53135baf105e4ecf3b8 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Fri, 13 Oct 2023 13:37:49 -0700 Subject: gitlab CI: add libc-dev to required packages in build container Resolves configure failure: configure:3823: checking whether the C compiler works configure:3845: gcc conftest.c >&5 /usr/bin/ld: cannot find Scrt1.o: No such file or directory /usr/bin/ld: cannot find crti.o: No such file or directory collect2: error: ld returned 1 exit status configure:3849: $? = 1 configure:3889: result: no Signed-off-by: Alan Coopersmith --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8735439..95ac489 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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: '2023-10-13.0' - FDO_DISTRIBUTION_PACKAGES: 'git gcc pkgconf autoconf automake make xutils-dev xmlto xorg-sgml-doctools w3m xsltproc fop xz-utils' + 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' # -- cgit v1.2.3 From c219be946b1d8a641dcbc7a60904293f105e2866 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Wed, 3 Apr 2024 12:11:48 +0200 Subject: update .gitignore Add some yet missing auto-generated files. Signed-off-by: Enrico Weigelt, metux IT consult --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) 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 -- cgit v1.2.3 From 6171150fe9f8edad3f1cfb14cec59e6a42a9c15b Mon Sep 17 00:00:00 2001 From: Kim Woelders Date: Thu, 28 Mar 2024 17:29:26 +0100 Subject: =?UTF-8?q?TRANS(ParseAddress):=20Fix=20"assignment=20discards=20?= =?UTF-8?q?=E2=80=98const=E2=80=99=20qualifier"=20warnings?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Occurs when compiling xserver master with gcc 13.2.1. In file included from /local/stuff/xorg/include/X11/Xtrans/transport.c:69, from ../os/xstrans.c:17: /local/stuff/xorg/include/X11/Xtrans/Xtrans.c: In function ‘_XSERVTransParseAddress’: /local/stuff/xorg/include/X11/Xtrans/Xtrans.c:216:15: warning: assignment discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers] 216 | _host = ""; | ^ /local/stuff/xorg/include/X11/Xtrans/Xtrans.c:217:15: warning: assignment discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers] 217 | _port = address; | ^ /local/stuff/xorg/include/X11/Xtrans/Xtrans.c:229:15: warning: assignment discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers] 229 | _host = ""; | ^ /local/stuff/xorg/include/X11/Xtrans/Xtrans.c:230:15: warning: assignment discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers] 230 | _port = address + 5; | ^ Signed-off-by: Kim Woelders Part-of: --- Xtrans.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Xtrans.c b/Xtrans.c index 12eefe8..3f50f6a 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; prmsg (3,"ParseAddress(%s)\n", address); @@ -293,7 +294,7 @@ TRANS(ParseAddress) (const char *address, /* Get the host part */ - _host = mybuf; + _host = _host_buf = mybuf; if ((mybuf = strrchr (mybuf,':')) == NULL) { @@ -316,10 +317,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) { @@ -328,7 +329,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 -- cgit v1.2.3 From 656d27ed32af4082e8062c1d7c42b65ea3a6b80f Mon Sep 17 00:00:00 2001 From: Kim Woelders Date: Thu, 28 Mar 2024 18:01:20 +0100 Subject: =?UTF-8?q?TRANS(GetHostname):=20Fix=20"=E2=80=98strncpy=E2=80=99?= =?UTF-8?q?=20output=20truncated.."=20warning?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Occurs when compiling xserver master with gcc 13.2.1. In file included from /local/stuff/xorg/include/X11/Xtrans/transport.c:69: In function ‘_XSERVTransGetHostname’, inlined from ‘_XSERVTransConvertAddress’ at /local/stuff/xorg/include/X11/Xtrans/Xtransutil.c:188:12: /local/stuff/xorg/include/X11/Xtrans/Xtrans.c:1352:5: warning: ‘strncpy’ output truncated before terminating nul copying as many bytes from a string as its length [-Wstringop-truncation] 1352 | strncpy (buf, name.nodename, len); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /local/stuff/xorg/include/X11/Xtrans/Xtrans.c:1350:11: note: length computed here 1350 | len = strlen (name.nodename); | ^~~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Kim Woelders Part-of: --- Xtrans.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Xtrans.c b/Xtrans.c index 3f50f6a..d826996 100644 --- a/Xtrans.c +++ b/Xtrans.c @@ -1349,7 +1349,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'; -- cgit v1.2.3