Merge ~dviererbe/ubuntu/+source/plocate:merge-lp2029150-mantic into ubuntu/+source/plocate:debian/sid

[Dominik Viererbe]

[Dominik Viererbe (dviererbe)]

- The proposed merge candidate built successful in a PPA (ppa:dviererbe/dviererbe-ppa) [1].
- All tests pass, except for i386 which never succeeded before (see [8]). Test Logs:
  - amd64 [2]
  - arm64 [3]
  - armhf [4]
  - i386 [5]
  - ppc64el [6]
  - s390x [7]
- I tested upgrading from the previous version in a local lxc container.

[1] https://launchpad.net/~dviererbe/+archive/ubuntu/dviererbe-ppa
[2] https://autopkgtest.ubuntu.com/results/autopkgtest-mantic-dviererbe-dviererbe-ppa/mantic/amd64/p/plocate/20230801_071222_2812b@/log.gz
[3] https://autopkgtest.ubuntu.com/results/autopkgtest-mantic-dviererbe-dviererbe-ppa/mantic/arm64/p/plocate/20230801_072110_727fc@/log.gz
[4] https://autopkgtest.ubuntu.com/results/autopkgtest-mantic-dviererbe-dviererbe-ppa/mantic/armhf/p/plocate/20230801_071210_ecdb8@/log.gz
[5] https://autopkgtest.ubuntu.com/results/autopkgtest-mantic-dviererbe-dviererbe-ppa/mantic/i386/p/plocate/20230801_073124_2fbcb@/log.gz
[6] https://autopkgtest.ubuntu.com/results/autopkgtest-mantic-dviererbe-dviererbe-ppa/mantic/ppc64el/p/plocate/20230801_071033_dc339@/log.gz
[7] https://autopkgtest.ubuntu.com/results/autopkgtest-mantic-dviererbe-dviererbe-ppa/mantic/s390x/p/plocate/20230801_070931_5fc2a@/log.gz
[8] https://autopkgtest.ubuntu.com/packages/plocate

[Graham Inggs (ginggs)]

Uploaded, thanks

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 57c3215..ddcfe1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+plocate (1.1.19-2ubuntu1) mantic; urgency=medium
+
+  * Merge with Debian unstable (LP: #2029150). Remaining changes:
+    - Adjust handling of db generation on package install to ensure db
+      generation even in chroots, print a message before, and ensure db
+      generation finishes before the postinst returns.
+    - Adjust dh_systemd handling to match the above.
+    - d/p/locate-add-ignore-spaces-option-to-ignore-word-separ.patch: port
+      support for the --ignore-spaces option from mlocate.
+
+ -- Dominik Viererbe <[e-mail]>  Mon, 31 Jul 2023 23:04:46 +0300
+
 plocate (1.1.19-2) unstable; urgency=medium
 
   * Remove compatibility cruft for upgrading from pre-bullseye.
@@ -10,18 +22,56 @@ plocate (1.1.19-2) unstable; urgency=medium
 
  -- Steinar H. Gunderson <[e-mail]>  Tue, 04 Jul 2023 18:24:02 +0200
 
+plocate (1.1.19-1ubuntu1) mantic; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Adjust handling of db generation on package install to ensure db
+      generation even in chroots, print a message before, and ensure db
+      generation finishes before the postinst returns.
+    - Adjust dh_systemd handling to match the above.
+    - d/p/locate-add-ignore-spaces-option-to-ignore-word-separ.patch: port
+      support for the --ignore-spaces option from mlocate.
+
+ -- Steve Langasek <[e-mail]>  Thu, 15 Jun 2023 19:10:12 -0700
+
 plocate (1.1.19-1) unstable; urgency=medium
 
   * New upstream release.
 
  -- Steinar H. Gunderson <[e-mail]>  Fri, 09 Jun 2023 09:36:32 +0200
 
+plocate (1.1.18-1ubuntu1) lunar; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Adjust handling of db generation on package install to match the
+      previous mlocate behavior, which ensured db generation even in
+      chroots, printed a message before, and ensured db generation finished
+      before the postinst returned.
+    - Adjust dh_systemd handling to match the above.
+    - d/p/locate-add-ignore-spaces-option-to-ignore-word-separ.patch: port
+      support for the --ignore-spaces option from mlocate.
+
+ -- Steve Langasek <[e-mail]>  Mon, 06 Feb 2023 16:09:29 -0800
+
 plocate (1.1.18-1) unstable; urgency=medium
 
   * New upstream release.
 
  -- Steinar H. Gunderson <[e-mail]>  Sat, 28 Jan 2023 21:46:26 +0100
 
+plocate (1.1.17-2ubuntu1) lunar; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Adjust handling of db generation on package install to match the
+      previous mlocate behavior, which ensured db generation even in
+      chroots, printed a message before, and ensured db generation finished
+      before the postinst returned.
+    - Adjust dh_systemd handling to match the above.
+    - d/p/locate-add-ignore-spaces-option-to-ignore-word-separ.patch: port
+      support for the --ignore-spaces option from mlocate.
+
+ -- Steve Langasek <[e-mail]>  Tue, 24 Jan 2023 13:21:44 -0800
+
 plocate (1.1.17-2) unstable; urgency=medium
 
   * Adjust the autopkgtest to deal with the return value changes in 1.1.17.
@@ -36,6 +86,23 @@ plocate (1.1.17-1) unstable; urgency=medium
 
  -- Steinar H. Gunderson <[e-mail]>  Mon, 21 Nov 2022 18:27:45 +0100
 
+plocate (1.1.16-1ubuntu1) kinetic; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Adjust handling of db generation on package install to match the
+      previous mlocate behavior, which ensured db generation even in
+      chroots, printed a message before, and ensured db generation finished
+      before the postinst returned.
+    - Adjust dh_systemd handling to match the above.
+    - d/p/locate-add-ignore-spaces-option-to-ignore-word-separ.patch: port
+      support for the --ignore-spaces option from mlocate.
+  * Dropped changes, included in Debian:
+    - Add /home/.ecryptfs and /var/lib/schroot to PRUNEPATHS.
+    - Add fuse.cryfs and fuse.encfs to PRUNEFS.
+    - Remove debian/source/include-binaries file.
+
+ -- Steve Langasek <[e-mail]>  Fri, 24 Jun 2022 09:50:11 -0700
+
 plocate (1.1.16-1) unstable; urgency=medium
 
   * New upstream release.
@@ -53,6 +120,31 @@ plocate (1.1.15-2) unstable; urgency=medium
 
  -- Steinar H. Gunderson <[e-mail]>  Wed, 02 Mar 2022 20:52:02 +0100
 
+plocate (1.1.15-1ubuntu2) jammy; urgency=medium
+
+  * Remove debian/source/include-binaries file. (LP: #1961266)
+
+ -- Nick Rosbrook <[e-mail]>  Thu, 17 Feb 2022 09:26:51 -0500
+
+plocate (1.1.15-1ubuntu1) jammy; urgency=medium
+
+  * Port changes over from mlocate so that we can move to plocate in Ubuntu.
+  * Add /home/.ecryptfs and /var/lib/schroot to PRUNEPATHS.
+  * Add fuse.cryfs and fuse.encfs to PRUNEFS.
+  * Adjust handling of db generation on package install to match the
+    previous mlocate behavior, which ensured db generation even in chroots,
+    printed a message before, and ensured db generation finished before the
+    postinst returned.
+  * Adjust dh_systemd handling to match the above.
+  * Drops support for the --transliterate option, which requires significant
+    porting of functionality from C to the independent plocate C++ codebase.
+  * d/p/locate-add-ignore-spaces-option-to-ignore-word-separ.patch: port
+    support for the --ignore-spaces option from mlocate.
+  * All other patches and packaging delta for mlocate are obsolete for
+    plocate.
+
+ -- Steve Langasek <[e-mail]>  Thu, 10 Feb 2022 00:45:06 +0000
+
 plocate (1.1.15-1) unstable; urgency=medium
 
   * New upstream release.
@@ -389,3 +481,4 @@ plocate (1.0.0-1) unstable; urgency=medium
   * Initial release.
 
  -- Steinar H. Gunderson <[e-mail]>  Sun, 11 Oct 2020 21:24:13 +0200
+
diff --git a/debian/control b/debian/control
index 8ecf3be..2147b08 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: plocate
 Section: utils
 Priority: optional
-Maintainer: Steinar H. Gunderson <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Steinar H. Gunderson <[e-mail]>
 # liburing-dev is technically optional, but strongly recommended.
 Build-Depends: debhelper-compat (= 13), liburing-dev [linux-any], libzstd-dev, meson, ninja-build, pkg-config, systemd [linux-any]
 Standards-Version: 4.5.0
diff --git a/debian/patches/locate-add-ignore-spaces-option-to-ignore-word-separ.patch b/debian/patches/locate-add-ignore-spaces-option-to-ignore-word-separ.patch
 new file mode 100644
index 0000000..2774959
--- /dev/null
+++ b/debian/patches/locate-add-ignore-spaces-option-to-ignore-word-separ.patch
@@ -0,0 +1,173 @@
+Description: locate: add --ignore-spaces option to ignore word separators
+ It allows to locate files ignoring separators such as punctuation and
+ spaces, so searching for "foo-bar" will match "foo bar", "foo_bar" or
+ "foo?bar".
+ .
+ This is not compatible with regex.
+ .
+ Ported from https://pagure.io/mlocate/pull-request/42
+Author: Steve Langasek <[e-mail]>
+Last-Update: 2022-02-09
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/mlocate/+bug/1752148
+
+Index: plocate-1.1.15/plocate.cpp
+===================================================================
+--- plocate-1.1.15.orig/plocate.cpp
++++ plocate-1.1.15/plocate.cpp
+@@ -47,6 +47,7 @@
+ using namespace std::chrono;
+ 
+ bool ignore_case = false;
++bool ignore_spaces = false;
+ bool only_count = false;
+ bool print_nul = false;
+ bool use_debug = false;
+@@ -171,6 +172,49 @@
+ 	}
+ }
+ 
++/* Remove repeated punctuation or spaces from string and replace
++   them with a space */
++static char *
++collapse_string_separators (const char *str, bool is_pattern)
++{
++	size_t strippedlen = 0;
++	size_t i;
++	char *outbuf;
++	bool first = false;
++	bool changed = false;
++
++	outbuf = (char *) malloc (strlen (str) + 1);
++
++	for (i = 0; str[i]; i++) {
++		char cnt = str[i];
++
++		if (isspace (cnt) || (ispunct (cnt) && cnt != '@' &&
++		    (!is_pattern || strchr ("*?[\\]", cnt) == NULL)))
++		{
++			if (first) {
++				changed = true;
++				continue;
++			}
++			if (cnt != ' ') {
++				cnt = ' ';
++				changed = true;
++			}
++			first = true;
++		} else
++			first = false;
++
++		outbuf[strippedlen++] = cnt;
++	}
++
++	if (!changed) {
++		free (outbuf);
++		return NULL;
++	}
++
++	outbuf[strippedlen] = '\0';
++	return outbuf;
++}
++
+ void scan_file_block(const vector<Needle> &needles, string_view compressed,
+                      IOUringEngine *engine, AccessRXCache *access_rx_cache, uint64_t seq, ResultReceiver *serializer,
+                      atomic<uint64_t> *matched)
+@@ -223,6 +267,7 @@
+ 	     filename != block.data() + block.size();
+ 	     filename += strlen(filename) + 1) {
+ 		const char *haystack = filename;
++		char *altered_match = NULL;
+ 		if (match_basename) {
+ 			haystack = strrchr(filename, '/');
+ 			if (haystack == nullptr) {
+@@ -232,6 +277,12 @@
+ 			}
+ 		}
+ 
++		if (ignore_spaces)
++			altered_match = collapse_string_separators(haystack,
++			                                           false);
++		if (altered_match)
++			haystack = altered_match;
++
+ 		bool found = true;
+ 		for (const Needle &needle : needles) {
+ 			if (!matches(needle, haystack)) {
+@@ -246,6 +297,8 @@
+ 			}
+ 			pending_candidate = filename;
+ 		}
++		if (altered_match)
++			free(altered_match);
+ 	}
+ 	if (pending_candidate == nullptr) {
+ 		serializer->print(seq << 32, 1ULL << 32, "");
+@@ -842,6 +895,7 @@
+ 		{ "database", required_argument, 0, 'd' },
+ 		{ "existing", no_argument, 0, 'e' },
+ 		{ "ignore-case", no_argument, 0, 'i' },
++                { "ignore-spaces", no_argument, 0, 'p' },
+ 		{ "limit", required_argument, 0, 'l' },
+ 		{ "literal", no_argument, 0, 'N' },
+ 		{ "null", no_argument, 0, '0' },
+@@ -858,7 +912,7 @@
+ 	setlocale(LC_ALL, "");
+ 	for (;;) {
+ 		int option_index = 0;
+-		int c = getopt_long(argc, argv, "Abcd:ehil:n:N0rwVD", long_options, &option_index);
++		int c = getopt_long(argc, argv, "Abcd:ehipl:n:N0rwVD", long_options, &option_index);
+ 		if (c == -1) {
+ 			break;
+ 		}
+@@ -884,6 +938,9 @@
+ 		case 'i':
+ 			ignore_case = true;
+ 			break;
++		case 'p':
++			ignore_spaces = true;
++			break;
+ 		case 'l':
+ 		case 'n':
+ 			limit_matches = limit_left = atoll(optarg);
+@@ -934,6 +991,11 @@
+ 		}
+ 	}
+ 
++	if (patterns_are_regex && ignore_spaces) {
++		perror("ignore-spaces is not supported when using regexp");
++		exit(EXIT_FAILURE);
++	}
++
+ 	if (!print_nul) {
+ 		stdout_is_tty = isatty(1);
+ 	}
+@@ -968,6 +1030,14 @@
+ 			needle.type = Needle::STRSTR;
+ 			needle.str = unescape_glob_to_plain_string(needle.str);
+ 		}
++
++		if (ignore_spaces) {
++			char *pattern = collapse_string_separators(needle.str.c_str(),
++                                                                   true);
++                        if (pattern)
++                            needle.str = pattern;
++		}
++
+ 		needles.push_back(move(needle));
+ 	}
+ 	if (needles.empty()) {
+Index: plocate-1.1.15/plocate.1
+===================================================================
+--- plocate-1.1.15.orig/plocate.1
++++ plocate-1.1.15/plocate.1
+@@ -104,6 +104,10 @@
+ generate more candidates for searching the index.
+ 
+ .TP
++\fB\-p\fR, \fB\-\-ignore\-spaces\fR
++Ignore punctuation and spaces when matching patterns.
++
++.TP
+ \fB\-l\fR, \fB\-\-limit\fR \fILIMIT\fR
+ Stop searching after
+ .I LIMIT
diff --git a/debian/patches/series b/debian/patches/series
 new file mode 100644
index 0000000..7a363de
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+locate-add-ignore-spaces-option-to-ignore-word-separ.patch
diff --git a/debian/plocate.postinst b/debian/plocate.postinst
index 5728938..ad3b1f3 100644
--- a/debian/plocate.postinst
+++ b/debian/plocate.postinst
@@ -17,6 +17,16 @@ if [ "$1" = "configure" ]; then
     if ! dpkg-statoverride --list /usr/bin/plocate >/dev/null 2>&1; then
     	dpkg-statoverride --update --add root "$GROUP" 2755 /usr/bin/plocate 
     fi
+
+    if [ -z "$2" ] && ! [ -f /var/lib/plocate/plocate.db ]; then
+        echo -n "Initializing plocate database; this may take some time... "
+        NOCACHE=
+        if [ -x /usr/bin/nocache ]; then
+            NOCACHE="/usr/bin/nocache"
+        fi
+        $NOCACHE /usr/sbin/updatedb.plocate || true
+        echo "done"
+    fi
 fi
 
 
diff --git a/debian/rules b/debian/rules
index 8e8b766..c24f340 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,3 +5,6 @@
 
 override_dh_auto_configure:
 	dh_auto_configure -- -Dupdatedb_progname=updatedb.plocate
+
+override_dh_installsystemd:
+	dh_installsystemd --no-start