Ubuntu
pam package

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

  1. Git
  2. lp:~tjaalton/ubuntu/+source/pam
  3. ubuntu/devel
  4. Merge into ubuntu/devel
Proposed by Timo Aaltonen
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 (community) Approve
Review via email: mp+342729@code.launchpad.net
To post a comment you must log in.
Revision history for this message
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
Revision history for this message
Nish Aravamudan (nacc) wrote :

Will re-review now.

Revision history for this message
Nish Aravamudan (nacc) wrote :

Upload tagged and sponsored. Thanks Timo!

review: Approve
Revision history for this message
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
diff --git a/debian/changelog b/debian/changelog
index a442a14..b136d92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
1<<<<<<< debian/changelog
2=======
3pam (1.1.8-3.6ubuntu2) bionic; urgency=medium
4
5 * pam-auth-update: Add support for --enable option which is useful for
6 enabling non-default configs without asking the admin. (LP:
7 #1192719)
8
9 -- Timo Aaltonen <tjaalton@debian.org> Thu, 05 Apr 2018 15:27:42 +0300
10
11>>>>>>> debian/changelog
1pam (1.1.8-3.6ubuntu1) bionic; urgency=medium12pam (1.1.8-3.6ubuntu1) bionic; urgency=medium
213
3 * Merge with Debian unstable.14 * 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';
39my $titletemplate = 'libpam-runtime/title';39my $titletemplate = 'libpam-runtime/title';
40my $confdir = '/etc/pam.d';40my $confdir = '/etc/pam.d';
41my $savedir = '/var/lib/pam';41my $savedir = '/var/lib/pam';
42<<<<<<< debian/local/pam-auth-update
42my (%profiles, @sorted, @enabled, @conflicts, @new, %removals);43my (%profiles, @sorted, @enabled, @conflicts, @new, %removals);
44=======
45my (%profiles, @sorted, @enabled, @conflicts, @new, %removals, %to_enable);
46>>>>>>> debian/local/pam-auth-update
43my $force = 0;47my $force = 0;
44my $package = 0;48my $package = 0;
45my $priority = 'high';49my $priority = 'high';
@@ -91,6 +95,16 @@ while ($#ARGV >= 0) {
91 }95 }
92 # --remove implies --package96 # --remove implies --package
93 $package = 1 if (keys(%removals));97 $package = 1 if (keys(%removals));
98<<<<<<< debian/local/pam-auth-update
99=======
100 } elsif ($opt eq '--enable') {
101 while ($#ARGV >= 0) {
102 last if ($ARGV[0] =~ /^--/);
103 $to_enable{shift @ARGV} = 1;
104 }
105 # --enable implies --package
106 $package = 1 if (keys(%to_enable));
107>>>>>>> debian/local/pam-auth-update
94 }108 }
95}109}
96110
@@ -138,6 +152,13 @@ if (!@enabled) {
138 $priority = 'high' unless ($force);152 $priority = 'high' unless ($force);
139}153}
140154
155<<<<<<< debian/local/pam-auth-update
156=======
157# add configs to enable
158push(@enabled,
159 grep { $to_enable{$_} } @sorted);
160
161>>>>>>> debian/local/pam-auth-update
141# add any previously-unseen configs162# add any previously-unseen configs
142push(@enabled,163push(@enabled,
143 grep { $profiles{$_}->{'Default'} eq 'yes' && !$seen{$_} } @sorted);164 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
68priority of debconf questions to `medium' so that the user is not68priority of debconf questions to `medium' so that the user is not
69prompted by default.69prompted by default.
70.TP70.TP
71<<<<<<< debian/local/pam-auth-update.8
72=======
73.B \-\-enable \fIprofile \fR[\fIprofile\fR...]
74Enable the specified profiles in system configuration. This is used to
75enable profiles that are not on by default.
76.TP
77>>>>>>> debian/local/pam-auth-update.8
71.B \-\-remove \fIprofile \fR[\fIprofile\fR...]78.B \-\-remove \fIprofile \fR[\fIprofile\fR...]
72Remove the specified profiles from the system configuration.79Remove the specified profiles from the system configuration.
73.B pam\-auth\-update \-\-remove80.B pam\-auth\-update \-\-remove

Subscribers

People subscribed via source and target branches