Merge ~tjaalton/ubuntu/+source/pam:ubuntu/devel into ubuntu/+source/pam:ubuntu/devel

[Timo Aaltonen]

[Nish Aravamudan (nacc)]

As per our IRC discussion with Steve yesterday, we were hoping to integrate Steve's rich history into this change.

Can you do a

git rebase -i pkg/upload/1.1.8-3.6ubuntu1

from your ubuntu/devel branch

The result should be your single commit with a single parent which is the upload-tag above.

Force push that to your current branch, and then when I tag it, that'll pull in Steve's history.

review: Needs Fixing

[Nish Aravamudan (nacc)]

Will re-review now.

[Nish Aravamudan (nacc)]

Upload tagged and sponsored. Thanks Timo!

review: Approve

[Nish Aravamudan (nacc)]

You can ignore the conflicts below, as they are because Git can't find ancestry properly here :)

diff --git a/debian/changelog b/debian/changelog
index a442a14..b136d92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+<<<<<<< debian/changelog
+=======
+pam (1.1.8-3.6ubuntu2) bionic; urgency=medium
+
+  * pam-auth-update: Add support for --enable option which is useful for
+    enabling non-default configs without asking the admin. (LP:
+    #1192719)
+
+ -- Timo Aaltonen <[e-mail]>  Thu, 05 Apr 2018 15:27:42 +0300
+
+>>>>>>> debian/changelog
 pam (1.1.8-3.6ubuntu1) bionic; urgency=medium
 
   * Merge with Debian unstable.
diff --git a/debian/local/pam-auth-update b/debian/local/pam-auth-update
index 012443d..ebe3e82 100644
--- a/debian/local/pam-auth-update
+++ b/debian/local/pam-auth-update
@@ -39,7 +39,11 @@ my $blanktemplate = 'libpam-runtime/no_profiles_chosen';
 my $titletemplate = 'libpam-runtime/title';
 my $confdir = '/etc/pam.d';
 my $savedir = '/var/lib/pam';
+<<<<<<< debian/local/pam-auth-update
 my (%profiles, @sorted, @enabled, @conflicts, @new, %removals);
+=======
+my (%profiles, @sorted, @enabled, @conflicts, @new, %removals, %to_enable);
+>>>>>>> debian/local/pam-auth-update
 my $force = 0;
 my $package = 0;
 my $priority = 'high';
@@ -91,6 +95,16 @@ while ($#ARGV >= 0) {
 		}
 		# --remove implies --package
 		$package = 1 if (keys(%removals));
+<<<<<<< debian/local/pam-auth-update
+=======
+	} elsif ($opt eq '--enable') {
+		while ($#ARGV >= 0) {
+			last if ($ARGV[0] =~ /^--/);
+			$to_enable{shift @ARGV} = 1;
+		}
+		# --enable implies --package
+		$package = 1 if (keys(%to_enable));
+>>>>>>> debian/local/pam-auth-update
 	}
 }
 
@@ -138,6 +152,13 @@ if (!@enabled) {
 	$priority = 'high' unless ($force);
 }
 
+<<<<<<< debian/local/pam-auth-update
+=======
+# add configs to enable
+push(@enabled,
+     grep { $to_enable{$_} } @sorted);
+
+>>>>>>> debian/local/pam-auth-update
 # add any previously-unseen configs
 push(@enabled,
      grep { $profiles{$_}->{'Default'} eq 'yes' && !$seen{$_} } @sorted);
diff --git a/debian/local/pam-auth-update.8 b/debian/local/pam-auth-update.8
index fd5e2ad..55222f5 100644
--- a/debian/local/pam-auth-update.8
+++ b/debian/local/pam-auth-update.8
@@ -68,6 +68,13 @@ Indicate that the caller is a package maintainer script; lowers the
 priority of debconf questions to `medium' so that the user is not
 prompted by default.
 .TP
+<<<<<<< debian/local/pam-auth-update.8
+=======
+.B \-\-enable \fIprofile \fR[\fIprofile\fR...]
+Enable the specified profiles in system configuration. This is used to
+enable profiles that are not on by default.
+.TP
+>>>>>>> debian/local/pam-auth-update.8
 .B \-\-remove \fIprofile \fR[\fIprofile\fR...]
 Remove the specified profiles from the system configuration.
 .B pam\-auth\-update \-\-remove