Hello community, here is the log from the commit of package luit for openSUSE:Factory checked in at 2020-10-08 13:11:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/luit (Old) and /work/SRC/openSUSE:Factory/.luit.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "luit" Thu Oct 8 13:11:41 2020 rev:13 rq:839817 version:20201003 Changes: -------- --- /work/SRC/openSUSE:Factory/luit/luit.changes 2016-05-25 21:21:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.luit.new.4249/luit.changes 2020-10-08 13:12:29.951189544 +0200 @@ -1,0 +2,9 @@ +Tue Oct 6 10:45:50 UTC 2020 - Stefan Dirsch <[email protected]> + +- Update to version 20201003 + * updated configure macros: + + compiler-warning fixes + + build-fixes for OpenBSD and macOS + * update config.guess, config.sub + +------------------------------------------------------------------- Old: ---- luit-20150706.tgz New: ---- luit-20201003.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ luit.spec ++++++ --- /var/tmp/diff_new_pack.DxhApg/_old 2020-10-08 13:12:30.427189976 +0200 +++ /var/tmp/diff_new_pack.DxhApg/_new 2020-10-08 13:12:30.431189979 +0200 @@ -1,7 +1,7 @@ # # spec file for package luit # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,18 +12,18 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: luit -Version: 20150706 +Version: 20201003 Release: 0 Summary: Locale and ISO 2022 support for Unicode terminals License: MIT Group: System/X11/Utilities -Url: http://invisible-island.net/luit/ -Source0: ftp://invisible-island.net/%{name}/%{name}-%{version}.tgz +URL: http://invisible-island.net/luit/ +Source0: ftp://ftp.invisible-island.net/%{name}/%{name}-%{version}.tgz BuildRequires: pkg-config BuildRequires: pkgconfig(fontenc) BuildRequires: pkgconfig(x11) ++++++ luit-20150706.tgz -> luit-20201003.tgz ++++++ ++++ 16881 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/luit-20150706/COPYING new/luit-20201003/COPYING --- old/luit-20150706/COPYING 1970-01-01 01:00:00.000000000 +0100 +++ new/luit-20201003/COPYING 2020-10-03 14:31:20.000000000 +0200 @@ -0,0 +1,21 @@ +Copyright 2006-2019,2020 by Thomas E. Dickey +Copyright (c) 2002 by Tomohiro KUBOTA +Copyright (c) 2001 by Juliusz Chroboczek + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/luit-20150706/COPYING.asc new/luit-20201003/COPYING.asc --- old/luit-20150706/COPYING.asc 1970-01-01 01:00:00.000000000 +0100 +++ new/luit-20201003/COPYING.asc 2020-10-03 14:32:24.000000000 +0200 @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Comment: See https://invisible-island.net/public/public.html for info + +iF0EABECAB0WIQTFIEjAwHSP7iJ9R6JwI1Pg9+SO2wUCX3hvVQAKCRBwI1Pg9+SO +2ylOAKCPRpKO5uMlMUgJQ3em1eMTeTA23wCfbiKtOjC9f1p3eJ2o5O/FZ6f9Z58= +=Zfzk +-----END PGP SIGNATURE----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/luit-20150706/charset.c new/luit-20201003/charset.c --- old/luit-20150706/charset.c 2014-12-03 22:52:36.000000000 +0100 +++ new/luit-20201003/charset.c 2018-06-27 22:41:53.000000000 +0200 @@ -1,7 +1,7 @@ -/* $XTermId: charset.c,v 1.78 2014/12/03 21:52:36 tom Exp $ */ +/* $XTermId: charset.c,v 1.80 2018/06/27 20:41:53 tom Exp $ */ /* -Copyright 2010-2013,2014 by Thomas E. Dickey +Copyright 2010-2014,2018 by Thomas E. Dickey Copyright (c) 2001 by Juliusz Chroboczek Permission is hereby granted, free of charge, to any person obtaining a copy @@ -300,7 +300,9 @@ FontMapReversePtr reverse; CharsetPtr result = NULL; - TRACE(("getFontencCharset(final %#x, type %d, name %s)\n", final, type, name)); + TRACE(("getFontencCharset(final %#x, type %d, name %s)\n", + final, type, NonNull(name))); + fc = fontencCharsets; while (fc->name) { if (((fc->type == type && fc->final == final) || @@ -667,11 +669,11 @@ | (int) umFONTENC | (int) umBUILTIN)); if ((result = closestLocaleCharset(enc)) != 0) { - TRACE(("...matched a LocaleCharset record for %s\n", charset)); + TRACE(("...matched a LocaleCharset record for %s\n", NonNull(charset))); } else if (canFakeLocaleCharset(enc)) { LocaleCharsetRec *temp = &fakeLocaleCharset; - TRACE(("...fake a LocaleCharset record for %s\n", charset)); + TRACE(("...fake a LocaleCharset record for %s\n", NonNull(charset))); memset(temp, 0, sizeof(*temp)); temp->name = strmalloc(charset); @@ -681,7 +683,8 @@ result = temp; } else { - TRACE(("...do not know how to fake LocaleCharset for %s\n", charset)); + TRACE(("...do not know how to fake LocaleCharset for %s\n", + NonNull(charset))); } luitFreeFontEnc(enc); } @@ -712,8 +715,8 @@ const LocaleCharsetRec *p = 0; - TRACE(("matchLocaleCharset(%s)\n", charset)); - if (*charset != '\0') { + TRACE(("matchLocaleCharset(%s)\n", NonNull(charset))); + if (!IsEmpty(charset)) { char *euro; char source[MAX_KEYWORD_LENGTH + 1]; @@ -764,7 +767,7 @@ const LocaleCharsetRec *p; TRACE(("getLocaleState(locale=%s, charset=%s)\n", locale, NonNull(charset))); - if (!charset) { + if (IsEmpty(charset)) { if (ignore_locale) { charset = locale; } else { @@ -853,7 +856,8 @@ if ((fc = getFontencByName(encoding_name)) != 0) { if ((lc = findLocaleByCharset(fc->name)) != 0) { result = lc->name; - TRACE(("getCompositeCharset(%s) ->%s\n", encoding_name, result)); + TRACE(("getCompositeCharset(%s) ->%s\n", + NonNull(encoding_name), NonNull(result))); } } return result; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/luit-20150706/configure.in new/luit-20201003/configure.in --- old/luit-20150706/configure.in 2015-07-07 00:10:30.000000000 +0200 +++ new/luit-20201003/configure.in 2020-10-03 14:39:34.000000000 +0200 @@ -1,8 +1,8 @@ -dnl $XTermId: configure.in,v 1.45 2015/07/06 22:10:30 tom Exp $ +dnl $XTermId: configure.in,v 1.49 2020/10/03 12:39:34 tom Exp $ dnl dnl --------------------------------------------------------------------------- dnl -dnl Copyright 2006-2014,2015 by Thomas E. Dickey +dnl Copyright 2006-2019,2020 by Thomas E. Dickey dnl dnl All Rights Reserved dnl @@ -25,7 +25,7 @@ dnl dnl --------------------------------------------------------------------------- -AC_PREREQ(2.52.20030208) +AC_PREREQ(2.52.20200802) AC_INIT(luit.c) AC_CONFIG_HEADER(config.h:config_h.in) CF_CHECK_CACHE @@ -41,27 +41,15 @@ AC_CONST AC_PATH_XTRA -CF_XOPEN_SOURCE +CF_XOPEN_SOURCE(600) CF_SIGWINCH CF_SVR4 CF_SYSV AC_TYPE_UID_T +CF_WITHOUT_X CF_DISABLE_ECHO - -if test -n "$GCC" ; then -AC_MSG_CHECKING(if you want to turn on gcc warnings) -CF_ARG_ENABLE(warnings, - [ --enable-warnings test: turn on GCC compiler warnings], - [with_warnings=yes], - [with_warnings=no]) -AC_MSG_RESULT($with_warnings) -if test "$with_warnings" = yes -then - CF_GCC_ATTRIBUTES - CF_GCC_WARNINGS(Wwrite-strings Wconversion) -fi -fi +CF_ENABLE_WARNINGS(Wwrite-strings Wconversion) AC_CHECK_HEADERS( \ poll.h \ @@ -91,6 +79,11 @@ ]) CF_SYS_TIME_SELECT + +# workaround for divergence of xterm/luit in the [CF_FUNC_GRANTPT] macro... +AC_CHECK_FUNCS(grantpt) +disable_openpty=$ac_cv_func_grantpt + CF_FUNC_GRANTPT CF_FUNC_POLL @@ -152,7 +145,7 @@ CF_WITH_ZLIB if test "x$ac_cv_func_zError" = xyes then - AC_DEFINE(USE_ZLIB) + AC_DEFINE(USE_ZLIB,1,[Define to 1 if we can link with zlib]) fi if test "$with_fontenc" = yes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/luit-20150706/fontenc.c new/luit-20201003/fontenc.c --- old/luit-20150706/fontenc.c 2013-02-17 13:02:42.000000000 +0100 +++ new/luit-20201003/fontenc.c 2020-10-03 16:00:41.000000000 +0200 @@ -1,27 +1,26 @@ +/* $XTermId: fontenc.c,v 1.90 2020/10/03 14:00:41 tom Exp $ */ + /* - * $XTermId: fontenc.c,v 1.86 2013/02/17 12:02:42 tom Exp $ - * - * Copyright 2013 by Thomas E. Dickey - * - * All Rights Reserved - * - * Permission to use, copy, modify, and distribute this software and its - * documentation for any purpose and without fee is hereby granted, - * provided that the above copyright notice appear in all copies and that - * both that copyright notice and this permission notice appear in - * supporting documentation, and that the name of the above listed - * copyright holder(s) not be used in advertising or publicity pertaining - * to distribution of the software without specific, written prior - * permission. - * - * THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD - * TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE - * LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +Copyright 2013-2019,2020 by Thomas E. Dickey + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +*/ #include <other.h> #include <sys.h> @@ -60,9 +59,9 @@ * compiled-in default value which can be overridden by an environment * variable. */ +#ifndef USE_FONTENC extern char *FontEncDirectory(void); -#ifndef USE_FONTENC char * FontEncDirectory(void) { @@ -142,6 +141,8 @@ if (*bufferp == 0) return 0; *lengthp = need; + } else if (*bufferp == 0) { + return 0; } strcpy(*bufferp + used, extra); used += have; @@ -205,7 +206,7 @@ #endif /* USE_FONTENC */ static char * -absolutePath(char *given, char *refPath) +absolutePath(char *given, const char *refPath) { char *result; char *leaf; @@ -258,7 +259,7 @@ { if (encodings_dir == 0) { FILE *fp; - char *path = FontEncDirectory(); + const char *path = FontEncDirectory(); char *buffer = 0; size_t entry = 0; size_t length = 0; @@ -536,7 +537,7 @@ { int inx = fontencIndex(enc, (unsigned) from); - if (inx >= 0) { + if (inx >= 0 && enc->mappings != NULL) { int first = fontencFirst(enc); FontEncSimpleMapPtr data = enc->mappings->client_data; int limit = (int) fontencSize(enc); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/luit-20150706/iso2022.c new/luit-20201003/iso2022.c --- old/luit-20150706/iso2022.c 2013-01-25 19:50:14.000000000 +0100 +++ new/luit-20201003/iso2022.c 2018-06-27 22:41:53.000000000 +0200 @@ -1,7 +1,7 @@ -/* $XTermId: iso2022.c,v 1.38 2013/01/25 18:50:14 tom Exp $ */ +/* $XTermId: iso2022.c,v 1.40 2018/06/27 20:41:53 tom Exp $ */ /* -Copyright 2011-2012,2013 by Thomas E. Dickey +Copyright 2011-2013,2018 by Thomas E. Dickey Copyright (c) 2001 by Juliusz Chroboczek Permission is hereby granted, free of charge, to any person obtaining a copy @@ -46,7 +46,7 @@ trace_charset(const char *tag, const CharsetRec * ptr) { if (ptr != NULL) { - TRACE(("%s:", tag)); + TRACE(("%s:", NonNull(tag))); TRACE((" name:%s", NonNull(ptr->name))); TRACE((" type:%d", ptr->type)); if (ptr->final) @@ -72,7 +72,7 @@ static void trace_iso2022(const char *tag, const Iso2022Ptr ptr) { - TRACE(("%s:\n", tag)); + TRACE(("%s:\n", NonNull(tag))); trace_charset("\tGL()", GL(ptr)); trace_charset("\tGR()", GR(ptr)); trace_charset("\tG0()", G0(ptr)); @@ -284,7 +284,7 @@ const CharsetRec *other = NULL; int rc; - TRACE(("initIso2022(locale=%s, charset=%s)\n", locale, NonNull(charset))); + TRACE(("initIso2022(locale=%s, charset=%s)\n", NonNull(locale), NonNull(charset))); rc = getLocaleState(locale, charset, &gl, &gr, &g0, &g1, &g2, &g3, &other); if (rc < 0) { if (charset) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/luit-20150706/luit.c new/luit-20201003/luit.c --- old/luit-20150706/luit.c 2013-02-16 15:12:58.000000000 +0100 +++ new/luit-20201003/luit.c 2018-06-27 22:41:53.000000000 +0200 @@ -1,7 +1,7 @@ -/* $XTermId: luit.c,v 1.68 2013/02/16 14:12:58 tom Exp $ */ +/* $XTermId: luit.c,v 1.71 2018/06/27 20:41:53 tom Exp $ */ /* -Copyright 2010-2012,2013 by Thomas E. Dickey +Copyright 2010-2016,2018 by Thomas E. Dickey Copyright (c) 2001 by Juliusz Chroboczek Permission is hereby granted, free of charge, to any person obtaining a copy @@ -227,7 +227,7 @@ size_t limit = SizeOf(lookup_order) - 1; size_t used = 0; - TRACE(("setLookupOrder(%s)\n", name)); + TRACE(("setLookupOrder(%s)\n", NonNull(name))); while ((token = strtok(tomatch, ",")) != 0) { UM_MODE order = umNONE; size_t length = strlen(token); @@ -499,6 +499,29 @@ return i; } +static char * +getShell(void) +{ + const char *shell; + if ((shell = getenv("SHELL")) == 0) + shell = "/bin/sh"; + return strmalloc(shell); +} + +static int +isSpecialCommand(int argc, char **argv) +{ + int result = 0; + if (argc == 1) { + size_t len = strlen(argv[0]); + size_t chk = strcspn(argv[0], "~`!$^&*(){}|\\<>?\"' \t"); + if (len != chk) { + result = 1; + } + } + return result; +} + static int parseArgs(int argc, char **argv, char *argv0, @@ -509,16 +532,8 @@ char **child_argv = NULL; if (argc <= 0) { - char *shell; - shell = getenv("SHELL"); - if (shell) { - path = strmalloc(shell); - if (!path) - goto bail; - } else { - path = strmalloc("/bin/sh"); - if (!path) - goto bail; + if ((path = getShell()) == NULL) { + goto bail; } child_argv = malloc(2 * sizeof(char *)); if (!child_argv) @@ -528,6 +543,13 @@ else child_argv[0] = my_basename(path); child_argv[1] = NULL; + } else if (isSpecialCommand(argc, argv)) { + path = strmalloc("sh"); + child_argv = malloc(4 * sizeof(char *)); + child_argv[0] = argv0 ? argv0 : path; + child_argv[1] = strmalloc("-c"); + child_argv[2] = argv[0]; + child_argv[3] = NULL; } else { path = strmalloc(argv[0]); if (!path) @@ -776,7 +798,7 @@ IGNORE_RC(pipe(c2p_waitpipe)); } - TRACE(("...forking to run %s(%s)\n", path, child_argv[0])); + TRACE(("...forking to run %s(%s)\n", NonNull(path), NonNull(child_argv[0]))); pid = fork(); if (pid < 0) { perror("Couldn't fork"); @@ -808,7 +830,10 @@ int tty; int pgrp; - TRACE(("child %s\n", path)); + TRACE(("child %s\n", NonNull(path))); + if (path == NULL) + ExitFailure(); + pgrp = setsid(); if (pgrp < 0) { kill(getppid(), SIGABRT); @@ -847,7 +872,7 @@ } execvp(path, argv); - perror("Couldn't exec"); + perror(path); ExitFailure(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/luit-20150706/luit.h new/luit-20201003/luit.h --- old/luit-20150706/luit.h 2013-01-23 11:02:12.000000000 +0100 +++ new/luit-20201003/luit.h 2018-06-27 11:25:47.000000000 +0200 @@ -1,7 +1,7 @@ -/* $XTermId: luit.h,v 1.22 2013/01/23 10:02:12 tom Exp $ */ +/* $XTermId: luit.h,v 1.23 2018/06/27 09:25:47 tom Exp $ */ /* -Copyright 2010-2012,2013 by Thomas E. Dickey +Copyright 2010-2013,2018 by Thomas E. Dickey Copyright (c) 2001 by Juliusz Chroboczek Permission is hereby granted, free of charge, to any person obtaining a copy @@ -65,6 +65,7 @@ #define VERBOSE(level,params) if (verbose >= level) Message params +#define IsEmpty(s) ((s) == 0 || (*(s)) == '\0') #define NonNull(s) ((s) ? (s) : "<null>") #endif /* LUIT_LUIT_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/luit-20150706/luit.log.html new/luit-20201003/luit.log.html --- old/luit-20150706/luit.log.html 2015-07-07 00:09:49.000000000 +0200 +++ new/luit-20201003/luit.log.html 2020-10-03 18:20:49.000000000 +0200 @@ -1,48 +1,188 @@ <!-- - ***************************************************************************** - * Copyright 2006-2013,2014 by Thomas E. Dickey * - * All Rights Reserved. * - * * - * Permission to use, copy, modify, and distribute this software and its * - * documentation for any purpose and without fee is hereby granted, provided * - * that the above copyright notice appear in all copies and that both that * - * copyright notice and this permission notice appear in supporting * - * documentation, and that the name of the above listed copyright holder(s) * - * not be used in advertising or publicity pertaining to distribution of the * - * software without specific, written prior permission. * - * * - * THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD * - * TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND * - * FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE * - * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN * - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - ***************************************************************************** - $XTermId: luit.log.html,v 1.148 2015/07/06 22:09:49 tom Exp $ + ****************************************************************************** + * Copyright 2006-2019,2020 by Thomas E. Dickey * + * All Rights Reserved. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the "Software"), * + * to deal in the Software without restriction, including without limitation * + * the rights to use, copy, modify, merge, publish, distribute, sublicense, * + * and/or sell copies of the Software, and to permit persons to whom the * + * Software is furnished to do so, subject to the following conditions: * + * * + * The above copyright notice and this permission notice shall be included in * + * all copies or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL * + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING * + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * + * DEALINGS IN THE SOFTWARE. * + ****************************************************************************** + $XTermId: luit.log.html,v 1.173 2020/10/03 16:20:49 tom Exp $ --> <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"> <html> <head> <meta name="generator" content= - "HTML Tidy for Linux (vers 25 March 2009), see www.w3.org"> + "HTML Tidy for HTML5 for Linux version 5.2.0"> <title>LUIT - Change Log</title> - <link rev="MADE" href="mailto:[email protected]";> + <link rel="author" href="mailto:[email protected]";> <meta http-equiv="Content-Type" content= "text/html; charset=us-ascii"> </head> <body> <hr> - Copyright 2006-2013,2014 by <a href= + Copyright 2006-2019,2020 by <a href= "mailto:[email protected]";>Thomas E. Dickey</a> + <hr> <p>This file contains a list of the changes that I have made for luit.</p> + <p><a id="t20201003" name="t20201003">2020/10/03</a> -</p> + + <ul> + <li>updated configure macros: + + <ul> + <li>compiler-warning fixes</li> + + <li>build-fixes for OpenBSD and macOS</li> + </ul> + </li> + + <li>update config.guess, config.sub</li> + </ul> + + <p><a id="t20191231" name="t20191231">2019/12/31</a> -</p> + + <ul> + <li>updated configure macros.</li> + + <li>update config.guess, config.sub</li> + </ul> + + <p><a id="t20190106" name="t20190106">2019/01/06</a> -</p> + + <ul> + <li>updated configure macros to work around a non-POSIX feature + of BSDs.</li> + + <li>add a dummy "check" rule to makefile for Arch + packages.</li> + + <li>add <code>COPYING</code> file for Arch packages.</li> + + <li>use consistent wording for copyright notice in + source-files.</li> + + <li>update config.guess, config.sub</li> + </ul> + + <p><a id="t20181211" name="t20181211">2018/12/11</a> -</p> + + <ul> + <li>build-fixes/updates for cygwin to accommodate + configure-macro changes.</li> + + <li>updated configure macros: + + <ul> + <li><code>CF_CC_ENV_FLAGS</code>, add check for + preprocessor-options in <code>$CFLAGS</code>.</li> + + <li><code>CF_FUNC_GRANTPT</code>, amend the + <code>posix_openpt</code> vs <code>grantpt</code> change to + work with BSDs</li> + + <li><code>CF_GNU_SOURCE</code>, fixes a regression for + Cygwin. The check for _DEFAULT_SOURCE should apply to + "recent" Cygwin (since early 2016), and except for "NEWLIB" + vs "GLIBC" in the test, acts the same if I pretend that + "newlib" is the GNU C library. Without this, the check + falls through to the _XOPEN_SOURCE test, which breaks the + pseudoterminal checks for xterm.</li> + + <li><code>CF_LD_RPATH_OPT</code>, suppress check if + <code>--disable-rpath</code> is given.</li> + + <li><code>CF_XOPEN_SOURCE</code>, add midnightbsd to + special cases with freebsd</li> + </ul> + </li> + + <li>update config.guess, config.sub</li> + </ul> + + <p><a id="t20180628" name="t20180628">2018/06/28</a> -</p> + + <ul> + <li>modify configure script to avoid using OpenBSD's + nonfunctional POSIX pseudoterminal interface.</li> + + <li>add null-pointer checks for all strings printed in trace + calls.</li> + + <li>updated configure macros, deprecating use of + <code>_GNU_SOURCE</code> symbol for + <code>DEFAULT_SOURCE</code>, and preferring + <code>man2html</code> over groff's html conversion.</li> + + <li>update config.guess, config.sub</li> + </ul> + + <p><a id="t20160508" name="t20160508">2016/05/08</a> -</p> + + <ul> + <li>adapt Solaris fix for C11 changes from xterm #325.</li> + + <li>modify <code>parseArgs</code> to check for a special case, + e.g., from xterm, where a shell command that cannot be exec'd + is passed as a single parameter. For that case, run the command + via the shell.</li> + + <li>reset <code>IEXTEN</code> when turning off canonical mode, + needed to make <code>lnext</code> control/V work consistently + on BSD platforms (report/patch by Christian Weisgerber).</li> + + <li>updated configure macros: + + <dl> + <dt>CF_FUNC_POLL</dt> + + <dd>add a fallback to checking with + <code>posix_openpt()</code>, in case someone's running the + configure script in batch mode.</dd> + + <dt>CF_LD_RPATH_OPT</dt> + + <dd>change FreeBSD to use <code>-Wl,-rpath</code> rather + than <code>-rpath</code> option. According to FreeBSD + #178732, either works since FreeBSD 4.x; however + <code>scons</code> does not accept anything except the + <code>-Wl,-rpath</code> form.</dd> + + <dt>CF_WITH_MAN2HTML</dt> + + <dd>use configured shell rather than + <code>/bin/sh</code></dd> + + <dt>CF_XOPEN_SOURCE</dt> + + <dd>add a case for OS/2</dd> + </dl> + </li> + + <li>update config.guess, config.sub</li> + </ul> + <p><a id="t20150706" name="t20150706">2015/07/06</a> -</p> <ul> @@ -58,10 +198,12 @@ <ul> <li>add table entries for luit to work as expected with - <em>CP865 — MS-DOS with Nordic letters</em>. This code - page was commonly used on BBSes in Norway, Denmark and Sweden - running the MBBS and compatible systems in the 90s (patch by - Hans Petter Jansson).</li> + <em>CP865 + â€â€ + MS-DOS with Nordic letters</em>. This code page was commonly + used on BBSes in Norway, Denmark and Sweden running the MBBS + and compatible systems in the 90s (patch by Hans Petter + Jansson).</li> <li>add to search-list for encodings.dir file to accommodate Fedora.</li> @@ -270,9 +412,11 @@ posix_openpt. Bug report for xterm by Christian Ebert for 9.8.0 says screensize does not work for the pty.</dd> - <dt>CF_XOPEN_SOURCE fixes for redefinition of _XOPEN_SOURCE - on a few platforms: Mac OS X, IRIX64. Also workarounds for - header inconsistencies with OpenBSD and MirBSD.</dt> + <dt>CF_XOPEN_SOURCE</dt> + + <dd>fixes for redefinition of _XOPEN_SOURCE on a few + platforms: Mac OS X, IRIX64. Also workarounds for header + inconsistencies with OpenBSD and MirBSD.</dd> </dl> </li> </ul> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/luit-20150706/luit.man new/luit-20201003/luit.man --- old/luit-20150706/luit.man 2013-02-16 16:17:03.000000000 +0100 +++ new/luit-20201003/luit.man 2018-06-28 10:38:33.000000000 +0200 @@ -1,6 +1,26 @@ -.\" $XTermId: luit.man,v 1.36 2013/02/16 15:17:03 tom Exp $ +.\" $XTermId: luit.man,v 1.38 2018/06/28 08:38:33 tom Exp $ +.\" --------------------------------------------------------------------------- +.\" Copyright 2006-2016,2018 by Thomas E. Dickey +.\" Copyright (c) 2001 by Juliusz Chroboczek .\" +.\" Permission is hereby granted, free of charge, to any person obtaining a +.\" copy of this software and associated documentation files (the "Software"), +.\" to deal in the Software without restriction, including without limitation +.\" the rights to use, copy, modify, merge, publish, distribute, sublicense, +.\" and/or sell copies of the Software, and to permit persons to whom the +.\" Software is furnished to do so, subject to the following conditions: .\" +.\" The above copyright notice and this permission notice shall be included in +.\" all copies or substantial portions of the Software. +.\" +.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +.\" THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +.\" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +.\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +.\" DEALINGS IN THE SOFTWARE. +.\" --------------------------------------------------------------------------- .\" Escape single quotes in literal strings from groff's Unicode transform. .ie \n(.g .ds AQ \(aq .el .ds AQ ' @@ -9,7 +29,8 @@ .ie \n(.g .ds '' \(rq .el .ds '' '' .de bP -.IP \(bu 4 +.ie n .IP \(bu 4 +.el .IP \(bu 2 .. .TH LUIT 1 __vendorversion__ .SH NAME @@ -185,7 +206,8 @@ .TP .B \-list\-iconv List the encodings and locales supported by the \fIiconv\fP library. -\fBLuit\fP adapts its internal tables of \fIfontenc\fP names to \fIiconv\fP encodings. +\fBLuit\fP adapts its internal tables of \fIfontenc\fP names +to \fIiconv\fP encodings. .IP To make scripting simpler, .B luit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/luit-20150706/luitconv.c new/luit-20201003/luitconv.c --- old/luit-20150706/luitconv.c 2015-07-07 00:41:28.000000000 +0200 +++ new/luit-20201003/luitconv.c 2020-10-03 16:23:42.000000000 +0200 @@ -1,27 +1,26 @@ +/* $XTermId: luitconv.c,v 1.123 2020/10/03 14:23:42 tom Exp $ */ + /* - * $XTermId: luitconv.c,v 1.117 2015/07/06 22:41:28 tom Exp $ - * - * Copyright 2010-2014,2015 by Thomas E. Dickey - * - * All Rights Reserved - * - * Permission to use, copy, modify, and distribute this software and its - * documentation for any purpose and without fee is hereby granted, - * provided that the above copyright notice appear in all copies and that - * both that copyright notice and this permission notice appear in - * supporting documentation, and that the name of the above listed - * copyright holder(s) not be used in advertising or publicity pertaining - * to distribution of the software without specific, written prior - * permission. - * - * THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD - * TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE - * LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +Copyright 2010-2019,2020 by Thomas E. Dickey + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +*/ #include <iso2022.h> @@ -32,6 +31,10 @@ #include <langinfo.h> #endif +#ifndef ICONV_CONST +#define ICONV_CONST /* nothing */ +#endif + /* * This uses a similar approach to vile's support for wide/narrow locales. * @@ -226,7 +229,7 @@ iconv_t result; strcpy(encoding_name, guess); - TRACE(("try_iconv_open(%s)\n", encoding_name)); + TRACE(("try_iconv_open(%s)\n", NonNull(encoding_name))); result = iconv_open("UTF-8", encoding_name); /* @@ -298,7 +301,7 @@ result = iconv_open("UTF-8", encoding_name); if (result != NO_ICONV) { TRACE(("...iconv_open'd with different name \"%s\"\n", - encoding_name)); + NonNull(encoding_name))); break; } } @@ -337,7 +340,7 @@ trace_convert(LuitConv * data, size_t which, unsigned gs) { size_t j; - char gsbuf[10]; + char gsbuf[20]; if (gs) { sprintf(gsbuf, "G%u ", gs); @@ -427,7 +430,8 @@ char output[80]; char *op; - TRACE(("sizeofIconvTable(%s, %u) opened...\n", encoding_name, limit)); + TRACE(("sizeofIconvTable(%s, %u) opened...\n", + NonNull(encoding_name), limit)); for (n = 0; n < MAX16; ++n) { if (!legalUCode(n)) continue; @@ -454,7 +458,7 @@ if (total > 256) result = MAX16; } - TRACE(("sizeofIconvTable(%s, %u) = %u\n", encoding_name, limit, result)); + TRACE(("sizeofIconvTable(%s, %u) = %u\n", NonNull(encoding_name), limit, result)); return result; } @@ -568,7 +572,7 @@ LuitConv *data; iconv_t my_desc = iconv_open(charset, "UTF-8"); - TRACE(("initialize16bitTable(%s) gmax %d\n", charset, gmax)); + TRACE(("initialize16bitTable(%s) gmax %d\n", NonNull(charset), gmax)); for (n = 0; n < gmax; ++n) { if ((data = datap[n]) != 0) { @@ -696,11 +700,11 @@ size_t n; const char *result = 0; - TRACE(("findEncodingAlias(%s)\n", encoding_name)); + TRACE(("findEncodingAlias(%s)\n", NonNull(encoding_name))); for (n = 0; n < SizeOf(table); ++n) { if (!lcStrCmp(encoding_name, table[n].luit_name)) { result = table[n].iconv_name; - TRACE(("... matched '%s'\n", result)); + TRACE(("... matched '%s'\n", NonNull(result))); break; } } @@ -718,7 +722,7 @@ TRACE(("initializing %s '%s'\n", enc_file ? "external" : "built-in", - builtIn->name)); + NonNull(builtIn->name))); (void) enc_file; data->len_index = 0; @@ -874,7 +878,7 @@ latest->reverse.reverse = luitReverse; latest->reverse.data = latest; all_conversions = latest; - TRACE(("...finished LuitConv table for \"%s\"\n", latest->encoding_name)); + TRACE(("...finished LuitConv table for \"%s\"\n", NonNull(latest->encoding_name))); } static FontMapPtr @@ -915,7 +919,7 @@ break; } - TRACE(("initLuitConv(%s) %u\n", encoding_name, (unsigned) length)); + TRACE(("initLuitConv(%s) %u\n", NonNull(encoding_name), (unsigned) length)); if ((latest = newLuitConv(length)) != 0) { latest->encoding_name = strmalloc(encoding_name); latest->iconv_desc = my_desc; @@ -952,7 +956,7 @@ BuiltInMapping *mapping; FontMapPtr result = 0; - TRACE(("convertFontEnc: %s\n", fontenc->name)); + TRACE(("convertFontEnc: %s\n", NonNull(fontenc->name))); while (mp != 0) { if (mp->type == FONT_ENCODING_UNICODE) @@ -1020,7 +1024,7 @@ const FontencCharsetRec *fc = getCompositePart(composite_name, g); work[g] = 0; if (fc != 0 && !knownCharset(fc)) { - TRACE(("part %d:%s (%s)\n", g, fc->name, fc->xlfd)); + TRACE(("part %d:%s (%s)\n", g, NonNull(fc->name), NonNull(fc->xlfd))); switch (fc->type) { case T_94: @@ -1077,7 +1081,7 @@ break; } } - TRACE(("getFontMapByName(%s) %s\n", encoding_name, + TRACE(("getFontMapByName(%s) %s\n", NonNull(encoding_name), result ? "OK" : "FAIL")); return result; } @@ -1102,7 +1106,7 @@ *aliased = 0; } *encoding_name = alias; - TRACE(("...retry '%s'\n", *encoding_name)); + TRACE(("...retry '%s'\n", NonNull(*encoding_name))); my_desc = try_iconv_open(*encoding_name, aliased); } } @@ -1132,7 +1136,8 @@ const BuiltInCharsetRec *builtIn; char *aliased = 0; - TRACE(("luitLookupMapping '%s' mode %u size %u\n", encoding_name, mode, size)); + TRACE(("luitLookupMapping '%s' mode %u size %u\n", + NonNull(encoding_name), mode, size)); if ((result = getFontMapByName(encoding_name)) != 0) { TRACE(("...found in cache\n")); @@ -1213,7 +1218,7 @@ TRACE(("luitLookupReverse %p\n", (void *) fontmap_ptr)); for (search = all_conversions; search != 0; search = search->next) { if (fontmap_ptr == &(search->mapping)) { - TRACE(("...found %s\n", search->encoding_name)); + TRACE(("...found %s\n", NonNull(search->encoding_name))); result = &(search->reverse); break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/luit-20150706/luitconv.h new/luit-20201003/luitconv.h --- old/luit-20150706/luitconv.h 2013-02-14 12:38:42.000000000 +0100 +++ new/luit-20201003/luitconv.h 2019-01-06 21:53:36.000000000 +0100 @@ -1,27 +1,27 @@ +/* $XTermId: luitconv.h,v 1.35 2019/01/06 20:53:36 tom Exp $ */ + /* - * $XTermId: luitconv.h,v 1.34 2013/02/14 11:38:42 tom Exp $ - * - * Copyright 2010,2013 by Thomas E. Dickey - * - * All Rights Reserved - * - * Permission to use, copy, modify, and distribute this software and its - * documentation for any purpose and without fee is hereby granted, - * provided that the above copyright notice appear in all copies and that - * both that copyright notice and this permission notice appear in - * supporting documentation, and that the name of the above listed - * copyright holder(s) not be used in advertising or publicity pertaining - * to distribution of the software without specific, written prior - * permission. - * - * THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD - * TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE - * LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +Copyright 2010-2013,2019 by Thomas E. Dickey + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +*/ + #ifndef LUITCONV_H #define LUITCONV_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/luit-20150706/package/debian/changelog new/luit-20201003/package/debian/changelog --- old/luit-20150706/package/debian/changelog 2015-07-06 23:48:21.000000000 +0200 +++ new/luit-20201003/package/debian/changelog 2020-10-03 14:31:20.000000000 +0200 @@ -1,3 +1,39 @@ +bluit (20201003) unstable; urgency=low + + * maintenance updates + + -- Thomas E. Dickey <[email protected]> Sat, 03 Oct 2020 08:31:20 -0400 + +bluit (20191231) unstable; urgency=low + + * maintenance updates + + -- Thomas E. Dickey <[email protected]> Tue, 31 Dec 2019 16:30:54 -0500 + +bluit (20190106) unstable; urgency=low + + * maintenance updates + + -- Thomas E. Dickey <[email protected]> Sun, 06 Jan 2019 15:13:47 -0500 + +bluit (20181211) unstable; urgency=low + + * maintenance updates + + -- Thomas E. Dickey <[email protected]> Tue, 11 Dec 2018 04:25:31 -0500 + +bluit (20180628) unstable; urgency=low + + * maintenance updates + + -- Thomas E. Dickey <[email protected]> Tue, 26 Jun 2018 05:17:17 -0400 + +bluit (20160508) unstable; urgency=low + + * maintenance updates + + -- Thomas E. Dickey <[email protected]> Wed, 04 May 2016 18:54:17 -0400 + bluit (20150706) unstable; urgency=low * maintenance updates diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/luit-20150706/package/debian/copyright new/luit-20201003/package/debian/copyright --- old/luit-20150706/package/debian/copyright 2015-07-07 00:15:55.000000000 +0200 +++ new/luit-20201003/package/debian/copyright 2020-10-03 14:46:37.000000000 +0200 @@ -1,6 +1,6 @@ Debianized-By: Thomas E. Dickey <[email protected]> Debianized-Date: Mon, 31 May 2010 09:50:35 -0400. -Source-Downloaded-From: ftp://invisible-island.net/luit/ +Source-Downloaded-From: ftp://ftp.invisible-island.net/luit/ Upstream-Author: Thomas E. Dickey <[email protected]> Files: luit.c @@ -45,25 +45,26 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -Files: aclocal.m4 +Files: aclocal.m4 *.c *.h *.in *.man *.sh encodings/make-tables package/debian/* Licence: other-BSD -Copyright: 2006-2014,2015 by Thomas E. Dickey - Permission to use, copy, modify, and distribute this software and its - documentation for any purpose and without fee is hereby granted, - provided that the above copyright notice appear in all copies and that - both that copyright notice and this permission notice appear in - supporting documentation, and that the name of the above listed - copyright holder(s) not be used in advertising or publicity pertaining - to distribution of the software without specific, written prior - permission. - - THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD - TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE - LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +Copyright: 2006-2019,2020 by Thomas E. Dickey + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. Files: install-sh Copyright: 1994 X Consortium @@ -100,25 +101,5 @@ from scratch. It can only install one file at a time, a restriction shared with many OS's install programs. -Files: debian/* -Copyright: 2010-2013,2014 Thomas E. Dickey -Licence: other-BSD - Permission to use, copy, modify, and distribute this software and its - documentation for any purpose and without fee is hereby granted, - provided that the above copyright notice appear in all copies and that - both that copyright notice and this permission notice appear in - supporting documentation, and that the name of the above listed - copyright holder(s) not be used in advertising or publicity pertaining - to distribution of the software without specific, written prior - permission. - - THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD - TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE - LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - On Debian systems, the complete text of the GNU General Public License can be found in '/usr/share/common-licenses/GPL-2' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/luit-20150706/package/debian/source/format new/luit-20201003/package/debian/source/format --- old/luit-20150706/package/debian/source/format 2010-01-01 17:39:30.000000000 +0100 +++ new/luit-20201003/package/debian/source/format 2010-06-22 23:37:16.000000000 +0200 @@ -1 +1 @@ -3.0 (quilt) +3.0 (native) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/luit-20150706/package/luit.spec new/luit-20201003/package/luit.spec --- old/luit-20150706/package/luit.spec 2015-07-06 23:48:21.000000000 +0200 +++ new/luit-20201003/package/luit.spec 2020-10-03 14:31:20.000000000 +0200 @@ -1,8 +1,8 @@ Summary: luit - Locale and ISO 2022 support for Unicode terminals %define AppProgram luit -%define AppVersion 20150706 +%define AppVersion 20201003 %define UseProgram b%{AppProgram} -# $XTermId: luit.spec,v 1.51 2015/07/06 21:48:21 tom Exp $ +# $XTermId: luit.spec,v 1.61 2020/10/03 12:31:20 tom Exp $ Name: %{AppProgram} Version: %{AppVersion} Release: 1 @@ -31,13 +31,13 @@ %build INSTALL_PROGRAM='${INSTALL}' \ - ./configure \ - --program-prefix=b \ - --target %{_target_platform} \ - --prefix=%{_prefix} \ - --bindir=%{_bindir} \ - --libdir=%{_libdir} \ - --mandir=%{_mandir} +%configure \ + --program-prefix=b \ + --target %{_target_platform} \ + --prefix=%{_prefix} \ + --bindir=%{_bindir} \ + --libdir=%{_libdir} \ + --mandir=%{_mandir} make diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/luit-20150706/parser.c new/luit-20201003/parser.c --- old/luit-20150706/parser.c 2013-01-14 02:56:45.000000000 +0100 +++ new/luit-20201003/parser.c 2018-06-27 22:41:53.000000000 +0200 @@ -1,7 +1,7 @@ -/* $XTermId: parser.c,v 1.22 2013/01/14 01:56:45 tom Exp $ */ +/* $XTermId: parser.c,v 1.24 2018/06/27 20:41:53 tom Exp $ */ /* -Copyright 2011-2012,2013 by Thomas E. Dickey +Copyright 2011-2013,2018 by Thomas E. Dickey Copyright (c) 2001 by Juliusz Chroboczek Permission is hereby granted, free of charge, to any person obtaining a copy @@ -202,9 +202,14 @@ int rc; int found = 0; - TRACE(("resolveLocale(%s)\n", locale)); + TRACE(("resolveLocale(%s)\n", NonNull(locale))); + if (locale == NULL) + ExitFailure(); + + TRACE(("...looking in %s\n", NonNull(locale_alias))); + if (locale_alias == NULL) + ExitFailure(); - TRACE(("...looking in %s\n", locale_alias)); f = fopen(locale_alias, "r"); if (f != NULL) { @@ -221,7 +226,7 @@ if (!found) { if (resolved == NULL) { - TRACE(("...not found in %s\n", locale_alias)); + TRACE(("...not found in %s\n", NonNull(locale_alias))); resolved = strmalloc(locale); } } @@ -242,7 +247,7 @@ && strcmp(locale, "POSIX") && strcmp(locale, "US-ASCII") && (improved = nl_langinfo(CODESET)) != 0) { - TRACE(("...nl_langinfo ->%s\n", improved)); + TRACE(("...nl_langinfo ->%s\n", NonNull(improved))); free(resolved); resolved = strmalloc(improved); } else @@ -252,6 +257,6 @@ } } - TRACE(("...resolveLocale ->%s\n", resolved)); + TRACE(("...resolveLocale ->%s\n", NonNull(resolved))); return resolved; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/luit-20150706/sys.c new/luit-20201003/sys.c --- old/luit-20150706/sys.c 2013-01-27 22:47:10.000000000 +0100 +++ new/luit-20201003/sys.c 2018-06-27 22:41:53.000000000 +0200 @@ -1,7 +1,7 @@ -/* $XTermId: sys.c,v 1.51 2013/01/27 21:47:10 tom Exp $ */ +/* $XTermId: sys.c,v 1.56 2018/06/27 20:41:53 tom Exp $ */ /* -Copyright 2010-2012,2013 by Thomas E. Dickey +Copyright 2010-2016,2018 by Thomas E. Dickey Copyright (c) 2001 by Juliusz Chroboczek Permission is hereby granted, free of charge, to any person obtaining a copy @@ -88,8 +88,11 @@ static int opened_tty = -1; #endif -#if defined(I_PUSH) && defined(HAVE_STROPTS_H) -#define USE_STREAMS 1 +#if defined(I_FIND) && defined(I_PUSH) +#define PUSH_FAILS(fd,name) ioctl(fd, I_FIND, name) == 0 \ + && ioctl(fd, I_PUSH, name) < 0 +#else +#define PUSH_FAILS(fd,name) ioctl(fd, I_PUSH, name) < 0 #endif static int saved_tio_valid = 0; @@ -280,7 +283,7 @@ rc = tcgetattr(0, &tio); if (rc < 0) return rc; - tio.c_lflag &= (unsigned) ~(ECHO | ICANON | ISIG); + tio.c_lflag &= (unsigned) ~(ECHO | ICANON | IEXTEN | ISIG); tio.c_iflag &= (unsigned) ~(ICRNL | IXOFF | IXON | ISTRIP); #ifdef ONLCR tio.c_oflag &= (unsigned) ~ONLCR; @@ -325,7 +328,7 @@ if (rc < 0) return -1; - TRACE(("fix_pty_perms sees %s\n", line)); + TRACE(("fix_pty_perms sees %s\n", NonNull(line))); TRACE(("..pty owned by %ld/%ld\n", (long) s.st_uid, (long) s.st_gid)); TRACE(("...but you are %ld/%ld\n", (long) getuid(), (long) getgid())); @@ -405,7 +408,7 @@ goto bsd; } - TRACE(("ptsname '%s'\n", line)); + TRACE(("ptsname '%s'\n", NonNull(line))); fix_pty_perms(line); *pty_return = pty; @@ -473,12 +476,12 @@ int openTty(char *line) { - int rc; int tty = -1; - TRACE(("openTty(%s)\n", line)); + TRACE(("openTty(%s)\n", NonNull(line))); + if (line == NULL) + ExitFailure(); - (void) rc; tty = open(line, O_RDWR #if defined(TIOCSCTTY) && defined(O_NOCTTY) /* @@ -508,8 +511,7 @@ * * Cygwin as of 2009/10/12 lacks this call, but has O_NOCTTY. */ - rc = ioctl(tty, TIOCSCTTY, (char *) 0); - if (rc < 0) { + if (ioctl(tty, TIOCSCTTY, (char *) 0) < 0) { TRACE_ERR("openTty - ioctl(TIOCSCTTY)"); goto bail; } @@ -518,16 +520,14 @@ /* HPUX and Solaris */ #ifdef HAVE_GRANTPT_PTEM TRACE(("...setup stream\n")); - rc = ioctl(tty, I_PUSH, "ptem"); - if (rc < 0) { + if (PUSH_FAILS(tty, "ptem")) { TRACE_ERR("openTty - push ptem"); goto bail; } #endif #ifdef HAVE_GRANTPT_LDTERM - rc = ioctl(tty, I_PUSH, "ldterm"); - if (rc < 0) { + if (PUSH_FAILS(tty, "ldterm")) { TRACE_ERR("openTty - push ldterm"); goto bail; } @@ -535,8 +535,7 @@ /* Solaris */ #ifdef HAVE_GRANTPT_TTCOMPAT - rc = ioctl(tty, I_PUSH, "ttcompat"); - if (rc < 0) { + if (PUSH_FAILS(tty, "ttcompat")) { TRACE_ERR("openTty - push ttcompat"); goto bail; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/luit-20150706/trace.c new/luit-20201003/trace.c --- old/luit-20150706/trace.c 2011-10-28 03:01:43.000000000 +0200 +++ new/luit-20201003/trace.c 2019-01-06 21:53:00.000000000 +0100 @@ -1,34 +1,34 @@ +/* $XTermId: trace.c,v 1.7 2019/01/06 20:53:00 tom Exp $ */ + /* - * $XTermId: trace.c,v 1.6 2011/10/28 01:01:43 tom Exp $ - * - * Copyright 2010,2011 by Thomas E. Dickey - * - * All Rights Reserved - * - * Permission to use, copy, modify, and distribute this software and its - * documentation for any purpose and without fee is hereby granted, - * provided that the above copyright notice appear in all copies and that - * both that copyright notice and this permission notice appear in - * supporting documentation, and that the name of the above listed - * copyright holder(s) not be used in advertising or publicity pertaining - * to distribution of the software without specific, written prior - * permission. - * - * THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD - * TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE - * LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +Copyright 2010-2011,2019 by Thomas E. Dickey + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. */ + #include <config.h> #include <unistd.h> #include <trace.h> void -Trace(const char *fmt,...) +Trace(const char *fmt, ...) { static pid_t first_pid; static FILE *fp = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/luit-20150706/trace.h new/luit-20201003/trace.h --- old/luit-20150706/trace.h 2011-10-28 03:01:50.000000000 +0200 +++ new/luit-20201003/trace.h 2019-01-06 21:53:11.000000000 +0100 @@ -1,33 +1,33 @@ +/* $XTermId: trace.h,v 1.9 2019/01/06 20:53:11 tom Exp $ */ + /* - * $XTermId: trace.h,v 1.7 2011/10/28 01:01:50 tom Exp $ - * - * Copyright 2010,2011 by Thomas E. Dickey - * - * All Rights Reserved - * - * Permission to use, copy, modify, and distribute this software and its - * documentation for any purpose and without fee is hereby granted, - * provided that the above copyright notice appear in all copies and that - * both that copyright notice and this permission notice appear in - * supporting documentation, and that the name of the above listed - * copyright holder(s) not be used in advertising or publicity pertaining - * to distribution of the software without specific, written prior - * permission. - * - * THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD - * TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE - * LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +Copyright 2010-2018,2019 by Thomas E. Dickey + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. */ + #ifndef TRACE_H #define TRACE_H #include <luit.h> -void Trace(const char *fmt,...) GCC_PRINTFLIKE(1,2); +void Trace(const char *fmt, ...) GCC_PRINTFLIKE(1,2); #ifdef OPT_TRACE #define TRACE(params) Trace params @@ -41,6 +41,6 @@ #define TRACE2(params) /* nothing */ #endif -#define TRACE_ERR(msg) TRACE((msg ": %s\n", strerror(errno))) +#define TRACE_ERR(msg) TRACE((msg ": %s\n", NonNull(strerror(errno)))) #endif /* TRACE_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/luit-20150706/version.h new/luit-20201003/version.h --- old/luit-20150706/version.h 2015-07-06 23:48:21.000000000 +0200 +++ new/luit-20201003/version.h 2020-10-03 14:31:20.000000000 +0200 @@ -1,6 +1,6 @@ /* - * $XTermId: version.h,v 1.48 2015/07/06 21:48:21 tom Exp $ + * $XTermId: version.h,v 1.57 2020/10/03 12:31:20 tom Exp $ * * http://invisible-island.net/luit/ */ -#define LUIT_VERSION "2.0-20150706" +#define LUIT_VERSION "2.0-20201003"
