--- mlocate-0.26.orig/.gitignore +++ mlocate-0.26/.gitignore @@ -0,0 +1,8 @@ +/obj-* +/*-stamp + +/debian/tmp +/debian/files +/debian/mlocate +/debian/*.substvars +/debian/*.debhelper.log --- mlocate-0.26.orig/.hgignore +++ mlocate-0.26/.hgignore @@ -0,0 +1,29 @@ +.*~$ +^admin.* +^autom4te\.cache.* +^gnulib/lib.* +# Only gnulib-cache.m4 should be left +^gnulib/m4/([^g]|g[^n]).* +^gnulib/m4/gnulib-(common\.m4|comp\.m4|tool\.m4) +^m4.* +^po/.*\.gmo$ +^po/Makefile\.in\.in +^po/Makevars\.template$ +^po/Rules-quot$ +^po/boldquot\.sed$ +^po/en@boldquot\.header$ +^po/en@quot\.header$ +^po/insert-header\.sin$ +^po/quot\.sed$ +^po/remove-potcdate\.sin$ +^ABOUT-NLS$ +^INSTALL$ +^Makefile\.in$ +^aclocal\.m4$ +^configure$ +^src/config\.h\.in$ +^tests/package\.m4$ +^tests/testsuite$ + +^build.* +^p/.* --- mlocate-0.26.orig/.hgtags +++ mlocate-0.26/.hgtags @@ -0,0 +1,36 @@ +63925cac65c8369da83bc1800034d697e401ca23 mlocate-0.01 +c294530af1ad241859e876a63733b58677d676be mlocate-0.02 +534230c9812571afd5e77ab3f5e5752ef2d97968 mlocate-0.03 +423139f2e382f2de942306dd995e2af486a793ad mlocate-0.04 +257bc38d539f7ba478c2517b60c44719c114a375 mlocate-0.05 +4cec935b1875ff48155c18c6f513ea3acec1aa84 mlocate-0.06 +c3a9e26144edfbecb08b08a09b90666bc0a55c0b mlocate-0.07 +cedac157654197859adfc2e1f15f60cf84b6a448 mlocate-0.08 +fb60f3534a857174632fb216ee0bae2eec5e7455 mlocate-0.09 +8c67446f30995a77d78bab20d584b918a16f2131 mlocate-0.10 +eb61e089fe65c8d40458e4f10163eec4fdc5af4e mlocate-0.10 +136c3ccc2fea8f0de40ecd8089d6bf3000a9fa82 mlocate-0.10 +e4e10ab72b685a2c14342e58f9b057f42c492546 mlocate-0.11 +bfd1c84009d8b7e77d260571f3dd6b4eb97dd916 mlocate-0.12 +3e9eee936e415f9fe168c1a95a562cdbaf8300ed mlocate-0.13 +8227845e08e2363f2ac80bdf88529930e723f7c3 mlocate-0.14 +d927553478dd11dcd41d2fac9feca3299515f428 mlocate-0.15 +c7015d3a3f16157a90607b0c576a5dcca61e4e37 mlocate-0.16 +8295f7b370cfdd95bdc90189b2a553d00c9ff9e3 mlocate-0.17 +9f8dadd6334084bc1af5dd9464e4556949ed50a7 mlocate-0.18 +8d43a8017ffd49a28c3388a9b27c00cba4d31fc9 mlocate-0.19 +f67f0d465428344893480e239a195efc39c19708 mlocate-0.20 +78092195a35daa025a16b1dfb411cb7b8070fccf mlocate-0.21 +e11e759fc3cac46b806c65d756c539a56453eba5 mlocate-0.21.1 +ed71d6d51b3aa8ae63835d721be1df6c8ff274b3 mlocate-0.22 +767382db50bf4b79ba9c0dccae64e3b2c1317c9c mocate-0.22.1 +767382db50bf4b79ba9c0dccae64e3b2c1317c9c mocate-0.22.1 +0000000000000000000000000000000000000000 mocate-0.22.1 +102e3256fe175a6cac5b503745c117a668388587 mlocate-0.22.1 +203f86be20b5e99d0697b273824fce5acd80a409 mlocate-0.22.2 +776e0fd83884228ef07f76b991db8d122f3cb139 mlocate-0.22.3 +356095beac47bdc0d86b08cee6849a81a26dd984 mlocate-0.22.4 +e6dea0b7f04efd843297a16cd9003a7f0da86cfa mlocate-0.23 +cca990af506fa38aff011cf2baae45c573a20e2b mlocate-0.23.1 +71587f6c6b793c7d4a7d85788dad705da24460f7 mlocate-0.24 +69f1424b5ccbc84e1a396ce10aedd862c9388e17 mlocate-0.25 --- mlocate-0.26.orig/.tx/config +++ mlocate-0.26/.tx/config @@ -0,0 +1,8 @@ +[main] +host = https://www.transifex.net + +[mlocate.default] +file_filter = po/.po +source_file = po/mlocate.pot +source_lang = en + --- mlocate-0.26.orig/HACKING +++ mlocate-0.26/HACKING @@ -0,0 +1,8 @@ +To set up a build environment from this repository, run: + mkdir $gldir; cd $gldir + git clone git://git.savannah.gnu.org/gnulib.git + git checkout 5861339993f3014cfad1b94fc7fe366fc2573598 + cd $mlocate_dir + $gldir/gnulib/gnulib-tool --import + hg revert --all + autoreconf -is --- mlocate-0.26.orig/debian/TODO +++ mlocate-0.26/debian/TODO @@ -0,0 +1 @@ +nice value from /etc/default/mlocate? --- mlocate-0.26.orig/debian/changelog +++ mlocate-0.26/debian/changelog @@ -0,0 +1,194 @@ +mlocate (0.26-3) unstable; urgency=medium + + * Update list of excluded file systems. Closes: #907579 + * Run cron script under nice. Closes: #602485 + * Suggest nocache. Closes: #911653 + * Update upstream home page location and watch file. Also update + debian/copyright. Closes: #867640 + * Use getent group instead of sg in postinst for testing if the mlocate + group exists or not. Closes: #904050 + * Pull in patch from upstream to fix up include guards for db.h and ship + the file. Closes: #770699 + * Update VCS-git fields. + + -- Tollef Fog Heen Wed, 14 Nov 2018 20:04:27 +0100 + +mlocate (0.26-2) unstable; urgency=medium + + * Add support for nocache(1) to cron.daily. Closes: #711323 + * Update Homepage URL in control. Closes: #791762 + * Add /var/lib/os-prober to PRUNEPATHS. Closes: #810670 + * Add /var/lib/ceph to PRUNEPATHS and ceph as fuse.ceph to PRUNEFS. + Closes: #786433 + * Add fuse.rozofs to PRUNEFS. Closes: #720465 + * Update name of mfs to fuse.mfs in PRUNEFS. Closes: #810902 + * Add devtmpfs to PRUNEFS. Closes: #762172 + * Add ${misc:Depends} to Depends in control file. + * Switch to dh for the build system and bump compat to 10. + - Drop debian/mlocate.dirs + - Drop most of debian/mlocate.install + - Clean up debian/rules + - Add debian/mlocate.docs + * Drop gitpkg scaffolding. + * Add dh-autoreconf to build-depends. Closes: #700094 + * Make updatedb man page a slave to update.mlocate manpage, to make + lintian happier. + * Update Standards-Version. No further changes necessary for this. + + -- Tollef Fog Heen Sun, 13 Nov 2016 13:24:24 +0100 + +mlocate (0.26-1) unstable; urgency=low + + * New upstream release. Closes: #669368 + - Stops using PATH_MAX. Closes: #610209 + * The filesystem type for Lustre is lustre, not lustre_lite. Update + updatedb.conf accordingly. Closes: #660781 + * Fix up locking in cron.daily. Closes: #611096 + * rm -rf /var/lib/mlocate on purge, don't just take out single files. + Closes: #542616 + + -- Tollef Fog Heen Thu, 13 Jun 2013 08:34:09 +0200 + +mlocate (0.23.1-1) unstable; urgency=low + + * New upstream release + - Updated translations + - Don't prune no-op bind mounts (mounting a directory over itself) + * Remove Thomas Jollans from Uploaders. Closes: #573428 + * Add curlftpfs to default exclude list. Closes: #585746 + * Stop removing the mlocate group on purge. Closes: #561469 + + -- Tollef Fog Heen Sat, 25 Sep 2010 08:15:12 +0200 + +mlocate (0.22.2-1) unstable; urgency=low + + * New upstream version + - Updated translations + - Fix format docs + - Ignore --require-visibility in locate if the database is not owned + by group mlocate or it is readable by others (#7). + - Refuse to open unprivileged databases in directories only accessible + by group mlocate. + + -- Tollef Fog Heen Tue, 03 Nov 2009 22:43:19 +0100 + +mlocate (0.21.1-3) unstable; urgency=low + + [ Adeodato Simó ] + * Remove the "mlocate" group on purge. No other files than the mlocate.db + database should belong to said group, and since it also gets removed on + purge, it should be safe to remove the group as well. (Closes: #520017) + + [ Tollef Fog Heen ] + * Adopt package. (Closes: #548351) + * Add fuse.glusterfs to PRUNEFS. (Closes: #535170) + * Add fuse.sshfs to PRUNEFS. (Closes: #526262) + * Stop giving out an error when not running updatedb because we are on + battery. (Closes: #519188) + * Remove XS-X-Collab-Maint from debian/control, it seems it didn't take + off + + -- Tollef Fog Heen Sat, 03 Oct 2009 08:59:31 +0200 + +mlocate (0.21.1-2) unstable; urgency=low + + * Do not let the cron job run if we detect we're running on battery. + Patch from Ubuntu by Colin Watson. (Closes: #504350) + + * Update Standards-Version to 3.8.0 (no changes needed). + + -- Adeodato Simó Mon, 02 Mar 2009 19:18:48 +0100 + +mlocate (0.21.1-1) unstable; urgency=low + + * New upstream release (translations and documentations updates only). + + -- Adeodato Simó Tue, 28 Oct 2008 11:14:28 +0100 + +mlocate (0.21-1) unstable; urgency=low + + * New upstream release. + + + fixes PRUNE_BIND_MOUNTS to work with bind mounts under bind mounts. + (Closes: #458753) + + + implements PRUNENAMES in updatedb.conf, a mechanism to prune directories + based on their (base)name. (Closes: #473891) + + * Add a commented out PRUNENAMES example to the updatedb.conf shipped with + the package. + + -- Adeodato Simó Tue, 01 Jul 2008 16:16:12 +0200 + +mlocate (0.20-2) unstable; urgency=low + + * Add rpc_pipefs to the PRUNEFS list (change comes from Ubuntu, accidentally + discovered via the PTS link). + + -- Adeodato Simó Sun, 08 Jun 2008 16:59:48 +0200 + +mlocate (0.20-1) unstable; urgency=low + + * New upstream release. + + Fixes more typos in man pages. (Closes: #468435) + + * Use a lock file in the cron.daily script. (Closes: #472116) + + * Check that ionice(1) works before using it for updatedb. ionice reportedly + does not work in some vservers. (Closes: #477157) + + * Fix watch file to work with the new homepage under Trac. + + -- Adeodato Simó Sun, 08 Jun 2008 14:02:44 +0200 + +mlocate (0.19-1) unstable; urgency=low + + * New upstream release. + + Fixes various typos in man pages. (Closes: #465199, #465200) + + * Temporarily disable the test suite, since it fails when run with $CWD + matching "*d/b*" (which happens on buildds). + + * Add paragraph to the description mentioning how installing mlocate changes + /usr/bin/locate via alternatives, and that it won't work until the daily + script is run at least once. Thanks Stefano Zacchiroli for the suggestion. + (Closes: #456150, #456151) + + * Call dpkg-statoverride --remove in postrm. (Closes: #468231) + + * Fix typo in description. (Closes: #453019) + + * Move packaging to a git repository under collab-maint. Add a + X-Collab-Maint header. + + * Update Standards-Version to 3.7.3 (no changes needed). + + -- Adeodato Simó Sun, 16 Mar 2008 11:56:51 +0100 + +mlocate (0.18-2) unstable; urgency=low + + * Upload to unstable. + + * Only run the test suite when there is no /etc/updatedb.conf file, or + its syntax is compatible with mlocate's updatedb -- otherwise all tests + involving updatedb fail due to bad syntax. Upstream agrees there should + be a --config-file option. (Closes: #451997) + + * Lower conflicts against findutils to (<= 4.2.31-1). + + -- Adeodato Simó Sun, 25 Nov 2007 16:08:47 +0100 + +mlocate (0.18-1) experimental; urgency=low + + * Initial release. (Closes: #435787) + + * Handle /usr/bin/locate, /usr/bin/updatedb and locate.1 with alternatives + (manpage for mlocate's updatedb is in section 8, so no need to). + + * Create a "mlocate" group, and make the locate binary setgid on postinst + (with dpkg-statoverride). + + * Run the cron.daily script under the "idle" ionice(1) priority. + Via #448398. + + -- Adeodato Simó Sun, 18 Nov 2007 18:28:34 +0100 --- mlocate-0.26.orig/debian/compat +++ mlocate-0.26/debian/compat @@ -0,0 +1 @@ +10 --- mlocate-0.26.orig/debian/control +++ mlocate-0.26/debian/control @@ -0,0 +1,47 @@ +Source: mlocate +Section: utils +Priority: standard +Maintainer: Tollef Fog Heen +Build-Depends: debhelper (>= 10), + dh-autoreconf +Standards-Version: 3.9.8 +Homepage: https://pagure.io/mlocate +Vcs-Git: https://salsa.debian.org/tfheen/mlocate.git +Vcs-Browser: https://salsa.debian.org/tfheen/mlocate + +Package: mlocate +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, adduser +Suggests: nocache +Conflicts: findutils (<= 4.2.31-1), slocate (<= 3.1-1.1) +Description: quickly find files on the filesystem based on their name + mlocate is a new implementation of locate, a tool to find files + anywhere in the filesystem based on their name, using a fixed pattern + or a regular expression. Unlike other tools like find(1), locate uses + a previously created database to perform the search, allowing queries + to execute much faster. This database is updated periodically from + cron. + . + Several implementations of locate exist: the original implementation + from GNU's findutils, slocate, and mlocate. The advantages of mlocate + are: + . + * it indexes all the filesystem, but results of a search will only + include files that the user running locate has access to. It does + this by updating the database as root, but making it unreadable for + normal users, who can only access it via the locate binary. slocate + does this as well, but not the original locate. + . + * instead of re-reading all the contents of all directories each time + the database is updated, mlocate keeps timestamp information in its + database and can know if the contents of a directory changed without + reading them again. This makes updates much faster and less demanding + on the hard drive. This feature is only found in mlocate. + . + Installing mlocate will change the /usr/bin/locate binary to point to + mlocate via the alternatives mechanism. After installation, you may + wish to run /etc/cron.daily/mlocate by hand to create the database, + otherwise mlocate won't work until that script is run from cron itself + (since mlocate does not use the same database file as standard locate). + Also, you may wish to remove the "locate" package in order not to have + two different database files updated regularly on your system. --- mlocate-0.26.orig/debian/copyright +++ mlocate-0.26/debian/copyright @@ -0,0 +1,24 @@ +Debianized by Adeodato Simó 2007-11-10 + +The sources of mlocate can be downloaded from the project home page at +https://pagure.io/mlocate + +Upstream author: + + Miloslav Trmac + +Copyright and license terms: + + - The sources of mlocate are: + + | Copyright (C) 2005, 2006, 2007 Red Hat, Inc. + + And licensed under the terms of the GPL license, version 2. On + Debian systems, the full text of the GPLv2 License is available + in /usr/share/common-licenses/GPL-2. + + - The packaging scripts in the debian/ subdirectory are: + + | Copyright (c) 2007 Adeodato Simó + + And licensed under the same terms of mlocate itself. --- mlocate-0.26.orig/debian/gbp.conf +++ mlocate-0.26/debian/gbp.conf @@ -0,0 +1,11 @@ +[DEFAULT] +upstream-branch = master +debian-branch = debian +upstream-tag = %(version)s + +sign-tags = True +pristine-tar = False +pristine-tar-commit = False + +[import-orig] +merge-mode = merge --- mlocate-0.26.orig/debian/mlocate.cron.daily +++ mlocate-0.26/debian/mlocate.cron.daily @@ -0,0 +1,27 @@ +#! /bin/bash + +set -e + +[ -x /usr/bin/updatedb.mlocate ] || exit 0 + +if which on_ac_power >/dev/null 2>&1; then + ON_BATTERY=0 + on_ac_power >/dev/null 2>&1 || ON_BATTERY=$? + if [ "$ON_BATTERY" -eq 1 ]; then + exit 0 + fi +fi + +# See ionice(1) +if [ -x /usr/bin/ionice ] && + /usr/bin/ionice -c3 true 2>/dev/null; then + IONICE="/usr/bin/ionice -c3" +fi + +# See nocache(1) +NOCACHE= +if [ -x /usr/bin/nocache ]; then + NOCACHE="/usr/bin/nocache" +fi + +flock --nonblock /run/mlocate.daily.lock $NOCACHE $IONICE nice /usr/bin/updatedb.mlocate --- mlocate-0.26.orig/debian/mlocate.docs +++ mlocate-0.26/debian/mlocate.docs @@ -0,0 +1,3 @@ +AUTHORS +README +NEWS --- mlocate-0.26.orig/debian/mlocate.install +++ mlocate-0.26/debian/mlocate.install @@ -0,0 +1,2 @@ +debian/updatedb.conf /etc +src/db.h /usr/include/mlocate --- mlocate-0.26.orig/debian/mlocate.postinst +++ mlocate-0.26/debian/mlocate.postinst @@ -0,0 +1,25 @@ +#! /bin/sh + +set -e + +GROUP="mlocate" + +if [ "$1" = "configure" ]; then + update-alternatives --install /usr/bin/locate locate /usr/bin/mlocate 80 \ + --slave /usr/share/man/man1/locate.1.gz locate.1.gz /usr/share/man/man1/mlocate.1.gz \ + --slave /usr/bin/updatedb updatedb /usr/bin/updatedb.mlocate \ + --slave /usr/share/man/man8/updatedb.8.gz updatedb.8.gz /usr/share/man/man8/updatedb.mlocate.8.gz + + if ! getent group "$GROUP" > /dev/null 2>&1 ; then + addgroup --system "$GROUP" + fi + + if ! dpkg-statoverride --list /usr/bin/mlocate >/dev/null 2>&1; then + dpkg-statoverride --update --add root "$GROUP" 2755 /usr/bin/mlocate + fi +fi + +# Obsolete file, this can be dropped post-jessie. +rm -f /var/lib/mlocate/daily.lock + +#DEBHELPER# --- mlocate-0.26.orig/debian/mlocate.postrm +++ mlocate-0.26/debian/mlocate.postrm @@ -0,0 +1,10 @@ +#! /bin/sh + +set -e + +if [ "$1" = "purge" ]; then + rm -rf "/var/lib/mlocate" + dpkg-statoverride --remove /usr/bin/mlocate || test $? -eq 2 +fi + +#DEBHELPER# --- mlocate-0.26.orig/debian/mlocate.prerm +++ mlocate-0.26/debian/mlocate.prerm @@ -0,0 +1,9 @@ +#! /bin/sh + +set -e + +if [ "$1" != "upgrade" ]; then + update-alternatives --remove locate /usr/bin/mlocate +fi + +#DEBHELPER# --- mlocate-0.26.orig/debian/rules +++ mlocate-0.26/debian/rules @@ -0,0 +1,14 @@ +#! /usr/bin/make -f + +%: + dh $@ --builddirectory=build + +override_dh_auto_configure: + dh_auto_configure -- --localstatedir=/var/lib + +override_dh_install: + dh_install --fail-missing + mv debian/mlocate/usr/bin/locate debian/mlocate/usr/bin/mlocate + mv debian/mlocate/usr/bin/updatedb debian/mlocate/usr/bin/updatedb.mlocate + mv debian/mlocate/usr/share/man/man1/locate.1 debian/mlocate/usr/share/man/man1/mlocate.1 + mv debian/mlocate/usr/share/man/man8/updatedb.8 debian/mlocate/usr/share/man/man8/updatedb.mlocate.8 --- mlocate-0.26.orig/debian/updatedb.conf +++ mlocate-0.26/debian/updatedb.conf @@ -0,0 +1,4 @@ +PRUNE_BIND_MOUNTS="yes" +# PRUNENAMES=".git .bzr .hg .svn" +PRUNEPATHS="/tmp /var/spool /media /var/lib/os-prober /var/lib/ceph" +PRUNEFS="NFS afs autofs binfmt_misc ceph cgroup cgroup2 cifs coda configfs curlftpfs debugfs devfs devpts devtmpfs ecryptfs ftpfs fuse.ceph fuse.glusterfs fuse.gvfsd-fuse fuse.mfs fuse.rozofs fuse.sshfs fusectl fusesmb hugetlbfs iso9660 lustre lustre_lite mfs mqueue ncpfs nfs nfs4 ocfs ocfs2 proc pstore rpc_pipefs securityfs shfs smbfs sysfs tmpfs tracefs udev udf usbfs" --- mlocate-0.26.orig/debian/watch +++ mlocate-0.26/debian/watch @@ -0,0 +1,2 @@ +version=3 +https://releases.pagure.org/mlocate/ mlocate-(.+).tar.xz --- mlocate-0.26.orig/gnulib/m4/gnulib-cache.m4 +++ mlocate-0.26/gnulib/m4/gnulib-cache.m4 @@ -0,0 +1,32 @@ +# Copyright (C) 2004-2007 Free Software Foundation, Inc. +# +# This file is free software, distributed under the terms of the GNU +# General Public License. As a special exception to the GNU General +# Public License, this file may be distributed as part of a program +# that contains a configuration script generated by Autoconf, under +# the same distribution terms as the rest of that program. +# +# Generated by gnulib-tool. +# +# This file represents the specification of how gnulib-tool is used. +# It acts as a cache: It is written and read by gnulib-tool. +# In projects using CVS, this file is meant to be stored in CVS, +# like the configure.ac and various Makefile.am files. + + +# Specification in the form of a command-line invocation: +# gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --doc-base=doc --aux-dir=admin --no-libtool --macro-prefix=gl canonicalize-lgpl config-h d-type error fnmatch-gnu fwriteerror getopt gettext-h mbsstr mempcpy obstack progname safe-read stat-time strchrnul timespec verify xalloc + +# Specification in the form of a few gnulib-tool.m4 macro invocations: +gl_LOCAL_DIR([]) +gl_MODULES([canonicalize-lgpl config-h d-type error fnmatch-gnu fwriteerror getopt gettext-h mbsstr mempcpy obstack progname safe-read stat-time strchrnul timespec verify xalloc]) +gl_AVOID([]) +gl_SOURCE_BASE([gnulib/lib]) +gl_M4_BASE([gnulib/m4]) +gl_PO_BASE([]) +gl_DOC_BASE([doc]) +gl_TESTS_BASE([tests]) +gl_LIB([libgnu]) +gl_MAKEFILE_NAME([]) +gl_MACRO_PREFIX([gl]) +gl_PO_DOMAIN([]) --- mlocate-0.26.orig/src/db.h +++ mlocate-0.26/src/db.h @@ -13,8 +13,8 @@ Author: Miloslav Trmac */ -#ifndef DB_H__ -#define DB_H__ +#ifndef MLOCATE_DB_H__ +#define MLOCATE_DB_H__ #include