[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/am-utils/devel am-utils-6.1.5-nfs-version.patch, NONE, 1.1 am-utils-6.1.5-rmtab-temp.patch, NONE, 1.1 am-utils.spec, 1.38, 1.39



Author: kzak

Update of /cvs/dist/rpms/am-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20716

Modified Files:
	am-utils.spec 
Added Files:
	am-utils-6.1.5-nfs-version.patch 
	am-utils-6.1.5-rmtab-temp.patch 
Log Message:
- fix critical bug


am-utils-6.1.5-nfs-version.patch:
 mount/mount_linux.c       |    2 +-
 nfs_prot/nfs_prot_linux.h |    7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

--- NEW FILE am-utils-6.1.5-nfs-version.patch ---
--- am-utils-6.1.5/conf/mount/mount_linux.c.kzak	2006-08-24 15:59:24.000000000 +0200
+++ am-utils-6.1.5/conf/mount/mount_linux.c	2006-08-24 15:59:32.000000000 +0200
@@ -277,7 +277,7 @@
   int errorcode;
 
   /* Fake some values for linux */
-  mnt_data->version = NFS_MOUNT_VERSION;
+  mnt_data->version = AMD_NFS_MOUNT_VERSION;
   if (!mnt_data->timeo) {
 #ifdef MNT2_NFS_OPT_TCP
     if (mnt_data->flags & MNT2_NFS_OPT_TCP)
--- am-utils-6.1.5/conf/nfs_prot/nfs_prot_linux.h.kzak	2006-08-24 15:55:02.000000000 +0200
+++ am-utils-6.1.5/conf/nfs_prot/nfs_prot_linux.h	2006-08-24 15:58:27.000000000 +0200
@@ -241,6 +241,13 @@
   u_char	data[FHSIZE3];
 };
 
+/* version of our nsf_mount_data struct
+ * -- we cannot use NFS_MOUNT_VERSION from system kernel 
+ *    headers, because there could version that doesn't 
+ *    match with nfs_args struct.
+ */
+#define AMD_NFS_MOUNT_VERSION	4
+
 struct nfs_args {
   int			version;	/* 1 */
   int			fd;		/* 1 */

am-utils-6.1.5-rmtab-temp.patch:
 fixrmtab.in |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE am-utils-6.1.5-rmtab-temp.patch ---
diff -ur am-utils-6.1.5.orig/scripts/fixrmtab.in am-utils-6.1.5/scripts/fixrmtab.in
--- am-utils-6.1.5.orig/scripts/fixrmtab.in	2006-08-18 16:24:53.000000000 -0400
+++ am-utils-6.1.5/scripts/fixrmtab.in	2006-08-18 16:31:12.000000000 -0400
@@ -11,7 +11,10 @@
 #set -x
 
 RMTAB=/etc/rmtab
-TMP=/tmp/rmtab.$$
+TMP=`mktemp /tmp/rmtab.XXXXXXXX`
+if [ x"$TMP" = "x" ] ; then
+	exit 1
+fi
 
 if [ ! -f /etc/rmtab ]; then
 	exit 0


Index: am-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/am-utils/devel/am-utils.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- am-utils.spec	12 Jul 2006 20:13:00 -0000	1.38
+++ am-utils.spec	24 Aug 2006 14:08:49 -0000	1.39
@@ -1,7 +1,7 @@
 Summary: Automount utilities including an updated version of Amd.
 Name: am-utils
 Version: 6.1.5
-Release: 3
+Release: 4
 License: BSD
 Epoch: 5
 Group: System Environment/Daemons
@@ -17,6 +17,11 @@
 Prereq: /sbin/install-info, /sbin/chkconfig, grep
 Obsoletes: amd
 
+# 203193 - tmpfile usage
+Patch1: am-utils-6.1.5-rmtab-temp.patch
+# 202180 - amd service doesn't work
+Patch2: am-utils-6.1.5-nfs-version.patch
+
 # We need to filter out some perl requirements for now.
 %define _use_internal_dependency_generator 0
 %define old_find_requires %{__find_requires}
@@ -35,6 +40,8 @@
 %prep
 %setup -q
 
+%patch1 -p1
+%patch2 -p1
 
 find_requires=%{old_find_requires}
 echo "$find_requires | grep -v lostaltmail.conf" > find-requires
@@ -129,6 +136,10 @@
 %{_libdir}/libamu.so*
 
 %changelog
+* Tue Aug 24 2006 Karel Zak <kzak redhat com> 5:6.1.5-4
+- fix #203193 - tmpfile usage
+- fix #202180 - amd service doesn't work
+
 * Wed Jul 12 2006 Jesse Keating <jkeating redhat com> - 5:6.1.5-3
 - rebuild
 - Add missing br flex


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]