diff options
| author | Nalin Dahyabhai <nalin@redhat.com> | 2011-03-18 13:23:22 -0400 |
|---|---|---|
| committer | Nalin Dahyabhai <nalin@redhat.com> | 2011-03-18 13:23:22 -0400 |
| commit | 27e969332f18cbc95fb0b1daf887ef7e31072740 (patch) | |
| tree | 93ff8b9a4937890f3ab38fe9aa0b43191ceaf855 | |
| parent | 41bc7a0e629d558fe3f7957fa29ec9e7f9c1463a (diff) | |
| download | krb5-27e969332f18cbc95fb0b1daf887ef7e31072740.tar.gz krb5-27e969332f18cbc95fb0b1daf887ef7e31072740.tar.xz krb5-27e969332f18cbc95fb0b1daf887ef7e31072740.zip | |
- backport change from SVN to fix a computed-value-not-used warning in
kpropd (#684065)
| -rw-r--r-- | krb5-1.9-paren.patch | 13 | ||||
| -rw-r--r-- | krb5.spec | 8 |
2 files changed, 20 insertions, 1 deletions
diff --git a/krb5-1.9-paren.patch b/krb5-1.9-paren.patch new file mode 100644 index 0000000..1332f77 --- /dev/null +++ b/krb5-1.9-paren.patch @@ -0,0 +1,13 @@ +Upstream commit #24477. +diff -up krb5-1.9/src/slave/kpropd.c krb5-1.9/src/slave/kpropd.c +--- krb5-1.9/src/slave/kpropd.c 2011-03-18 13:14:24.020999947 -0400 ++++ krb5-1.9/src/slave/kpropd.c 2011-03-18 13:14:34.159999947 -0400 +@@ -993,7 +993,7 @@ unsigned int backoff_from_master(int *cn + btime = (unsigned int)(2<<(*cnt)); + if (btime > MAX_BACKOFF) { + btime = MAX_BACKOFF; +- *cnt--; ++ (*cnt)--; + } + + return (btime); @@ -6,7 +6,7 @@ Summary: The Kerberos network authentication system Name: krb5 Version: 1.9 -Release: 7%{?dist} +Release: 8%{?dist} # Maybe we should explode from the now-available-to-everybody tarball instead? # http://web.mit.edu/kerberos/dist/krb5/1.9/krb5-1.9-signed.tar Source0: krb5-%{version}.tar.gz @@ -53,6 +53,7 @@ Patch73: http://web.mit.edu/kerberos/advisories/2011-001-patch.txt Patch74: http://web.mit.edu/kerberos/advisories/2011-002-patch.txt Patch75: krb5-pkinit-debug.patch Patch76: http://web.mit.edu/kerberos/advisories/2011-003-patch.txt +Patch77: krb5-1.9-paren.patch License: MIT URL: http://web.mit.edu/kerberos/www/ @@ -197,6 +198,7 @@ ln -s NOTICE LICENSE %patch74 -p1 -b .2011-002 #%patch75 -p1 -b .pkinit-debug %patch76 -p1 -b .2011-003 +%patch77 -p1 -b .paren gzip doc/*.ps sed -i -e '1s!\[twoside\]!!;s!%\(\\usepackage{hyperref}\)!\1!' doc/api/library.tex @@ -655,6 +657,10 @@ exit 0 %{_sbindir}/uuserver %changelog +* Fri Mar 18 2011 Nalin Dahyabhai <nalin@redhat.com> 1.9-8 +- backport change from SVN to fix a computed-value-not-used warning in + kpropd (#684065) + * Tue Mar 15 2011 Nalin Dahyabhai <nalin@redhat.com> 1.9-7 - turn off NSS as the backend for libk5crypto for now to work around its DES string2key not working (#679012) |