Merge ~athos-ribeiro/ubuntu/+source/postgresql-common:fix-set-conffile-regex-focal into ubuntu/+source/postgresql-common:ubuntu/focal-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:

  - postgresql-common/214ubuntu0.2
    + ✅ postgresql-common on focal for amd64 @ 11.04.23 00:24:15 Log️ 🗒️
    + ✅ postgresql-common on focal for arm64 @ 11.04.23 00:38:32 Log️ 🗒️
    + ✅ postgresql-common on focal for armhf @ 11.04.23 00:22:30 Log️ 🗒️
    + ❌ postgresql-common on focal for i386 @ 11.04.23 00:29:50 Log️ 🗒️
      • default-psql FAIL 🟥
      • run-testsuite FAIL 🟥
    + ✅ postgresql-common on focal for ppc64el @ 11.04.23 00:26:19 Log️ 🗒️
    + ✅ postgresql-common on focal for s390x @ 11.04.23 00:49:50 Log️ 🗒️

The i386 failures are not regressions, as shown in https://autopkgtest.ubuntu.com/packages/p/postgresql-common/focal/i386

[Bryce Harrington (bryce)]

Confirmed test results for focal. See karmic MP for further review comments.

  - postgresql-common/214ubuntu0.2
    + ✅ postgresql-common on focal for amd64 @ 11.04.23 00:24:15 Log️ 🗒️
    + ✅ postgresql-common on focal for arm64 @ 11.04.23 00:38:32 Log️ 🗒️
    + ✅ postgresql-common on focal for armhf @ 11.04.23 00:22:30 Log️ 🗒️
    + ❌ postgresql-common on focal for i386 @ 11.04.23 00:29:50 Log️ 🗒️
      • default-psql FAIL 🟥
      • run-testsuite FAIL 🟥
    + ✅ postgresql-common on focal for ppc64el @ 11.04.23 00:26:19 Log️ 🗒️
    + ✅ postgresql-common on focal for s390x @ 11.04.23 00:49:50 Log️ 🗒️

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_214ubuntu0.2.dsc: done.
  Uploading postgresql-common_214ubuntu0.2.tar.xz: done.
  Uploading postgresql-common_214ubuntu0.2_source.buildinfo: done.
  Uploading postgresql-common_214ubuntu0.2_source.changes: done.
Successfully uploaded packages.

[Andreas Hasenack (ahasenack)]

214ubuntu0.2 was never published, this link is a 404:

  https://launchpad.net/ubuntu/+source/postgresql-common/214ubuntu0.2

I see a rejection[1] notice;

  Rejected on 2023-05-19 by Steve Langasek
  rejected per uploader

The ubuntu/focal-devel git-ubuntu branch also does not have this version. Marking the MP as rejected.

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

Unmerged commits

7f6a32f... by Athos Ribeiro on 2023-04-10

Update changelog

fd7a286... 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 2b7877d..ab6e8a2 100644
--- a/PgCommon.pm
+++ b/PgCommon.pm
@@ -255,8 +255,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 53c844c..d0e7242 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+postgresql-common (214ubuntu0.2) focal; urgency=medium
+
+  * Fix set_conffile_value comment parsing regular expression. (LP: #2007794)
+
+ -- Athos Ribeiro <[e-mail]>  Mon, 10 Apr 2023 18:35:10 -0300
+
 postgresql-common (214ubuntu0.1) focal-security; urgency=medium
 
   [ Christoph Berg ]
diff --git a/t/005_PgCommon.t b/t/005_PgCommon.t
index 22dcca8..e1bc337 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
@@ -194,6 +197,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';
@@ -210,6 +216,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
@@ -223,6 +232,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
@@ -241,6 +251,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
@@ -254,6 +267,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
@@ -272,6 +286,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
@@ -286,6 +303,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