rpms/krb5/devel krb5.spec,1.157,1.158 krb5-1.4-null.patch,1.1,NONE

[Nalin Somabhai Dahyabhai (nalin)]

Author: nalin

Update of /cvs/pkgs/rpms/krb5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3054

Modified Files:
	krb5.spec 
Removed Files:
	krb5-1.4-null.patch 
Log Message:
- remove a patch to fix problems with interfaces which are "up" but which
  have no address assigned which conflicted with a change to fix the same
  problem in 1.5 (#200979)



Index: krb5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- krb5.spec	25 Feb 2008 19:50:42 -0000	1.157
+++ krb5.spec	25 Feb 2008 19:58:51 -0000	1.158
@@ -63,7 +63,6 @@
 Patch16: krb5-1.6-buildconf.patch
 Patch18: krb5-1.2.7-reject-bad-transited.patch
 Patch23: krb5-1.3.1-dns.patch
-Patch25: krb5-1.4-null.patch
 Patch26: krb5-1.3.2-efence.patch
 Patch27: krb5-1.3.3-rcp-sendlarge.patch
 Patch29: krb5-1.3.5-kprop-mktemp.patch
@@ -228,6 +227,11 @@
 
 %changelog
 * Mon Feb 25 2008 Nalin Dahyabhai <nalin at redhat.com>
+- remove a patch, to fix problems with interfaces which are "up" but which
+  have no address assigned, which conflicted with a different fix for the same
+  problem in 1.5 (#200979)
+
+* Mon Feb 25 2008 Nalin Dahyabhai <nalin at redhat.com>
 - ftp: don't lose track of a descriptor on passive get when the server fails to
   open a file
 
@@ -1283,7 +1287,6 @@
 %patch16 -p1 -b .buildconf
 %patch18 -p1 -b .reject-bad-transited
 %patch23 -p1 -b .dns
-%patch25 -p1 -b .null
 # Removes a malloc(0) case, nothing more.
 # %patch26 -p1 -b .efence
 %patch27 -p1 -b .rcp-sendlarge


--- krb5-1.4-null.patch DELETED ---