From fad7e04efd4045c478db2e849bb8d457b82cdada Mon Sep 17 00:00:00 2001 From: root Date: Mon, 24 Jun 2013 00:07:29 -0700 Subject: Mon Jun 24 00:07:29 PDT 2013 --- core/e2fsprogs/PKGBUILD | 21 +++++++-------------- core/nfs-utils/PKGBUILD | 11 +++++++---- 2 files changed, 14 insertions(+), 18 deletions(-) (limited to 'core') diff --git a/core/e2fsprogs/PKGBUILD b/core/e2fsprogs/PKGBUILD index 2f2a5b09c..37a944403 100644 --- a/core/e2fsprogs/PKGBUILD +++ b/core/e2fsprogs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 187024 2013-06-03 11:15:03Z allan $ -# Maintainer: Ronald van Haren +# $Id: PKGBUILD 188851 2013-06-23 03:24:28Z foutrelis $ +# Maintainer: Ronald van Haren # Contributor: judd pkgname=e2fsprogs -pkgver=1.42.7 -pkgrel=2 +pkgver=1.42.8 +pkgrel=1 pkgdesc="Ext2/3/4 filesystem utilities" arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'MIT') @@ -16,7 +16,7 @@ source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pk 'MIT-LICENSE') backup=('etc/mke2fs.conf') install=${pkgname}.install -sha1sums=('897ed5bab4f021834d00ec047ed83766d56ce0a8' +sha1sums=('79cdb2374a9c0e68f01739598679db06d546b897' 'f4a0d5b0cdb980e3fedd6f5e7dde0b0ffb7bbdfb') build() { @@ -26,7 +26,7 @@ build() { sed -i '/init\.d/s|^|#|' misc/Makefile.in ./configure --prefix=/usr --with-root-prefix="" --libdir=/usr/lib \ - --enable-elf-shlibs --disable-fsck --disable-uuidd \ + --sbindir=/usr/bin --enable-elf-shlibs --disable-fsck --disable-uuidd \ --disable-libuuid --disable-libblkid make @@ -37,7 +37,7 @@ package() { make DESTDIR="${pkgdir}" install install-libs sed -i -e 's/^AWK=.*/AWK=awk/' "${pkgdir}/usr/bin/compile_et" - + # remove references to build directory sed -i -e 's#^SS_DIR=.*#SS_DIR="/usr/share/ss"#' "${pkgdir}/usr/bin/mk_cmds" sed -i -e 's#^ET_DIR=.*#ET_DIR="/usr/share/et"#' "${pkgdir}/usr/bin/compile_et" @@ -45,11 +45,4 @@ package() { # install MIT license install -Dm644 "${srcdir}/MIT-LICENSE" \ "${pkgdir}/usr/share/licenses/${pkgname}/MIT-LICENSE" - - # usrmove - cd "$pkgdir" - mv sbin/* usr/bin/ - rmdir sbin - mv usr/sbin/* usr/bin/ - rmdir usr/sbin } diff --git a/core/nfs-utils/PKGBUILD b/core/nfs-utils/PKGBUILD index 3a1f08c0a..7822b0465 100644 --- a/core/nfs-utils/PKGBUILD +++ b/core/nfs-utils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186779 2013-05-31 07:19:12Z tpowa $ +# $Id: PKGBUILD 188861 2013-06-23 11:12:05Z tpowa $ # Maintainer: Tobias Powalowski # Contributor: John Proctor # Contributor: dibblethewrecker @@ -7,14 +7,14 @@ pkgname=nfs-utils pkgver=1.2.8 -pkgrel=6 +pkgrel=8 pkgdesc="Support programs for Network File Systems" arch=('i686' 'x86_64') url='http://nfs.sourceforge.net' license=('GPL') backup=(etc/{exports,idmapd.conf,nfsmount.conf} etc/conf.d/{nfs-common.conf,nfs-server.conf}) -depends=('glibc' 'e2fsprogs' 'rpcbind' 'libtirpc>=0.2.1' 'librpcsecgss>=0.19-2' 'nfsidmap' 'libevent>=2.0.10' 'libgssglue' 'device-mapper' 'sqlite') -makedepends=('pkgconfig' 'autoconf' 'automake') +depends=('glibc' 'e2fsprogs' 'rpcbind' 'libtirpc>=0.2.1' 'librpcsecgss>=0.19-2' 'nfsidmap' 'libevent>=2.0.10' 'libgssglue' 'device-mapper') +makedepends=('pkgconfig' 'autoconf' 'automake' 'sqlite') source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2 nfs-common.conf nfs-server.conf @@ -36,6 +36,8 @@ source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgn id_resolver.conf start-statd.patch) install=nfs-utils.install +optdepends=('sqlite: for nfsdcltrack usage') + md5sums=('6e7d97de51e428a0b8698c16ca23db77' 'f73f197a16b02c3e248488ec35c4cf43' '9cef69bc686cc5dcac23fbb51450747d' @@ -70,6 +72,7 @@ build() { ./configure --prefix=/usr --sbindir=/usr/bin --enable-nfsv4 --enable-nfsv41 --enable-gss \ --without-tcp-wrappers --with-statedir=/var/lib/nfs \ --enable-ipv6 --sysconfdir=/etc --enable-libmount-mount \ + --with-gssglue \ --enable-mountconfig --with-start-statd=/usr/bin/start-statd # move mount helpers to /usr/bin sed -i -e 's#sbindir = /sbin#sbindir = /usr/bin#g' utils/mount/Makefile -- cgit v1.2.3-54-g00ecf