The attached patch updates uw-imap to use krb5-config.mit and depend on krb5-multidev rather than libkrb5-dev.
Cheers, Jelmer
From 213dcb94c7e16e51b11f44ebd27d3b1700bca2ad Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij <jel...@samba.org> Date: Sun, 20 Apr 2014 17:22:57 +0200 Subject: [PATCH] Depend on krb5-multidev rather than libkrb5-dev. --- debian/changelog | 6 +++++ debian/control | 2 +- debian/patches/1001_shlibs.patch | 28 +++++++++++++++++--- debian/patches/2002_mailspool.patch | 4 +-- debian/rules | 2 +- 5 files changed, 55 insertions(+), 17 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4c3989b..e1274bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +uw-imap (8:2007f~dfsg-2.1) UNRELEASED; urgency=medium + + * Depend on krb5-multidev rather than libkrb5-dev. Closes: #745333 + + -- Jelmer Vernooij <jel...@debian.org> Sun, 20 Apr 2014 17:22:52 +0200 + uw-imap (8:2007f~dfsg-2) unstable; urgency=medium * New maintainer (Closes: #686448). diff --git a/debian/control b/debian/control index 1b12a46..5f9300b 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-Depends: cdbs (>= 0.4.72~), dh-buildinfo, devscripts, libpam-dev, - libkrb5-dev, + krb5-multidev, comerr-dev, libssl-dev, d-shlibs diff --git a/debian/patches/1001_shlibs.patch b/debian/patches/1001_shlibs.patch index 4845361..527837c 100644 --- a/debian/patches/1001_shlibs.patch +++ b/debian/patches/1001_shlibs.patch @@ -158,7 +158,8 @@ @@ -498,7 +498,20 @@ ACTIVEFILE=/var/lib/news/active \ RSHPATH=/usr/bin/rsh \ - BASECFLAGS="$(GCCCFLAGS)" \ +- BASECFLAGS="$(GCCCFLAGS)" \ ++ BASECFLAGS="$(GCCCFLAGS) $(shell krb5-config.mit --cflags gssapi)" \ - BASELDFLAGS="$(PAMLDFLAGS)" + BASELDFLAGS="../c-client/c-client.a $(PAMLDFLAGS)" + @@ -168,11 +169,11 @@ + SPOOLDIR=/var/spool \ + ACTIVEFILE=/var/lib/news/active \ + RSHPATH=/usr/bin/rsh \ -+ BASECFLAGS="-fPIC $(GCCCFLAGS)" \ ++ BASECFLAGS="-fPIC $(GCCCFLAGS) $(shell krb5-config.mit --cflags gssapi)" \ + ARCHIVE="libc-client.so" \ + BASELDFLAGS="-L../c-client -lc-client $(PAMLDFLAGS) -lc" \ + ARRC="gcc --shared -Wl,-soname,libc-client.so.$(VERSION) -o" \ -+ LIBRARIES="$(PAMLDFLAGS) $(EXTRALDFLAGS) $(SSLLDFLAGS) -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err" \ ++ LIBRARIES="$(PAMLDFLAGS) $(EXTRALDFLAGS) $(SSLLDFLAGS) $(shell krb5-config.mit --libs gssapi)" \ + RANLIB=true lnx: # Linux non-shadow passwords @@ -225,3 +226,24 @@ clean: rm -f *.o tmail +diff --git a/src/osdep/unix/Makefile.gss b/src/osdep/unix/Makefile.gss +index 440647e..ab36938 100644 +--- a/src/osdep/unix/Makefile.gss ++++ b/src/osdep/unix/Makefile.gss +@@ -26,14 +26,9 @@ + + # Extended flags needed for additional authenticators. You may need to modify. + +-GSSDIR=/usr/local +-GSSINCLUDE=$(GSSDIR)/include +-GSSLIB=$(GSSDIR)/lib +-GSSCFLAGS= -I$(GSSINCLUDE) -DGSS_C_NT_HOSTBASED_SERVICE=gss_nt_service_name -DKRB5_DEPRECATED=1 +-GSSOLDLDFLAGS= -L$(GSSLIB) -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err +-GSSNEWLDFLAGS= -L$(GSSLIB) -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ++GSSCFLAGS= $(shell krb5-config.mit --cflags gssapi) -DGSS_C_NT_HOSTBASED_SERVICE=gss_nt_service_name -DKRB5_DEPRECATED=1 + + gss: # GSSAPI Kerberos V flags + echo $(GSSCFLAGS) >> OSCFLAGS +- sh -c '(test -f $(GSSLIB)/libk5crypto.a) && echo $(GSSNEWLDFLAGS) || echo $(GSSOLDLDFLAGS)' >> LDFLAGS ++ krb5-config.mit --libs gssapi >> LDFLAGS + echo "#include \"kerb_mit.c\"" >> auths.c diff --git a/debian/patches/2002_mailspool.patch b/debian/patches/2002_mailspool.patch index 4cdcd45..6331d05 100644 --- a/debian/patches/2002_mailspool.patch +++ b/debian/patches/2002_mailspool.patch @@ -8,7 +8,7 @@ + SPOOLDIR=/var/spool MAILSPOOL=/var/mail \ ACTIVEFILE=/var/lib/news/active \ RSHPATH=/usr/bin/rsh \ - BASECFLAGS="$(GCCCFLAGS)" \ + BASECFLAGS="$(GCCCFLAGS) $(shell krb5-config.mit --cflags gssapi)" \ @@ -503,7 +503,7 @@ lnps: # Linux Pluggable Authentication modules (c-client as shared lib) $(BUILD) `$(CAT) SPECIALS` OS=lnx \ @@ -17,4 +17,4 @@ + SPOOLDIR=/var/spool MAILSPOOL=/var/mail \ ACTIVEFILE=/var/lib/news/active \ RSHPATH=/usr/bin/rsh \ - BASECFLAGS="-fPIC $(GCCCFLAGS)" \ + BASECFLAGS="-fPIC $(GCCCFLAGS) $(shell krb5-config.mit --cflags gssapi)" \ diff --git a/debian/rules b/debian/rules index 31581df..f622de0 100755 --- a/debian/rules +++ b/debian/rules @@ -149,7 +149,7 @@ clean:: exit 1) # Needed by upstream build process -CDBS_BUILD_DEPENDS += , libpam-dev, libkrb5-dev, comerr-dev, libssl-dev +CDBS_BUILD_DEPENDS += , libpam-dev, krb5-multidev, comerr-dev, libssl-dev # Needed for our packaging routines CDBS_BUILD_DEPENDS += , d-shlibs -- 1.9.2.657.geaba915
signature.asc
Description: Digital signature
