--- mlocate-0.23.1.orig/.hgignore +++ mlocate-0.23.1/.hgignore @@ -0,0 +1,30 @@ +.*~$ +^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/mlocate\.pot$ +^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.23.1.orig/.hgtags +++ mlocate-0.23.1/.hgtags @@ -0,0 +1,34 @@ +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 --- mlocate-0.23.1.orig/.gitignore +++ mlocate-0.23.1/.gitignore @@ -0,0 +1,8 @@ +/obj-* +/*-stamp + +/debian/tmp +/debian/files +/debian/mlocate +/debian/*.substvars +/debian/*.debhelper.log --- mlocate-0.23.1.orig/HACKING +++ mlocate-0.23.1/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.23.1.orig/gnulib/m4/gnulib-cache.m4 +++ mlocate-0.23.1/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.23.1.orig/debian/changelog +++ mlocate-0.23.1/debian/changelog @@ -0,0 +1,165 @@ +mlocate (0.23.1-1ubuntu2) oneiric; urgency=low + + * Add /home/.ecryptfs to PRUNEPATHS (LP: #827841). + + -- Colin Watson Wed, 17 Aug 2011 14:07:51 +0100 + +mlocate (0.23.1-1ubuntu1) natty; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Add ecryptfs, fusesmb, and devtmpfs to PRUNEFS. + + -- Colin Watson Tue, 12 Oct 2010 16:34:36 +0100 + +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-1ubuntu1) lucid; urgency=low + + * Add ecryptfs to PRUNEFS (LP: #372631). + * Add fusesmb to PRUNEFS (LP: #222504). + * Add devtmpfs to PRUNEFS; tmpfs was already there, so this should cover + /dev (LP: #355404). + + -- Colin Watson Wed, 24 Mar 2010 10:12:15 +0000 + +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.23.1.orig/debian/rules +++ mlocate-0.23.1/debian/rules @@ -0,0 +1,119 @@ +#! /usr/bin/make -f + +### + +# Configure arguments + +confflags = --prefix=/usr --localstatedir=/var/lib --sysconfdir=/etc + +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +confflags += --build $(DEB_BUILD_GNU_TYPE) + +# Only specify --host when cross-compiling +ifneq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + confflags += --host $(DEB_HOST_GNU_TYPE) +endif + +### + +# Directory to make the build on + +objdir = $(CURDIR)/obj-$(DEB_HOST_GNU_TYPE) + +### + +# CFLAGS + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +### + +configure: configure-stamp +configure-stamp: + dh_testdir + + -mkdir $(objdir) + cd $(objdir) && \ + env CFLAGS="$(CFLAGS)" ../configure $(confflags) + + touch $@ + +# + +build: build-stamp +build-stamp: configure-stamp +# Only run `make check` if /etc/updatedb.conf is compatible with +# mlocate, otherwise all many tests will fail; we check for that by +# checking the exit status of updatedb --help. + cd $(objdir) && \ + $(MAKE) all; \ +# if src/updatedb --help >/dev/null 2>&1; then \ +# $(MAKE) check; \ +# fi + + touch $@ + +# + +clean: + dh_testdir + dh_testroot + + rm -f configure-stamp build-stamp install-stamp + rm -rf $(objdir) + + dh_clean + +# + +install: install-stamp +install-stamp: + dh_testdir + dh_testroot + dh_clean + dh_installdirs + cd $(objdir) && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + dh_install + install -D -m 755 $(CURDIR)/debian/tmp/usr/bin/locate \ + $(CURDIR)/debian/mlocate/usr/bin/mlocate + install -D -m 755 $(CURDIR)/debian/tmp/usr/bin/updatedb \ + $(CURDIR)/debian/mlocate/usr/bin/updatedb.mlocate + install -D -m 644 $(CURDIR)/debian/tmp/usr/share/man/man1/locate.1 \ + $(CURDIR)/debian/mlocate/usr/share/man/man1/mlocate.1 + touch $@ + +# + +binary: binary-arch + +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs AUTHORS NEWS README + dh_installman + dh_installcron + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary-indep: + @echo "Nothing to do." + +# + +.PHONY: configure build clean install binary binary-arch binary-indep --- mlocate-0.23.1.orig/debian/mlocate.prerm +++ mlocate-0.23.1/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.23.1.orig/debian/watch +++ mlocate-0.23.1/debian/watch @@ -0,0 +1,3 @@ +version=3 +opts=downloadurlmangle=s/bz2$/bz2?format=raw/ \ +https://fedorahosted.org/mlocate/wiki/MlocateDownloads .*/mlocate-(.+).tar.bz2 --- mlocate-0.23.1.orig/debian/mlocate.postrm +++ mlocate-0.23.1/debian/mlocate.postrm @@ -0,0 +1,16 @@ +#! /bin/sh + +set -e + +VARDIR="/var/lib/mlocate" + +if [ "$1" = "purge" ]; then + if [ -d "$VARDIR" ]; then + rm -f "$VARDIR/mlocate.db" + rmdir --ignore-fail-on-non-empty "$VARDIR" + fi + + dpkg-statoverride --remove /usr/bin/mlocate || test $? -eq 2 +fi + +#DEBHELPER# --- mlocate-0.23.1.orig/debian/mlocate.dirs +++ mlocate-0.23.1/debian/mlocate.dirs @@ -0,0 +1 @@ +/var/lib/mlocate --- mlocate-0.23.1.orig/debian/compat +++ mlocate-0.23.1/debian/compat @@ -0,0 +1 @@ +5 --- mlocate-0.23.1.orig/debian/mlocate.postinst +++ mlocate-0.23.1/debian/mlocate.postinst @@ -0,0 +1,21 @@ +#! /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 + + if ! sg "$GROUP" true 2>/dev/null; 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 + +#DEBHELPER# --- mlocate-0.23.1.orig/debian/updatedb.conf +++ mlocate-0.23.1/debian/updatedb.conf @@ -0,0 +1,4 @@ +PRUNE_BIND_MOUNTS="yes" +# PRUNENAMES=".git .bzr .hg .svn" +PRUNEPATHS="/tmp /var/spool /media /home/.ecryptfs" +PRUNEFS="NFS nfs nfs4 rpc_pipefs afs binfmt_misc proc smbfs autofs iso9660 ncpfs coda devpts ftpfs devfs mfs shfs sysfs cifs lustre_lite tmpfs usbfs udf fuse.glusterfs fuse.sshfs curlftpfs ecryptfs fusesmb devtmpfs" --- mlocate-0.23.1.orig/debian/control +++ mlocate-0.23.1/debian/control @@ -0,0 +1,46 @@ +Source: mlocate +Section: utils +Priority: standard +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Tollef Fog Heen +Build-Depends: debhelper +Standards-Version: 3.8.0 +Homepage: http://carolina.mff.cuni.cz/~trmac/blog/mlocate +Vcs-Git: git://git.debian.org/git/collab-maint/mlocate.git +Vcs-Browser: http://git.debian.org/?p=collab-maint/mlocate.git + +Package: mlocate +Architecture: any +Depends: ${shlibs:Depends}, adduser +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.23.1.orig/debian/copyright +++ mlocate-0.23.1/debian/copyright @@ -0,0 +1,29 @@ +Debianized by Adeodato Simó 2007-11-10 + +The sources of mlocate can be downloaded from: + + http://people.redhat.com/mitr/mlocate + +And the project homepage is: + + http://carolina.mff.cuni.cz/~trmac/blog/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.23.1.orig/debian/mlocate.cron.daily +++ mlocate-0.23.1/debian/mlocate.cron.daily @@ -0,0 +1,36 @@ +#! /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 + +## + +LOCKFILE="/var/lib/mlocate/daily.lock" + +trap "rm -f $LOCKFILE" EXIT + +if [ -e "$LOCKFILE" ]; then + echo >&2 "Warning: $LOCKFILE present, not running updatedb." + exit 1 +else + touch "$LOCKFILE" +fi + +## + +# See ionice(1) +if [ -x /usr/bin/ionice ] && + /usr/bin/ionice -c3 true 2>/dev/null; then + IONICE="/usr/bin/ionice -c3" +fi + +$IONICE /usr/bin/updatedb.mlocate --- mlocate-0.23.1.orig/debian/gitpkg-hook.sh +++ mlocate-0.23.1/debian/gitpkg-hook.sh @@ -0,0 +1,10 @@ +#! /bin/sh +# This file is used by gitpkg to extract a byte identical .orig.tar.gz +# file using pristine-tar. To use it you need pristine-tar, and to +# configure HOOK_FILE=debian/gitpkg-hook.sh in one of the places that +# gitpkg looks (currently _not_ the environment). + +set -x +ORIGTGZ="${DEB_DIR}/${DEB_SOURCE}/${DEB_SOURCE}_${DEB_VERSION%-*}.orig.tar.gz" +echo "(cd $REPO_ROOT && pristine-tar checkout ${ORIGTGZ})" +(cd $REPO_ROOT && pristine-tar checkout ${ORIGTGZ}) --- mlocate-0.23.1.orig/debian/TODO +++ mlocate-0.23.1/debian/TODO @@ -0,0 +1 @@ +nice value from /etc/default/mlocate? --- mlocate-0.23.1.orig/debian/mlocate.install +++ mlocate-0.23.1/debian/mlocate.install @@ -0,0 +1,5 @@ +debian/updatedb.conf /etc +debian/tmp/usr/share/locale +debian/tmp/usr/share/man/man8/updatedb.8 +debian/tmp/usr/share/man/man5/mlocate.db.5 +debian/tmp/usr/share/man/man5/updatedb.conf.5