diff options
| -rw-r--r-- | .gitlab-ci.yml | 99 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | Xtrans.c | 6 | ||||
| -rw-r--r-- | Xtranslcl.c | 2 | ||||
| -rw-r--r-- | Xtranssock.c | 15 | ||||
| -rw-r--r-- | Xtransutil.c | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | doc/xtrans.xml | 2 |
8 files changed, 118 insertions, 12 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..58db6f6 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,99 @@ +# vim: set expandtab shiftwidth=2 tabstop=8 textwidth=0 filetype=yaml: +# +# This CI uses the freedesktop.org ci-templates. +# 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 + + +include: + # Debian container builder template + - project: 'freedesktop/ci-templates' + ref: *template_sha + file: '/templates/debian.yml' + - project: 'freedesktop/ci-templates' + ref: *template_sha + file: '/templates/ci-fairy.yml' + - template: Security/SAST.gitlab-ci.yml + + +stages: + - prep # prep work like rebuilding the container images if there is a change + - build # for actually building and testing things in a container + - test + - deploy + + +variables: + FDO_UPSTREAM_REPO: 'xorg/lib/libxtrans' + FDO_DISTRIBUTION_VERSION: 'stable' + # 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' + + +# +# Verify that commit messages are as expected +# +check-commits: + extends: + - .fdo.ci-fairy + stage: prep + script: + - ci-fairy check-commits --junit-xml=results.xml + except: + - master@xorg/lib/libxtrans + variables: + GIT_DEPTH: 100 + artifacts: + reports: + junit: results.xml + +# +# Verify that the merge request has the allow-collaboration checkbox ticked +# +check-merge-request: + extends: + - .fdo.ci-fairy + stage: deploy + script: + - ci-fairy check-merge-request --require-allow-collaboration --junit-xml=results.xml + artifacts: + when: on_failure + reports: + junit: results.xml + allow_failure: true + + +# +# Build a container with the given tag and the packages pre-installed. +# This only happens if/when the tag changes, otherwise the existing image is +# re-used. +# +container-prep: + extends: + - .fdo.container-build@debian + stage: prep + variables: + GIT_STRATEGY: none + + +# +# The default build, runs on the image built above. +# +build: + stage: build + extends: + - .fdo.distribution-image@debian + script: + - autoreconf -ivf + - mkdir _builddir + - pushd _builddir > /dev/null + - ../configure --disable-silent-rules --enable-specs --enable-xaw7 --enable-xaw7 + - make + - make check + - make distcheck + - popd > /dev/null @@ -25,7 +25,7 @@ Xorg mailing list: https://lists.x.org/mailman/listinfo/xorg -The master development code repository can be found at: +The primary development code repository can be found at: https://gitlab.freedesktop.org/xorg/lib/libxtrans @@ -62,7 +62,7 @@ from The Open Group. * Each transport is assigned a unique transport id. * * New transports can be added by adding an entry in this table. - * For compatiblity, the transport ids should never be renumbered. + * For compatibility, the transport ids should never be renumbered. * Always add to the end of the list. */ @@ -248,7 +248,7 @@ TRANS(ParseAddress) (const char *address, { /* There is a hostname specified */ _protocol = "tcp"; - mybuf = tmpptr; /* reset to the begining of the host ptr */ + mybuf = tmpptr; /* reset to the beginning of the host ptr */ } } else @@ -998,7 +998,7 @@ TRANS(GetConnectionNumber) (XtransConnInfo ciptr) /* * These functions are really utility functions, but they require knowledge * of the internal data structures, so they have to be part of the Transport - * Independant API. + * Independent API. */ #ifdef TRANS_SERVER diff --git a/Xtranslcl.c b/Xtranslcl.c index f8a3976..9fbac1f 100644 --- a/Xtranslcl.c +++ b/Xtranslcl.c @@ -881,7 +881,7 @@ TRANS(LocalOpenClient)(int type, const char *protocol, #if defined(X11_t) /* - * X has a well known port, that is transport dependant. It is easier + * X has a well known port, that is transport dependent. It is easier * to handle it here, than try and come up with a transport independent * representation that can be passed in and resolved the usual way. * diff --git a/Xtranssock.c b/Xtranssock.c index 166a377..59b2924 100644 --- a/Xtranssock.c +++ b/Xtranssock.c @@ -611,12 +611,19 @@ TRANS(SocketOpenCOTSServer) (Xtransport *thistrans, const char *protocol, break; } if (i < 0) { - if (i == -1) - prmsg (1,"SocketOpenCOTSServer: Unable to open socket for %s\n", - thistrans->TransName); - else + if (i == -1) { + if (errno == EAFNOSUPPORT) { + thistrans->flags |= TRANS_NOLISTEN; + prmsg (1,"SocketOpenCOTSServer: Socket for %s unsupported on this system.\n", + thistrans->TransName); + } else { + prmsg (1,"SocketOpenCOTSServer: Unable to open socket for %s\n", + thistrans->TransName); + } + } else { prmsg (1,"SocketOpenCOTSServer: Unable to determine socket type for %s\n", thistrans->TransName); + } return NULL; } diff --git a/Xtransutil.c b/Xtransutil.c index e12f37a..320f87b 100644 --- a/Xtransutil.c +++ b/Xtransutil.c @@ -50,7 +50,7 @@ from The Open Group. /* * These are some utility functions created for convenience or to provide * an interface that is similar to an existing interface. These are built - * only using the Transport Independant API, and have no knowledge of + * only using the Transport Independent API, and have no knowledge of * the internal implementation. */ diff --git a/configure.ac b/configure.ac index d404dc9..5786af9 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ AC_INIT([xtrans], [1.4.0], AC_CONFIG_SRCDIR([Makefile.am]) # Initialize Automake -AM_INIT_AUTOMAKE([foreign dist-bzip2]) +AM_INIT_AUTOMAKE([foreign dist-xz]) # Require xorg-macros minimum of 1.12 for DocBook external references m4_ifndef([XORG_MACROS_VERSION], diff --git a/doc/xtrans.xml b/doc/xtrans.xml index 08a3cac..dd0030b 100644 --- a/doc/xtrans.xml +++ b/doc/xtrans.xml @@ -1109,7 +1109,7 @@ In X11R7 modular releases, these flags are set when running <row> <entry>OSI</entry> <entry>osi</entry> - <entry>name of an OSI adressable host.</entry> + <entry>name of an OSI addressable host.</entry> <entry>Not sure of the specifics yet.</entry> </row> <row> |