Source: passwordsafe
Version: 1.05+dfsg-2
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap
passwordsafe fails to cross build from source for two reasons. The
upstream build system hard codes the build architecture pkg-config and
the debian packaging fails running tests despite
DEB_BUILD_OPTIONS=nocheck. The attached patch fixes both and makes
passwordsafe cross build successfully. Please consider applying it.
Helmut
diff --minimal -Nru passwordsafe-1.05+dfsg/debian/changelog
passwordsafe-1.05+dfsg/debian/changelog
--- passwordsafe-1.05+dfsg/debian/changelog 2018-04-27 03:35:53.000000000
+0200
+++ passwordsafe-1.05+dfsg/debian/changelog 2018-06-08 23:02:28.000000000
+0200
@@ -1,3 +1,12 @@
+passwordsafe (1.05+dfsg-2.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCBFS: (Closes: #-1)
+ + cross.patch: Make pkg-config substitutable.
+ + Honour DEB_BUILD_OPTIONS=nocheck.
+
+ -- Helmut Grohne <hel...@subdivi.de> Fri, 08 Jun 2018 23:02:28 +0200
+
passwordsafe (1.05+dfsg-2) unstable; urgency=medium
* Fix build issue that causes help files to not be found by the program
diff --minimal -Nru passwordsafe-1.05+dfsg/debian/patches/cross.patch
passwordsafe-1.05+dfsg/debian/patches/cross.patch
--- passwordsafe-1.05+dfsg/debian/patches/cross.patch 1970-01-01
01:00:00.000000000 +0100
+++ passwordsafe-1.05+dfsg/debian/patches/cross.patch 2018-06-08
23:02:27.000000000 +0200
@@ -0,0 +1,20 @@
+--- passwordsafe-1.05+dfsg.orig/src/os/unix/Makefile
++++ passwordsafe-1.05+dfsg/src/os/unix/Makefile
+@@ -24,6 +24,8 @@
+
+ NAME=os
+
++PKG_CONFIG ?= pkg-config
++
+ ifndef NO_YUBI
+ YUBI_SRC=PWYubi.cpp
+ # Use the following if you've installed ykpers-1 manually
+@@ -32,7 +34,7 @@
+
+ # If you've installed it from your distro's package repo, you
+ # should use this instead:
+-YBPERSFLAGS=$(shell pkg-config --cflags ykpers-1)
++YBPERSFLAGS=$(shell $(PKG_CONFIG) --cflags ykpers-1)
+ endif
+
+ LIBSRC = cleanup.cpp debug.cpp dir.cpp env.cpp \
diff --minimal -Nru passwordsafe-1.05+dfsg/debian/patches/series
passwordsafe-1.05+dfsg/debian/patches/series
--- passwordsafe-1.05+dfsg/debian/patches/series 2018-04-27
03:35:53.000000000 +0200
+++ passwordsafe-1.05+dfsg/debian/patches/series 2018-06-08
23:01:54.000000000 +0200
@@ -1,2 +1,3 @@
no_force_debug
perl_shebangs
+cross.patch
diff --minimal -Nru passwordsafe-1.05+dfsg/debian/rules
passwordsafe-1.05+dfsg/debian/rules
--- passwordsafe-1.05+dfsg/debian/rules 2018-04-27 03:35:53.000000000 +0200
+++ passwordsafe-1.05+dfsg/debian/rules 2018-06-08 23:02:28.000000000 +0200
@@ -18,6 +18,7 @@
override_dh_installchangelogs:
dh_installchangelogs --keep docs/ReleaseNotes.txt
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
override_dh_auto_test:
LC_ALL=C.UTF-8 make release-test
-
+endif
