Merge branch 'master' of ssh://gparabola/srv/git/abslibre-mips64el

3 files changed, 20 insertions, 26 deletions

diff --git a/core/mlocate/PKGBUILD b/core/mlocate/PKGBUILD
index 0f2e212e0..c45a7132a 100644
--- a/core/mlocate/PKGBUILD
+++ b/core/mlocate/PKGBUILD
@@ -1,26 +1,22 @@
-# $Id: PKGBUILD 152305 2012-03-06 15:10:37Z allan $
+# $Id: PKGBUILD 162719 2012-06-29 02:14:10Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: lydgate
 
 pkgname=mlocate
 pkgver=0.25
-pkgrel=1
+pkgrel=2
 pkgdesc="Faster merging drop-in for slocate"
 arch=('i686' 'x86_64' 'mips64el')
 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'
+         'b56d81de17fe29b01b4b28861acb8fd4'
          'cde5da81bebad2de556ef2e43d895e13')
 
 build() {
@@ -39,18 +35,17 @@ 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
+  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 -d -m750 -g21 $pkgdir/var/lib/locate
+  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
 }
diff --git a/core/mlocate/updatedb.conf b/core/mlocate/updatedb.conf
index 722b04205..633c17482 100644
--- a/core/mlocate/updatedb.conf
+++ b/core/mlocate/updatedb.conf
@@ -1,5 +1,4 @@
-# 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"
+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"
diff --git a/core/pciutils/PKGBUILD b/core/pciutils/PKGBUILD
index 987d32d9e..021049505 100644
--- a/core/pciutils/PKGBUILD
+++ b/core/pciutils/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 159402 2012-05-23 20:09:18Z tomegun $
+# $Id: PKGBUILD 162716 2012-06-28 20:04:34Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=pciutils
-pkgver=3.1.9
-pkgrel=2
+pkgver=3.1.10
+pkgrel=1
 pkgdesc="PCI bus configuration space access library and tools"
 arch=(i686 x86_64 'mips64el')
 license=('GPL2')
@@ -11,7 +11,7 @@ url="http://mj.ucw.cz/sw/pciutils/"
 depends=('glibc' 'hwids')
 source=(#ftp://ftp.kernel.org/pub/software/utils/${pkgname}/${pkgname}-${pkgver}.tar.bz2
        ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${pkgname}-${pkgver}.tar.gz)
-md5sums=('e958f5ffb93b12972964381c38f27eb3')
+md5sums=('cdb1e5a95ab7ac67349f10c8f77a6d3c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -26,5 +26,5 @@ package() {
   make SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man DESTDIR="${pkgdir}" install install-lib
   install -m644 "${srcdir}/libpci.a" "${pkgdir}/usr/lib/"
   # this is now supplied by the hwids package
-  rm -rf $pkgdir/usr/{sbin/update-pciids,share/{man/man8/update-pciids.8.gz,hwdata}}
+  rm -rf $pkgdir/usr/{sbin/update-pciids,share/{man/man8/update-pciids.8,hwdata}}
 }