From c11d5ad653d8502bdc84795fc92f749a85affdff Mon Sep 17 00:00:00 2001 From: Kei Date: Wed, 24 Sep 2025 09:55:46 +0900 Subject: [PATCH 1/4] add debian:sid test --- .github/workflows/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml index 5af63167c..40a2f361b 100644 --- a/.github/workflows/config.yml +++ b/.github/workflows/config.yml @@ -17,6 +17,7 @@ jobs: - DOCKER_IMAGE: ubuntu:bionic - DOCKER_IMAGE: ubuntu:focal - DOCKER_IMAGE: debian:stretch + - DOCKER_IMAGE: debian:sid - DOCKER_IMAGE: ubuntu:trusty ROS_DISTRO: indigo - DOCKER_IMAGE: ubuntu:xenial From 83bee50e6de8645ed14a3e999c2aa148e5b97557 Mon Sep 17 00:00:00 2001 From: Kei Date: Wed, 24 Sep 2025 17:17:46 +0900 Subject: [PATCH 2/4] [ga] clean up code to use archive.debian.org for EOL debians --- .travis.sh | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/.travis.sh b/.travis.sh index 6b0d6e5ad..ad91074f9 100755 --- a/.travis.sh +++ b/.travis.sh @@ -32,27 +32,15 @@ function travis_time_end { if [ "$TRAVIS_OS_NAME" == "linux" ]; then travis_time_start setup.apt-get_update - if [[ "$DOCKER_IMAGE" == *"jessie" ]] ; then - # Jessie is EOL, rewrite sources.list and configure apt - # http://archive.debian.org/debian-archive/ - DIST_NAME="jessie" - echo "Rewriting /etc/apt/sources.list for ${DIST_NAME}" - echo "deb http://archive.debian.org/debian/ ${DIST_NAME} main" > /etc/apt/sources.list - echo "deb http://archive.debian.org/debian-security/ ${DIST_NAME}/updates main" >> /etc/apt/sources.list - printf 'Acquire::AllowInsecureRepositories "true";\nAcquire::Check-Valid-Until "false";\n' > /etc/apt/apt.conf.d/99-force-apt-update - fi - if [[ "$DOCKER_IMAGE" == *"stretch" ]] ; then - cat /etc/apt/sources.list - sed -i s@httpredir.debian.org@archive.debian.org@ /etc/apt/sources.list; - sed -i s@deb.debian.org@archive.debian.org@ /etc/apt/sources.list; - sed -i s@security.debian.org/debian-security@archive.debian.org/debian-security@ /etc/apt/sources.list - sed -i '/-updates/ s/^#*/#/' /etc/apt/sources.list - fi - if [[ "$DOCKER_IMAGE" == *"buster" ]] ; then + if [[ "$DOCKER_IMAGE" == *"jessie" || "$DOCKER_IMAGE" == *"stretch" || "$DOCKER_IMAGE" == *"buster" ]] ; then + # Busteris EOL, rewrite sources.list and configure apt cat /etc/apt/sources.list - sed -i 's@deb.debian.org/debian buster@archive.debian.org/debian buster@' /etc/apt/sources.list; + echo "Rewriting /etc/apt/sources.list" + sed -i 's@deb.debian.org/debian@archive.debian.org/debian@' /etc/apt/sources.list; + sed -i 's@security.debian.org/debian@archive.debian.org/debian@' /etc/apt/sources.list sed -i '/-updates/ s/^#*/#/' /etc/apt/sources.list cat /etc/apt/sources.list + printf 'Acquire::AllowInsecureRepositories "true";\nAcquire::Check-Valid-Until "false";\n' > /etc/apt/apt.conf.d/99-force-apt-update fi if [ ! -e /usr/bin/sudo ] ; then apt-get update && apt-get install -y --force-yes sudo; else sudo apt-get update; fi travis_time_end From 7016be8ad847025dec79a1b18b80553bcf21c8e4 Mon Sep 17 00:00:00 2001 From: Kei Date: Wed, 24 Sep 2025 17:20:38 +0900 Subject: [PATCH 3/4] lisp/c/eusioctl.c: use termios.h instead of termio.h as this is old incldue file fix for debia:unstable-slim, (cd c; gcc -c -Wno-old-style-definition -fPIC -Dx86_64 -DLinux -D_REENTRANT -DVERSION="9.31" -DLIB6 -falign-functions=8 -g -m64 -DTHREADED -DPTHREAD -DX_V11R6_1 -DGCC -DGCC3 -I/usr/include -I/usr/X11R6/include -I/ws/euslisp/include -o /ws/euslisp/Linux64/obj/eusioctl.o -O2 eusioctl.c) eusioctl.c:12:10: fatal error: termio.h: No such file or directory 12 | #include | ^~~~~~~~~~ --- lisp/c/eusioctl.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/lisp/c/eusioctl.c b/lisp/c/eusioctl.c index db6ffa562..c2df5a03c 100644 --- a/lisp/c/eusioctl.c +++ b/lisp/c/eusioctl.c @@ -9,7 +9,15 @@ static char *rcsid="@(#)$Id$"; #include #include #ifndef Darwin -#include +#include +#if defined(__GLIBC__) && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 42)) + #warning "Since glibc 2.42, termio.h is no longer supported. Dropping TCGETA TCSETA TCSETAW TCSETAF" + #define USE_TERMIOS + #include +#else + #define USE_TERMIO + #include +#endif #endif /* #include */ @@ -200,6 +208,7 @@ pointer argv[]; { return(ioctl_struct(n,argv,TCSETSF,sizeof(struct termios)));} #endif +#ifdef USE_TERMIO pointer IOCTL_TCGETA(ctx,n,argv) register context *ctx; int n; @@ -223,6 +232,7 @@ int n; pointer argv[]; { return(ioctl_struct(n,argv,TCSETAW,sizeof(struct termio)));} #endif +#endif pointer TCGETATTR(ctx,n,argv) register context *ctx; @@ -281,10 +291,12 @@ register pointer mod; defunpkg(ctx,"TCSETSW",mod,IOCTL_TCSETSW,unixpkg); defunpkg(ctx,"TCSETSF",mod,IOCTL_TCSETSF,unixpkg); #endif +#ifdef USE_TERMIO defunpkg(ctx,"TCGETA",mod,IOCTL_TCGETA,unixpkg); defunpkg(ctx,"TCSETA",mod,IOCTL_TCSETA,unixpkg); defunpkg(ctx,"TCSETAW",mod,(pointer(*)(context*,int,pointer*))IOCTL_TCSETAW,unixpkg); defunpkg(ctx,"TCSETAF",mod,IOCTL_TCSETAF,unixpkg); +#endif #endif defunpkg(ctx,"TCGETATTR",mod,TCGETATTR,unixpkg); defunpkg(ctx,"TCSETATTR",mod,TCSETATTR,unixpkg); From 5a0bb774a272aa4f31c2c11a31209515f8d9ab26 Mon Sep 17 00:00:00 2001 From: Kei Date: Thu, 25 Sep 2025 11:54:24 +0900 Subject: [PATCH 4/4] lisp/too/eustags.c: update function prototypes, to close error: number of arguments doesn't match prototype --- lisp/tool/eustags.c | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/lisp/tool/eustags.c b/lisp/tool/eustags.c index c7e9cf931..19a9c793a 100644 --- a/lisp/tool/eustags.c +++ b/lisp/tool/eustags.c @@ -150,7 +150,7 @@ struct nd_st { /* sorting structure */ struct nd_st *left,*right; /* left and right sons */ }; -long ftell(); +long ftell(FILE *); typedef struct nd_st NODE; int number; /* tokens found so far on line starting with # (including #) */ @@ -204,21 +204,22 @@ void find_entries (char *file); void free_tree (NODE *node); void put_entries (NODE *node); -char *savestr(); -char *savenstr (); -char *_rindex(); -char *_index(); -char *concat (); -void initbuffer (); -long readline (); - -int total_size_of_entries (); -int PF_funcs (); -int xmalloc (); -int consider_token (); -int tail (); -int TEX_Token (); -int xrealloc (); +struct linebuffer; /* Forward declaration of 'struct linebuffer' */ +char *savestr(char *cp); +char *savenstr (char *cp, int len); +char *_rindex(char *sp, char c); +char *_index(char *sp, char c); +char *concat (char *s1, char *s2, char *s3); +void initbuffer (struct linebuffer *); +long readline (struct linebuffer *, register FILE *); + +int total_size_of_entries (NODE *node); +int PF_funcs (FILE *fi); +int xmalloc (int size); +int consider_token (char **lpp, char *token, int *f, int level); +int tail (char *cp); +int TEX_Token (char *cp); +int xrealloc (char *ptr, int size); /* A `struct linebuffer' is a structure which holds a line of text. `readline' reads a line from a stream into a linebuffer @@ -1395,7 +1396,7 @@ struct TEX_tabent *TEX_toktab = NULL; /* Table with tag tokens */ static char *TEX_defenv = ":chapter:section:subsection:subsubsection:eqno:label:ref:cite:bibitem:typeout"; -struct TEX_tabent *TEX_decode_env (); +struct TEX_tabent *TEX_decode_env (char *evarname, char *defenv); static char TEX_esc = '\\'; static char TEX_opgrp = '{'; @@ -1498,7 +1499,7 @@ TEX_decode_env (evarname, defenv) char *defenv; { register char *env, *p; - extern char *savenstr (), *_index (); + extern char *savenstr (char *cp, int len), *_index (char *sp, char c); struct TEX_tabent *tab; int size, i;