diff options
Diffstat (limited to 'Build/source/utils/t1utils')
19 files changed, 70 insertions, 56 deletions
diff --git a/Build/source/utils/t1utils/ChangeLog b/Build/source/utils/t1utils/ChangeLog index a5d2bf0cd48..5296bbfd374 100644 --- a/Build/source/utils/t1utils/ChangeLog +++ b/Build/source/utils/t1utils/ChangeLog @@ -1,3 +1,8 @@ +2020-10-31 Akira Kakuto <kakuto@w32tex.org> + + Import t1utils-1.42. + * version.ac: Adapted. + 2017-08-30 Akira Kakuto <kakuto@fuk.kindai.ac.jp> * Makefile.am, configure.ac: Do not use system memmem. diff --git a/Build/source/utils/t1utils/TLpatches/ChangeLog b/Build/source/utils/t1utils/TLpatches/ChangeLog index 18f3ab141bc..c4d8127c734 100644 --- a/Build/source/utils/t1utils/TLpatches/ChangeLog +++ b/Build/source/utils/t1utils/TLpatches/ChangeLog @@ -1,3 +1,9 @@ +2020-10-31 Akira Kakuto <kakuto@w32tex.org> + + Import t1utils-1.42. + * patch-03-warnings, patch-04-TL-binary, patch-05-getopt, + patch-07-warnings, patch-08-notuse-system-memmem: Adapted. + 2017-08-30 Akira Kakuto <kakuto@fuk.kindai.ac.jp> * patch-08-notuse-system-memmem: Added. @@ -6,7 +12,7 @@ Import t1utils-1.41. * patch-03-warnings, patch-04-TL-binary, patch-05-getopt, - patch-07-warnings: Adapded. + patch-07-warnings: Adapted. 2015-03-01 Peter Breitenlohner <peb@mppmu.mpg.de> diff --git a/Build/source/utils/t1utils/TLpatches/TL-Changes b/Build/source/utils/t1utils/TLpatches/TL-Changes index c2c75e73544..dbf73b8689a 100644 --- a/Build/source/utils/t1utils/TLpatches/TL-Changes +++ b/Build/source/utils/t1utils/TLpatches/TL-Changes @@ -1,4 +1,4 @@ -Changes applied to the t1utils-1.41 tree as obtained from: +Changes applied to the t1utils-1.42 tree as obtained from: http://www.lcdf.org/type/ Removed: diff --git a/Build/source/utils/t1utils/TLpatches/patch-03-warnings b/Build/source/utils/t1utils/TLpatches/patch-03-warnings index da2e03e98d6..d76b3deb924 100644 --- a/Build/source/utils/t1utils/TLpatches/patch-03-warnings +++ b/Build/source/utils/t1utils/TLpatches/patch-03-warnings @@ -1,8 +1,6 @@ - Avoid compiler warnings (gcc's -Wcast-qual). - -diff -ur t1utils-1.41.orig/clp.c t1utils-1.41/clp.c ---- t1utils-1.41.orig/clp.c Thu Aug 17 00:20:27 2017 -+++ t1utils-1.41/clp.c Mon Aug 28 15:43:58 2017 +diff -ur t1utils-1.42/clp.c t1utils-src/clp.c +--- t1utils-1.42/clp.c Wed Oct 28 00:08:00 2020 ++++ t1utils-src/clp.c Sat Oct 31 13:01:47 2020 @@ -1095,22 +1095,28 @@ parse_int(Clp_Parser* clp, const char* arg, int complain, void* user_data) { diff --git a/Build/source/utils/t1utils/TLpatches/patch-04-TL-binary b/Build/source/utils/t1utils/TLpatches/patch-04-TL-binary index c3d170c3e63..c9c84c8d848 100644 --- a/Build/source/utils/t1utils/TLpatches/patch-04-TL-binary +++ b/Build/source/utils/t1utils/TLpatches/patch-04-TL-binary @@ -1,8 +1,6 @@ - In TeX Live we treat all output files as binary. - -diff -ur t1utils-1.41.orig/t1ascii.c t1utils-1.41/t1ascii.c ---- t1utils-1.41.orig/t1ascii.c Thu Aug 17 01:31:02 2017 -+++ t1utils-1.41/t1ascii.c Mon Aug 28 15:43:58 2017 +diff -ur t1utils-1.42/t1ascii.c t1utils-src/t1ascii.c +--- t1utils-1.42/t1ascii.c Wed Oct 28 00:08:00 2020 ++++ t1utils-src/t1ascii.c Sat Oct 31 13:02:49 2020 @@ -286,6 +286,7 @@ /* As we are processing a PFB (binary) input */ /* file, we must set its file mode to binary. */ @@ -11,9 +9,9 @@ diff -ur t1utils-1.41.orig/t1ascii.c t1utils-1.41/t1ascii.c #endif /* prepare font reader */ -diff -ur t1utils-1.41.orig/t1asm.c t1utils-1.41/t1asm.c ---- t1utils-1.41.orig/t1asm.c Thu Aug 17 01:31:11 2017 -+++ t1utils-1.41/t1asm.c Wed Aug 30 16:13:00 2017 +diff -ur t1utils-1.42/t1asm.c t1utils-src/t1asm.c +--- t1utils-1.42/t1asm.c Wed Oct 28 00:08:00 2020 ++++ t1utils-src/t1asm.c Sat Oct 31 13:03:47 2020 @@ -715,8 +715,7 @@ #if defined(_MSDOS) || defined(_WIN32) /* If we are processing a PFB (binary) output */ @@ -24,9 +22,9 @@ diff -ur t1utils-1.41.orig/t1asm.c t1utils-1.41/t1asm.c #endif /* Finally, we loop until no more input. Some special things to look for are -diff -ur t1utils-1.41.orig/t1disasm.c t1utils-1.41/t1disasm.c ---- t1utils-1.41.orig/t1disasm.c Thu Aug 17 01:31:24 2017 -+++ t1utils-1.41/t1disasm.c Mon Aug 28 15:43:58 2017 +diff -ur t1utils-1.42/t1disasm.c t1utils-src/t1disasm.c +--- t1utils-1.42/t1disasm.c Wed Oct 28 00:08:00 2020 ++++ t1utils-src/t1disasm.c Sat Oct 31 13:04:32 2020 @@ -727,6 +727,7 @@ /* As we might be processing a PFB (binary) input file, we must set its file mode to binary. */ @@ -35,9 +33,9 @@ diff -ur t1utils-1.41.orig/t1disasm.c t1utils-1.41/t1disasm.c #endif /* prepare font reader */ -diff -ur t1utils-1.41.orig/t1unmac.c t1utils-1.41/t1unmac.c ---- t1utils-1.41.orig/t1unmac.c Thu Aug 17 01:31:39 2017 -+++ t1utils-1.41/t1unmac.c Mon Aug 28 15:43:58 2017 +diff -ur t1utils-1.42/t1unmac.c t1utils-src/t1unmac.c +--- t1utils-1.42/t1unmac.c Wed Oct 28 00:08:00 2020 ++++ t1utils-src/t1unmac.c Sat Oct 31 13:06:12 2020 @@ -656,8 +655,7 @@ _setmode(_fileno(ifp), _O_BINARY); /* If we are processing a PFB (binary) output */ diff --git a/Build/source/utils/t1utils/TLpatches/patch-05-getopt b/Build/source/utils/t1utils/TLpatches/patch-05-getopt index 38c9b9cb035..ea581057951 100644 --- a/Build/source/utils/t1utils/TLpatches/patch-05-getopt +++ b/Build/source/utils/t1utils/TLpatches/patch-05-getopt @@ -1,6 +1,6 @@ -diff -ur t1utils-1.41.orig/t1unmac.c t1utils-1.41/t1unmac.c ---- t1utils-1.41.orig/t1unmac.c Thu Aug 17 01:31:39 2017 -+++ t1utils-1.41/t1unmac.c Mon Aug 28 14:26:09 2017 +diff -ur t1utils-1.42/t1unmac.c t1utils-src/t1unmac.c +--- t1utils-1.42/t1unmac.c Wed Oct 28 00:08:00 2020 ++++ t1utils-src/t1unmac.c Sat Oct 31 13:06:12 2020 @@ -41,7 +41,6 @@ #endif #if defined(_MSDOS) || defined(_WIN32) diff --git a/Build/source/utils/t1utils/TLpatches/patch-07-warnings b/Build/source/utils/t1utils/TLpatches/patch-07-warnings index 0d5bbf7fb4f..16c9340879c 100644 --- a/Build/source/utils/t1utils/TLpatches/patch-07-warnings +++ b/Build/source/utils/t1utils/TLpatches/patch-07-warnings @@ -1,8 +1,6 @@ - Avoid compiler warnings (gcc's -Wcast-qual). - -diff -ur t1utils-1.41.orig/t1asmhelp.h t1utils-1.41/t1asmhelp.h ---- t1utils-1.41.orig/t1asmhelp.h Thu Aug 17 00:20:27 2017 -+++ t1utils-1.41/t1asmhelp.h Wed Aug 30 13:42:34 2017 +diff -ur t1utils-1.42/t1asmhelp.h t1utils-src/t1asmhelp.h +--- t1utils-1.42/t1asmhelp.h Wed Oct 28 00:08:00 2020 ++++ t1utils-src/t1asmhelp.h Sat Oct 31 13:15:46 2020 @@ -26,7 +28,8 @@ } diff --git a/Build/source/utils/t1utils/TLpatches/patch-08-notuse-system-memmem b/Build/source/utils/t1utils/TLpatches/patch-08-notuse-system-memmem index ed4a780c4fb..ef0997bc1ca 100644 --- a/Build/source/utils/t1utils/TLpatches/patch-08-notuse-system-memmem +++ b/Build/source/utils/t1utils/TLpatches/patch-08-notuse-system-memmem @@ -1,6 +1,6 @@ -diff -ur t1utils-1.41.orig/memmem.c t1utils-1.41/memmem.c ---- t1utils-1.41.orig/memmem.c Thu Aug 17 00:20:27 2017 -+++ t1utils-1.41/memmem.c Wed Aug 30 13:40:56 2017 +diff -ur t1utils-1.42/memmem.c t1utils-src/memmem.c +--- t1utils-1.42/memmem.c Wed Oct 28 00:08:00 2020 ++++ t1utils-src/memmem.c Sat Oct 31 13:12:12 2020 @@ -9,6 +9,8 @@ extern "C" { #endif @@ -10,9 +10,9 @@ diff -ur t1utils-1.41.orig/memmem.c t1utils-1.41/memmem.c void* memmem(const void* haystack, size_t haystack_len, const void* needle, size_t needle_len) -diff -ur t1utils-1.41.orig/t1asmhelp.h t1utils-1.41/t1asmhelp.h ---- t1utils-1.41.orig/t1asmhelp.h Thu Aug 17 00:20:27 2017 -+++ t1utils-1.41/t1asmhelp.h Wed Aug 30 13:42:34 2017 +diff -ur t1utils-1.42/t1asmhelp.h t1utils-src/t1asmhelp.h +--- t1utils-1.42/t1asmhelp.h Wed Oct 28 00:08:00 2020 ++++ t1utils-src/t1asmhelp.h Sat Oct 31 13:15:46 2020 @@ -7,6 +7,8 @@ lenIV to <num>. This indicates the number of random bytes at the beginning of each charstring. */ @@ -22,4 +22,3 @@ diff -ur t1utils-1.41.orig/t1asmhelp.h t1utils-1.41/t1asmhelp.h static void set_lenIV(const char* line, size_t line_len) { - diff --git a/Build/source/utils/t1utils/configure b/Build/source/utils/t1utils/configure index d507edd912c..930af4cbeab 100755 --- a/Build/source/utils/t1utils/configure +++ b/Build/source/utils/t1utils/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for t1utils (TeX Live) 1.41. +# Generated by GNU Autoconf 2.69 for t1utils (TeX Live) 1.42. # # Report bugs to <tex-k@tug.org>. # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='t1utils (TeX Live)' PACKAGE_TARNAME='t1utils--tex-live-' -PACKAGE_VERSION='1.41' -PACKAGE_STRING='t1utils (TeX Live) 1.41' +PACKAGE_VERSION='1.42' +PACKAGE_STRING='t1utils (TeX Live) 1.42' PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' @@ -1273,7 +1273,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures t1utils (TeX Live) 1.41 to adapt to many kinds of systems. +\`configure' configures t1utils (TeX Live) 1.42 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1340,7 +1340,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of t1utils (TeX Live) 1.41:";; + short | recursive ) echo "Configuration of t1utils (TeX Live) 1.42:";; esac cat <<\_ACEOF @@ -1437,7 +1437,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -t1utils (TeX Live) configure 1.41 +t1utils (TeX Live) configure 1.42 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2043,7 +2043,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by t1utils (TeX Live) $as_me 1.41, which was +It was created by t1utils (TeX Live) $as_me 1.42, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3967,7 +3967,7 @@ fi # Define the identity of the package. PACKAGE='t1utils--tex-live-' - VERSION='1.41' + VERSION='1.42' cat >>confdefs.h <<_ACEOF @@ -6159,7 +6159,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by t1utils (TeX Live) $as_me 1.41, which was +This file was extended by t1utils (TeX Live) $as_me 1.42, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6225,7 +6225,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -t1utils (TeX Live) config.status 1.41 +t1utils (TeX Live) config.status 1.42 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/Build/source/utils/t1utils/t1utils-src/NEWS.md b/Build/source/utils/t1utils/t1utils-src/NEWS.md index 458b6113182..18881bddb00 100644 --- a/Build/source/utils/t1utils/t1utils-src/NEWS.md +++ b/Build/source/utils/t1utils/t1utils-src/NEWS.md @@ -1,6 +1,11 @@ T1utils NEWS ============ +## Version 1.42 – 27.Oct.2020 + +* Compile fixes for OSes that do not declare a function. + + ## Version 1.41 – 16.Aug.2017 * t1asm, t1disasm: More security fixes. diff --git a/Build/source/utils/t1utils/t1utils-src/config.h.in b/Build/source/utils/t1utils/t1utils-src/config.h.in index 718cae85698..e3686d8e044 100644 --- a/Build/source/utils/t1utils/t1utils-src/config.h.in +++ b/Build/source/utils/t1utils/t1utils-src/config.h.in @@ -3,6 +3,10 @@ #ifndef T1UTILS_CONFIG_H #define T1UTILS_CONFIG_H +/* Define to 1 if you have the declaration of `memmem', and to 0 if you don't. + */ +#undef HAVE_DECL_MEMMEM + /* Define if intXX_t types are not available. */ #undef HAVE_FAKE_INT_TYPES @@ -96,7 +100,7 @@ char* strerror(int errno); #endif /* Prototype memmem if we don't have it. */ -#if !HAVE_MEMMEM +#if !HAVE_MEMMEM || !HAVE_DECL_MEMMEM void* memmem(const void* haystack, size_t haystack_len, const void* needle, size_t needle_len); #endif diff --git a/Build/source/utils/t1utils/t1utils-src/configure.ac b/Build/source/utils/t1utils/t1utils-src/configure.ac index 5b4e3ffc22a..d5619c5a1d0 100644 --- a/Build/source/utils/t1utils/t1utils-src/configure.ac +++ b/Build/source/utils/t1utils/t1utils-src/configure.ac @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([t1utils], [1.41]) +AC_INIT([t1utils], [1.42]) AC_CONFIG_SRCDIR([t1ascii.c]) AM_INIT_AUTOMAKE AC_CONFIG_HEADERS([config.h]) @@ -19,6 +19,7 @@ dnl strerror()? dnl AC_REPLACE_FUNCS([strerror memmem]) +AC_CHECK_DECLS([memmem]) dnl @@ -88,7 +89,7 @@ char* strerror(int errno); #endif /* Prototype memmem if we don't have it. */ -#if !HAVE_MEMMEM +#if !HAVE_MEMMEM || !HAVE_DECL_MEMMEM void* memmem(const void* haystack, size_t haystack_len, const void* needle, size_t needle_len); #endif diff --git a/Build/source/utils/t1utils/t1utils-src/t1ascii.1 b/Build/source/utils/t1utils/t1utils-src/t1ascii.1 index 8fc7e884cf5..e8fa1e11a80 100644 --- a/Build/source/utils/t1utils/t1utils-src/t1ascii.1 +++ b/Build/source/utils/t1utils/t1utils-src/t1ascii.1 @@ -1,4 +1,4 @@ -.ds V 1.41 +.ds V 1.42 .de M .BR "\\$1" "(\\$2)\\$3" .. diff --git a/Build/source/utils/t1utils/t1utils-src/t1asm.1 b/Build/source/utils/t1utils/t1utils-src/t1asm.1 index cdf5e59c198..a346be75532 100644 --- a/Build/source/utils/t1utils/t1utils-src/t1asm.1 +++ b/Build/source/utils/t1utils/t1utils-src/t1asm.1 @@ -1,4 +1,4 @@ -.ds V 1.41 +.ds V 1.42 .de M .BR "\\$1" "(\\$2)\\$3" .. diff --git a/Build/source/utils/t1utils/t1utils-src/t1binary.1 b/Build/source/utils/t1utils/t1utils-src/t1binary.1 index 9574b394989..9a1e8f02bed 100644 --- a/Build/source/utils/t1utils/t1utils-src/t1binary.1 +++ b/Build/source/utils/t1utils/t1utils-src/t1binary.1 @@ -1,4 +1,4 @@ -.ds V 1.41 +.ds V 1.42 .de M .BR "\\$1" "(\\$2)\\$3" .. diff --git a/Build/source/utils/t1utils/t1utils-src/t1disasm.1 b/Build/source/utils/t1utils/t1utils-src/t1disasm.1 index f9ff3b54281..60940523142 100644 --- a/Build/source/utils/t1utils/t1utils-src/t1disasm.1 +++ b/Build/source/utils/t1utils/t1utils-src/t1disasm.1 @@ -1,4 +1,4 @@ -.ds V 1.41 +.ds V 1.42 .de M .BR "\\$1" "(\\$2)\\$3" .. diff --git a/Build/source/utils/t1utils/t1utils-src/t1mac.1 b/Build/source/utils/t1utils/t1utils-src/t1mac.1 index e48af31dbe3..d19c96f3d41 100644 --- a/Build/source/utils/t1utils/t1utils-src/t1mac.1 +++ b/Build/source/utils/t1utils/t1utils-src/t1mac.1 @@ -1,4 +1,4 @@ -.ds V 1.41 +.ds V 1.42 .de M .BR "\\$1" "(\\$2)\\$3" .. diff --git a/Build/source/utils/t1utils/t1utils-src/t1unmac.1 b/Build/source/utils/t1utils/t1utils-src/t1unmac.1 index a86c9ea15af..2e121d10be8 100644 --- a/Build/source/utils/t1utils/t1utils-src/t1unmac.1 +++ b/Build/source/utils/t1utils/t1utils-src/t1unmac.1 @@ -1,4 +1,4 @@ -.ds V 1.41 +.ds V 1.42 .de M .BR "\\$1" "(\\$2)\\$3" .. diff --git a/Build/source/utils/t1utils/version.ac b/Build/source/utils/t1utils/version.ac index 5ed4185e15e..d2f4e144ea2 100644 --- a/Build/source/utils/t1utils/version.ac +++ b/Build/source/utils/t1utils/version.ac @@ -8,4 +8,4 @@ dnl dnl -------------------------------------------------------- dnl dnl m4-include this file to define the current t1utils version -m4_define([t1utils_version], [1.41]) +m4_define([t1utils_version], [1.42]) |