From 8e0cef3ad1e13cb8bef0b71416c3e9ff7b46fdc0 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Tue, 1 Jan 2019 18:08:13 +0100 Subject: [PATCH] update: gdb, libidn, lzma, nasm --- src/gdb.mk | 4 +- src/libidn-1-fixes.patch | 1022 +------------------------------------- src/libidn.mk | 5 +- src/lzma.mk | 4 +- src/nasm.mk | 4 +- 5 files changed, 9 insertions(+), 1030 deletions(-) diff --git a/src/gdb.mk b/src/gdb.mk index e6e11961..e951f705 100644 --- a/src/gdb.mk +++ b/src/gdb.mk @@ -2,8 +2,8 @@ PKG := gdb $(PKG)_WEBSITE := https://www.gnu.org/software/gdb/ -$(PKG)_VERSION := 8.2 -$(PKG)_CHECKSUM := c3a441a29c7c89720b734e5a9c6289c0a06be7e0c76ef538f7bbcef389347c39 +$(PKG)_VERSION := 8.2.1 +$(PKG)_CHECKSUM := 0a6a432907a03c5c8eaad3c3cffd50c00a40c3a5e3c4039440624bae703f2202 $(PKG)_SUBDIR := gdb-$($(PKG)_VERSION) $(PKG)_FILE := gdb-$($(PKG)_VERSION).tar.xz $(PKG)_URL := https://ftp.gnu.org/gnu/$(PKG)/$($(PKG)_FILE) diff --git a/src/libidn-1-fixes.patch b/src/libidn-1-fixes.patch index da25d33a..d192b298 100644 --- a/src/libidn-1-fixes.patch +++ b/src/libidn-1-fixes.patch @@ -5,7 +5,7 @@ Contains ad hoc patches for cross building. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "a@mxe.org" Date: Fri, 25 Nov 2011 15:58:28 +0100 -Subject: [PATCH 1/4] fix Libs.private +Subject: [PATCH 1/1] fix Libs.private diff --git a/libidn.pc.in b/libidn.pc.in @@ -19,1023 +19,3 @@ index 1111111..2222222 100644 -Libs.private: @LTLIBICONV@ +Libs.private: -lintl -liconv Cflags: -I${includedir} - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim=20R=C3=BChsen?= -Date: Wed, 1 Feb 2017 10:44:36 +0100 -Subject: [PATCH 2/4] Update intprops.h for gcc-7 compatibility - -(cherry picked from commit 230930b3bc3e431b819eb45420cb42475d83ca93) - -diff --git a/gl/intprops.h b/gl/intprops.h -index 1111111..2222222 100644 ---- a/gl/intprops.h -+++ b/gl/intprops.h -@@ -1,18 +1,18 @@ - /* intprops.h -- properties of integer types - -- Copyright (C) 2001-2016 Free Software Foundation, Inc. -+ Copyright (C) 2001-2017 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published -- by the Free Software Foundation; either version 3 of the License, or -+ under the terms of the GNU Lesser General Public License as published -+ by the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- GNU General Public License for more details. -+ GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU General Public License -+ You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ - - /* Written by Paul Eggert. */ -@@ -47,12 +47,16 @@ - - /* Minimum and maximum values for integer types and expressions. */ - -+/* The width in bits of the integer type or expression T. -+ Padding bits are not supported; this is checked at compile-time below. */ -+#define TYPE_WIDTH(t) (sizeof (t) * CHAR_BIT) -+ - /* The maximum and minimum values for the integer type T. */ - #define TYPE_MINIMUM(t) ((t) ~ TYPE_MAXIMUM (t)) - #define TYPE_MAXIMUM(t) \ - ((t) (! TYPE_SIGNED (t) \ - ? (t) -1 \ -- : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1))) -+ : ((((t) 1 << (TYPE_WIDTH (t) - 2)) - 1) * 2 + 1))) - - /* The maximum and minimum values for the type of the expression E, - after integer promotion. E should not have side effects. */ -@@ -65,7 +69,13 @@ - ? _GL_SIGNED_INT_MAXIMUM (e) \ - : _GL_INT_NEGATE_CONVERT (e, 1)) - #define _GL_SIGNED_INT_MAXIMUM(e) \ -- (((_GL_INT_CONVERT (e, 1) << (sizeof ((e) + 0) * CHAR_BIT - 2)) - 1) * 2 + 1) -+ (((_GL_INT_CONVERT (e, 1) << (TYPE_WIDTH ((e) + 0) - 2)) - 1) * 2 + 1) -+ -+/* Work around OpenVMS incompatibility with C99. */ -+#if !defined LLONG_MAX && defined __INT64_MAX -+# define LLONG_MAX __INT64_MAX -+# define LLONG_MIN __INT64_MIN -+#endif - - /* This include file assumes that signed types are two's complement without - padding bits; the above macros have undefined behavior otherwise. -@@ -84,10 +94,15 @@ verify (TYPE_MAXIMUM (long int) == LONG_MAX); - verify (TYPE_MINIMUM (long long int) == LLONG_MIN); - verify (TYPE_MAXIMUM (long long int) == LLONG_MAX); - #endif -+/* Similarly, sanity-check one ISO/IEC TS 18661-1:2014 macro if defined. */ -+#ifdef UINT_WIDTH -+verify (TYPE_WIDTH (unsigned int) == UINT_WIDTH); -+#endif - - /* Does the __typeof__ keyword work? This could be done by - 'configure', but for now it's easier to do it by hand. */ --#if (2 <= __GNUC__ || defined __IBM__TYPEOF__ \ -+#if (2 <= __GNUC__ \ -+ || (1210 <= __IBMC__ && defined __IBM__TYPEOF__) \ - || (0x5110 <= __SUNPRO_C && !__STDC__)) - # define _GL_HAVE___TYPEOF__ 1 - #else -@@ -116,8 +131,7 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX); - signed, this macro may overestimate the true bound by one byte when - applied to unsigned types of size 2, 4, 16, ... bytes. */ - #define INT_STRLEN_BOUND(t) \ -- (INT_BITS_STRLEN_BOUND (sizeof (t) * CHAR_BIT \ -- - _GL_SIGNED_TYPE_OR_EXPR (t)) \ -+ (INT_BITS_STRLEN_BOUND (TYPE_WIDTH (t) - _GL_SIGNED_TYPE_OR_EXPR (t)) \ - + _GL_SIGNED_TYPE_OR_EXPR (t)) - - /* Bound on buffer size needed to represent an integer type or expression T, -@@ -222,20 +236,23 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX); - ? (a) < (min) >> (b) \ - : (max) >> (b) < (a)) - --/* True if __builtin_add_overflow (A, B, P) works when P is null. */ --#define _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL (7 <= __GNUC__) -+/* True if __builtin_add_overflow (A, B, P) works when P is non-null. */ -+#define _GL_HAS_BUILTIN_OVERFLOW (5 <= __GNUC__) -+ -+/* True if __builtin_add_overflow_p (A, B, C) works. */ -+#define _GL_HAS_BUILTIN_OVERFLOW_P (7 <= __GNUC__) - - /* The _GL*_OVERFLOW macros have the same restrictions as the - *_RANGE_OVERFLOW macros, except that they do not assume that operands - (e.g., A and B) have the same type as MIN and MAX. Instead, they assume - that the result (e.g., A + B) has that type. */ --#if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL --# define _GL_ADD_OVERFLOW(a, b, min, max) -- __builtin_add_overflow (a, b, (__typeof__ ((a) + (b)) *) 0) --# define _GL_SUBTRACT_OVERFLOW(a, b, min, max) -- __builtin_sub_overflow (a, b, (__typeof__ ((a) - (b)) *) 0) --# define _GL_MULTIPLY_OVERFLOW(a, b, min, max) -- __builtin_mul_overflow (a, b, (__typeof__ ((a) * (b)) *) 0) -+#if _GL_HAS_BUILTIN_OVERFLOW_P -+# define _GL_ADD_OVERFLOW(a, b, min, max) \ -+ __builtin_add_overflow_p (a, b, (__typeof__ ((a) + (b))) 0) -+# define _GL_SUBTRACT_OVERFLOW(a, b, min, max) \ -+ __builtin_sub_overflow_p (a, b, (__typeof__ ((a) - (b))) 0) -+# define _GL_MULTIPLY_OVERFLOW(a, b, min, max) \ -+ __builtin_mul_overflow_p (a, b, (__typeof__ ((a) * (b))) 0) - #else - # define _GL_ADD_OVERFLOW(a, b, min, max) \ - ((min) < 0 ? INT_ADD_RANGE_OVERFLOW (a, b, min, max) \ -@@ -315,7 +332,7 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX); - _GL_BINARY_OP_OVERFLOW (a, b, _GL_ADD_OVERFLOW) - #define INT_SUBTRACT_OVERFLOW(a, b) \ - _GL_BINARY_OP_OVERFLOW (a, b, _GL_SUBTRACT_OVERFLOW) --#if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL -+#if _GL_HAS_BUILTIN_OVERFLOW_P - # define INT_NEGATE_OVERFLOW(a) INT_SUBTRACT_OVERFLOW (0, a) - #else - # define INT_NEGATE_OVERFLOW(a) \ -@@ -349,10 +366,6 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX); - #define INT_MULTIPLY_WRAPV(a, b, r) \ - _GL_INT_OP_WRAPV (a, b, r, *, __builtin_mul_overflow, INT_MULTIPLY_OVERFLOW) - --#ifndef __has_builtin --# define __has_builtin(x) 0 --#endif -- - /* Nonzero if this compiler has GCC bug 68193 or Clang bug 25390. See: - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68193 - https://llvm.org/bugs/show_bug.cgi?id=25390 -@@ -369,7 +382,7 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX); - the operation. BUILTIN is the builtin operation, and OVERFLOW the - overflow predicate. Return 1 if the result overflows. See above - for restrictions. */ --#if 5 <= __GNUC__ || __has_builtin (__builtin_add_overflow) -+#if _GL_HAS_BUILTIN_OVERFLOW - # define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) builtin (a, b, r) - #elif 201112 <= __STDC_VERSION__ && !_GL__GENERIC_BOGUS - # define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) \ -@@ -412,7 +425,7 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX); - # else - # define _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow) \ - _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \ -- long int, LONG_MIN, LONG_MAX)) -+ long int, LONG_MIN, LONG_MAX) - # endif - #endif - -diff --git a/lib/gltests/intprops.h b/lib/gltests/intprops.h -index 1111111..2222222 100644 ---- a/lib/gltests/intprops.h -+++ b/lib/gltests/intprops.h -@@ -1,18 +1,18 @@ - /* intprops.h -- properties of integer types - -- Copyright (C) 2001-2016 Free Software Foundation, Inc. -+ Copyright (C) 2001-2017 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published -- by the Free Software Foundation; either version 3 of the License, or -+ under the terms of the GNU Lesser General Public License as published -+ by the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- GNU General Public License for more details. -+ GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU General Public License -+ You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ - - /* Written by Paul Eggert. */ -@@ -47,12 +47,16 @@ - - /* Minimum and maximum values for integer types and expressions. */ - -+/* The width in bits of the integer type or expression T. -+ Padding bits are not supported; this is checked at compile-time below. */ -+#define TYPE_WIDTH(t) (sizeof (t) * CHAR_BIT) -+ - /* The maximum and minimum values for the integer type T. */ - #define TYPE_MINIMUM(t) ((t) ~ TYPE_MAXIMUM (t)) - #define TYPE_MAXIMUM(t) \ - ((t) (! TYPE_SIGNED (t) \ - ? (t) -1 \ -- : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1))) -+ : ((((t) 1 << (TYPE_WIDTH (t) - 2)) - 1) * 2 + 1))) - - /* The maximum and minimum values for the type of the expression E, - after integer promotion. E should not have side effects. */ -@@ -65,7 +69,13 @@ - ? _GL_SIGNED_INT_MAXIMUM (e) \ - : _GL_INT_NEGATE_CONVERT (e, 1)) - #define _GL_SIGNED_INT_MAXIMUM(e) \ -- (((_GL_INT_CONVERT (e, 1) << (sizeof ((e) + 0) * CHAR_BIT - 2)) - 1) * 2 + 1) -+ (((_GL_INT_CONVERT (e, 1) << (TYPE_WIDTH ((e) + 0) - 2)) - 1) * 2 + 1) -+ -+/* Work around OpenVMS incompatibility with C99. */ -+#if !defined LLONG_MAX && defined __INT64_MAX -+# define LLONG_MAX __INT64_MAX -+# define LLONG_MIN __INT64_MIN -+#endif - - /* This include file assumes that signed types are two's complement without - padding bits; the above macros have undefined behavior otherwise. -@@ -84,10 +94,15 @@ verify (TYPE_MAXIMUM (long int) == LONG_MAX); - verify (TYPE_MINIMUM (long long int) == LLONG_MIN); - verify (TYPE_MAXIMUM (long long int) == LLONG_MAX); - #endif -+/* Similarly, sanity-check one ISO/IEC TS 18661-1:2014 macro if defined. */ -+#ifdef UINT_WIDTH -+verify (TYPE_WIDTH (unsigned int) == UINT_WIDTH); -+#endif - - /* Does the __typeof__ keyword work? This could be done by - 'configure', but for now it's easier to do it by hand. */ --#if (2 <= __GNUC__ || defined __IBM__TYPEOF__ \ -+#if (2 <= __GNUC__ \ -+ || (1210 <= __IBMC__ && defined __IBM__TYPEOF__) \ - || (0x5110 <= __SUNPRO_C && !__STDC__)) - # define _GL_HAVE___TYPEOF__ 1 - #else -@@ -116,8 +131,7 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX); - signed, this macro may overestimate the true bound by one byte when - applied to unsigned types of size 2, 4, 16, ... bytes. */ - #define INT_STRLEN_BOUND(t) \ -- (INT_BITS_STRLEN_BOUND (sizeof (t) * CHAR_BIT \ -- - _GL_SIGNED_TYPE_OR_EXPR (t)) \ -+ (INT_BITS_STRLEN_BOUND (TYPE_WIDTH (t) - _GL_SIGNED_TYPE_OR_EXPR (t)) \ - + _GL_SIGNED_TYPE_OR_EXPR (t)) - - /* Bound on buffer size needed to represent an integer type or expression T, -@@ -222,20 +236,23 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX); - ? (a) < (min) >> (b) \ - : (max) >> (b) < (a)) - --/* True if __builtin_add_overflow (A, B, P) works when P is null. */ --#define _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL (7 <= __GNUC__) -+/* True if __builtin_add_overflow (A, B, P) works when P is non-null. */ -+#define _GL_HAS_BUILTIN_OVERFLOW (5 <= __GNUC__) -+ -+/* True if __builtin_add_overflow_p (A, B, C) works. */ -+#define _GL_HAS_BUILTIN_OVERFLOW_P (7 <= __GNUC__) - - /* The _GL*_OVERFLOW macros have the same restrictions as the - *_RANGE_OVERFLOW macros, except that they do not assume that operands - (e.g., A and B) have the same type as MIN and MAX. Instead, they assume - that the result (e.g., A + B) has that type. */ --#if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL --# define _GL_ADD_OVERFLOW(a, b, min, max) -- __builtin_add_overflow (a, b, (__typeof__ ((a) + (b)) *) 0) --# define _GL_SUBTRACT_OVERFLOW(a, b, min, max) -- __builtin_sub_overflow (a, b, (__typeof__ ((a) - (b)) *) 0) --# define _GL_MULTIPLY_OVERFLOW(a, b, min, max) -- __builtin_mul_overflow (a, b, (__typeof__ ((a) * (b)) *) 0) -+#if _GL_HAS_BUILTIN_OVERFLOW_P -+# define _GL_ADD_OVERFLOW(a, b, min, max) \ -+ __builtin_add_overflow_p (a, b, (__typeof__ ((a) + (b))) 0) -+# define _GL_SUBTRACT_OVERFLOW(a, b, min, max) \ -+ __builtin_sub_overflow_p (a, b, (__typeof__ ((a) - (b))) 0) -+# define _GL_MULTIPLY_OVERFLOW(a, b, min, max) \ -+ __builtin_mul_overflow_p (a, b, (__typeof__ ((a) * (b))) 0) - #else - # define _GL_ADD_OVERFLOW(a, b, min, max) \ - ((min) < 0 ? INT_ADD_RANGE_OVERFLOW (a, b, min, max) \ -@@ -315,7 +332,7 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX); - _GL_BINARY_OP_OVERFLOW (a, b, _GL_ADD_OVERFLOW) - #define INT_SUBTRACT_OVERFLOW(a, b) \ - _GL_BINARY_OP_OVERFLOW (a, b, _GL_SUBTRACT_OVERFLOW) --#if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL -+#if _GL_HAS_BUILTIN_OVERFLOW_P - # define INT_NEGATE_OVERFLOW(a) INT_SUBTRACT_OVERFLOW (0, a) - #else - # define INT_NEGATE_OVERFLOW(a) \ -@@ -349,10 +366,6 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX); - #define INT_MULTIPLY_WRAPV(a, b, r) \ - _GL_INT_OP_WRAPV (a, b, r, *, __builtin_mul_overflow, INT_MULTIPLY_OVERFLOW) - --#ifndef __has_builtin --# define __has_builtin(x) 0 --#endif -- - /* Nonzero if this compiler has GCC bug 68193 or Clang bug 25390. See: - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68193 - https://llvm.org/bugs/show_bug.cgi?id=25390 -@@ -369,7 +382,7 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX); - the operation. BUILTIN is the builtin operation, and OVERFLOW the - overflow predicate. Return 1 if the result overflows. See above - for restrictions. */ --#if 5 <= __GNUC__ || __has_builtin (__builtin_add_overflow) -+#if _GL_HAS_BUILTIN_OVERFLOW - # define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) builtin (a, b, r) - #elif 201112 <= __STDC_VERSION__ && !_GL__GENERIC_BOGUS - # define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) \ -@@ -412,7 +425,7 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX); - # else - # define _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow) \ - _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \ -- long int, LONG_MIN, LONG_MAX)) -+ long int, LONG_MIN, LONG_MAX) - # endif - #endif - - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim=20R=C3=BChsen?= -Date: Wed, 1 Feb 2017 10:45:29 +0100 -Subject: [PATCH 3/4] Increase value for -Wframe-larger-than (gcc-7) - -(cherry picked from commit a6fcdb4f953e40ea162a9104cac034bce01706af) - -diff --git a/configure.ac b/configure.ac -index 1111111..2222222 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -128,7 +128,7 @@ AC_ARG_ENABLE([gcc-warnings], - - if test "$gl_gcc_warnings" = yes; then - gl_WARN_ADD([-Werror], [WERROR_CFLAGS]) -- gl_WARN_ADD([-Wframe-larger-than=112], [WSTACK_CFLAGS]) -+ gl_WARN_ADD([-Wframe-larger-than=160], [WSTACK_CFLAGS]) - - nw="$nw -Wsystem-headers" # Don't let system headers trigger warnings - nw="$nw -Wpadded" # Struct in src/idn_cmd.h is not padded - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim=20R=C3=BChsen?= -Date: Wed, 1 Feb 2017 11:06:39 +0100 -Subject: [PATCH 4/4] Fix -Wformat warnings - -(cherry picked from commit 7148adf34dae30345c2e4d9d437838a45ba6f6e8) - -diff --git a/examples/example.c b/examples/example.c -index 1111111..2222222 100644 ---- a/examples/example.c -+++ b/examples/example.c -@@ -55,7 +55,7 @@ main (void) - - printf ("Before locale2utf8 (length %ld): ", (long int) strlen (buf)); - for (i = 0; i < strlen (buf); i++) -- printf ("%02x ", buf[i] & 0xFF); -+ printf ("%02x ", (unsigned) buf[i] & 0xFF); - printf ("\n"); - - p = stringprep_locale_to_utf8 (buf); -@@ -69,7 +69,7 @@ main (void) - - printf ("Before stringprep (length %ld): ", (long int) strlen (buf)); - for (i = 0; i < strlen (buf); i++) -- printf ("%02x ", buf[i] & 0xFF); -+ printf ("%02x ", (unsigned) buf[i] & 0xFF); - printf ("\n"); - - rc = stringprep (buf, BUFSIZ, 0, stringprep_nameprep); -@@ -79,7 +79,7 @@ main (void) - { - printf ("After stringprep (length %ld): ", (long int) strlen (buf)); - for (i = 0; i < strlen (buf); i++) -- printf ("%02x ", buf[i] & 0xFF); -+ printf ("%02x ", (unsigned) buf[i] & 0xFF); - printf ("\n"); - } - -diff --git a/examples/example3.c b/examples/example3.c -index 1111111..2222222 100644 ---- a/examples/example3.c -+++ b/examples/example3.c -@@ -56,7 +56,7 @@ main (void) - - printf ("Read string (length %ld): ", (long int) strlen (buf)); - for (i = 0; i < strlen (buf); i++) -- printf ("%02x ", buf[i] & 0xFF); -+ printf ("%02x ", (unsigned) buf[i] & 0xFF); - printf ("\n"); - - rc = idna_to_ascii_lz (buf, &p, 0); -@@ -68,7 +68,7 @@ main (void) - - printf ("ACE label (length %ld): '%s'\n", (long int) strlen (p), p); - for (i = 0; i < strlen (p); i++) -- printf ("%02x ", p[i] & 0xFF); -+ printf ("%02x ", (unsigned) p[i] & 0xFF); - printf ("\n"); - - free (p); -diff --git a/examples/example4.c b/examples/example4.c -index 1111111..2222222 100644 ---- a/examples/example4.c -+++ b/examples/example4.c -@@ -56,7 +56,7 @@ main (void) - - printf ("Read string (length %ld): ", (long int) strlen (buf)); - for (i = 0; i < strlen (buf); i++) -- printf ("%02x ", buf[i] & 0xFF); -+ printf ("%02x ", (unsigned) buf[i] & 0xFF); - printf ("\n"); - - rc = idna_to_unicode_lzlz (buf, &p, 0); -@@ -68,7 +68,7 @@ main (void) - - printf ("ACE label (length %ld): '%s'\n", (long int) strlen (p), p); - for (i = 0; i < strlen (p); i++) -- printf ("%02x ", p[i] & 0xFF); -+ printf ("%02x ", (unsigned) p[i] & 0xFF); - printf ("\n"); - - free (p); -diff --git a/examples/example5.c b/examples/example5.c -index 1111111..2222222 100644 ---- a/examples/example5.c -+++ b/examples/example5.c -@@ -68,7 +68,7 @@ main (void) - - printf ("Read string (length %ld): ", (long int) strlen (buf)); - for (i = 0; i < strlen (buf); i++) -- printf ("%02x ", buf[i] & 0xFF); -+ printf ("%02x ", (unsigned) buf[i] & 0xFF); - printf ("\n"); - - p = stringprep_locale_to_utf8 (buf); -diff --git a/src/idn.c b/src/idn.c -index 1111111..2222222 100644 ---- a/src/idn.c -+++ b/src/idn.c -@@ -419,7 +419,7 @@ main (int argc, char *argv[]) - size_t i; - for (i = 0; p[i]; i++) - fprintf (stderr, "output[%lu] = U+%04x\n", -- (unsigned long) i, p[i]); -+ (unsigned long) i, (unsigned) p[i]); - } - - fprintf (stdout, "%s\n", p); -diff --git a/tests/tst_idna.c b/tests/tst_idna.c -index 1111111..2222222 100644 ---- a/tests/tst_idna.c -+++ b/tests/tst_idna.c -@@ -220,13 +220,14 @@ doit (void) - char label[100]; - uint32_t *ucs4label = NULL; - uint32_t tmp[100]; -- size_t len, len2, i; -+ size_t len, len2; - int rc; -+ unsigned i; - - for (i = 0; i < sizeof (idna) / sizeof (idna[0]); i++) - { - if (debug) -- printf ("IDNA entry %ld: %s\n", i, idna[i].name); -+ printf ("IDNA entry %u: %s\n", i, idna[i].name); - - if (debug) - { -@@ -237,7 +238,7 @@ doit (void) - rc = idna_to_ascii_4i (idna[i].in, idna[i].inlen, label, idna[i].flags); - if (rc != idna[i].toasciirc) - { -- fail ("IDNA entry %ld failed: %d\n", i, rc); -+ fail ("IDNA entry %u failed: %d\n", i, rc); - if (debug) - printf ("FATAL\n"); - continue; -@@ -256,7 +257,7 @@ doit (void) - if (strlen (idna[i].out) != strlen (label) || - strcasecmp (idna[i].out, label) != 0) - { -- fail ("IDNA entry %ld failed\n", i); -+ fail ("IDNA entry %u failed\n", i); - if (debug) - printf ("ERROR\n"); - } -@@ -273,8 +274,8 @@ doit (void) - - if (debug) - { -- printf ("in: %s (%ld==%ld)\n", idna[i].out, strlen (idna[i].out), -- len); -+ printf ("in: %s (%d==%d)\n", idna[i].out, (int) strlen (idna[i].out), -+ (int) len); - ucs4print (ucs4label, len); - } - -@@ -282,20 +283,20 @@ doit (void) - rc = idna_to_unicode_44i (ucs4label, len, tmp, &len2, idna[i].flags); - if (debug) - { -- printf ("expected out (%ld):\n", -+ printf ("expected out (%lu):\n", - rc == IDNA_SUCCESS ? idna[i].inlen : len); - if (rc == IDNA_SUCCESS) - ucs4print (idna[i].in, idna[i].inlen); - else - ucs4print (ucs4label, len); - -- printf ("computed out (%ld):\n", len2); -+ printf ("computed out (%d):\n", (int) len2); - ucs4print (tmp, len2); - } - - if (rc != idna[i].tounicoderc) - { -- fail ("IDNA entry %ld failed: %d\n", i, rc); -+ fail ("IDNA entry %u failed: %d\n", i, rc); - if (debug) - printf ("FATAL\n"); - continue; -@@ -309,11 +310,11 @@ doit (void) - if (debug) - { - if (rc == IDNA_SUCCESS) -- printf ("len=%ld len2=%ld\n", len2, idna[i].inlen); -+ printf ("len=%d len2=%d\n", (int) len2, (int) idna[i].inlen); - else -- printf ("len=%ld len2=%ld\n", len, len2); -+ printf ("len=%d len2=%d\n", (int) len, (int) len2); - } -- fail ("IDNA entry %ld failed\n", i); -+ fail ("IDNA entry %u failed\n", i); - if (debug) - printf ("ERROR\n"); - } -diff --git a/tests/tst_idna2.c b/tests/tst_idna2.c -index 1111111..2222222 100644 ---- a/tests/tst_idna2.c -+++ b/tests/tst_idna2.c -@@ -461,14 +461,14 @@ static const struct idna idna[] = { - void - doit (void) - { -- size_t i; -+ unsigned i; - char *out; - int rc; - - for (i = 0; i < sizeof (idna) / sizeof (idna[0]); i++) - { - if (debug) -- printf ("IDNA2 entry %ld\n", i); -+ printf ("IDNA2 entry %u\n", i); - - if (debug) - { -@@ -487,7 +487,7 @@ doit (void) - IDNA_USE_STD3_ASCII_RULES); - if (rc != IDNA_SUCCESS && strlen (idna[i].out) > 0) - { -- fail ("IDNA2 entry %ld failed: %d\n", i, rc); -+ fail ("IDNA2 entry %u failed: %d\n", i, rc); - continue; - } - -@@ -504,7 +504,7 @@ doit (void) - if (strlen (idna[i].out) != strlen (out) || - strcasecmp (idna[i].out, out) != 0) - { -- fail ("IDNA2 entry %ld failed\n", i); -+ fail ("IDNA2 entry %u failed\n", i); - if (debug) - printf ("ERROR\n"); - } -diff --git a/tests/tst_idna3.c b/tests/tst_idna3.c -index 1111111..2222222 100644 ---- a/tests/tst_idna3.c -+++ b/tests/tst_idna3.c -@@ -59,13 +59,13 @@ doit (void) - { - int rc; - char *out = NULL; -- size_t i; -+ unsigned i; - - for (i = 0; i < sizeof (idna) / sizeof (idna[0]); i++) - { - rc = idna_to_unicode_8z8z (idna[i].in, &out, 0); - if (rc != IDNA_SUCCESS) -- fail ("IDNA3[%ld] failed %d\n", i, rc); -+ fail ("IDNA3[%u] failed %d\n", i, rc); - - if (debug && rc == IDNA_SUCCESS) - { -@@ -75,9 +75,9 @@ doit (void) - } - - if (strcmp (out, idna[i].out) != 0) -- fail ("IDNA3[%ld] failed\n", i); -+ fail ("IDNA3[%u] failed\n", i); - else if (debug) -- printf ("IDNA3[%ld] success\n", i); -+ printf ("IDNA3[%u] success\n", i); - - if (out) - idn_free (out); -diff --git a/tests/tst_nfkc.c b/tests/tst_nfkc.c -index 1111111..2222222 100644 ---- a/tests/tst_nfkc.c -+++ b/tests/tst_nfkc.c -@@ -68,18 +68,18 @@ void - doit (void) - { - char *out; -- size_t i; -+ unsigned i; - - for (i = 0; i < sizeof (nfkc) / sizeof (nfkc[0]); i++) - { - if (debug) -- printf ("NFKC entry %ld\n", i); -+ printf ("NFKC entry %u\n", i); - - out = stringprep_utf8_nfkc_normalize (nfkc[i].in, - (ssize_t) strlen (nfkc[i].in)); - if (out == NULL) - { -- fail ("NFKC entry %ld failed fatally\n", i); -+ fail ("NFKC entry %u failed fatally\n", i); - continue; - } - -@@ -114,7 +114,7 @@ doit (void) - if (strlen (nfkc[i].out) != strlen (out) || - memcmp (nfkc[i].out, out, strlen (out)) != 0) - { -- fail ("NFKC entry %ld failed\n", i); -+ fail ("NFKC entry %u failed\n", i); - if (debug) - printf ("ERROR\n"); - } -diff --git a/tests/tst_pr29.c b/tests/tst_pr29.c -index 1111111..2222222 100644 ---- a/tests/tst_pr29.c -+++ b/tests/tst_pr29.c -@@ -91,7 +91,7 @@ static const struct tv tv[] = { - void - doit (void) - { -- size_t i; -+ unsigned i; - int rc; - - for (i = 0; i < sizeof (tv) / sizeof (tv[0]); i++) -@@ -100,7 +100,7 @@ doit (void) - { - uint32_t *p, *q; - -- printf ("PR29 entry %ld: %s\n", i, tv[i].name); -+ printf ("PR29 entry %u: %s\n", i, tv[i].name); - - printf ("in:\n"); - ucs4print (tv[i].in, tv[i].inlen); -@@ -120,7 +120,7 @@ doit (void) - rc = pr29_4 (tv[i].in, tv[i].inlen); - if (rc != tv[i].rc) - { -- fail ("PR29 entry %ld failed (expected %d): %d\n", i, tv[i].rc, rc); -+ fail ("PR29 entry %u failed (expected %d): %d\n", i, tv[i].rc, rc); - if (debug) - printf ("FATAL\n"); - continue; -@@ -129,7 +129,7 @@ doit (void) - rc = pr29_4z (tv[i].in); - if (rc != tv[i].rc) - { -- fail ("PR29 entry %ld failed (expected %d): %d\n", i, tv[i].rc, rc); -+ fail ("PR29 entry %u failed (expected %d): %d\n", i, tv[i].rc, rc); - if (debug) - printf ("FATAL\n"); - continue; -@@ -142,7 +142,7 @@ doit (void) - p = stringprep_ucs4_to_utf8 (tv[i].in, (ssize_t) tv[i].inlen, - &items_read, &items_written); - if (p == NULL) -- fail ("FAIL: stringprep_ucs4_to_utf8(tv[%ld]) == NULL\n", i); -+ fail ("FAIL: stringprep_ucs4_to_utf8(tv[%u]) == NULL\n", i); - if (debug) - hexprint (p, strlen (p)); - -@@ -150,7 +150,7 @@ doit (void) - free (p); - if (rc != tv[i].rc) - { -- fail ("PR29 entry %ld failed (expected %d): %d\n", -+ fail ("PR29 entry %u failed (expected %d): %d\n", - i, tv[i].rc, rc); - if (debug) - printf ("FATAL\n"); -diff --git a/tests/tst_punycode.c b/tests/tst_punycode.c -index 1111111..2222222 100644 ---- a/tests/tst_punycode.c -+++ b/tests/tst_punycode.c -@@ -173,7 +173,8 @@ doit (void) - char *p; - uint32_t *q; - int rc; -- size_t i, outlen; -+ size_t outlen; -+ unsigned i; - - p = malloc (sizeof (*p) * BUFSIZ); - if (p == NULL) -@@ -186,7 +187,7 @@ doit (void) - for (i = 0; i < sizeof (punycode) / sizeof (punycode[0]); i++) - { - if (debug) -- printf ("PUNYCODE entry %ld: %s\n", i, punycode[i].name); -+ printf ("PUNYCODE entry %u: %s\n", i, punycode[i].name); - - if (debug) - { -@@ -199,7 +200,7 @@ doit (void) - NULL, &outlen, p); - if (rc != punycode[i].rc) - { -- fail ("punycode_encode() entry %ld failed: %d\n", i, rc); -+ fail ("punycode_encode() entry %u failed: %d\n", i, rc); - if (debug) - printf ("FATAL\n"); - continue; -@@ -221,7 +222,7 @@ doit (void) - if (strlen (punycode[i].out) != strlen (p) || - memcmp (punycode[i].out, p, strlen (p)) != 0) - { -- fail ("punycode() entry %ld failed\n", i); -+ fail ("punycode() entry %u failed\n", i); - if (debug) - printf ("ERROR\n"); - } -@@ -241,7 +242,7 @@ doit (void) - &outlen, q, NULL); - if (rc != punycode[i].rc) - { -- fail ("punycode() entry %ld failed: %d\n", i, rc); -+ fail ("punycode() entry %u failed: %d\n", i, rc); - if (debug) - printf ("FATAL\n"); - continue; -@@ -262,7 +263,7 @@ doit (void) - if (punycode[i].inlen != outlen || - memcmp (punycode[i].in, q, outlen) != 0) - { -- fail ("punycode_decode() entry %ld failed\n", i); -+ fail ("punycode_decode() entry %u failed\n", i); - if (debug) - printf ("ERROR\n"); - } -diff --git a/tests/tst_strerror.c b/tests/tst_strerror.c -index 1111111..2222222 100644 ---- a/tests/tst_strerror.c -+++ b/tests/tst_strerror.c -@@ -110,7 +110,7 @@ doit (void) - /* Iterate through all error codes. */ - - { -- size_t i; -+ unsigned i; - const char *last_p = NULL; - - for (i = 0;; i++) -@@ -126,13 +126,13 @@ doit (void) - break; - } - if (debug) -- printf ("idna %ld: %s\n", i, p); -+ printf ("idna %u: %s\n", i, p); - last_p = p; - } - } - - { -- size_t i; -+ unsigned i; - const char *last_p = NULL; - - for (i = 0;; i++) -@@ -141,13 +141,13 @@ doit (void) - if (p == last_p) - break; - if (debug) -- printf ("pr29 %ld: %s\n", i, p); -+ printf ("pr29 %u: %s\n", i, p); - last_p = p; - } - } - - { -- size_t i; -+ unsigned i; - const char *last_p = NULL; - - for (i = 0;; i++) -@@ -156,13 +156,13 @@ doit (void) - if (p == last_p) - break; - if (debug) -- printf ("punycode %ld: %s\n", i, p); -+ printf ("punycode %u: %s\n", i, p); - last_p = p; - } - } - - { -- size_t i; -+ unsigned i; - const char *last_p = NULL; - - for (i = 0;; i++) -@@ -183,13 +183,13 @@ doit (void) - break; - } - if (debug) -- printf ("stringprep %ld: %s\n", i, p); -+ printf ("stringprep %u: %s\n", i, p); - last_p = p; - } - } - - { -- size_t i; -+ unsigned i; - const char *last_p = NULL; - - for (i = 0;; i++) -@@ -198,7 +198,7 @@ doit (void) - if (p == last_p) - break; - if (debug) -- printf ("tld %ld: %s\n", i, p); -+ printf ("tld %u: %s\n", i, p); - last_p = p; - } - } -diff --git a/tests/tst_stringprep.c b/tests/tst_stringprep.c -index 1111111..2222222 100644 ---- a/tests/tst_stringprep.c -+++ b/tests/tst_stringprep.c -@@ -205,7 +205,7 @@ doit (void) - { - char *p; - int rc; -- size_t i; -+ unsigned i; - - if (!stringprep_check_version (STRINGPREP_VERSION)) - fail ("stringprep_check_version failed (header %s runtime %s)\n", -@@ -224,7 +224,7 @@ doit (void) - for (i = 0; i < sizeof (strprep) / sizeof (strprep[0]); i++) - { - if (debug) -- printf ("STRINGPREP entry %ld\n", i); -+ printf ("STRINGPREP entry %u\n", i); - - if (debug) - { -@@ -247,12 +247,12 @@ doit (void) - continue; - else if (l == NULL) - { -- fail ("bad UTF-8 in entry %ld\n", i); -+ fail ("bad UTF-8 in entry %u\n", i); - continue; - } - else if (strcmp (strprep[i].in, x) != 0) - { -- fail ("bad UTF-8 in entry %ld\n", i); -+ fail ("bad UTF-8 in entry %u\n", i); - if (debug) - { - puts ("expected:"); -@@ -274,7 +274,7 @@ doit (void) - "Nameprep", strprep[i].flags); - if (rc != strprep[i].rc) - { -- fail ("stringprep() entry %ld failed: %d\n", i, rc); -+ fail ("stringprep() entry %u failed: %d\n", i, rc); - if (debug) - printf ("FATAL\n"); - if (rc == STRINGPREP_OK) -@@ -302,7 +302,7 @@ doit (void) - if (strlen (strprep[i].out) != strlen (p) || - memcmp (strprep[i].out, p, strlen (p)) != 0) - { -- fail ("stringprep() entry %ld failed\n", i); -+ fail ("stringprep() entry %ld failed\n", (long) i); - if (debug) - printf ("ERROR\n"); - } -diff --git a/tests/tst_tld.c b/tests/tst_tld.c -index 1111111..2222222 100644 ---- a/tests/tst_tld.c -+++ b/tests/tst_tld.c -@@ -80,7 +80,7 @@ const Tld_table * my_tld_tables[] = - void - doit (void) - { -- size_t i; -+ unsigned i; - const Tld_table *tldtable; - char *out; - size_t errpos; -@@ -206,7 +206,7 @@ doit (void) - for (i = 0; i < sizeof (tld) / sizeof (tld[0]); i++) - { - if (debug) -- printf ("TLD entry %ld: %s\n", i, tld[i].name); -+ printf ("TLD entry %u: %s\n", i, tld[i].name); - - if (debug) - { -@@ -217,7 +217,7 @@ doit (void) - tldtable = tld_default_table (tld[i].tld, NULL); - if (tldtable == NULL) - { -- fail ("TLD entry %ld tld_get_table (%s)\n", i, tld[i].tld); -+ fail ("TLD entry %u tld_get_table (%s)\n", i, tld[i].tld); - if (debug) - printf ("FATAL\n"); - continue; -@@ -226,7 +226,7 @@ doit (void) - rc = tld_check_4t (tld[i].in, tld[i].inlen, &errpos, tldtable); - if (rc != tld[i].rc) - { -- fail ("TLD entry %ld failed: %d\n", i, rc); -+ fail ("TLD entry %u failed: %d\n", i, rc); - if (debug) - printf ("FATAL\n"); - continue; -@@ -237,7 +237,7 @@ doit (void) - - if (rc != tld[i].rc) - { -- fail ("TLD entry %ld failed\n", i); -+ fail ("TLD entry %u failed\n", i); - if (debug) - printf ("ERROR\n"); - } -@@ -245,12 +245,12 @@ doit (void) - { - if (debug) - printf ("returned errpos %ld expected errpos %ld\n", -- errpos, tld[i].errpos); -+ (long) errpos, (long) tld[i].errpos); - - if (tld[i].errpos != errpos) - { -- fail ("TLD entry %ld failed because errpos %ld != %ld\n", i, -- tld[i].errpos, errpos); -+ fail ("TLD entry %u failed because errpos %ld != %ld\n", i, -+ (long) tld[i].errpos, (long) errpos); - if (debug) - printf ("ERROR\n"); - } -@@ -262,12 +262,12 @@ doit (void) - rc = tld_check_8z (tld[i].example, &errpos, NULL); - if (rc != tld[i].rc) - { -- fail ("TLD entry %ld failed\n", i); -+ fail ("TLD entry %u failed\n", i); - if (debug) - printf ("ERROR\n"); - } - if (debug) -- printf ("TLD entry %ld tld_check_8z (%s)\n", i, tld[i].example); -+ printf ("TLD entry %u tld_check_8z (%s)\n", i, tld[i].example); - } - } - } -diff --git a/tests/utils.c b/tests/utils.c -index 1111111..2222222 100644 ---- a/tests/utils.c -+++ b/tests/utils.c -@@ -49,7 +49,7 @@ escapeprint (const char *str, size_t len) - { - size_t i; - -- printf (" (length %ld bytes):\n\t", len); -+ printf (" (length %ld bytes):\n\t", (long) len); - for (i = 0; i < len; i++) - { - if (((str[i] & 0xFF) >= 'A' && (str[i] & 0xFF) <= 'Z') || -@@ -58,7 +58,7 @@ escapeprint (const char *str, size_t len) - || (str[i] & 0xFF) == ' ' || (str[i] & 0xFF) == '.') - printf ("%c", (str[i] & 0xFF)); - else -- printf ("\\x%02X", (str[i] & 0xFF)); -+ printf ("\\x%02X", (unsigned) (str[i] & 0xFF)); - if ((i + 1) % 16 == 0 && (i + 1) < len) - printf ("'\n\t'"); - } -@@ -73,7 +73,7 @@ hexprint (const char *str, size_t len) - printf ("\t;; "); - for (i = 0; i < len; i++) - { -- printf ("%02x ", (str[i] & 0xFF)); -+ printf ("%02x ", (unsigned) (str[i] & 0xFF)); - if ((i + 1) % 8 == 0) - printf (" "); - if ((i + 1) % 16 == 0 && i + 1 < len) diff --git a/src/libidn.mk b/src/libidn.mk index 37675306..3c24214a 100644 --- a/src/libidn.mk +++ b/src/libidn.mk @@ -4,8 +4,8 @@ PKG := libidn $(PKG)_WEBSITE := https://www.gnu.org/software/libidn/ $(PKG)_DESCR := Libidn $(PKG)_IGNORE := -$(PKG)_VERSION := 1.33 -$(PKG)_CHECKSUM := 44a7aab635bb721ceef6beecc4d49dfd19478325e1b47f3196f7d2acc4930e19 +$(PKG)_VERSION := 1.35 +$(PKG)_CHECKSUM := f11af1005b46b7b15d057d7f107315a1ad46935c7fcdf243c16e46ec14f0fe1e $(PKG)_SUBDIR := libidn-$($(PKG)_VERSION) $(PKG)_FILE := libidn-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://ftp.gnu.org/gnu/libidn/$($(PKG)_FILE) @@ -19,7 +19,6 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && rm aclocal.m4 && autoreconf -fi # don't build and install docs (echo '# DISABLED'; echo 'all:'; echo 'install:') > '$(1)/doc/Makefile.in' cd '$(1)' && ./configure \ diff --git a/src/lzma.mk b/src/lzma.mk index 15d02ef0..b388d0f1 100644 --- a/src/lzma.mk +++ b/src/lzma.mk @@ -4,8 +4,8 @@ PKG := lzma $(PKG)_WEBSITE := https://www.7-zip.org/sdk.html $(PKG)_DESCR := LZMA SDK $(PKG)_IGNORE := -$(PKG)_VERSION := 1805 -$(PKG)_CHECKSUM := d4ad382070d20edde117a8e544e7149ab6c84fdedd220aafe75454056a924732 +$(PKG)_VERSION := 1806 +$(PKG)_CHECKSUM := 01f8f7afe35b88d652fec3efd02a7ad282d3045d00cbbc3b961cdd2a37489a55 $(PKG)_SUBDIR := . $(PKG)_FILE := lzma$(subst .,,$($(PKG)_VERSION)).7z $(PKG)_URL := https://www.7-zip.org/a/$($(PKG)_FILE) diff --git a/src/nasm.mk b/src/nasm.mk index 3a257b31..943413a0 100644 --- a/src/nasm.mk +++ b/src/nasm.mk @@ -4,8 +4,8 @@ PKG := nasm $(PKG)_WEBSITE := https://www.nasm.us/ $(PKG)_DESCR := NASM - The Netwide Assembler $(PKG)_IGNORE := -$(PKG)_VERSION := 2.14 -$(PKG)_CHECKSUM := 97c615dbf02ef80e4e2b6c385f7e28368d51efc214daa98e600ca4572500eec0 +$(PKG)_VERSION := 2.14.02 +$(PKG)_CHECKSUM := e24ade3e928f7253aa8c14aa44726d1edf3f98643f87c9d72ec1df44b26be8f5 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz $(PKG)_URL := https://www.nasm.us/pub/$(PKG)/releasebuilds/$($(PKG)_VERSION)/$($(PKG)_FILE)