Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	extra/gnome-nettool/PKGBUILD

3 files changed, 20 insertions, 23 deletions

diff --git a/core/ed/PKGBUILD b/core/ed/PKGBUILD
index 8909ba8b7..1644130dc 100644
--- a/core/ed/PKGBUILD
+++ b/core/ed/PKGBUILD
@@ -1,19 +1,20 @@
-# $Id: PKGBUILD 173766 2012-12-22 18:16:53Z dreisner $
+# $Id: PKGBUILD 184200 2013-05-03 13:44:53Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=ed
-pkgver=1.7
-pkgrel=2
+pkgver=1.8
+pkgrel=1
 pkgdesc="A POSIX-compliant line-oriented text editor"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.gnu.org/software/ed/ed.html"
 depends=('glibc' 'sh')
 options=('!emptydirs')
-source=(ftp://ftp.gnu.org/gnu/ed/${pkgname}-${pkgver}.tar.gz)
+source=("ftp://ftp.gnu.org/gnu/ed/$pkgname-$pkgver.tar.gz"{,.sig})
 install='ed.install'
-md5sums=('0aa4e2428e325203d0d7c3e86c961b1c')
+md5sums=('2268d2344b3c52d23730acb2e3c942fe'
+         'SKIP')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/core/nfs-utils/PKGBUILD b/core/nfs-utils/PKGBUILD
index c40aaf30a..132a2a196 100644
--- a/core/nfs-utils/PKGBUILD
+++ b/core/nfs-utils/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 175118 2013-01-14 07:37:11Z tpowa $
+# $Id: PKGBUILD 184188 2013-05-03 10:22:57Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 # Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org>
@@ -6,8 +6,8 @@
 # Contributor: Marco Lima <cipparello gmail com>
 
 pkgname=nfs-utils
-pkgver=1.2.6
-pkgrel=4
+pkgver=1.2.7
+pkgrel=1
 pkgdesc="Support programs for Network File Systems"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://nfs.sourceforge.net'
@@ -16,9 +16,7 @@ backup=(etc/{exports,idmapd.conf,nfsmount.conf} etc/conf.d/{nfs-common.conf,nfs-
 depends=('glibc' 'e2fsprogs' 'rpcbind' 'libtirpc>=0.2.1' 'librpcsecgss>=0.19-2' 'nfsidmap' 'libevent>=2.0.10' 'libgssglue' 'device-mapper')
 makedepends=('pkgconfig' 'autoconf' 'automake')
 source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2
-	nfs-common
 	nfs-common.conf
-	nfs-server
 	nfs-server.conf
 	exports
 	idmapd.conf
@@ -37,10 +35,8 @@ source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgn
 	blkmapd.service
 	nfs-utils.conf)
 install=nfs-utils.install
-md5sums=('8be543ca270c2234ff18f8c8d35e0d37'
-         'dd0d65fc6e8f422fa12520813098264b'
+md5sums=('3b5ca797197765dc0c3a4122720c7716'
          'f73f197a16b02c3e248488ec35c4cf43'
-         'e619f18354ff958ed624d05d08853d8f'
          '9cef69bc686cc5dcac23fbb51450747d'
          'ff585faf410a62c4333a027c50b56bae'
          'eb4f4027fab6fc1201f1ca04f5954c76'
@@ -59,13 +55,16 @@ md5sums=('8be543ca270c2234ff18f8c8d35e0d37'
          '8ffc2ebe932d29efe17d6f3f23d5b975'
          '8ac484023d786766d287ccbe878ae4ba')
 
-build() {
+prepare() {
   cd $srcdir/${pkgname}-${pkgver}
   patch -Np1 -i ../nfs-utils-1.1.4-mtab-sym.patch
   #patch -Np1 -i ../nfs-utils-1.1.4-no-exec.patch
   # arch specific patch
   patch -Np0 -i $srcdir/start-statd.patch
+}
 
+build() {
+  cd $srcdir/${pkgname}-${pkgver}
   ./configure --prefix=/usr --enable-nfsv4 --enable-nfsv41 --enable-gss \
               --without-tcp-wrappers --with-statedir=/var/lib/nfs \
               --enable-ipv6 --sysconfdir=/etc --enable-libmount-mount \
@@ -83,9 +82,6 @@ package() {
   # support python2 (FS#25120)
   sed -i '1s/python$/python2/' "$pkgdir"/usr/sbin/{nfsiostat,mountstats}
 
-  # NFS & NFSv4 init scripts
-  install -D -m 755 ../nfs-common "$pkgdir/"etc/rc.d/nfs-common
-  install -D -m 755 ../nfs-server "$pkgdir/"etc/rc.d/nfs-server
   # Configuration
   install -D -m 644 ../exports "$pkgdir/"etc/exports
   install -D -m 644 ../idmapd.conf "$pkgdir/"etc/idmapd.conf
diff --git a/core/pciutils/PKGBUILD b/core/pciutils/PKGBUILD
index 021049505..2327821f6 100644
--- a/core/pciutils/PKGBUILD
+++ b/core/pciutils/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 162716 2012-06-28 20:04:34Z tpowa $
+# $Id: PKGBUILD 184187 2013-05-03 10:22:45Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=pciutils
-pkgver=3.1.10
-pkgrel=1
+pkgver=3.2.0
+pkgrel=2
 pkgdesc="PCI bus configuration space access library and tools"
 arch=(i686 x86_64 'mips64el')
 license=('GPL2')
 groups=('base')
 url="http://mj.ucw.cz/sw/pciutils/"
-depends=('glibc' 'hwids')
+depends=('glibc' 'hwids' 'kmod')
 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=('cdb1e5a95ab7ac67349f10c8f77a6d3c')
+md5sums=('3fccb0b28879adb57d8156115f8003c8')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all
+  make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man lib/libpci.a 
   cp lib/libpci.a "${srcdir}/"
   make clean
   make OPT="${CFLAGS}" ZLIB=no SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all