Hi!
As you apparently had no time to repack the .orig yourself, I've prepared a
NMU.  It fixes the autoreject (by removing chm and its binary indices from
the .orig tarball), and the Java 9 FTBFS.  It turns out that two other FTBFS
problems popped up in just the last month: with Java 10, and gcc-8.  I've
fixed them as well.

Here's the NMU debdiff.  Alas, debdiff fails to handle deletion of binary
files well -- if you want to apply it, you'd need to delete the files by
hand.

I'll upload to DELAYED/7 once I verify that it builds on riscv64 as well.


Meow!
-- 
⢀⣴⠾⠻⢶⣦⠀ So a Hungarian gypsy mountainman, lumberjack by day job,
⣾⠁⢰⠒⠀⣿⡁ brigand by, uhm, hobby, invented a dish: goulash on potato
⢿⡄⠘⠷⠚⠋⠀ pancakes.  Then the Polish couldn't decide which of his
⠈⠳⣄⠀⠀⠀⠀ adjectives to use for the dish's name.
diff -Nru db5.3-5.3.28/debian/changelog db5.3-5.3.28+dfsg1/debian/changelog
--- db5.3-5.3.28/debian/changelog       2017-08-17 14:35:22.000000000 +0200
+++ db5.3-5.3.28+dfsg1/debian/changelog 2018-08-09 01:12:06.000000000 +0200
@@ -1,3 +1,14 @@
+db5.3 (5.3.28+dfsg1-0.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Repack the .orig tarball to eliminate prebuilt binaries that need a
+    Visual Studio plugin to build from source. (Closes: #898215)
+  * Fix FTBFS with Java 9, thanks Markus Koschany. (Closes: #873976)
+  * Fix FTBFS with Java 10 (bogus version detection).
+  * Fix FTBFS with GCC-8 (__atomic_compare_exchange).
+
+ -- Adam Borowski <[email protected]>  Thu, 09 Aug 2018 01:12:06 +0200
+
 db5.3 (5.3.28-13.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru db5.3-5.3.28/debian/patches/009-java-10.patch 
db5.3-5.3.28+dfsg1/debian/patches/009-java-10.patch
--- db5.3-5.3.28/debian/patches/009-java-10.patch       1970-01-01 
01:00:00.000000000 +0100
+++ db5.3-5.3.28+dfsg1/debian/patches/009-java-10.patch 2018-08-09 
00:33:37.000000000 +0200
@@ -0,0 +1,22 @@
+Description: fix a bogus Java version check
+ These clowns look at just the first digit, thinking that 10 means 1.
+
+--- db5.3-5.3.28+dfsg1.orig/dist/configure.ac
++++ db5.3-5.3.28+dfsg1/dist/configure.ac
+@@ -453,11 +453,11 @@ if test "$db_cv_java" = "yes" -o "$db_cv
+                       sed -e '/ version /!d' -e 's/.*"\(.*\)".*/\1/'` ;;
+       esac
+       AC_MSG_RESULT($JAVA_VERSION)
+-      case "$JAVA_VERSION" in
+-      1.[[3456789]]* | 1.[[1-9]][[0-9]]* | [[23456789]]* ) ;;
+-      * )
+-              AC_MSG_ERROR([Java version 1.3 or higher required, got 
$JAVA_VERSION]) ;;
+-      esac
++      #case "$JAVA_VERSION" in
++      #1.[[3456789]]* | 1.[[1-9]][[0-9]]* | [[23456789]]* ) ;;
++      #* )
++      #       AC_MSG_ERROR([Java version 1.3 or higher required, got 
$JAVA_VERSION]) ;;
++      #esac
+ 
+       # Because of the code that SWIG generates to cast between pointers and
+       # integers, we need to add the flag "-fno-strict-aliasing" to the gcc
diff -Nru db5.3-5.3.28/debian/patches/010-__atomic_compare_exchange.patch 
db5.3-5.3.28+dfsg1/debian/patches/010-__atomic_compare_exchange.patch
--- db5.3-5.3.28/debian/patches/010-__atomic_compare_exchange.patch     
1970-01-01 01:00:00.000000000 +0100
+++ db5.3-5.3.28+dfsg1/debian/patches/010-__atomic_compare_exchange.patch       
2018-08-09 01:12:04.000000000 +0200
@@ -0,0 +1,24 @@
+Description: function conflict with GCC-8
+ Identifiers with names starting with __ are reserved for the compiler and
+ core system libs only, random user programs are not supposed to use them.
+
+--- db5.3-5.3.28+dfsg1.orig/src/dbinc/atomic.h
++++ db5.3-5.3.28+dfsg1/src/dbinc/atomic.h
+@@ -144,7 +144,7 @@ typedef LONG volatile *interlocked_val;
+ #define       atomic_inc(env, p)      __atomic_inc(p)
+ #define       atomic_dec(env, p)      __atomic_dec(p)
+ #define       atomic_compare_exchange(env, p, o, n)   \
+-      __atomic_compare_exchange((p), (o), (n))
++      db__atomic_compare_exchange((p), (o), (n))
+ static inline int __atomic_inc(db_atomic_t *p)
+ {
+       int     temp;
+@@ -176,7 +176,7 @@ static inline int __atomic_dec(db_atomic
+  * http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html
+  * which configure could be changed to use.
+  */
+-static inline int __atomic_compare_exchange(
++static inline int db__atomic_compare_exchange(
+       db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval)
+ {
+       atomic_value_t was;
diff -Nru db5.3-5.3.28/debian/patches/series 
db5.3-5.3.28+dfsg1/debian/patches/series
--- db5.3-5.3.28/debian/patches/series  2017-08-17 14:35:22.000000000 +0200
+++ db5.3-5.3.28+dfsg1/debian/patches/series    2018-08-09 01:10:55.000000000 
+0200
@@ -7,3 +7,5 @@
 mmap_extend-mode-requires-page-aligned-extends.patch
 008-autoconf-in-lang-sql-sqlite.patch
 CVE-2017-10140-cwd-db_config.patch
+009-java-10.patch
+010-__atomic_compare_exchange.patch
diff -Nru db5.3-5.3.28/debian/rules db5.3-5.3.28+dfsg1/debian/rules
--- db5.3-5.3.28/debian/rules   2017-08-17 14:35:22.000000000 +0200
+++ db5.3-5.3.28+dfsg1/debian/rules     2018-08-09 00:24:54.000000000 +0200
@@ -80,7 +80,7 @@
 endif
 
 ifeq (yes,$(ENABLE_JAVA))
-JAVACFLAGS=-source 1.5 -target 1.5
+JAVACFLAGS=-source 1.7 -target 1.7
 JAVA_HOME ?= /usr/lib/jvm/default-java
 CFLAGS += -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
 CONFIGURE_SWITCHES += --enable-java
Binary files /tmp/nc6getHhe5/db5.3-5.3.28/docs/csharp/BerkeleyDB.chm and 
/tmp/s4t3C10iXq/db5.3-5.3.28+dfsg1/docs/csharp/BerkeleyDB.chm differ
Binary files /tmp/nc6getHhe5/db5.3-5.3.28/docs/csharp/fti/FTI_100.bin and 
/tmp/s4t3C10iXq/db5.3-5.3.28+dfsg1/docs/csharp/fti/FTI_100.bin differ
Binary files /tmp/nc6getHhe5/db5.3-5.3.28/docs/csharp/fti/FTI_101.bin and 
/tmp/s4t3C10iXq/db5.3-5.3.28+dfsg1/docs/csharp/fti/FTI_101.bin differ
Binary files /tmp/nc6getHhe5/db5.3-5.3.28/docs/csharp/fti/FTI_102.bin and 
/tmp/s4t3C10iXq/db5.3-5.3.28+dfsg1/docs/csharp/fti/FTI_102.bin differ
Binary files /tmp/nc6getHhe5/db5.3-5.3.28/docs/csharp/fti/FTI_103.bin and 
/tmp/s4t3C10iXq/db5.3-5.3.28+dfsg1/docs/csharp/fti/FTI_103.bin differ
Binary files /tmp/nc6getHhe5/db5.3-5.3.28/docs/csharp/fti/FTI_104.bin and 
/tmp/s4t3C10iXq/db5.3-5.3.28+dfsg1/docs/csharp/fti/FTI_104.bin differ
Binary files /tmp/nc6getHhe5/db5.3-5.3.28/docs/csharp/fti/FTI_105.bin and 
/tmp/s4t3C10iXq/db5.3-5.3.28+dfsg1/docs/csharp/fti/FTI_105.bin differ
Binary files /tmp/nc6getHhe5/db5.3-5.3.28/docs/csharp/fti/FTI_106.bin and 
/tmp/s4t3C10iXq/db5.3-5.3.28+dfsg1/docs/csharp/fti/FTI_106.bin differ
Binary files /tmp/nc6getHhe5/db5.3-5.3.28/docs/csharp/fti/FTI_107.bin and 
/tmp/s4t3C10iXq/db5.3-5.3.28+dfsg1/docs/csharp/fti/FTI_107.bin differ
Binary files /tmp/nc6getHhe5/db5.3-5.3.28/docs/csharp/fti/FTI_108.bin and 
/tmp/s4t3C10iXq/db5.3-5.3.28+dfsg1/docs/csharp/fti/FTI_108.bin differ
Binary files /tmp/nc6getHhe5/db5.3-5.3.28/docs/csharp/fti/FTI_109.bin and 
/tmp/s4t3C10iXq/db5.3-5.3.28+dfsg1/docs/csharp/fti/FTI_109.bin differ
Binary files /tmp/nc6getHhe5/db5.3-5.3.28/docs/csharp/fti/FTI_110.bin and 
/tmp/s4t3C10iXq/db5.3-5.3.28+dfsg1/docs/csharp/fti/FTI_110.bin differ
Binary files /tmp/nc6getHhe5/db5.3-5.3.28/docs/csharp/fti/FTI_111.bin and 
/tmp/s4t3C10iXq/db5.3-5.3.28+dfsg1/docs/csharp/fti/FTI_111.bin differ
Binary files /tmp/nc6getHhe5/db5.3-5.3.28/docs/csharp/fti/FTI_112.bin and 
/tmp/s4t3C10iXq/db5.3-5.3.28+dfsg1/docs/csharp/fti/FTI_112.bin differ
Binary files /tmp/nc6getHhe5/db5.3-5.3.28/docs/csharp/fti/FTI_113.bin and 
/tmp/s4t3C10iXq/db5.3-5.3.28+dfsg1/docs/csharp/fti/FTI_113.bin differ
Binary files /tmp/nc6getHhe5/db5.3-5.3.28/docs/csharp/fti/FTI_114.bin and 
/tmp/s4t3C10iXq/db5.3-5.3.28+dfsg1/docs/csharp/fti/FTI_114.bin differ
Binary files /tmp/nc6getHhe5/db5.3-5.3.28/docs/csharp/fti/FTI_115.bin and 
/tmp/s4t3C10iXq/db5.3-5.3.28+dfsg1/docs/csharp/fti/FTI_115.bin differ
Binary files /tmp/nc6getHhe5/db5.3-5.3.28/docs/csharp/fti/FTI_116.bin and 
/tmp/s4t3C10iXq/db5.3-5.3.28+dfsg1/docs/csharp/fti/FTI_116.bin differ
Binary files /tmp/nc6getHhe5/db5.3-5.3.28/docs/csharp/fti/FTI_117.bin and 
/tmp/s4t3C10iXq/db5.3-5.3.28+dfsg1/docs/csharp/fti/FTI_117.bin differ
Binary files /tmp/nc6getHhe5/db5.3-5.3.28/docs/csharp/fti/FTI_118.bin and 
/tmp/s4t3C10iXq/db5.3-5.3.28+dfsg1/docs/csharp/fti/FTI_118.bin differ
Binary files /tmp/nc6getHhe5/db5.3-5.3.28/docs/csharp/fti/FTI_119.bin and 
/tmp/s4t3C10iXq/db5.3-5.3.28+dfsg1/docs/csharp/fti/FTI_119.bin differ
Binary files /tmp/nc6getHhe5/db5.3-5.3.28/docs/csharp/fti/FTI_120.bin and 
/tmp/s4t3C10iXq/db5.3-5.3.28+dfsg1/docs/csharp/fti/FTI_120.bin differ
Binary files /tmp/nc6getHhe5/db5.3-5.3.28/docs/csharp/fti/FTI_121.bin and 
/tmp/s4t3C10iXq/db5.3-5.3.28+dfsg1/docs/csharp/fti/FTI_121.bin differ
Binary files /tmp/nc6getHhe5/db5.3-5.3.28/docs/csharp/fti/FTI_122.bin and 
/tmp/s4t3C10iXq/db5.3-5.3.28+dfsg1/docs/csharp/fti/FTI_122.bin differ
Binary files /tmp/nc6getHhe5/db5.3-5.3.28/docs/csharp/fti/FTI_97.bin and 
/tmp/s4t3C10iXq/db5.3-5.3.28+dfsg1/docs/csharp/fti/FTI_97.bin differ
Binary files /tmp/nc6getHhe5/db5.3-5.3.28/docs/csharp/fti/FTI_98.bin and 
/tmp/s4t3C10iXq/db5.3-5.3.28+dfsg1/docs/csharp/fti/FTI_98.bin differ
Binary files /tmp/nc6getHhe5/db5.3-5.3.28/docs/csharp/fti/FTI_99.bin and 
/tmp/s4t3C10iXq/db5.3-5.3.28+dfsg1/docs/csharp/fti/FTI_99.bin differ
Binary files /tmp/nc6getHhe5/db5.3-5.3.28/docs/csharp/fti/FTI_Files.bin and 
/tmp/s4t3C10iXq/db5.3-5.3.28+dfsg1/docs/csharp/fti/FTI_Files.bin differ

Reply via email to