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

Local autopkgtest results:

autopkgtest [14:40:00]: @@@@@@@@@@@@@@@@@@@@ summary
default-psql PASS
run-testsuite PASS

[Sergio Durigan Junior (sergiodj)]

Thanks, Athos.

LGTM. I verified that the new package fixes the issue. Also, I'm happy that Myon accepted your fix into Debian already.

+1

review: Approve

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

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

review: Approve

[Athos Ribeiro (athos-ribeiro)]

Thanks, Sergio!

Uploaded

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

diff --git a/PgCommon.pm b/PgCommon.pm
index 783aa4c..e51d89e 100644
--- a/PgCommon.pm
+++ b/PgCommon.pm
@@ -340,8 +340,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 dbdbe2c..2e74f93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+postgresql-common (247ubuntu1) lunar; urgency=medium
+
+  * Fix set_conffile_value comment parsing regular expression. (LP: #2007794)
+
+ -- Athos Ribeiro <[e-mail]>  Thu, 09 Mar 2023 11:44:03 -0300
+
 postgresql-common (247) unstable; urgency=medium
 
   [ Christoph Berg ]
diff --git a/debian/control b/debian/control
index 1497395..29cc456 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: postgresql-common
 Section: database
 Priority: optional
-Maintainer: Debian PostgreSQL Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian PostgreSQL Maintainers <[e-mail]>
 Uploaders:
  Martin Pitt <[e-mail]>,
  Christoph Berg <[e-mail]>,
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