From 5e43b65f3e67974c0b421f631e6b5eeec2bb393c Mon Sep 17 00:00:00 2001 From: James Meyer Date: Sun, 16 Feb 2014 17:55:51 -0600 Subject: net-tools, nfstools update binary path to /usr/bin refs #961 --- abs/core/net-tools/Makefile.patch | 17 ++ abs/core/net-tools/PKGBUILD | 41 ++- abs/core/net-tools/gcc340.patch | 46 --- .../net-tools/net-tools-1.60-2.6-compilefix.patch | 23 -- abs/core/net-tools/net-tools-1.60-miiioctl.patch | 17 -- abs/core/net-tools/net-tools-1.60-nameif.patch | 58 ---- .../net-tools/net-tools-1.60-nameif_strncpy.patch | 13 - abs/core/net-tools/net-tools.install | 12 - abs/core/net-tools/net-tools.patch | 30 -- abs/core/nfs-utils/PKGBUILD | 86 +++--- abs/core/nfs-utils/blkmapd.service | 2 +- abs/core/nfs-utils/id_resolver.conf | 1 + abs/core/nfs-utils/nfs-common | 315 --------------------- abs/core/nfs-utils/nfs-server | 299 ------------------- abs/core/nfs-utils/nfs-utils.install | 6 +- abs/core/nfs-utils/nfsd.service | 8 +- abs/core/nfs-utils/proc-fs-nfsd.mount | 2 +- abs/core/nfs-utils/rpc-gssd.service | 3 +- abs/core/nfs-utils/rpc-idmapd.service | 3 +- abs/core/nfs-utils/rpc-mountd.service | 2 +- abs/core/nfs-utils/rpc-statd.service | 3 +- abs/core/nfs-utils/rpc-svcgssd.service | 2 +- abs/core/nfs-utils/start-statd.patch | 22 +- abs/core/nilfs-utils/PKGBUILD | 15 +- 24 files changed, 112 insertions(+), 914 deletions(-) create mode 100644 abs/core/net-tools/Makefile.patch delete mode 100644 abs/core/net-tools/gcc340.patch delete mode 100644 abs/core/net-tools/net-tools-1.60-2.6-compilefix.patch delete mode 100644 abs/core/net-tools/net-tools-1.60-miiioctl.patch delete mode 100644 abs/core/net-tools/net-tools-1.60-nameif.patch delete mode 100644 abs/core/net-tools/net-tools-1.60-nameif_strncpy.patch delete mode 100644 abs/core/net-tools/net-tools.install delete mode 100644 abs/core/net-tools/net-tools.patch create mode 100644 abs/core/nfs-utils/id_resolver.conf delete mode 100644 abs/core/nfs-utils/nfs-common delete mode 100644 abs/core/nfs-utils/nfs-server diff --git a/abs/core/net-tools/Makefile.patch b/abs/core/net-tools/Makefile.patch new file mode 100644 index 0000000..aaacd6b --- /dev/null +++ b/abs/core/net-tools/Makefile.patch @@ -0,0 +1,17 @@ +--- Makefile.old 2012-08-07 22:07:58.235437087 +0200 ++++ Makefile 2012-08-07 22:10:21.192104345 +0200 +@@ -239,12 +239,12 @@ + install -m 0755 -d ${BASEDIR}/bin + install -m 0755 arp ${BASEDIR}/sbin + install -m 0755 hostname ${BASEDIR}/bin +- install -m 0755 ifconfig ${BASEDIR}/bin ++ install -m 0755 ifconfig ${BASEDIR}/sbin + install -m 0755 nameif ${BASEDIR}/sbin + install -m 0755 netstat ${BASEDIR}/bin + install -m 0755 plipconfig $(BASEDIR)/sbin + install -m 0755 rarp ${BASEDIR}/sbin +- install -m 0755 route ${BASEDIR}/bin ++ install -m 0755 route ${BASEDIR}/sbin + install -m 0755 slattach $(BASEDIR)/sbin + ifeq ($(HAVE_IP_TOOLS),1) + install -m 0755 ipmaddr $(BASEDIR)/sbin diff --git a/abs/core/net-tools/PKGBUILD b/abs/core/net-tools/PKGBUILD index 605620a..dc1a161 100644 --- a/abs/core/net-tools/PKGBUILD +++ b/abs/core/net-tools/PKGBUILD @@ -1,43 +1,40 @@ -# $Id: PKGBUILD 142384 2011-11-08 22:05:28Z ronald $ +# $Id: PKGBUILD 187035 2013-06-03 11:15:26Z allan $ # Maintainer: Ronald van Haren # Contributor: judd pkgname=net-tools -pkgver=1.60.20110819cvs -pkgrel=3 +pkgver=1.60.20130531git +pkgrel=1 pkgdesc="Configuration tools for Linux networking" -arch=(i686 x86_64) +arch=('i686' 'x86_64') license=('GPL2') -url="http://www.tazenda.demon.co.uk/phil/net-tools" +url="http://net-tools.sourceforge.net/" depends=('glibc') - -# http://www.tazenda.demon.co.uk/phil/$pkgname/$pkgname-$pkgver.tar.bz2 -# use cvs checkout instead -source=(ftp://ftp.archlinux.org/other/net-tools/net-tools-1.60.20110819cvs.tar.bz2 - net-tools-1.60-miiioctl.patch - net-tools-1.60-nameif_strncpy.patch) +makedepends=('git') +# use git snapshot currently prefered over release +source=("net-tools::git://git.code.sf.net/p/net-tools/code#commit=6a14c03f") options=(!makeflags) -install=net-tools.install -sha1sums=('02946449191ff279f9f0f7fd7bc65ae21059a2bf' - '654a96bc6575efb4a2e04b49de45d448d240eb6e' - '7888000d8fe867e58b5b00fe2bcf6c3041d716b4') +sha1sums=('SKIP') + +prepare() { + sed -i "s#/sbin#/bin#" ${srcdir}/${pkgname}/Makefile + sed -i "s#/usr##" ${srcdir}/${pkgname}/man/Makefile +} build() { - cd $srcdir/$pkgname-$pkgver - patch -Np1 -i ../net-tools-1.60-miiioctl.patch - patch -Np1 -i ${srcdir}/net-tools-1.60-nameif_strncpy.patch + cd ${srcdir}/${pkgname} yes "" | make } package() { - cd $srcdir/$pkgname-$pkgver - make BASEDIR=$pkgdir update + cd ${srcdir}/${pkgname} + make DESTDIR=${pkgdir}/usr update # the following is provided by yp-tools - rm "${pkgdir}"/bin/{nis,yp}domainname + rm "${pkgdir}"/usr/bin/{nis,yp}domainname rm "${pkgdir}"/usr/share/man/man1/{nis,yp}domainname.1 # hostname is provided by inetutils - rm "${pkgdir}"/bin/{hostname,dnsdomainname,domainname} + rm "${pkgdir}"/usr/bin/{hostname,dnsdomainname,domainname} rm -rf "${pkgdir}"/usr/share/man/man1 } diff --git a/abs/core/net-tools/gcc340.patch b/abs/core/net-tools/gcc340.patch deleted file mode 100644 index 8089bf2..0000000 --- a/abs/core/net-tools/gcc340.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -Naur net-tools-1.60-orig/hostname.c net-tools-1.60/hostname.c ---- net-tools-1.60-orig/hostname.c 2001-04-08 10:04:23.000000000 -0700 -+++ net-tools-1.60/hostname.c 2004-05-07 17:22:14.000000000 -0700 -@@ -78,6 +78,7 @@ - fprintf(stderr, _("%s: name too long\n"), program_name); - break; - default: -+ ; - } - exit(1); - } -@@ -98,6 +99,7 @@ - fprintf(stderr, _("%s: name too long\n"), program_name); - break; - default: -+ ; - } - exit(1); - }; -@@ -117,6 +119,7 @@ - fprintf(stderr, _("%s: name too long\n"), program_name); - break; - default: -+ ; - } - exit(1); - }; -@@ -174,6 +177,7 @@ - printf("%s\n", hp->h_name); - break; - default: -+ ; - } - } - -diff -Naur net-tools-1.60-orig/lib/inet_sr.c net-tools-1.60/lib/inet_sr.c ---- net-tools-1.60-orig/lib/inet_sr.c 2000-02-20 13:46:45.000000000 -0800 -+++ net-tools-1.60/lib/inet_sr.c 2004-05-07 17:20:14.000000000 -0700 -@@ -105,6 +105,7 @@ - case 2: - isnet = 0; break; - default: -+ ; - } - - /* Fill in the other fields. */ diff --git a/abs/core/net-tools/net-tools-1.60-2.6-compilefix.patch b/abs/core/net-tools/net-tools-1.60-2.6-compilefix.patch deleted file mode 100644 index 92ce901..0000000 --- a/abs/core/net-tools/net-tools-1.60-2.6-compilefix.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -ruN net-tools-1.60.orig/lib/x25_sr.c net-tools-1.60/lib/x25_sr.c ---- net-tools-1.60.orig/lib/x25_sr.c 2000-05-20 15:38:10.000000000 +0200 -+++ net-tools-1.60/lib/x25_sr.c 2003-10-18 20:33:31.927574928 +0200 -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -77,7 +78,11 @@ - rt.sigdigits=sigdigits; - - /* x25_route_struct.address isn't type struct sockaddr_x25, Why? */ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) - memcpy(&rt.address, &sx25.sx25_addr, sizeof(x25_address)); -+#else -+ memcpy(&rt.address, &sx25.sx25_addr, sizeof(struct x25_address)); -+#endif - - while (*args) { - if (!strcmp(*args,"device") || !strcmp(*args,"dev")) { diff --git a/abs/core/net-tools/net-tools-1.60-miiioctl.patch b/abs/core/net-tools/net-tools-1.60-miiioctl.patch deleted file mode 100644 index 6c7f069..0000000 --- a/abs/core/net-tools/net-tools-1.60-miiioctl.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- net-tools-1.60.20110819cvs/include/mii.h 2011-08-19 10:14:00.743873299 +0200 -+++ net-tools-1.60.20110819cvs/include/mii.h.new 2011-08-19 10:28:26.500524160 +0200 -@@ -14,11 +14,9 @@ - /* network interface ioctl's for MII commands */ - #ifndef SIOCGMIIPHY - #warning "SIOCGMIIPHY is not defined by your kernel source" --#define SIOCGMIIPHY (SIOCDEVPRIVATE) /* Read from current PHY */ --#define SIOCGMIIREG (SIOCDEVPRIVATE+1) /* Read any PHY register */ --#define SIOCSMIIREG (SIOCDEVPRIVATE+2) /* Write any PHY register */ --#define SIOCGPARAMS (SIOCDEVPRIVATE+3) /* Read operational parameters */ --#define SIOCSPARAMS (SIOCDEVPRIVATE+4) /* Set operational parameters */ -+#define SIOCGMIIPHY 0x8947 /* Read from current PHY */ -+#define SIOCGMIIREG 0x8948 /* Read any PHY register */ -+#define SIOCSMIIREG 0x8949 /* Write any PHY register */ - #endif - - #include diff --git a/abs/core/net-tools/net-tools-1.60-nameif.patch b/abs/core/net-tools/net-tools-1.60-nameif.patch deleted file mode 100644 index 54def00..0000000 --- a/abs/core/net-tools/net-tools-1.60-nameif.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- net-tools-1.60/nameif.c.nameif 2000-10-18 19:26:29.000000000 +0200 -+++ net-tools-1.60/nameif.c 2003-03-19 11:02:01.000000000 +0100 -@@ -117,7 +117,8 @@ - } - - struct change { -- struct change *next,**pprev; -+ struct change *next; -+ int found; - char ifname[IFNAMSIZ+1]; - unsigned char mac[6]; - }; -@@ -139,10 +140,7 @@ - ch->ifname, pos); - if (parsemac(p,ch->mac) < 0) - complain(_("cannot parse MAC `%s' at %s"), p, pos); -- if (clist) -- clist->pprev = &ch->next; - ch->next = clist; -- ch->pprev = &clist; - clist = ch; - return 0; - } -@@ -200,7 +198,7 @@ - - void usage(void) - { -- fprintf(stderr, _("usage: nameif [-c configurationfile] [-s] {ifname macaddress}")); -+ fprintf(stderr, _("usage: nameif [-c configurationfile] [-s] {ifname macaddress}\n")); - exit(1); - } - -@@ -277,21 +275,21 @@ - ch = lookupmac(mac); - if (!ch) - continue; -- -- *ch->pprev = ch->next; -+ -+ ch->found = 1; - if (strcmp(p, ch->ifname)) { - if (setname(p, ch->ifname) < 0) - complain(_("cannot change name of %s to %s: %s"), - p, ch->ifname, strerror(errno)); - } -- free(ch); - } - fclose(ifh); - - while (clist) { - struct change *ch = clist; - clist = clist->next; -- warning(_("interface '%s' not found"), ch->ifname); -+ if (!ch->found) -+ warning(_("interface '%s' not found"), ch->ifname); - free(ch); - } - diff --git a/abs/core/net-tools/net-tools-1.60-nameif_strncpy.patch b/abs/core/net-tools/net-tools-1.60-nameif_strncpy.patch deleted file mode 100644 index 7568e21..0000000 --- a/abs/core/net-tools/net-tools-1.60-nameif_strncpy.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- net-tools-1.60/nameif.c.ncpy 2006-10-03 14:24:21.000000000 +0200 -+++ net-tools-1.60/nameif.c 2006-10-03 14:22:43.000000000 +0200 -@@ -100,8 +100,8 @@ - struct ifreq ifr; - opensock(); - memset(&ifr,0,sizeof(struct ifreq)); -- strcpy(ifr.ifr_name, oldname); -- strcpy(ifr.ifr_newname, newname); -+ strncpy(ifr.ifr_name, oldname, IF_NAMESIZE); -+ strncpy(ifr.ifr_newname, newname, IF_NAMESIZE); - return ioctl(ctl_sk, SIOCSIFNAME, &ifr); - } - diff --git a/abs/core/net-tools/net-tools.install b/abs/core/net-tools/net-tools.install deleted file mode 100644 index 9eee9e5..0000000 --- a/abs/core/net-tools/net-tools.install +++ /dev/null @@ -1,12 +0,0 @@ -post_upgrade() { - if [ "$(vercmp $2 1.60-16)" -lt 0 ]; then - echo "hostname and {,yp,nis}domainname has moved:" - echo "----------" - echo "hostname is now in coreutils" - echo "domainname is now in yp-tools" - echo "their functionality might have changed slightly" - echo "" - echo "dnsdomainname remains in net-tools" - echo "----------" - fi -} diff --git a/abs/core/net-tools/net-tools.patch b/abs/core/net-tools/net-tools.patch deleted file mode 100644 index 8af2d21..0000000 --- a/abs/core/net-tools/net-tools.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -Naur net-tools-1.60-orig/mii-tool.c net-tools-1.60/mii-tool.c ---- net-tools-1.60-orig/mii-tool.c 2000-05-21 07:31:17.000000000 -0700 -+++ net-tools-1.60/mii-tool.c 2004-05-31 12:35:21.000000000 -0700 -@@ -379,16 +379,16 @@ - /*--------------------------------------------------------------------*/ - - const char *usage = --"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...] -- -V, --version display version information -- -v, --verbose more verbose output -- -R, --reset reset MII to poweron state -- -r, --restart restart autonegotiation -- -w, --watch monitor for link status changes -- -l, --log with -w, write events to syslog -- -A, --advertise=media,... advertise only specified media -- -F, --force=media force specified media technology --media: 100baseT4, 100baseTx-FD, 100baseTx-HD, 10baseT-FD, 10baseT-HD, -+"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...]\n\ -+ -V, --version display version information\n\ -+ -v, --verbose more verbose output\n\ -+ -R, --reset reset MII to poweron state\n\ -+ -r, --restart restart autonegotiation\n\ -+ -w, --watch monitor for link status changes\n\ -+ -l, --log with -w, write events to syslog\n\ -+ -A, --advertise=media,... advertise only specified media\n\ -+ -F, --force=media force specified media technology\n\ -+media: 100baseT4, 100baseTx-FD, 100baseTx-HD, 10baseT-FD, 10baseT-HD,\n\ - (to advertise both HD and FD) 100baseTx, 10baseT\n"; - - int main(int argc, char **argv) diff --git a/abs/core/nfs-utils/PKGBUILD b/abs/core/nfs-utils/PKGBUILD index a6ac7ff..b94b840 100644 --- a/abs/core/nfs-utils/PKGBUILD +++ b/abs/core/nfs-utils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 160027 2012-05-28 10:26:22Z tpowa $ +# $Id: PKGBUILD 200306 2013-11-25 08:16:32Z tpowa $ # Maintainer: Tobias Powalowski # Contributor: John Proctor # Contributor: dibblethewrecker @@ -6,7 +6,7 @@ # Contributor: Marco Lima pkgname=nfs-utils -pkgver=1.2.6 +pkgver=1.2.9 pkgrel=1 pkgdesc="Support programs for Network File Systems" arch=('i686' 'x86_64') @@ -14,15 +14,12 @@ 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') -makedepends=('pkgconfig' 'autoconf' 'automake') +makedepends=('pkgconfig' 'autoconf' 'automake' 'sqlite') 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 - start-statd.patch nfs nfs-utils-1.1.4-mtab-sym.patch nfs-utils-1.1.4-no-exec.patch @@ -35,57 +32,43 @@ source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgn var-lib-nfs-rpc_pipefs.mount proc-fs-nfsd.mount blkmapd.service - nfs-utils.conf) + nfs-utils.conf + id_resolver.conf + start-statd.patch) install=nfs-utils.install -md5sums=('8be543ca270c2234ff18f8c8d35e0d37' - 'dd0d65fc6e8f422fa12520813098264b' - 'f73f197a16b02c3e248488ec35c4cf43' - 'e619f18354ff958ed624d05d08853d8f' - '9cef69bc686cc5dcac23fbb51450747d' - 'ff585faf410a62c4333a027c50b56bae' - 'eb4f4027fab6fc1201f1ca04f5954c76' - 'e9144277a89a620d9bc80413158a7d27' - 'f5e7bba09a46c5c5d7007cac6eff9df5' - '7674106eaaa4c149bccd4f05fe3604e9' - '4f4827dfc93008dfadd0a530ad0872b2' - '38855936dc55a5afe37d84edc0f11066' - '965311784d49a7d126d512cadbe91deb' - 'e05705d9ccccaeaeb1ecaee20adc05bc' - 'd7df7bc311fd95c5b80017dd1741570d' - '2e72ee082cba5d3ec6f51d2a105664da' - '5d33d2e754fd37280365b287603bac90' - '1cd65909fa0983047f3f06a3ab352401' - '02a34835aa077146a90eb7d191e612d0' - '8ffc2ebe932d29efe17d6f3f23d5b975' - '8ac484023d786766d287ccbe878ae4ba') +optdepends=('sqlite: for nfsdcltrack usage') -build() { + +prepare() { cd $srcdir/${pkgname}-${pkgver} patch -Np1 -i ../nfs-utils-1.1.4-mtab-sym.patch + # fix /usr/bin in start-statd shell script + patch -Np1 -i ../start-statd.patch #patch -Np1 -i ../nfs-utils-1.1.4-no-exec.patch - # arch specific patch - patch -Np0 -i $srcdir/start-statd.patch +} - ./configure --prefix=/usr --enable-nfsv4 --enable-nfsv41 --enable-gss \ +build() { + cd $srcdir/${pkgname}-${pkgver} + ./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 \ - --enable-mountconfig - + --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 + # move osd_login to /usr/bin + sed -i -e 's#sbindir = /sbin#sbindir = /usr/bin#g' utils/osd_login/Makefile make } package() { cd $srcdir/${pkgname}-${pkgver} # fix make install - mkdir -p $pkgdir/sbin make DESTDIR=$pkgdir install # support python2 (FS#25120) - sed -i '1s/python$/python2/' "$pkgdir"/usr/sbin/{nfsiostat,mountstats} + sed -i '1s/python$/python2/' "$pkgdir"/usr/bin/{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 @@ -93,6 +76,8 @@ package() { install -D -m 644 ../nfs-server.conf "$pkgdir/"etc/conf.d/nfs-server.conf install -D -m 644 ../nfs "$pkgdir/"etc/conf.d/nfs install -D -m 644 utils/mount/nfsmount.conf "$pkgdir/"etc/nfsmount.conf + # keyutils id_resolver #35463 + install -D -m 644 ../id_resolver.conf "$pkgdir/"etc/request-key.d/id_resolver.conf # systemd files for i in ${srcdir}/*.{service,mount}; do install -D -m 644 $i "$pkgdir/usr/lib/systemd/system/${i##*/}" @@ -100,6 +85,27 @@ package() { install -D -m 644 ../nfs-utils.conf "$pkgdir/"usr/lib/modules-load.d/nfs-utils.conf # directories mkdir "$pkgdir/"etc/exports.d - mkdir "$pkgdir/"var/lib/nfs/rpc_pipefs + mkdir -m 555 "$pkgdir/"var/lib/nfs/rpc_pipefs mkdir "$pkgdir/"var/lib/nfs/v4recovery } + +md5sums=('18869d16db3f49c053f8c68eba3fe2e0' + 'f73f197a16b02c3e248488ec35c4cf43' + '9cef69bc686cc5dcac23fbb51450747d' + 'ff585faf410a62c4333a027c50b56bae' + 'eb4f4027fab6fc1201f1ca04f5954c76' + 'f5e7bba09a46c5c5d7007cac6eff9df5' + '7674106eaaa4c149bccd4f05fe3604e9' + '4f4827dfc93008dfadd0a530ad0872b2' + '6aeb4a80b2a5162f5951438474ea22f3' + 'ff95ad9275ef774e0a2ea8adfe55ee66' + '2e991f0e440b4809e22b6c7689544fc0' + '42d0088add3beab0284be1379391382b' + '60d82e2d2d19d21ceb72665e54bf913e' + '3bcc9901478f4f9ea0a03b67171c13e3' + '1cd65909fa0983047f3f06a3ab352401' + '8f1b5282795895c9b8ce8430d20cdda6' + '8f03e708b230619ffc2a799a48bffb53' + '8ac484023d786766d287ccbe878ae4ba' + 'bed57f7c3911af695ec7b469248c104a' + 'f8bb29c2ca1ce178e6371091a3e1090d') diff --git a/abs/core/nfs-utils/blkmapd.service b/abs/core/nfs-utils/blkmapd.service index 16cb68b..fa7ce39 100644 --- a/abs/core/nfs-utils/blkmapd.service +++ b/abs/core/nfs-utils/blkmapd.service @@ -5,7 +5,7 @@ Requires=var-lib-nfs-rpc_pipefs.mount [Service] Type=forking -ExecStart=/usr/sbin/blkmapd +ExecStart=/usr/bin/blkmapd [Install] WantedBy=multi-user.target diff --git a/abs/core/nfs-utils/id_resolver.conf b/abs/core/nfs-utils/id_resolver.conf new file mode 100644 index 0000000..9c0fee3 --- /dev/null +++ b/abs/core/nfs-utils/id_resolver.conf @@ -0,0 +1 @@ +create id_resolver * * /usr/bin/nfsidmap %k %d \ No newline at end of file diff --git a/abs/core/nfs-utils/nfs-common b/abs/core/nfs-utils/nfs-common deleted file mode 100644 index 7b16b4b..0000000 --- a/abs/core/nfs-utils/nfs-common +++ /dev/null @@ -1,315 +0,0 @@ -#!/bin/bash - -daemon_name=nfs-common - -NEED_STATD= -STATD_OPTS= -NEED_IDMAPD= -IDMAPD_OPTS= -NEED_GSSD= -GSSD_OPTS= -PIPEFS_MOUNTPOINT= -PIPEFS_MOUNTOPTS= - -# rpc.statd daemon & binary location -STATD_DAEMON_NAME=rpc.statd -STATD="/usr/sbin/rpc.statd" - -# rpc.idmapd daemon & binary location -IDMAPD_DAEMON_NAME=rpc.idmapd -IDMAPD="/usr/sbin/rpc.idmapd" - -# rpc.gssd daemon & binary location -GSSD_DAEMON_NAME=rpc.gssd -GSSD="/usr/sbin/rpc.gssd" - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/$daemon_name.conf - -# Default mountpoint and options for rpc_pipefs filesystem -[ -z "$PIPEFS_MOUNTPOINT" ] && PIPEFS_MOUNTPOINT="/var/lib/nfs/rpc_pipefs" -[ -z "$PIPEFS_MOUNTOPTS" ] && PIPEFS_MOUNTOPTS="defaults" - -# Parse the fstab file, and determine whether we need idmapd and gssd. (The -# /etc/conf.d/nfs-common settings, if any, will override our autodetection.) -AUTO_NEED_IDMAPD=no -AUTO_NEED_GSSD=no - -if [ -f /etc/fstab ]; then - exec 9<&0 /dev/null ; then - return 1 - fi - - if grep -vw "$1" /proc/mounts &> /dev/null ; then - if ! mountpoint -q "$2" ; then - mount -t "$1" "$1" "$2" -o "$3" - return - fi - fi - return 0 -} - -do_umount() { - if mountpoint -q "$1" ; then - umount "$1" - fi - return 0 -} - -get_pid() { - pidof -o %PPID "$1" -} - -case "$1" in - start) - ck_daemon rpcbind && { echo -n "Start rpcbind first." >&2; stat_die; } - rc=0 - if [ "$NEED_STATD" = yes ]; then - stat_busy "Starting $STATD_DAEMON_NAME daemon" - PID=$(get_pid $STATD) - if [ -z "$PID" ]; then - [ -f /var/run/$STATD_DAEMON_NAME.pid ] && rm -f /var/run/$STATD_DAEMON_NAME.pid - # RUN - $STATD $STATD_OPTS - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - echo $(get_pid $STATD) > /var/run/$STATD_DAEMON_NAME.pid - stat_done - fi - else - stat_fail - exit 1 - fi - # Run sm-notify - /usr/sbin/sm-notify $SMNOTIFY_OPTS - fi - - if [ "$NEED_IDMAPD" = yes ] || [ "$NEED_GSSD" = yes ]; then - stat_busy "Mounting pipefs filesystem" - do_modprobe sunrpc - do_modprobe nfs - do_modprobe nfsd - do_mount rpc_pipefs "$PIPEFS_MOUNTPOINT" "$PIPEFS_MOUNTOPTS" - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - stat_done - fi - - if [ "$NEED_IDMAPD" = yes ]; then - stat_busy "Starting $IDMAPD_DAEMON_NAME daemon" - PID=$(get_pid $IDMAPD) - if [ -z "$PID" ]; then - [ -f /var/run/$IDMAPD_DAEMON_NAME.pid ] && rm -f /var/run/$IDMAPD_DAEMON_NAME.pid - # RUN - $IDMAPD $IDMAPD_OPTS - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - echo $(get_pid $IDMAPD) > /var/run/$IDMAPD_DAEMON_NAME.pid - stat_done - fi - else - stat_fail - exit 1 - fi - fi - - if [ "$NEED_GSSD" = yes ]; then - do_modprobe rpcsec_gss_krb5 - stat_busy "Starting $GSSD_DAEMON_NAME daemon" - PID=$(get_pid $GSSD) - if [ -z "$PID" ]; then - [ -f /var/run/$GSSD_DAEMON_NAME.pid ] && rm -f /var/run/$GSSD_DAEMON_NAME.pid - # RUN - $GSSD $GSSD_OPTS - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - echo $(get_pid $GSSD) > /var/run/$GSSD_DAEMON_NAME.pid - stat_done - fi - else - stat_fail - exit 1 - fi - fi - fi - - add_daemon $daemon_name - ;; - - stop) - rc=0 - if [ "$NEED_IDMAPD" = yes ] || [ "$NEED_GSSD" = yes ]; then - - if [ "$NEED_GSSD" = yes ]; then - stat_busy "Stopping $GSSD_DAEMON_NAME daemon" - PID=$(get_pid $GSSD) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - rm -f /var/run/$GSSD_DAEMON_NAME.pid &> /dev/null - stat_done - fi - fi - - if [ "$NEED_IDMAPD" = yes ]; then - stat_busy "Stopping $IDMAPD_DAEMON_NAME daemon" - PID=$(get_pid $IDMAPD) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - rm -f /var/run/$IDMAPD_DAEMON_NAME.pid &> /dev/null - stat_done - fi - fi - do_umount "$PIPEFS_MOUNTPOINT" 2>/dev/null || true - fi - - if [ "$NEED_STATD" = yes ]; then - stat_busy "Stopping $STATD_DAEMON_NAME daemon" - PID=$(get_pid $STATD) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - rm -f /var/run/$STATD_DAEMON_NAME.pid &> /dev/null - stat_done - fi - fi - - rm_daemon $daemon_name - ;; - - status) - stat_busy "Checking $daemon_name status"; - ck_status $daemon_name - - if [ "$NEED_STATD" = yes ]; then - stat_busy "Daemon $STATD_DAEMON_NAME running" - PID=$(get_pid $STATD) - if [ -z "$PID" ]; then - stat_fail - else - stat_done - fi - fi - - if [ "$NEED_GSSD" = yes ]; then - stat_busy "Daemon $GSSD_DAEMON_NAME running" - PID=$(get_pid $GSSD) - if [ -z "$PID" ]; then - stat_fail - else - stat_done - fi - fi - - if [ "$NEED_IDMAPD" = yes ]; then - stat_busy "Daemon $IDMAPD_DAEMON_NAME running" - PID=$(get_pid $IDMAPD) - if [ -z "$PID" ]; then - stat_fail - else - stat_done - fi - fi - echo - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|status|restart}" -esac -exit 0 - diff --git a/abs/core/nfs-utils/nfs-server b/abs/core/nfs-utils/nfs-server deleted file mode 100644 index 6aa609d..0000000 --- a/abs/core/nfs-utils/nfs-server +++ /dev/null @@ -1,299 +0,0 @@ -#!/bin/bash - -daemon_name=nfs-server - -NFSD_COUNT= -NFSD_OPTS= -NEED_SVCGSSD= -SVCGSSD_OPTS= -MOUNTD_OPTS= -PROCNFSD_MOUNTPOINT= -PROCNFSD_MOUNTOPTS= - -# rpc.nfsd daemon & binary location -NFSD_PROCESS_NAME=nfsd -NFSD_DAEMON_NAME=rpc.nfsd -NFSD="/usr/sbin/rpc.nfsd" - -# rpc.svcgssd daemon & binary location -SVCGSSD_DAEMON_NAME=rpc.svcgssd -SVCGSSD="/usr/sbin/rpc.svcgssd" - -# rpc.idmapd daemon & binary location -IDMAPD_DAEMON_NAME=rpc.idmapd -IDMAPD="/usr/sbin/rpc.idmapd" - -# rpc.mountd daemon & binary location -MOUNTD_DAEMON_NAME=rpc.mountd -MOUNTD="/usr/sbin/rpc.mountd" - -# exortfs binary location -EXPORTFS="/usr/sbin/exportfs" - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/$daemon_name.conf - -# Default number of nfsd servers -[ -z "$NFSD_COUNT" ] && NFSD_COUNT=8 - -# Default mountpoint and options for nfsd filesystem -[ -z "$PROCNFSD_MOUNTPOINT" ] && PROCNFSD_MOUNTPOINT="/proc/fs/nfsd" -[ -z "$PROCNFSD_MOUNTOPTS" ] && PROCNFSD_MOUNTOPTS="rw,nodev,noexec,nosuid" - -case "$NEED_SVCGSSD" in - yes|no) - ;; - *) - NEED_SVCGSSD=no - ;; -esac - -do_modprobe() { - if [ -x /sbin/modprobe -a -f /proc/modules ]; then - modprobe -q "$1" || true - fi -} - -do_mount() { - if ! grep -E "$1\$" /proc/filesystems &> /dev/null ; then - return 1 - fi - - if grep -vw "$1" /proc/mounts &> /dev/null ; then - if ! mountpoint -q "$2" ; then - mount -t "$1" "$1" "$2" -o "$3" - return - fi - fi - return 0 -} - -do_umount() { - if mountpoint -q "$1" ; then - umount "$1" - fi - return 0 -} - -get_pid() { - pidof -o %PPID "$1" -} - -case "$1" in - start) - ck_daemon nfs-common && { echo -n "Start nfs-common first." >&2; stat_die; } - rc=0 - stat_busy "Mounting nfsd filesystem" - do_modprobe nfsd - do_mount nfsd "$PROCNFSD_MOUNTPOINT" "$PROCNFSD_MOUNTOPTS" - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - stat_done - fi - - stat_busy "Exporting all directories" - $EXPORTFS -r - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - stat_done - fi - - stat_busy "Starting $NFSD_DAEMON_NAME daemon" - PID=$(get_pid $NFSD_PROCESS_NAME) - if [ -z "$PID" ]; then - [ -f /var/run/$NFSD_DAEMON_NAME.pid ] && rm -f /var/run/$NFSD_DAEMON_NAME.pid - # RUN - $NFSD $NFSD_OPTS $NFSD_COUNT - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - echo $(get_pid $NFSD_PROCESS_NAME) > /var/run/$NFSD_DAEMON_NAME.pid - stat_done - fi - else - stat_fail - exit 1 - fi - - if [ "$NEED_SVCGSSD" = yes ]; then - do_modprobe rpcsec_gss_krb5 - stat_busy "Starting $SVCGSSD_DAEMON_NAME daemon" - PID=$(get_pid $SVCGSSD) - if [ -z "$PID" ]; then - [ -f /var/run/$SVCGSSD_DAEMON_NAME.pid ] && rm -f /var/run/$SVCGSSD_DAEMON_NAME.pid - # RUN - $SVCGSSD $SVCGSSD_OPTS - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - echo $(get_pid $SVCGSSD) > /var/run/$SVCGSSD_DAEMON_NAME.pid - stat_done - fi - else - stat_fail - exit 1 - fi - fi - - PID=$(get_pid $IDMAPD) - [ ! -z "$PID" ] && kill -SIGHUP $IDMAPD_DAEMON_NAME &> /dev/null - - stat_busy "Starting $MOUNTD_DAEMON_NAME daemon" - PID=$(get_pid $MOUNTD) - if [ -z "$PID" ]; then - [ -f /var/run/$MOUNTD_DAEMON_NAME.pid ] && rm -f /var/run/$MOUNTD_DAEMON_NAME.pid - # RUN - $MOUNTD $MOUNTD_OPTS - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - echo $(get_pid $MOUNTD) > /var/run/$MOUNTD_DAEMON_NAME.pid - stat_done - fi - else - stat_fail - exit 1 - fi - - add_daemon $daemon_name - ;; - - stop) - rc=0 - stat_busy "Stopping $MOUNTD_DAEMON_NAME daemon" - PID=$(get_pid $MOUNTD) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - rm -f /var/run/$MOUNTD_DAEMON_NAME.pid &> /dev/null - stat_done - fi - - if [ "$NEED_SVCGSSD" = yes ]; then - stat_busy "Stopping $SVCGSSD_DAEMON_NAME daemon" - PID=$(get_pid $SVCGSSD) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - rm -f /var/run/$SVCGSSD_DAEMON_NAME.pid &> /dev/null - stat_done - fi - fi - - stat_busy "Stopping $NFSD_DAEMON_NAME daemon" - PID=$(get_pid $NFSD_PROCESS_NAME) - # KILL (SIGINT) - [ ! -z "$PID" ] && kill -2 $PID &> /dev/null - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - sleep 1 - PID=$(get_pid $NFSD_PROCESS_NAME) - # KILL (KILL) - just to be sure - [ ! -z "$PID" ] && kill -9 $PID &> /dev/null - # - rm -f /var/run/$NFSD_DAEMON_NAME.pid &> /dev/null - stat_done - fi - - stat_busy "Unexporting all directories" - $EXPORTFS -au - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - stat_done - fi - - # flush everything out of the kernels export table - if mountpoint -q "$PROCNFSD_MOUNTPOINT" ; then - $EXPORTFS -f - fi - do_umount "$PROCNFSD_MOUNTPOINT" 2>/dev/null || true - rm_daemon $daemon_name - ;; - - status) - stat_busy "Checking $daemon_name status"; - ck_status $daemon_name - - stat_busy "Daemon $NFSD_DAEMON_NAME running" - PID=$(get_pid $NFSD_PROCESS_NAME) - if [ -z "$PID" ]; then - stat_fail - else - stat_done - fi - - stat_busy "Daemon $MOUNTD_DAEMON_NAME running" - PID=$(get_pid $MOUNTD) - if [ -z "$PID" ]; then - stat_fail - else - stat_done - fi - - if [ "$NEED_SVCGSSD" = yes ]; then - stat_busy "Daemon $SVCGSSD_DAEMON_NAME running" - PID=$(get_pid $SVCGSSD) - if [ -z "$PID" ]; then - stat_fail - else - stat_done - fi - fi - echo - ;; - - reload) - rc=0 - stat_busy "Re-exporting all directories" - $EXPORTFS -r - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - stat_done - fi - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|status|reload|restart}" -esac -exit 0 diff --git a/abs/core/nfs-utils/nfs-utils.install b/abs/core/nfs-utils/nfs-utils.install index 7dcdf95..f6c72d9 100644 --- a/abs/core/nfs-utils/nfs-utils.install +++ b/abs/core/nfs-utils/nfs-utils.install @@ -5,9 +5,9 @@ cat << 'EOM' ==> Extended configuration options for NFS (clients & server) are available in ==> /etc/conf.d/nfs-common.conf and in /etc/conf.d/nfs-server.conf ==> - ==> Please refer to http://wiki.archlinux.org/index.php/Nfs - ==> for further information on NFS; for NFSv4, refer to - ==> http://wiki.archlinux.org/index.php/NFSv4 + ==> Please refer to http://wiki.archlinux.org/index.php/NFS + ==> for further information on NFS4; for NFSv3, refer to + ==> http://wiki.archlinux.org/index.php/NFSv3 EOM } diff --git a/abs/core/nfs-utils/nfsd.service b/abs/core/nfs-utils/nfsd.service index e5481c3..d63e490 100644 --- a/abs/core/nfs-utils/nfsd.service +++ b/abs/core/nfs-utils/nfsd.service @@ -6,10 +6,10 @@ Requires=rpcbind.service [Service] Type=oneshot EnvironmentFile=/etc/conf.d/nfs-server.conf -ExecStart=/usr/sbin/rpc.nfsd $NFSD_OPTS $NFSD_COUNT -ExecStartPost=/usr/sbin/exportfs -a -ExecStop=/usr/sbin/rpc.nfsd 0 -ExecStopPost=/usr/sbin/exportfs -a -u +ExecStart=/usr/bin/rpc.nfsd $NFSD_OPTS $NFSD_COUNT +ExecStartPost=/usr/bin/exportfs -a +ExecStop=/usr/bin/rpc.nfsd 0 +ExecStopPost=/usr/bin/exportfs -a -u RemainAfterExit=yes [Install] diff --git a/abs/core/nfs-utils/proc-fs-nfsd.mount b/abs/core/nfs-utils/proc-fs-nfsd.mount index f8664a8..e5ee6fb 100644 --- a/abs/core/nfs-utils/proc-fs-nfsd.mount +++ b/abs/core/nfs-utils/proc-fs-nfsd.mount @@ -5,4 +5,4 @@ DefaultDependencies=no [Mount] What=sunrpc Where=/proc/fs/nfsd -Type=rpc_pipefs +Type=nfsd diff --git a/abs/core/nfs-utils/rpc-gssd.service b/abs/core/nfs-utils/rpc-gssd.service index 446864d..182d9b7 100644 --- a/abs/core/nfs-utils/rpc-gssd.service +++ b/abs/core/nfs-utils/rpc-gssd.service @@ -2,11 +2,12 @@ Description=RPC GSS-API client-side daemon After=rpcbind.service var-lib-nfs-rpc_pipefs.mount Requires=rpcbind.service var-lib-nfs-rpc_pipefs.mount +Before=remote-fs-pre.target [Service] Type=forking EnvironmentFile=/etc/conf.d/nfs-common.conf -ExecStart=/usr/sbin/rpc.gssd $GSSD_OPTS +ExecStart=/usr/bin/rpc.gssd $GSSD_OPTS [Install] WantedBy=multi-user.target diff --git a/abs/core/nfs-utils/rpc-idmapd.service b/abs/core/nfs-utils/rpc-idmapd.service index 72cd26a..1167daf 100644 --- a/abs/core/nfs-utils/rpc-idmapd.service +++ b/abs/core/nfs-utils/rpc-idmapd.service @@ -2,11 +2,12 @@ Description=NFSv4 ID-name mapping daemon After=var-lib-nfs-rpc_pipefs.mount nfsd.service Requires=var-lib-nfs-rpc_pipefs.mount +Before=remote-fs-pre.target [Service] Type=forking EnvironmentFile=/etc/conf.d/nfs-common.conf -ExecStart=/usr/sbin/rpc.idmapd $IDMAPD_OPTS +ExecStart=/usr/bin/rpc.idmapd $IDMAPD_OPTS [Install] WantedBy=multi-user.target diff --git a/abs/core/nfs-utils/rpc-mountd.service b/abs/core/nfs-utils/rpc-mountd.service index edd8c85..7528884 100644 --- a/abs/core/nfs-utils/rpc-mountd.service +++ b/abs/core/nfs-utils/rpc-mountd.service @@ -6,7 +6,7 @@ Requires=rpcbind.service nfsd.service [Service] Type=forking EnvironmentFile=/etc/conf.d/nfs-server.conf -ExecStart=/usr/sbin/rpc.mountd $MOUNTD_OPTS +ExecStart=/usr/bin/rpc.mountd $MOUNTD_OPTS [Install] WantedBy=multi-user.target diff --git a/abs/core/nfs-utils/rpc-statd.service b/abs/core/nfs-utils/rpc-statd.service index 983b404..c2fd63b 100644 --- a/abs/core/nfs-utils/rpc-statd.service +++ b/abs/core/nfs-utils/rpc-statd.service @@ -2,11 +2,12 @@ Description=NFSv2/3 Network Status Monitor Daemon After=rpcbind.service Requires=rpcbind.service +Before=remote-fs-pre.target [Service] Type=forking EnvironmentFile=/etc/conf.d/nfs-common.conf -ExecStart=/usr/sbin/rpc.statd $STATD_OPTS +ExecStart=/usr/bin/rpc.statd $STATD_OPTS [Install] WantedBy=multi-user.target diff --git a/abs/core/nfs-utils/rpc-svcgssd.service b/abs/core/nfs-utils/rpc-svcgssd.service index 8152e83..876bad3 100644 --- a/abs/core/nfs-utils/rpc-svcgssd.service +++ b/abs/core/nfs-utils/rpc-svcgssd.service @@ -6,7 +6,7 @@ Requires=rpcbind.service [Service] Type=forking EnvironmentFile=/etc/conf.d/nfs-server.conf -ExecStart=/usr/sbin/rpc.svcgssd $SVCGSSD_OPTS +ExecStart=/usr/bin/rpc.svcgssd $SVCGSSD_OPTS [Install] WantedBy=multi-user.target diff --git a/abs/core/nfs-utils/start-statd.patch b/abs/core/nfs-utils/start-statd.patch index 5d73b6e..6f6f119 100644 --- a/abs/core/nfs-utils/start-statd.patch +++ b/abs/core/nfs-utils/start-statd.patch @@ -1,22 +1,10 @@ ---- utils/statd/start-statd 2007-05-11 04:40:57.000000000 +0100 -+++ utils/statd/start-statd.new 2007-09-21 17:11:34.000000000 +0100 -@@ -1,9 +1,16 @@ --#!/bin/bash -p -+#!/bin/sh -+ -+# Original script provided by the NFS project -+# Modified for Arch Linux by Tom Killian -+ - # nfsmount calls this script when mounting a filesystem with locking - # enabled, but when statd does not seem to be running (based on +--- nfs-utils-1.2.8/utils/statd/start-statd.old 2013-05-23 11:35:10.408221686 +0200 ++++ nfs-utils-1.2.8/utils/statd/start-statd 2013-05-23 11:35:22.191356904 +0200 +@@ -4,6 +4,6 @@ # /var/run/rpc.statd.pid). # It should run statd with whatever flags are apropriate for this # site. -PATH=/sbin:/usr/sbin --exec rpc.statd --no-notify -+ -+# source application-specific settings -+[ -f /etc/conf.d/nfs-common.conf ] && . /etc/conf.d/nfs-common.conf -+ -+exec /usr/sbin/rpc.statd $STATD_OPTS ++PATH=/sbin:/usr/sbin:/usr/bin + exec rpc.statd --no-notify diff --git a/abs/core/nilfs-utils/PKGBUILD b/abs/core/nilfs-utils/PKGBUILD index f943a0d..f86b6b5 100644 --- a/abs/core/nilfs-utils/PKGBUILD +++ b/abs/core/nilfs-utils/PKGBUILD @@ -1,27 +1,26 @@ -# $Id: PKGBUILD 163896 2012-07-21 19:19:52Z ibiru $ -# Maintainer : Ionut Biru +# $Id: PKGBUILD 197802 2013-10-30 10:38:00Z allan $ +# Maintainer: Dan McGee # Contributor: Geoffroy Carrier pkgname=nilfs-utils -pkgver=2.1.4 -pkgrel=1 +pkgver=2.1.5 +pkgrel=3 pkgdesc="A log-structured file system supporting continuous snapshotting (userspace utils)" arch=('i686' 'x86_64') url="http://www.nilfs.org/" license=('GPL2' 'LGPL2.1') backup=('etc/nilfs_cleanerd.conf') depends=('util-linux') -options=(!libtool) source=(http://www.nilfs.org/download/$pkgname-$pkgver.tar.bz2) -md5sums=('e72f941f5041a057a81a1ce22e03497d') build() { cd $pkgname-$pkgver - ./configure --enable-libmount + ./configure --sbindir=/usr/bin --enable-libmount make } package() { cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install LDCONFIG=/bin/true + make DESTDIR="$pkgdir" sbindir=/usr/bin install LDCONFIG=/bin/true } +md5sums=('f072cc53c288492061b3199d63e32177') -- cgit v0.12