Merge ~utkarsh/ubuntu/+source/libpam-mount:lp1891552-fix-segfault into ubuntu/+source/libpam-mount:ubuntu/focal-devel

[Utkarsh Gupta]

Hello,

This MP intends to fix the segfault, as reported in LP: #1891552.

PPA at https://launchpad.net/~utkarsh/+archive/ubuntu/experimental-dump/

Autopkgtest is passing and happy:
```
autopkgtest [20:28:49]: @@@@@@@@@@@@@@@@@@@@ summary
local-luks PASS
```

Requesting you to please review and sponsor the upload. Let me know if you have any questions. TIA! :)

[Christian Ehrhardt  (paelzer)]

Please add https://salsa.debian.org/debian/libpam-mount/-/merge_requests/3 for the test-fixes

IMHO we could do so on any release we SRU-touch, and once Debian merged it we will sync it on 21.10.

[Christian Ehrhardt  (paelzer)]

FYI - I've mentioned the autopkgtest fixes in the SRU template

[Christian Ehrhardt  (paelzer)]

Test fixes match what I have worked on +1 to that

[Christian Ehrhardt  (paelzer)]

I know you've taken the patch from Debian as-is but to have some references we could/should link to https://salsa.debian.org/debian/libpam-mount/-/commit/c166793d582048587a4091a6deed9824b535f4c8 ?

review: Needs Fixing

[Christian Ehrhardt  (paelzer)]

Other than that I found no issue, well done.

Once that bit is resolved (or you have other opinions about it to discuss) ping and I can sponsor.

[Utkarsh Gupta (utkarsh)]

Hello Christian,

Thanks for the review. I've added the commit reference in the commit message. Hope that works for you?

[Christian Ehrhardt  (paelzer)]

In the patch header actually, but no need to ping/pong for that - I've changed it on sponsoring with an added commit by me.

To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/libpam-mount
 * [new tag] upload/2.16-10ubuntu0.20.04.1 -> upload/2.16-10ubuntu0.20.04.1

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading libpam-mount_2.16-10ubuntu0.20.04.1.dsc: done.
  Uploading libpam-mount_2.16-10ubuntu0.20.04.1.debian.tar.xz: done.
  Uploading libpam-mount_2.16-10ubuntu0.20.04.1_source.buildinfo: done.
  Uploading libpam-mount_2.16-10ubuntu0.20.04.1_source.changes: done.
Successfully uploaded packages.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index f207f49..2e70d62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+libpam-mount (2.16-10ubuntu0.20.04.1) focal; urgency=medium
+
+  [ Utkarsh Gupta ]
+  * Fix segmentation fault in libpcre2-8-0 when using regex
+    in (cifs) volume. (LP: #1891552)
+    - d/p/0016-Port-to-pcre2.patch: Fix pcre2 patch.
+    Thanks to Jochen Sprickerhof for the patch.
+
+  [ Christian Ehrhardt ]
+  * d/t/local-luks: fix autopkgtests.
+
+ -- Utkarsh Gupta <[e-mail]>  Fri, 26 Mar 2021 20:02:14 +0530
+
 libpam-mount (2.16-10) unstable; urgency=medium
 
   [ Christian Ehrhardt ]
diff --git a/debian/control b/debian/control
index 1ba3c5f..6fbdc4c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: libpam-mount
 Section: admin
 Priority: optional
-Maintainer: Jochen Sprickerhof <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Jochen Sprickerhof <[e-mail]>
 Build-Depends:
  debhelper-compat (= 12),
  libblkid-dev,
diff --git a/debian/patches/0016-Port-to-pcre2.patch b/debian/patches/0016-Port-to-pcre2.patch
index a804429..b41a91b 100644
--- a/debian/patches/0016-Port-to-pcre2.patch
+++ b/debian/patches/0016-Port-to-pcre2.patch
@@ -44,7 +44,7 @@ index e86b05d..203e490 100644
  
  #
 diff --git a/src/rdconf1.c b/src/rdconf1.c
-index 6869d25..5b4f4f3 100644
+index b252aa0..68e4b2d 100644
 --- a/src/rdconf1.c
 +++ b/src/rdconf1.c
 @@ -21,7 +21,8 @@
@@ -68,7 +68,7 @@ index 6869d25..5b4f4f3 100644
 -	pcre *rd;
 +	unsigned int flags = PCRE2_DOLLAR_ENDONLY | PCRE2_DOTALL |
 +	                     PCRE2_NO_AUTO_CAPTURE;
-+	int errcode = NULL, ret;
++	int errcode = 0, ret;
 +	PCRE2_SIZE erroffset;
 +	pcre2_code_8 *rd;
 +	PCRE2_UCHAR buffer[256];
@@ -83,7 +83,7 @@ index 6869d25..5b4f4f3 100644
 -	} else if (rd == NULL) {
 -		l0g("pcre_compile failed: %s\n", strerror(errno));
 +		flags |= PCRE2_CASELESS;
-+	rd = pcre2_compile(pattern, PCRE2_ZERO_TERMINATED, flags, &errcode, &erroffset, NULL);
++	rd = pcre2_compile((PCRE2_SPTR)pattern, PCRE2_ZERO_TERMINATED, flags, &errcode, &erroffset, NULL);
 +	if (rd == NULL) {
 +		l0g("pcre2_compile failed: %s at offset %d\n", buffer, (int)erroffset);
  		return -1;
@@ -91,8 +91,8 @@ index 6869d25..5b4f4f3 100644
  
 -	ret = pcre_exec(rd, NULL, s, strlen(s), 0, 0, NULL, 0);
 -	if (ret == PCRE_ERROR_NOMATCH) {
-+	match_data = pcre2_match_data_create_from_pattern(pattern, NULL);
-+	ret = pcre2_match(rd, s, strlen(s), 0, 0, match_data, 0);
++	match_data = pcre2_match_data_create_from_pattern(rd, NULL);
++	ret = pcre2_match(rd, (PCRE2_SPTR)s, strlen(s), 0, 0, match_data, 0);
 +	if (ret == PCRE2_ERROR_NOMATCH) {
  		l0g("pcre_exec: no match\n");
  		ret = false;
diff --git a/debian/tests/local-luks b/debian/tests/local-luks
index 7ea2a8e..502c259 100644
--- a/debian/tests/local-luks
+++ b/debian/tests/local-luks
@@ -8,7 +8,7 @@ createluks()
     type=${2}
     tdir=$(mktemp --directory)
 
-    fallocate -l 8M "/tmp/disk-l${id}.img"
+    fallocate -l 32M "/tmp/disk-l${id}.img"
     cryptsetup luksFormat --batch-mode --verbose --force-password --key-file=/home/alice/alice.key --type "${type}" "/tmp/disk-l${id}.img"
     cryptsetup open --type "${type}" --batch-mode --verbose --key-file=/home/alice/alice.key "/tmp/disk-l${id}.img" "img-luks${id}"
     mkfs.ext4 -L "IMG-LUKS${id}" "/dev/mapper/img-luks${id}"
@@ -31,20 +31,24 @@ checkluks()
     # smoke tests the mount and if not working print debug from journal
     # shellcheck disable=SC2029
     ssh -o "StrictHostKeyChecking=no" -i test.key alice@localhost "ls -laF ~/img-luks${id}/testfile" || journalctl -xe -u ssh --no-pager
+    sleep 5s
 
     # make sure we are using an actual mount
     ssh -o "StrictHostKeyChecking=no" -i test.key alice@localhost "mount" | grep "img-luks${id}"
+    sleep 5s
 
     # compare data on encrypted disk via local login shell
     # ensure su from root (needs no PW) does not re-ask for a pass (gets it from ~alice/alice.key anyway)
-    sed -i -e 's/pam_mount.so$/pam_mount.so disable_interactive/' /etc/pam.d/common-auth
-    sed -i -e 's/pam_mount.so$/pam_mount.so disable_interactive/' /etc/pam.d/common-session
+    sed -i -e 's/pam_mount.so\s*$/pam_mount.so disable_interactive/' /etc/pam.d/common-auth
+    sed -i -e 's/pam_mount.so\s*$/pam_mount.so disable_interactive/' /etc/pam.d/common-session
     su --login --command "cat ~/img-luks${id}/testfile" alice > "luks${id}"
+    sleep 5s
     cmp expected "luks${id}"
 
-    # compare data on encrypted disk via ssh bsed login
+    # compare data on encrypted disk via ssh based login
     # shellcheck disable=SC2029
     ssh -o "StrictHostKeyChecking=no" -i test.key alice@localhost "cat ~/img-luks${id}/testfile" > "luks${id}"
+    sleep 5s
     cmp expected "luks${id}"
 
     # restore configuration