projects / ckermit.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ce64b6a)
import multiarch patch from ubuntu, modified to check multiarch dirs for all libs
authorIan Beckwith <ianb@erislabs.net>
Sun, 29 Jan 2012 01:07:09 +0000 (01:07 +0000)
committerIan Beckwith <ianb@erislabs.net>
Sun, 29 Jan 2012 01:07:09 +0000 (01:07 +0000)
debian/changelog patch | blob | history
debian/patches/010_multiarch-makefile.patch [new file with mode: 0644] patch | blob
debian/patches/01_search-usr-lib-for-libk5crypto.patch [deleted file] patch | blob | history
debian/patches/series patch | blob | history
debian/rules patch | blob | history
makefile patch | blob | history

diff --git a/debian/changelog b/debian/changelog
index 91c61ce..c8bfc90 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ckermit (302-1) unstable; urgency=low
+
+  * New upstream version.
+  * Update 01_search-usr-lib-for-libk5crypto.patch to
+    properly find multiarch library paths (Closes: #639747).
+    Patch from Ubuntu, thanks to Daniel T Chen.
+
+ -- Ian Beckwith <ianb@debian.org>  Sun, 29 Jan 2012 00:47:58 +0000
+
 ckermit (301-2) unstable; urgency=low
 
   * Fix FTBFS:
diff --git a/debian/patches/010_multiarch-makefile.patch b/debian/patches/010_multiarch-makefile.patch
new file mode 100644 (file)
index 0000000..52d05d8
--- /dev/null
+++ b/debian/patches/010_multiarch-makefile.patch
@@ -0,0 +1,61 @@
+Index: ckermit/makefile
+===================================================================
+--- ckermit.orig/makefile      2012-01-29 00:15:30.000000000 +0000
++++ ckermit/makefile   2012-01-29 00:32:46.000000000 +0000
+@@ -6100,10 +6100,14 @@
+          test -f /usr/lib/libncurses.a  || \
+          test -f /usr/lib/libncurses.so; then \
+         HAVE_LIBCURSES='-lncurses'; \
++      else if test -f /usr/lib/$(MULTIARCH)/libncurses.so || \
++         test -f /usr/lib/$(MULTIARCH)/libncurses.a  || \
++         test -f /usr/lib/$(MULTIARCH)/libncurses.so; then \
++        HAVE_LIBCURSES='-lncurses'; \
+       else if test -f /usr/lib64/libcurses.so || \
+          test -f /usr/lib/libcurses.a || \
+          test -f /usr/lib/libcurses.so; then \
+-           HAVE_LIBCURSES='-lcurses'; fi; fi; \
++           HAVE_LIBCURSES='-lcurses'; fi; fi; fi; \
+       HAVE_CURSES=''; \
+       if test -n '$$HAVE_LIBCURSES'; then \
+         if test -f /usr/include/ncurses.h; then \
+@@ -6130,16 +6134,19 @@
+       || test -f /usr/lib/libresolv.a || test -f /usr/lib/libresolv.so \
+       || test -f /usr/lib/i386-linux-gnu/libresolv.a \
+       || test -f /usr/lib/i386-linux-gnu/libresolv.so \
++      || ls /lib/$(MULTIARCH)/libresolv.* > /dev/null 2> /dev/null \
+       || ls /lib/x86_64-linux-gnu/libresolv.* > /dev/null 2> /dev/null; \
+       then echo -lresolv; fi` \
+       `if test -f /usr/lib64/libcrypt.a || test -f /usr/lib64/libcrypt.so \
+       || test -f /usr/lib/libcrypt.a || test -f /usr/lib/libcrypt.so \
++      || ls /lib/$(MULTIARCH)/libcrypt.* > /dev/null 2> /dev/null \
+       || ls /lib/x86_64-linux-gnu/libcrypt.* > /dev/null 2> /dev/null; \
+       then echo -lcrypt; fi` \
+       `if test -f /usr/lib64/liblockdev.a || \
+       test -f /usr/lib64/liblockdev.so || \
+       test -f /usr/lib/liblockdev.a || \
+-      test -f /usr/lib/liblockdev.so; \
++      test -f /usr/lib/liblockdev.so \
++      ls /usr/lib/$(MULTIARCH)/liblockdev.* > /dev/null 2> /dev/null; \
+       then echo -llockdev; fi`" \
+       linuxa
+ 
+@@ -6309,7 +6316,9 @@
+               K5CRYPTO='-lk5crypto'; \
+         else if ls /usr/lib64/libk5crypto* > /dev/null 2> /dev/null; then \
+                 K5CRYPTO='-lk5crypto'; \
+-      fi; fi; fi; \
++              else if ls /usr/lib/$(MULTIARCH)/libk5crypto* > /dev/null 2> /dev/null; then \
++                                      K5CRYPTO='-lk5crypto'; \
++      fi; fi; fi; fi; \
+       COM_ERR=''; \
+       if ls /lib/libcom_err* > /dev/null 2> /dev/null; then \
+               COM_ERR='-lcom_err'; \
+@@ -6317,7 +6326,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 --git a/debian/patches/01_search-usr-lib-for-libk5crypto.patch b/debian/patches/01_search-usr-lib-for-libk5crypto.patch
deleted file mode 100644 (file)
index eca6b76..0000000
--- a/debian/patches/01_search-usr-lib-for-libk5crypto.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: ckermit/makefile
-===================================================================
---- ckermit.orig/makefile      2011-07-20 01:39:33.000000000 +0100
-+++ ckermit/makefile   2011-07-20 01:39:39.000000000 +0100
-@@ -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 \
-+                K5CRYPTO='-lk5crypto'; \
-+        fi; fi; fi; \
-       COM_ERR=''; \
-       if ls /lib/libcom_err* > /dev/null 2> /dev/null; then \
-               COM_ERR='-lcom_err'; \
diff --git a/debian/patches/series b/debian/patches/series
index 889cd21..11154f1 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-01_search-usr-lib-for-libk5crypto.patch
+010_multiarch-makefile.patch
diff --git a/debian/rules b/debian/rules
index ab73041..b6def6b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -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 @@ ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
        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
 
 %:
@@ -50,7 +52,7 @@ override_dh_auto_install:
        rm "$(BUILDDIR)/usr/share/doc/ckermit/COPYING.TXT"
 
 override_dh_installchangelogs:
-       dh_installchangelogs -k ckc301.txt
+       dh_installchangelogs -k ckc302.txt
 
 override_dh_installpam:
        dh_installpam --name=kermit
diff --git a/makefile b/makefile
index 9efe262..5292706 100644 (file)
--- a/makefile
+++ b/makefile
@@ -6100,10 +6100,14 @@ linux:
           test -f /usr/lib/libncurses.a  || \
           test -f /usr/lib/libncurses.so; then \
          HAVE_LIBCURSES='-lncurses'; \
+       else if test -f /usr/lib/$(MULTIARCH)/libncurses.so || \
+          test -f /usr/lib/$(MULTIARCH)/libncurses.a  || \
+          test -f /usr/lib/$(MULTIARCH)/libncurses.so; then \
+         HAVE_LIBCURSES='-lncurses'; \
        else if test -f /usr/lib64/libcurses.so || \
           test -f /usr/lib/libcurses.a || \
           test -f /usr/lib/libcurses.so; then \
-            HAVE_LIBCURSES='-lcurses'; fi; fi; \
+            HAVE_LIBCURSES='-lcurses'; fi; fi; fi; \
        HAVE_CURSES=''; \
        if test -n '$$HAVE_LIBCURSES'; then \
          if test -f /usr/include/ncurses.h; then \
@@ -6130,16 +6134,19 @@ linux:
        || test -f /usr/lib/libresolv.a || test -f /usr/lib/libresolv.so \
        || test -f /usr/lib/i386-linux-gnu/libresolv.a \
        || test -f /usr/lib/i386-linux-gnu/libresolv.so \
+       || ls /lib/$(MULTIARCH)/libresolv.* > /dev/null 2> /dev/null \
        || ls /lib/x86_64-linux-gnu/libresolv.* > /dev/null 2> /dev/null; \
        then echo -lresolv; fi` \
        `if test -f /usr/lib64/libcrypt.a || test -f /usr/lib64/libcrypt.so \
        || test -f /usr/lib/libcrypt.a || test -f /usr/lib/libcrypt.so \
+       || ls /lib/$(MULTIARCH)/libcrypt.* > /dev/null 2> /dev/null \
        || ls /lib/x86_64-linux-gnu/libcrypt.* > /dev/null 2> /dev/null; \
        then echo -lcrypt; fi` \
        `if test -f /usr/lib64/liblockdev.a || \
        test -f /usr/lib64/liblockdev.so || \
        test -f /usr/lib/liblockdev.a || \
-       test -f /usr/lib/liblockdev.so; \
+       test -f /usr/lib/liblockdev.so \
+       ls /usr/lib/$(MULTIARCH)/liblockdev.* > /dev/null 2> /dev/null; \
        then echo -llockdev; fi`" \
        linuxa
 
@@ -6309,7 +6316,9 @@ linux+krb5+ssl linux+krb5+openssl:
                K5CRYPTO='-lk5crypto'; \
         else if ls /usr/lib64/libk5crypto* > /dev/null 2> /dev/null; then \
                 K5CRYPTO='-lk5crypto'; \
-       fi; fi; fi; \
+               else if ls /usr/lib/$(MULTIARCH)/libk5crypto* > /dev/null 2> /dev/null; then \
+                                       K5CRYPTO='-lk5crypto'; \
+       fi; fi; fi; fi; \
        COM_ERR=''; \
        if ls /lib/libcom_err* > /dev/null 2> /dev/null; then \
                COM_ERR='-lcom_err'; \
@@ -6317,7 +6326,7 @@ linux+krb5+ssl linux+krb5+openssl:
        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 \
ckermit debian package