Source: courier-authlib
Version: 0.68.0-4
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap

courier-authlib fails to cross build from source for the following
reasons:
 * ./configure refuses to detect the mailuser and mailgroup during cross
   compilation and requires them to be set explicitly. This is a good
   idea anyway as it improves reproducibility.
 * ./configure also refuses to detect the locking method, so it must be
   passed explicitly as well.
 * ./configure fails to find sqlite3.pc using the wrong pkg-config.
   Makin it consider $ac_tool_prefix fixes that.

The attached patch fixes all of the above problems. Please consider
applying it.

Helmut
diff --minimal -Nru courier-authlib-0.68.0/debian/changelog 
courier-authlib-0.68.0/debian/changelog
--- courier-authlib-0.68.0/debian/changelog     2017-09-11 23:06:17.000000000 
+0200
+++ courier-authlib-0.68.0/debian/changelog     2017-09-18 19:04:43.000000000 
+0200
@@ -1,3 +1,13 @@
+courier-authlib (0.68.0-4.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: (Closes: #-1)
+    + Do not try to guess the mail user/group from the build system.
+    + Use fcntl locking.
+    + 0008-cross.patch: Consider $ac_tool_prefix for pkg-config.
+
+ -- Helmut Grohne <hel...@subdivi.de>  Mon, 18 Sep 2017 19:04:43 +0200
+
 courier-authlib (0.68.0-4) unstable; urgency=medium
 
   [ Matthias Klose ]
diff --minimal -Nru courier-authlib-0.68.0/debian/patches/0008-cross.patch 
courier-authlib-0.68.0/debian/patches/0008-cross.patch
--- courier-authlib-0.68.0/debian/patches/0008-cross.patch      1970-01-01 
01:00:00.000000000 +0100
+++ courier-authlib-0.68.0/debian/patches/0008-cross.patch      2017-09-18 
19:04:43.000000000 +0200
@@ -0,0 +1,19 @@
+From: Helmut Grohne <hel...@subdivi.de>
+Subject: consider $ac_tool_prefix for pkg-config for cross compilation
+
+--- courier-authlib-0.68.0.orig/configure.ac
++++ courier-authlib-0.68.0/configure.ac
+@@ -632,10 +632,11 @@
+       SQLITE_CFLAGS="-I$withval"
+ )
+ 
++PKG_PROG_PKG_CONFIG
+ if test "$doauthsqlite" = ""
+ then
+-      SQLITE_CFLAGS="`pkg-config --cflags sqlite3 2>/dev/null`"
+-      SQLITE_LIBS="`pkg-config --libs sqlite3 2>/dev/null`"
++      SQLITE_CFLAGS="`$PKG_CONFIG --cflags sqlite3 2>/dev/null`"
++      SQLITE_LIBS="`$PKG_CONFIG --libs sqlite3 2>/dev/null`"
+         saveLIBS="$LIBS"
+       LIBS="$SQLITE_LIBS $LIBS"
+       AC_CHECK_FUNC(sqlite3_version,
diff --minimal -Nru courier-authlib-0.68.0/debian/patches/series 
courier-authlib-0.68.0/debian/patches/series
--- courier-authlib-0.68.0/debian/patches/series        2017-07-02 
21:27:42.000000000 +0200
+++ courier-authlib-0.68.0/debian/patches/series        2017-09-18 
19:04:43.000000000 +0200
@@ -4,3 +4,4 @@
 0004-Reorder-libs-on-pkglib_LTLIBRARIES-to-help-libtool-f.patch
 0005-libcourierauth-libraries-are-normal-shared-libraries.patch
 0007-add-missing-include.patch
+0008-cross.patch
diff --minimal -Nru courier-authlib-0.68.0/debian/rules 
courier-authlib-0.68.0/debian/rules
--- courier-authlib-0.68.0/debian/rules 2017-09-11 22:43:47.000000000 +0200
+++ courier-authlib-0.68.0/debian/rules 2017-09-18 19:04:33.000000000 +0200
@@ -59,6 +59,9 @@
                --enable-userdb \
                --enable-syslog=1 \
                --disable-root-check \
+               --with-mailuser=daemon \
+               --with-mailgroup=daemon \
+               --with-locking-method=fcntl \
 
 override_dh_auto_configure:
        dh_auto_configure -- $(COMMON_CONFOPTS)

Reply via email to