From 78917d4e0d4a8f936937fe75217e34b90ca2be5eafb9c14ff80702b278ddb961 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 27 Feb 2007 08:10:11 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nfs-utils?expand=0&rev=4 --- nfs-utils-1.0.10.tar.bz2 | 3 --- nfs-utils-1.0.12.tar.bz2 | 3 +++ nfs-utils-1.0.7-bind-syntax.patch | 22 +++++++--------------- nfs-utils-anon-uid32.patch | 16 ---------------- nfs-utils-gssd-select-ccache.patch | 27 +++++++++++---------------- nfs-utils.changes | 11 +++++++++++ nfs-utils.spec | 28 +++++++++++++--------------- 7 files changed, 45 insertions(+), 65 deletions(-) delete mode 100644 nfs-utils-1.0.10.tar.bz2 create mode 100644 nfs-utils-1.0.12.tar.bz2 delete mode 100644 nfs-utils-anon-uid32.patch diff --git a/nfs-utils-1.0.10.tar.bz2 b/nfs-utils-1.0.10.tar.bz2 deleted file mode 100644 index fb1ca51..0000000 --- a/nfs-utils-1.0.10.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f06f4aa1053e60738c7bd09132a4a99047a97e91f334a01d8dab5af3688bee68 -size 528352 diff --git a/nfs-utils-1.0.12.tar.bz2 b/nfs-utils-1.0.12.tar.bz2 new file mode 100644 index 0000000..6e46558 --- /dev/null +++ b/nfs-utils-1.0.12.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:899844fd86f8b5b2a1a606be3adbc4645d2118e2d56a390028eef6272f0dcc4c +size 548247 diff --git a/nfs-utils-1.0.7-bind-syntax.patch b/nfs-utils-1.0.7-bind-syntax.patch index 3342282..c616101 100644 --- a/nfs-utils-1.0.7-bind-syntax.patch +++ b/nfs-utils-1.0.7-bind-syntax.patch @@ -1,21 +1,13 @@ support/export/export.c | 2 support/include/misc.h | 3 support/include/nfslib.h | 1 - support/misc/mountpoint.c | 158 +++++++++++++++++++++++++++++++++++++++++++++- - support/nfs/exports.c | 7 ++ - utils/mountd/cache.c | 11 +-- - utils/mountd/mountd.c | 7 +- - utils/mountd/mountd.h | 9 ++ - 8 files changed, 187 insertions(+), 11 deletions(-) - -Index: nfs-utils-1.0.7/support/nfs/exports.c -=================================================================== ---- nfs-utils-1.0.7.orig/support/nfs/exports.c -+++ nfs-utils-1.0.7/support/nfs/exports.c -@@ -435,6 +435,8 @@ bad_option: - ep->e_mountpoint = strdup(mp+1); - else - ep->e_mountpoint = strdup(""); +================================================================================ +--- nfs-utils-1.0.12/support/nfs/exports.c ++++ nfs-utils-1.0.12/support/nfs/exports.c +@@ -522,6 +522,8 @@ + } else if (strncmp(opt, "replicas=", 9) == 0) { + ep->e_fslocmethod = FSLOC_REPLICA; + ep->e_fslocdata = strdup(opt+9); + } else if (strncmp(opt, "bind=/", 6) == 0) { + /* ignore this for now */ } else { diff --git a/nfs-utils-anon-uid32.patch b/nfs-utils-anon-uid32.patch deleted file mode 100644 index f7b3924..0000000 --- a/nfs-utils-anon-uid32.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: nfs-utils-1.0.6/utils/exportfs/exportfs.c -=================================================================== ---- nfs-utils-1.0.6.orig/utils/exportfs/exportfs.c 2004-06-24 12:42:44.000000000 +0200 -+++ nfs-utils-1.0.6/utils/exportfs/exportfs.c 2004-06-24 12:44:43.000000000 +0200 -@@ -399,9 +399,9 @@ - c = dumpopt(c, "mapping=ugidd"); - else if (ep->e_maptype == CLE_MAP_FILE) - c = dumpopt(c, "mapping=file"); -- if (ep->e_anonuid != -2) -+ if (ep->e_anonuid != 65534) - c = dumpopt(c, "anonuid=%d", ep->e_anonuid); -- if (ep->e_anongid != -2) -+ if (ep->e_anongid != 65534) - c = dumpopt(c, "anongid=%d", ep->e_anongid); - - printf("%c\n", (c != '(')? ')' : ' '); diff --git a/nfs-utils-gssd-select-ccache.patch b/nfs-utils-gssd-select-ccache.patch index 2f8e3c1..983a1ab 100644 --- a/nfs-utils-gssd-select-ccache.patch +++ b/nfs-utils-gssd-select-ccache.patch @@ -1,16 +1,11 @@ - utils/gssd/krb5_util.c | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletion(-) - -Index: nfs-utils-1.0.7/utils/gssd/krb5_util.c -=================================================================== ---- nfs-utils-1.0.7.orig/utils/gssd/krb5_util.c -+++ nfs-utils-1.0.7/utils/gssd/krb5_util.c -@@ -193,7 +195,7 @@ gssd_find_existing_krb5_ccache(uid_t uid - snprintf(statname, sizeof(statname), - "%s/%s", GSSD_DEFAULT_CRED_DIR, - namelist[i]->d_name); -- if (stat(statname, &tmp_stat)) { -+ if (lstat(statname, &tmp_stat)) { - printerr(0, "Error doing stat " - "on file '%s'\n", - statname); +--- nfs-utils-1.0.12/utils/gssd/krb5_util.c ++++ nfs-utils-1.0.12/utils/gssd/krb5_util.c +@@ -191,7 +191,7 @@ + namelist[i]->d_name); + snprintf(statname, sizeof(statname), + "%s/%s", ccachedir, namelist[i]->d_name); +- if (stat(statname, &tmp_stat)) { ++ if (lstat(statname, &tmp_stat)) { + printerr(0, "Error doing stat on file '%s'\n", + statname); + free(namelist[i]); diff --git a/nfs-utils.changes b/nfs-utils.changes index 6c12015..629ca67 100644 --- a/nfs-utils.changes +++ b/nfs-utils.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Feb 27 08:52:29 CET 2007 - ro@suse.de + +- update to 1.0.12 + - Fix -n option to mountd + - Document sensitive gids +- upstreamed patches deleted: + nfs-utils-anon-uid32.patch +- added e2fsprogs-devel (for libblkid) +- nhfsXXX binaries and manpages have been removed upstream + ------------------------------------------------------------------- Thu Jan 11 12:25:25 CET 2007 - ro@suse.de diff --git a/nfs-utils.spec b/nfs-utils.spec index 91ec747..f7958d5 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -1,5 +1,5 @@ # -# spec file for package nfs-utils (Version 1.0.10) +# spec file for package nfs-utils (Version 1.0.12) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,11 +11,11 @@ # norootforbuild Name: nfs-utils -BuildRequires: gcc-c++ krb5-devel libevent librpcsecgss nfsidmap openldap2-devel pkgconfig tcpd-devel +BuildRequires: e2fsprogs-devel gcc-c++ krb5-devel libevent librpcsecgss nfsidmap openldap2-devel pkgconfig tcpd-devel URL: http://nfs.sourceforge.net Summary: Support Utilities for Kernel nfsd -Version: 1.0.10 -Release: 31 +Version: 1.0.12 +Release: 1 Group: Productivity/Networking/NFS Obsoletes: knfsd linuxnfs nfsutils Provides: knfsd linuxnfs nfsutils @@ -36,7 +36,6 @@ Source15: svcgssd.init Source16: nfsserver.xml Patch1: nfs-utils-nsm.patch Patch2: nfs-utils-largefiles.patch -Patch3: nfs-utils-anon-uid32.patch Patch4: nfs-utils-noroot.patch Patch5: nfs-utils-gssd-select-ccache.patch Patch6: nfs-utils-krb5.patch @@ -58,7 +57,6 @@ Authors: %setup -q -a 1 %patch1 %patch2 -p1 -%patch3 -p1 %patch4 %patch5 -p1 %patch6 @@ -145,10 +143,6 @@ rm -rf $RPM_BUILD_ROOT /usr/sbin/gss_destroy_creds /usr/sbin/nfsstat /usr/sbin/showmount -/usr/sbin/nhfsstone -/usr/sbin/nhfsrun -/usr/sbin/nhfsnums -/usr/sbin/nhfsgraph /usr/sbin/rcnfsserver /usr/sbin/rcidmapd /usr/sbin/rcgssd @@ -173,10 +167,6 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man7/nfsd.7.gz %{_mandir}/man8/exportfs.8.gz %{_mandir}/man8/nfsstat.8.gz -%{_mandir}/man8/nhfsstone.8.gz -%{_mandir}/man8/nhfsrun.8.gz -%{_mandir}/man8/nhfsnums.8.gz -%{_mandir}/man8/nhfsgraph.8.gz %{_mandir}/man8/showmount.8.gz %{_mandir}/man8/mountd.8.gz %{_mandir}/man8/rpc.gssd.8.gz @@ -192,7 +182,15 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/rpc.svcgssd.8.gz %{_mandir}/man8/rpcdebug.8.gz -%changelog -n nfs-utils +%changelog +* Tue Feb 27 2007 - ro@suse.de +- update to 1.0.12 + - Fix -n option to mountd + - Document sensitive gids +- upstreamed patches deleted: + nfs-utils-anon-uid32.patch +- added e2fsprogs-devel (for libblkid) +- nhfsXXX binaries and manpages have been removed upstream * Thu Jan 11 2007 - ro@suse.de - moved omc xml file to /usr/share/omc and removed config tag * Mon Jan 08 2007 - ro@suse.de