Date: Thursday, June 28, 2012 @ 22:14:10
Author: allan
Revision: 162719
db-move: moved mlocate from [testing] to [core] ( i686, x86_64)
Added:
mlocate/repos/core-i686/PKGBUILD
(from rev 162718, mlocate/repos/testing-i686/PKGBUILD)
mlocate/repos/core-i686/updatedb.conf
(from rev 162718, mlocate/repos/testing-i686/updatedb.conf)
mlocate/repos/core-i686/updatedb.cron.daily
(from rev 162718, mlocate/repos/testing-i686/updatedb.cron.daily)
mlocate/repos/core-x86_64/PKGBUILD
(from rev 162718, mlocate/repos/testing-x86_64/PKGBUILD)
mlocate/repos/core-x86_64/updatedb.conf
(from rev 162718, mlocate/repos/testing-x86_64/updatedb.conf)
mlocate/repos/core-x86_64/updatedb.cron.daily
(from rev 162718, mlocate/repos/testing-x86_64/updatedb.cron.daily)
Deleted:
mlocate/repos/core-i686/PKGBUILD
mlocate/repos/core-i686/mlocate.install
mlocate/repos/core-i686/updatedb.conf
mlocate/repos/core-i686/updatedb.cron.daily
mlocate/repos/core-x86_64/PKGBUILD
mlocate/repos/core-x86_64/mlocate.install
mlocate/repos/core-x86_64/updatedb.conf
mlocate/repos/core-x86_64/updatedb.cron.daily
mlocate/repos/testing-i686/
mlocate/repos/testing-x86_64/
---------------------------------+
core-i686/PKGBUILD | 107 ++++++++++++++++++--------------------
core-i686/mlocate.install | 18 ------
core-i686/updatedb.conf | 9 +--
core-i686/updatedb.cron.daily | 58 ++++++++++----------
core-x86_64/PKGBUILD | 107 ++++++++++++++++++--------------------
core-x86_64/mlocate.install | 18 ------
core-x86_64/updatedb.conf | 9 +--
core-x86_64/updatedb.cron.daily | 58 ++++++++++----------
8 files changed, 168 insertions(+), 216 deletions(-)
Deleted: core-i686/PKGBUILD
===================================================================
--- core-i686/PKGBUILD 2012-06-28 20:58:52 UTC (rev 162718)
+++ core-i686/PKGBUILD 2012-06-29 02:14:10 UTC (rev 162719)
@@ -1,56 +0,0 @@
-# $Id$
-# Maintainer: Allan McRae <al...@archlinux.org>
-# Contributor: lydgate
-
-pkgname=mlocate
-pkgver=0.25
-pkgrel=1
-pkgdesc="Faster merging drop-in for slocate"
-arch=('i686' 'x86_64')
-url="http://carolina.mff.cuni.cz/~trmac/blog/mlocate";
-license=('GPL')
-conflicts=('slocate')
-provides=('slocate')
-replaces=('slocate')
-depends=('glibc' 'coreutils' 'sh')
-backup=('etc/updatedb.conf'
- 'etc/cron.daily/updatedb')
-install=mlocate.install
-source=(https://fedorahosted.org/releases/m/l/mlocate/mlocate-$pkgver.tar.xz
- updatedb.conf
- updatedb.cron.daily)
-md5sums=('c6d043b170613b0e327a815b497f680a'
- 'c374ff223f2e07b5e602ba22359f2335'
- 'cde5da81bebad2de556ef2e43d895e13')
-
-build() {
- cd $srcdir/$pkgname-$pkgver
-
- sed -i '/^groupname /s/mlocate/locate/' Makefile.in
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib
- make
-
-}
-
-check() {
- cd $srcdir/$pkgname-$pkgver
- make check
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver
-
- # Set up a default updatedb.conf and a daily cronjob
- install -Dm644 ${srcdir}/updatedb.conf $pkgdir/etc/updatedb.conf
- install -Dm744 ${srcdir}/updatedb.cron.daily $pkgdir/etc/cron.daily/updatedb
-
- # Install Mlocate
- make DESTDIR=$pkgdir install
-
- ln -sv locate $pkgdir/usr/bin/slocate
- chgrp -v 21 $pkgdir/usr/bin/locate
- chmod -v 2755 $pkgdir/usr/bin/locate
-
- install -dm755 $pkgdir/var/lib
- install -d -m750 -g21 $pkgdir/var/lib/locate
-}
Copied: mlocate/repos/core-i686/PKGBUILD (from rev 162718,
mlocate/repos/testing-i686/PKGBUILD)
===================================================================
--- core-i686/PKGBUILD (rev 0)
+++ core-i686/PKGBUILD 2012-06-29 02:14:10 UTC (rev 162719)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Allan McRae <al...@archlinux.org>
+# Contributor: lydgate
+
+pkgname=mlocate
+pkgver=0.25
+pkgrel=2
+pkgdesc="Faster merging drop-in for slocate"
+arch=('i686' 'x86_64')
+url="http://carolina.mff.cuni.cz/~trmac/blog/mlocate";
+license=('GPL')
+depends=('glibc' 'coreutils' 'sh')
+backup=('etc/updatedb.conf'
+ 'etc/cron.daily/updatedb')
+source=(https://fedorahosted.org/releases/m/l/mlocate/mlocate-$pkgver.tar.xz
+ updatedb.conf
+ updatedb.cron.daily)
+md5sums=('c6d043b170613b0e327a815b497f680a'
+ 'b56d81de17fe29b01b4b28861acb8fd4'
+ 'cde5da81bebad2de556ef2e43d895e13')
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+
+ sed -i '/^groupname /s/mlocate/locate/' Makefile.in
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib
+ make
+
+}
+
+check() {
+ cd $srcdir/$pkgname-$pkgver
+ make check
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+
+ make DESTDIR=$pkgdir install
+
+ ln -s locate $pkgdir/usr/bin/slocate
+ chgrp 21 $pkgdir/usr/bin/locate
+ chmod 2755 $pkgdir/usr/bin/locate
+
+ install -dm755 $pkgdir/var/lib
+ install -dm750 -g21 $pkgdir/var/lib/locate
+
+ # Set up a default updatedb.conf and a daily cronjob
+ install -Dm644 ${srcdir}/updatedb.conf $pkgdir/etc/updatedb.conf
+ install -Dm744 ${srcdir}/updatedb.cron.daily $pkgdir/etc/cron.daily/updatedb
+}
Deleted: core-i686/mlocate.install
===================================================================
--- core-i686/mlocate.install 2012-06-28 20:58:52 UTC (rev 162718)
+++ core-i686/mlocate.install 2012-06-29 02:14:10 UTC (rev 162719)
@@ -1,18 +0,0 @@
-post_install() {
- post_upgrade "$1" "$1"
- echo "mlocate command is technically locate, but slocate is symlinked and
still works."
- echo "You should run updatedb as root."
-}
-
-post_upgrade() {
- # This can be removed after {m,x}locate have both been updated
- getent group slocate &>/dev/null && usr/sbin/groupdel slocate &>/dev/null
- getent group mlocate &>/dev/null && usr/sbin/groupdel mlocate &>/dev/null
-
- getent group locate &>/dev/null || usr/sbin/groupadd -g 21 locate &>/dev/null
- chown -R root:locate var/lib/mlocate
-}
-
-pre_remove() {
- getent group locate &>/dev/null && usr/sbin/groupdel locate &>/dev/null
-}
Deleted: core-i686/updatedb.conf
===================================================================
--- core-i686/updatedb.conf 2012-06-28 20:58:52 UTC (rev 162718)
+++ core-i686/updatedb.conf 2012-06-29 02:14:10 UTC (rev 162719)
@@ -1,5 +0,0 @@
-# directories to exclude from the slocate database:
-PRUNEPATHS="/media /mnt /tmp /var/tmp /var/cache /var/lock /var/run /var/spool"
-
-# filesystems to exclude from the slocate database:
-PRUNEFS="afs auto autofs binfmt_misc cifs coda configfs cramfs debugfs devpts
devtmpfs ftpfs iso9660 mqueue ncpfs nfs nfs4 proc ramfs securityfs shfs smbfs
sshfs sysfs tmpfs udf usbfs vboxsf"
Copied: mlocate/repos/core-i686/updatedb.conf (from rev 162718,
mlocate/repos/testing-i686/updatedb.conf)
===================================================================
--- core-i686/updatedb.conf (rev 0)
+++ core-i686/updatedb.conf 2012-06-29 02:14:10 UTC (rev 162719)
@@ -0,0 +1,4 @@
+PRUNE_BIND_MOUNTS = "yes"
+PRUNEFS = "9p afs anon_inodefs auto autofs bdev binfmt_misc cgroup cifs coda
configfs cpuset cramfs debugfs devpts devtmpfs ecryptfs exofs ftpfs fuse
fuse.encfs fuse.sshfs fusectl gfs gfs2 hugetlbfs inotifyfs iso9660 jffs2 lustre
mqueue ncpfs nfs nfs4 nfsd pipefs proc ramfs rootfs rpc_pipefs securityfs
selinuxfs sfs shfs smbfs sockfs sshfs sysfs tmpfs ubifs udf usbfs vboxsf"
+PRUNENAMES = ".git .hg .svn"
+PRUNEPATHS = "/afs /media /mnt /net /sfs /tmp /udev /var/cache
/var/lib/pacman/local /var/lock /var/run /var/spool /var/tmp"
Deleted: core-i686/updatedb.cron.daily
===================================================================
--- core-i686/updatedb.cron.daily 2012-06-28 20:58:52 UTC (rev 162718)
+++ core-i686/updatedb.cron.daily 2012-06-29 02:14:10 UTC (rev 162719)
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-# nicenesses range from -20 (most favorable scheduling) to 19 (least favorable)
-NICE=19
-
-# 0 for none, 1 for real time, 2 for best-effort, 3 for idle
-IONICE_CLASS=2
-
-# 0-7 (for IONICE_CLASS 1 and 2 only), 0=highest, 7=lowest
-IONICE_PRIORITY=7
-
-UPDATEDB="/usr/bin/updatedb"
-
-if [ -x /usr/bin/nice ]; then
- UPDATEDB="/usr/bin/nice -n ${NICE:-19} ${UPDATEDB}"
-fi
-
-if [ -x /usr/bin/ionice ]; then
- UPDATEDB="/usr/bin/ionice -c ${IONICE_CLASS:-2} -n ${IONICE_PRIORITY:-7}
${UPDATEDB}"
-fi
-
-# Update the "locate" database
-if [ -x /usr/bin/updatedb ]; then
- if [ -f /etc/updatedb.conf ]; then
- ${UPDATEDB}
- else
- ${UPDATEDB} -f proc
- fi
-fi
Copied: mlocate/repos/core-i686/updatedb.cron.daily (from rev 162718,
mlocate/repos/testing-i686/updatedb.cron.daily)
===================================================================
--- core-i686/updatedb.cron.daily (rev 0)
+++ core-i686/updatedb.cron.daily 2012-06-29 02:14:10 UTC (rev 162719)
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+# nicenesses range from -20 (most favorable scheduling) to 19 (least favorable)
+NICE=19
+
+# 0 for none, 1 for real time, 2 for best-effort, 3 for idle
+IONICE_CLASS=2
+
+# 0-7 (for IONICE_CLASS 1 and 2 only), 0=highest, 7=lowest
+IONICE_PRIORITY=7
+
+UPDATEDB="/usr/bin/updatedb"
+
+if [ -x /usr/bin/nice ]; then
+ UPDATEDB="/usr/bin/nice -n ${NICE:-19} ${UPDATEDB}"
+fi
+
+if [ -x /usr/bin/ionice ]; then
+ UPDATEDB="/usr/bin/ionice -c ${IONICE_CLASS:-2} -n ${IONICE_PRIORITY:-7}
${UPDATEDB}"
+fi
+
+# Update the "locate" database
+if [ -x /usr/bin/updatedb ]; then
+ if [ -f /etc/updatedb.conf ]; then
+ ${UPDATEDB}
+ else
+ ${UPDATEDB} -f proc
+ fi
+fi
Deleted: core-x86_64/PKGBUILD
===================================================================
--- core-x86_64/PKGBUILD 2012-06-28 20:58:52 UTC (rev 162718)
+++ core-x86_64/PKGBUILD 2012-06-29 02:14:10 UTC (rev 162719)
@@ -1,56 +0,0 @@
-# $Id$
-# Maintainer: Allan McRae <al...@archlinux.org>
-# Contributor: lydgate
-
-pkgname=mlocate
-pkgver=0.25
-pkgrel=1
-pkgdesc="Faster merging drop-in for slocate"
-arch=('i686' 'x86_64')
-url="http://carolina.mff.cuni.cz/~trmac/blog/mlocate";
-license=('GPL')
-conflicts=('slocate')
-provides=('slocate')
-replaces=('slocate')
-depends=('glibc' 'coreutils' 'sh')
-backup=('etc/updatedb.conf'
- 'etc/cron.daily/updatedb')
-install=mlocate.install
-source=(https://fedorahosted.org/releases/m/l/mlocate/mlocate-$pkgver.tar.xz
- updatedb.conf
- updatedb.cron.daily)
-md5sums=('c6d043b170613b0e327a815b497f680a'
- 'c374ff223f2e07b5e602ba22359f2335'
- 'cde5da81bebad2de556ef2e43d895e13')
-
-build() {
- cd $srcdir/$pkgname-$pkgver
-
- sed -i '/^groupname /s/mlocate/locate/' Makefile.in
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib
- make
-
-}
-
-check() {
- cd $srcdir/$pkgname-$pkgver
- make check
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver
-
- # Set up a default updatedb.conf and a daily cronjob
- install -Dm644 ${srcdir}/updatedb.conf $pkgdir/etc/updatedb.conf
- install -Dm744 ${srcdir}/updatedb.cron.daily $pkgdir/etc/cron.daily/updatedb
-
- # Install Mlocate
- make DESTDIR=$pkgdir install
-
- ln -sv locate $pkgdir/usr/bin/slocate
- chgrp -v 21 $pkgdir/usr/bin/locate
- chmod -v 2755 $pkgdir/usr/bin/locate
-
- install -dm755 $pkgdir/var/lib
- install -d -m750 -g21 $pkgdir/var/lib/locate
-}
Copied: mlocate/repos/core-x86_64/PKGBUILD (from rev 162718,
mlocate/repos/testing-x86_64/PKGBUILD)
===================================================================
--- core-x86_64/PKGBUILD (rev 0)
+++ core-x86_64/PKGBUILD 2012-06-29 02:14:10 UTC (rev 162719)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Allan McRae <al...@archlinux.org>
+# Contributor: lydgate
+
+pkgname=mlocate
+pkgver=0.25
+pkgrel=2
+pkgdesc="Faster merging drop-in for slocate"
+arch=('i686' 'x86_64')
+url="http://carolina.mff.cuni.cz/~trmac/blog/mlocate";
+license=('GPL')
+depends=('glibc' 'coreutils' 'sh')
+backup=('etc/updatedb.conf'
+ 'etc/cron.daily/updatedb')
+source=(https://fedorahosted.org/releases/m/l/mlocate/mlocate-$pkgver.tar.xz
+ updatedb.conf
+ updatedb.cron.daily)
+md5sums=('c6d043b170613b0e327a815b497f680a'
+ 'b56d81de17fe29b01b4b28861acb8fd4'
+ 'cde5da81bebad2de556ef2e43d895e13')
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+
+ sed -i '/^groupname /s/mlocate/locate/' Makefile.in
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib
+ make
+
+}
+
+check() {
+ cd $srcdir/$pkgname-$pkgver
+ make check
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+
+ make DESTDIR=$pkgdir install
+
+ ln -s locate $pkgdir/usr/bin/slocate
+ chgrp 21 $pkgdir/usr/bin/locate
+ chmod 2755 $pkgdir/usr/bin/locate
+
+ install -dm755 $pkgdir/var/lib
+ install -dm750 -g21 $pkgdir/var/lib/locate
+
+ # Set up a default updatedb.conf and a daily cronjob
+ install -Dm644 ${srcdir}/updatedb.conf $pkgdir/etc/updatedb.conf
+ install -Dm744 ${srcdir}/updatedb.cron.daily $pkgdir/etc/cron.daily/updatedb
+}
Deleted: core-x86_64/mlocate.install
===================================================================
--- core-x86_64/mlocate.install 2012-06-28 20:58:52 UTC (rev 162718)
+++ core-x86_64/mlocate.install 2012-06-29 02:14:10 UTC (rev 162719)
@@ -1,18 +0,0 @@
-post_install() {
- post_upgrade "$1" "$1"
- echo "mlocate command is technically locate, but slocate is symlinked and
still works."
- echo "You should run updatedb as root."
-}
-
-post_upgrade() {
- # This can be removed after {m,x}locate have both been updated
- getent group slocate &>/dev/null && usr/sbin/groupdel slocate &>/dev/null
- getent group mlocate &>/dev/null && usr/sbin/groupdel mlocate &>/dev/null
-
- getent group locate &>/dev/null || usr/sbin/groupadd -g 21 locate &>/dev/null
- chown -R root:locate var/lib/mlocate
-}
-
-pre_remove() {
- getent group locate &>/dev/null && usr/sbin/groupdel locate &>/dev/null
-}
Deleted: core-x86_64/updatedb.conf
===================================================================
--- core-x86_64/updatedb.conf 2012-06-28 20:58:52 UTC (rev 162718)
+++ core-x86_64/updatedb.conf 2012-06-29 02:14:10 UTC (rev 162719)
@@ -1,5 +0,0 @@
-# directories to exclude from the slocate database:
-PRUNEPATHS="/media /mnt /tmp /var/tmp /var/cache /var/lock /var/run /var/spool"
-
-# filesystems to exclude from the slocate database:
-PRUNEFS="afs auto autofs binfmt_misc cifs coda configfs cramfs debugfs devpts
devtmpfs ftpfs iso9660 mqueue ncpfs nfs nfs4 proc ramfs securityfs shfs smbfs
sshfs sysfs tmpfs udf usbfs vboxsf"
Copied: mlocate/repos/core-x86_64/updatedb.conf (from rev 162718,
mlocate/repos/testing-x86_64/updatedb.conf)
===================================================================
--- core-x86_64/updatedb.conf (rev 0)
+++ core-x86_64/updatedb.conf 2012-06-29 02:14:10 UTC (rev 162719)
@@ -0,0 +1,4 @@
+PRUNE_BIND_MOUNTS = "yes"
+PRUNEFS = "9p afs anon_inodefs auto autofs bdev binfmt_misc cgroup cifs coda
configfs cpuset cramfs debugfs devpts devtmpfs ecryptfs exofs ftpfs fuse
fuse.encfs fuse.sshfs fusectl gfs gfs2 hugetlbfs inotifyfs iso9660 jffs2 lustre
mqueue ncpfs nfs nfs4 nfsd pipefs proc ramfs rootfs rpc_pipefs securityfs
selinuxfs sfs shfs smbfs sockfs sshfs sysfs tmpfs ubifs udf usbfs vboxsf"
+PRUNENAMES = ".git .hg .svn"
+PRUNEPATHS = "/afs /media /mnt /net /sfs /tmp /udev /var/cache
/var/lib/pacman/local /var/lock /var/run /var/spool /var/tmp"
Deleted: core-x86_64/updatedb.cron.daily
===================================================================
--- core-x86_64/updatedb.cron.daily 2012-06-28 20:58:52 UTC (rev 162718)
+++ core-x86_64/updatedb.cron.daily 2012-06-29 02:14:10 UTC (rev 162719)
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-# nicenesses range from -20 (most favorable scheduling) to 19 (least favorable)
-NICE=19
-
-# 0 for none, 1 for real time, 2 for best-effort, 3 for idle
-IONICE_CLASS=2
-
-# 0-7 (for IONICE_CLASS 1 and 2 only), 0=highest, 7=lowest
-IONICE_PRIORITY=7
-
-UPDATEDB="/usr/bin/updatedb"
-
-if [ -x /usr/bin/nice ]; then
- UPDATEDB="/usr/bin/nice -n ${NICE:-19} ${UPDATEDB}"
-fi
-
-if [ -x /usr/bin/ionice ]; then
- UPDATEDB="/usr/bin/ionice -c ${IONICE_CLASS:-2} -n ${IONICE_PRIORITY:-7}
${UPDATEDB}"
-fi
-
-# Update the "locate" database
-if [ -x /usr/bin/updatedb ]; then
- if [ -f /etc/updatedb.conf ]; then
- ${UPDATEDB}
- else
- ${UPDATEDB} -f proc
- fi
-fi
Copied: mlocate/repos/core-x86_64/updatedb.cron.daily (from rev 162718,
mlocate/repos/testing-x86_64/updatedb.cron.daily)
===================================================================
--- core-x86_64/updatedb.cron.daily (rev 0)
+++ core-x86_64/updatedb.cron.daily 2012-06-29 02:14:10 UTC (rev 162719)
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+# nicenesses range from -20 (most favorable scheduling) to 19 (least favorable)
+NICE=19
+
+# 0 for none, 1 for real time, 2 for best-effort, 3 for idle
+IONICE_CLASS=2
+
+# 0-7 (for IONICE_CLASS 1 and 2 only), 0=highest, 7=lowest
+IONICE_PRIORITY=7
+
+UPDATEDB="/usr/bin/updatedb"
+
+if [ -x /usr/bin/nice ]; then
+ UPDATEDB="/usr/bin/nice -n ${NICE:-19} ${UPDATEDB}"
+fi
+
+if [ -x /usr/bin/ionice ]; then
+ UPDATEDB="/usr/bin/ionice -c ${IONICE_CLASS:-2} -n ${IONICE_PRIORITY:-7}
${UPDATEDB}"
+fi
+
+# Update the "locate" database
+if [ -x /usr/bin/updatedb ]; then
+ if [ -f /etc/updatedb.conf ]; then
+ ${UPDATEDB}
+ else
+ ${UPDATEDB} -f proc
+ fi
+fi
