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

Proposed by Timo Aaltonen on 2018-04-05
Status: Merged
Merge reported by: Nish Aravamudan
Merged at revision: f53c81715163d8f91f07d049b4fdeffdbe7b2bf2
Proposed branch: ~tjaalton/ubuntu/+source/pam:ubuntu/devel
Merge into: ubuntu/+source/pam:ubuntu/devel
Diff against target: 84 lines (+39/-0) (has conflicts)
3 files modified
debian/changelog (+11/-0)
debian/local/pam-auth-update (+21/-0)
debian/local/pam-auth-update.8 (+7/-0)
Conflict in debian/changelog
Conflict in debian/local/pam-auth-update
Conflict in debian/local/pam-auth-update.8
Reviewer Review Type Date Requested Status
Nish Aravamudan 2018-04-05 Approve on 2018-04-06
Review via email: mp+342729@code.launchpad.net
To post a comment you must log in.
Nish Aravamudan (nacc) wrote :

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) wrote :

Will re-review now.

Nish Aravamudan (nacc) wrote :

Upload tagged and sponsored. Thanks Timo!

review: Approve
Nish Aravamudan (nacc) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index a442a14..b136d92 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,14 @@
6+<<<<<<< debian/changelog
7+=======
8+pam (1.1.8-3.6ubuntu2) bionic; urgency=medium
9+
10+ * pam-auth-update: Add support for --enable option which is useful for
11+ enabling non-default configs without asking the admin. (LP:
12+ #1192719)
13+
14+ -- Timo Aaltonen <tjaalton@debian.org> Thu, 05 Apr 2018 15:27:42 +0300
15+
16+>>>>>>> debian/changelog
17 pam (1.1.8-3.6ubuntu1) bionic; urgency=medium
18
19 * Merge with Debian unstable.
20diff --git a/debian/local/pam-auth-update b/debian/local/pam-auth-update
21index 012443d..ebe3e82 100644
22--- a/debian/local/pam-auth-update
23+++ b/debian/local/pam-auth-update
24@@ -39,7 +39,11 @@ my $blanktemplate = 'libpam-runtime/no_profiles_chosen';
25 my $titletemplate = 'libpam-runtime/title';
26 my $confdir = '/etc/pam.d';
27 my $savedir = '/var/lib/pam';
28+<<<<<<< debian/local/pam-auth-update
29 my (%profiles, @sorted, @enabled, @conflicts, @new, %removals);
30+=======
31+my (%profiles, @sorted, @enabled, @conflicts, @new, %removals, %to_enable);
32+>>>>>>> debian/local/pam-auth-update
33 my $force = 0;
34 my $package = 0;
35 my $priority = 'high';
36@@ -91,6 +95,16 @@ while ($#ARGV >= 0) {
37 }
38 # --remove implies --package
39 $package = 1 if (keys(%removals));
40+<<<<<<< debian/local/pam-auth-update
41+=======
42+ } elsif ($opt eq '--enable') {
43+ while ($#ARGV >= 0) {
44+ last if ($ARGV[0] =~ /^--/);
45+ $to_enable{shift @ARGV} = 1;
46+ }
47+ # --enable implies --package
48+ $package = 1 if (keys(%to_enable));
49+>>>>>>> debian/local/pam-auth-update
50 }
51 }
52
53@@ -138,6 +152,13 @@ if (!@enabled) {
54 $priority = 'high' unless ($force);
55 }
56
57+<<<<<<< debian/local/pam-auth-update
58+=======
59+# add configs to enable
60+push(@enabled,
61+ grep { $to_enable{$_} } @sorted);
62+
63+>>>>>>> debian/local/pam-auth-update
64 # add any previously-unseen configs
65 push(@enabled,
66 grep { $profiles{$_}->{'Default'} eq 'yes' && !$seen{$_} } @sorted);
67diff --git a/debian/local/pam-auth-update.8 b/debian/local/pam-auth-update.8
68index fd5e2ad..55222f5 100644
69--- a/debian/local/pam-auth-update.8
70+++ b/debian/local/pam-auth-update.8
71@@ -68,6 +68,13 @@ Indicate that the caller is a package maintainer script; lowers the
72 priority of debconf questions to `medium' so that the user is not
73 prompted by default.
74 .TP
75+<<<<<<< debian/local/pam-auth-update.8
76+=======
77+.B \-\-enable \fIprofile \fR[\fIprofile\fR...]
78+Enable the specified profiles in system configuration. This is used to
79+enable profiles that are not on by default.
80+.TP
81+>>>>>>> debian/local/pam-auth-update.8
82 .B \-\-remove \fIprofile \fR[\fIprofile\fR...]
83 Remove the specified profiles from the system configuration.
84 .B pam\-auth\-update \-\-remove

Subscribers

People subscribed via source and target branches