Bug#634121: Please transition krb5 for multiarch

2011-07-17 Thread Steve Langasek
Source: krb5
Version: 1.9.1+dfsg-1
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: ubuntu-patch oneiric origin-ubuntu

Hi gents,

Please find attached a patch to krb5 to transition it to use of the
multiarch library paths as described at
http://wiki.debian.org/Multiarch/Implementation.  This patch has been
applied and is being used successfully in Ubuntu 11.04, and should be safe
to apply in Debian now that multiarch has been bootstrapped there.

Note that this involves a change to the krb5 plugin path
(/usr/lib/krb5/plugins - /usr/lib/$(DEB_HOST_MULTIARCH)/krb5/plugins),
which means that either external packages using this path need to transition
in tandem, or backwards-compatibility support for the previous path needs to
be provided.  Since I only found one other package in the archive (sssd)
that ships such a plugin, I think it's best to just do a coordinated rebuild
of sssd.  The patch assumes this will be done in the next NMU of sssd.

Cheers,
-- 
Steve Langasek   Give me a lever long enough and a Free OS
Debian Developer   to set it on, and I can move the world.
Ubuntu Developerhttp://www.debian.org/
slanga...@ubuntu.com vor...@debian.org
diff -uNr --exclude .bzr debian/debian/clean trunk/debian/clean
--- debian/debian/clean	1969-12-31 16:00:00.0 -0800
+++ trunk/debian/clean	2011-03-19 03:05:13.0 -0700
@@ -0,0 +1,7 @@
+debian/krb5-kdc.dirs   
+debian/krb5-multidev.dirs   
+debian/krb5-multidev.links
+debian/krb5-multidev.install
+debian/libkrb5-3.dirs   
+debian/libkrb5-dev.dirs   
+
diff -uNr --exclude .bzr debian/debian/control trunk/debian/control
--- debian/debian/control	2011-07-16 22:02:23.0 -0700
+++ trunk/debian/control	2011-06-20 16:08:46.0 -0700
@@ -1,7 +1,8 @@
 Source: krb5
 Section: net
 Priority: standard
-Build-Depends: debhelper (= 7), byacc | bison, comerr-dev, docbook-to-man,
+Build-Depends: debhelper (= 8.1.3), byacc | bison,
+ comerr-dev, docbook-to-man,
  libkeyutils-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libldap2-dev,
  libncurses5-dev, libssl-dev, ss-dev, texinfo
 Standards-Version: 3.9.1
@@ -140,6 +141,7 @@
  | libkrb5support0 (= ${binary:Version})
 Priority: extra
 Section: debug
+Multi-Arch: same
 Description: Debugging files for MIT Kerberos
  Kerberos is a system for authenticating users and services on a network.
  Kerberos is a trusted third-party service.  That means that there is a
@@ -158,6 +160,7 @@
 Suggests: opensc
 Replaces: libkrb53 (= 1.6.dfsg.3~beta1-1)
 Priority: extra
+Multi-Arch: same
 Description: PKINIT plugin for MIT Kerberos
  Kerberos is a system for authenticating users and services on a network.
  Kerberos is a trusted third-party service.  That means that there is a
@@ -192,7 +195,8 @@
 Package: libkrb5-3
 Section: libs
 Replaces: libkrb53 (1.6.dfsg.4~beta1-7)
-Breaks: libkrb53 ( 1.6.dfsg.4~beta1-9 )
+Breaks: libkrb53 ( 1.6.dfsg.4~beta1-9 ),
+ sssd (= 1.2.1-4.3)
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends},
  libkrb5support0 (= ${binary:Version})
@@ -200,6 +204,8 @@
 Conflicts: ssh-krb5 ( 3.8.1p1-10),
  libapache-mod-auth-kerb (= 4.996-5.0-rc6-2),
  libapache2-mod-auth-kerb (= 4.996-5.0-rc6-2)
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Description: MIT Kerberos runtime libraries
  Kerberos is a system for authenticating users and services on a network.
  Kerberos is a trusted third-party service.  That means that there is a
@@ -218,6 +224,8 @@
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, libkrb5-3 (= ${binary:Version})
 Suggests: krb5-doc, krb5-user
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Description: MIT Kerberos runtime libraries - krb5 GSS-API Mechanism
  Kerberos is a system for authenticating users and services on a network.
  Kerberos is a trusted third-party service.  That means that there is a
@@ -236,6 +244,8 @@
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: krb5-doc, krb5-user
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Description: MIT Kerberos runtime libraries - GSS enabled ONCRPC
  Kerberos is a system for authenticating users and services on a network.
  Kerberos is a trusted third-party service.  That means that there is a
@@ -252,6 +262,8 @@
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: krb5-doc, krb5-user
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Description: MIT Kerberos runtime libraries - KDC and Admin Server
  Kerberos is a system for authenticating users and services on a network.
  Kerberos is a trusted third-party service.  That means that there is a
@@ -268,6 +280,8 @@
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: krb5-doc, krb5-user
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Description: MIT Kerberos runtime libraries - Administration Clients
  Kerberos is a system for authenticating users and 

Bug#634121: Please transition krb5 for multiarch

2011-07-17 Thread Sam Hartman
Hi.  Thanks for all your great work on multi-arch.  This looks good and
I will apply and upload in my next upload.



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org