First step toward upgrading to the new 1.0.7 version

.cvsignore

@@ -5,3 +5,6 @@ nfsidmap-0.1.tar.gz
 nfsidmap-0.5.tar.gz
 libgssapi-0.1.tar.gz
 librpcsecgss-0.1.tar.gz
+nfs-utils-1.0.7.tar.gz
+libevent-1.0b.tar.gz
+nfsidmap-0.10.tar.gz

nfs-utils.spec

@@ -1,22 +1,22 @@
 Summary: NFS utlilities and supporting daemons for the kernel NFS server.
 Name: nfs-utils
-Version: 1.0.6
+Version: 1.0.7
-Release: 53
+Release: 0
 
 # group all 32bit related archs
 %define all_32bit_archs i386 i686 athlon
 
-Source0: http://prdownloads.sourceforge.net/nfs/nfs-utils-1.0.6.tar.gz
+Source0: http://unc.dl.sourceforge.net/sourceforge/nfs/nfs-utils-1.0.7.tar.gz
 Source1: ftp://nfs.sourceforge.net/pub/nfs/nfs.doc.tar.gz
 
-%define idmapvers 0.5
+%define idmapvers 0.10
 Source2: http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/nfsidmap-%{idmapvers}.tar.gz
-%define eventvers 0.9
+%define eventvers 1.0b
 Source3: http://monkey.org/~provos/libevent-%{eventvers}.tar.gz
-%define gssapivers 0.1
-Source4: http://www.citi.umich.edu/projects/nfsv4/linux/libgssapi/libgssapi-%{gssapivers}.tar.gz
 %define rpcsecgss 0.1
-Source5: http://www.citi.umich.edu/projects/nfsv4/linux/librpcsecgss/librpcsecgss-%{rpcsecgss}.tar.gz 
+Source4: http://www.citi.umich.edu/projects/nfsv4/linux/librpcsecgss/librpcsecgss-%{rpcsecgss}.tar.gz 
+#%define gssapivers 0.1
+#Source4: http://www.citi.umich.edu/projects/nfsv4/linux/libgssapi/libgssapi-%{gssapivers}.tar.gz
 
 Source10: nfs.init
 Source11: nfslock.init
@@ -24,33 +24,21 @@ Source12: rpcidmapd.init
 Source13: rpcgssd.init
 Source14: rpcsvcgssd.init
 
-#
-# Upstream Patches
-#
-Patch1: nfs-utils-1-0-6-post1.patch
-Patch2: nfs-utils-1-0-6-post2.patch
-Patch3: nfs-utils-1-0-6-post3.patch
-Patch4: nfs-utils-1-0-6-post4.patch
-Patch5: nfs-utils-1-0-6-post5.patch
-Patch6: nfs-utils-1-0-6-post6.patch
-Patch7: nfs-utils-1-0-6-post7.patch
-Patch8: nfs-utils-1-0-6-post8.patch
-
 #
 # CITI NFS4 Patches (nfs-utils-1.0.6-23)
 #
-Patch20: nfs-utils-1.0.6-citi-rpcdebug.patch
+#Patch20: nfs-utils-1.0.6-citi-rpcdebug.patch
-Patch21: nfs-utils-1.0.6-citi-svcgssd_memleak_fix.patch
+#Patch21: nfs-utils-1.0.6-citi-svcgssd_memleak_fix.patch
-Patch22: nfs-utils-1.0.6-citi-svcgssd_remove_NOGROUPS.patch
+#Patch22: nfs-utils-1.0.6-citi-svcgssd_remove_NOGROUPS.patch
-Patch23: nfs-utils-1.0.6-citi-idmapd_remove_mapping_related_options.patch
+#Patch23: nfs-utils-1.0.6-citi-idmapd_remove_mapping_related_options.patch
-Patch24: nfs-utils-1.0.6-citi-update_idmapd.patch
+#Patch24: nfs-utils-1.0.6-citi-update_idmapd.patch
-Patch25: nfs-utils-1.0.6-citi-idmapd_let_libnfsidmap_parse_conf_file.patch
+#Patch25: nfs-utils-1.0.6-citi-idmapd_let_libnfsidmap_parse_conf_file.patch
-Patch26: nfs-utils-1.0.6-citi-mountd_flavors.patch
+#Patch26: nfs-utils-1.0.6-citi-mountd_flavors.patch
-Patch27: nfs-utils-1.0.6-citi-gssd_downcall_err_reporting.patch
+#Patch27: nfs-utils-1.0.6-citi-gssd_downcall_err_reporting.patch
-Patch28: nfs-utils-1.0.6-citi-gssd_restore_euid_on_failure.patch
+#Patch28: nfs-utils-1.0.6-citi-gssd_restore_euid_on_failure.patch
-Patch29: nfs-utils-1.0.6-citi-svcgssd-princ-to-uid.patch
+#Patch29: nfs-utils-1.0.6-citi-svcgssd-princ-to-uid.patch
-Patch30: nfs-utils-1.0.6-citi-use_libgssapi.patch
+#Patch30: nfs-utils-1.0.6-citi-use_libgssapi.patch
-Patch31: nfs-utils-1.0.6-citi-use_librpcsecgss.patch
+#Patch31: nfs-utils-1.0.6-citi-use_librpcsecgss.patch
 
 #
 # Local Patches
@@ -59,16 +47,14 @@ Patch50: nfs-utils-1.0.5-statdpath.patch
 Patch51: nfs-utils-1.0.6-zerostats.patch
 Patch52: nfs-utils-1.0.6-mountd.patch
 Patch53: nfs-utils-1.0.6-expwarn.patch
-Patch54: nfs-utils-1.0.6-export-permisions.patch
+Patch54: nfs-utils-1.0.7-sgi-statd-fixes.patch
-Patch55: nfs-utils-1.0.6-sgi-statd-fixes.patch
+Patch55: nfs-utils-1.0.6-fd-sig-cleanup.patch
-Patch56: nfs-utils-1.0.6-fd-sig-cleanup.patch
+Patch56: nfs-utils-1.0.6-idmap-syslog.patch
-Patch57: nfs-utils-1.0.6-idmap-syslog.patch
+Patch57: nfs-utils-1.0.6-idmap.conf.patch
-Patch58: nfs-utils-1.0.6-idmap.conf.patch
+Patch58: nfs-utils-1.0.6-rquotad-overflow.patch
-Patch59: nfs-utils-1.0.6-rquotad-overflow.patch
+Patch59: nfs-utils-1.0.6-statd-notify-hostname.patch
-Patch60: nfs-utils-1.0.6-statd-notify-hostname.patch
-Patch61: nfs-utils-1.0.6-idmap-event.patch
 
-Patch100: nfs-utils-1.0.6-compile.patch
+Patch100: nfs-utils-1.0.7-compile.patch
 Patch150: nfs-utils-1.0.6-pie.patch
 
 Group: System Environment/Daemons
@@ -86,7 +72,7 @@ License: GPL
 Buildroot: %{_tmppath}/%{name}-root
 Requires: kernel >= 2.2.14, portmap >= 4.0, sed, gawk, sh-utils, fileutils, textutils, grep
 Requires: modutils >= 2.4.26-9
-BuildRequires: krb5-devel >= 1.3.1 autoconf >= 2.57
+BuildRequires: krb5-devel >= 1.3.1 autoconf >= 2.57 openldap-devel >= 2.2
 Prereq: /sbin/chkconfig /usr/sbin/useradd /sbin/nologin
 
 %description
@@ -100,49 +86,47 @@ System) server on the remote host.  For example, showmount can display the
 clients which are mounted on that host.
 
 %prep
-%setup -q -a1 -a2 -a3 -a4 -a5
+%setup -q -a1 -a2 -a3 -a4
 #
 # Set up the support libs
 #
 mv nfsidmap-%{idmapvers} support/nfsidmap
 mv libevent-%{eventvers} support/event
-mv libgssapi-%{gssapivers} support/gssapi
 mv librpcsecgss-%{rpcsecgss} support/rpcsecgss
+#mv libgssapi-%{gssapivers} support/gssapi
 
-%patch1 -p1
+#%patch1 -p1
-%patch2 -p1
+#%patch2 -p1
-%patch3 -p1
+#%patch3 -p1
-%patch4 -p1
+#%patch4 -p1
-%patch5 -p1
+#%patch5 -p1
-%patch6 -p1
+#%patch6 -p1
-%patch7 -p1
+#%patch7 -p1
-%patch8 -p1
+#%patch8 -p1
 
-%patch20 -p1
+#%patch20 -p1
-%patch21 -p1
+#%patch21 -p1
-%patch22 -p1 
+#%patch22 -p1 
-%patch23 -p1 
+#%patch23 -p1 
-%patch24 -p1 
+#%patch24 -p1 
-%patch25 -p1 
+#%patch25 -p1 
-%patch26 -p1 
+#%patch26 -p1 
-%patch27 -p1 
+#%patch27 -p1 
-%patch28 -p1 
+#%patch28 -p1 
-%patch29 -p1 
+#%patch29 -p1 
-%patch30 -p1 
+#%patch30 -p1 
-%patch31 -p1 
+#%patch31 -p1 
 
 %patch50 -p1 -b .statdpath
 %patch51 -p1 -b .zerostats
 %patch52 -p1 -b .mountd
 %patch53 -p1 -b .expwarn
-%patch54 -p1 -b .expperms
+%patch54 -p1 -b .sgi
-%patch55 -p1 -b .sgi
+%patch55 -p1 -b .cleanup
-%patch56 -p1 -b .cleanup
+%patch56 -p1 -b .syslog
-%patch57 -p1 -b .syslog
+%patch57 -p1 -b .conf
-%patch58 -p1 -b .conf
+%patch58 -p1 -b .overflow
-%patch59 -p1 -b .overflow
+%patch59 -p1 -b .notify
-%patch60 -p1 -b .notify
-%patch61 -p1 -b .event
 
 
 # Do the magic to get things to compile
@@ -165,7 +149,7 @@ ac_cv_func_innetgr=yes \
 
 cd support/nfsidmap; %configure --prefix=$RPM_BUILD_ROOT
 cd ../../support/event; %configure --prefix=$RPM_BUILD_ROOT
-cd ../../support/gssapi; %configure --prefix=$RPM_BUILD_ROOT
+#cd ../../support/gssapi; %configure --prefix=$RPM_BUILD_ROOT
 cd ../../support/rpcsecgss; %configure --prefix=$RPM_BUILD_ROOT
 cd ../../
 

sources

@@ -1,7 +1,4 @@
-1287b2a3021215ad8fb33f326f3b1930  libevent-0.9.tar.gz
+8f863120261cd572ad320a9152581e11  nfs-utils-1.0.7.tar.gz
-f17e9983457e1cf61c37f0be4493fce6  nfs-utils-1.0.6.tar.gz
+d2970ee6089f92e15181018b31b5cd74  libevent-1.0b.tar.gz
-ae7db9c61c5ad04f83bb99e5caed73da  nfs.doc.tar.gz
+7f72edd613b8ca30f0dfcc401b0b96a4  nfsidmap-0.10.tar.gz
-0df1b20e185dee83cc2a59e1a434f9d1  nfsidmap-0.1.tar.gz
-8033b61787c45cd04d71ff68f206fc2c  nfsidmap-0.5.tar.gz
-6e37f3d1366fee219fd714e5f30b7649  libgssapi-0.1.tar.gz
 74bfa65a320b1db241d5e91043fa4123  librpcsecgss-0.1.tar.gz