Merge ~athos-ribeiro/ubuntu/+source/postgresql-common:fix-set-conffile-regex-bionic into ubuntu/+source/postgresql-common:ubuntu/bionic-devel

[Athos Ribeiro]

pg_conftool mistakes regular comments starting with a configuration option for actual commented configuration options.

While the issue does not impact any software features or its usability, it may lead to the deletion of useful comments or documentation in configuration files.

See LP: #2007794 for further reference.

PPA: https://launchpad.net/~athos-ribeiro/+archive/ubuntu/pg-fix-config-regex/+packages

DEP8 test results:

* Results:
  - postgresql-common/190ubuntu0.2
    + ✅ postgresql-common on bionic for amd64 @ 11.04.23 12:31:58 Log️ 🗒️
    + ✅ postgresql-common on bionic for arm64 @ 11.04.23 00:12:07 Log️ 🗒️
    + ✅ postgresql-common on bionic for armhf @ 11.04.23 00:11:26 Log️ 🗒️
    + ✅ postgresql-common on bionic for i386 @ 11.04.23 00:14:50 Log️ 🗒️
    + ✅ postgresql-common on bionic for ppc64el @ 11.04.23 00:15:22 Log️ 🗒️
    + ✅ postgresql-common on bionic for s390x @ 11.04.23 00:31:51 Log️ 🗒️

There was an amd64 failure on the first run, which seemed to be unrelated to the change (flakiness).

[Bryce Harrington (bryce)]

I had a bug in the implementation for --release in ppa-dev-tools that was preventing me from seeing the results, but after fixing it

* Triggers:
  - Source postgresql-common/190ubuntu0.2: Published
    + Trigger basic @amd64♻️ Trigger all-proposed @amd64💍
    + Trigger basic @arm64♻️ Trigger all-proposed @arm64💍
    + Trigger basic @armhf♻️ Trigger all-proposed @armhf💍
    + Trigger basic @i386♻️ Trigger all-proposed @i386💍
    + Trigger basic @ppc64el♻️ Trigger all-proposed @ppc64el💍
    + Trigger basic @s390x♻️ Trigger all-proposed @s390x💍
* Results:
  - postgresql-common/190ubuntu0.2
    + ❌ postgresql-common on bionic for amd64 @ 11.04.23 00:16:07 Log️ 🗒️
      • default-psql FAIL 🟥
    + ✅ postgresql-common on bionic for amd64 @ 11.04.23 12:31:58 Log️ 🗒️
    + ✅ postgresql-common on bionic for arm64 @ 11.04.23 00:12:07 Log️ 🗒️
    + ✅ postgresql-common on bionic for armhf @ 11.04.23 00:11:26 Log️ 🗒️
    + ✅ postgresql-common on bionic for i386 @ 11.04.23 00:14:50 Log️ 🗒️
    + ✅ postgresql-common on bionic for ppc64el @ 11.04.23 00:15:22 Log️ 🗒️
    + ✅ postgresql-common on bionic for s390x @ 11.04.23 00:31:51 Log️ 🗒️
* Running: (none)
* Waiting: (none)

Looks like the first amd64 test ran and it passed on retrigger.

Otherwise, same changes as the kinetic branch, so see its MP for details.

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: athos-ribeiro, bryce
Uploaders: athos-ribeiro, bryce
MP auto-approved

review: Approve

[Athos Ribeiro (athos-ribeiro)]

Thanks Bryce!

Uploaded:

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading postgresql-common_190ubuntu0.2.dsc: done.
  Uploading postgresql-common_190ubuntu0.2.tar.xz: done.
  Uploading postgresql-common_190ubuntu0.2_source.buildinfo: done.
  Uploading postgresql-common_190ubuntu0.2_source.changes: done.
Successfully uploaded packages.

[Andreas Hasenack (ahasenack)]

This was rejected[1] on 2023-05-03:

Rejected on 2023-05-30 by Łukasz Zemczak
18.04 is going EOL (ESM), please re-submit to ESM if needed

As a consequence, it's also not imported into git-ubuntu. Let's mark this MP as rejected then to reflect the current status, and to get it off our pending reviews list.

1. https://launchpad.net/ubuntu/bionic/+queue?queue_state=4&queue_text=postgresql-common

Unmerged commits

acb4ced... by Athos Ribeiro on 2023-04-10

Update changelog

c698e67... by Athos Ribeiro on 2023-03-09

    - Fix set_conffile_value comment parsing regular expression. (LP: #2007794)

diff --git a/PgCommon.pm b/PgCommon.pm
index 7082c4a..dbe5b15 100644
--- a/PgCommon.pm
+++ b/PgCommon.pm
@@ -236,8 +236,8 @@ sub set_conffile_value {
     # of appending
     if (!$found) {
 	for (my $i=0; $i <= $#lines; ++$i) {
-	    if ($lines[$i] =~ /^\s*#\s*($key)(\s*(?:=|\s)\s*)\w+\b((?:\s*#.*)?)/i or
-		$lines[$i] =~ /^\s*#\s*($key)(\s*(?:=|\s)\s*)'[^']*'((?:\s*#.*)?)/i) {
+	    if ($lines[$i] =~ /^\s*#\s*($key)(\s*(?:=|\s)\s*)\w+\b((?:\s*#.*)?)$/i or
+		$lines[$i] =~ /^\s*#\s*($key)(\s*(?:=|\s)\s*)'[^']*'((?:\s*#.*)?)$/i) {
 		$lines[$i] = "$1$2$value$3\n";
 		$found = 1;
 		last;
diff --git a/debian/changelog b/debian/changelog
index ca920b1..3cbe6b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+postgresql-common (190ubuntu0.2) bionic; urgency=medium
+
+  * Fix set_conffile_value comment parsing regular expression. (LP: #2007794)
+
+ -- Athos Ribeiro <[e-mail]>  Mon, 10 Apr 2023 18:37:06 -0300
+
 postgresql-common (190ubuntu0.1) bionic-security; urgency=medium
 
   * SECURITY UPDATE: Privilege Escalation via Arbitrary Directory Creation
diff --git a/t/005_PgCommon.t b/t/005_PgCommon.t
index fef5330..8bb09e8 100644
--- a/t/005_PgCommon.t
+++ b/t/005_PgCommon.t
@@ -102,6 +102,9 @@ print F <<EOF;
 
 # Commented_Int = 12
 # commented_str='foobar'
+# commented_bool off
+# commented_bool2 off # comment
+# commented_bool3 just a comment
 
 #intval = 1
 Intval = 42
@@ -191,6 +194,9 @@ is_deeply (\%conf, {
 # test set_conf_value()
 PgCommon::set_conf_value '8.4', 'test', 'foo.conf', 'commented_int', '24';
 PgCommon::set_conf_value '8.4', 'test', 'foo.conf', 'commented_str', 'new foo';
+PgCommon::set_conf_value '8.4', 'test', 'foo.conf', 'commented_bool', 'on';
+PgCommon::set_conf_value '8.4', 'test', 'foo.conf', 'commented_bool2', 'on';
+PgCommon::set_conf_value '8.4', 'test', 'foo.conf', 'commented_bool3', 'on';
 PgCommon::set_conf_value '8.4', 'test', 'foo.conf', 'intval', '39';
 PgCommon::set_conf_value '8.4', 'test', 'foo.conf', 'cintval', '5';
 PgCommon::set_conf_value '8.4', 'test', 'foo.conf', 'strval', 'Howdy';
@@ -207,6 +213,9 @@ is ($conf, <<EOF, 'set_conf_value');
 
 Commented_Int = 24
 commented_str='new foo'
+commented_bool on
+commented_bool2 on # comment
+# commented_bool3 just a comment
 
 #intval = 1
 Intval = 39
@@ -219,6 +228,7 @@ cemptystr = '' # moo!
 #testpath = '/bin/bad'
 testpath = '/bin/new'
 QuoteStr = 'test ! -f \\'/tmp/%f\\' && echo \\'yes\\''
+commented_bool3 = on
 newval = 'NEW!'
 include_dir = 'conf.d'
 EOF
@@ -237,6 +247,9 @@ is ($conf, <<EOF, 'disable_conf_value');
 
 Commented_Int = 24
 commented_str='new foo'
+commented_bool on
+commented_bool2 on # comment
+# commented_bool3 just a comment
 
 #intval = 1
 #Intval = 39 #ints are out of fashion
@@ -249,6 +262,7 @@ cemptystr = '' # moo!
 #testpath = '/bin/bad'
 #testpath = '/bin/new' #now 2 comments
 QuoteStr = 'test ! -f \\'/tmp/%f\\' && echo \\'yes\\''
+commented_bool3 = on
 newval = 'NEW!'
 include_dir = 'conf.d'
 EOF
@@ -267,6 +281,9 @@ is ($conf, <<EOF, 'replace_conf_value');
 
 Commented_Int = 24
 commented_str='new foo'
+commented_bool on
+commented_bool2 on # comment
+# commented_bool3 just a comment
 
 #intval = 1
 #Intval = 39 #ints are out of fashion
@@ -280,6 +297,7 @@ cemptystr = '' # moo!
 #testpath = '/bin/bad'
 #testpath = '/bin/new' #now 2 comments
 QuoteStr = 'test ! -f \\'/tmp/%f\\' && echo \\'yes\\''
+commented_bool3 = on
 newval = 'NEW!'
 include_dir = 'conf.d'
 EOF