Update debian/rules for new upstream version

Some packages are gone, with klog and the pam module and such.

We now have a more complicated krb5 setup, as we use MIT krb5 for
libkrb5 functionality but also pull in libroken and libhcrypto
from heimdal.

Now that upstream supports passing CFLAGS/etc. to configure, we
can pass them directly instead of smushing them into CC the way
we started doing when hardening-wrapper went away.

diff --git a/debian/rules b/debian/rules
index fb24e9d7433fe7305f5c5107a1f3893d8efcc36d..f955bf4eb54abcd1425fdea8cba8a1e394694295 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -43,7 +43,7 @@ HTML_XSL   = /usr/share/xml/docbook/stylesheet/nwalsh/html/chunk.xsl
 # /usr/share/doc/openafs-client.  Any package on this list must depend on
 # openafs-client.  This variable is used as options to dh_installdocs with
 # the --link-doc option.
-DOC_PACKAGES = -plibpam-openafs-kaserver -popenafs-fuse -popenafs-kpasswd
+DOC_PACKAGES = -popenafs-fuse
 
 # These are files that we know we don't want to install.  List them so that we
 # can use dh_install --fail-missing and catch anything new that shows up.
@@ -55,7 +55,7 @@ IGNORE = -XAuthLog -Xaklog_dynamic_auth.8 -Xcopyauth -Xdlog -Xdpass   \
        -Xxfs_size_check
 
 # Installed via other means since we have to rename them.
-IGNORE += -Xafsd.fuse.8 -Xpam_afs
+IGNORE += -Xafsd.fuse.8
 
 # These variables are used by get-orig-source, to construct dkms.conf, and
 # to set the build version.  You will need to change TAG to package stable
@@ -89,9 +89,6 @@ get-orig-source:
 
 # Handle the renaming of the up man page to afs-up here since the man pages
 # are generated from POD source by regen.sh.
-#
-# As a temporary workaround until upstream supports using
-# user-provided CFLAGS, CPPFLAGS, and LDFLAGS, we pass these via CC.
 override_dh_auto_configure:
        @if test x"$(SYS_NAME)" = x"UNKNOWN" ; then exit 1 ; fi
        echo '$(DEBIAN)'-debian > .version
@@ -100,14 +97,20 @@ override_dh_auto_configure:
        sh regen.sh
        afslogsdir=/var/log/openafs afslocaldir=/var/lib/openafs/local     \
            sh configure                                                   \
-           CC='$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)'                    \
+           CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' \
            --with-afs-sysname=$(SYS_NAME) --disable-kernel-module         \
            --prefix=/usr --mandir=\$${prefix}/share/man                   \
-           --sysconfdir=/etc --libexecdir=/usr/lib --with-krb5            \
+           --sysconfdir=/etc --libexecdir=/usr/lib                        \
            --localstatedir=/var/lib --enable-supergroups                  \
            --enable-fuse-client --enable-debug --enable-debug-lwp         \
            --with-docbook2pdf=dblatex --with-xslt-processor=xsltproc      \
            --with-html-xsl=$(HTML_XSL)                                    \
+           --with-krb5-include=/usr/include/mit-krb5                      \
+           --with-krb5-lib=/usr/lib/x86_64-linux-gnu/mit-krb5             \
+           --with-roken-include=/usr/include/heimdal                      \
+           --with-roken-lib=/usr/lib/x86_64-linux-gnu/heimdal             \
+           --with-hcrypto-include=/usr/include/heimdal                    \
+           --with-hcrypto-lib=/usr/lib/x86_64-linux-gnu/heimdal           \
            $(DEBIAN_OPT_FLAGS) $(SYSTEM)
 
 # Also build a libafs_tree and build the XML documentation if building
@@ -131,7 +134,7 @@ override_dh_auto_clean:
        done
        [ ! -f debian/changelog.in ] \
            || cp debian/changelog debian/changelog.save
-       dh_auto_clean
+       dh_auto_clean -- maintainer-clean
        [ -f debian/changelog ] || mv debian/changelog.save debian/changelog
 
 # We have to use a non-standard install target and then do some fiddling
@@ -141,6 +144,8 @@ override_dh_auto_install:
        $(MAKE) install_nolibafs DESTDIR=$(CURDIR)/debian/tmp
        rm -f debian/tmp/usr/bin/klog.krb
        rm -f debian/tmp/usr/share/man/man1/klog.krb.1
+       rm -f debian/tmp/usr/share/man/man8/kas*.8
+       rm -f debian/tmp/usr/share/man/man1/kkpasswd.1
 
 # Override dh_install for architecture-dependent builds to move some files
 # around, do some manual installation of things like PAM modules, and ensure
@@ -153,18 +158,9 @@ override_dh_install-arch:
            debian/openafs-client/usr/bin/pagsh.openafs
        mv debian/openafs-client/usr/share/man/man1/pagsh.1 \
            debian/openafs-client/usr/share/man/man1/pagsh.openafs.1
-       mv debian/openafs-client/usr/bin/klog \
-           debian/openafs-client/usr/bin/klog.afs
-       mv debian/openafs-client/usr/share/man/man1/klog.1 \
-           debian/openafs-client/usr/share/man/man1/klog.afs.1
        mv debian/openafs-client/usr/bin/up \
            debian/openafs-client/usr/bin/afs-up
 
-       install -m 644 -c debian/tmp/usr/lib/pam_afs.so.1 \
-           debian/libpam-openafs-kaserver/lib/security/pam_afs.so
-       install -m 644 -c debian/tmp/usr/lib/pam_afs.krb.so.1 \
-           debian/libpam-openafs-kaserver/lib/security/pam_afs.krb.so
-
        install -d debian/openafs-dbserver/usr/share/man/man8
        ( cd debian && pod2man --section 8 --center "Debian GNU/Linux"  \
            afs-rootvol )                                               \