Control: tags 853368 + pending Dear maintainer,
I've prepared an NMU for dbf2mysql (versioned as 1.14a-5.1) and uploaded it to DELAYED/10. Please feel free to tell me if I should cancel it. cu Adrian -- "Is there not promise of rain?" Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. "Only a promise," Lao Er said. Pearl S. Buck - Dragon Seed
diff -Nru dbf2mysql-1.14a/debian/changelog dbf2mysql-1.14a/debian/changelog --- dbf2mysql-1.14a/debian/changelog 2016-12-13 00:30:47.000000000 +0200 +++ dbf2mysql-1.14a/debian/changelog 2017-09-01 16:20:46.000000000 +0300 @@ -1,3 +1,10 @@ +dbf2mysql (1.14a-5.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS with gcc 7. (Closes: #853368) + + -- Adrian Bunk <b...@debian.org> Fri, 01 Sep 2017 16:20:46 +0300 + dbf2mysql (1.14a-5) unstable; urgency=medium * Moved to new libmysql-dev b-d. diff -Nru dbf2mysql-1.14a/debian/patches/35_gcc-7.patch dbf2mysql-1.14a/debian/patches/35_gcc-7.patch --- dbf2mysql-1.14a/debian/patches/35_gcc-7.patch 1970-01-01 02:00:00.000000000 +0200 +++ dbf2mysql-1.14a/debian/patches/35_gcc-7.patch 2017-08-17 20:28:30.000000000 +0300 @@ -0,0 +1,55 @@ +Description: Make strtoupper/strtolower static inline + This seems to have been intended, + and the static makes gcc 7 happy. +Author: Adrian Bunk <b...@debian.org> +Bug-Debian: https://bugs.debian.org/853368 + +--- dbf2mysql-1.14a.orig/dbf2mysql.c ++++ dbf2mysql-1.14a/dbf2mysql.c +@@ -41,21 +41,19 @@ char *convert = NULL; + + void do_onlyfields (char *flist, dbhead *dbh); + void do_substitute(char *subarg, dbhead *dbh); +-inline void strtoupper(char *string); +-inline void strtolower(char *string); + void do_create(MYSQL *, char*, dbhead*); + void do_inserts(MYSQL *, char*, dbhead*); + int check_table(MYSQL *, char*); + void usage(void); + +-inline void strtoupper(char *string) { ++static inline void strtoupper(char *string) { + while(*string != '\0') { + *string = toupper(*string); + string++; + } + } + +-inline void strtolower(char *string) { ++static inline void strtolower(char *string) { + while(*string != '\0') { + *string = tolower(*string); + string++; +--- dbf2mysql-1.14a.orig/mysql2dbf.c ++++ dbf2mysql-1.14a/mysql2dbf.c +@@ -21,18 +21,16 @@ char *table = NULL; + char *pass = NULL; + char *user = NULL; + +-inline void strtoupper(char *string); +-inline void strtolower(char *string); + void usage(void); + +-inline void strtoupper(char *string) { ++static inline void strtoupper(char *string) { + while(*string != '\0') { + *string = toupper(*string); + string++; + } + } + +-inline void strtolower(char *string) { ++static inline void strtolower(char *string) { + while(*string != '\0') { + *string = tolower(*string); + string++; diff -Nru dbf2mysql-1.14a/debian/patches/series dbf2mysql-1.14a/debian/patches/series --- dbf2mysql-1.14a/debian/patches/series 2016-03-06 16:32:58.000000000 +0200 +++ dbf2mysql-1.14a/debian/patches/series 2017-09-01 16:20:46.000000000 +0300 @@ -4,3 +4,4 @@ 20-u-char.patch 25-mysql-real-connect.patch 30-makefile +35_gcc-7.patch