Merge ~ahasenack/ubuntu/+source/snapper:cosmic-ftbfs-1789953 into ubuntu/+source/snapper:ubuntu/devel

[Andreas Hasenack]

snapper is a sync from debian. The last sync, 0.5.6-1, failed to build in all architectures (https://launchpad.net/ubuntu/+source/snapper/0.5.6-1). Root cause for that was the dropping of -lpthread in https://salsa.debian.org/debian/snapper/commit/7b582167d840a7673b33d186891d2e07a4f3ee4d, by mistake I believe.

When that was put back in, all builds worked, with the exception of armhf. That one failed with this error:
/usr/bin/ld: ../snapper/.libs/libsnapper.so: undefined reference to symbol '_ZN5boost6system16generic_categoryEv'
/usr/bin/ld: /usr/lib/gcc/arm-linux-gnueabihf/7/../../../arm-linux-gnueabihf/libboost_system.so: error adding symbols: DSO missing from command line
collect2: error: ld returned 1 exit status
Makefile:639: recipe for target 'snapper' failed

I traced that down to a missing link to the boost libraries. That I fixed with add-boost-libs-to-dbus.patch and submitted it upstream as well (https://github.com/openSUSE/snapper/issues/424). If you grep for "boost" in the dbus/ directory you'll see it's being used, but not linked with explicitly. A similar fix was done by upstream in the past (https://github.com/openSUSE/snapper/commit/33fbde9412d5eafb9f94aaff6b1be10bcda14951), coincidentally to fix a build in Ubuntu (16.04 back then).

Turns out the DSO patch from Debian seems unnecessary. The package built just fine in an amd64 lxd debian sid container without that patch. So I also pushed a change to debian to drop it, and use my libboost patch for the armhf build: https://salsa.debian.org/debian/snapper/merge_requests/1

Now, none of this seems to be affecting Debian builds, just Ubuntu. We should probably wait from Debian's and upstream's response on these changes, but a review ahead of time doesn't hurt.

Alternatively, to fix our build problem, we could keep Debian's patch but with the -lpthread addition that's needed, and my libboost patch.

Bileto ticket: https://bileto.ubuntu.com/#/ticket/3397 (there are no dep8 tests I'm afraid)

1d736af... by Hideki Yamane on 2018-09-02

Import patches-unapplied version 0.5.6-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: c08ce8d36ed2209f6c1d1e1b558daad2458213af

New changelog entries:
  * debian/patches
    - Add missing -lpthread option to fix FTBFS in Ubuntu.
      Thanks to Andreas Hasenack for the report
  * debian/control
    - set Standards-Version: 4.2.1 (no change)

[Christian Ehrhardt  (paelzer)]

You already got an ack on the -lpthread mistake, but the other discussions are still open atm.
I agree that waiting for the result of the "DSO fix drop" for a few days could keep this a sync.

If not IMHO your current contrib looks good.
Changelog, Patch, references as well as the example builds are all fine, except that ist was surpassed by the new upload in Debian.

There actually is a 0.5.6-2 in unstable now, let me check the full content of that ...

[Christian Ehrhardt  (paelzer)]

The Debian upload contains only the -lpthread accident.

The libboost change isn't in so I assume there is no hope to sync 0.5.6-2, but I'd ask you to make a 0.5.6-2ubuntu1 for re-review (or wait a few days if a 0.5.6-3 will sort it out and can be synced).

[Christian Ehrhardt  (paelzer)]

For the new Debian version to rebase to -> needs fixing

review: Needs Fixing

[Andreas Hasenack (ahasenack)]

Debian's 0.5.6-2 failed to build again in armhf, as expected:
libtool: link: g++ -g -O2 -fdebug-prefix-map=/home/andreas/snapper/deb/snapper-0.5.6=. -fstack-protector-strong -Wformat -Werror=format-security -std=c++11 -Wall -Wextra -Wformat=2 -Wnon-virtual-dtor -Wno-unused-parameter -Wl,-Bsymbolic-functions -Wl,-z -Wl,relro -Wl,-z -Wl,now -o .libs/snapper snapper.o types.o commands.o cleanup.o proxy.o proxy-dbus.o proxy-lib.o misc.o errors.o ../snapper/.libs/libsnapper.so -lm utils/.libs/libutils.a /home/andreas/snapper/deb/snapper-0.5.6/snapper/.libs/libsnapper.so -lmount -lboost_thread -lboost_system -lxml2 -lacl -lz ../dbus/.libs/libdbus.a -ldbus-1 -lbtrfs
/usr/bin/ld: ../snapper/.libs/libsnapper.so: undefined reference to symbol '_ZN5boost6system16generic_categoryEv'
/usr/bin/ld: /usr/lib/gcc/arm-linux-gnueabihf/8/../../../arm-linux-gnueabihf/libboost_system.so: error adding symbols: DSO missing from command line
collect2: error: ld returned 1 exit status
make[4]: *** [Makefile:646: snapper] Error 1

I might change this MP to have just the armhf fix, since debian's -2 added back the missing pthread library. We can leave the dropping of the patch to another time.

Waiting for the importer to grab 0.5.6-2.

a0e4e65... by Andreas Hasenack on 2018-09-03

changelog

[Andreas Hasenack (ahasenack)]

Build worked, just testing the binary armhf packages now.

[Andreas Hasenack (ahasenack)]

All looks fine with just the added patch to fix the armhf build (and rebase on top of debian's 0.5.6-2 which has the -lpthread fix):

https://bileto.ubuntu.com/#/ticket/3397

I updated the upstream bugreport (https://github.com/openSUSE/snapper/issues/424) with a PR: https://github.com/openSUSE/snapper/pull/425

Please take a new look, thanks.

[Christian Ehrhardt  (paelzer)]

LP view is still against 0.5.6-1.

No need to resubmit this, the git view is nice and clean.
The new minimized change on top of 0.5.6-2 is looking good.

Just what is needed and doing the job.
+1

Not being in the importer tagging makes no sense.
This is a MOTU package, can you upload yourself?

review: Approve

[Andreas Hasenack (ahasenack)]

Sadly, I cannot upload this one either.

[Andreas Hasenack (ahasenack)]

a0e4e65631d63fe4fcf6b5938b2dc649f5f2a00f is correct, please sponsor

[Christian Ehrhardt  (paelzer)]

uploaded

diff --git a/debian/changelog b/debian/changelog
index 40552e6..7fe8376 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+snapper (0.5.6-2ubuntu1) cosmic; urgency=medium
+
+  * d/p/add-boost-libs-to-dbus.patch: add boost libs to dbus to fix
+    the armhf build.
+
+ -- Andreas Hasenack <[e-mail]>  Mon, 03 Sep 2018 13:46:56 -0300
+
+snapper (0.5.6-2) unstable; urgency=medium
+
+  * debian/patches
+    - Add missing -lpthread option to fix FTBFS in Ubuntu.
+      Thanks to Andreas Hasenack for the report
+  * debian/control
+    - set Standards-Version: 4.2.1 (no change)
+
+ -- Hideki Yamane <[e-mail]>  Sun, 02 Sep 2018 11:47:13 +0900
+
 snapper (0.5.6-1) unstable; urgency=medium
 
   * New upstream release 0.5.6
diff --git a/debian/control b/debian/control
index 7df6832..a95766e 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends:
  zlib1g-dev,
  e2fslibs-dev,
  locales-all,
-Standards-Version: 4.2.0
+Standards-Version: 4.2.1
 Homepage: http://snapper.io/
 Vcs-Git: https://salsa.debian.org/debian/snapper.git
 Vcs-Browser: https://salsa.debian.org/debian/snapper
diff --git a/debian/patches/0001-refresh-Add-DSO-linker-options-for-libsnapper.la.pat.patch b/debian/patches/0001-refresh-Add-DSO-linker-options-for-libsnapper.la.pat.patch
index a4fb08a..adc158a 100644
--- a/debian/patches/0001-refresh-Add-DSO-linker-options-for-libsnapper.la.pat.patch
+++ b/debian/patches/0001-refresh-Add-DSO-linker-options-for-libsnapper.la.pat.patch
@@ -12,11 +12,9 @@ Subject: Add DSO linker options for libsnapper.la
  testsuite/Makefile.am        | 2 +-
  7 files changed, 10 insertions(+), 8 deletions(-)
 
-diff --git a/client/Makefile.am b/client/Makefile.am
-index e8f9a5e..198c507 100644
 --- a/client/Makefile.am
 +++ b/client/Makefile.am
-@@ -19,7 +19,7 @@ snapper_SOURCES =			\
+@@ -19,7 +19,7 @@
  	misc.cc		misc.h		\
  	errors.cc	errors.h
  
@@ -25,7 +23,7 @@ index e8f9a5e..198c507 100644
  
  libexecdir = /usr/lib/snapper
  
-@@ -36,7 +36,7 @@ systemd_helper_SOURCES =		\
+@@ -36,7 +36,7 @@
  	misc.cc		misc.h		\
  	errors.cc	errors.h
  
@@ -34,19 +32,15 @@ index e8f9a5e..198c507 100644
  
  if ENABLE_BTRFS
  
-diff --git a/client/utils/Makefile.am b/client/utils/Makefile.am
-index 910beda..b6016fc 100644
 --- a/client/utils/Makefile.am
 +++ b/client/utils/Makefile.am
-@@ -14,5 +14,5 @@ libutils_la_SOURCES =			\
+@@ -14,5 +14,5 @@
  	GetOpts.cc	GetOpts.h	\
  	Range.cc	Range.h
  
 -libutils_la_LIBADD = ../../snapper/libsnapper.la
 +libutils_la_LIBADD = ../../snapper/libsnapper.la -lboost_thread -lboost_system -lxml2 -lacl -lz -lm
  
-diff --git a/examples/c++-lib/Makefile.am b/examples/c++-lib/Makefile.am
-index 52c81e5..2807f81 100644
 --- a/examples/c++-lib/Makefile.am
 +++ b/examples/c++-lib/Makefile.am
 @@ -5,7 +5,8 @@
@@ -59,19 +53,15 @@ index 52c81e5..2807f81 100644
  
  noinst_PROGRAMS = List ListAll Create CmpDirs CreateNumber CreateTimeline
  
-diff --git a/server/Makefile.am b/server/Makefile.am
-index 2a6a4c2..fe05e06 100644
 --- a/server/Makefile.am
 +++ b/server/Makefile.am
-@@ -14,4 +14,5 @@ snapperd_SOURCES =					\
+@@ -14,4 +14,5 @@
  	Types.cc		Types.h
  
  snapperd_LDADD = ../snapper/libsnapper.la ../dbus/libdbus.la -lrt
 -snapperd_LDFLAGS = -lboost_system -lboost_thread -lpthread
-+snapperd_LDFLAGS = -lboost_system -lboost_thread \
++snapperd_LDFLAGS = -lboost_system -lboost_thread -lpthread \
 +                   -lxml2 -lacl -lz -lm
-diff --git a/testsuite-cmp/Makefile.am b/testsuite-cmp/Makefile.am
-index 81104bf..aca7a79 100644
 --- a/testsuite-cmp/Makefile.am
 +++ b/testsuite-cmp/Makefile.am
 @@ -5,7 +5,7 @@
@@ -83,11 +73,9 @@ index 81104bf..aca7a79 100644
  
  noinst_SCRIPTS = run-all
  
-diff --git a/testsuite-real/Makefile.am b/testsuite-real/Makefile.am
-index 8148b54..0e51ae2 100644
 --- a/testsuite-real/Makefile.am
 +++ b/testsuite-real/Makefile.am
-@@ -6,7 +6,7 @@ CXXFLAGS += -std=gnu++0x
+@@ -6,7 +6,7 @@
  
  AM_CPPFLAGS = -I$(top_srcdir)
  
@@ -96,8 +84,6 @@ index 8148b54..0e51ae2 100644
  
  if HAVE_XATTRS
  TMP_XATST = xattrs1 xattrs2 xattrs3 xattrs4
-diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
-index 8b3fbd6..7fffb29 100644
 --- a/testsuite/Makefile.am
 +++ b/testsuite/Makefile.am
 @@ -4,7 +4,7 @@
diff --git a/debian/patches/add-boost-libs-to-dbus.patch b/debian/patches/add-boost-libs-to-dbus.patch
new file mode 100644
index 0000000..a4d11a2
--- /dev/null
+++ b/debian/patches/add-boost-libs-to-dbus.patch
@@ -0,0 +1,23 @@
+Description: add boost libs to dbus to fix the armhf build
+ The libdbus.a static library produced in the dbus/ directory needs some
+ boost symbols, and for some reason this dependency isn't automatically
+ detected when building for armhf. A similar fix I believe was done in
+ server/Makefile.am in this commit:
+ https://github.com/openSUSE/snapper/commit/33fbde9412d5eafb9f94aaff6b1be10bcda14951
+Author: Andreas Hasenack <[e-mail]>
+Bug: https://github.com/openSUSE/snapper/issues/424
+Forwarded: https://salsa.debian.org/debian/snapper/merge_requests/1
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/snapper/+bug/1789953
+Last-Update: 2018-08-31
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+diff --git a/dbus/Makefile.am b/dbus/Makefile.am
+index eb8769d..f9521a8 100644
+--- a/dbus/Makefile.am
++++ b/dbus/Makefile.am
+@@ -12,4 +12,4 @@ libdbus_la_SOURCES =					\
+ 	DBusMainLoop.cc		DBusMainLoop.h
+ 
+ libdbus_la_LIBADD = $(DBUS_LIBS)
+-
++libdbus_la_LDFLAGS = -lboost_system -lboost_thread
diff --git a/debian/patches/series b/debian/patches/series
index fee6f58..8ca907b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-refresh-Add-DSO-linker-options-for-libsnapper.la.pat.patch
 0002-Bug-852574-Update-udevadm-path-to-bin-udevadm.patch
 0003-Add-debian-specific-option-DISABLE_APT_SNAPSHOT.patch
+add-boost-libs-to-dbus.patch