Date: Sunday, September 23, 2012 @ 18:22:21
Author: bisson
Revision: 166971
db-move: moved mlocate from [testing] to [core] (i686, x86_64)
Added:
mlocate/repos/core-i686/PKGBUILD
(from rev 166970, mlocate/repos/testing-i686/PKGBUILD)
mlocate/repos/core-i686/updatedb.conf
(from rev 166970, mlocate/repos/testing-i686/updatedb.conf)
mlocate/repos/core-i686/updatedb.cron
(from rev 166970, mlocate/repos/testing-i686/updatedb.cron)
mlocate/repos/core-x86_64/PKGBUILD
(from rev 166970, mlocate/repos/testing-x86_64/PKGBUILD)
mlocate/repos/core-x86_64/updatedb.conf
(from rev 166970, mlocate/repos/testing-x86_64/updatedb.conf)
mlocate/repos/core-x86_64/updatedb.cron
(from rev 166970, mlocate/repos/testing-x86_64/updatedb.cron)
Deleted:
mlocate/repos/core-i686/PKGBUILD
mlocate/repos/core-i686/updatedb.conf
mlocate/repos/core-i686/updatedb.cron.daily
mlocate/repos/core-x86_64/PKGBUILD
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 | 100 ++++++++++++++++++--------------------
core-i686/updatedb.conf | 8 +--
core-i686/updatedb.cron | 6 ++
core-i686/updatedb.cron.daily | 29 -----------
core-x86_64/PKGBUILD | 100 ++++++++++++++++++--------------------
core-x86_64/updatedb.conf | 8 +--
core-x86_64/updatedb.cron | 6 ++
core-x86_64/updatedb.cron.daily | 29 -----------
8 files changed, 118 insertions(+), 168 deletions(-)
Deleted: core-i686/PKGBUILD
===================================================================
--- core-i686/PKGBUILD 2012-09-23 20:09:41 UTC (rev 166970)
+++ core-i686/PKGBUILD 2012-09-23 22:22:21 UTC (rev 166971)
@@ -1,51 +0,0 @@
-# $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
-}
Copied: mlocate/repos/core-i686/PKGBUILD (from rev 166970,
mlocate/repos/testing-i686/PKGBUILD)
===================================================================
--- core-i686/PKGBUILD (rev 0)
+++ core-i686/PKGBUILD 2012-09-23 22:22:21 UTC (rev 166971)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bis...@archlinux.org>
+# Contributor: Allan McRae <al...@archlinux.org>
+# Contributor: lydgate
+
+pkgname=mlocate
+pkgver=0.26
+pkgrel=1
+pkgdesc='Merging locate/updatedb implementation'
+url='https://fedorahosted.org/mlocate/'
+arch=('i686' 'x86_64')
+license=('GPL')
+backup=('etc/updatedb.conf'
+ 'etc/cron.daily/updatedb')
+source=("https://fedorahosted.org/releases/m/l/mlocate/mlocate-${pkgver}.tar.xz";
+ 'updatedb.conf'
+ 'updatedb.cron')
+sha1sums=('c6e6d81b25359c51c545f4b8ba0f3b469227fcbc'
+ '0150379149bf9d714bc81332d775fc273e7e3535'
+ '8301e6277d27db539af6cf4bc243e8e247bffc2e')
+
+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
+
+ chgrp 21 "${pkgdir}/usr/bin/locate"
+ chmod 2755 "${pkgdir}/usr/bin/locate"
+ ln -s locate "${pkgdir}/usr/bin/slocate"
+
+ install -dm755 "${pkgdir}/var/lib"
+ install -dm750 -g21 "${pkgdir}/var/lib/locate"
+
+ install -Dm644 ../updatedb.conf "${pkgdir}/etc/updatedb.conf"
+ install -Dm744 ../updatedb.cron "${pkgdir}/etc/cron.daily/updatedb"
+}
Deleted: core-i686/updatedb.conf
===================================================================
--- core-i686/updatedb.conf 2012-09-23 20:09:41 UTC (rev 166970)
+++ core-i686/updatedb.conf 2012-09-23 22:22:21 UTC (rev 166971)
@@ -1,4 +0,0 @@
-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"
Copied: mlocate/repos/core-i686/updatedb.conf (from rev 166970,
mlocate/repos/testing-i686/updatedb.conf)
===================================================================
--- core-i686/updatedb.conf (rev 0)
+++ core-i686/updatedb.conf 2012-09-23 22:22:21 UTC (rev 166971)
@@ -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"
Copied: mlocate/repos/core-i686/updatedb.cron (from rev 166970,
mlocate/repos/testing-i686/updatedb.cron)
===================================================================
--- core-i686/updatedb.cron (rev 0)
+++ core-i686/updatedb.cron 2012-09-23 22:22:21 UTC (rev 166971)
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+NICE='nice -n 19'
+IONICE='ionice -c 2 -n 7'
+
+exec ${IONICE} ${NICE} updatedb -f proc
Deleted: core-i686/updatedb.cron.daily
===================================================================
--- core-i686/updatedb.cron.daily 2012-09-23 20:09:41 UTC (rev 166970)
+++ core-i686/updatedb.cron.daily 2012-09-23 22:22:21 UTC (rev 166971)
@@ -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
Deleted: core-x86_64/PKGBUILD
===================================================================
--- core-x86_64/PKGBUILD 2012-09-23 20:09:41 UTC (rev 166970)
+++ core-x86_64/PKGBUILD 2012-09-23 22:22:21 UTC (rev 166971)
@@ -1,51 +0,0 @@
-# $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
-}
Copied: mlocate/repos/core-x86_64/PKGBUILD (from rev 166970,
mlocate/repos/testing-x86_64/PKGBUILD)
===================================================================
--- core-x86_64/PKGBUILD (rev 0)
+++ core-x86_64/PKGBUILD 2012-09-23 22:22:21 UTC (rev 166971)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bis...@archlinux.org>
+# Contributor: Allan McRae <al...@archlinux.org>
+# Contributor: lydgate
+
+pkgname=mlocate
+pkgver=0.26
+pkgrel=1
+pkgdesc='Merging locate/updatedb implementation'
+url='https://fedorahosted.org/mlocate/'
+arch=('i686' 'x86_64')
+license=('GPL')
+backup=('etc/updatedb.conf'
+ 'etc/cron.daily/updatedb')
+source=("https://fedorahosted.org/releases/m/l/mlocate/mlocate-${pkgver}.tar.xz";
+ 'updatedb.conf'
+ 'updatedb.cron')
+sha1sums=('c6e6d81b25359c51c545f4b8ba0f3b469227fcbc'
+ '0150379149bf9d714bc81332d775fc273e7e3535'
+ '8301e6277d27db539af6cf4bc243e8e247bffc2e')
+
+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
+
+ chgrp 21 "${pkgdir}/usr/bin/locate"
+ chmod 2755 "${pkgdir}/usr/bin/locate"
+ ln -s locate "${pkgdir}/usr/bin/slocate"
+
+ install -dm755 "${pkgdir}/var/lib"
+ install -dm750 -g21 "${pkgdir}/var/lib/locate"
+
+ install -Dm644 ../updatedb.conf "${pkgdir}/etc/updatedb.conf"
+ install -Dm744 ../updatedb.cron "${pkgdir}/etc/cron.daily/updatedb"
+}
Deleted: core-x86_64/updatedb.conf
===================================================================
--- core-x86_64/updatedb.conf 2012-09-23 20:09:41 UTC (rev 166970)
+++ core-x86_64/updatedb.conf 2012-09-23 22:22:21 UTC (rev 166971)
@@ -1,4 +0,0 @@
-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"
Copied: mlocate/repos/core-x86_64/updatedb.conf (from rev 166970,
mlocate/repos/testing-x86_64/updatedb.conf)
===================================================================
--- core-x86_64/updatedb.conf (rev 0)
+++ core-x86_64/updatedb.conf 2012-09-23 22:22:21 UTC (rev 166971)
@@ -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"
Copied: mlocate/repos/core-x86_64/updatedb.cron (from rev 166970,
mlocate/repos/testing-x86_64/updatedb.cron)
===================================================================
--- core-x86_64/updatedb.cron (rev 0)
+++ core-x86_64/updatedb.cron 2012-09-23 22:22:21 UTC (rev 166971)
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+NICE='nice -n 19'
+IONICE='ionice -c 2 -n 7'
+
+exec ${IONICE} ${NICE} updatedb -f proc
Deleted: core-x86_64/updatedb.cron.daily
===================================================================
--- core-x86_64/updatedb.cron.daily 2012-09-23 20:09:41 UTC (rev 166970)
+++ core-x86_64/updatedb.cron.daily 2012-09-23 22:22:21 UTC (rev 166971)
@@ -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
