Merge ~sergiodj/ubuntu/+source/pam:etc-env-no-newline into ubuntu/+source/pam:ubuntu/devel

[Sergio Durigan Junior]

This MP fixes bug #1953201.

This was a fun problem to investigate. In the end, upstream already has a bug report and a fix for it, so it's just a matter of backporting the right patch here, which is also very simple.

There's a PPA with the proposed changes here:

https://launchpad.net/~sergiodj/+archive/ubuntu/pam-bugfix/+packages

[Sergio Durigan Junior (sergiodj)]

Requesting a review from Simon because he's the last person who did the merge from Debian.

[Christian Ehrhardt  (paelzer)]

I agree to let Simon have a look as last merge-person, but I wanted to mention that I checked and to me formally all LGTM.

[Simon Chopin (schopin)]

LGTM, not too intrusive.

However, I believe pam is packaged in this repository: https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/pam/+git/pam

I'll just rewrite the commits against that repository and push it there.
Unless Steve wishes us to start adopting the git-ubuntu workflow for pam?

review: Approve

[Sergio Durigan Junior (sergiodj)]

On Monday, December 06 2021, Simon Chopin wrote:

> Review: Approve
>
> LGTM, not too intrusive.
>
> However, I believe pam is packaged in this repository: https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/pam/+git/pam

Thanks for the review, Christian and Simon.

I didn't PAM is packaged elsewhere. Interesting.

> I'll just rewrite the commits against that repository and push it there.
> Unless Steve wishes us to start adopting the git-ubuntu workflow for pam?

No problem for me; feel free to go ahead.

Thanks,

--
Sergio
GPG key ID: E92F D0B3 6B14 F1F4 D8E0 EB2F 106D A1C8 C3CB BF14

[Steve Langasek (vorlon)]

On Mon, Dec 06, 2021 at 04:00:47PM -0000, Sergio Durigan Junior wrote:
> Thanks for the review, Christian and Simon.

> I didn't PAM is packaged elsewhere. Interesting.

$ apt-cache showsrc pam | grep Vcs
Vcs-Git: https://code.launchpad.net/~ubuntu-core-dev/ubuntu/+source/pam/+git/pam
Debian-Vcs-Browser: https://salsa.debian.org/vorlon/pam
Debian-Vcs-Git: https://salsa.debian.org/vorlon/pam.git
$

:)

[Sergio Durigan Junior (sergiodj)]

On Monday, December 06 2021, Steve Langasek wrote:

> On Mon, Dec 06, 2021 at 04:00:47PM -0000, Sergio Durigan Junior wrote:
>> Thanks for the review, Christian and Simon.
>
>> I didn't PAM is packaged elsewhere. Interesting.
>
> $ apt-cache showsrc pam | grep Vcs
> Vcs-Git: https://code.launchpad.net/~ubuntu-core-dev/ubuntu/+source/pam/+git/pam
> Debian-Vcs-Browser: https://salsa.debian.org/vorlon/pam
> Debian-Vcs-Git: https://salsa.debian.org/vorlon/pam.git
> $

Noted, thanks.

--
Sergio
GPG key ID: E92F D0B3 6B14 F1F4 D8E0 EB2F 106D A1C8 C3CB BF14

[Simon Chopin (schopin)]

As it turns out, I don't have permissions to push on the other repo. I've pushed the relevant commit to git+ssh://git.launchpad.net/~schopin/ubuntu/+source/pam/+git/pam branch eof-fix, if Steve has the time to pick it up?

[Sergio Durigan Junior (sergiodj)]

On Monday, December 06 2021, Sergio Durigan Junior wrote:

> On Monday, December 06 2021, Steve Langasek wrote:
>
>> On Mon, Dec 06, 2021 at 04:00:47PM -0000, Sergio Durigan Junior wrote:
>>> Thanks for the review, Christian and Simon.
>>
>>> I didn't PAM is packaged elsewhere. Interesting.
>>
>> $ apt-cache showsrc pam | grep Vcs
>> Vcs-Git: https://code.launchpad.net/~ubuntu-core-dev/ubuntu/+source/pam/+git/pam
>> Debian-Vcs-Browser: https://salsa.debian.org/vorlon/pam
>> Debian-Vcs-Git: https://salsa.debian.org/vorlon/pam.git
>> $
>
> Noted, thanks.

FWIW, most Ubuntu packages that I touched don't use the Vcs-* fields for
anything useful.

--
Sergio
GPG key ID: E92F D0B3 6B14 F1F4 D8E0 EB2F 106D A1C8 C3CB BF14

[Christian Ehrhardt  (paelzer)]

 pam | 1.4.0-10ubuntu2 | jammy | source

Completed, please set the MR to merged (plenty of pings today as I can't do that anymore nowadays :-/ )

diff --git a/debian/changelog b/debian/changelog
index 28c8ec0..a83147a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+pam (1.4.0-10ubuntu2) jammy; urgency=medium
+
+  * d/p/pam_env-allow-environment-files-without-EOL-at-EOF.patch:
+    Allow /etc/environment files without EOL at EOF.  In other words,
+    allow files without a newline at the end. (LP: #1953201)
+
+ -- Sergio Durigan Junior <[e-mail]>  Sat, 04 Dec 2021 13:53:28 -0500
+
 pam (1.4.0-10ubuntu1) jammy; urgency=medium
 
   * Merge from Debian unstable (LP: #1916509). Remaining changes:
diff --git a/debian/patches-applied/pam_env-allow-environment-files-without-EOL-at-EOF.patch b/debian/patches-applied/pam_env-allow-environment-files-without-EOL-at-EOF.patch
new file mode 100644
index 0000000..340e4a7
--- /dev/null
+++ b/debian/patches-applied/pam_env-allow-environment-files-without-EOL-at-EOF.patch
@@ -0,0 +1,30 @@
+From: Tomas Mraz <[e-mail]>
+Date: Wed, 4 Nov 2020 09:37:36 +0100
+Subject: pam_env: allow environment files without EOL at EOF
+
+Fixes #263
+
+* modules/pam_env/pam_env.c (_assemble_line): Do not error out if at feof()
+
+Origin: upstream, https://github.com/linux-pam/linux-pam/commit/12824dd648b0668968231044ed805d1f3b212d7e
+Applied-Upstream: 1.5.0
+Bug: https://github.com/linux-pam/linux-pam/issues/263
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/pam/+bug/1953201
+Reviewed-By: Sergio Durigan Junior <[e-mail]>
+---
+ modules/pam_env/pam_env.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/pam_env/pam_env.c b/modules/pam_env/pam_env.c
+index 79d4372..4aa3777 100644
+--- a/modules/pam_env/pam_env.c
++++ b/modules/pam_env/pam_env.c
+@@ -311,7 +311,7 @@ static int _assemble_line(FILE *f, char *buffer, int buf_len)
+ 	    D(("_assemble_line: corrupted or binary file"));
+ 	    return -1;
+ 	}
+-	if (p[strlen(p)-1] != '\n') {
++	if (p[strlen(p)-1] != '\n' && !feof(f)) {
+ 	    D(("_assemble_line: line too long"));
+ 	    return -1;
+ 	}
diff --git a/debian/patches-applied/series b/debian/patches-applied/series
index 97761f4..ebf57fb 100644
--- a/debian/patches-applied/series
+++ b/debian/patches-applied/series
@@ -31,3 +31,5 @@ pam_unix_initialize_daysleft
 pam_faillock_create_directory
 pam_mkhomedir_stat_before_opendir
 pam_unix_avoid_checksalt
+
+pam_env-allow-environment-files-without-EOL-at-EOF.patch