diff -Nru krb5-sync-3.0/debian/changelog krb5-sync-3.0/debian/changelog --- krb5-sync-3.0/debian/changelog 2014-02-08 16:51:40.000000000 +0000 +++ krb5-sync-3.0/debian/changelog 2014-04-13 18:15:35.000000000 +0000 @@ -1,8 +1,27 @@ -krb5-sync (3.0-1build1) trusty; urgency=medium +krb5-sync (3.0-4) unstable; urgency=medium - * Rebuild against libkadm5srv-mit9. + * Actually use dh_autoreconf rather than only depending on it. Thanks + to Matthias Klose for the report. (Closes: #744600) + * Enable parallel builds. - -- Colin Watson Sat, 08 Feb 2014 16:51:37 +0000 + -- Russ Allbery Sun, 13 Apr 2014 11:14:45 -0700 + +krb5-sync (3.0-3) unstable; urgency=medium + + * The change in 3.0-3 fixed the test suite failure on all architectures + except armel, which appears to still be failing with a variation on + the original issue. Further expand the valid timing range on the + test, since this seems to be on the right track but just didn't go far + enough. + + -- Russ Allbery Sun, 09 Feb 2014 19:21:52 -0800 + +krb5-sync (3.0-2) unstable; urgency=medium + + * Fix the tools/backend test suite to be less sensitive to timing when + queuing changes. (Closes: #738364) + + -- Russ Allbery Sun, 09 Feb 2014 13:41:36 -0800 krb5-sync (3.0-1) unstable; urgency=low diff -Nru krb5-sync-3.0/debian/patches/debian-changes krb5-sync-3.0/debian/patches/debian-changes --- krb5-sync-3.0/debian/patches/debian-changes 1970-01-01 00:00:00.000000000 +0000 +++ krb5-sync-3.0/debian/patches/debian-changes 2014-04-13 18:16:09.000000000 +0000 @@ -0,0 +1,47 @@ +Subject: Collected Debian patches for krb5-sync +Author: Russ Allbery + +Since I am also upstream for this package, there will normally not be any +patches to apply to the upstream source. However, occasionally I'll pull +up specific upstream commits prior to making an upstream release. When +this happens, this patch will collect all of those modifications. + +I use Git to maintain both the upstream source and the Debian packages, +and generating individual patches rather than using git cherry-pick takes +extra work for no gain. Since I'm also upstream, there's no need to +separate the patches for later upstream submission. Hence, I take this +approach with a unified patch when it's necessary. + +For full commit history and separated commits, see the upstream Git +repsitory. +--- krb5-sync-3.0.orig/tests/tools/backend-t ++++ krb5-sync-3.0/tests/tools/backend-t +@@ -87,9 +87,9 @@ sub run_backend_checked { + + # Given a user, an action, and (for a password change) the new password, + # locate that queued action and check that the correct information was stored +-# for it. Expects the action to have been queued in the past second. Reports +-# results with Test::More functions. Always uses a directory named 'queue' +-# under test_tmpdir() as the queue directory. ++# for it. Expects the action to have been queued in the five seconds. ++# Reports results with Test::More functions. Always uses a directory named ++# 'queue' under test_tmpdir() as the queue directory. + # + # $user - User for which the action should be queued + # $action - The queued action, chosen from enable, disable, or password +@@ -109,9 +109,12 @@ sub check_queued_action { + # with the same timestamp with a non-zero sequence number. + my $now = time; + my $path; +- for my $time ($now - 1 .. $now) { +- $path = $base . strftime('%Y%m%dT%H%M%SZ-00', gmtime($time)); +- last if -f $path; ++ for my $time ($now - 10 .. $now + 1) { ++ my $candidate = $base . strftime('%Y%m%dT%H%M%SZ-00', gmtime($time)); ++ if (-f $candidate) { ++ $path = $candidate; ++ last; ++ } + } + ok(defined($path), 'Queued change found'); + diff -Nru krb5-sync-3.0/debian/patches/series krb5-sync-3.0/debian/patches/series --- krb5-sync-3.0/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ krb5-sync-3.0/debian/patches/series 2014-04-13 18:16:09.000000000 +0000 @@ -0,0 +1 @@ +debian-changes diff -Nru krb5-sync-3.0/debian/rules krb5-sync-3.0/debian/rules --- krb5-sync-3.0/debian/rules 2013-12-10 06:58:12.000000000 +0000 +++ krb5-sync-3.0/debian/rules 2014-04-13 18:15:35.000000000 +0000 @@ -6,14 +6,14 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) %: - dh $@ + dh $@ --parallel --with autoreconf override_dh_auto_configure: - dh_auto_configure -- --enable-reduced-depends \ + dh_auto_configure --parallel -- --enable-reduced-depends \ --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) override_dh_auto_install: - dh_auto_install + dh_auto_install --parallel rm debian/tmp/usr/lib/*/krb5/plugins/kadm5_hook/*.la chmod 644 debian/tmp/usr/lib/*/krb5/plugins/kadm5_hook/*.so