* Don't use krb5-config to get a library list. It runs the risk of

  encoding unnecessary library dependencies.  Instead, hard-code the
  flags and libraries we actually need.  (Closes: #424448)

diff --git a/debian/changelog b/debian/changelog
index 641adf31be13d7b17d7e0b3b58119683da60136b..e7046077b29ad5c6797a3b99de2868f584bf9676 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,12 @@
 openafs (1.4.4.dfsg1-3) unstable; urgency=low
 
+  * Don't use krb5-config to get a library list.  It runs the risk of
+    encoding unnecessary library dependencies.  Instead, hard-code the
+    flags and libraries we actually need.  (Closes: #424448)
   * When loading a module using the upstream naming convention, don't
     append the .mp to the module name for modprobe.  (Closes: #420597)
 
- --
+ -- Russ Allbery <rra@debian.org>  Wed, 16 May 2007 16:54:57 -0700
 
 openafs (1.4.4.dfsg1-2) unstable; urgency=low
 

diff --git a/debian/rules b/debian/rules
index f03a84f5e46c9124990e8a5c9054be7f4b5e7a67..f52311d8f72a2d54ac5eb27ec87c3e168075d403 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -85,20 +85,22 @@ get-orig-source:
        rm -r openafs_$(DEBVERS).orig
        gzip -9 openafs_$(DEBVERS).orig.tar
 
+# Manually set --with-krb5 and the environment variables since krb5-config
+# adds a variety of other stuff we don't want.  This may soon be fixed in
+# Debian unstable, but this is the most reliable approach.
 configure: configure-stamp
 configure-stamp:
        @if test x"$(SYS_NAME)" = x"UNKNOWN" ; then exit 1 ; fi
        dh_testdir
        sh regen.sh
        afslogsdir=/var/log/openafs afslocaldir=/etc/openafs/server-local \
-           sh configure \
+           KRB5CFLAGS=' ' KRB5LIBS='-lkrb5 -lcom_err' sh configure \
            --with-afs-sysname=$(SYS_NAME) --disable-kernel-module \
            --prefix=/usr --mandir=\$${prefix}/share/man \
            --sysconfdir=/etc --libexecdir=/usr/lib \
            --localstatedir=/var/lib --enable-supergroups \
            --enable-largefile-fileserver --enable-debug --enable-lwp-debug \
-           --with-krb5-conf=/usr/bin/krb5-config \
-           $(DEBIAN_OPT_FLAGS) $(SYSTEM)
+           --with-krb5 $(DEBIAN_OPT_FLAGS) $(SYSTEM)
        chmod a+x src/libafs/make_kbuild_makefile.pl         
        touch configure-stamp