diff -Nru pam-krb5-migrate-0.0.11/debian/changelog pam-krb5-migrate-0.0.11/debian/changelog --- pam-krb5-migrate-0.0.11/debian/changelog 2014-07-15 14:56:10.000000000 +0000 +++ pam-krb5-migrate-0.0.11/debian/changelog 2015-04-26 12:31:43.000000000 +0000 @@ -1,3 +1,12 @@ +pam-krb5-migrate (0.0.11-3) unstable; urgency=medium + + * Install login.pam example file. Closes: #687960 + * Bump standards version to 3.9.6 (no changes). + * Also build a libpam-krb5-migrate-mit package, possible now because + of the introduction of libkrb5-multidev. + + -- Jelmer Vernooij Sat, 25 Apr 2015 10:57:57 +0200 + pam-krb5-migrate (0.0.11-2) unstable; urgency=medium * Use canonical URL in Vcs-Git header. diff -Nru pam-krb5-migrate-0.0.11/debian/control pam-krb5-migrate-0.0.11/debian/control --- pam-krb5-migrate-0.0.11/debian/control 2014-07-15 14:34:58.000000000 +0000 +++ pam-krb5-migrate-0.0.11/debian/control 2015-04-26 11:52:12.000000000 +0000 @@ -2,11 +2,12 @@ Section: admin Priority: optional Maintainer: Jelmer Vernooij -Standards-Version: 3.9.5 +Standards-Version: 3.9.6 Build-Depends: comerr-dev, debhelper (>= 5.0.70~), dh-autoreconf, heimdal-multidev, + krb5-multidev, libpam-dev, pkg-config Vcs-Git: git://anonscm.debian.org/users/jelmer/pam-krb5-migrate.git -b unstable @@ -14,7 +15,7 @@ Package: libpam-krb5-migrate-heimdal Architecture: any Depends: libpam-runtime (>= 1.0.1-6), ${misc:Depends}, ${shlibs:Depends} -Description: PAM module for migrating to Kerberos +Description: PAM module for migrating to Heimdal Kerberos A stackable authentication module that takes a username and password from an earlier module in the stack and attempts to transparently add the user to a Kerberos realm using the Kerberos 5 kadmin service. The module can be used to @@ -22,3 +23,15 @@ pre-existing authentication methods to a Kerberos-based setup. . This package allows updating the database of a remote Heimdal server. + +Package: libpam-krb5-migrate-mit +Architecture: any +Depends: libpam-runtime (>= 1.0.1-6), ${misc:Depends}, ${shlibs:Depends} +Description: PAM module for migrating to MIT Kerberos + A stackable authentication module that takes a username and password from an + earlier module in the stack and attempts to transparently add the user to a + Kerberos realm using the Kerberos 5 kadmin service. The module can be used to + ease the administrative burdens of migrating a large installed userbase from + pre-existing authentication methods to a Kerberos-based setup. + . + This package allows updating the database of a remote MIT Kerberos server. diff -Nru pam-krb5-migrate-0.0.11/debian/dirs pam-krb5-migrate-0.0.11/debian/dirs --- pam-krb5-migrate-0.0.11/debian/dirs 2014-03-01 18:02:27.000000000 +0000 +++ pam-krb5-migrate-0.0.11/debian/dirs 2015-04-26 12:10:33.000000000 +0000 @@ -1,2 +1,3 @@ lib/security +usr/share/man/man7 usr/share/pam-configs diff -Nru pam-krb5-migrate-0.0.11/debian/install pam-krb5-migrate-0.0.11/debian/install --- pam-krb5-migrate-0.0.11/debian/install 2014-03-01 18:02:27.000000000 +0000 +++ pam-krb5-migrate-0.0.11/debian/install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -debian/libpam-krb5-migrate-heimdal.pam-config /usr/share/pam-configs/krb5-migrate-heimdal diff -Nru pam-krb5-migrate-0.0.11/debian/libpam-krb5-migrate-heimdal.examples pam-krb5-migrate-0.0.11/debian/libpam-krb5-migrate-heimdal.examples --- pam-krb5-migrate-0.0.11/debian/libpam-krb5-migrate-heimdal.examples 1970-01-01 00:00:00.000000000 +0000 +++ pam-krb5-migrate-0.0.11/debian/libpam-krb5-migrate-heimdal.examples 2015-04-26 11:52:12.000000000 +0000 @@ -0,0 +1 @@ +login.pam diff -Nru pam-krb5-migrate-0.0.11/debian/libpam-krb5-migrate-heimdal.install pam-krb5-migrate-0.0.11/debian/libpam-krb5-migrate-heimdal.install --- pam-krb5-migrate-0.0.11/debian/libpam-krb5-migrate-heimdal.install 1970-01-01 00:00:00.000000000 +0000 +++ pam-krb5-migrate-0.0.11/debian/libpam-krb5-migrate-heimdal.install 2015-04-26 12:26:47.000000000 +0000 @@ -0,0 +1,2 @@ +heimdal/pam_krb5_migrate_heimdal.so /lib/security/pam_krb5_migrate_heimdal.so +debian/libpam-krb5-migrate-heimdal.pam-config /usr/share/pam-configs/krb5-migrate-heimdal diff -Nru pam-krb5-migrate-0.0.11/debian/libpam-krb5-migrate-heimdal.manpages pam-krb5-migrate-0.0.11/debian/libpam-krb5-migrate-heimdal.manpages --- pam-krb5-migrate-0.0.11/debian/libpam-krb5-migrate-heimdal.manpages 1970-01-01 00:00:00.000000000 +0000 +++ pam-krb5-migrate-0.0.11/debian/libpam-krb5-migrate-heimdal.manpages 2015-04-26 12:19:18.000000000 +0000 @@ -0,0 +1 @@ +heimdal/pam_krb5_migrate_heimdal.7 diff -Nru pam-krb5-migrate-0.0.11/debian/libpam-krb5-migrate-heimdal.pam-config pam-krb5-migrate-0.0.11/debian/libpam-krb5-migrate-heimdal.pam-config --- pam-krb5-migrate-0.0.11/debian/libpam-krb5-migrate-heimdal.pam-config 2014-03-01 18:02:27.000000000 +0000 +++ pam-krb5-migrate-0.0.11/debian/libpam-krb5-migrate-heimdal.pam-config 2015-04-26 12:00:07.000000000 +0000 @@ -1,8 +1,8 @@ -Name: Kerberos password synchronization +Name: Kerberos password synchronization (Heimdal) Default: yes Priority: 0 Auth-Type: Additional Auth-Initial: - optional pam_krb5_migrate.so + optional pam_krb5_migrate_heimdal.so Auth-Final: - optional pam_krb5_migrate.so + optional pam_krb5_migrate_heimdal.so diff -Nru pam-krb5-migrate-0.0.11/debian/libpam-krb5-migrate-mit.examples pam-krb5-migrate-0.0.11/debian/libpam-krb5-migrate-mit.examples --- pam-krb5-migrate-0.0.11/debian/libpam-krb5-migrate-mit.examples 1970-01-01 00:00:00.000000000 +0000 +++ pam-krb5-migrate-0.0.11/debian/libpam-krb5-migrate-mit.examples 2015-04-26 12:00:34.000000000 +0000 @@ -0,0 +1 @@ +login.pam diff -Nru pam-krb5-migrate-0.0.11/debian/libpam-krb5-migrate-mit.install pam-krb5-migrate-0.0.11/debian/libpam-krb5-migrate-mit.install --- pam-krb5-migrate-0.0.11/debian/libpam-krb5-migrate-mit.install 1970-01-01 00:00:00.000000000 +0000 +++ pam-krb5-migrate-0.0.11/debian/libpam-krb5-migrate-mit.install 2015-04-26 12:26:44.000000000 +0000 @@ -0,0 +1,2 @@ +mit/pam_krb5_migrate_mit.so /lib/security/pam_krb5_migrate_mit.so +debian/libpam-krb5-migrate-mit.pam-config /usr/share/pam-configs/krb5-migrate-mit diff -Nru pam-krb5-migrate-0.0.11/debian/libpam-krb5-migrate-mit.manpages pam-krb5-migrate-0.0.11/debian/libpam-krb5-migrate-mit.manpages --- pam-krb5-migrate-0.0.11/debian/libpam-krb5-migrate-mit.manpages 1970-01-01 00:00:00.000000000 +0000 +++ pam-krb5-migrate-0.0.11/debian/libpam-krb5-migrate-mit.manpages 2015-04-26 12:19:22.000000000 +0000 @@ -0,0 +1 @@ +mit/pam_krb5_migrate_mit.7 diff -Nru pam-krb5-migrate-0.0.11/debian/libpam-krb5-migrate-mit.pam-config pam-krb5-migrate-0.0.11/debian/libpam-krb5-migrate-mit.pam-config --- pam-krb5-migrate-0.0.11/debian/libpam-krb5-migrate-mit.pam-config 1970-01-01 00:00:00.000000000 +0000 +++ pam-krb5-migrate-0.0.11/debian/libpam-krb5-migrate-mit.pam-config 2015-04-26 12:00:10.000000000 +0000 @@ -0,0 +1,8 @@ +Name: Kerberos password synchronization (MIT) +Default: yes +Priority: 0 +Auth-Type: Additional +Auth-Initial: + optional pam_krb5_migrate_mit.so +Auth-Final: + optional pam_krb5_migrate_mit.so diff -Nru pam-krb5-migrate-0.0.11/debian/libpam-krb5-migrate-mit.postinst pam-krb5-migrate-0.0.11/debian/libpam-krb5-migrate-mit.postinst --- pam-krb5-migrate-0.0.11/debian/libpam-krb5-migrate-mit.postinst 1970-01-01 00:00:00.000000000 +0000 +++ pam-krb5-migrate-0.0.11/debian/libpam-krb5-migrate-mit.postinst 2015-04-26 12:01:15.000000000 +0000 @@ -0,0 +1,7 @@ +#!/bin/sh + +set -e + +pam-auth-update --package + +#DEBHELPER# diff -Nru pam-krb5-migrate-0.0.11/debian/libpam-krb5-migrate-mit.prerm pam-krb5-migrate-0.0.11/debian/libpam-krb5-migrate-mit.prerm --- pam-krb5-migrate-0.0.11/debian/libpam-krb5-migrate-mit.prerm 1970-01-01 00:00:00.000000000 +0000 +++ pam-krb5-migrate-0.0.11/debian/libpam-krb5-migrate-mit.prerm 2015-04-26 12:22:12.000000000 +0000 @@ -0,0 +1,9 @@ +#!/bin/sh + +set -e + +if [ "$1" = "remove" ]; then + pam-auth-update --package --remove krb5-migrate-mit +fi + +#DEBHELPER# diff -Nru pam-krb5-migrate-0.0.11/debian/manpages pam-krb5-migrate-0.0.11/debian/manpages --- pam-krb5-migrate-0.0.11/debian/manpages 2014-03-01 18:02:27.000000000 +0000 +++ pam-krb5-migrate-0.0.11/debian/manpages 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -pam_krb5_migrate.7 diff -Nru pam-krb5-migrate-0.0.11/debian/rules pam-krb5-migrate-0.0.11/debian/rules --- pam-krb5-migrate-0.0.11/debian/rules 2014-03-01 18:02:27.000000000 +0000 +++ pam-krb5-migrate-0.0.11/debian/rules 2015-04-26 12:27:58.000000000 +0000 @@ -1,13 +1,46 @@ #!/usr/bin/make -f +export DESTDIR=$(shell pwd)/debian/tmp + +CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) +CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) +CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) +LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) + +CFLAGS += -fPIC + %: dh --with autoreconf $* override_dh_auto_configure: - $(shell dpkg-buildflags --export=configure) KRB5CONFIG=krb5-config.heimdal CFLAGS="-fPIC $(shell dpkg-buildflags --get CFLAGS)" ./configure --prefix=/usr + mkdir -p heimdal mit + cd heimdal && $(shell dpkg-buildflags --export=configure) KRB5CONFIG=krb5-config.heimdal CFLAGS="$(CFLAGS) $(CPPFLAGS)" ../configure --prefix=/usr + cd mit && $(shell dpkg-buildflags --export=configure) KRB5CONFIG=krb5-config.mit CFLAGS="$(CFLAGS) $(CPPFLAGS)" ../configure --prefix=/usr + +override_dh_auto_build: + ln -s ../Makefile heimdal/Makefile + ln -s ../Makefile mit/Makefile + ln -s ../pam_krb5_migrate.c mit + ln -s ../pam_krb5_migrate.h mit + ln -s ../pam_krb5_migrate.c heimdal + ln -s ../pam_krb5_migrate.h heimdal + ln -s ../pam_krb5_migrate.7 heimdal + ln -s ../pam_krb5_migrate.7 mit + $(MAKE) -C heimdal + $(MAKE) -C mit + +override_dh_auto_test:: override_dh_auto_clean: - [ ! -f Makefile.settings ] || $(MAKE) distclean + rm -rf mit heimdal + +override_dh_auto_install: + $(MAKE) -C heimdal install DESTDIR=$(DESTDIR) + mv $(DESTDIR)/lib/security/pam_krb5_migrate.so heimdal/pam_krb5_migrate_heimdal.so + mv $(DESTDIR)/usr/share/man/man7/pam_krb5_migrate.7 heimdal/pam_krb5_migrate_heimdal.7 + $(MAKE) -C mit install DESTDIR=$(DESTDIR) + mv $(DESTDIR)/lib/security/pam_krb5_migrate.so mit/pam_krb5_migrate_mit.so + mv $(DESTDIR)/usr/share/man/man7/pam_krb5_migrate.7 mit/pam_krb5_migrate_mit.7 override_dh_installchangelogs: dh_installchangelogs -a CHANGELOG