nfs-utils: update to 1.2.7.

This commit is contained in:
Juan RP 2012-11-16 10:19:52 +01:00
parent 896dc9dd70
commit b41f0cfa0d
3 changed files with 8 additions and 47 deletions

View file

@ -1,3 +1,4 @@
libsqlite3.so.0
libc.so.6 libc.so.6
libtirpc.so.1 libtirpc.so.1
libcap.so.2 libcap.so.2

View file

@ -1,35 +0,0 @@
Switch to use /run directory to store pid files.
--- utils/blkmapd/device-discovery.c.orig 2012-07-09 11:20:51.221140077 +0200
+++ utils/blkmapd/device-discovery.c 2012-07-09 11:21:03.050857448 +0200
@@ -51,7 +51,7 @@
#include "device-discovery.h"
#define BL_PIPE_FILE "/var/lib/nfs/rpc_pipefs/nfs/blocklayout"
-#define PID_FILE "/var/run/blkmapd.pid"
+#define PID_FILE "/run/blkmapd.pid"
struct bl_disk *visible_disk_list;
--- utils/statd/statd.c.orig 2012-07-09 11:21:43.651887544 +0200
+++ utils/statd/statd.c 2012-07-09 11:22:02.897427788 +0200
@@ -155,7 +155,7 @@ usage(void)
fprintf(stderr," -H Specify a high-availability callout program.\n");
}
-static const char *pidfile = "/var/run/rpc.statd.pid";
+static const char *pidfile = "/run/rpc.statd.pid";
int pidfd = -1;
static void create_pidfile(void)
--- utils/statd/sm-notify.c.orig 2012-07-09 11:22:33.106706108 +0200
+++ utils/statd/sm-notify.c 2012-07-09 11:22:49.104323933 +0200
@@ -858,7 +858,7 @@ static int record_pid(void)
int fd;
(void)snprintf(pid, sizeof(pid), "%d\n", (int)getpid());
- fd = open("/var/run/sm-notify.pid", O_CREAT|O_EXCL|O_WRONLY, 0600);
+ fd = open("/run/sm-notify.pid", O_CREAT|O_EXCL|O_WRONLY, 0600);
if (fd < 0)
return 0;

View file

@ -1,22 +1,22 @@
# Template file for 'nfs-utils' # Template file for 'nfs-utils'
pkgname=nfs-utils pkgname=nfs-utils
version=1.2.6 version=1.2.7
revision=9 revision=1
build_style=gnu-configure build_style=gnu-configure
configure_args="--with-statduser=nobody --enable-gss --enable-nfsv4 configure_args="--with-statduser=nobody --enable-gss --enable-nfsv4
--with-statedir=/var/lib/nfs --enable-libmount-mount --with-statedir=/var/lib/nfs --enable-libmount-mount
--without-tcp-wrappers --enable-ipv6 --sbindir=/usr/sbin" --without-tcp-wrappers --enable-ipv6 --sbindir=/usr/sbin"
depends="rpcbind" depends="rpcbind"
subpackages="$pkgname-server" subpackages="$pkgname-server"
makedepends="pkg-config libblkid-devel libmount-devel libtirpc-devel makedepends="pkg-config libblkid-devel libmount-devel libtirpc-devel
librpcsecgss-devel libnfsidmap-devel libevent-devel device-mapper-devel librpcsecgss-devel libnfsidmap-devel libevent-devel device-mapper-devel
libcap-devel mit-krb5-devel" libcap-devel mit-krb5-devel sqlite-devel"
short_desc="Network File System client utilities" short_desc="Network File System client utilities"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2" license="GPL-2"
homepage="http://nfs.sourceforge.net" homepage="http://nfs.sourceforge.net"
distfiles="http://downloads.sf.net/nfs/$pkgname-$version.tar.bz2" distfiles="${KERNEL_SITE}/utils/${pkgname}/${version}/${pkgname}-${version}.tar.xz"
checksum=70267288500408495085b7c54a667c4e8cfde5882f3193da095fc7dad2da0b83 checksum=d78768a0819c5eeed5e5abb6c4c9048962e9f8b9ef45451ea4db6aee38720121
long_desc=" long_desc="
The $pkgname package provides client utilities for the linux kernel The $pkgname package provides client utilities for the linux kernel
implementation of NFS - Network File System." implementation of NFS - Network File System."
@ -27,11 +27,6 @@ make_dirs="
/var/lib/nfs/rpc_pipefs 0755 root root /var/lib/nfs/rpc_pipefs 0755 root root
/var/lib/nfs/sm 0750 root root" /var/lib/nfs/sm 0750 root root"
pre_install() {
# Makefile doesn't seem to create it!
vmkdir sbin
}
post_install() { post_install() {
vmove "sbin/*" usr/sbin vmove "sbin/*" usr/sbin
# conffiles # conffiles