Hello community, here is the log from the commit of package nfs-utils for openSUSE:Factory checked in at 2012-05-21 07:28:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old) and /work/SRC/openSUSE:Factory/.nfs-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nfs-utils", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2012-05-09 18:32:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2012-05-21 07:28:53.000000000 +0200 @@ -1,0 +2,8 @@ +Thu May 17 07:04:58 UTC 2012 - [email protected] + +- nfs upstream version 1.2.5. Lots of bug fixes + and improved support for pNFS. + Adds nfsdcld daemon on osd_login script. + Removed some very out-of-date documentation. + +------------------------------------------------------------------- Old: ---- nfs-utils-1.2.5.tar.bz2 nfs-utils-page_size.patch warn-nfs-udp.patch New: ---- mkdir-sbin nfs-utils-1.2.6.tar.bz2 remove_pretty_sig.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nfs-utils.spec ++++++ --- /var/tmp/diff_new_pack.FuJmiP/_old 2012-05-21 07:28:56.000000000 +0200 +++ /var/tmp/diff_new_pack.FuJmiP/_new 2012-05-21 07:28:56.000000000 +0200 @@ -21,6 +21,7 @@ BuildRequires: e2fsprogs-devel BuildRequires: gcc-c++ BuildRequires: krb5-devel +BuildRequires: libevent-devel BuildRequires: libgssglue-devel >= 0.3 BuildRequires: libmount-devel BuildRequires: librpcsecgss @@ -28,17 +29,13 @@ BuildRequires: libtool BuildRequires: nfsidmap-devel >= 0.24 BuildRequires: pkgconfig +BuildRequires: sqlite3-devel BuildRequires: tcpd-devel -%if 0%{?suse_version} > 1100 -BuildRequires: libevent-devel -%else -BuildRequires: libevent -%endif Url: http://nfs.sourceforge.net Summary: Support Utilities for Kernel nfsd License: GPL-2.0+ Group: Productivity/Networking/NFS -Version: 1.2.5 +Version: 1.2.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %fillup_prereq %insserv_prereq @@ -60,8 +57,8 @@ Source12: start-statd Source13: nfs-utils.rpmlintrc Patch0: nfs-utils-1.0.7-bind-syntax.patch -Patch1: warn-nfs-udp.patch -Patch2: nfs-utils-page_size.patch +Patch1: remove_pretty_sig.patch +Patch2: mkdir-sbin Suggests: python-base %description @@ -139,11 +136,10 @@ %setup -q -n nfs-utils-%{version} -a 1 %patch0 -p1 %patch1 -p1 -%patch2 +%patch2 -p1 cp %{S:6} . %build -%{?suse_update_config:%{suse_update_config -f }} rm -f configure; autoreconf -fi CFLAGS="$RPM_OPT_FLAGS -fPIE -fno-strict-aliasing" LDFLAGS="-pie" ./configure \ --mandir=%{_mandir} \ @@ -151,6 +147,7 @@ --enable-nfsv4 \ --enable-gss \ --enable-ipv6 \ + --enable-nfsdcld \ --enable-mount \ --enable-libmount-mount \ --enable-mountconfig \ @@ -266,6 +263,7 @@ /sbin/mount.nfs4 /sbin/umount.nfs /sbin/umount.nfs4 +/sbin/osd_login /usr/sbin/gss_clnt_send_err /usr/sbin/gss_destroy_creds %attr(0755,root,root) /usr/sbin/mountstats @@ -318,6 +316,7 @@ /usr/sbin/rpc.mountd /usr/sbin/rpc.nfsd /usr/sbin/rpc.svcgssd +/usr/sbin/nfsdcld %{_mandir}/man5/exports.5.gz %{_mandir}/man7/nfsd.7.gz %{_mandir}/man8/exportfs.8.gz @@ -326,6 +325,7 @@ %{_mandir}/man8/rpc.mountd.8.gz %{_mandir}/man8/rpc.nfsd.8.gz %{_mandir}/man8/rpc.svcgssd.8.gz +%{_mandir}/man8/nfsdcld.8.gz /usr/share/omc/svcinfo.d/nfs-kernel-server.xml %config(noreplace) /var/lib/nfs/xtab %config(noreplace) /var/lib/nfs/etab @@ -334,6 +334,6 @@ %files -n nfs-doc %defattr(-,root,root) -%doc nfs/*.html nfs/*.ps linux-nfs/* README.NFSv4 +%doc nfs/*.html nfs/*.ps README.NFSv4 %changelog ++++++ README.NFSv4 ++++++ --- /var/tmp/diff_new_pack.FuJmiP/_old 2012-05-21 07:28:56.000000000 +0200 +++ /var/tmp/diff_new_pack.FuJmiP/_new 2012-05-21 07:28:56.000000000 +0200 @@ -1,5 +1,5 @@ NFSv4 README -Last updated: 15 June 2006 +Last updated: 17 May 2012 0. Contents: ----------- @@ -39,7 +39,7 @@ 1. Overview: ------------ -The Network File System Version 4 (NFSv4) is a new distributed file system +The Network File System Version 4 (NFSv4) is a distributed file system similar to previous versions of NFS in its straightforward design, and independence of transport protocols and operating systems for file access in a heterogeneous network. Unlike earlier versions of NFS, the new protocol @@ -52,7 +52,8 @@ 1.1 The Purpose of this document ________________________________ -This document is intended as a step-by-step guide to setup NFSv4 on SLES 10. +This document is intended as a step-by-step guide to setup NFSv4 on +openSUSE 12. It discusses NFSv4 server and client configuration. @@ -61,14 +62,11 @@ For NFSv4 server: -1) Edit /etc/exports to have an entry similar to the one below: - - /export <client_ip/hostname/wildcard>(rw,fsid=0,sync,no_root_squash) - - (i) fsid=0 is a must. - (ii) Replace "/export" with file tree that needs to be nfs-exported and - the <client_ip/hostname/wildcard> with client's ip or hostname or *. - (* means any client) +1) /etc/exports does not require any special entries to work with + NFSv4. Earlier SUSE releases required 'fsid=0' on precisely one + entry, and 'bind=' annotations on others. This is no longer required + and should be removed. It is still supported, so there is no need + to change /etc/exports when upgrading to openSUSE 12. 2) Edit /etc/idmapd.conf to modify the default "Domain" to contain your DNS domain name. @@ -124,88 +122,11 @@ There are three main configuration files you will need to edit to set up an NFSv4 server: -/etc/exports, /etc/sysconfig/nfs and /etc/idmapd.conf. -we will describe the first two here as idmapd.conf is done in previous section. - - -4.1.1 /etc/exports -================== - -This file contains a list of entries; each entry indicates a volume that is -shared and how it is shared. The /etc/exports file format is slightly -different from previous versions. A sample exports entry looks like this. - -/export *(rw,fsid=0,no_subtree_check,sync,no_root_squash) - -Note that: - -i) fsid - The value 0 has a special meaning when use with NFSv4. NFSv4 has a - concept of a root of the overall exported filesystem. The export point - exported with fsid=0 will be used as this root. - There must be at least one entry with fsid=0. (this will be pseudo file - system's /) - -ii) The method used to mount multiple exported trees is different. NFSv4 uses - the concept of pseudo filesystem to give a single file system view to the - client with a pseudo-"/" as root of the filesystem tree. To illustrate, - - Suppose we have - - /path1/volume1 - /path2/volume2 - - as two filesystem trees on the server that need to be exported, then - Firstly, these need to be bound to another name under /export directory - using mount command's bind option. This is done as : - mount --bind <old dir> /export/<new dir> - i.e. in our example: - - #mount --bind /path1/volume1 /export/volume1 - #mount --bind /path2/volume2 /export/volume2 - - will bind these local filesystem trees to their local new names. - Then these two exported filesystems (with their newly bound paths) are - entered into /etc/exports with their respective independent options. - i.e. /etc/exports would contain - - - /export/volume1 *(<options_to_be_filled>) - /export/volume2 *(<options_to_be_filled>) - -iii)If both a directory and its subdirectory residing on different file systems - need to be exported, then the option 'nohide' must be appropriately used. - /export and /export/subdir are on differnt file systems - and both need to be exported to same client then - - /export <client>(<options>) - /export/subdir <client>(<options>,nohide) - - must be done so that the client can see the contents of subdir too. - Though this is not specific to NFSv4, it is seen as a common use case - scenario and is included here. - 'man exports' has more info. - -iv) Currently Yast2's nfs-server module can only be used as a subsitute - for manually editing the /etc/exports. Fully functional yast with other - configuration editing (idmapd etc) is work in progress. - -v) In case of different kind of exports for the same exported path the - syntax that must be followed is either of the following - /export host1(<options>) host2(<options>) - (or) - /export host1(<options>) - /export host2(<options>) - - - -4.1.2 Co-existing NFSv3 and NFSv4 exports for same file systems -=============================================================== - -NFSv4 current linux implementation caters to serving NFSv2 and NFSv3 clients -too. The /etc/exports can contain both type of export entries even for the -same filesystem trees being exported. +/etc/sysconfig/nfs and /etc/idmapd.conf. +we will describe the first here as idmapd.conf is done in previous section. -4.1.3 /etc/sysconfig/nfs +4.1.1 /etc/sysconfig/nfs ========================= /etc/sysconfig/nfs is another NFS server configuration file. Here the number @@ -358,13 +279,12 @@ Typical entries for kerberos security mode looks like these: -/export gss/krb5(rw,fsid=0,insecure,no_subtree_check,sync,no_root_squash) -/export gss/krb5i(rw,fsid=0,insecure,no_subtree_check,sync,no_root_squash) +/export gss/krb5(rw,insecure,no_subtree_check,sync,no_root_squash) +/export gss/krb5i(rw,insecure,no_subtree_check,sync,no_root_squash) Note: -i) krb5p (Privacy) is currently not supported. -ii) option 'insecure' - The insecure option in this entry also allows clients +i) option 'insecure' - The insecure option in this entry also allows clients with NFS implementations that don't use a reserved port for NFS. So it is advisable *NOT* to use this option unless you have a kerberised set up or you know what you are doing. @@ -446,14 +366,10 @@ 5. showmount -e <server name> to check mount information on NFS server -6. Make sure that one and only one path is exported - with fsid=0. - Refer Pseudofilesystems (point (iii) in Section 3.2.1) for more information. - -7. If users are not mapped properly check whether idmapd is running in both +6. If users are not mapped properly check whether idmapd is running in both server & client and dns domain name is properly configured. -8. If you unable to mount, check for the correctness of the exports file entry. +7. If you unable to mount, check for the correctness of the exports file entry. 6.2 Check list to ensure kerberos is working properly ++++++ mkdir-sbin ++++++ commit 03bb227402ab023f4badb515022d49f82e01ff8d Author: Neil Brown <[email protected]> Date: Thu May 17 16:40:40 2012 +1000 osd_login - ensure /sbin is created before installation. If we use a more standard approach to describing the osd_login script, the automake infrastructure will create /sbin before attempting installation. This is important for: make DESTDIR=/empty-dir install Signed-off-by: NeilBrown <[email protected]> diff --git a/utils/osd_login/Makefile.am b/utils/osd_login/Makefile.am index adc493a..d17ffa7 100644 --- a/utils/osd_login/Makefile.am +++ b/utils/osd_login/Makefile.am @@ -1,12 +1,9 @@ ## Process this file with automake to produce Makefile.in -OSD_LOGIN_FILES= osd_login +# These binaries go in /sbin (not /usr/sbin), and that cannot be +# overriden at config time. +sbindir = /sbin -EXTRA_DIST= $(OSD_LOGIN_FILES) - -all-local: $(OSD_LOGIN_FILES) - -install-data-hook: - $(INSTALL) --mode 755 osd_login $(DESTDIR)/sbin/osd_login +sbin_SCRIPTS = osd_login MAINTAINERCLEANFILES = Makefile.in ++++++ nfs-utils-1.2.5.tar.bz2 -> nfs-utils-1.2.6.tar.bz2 ++++++ ++++ 28367 lines of diff (skipped) ++++++ remove_pretty_sig.patch ++++++ From: Jim Rees <[email protected]> Date: Tue, 27 Mar 2012 10:18:39 -0400 Subject: [PATCH 1/2] remove pretty_sig() This really only works against EMC servers. There is at least one server that returns unprintable signatures, which fill the log with garbage (the spec does not mandate printable signatures). It could be made more generic, for example by checking each byte for isprint(). But the signatures are really only of interest to developers, not admins, so it seems better to just remove it. Signed-off-by: Jim Rees <[email protected]> Acked-by: NeilBrown <[email protected]> --- utils/blkmapd/device-process.c | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/utils/blkmapd/device-process.c b/utils/blkmapd/device-process.c index 652a7a8..5fe3dff 100644 --- a/utils/blkmapd/device-process.c +++ b/utils/blkmapd/device-process.c @@ -49,28 +49,6 @@ #include "device-discovery.h" -static char *pretty_sig(char *sig, uint32_t siglen) -{ - static char rs[100]; - uint64_t sigval; - unsigned int i; - - if (siglen <= sizeof(sigval)) { - sigval = 0; - for (i = 0; i < siglen; i++) - sigval |= ((unsigned char *)sig)[i] << (i * 8); - sprintf(rs, "0x%0llx", (unsigned long long) sigval); - } else { - if (siglen > sizeof rs - 4) { - siglen = sizeof rs - 4; - sprintf(&rs[siglen], "..."); - } else - rs[siglen] = '\0'; - memcpy(rs, sig, siglen); - } - return rs; -} - uint32_t *blk_overflow(uint32_t * p, uint32_t * end, size_t nbytes) { uint32_t *q = p + ((nbytes + 3) >> 2); @@ -109,9 +87,6 @@ static int decode_blk_signature(uint32_t **pp, uint32_t * end, * for mapping, then thrown away. */ comp->bs_string = (char *)p; - BL_LOG_INFO("%s: si_comps[%d]: bs_length %d, bs_string %s\n", - __func__, i, siglen, - pretty_sig(comp->bs_string, siglen)); p += ((siglen + 3) >> 2); } *pp = p; @@ -152,10 +127,6 @@ read_cmp_blk_sig(struct bl_disk *disk, int fd, struct bl_sig_comp *comp) } ret = memcmp(sig, comp->bs_string, siglen); - if (!ret) - BL_LOG_INFO("%s: %s sig %s at %lld\n", __func__, dev_name, - pretty_sig(sig, siglen), - (long long)comp->bs_offset); out: if (sig) -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
