From 3d390967afe87144d01f0b6527a6c0a8b87cbccc Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Thu, 15 Jun 2017 11:39:19 +1000 Subject: [PATCH 1/9] Start preparing for version 7.11 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 7691ecf..c17ec63 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ dnl You should have received a copy of the GNU General Public License dnl along with this program. If not, see http://www.gnu.org/licenses/. -AC_INIT([Star Traders], [7.10], [J.Zaitseff@zap.org.au], [trader], +AC_INIT([Star Traders], [7.11], [J.Zaitseff@zap.org.au], [trader], [http://www.zap.org.au/software/trader/]) AC_DEFINE([PACKAGE_AUTHOR], ["John Zaitseff"], [Package author]) From 6433c44dee0e5968a6c81840565f4c60ac37219d Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Thu, 15 Jun 2017 11:40:24 +1000 Subject: [PATCH 2/9] Bug fix: if "char" is unsigned (as on some architectures), b64decode() fails --- NEWS | 7 +++++++ src/utils.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index b495c4a..35cd423 100644 --- a/NEWS +++ b/NEWS @@ -15,6 +15,13 @@ browse the Git repository on The ZAP Group web server at the following location: http://www.zap.org.au/gitweb/trader.git +Version 7.11 (not yet released) +------------------------------- + +Minor bug fix: some architectures treat "char" as "unsigned char", and +this caused b64decode() to fail. + + Version 7.10 (2nd June, 2017) ----------------------------- diff --git a/src/utils.c b/src/utils.c index 6d160b0..4a32fdc 100644 --- a/src/utils.c +++ b/src/utils.c @@ -873,7 +873,7 @@ ssize_t b64decode (const void *restrict in, size_t inlen, n = 1; for (size_t i = 0; i < inlen && *u_in != '\0'; i++, u_in++) { - char c = *u_in > UNSCRAMBLE_TABLE_SIZE ? + signed char c = *u_in > UNSCRAMBLE_TABLE_SIZE ? UNSCRAMBLE_INVALID : unscramble_table[*u_in]; switch (c) { From d0e114135549eea4790ba75e300cf1d855f000d9 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Sun, 18 Jun 2017 05:47:25 +1000 Subject: [PATCH 3/9] utils.c: Rename the variable from "signed char c" to "int v" --- src/utils.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/utils.c b/src/utils.c index 4a32fdc..c5e5f52 100644 --- a/src/utils.c +++ b/src/utils.c @@ -873,10 +873,10 @@ ssize_t b64decode (const void *restrict in, size_t inlen, n = 1; for (size_t i = 0; i < inlen && *u_in != '\0'; i++, u_in++) { - signed char c = *u_in > UNSCRAMBLE_TABLE_SIZE ? + int v = *u_in > UNSCRAMBLE_TABLE_SIZE ? UNSCRAMBLE_INVALID : unscramble_table[*u_in]; - switch (c) { + switch (v) { case UNSCRAMBLE_INVALID: return -1; @@ -889,7 +889,7 @@ ssize_t b64decode (const void *restrict in, size_t inlen, continue; default: - n = n << 6 | c; // c is 0 .. 63 + n = n << 6 | v; // v is 0 .. 63 if (n & 0x1000000) { // Convert 24-bit number into three output bytes From e7fe8841ef42250b0e0a264a0a6457265db5a6c7 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Sun, 18 Jun 2017 05:49:13 +1000 Subject: [PATCH 4/9] Give more details of the bug fix in NEWS --- NEWS | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 35cd423..7127636 100644 --- a/NEWS +++ b/NEWS @@ -18,8 +18,9 @@ location: http://www.zap.org.au/gitweb/trader.git Version 7.11 (not yet released) ------------------------------- -Minor bug fix: some architectures treat "char" as "unsigned char", and -this caused b64decode() to fail. +Bug fix: some architectures (such as ARM, PowerPC and S390) treat "char" +as "unsigned char", and this caused b64decode() to fail while loading a +saved game. Changed the relevant type from "char" to "int" to fix this. Version 7.10 (2nd June, 2017) From 8db3dd38f22994fc6e5bf7580552877dcc1f045d Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Sun, 18 Jun 2017 06:05:33 +1000 Subject: [PATCH 5/9] Update version number and POT creation date in all PO files --- po/da.po | 6 +++--- po/de.po | 6 +++--- po/en_AU.po | 6 +++--- po/en_CA.po | 6 +++--- po/en_GB.po | 6 +++--- po/en_US.po | 6 +++--- po/eo.po | 6 +++--- po/fi.po | 6 +++--- po/fr.po | 6 +++--- po/hr.po | 6 +++--- po/hu.po | 6 +++--- po/nb.po | 6 +++--- po/ru.po | 6 +++--- po/sr.po | 6 +++--- po/sv.po | 6 +++--- 15 files changed, 45 insertions(+), 45 deletions(-) diff --git a/po/da.po b/po/da.po index 3ff892e..6fc7483 100644 --- a/po/da.po +++ b/po/da.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.10\n" +"Project-Id-Version: trader 7.11\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2017-06-02 05:31+1000\n" -"PO-Revision-Date: 2017-06-02 05:26+1000\n" +"POT-Creation-Date: 2017-06-18 06:01+1000\n" +"PO-Revision-Date: 2017-06-18 06:02+1000\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" "Language: da\n" diff --git a/po/de.po b/po/de.po index 9b78ee3..aca6671 100644 --- a/po/de.po +++ b/po/de.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.10\n" +"Project-Id-Version: trader 7.11\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2017-06-02 05:31+1000\n" -"PO-Revision-Date: 2017-06-02 05:27+1000\n" +"POT-Creation-Date: 2017-06-18 06:01+1000\n" +"PO-Revision-Date: 2017-06-18 06:02+1000\n" "Last-Translator: Philipp Thomas \n" "Language-Team: German \n" "Language: de\n" diff --git a/po/en_AU.po b/po/en_AU.po index c4cbd2a..f17a515 100644 --- a/po/en_AU.po +++ b/po/en_AU.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.10\n" +"Project-Id-Version: trader 7.11\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2017-06-02 05:31+1000\n" -"PO-Revision-Date: 2017-06-02 05:27+1000\n" +"POT-Creation-Date: 2017-06-18 06:01+1000\n" +"PO-Revision-Date: 2017-06-18 06:02+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Australian) <(nothing)>\n" "Language: en_AU\n" diff --git a/po/en_CA.po b/po/en_CA.po index 44128cd..6e98370 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.10\n" +"Project-Id-Version: trader 7.11\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2017-06-02 05:31+1000\n" -"PO-Revision-Date: 2017-06-02 05:27+1000\n" +"POT-Creation-Date: 2017-06-18 06:01+1000\n" +"PO-Revision-Date: 2017-06-18 06:02+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Canadian) <(nothing)>\n" "Language: en_CA\n" diff --git a/po/en_GB.po b/po/en_GB.po index 1375d25..a40cb3c 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.10\n" +"Project-Id-Version: trader 7.11\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2017-06-02 05:31+1000\n" -"PO-Revision-Date: 2017-06-02 05:27+1000\n" +"POT-Creation-Date: 2017-06-18 06:01+1000\n" +"PO-Revision-Date: 2017-06-18 06:03+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (British) <(nothing)>\n" "Language: en_GB\n" diff --git a/po/en_US.po b/po/en_US.po index 34f809c..695bf08 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.10\n" +"Project-Id-Version: trader 7.11\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2017-06-02 05:31+1000\n" -"PO-Revision-Date: 2017-06-02 05:27+1000\n" +"POT-Creation-Date: 2017-06-18 06:01+1000\n" +"PO-Revision-Date: 2017-06-18 06:03+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (US) <(nothing)>\n" "Language: en_US\n" diff --git a/po/eo.po b/po/eo.po index 270583d..6e90572 100644 --- a/po/eo.po +++ b/po/eo.po @@ -13,10 +13,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.10\n" +"Project-Id-Version: trader 7.11\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2017-06-02 05:31+1000\n" -"PO-Revision-Date: 2017-06-02 05:27+1000\n" +"POT-Creation-Date: 2017-06-18 06:01+1000\n" +"PO-Revision-Date: 2017-06-18 06:03+1000\n" "Last-Translator: Felipe Castro \n" "Language-Team: Esperanto \n" "Language: eo\n" diff --git a/po/fi.po b/po/fi.po index 2021112..fbbb342 100644 --- a/po/fi.po +++ b/po/fi.po @@ -13,10 +13,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.10\n" +"Project-Id-Version: trader 7.11\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2017-06-02 05:31+1000\n" -"PO-Revision-Date: 2017-06-02 05:27+1000\n" +"POT-Creation-Date: 2017-06-18 06:01+1000\n" +"PO-Revision-Date: 2017-06-18 06:03+1000\n" "Last-Translator: Jorma Karvonen \n" "Language-Team: Finnish \n" "Language: fi\n" diff --git a/po/fr.po b/po/fr.po index c332b79..67da949 100644 --- a/po/fr.po +++ b/po/fr.po @@ -19,10 +19,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.10\n" +"Project-Id-Version: trader 7.11\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2017-06-02 05:31+1000\n" -"PO-Revision-Date: 2017-06-02 05:27+1000\n" +"POT-Creation-Date: 2017-06-18 06:01+1000\n" +"PO-Revision-Date: 2017-06-18 06:03+1000\n" "Last-Translator: Frédéric Marchal \n" "Language-Team: French \n" "Language: fr\n" diff --git a/po/hr.po b/po/hr.po index aea5472..bdbdd68 100644 --- a/po/hr.po +++ b/po/hr.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.10\n" +"Project-Id-Version: trader 7.11\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2017-06-02 05:31+1000\n" -"PO-Revision-Date: 2017-06-02 05:27+1000\n" +"POT-Creation-Date: 2017-06-18 06:01+1000\n" +"PO-Revision-Date: 2017-06-18 06:03+1000\n" "Last-Translator: Tomislav Krznar \n" "Language-Team: Croatian \n" "Language: hr\n" diff --git a/po/hu.po b/po/hu.po index 1e9ab98..54ecf86 100644 --- a/po/hu.po +++ b/po/hu.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.10\n" +"Project-Id-Version: trader 7.11\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2017-06-02 05:31+1000\n" -"PO-Revision-Date: 2017-06-02 05:27+1000\n" +"POT-Creation-Date: 2017-06-18 06:01+1000\n" +"PO-Revision-Date: 2017-06-18 06:03+1000\n" "Last-Translator: Balázs Úr \n" "Language-Team: Hungarian \n" "Language: hu\n" diff --git a/po/nb.po b/po/nb.po index f1ec67c..9df7468 100644 --- a/po/nb.po +++ b/po/nb.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.10\n" +"Project-Id-Version: trader 7.11\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2017-06-02 05:31+1000\n" -"PO-Revision-Date: 2017-06-02 05:27+1000\n" +"POT-Creation-Date: 2017-06-18 06:01+1000\n" +"PO-Revision-Date: 2017-06-18 06:03+1000\n" "Last-Translator: Johnny A. Solbu \n" "Language-Team: Norwegian Bokmaal \n" "Language: nb\n" diff --git a/po/ru.po b/po/ru.po index f576149..24c7dc8 100644 --- a/po/ru.po +++ b/po/ru.po @@ -15,10 +15,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.10\n" +"Project-Id-Version: trader 7.11\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2017-06-02 05:31+1000\n" -"PO-Revision-Date: 2017-06-02 05:27+1000\n" +"POT-Creation-Date: 2017-06-18 06:01+1000\n" +"PO-Revision-Date: 2017-06-18 06:03+1000\n" "Last-Translator: Pavel Maryanov \n" "Language-Team: Russian \n" "Language: ru\n" diff --git a/po/sr.po b/po/sr.po index af66a1d..adf4bb7 100644 --- a/po/sr.po +++ b/po/sr.po @@ -13,10 +13,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.10\n" +"Project-Id-Version: trader 7.11\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2017-06-02 05:31+1000\n" -"PO-Revision-Date: 2017-06-02 05:27+1000\n" +"POT-Creation-Date: 2017-06-18 06:01+1000\n" +"PO-Revision-Date: 2017-06-18 06:03+1000\n" "Last-Translator: Мирослав Николић \n" "Language-Team: Serbian <(nothing)>\n" "Language: sr\n" diff --git a/po/sv.po b/po/sv.po index 42b8daa..b55237c 100644 --- a/po/sv.po +++ b/po/sv.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.10\n" +"Project-Id-Version: trader 7.11\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2017-06-02 05:31+1000\n" -"PO-Revision-Date: 2017-06-02 05:27+1000\n" +"POT-Creation-Date: 2017-06-18 06:01+1000\n" +"PO-Revision-Date: 2017-06-18 06:03+1000\n" "Last-Translator: Anders Jonsson \n" "Language-Team: Swedish \n" "Language: sv\n" From 3f871bda3ace45ebf5f01502bbb875047fe5e39f Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Sun, 18 Jun 2017 06:06:25 +1000 Subject: [PATCH 6/9] Update version number and release date for v7.11 --- INSTALL | 8 ++++---- NEWS | 4 ++-- doc/trader.6 | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/INSTALL b/INSTALL index 27c784c..4763328 100644 --- a/INSTALL +++ b/INSTALL @@ -102,12 +102,12 @@ You can also run configure in a separate build-only directory tree. This feature requires GNU Make and allows you to keep the source code tree from being modified by the compilation process. To use this option, create a separate build directory, then run configure. For example, if you placed -the Star Traders source code tree in $HOME/src/trader-7.10, you could run +the Star Traders source code tree in $HOME/src/trader-7.11, you could run something like: - mkdir $HOME/build/trader-build-7.10 - cd $HOME/build/trader-build-7.10 - $HOME/src/trader-7.10/configure + mkdir $HOME/build/trader-build-7.11 + cd $HOME/build/trader-build-7.11 + $HOME/src/trader-7.11/configure Once again, the Autoconf manual describes these options (and many others): diff --git a/NEWS b/NEWS index 7127636..f05880f 100644 --- a/NEWS +++ b/NEWS @@ -15,8 +15,8 @@ browse the Git repository on The ZAP Group web server at the following location: http://www.zap.org.au/gitweb/trader.git -Version 7.11 (not yet released) -------------------------------- +Version 7.11 (18th June, 2017) +------------------------------ Bug fix: some architectures (such as ARM, PowerPC and S390) treat "char" as "unsigned char", and this caused b64decode() to fail while loading a diff --git a/doc/trader.6 b/doc/trader.6 index 0e2756b..ed6c8f4 100644 --- a/doc/trader.6 +++ b/doc/trader.6 @@ -41,7 +41,7 @@ .if \n[.g] .mso www.tmac .\" .\" ********************************************************************* -.TH TRADER 6 "2nd June, 2017" "Unix-like systems" +.TH TRADER 6 "18th June, 2017" "Unix-like systems" .SH NAME trader \- a game of interstellar trading .\" ********************************************************************* From 561ad3f624a3a2f44a4cefa67291cd8b11e04517 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Sun, 18 Jun 2017 06:10:49 +1000 Subject: [PATCH 7/9] Regenerate the POT file for Star Traders --- po/trader.pot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/trader.pot b/po/trader.pot index a02a21e..bc551e8 100644 --- a/po/trader.pot +++ b/po/trader.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: trader 7.10\n" +"Project-Id-Version: trader 7.11\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2017-06-02 05:31+1000\n" +"POT-Creation-Date: 2017-06-18 06:01+1000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" From 7e9fa540c71845120ad5f2d5e8b12fdd8bd23a56 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Sun, 18 Jun 2017 06:26:18 +1000 Subject: [PATCH 8/9] Update all auto-generated files These files have been created by running ./build-aux/bootstrap with Gnulib as at commit 002ac8b180f58136efb17f2a6ebc4bd991b1417d (with a date stamp of Sat Jun 17 12:16:27 2017 -0700), Autoconf 2.69, Automake 1.15, Gettext 0.19.8.1 and pkg-config 0.29. --- Makefile.in | 2 +- config.h.in | 3 +++ configure | 24 ++++++++++++++---------- lib/getopt-pfx-core.h | 5 +++++ lib/getopt-pfx-ext.h | 5 +++++ lib/gettext.h | 3 ++- m4/.gitignore | 1 + m4/sys_types_h.m4 | 5 ++++- 8 files changed, 35 insertions(+), 13 deletions(-) diff --git a/Makefile.in b/Makefile.in index dacfb7a..b105f7e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -233,7 +233,7 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(top_srcdir)/build-aux/install-sh \ $(top_srcdir)/build-aux/missing COPYING INSTALL NEWS README \ build-aux/README build-aux/compile build-aux/config.guess \ - build-aux/config.rpath build-aux/config.sub \ + build-aux/config.rpath build-aux/config.sub build-aux/depcomp \ build-aux/install-sh build-aux/missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) diff --git a/config.h.in b/config.h.in index 056c819..c0977be 100644 --- a/config.h.in +++ b/config.h.in @@ -1034,6 +1034,9 @@ /* Define to 1 if you need to in order for 'stat' and other things to work. */ #undef _POSIX_SOURCE +/* For standard stat data types on VMS. */ +#undef _USE_STD_STAT + /* Define to rpl_ if the getopt replacement functions and variables should be used. */ #undef __GETOPT_PREFIX diff --git a/configure b/configure index 1291836..f7f98be 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Star Traders 7.10. +# Generated by GNU Autoconf 2.69 for Star Traders 7.11. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Star Traders' PACKAGE_TARNAME='trader' -PACKAGE_VERSION='7.10' -PACKAGE_STRING='Star Traders 7.10' +PACKAGE_VERSION='7.11' +PACKAGE_STRING='Star Traders 7.11' PACKAGE_BUGREPORT='J.Zaitseff@zap.org.au' PACKAGE_URL='http://www.zap.org.au/software/trader/' @@ -2051,7 +2051,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 Star Traders 7.10 to adapt to many kinds of systems. +\`configure' configures Star Traders 7.11 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2122,7 +2122,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Star Traders 7.10:";; + short | recursive ) echo "Configuration of Star Traders 7.11:";; esac cat <<\_ACEOF @@ -2239,7 +2239,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Star Traders configure 7.10 +Star Traders configure 7.11 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2891,7 +2891,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 Star Traders $as_me 7.10, which was +It was created by Star Traders $as_me 7.11, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3791,7 +3791,7 @@ fi # Define the identity of the package. PACKAGE='trader' - VERSION='7.10' + VERSION='7.11' cat >>confdefs.h <<_ACEOF @@ -12984,6 +12984,10 @@ fi +$as_echo "#define _USE_STD_STAT 1" >>confdefs.h + + + @@ -20490,7 +20494,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 Star Traders $as_me 7.10, which was +This file was extended by Star Traders $as_me 7.11, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20557,7 +20561,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="\\ -Star Traders config.status 7.10 +Star Traders config.status 7.11 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/lib/getopt-pfx-core.h b/lib/getopt-pfx-core.h index 4dc427d..db5f15c 100644 --- a/lib/getopt-pfx-core.h +++ b/lib/getopt-pfx-core.h @@ -47,6 +47,11 @@ # define opterr __GETOPT_ID (opterr) # define optind __GETOPT_ID (optind) # define optopt __GETOPT_ID (optopt) + +/* The system's getopt.h may have already included getopt-core.h to + declare the unprefixed identifiers. Undef _GETOPT_CORE_H so that + getopt-core.h declares them with prefixes. */ +# undef _GETOPT_CORE_H #endif #include diff --git a/lib/getopt-pfx-ext.h b/lib/getopt-pfx-ext.h index 0839759..91f4df1 100644 --- a/lib/getopt-pfx-ext.h +++ b/lib/getopt-pfx-ext.h @@ -45,6 +45,11 @@ # define getopt_long_only __GETOPT_ID (getopt_long_only) # define option __GETOPT_ID (option) # define _getopt_internal __GETOPT_ID (getopt_internal) + +/* The system's getopt.h may have already included getopt-ext.h to + declare the unprefixed identifiers. Undef _GETOPT_EXT_H so that + getopt-ext.h declares them with prefixes. */ +# undef _GETOPT_EXT_H #endif /* Standalone applications get correct prototypes for getopt_long and diff --git a/lib/gettext.h b/lib/gettext.h index e7520af..742ce37 100644 --- a/lib/gettext.h +++ b/lib/gettext.h @@ -185,7 +185,8 @@ npgettext_aux (const char *domain, #include #if (((__GNUC__ >= 3 || __GNUG__ >= 2) && !defined __STRICT_ANSI__) \ - /* || __STDC_VERSION__ >= 199901L */ ) + /* || __STDC_VERSION__ == 199901L + || (__STDC_VERSION__ >= 201112L && !defined __STDC_NO_VLA__) */ ) # define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 1 #else # define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 0 diff --git a/m4/.gitignore b/m4/.gitignore index e69de29..e45e8d0 100644 --- a/m4/.gitignore +++ b/m4/.gitignore @@ -0,0 +1 @@ +/gnulib-tool.m4 diff --git a/m4/sys_types_h.m4 b/m4/sys_types_h.m4 index e590670..ec0860b 100644 --- a/m4/sys_types_h.m4 +++ b/m4/sys_types_h.m4 @@ -1,4 +1,4 @@ -# sys_types_h.m4 serial 7 +# sys_types_h.m4 serial 8 dnl Copyright (C) 2011-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -6,6 +6,9 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN_ONCE([gl_SYS_TYPES_H], [ + dnl Use sane struct stat types in OpenVMS 8.2 and later. + AC_DEFINE([_USE_STD_STAT], 1, [For standard stat data types on VMS.]) + AC_REQUIRE([gl_SYS_TYPES_H_DEFAULTS]) gl_NEXT_HEADERS([sys/types.h]) From 319a99c3f0f97b9b4d4a803faf60db4daab34959 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Sun, 18 Jun 2017 06:32:12 +1000 Subject: [PATCH 9/9] Update all GMO files (and en@quot.po) as part of "make dist" --- po/da.gmo | Bin 30286 -> 30286 bytes po/de.gmo | Bin 31194 -> 31194 bytes po/en@quot.gmo | Bin 29715 -> 29715 bytes po/en@quot.po | 6 +++--- po/en_AU.gmo | Bin 29767 -> 29767 bytes po/en_CA.gmo | Bin 29765 -> 29765 bytes po/en_GB.gmo | Bin 29764 -> 29764 bytes po/en_US.gmo | Bin 29758 -> 29758 bytes po/eo.gmo | Bin 30168 -> 30168 bytes po/fi.gmo | Bin 30852 -> 30852 bytes po/fr.gmo | Bin 31664 -> 31664 bytes po/hr.gmo | Bin 30354 -> 30354 bytes po/hu.gmo | Bin 32233 -> 32233 bytes po/nb.gmo | Bin 30023 -> 30023 bytes po/ru.gmo | Bin 39007 -> 39007 bytes po/sr.gmo | Bin 37555 -> 37555 bytes po/sv.gmo | Bin 30257 -> 30257 bytes 17 files changed, 3 insertions(+), 3 deletions(-) diff --git a/po/da.gmo b/po/da.gmo index 1d3bf75aedcf9a5d5a4f8877b9d56295c366c47f..6a8eb4e3e6f83bfea138052bc85b7f1facf7f141 100644 GIT binary patch delta 41 scmX^2hVk4R#tjFZ7!4;Ma`Ip|v`{cGvoe@0=&Z;AWgBg_auzWL071PBtpET3 delta 41 tcmX^2hVk4R#tjFZ7!4*La`Ip|Fj6ouwKAS8=&Z;AVH=rkwsICR1^__e45a`7 diff --git a/po/de.gmo b/po/de.gmo index 97c1a0b04ea2a342fa31d82e40df3be12000a6ab..f7f0d1bbbd6c4cc379d710d9ebf201071a1582ad 100644 GIT binary patch delta 41 scmcchneo#tjFZ7!4;Ma`Ip|v`{cGvoe@0=&Z;AWgBm{a^^Jx06y^ylmGw# delta 41 tcmX^9it+d>#tjFZ7!4*La`Ip|Fj6ouwKAS8=&Z;AVH=rmwsPh*0suZ042%E( diff --git a/po/ru.gmo b/po/ru.gmo index 0d2ebffeea62fe129125f5eb63aa961b9bb29ab4..805b4899c3111c4365a34b576279ed6b8e0ce654 100644 GIT binary patch delta 41 scmcb=f$9DRrVR(37!4;Ma`Ip|v`{cGvoe@0=&Z;AWgBm{a#jrm05ydSjQ{`u delta 41 tcmcb=f$9DRrVR(37!4*La`Ip|Fj6ouwKAS8=&Z;AVH=rmwsKYt1pqXu421vy diff --git a/po/sr.gmo b/po/sr.gmo index 362b288a190ed4587d80a825ed5f370020dcee84..15f7e42a16e7dbdfb9130adb6ac38ec710e4c8b5 100644 GIT binary patch delta 41 scmdnIlxg!)rVYJLjE0l@oIKbKEffsQtPCdKbyDPjvW+*hIj{8x040nJ&;S4c delta 41 tcmdnIlxg!)rVYJLj0ThYoIKbKj1&w^t&At%byDPju#L<&vpKKz2LL3n49EZg diff --git a/po/sv.gmo b/po/sv.gmo index 5ad15de2854faa175ad5ba805356433130e1f433..8b0b1d07bc8e600acafa83f237ed4f1e9a30551b 100644 GIT binary patch delta 41 scmdn^hH>K?#tjFZ7!4;Ma`Ip|v`{cGvoe@0=&Z;AWgBm{a{g`v06LWoRsaA1 delta 41 tcmdn^hH>K?#tjFZ7!4*La`Ip|Fj6ouwKAS8=&Z;AVH=rmwsQV%1OPd?4Nd?6