Package: ckermit
Version: 301-2
Severity: important
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch
In Ubuntu, the attached patch was applied to achieve the following:
* Update 01_search-usr-lib-for-libk5crypto.patch to handle
remaining multiarch libs. Fixes FTBFS. (LP: #831177)
The variable(s) in debian/rules is(are) not likely the cleanest
resolution, but thanks for considering the patch.
-- System Information:
Debian Release: wheezy/sid
APT prefers oneiric-updates
APT policy: (500, 'oneiric-updates'), (500, 'oneiric-security'), (500,
'oneiric-proposed'), (500, 'oneiric')
Architecture: amd64 (x86_64)
Kernel: Linux 3.0.0-9-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru ckermit-301/debian/patches/01_search-usr-lib-for-libk5crypto.patch ckermit-301/debian/patches/01_search-usr-lib-for-libk5crypto.patch
--- ckermit-301/debian/patches/01_search-usr-lib-for-libk5crypto.patch 2011-07-19 20:55:20.000000000 -0400
+++ ckermit-301/debian/patches/01_search-usr-lib-for-libk5crypto.patch 2011-08-29 17:24:16.000000000 -0400
@@ -1,15 +1,24 @@
-Index: ckermit/makefile
+Index: ckermit-301/makefile
===================================================================
---- ckermit.orig/makefile 2011-07-20 01:39:33.000000000 +0100
-+++ ckermit/makefile 2011-07-20 01:39:39.000000000 +0100
+--- ckermit-301.orig/makefile 2011-07-11 09:24:33.000000000 -0400
++++ ckermit-301/makefile 2011-08-29 17:24:14.000000000 -0400
@@ -6277,7 +6277,9 @@
K5CRYPTO='-lk5crypto'; \
else if ls /usr/lib64/libk5crypto* > /dev/null 2> /dev/null; then \
K5CRYPTO='-lk5crypto'; \
- fi; fi; \
-+ else if ls /usr/lib/libk5crypto* > /dev/null 2> /dev/null; then \
++ else if ls /usr/lib/$(MULTIARCH)/libk5crypto* > /dev/null 2> /dev/null; then \
+ K5CRYPTO='-lk5crypto'; \
+ fi; fi; fi; \
COM_ERR=''; \
if ls /lib/libcom_err* > /dev/null 2> /dev/null; then \
COM_ERR='-lcom_err'; \
+@@ -6285,7 +6287,7 @@
+ GSSAPILIB='-lgssapi'; \
+ if ls /lib/libgssapi_krb5* > /dev/null 2> /dev/null; then \
+ GSSAPILIB='-lgssapi_krb5'; \
+- else if ls /usr/lib/libgssapi_krb5* > /dev/null 2> /dev/null; then \
++ else if ls /usr/lib/$(MULTIARCH)/libgssapi_krb5* > /dev/null 2> /dev/null; then \
+ GSSAPILIB='-lgssapi_krb5'; \
+ else K5DIR=`echo $(K5LIB) | sed 's|-L||'`; \
+ if ls $$K5DIR/libgssapi_krb5* > /dev/null 2> /dev/null; then \
diff -Nru ckermit-301/debian/rules ckermit-301/debian/rules
--- ckermit-301/debian/rules 2011-07-19 20:55:20.000000000 -0400
+++ ckermit-301/debian/rules 2011-08-29 17:22:17.000000000 -0400
@@ -4,6 +4,8 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
BUILDDIR=`pwd`/debian/ckermit
CFLAGS =-g \
@@ -22,7 +24,7 @@
CFLAGS += -DSELECT
endif
-MAKEOPTS=-f makefile DESTDIR=\"$(BUILDDIR)\" BINDIR=/usr/bin MANDIR=/usr/share/man/man1 INFODIR=/usr/share/doc/ckermit KFLAGS='$(CFLAGS)' LNKFLAGS="-Wl,-z,defs -Wl,--as-needed"
+MAKEOPTS=-f makefile DESTDIR=\"$(BUILDDIR)\" BINDIR=/usr/bin MANDIR=/usr/share/man/man1 INFODIR=/usr/share/doc/ckermit KFLAGS='$(CFLAGS)' MULTIARCH=\"$(DEB_HOST_MULTIARCH)\" LNKFLAGS="-Wl,-z,defs -Wl,--as-needed"
MAKETARGET=linux+krb5+openssl
%:
