From 0c2dcfe3ef2d9d62ddfbd59e754e9d22c10ceb43 Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@dahyabhai.net>
Date: Mon, 25 Feb 2013 12:42:58 -0500
Subject: [PATCH] update to 1.11.1

update to 1.11.1
- drop patch for noticing negative timeouts being passed to the poll()
  wrapper in the client transmit functions
---
 krb5-1.10.3-timeout_over.patch | 17 -----------------
 krb5.spec                      | 13 ++++++++-----
 sources                        |  4 ++--
 3 files changed, 10 insertions(+), 24 deletions(-)
 delete mode 100644 krb5-1.10.3-timeout_over.patch

diff --git a/krb5-1.10.3-timeout_over.patch b/krb5-1.10.3-timeout_over.patch
deleted file mode 100644
index 138dc74..0000000
--- a/krb5-1.10.3-timeout_over.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-When wrapping poll(), if we compute a negative timeout, just return a
-no-results status, as the krb5int_cm_call_select() wrapper for select()
-does.  Based on a patch by Filip Krska.
-
---- krb5/src/lib/krb5/os/sendto_kdc.c
-+++ krb5/src/lib/krb5/os/sendto_kdc.c
-@@ -523,6 +523,10 @@ cm_select_or_poll(const struct select_st
-             return e;
-         timeout = (in->end_time.tv_sec - now.tv_sec) * 1000 +
-             (in->end_time.tv_usec - now.tv_usec) / 1000;
-+        if (timeout < 0) {
-+            *sret = 0;
-+            return 0;
-+        }
-     }
-     /* We don't need a separate copy of the selstate for poll, but use one
-      * anyone for consistency with the select wrapper. */
diff --git a/krb5.spec b/krb5.spec
index 51e3acb..9be3ff5 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -29,10 +29,10 @@
 
 Summary: The Kerberos network authentication system
 Name: krb5
-Version: 1.11
-Release: 2%{?dist}
+Version: 1.11.1
+Release: 1%{?dist}
 # Maybe we should explode from the now-available-to-everybody tarball instead?
-# http://web.mit.edu/kerberos/dist/krb5/1.11/krb5-1.11-signed.tar
+# http://web.mit.edu/kerberos/dist/krb5/1.11/krb5-1.11.1-signed.tar
 Source0: krb5-%{version}.tar.gz
 Source1: krb5-%{version}.tar.gz.asc
 Source2: kprop.service
@@ -69,7 +69,6 @@ Patch71: krb5-1.11-dirsrv-accountlock.patch
 Patch75: krb5-pkinit-debug.patch
 Patch86: krb5-1.9-debuginfo.patch
 Patch105: krb5-kvno-230379.patch
-Patch112: krb5-1.10.3-timeout_over.patch
 Patch113: krb5-1.11-alpha1-init.patch
 
 License: MIT
@@ -279,7 +278,6 @@ ln -s NOTICE LICENSE
 #%patch75 -p1 -b .pkinit-debug
 %patch86 -p0 -b .debuginfo
 %patch105 -p1 -b .kvno
-%patch112 -p1 -b .timeout_over
 %patch113 -p1 -b .init
 
 # Take the execute bit off of documentation.
@@ -791,6 +789,11 @@ exit 0
 %{_sbindir}/uuserver
 
 %changelog
+* Mon Feb 25 2013 Nalin Dahyabhai <nalin@redhat.com> 1.11.1-1
+- update to 1.11.1
+  - drop patch for noticing negative timeouts being passed to the poll()
+    wrapper in the client transmit functions
+
 * Fri Feb  8 2013 Nalin Dahyabhai <nalin@redhat.com> 1.11-2
 - set "rdns = false" in the default krb5.conf (#908323)
 
diff --git a/sources b/sources
index 63c1c34..9f18fe1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-7a73b849ced0db9dd2ed06dea9bb1972  krb5-1.11.tar.gz
-d8bf98a15d37105b5a8e14c5e2dbe53e  krb5-1.11.tar.gz.asc
+4d72b65955d9db5810c80adff850d660  krb5-1.11.1.tar.gz
+a00d0c39e8d9b4ab8c726c8cada82a44  krb5-1.11.1.tar.gz.asc