rpms/which/devel which-2.19-afs.patch, NONE, 1.1 which.spec, 1.21, 1.22 which-2.13-afs.patch, 1.2, NONE which-2.14-broken.patch, 1.2, NONE which-2.18-direntry.patch, 1.1, NONE

[Than Ngo (than)]

Author: than

Update of /cvs/extras/rpms/which/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2975

Modified Files:
	which.spec 
Added Files:
	which-2.19-afs.patch 
Removed Files:
	which-2.13-afs.patch which-2.14-broken.patch 
	which-2.18-direntry.patch 
Log Message:
2.19, fix #399551, #430159


which-2.19-afs.patch:

--- NEW FILE which-2.19-afs.patch ---
diff -up which-2.19/bash.c.afs which-2.19/bash.c
--- which-2.19/bash.c.afs	2008-01-18 19:03:40.000000000 +0100
+++ which-2.19/bash.c	2008-01-25 11:41:14.000000000 +0100
@@ -34,7 +34,6 @@
  */
 #define HAVE_GETGROUPS
 #undef SHELL
-#undef AFS
 #undef NOGROUP
 
 /*
@@ -251,7 +250,7 @@ file_status (char const* name)
 
   r = FS_EXISTS;
 
-#if defined (AFS)
+  if (getenv("AFS")) {
   /* We have to use access(2) to determine access because AFS does not
      support Unix file system semantics.  This may produce wrong
      answers for non-AFS files when ruid != euid.  I hate AFS. */
@@ -261,8 +260,9 @@ file_status (char const* name)
     r |= FS_READABLE;
 
   return r;
-#else /* !AFS */
-
+  }
+  else /* !AFS */
+  {
   /* Find out if the file is actually executable.  By definition, the
      only other criteria is that the file has an execute bit set that
      we can use.  The same with whether or not a file is readable. */
@@ -305,7 +305,7 @@ file_status (char const* name)
     }
 
   return r;
-#endif /* !AFS */
+  } /* !AFS */
 }
 
 /* From bash-3.2 / general.c / line 534 ; Changes: Using 'strchr' instead of 'xstrchr'. */


Index: which.spec
===================================================================
RCS file: /cvs/extras/rpms/which/devel/which.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- which.spec	27 Nov 2007 22:50:02 -0000	1.21
+++ which.spec	25 Jan 2008 10:56:15 -0000	1.22
@@ -1,16 +1,14 @@
 Summary: Displays where a particular program in your path is located
 Name: which
-Version: 2.18
-Release: 5%{?dist}
-License: GPLv2
+Version: 2.19
+Release: 1%{?dist}
+License: GPLv3
 Group: Applications/System
 Source0: http://www.xs4all.nl/~carlo17/which/%{name}-%{version}.tar.gz
 Source1: which2.sh
 Source2: which2.csh
 Url: http://www.xs4all.nl/~carlo17/which/
-Patch: which-2.13-afs.patch
-Patch1: which-2.14-broken.patch
-Patch2: which-2.18-direntry.patch
+Patch: which-2.19-afs.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(preun): /sbin/install-info
 Requires(post): /sbin/install-info
@@ -23,8 +21,6 @@
 %setup -q
 
 %patch -p1 -b .afs
-%patch1 -p1 -b .broken
-%patch2 -p1 -b .direntry
 
 %build
 %configure
@@ -60,6 +56,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Fri Jan 25 2008 Than Ngo <than at redhat.com> 2.19-1
+- 2.19, fix #399551, #430159
+
 * Tue Nov 27 2007 Than Ngo <than at redhat.com> - 2.18-5
 - fix permission which-2 scripts
 


--- which-2.13-afs.patch DELETED ---


--- which-2.14-broken.patch DELETED ---


--- which-2.18-direntry.patch DELETED ---