commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2020-11-02 14:03:49
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new.3463 (New)
Package is "nfs-utils"
Mon Nov 2 14:03:49 2020 rev:158 rq:844948 version:unknown
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2020-10-03
18:54:00.445382933 +0200
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new.3463/nfs-utils.changes
2020-11-02 14:04:02.476665398 +0100
@@ -1,0 +2,9 @@
+Thu Oct 29 15:21:57 UTC 2020 - Petr Vorel
+
+- Update to version 2.5.2
+ - fixed a couple memory leaks and other bug fixes,
+ - a lot of clean up
+- Refresh nfs-utils-1.0.7-bind-syntax.patch
+- Use %autosetup -p1
+
+---
Old:
nfs-utils-2.5.1.tar.xz
New:
nfs-utils-2.5.2.tar.xz
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.D1vqYM/_old 2020-11-02 14:04:03.652666291 +0100
+++ /var/tmp/diff_new_pack.D1vqYM/_new 2020-11-02 14:04:03.652666291 +0100
@@ -22,7 +22,7 @@
%endif
Name: nfs-utils
-Version:2.5.1
+Version:2.5.2
Release:0
Summary:Support Utilities for Kernel nfsd
License:GPL-2.0-or-later
@@ -125,8 +125,7 @@
translate these to numeric IDs.
%prep
-%setup -q
-%patch0 -p1
+%autosetup -p1
%build
autoreconf -fvi
++ nfs-utils-1.0.7-bind-syntax.patch ++
--- /var/tmp/diff_new_pack.D1vqYM/_old 2020-11-02 14:04:03.724666346 +0100
+++ /var/tmp/diff_new_pack.D1vqYM/_new 2020-11-02 14:04:03.724666346 +0100
@@ -8,7 +8,7 @@
--- a/support/nfs/exports.c
+++ b/support/nfs/exports.c
-@@ -658,6 +658,8 @@ bad_option:
+@@ -682,6 +682,8 @@ bad_option:
} else if (strncmp(opt, "replicas=", 9) == 0) {
ep->e_fslocmethod = FSLOC_REPLICA;
ep->e_fslocdata = strdup(opt+9);
++ nfs-utils-2.5.1.tar.xz -> nfs-utils-2.5.2.tar.xz ++
3550 lines of diff (skipped)
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2020-10-03 18:53:56
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new.4249 (New)
Package is "nfs-utils"
Sat Oct 3 18:53:56 2020 rev:157 rq:838679 version:unknown
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2020-07-02
23:54:39.528538816 +0200
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new.4249/nfs-utils.changes
2020-10-03 18:54:00.445382933 +0200
@@ -1,0 +2,21 @@
+Wed Sep 30 06:24:22 UTC 2020 - Neil Brown
+
+- Remove nfs-doc package. The documentation is 20 years old
+ and barely relevant.
+ (bsc#1171448)
+
+---
+Tue Jul 14 16:05:08 UTC 2020 - Petr Vorel
+
+- Update to version 2.5.1
+ Dropped patch accepted upstream:
+ 0001-conffile-Don-t-give-warning-for-optional-config-file.patch
+
+ - improvements for 64bit time
+ - improvements for SASL referrals
+ - Rename clddb-tool to nfsdclddb
+ - New tools nfsdclnts
+ - Better python3 support
+ - many bug-fixes
+
+---
Old:
0001-conffile-Don-t-give-warning-for-optional-config-file.patch
nfs-utils-2.4.3.tar.xz
nfs.doc.tar.bz2
New:
nfs-utils-2.5.1.tar.xz
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.tKnkEL/_old 2020-10-03 18:54:02.221384900 +0200
+++ /var/tmp/diff_new_pack.tKnkEL/_new 2020-10-03 18:54:02.225384904 +0200
@@ -22,16 +22,13 @@
%endif
Name: nfs-utils
-Version:2.4.3
+Version:2.5.1
Release:0
Summary:Support Utilities for Kernel nfsd
License:GPL-2.0-or-later
Group: Productivity/Networking/NFS
URL:http://kernel.org/pub/linux/utils/nfs-utils/
Source0:
http://kernel.org/pub/linux/utils/nfs-utils/%{version}/nfs-utils-%{version}.tar.xz
-# Download does not work:
-# Source1:ftp://nfs.sourceforge.net/pub/nfs/nfs.doc.tar.bz2
-Source1:nfs.doc.tar.bz2
Source4:sysconfig.nfs
Source11: idmapd.conf
Source12: statd-user.conf
@@ -45,7 +42,6 @@
Source26: nfs.conf
Source27: nfs-kernel-server.tmpfiles.conf
Patch0: nfs-utils-1.0.7-bind-syntax.patch
-Patch1: 0001-conffile-Don-t-give-warning-for-optional-config-file.patch
BuildRequires: e2fsprogs-devel
BuildRequires: fedfs-utils-devel
@@ -128,20 +124,9 @@
and group ID. Both the NFS server and client code in the kernel need to
translate these to numeric IDs.
-%package -n nfs-doc
-Summary:Support Utilities for NFS
-Group: Productivity/Networking/NFS
-Requires: latex2html-pngicons
-Obsoletes: nfs-utils < 1.1.0
-Supplements:(nfs-utils and patterns-base-documentation)
-
-%description -n nfs-doc
-This package contains additional NFS documentation.
-
%prep
-%setup -q -a 1
+%setup -q
%patch0 -p1
-%patch1 -p1
%build
autoreconf -fvi
@@ -161,14 +146,6 @@
--enable-mountconfig
make %{?_smp_mflags}
%sysusers_generate_pre %{SOURCE12} statd
-cd nfs
-for i in *.html ; do
-sed -i \
- -e
"s@%{_prefix}/lib/latex2html/icons.png/next_motif.png@%{_datadir}/latex2html/icons/next.png@"
\
- -e
"s@%{_prefix}/lib/latex2html/icons.png/up_motif_gr.png@%{_datadir}/latex2html/icons/up.png@"
\
- -e
"s@%{_prefix}/lib/latex2html/icons.png/previous_motif_gr.png@%{_datadir}/latex2html/icons/prev.png@"
\
- $i
-done
%install
make %{?_smp_mflags} DESTDIR=%{buildroot} install
@@ -281,7 +258,8 @@
/sbin/umount.nfs4
%attr(0755,root,root) %{_sbindir}/mountstats
%attr(0755,root,root) %{_sbindir}/nfsiostat
-%{_sbindir}/clddb-tool
+%{_sbindir}/nfsdclddb
+%{_sbindir}/nfsdclnts
%{_sbindir}/nfsdcld
%{_sbindir}/nfsidmap
%{_sbindir}/nfsstat
@@ -315,7 +293,8 @@
%dir /usr/lib/systemd/system-generators
/usr/lib/systemd/system-generators/nfs-server-generator
/usr/lib/systemd/system-generators/rpc-pipefs-generator
-%{_mandir}/man8/clddb-tool.8%{ext_man}
+%{_mandir}/man8/nfsdclddb.8%{ext_man}
+%{_mandir}/man8/nfsdclnts.8%{ext_man}
%{_mandir}/man5/nfsmount.conf.5%{ext_man}
%{_mandir}/man5/nfs.conf.5%{ext_man}
%{_mandir}/man5/nfs.5%{ext_man}
@@ -386,8 +365,4 @@
%{_mandir}/man3/*
%doc support/nfsidmap/README
-%files -n nfs-doc
-%defattr(-,root,root)
-%doc nfs/*.html nfs/*.ps
-
%changelog
++ nfs-utils-2.4.3.tar.xz -> nfs-utils-2.5.1.tar.xz ++
6023 lines of diff (skipped)
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2020-07-02 23:54:33
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new.3060 (New)
Package is "nfs-utils"
Thu Jul 2 23:54:33 2020 rev:156 rq:817957 version:unknown
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2020-06-11
14:40:18.036538873 +0200
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new.3060/nfs-utils.changes
2020-07-02 23:54:39.528538816 +0200
@@ -1,0 +2,6 @@
+Fri Jun 5 10:02:18 UTC 2020 - Thorsten Kukuk
+
+- Use group statd instead of nogroup, nogroup would invalidate
+ the extra statd user.
+
+---
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.vRSZQK/_old 2020-07-02 23:54:40.388541668 +0200
+++ /var/tmp/diff_new_pack.vRSZQK/_new 2020-07-02 23:54:40.392541680 +0200
@@ -80,9 +80,6 @@
Requires: rpcbind
Requires(post): %fillup_prereq
Requires(pre): permissions
-%if 0%{?suse_version} >= 1330
-Requires(pre): group(nogroup)
-%endif
Obsoletes: nfs-utils < 1.1.0
%sysusers_requires
@@ -211,15 +208,15 @@
%post -n nfs-client
# lib/nfs must be root-owned.
-# sm and sm.back and contents should be statd:nogroup,
+# sm and sm.back and contents should be statd:statd,
# but only chown if the dirs are currently root-owned.
# This is needed for some upgraded, but chown is best avoided
# when not necessary
chown root:root %{_localstatedir}/lib/nfs > /dev/null 2>&1 || :
for i in sm sm.bak; do
p=%{_localstatedir}/lib/nfs/$i
-if [ -d "$b" -a -n "`chown 2> /dev/null -c --from root statd:nogroup $p`"
]; then
- chown -R statd:nogroup $p > /dev/null 2>&1 || :
+if [ -d "$b" -a -n "`chown 2> /dev/null -c --from root statd:statd $p`" ];
then
+ chown -R statd:statd $p > /dev/null 2>&1 || :
fi
done
### migrate from /var/lock/subsys
@@ -350,8 +347,8 @@
%dir %{_localstatedir}/lib/nfs
%dir %{_localstatedir}/lib/nfs/rpc_pipefs
%dir %{_localstatedir}/lib/nfs/v4recovery
-%attr(0700,statd,nogroup) %dir %{_localstatedir}/lib/nfs/sm
-%attr(0700,statd,nogroup) %dir %{_localstatedir}/lib/nfs/sm.bak
+%attr(0700,statd,statd) %dir %{_localstatedir}/lib/nfs/sm
+%attr(0700,statd,statd) %dir %{_localstatedir}/lib/nfs/sm.bak
%ghost %{_localstatedir}/lib/nfs/state
%files -n nfs-kernel-server
++ statd-user.conf ++
--- /var/tmp/diff_new_pack.vRSZQK/_old 2020-07-02 23:54:40.552542211 +0200
+++ /var/tmp/diff_new_pack.vRSZQK/_new 2020-07-02 23:54:40.552542211 +0200
@@ -1,4 +1,3 @@
# Type Name ID GECOS [HOME]
+g statd - -
u statd - "NFS statd daemon" /var/lib/nfs
-m statd nogroup
-
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2020-06-11 14:39:17
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new.3606 (New)
Package is "nfs-utils"
Thu Jun 11 14:39:17 2020 rev:155 rq:810693 version:unknown
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2020-04-09
23:14:01.906195143 +0200
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new.3606/nfs-utils.changes
2020-06-11 14:40:18.036538873 +0200
@@ -1,0 +2,7 @@
+Tue May 26 04:43:19 UTC 2020 - Neil Brown
+
+- Remove README.NFSv4. It is out dated and not useful. All
+ the configation described is now done automatically.
+ (bsc#1171448)
+
+---
Old:
README.NFSv4
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.VelbEV/_old 2020-06-11 14:40:24.892559229 +0200
+++ /var/tmp/diff_new_pack.VelbEV/_new 2020-06-11 14:40:24.896559241 +0200
@@ -33,7 +33,6 @@
# Source1:ftp://nfs.sourceforge.net/pub/nfs/nfs.doc.tar.bz2
Source1:nfs.doc.tar.bz2
Source4:sysconfig.nfs
-Source6:README.NFSv4
Source11: idmapd.conf
Source12: statd-user.conf
Source13: nfs-utils.rpmlintrc
@@ -147,8 +146,6 @@
%patch0 -p1
%patch1 -p1
-cp %{SOURCE6} .
-
%build
autoreconf -fvi
export CFLAGS="%{optflags} -fPIE"
@@ -394,6 +391,6 @@
%files -n nfs-doc
%defattr(-,root,root)
-%doc nfs/*.html nfs/*.ps README.NFSv4
+%doc nfs/*.html nfs/*.ps
%changelog
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2020-04-09 23:14:00
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new.3248 (New)
Package is "nfs-utils"
Thu Apr 9 23:14:00 2020 rev:154 rq:791592 version:unknown
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2020-03-31
17:31:53.684248169 +0200
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new.3248/nfs-utils.changes
2020-04-09 23:14:01.906195143 +0200
@@ -1,0 +2,5 @@
+Fri Apr 3 11:04:11 UTC 2020 - Thorsten Kukuk
+
+- Remove obsolete useradd call
+
+---
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.YNBThi/_old 2020-04-09 23:14:02.746195629 +0200
+++ /var/tmp/diff_new_pack.YNBThi/_new 2020-04-09 23:14:02.750195631 +0200
@@ -210,9 +210,6 @@
install -m 644 %{SOURCE12} %{buildroot}%{_sysusersdir}/
%pre -n nfs-client -f statd.pre
-/usr/bin/getent passwd statd >/dev/null || \
- /usr/sbin/useradd -r -c 'NFS statd daemon' \
- -s /sbin/nologin -d %{_localstatedir}/lib/nfs -g nogroup statd
%service_add_pre auth-rpcgss-module.service nfs-idmapd.service
nfs-blkmap.service rpc-statd-notify.service rpc-gssd.service rpc-statd.service
rpc-svcgssd.service
%post -n nfs-client
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2020-03-31 17:31:47
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new.3160 (New)
Package is "nfs-utils"
Tue Mar 31 17:31:47 2020 rev:153 rq:788739 version:unknown
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2020-03-16
10:16:27.819541420 +0100
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new.3160/nfs-utils.changes
2020-03-31 17:31:53.684248169 +0200
@@ -1,0 +2,23 @@
+Fri Mar 27 05:29:36 UTC 2020 - Neil Brown
+
+- Improve the hack to avoid python dependencies.
+ A new python script had been added since that hack was written.
+ (boo#1166067)
+
+---
+Fri Mar 27 05:06:12 UTC 2020 - Neil Brown
+
+- 0001-conffile-Don-t-give-warning-for-optional-config-file.patch
+ Support optional include files correctly
+ (boo#1164619)
+
+---
+Tue Mar 24 10:13:53 UTC 2020 - Petr Vorel
+
+- Update nfs.conf
+ - change value: udp=n (disabled in 2.2.1.)
+ - update name: manage-gids
+ - new: verbosity=0, rpc-verbosity=0, use-gss-proxy=0, rdma-port=20049,
+ no-notify=0, force=0, lift-grace=y
+
+---
New:
0001-conffile-Don-t-give-warning-for-optional-config-file.patch
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.xklr0N/_old 2020-03-31 17:31:55.136249019 +0200
+++ /var/tmp/diff_new_pack.xklr0N/_new 2020-03-31 17:31:55.144249024 +0200
@@ -46,6 +46,7 @@
Source26: nfs.conf
Source27: nfs-kernel-server.tmpfiles.conf
Patch0: nfs-utils-1.0.7-bind-syntax.patch
+Patch1: 0001-conffile-Don-t-give-warning-for-optional-config-file.patch
BuildRequires: e2fsprogs-devel
BuildRequires: fedfs-utils-devel
@@ -144,6 +145,7 @@
%prep
%setup -q -a 1
%patch0 -p1
+%patch1 -p1
cp %{SOURCE6} .
@@ -202,7 +204,7 @@
install -m 644 utils/mount/nfsmount.conf
%{buildroot}%{_sysconfdir}/nfsmount.conf
#
# hack to avoid automatic python dependency
-chmod 644 %{buildroot}%{_sbindir}/{mountstats,nfsiostat}
+chmod 644 `grep -l -r '^#!/usr/bin/python' %{buildroot}%{_sbindir}`
# Install sysusers.d template
mkdir -p %{buildroot}%{_sysusersdir}
install -m 644 %{SOURCE12} %{buildroot}%{_sysusersdir}/
++ 0001-conffile-Don-t-give-warning-for-optional-config-file.patch ++
>From 1c20fcd0a315f3c692a465159985e6125289f4e4 Mon Sep 17 00:00:00 2001
From: NeilBrown
Date: Fri, 27 Mar 2020 15:58:24 +1100
Subject: [PATCH] conffile: Don't give warning for optional config files.
A recent commit added the possibility of optional config files for which
warning messages would be suppressed.
Unfortunately only one of the possible warning messages - the least
likely one - was suppressed.
This patch suppresses the other.
Fixes: c6fdcbe0a5cf ("conffile: allow optional include files")
Signed-off-by: NeilBrown
---
support/nfs/conffile.c |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- a/support/nfs/conffile.c
+++ b/support/nfs/conffile.c
@@ -429,9 +429,9 @@ conf_parse_line(int trans, char *line, c
subconf = conf_readfile(relpath);
if (subconf == NULL) {
- xlog_warn("config error at %s:%d: "
- "error loading included config",
- filename, lineno);
+ if (!optional)
+ xlog_warn("config error at %s:%d: error loading
included config",
+ filename, lineno);
if (relpath)
free(relpath);
return;
++ nfs.conf ++
--- /var/tmp/diff_new_pack.xklr0N/_old 2020-03-31 17:31:55.312249122 +0200
+++ /var/tmp/diff_new_pack.xklr0N/_new 2020-03-31 17:31:55.312249122 +0200
@@ -17,8 +17,11 @@
# debug=0
#
#[gssd]
+# verbosity=0
+# rpc-verbosity=0
# use-memcache=0
# use-machine-creds=1
+# use-gss-proxy=0
avoid-dns=$NFS_GSSD_AVOID_DNS
# limit-to-legacy-enctypes=0
# context-timeout=0
@@ -33,7 +36,7 @@
#
[mountd]
# debug=0
-# manage_gids=n
+# manage-gids=n
# descriptors=0
port= $MOUNTD_PORT
# threads=1
@@ -52,7 +55,7 @@
# port=0
# grace-time=90
lease-time=$NFSV4LEASETIME
-# udp=y
+# udp=n
# tcp=y
# vers2=n
vers3=$NFS3_SERVER_SUPPORT
@@ -61,6 +64,7 @@
# vers4.1=y
# vers4.2=y
# rdma=n
+# rdma-port=20049
#
[statd]
# debug=0
@@ -69,12 +73,15 @@
name=$STATD_HOSTNAME
# state-directory-path=/var/lib/nfs/statd
# ha-callout=
+# no-notify=0
#
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2020-03-16 10:16:01
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new.3160 (New)
Package is "nfs-utils"
Mon Mar 16 10:16:01 2020 rev:152 rq:784479 version:unknown
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2020-02-15
22:24:46.231288645 +0100
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new.3160/nfs-utils.changes
2020-03-16 10:16:27.819541420 +0100
@@ -1,0 +2,6 @@
+Mon Mar 9 10:04:10 UTC 2020 - Thorsten Kukuk
+
+- statd-user.conf: create user via sysusers.d template
+- Use ordering for systemd instead of hard requires
+
+---
New:
statd-user.conf
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.lyeV3v/_old 2020-03-16 10:16:35.047544365 +0100
+++ /var/tmp/diff_new_pack.lyeV3v/_new 2020-03-16 10:16:35.079544378 +0100
@@ -35,6 +35,7 @@
Source4:sysconfig.nfs
Source6:README.NFSv4
Source11: idmapd.conf
+Source12: statd-user.conf
Source13: nfs-utils.rpmlintrc
Source20: nfs-mountd.options.conf
Source21: nfs-server.options.conf
@@ -52,7 +53,8 @@
BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: rpcgen
-BuildRequires: systemd-rpm-macros
+BuildRequires: sysuser-shadow
+BuildRequires: sysuser-tools
BuildRequires: tcpd-devel
BuildRequires: pkgconfig(devmapper)
BuildRequires: pkgconfig(kdb)
@@ -63,7 +65,7 @@
BuildRequires: pkgconfig(sqlite3)
Suggests: python-base
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%{?systemd_requires}
+%{?systemd_ordering}
%description
This package contains the NFS utilities. You can tune the number of
@@ -78,11 +80,11 @@
Requires: rpcbind
Requires(post): %fillup_prereq
Requires(pre): permissions
-Requires(pre): shadow
%if 0%{?suse_version} >= 1330
Requires(pre): group(nogroup)
%endif
Obsoletes: nfs-utils < 1.1.0
+%sysusers_requires
%description -n nfs-client
This package contains common NFS utilities which are needed for client
@@ -162,6 +164,7 @@
--with-pluginpath=%{_libdir}/libnfsidmap-1.0.0 \
--enable-mountconfig
make %{?_smp_mflags}
+%sysusers_generate_pre %{SOURCE12} statd
cd nfs
for i in *.html ; do
sed -i \
@@ -200,8 +203,11 @@
#
# hack to avoid automatic python dependency
chmod 644 %{buildroot}%{_sbindir}/{mountstats,nfsiostat}
+# Install sysusers.d template
+mkdir -p %{buildroot}%{_sysusersdir}
+install -m 644 %{SOURCE12} %{buildroot}%{_sysusersdir}/
-%pre -n nfs-client
+%pre -n nfs-client -f statd.pre
/usr/bin/getent passwd statd >/dev/null || \
/usr/sbin/useradd -r -c 'NFS statd daemon' \
-s /sbin/nologin -d %{_localstatedir}/lib/nfs -g nogroup statd
@@ -344,6 +350,7 @@
%{_mandir}/man8/blkmapd.8%{ext_man}
%{_mandir}/man8/rpc.svcgssd.8%{ext_man}
%{_fillupdir}/sysconfig.nfs
+%{_sysusersdir}/statd-user.conf
%dir %{_localstatedir}/lib/nfs
%dir %{_localstatedir}/lib/nfs/rpc_pipefs
%dir %{_localstatedir}/lib/nfs/v4recovery
++ statd-user.conf ++
# Type Name ID GECOS [HOME]
u statd - "NFS statd daemon" /var/lib/nfs
m statd nogroup
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2020-02-15 22:24:19
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new.26092 (New)
Package is "nfs-utils"
Sat Feb 15 22:24:19 2020 rev:151 rq:773539 version:unknown
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2019-11-23
23:46:22.518940887 +0100
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new.26092/nfs-utils.changes
2020-02-15 22:24:46.231288645 +0100
@@ -1,0 +2,31 @@
+Mon Feb 10 18:58:59 UTC 2020 - Petr Vorel
+
+- Update to version 2.4.3
+ Dropped patches (accepted upstream):
+ - 0001-nfs.conf-allow-empty-assignments.patch
+ - 0002-Let-systemd-know-when-rpc.statd-is-needed.patch
+ - 0003-systemd-run-statd-notify-even-when-nfs-client-isn-t-.patch
+ - 0004-nfsidmap-honour-with-pluginpath-for-instalation.patch
+ - 0005-nfs.conf-fail-to-disable-major-NFS-version-4-using-v.patch
+ - 0006-conffile-allow-optional-include-files.patch
+ - 0007-statd-user-from-sm
+ - 0008-mountd-Initialize-logging-early.patch
+
+ Dropped patches (upstream used different solution):
+ - 0009-Allow-compilation-to-succeed-with-fno-common.patch (btw this used
+Patch0: instead of Patch10:) (boo#1160405)
+
+ Add nfsdcld - NFSv4 Client Tracking Daemon, add nfsdcld.service and enable
it
+ for nfs-kernel-server, add man page
+ Add clddb-tool - tool for downgrading the nfsdcld sqlite database schema,
+ add man page
+ Removed osd_login (dropped in upstream in 2.3.4 rc1)
+
+---
+Wed Feb 5 22:13:28 UTC 2020 - Neil Brown
+
+- 0009-Allow-compilation-to-succeed-with-fno-common.patch
+ Allow compilation to success with -fno-common
+ (boo#1160405)
+
+---
Old:
0001-nfs.conf-allow-empty-assignments.patch
0002-Let-systemd-know-when-rpc.statd-is-needed.patch
0003-systemd-run-statd-notify-even-when-nfs-client-isn-t-.patch
0004-nfsidmap-honour-with-pluginpath-for-instalation.patch
0005-nfs.conf-fail-to-disable-major-NFS-version-4-using-v.patch
0006-conffile-allow-optional-include-files.patch
0007-statd-user-from-sm
0008-mountd-Initialize-logging-early.patch
nfs-utils-2.3.3.tar.xz
New:
nfs-utils-2.4.3.tar.xz
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.hauDTw/_old 2020-02-15 22:24:47.403289279 +0100
+++ /var/tmp/diff_new_pack.hauDTw/_new 2020-02-15 22:24:47.403289279 +0100
@@ -1,7 +1,7 @@
#
# spec file for package nfs-utils
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -22,12 +22,12 @@
%endif
Name: nfs-utils
-Version:2.3.3
+Version:2.4.3
Release:0
Summary:Support Utilities for Kernel nfsd
License:GPL-2.0-or-later
Group: Productivity/Networking/NFS
-Url:http://kernel.org/pub/linux/utils/nfs-utils/
+URL:http://kernel.org/pub/linux/utils/nfs-utils/
Source0:
http://kernel.org/pub/linux/utils/nfs-utils/%{version}/nfs-utils-%{version}.tar.xz
# Download does not work:
# Source1:ftp://nfs.sourceforge.net/pub/nfs/nfs.doc.tar.bz2
@@ -45,14 +45,6 @@
Source26: nfs.conf
Source27: nfs-kernel-server.tmpfiles.conf
Patch0: nfs-utils-1.0.7-bind-syntax.patch
-Patch1: 0001-nfs.conf-allow-empty-assignments.patch
-Patch2: 0002-Let-systemd-know-when-rpc.statd-is-needed.patch
-Patch3: 0003-systemd-run-statd-notify-even-when-nfs-client-isn-t-.patch
-Patch4: 0004-nfsidmap-honour-with-pluginpath-for-instalation.patch
-Patch5: 0005-nfs.conf-fail-to-disable-major-NFS-version-4-using-v.patch
-Patch6: 0006-conffile-allow-optional-include-files.patch
-Patch7: 0007-statd-user-from-sm
-Patch8: 0008-mountd-Initialize-logging-early.patch
BuildRequires: e2fsprogs-devel
BuildRequires: fedfs-utils-devel
@@ -150,14 +142,6 @@
%prep
%setup -q -a 1
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
cp %{SOURCE6} .
@@ -277,12 +261,12 @@
mv %{_localstatedir}/lock/subsys/nfsserver-rpc.idmapd /run/nfs
fi
###
-%service_add_post nfs-mountd.service nfs-server.service
+%service_add_post nfs-mountd.service nfs-server.service nfsdcld.service
%tmpfiles_create nfs-kernel-server.conf
%set_permissions /var/lib/nfs/rmtab
%postun -n nfs-kernel-server
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2019-11-23 23:46:21
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new.26869 (New)
Package is "nfs-utils"
Sat Nov 23 23:46:21 2019 rev:150 rq:750032 version:unknown
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2019-09-25
01:35:27.137668009 +0200
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new.26869/nfs-utils.changes
2019-11-23 23:46:22.518940887 +0100
@@ -1,0 +2,11 @@
+Wed Nov 20 23:55:31 UTC 2019 - Neil Brown
+
+- nfs-utils.spec - don't chown when not needed.
+ Only chown directories in /var/lib/nfs to statd
+ if they are currently owned by root.
+ The chown is needed for some upgrades, but if the
+ dirs are already owned by statd, an vulnerability in
+ statd could be escalated to root.
+ (bsc#1157321)
+
+---
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.ru9YRk/_old 2019-11-23 23:46:23.570941011 +0100
+++ /var/tmp/diff_new_pack.ru9YRk/_new 2019-11-23 23:46:23.574941012 +0100
@@ -224,9 +224,17 @@
%service_add_pre auth-rpcgss-module.service nfs-idmapd.service
nfs-blkmap.service rpc-statd-notify.service rpc-gssd.service rpc-statd.service
rpc-svcgssd.service
%post -n nfs-client
+# lib/nfs must be root-owned.
+# sm and sm.back and contents should be statd:nogroup,
+# but only chown if the dirs are currently root-owned.
+# This is needed for some upgraded, but chown is best avoided
+# when not necessary
chown root:root %{_localstatedir}/lib/nfs > /dev/null 2>&1 || :
for i in sm sm.bak; do
- chown -R statd:nogroup %{_localstatedir}/lib/nfs/$i > /dev/null 2>&1 ||
:
+p=%{_localstatedir}/lib/nfs/$i
+if [ -d "$b" -a -n "`chown 2> /dev/null -c --from root statd:nogroup $p`"
]; then
+ chown -R statd:nogroup $p > /dev/null 2>&1 || :
+fi
done
### migrate from /var/lock/subsys
[ -d /run/nfs ] || mkdir /run/nfs
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2019-09-25 01:35:24
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new.7948 (New)
Package is "nfs-utils"
Wed Sep 25 01:35:24 2019 rev:149 rq:732555 version:unknown
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2019-09-09
12:32:25.833501328 +0200
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new.7948/nfs-utils.changes
2019-09-25 01:35:27.137668009 +0200
@@ -1,0 +2,31 @@
+Mon Sep 23 01:52:29 UTC 2019 - Neil Brown
+
+- Delete 0006-nfs.conf-silence-include-error.patch
+ replaced with better version
+- 0006-conffile-allow-optional-include-files.patch
+ Avoid error if /etc/nfs.conf.local doesn't exist
+ (bsc#1151044 bsc#1150807)
+- 0008-mountd-Initialize-logging-early.patch
+ Don't close the loging socket - it causes problems.
+ (bsc#1151044 bsc#1150807)
+
+---
+Mon Sep 16 23:43:37 UTC 2019 - Neil Brown
+
+- Don't make /var/lib/nfs owned by statd.
+ Only sm and sm.bak need to be accessible by
+ statd or sm-notify after they drop privs.
+ Providing they get created, the parent
+ directory can be root-owned.
+- 0007-statd-user-from-sm
+ Change rpc.statd and sm-notify to take uid from the sm
+ directory.
+ (bsc#1150733 CVE-2019-3689)
+
+---
+Mon Sep 16 05:56:12 UTC 2019 - Neil Brown
+
+- 0006-nfs.conf-silence-include-error.patch
+ Avoid an unhelpful warning (bsc#1150807)
+
+---
New:
0006-conffile-allow-optional-include-files.patch
0007-statd-user-from-sm
0008-mountd-Initialize-logging-early.patch
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.506neM/_old 2019-09-25 01:35:28.873667797 +0200
+++ /var/tmp/diff_new_pack.506neM/_new 2019-09-25 01:35:28.893667794 +0200
@@ -50,6 +50,9 @@
Patch3: 0003-systemd-run-statd-notify-even-when-nfs-client-isn-t-.patch
Patch4: 0004-nfsidmap-honour-with-pluginpath-for-instalation.patch
Patch5: 0005-nfs.conf-fail-to-disable-major-NFS-version-4-using-v.patch
+Patch6: 0006-conffile-allow-optional-include-files.patch
+Patch7: 0007-statd-user-from-sm
+Patch8: 0008-mountd-Initialize-logging-early.patch
BuildRequires: e2fsprogs-devel
BuildRequires: fedfs-utils-devel
@@ -152,6 +155,9 @@
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
cp %{SOURCE6} .
@@ -218,9 +224,9 @@
%service_add_pre auth-rpcgss-module.service nfs-idmapd.service
nfs-blkmap.service rpc-statd-notify.service rpc-gssd.service rpc-statd.service
rpc-svcgssd.service
%post -n nfs-client
-chown statd:nogroup %{_localstatedir}/lib/nfs > /dev/null 2>&1 || :
-for i in state sm sm.bak; do
- chown -R statd %{_localstatedir}/lib/nfs/$i > /dev/null 2>&1 || :
+chown root:root %{_localstatedir}/lib/nfs > /dev/null 2>&1 || :
+for i in sm sm.bak; do
+ chown -R statd:nogroup %{_localstatedir}/lib/nfs/$i > /dev/null 2>&1 ||
:
done
### migrate from /var/lock/subsys
[ -d /run/nfs ] || mkdir /run/nfs
@@ -342,12 +348,12 @@
%{_mandir}/man8/blkmapd.8%{ext_man}
%{_mandir}/man8/rpc.svcgssd.8%{ext_man}
%{_fillupdir}/sysconfig.nfs
-%attr(0711,statd,nogroup) %dir %{_localstatedir}/lib/nfs
+%dir %{_localstatedir}/lib/nfs
%dir %{_localstatedir}/lib/nfs/rpc_pipefs
%dir %{_localstatedir}/lib/nfs/v4recovery
%attr(0700,statd,nogroup) %dir %{_localstatedir}/lib/nfs/sm
%attr(0700,statd,nogroup) %dir %{_localstatedir}/lib/nfs/sm.bak
-%attr(0700,statd,nogroup) %ghost %{_localstatedir}/lib/nfs/state
+%ghost %{_localstatedir}/lib/nfs/state
%files -n nfs-kernel-server
%defattr(-,root,root)
++ 0006-conffile-allow-optional-include-files.patch ++
>From f608217f6136c0e9fedc7bc728e4ba13ed295c4c Mon Sep 17 00:00:00 2001
From: NeilBrown
Date: Mon, 23 Sep 2019 11:20:39 +1000
Subject: [PATCH] conffile: allow optional include files.
If nfs.conf contains, for example
include = /etc/nfs.conf.local
and /etc/nfs.conf.local doesn't exist, then a warning is given.
Sometimes it is useful to have an optional include file which is
included if present, but for which an absence doesn't give a
warning.
Systemd has a convention that a hyphen at the start of
an include file name marks it as optional, so add this convention
to nfs-utils.
So
include = -/etc/nfs.conf.local
will not give a warning if the file doesn't exist.
Signed-off-by: NeilBrown
---
support/nfs/conffile.c | 13 ++---
systemd/nfs.conf.man |3 +++
2 files changed, 13 insertions(+), 3
commit nfs-utils for openSUSE:Factory
Hello community, here is the log from the commit of package nfs-utils for openSUSE:Factory checked in at 2019-09-09 12:32:22 Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old) and /work/SRC/openSUSE:Factory/.nfs-utils.new.7948 (New) Package is "nfs-utils" Mon Sep 9 12:32:22 2019 rev:148 rq:727642 version:unknown Changes: --- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2018-08-17 23:58:06.942004491 +0200 +++ /work/SRC/openSUSE:Factory/.nfs-utils.new.7948/nfs-utils.changes 2019-09-09 12:32:25.833501328 +0200 @@ -1,0 +2,67 @@ +Mon Sep 2 05:25:07 UTC 2019 - Neil Brown + +- 0005-nfs.conf-fail-to-disable-major-NFS-version-4-using-v.patch + Fix a bug that cause NFSv4 service to always be enabled, if + the server was enabled at all. + +--- +Wed Jul 24 13:07:41 UTC 2019 - matthias.gerst...@suse.com + +- removal of SuSEfirewall2 service, since SuSEfirewall2 has been replaced by + firewalld, see [1]. + + [1]: https://lists.opensuse.org/opensuse-factory/2019-01/msg00490.html + +--- +Wed Jan 30 00:10:03 UTC 2019 - Neil Brown + +- remove libnfsidmap1 dependency for nfs-client. + It isn't needed. + +--- +Tue Jan 29 22:50:04 UTC 2019 - Neil Brown + +- Remove service aliases - these files are deleted. + nfs.service + nfsserver.service + nfs-server.nfsserver.conf + nfs-client.nfs.conf + + Now the upstream standard service names "nfs-client" and "nfs-server" + must be used. + +--- +Tue Dec 4 00:03:00 UTC 2018 - Neil Brown + +- 0004-nfsidmap-honour-with-pluginpath-for-instalation.patch + Allow plugins to be installed properly +- nfs-utils.spec + Package shared library correctly + +--- +Mon Dec 3 02:49:13 UTC 2018 - Neil Brown + +- 0001-nfs.conf-allow-empty-assignments.patch + Fix regression due to unnecessary "error" messages from nfs.conf + +- 0002-Let-systemd-know-when-rpc.statd-is-needed.patch + 0003-systemd-run-statd-notify-even-when-nfs-client-isn-t-.patch + Fixes for systemd integration + (bsc#1116221) + +--- +Thu Oct 25 05:32:30 UTC 2018 - Neil Brown + +- New version: nfs-utils-2.3.3 + The nfsidmap library source has been merged into + nfs-utils, so this source package now makes + nfsidmap and nfsidmap-devel packages. + New program "nfsconf" improves access to nfs config files. + Delete patches that have been included upstream: +0001-conffile-ignore-empty-environment-variables.patch +0002-mount-call-setgroups-before-setuid.patch +0003-nfs-server-generator-handle-noauto-mounts-correctly.patch +nsm-headers.patch +sysmacros.patch + +--- Old: 0001-conffile-ignore-empty-environment-variables.patch 0002-mount-call-setgroups-before-setuid.patch 0003-nfs-server-generator-handle-noauto-mounts-correctly.patch fw-client fw-server nfs-client.nfs.conf nfs-server.nfsserver.conf nfs-utils-2.1.1.tar.xz nfs.service nfsserver.service nsm-headers.patch sysmacros.patch New: 0001-nfs.conf-allow-empty-assignments.patch 0002-Let-systemd-know-when-rpc.statd-is-needed.patch 0003-systemd-run-statd-notify-even-when-nfs-client-isn-t-.patch 0004-nfsidmap-honour-with-pluginpath-for-instalation.patch 0005-nfs.conf-fail-to-disable-major-NFS-version-4-using-v.patch nfs-utils-2.3.3.tar.xz Other differences: -- ++ nfs-utils.spec ++ --- /var/tmp/diff_new_pack.yB96Xj/_old 2019-09-09 12:32:27.021501134 +0200 +++ /var/tmp/diff_new_pack.yB96Xj/_new 2019-09-09 12:32:27.025501133 +0200 @@ -1,7 +1,7 @@ # # spec file for package nfs-utils # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -22,7 +22,7 @@ %endif Name: nfs-utils -Version:2.1.1 +Version:2.3.3 Release:0 Summary:Support Utilities for Kernel nfsd License:GPL-2.0-or-later @@ -34,14 +34,8 @@ Source1:nfs.doc.tar.bz2
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2018-08-17 23:58:03
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new (New)
Package is "nfs-utils"
Fri Aug 17 23:58:03 2018 rev:147 rq:628535 version:2.1.1
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2018-08-02
14:49:45.787437050 +0200
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2018-08-17
23:58:06.942004491 +0200
@@ -1,0 +2,11 @@
+Mon Aug 6 07:29:37 UTC 2018 - sch...@suse.de
+
+- sysmacros.patch: include for major
+
+---
+Thu Aug 2 01:31:30 UTC 2018 - sfl...@suse.de
+
+- use packageand for nfs documentation rather then always
+ installing nfs-doc as part of the documentation pattern.
+
+---
New:
sysmacros.patch
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.lPMIRH/_old 2018-08-17 23:58:09.386011755 +0200
+++ /var/tmp/diff_new_pack.lPMIRH/_new 2018-08-17 23:58:09.386011755 +0200
@@ -55,6 +55,7 @@
Patch2: 0002-mount-call-setgroups-before-setuid.patch
Patch3: 0003-nfs-server-generator-handle-noauto-mounts-correctly.patch
Patch4: nsm-headers.patch
+Patch5: sysmacros.patch
BuildRequires: e2fsprogs-devel
BuildRequires: fedfs-utils-devel
@@ -120,6 +121,7 @@
Group: Productivity/Networking/NFS
Requires: latex2html-pngicons
Obsoletes: nfs-utils < 1.1.0
+Supplements:(nfs-utils and patterns-base-documentation)
%description -n nfs-doc
This package contains additional NFS documentation.
@@ -131,6 +133,7 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
cp %{SOURCE6} .
++ sysmacros.patch ++
Index: nfs-utils-2.1.1/utils/blkmapd/device-discovery.c
===
--- nfs-utils-2.1.1.orig/utils/blkmapd/device-discovery.c
+++ nfs-utils-2.1.1/utils/blkmapd/device-discovery.c
@@ -27,6 +27,7 @@
*/
#include
+#include
#include
#include
#include
commit nfs-utils for openSUSE:Factory
Hello community, here is the log from the commit of package nfs-utils for openSUSE:Factory checked in at 2018-08-02 14:49:45 Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old) and /work/SRC/openSUSE:Factory/.nfs-utils.new (New) Package is "nfs-utils" Thu Aug 2 14:49:45 2018 rev:146 rq:625583 version:2.1.1 Changes: --- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2018-07-13 10:18:44.186268296 +0200 +++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2018-08-02 14:49:45.787437050 +0200 @@ -1,0 +2,6 @@ +Thu Jul 26 23:05:27 UTC 2018 - nfbr...@suse.com + +- nfs.conf: spell NFSV4LEASETIME correctly. + (bsc#1098532) + +--- Other differences: -- ++ nfs.conf ++ --- /var/tmp/diff_new_pack.CpX3GI/_old 2018-08-02 14:49:46.723438841 +0200 +++ /var/tmp/diff_new_pack.CpX3GI/_new 2018-08-02 14:49:46.723438841 +0200 @@ -51,7 +51,7 @@ # host= # port=0 # grace-time=90 - lease-time=$NFS4LEASETIME + lease-time=$NFSV4LEASETIME # udp=y # tcp=y # vers2=n
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2018-07-13 10:18:39
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new (New)
Package is "nfs-utils"
Fri Jul 13 10:18:39 2018 rev:145 rq:621750 version:2.1.1
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2017-12-06
08:47:41.928905752 +0100
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2018-07-13
10:18:44.186268296 +0200
@@ -1,0 +2,6 @@
+Fri Jul 6 15:02:49 CEST 2018 - ku...@suse.de
+
+- Create files in /var/lib/nfs via tmpfiles.d [bsc#1100404],
+ [FATE#325524]
+
+---
New:
nfs-kernel-server.tmpfiles.conf
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.YaYFWk/_old 2018-07-13 10:18:44.830269062 +0200
+++ /var/tmp/diff_new_pack.YaYFWk/_new 2018-07-13 10:18:44.834269067 +0200
@@ -1,7 +1,7 @@
#
# spec file for package nfs-utils
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -25,7 +25,7 @@
Version:2.1.1
Release:0
Summary:Support Utilities for Kernel nfsd
-License:GPL-2.0+
+License:GPL-2.0-or-later
Group: Productivity/Networking/NFS
Url:http://kernel.org/pub/linux/utils/nfs-utils/
Source0:
http://kernel.org/pub/linux/utils/nfs-utils/%{version}/nfs-utils-%{version}.tar.xz
@@ -49,6 +49,7 @@
Source24: rpc-statd-notify.options.conf
Source25: rpc-svcgssd.options.conf
Source26: nfs.conf
+Source27: nfs-kernel-server.tmpfiles.conf
Patch0: nfs-utils-1.0.7-bind-syntax.patch
Patch1: 0001-conffile-ignore-empty-environment-variables.patch
Patch2: 0002-mount-call-setgroups-before-setuid.patch
@@ -170,6 +171,7 @@
install -D -m 644 %{SOURCE24}
%{buildroot}%{_unitdir}/rpc-statd-notify.service.d/options.conf
install -D -m 644 %{SOURCE25}
%{buildroot}%{_unitdir}/rpc-svcgssd.service.d/options.conf
install -D -m 644 %{SOURCE26} %{buildroot}%{_sysconfdir}/nfs.conf
+install -D -m 644 %{SOURCE27}
%{buildroot}%{_prefix}/lib/tmpfiles.d/nfs-kernel-server.conf
ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcnfsserver
ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcnfs-server
ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcnfs
@@ -244,6 +246,7 @@
fi
###
%service_add_post nfsserver.service nfs-mountd.service nfs-server.service
+%tmpfiles_create nfs-kernel-server.conf
%set_permissions /var/lib/nfs/rmtab
%postun -n nfs-kernel-server
@@ -343,6 +346,7 @@
%{_unitdir}/proc-fs-nfsd.mount
%{_unitdir}/nfsserver.service
%{_unitdir}/nfs-server.service.d/nfsserver.conf
+%{_prefix}/lib/tmpfiles.d/nfs-kernel-server.conf
%{_sbindir}/exportfs
%{_sbindir}/rcnfsserver
%{_sbindir}/rcnfs-server
++ nfs-kernel-server.tmpfiles.conf ++
# See tmpfiles.d(5) for details
#Type PathMode UID GID Age Argument
d /var/lib/nfs
f /var/lib/nfs/etab
f /var/lib/nfs/rmtab
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2017-12-06 08:47:40
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new (New)
Package is "nfs-utils"
Wed Dec 6 08:47:40 2017 rev:144 rq:546722 version:2.1.1
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2017-10-13
14:03:22.633764129 +0200
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2017-12-06
08:47:41.928905752 +0100
@@ -1,0 +2,6 @@
+Thu Nov 23 13:40:51 UTC 2017 - rbr...@suse.com
+
+- Replace references to /var/adm/fillup-templates with new
+ %_fillupdir macro (boo#1069468)
+
+---
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.Uu3eGV/_old 2017-12-06 08:47:42.808873534 +0100
+++ /var/tmp/diff_new_pack.Uu3eGV/_new 2017-12-06 08:47:42.812873387 +0100
@@ -16,6 +16,11 @@
#
+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+ %define _fillupdir /var/adm/fillup-templates
+%endif
+
Name: nfs-utils
Version:2.1.1
Release:0
@@ -170,8 +175,8 @@
ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcnfs
ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcnfs-client
# sysconfig-data
-mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
-install -m 644 %{SOURCE4} %{buildroot}%{_localstatedir}/adm/fillup-templates
+mkdir -p %{buildroot}%{_fillupdir}
+install -m 644 %{SOURCE4} %{buildroot}%{_fillupdir}
# idmapd setup
install -D -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/idmapd.conf
mkdir -p -m 755 %{buildroot}%{_localstatedir}/lib/nfs/rpc_pipefs
@@ -318,7 +323,7 @@
%{_mandir}/man8/nfsiostat.8%{ext_man}
%{_mandir}/man8/blkmapd.8%{ext_man}
%{_mandir}/man8/rpc.svcgssd.8%{ext_man}
-%{_localstatedir}/adm/fillup-templates/sysconfig.nfs
+%{_fillupdir}/sysconfig.nfs
%attr(0711,statd,nogroup) %dir %{_localstatedir}/lib/nfs
%dir %{_localstatedir}/lib/nfs/rpc_pipefs
%dir %{_localstatedir}/lib/nfs/v4recovery
commit nfs-utils for openSUSE:Factory
Hello community, here is the log from the commit of package nfs-utils for openSUSE:Factory checked in at 2017-10-13 14:03:21 Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old) and /work/SRC/openSUSE:Factory/.nfs-utils.new (New) Package is "nfs-utils" Fri Oct 13 14:03:21 2017 rev:143 rq:532009 version:2.1.1 Changes: --- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2017-08-10 13:46:08.439759009 +0200 +++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2017-10-13 14:03:22.633764129 +0200 @@ -1,0 +2,9 @@ +Fri Oct 6 04:23:19 UTC 2017 - nfbr...@suse.com + +- fix incorrect dependency in + /usr/lib/systemd/system/nfs-client.target.d/nfs.conf + When yast restarts "nfs" it should propagate to nfs-client, + but doesn't. + (boo#1053691) + +--- Other differences: -- ++ nfs-client.nfs.conf ++ --- /var/tmp/diff_new_pack.A2o5WQ/_old 2017-10-13 14:03:23.513725431 +0200 +++ /var/tmp/diff_new_pack.A2o5WQ/_new 2017-10-13 14:03:23.513725431 +0200 @@ -1,4 +1,4 @@ # When nfs is stopped or restarted, nfs-client must too. [Unit] -PartOf=nfs-client.target +PartOf=nfs.service
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2017-08-10 13:45:52
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new (New)
Package is "nfs-utils"
Thu Aug 10 13:45:52 2017 rev:142 rq:513638 version:2.1.1
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2017-05-10
20:33:29.934924574 +0200
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2017-08-10
13:46:08.439759009 +0200
@@ -1,0 +2,5 @@
+Wed Jul 5 11:02:51 UTC 2017 - sch...@suse.de
+
+- nsm-headers.patch: add missing
+
+---
New:
nsm-headers.patch
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.Gp4EvF/_old 2017-08-10 13:46:12.339210044 +0200
+++ /var/tmp/diff_new_pack.Gp4EvF/_new 2017-08-10 13:46:12.355207792 +0200
@@ -48,6 +48,7 @@
Patch1: 0001-conffile-ignore-empty-environment-variables.patch
Patch2: 0002-mount-call-setgroups-before-setuid.patch
Patch3: 0003-nfs-server-generator-handle-noauto-mounts-correctly.patch
+Patch4: nsm-headers.patch
BuildRequires: e2fsprogs-devel
BuildRequires: fedfs-utils-devel
@@ -123,6 +124,7 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
cp %{SOURCE6} .
++ nsm-headers.patch ++
Index: nfs-utils-2.1.1/support/nsm/rpc.c
===
--- nfs-utils-2.1.1.orig/support/nsm/rpc.c
+++ nfs-utils-2.1.1/support/nsm/rpc.c
@@ -41,6 +41,7 @@
#include
#include
#include
+#include
#include
#include
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2017-05-10 20:33:28
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new (New)
Package is "nfs-utils"
Wed May 10 20:33:28 2017 rev:141 rq:493620 version:2.1.1
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2017-02-16
16:41:49.345482078 +0100
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2017-05-10
20:33:29.934924574 +0200
@@ -1,0 +2,5 @@
+Tue May 2 13:51:27 CEST 2017 - ku...@suse.de
+
+- Prerequire needed group "nogroup"
+
+---
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.GSwoie/_old 2017-05-10 20:33:30.894789151 +0200
+++ /var/tmp/diff_new_pack.GSwoie/_new 2017-05-10 20:33:30.894789151 +0200
@@ -82,6 +82,9 @@
Requires(post): %fillup_prereq
Requires(pre): permissions
Requires(pre): shadow
+%if 0%{?suse_version} >= 1330
+Requires(pre): group(nogroup)
+%endif
Obsoletes: nfs-utils < 1.1.0
%description -n nfs-client
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2017-02-16 16:41:48
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new (New)
Package is "nfs-utils"
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2017-02-07
11:57:51.585282903 +0100
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2017-02-16
16:41:49.345482078 +0100
@@ -1,0 +2,28 @@
+Wed Feb 8 02:32:37 UTC 2017 - nfbr...@suse.com
+
+- update upstream version from 1.3.4 to 2.1.1
+ The significant update is that configuration can
+ now be read from a central /etc/nfs.conf file, and
+ it can include other files such as /etc/sysconfig/nfs
+ This means that the old nfs-config.service systemd
+ unit is no longer needed.
+- /etc/nfs.conf file created to import all sysconfig
+ settings except *_OPTIONS directly into running code.
+- dropins created to pass *_OPTIONS sysconfig setting to
+ the various daemons.
+- various specfile improvements, such as using "-D" in
+ "install" commands, and adding "verify_permissions".
+- "xtab" has not been needed for years and has now been remove.
+- sysconfig.nfs updated, particular the ServiceRestart
+ declarations have been tuned for systemd units.
+- 0003-nfs-server-generator-handle-noauto-mounts-correctly.patch
+ Fix the nfs-server-generator so that mounts marked "noauto"
+ are not automatically mounted when NFS exported.
+ (bsc#1019211)
+- 0001-conffile-ignore-empty-environment-variables.patch
+ 0002-mount-call-setgroups-before-setuid.patch
+ Other minor fixes found during testing.
+- REMOVED 0001-Make-location-of-nfs-utils_env.sh-configurable.patch
+ now included upstream
+
+---
Old:
0001-Make-location-of-nfs-utils_env.sh-configurable.patch
nfs-config.restart.conf
nfs-utils-1.3.4.tar.xz
nfs-utils_env.sh
New:
0001-conffile-ignore-empty-environment-variables.patch
0002-mount-call-setgroups-before-setuid.patch
0003-nfs-server-generator-handle-noauto-mounts-correctly.patch
nfs-mountd.options.conf
nfs-server.options.conf
nfs-utils-2.1.1.tar.xz
nfs.conf
rpc-gssd.options.conf
rpc-statd-notify.options.conf
rpc-statd.options.conf
rpc-svcgssd.options.conf
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.XdWKKQ/_old 2017-02-16 16:41:50.781278169 +0100
+++ /var/tmp/diff_new_pack.XdWKKQ/_new 2017-02-16 16:41:50.785277601 +0100
@@ -17,7 +17,7 @@
Name: nfs-utils
-Version:1.3.4
+Version:2.1.1
Release:0
Summary:Support Utilities for Kernel nfsd
License:GPL-2.0+
@@ -32,15 +32,23 @@
Source7:fw-client
Source8:fw-server
Source11: idmapd.conf
-Source12: nfs-config.restart.conf
Source13: nfs-utils.rpmlintrc
-Source14: nfs-utils_env.sh
Source15: nfsserver.service
Source16: nfs.service
Source17: nfs-server.nfsserver.conf
Source18: nfs-client.nfs.conf
+Source20: nfs-mountd.options.conf
+Source21: nfs-server.options.conf
+Source22: rpc-gssd.options.conf
+Source23: rpc-statd.options.conf
+Source24: rpc-statd-notify.options.conf
+Source25: rpc-svcgssd.options.conf
+Source26: nfs.conf
Patch0: nfs-utils-1.0.7-bind-syntax.patch
-Patch1: 0001-Make-location-of-nfs-utils_env.sh-configurable.patch
+Patch1: 0001-conffile-ignore-empty-environment-variables.patch
+Patch2: 0002-mount-call-setgroups-before-setuid.patch
+Patch3: 0003-nfs-server-generator-handle-noauto-mounts-correctly.patch
+
BuildRequires: e2fsprogs-devel
BuildRequires: fedfs-utils-devel
BuildRequires: gcc-c++
@@ -89,6 +97,7 @@
Conflicts: nfs-server
Provides: nfs-utils = %{version}
Obsoletes: nfs-utils < 1.1.0
+PreReq: permissions
%description -n nfs-kernel-server
This package contains support for the kernel based NFS server. You can
@@ -109,6 +118,8 @@
%setup -q -a 1
%patch0 -p1
%patch1 -p1
+%patch2 -p1
+%patch3 -p1
cp %{SOURCE6} .
@@ -138,17 +149,17 @@
%install
make %{?_smp_mflags} DESTDIR=%{buildroot} install
-install -d %{buildroot}/%{_unitdir}
-install -m 644 %{SOURCE15} %{buildroot}%{_unitdir}/nfsserver.service
-install -m 644 %{SOURCE16} %{buildroot}%{_unitdir}/nfs.service
-install -d %{buildroot}%{_unitdir}/nfs-server.service.d
-install -m 644 %{SOURCE17}
%{buildroot}%{_unitdir}/nfs-server.service.d/nfsserver.conf
-install -d %{buildroot}%{_unitdir}/nfs-client.target.d
-install -m 644 %{SOURCE18} %{buildroot}%{_unitdir}/nfs-client.target.d/nfs.conf
-install -d
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2017-02-07 11:57:50
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new (New)
Package is "nfs-utils"
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2016-11-17
13:09:19.0 +0100
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2017-02-07
11:57:51.585282903 +0100
@@ -1,0 +2,8 @@
+Thu Jan 19 10:17:03 UTC 2017 - jeng...@inai.de
+
+- Check for existence of "statd" user before creating it,
+ and do not suppress errors about it.
+- Ensure units passed to %service_* are full filenames.
+- Pass all units (non-templated) to %service_*.
+
+---
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.aK3he9/_old 2017-02-07 11:57:53.329035689 +0100
+++ /var/tmp/diff_new_pack.aK3he9/_new 2017-02-07 11:57:53.333035122 +0100
@@ -1,7 +1,7 @@
#
# spec file for package nfs-utils
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -73,6 +73,7 @@
Requires: rpcbind
Requires(post): %fillup_prereq
Requires(pre): permissions
+Requires(pre): shadow
Obsoletes: nfs-utils < 1.1.0
%description -n nfs-client
@@ -173,9 +174,10 @@
chmod 644 %{buildroot}%{_sbindir}/{mountstats,nfsiostat}
%pre -n nfs-client
-useradd -r -c 'NFS statd daemon' \
--s /sbin/nologin -d %{_localstatedir}/lib/nfs -g nogroup statd > /dev/null
2>&1 || :
-%service_add_pre nfs
+/usr/bin/getent passwd statd >/dev/null || \
+ /usr/sbin/useradd -r -c 'NFS statd daemon' \
+ -s /sbin/nologin -d %{_localstatedir}/lib/nfs -g nogroup statd
+%service_add_pre nfs.service auth-rpcgss-module.service nfs-idmapd.service
nfs-blkmap.service rpc-statd-notify.service rpc-gssd.service rpc-statd.service
nfs-config.service
%post -n nfs-client
chown statd:nogroup %{_localstatedir}/lib/nfs > /dev/null 2>&1 || :
@@ -194,22 +196,22 @@
%{fillup_only -n nfs nfs}
#
%set_permissions /sbin/mount.nfs
-%service_add_post nfs
+%service_add_post nfs.service auth-rpcgss-module.service nfs-idmapd.service
nfs-blkmap.service rpc-statd-notify.service rpc-gssd.service rpc-statd.service
nfs-config.service
%preun -n nfs-client
-%service_del_preun nfs
+%service_del_preun nfs.service auth-rpcgss-module.service nfs-idmapd.service
nfs-blkmap.service rpc-statd-notify.service rpc-gssd.service rpc-statd.service
nfs-config.service
%postun -n nfs-client
-%service_del_postun nfs
+%service_del_postun nfs.service auth-rpcgss-module.service nfs-idmapd.service
nfs-blkmap.service rpc-statd-notify.service rpc-gssd.service rpc-statd.service
nfs-config.service
%verifyscript -n nfs-client
%verify_permissions -e /sbin/mount.nfs
%pre -n nfs-kernel-server
-%service_add_pre nfsserver
+%service_add_pre nfsserver.service nfs-svcgssd.service nfs-mountd.service
nfs-server.service
%preun -n nfs-kernel-server
-%service_del_preun nfsserver
+%service_del_preun nfsserver.service nfs-svcgssd.service nfs-mountd.service
nfs-server.service
%post -n nfs-kernel-server
### migrate from /var/lock/subsys
@@ -221,10 +223,10 @@
mv %{_localstatedir}/lock/subsys/nfsserver-rpc.idmapd /run/nfs
fi
###
-%service_add_post nfsserver
+%service_add_post nfsserver.service rpc-svcgssd.service nfs-mountd.service
nfs-server.service
%postun -n nfs-kernel-server
-%service_del_postun nfsserver
+%service_del_postun nfsserver.service rpc-svcgssd.service nfs-mountd.service
nfs-server.service
%files -n nfs-client
%defattr(-,root,root)
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2016-11-17 13:09:18
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new (New)
Package is "nfs-utils"
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2016-11-02
12:28:49.0 +0100
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2016-11-17
13:09:19.0 +0100
@@ -1,0 +2,7 @@
+Mon Nov 14 14:51:30 UTC 2016 - dims...@opensuse.org
+
+- Also ignore errors on the first chown call: this can happen
+ especially in the build system when shadow is not present and
+ the user has not been generated in the %pre phase.
+
+---
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.5s9N8g/_old 2016-11-17 13:09:20.0 +0100
+++ /var/tmp/diff_new_pack.5s9N8g/_new 2016-11-17 13:09:20.0 +0100
@@ -178,7 +178,7 @@
%service_add_pre nfs
%post -n nfs-client
-chown statd:nogroup %{_localstatedir}/lib/nfs
+chown statd:nogroup %{_localstatedir}/lib/nfs > /dev/null 2>&1 || :
for i in state sm sm.bak; do
chown -R statd %{_localstatedir}/lib/nfs/$i > /dev/null 2>&1 || :
done
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2016-11-02 12:28:48
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new (New)
Package is "nfs-utils"
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2016-08-25
09:50:39.0 +0200
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2016-11-02
12:28:49.0 +0100
@@ -1,0 +2,9 @@
+Fri Oct 21 00:09:04 UTC 2016 - nfbr...@suse.com
+
+- move rpc.svcgssd and corresponding man page from
+ nfs-client package to nfs-kernel-server.
+ For NFSv4.0 this is needed on client as well as
+ the server to support the back-channel.
+ (bsc#1005609)
+
+---
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.ecJPZS/_old 2016-11-02 12:28:50.0 +0100
+++ /var/tmp/diff_new_pack.ecJPZS/_new 2016-11-02 12:28:50.0 +0100
@@ -249,6 +249,7 @@
%{_sbindir}/sm-notify
%{_sbindir}/start-statd
%{_sbindir}/blkmapd
+%{_sbindir}/rpc.svcgssd
%{_unitdir}/auth-rpcgss-module.service
%{_unitdir}/nfs-blkmap.service
%{_unitdir}/nfs-client.target
@@ -287,6 +288,7 @@
%{_mandir}/man8/mountstats.8%{ext_man}
%{_mandir}/man8/nfsiostat.8%{ext_man}
%{_mandir}/man8/blkmapd.8%{ext_man}
+%{_mandir}/man8/rpc.svcgssd.8%{ext_man}
%{_localstatedir}/adm/fillup-templates/sysconfig.nfs
%attr(0711,statd,nogroup) %dir %{_localstatedir}/lib/nfs
%dir %{_localstatedir}/lib/nfs/rpc_pipefs
@@ -309,7 +311,6 @@
%{_sbindir}/rcnfs-server
%{_sbindir}/rpc.mountd
%{_sbindir}/rpc.nfsd
-%{_sbindir}/rpc.svcgssd
/sbin/nfsdcltrack
%{_mandir}/man5/exports.5%{ext_man}
%{_mandir}/man7/nfsd.7%{ext_man}
@@ -318,7 +319,6 @@
%{_mandir}/man8/nfsd.8%{ext_man}
%{_mandir}/man8/rpc.mountd.8%{ext_man}
%{_mandir}/man8/rpc.nfsd.8%{ext_man}
-%{_mandir}/man8/rpc.svcgssd.8%{ext_man}
%{_mandir}/man8/nfsdcltrack.8%{ext_man}
%config(noreplace) %{_localstatedir}/lib/nfs/xtab
%config(noreplace) %{_localstatedir}/lib/nfs/etab
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2016-08-25 09:50:38
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new (New)
Package is "nfs-utils"
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2016-08-18
09:15:16.0 +0200
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2016-08-25
09:50:39.0 +0200
@@ -1,0 +2,9 @@
+Sun Aug 21 06:16:27 UTC 2016 - nfbr...@suse.com
+
+- 0001-Make-location-of-nfs-utils_env.sh-configurable.patch
+ 1.3.4 moved the config script location to somewhere
+ that doesn't exist on openSUSE. Move it somewhere
+ better and install it there.
+ (bsc#990356)
+
+---
New:
0001-Make-location-of-nfs-utils_env.sh-configurable.patch
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.hNKoHK/_old 2016-08-25 09:50:40.0 +0200
+++ /var/tmp/diff_new_pack.hNKoHK/_new 2016-08-25 09:50:40.0 +0200
@@ -40,6 +40,7 @@
Source17: nfs-server.nfsserver.conf
Source18: nfs-client.nfs.conf
Patch0: nfs-utils-1.0.7-bind-syntax.patch
+Patch1: 0001-Make-location-of-nfs-utils_env.sh-configurable.patch
BuildRequires: e2fsprogs-devel
BuildRequires: fedfs-utils-devel
BuildRequires: gcc-c++
@@ -106,6 +107,7 @@
%prep
%setup -q -a 1
%patch0 -p1
+%patch1 -p1
cp %{SOURCE6} .
@@ -142,8 +144,8 @@
install -m 644 %{SOURCE17}
%{buildroot}%{_unitdir}/nfs-server.service.d/nfsserver.conf
install -d %{buildroot}%{_unitdir}/nfs-client.target.d
install -m 644 %{SOURCE18} %{buildroot}%{_unitdir}/nfs-client.target.d/nfs.conf
-install -d %{buildroot}%{_prefix}/lib/systemd/scripts
-install -m 755 %{SOURCE14}
%{buildroot}%{_prefix}/lib/systemd/scripts/nfs-utils_env.sh
+install -d %{buildroot}%{_libexecdir}/nfs-utils
+install -m 755 %{SOURCE14}
%{buildroot}%{_libexecdir}/nfs-utils/nfs-utils_env.sh
install -d %{buildroot}%{_unitdir}/nfs-config.service.d
install -m 644 %{SOURCE12}
%{buildroot}%{_unitdir}/nfs-config.service.d/restart.conf
ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcnfsserver
@@ -263,8 +265,8 @@
%{_unitdir}/nfs-client.target.d/nfs.conf
%dir %{_unitdir}/nfs-config.service.d
%{_unitdir}/nfs-config.service.d/restart.conf
-%dir %{_libexecdir}/systemd/scripts
-%{_libexecdir}/systemd/scripts/nfs-utils_env.sh
+%dir %{_libexecdir}/nfs-utils
+%{_libexecdir}/nfs-utils/nfs-utils_env.sh
%{_mandir}/man5/nfsmount.conf.5%{ext_man}
%{_mandir}/man5/nfs.5%{ext_man}
%{_mandir}/man8/mount.nfs.8%{ext_man}
++ 0001-Make-location-of-nfs-utils_env.sh-configurable.patch ++
>From dc071e55135019d4503930f204674219a9f8676b Mon Sep 17 00:00:00 2001
From: NeilBrown
Date: Sun, 21 Aug 2016 14:53:57 +1000
Subject: [PATCH] Make location of nfs-utils_env.sh configurable.
A recent patch moved this file to /usr/libexec/...
That directory isn't universal, and doesn't exist on openSUSE or
Debian for example.
So change it to use the $libexecdir directory determined by configure
Signed-off-by: NeilBrown
---
configure.ac |6 ++
systemd/nfs-config.service| 13 -
systemd/nfs-config.service.in | 13 +
3 files changed, 19 insertions(+), 13 deletions(-)
--- a/configure.ac
+++ b/configure.ac
@@ -511,8 +511,14 @@ AC_SUBST([AM_CFLAGS], ["$my_am_cflags"])
# Make sure that $ACLOCAL_FLAGS are used during a rebuild
AC_SUBST([ACLOCAL_AMFLAGS], ["-I $ac_macro_dir \$(ACLOCAL_FLAGS)"])
+# make libexecdir available for substituion in config files
+# 2 "evals" needed late to expand variable names.
+AC_SUBST([_libexecdir])
+AC_CONFIG_COMMANDS_PRE([eval eval _libexecdir=$libexecdir])
+
AC_CONFIG_FILES([
Makefile
+ systemd/nfs-config.service
linux-nfs/Makefile
support/Makefile
support/export/Makefile
--- a/systemd/nfs-config.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Preprocess NFS configuration
-After=local-fs.target
-DefaultDependencies=no
-
-[Service]
-Type=oneshot
-# This service needs to run any time any nfs service
-# is started, so changes to local config files get
-# incorporated. Having "RemainAfterExit=no" (the default)
-# ensures this happens.
-RemainAfterExit=no
-ExecStart=/usr/libexec/nfs-utils/nfs-utils_env.sh
--- /dev/null
+++ b/systemd/nfs-config.service.in
@@ -0,0 +1,13 @@
+[Unit]
+Description=Preprocess NFS configuration
+After=local-fs.target
+DefaultDependencies=no
+
+[Service]
+Type=oneshot
+# This service needs to run any time any nfs service
+# is started, so changes to local config files get
+# incorporated.
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2016-08-18 09:15:14
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new (New)
Package is "nfs-utils"
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2016-06-02
12:48:51.0 +0200
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2016-08-18
09:15:16.0 +0200
@@ -1,0 +2,39 @@
+Wed Aug 10 02:57:57 UTC 2016 - nfbr...@suse.com
+
+- nfs-utils-1.3.4.tar.xz
+ New upstream release. Lots of bugfixes, no significant
+ functionality changes
+
+- delete 0001-Fix-protocol-minor-version-fall-back.patch
+ delete 0001-close-the-syslog-fd-in-daemon_init.patch
+ delete 0001-mount-run-START_STATD-fully-as-root.patch
+ delete 0001-mount.nfs-hide-EBUSY-errors.patch
+ delete 0001-mount.nfs-trust-the-exit-status-of-start_statd.patch
+ delete 0001-systemd-Decouple-the-starting-and-stopping-of-rpcbin.patch
+ delete 0002-systemd-unit-files-fix-up-dependencies-on-rpcbind.patch
+ delete nfs-utils-no-svcgss.service
+ delete nfs-utils-uninit-mem.patch
+ All patches are included in 1.3.4
+
+
+---
+Tue Aug 9 23:32:10 UTC 2016 - nfbr...@suse.com
+
+- nfs-utils_env.sh
+ Fix some problems with version_params.
+ Various misspellings and remove the possiblity
+ that V4 is both disabled and enabled.
+ (bsc#990356)
+
+---
+Mon Aug 8 08:39:54 UTC 2016 - tchva...@suse.com
+
+- Drop OMC svcinfo file, nowdays useless
+
+---
+Mon Aug 8 08:38:16 UTC 2016 - tchva...@suse.com
+
+- Sort a bit with spec-cleaner to get uptodate spec
+- Convert deps from regular devels to pkgconfig style
+
+---
Old:
0001-Fix-protocol-minor-version-fall-back.patch
0001-close-the-syslog-fd-in-daemon_init.patch
0001-mount-run-START_STATD-fully-as-root.patch
0001-mount.nfs-hide-EBUSY-errors.patch
0001-mount.nfs-trust-the-exit-status-of-start_statd.patch
0001-systemd-Decouple-the-starting-and-stopping-of-rpcbin.patch
0002-systemd-unit-files-fix-up-dependencies-on-rpcbind.patch
nfs-kernel-server.xml
nfs-utils-1.3.3.tar.xz
nfs-utils-no-svcgss.service
nfs-utils-uninit-mem.patch
New:
nfs-utils-1.3.4.tar.xz
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.gdC1Xw/_old 2016-08-18 09:15:17.0 +0200
+++ /var/tmp/diff_new_pack.gdC1Xw/_new 2016-08-18 09:15:17.0 +0200
@@ -17,36 +17,17 @@
Name: nfs-utils
-BuildRequires: device-mapper-devel
-BuildRequires: e2fsprogs-devel
-BuildRequires: fedfs-utils-devel
-BuildRequires: gcc-c++
-BuildRequires: krb5-devel
-BuildRequires: libevent-devel
-BuildRequires: libmount-devel
-BuildRequires: libtirpc-devel
-BuildRequires: libtool
-BuildRequires: nfsidmap-devel >= 0.24
-BuildRequires: pkgconfig
-BuildRequires: sqlite3-devel
-BuildRequires: systemd-rpm-macros
-BuildRequires: tcpd-devel
-Url:http://kernel.org/pub/linux/utils/nfs-utils/
+Version:1.3.4
+Release:0
Summary:Support Utilities for Kernel nfsd
License:GPL-2.0+
Group: Productivity/Networking/NFS
-Version:1.3.3
-Release:0
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-PreReq: %fillup_prereq
-%{?systemd_requires}
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Url:http://kernel.org/pub/linux/utils/nfs-utils/
Source0:
http://kernel.org/pub/linux/utils/nfs-utils/%{version}/nfs-utils-%{version}.tar.xz
# Download does not work:
# Source1:ftp://nfs.sourceforge.net/pub/nfs/nfs.doc.tar.bz2
Source1:nfs.doc.tar.bz2
Source4:sysconfig.nfs
-Source5:nfs-kernel-server.xml
Source6:README.NFSv4
Source7:fw-client
Source8:fw-server
@@ -59,17 +40,24 @@
Source17: nfs-server.nfsserver.conf
Source18: nfs-client.nfs.conf
Patch0: nfs-utils-1.0.7-bind-syntax.patch
-Patch1: nfs-utils-no-svcgss.service
-Patch2: nfs-utils-uninit-mem.patch
-Patch3: 0001-Fix-protocol-minor-version-fall-back.patch
-Patch4: 0001-mount.nfs-hide-EBUSY-errors.patch
-Patch5: 0001-close-the-syslog-fd-in-daemon_init.patch
-Patch6: 0001-mount.nfs-trust-the-exit-status-of-start_statd.patch
-Patch7: 0001-mount-run-START_STATD-fully-as-root.patch
-Patch8: 0001-systemd-Decouple-the-starting-and-stopping-of-rpcbin.patch
-Patch9:
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2016-06-02 12:48:50
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new (New)
Package is "nfs-utils"
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2016-04-28
16:50:52.0 +0200
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2016-06-02
12:48:51.0 +0200
@@ -1,0 +2,8 @@
+Tue May 24 22:27:14 UTC 2016 - nfbr...@suse.com
+
+- 0001-systemd-Decouple-the-starting-and-stopping-of-rpcbin.patch
+ 0002-systemd-unit-files-fix-up-dependencies-on-rpcbind.patch
+ Fix systemd dependencies to ensure rpcbind is started when needed.
+ (bsc#975265)
+
+---
New:
0001-systemd-Decouple-the-starting-and-stopping-of-rpcbin.patch
0002-systemd-unit-files-fix-up-dependencies-on-rpcbind.patch
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.j5Afze/_old 2016-06-02 12:48:52.0 +0200
+++ /var/tmp/diff_new_pack.j5Afze/_new 2016-06-02 12:48:52.0 +0200
@@ -66,6 +66,8 @@
Patch5: 0001-close-the-syslog-fd-in-daemon_init.patch
Patch6: 0001-mount.nfs-trust-the-exit-status-of-start_statd.patch
Patch7: 0001-mount-run-START_STATD-fully-as-root.patch
+Patch8: 0001-systemd-Decouple-the-starting-and-stopping-of-rpcbin.patch
+Patch9: 0002-systemd-unit-files-fix-up-dependencies-on-rpcbind.patch
Suggests: python-base
@@ -124,6 +126,8 @@
%patch5 -p1
%patch6 -p1
%patch7 -p1
+%patch8 -p1
+%patch9 -p1
cp %{S:6} .
++ 0001-systemd-Decouple-the-starting-and-stopping-of-rpcbin.patch ++
>From 4fabfcd082069a16ea8769b9ea9344fc15011366 Mon Sep 17 00:00:00 2001
From: Steve Dickson
Date: Mon, 9 Nov 2015 11:28:30 -0500
Subject: [PATCH] systemd: Decouple the starting and stopping of
rpcbind/nfs-server
Commit b98f2af15 introduced a regression that cause the
starting and stop of rpcbind and the nfs-server to
be depended on each other
The starting of the NFS server should start rpcbind
but bring rpcbind down should not bring the NFS
server down.
Signed-off-by: Steve Dickson
---
systemd/nfs-server.service | 2 +-
systemd/rpc-statd.service | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/systemd/nfs-server.service b/systemd/nfs-server.service
index 12b02f26f9ce..317e5d689767 100644
--- a/systemd/nfs-server.service
+++ b/systemd/nfs-server.service
@@ -1,7 +1,7 @@
[Unit]
Description=NFS server and services
DefaultDependencies=no
-Requires= network.target proc-fs-nfsd.mount rpcbind.service
+Requires= network.target proc-fs-nfsd.mount rpcbind.target
Requires= nfs-mountd.service
Wants=rpc-statd.service nfs-idmapd.service
Wants=rpc-statd-notify.service
diff --git a/systemd/rpc-statd.service b/systemd/rpc-statd.service
index 14604d783ddf..f16ea425dc77 100644
--- a/systemd/rpc-statd.service
+++ b/systemd/rpc-statd.service
@@ -3,7 +3,7 @@ Description=NFS status monitor for NFSv2/3 locking.
DefaultDependencies=no
Conflicts=umount.target
Requires=nss-lookup.target rpcbind.target
-After=network.target nss-lookup.target rpcbind.target
+After=network.target nss-lookup.target rpcbind.service
PartOf=nfs-utils.service
--
2.8.2
++ 0002-systemd-unit-files-fix-up-dependencies-on-rpcbind.patch ++
>From 91da135f243d6f87fcea8b8a3ce28a589917b0e4 Mon Sep 17 00:00:00 2001
From: NeilBrown
Date: Mon, 2 May 2016 08:54:13 -0400
Subject: [PATCH] systemd unit files: fix up dependencies on rpcbind.
The dependencies on rpcbind have been changed a few times and I think
they are still wrong. So I'll go into some detail to justify this
change.
Firstly: rpcbind.target rpcbind.socket or rpcbind.service?
The systemd documentation talks about targets as "synchronization
points" and likens them to SysV init run levels. Run levels are about
ordering but not dependencies.
The systemd.special man page describes rpcbind.target as intended
explicitly for ordering sysvinit scripts, with "After=" dependencies.
So while I think it is valid to use rpcbind.target for ordering
(before/after) it shouldn't be used for dependencies (Wants/Requires).
The rpcbind.target file included in systemd does not "Require" the
actual service, so requiring rpcbind.target itself is pointless.
I think we shouldn't use rpcbind.target at all. Leave it for sysvinit
synchronization.
So: .socket or .service?
I think nfs only needs the socket to be active. On first connection
the service will be started. But nfs does not need to wait for the
service to start, only the socket. So I
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2016-04-28 16:50:50
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new (New)
Package is "nfs-utils"
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2016-04-11
09:12:21.0 +0200
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2016-04-28
16:50:52.0 +0200
@@ -1,0 +2,10 @@
+Thu Apr 21 23:40:59 UTC 2016 - ne...@suse.com
+
+- 0001-close-the-syslog-fd-in-daemon_init.patch
+ Without this, tracing doesn't work
+- 0001-mount.nfs-trust-the-exit-status-of-start_statd.patch
+ (bsc#945937)
+- 0001-mount-run-START_STATD-fully-as-root.patch
+ (bsc#969152)
+
+---
New:
0001-close-the-syslog-fd-in-daemon_init.patch
0001-mount-run-START_STATD-fully-as-root.patch
0001-mount.nfs-trust-the-exit-status-of-start_statd.patch
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.4s74qo/_old 2016-04-28 16:50:53.0 +0200
+++ /var/tmp/diff_new_pack.4s74qo/_new 2016-04-28 16:50:53.0 +0200
@@ -63,6 +63,10 @@
Patch2: nfs-utils-uninit-mem.patch
Patch3: 0001-Fix-protocol-minor-version-fall-back.patch
Patch4: 0001-mount.nfs-hide-EBUSY-errors.patch
+Patch5: 0001-close-the-syslog-fd-in-daemon_init.patch
+Patch6: 0001-mount.nfs-trust-the-exit-status-of-start_statd.patch
+Patch7: 0001-mount-run-START_STATD-fully-as-root.patch
+
Suggests: python-base
%description
@@ -117,6 +121,10 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+
cp %{S:6} .
%build
++ 0001-close-the-syslog-fd-in-daemon_init.patch ++
>From 273b46473594b8aa4e55f682577d1dd94d44ad50 Mon Sep 17 00:00:00 2001
From: Scott Mayhew
Date: Mon, 2 Nov 2015 08:07:11 -0500
Subject: [PATCH] close the syslog fd in daemon_init()
Commit 7addf9d (cleanup daemonization code) added the following line to
mydaemon_init():
dup2(pipefds[1], 3);
If we've already called vsyslog() before the fork(), then chances are fd
3 was being used for the syslog socket. In that case the next vsyslog()
call will cause the data to appear on the read end of the pipe, causing
the parent to exit with a nonzero status. If systemd is running, it
will see the parent's nonzero exit status and will terminate the child
as well.
So just call closelog() to close the fd. The next call to vsyslog()
will open a new one if need be.
Signed-off-by: Scott Mayhew
Signed-off-by: Steve Dickson
---
support/nfs/mydaemon.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/support/nfs/mydaemon.c b/support/nfs/mydaemon.c
index 3391eff39008..701cfd914179 100644
--- a/support/nfs/mydaemon.c
+++ b/support/nfs/mydaemon.c
@@ -122,6 +122,7 @@ daemon_init(bool fg)
dup2(tempfd, 0);
dup2(tempfd, 1);
dup2(tempfd, 2);
+ closelog();
dup2(pipefds[1], 3);
pipefds[1] = 3;
closeall(4);
--
2.8.1
++ 0001-mount-run-START_STATD-fully-as-root.patch ++
>From 8714f14c1966612d073d922d86a394c424eda724 Mon Sep 17 00:00:00 2001
From: NeilBrown
Date: Fri, 22 Apr 2016 09:13:31 +1000
Subject: [PATCH] mount: run START_STATD fully as root
If a "user" mount is the first NFSv3 mount, mount.nfs will be running
setuid to root (with non-root as the real-uid) when it executes START_STATD.
start-statd is a shell script and many shells refuse to run setuid,
dropping privileges immediately. This results in start-statd running
as an unprivileged user and so statd fails to start.
To fix this, call "setuid(0)" to set real uid to zero. Also call "setgid(0)"
for consistency.
The behaviour of a shell can often be affected by the environment,
such as the "shell functions" that bash includes from the environment.
To avoid the user being able to pass such environment to the shell,
explicitly pass an empty environment. The start-statd script explicitly
sets the PATH which is all it really needs.
Signed-off-by: NeilBrown
---
utils/mount/network.c | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/utils/mount/network.c b/utils/mount/network.c
index 7240ca7bcdc4..0d12613e86a4 100644
--- a/utils/mount/network.c
+++ b/utils/mount/network.c
@@ -795,6 +795,7 @@ int start_statd(void)
if (S_ISREG(stb.st_mode) && (stb.st_mode & S_IXUSR)) {
int cnt = STATD_TIMEOUT * 10;
int status = 0;
+ char * const envp[1] = { NULL };
commit nfs-utils for openSUSE:Factory
Hello community, here is the log from the commit of package nfs-utils for openSUSE:Factory checked in at 2016-04-11 09:12:20 Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old) and /work/SRC/openSUSE:Factory/.nfs-utils.new (New) Package is "nfs-utils" Changes: --- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2016-03-07 13:25:46.0 +0100 +++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2016-04-11 09:12:21.0 +0200 @@ -1,0 +2,10 @@ +Mon Apr 4 13:56:38 CEST 2016 - ku...@suse.de + +- Drop unused BuildRequires for libgssglue, not used with tirpc + +--- +Mon Apr 4 10:16:32 CEST 2016 - ku...@suse.de + +- Drop unused BuildRequires for librpcsecgss, tirpc version is used + +--- Other differences: -- ++ nfs-utils.spec ++ --- /var/tmp/diff_new_pack.msdsi4/_old 2016-04-11 09:12:22.0 +0200 +++ /var/tmp/diff_new_pack.msdsi4/_new 2016-04-11 09:12:22.0 +0200 @@ -23,9 +23,7 @@ BuildRequires: gcc-c++ BuildRequires: krb5-devel BuildRequires: libevent-devel -BuildRequires: libgssglue-devel >= 0.3 BuildRequires: libmount-devel -BuildRequires: librpcsecgss BuildRequires: libtirpc-devel BuildRequires: libtool BuildRequires: nfsidmap-devel >= 0.24
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2016-03-07 13:25:44
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new (New)
Package is "nfs-utils"
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2016-02-28
02:28:19.0 +0100
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2016-03-07
13:25:46.0 +0100
@@ -1,0 +2,7 @@
+Wed Mar 2 03:53:26 UTC 2016 - ne...@suse.com
+
+- 0001-mount.nfs-hide-EBUSY-errors.patch
+ Stop "mount -a -t nfs" from complaining if filesystem
+ already mounted (bsc#950340)
+
+---
New:
0001-mount.nfs-hide-EBUSY-errors.patch
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.K2aDpZ/_old 2016-03-07 13:25:47.0 +0100
+++ /var/tmp/diff_new_pack.K2aDpZ/_new 2016-03-07 13:25:47.0 +0100
@@ -64,6 +64,7 @@
Patch1: nfs-utils-no-svcgss.service
Patch2: nfs-utils-uninit-mem.patch
Patch3: 0001-Fix-protocol-minor-version-fall-back.patch
+Patch4: 0001-mount.nfs-hide-EBUSY-errors.patch
Suggests: python-base
%description
@@ -117,6 +118,7 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
cp %{S:6} .
%build
++ 0001-mount.nfs-hide-EBUSY-errors.patch ++
>From f0dc907b52892c18ccad2e573850583c0ee01157 Mon Sep 17 00:00:00 2001
From: NeilBrown
Date: Wed, 21 Oct 2015 14:07:52 +1100
Subject: [PATCH] mount.nfs - hide EBUSY errors.
Linux only returns EBUSY for a non-remount mount if the exact
requested filesystem is already mounted. Arguably this is not an
error.
"mount -a" tries to see if each request filesystem is already mounted.
Sometimes it gets it wrong - e.g. hostname aliases can confuse it.
So "mount -a" will report a failure "already mounted", which is
wrong because it should filter those out.
An easy fix it just to be silent about EBUSY. As the requested
result (a given filesystem being mounted at a given location) is in
effect after the EBUSY return, we can just treat it as success.
This removed the confusing "already mounted" errors.
Signed-off-by: NeilBrown
---
utils/mount/stropts.c | 9 +
1 file changed, 9 insertions(+)
diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index 86829a902bfd..320dde2fab92 100644
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -960,6 +960,15 @@ static int nfsmount_fg(struct nfsmount_info *mi)
if (nfs_try_mount(mi))
return EX_SUCCESS;
+ if (errno == EBUSY)
+ /* The only cause of EBUSY is if exactly the desired
+* filesystem is already mounted. That can arguably
+* be seen as success. "mount -a" tries to optimise
+* out this case but sometimes fails. Help it out
+* by pretending everything is rosy
+*/
+ return EX_SUCCESS;
+
if (nfs_is_permanent_error(errno))
break;
--
2.7.2
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2016-02-28 02:28:14
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new (New)
Package is "nfs-utils"
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2015-12-03
13:29:34.0 +0100
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2016-02-28
02:28:19.0 +0100
@@ -1,0 +2,13 @@
+Thu Feb 18 06:04:05 UTC 2016 - ne...@suse.com
+
+- 0001-Fix-protocol-minor-version-fall-back.patch
+ (bnc#959211)
+
+---
+Wed Feb 17 03:20:55 UTC 2016 - ne...@suse.com
+
+- nfs.service: don't mount/unmount nfs filesystems.
+ systemd does this automatically. Trying to do it here too
+ causes timing races (boo#963616)
+
+---
New:
0001-Fix-protocol-minor-version-fall-back.patch
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.86RFZl/_old 2016-02-28 02:28:23.0 +0100
+++ /var/tmp/diff_new_pack.86RFZl/_new 2016-02-28 02:28:23.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package nfs-utils
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -63,6 +63,7 @@
Patch0: nfs-utils-1.0.7-bind-syntax.patch
Patch1: nfs-utils-no-svcgss.service
Patch2: nfs-utils-uninit-mem.patch
+Patch3: 0001-Fix-protocol-minor-version-fall-back.patch
Suggests: python-base
%description
@@ -115,6 +116,7 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
cp %{S:6} .
%build
++ 0001-Fix-protocol-minor-version-fall-back.patch ++
>From 78bb645a42c216b37b8d930c7c849a3fa89babf8 Mon Sep 17 00:00:00 2001
From: Takashi Iwai
Date: Sat, 16 Jan 2016 12:02:30 -0500
Subject: [PATCH] Fix protocol minor version fall-back
mount.nfs currently expects mount(2) to fail with EPROTONOSUPPORT if
the kernel doesn't understand the requested NFS version.
Unfortunately if the requested minor is not known to the kernel
it returns -EINVAL.
In kernels since 3.11 this can happen in nfs4_alloc_client(), if
compiled without NFS_V4_2.
More generally it can happen in in nfs_validate_text_mount_data()
when nfs_parse_mount_options() returns 0 because
nfs_parse_version_string()
didn't recognise the version.
EPROTONOSUPPORT is only returned if NFSv4 support is completely compiled
out.
So nfs_autonegotiate needs to check for EINVAL as well as
EPROTONOSUPPORT.
URL: https://bugzilla.opensuse.org/show_bug.cgi?id=959211
Reported-by: Takashi Iwai
Signed-off-by: NeilBrown
Signed-off-by: Steve Dickson
---
utils/mount/stropts.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index c8f5a6d223e7..86829a902bfd 100644
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -841,6 +841,9 @@ check_result:
case EPROTONOSUPPORT:
/* A clear indication that the server or our
* client does not support NFS version 4 and minor */
+ case EINVAL:
+ /* A less clear indication that our client
+* does not support NFSv4 minor version. */
if (mi->version.v_mode == V_GENERAL &&
mi->version.minor == 0)
return result;
--
2.7.1
++ nfs.service ++
--- /var/tmp/diff_new_pack.86RFZl/_old 2016-02-28 02:28:23.0 +0100
+++ /var/tmp/diff_new_pack.86RFZl/_new 2016-02-28 02:28:23.0 +0100
@@ -17,8 +17,6 @@
Type=oneshot
RemainAfterExit=yes
ExecStart=/bin/true
-ExecStartPost=/usr/bin/mount -at nfs,nfs4
-ExecStop=/usr/bin/umount -aft nfs,nfs4
[Install]
WantedBy=multi-user.target
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2015-12-03 13:29:33
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new (New)
Package is "nfs-utils"
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2015-11-24
22:31:48.0 +0100
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2015-12-03
13:29:34.0 +0100
@@ -1,0 +2,5 @@
+Thu Nov 26 16:17:42 UTC 2015 - sch...@suse.de
+
+- nfs-utils-uninit-mem.patch: fix use of uninitialized memory (bsc#956743)
+
+---
New:
nfs-utils-uninit-mem.patch
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.UIiyT2/_old 2015-12-03 13:29:35.0 +0100
+++ /var/tmp/diff_new_pack.UIiyT2/_new 2015-12-03 13:29:35.0 +0100
@@ -19,6 +19,7 @@
Name: nfs-utils
BuildRequires: device-mapper-devel
BuildRequires: e2fsprogs-devel
+BuildRequires: fedfs-utils-devel
BuildRequires: gcc-c++
BuildRequires: krb5-devel
BuildRequires: libevent-devel
@@ -30,9 +31,8 @@
BuildRequires: nfsidmap-devel >= 0.24
BuildRequires: pkgconfig
BuildRequires: sqlite3-devel
-BuildRequires: tcpd-devel
BuildRequires: systemd-rpm-macros
-BuildRequires: fedfs-utils-devel
+BuildRequires: tcpd-devel
Url:http://kernel.org/pub/linux/utils/nfs-utils/
Summary:Support Utilities for Kernel nfsd
License:GPL-2.0+
@@ -62,6 +62,7 @@
Source18: nfs-client.nfs.conf
Patch0: nfs-utils-1.0.7-bind-syntax.patch
Patch1: nfs-utils-no-svcgss.service
+Patch2: nfs-utils-uninit-mem.patch
Suggests: python-base
%description
@@ -113,6 +114,7 @@
%setup -q -n nfs-utils-%{version} -a 1
%patch0 -p1
%patch1 -p1
+%patch2 -p1
cp %{S:6} .
%build
++ nfs-utils-uninit-mem.patch ++
Index: nfs-utils-1.3.3/utils/mount/network.c
===
--- nfs-utils-1.3.3.orig/utils/mount/network.c
+++ nfs-utils-1.3.3/utils/mount/network.c
@@ -1626,7 +1626,10 @@ int nfs_options2pmap(struct mount_option
return 0;
if (!nfs_nfs_version(options, ))
return 0;
- nfs_pmap->pm_vers = version.major;
+ if (version.v_mode == V_DEFAULT)
+ nfs_pmap->pm_vers = 0;
+ else
+ nfs_pmap->pm_vers = version.major;
if (!nfs_nfs_protocol(options, _pmap->pm_prot))
return 0;
if (!nfs_nfs_port(options, _pmap->pm_port))
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2015-11-24 22:31:47
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new (New)
Package is "nfs-utils"
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2015-11-12
19:36:58.0 +0100
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2015-11-24
22:31:48.0 +0100
@@ -1,0 +2,10 @@
+Mon Nov 9 23:53:43 UTC 2015 - p.drou...@gmail.com
+
+- Remove sysvinit related macros; the package doesn't contain any
+ sysvinit script
+- Replace systemd with systemd-rpm-macros; increase dependencies
+ weight
+- Use %configure macro
+- Remove depreciated %clean section
+
+---
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.e20KZ4/_old 2015-11-24 22:31:49.0 +0100
+++ /var/tmp/diff_new_pack.e20KZ4/_new 2015-11-24 22:31:49.0 +0100
@@ -31,12 +31,8 @@
BuildRequires: pkgconfig
BuildRequires: sqlite3-devel
BuildRequires: tcpd-devel
-%if 0%{?suse_version} >= 1210
-BuildRequires: systemd
-%endif
-%if 0%{?suse_version} >= 1310
+BuildRequires: systemd-rpm-macros
BuildRequires: fedfs-utils-devel
-%endif
Url:http://kernel.org/pub/linux/utils/nfs-utils/
Summary:Support Utilities for Kernel nfsd
License:GPL-2.0+
@@ -121,8 +117,9 @@
%build
rm -f configure; autoreconf -fi
-CFLAGS="$RPM_OPT_FLAGS -fPIE -fno-strict-aliasing" LDFLAGS="-pie" ./configure \
- --mandir=%{_mandir} \
+export CFLAGS="%{optflags} -fPIE"
+export LDFLAGS="-pie"
+%{configure} \
--with-systemd \
--enable-nfsv4 \
--enable-gss \
@@ -181,9 +178,6 @@
# hack to avoid automatic python dependency
chmod 644 $RPM_BUILD_ROOT%{_sbindir}/{mountstats,nfsiostat}
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%pre -n nfs-client
useradd -r -c 'NFS statd daemon' \
-s /sbin/nologin -d /var/lib/nfs -g nogroup statd > /dev/null 2>&1 || :
@@ -209,11 +203,9 @@
%service_add_post nfs
%preun -n nfs-client
-%stop_on_removal nfs
%service_del_preun nfs
%postun -n nfs-client
-%restart_on_update nfs
%service_del_postun nfs
%verifyscript -n nfs-client
@@ -223,7 +215,6 @@
%service_add_pre nfsserver
%preun -n nfs-kernel-server
-%stop_on_removal nfsserver
%service_del_preun nfsserver
%post -n nfs-kernel-server
@@ -239,7 +230,6 @@
%service_add_post nfsserver
%postun -n nfs-kernel-server
-%restart_on_update nfsserver
%service_del_postun nfsserver
%files -n nfs-client
@@ -251,20 +241,20 @@
/sbin/umount.nfs
/sbin/umount.nfs4
/sbin/osd_login
-%attr(0755,root,root) /usr/sbin/mountstats
-%attr(0755,root,root) /usr/sbin/nfsiostat
-/usr/sbin/nfsidmap
-/usr/sbin/nfsstat
-/usr/sbin/rcnfs
-/usr/sbin/rcnfs-client
-/usr/sbin/rpc.gssd
-/usr/sbin/rpc.idmapd
-/usr/sbin/rpc.statd
-/usr/sbin/rpcdebug
-/usr/sbin/showmount
-/usr/sbin/sm-notify
-/usr/sbin/start-statd
-/usr/sbin/blkmapd
+%attr(0755,root,root) %{_sbindir}/mountstats
+%attr(0755,root,root) %{_sbindir}/nfsiostat
+%{_sbindir}/nfsidmap
+%{_sbindir}/nfsstat
+%{_sbindir}/rcnfs
+%{_sbindir}/rcnfs-client
+%{_sbindir}/rpc.gssd
+%{_sbindir}/rpc.idmapd
+%{_sbindir}/rpc.statd
+%{_sbindir}/rpcdebug
+%{_sbindir}/showmount
+%{_sbindir}/sm-notify
+%{_sbindir}/start-statd
+%{_sbindir}/blkmapd
%{_unitdir}/auth-rpcgss-module.service
%{_unitdir}/nfs-blkmap.service
%{_unitdir}/nfs-client.target
@@ -281,8 +271,8 @@
%{_unitdir}/nfs-client.target.d/nfs.conf
%dir %{_unitdir}/nfs-config.service.d
%{_unitdir}/nfs-config.service.d/restart.conf
-%dir /usr/lib/systemd/scripts
-/usr/lib/systemd/scripts/nfs-utils_env.sh
+%dir %{_libexecdir}/systemd/scripts
+%{_libexecdir}/systemd/scripts/nfs-utils_env.sh
%{_mandir}/man5/nfsmount.conf.5.gz
%{_mandir}/man5/nfs.5.gz
%{_mandir}/man8/mount.nfs.8.gz
@@ -320,12 +310,12 @@
%{_unitdir}/nfsserver.service
%dir %{_unitdir}/nfs-server.service.d
%{_unitdir}/nfs-server.service.d/nfsserver.conf
-/usr/sbin/exportfs
-/usr/sbin/rcnfsserver
-/usr/sbin/rcnfs-server
-/usr/sbin/rpc.mountd
-/usr/sbin/rpc.nfsd
-/usr/sbin/rpc.svcgssd
+%{_sbindir}/exportfs
+%{_sbindir}/rcnfsserver
+%{_sbindir}/rcnfs-server
+%{_sbindir}/rpc.mountd
+%{_sbindir}/rpc.nfsd
+%{_sbindir}/rpc.svcgssd
/sbin/nfsdcltrack
%{_mandir}/man5/exports.5.gz
%{_mandir}/man7/nfsd.7.gz
@@ -336,7 +326,7 @@
%{_mandir}/man8/rpc.nfsd.8.gz
%{_mandir}/man8/rpc.svcgssd.8.gz
%{_mandir}/man8/nfsdcltrack.8.gz
-/usr/share/omc/svcinfo.d/nfs-kernel-server.xml
+%{_datadir}/omc/svcinfo.d/nfs-kernel-server.xml
%config(noreplace) /var/lib/nfs/xtab
%config(noreplace) /var/lib/nfs/etab
%config(noreplace) /var/lib/nfs/rmtab
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2015-11-12 19:36:57
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new (New)
Package is "nfs-utils"
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2015-10-28
17:17:44.0 +0100
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2015-11-12
19:36:58.0 +0100
@@ -1,0 +2,18 @@
+Tue Oct 27 13:24:31 UTC 2015 - je...@suse.com
+
+- Use proper annotations for service restart (bsc#952055).
+
+---
+Thu Oct 22 06:35:02 UTC 2015 - nfbr...@suse.com
+
+- update upstream version from 1.3.1 to 1.3.3.
+ This contains lots of bugfixes but not significant new features.
+- delete 0001-nfs-client.target-Removed-a-ordering-cycle-with-nfs-.patch
+ delete 0002-Centralize-dependencies-on-the-auth-unit.patch
+ both included upstream
+- nfs-utils-no-svcgss.service
+ fix minor make-install issue (has since been accepted upstream)
+- use "make install" to install systemd files instead of hand-code.
+- retain rpc-svcgssd for now until gss-proxy is packaged.
+
+---
Old:
0001-nfs-client.target-Removed-a-ordering-cycle-with-nfs-.patch
0002-Centralize-dependencies-on-the-auth-unit.patch
nfs-utils-1.3.1.tar.xz
New:
nfs-utils-1.3.3.tar.xz
nfs-utils-no-svcgss.service
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.5W7INJ/_old 2015-11-12 19:37:00.0 +0100
+++ /var/tmp/diff_new_pack.5W7INJ/_new 2015-11-12 19:37:00.0 +0100
@@ -41,7 +41,7 @@
Summary:Support Utilities for Kernel nfsd
License:GPL-2.0+
Group: Productivity/Networking/NFS
-Version:1.3.1
+Version:1.3.3
Release:0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: %fillup_prereq
@@ -65,10 +65,7 @@
Source17: nfs-server.nfsserver.conf
Source18: nfs-client.nfs.conf
Patch0: nfs-utils-1.0.7-bind-syntax.patch
-# PATCH-FIX-UPSTREAM
0001-nfs-client.target-Removed-a-ordering-cycle-with-nfs-.patch nfbr...@suse.de
-Patch1: 0001-nfs-client.target-Removed-a-ordering-cycle-with-nfs-.patch
-# PATCH-FIX-UPSTREAM 0002-Centralize-dependencies-on-the-auth-unit.patch
nfbr...@suse.de
-Patch2: 0002-Centralize-dependencies-on-the-auth-unit.patch
+Patch1: nfs-utils-no-svcgss.service
Suggests: python-base
%description
@@ -120,15 +117,16 @@
%setup -q -n nfs-utils-%{version} -a 1
%patch0 -p1
%patch1 -p1
-%patch2 -p1
cp %{S:6} .
%build
rm -f configure; autoreconf -fi
CFLAGS="$RPM_OPT_FLAGS -fPIE -fno-strict-aliasing" LDFLAGS="-pie" ./configure \
--mandir=%{_mandir} \
+ --with-systemd \
--enable-nfsv4 \
--enable-gss \
+ --enable-svcgss \
--enable-ipv6 \
--enable-nfsdcltrack \
--enable-mount \
@@ -147,7 +145,6 @@
%install
make install DESTDIR=$RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/%{_unitdir}
-install -m 644 systemd/*.{service,target,mount} $RPM_BUILD_ROOT/%{_unitdir}
install -m 644 %{S:15} $RPM_BUILD_ROOT%{_unitdir}/nfsserver.service
install -m 644 %{S:16} $RPM_BUILD_ROOT%{_unitdir}/nfs.service
install -d $RPM_BUILD_ROOT%{_unitdir}/nfs-server.service.d
@@ -158,10 +155,10 @@
install -m 755 %{S:14} $RPM_BUILD_ROOT/usr/lib/systemd/scripts/nfs-utils_env.sh
install -d $RPM_BUILD_ROOT%{_unitdir}/nfs-config.service.d
install -m 644 %{S:12}
$RPM_BUILD_ROOT%{_unitdir}/nfs-config.service.d/restart.conf
-ln -sf /sbin/service $RPM_BUILD_ROOT/usr/sbin/rcnfsserver
-ln -sf /sbin/service $RPM_BUILD_ROOT/usr/sbin/rcnfs-server
-ln -sf /sbin/service $RPM_BUILD_ROOT/usr/sbin/rcnfs
-ln -sf /sbin/service $RPM_BUILD_ROOT/usr/sbin/rcnfs-client
+ln -sf /usr/sbin/service $RPM_BUILD_ROOT/usr/sbin/rcnfsserver
+ln -sf /usr/sbin/service $RPM_BUILD_ROOT/usr/sbin/rcnfs-server
+ln -sf /usr/sbin/service $RPM_BUILD_ROOT/usr/sbin/rcnfs
+ln -sf /usr/sbin/service $RPM_BUILD_ROOT/usr/sbin/rcnfs-client
# sysconfig-data
mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
install -m 644 %{SOURCE4} $RPM_BUILD_ROOT/var/adm/fillup-templates
@@ -270,7 +267,6 @@
/usr/sbin/blkmapd
%{_unitdir}/auth-rpcgss-module.service
%{_unitdir}/nfs-blkmap.service
-%{_unitdir}/nfs-blkmap.target
%{_unitdir}/nfs-client.target
%{_unitdir}/nfs-config.service
%{_unitdir}/nfs-idmapd.service
++ nfs-utils-1.3.1.tar.xz -> nfs-utils-1.3.3.tar.xz ++
16115 lines of diff (skipped)
++ nfs-utils-no-svcgss.service ++
diff --git a/systemd/Makefile.am b/systemd/Makefile.am
index
commit nfs-utils for openSUSE:Factory
Hello community, here is the log from the commit of package nfs-utils for openSUSE:Factory checked in at 2015-10-28 17:17:43 Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old) and /work/SRC/openSUSE:Factory/.nfs-utils.new (New) Package is "nfs-utils" Changes: --- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2015-10-12 10:00:35.0 +0200 +++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2015-10-28 17:17:44.0 +0100 @@ -1,0 +2,7 @@ +Thu Oct 15 03:32:53 UTC 2015 - nfbr...@suse.com + +- nfs-utils_env.sh: honour RPC_PIPEFS_DIR setting. + It is currently ignored due to a logic error. + (bsc#947852) + +--- Other differences: -- ++ nfs-utils_env.sh ++ --- /var/tmp/diff_new_pack.WMauxs/_old 2015-10-28 17:17:45.0 +0100 +++ /var/tmp/diff_new_pack.WMauxs/_new 2015-10-28 17:17:45.0 +0100 @@ -13,7 +13,7 @@ pipefs= if [ -n "$RPC_PIPEFS_DIR" -a "$RPC_PIPEFS_DIR" != "/var/lib/nfs/rpc_pipefs" ]; then -pipefs="-p /var/lib/nfs/rpc_pipefs" +pipefs="-p $RPC_PIPEFS_DIR" fi mountdport=
commit nfs-utils for openSUSE:Factory
Hello community, here is the log from the commit of package nfs-utils for openSUSE:Factory checked in at 2015-10-12 10:00:33 Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old) and /work/SRC/openSUSE:Factory/.nfs-utils.new (New) Package is "nfs-utils" Changes: --- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2015-08-25 07:17:35.0 +0200 +++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2015-10-12 10:00:35.0 +0200 @@ -1,0 +2,9 @@ +Thu Sep 24 02:29:36 UTC 2015 - nfbr...@suse.com + +- nfsserver.service. Provide ExecReload directive. + This allows "systemctl reload nfsserver" to work. + PropagatesReloadTo but itself is not enough if this + unit doesn't have it's own Reload handler. + (bsc#97296) + +--- Other differences: -- ++ nfsserver.service ++ --- /var/tmp/diff_new_pack.4CKEr7/_old 2015-10-12 10:00:36.0 +0200 +++ /var/tmp/diff_new_pack.4CKEr7/_new 2015-10-12 10:00:36.0 +0200 @@ -11,12 +11,15 @@ # nfs-server.d/nfsserver.conf is part of this service. Requires= nfs-server.service -PropagatesReloadTo=nfs-server.service [Service] Type=oneshot ExecStart=/bin/true RemainAfterExit=yes +# Can't just PropagatesReloadTo to nfs-server.service +# as reload fails if we don't have our own ExecReload +# So copy that from nfs-server.service +ExecReload=/usr/sbin/exportfs -r [Install] WantedBy=multi-user.target
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2015-08-25 07:17:33
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new (New)
Package is nfs-utils
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2015-08-11
08:24:58.0 +0200
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2015-08-25
07:17:35.0 +0200
@@ -1,0 +2,11 @@
+Thu Aug 13 02:36:16 UTC 2015 - nfbr...@suse.com
+
+- sysconfig.nfs: add STATD_PORT, STATD_HOSTNAME,
+ LOCKD_TCPPORT, LOCKD_UDPPORT
+- nfs-utils-env.sh: handle STATD_PORT, STATD_HOSTNAME,
+ LOCKD_TCPPORT, LOCKD_UDPPORT
+ Also handle NFSV4LEASETIME, which was missing.
+
+ (bsc#941645)
+
+---
Other differences:
--
++ nfs-utils_env.sh ++
--- /var/tmp/diff_new_pack.cHYSpo/_old 2015-08-25 07:17:36.0 +0200
+++ /var/tmp/diff_new_pack.cHYSpo/_new 2015-08-25 07:17:36.0 +0200
@@ -44,6 +44,24 @@
threads=3
fi
+time_params=
+if [ -n $NFSV4LEASETIME ]; then
+time_params=--grace-time=$NFSV4LEASETIME --lease-time=$NFSV4LEASETIME
+fi
+
+if [ -n $STATD_PORT ]; then
+STATD_OPTIONS=$STATD_OPTIONS -p $STATD_PORT
+fi
+if [ -n $STATD_HOSTNAME ]; then
+STATD_OPTIONS=$STATD_OPTIONS -n $STATD_HOSTNAME
+fi
+if [ -n $LOCKD_TCPPORT ]; then
+STATD_OPTIONS=$STATD_OPTIONS --nlm-port $LOCKD_TCPPORT
+fi
+if [ -n $LOCKD_UDPPORT ]; then
+STATD_OPTIONS=$STATD_OPTIONS --nlm-udp-port $LOCKD_UDPPORT
+fi
+
case $NFS_GSSD_AVOID_DNS in
[Nn]*) ignore_dns=-D ;;
[Yy]*) ignore_dns= ;;
@@ -54,7 +72,7 @@
{
echo RPCIDMAPDARGS=$pipefs
echo RPCMOUNTDARGS=$mountdport $MOUNTD_OPTIONS $version_parms
-echo RPCNFSDARGS=$NFSD_OPTIONS $version_params $threads
+echo RPCNFSDARGS=$NFSD_OPTIONS $version_params $time_params $threads
echo GSSDARGS=$ignore_dns $GSSD_OPTIONS $pipefs
echo SMNOTIFYARGS=$SM_NOTIFY_OPTIONS
echo STATDARGS=$STATD_OPTIONS
++ sysconfig.nfs ++
--- /var/tmp/diff_new_pack.cHYSpo/_old 2015-08-25 07:17:36.0 +0200
+++ /var/tmp/diff_new_pack.cHYSpo/_new 2015-08-25 07:17:36.0 +0200
@@ -90,6 +90,59 @@
NFS_START_SERVICES=yes
## Path:Network/File systems/NFS server
+## Description: Port rpc.statd should listen on
+## Type:integer
+## Default:
+## ServiceRestart: nfsserver
+#
+# Statd will normally choose a random port to listen on and
+# SuSE-Firewall is able to detect which port and allow for it.
+# If you have another firewall, you may want to set a fixed
+# port number which can then be opened in that firewall.
+STATD_PORT=
+
+## Path:Network/File systems/NFS server
+## Description: Hostname used by rpc.statd
+## Type:string
+## Default:
+## ServiceRestart: nfsserver
+#
+# statd will normally use the system hostname in status
+# monitoring conversations with other hosts. If a different
+# host name should be used, as can be useful with fail-over
+# configurations, that name should be given here.
+#
+STATD_HOSTNAME=
+
+## Path:Network/File systems/NFS server
+## Description:TCP Port that lockd should listen on
+## Type:integer
+## Default:
+## ServiceRestart: nfsserver
+#
+# Lockd will normally choose a random port to listen on and
+# SuSE-Firewall is able to detect which port and allow for it.
+# If you have another firewall, you may want to set a fixed
+# port number which can then be opened in that firewall.
+# lockd opens a UDP and a TCP port. This setting only affect
+# the TCP port.
+LOCKD_TCPPORT=
+
+## Path:Network/File systems/NFS server
+## Description:UDP Port that lockd should listen on
+## Type:integer
+## Default:
+## ServiceRestart: nfsserver
+#
+# Lockd will normally choose a random port to listen on and
+# SuSE-Firewall is able to detect which port and allow for it.
+# If you have another firewall, you may want to set a fixed
+# port number which can then be opened in that firewall.
+# lockd opens a UDP and a TCP port. This setting only affect
+# the UDP port.
+LOCKD_UDPPORT=
+
+## Path:Network/File systems/NFS server
## Description: Command line parameters for rpc.statd
## Type:string
## Default:
@@ -161,8 +214,11 @@
## Type:string
## Default:
#
-# This setting allows extra options to be specified for rpc.mountd,
-# such as --manage-gids.
+# Normally mountd does not require any options. In some circumstances,
+#
commit nfs-utils for openSUSE:Factory
Hello community, here is the log from the commit of package nfs-utils for openSUSE:Factory checked in at 2015-08-11 08:24:56 Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old) and /work/SRC/openSUSE:Factory/.nfs-utils.new (New) Package is nfs-utils Changes: --- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2015-07-20 11:16:52.0 +0200 +++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2015-08-11 08:24:58.0 +0200 @@ -1,0 +2,8 @@ +Mon Aug 10 04:28:42 UTC 2015 - nfbr...@suse.com + +- nfs.service: improve back-compatibility with /etc/init.d/nfs + + mount and unmount nfs filesystems on start/stop. + + keep status as good when everything is running. + (bnc#911986) + +--- Other differences: -- ++ nfs-utils.spec ++ --- /var/tmp/diff_new_pack.JMxL8g/_old 2015-08-11 08:24:59.0 +0200 +++ /var/tmp/diff_new_pack.JMxL8g/_new 2015-08-11 08:24:59.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package nfs-utils # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++ nfs.service ++ --- /var/tmp/diff_new_pack.JMxL8g/_old 2015-08-11 08:24:59.0 +0200 +++ /var/tmp/diff_new_pack.JMxL8g/_new 2015-08-11 08:24:59.0 +0200 @@ -15,7 +15,10 @@ [Service] Type=oneshot +RemainAfterExit=yes ExecStart=/bin/true +ExecStartPost=/usr/bin/mount -at nfs,nfs4 +ExecStop=/usr/bin/umount -aft nfs,nfs4 [Install] WantedBy=multi-user.target
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2015-07-20 11:16:51
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new (New)
Package is nfs-utils
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2014-09-18
07:12:09.0 +0200
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2015-07-20
11:16:52.0 +0200
@@ -1,0 +2,24 @@
+Sun Nov 09 19:34:00 UTC 2014 - Led led...@gmail.com
+
+- fix bashisms in pre/post scripts
+
+---
+Wed Nov 5 00:48:09 UTC 2014 - nfbr...@suse.com
+
+- new upstream nfs-utils-1.3.1
+ This brings numerous fixes, particularly to gssd and
+ nfsdcltrack. It incorporates all the upstreamable
+ patches we had:
+- Delete nfsdcltrack.sbin.patch
+- Delete start-statd.patch
+- 0001-nfs-client.target-Removed-a-ordering-cycle-with-nfs-.patch
+ 0002-Centralize-dependencies-on-the-auth-unit.patch
+ Patches from 1.3.2-rc, which look useful
+
+- Convert from /etc/init.d startup scripts to full
+ systemd integration.
+ The upstream standard names are nfs-client and nfs-server
+ rather than nfs and nfsserver, so local nfs nfsserver
+ aliases are created and rcXXX links are provided for all 4.
+
+---
Old:
nfs-utils-1.3.0.tar.xz
nfs.init
nfsdcltrack.sbin.patch
nfsserver.init
start-statd.patch
New:
0001-nfs-client.target-Removed-a-ordering-cycle-with-nfs-.patch
0002-Centralize-dependencies-on-the-auth-unit.patch
nfs-client.nfs.conf
nfs-config.restart.conf
nfs-server.nfsserver.conf
nfs-utils-1.3.1.tar.xz
nfs-utils_env.sh
nfs.service
nfsserver.service
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.Pc5Y4y/_old 2015-07-20 11:16:54.0 +0200
+++ /var/tmp/diff_new_pack.Pc5Y4y/_new 2015-07-20 11:16:54.0 +0200
@@ -41,30 +41,34 @@
Summary:Support Utilities for Kernel nfsd
License:GPL-2.0+
Group: Productivity/Networking/NFS
-Version:1.3.0
+Version:1.3.1
Release:0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-PreReq: %fillup_prereq %insserv_prereq
+PreReq: %fillup_prereq
%{?systemd_requires}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0:
http://kernel.org/pub/linux/utils/nfs-utils/%{version}/nfs-utils-%{version}.tar.xz
# Download does not work:
# Source1:ftp://nfs.sourceforge.net/pub/nfs/nfs.doc.tar.bz2
Source1:nfs.doc.tar.bz2
-Source2:nfs.init
-Source3:nfsserver.init
Source4:sysconfig.nfs
Source5:nfs-kernel-server.xml
Source6:README.NFSv4
Source7:fw-client
Source8:fw-server
Source11: idmapd.conf
+Source12: nfs-config.restart.conf
Source13: nfs-utils.rpmlintrc
+Source14: nfs-utils_env.sh
+Source15: nfsserver.service
+Source16: nfs.service
+Source17: nfs-server.nfsserver.conf
+Source18: nfs-client.nfs.conf
Patch0: nfs-utils-1.0.7-bind-syntax.patch
-# PATCH-FIX-UPSTREAM nfsdcltrack.sbin.patch nfbr...@suse.de
-Patch1: nfsdcltrack.sbin.patch
-# PATCH-FIX-OPENSUSE start-statd.patch nfbr...@suse.de
-Patch2: start-statd.patch
+# PATCH-FIX-UPSTREAM
0001-nfs-client.target-Removed-a-ordering-cycle-with-nfs-.patch nfbr...@suse.de
+Patch1: 0001-nfs-client.target-Removed-a-ordering-cycle-with-nfs-.patch
+# PATCH-FIX-UPSTREAM 0002-Centralize-dependencies-on-the-auth-unit.patch
nfbr...@suse.de
+Patch2: 0002-Centralize-dependencies-on-the-auth-unit.patch
Suggests: python-base
%description
@@ -79,9 +83,8 @@
Requires: keyutils
Requires: netcfg
Requires: rpcbind
-PreReq: %fillup_prereq %insserv_prereq
+PreReq: %fillup_prereq
PreReq: permissions
-Provides: aaa_base:/etc/init.d/nfs
%description -n nfs-client
This package contains common NFS utilities which are needed for client
@@ -96,7 +99,7 @@
Requires: netcfg
Requires: nfs-client = %{version}
Requires: rpcbind
-PreReq: %fillup_prereq %insserv_prereq
+PreReq: %fillup_prereq
%description -n nfs-kernel-server
This package contains support for the kernel based NFS server. You can
@@ -144,17 +147,26 @@
%install
make install DESTDIR=$RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/%{_unitdir}
-install -m 644 systemd/rpc-statd.service $RPM_BUILD_ROOT/%{_unitdir}
-# rc-script
-install -d $RPM_BUILD_ROOT/etc/init.d
-install -m 744 %{SOURCE3} $RPM_BUILD_ROOT/etc/init.d/nfsserver
-install -m 744
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2014-09-18 07:12:08
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new (New)
Package is nfs-utils
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2014-07-16
16:36:25.0 +0200
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2014-09-18
07:12:09.0 +0200
@@ -1,0 +2,10 @@
+Thu Sep 4 02:55:22 UTC 2014 - nfbr...@suse.com
+
+- nfsserver.init: allow $NFSD_V4_GRACE to set the lease
+ time if NFSV4LEASETIME is not set, as some documentation
+ suggests this.
+ Also set NFSv4 and NLM grace time to make the NFSv4 lease time
+ as having them different at boot time doesn't make sense.
+ (bnc#892809)
+
+---
Other differences:
--
++ nfsserver.init ++
--- /var/tmp/diff_new_pack.OyFCR6/_old 2014-09-18 07:12:10.0 +0200
+++ /var/tmp/diff_new_pack.OyFCR6/_new 2014-09-18 07:12:10.0 +0200
@@ -93,6 +93,11 @@
* ) NFS4_SERVER_MINOR_VERSION=0
esac
+if [ -n $NFSV4LEASETIME ] ; then
+# Documentation inconsistency.
+NFSV4LEASETIME=$NFSD_V4_GRACE
+fi
+
check_for_nfsdfs() {
HAVE_NFSDFS=no
while read dummy type ; do
@@ -213,9 +218,12 @@
if [ $NFS4_SERVER_MINOR_VERSION != 0 ]; then
VERSION_PARAMS=$VERSION_PARAMS --nfs-version 4 --nfs-version
4.$NFS4_SERVER_MINOR_VERSION
fi
- if [ -n $NFSV4LEASETIME -a -f /proc/fs/nfsd/nfsv4leasetime ]; then
-echo $NFSV4LEASETIME /proc/fs/nfsd/nfsv4leasetime
- fi
+ for fl in /proc/fs/nfsd/nfsv4leasetime /proc/fs/nfsd/nfsv4gracetime
/proc/sys/fs/nfs/nlm_grace_period
+ do
+ if [ -n $NFSV4LEASETIME -a -f $fl ]; then
+echo $NFSV4LEASETIME $fl
+ fi
+ done
nfs4_bind_mounts
# svcgssd; gssd; idmapd
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2014-07-16 16:36:23
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new (New)
Package is nfs-utils
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2014-07-12
17:14:20.0 +0200
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2014-07-16
16:36:25.0 +0200
@@ -1,0 +2,7 @@
+Mon Jul 7 01:57:26 UTC 2014 - nfbr...@suse.com
+
+- Remove mkintird scripts again. libguestfs now includes
+ them so nfs-utils doesn't need to.
+ (bnc#883876)
+
+---
Old:
mkinitrd-boot.sh
mkinitrd-setup.sh
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.czb9sf/_old 2014-07-16 16:36:27.0 +0200
+++ /var/tmp/diff_new_pack.czb9sf/_new 2014-07-16 16:36:27.0 +0200
@@ -58,8 +58,6 @@
Source6:README.NFSv4
Source7:fw-client
Source8:fw-server
-Source9:mkinitrd-setup.sh
-Source10: mkinitrd-boot.sh
Source11: idmapd.conf
Source13: nfs-utils.rpmlintrc
Patch0: nfs-utils-1.0.7-bind-syntax.patch
@@ -169,9 +167,6 @@
mkdir -p $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services
install -m 0644 %{SOURCE7}
${RPM_BUILD_ROOT}/etc/sysconfig/SuSEfirewall2.d/services/nfs-client
install -m 0644 %{SOURCE8}
${RPM_BUILD_ROOT}/etc/sysconfig/SuSEfirewall2.d/services/nfs-kernel-server
-install -d $RPM_BUILD_ROOT/lib/mkinitrd/scripts
-install -m 755 %{S:9} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/setup-nfs.sh
-install -m 755 %{S:10} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/boot-nfs.sh
install -m 644 utils/mount/nfsmount.conf $RPM_BUILD_ROOT/etc/nfsmount.conf
#
# hack to avoid automatic python dependency
@@ -244,10 +239,6 @@
%config /etc/init.d/nfs
%config /etc/idmapd.conf
%config /etc/nfsmount.conf
-%dir /lib/mkinitrd
-%dir /lib/mkinitrd/scripts
-/lib/mkinitrd/scripts/setup-nfs.sh
-/lib/mkinitrd/scripts/boot-nfs.sh
%verify(not mode) %attr(0755,root,root) /sbin/mount.nfs
/sbin/mount.nfs4
/sbin/umount.nfs
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2014-07-12 17:14:18
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new (New)
Package is nfs-utils
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2014-06-18
10:59:30.0 +0200
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2014-07-12
17:14:20.0 +0200
@@ -1,0 +2,7 @@
+Thu Jun 26 02:35:31 UTC 2014 - nfbr...@suse.com
+
+- add mkinitrd scripts back in. They are needed by
+ guestfs See bnc#883873
+ (bnc#883876)
+
+---
New:
mkinitrd-boot.sh
mkinitrd-setup.sh
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.sRFya4/_old 2014-07-12 17:14:21.0 +0200
+++ /var/tmp/diff_new_pack.sRFya4/_new 2014-07-12 17:14:21.0 +0200
@@ -58,6 +58,8 @@
Source6:README.NFSv4
Source7:fw-client
Source8:fw-server
+Source9:mkinitrd-setup.sh
+Source10: mkinitrd-boot.sh
Source11: idmapd.conf
Source13: nfs-utils.rpmlintrc
Patch0: nfs-utils-1.0.7-bind-syntax.patch
@@ -167,6 +169,9 @@
mkdir -p $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services
install -m 0644 %{SOURCE7}
${RPM_BUILD_ROOT}/etc/sysconfig/SuSEfirewall2.d/services/nfs-client
install -m 0644 %{SOURCE8}
${RPM_BUILD_ROOT}/etc/sysconfig/SuSEfirewall2.d/services/nfs-kernel-server
+install -d $RPM_BUILD_ROOT/lib/mkinitrd/scripts
+install -m 755 %{S:9} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/setup-nfs.sh
+install -m 755 %{S:10} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/boot-nfs.sh
install -m 644 utils/mount/nfsmount.conf $RPM_BUILD_ROOT/etc/nfsmount.conf
#
# hack to avoid automatic python dependency
@@ -239,6 +244,10 @@
%config /etc/init.d/nfs
%config /etc/idmapd.conf
%config /etc/nfsmount.conf
+%dir /lib/mkinitrd
+%dir /lib/mkinitrd/scripts
+/lib/mkinitrd/scripts/setup-nfs.sh
+/lib/mkinitrd/scripts/boot-nfs.sh
%verify(not mode) %attr(0755,root,root) /sbin/mount.nfs
/sbin/mount.nfs4
/sbin/umount.nfs
++ mkinitrd-boot.sh ++
#!/bin/bash
#%stage: block
#%modules: nfs nfsv2 nfsv3 nfsv4
#%programs: mount.nfs mount.nfs4
#%if: $rootfstype = nfs -o $need_nfs
#
# Network FileSystem
##
## This is where NFS gets mounted.
## If no root= option was given, the root device will be taken from the
DHCP-server.
##
## Command line parameters
## ---
##
## root=server:/folder the nfs root path
##
# Prefer NFS root setting via DHCP the fallback provided in config/*.
# So at first, consider the command line (that's why we check for $cmd_root
# being empty here. Then consider the DHCP setting. And finally consider the
# fallback via config/*.
if [ -n $ROOTPATH -a -z $cmd_root ] ; then
case $ROOTPATH in
iscsi:*)
;;
*:*)
rootfstype=nfs
rootdev=$ROOTPATH ;;
*)
if [ -n $DHCPSIADDR ]; then
rootdev=$DHCPSIADDR:$ROOTPATH
rootfstype=nfs
elif [ -n $DHCPSNAME ]; then
rootdev=$DHCPSNAME:$ROOTPATH
rootfstype=nfs
fi ;;
esac
if [ -n $rootdev ] ; then
echo 2 Using root device ($rootdev) provided via DHCP
fi
fi
if [ $rootfstype = nfs ]; then
# load the nfs module before using it
load_modules
if [ -z $rootdev ]; then
echo no local root= kernel option given and no root server set by
the dhcp server.
echo exiting to /bin/sh
cd /
PATH=$PATH PS1='$ ' /bin/sh -i
fi
rootfsmod=
if [ -n $rootflags ] ; then
rootflags=${rootflags},nolock
else
rootflags=nolock
fi
# tell boot.rootfsck to skip warning
ROOTFS_FSCK=0
export ROOTFS_FSCK
else
dont_load_modules
fi
# Absolutely required for networking to function
ip link set dev lo up
++ mkinitrd-setup.sh ++
#!/bin/bash
#
#%stage: device
#
if [ $rootfstype = nfs ]; then
interface=${interface:-default}
save_var rootfstype
fi
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2014-06-18 10:59:26
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new (New)
Package is nfs-utils
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2014-05-14
10:50:25.0 +0200
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2014-06-18
10:59:30.0 +0200
@@ -1,0 +2,51 @@
+Tue Jun 10 07:19:06 UTC 2014 - nfbr...@suse.com
+
+- Use start-statd and rpc-statd.service from upstream for running statd.
+ Our start-statd doesn't work in a systemd environment (bnc#852984)
+- start-statd.patch - needed to make upstream start-statd work properly.
+- use .xz from upstream, that is what kernel.org prefers and it is smaller
+
+---
+Wed Jun 4 01:59:27 UTC 2014 - nfbr...@suse.com
+
+- Remove 0001-nfsidmap-Keys-need-to-be-invalidated-instead-of-revo.patch
+ Now that keyutils has been updated in Factory, this patch
+ is no longer needed.
+
+---
+Tue Jun 3 12:55:16 UTC 2014 - wer...@suse.de
+
+- Check if systemd is listen on local socket 111 to trigger the
+ start of the rpcbind.service on demand (bnc#860246)
+- There exists only nfs-utils-1.3.0.tar.gz at
+ http://kernel.org/pub/linux/utils/nfs-utils/1.3.0/
+
+---
+Wed May 14 02:40:01 UTC 2014 - nfbr...@suse.com
+
+- New upstream version 1.3.0.
+ Includes all our bugfix patches except 1.
+ Adds assorted other bugfixes and improvements including
+ initial support for NFSv4.2
+ Prepares the way for better systemd integration.
+ Discards useless programs gss_clnt_send_err and gss_destroy_creds
+
+- Removes: 0001-mountd-Fix-is_subdirectory-again.patch
+- Removes: 0002-gssd-Fix-recent-fix-to-Avoid-DNS-reverse-resolution-.patch
+- Removes: 0003-Fix-handling-of-preferred-realm-command-line-option.patch
+- Removes: 0004-nfsiostat-restore-output-format.patch
+- Removes: 0005-gssd-don-t-give-up-on-machine-credential-if-hostname.patch
+- Removes: 0006-gssd-fixed-typo-in-machine-cred-name.patch
+- Removes: skip-on-ENOENT.patch
+- Removes: mountd-fix-bug-affecting-exports-of-dirs-with-64bit-.patch
+- Removes: exportfs-exit-with-error-code-if-there-was-any-error.patch
+- Removes: exportfs-report-failure-if-asked-to-unexport-somethi.patch
+- Removes: gssd-mount-hang-fix.patch
+- Removes: udp-fallback-fix.patch
+- Removes: fedfs-lib-name.patch
+
+- 0001-nfsidmap-Keys-need-to-be-invalidated-instead-of-revo.patch
+ This upstream patch is currently reverted until we get a newer version
+ of keyutils.
+
+---
Old:
0001-mountd-Fix-is_subdirectory-again.patch
0002-gssd-Fix-recent-fix-to-Avoid-DNS-reverse-resolution-.patch
0003-Fix-handling-of-preferred-realm-command-line-option.patch
0004-nfsiostat-restore-output-format.patch
0005-gssd-don-t-give-up-on-machine-credential-if-hostname.patch
0006-gssd-fixed-typo-in-machine-cred-name.patch
exportfs-exit-with-error-code-if-there-was-any-error.patch
exportfs-report-failure-if-asked-to-unexport-somethi.patch
fedfs-lib-name.patch
gssd-mount-hang-fix.patch
mountd-fix-bug-affecting-exports-of-dirs-with-64bit-.patch
nfs-utils-1.2.8.tar.bz2
skip-on-ENOENT.patch
start-statd
udp-fallback-fix.patch
New:
nfs-utils-1.3.0.tar.xz
start-statd.patch
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.7Xeqtk/_old 2014-06-18 10:59:32.0 +0200
+++ /var/tmp/diff_new_pack.7Xeqtk/_new 2014-06-18 10:59:32.0 +0200
@@ -41,13 +41,13 @@
Summary:Support Utilities for Kernel nfsd
License:GPL-2.0+
Group: Productivity/Networking/NFS
-Version:1.2.8
+Version:1.3.0
Release:0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: %fillup_prereq %insserv_prereq
%{?systemd_requires}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0:
http://kernel.org/pub/linux/utils/nfs-utils/%{version}/nfs-utils-%{version}.tar.bz2
+Source0:
http://kernel.org/pub/linux/utils/nfs-utils/%{version}/nfs-utils-%{version}.tar.xz
# Download does not work:
# Source1:ftp://nfs.sourceforge.net/pub/nfs/nfs.doc.tar.bz2
Source1:nfs.doc.tar.bz2
@@ -59,38 +59,12 @@
Source7:fw-client
Source8:fw-server
Source11: idmapd.conf
-Source12: start-statd
Source13: nfs-utils.rpmlintrc
Patch0: nfs-utils-1.0.7-bind-syntax.patch
-# PATCH-FIX-UPSTREAM
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2014-05-14 10:50:22
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new (New)
Package is nfs-utils
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2014-04-23
17:28:14.0 +0200
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2014-05-14
10:50:25.0 +0200
@@ -1,0 +2,7 @@
+Tue May 6 00:51:39 UTC 2014 - nfbr...@suse.com
+
+- nfsdcltrack_sbin.patch
+ The kernel expects nfsdcltrack to be in /sbin,
+ so we must put it there.
+
+---
New:
nfsdcltrack.sbin.patch
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.EbYwdZ/_old 2014-05-14 10:50:26.0 +0200
+++ /var/tmp/diff_new_pack.EbYwdZ/_new 2014-05-14 10:50:26.0 +0200
@@ -16,7 +16,6 @@
#
-
Name: nfs-utils
BuildRequires: device-mapper-devel
BuildRequires: e2fsprogs-devel
@@ -89,6 +88,8 @@
Patch12:udp-fallback-fix.patch
# PATCH-FIX-UPSTREAM fedfs-lib-name.patch nfbr...@suse.de
Patch13:fedfs-lib-name.patch
+# PATCH-FIX-UPSTREAM nfsdcltrack.sbin.patch nfbr...@suse.de
+Patch14:nfsdcltrack.sbin.patch
Suggests: python-base
@@ -154,6 +155,7 @@
%patch11 -p1
%patch12 -p1
%patch13 -p1
+%patch14 -p1
cp %{S:6} .
%build
@@ -332,7 +334,7 @@
/usr/sbin/rpc.mountd
/usr/sbin/rpc.nfsd
/usr/sbin/rpc.svcgssd
-/usr/sbin/nfsdcltrack
+/sbin/nfsdcltrack
%{_mandir}/man5/exports.5.gz
%{_mandir}/man7/nfsd.7.gz
%{_mandir}/man8/exportfs.8.gz
++ nfsdcltrack.sbin.patch ++
---
utils/nfsdcltrack/Makefile.am |4
1 file changed, 4 insertions(+)
--- nfs-utils-1.2.8.orig/utils/nfsdcltrack/Makefile.am
+++ nfs-utils-1.2.8/utils/nfsdcltrack/Makefile.am
@@ -1,5 +1,9 @@
## Process this file with automake to produce Makefile.in
+# These binaries go in /sbin (not /usr/sbin), and that cannot be
+# overridden at config time. The kernel knows the /sbin name.
+sbindir = /sbin
+
man8_MANS = nfsdcltrack.man
EXTRA_DIST = $(man8_MANS)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2014-04-23 17:28:11
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new (New)
Package is nfs-utils
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2014-03-20
06:53:37.0 +0100
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2014-04-23
17:28:14.0 +0200
@@ -1,0 +2,10 @@
+Wed Apr 16 15:24:27 UTC 2014 - tr...@suse.de
+
+- Remove mkinitrd bits - we use dracut now which already has
+ nfs stuff provided in its package in:
+ /usr/lib/dracut/modules.d/95nfs/
+ Remove sources:
+- mkinitrd-boot.sh
+- mkinitrd-setup.sh
+
+---
Old:
mkinitrd-boot.sh
mkinitrd-setup.sh
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.EcjEUA/_old 2014-04-23 17:28:15.0 +0200
+++ /var/tmp/diff_new_pack.EcjEUA/_new 2014-04-23 17:28:15.0 +0200
@@ -16,6 +16,7 @@
#
+
Name: nfs-utils
BuildRequires: device-mapper-devel
BuildRequires: e2fsprogs-devel
@@ -58,8 +59,6 @@
Source6:README.NFSv4
Source7:fw-client
Source8:fw-server
-Source9:mkinitrd-setup.sh
-Source10: mkinitrd-boot.sh
Source11: idmapd.conf
Source12: start-statd
Source13: nfs-utils.rpmlintrc
@@ -203,9 +202,6 @@
mkdir -p $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services
install -m 0644 %{SOURCE7}
${RPM_BUILD_ROOT}/etc/sysconfig/SuSEfirewall2.d/services/nfs-client
install -m 0644 %{SOURCE8}
${RPM_BUILD_ROOT}/etc/sysconfig/SuSEfirewall2.d/services/nfs-kernel-server
-install -d $RPM_BUILD_ROOT/lib/mkinitrd/scripts
-install -m 755 %{S:9} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/setup-nfs.sh
-install -m 755 %{S:10} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/boot-nfs.sh
install -m 755 %{S:12} $RPM_BUILD_ROOT/usr/sbin/start-statd
install -m 644 utils/mount/nfsmount.conf $RPM_BUILD_ROOT/etc/nfsmount.conf
#
@@ -232,7 +228,6 @@
mv /var/lock/subsys/nfsserver-rpc.idmapd /run/nfs
fi
###
-[ -x /sbin/mkinitrd_setup ] mkinitrd_setup
%{fillup_and_insserv -n nfs nfs}
#
%set_permissions /sbin/mount.nfs
@@ -244,7 +239,6 @@
%postun -n nfs-client
%restart_on_update nfs
-[ -x /sbin/mkinitrd_setup ] mkinitrd_setup
%insserv_cleanup
%service_del_postun nfs
@@ -281,10 +275,6 @@
%config /etc/init.d/nfs
%config /etc/idmapd.conf
%config /etc/nfsmount.conf
-%dir /lib/mkinitrd
-%dir /lib/mkinitrd/scripts
-/lib/mkinitrd/scripts/setup-nfs.sh
-/lib/mkinitrd/scripts/boot-nfs.sh
%verify(not mode) %attr(0755,root,root) /sbin/mount.nfs
/sbin/mount.nfs4
/sbin/umount.nfs
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2014-03-20 06:53:35
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new (New)
Package is nfs-utils
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2014-02-19
18:55:01.0 +0100
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2014-03-20
06:53:37.0 +0100
@@ -1,0 +2,19 @@
+Tue Mar 11 00:11:18 UTC 2014 - sleep_wal...@suse.cz
+
+- properly rename patches:
+ udp-fallback.fix - udp-fallback-fix.patch
+ fedfs-lib-name - fedfs-lib-name.patch
+ gssd-mount-hang-fix - gssd-mount-hang-fix.patch
+
+---
+Sun Mar 9 23:00:19 UTC 2014 - nfbr...@suse.com
+
+- Remove Start-Before: autofs from nfs.init. This turns
+ out not to be needed, and is out of place. If anything,
+ autofs should declare a dependency on nfs. (bnc#861489)
+- fedfs-lib-name, nfs-utils.spec
+ Build with fedfs support so that if fedfs-utils is also
+ installed, federated-filesystems can be exported.
+ (FATE#313522)
+
+---
Old:
gssd-mount-hang-fix
udp-fallback.fix
New:
fedfs-lib-name.patch
gssd-mount-hang-fix.patch
udp-fallback-fix.patch
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.ol6mKU/_old 2014-03-20 06:53:38.0 +0100
+++ /var/tmp/diff_new_pack.ol6mKU/_new 2014-03-20 06:53:38.0 +0100
@@ -34,6 +34,9 @@
%if 0%{?suse_version} = 1210
BuildRequires: systemd
%endif
+%if 0%{?suse_version} = 1310
+BuildRequires: fedfs-utils-devel
+%endif
Url:http://kernel.org/pub/linux/utils/nfs-utils/
Summary:Support Utilities for Kernel nfsd
License:GPL-2.0+
@@ -81,10 +84,13 @@
Patch9: exportfs-exit-with-error-code-if-there-was-any-error.patch
# PATCH-FIX_UPSTREAM
exportfs-report-failure-if-asked-to-unexport-somethi.patch nfbr...@suse.de
Patch10:exportfs-report-failure-if-asked-to-unexport-somethi.patch
-# PATCH-FIX-UPSTREAM gssd-mount-hang-fix bnc#833543 nfbr...@suse.de
-Patch11:gssd-mount-hang-fix
-# PATCH-FIX-UPSTREAM udp-fallback.fix bnc#863749 nfbr...@suse.de
-Patch12:udp-fallback.fix
+# PATCH-FIX-UPSTREAM gssd-mount-hang-fix.patch bnc#833543 nfbr...@suse.de
+Patch11:gssd-mount-hang-fix.patch
+# PATCH-FIX-UPSTREAM udp-fallback-fix.patch bnc#863749 nfbr...@suse.de
+Patch12:udp-fallback-fix.patch
+# PATCH-FIX-UPSTREAM fedfs-lib-name.patch nfbr...@suse.de
+Patch13:fedfs-lib-name.patch
+
Suggests: python-base
%description
@@ -148,6 +154,7 @@
%patch10 -p1
%patch11 -p1
%patch12 -p1
+%patch13 -p1
cp %{S:6} .
%build
++ fedfs-lib-name.patch ++
From 878972d60cb55f2bc6e04a0937f81407fbc308fe Mon Sep 17 00:00:00 2001
From: Neil Brown ne...@suse.de
Date: Wed, 5 Mar 2014 14:55:46 +1100
Subject: [PATCH] mountd: use SONAME fir libnfsjunct when loading with dlopen.
The standard for loading shared libraries is to identify them by their
soname (Which objdump -x $BINARY | grep SONAME will report).
However mountd currently loads using the linker name which should only
be used when building new code.
Future releases of fedfs-utils will define the soname in the include
file, so if that is defined, use it. If not, use the soname of the
first version: libnfsjunct.so.0.
This is a slight behavioural change. However all distros known to
package fedfs-utils will install libnfsjunct.so.0 whenever they
install the old name of libnfsjunct.so, and make install will
install both. So it should not be a noticeable change.
Also only test the JP_API_VERSION if it is defined. As the version is
embedded in the soname, a secondary test is not needed.
Cc: Chuck Lever chuck.le...@oracle.com
Signed-off-by: NeilBrown ne...@suse.de
---
utils/mountd/cache.c |9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
--- nfs-utils-1.2.8.orig/utils/mountd/cache.c
+++ nfs-utils-1.2.8/utils/mountd/cache.c
@@ -1055,12 +1055,13 @@ static struct exportent *invoke_junction
__func__, error);
return NULL;
}
+#ifdef JP_API_VERSION
if (ops-jp_api_version != JP_API_VERSION) {
xlog(D_GENERAL, %s: unrecognized junction API version: %u,
__func__, ops-jp_api_version);
return NULL;
}
-
+#endif
status = ops-jp_init(false);
if (status != JP_OK) {
xlog(D_GENERAL, %s: failed to resolve %s: %s,
@@ -1107,7 +1108,11 @@ static struct exportent *lookup_junction
struct link_map *map;
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2014-02-19 18:54:59
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new (New)
Package is nfs-utils
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2014-02-15
08:14:04.0 +0100
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2014-02-19
18:55:01.0 +0100
@@ -1,0 +2,6 @@
+Mon Feb 17 04:40:41 UTC 2014 - nfbr...@suse.com
+
+- udp-fallback.fix: Fix fallback from tcp to udp
+ (bnc#863749)
+
+---
New:
udp-fallback.fix
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.ls6TsU/_old 2014-02-19 18:55:02.0 +0100
+++ /var/tmp/diff_new_pack.ls6TsU/_new 2014-02-19 18:55:02.0 +0100
@@ -81,8 +81,10 @@
Patch9: exportfs-exit-with-error-code-if-there-was-any-error.patch
# PATCH-FIX_UPSTREAM
exportfs-report-failure-if-asked-to-unexport-somethi.patch nfbr...@suse.de
Patch10:exportfs-report-failure-if-asked-to-unexport-somethi.patch
-# PATCH-FIX-UPSTRAM gssd-mount-hang-fix bnc#833543 nfbr...@suse.de
+# PATCH-FIX-UPSTREAM gssd-mount-hang-fix bnc#833543 nfbr...@suse.de
Patch11:gssd-mount-hang-fix
+# PATCH-FIX-UPSTREAM udp-fallback.fix bnc#863749 nfbr...@suse.de
+Patch12:udp-fallback.fix
Suggests: python-base
%description
@@ -145,6 +147,7 @@
%patch9 -p1
%patch10 -p1
%patch11 -p1
+%patch12 -p1
cp %{S:6} .
%build
++ udp-fallback.fix ++
From: NeilBrown ne...@suse.de
Subject: Fix fallback from tcp to udp
References: bnc#863749
Protocol negotiation in mount.nfs does not correctly negotiate with a
server which only support NFSv3 and UDP.
When mount.nfs attempts an NFSv4 mount and fails with ECONNREFUSED
it does not fall back to NFSv3, as this is not recognised as a
does not support NFSv4 error.
However ECONNREFUSED is a clear indication that the server doesn't
support TCP, and ipso facto does not support NFSv4.
So ECONNREFUSED should trigger a fallback from v4 to v2/3.
Once we allow that error, NFSv3 is attempted and mount.nfs talks to
rpcbind and discovers that UDP should be used for v3 and the mount
succeeds.
Signed-off-by: NeilBrown ne...@suse.de
Reported-by: Carsten Ziepke kiel...@gmail.com
---
utils/mount/stropts.c |3 +++
1 file changed, 3 insertions(+)
--- nfs-utils-1.2.8.orig/utils/mount/stropts.c
+++ nfs-utils-1.2.8/utils/mount/stropts.c
@@ -807,6 +807,9 @@ static int nfs_autonegotiate(struct nfsm
/* Linux servers prior to 2.6.25 may return
* EPERM when NFS version 4 is not supported. */
goto fall_back;
+ case ECONNREFUSED:
+ /* UDP-Only server won't support v4 */
+ goto fall_back;
default:
return result;
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit nfs-utils for openSUSE:Factory
Hello community, here is the log from the commit of package nfs-utils for openSUSE:Factory checked in at 2014-02-15 08:14:03 Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old) and /work/SRC/openSUSE:Factory/.nfs-utils.new (New) Package is nfs-utils Changes: --- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2013-11-28 07:38:11.0 +0100 +++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2014-02-15 08:14:04.0 +0100 @@ -1,0 +2,13 @@ +Tue Feb 4 05:18:48 UTC 2014 - nfbr...@suse.com + +- nfs-utils.spec: Require keyutils for proper + idmap lookup. +- nfs.init, nfsserver.init: mkdir /run/nfs before + trying to create a file in there (bnc#859221) +- nfs.init, nfsserver.init: add +X-Systemd-RemainAfterExit: true + to ensure services aren't shutdown if sm-notify + reports an error + (bnc#849387) + +--- Other differences: -- ++ nfs-utils.spec ++ --- /var/tmp/diff_new_pack.UgpP11/_old 2014-02-15 08:14:05.0 +0100 +++ /var/tmp/diff_new_pack.UgpP11/_new 2014-02-15 08:14:05.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package nfs-utils # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -94,6 +94,7 @@ Summary:Support Utilities for NFS Group: Productivity/Networking/NFS Obsoletes: nfs-utils 1.1.0 +Requires: keyutils Requires: netcfg Requires: rpcbind PreReq: %fillup_prereq %insserv_prereq ++ nfs.init ++ --- /var/tmp/diff_new_pack.UgpP11/_old 2014-02-15 08:14:05.0 +0100 +++ /var/tmp/diff_new_pack.UgpP11/_new 2014-02-15 08:14:05.0 +0100 @@ -20,6 +20,7 @@ # Default-Stop: 0 1 2 6 # Short-Description: NFS client services # Description:All necessary services for NFS clients +# X-Systemd-RemainAfterExit: true ### END INIT INFO . /etc/rc.status @@ -223,6 +224,7 @@ rc_status -v rc_exit } + [ -d /run/nfs ] || mkdir /run/nfs echo $GSSD_BIN $GSSD_CLIENT_STATE fi ++ nfsserver.init ++ --- /var/tmp/diff_new_pack.UgpP11/_old 2014-02-15 08:14:05.0 +0100 +++ /var/tmp/diff_new_pack.UgpP11/_new 2014-02-15 08:14:05.0 +0100 @@ -17,6 +17,7 @@ # Default-Start: 3 5 # Default-Stop: 0 1 2 6 # Short-Description: Start the kernel based NFS daemon +# X-Systemd-RemainAfterExit: true ### END INIT INFO . /etc/sysconfig/nfs @@ -229,6 +230,7 @@ rc_status -v rc_exit } + [ -d /run/nfs ] || mkdir /run/nfs echo $GSSD_BIN $GSSD_SERVER_STATE fi if [ $NEED_IDMAPD = yes ]; then -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit nfs-utils for openSUSE:Factory
Hello community, here is the log from the commit of package nfs-utils for openSUSE:Factory checked in at 2013-11-28 07:38:10 Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old) and /work/SRC/openSUSE:Factory/.nfs-utils.new (New) Package is nfs-utils Changes: --- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2013-11-26 19:21:38.0 +0100 +++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2013-11-28 07:38:11.0 +0100 @@ -1,0 +2,7 @@ +Wed Nov 27 09:00:36 UTC 2013 - nfbr...@suse.com + +- nfsserver.init: fix that typo properly. + Somehow I only fixed part of the problem + (bnc#849476) + +--- Other differences: -- ++ nfsserver.init ++ --- /var/tmp/diff_new_pack.KmGGbs/_old 2013-11-28 07:38:12.0 +0100 +++ /var/tmp/diff_new_pack.KmGGbs/_new 2013-11-28 07:38:12.0 +0100 @@ -210,7 +210,7 @@ VERSION_PARAMS=--no-nfs-version 4 fi if [ $NFS4_SERVER_MINOR_VERSION != 0 ]; then - VERSION_PARAMS=$VERSION_PARAMS --nfs-version 4 -nfs-version 4.$NFS4_SERVER_MINOR_VERSION + VERSION_PARAMS=$VERSION_PARAMS --nfs-version 4 --nfs-version 4.$NFS4_SERVER_MINOR_VERSION fi if [ -n $NFSV4LEASETIME -a -f /proc/fs/nfsd/nfsv4leasetime ]; then echo $NFSV4LEASETIME /proc/fs/nfsd/nfsv4leasetime -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit nfs-utils for openSUSE:Factory
Hello community, here is the log from the commit of package nfs-utils for openSUSE:Factory checked in at 2013-11-26 19:21:37 Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old) and /work/SRC/openSUSE:Factory/.nfs-utils.new (New) Package is nfs-utils Changes: --- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2013-11-18 10:53:39.0 +0100 +++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2013-11-26 19:21:38.0 +0100 @@ -1,0 +2,8 @@ +Tue Nov 26 13:05:11 UTC 2013 - wer...@suse.de + +- If nfs-utils and autofs are both installed make sure that the nfs + client boot service will be started before autofs as otherwise + systemd dependency chain is waiting on nfs client services at + shutdown if nfs client is enabled. + +--- Other differences: -- ++ nfs.init ++ --- /var/tmp/diff_new_pack.u8WqqK/_old 2013-11-26 19:21:39.0 +0100 +++ /var/tmp/diff_new_pack.u8WqqK/_new 2013-11-26 19:21:39.0 +0100 @@ -15,6 +15,7 @@ # Provides: nfs # Required-Start: $network $portmap # Required-Stop: $network $portmap +# X-Start-Before: +autofs # Default-Start: 3 5 # Default-Stop: 0 1 2 6 # Short-Description: NFS client services -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2013-11-18 10:53:38
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new (New)
Package is nfs-utils
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2013-11-15
13:29:46.0 +0100
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2013-11-18
10:53:39.0 +0100
@@ -1,0 +2,15 @@
+Mon Nov 18 03:35:45 UTC 2013 - nfbr...@suse.com
+
+- nfsserver.init: fix typo in --nfs-version 4.
+ (bnc#849476)
+
+---
+Sun Nov 17 23:06:16 UTC 2013 - nfbr...@suse.com
+
+- gssd-mount-hang-fix: An nfs mount will hang
+ indefinitely if mounted by IP address and there
+ is no reverse mapping available. This is
+ caused by a bug in gssd.
+ (bnc#833543)
+
+---
New:
gssd-mount-hang-fix
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.JpVWAV/_old 2013-11-18 10:53:40.0 +0100
+++ /var/tmp/diff_new_pack.JpVWAV/_new 2013-11-18 10:53:40.0 +0100
@@ -81,6 +81,8 @@
Patch9: exportfs-exit-with-error-code-if-there-was-any-error.patch
# PATCH-FIX_UPSTREAM
exportfs-report-failure-if-asked-to-unexport-somethi.patch nfbr...@suse.de
Patch10:exportfs-report-failure-if-asked-to-unexport-somethi.patch
+# PATCH-FIX-UPSTRAM gssd-mount-hang-fix bnc#833543 nfbr...@suse.de
+Patch11:gssd-mount-hang-fix
Suggests: python-base
%description
@@ -141,6 +143,7 @@
%patch8 -p1
%patch9 -p1
%patch10 -p1
+%patch11 -p1
cp %{S:6} .
%build
++ gssd-mount-hang-fix ++
From: Neil Brown ne...@suse.de
Date: Thu, 14 Nov 2013 11:50:38 +1100
Subject: [PATCH] gssd: always reply to rpc-pipe requests from kernel.
References: bnc#833543
Sometimes gssd will open a new rpc-pipe but never read requests from it
or reply to them. This causes the kernel to wait forever for a reply.
In particular, if a filesystem is mounted by IP, and the IP has no
hostname recorded in /etc/hosts or DNS, then gssd will not listen to
requests and the mount will hang indefinitely.
The comment in process_clnt_dir() for the fail_keep_client: branch
suggests that it is for the case where we couldn't open some
subdirectories. However it is currently also taken if reverse DNS
lookup fails (as well as some other lookup failures). Those failures
should not be treated the same as failure-to-open directories.
So this patch causes a failure from read_service_info() to *not* be
reported by process_clnt_dir_files. This ensures that insert_clnt_poll()
will be called and requests will be handled.
In handle_gssd_upcall, the current error path (taken when the mech is
not krb5) does not reply to the upcall. This is wrong. A reply is
always appropriate. The only replies which aren't treated as
transient errors are EACCES and EKEYEXPIRED, so we return the former.
If read_service_info() fails then -servicename will be NULL which will
cause process_krb5_upcall() (quite reasonably) to become confused. So
in that case we don't even try to process the up-call but just reply
with EACCES.
As clp-servicename==NULL is no longer treated as fatal, it is not
appropraite to use it to test if read_service_info() has been already
called on a client. Instread test clp-prog.
Finally, the error path of read_service_info() will close 'fd' if it
isn't -1, so when we close it, we should set fd to -1.
Signed-off-by: NeilBrown ne...@suse.de
diff --git a/utils/gssd/gssd_proc.c b/utils/gssd/gssd_proc.c
index b48d1637cd36..00b4bc779b7c 100644
--- a/utils/gssd/gssd_proc.c
+++ b/utils/gssd/gssd_proc.c
@@ -256,6 +256,7 @@ read_service_info(char *info_file_name, char **servicename,
char **servername,
if ((nbytes = read(fd, buf, INFOBUFLEN)) == -1)
goto fail;
close(fd);
+ fd = -1;
buf[nbytes] = '\0';
numfields = sscanf(buf,RPC server: %127s\n
@@ -403,11 +404,10 @@ process_clnt_dir_files(struct clnt_info * clp)
return -1;
snprintf(info_file_name, sizeof(info_file_name), %s/info,
clp-dirname);
- if ((clp-servicename == NULL)
-read_service_info(info_file_name, clp-servicename,
- clp-servername, clp-prog, clp-vers,
- clp-protocol, (struct sockaddr *) clp-addr))
- return -1;
+ if (clp-prog == 0)
+ read_service_info(info_file_name, clp-servicename,
+ clp-servername, clp-prog, clp-vers,
+
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2013-11-15 13:29:45
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new (New)
Package is nfs-utils
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2013-10-22
10:20:48.0 +0200
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2013-11-15
13:29:46.0 +0100
@@ -1,0 +2,14 @@
+Wed Nov 6 02:06:45 UTC 2013 - nfbr...@suse.com
+
+- nfs-utils.spec: add various systemd macros to make
+ sure init scripts are registered properly
+ bnc#845475
+- nfs.int, nfsserver.init: run gssd on server as well
+ as on client. This is needed for NFSv4.0 callbacks.
+ bnc#845269
+- exportfs-exit-with-error-code-if-there-was-any-error.patch
+- exportfs-report-failure-if-asked-to-unexport-somethi.patch
+ Return good error code from exportfs.
+ bnc#846064
+
+---
New:
exportfs-exit-with-error-code-if-there-was-any-error.patch
exportfs-report-failure-if-asked-to-unexport-somethi.patch
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.aeq4u2/_old 2013-11-15 13:29:47.0 +0100
+++ /var/tmp/diff_new_pack.aeq4u2/_new 2013-11-15 13:29:47.0 +0100
@@ -31,6 +31,9 @@
BuildRequires: pkgconfig
BuildRequires: sqlite3-devel
BuildRequires: tcpd-devel
+%if 0%{?suse_version} = 1210
+BuildRequires: systemd
+%endif
Url:http://kernel.org/pub/linux/utils/nfs-utils/
Summary:Support Utilities for Kernel nfsd
License:GPL-2.0+
@@ -39,6 +42,7 @@
Release:0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: %fillup_prereq %insserv_prereq
+%{?systemd_requires}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0:
http://kernel.org/pub/linux/utils/nfs-utils/%{version}/nfs-utils-%{version}.tar.bz2
# Download does not work:
@@ -73,6 +77,10 @@
Patch7: skip-on-ENOENT.patch
# PATCH-FIX-UPSTREAM
mountd-fix-bug-affecting-exports-of-dirs-with-64bit-.patch nfbr...@suse.de
Patch8: mountd-fix-bug-affecting-exports-of-dirs-with-64bit-.patch
+# PATCH-FIX-UPSTREAM
exportfs-exit-with-error-code-if-there-was-any-error.patch nfbr...@suse.de
+Patch9: exportfs-exit-with-error-code-if-there-was-any-error.patch
+# PATCH-FIX_UPSTREAM
exportfs-report-failure-if-asked-to-unexport-somethi.patch nfbr...@suse.de
+Patch10:exportfs-report-failure-if-asked-to-unexport-somethi.patch
Suggests: python-base
%description
@@ -131,6 +139,8 @@
%patch6 -p1
%patch7 -p1
%patch8 -p1
+%patch9 -p1
+%patch10 -p1
cp %{S:6} .
%build
@@ -194,6 +204,7 @@
%pre -n nfs-client
useradd -r -c 'NFS statd daemon' \
-s /sbin/nologin -d /var/lib/nfs -g nogroup statd /dev/null || :
+%service_add_pre nfs
%post -n nfs-client
chown statd:nogroup /var/lib/nfs
@@ -211,20 +222,27 @@
%{fillup_and_insserv -n nfs nfs}
#
%set_permissions /sbin/mount.nfs
+%service_add_post nfs
%preun -n nfs-client
%stop_on_removal nfs
+%service_del_preun nfs
%postun -n nfs-client
%restart_on_update nfs
[ -x /sbin/mkinitrd_setup ] mkinitrd_setup
%insserv_cleanup
+%service_del_postun nfs
%verifyscript -n nfs-client
%verify_permissions -e /sbin/mount.nfs
+%pre -n nfs-kernel-server
+%service_add_pre nfsserver
+
%preun -n nfs-kernel-server
%stop_on_removal nfsserver
+%service_del_preun nfsserver
%post -n nfs-kernel-server
### migrate from /var/lock/subsys
@@ -237,10 +255,12 @@
fi
###
%{fillup_and_insserv nfsserver}
+%service_add_post nfsserver
%postun -n nfs-kernel-server
%restart_on_update nfsserver
%insserv_cleanup
+%service_del_postun nfsserver
%files -n nfs-client
%defattr(-,root,root)
++ exportfs-exit-with-error-code-if-there-was-any-error.patch ++
From e10ddcb9d913f7938fc37c72568eea4e8287ade4 Mon Sep 17 00:00:00 2001
From: Neil Brown ne...@suse.de
Date: Mon, 21 Oct 2013 17:40:55 +1100
Subject: [PATCH] exportfs: exit with error code if there was any error.
Reference: bnc#846064
exportfs currently exits with a non-zero error for some errors,
but not for others.
It does this by having various support routines set the global
variable export_errno.
Change this to have 'xlog' set export_errno if an ERROR is
reported. That way all errors will be caught.
Note that the exit error code is changed from 22 (EINVAL)
to the more traditional '1'.
Signed-off-by: NeilBrown ne...@suse.de
---
support/include/exportfs.h |3 ---
support/include/xlog.h |1 +
support/nfs/exports.c |6 --
support/nfs/xlog.c |4
utils/exportfs/exportfs.c |2 --
5 files
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2013-10-22 10:20:46
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new (New)
Package is nfs-utils
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2013-09-05
23:21:42.0 +0200
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2013-10-22
10:20:48.0 +0200
@@ -1,0 +2,17 @@
+Tue Oct 22 04:45:13 UTC 2013 - nfbr...@suse.com
+
+- mountd-fix-bug-affecting-exports-of-dirs-with-64bit-.patch
+ allow NFS export to work for XFS filesystems with INODE64
+ (bnc#841971)
+
+---
+Tue Oct 15 01:13:01 UTC 2013 - nfbr...@suse.com
+
+- nfs.init: run ldconfig directly rather than calling
+ boot.ldconfig.
+ boot.ldconfig had some optimisations which are
+ unimportant and inconvenient for NFS, and doesn't
+ exist any more anyway.
+ (bnc#834164).
+
+---
New:
mountd-fix-bug-affecting-exports-of-dirs-with-64bit-.patch
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.ejy9gt/_old 2013-10-22 10:20:56.0 +0200
+++ /var/tmp/diff_new_pack.ejy9gt/_new 2013-10-22 10:20:56.0 +0200
@@ -71,6 +71,8 @@
Patch6: 0006-gssd-fixed-typo-in-machine-cred-name.patch
# PATCH-FIX-UPSTREAM skip-on-ENOENT.patch nfbr...@suse.de
Patch7: skip-on-ENOENT.patch
+# PATCH-FIX-UPSTREAM
mountd-fix-bug-affecting-exports-of-dirs-with-64bit-.patch nfbr...@suse.de
+Patch8: mountd-fix-bug-affecting-exports-of-dirs-with-64bit-.patch
Suggests: python-base
%description
@@ -128,6 +130,7 @@
%patch5 -p1
%patch6 -p1
%patch7 -p1
+%patch8 -p1
cp %{S:6} .
%build
++ mountd-fix-bug-affecting-exports-of-dirs-with-64bit-.patch ++
Git-commit: b3a156fe96c6645ca5dbf4b75e9cff710218d920
From: Neil Brown ne...@suse.de
Date: Mon, 21 Oct 2013 16:27:32 +1100
Subject: [PATCH 1/2] mountd: fix bug affecting exports of dirs with 64bit
inode number.
References: bnc:841971
parse_fsid is currently truncating all inode numbers to
32bits, and assumes that 'int' is 32 bits (which it probably is,
but we shouldn't assume).
So make the 'inode' field in 'struct parsed_fsid' a 64 bit field.
and only memcpy into variables or fields that have been declared
to a specific bit size.
Signed-off-by: NeilBrown ne...@suse.de
---
utils/mountd/cache.c | 25 ++---
1 file changed, 14 insertions(+), 11 deletions(-)
--- nfs-utils-1.2.8.orig/utils/mountd/cache.c
+++ nfs-utils-1.2.8/utils/mountd/cache.c
@@ -388,10 +388,10 @@ struct parsed_fsid {
int fsidtype;
/* We could use a union for this, but it would be more
* complicated; why bother? */
- unsigned int inode;
+ uint64_t inode;
unsigned int minor;
unsigned int major;
- unsigned int fsidnum;
+ uint32_t fsidnum;
size_t uuidlen;
char *fhuuid;
};
@@ -399,8 +399,8 @@ struct parsed_fsid {
static int parse_fsid(int fsidtype, int fsidlen, char *fsid,
struct parsed_fsid *parsed)
{
- unsigned int dev;
- unsigned long long inode64;
+ uint32_t dev;
+ uint32_t inode32;
memset(parsed, 0, sizeof(*parsed));
parsed-fsidtype = fsidtype;
@@ -409,7 +409,8 @@ static int parse_fsid(int fsidtype, int
if (fsidlen != 8)
return -1;
memcpy(dev, fsid, 4);
- memcpy(parsed-inode, fsid+4, 4);
+ memcpy(inode32, fsid+4, 4);
+ parsed-inode = inode32;
parsed-major = ntohl(dev)16;
parsed-minor = ntohl(dev) 0x;
break;
@@ -420,7 +421,7 @@ static int parse_fsid(int fsidtype, int
memcpy(parsed-fsidnum, fsid, 4);
break;
- case FSID_MAJOR_MINOR: /* 12 bytes: 4 major, 4 minor, 4 inode
+ case FSID_MAJOR_MINOR: /* 12 bytes: 4 major, 4 minor, 4 inode
* This format is never actually used but was
* an historical accident
*/
@@ -430,7 +431,8 @@ static int parse_fsid(int fsidtype, int
parsed-major = ntohl(dev);
memcpy(dev, fsid+4, 4);
parsed-minor = ntohl(dev);
- memcpy(parsed-inode, fsid+8, 4);
+ memcpy(inode32, fsid+8, 4);
+ parsed-inode = inode32;
break;
case FSID_ENCODE_DEV: /* 8 bytes: 4 byte packed device number, 4 inode
*/
@@ -440,7 +442,8 @@ static int parse_fsid(int fsidtype, int
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2013-09-05 23:21:41
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new (New)
Package is nfs-utils
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2013-08-06
07:04:06.0 +0200
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2013-09-05
23:21:42.0 +0200
@@ -1,0 +2,17 @@
+Thu Sep 5 05:05:13 UTC 2013 - nfbr...@suse.com
+
+- nfs.init: always start gssd.
+ Recent kernel change means that if gssd isn't running
+ and NFSv4 mount will wait 15 seconds before timing out
+ even if gss security wasn't requested.
+ So just start gssd alway - there is no significant cost
+ in this.
+ (bnc#837262)
+
+---
+Mon Sep 2 05:13:25 UTC 2013 - nfbr...@suse.com
+
+- skip-on-ENOENT.patch - suppress error message
+ that isn't really an error (bnc#800414)
+
+---
New:
skip-on-ENOENT.patch
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.X7IhSr/_old 2013-09-05 23:21:43.0 +0200
+++ /var/tmp/diff_new_pack.X7IhSr/_new 2013-09-05 23:21:43.0 +0200
@@ -69,6 +69,8 @@
Patch5: 0005-gssd-don-t-give-up-on-machine-credential-if-hostname.patch
# PATCH-FIX-UPSTREAM 0006-gssd-fixed-typo-in-machine-cred-name.patch
upstream-bugfix nfbr...@suse.de
Patch6: 0006-gssd-fixed-typo-in-machine-cred-name.patch
+# PATCH-FIX-UPSTREAM skip-on-ENOENT.patch nfbr...@suse.de
+Patch7: skip-on-ENOENT.patch
Suggests: python-base
%description
@@ -125,6 +127,7 @@
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
cp %{S:6} .
%build
++ nfs.init ++
--- /var/tmp/diff_new_pack.X7IhSr/_old 2013-09-05 23:21:43.0 +0200
+++ /var/tmp/diff_new_pack.X7IhSr/_new 2013-09-05 23:21:43.0 +0200
@@ -37,7 +37,8 @@
fi
NEED_IDMAPD=no
-NEED_GSSD=no
+#always start gssd, else kernel waits for it.
+NEED_GSSD=yes
NEED_LDCONFIG=no
state=0
usr=
++ skip-on-ENOENT.patch ++
From 8becedab3982d4780dbc010decc1ac7eb9ce914f Mon Sep 17 00:00:00 2001
From: Neil Brown ne...@suse.de
Date: Mon, 2 Sep 2013 14:54:16 +1000
Subject: [PATCH] gssd: support error message if rpc_pipefs dir disappears.
It is possible for a race to cause a name to appear when an rpc_pipefs
dir is scanned but to no longer be present when we try to open it.
So if the error is ENOENT, don't complain.
This is similar to
commit 5ac9bcfd820f09af4d3f87f1f7346d896f70bc9a
Author: David Jeffery djeff...@redhat.com
Date: Wed Jan 16 15:21:55 2013 -0500
rpc.idmapd: Ignore open failures in dirscancb()
which addressed a similar issue in idmapd.
Signed-off-by: NeilBrown ne...@suse.de
diff --git a/utils/gssd/gssd_proc.c b/utils/gssd/gssd_proc.c
index b7e2bbb..2d3dbec 100644
--- a/utils/gssd/gssd_proc.c
+++ b/utils/gssd/gssd_proc.c
@@ -467,8 +467,9 @@ process_clnt_dir(char *dir, char *pdir)
}
sprintf(clp-dirname, %s/%s, pdir, dir);
if ((clp-dir_fd = open(clp-dirname, O_RDONLY)) == -1) {
- printerr(0, ERROR: can't open %s: %s\n,
-clp-dirname, strerror(errno));
+ if (errno != ENOENT)
+ printerr(0, ERROR: can't open %s: %s\n,
+clp-dirname, strerror(errno));
goto fail_destroy_client;
}
fcntl(clp-dir_fd, F_SETSIG, DNOTIFY_SIGNAL);
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit nfs-utils for openSUSE:Factory
Hello community, here is the log from the commit of package nfs-utils for openSUSE:Factory checked in at 2013-08-06 07:04:04 Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old) and /work/SRC/openSUSE:Factory/.nfs-utils.new (New) Package is nfs-utils Changes: --- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2013-07-30 18:40:44.0 +0200 +++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2013-08-06 07:04:06.0 +0200 @@ -1,0 +2,7 @@ +Mon Aug 5 15:41:31 CEST 2013 - oher...@suse.de + +- Include also nfsv2,nfsv3,nfsv4.ko in initrd (bnc#815738) +- Remove usage of absolute paths in mkinitrd script +- Include also mount.nfs4 + +--- Other differences: -- ++ mkinitrd-boot.sh ++ --- /var/tmp/diff_new_pack.9lLkKk/_old 2013-08-06 07:04:07.0 +0200 +++ /var/tmp/diff_new_pack.9lLkKk/_new 2013-08-06 07:04:07.0 +0200 @@ -1,7 +1,7 @@ #!/bin/bash #%stage: block -#%modules: nfs -#%programs: /sbin/mount.nfs +#%modules: nfs nfsv2 nfsv3 nfsv4 +#%programs: mount.nfs mount.nfs4 #%if: $rootfstype = nfs -o $need_nfs # # Network FileSystem -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2013-07-30 18:40:42
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new (New)
Package is nfs-utils
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2013-05-13
19:57:18.0 +0200
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2013-07-30
18:40:44.0 +0200
@@ -1,0 +2,19 @@
+Mon Jul 22 06:47:57 UTC 2013 - nfbr...@suse.com
+
+- New sysconfig variables
+ NFS4_SERVER_MINOR_VERSION, GSSD_OPTIONS,
+ NFS_GSSD_AVOID_DNS
+ to enable various configurations.
+- bug fixes to init scripts to avoid unmounting everything(!)
+ and to avoid corrupting /run/nfs/bind.mounts
+
+---
+Mon Jul 22 06:12:53 UTC 2013 - nfbr...@suse.com
+
+- New upstream release 1.2.8 - mostly bugfixes, many to gssd.
+ No important new functionality
+- Changes to ./configure command to remove warnings
+- 8 more patches from upstream 'git' to fix non-trivial bugs
+ including on CVE.
+
+---
Old:
nfs-utils-1.2.7.tar.bz2
New:
0001-mountd-Fix-is_subdirectory-again.patch
0002-gssd-Fix-recent-fix-to-Avoid-DNS-reverse-resolution-.patch
0003-Fix-handling-of-preferred-realm-command-line-option.patch
0004-nfsiostat-restore-output-format.patch
0005-gssd-don-t-give-up-on-machine-credential-if-hostname.patch
0006-gssd-fixed-typo-in-machine-cred-name.patch
nfs-utils-1.2.8.tar.bz2
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.XAwHKw/_old 2013-07-30 18:40:46.0 +0200
+++ /var/tmp/diff_new_pack.XAwHKw/_new 2013-07-30 18:40:46.0 +0200
@@ -35,7 +35,7 @@
Summary:Support Utilities for Kernel nfsd
License:GPL-2.0+
Group: Productivity/Networking/NFS
-Version:1.2.7
+Version:1.2.8
Release:0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: %fillup_prereq %insserv_prereq
@@ -57,6 +57,18 @@
Source12: start-statd
Source13: nfs-utils.rpmlintrc
Patch0: nfs-utils-1.0.7-bind-syntax.patch
+# PATCH-FIX-UPSTREAM 0001-mountd-Fix-is_subdirectory-again.patch
upstream-bugfix nfbr...@suse.de
+Patch1: 0001-mountd-Fix-is_subdirectory-again.patch
+# PATCH-FIX-UPSTREAM
0002-gssd-Fix-recent-fix-to-Avoid-DNS-reverse-resolution-.patch upstream-bugfix
nfbr...@suse.de
+Patch2: 0002-gssd-Fix-recent-fix-to-Avoid-DNS-reverse-resolution-.patch
+# PATCH-FIX-UPSTREAM
0003-Fix-handling-of-preferred-realm-command-line-option.patch upstream-bugfix
nfbr...@suse.de
+Patch3: 0003-Fix-handling-of-preferred-realm-command-line-option.patch
+# PATCH-FIX-UPSTREAM 0004-nfsiostat-restore-output-format.patch
upstream-bugfix nfbr...@suse.de
+Patch4: 0004-nfsiostat-restore-output-format.patch
+# PATCH-FIX-UPSTREAM
0005-gssd-don-t-give-up-on-machine-credential-if-hostname.patch upstream-bugfix
nfbr...@suse.de
+Patch5: 0005-gssd-don-t-give-up-on-machine-credential-if-hostname.patch
+# PATCH-FIX-UPSTREAM 0006-gssd-fixed-typo-in-machine-cred-name.patch
upstream-bugfix nfbr...@suse.de
+Patch6: 0006-gssd-fixed-typo-in-machine-cred-name.patch
Suggests: python-base
%description
@@ -107,21 +119,25 @@
%prep
%setup -q -n nfs-utils-%{version} -a 1
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
cp %{S:6} .
%build
rm -f configure; autoreconf -fi
CFLAGS=$RPM_OPT_FLAGS -fPIE -fno-strict-aliasing LDFLAGS=-pie ./configure \
--mandir=%{_mandir} \
- --disable-rquotad \
--enable-nfsv4 \
--enable-gss \
--enable-ipv6 \
--enable-nfsdcltrack \
--enable-mount \
--enable-libmount-mount \
- --enable-mountconfig \
- --with-krb5=/usr/lib/mit
+ --enable-mountconfig
make
cd nfs
for i in *.html ; do
++ 0001-mountd-Fix-is_subdirectory-again.patch ++
From 23d3980b6cfea4e9056d9b7b81e48b4fefc645e0 Mon Sep 17 00:00:00 2001
From: NeilBrown ne...@suse.de
Date: Tue, 7 May 2013 11:46:18 -0400
Subject: [PATCH] mountd: Fix is_subdirectory again
The problem was that is_subdirectory() would also succeed if the two
directories were the same. This is needed for path_matches() which
needs to see if the child is same-or-descendant.
So this patch rearranges path_matches() to do the are they the same
test itself and only bother with is_subdirectory() if it they are not
the same.
So now is_subdirectory() can be strict, and so can be usable for
subexport(), which needs a strong 'in subdirectory - not the
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2013-05-13 19:57:16
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new (New)
Package is nfs-utils
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2013-03-10
08:35:59.0 +0100
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2013-05-13
19:57:18.0 +0200
@@ -1,0 +2,5 @@
+Mon May 13 15:32:55 UTC 2013 - co...@suse.com
+
+- remove sysvinit requires - they are rather harmful these days
+
+---
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.ZupHZM/_old 2013-05-13 19:58:20.0 +0200
+++ /var/tmp/diff_new_pack.ZupHZM/_new 2013-05-13 19:58:20.0 +0200
@@ -64,13 +64,6 @@
server threads via the sysconfig variable USE_KERNEL_NFSD_NUMBER. For
quota over NFS support, install the quota package.
-
-
-Authors:
-
-Olaf Kirch o...@monad.swb.de
-H.J. Lu h...@valinux.com
-
%package -n nfs-client
Summary:Support Utilities for NFS
Group: Productivity/Networking/NFS
@@ -78,20 +71,13 @@
Requires: netcfg
Requires: rpcbind
PreReq: %fillup_prereq %insserv_prereq
-PreReq: permissions sysvinit(portmap) sysvinit(network)
+PreReq: permissions
Provides: aaa_base:/etc/init.d/nfs
%description -n nfs-client
This package contains common NFS utilities which are needed for client
and kernel based server.
-
-
-Authors:
-
-Olaf Kirch o...@monad.swb.de
-H.J. Lu h...@valinux.com
-
%package -n nfs-kernel-server
Summary:Support Utilities for Kernel nfsd
Group: Productivity/Networking/NFS
@@ -109,13 +95,6 @@
USE_KERNEL_NFSD_NUMBER. For quota over NFS support, install the quota
package.
-
-
-Authors:
-
-Olaf Kirch o...@monad.swb.de
-H.J. Lu h...@valinux.com
-
%package -n nfs-doc
Summary:Support Utilities for NFS
Group: Productivity/Networking/NFS
@@ -125,13 +104,6 @@
%description -n nfs-doc
This package contains additional NFS documentation.
-
-
-Authors:
-
-Olaf Kirch o...@monad.swb.de
-H.J. Lu h...@valinux.com
-
%prep
%setup -q -n nfs-utils-%{version} -a 1
%patch0 -p1
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2013-03-10 08:35:57
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new (New)
Package is nfs-utils, Maintainer is nfbr...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2012-11-28
16:19:09.0 +0100
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2013-03-10
08:35:59.0 +0100
@@ -1,0 +2,6 @@
+Wed Mar 6 20:04:55 UTC 2013 - da...@darins.net
+
+- nfsserver.init,sysconfig.nfs - Add support for setting rpc.mountd
+ options.
+
+---
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.WisirY/_old 2013-03-10 08:36:01.0 +0100
+++ /var/tmp/diff_new_pack.WisirY/_new 2013-03-10 08:36:01.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package nfs-utils
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
++ nfsserver.init ++
--- /var/tmp/diff_new_pack.WisirY/_old 2013-03-10 08:36:01.0 +0100
+++ /var/tmp/diff_new_pack.WisirY/_new 2013-03-10 08:36:01.0 +0100
@@ -215,9 +215,9 @@
# rpc.mountd
echo -n mountd
if [ -n $MOUNTD_PORT ] ; then
- startproc /usr/sbin/rpc.mountd -p $MOUNTD_PORT $VERSION_PARAMS
+ startproc /usr/sbin/rpc.mountd -p $MOUNTD_PORT $MOUNTD_OPTIONS
$VERSION_PARAMS
else
- startproc /usr/sbin/rpc.mountd $VERSION_PARAMS
+ startproc /usr/sbin/rpc.mountd $MOUNTD_OPTIONS $VERSION_PARAMS
fi || {
rc_status -v
rc_exit
++ sysconfig.nfs ++
--- /var/tmp/diff_new_pack.WisirY/_old 2013-03-10 08:36:01.0 +0100
+++ /var/tmp/diff_new_pack.WisirY/_new 2013-03-10 08:36:01.0 +0100
@@ -132,3 +132,13 @@
# This setting allows extra options to be specified for NFSD, such as
# -H shared_hostname in a high-availability configuration.
NFSD_OPTIONS=
+
+## Path:Network/File systems/NFS server
+## Description: Extra options for mountd
+## Type:string
+## Default:
+#
+# This setting allows extra options to be specified for rpc.mountd,
+# such as --manage-gids.
+MOUNTD_OPTIONS=
+
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2012-11-28 16:19:06
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new (New)
Package is nfs-utils, Maintainer is nfbr...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2012-10-25
12:10:41.0 +0200
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2012-11-28
16:19:09.0 +0100
@@ -1,0 +2,14 @@
+Wed Nov 28 00:08:55 UTC 2012 - nfbr...@suse.com
+
+- New upstream release 1.2.7. Adds FedFD support
+ to mounted and replaces nfsdcld with
+ nfsdcltrack. This is used to manage client state
+ on NFSv4 servers.
+ Incorporates more local patches.
+
+- Replace /var/run with /run in various scripts.
+
+- nfsserver.init: Generate message that bind= is deprecated
+ if it is used.
+
+---
Old:
mkdir-sbin
mount-exit-code.fix
nfs-utils-1.2.6.tar.bz2
nfs4-no-umount
remove_pretty_sig.patch
New:
nfs-utils-1.2.7.tar.bz2
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.wrZOpY/_old 2012-11-28 16:19:11.0 +0100
+++ /var/tmp/diff_new_pack.wrZOpY/_new 2012-11-28 16:19:11.0 +0100
@@ -31,16 +31,16 @@
BuildRequires: pkgconfig
BuildRequires: sqlite3-devel
BuildRequires: tcpd-devel
-Url:http://nfs.sourceforge.net
+Url:http://kernel.org/pub/linux/utils/nfs-utils/
Summary:Support Utilities for Kernel nfsd
License:GPL-2.0+
Group: Productivity/Networking/NFS
-Version:1.2.6
+Version:1.2.7
Release:0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: %fillup_prereq %insserv_prereq
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0:
http://downloads.sourceforge.net/project/nfs/nfs-utils/%{version}/nfs-utils-%{version}.tar.bz2
+Source0:
http://kernel.org/pub/linux/utils/nfs-utils/%{version}/nfs-utils-%{version}.tar.bz2
# Download does not work:
# Source1:ftp://nfs.sourceforge.net/pub/nfs/nfs.doc.tar.bz2
Source1:nfs.doc.tar.bz2
@@ -57,10 +57,6 @@
Source12: start-statd
Source13: nfs-utils.rpmlintrc
Patch0: nfs-utils-1.0.7-bind-syntax.patch
-Patch1: remove_pretty_sig.patch
-Patch2: mkdir-sbin
-Patch3: mount-exit-code.fix
-Patch4: nfs4-no-umount
Suggests: python-base
%description
@@ -139,10 +135,6 @@
%prep
%setup -q -n nfs-utils-%{version} -a 1
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
cp %{S:6} .
%build
@@ -153,7 +145,7 @@
--enable-nfsv4 \
--enable-gss \
--enable-ipv6 \
- --enable-nfsdcld \
+ --enable-nfsdcltrack \
--enable-mount \
--enable-libmount-mount \
--enable-mountconfig \
@@ -213,12 +205,12 @@
chown statd:nogroup /var/lib/nfs
chown -R statd /var/lib/nfs/{state,sm,sm.bak} /dev/null || :
### migrate from /var/lock/subsys
-[ -d /var/run/nfs ] || mkdir /var/run/nfs
+[ -d /run/nfs ] || mkdir /run/nfs
if [ -f /var/lock/subsys/nfs-rpc.idmapd ]; then
- mv /var/lock/subsys/nfs-rpc.idmapd /var/run/nfs
+ mv /var/lock/subsys/nfs-rpc.idmapd /run/nfs
fi
if [ -f /var/lock/subsys/nfsserver-rpc.idmapd ]; then
- mv /var/lock/subsys/nfsserver-rpc.idmapd /var/run/nfs
+ mv /var/lock/subsys/nfsserver-rpc.idmapd /run/nfs
fi
###
[ -x /sbin/mkinitrd_setup ] mkinitrd_setup
@@ -242,12 +234,12 @@
%post -n nfs-kernel-server
### migrate from /var/lock/subsys
-[ -d /var/run/nfs ] || mkdir /var/run/nfs
+[ -d /run/nfs ] || mkdir /run/nfs
if [ -f /var/lock/subsys/nfs-rpc.idmapd ]; then
- mv /var/lock/subsys/nfs-rpc.idmapd /var/run/nfs
+ mv /var/lock/subsys/nfs-rpc.idmapd /run/nfs
fi
if [ -f /var/lock/subsys/nfsserver-rpc.idmapd ]; then
- mv /var/lock/subsys/nfsserver-rpc.idmapd /var/run/nfs
+ mv /var/lock/subsys/nfsserver-rpc.idmapd /run/nfs
fi
###
%{fillup_and_insserv nfsserver}
@@ -322,7 +314,7 @@
/usr/sbin/rpc.mountd
/usr/sbin/rpc.nfsd
/usr/sbin/rpc.svcgssd
-/usr/sbin/nfsdcld
+/usr/sbin/nfsdcltrack
%{_mandir}/man5/exports.5.gz
%{_mandir}/man7/nfsd.7.gz
%{_mandir}/man8/exportfs.8.gz
@@ -331,7 +323,7 @@
%{_mandir}/man8/rpc.mountd.8.gz
%{_mandir}/man8/rpc.nfsd.8.gz
%{_mandir}/man8/rpc.svcgssd.8.gz
-%{_mandir}/man8/nfsdcld.8.gz
+%{_mandir}/man8/nfsdcltrack.8.gz
/usr/share/omc/svcinfo.d/nfs-kernel-server.xml
%config(noreplace) /var/lib/nfs/xtab
%config(noreplace) /var/lib/nfs/etab
++ nfs-utils-1.0.7-bind-syntax.patch ++
--- /var/tmp/diff_new_pack.wrZOpY/_old 2012-11-28 16:19:12.0
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2012-10-25 12:10:38
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new (New)
Package is nfs-utils, Maintainer is nfbr...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2012-10-07
19:53:41.0 +0200
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2012-10-25
12:10:41.0 +0200
@@ -1,0 +2,6 @@
+Wed Oct 17 23:55:27 UTC 2012 - nfbr...@suse.com
+
+- Add dependency on netcfg to ensure /etc/services
+ is present (bnc#779851)
+
+---
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.IEpxta/_old 2012-10-25 12:10:43.0 +0200
+++ /var/tmp/diff_new_pack.IEpxta/_new 2012-10-25 12:10:43.0 +0200
@@ -79,6 +79,7 @@
Summary:Support Utilities for NFS
Group: Productivity/Networking/NFS
Obsoletes: nfs-utils 1.1.0
+Requires: netcfg
Requires: rpcbind
PreReq: %fillup_prereq %insserv_prereq
PreReq: permissions sysvinit(portmap) sysvinit(network)
@@ -101,6 +102,7 @@
Provides: nfs-utils = %{version}
Obsoletes: nfs-utils 1.1.0
Conflicts: nfs-server
+Requires: netcfg
Requires: nfs-client = %{version}
Requires: rpcbind
PreReq: %fillup_prereq %insserv_prereq
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2012-10-07 19:53:24
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new (New)
Package is nfs-utils, Maintainer is nfbr...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2012-07-20
10:24:40.0 +0200
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2012-10-07
19:53:41.0 +0200
@@ -1,0 +2,7 @@
+Thu Sep 27 02:10:53 UTC 2012 - nfbr...@suse.com
+
+- nfs4-no-umount: does send MOUNT_UMNT rpcs
+ when unmounting an 'nfs4' filesystem. They
+ are only required for nfs2,3. (bnc#772534)
+
+---
New:
nfs4-no-umount
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.imPWlE/_old 2012-10-07 19:53:43.0 +0200
+++ /var/tmp/diff_new_pack.imPWlE/_new 2012-10-07 19:53:43.0 +0200
@@ -60,6 +60,7 @@
Patch1: remove_pretty_sig.patch
Patch2: mkdir-sbin
Patch3: mount-exit-code.fix
+Patch4: nfs4-no-umount
Suggests: python-base
%description
@@ -139,6 +140,7 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
cp %{S:6} .
%build
++ nfs4-no-umount ++
From b0b342201140530c5b9e00408f12d22258df7c4e Mon Sep 17 00:00:00 2001
From: NeilBrown ne...@suse.de
Date: Mon, 6 Aug 2012 08:41:13 -0400
Subject: [PATCH] umount: use correct return value for is_vers4.
is_vers4 in mount_libmount.c is based on nfs_umount_is_vers4
in nfsumount.c, except the return values are reversed.
The result of this is:
- a MOUNT_UMNT call is not sent when an NFSv3 or NFSv2
filesystem is unmounted
- a MOUNT_UMNT call *is* sent when and 'nfs4' filesystem
is unmounted (but not when an 'nfs -o vers=4 filesystem
is unmounted, as that is checked elsewhere).
Signed-off-by: NeilBrown ne...@suse.de
Signed-off-by: Steve Dickson ste...@redhat.com
---
utils/mount/mount_libmount.c |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- nfs-utils-1.2.6.orig/utils/mount/mount_libmount.c
+++ nfs-utils-1.2.6/utils/mount/mount_libmount.c
@@ -140,14 +140,14 @@ static int try_mount(struct libmnt_conte
return ret;
}
-/* returns: error = -1, success = 0 , unknown = 1 */
+/* returns: error = -1, success = 1 , not vers4 == 0 */
static int is_vers4(struct libmnt_context *cxt)
{
struct libmnt_fs *fs = mnt_context_get_fs(cxt);
struct libmnt_table *tb = NULL;
const char *src = mnt_context_get_source(cxt),
*tgt = mnt_context_get_target(cxt);
- int rc = 1;
+ int rc = 0;
if (!src || !tgt)
return -1;
@@ -163,7 +163,7 @@ static int is_vers4(struct libmnt_contex
if (fs) {
const char *type = mnt_fs_get_fstype(fs);
if (type strcmp(type, nfs4) == 0)
- rc = 0;
+ rc = 1;
}
mnt_free_table(tb);
return rc;
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2012-07-20 10:21:16
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new (New)
Package is nfs-utils, Maintainer is nfbr...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2012-05-21
07:28:53.0 +0200
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2012-07-20
10:24:40.0 +0200
@@ -1,0 +2,7 @@
+Thu Jul 19 06:26:10 UTC 2012 - nfbr...@suse.com
+
+- mount-exit-code.fix: Correct exit code from
+ unmount when fs is busy - allows autofs to work
+ correctly. (bnc#770962)
+
+---
New:
mount-exit-code.fix
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.k3mIqw/_old 2012-07-20 10:24:42.0 +0200
+++ /var/tmp/diff_new_pack.k3mIqw/_new 2012-07-20 10:24:42.0 +0200
@@ -59,6 +59,7 @@
Patch0: nfs-utils-1.0.7-bind-syntax.patch
Patch1: remove_pretty_sig.patch
Patch2: mkdir-sbin
+Patch3: mount-exit-code.fix
Suggests: python-base
%description
@@ -137,6 +138,7 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
cp %{S:6} .
%build
++ mount-exit-code.fix ++
From 76908c3f14a12e865054ea5d6e4cad201c28839a Mon Sep 17 00:00:00 2001
From: NeilBrown ne...@suse.de
Date: Mon, 16 Jul 2012 08:43:28 -0400
Subject: [PATCH] mount.nfs: restore correct error status when umount fails
If nfs-utils is built without --enable-libmount-mount, then
an unmount that failed due to the filesystem being busy will
exit with '16' - EX_FILEIO.
Autofs apparently relies on this.
When built with --enable-libmount-mount, the same case will
exit with '32' - EX_FAIL. Normally this is reserved for
internal errors.
This patch restores the use of EX_FILEIO for errors from umount.
Reviewed-by: Karel Zak k...@redhat.com
Signed-off-by: NeilBrown ne...@suse.de
Signed-off-by: Steve Dickson ste...@redhat.com
---
utils/mount/mount_libmount.c |9 -
1 file changed, 4 insertions(+), 5 deletions(-)
--- nfs-utils-1.2.6.orig/utils/mount/mount_libmount.c
+++ nfs-utils-1.2.6/utils/mount/mount_libmount.c
@@ -173,6 +173,7 @@ static int umount_main(struct libmnt_con
{
int rc, c;
char *spec = NULL, *opts = NULL;
+ int ret = EX_FAIL;
static const struct option longopts[] = {
{ force, 0, 0, 'f' },
@@ -243,7 +244,7 @@ static int umount_main(struct libmnt_con
/* strange, no entry in mtab or /proc not mounted */
nfs_umount23(spec, tcp,v3);
}
-
+ ret = EX_FILEIO;
rc = mnt_context_do_umount(cxt);/* call umount(2) syscall */
mnt_context_finalize_mount(cxt);/* mtab update */
@@ -252,12 +253,10 @@ static int umount_main(struct libmnt_con
umount_error(rc, spec);
goto err;
}
-
- free(opts);
- return EX_SUCCESS;
+ ret = EX_SUCCESS;
err:
free(opts);
- return EX_FAIL;
+ return ret;
}
static int mount_main(struct libmnt_context *cxt, int argc, char **argv)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit nfs-utils for openSUSE:Factory
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 nfbr...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2012-05-09
18:32:22.0 +0200
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2012-05-21
07:28:53.0 +0200
@@ -1,0 +2,8 @@
+Thu May 17 07:04:58 UTC 2012 - nfbr...@suse.com
+
+- 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.0 +0200
+++ /var/tmp/diff_new_pack.FuJmiP/_new 2012-05-21 07:28:56.0 +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.0 +0200
+++ /var/tmp/diff_new_pack.FuJmiP/_new 2012-05-21 07:28:56.0 +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
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2012-05-09 18:18:54
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new (New)
Package is nfs-utils, Maintainer is nfbr...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2011-11-22
17:49:13.0 +0100
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2012-05-09
18:32:22.0 +0200
@@ -1,0 +2,13 @@
+Wed May 2 01:42:23 UTC 2012 - nfbr...@suse.com
+
+- nfsserver.init: remove VERSION_LIST. This is
+ unnecessary duplication of VERSION_PARAMS
+
+---
+Wed May 2 01:34:51 UTC 2012 - nfbr...@suse.com
+
+- nfsserver.init: Don't depend on mount preserving
+ unknown options - it doesn't any more. This can
+ confuse nfsd_unbind_mounts (bnc#754805)
+
+---
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.ojcq2W/_old 2012-05-09 18:32:24.0 +0200
+++ /var/tmp/diff_new_pack.ojcq2W/_new 2012-05-09 18:32:24.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package nfs-utils
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,11 +16,19 @@
#
-
Name: nfs-utils
-BuildRequires: e2fsprogs-devel gcc-c++ krb5-devel libgssglue-devel = 0.3
librpcsecgss libtirpc-devel libtool nfsidmap-devel = 0.24 pkgconfig tcpd-devel
BuildRequires: device-mapper-devel
+BuildRequires: e2fsprogs-devel
+BuildRequires: gcc-c++
+BuildRequires: krb5-devel
+BuildRequires: libgssglue-devel = 0.3
BuildRequires: libmount-devel
+BuildRequires: librpcsecgss
+BuildRequires: libtirpc-devel
+BuildRequires: libtool
+BuildRequires: nfsidmap-devel = 0.24
+BuildRequires: pkgconfig
+BuildRequires: tcpd-devel
%if 0%{?suse_version} 1100
BuildRequires: libevent-devel
%else
@@ -28,13 +36,12 @@
%endif
Url:http://nfs.sourceforge.net
Summary:Support Utilities for Kernel nfsd
-Version:1.2.5
-Release:1
-Group: Productivity/Networking/NFS
License:GPL-2.0+
+Group: Productivity/Networking/NFS
+Version:1.2.5
+Release:0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: %fillup_prereq %insserv_prereq
-AutoReqProv:on
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0:
http://downloads.sourceforge.net/project/nfs/nfs-utils/%{version}/nfs-utils-%{version}.tar.bz2
# Download does not work:
@@ -70,9 +77,8 @@
H.J. Lu h...@valinux.com
%package -n nfs-client
-License:GPL-2.0+
-Group: Productivity/Networking/NFS
Summary:Support Utilities for NFS
+Group: Productivity/Networking/NFS
Obsoletes: nfs-utils 1.1.0
Requires: rpcbind
PreReq: %fillup_prereq %insserv_prereq
@@ -91,13 +97,13 @@
H.J. Lu h...@valinux.com
%package -n nfs-kernel-server
-License:GPL-2.0+
-Group: Productivity/Networking/NFS
Summary:Support Utilities for Kernel nfsd
+Group: Productivity/Networking/NFS
Provides: nfs-utils = %{version}
Obsoletes: nfs-utils 1.1.0
Conflicts: nfs-server
-Requires: nfs-client = %{version} rpcbind
+Requires: nfs-client = %{version}
+Requires: rpcbind
PreReq: %fillup_prereq %insserv_prereq
%description -n nfs-kernel-server
@@ -114,9 +120,8 @@
H.J. Lu h...@valinux.com
%package -n nfs-doc
-License:GPL-2.0+
-Group: Productivity/Networking/NFS
Summary:Support Utilities for NFS
+Group: Productivity/Networking/NFS
Obsoletes: nfs-utils 1.1.0
Requires: latex2html-pngicons
++ nfsserver.init ++
--- /var/tmp/diff_new_pack.ojcq2W/_old 2012-05-09 18:32:24.0 +0200
+++ /var/tmp/diff_new_pack.ojcq2W/_new 2012-05-09 18:32:24.0 +0200
@@ -57,6 +57,7 @@
IDMAPD_CLIENT_STATE=/var/run/nfs/nfs-rpc.idmapd
IDMAPD_SERVER_STATE=/var/run/nfs/nfsserver-rpc.idmapd
+NFSD_BIND_MOUNTS=/var/run/nfs/bind.mounts
NEED_SVCGSSD=no
NEED_IDMPAPD=no
@@ -93,6 +94,7 @@
}
nfs4_bind_mounts() {
+[ -d /var/run/nfs ] || mkdir /var/run/nfs
# In case of doubt, try man sed :-)
cat /etc/exports |
@@ -101,21 +103,17 @@
sort |
while read export dir; do
test -d $export || mkdir -p $export
- # Fortunately,
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2011-12-06 18:32:08
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new (New)
Package is nfs-utils, Maintainer is nfbr...@suse.com
Changes:
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.xaylgy/_old 2011-12-06 18:53:25.0 +0100
+++ /var/tmp/diff_new_pack.xaylgy/_new 2011-12-06 18:53:25.0 +0100
@@ -31,7 +31,7 @@
Version:1.2.5
Release:1
Group: Productivity/Networking/NFS
-License:GPLv2+
+License:GPL-2.0+
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: %fillup_prereq %insserv_prereq
AutoReqProv:on
@@ -70,7 +70,7 @@
H.J. Lu h...@valinux.com
%package -n nfs-client
-License:GPLv2+
+License:GPL-2.0+
Group: Productivity/Networking/NFS
Summary:Support Utilities for NFS
Obsoletes: nfs-utils 1.1.0
@@ -91,7 +91,7 @@
H.J. Lu h...@valinux.com
%package -n nfs-kernel-server
-License:GPLv2+
+License:GPL-2.0+
Group: Productivity/Networking/NFS
Summary:Support Utilities for Kernel nfsd
Provides: nfs-utils = %{version}
@@ -114,7 +114,7 @@
H.J. Lu h...@valinux.com
%package -n nfs-doc
-License:GPLv2+
+License:GPL-2.0+
Group: Productivity/Networking/NFS
Summary:Support Utilities for NFS
Obsoletes: nfs-utils 1.1.0
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit nfs-utils for openSUSE:Factory
Hello community, here is the log from the commit of package nfs-utils for openSUSE:Factory checked in at 2011-11-07 14:23:08 Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old) and /work/SRC/openSUSE:Factory/.nfs-utils.new (New) Package is nfs-utils, Maintainer is nfbr...@suse.com Changes: --- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2011-10-13 00:14:47.0 +0200 +++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2011-11-07 14:23:10.0 +0100 @@ -1,0 +2,5 @@ +Sun Nov 6 11:43:39 UTC 2011 - pu...@suse.com + +- do not strip the binaries + +--- Other differences: -- ++ nfs-utils.spec ++ --- /var/tmp/diff_new_pack.9mXqAC/_old 2011-11-07 14:23:11.0 +0100 +++ /var/tmp/diff_new_pack.9mXqAC/_new 2011-11-07 14:23:11.0 +0100 @@ -161,7 +161,7 @@ done %install -make install-strip DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT rm -f linux-nfs/Makefile* # rc-script install -d $RPM_BUILD_ROOT/etc/init.d -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at Sun Oct 2 10:21:10 CEST 2011.
--- openSUSE:Factory/nfs-utils/nfs-utils.changes2011-09-26
10:35:49.0 +0200
+++ /mounts/work_src_done/STABLE/nfs-utils/nfs-utils.changes2011-10-01
17:25:59.0 +0200
@@ -1,0 +2,6 @@
+Sat Oct 1 15:24:33 UTC 2011 - crrodrig...@opensuse.org
+
+- Fix build in arm, portability bug, applications MUST
+ use sysconf(_SC_PAGESIZE) instead of constant PAGE_SIZE
+
+---
calling whatdependson for head-i586
New:
nfs-utils-page_size.patch
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.ZTKK6d/_old 2011-10-02 10:21:06.0 +0200
+++ /var/tmp/diff_new_pack.ZTKK6d/_new 2011-10-02 10:21:06.0 +0200
@@ -54,6 +54,7 @@
Source13: nfs-utils.rpmlintrc
Patch0: nfs-utils-1.0.7-bind-syntax.patch
Patch1: warn-nfs-udp.patch
+Patch2: nfs-utils-page_size.patch
Suggests: python-base
%description
@@ -133,6 +134,7 @@
%setup -q -n nfs-utils-%{version} -a 1
%patch0 -p1
%patch1 -p1
+%patch2
cp %{S:6} .
%build
++ nfs-utils-page_size.patch ++
--- utils/blkmapd/device-process.c.orig
+++ utils/blkmapd/device-process.c
@@ -296,7 +296,7 @@ decode_blk_volume(uint32_t **pp, uint32_
off_t stripe_unit = vol-param.bv_stripe_unit;
/* Check limitations imposed by device-mapper */
if ((stripe_unit (stripe_unit - 1)) != 0
- || stripe_unit (off_t) (PAGE_SIZE 9))
+ || stripe_unit (off_t) (sysconf(_SC_PAGESIZE) 9))
return -EIO;
BLK_READBUF(p, end, 4);
READ32(vol-bv_vol_n);
continue with q...
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at Thu Aug 18 11:55:52 CEST 2011.
--- nfs-utils/nfs-utils.changes 2011-06-23 07:52:04.0 +0200
+++ /mounts/work_src_done/STABLE/nfs-utils/nfs-utils.changes2011-08-18
10:20:42.0 +0200
@@ -1,0 +2,9 @@
+Thu Aug 18 07:48:27 UTC 2011 - nfbr...@novell.com
+
+- New upstream version 1.2.4 - plus a few important
+ patches from git. This adds a new binary nfsidmap,
+ with man page. Also: build with libmount enabled
+ to correctly handle /etc/mtab being linked to
+ /proc/self/mounts. (bnc#681106)
+
+---
calling whatdependson for head-i586
Old:
addmntent.fix
do-not-error-when-address-family-not-supported
mount-catch-signals
mountd-auth-fix
nfs-utils-1.2.3.tar.bz2
nfs-utils-allow-port-number-sharing
nfs-utils-clear-mountd-reg
nfs-utils-fix-remount
nfs-utils-improve-v4-umount
rpc.mountd-segfault-fix
New:
Statd-should-always-chdir-to-its-state-directory.patch
exportfs-closing-fd-associated-with-proc-fs-nfsd-exp.patch
mount-fix-for-libmount-from-util-linux-2.20.patch
mountd-Fixed-strcmp-usage-in-in-insert-groups.patch
nfs-utils-1.2.4.tar.bz2
rpc.statd-Bind-downcall-socket-to-loopback-address.patch
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.DDEZzz/_old 2011-08-18 11:49:38.0 +0200
+++ /var/tmp/diff_new_pack.DDEZzz/_new 2011-08-18 11:49:38.0 +0200
@@ -19,6 +19,7 @@
Name: nfs-utils
BuildRequires: e2fsprogs-devel gcc-c++ krb5-devel libgssglue-devel
librpcsecgss libtirpc-devel nfsidmap-devel pkgconfig tcpd-devel
+BuildRequires: libmount-devel
%if 0%{?suse_version} 1100
BuildRequires: libevent-devel
%else
@@ -26,8 +27,8 @@
%endif
Url:http://nfs.sourceforge.net
Summary:Support Utilities for Kernel nfsd
-Version:1.2.3
-Release:25
+Version:1.2.4
+Release:1
Group: Productivity/Networking/NFS
License:GPLv2+
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -52,15 +53,11 @@
Source13: nfs-utils.rpmlintrc
Patch0: nfs-utils-1.0.7-bind-syntax.patch
Patch1: warn-nfs-udp.patch
-Patch2: nfs-utils-clear-mountd-reg
-Patch3: nfs-utils-allow-port-number-sharing
-Patch4: nfs-utils-improve-v4-umount
-Patch5: nfs-utils-fix-remount
-Patch6: rpc.mountd-segfault-fix
-Patch7: do-not-error-when-address-family-not-supported
-Patch8: addmntent.fix
-Patch9: mount-catch-signals
-Patch10:mountd-auth-fix
+Patch2: exportfs-closing-fd-associated-with-proc-fs-nfsd-exp.patch
+Patch3: mountd-Fixed-strcmp-usage-in-in-insert-groups.patch
+Patch4: mount-fix-for-libmount-from-util-linux-2.20.patch
+Patch5: rpc.statd-Bind-downcall-socket-to-loopback-address.patch
+Patch6: Statd-should-always-chdir-to-its-state-directory.patch
Suggests: python-base
%description
@@ -145,10 +142,6 @@
%patch4 -p1
%patch5 -p1
%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
cp %{S:6} .
%build
@@ -161,6 +154,7 @@
--enable-gss \
--enable-ipv6 \
--enable-mount \
+ --enable-libmount-mount \
--enable-mountconfig \
--with-krb5=/usr/lib/mit
make
@@ -278,6 +272,7 @@
/usr/sbin/gss_destroy_creds
%attr(0755,root,root) /usr/sbin/mountstats
%attr(0755,root,root) /usr/sbin/nfsiostat
+/usr/sbin/nfsidmap
/usr/sbin/nfsstat
/usr/sbin/rcnfs
/usr/sbin/rpc.gssd
@@ -290,6 +285,7 @@
%{_mandir}/man5/nfsmount.conf.5.gz
%{_mandir}/man5/nfs.5.gz
%{_mandir}/man8/mount.nfs.8.gz
+%{_mandir}/man8/nfsidmap.8.gz
%{_mandir}/man8/nfsstat.8.gz
%{_mandir}/man8/rpc.sm-notify.8.gz
%{_mandir}/man8/showmount.8.gz
++ Statd-should-always-chdir-to-its-state-directory.patch ++
From 1ce0374d445d8a3dbdfb3e9da4c76be9df44666b Mon Sep 17 00:00:00 2001
From: NeilBrown ne...@suse.de
Date: Thu, 21 Jul 2011 14:23:00 -0400
Subject: [PATCH] Statd should always 'chdir' to its state directory.
s statd can be started by 'mount' which can sometimes be run by a
normal user, the current-working-directory could be anything. In
partcular it could be in a mounted filesystem. As 'statd' continues
running as a daemon it could keep prevent that filesystem from being
unmounted.
statd does currently 'chdir' to the state directory, but only if the
state directory is not owned by root. This is wrong - it should check
for root after the chdir, not before.
So swap the two if statements around.
Signed-off-by: NeilBrown ne...@suse.de
Signed-off-by: Steve Dickson ste...@redhat.com
---
support/nsm/file.c | 12 ++--
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/support/nsm/file.c b/support/nsm/file.c
index
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at Mon Jun 20 10:53:26 CEST 2011.
--- nfs-utils/nfs-utils.changes 2011-06-02 08:49:11.0 +0200
+++ /mounts/work_src_done/STABLE/nfs-utils/nfs-utils.changes2011-06-17
16:12:38.0 +0200
@@ -1,0 +2,5 @@
+Fri Jun 17 14:12:19 UTC 2011 - a...@suse.de
+
+- Fix URLs.
+
+---
calling whatdependson for head-i586
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.L52Jml/_old 2011-06-20 10:52:25.0 +0200
+++ /var/tmp/diff_new_pack.L52Jml/_new 2011-06-20 10:52:25.0 +0200
@@ -27,15 +27,17 @@
Url:http://nfs.sourceforge.net
Summary:Support Utilities for Kernel nfsd
Version:1.2.3
-Release:21
+Release:23
Group: Productivity/Networking/NFS
License:GPLv2+
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: %fillup_prereq %insserv_prereq
AutoReqProv:on
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0:
ftp://ftp.sourceforge.net/pub/sourceforge/n/nf/nfs/nfs-utils-%{version}.tar.bz2
-Source1:ftp://nfs.sourceforge.net/pub/nfs/nfs.doc.tar.bz2
+Source0:
http://downloads.sourceforge.net/project/nfs/nfs-utils/%{version}/nfs-utils-%{version}.tar.bz2
+# Download does not work:
+# Source1:ftp://nfs.sourceforge.net/pub/nfs/nfs.doc.tar.bz2
+Source1:nfs.doc.tar.bz2
Source2:nfs.init
Source3:nfsserver.init
Source4:sysconfig.nfs
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at Mon Jun 6 11:53:37 CEST 2011.
--- nfs-utils/nfs-utils.changes 2011-05-31 03:43:49.0 +0200
+++ /mounts/work_src_done/STABLE/nfs-utils/nfs-utils.changes2011-06-02
08:49:11.0 +0200
@@ -1,0 +2,12 @@
+Thu Jun 2 06:48:03 UTC 2011 - nfbr...@novell.com
+
+- nfsserver.init, sysconfig.nfs: add NFSV4LEASETIME
+ parameter to allow lease time to be set.
+ bnc#681510
+
+---
+Tue May 31 11:43:41 UTC 2011 - lnus...@suse.de
+
+- use /var/run/nfs instead of /var/lock/subsys
+
+---
calling whatdependson for head-i586
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.151U93/_old 2011-06-06 11:52:41.0 +0200
+++ /var/tmp/diff_new_pack.151U93/_new 2011-06-06 11:52:41.0 +0200
@@ -27,7 +27,7 @@
Url:http://nfs.sourceforge.net
Summary:Support Utilities for Kernel nfsd
Version:1.2.3
-Release:19
+Release:21
Group: Productivity/Networking/NFS
License:GPLv2+
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -205,6 +205,15 @@
%post -n nfs-client
chown statd:nogroup /var/lib/nfs
chown -R statd /var/lib/nfs/{state,sm,sm.bak} /dev/null || :
+### migrate from /var/lock/subsys
+[ -d /var/run/nfs ] || mkdir /var/run/nfs
+if [ -f /var/lock/subsys/nfs-rpc.idmapd ]; then
+ mv /var/lock/subsys/nfs-rpc.idmapd /var/run/nfs
+fi
+if [ -f /var/lock/subsys/nfsserver-rpc.idmapd ]; then
+ mv /var/lock/subsys/nfsserver-rpc.idmapd /var/run/nfs
+fi
+###
[ -x /sbin/mkinitrd_setup ] mkinitrd_setup
%{fillup_and_insserv -n nfs nfs}
#
@@ -225,6 +234,15 @@
%stop_on_removal nfsserver
%post -n nfs-kernel-server
+### migrate from /var/lock/subsys
+[ -d /var/run/nfs ] || mkdir /var/run/nfs
+if [ -f /var/lock/subsys/nfs-rpc.idmapd ]; then
+ mv /var/lock/subsys/nfs-rpc.idmapd /var/run/nfs
+fi
+if [ -f /var/lock/subsys/nfsserver-rpc.idmapd ]; then
+ mv /var/lock/subsys/nfsserver-rpc.idmapd /var/run/nfs
+fi
+###
%{fillup_and_insserv nfsserver}
%postun -n nfs-kernel-server
++ nfs.init ++
--- /var/tmp/diff_new_pack.151U93/_old 2011-06-06 11:52:42.0 +0200
+++ /var/tmp/diff_new_pack.151U93/_new 2011-06-06 11:52:42.0 +0200
@@ -24,12 +24,13 @@
. /etc/rc.status
. /etc/sysconfig/nfs
+# XXX: there should be separate init scripts for these really
IDMAPD_BIN=/usr/sbin/rpc.idmapd
GSSD_BIN=/usr/sbin/rpc.gssd
STATD_BIN=/usr/sbin/rpc.statd
-IDMAPD_CLIENT_STATE=/var/lock/subsys/nfs-rpc.idmapd
-IDMAPD_SERVER_STATE=/var/lock/subsys/nfsserver-rpc.idmapd
+IDMAPD_CLIENT_STATE=/var/run/nfs/nfs-rpc.idmapd
+IDMAPD_SERVER_STATE=/var/run/nfs/nfsserver-rpc.idmapd
NEED_IDMAPD=no
NEED_GSSD=no
@@ -213,7 +214,8 @@
rc_status -v
rc_exit
}
-echo $IDMAPD_BIN $IDMAPD_CLIENT_STATE
+ [ -d /var/run/nfs ] || mkdir /var/run/nfs
+ echo $IDMAPD_BIN $IDMAPD_CLIENT_STATE
fi
rc_status -v
++ nfsserver.init ++
--- /var/tmp/diff_new_pack.151U93/_old 2011-06-06 11:52:42.0 +0200
+++ /var/tmp/diff_new_pack.151U93/_new 2011-06-06 11:52:42.0 +0200
@@ -50,12 +50,13 @@
# with force-reload (in case signalling is not supported) are
# considered a success.
+# XXX: there should be separate init scripts for these really
SVCGSSD_BIN=/usr/sbin/rpc.svcgssd
IDMAPD_BIN=/usr/sbin/rpc.idmapd
NFSD_BIN=/usr/sbin/rpc.nfsd
-IDMAPD_CLIENT_STATE=/var/lock/subsys/nfs-rpc.idmapd
-IDMAPD_SERVER_STATE=/var/lock/subsys/nfsserver-rpc.idmapd
+IDMAPD_CLIENT_STATE=/var/run/nfs/nfs-rpc.idmapd
+IDMAPD_SERVER_STATE=/var/run/nfs/nfsserver-rpc.idmapd
NEED_SVCGSSD=no
NEED_IDMPAPD=no
@@ -187,6 +188,10 @@
if [ `cat /proc/fs/nfsd/threads` = 0 ]; then
echo $VERSION_LIST /proc/fs/nfsd/versions
fi
+ if [ -n $NFSV4LEASETIME -a -f /proc/fs/nfsd/nfsv4leasetime ]; then
+echo $NFSV4LEASETIME /proc/fs/nfsd/nfsv4leasetime
+ fi
+
nfs4_bind_mounts
# svcgssd; idmapd
if [ $NEED_SVCGSSD = yes ]; then
@@ -202,6 +207,7 @@
rc_status -v
rc_exit
}
+ [ -d /var/run/nfs ] || mkdir /var/run/nfs
echo $IDMAPD_BIN $IDMAPD_SERVER_STATE
fi
# exportfs
++ sysconfig.nfs ++
--- /var/tmp/diff_new_pack.151U93/_old 2011-06-06 11:52:42.0 +0200
+++ /var/tmp/diff_new_pack.151U93/_new 2011-06-06 11:52:42.0 +0200
@@ -86,3 +86,17 @@
#
STATD_OPTIONS=
+## Path:Network/File systems/NFS server
+## Description: Lease time for NFSv4 leases
+## Type:integer
+## Default:
+#
+# Set the lease time for the
commit nfs-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at Wed Apr 27 10:02:10 CEST 2011.
--- nfs-utils/nfs-utils.changes 2011-03-19 15:11:03.0 +0100
+++ /mounts/work_src_done/STABLE/nfs-utils/nfs-utils.changes2011-04-27
02:42:25.0 +0200
@@ -1,0 +2,7 @@
+Wed Apr 27 00:41:10 UTC 2011 - nfbr...@novell.com
+
+- Make /var/lib/nfs world executable.
+ Otherwise 'df' complains about /var/lib/nfs/rpc_pipefs
+ bnc#675385
+
+---
calling whatdependson for head-i586
Other differences:
--
++ nfs-utils.spec ++
--- /var/tmp/diff_new_pack.JrRuNI/_old 2011-04-27 09:57:06.0 +0200
+++ /var/tmp/diff_new_pack.JrRuNI/_new 2011-04-27 09:57:06.0 +0200
@@ -27,7 +27,7 @@
Url:http://nfs.sourceforge.net
Summary:Support Utilities for Kernel nfsd
Version:1.2.3
-Release:14
+Release:15
Group: Productivity/Networking/NFS
License:GPLv2+
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -276,7 +276,7 @@
%{_mandir}/man8/mountstats.8.gz
%{_mandir}/man8/nfsiostat.8.gz
/var/adm/fillup-templates/sysconfig.nfs
-%attr(0700,statd,nogroup) %dir /var/lib/nfs
+%attr(0711,statd,nogroup) %dir /var/lib/nfs
%dir /var/lib/nfs/rpc_pipefs
%dir /var/lib/nfs/v4recovery
%attr(0700,statd,nogroup) %dir /var/lib/nfs/sm
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
