Date: Saturday, October 10, 2015 @ 19:36:57 Author: andyrtr Revision: 248869
upgpkg: nfs-utils 1.3.3-1 upstream update 1.3.3 Modified: nfs-utils/trunk/PKGBUILD Deleted: nfs-utils/trunk/nfs-utils-1.3.2-statd-bg.patch nfs-utils/trunk/nfs-utils-1.3.2-statd-nowait.patch ------------------------------------+ PKGBUILD | 30 +++++++++++------------------- nfs-utils-1.3.2-statd-bg.patch | 25 ------------------------- nfs-utils-1.3.2-statd-nowait.patch | 35 ----------------------------------- 3 files changed, 11 insertions(+), 79 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-10-10 17:02:29 UTC (rev 248868) +++ PKGBUILD 2015-10-10 17:36:57 UTC (rev 248869) @@ -7,8 +7,8 @@ # Contributor: Marco Lima <cipparello gmail com> pkgname=nfs-utils -pkgver=1.3.2 -pkgrel=6 +pkgver=1.3.3 +pkgrel=1 pkgdesc="Support programs for Network File Systems" arch=('i686' 'x86_64') url='http://nfs.sourceforge.net' @@ -19,30 +19,22 @@ makedepends=('sqlite') source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.{bz2,sign} nfs-common.conf nfs-server.conf exports nfs-utils.conf id_resolver.conf - nfs-utils_env.sh - nfs-utils-1.3.2-statd-bg.patch - nfs-utils-1.3.2-statd-nowait.patch) + nfs-utils_env.sh) install=nfs-utils.install optdepends=('sqlite: for nfsdcltrack usage' 'python2: for nfsiostat and mountstats usage') -md5sums=('1e2f3c1ed468dee02d00c534c002ea10' - 'SKIP' - '95129639a19da1f262d4eb3ac73e0bdb' - '7bd61e84ee05054f5232b2e8063ea08d' - 'e6ad3c7a59c7e4c24965a0e7da35026c' - '8ac484023d786766d287ccbe878ae4ba' - '2e203f35ee753f5264a951cf43d4168e' - 'c6c9c32f153dfa6c0477ea6b99354288' - '45f55a5d581b2527b453c3a0816add24' - 'dde4e23776a2425d2a1241eb2daf8b7c') +sha1sums=('7c561e6a22a626aed93766bdb0c34e9a4e77b9e7' + 'SKIP' + '44deb1c199d89ef866d90aad47eadd3b44070b59' + '2658a0e9d9ff8e4be7b3f190f6743f5b83852f3f' + '170a929d9c0f22edb13b656648cadf372efea841' + 'c109f2300f2d841104adb09fe76a5f2583015c72' + '24b3c10b47dc120b2d252cf1e5001effa8f76a62' + '96734598a0b851da10cb9e02afb52ec55fed6273') validpgpkeys=('E1B71E339E20A10A676F7CB69AFB1D681A125177') # Steve Dickson prepare() { cd ${pkgname}-${pkgver} - # fix rpc.statd starting - patch -Np1 -i $srcdir/nfs-utils-1.3.2-statd-bg.patch - # don't wait for online target on statd - patch -Np1 -i $srcdir/nfs-utils-1.3.2-statd-nowait.patch # fix hardcoded sbin path to our needs sed -i "s|sbindir = /sbin|sbindir = /usr/bin|g" utils/*/Makefile.am Deleted: nfs-utils-1.3.2-statd-bg.patch =================================================================== --- nfs-utils-1.3.2-statd-bg.patch 2015-10-10 17:02:29 UTC (rev 248868) +++ nfs-utils-1.3.2-statd-bg.patch 2015-10-10 17:36:57 UTC (rev 248869) @@ -1,25 +0,0 @@ -commit 17a3e5bffb7110d46de1bf42b64b90713ff5ea50 -Author: Chris Mayo <aklh...@gmail.com> -Date: Sun Feb 1 12:03:46 2015 -0500 - - statd: Fix test for foreground mode - - daemon_init parameter has the opposite sense - to code removed in commit 7addf9d - - Signed-off-by: Chris Mayo <aklh...@gmail.com> - Signed-off-by: Steve Dickson <ste...@redhat.com> - -diff --git a/utils/statd/statd.c b/utils/statd/statd.c -index 60ce6d1..2b7a167 100644 ---- a/utils/statd/statd.c -+++ b/utils/statd/statd.c -@@ -393,7 +393,7 @@ int main (int argc, char **argv) - simulator (--argc, ++argv); /* simulator() does exit() */ - #endif - -- daemon_init(!(run_mode & MODE_NODAEMON)); -+ daemon_init((run_mode & MODE_NODAEMON)); - - if (run_mode & MODE_LOG_STDERR) { - xlog_syslog(0); Deleted: nfs-utils-1.3.2-statd-nowait.patch =================================================================== --- nfs-utils-1.3.2-statd-nowait.patch 2015-10-10 17:02:29 UTC (rev 248868) +++ nfs-utils-1.3.2-statd-nowait.patch 2015-10-10 17:36:57 UTC (rev 248869) @@ -1,35 +0,0 @@ -From 650633d4e956dc6b628da30c868e39fba76a0b29 Mon Sep 17 00:00:00 2001 -From: Steve Dickson <ste...@redhat.com> -Date: Mon, 9 Feb 2015 08:54:54 -0500 -Subject: [PATCH] rpc-statd-notify: Don't wait for the network to come up - -rpc-statd-notify only needs to wait for the network -interface to be configured not to be connected since -it forks into background and will wait 15mins for -the network to come up. - -This decrease boot times when networks are not -and will not be connected. - -Signed-off-by: Steve Dickson <ste...@redhat.com> -Reported-By: Eric Work <work.e...@gmail.com> ---- - systemd/rpc-statd-notify.service | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/systemd/rpc-statd-notify.service b/systemd/rpc-statd-notify.service -index 941afe5..a655445 100644 ---- a/systemd/rpc-statd-notify.service -+++ b/systemd/rpc-statd-notify.service -@@ -1,7 +1,7 @@ - [Unit] - Description=Notify NFS peers of a restart - Requires=network-online.target --After=network-online.target nss-lookup.target -+After=network.target nss-lookup.target - - # if we run an nfs server, it needs to be running before we - # tell clients that it has restarted. --- -2.1.0 -