[krb5] * Tue Sep 30 2014 Roland Mainz <rmainz at redhat.com> - 1.13-0.alpha1.3 - fix build failure caused by c

Roland Mainz gisburn at fedoraproject.org
Tue Sep 30 10:31:09 UTC 2014


commit 210ae0a2c1ee90b2e5dfa66d02eba895143e414c
Author: Roland Mainz <rmainz at redhat.com>
Date:   Tue Sep 30 12:09:28 2014 +0200

    * Tue Sep 30 2014 Roland Mainz <rmainz at redhat.com> - 1.13-0.alpha1.3
    - fix build failure caused by change of prototype for glibc
      |eventfd()| (#1147887)

 ...socket_wrapper_eventfd_prototype_mismatch.patch |   38 ++++++++++++++++++++
 krb5.spec                                          |    8 ++++-
 2 files changed, 45 insertions(+), 1 deletions(-)
---
diff --git a/krb5-socket_wrapper_eventfd_prototype_mismatch.patch b/krb5-socket_wrapper_eventfd_prototype_mismatch.patch
new file mode 100644
index 0000000..5dc221d
--- /dev/null
+++ b/krb5-socket_wrapper_eventfd_prototype_mismatch.patch
@@ -0,0 +1,38 @@
+--- ./socket_wrapper/src/socket_wrapper.c      2014-09-30 11:23:19.733011302 +0200
++++ ./socket_wrapper/src/socket_wrapper.c      2014-09-30 11:25:11.599141672 +0200
+@@ -294,7 +294,7 @@
+ 	int (*libc_dup)(int fd);
+ 	int (*libc_dup2)(int oldfd, int newfd);
+ #ifdef HAVE_EVENTFD
+-	int (*libc_eventfd)(int count, int flags);
++	int (*libc_eventfd)(unsigned int count, int flags);
+ #endif
+ 	int (*libc_getpeername)(int sockfd,
+ 				struct sockaddr *addr,
+@@ -528,7 +528,7 @@
+ }
+ 
+ #ifdef HAVE_EVENTFD
+-static int libc_eventfd(int count, int flags)
++static int libc_eventfd(unsigned int count, int flags)
+ {
+ 	swrap_load_lib_function(SWRAP_LIBC, eventfd);
+ 
+@@ -4159,7 +4159,7 @@
+  ***************************/
+ 
+ #ifdef HAVE_EVENTFD
+-static int swrap_eventfd(int count, int flags)
++static int swrap_eventfd(unsigned int count, int flags)
+ {
+ 	int fd;
+ 
+@@ -4171,7 +4171,7 @@
+ 	return fd;
+ }
+ 
+-int eventfd(int count, int flags)
++int eventfd(unsigned int count, int flags)
+ {
+ 	return swrap_eventfd(count, flags);
+ }
diff --git a/krb5.spec b/krb5.spec
index 728b3d2..638271f 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -42,7 +42,7 @@
 Summary: The Kerberos network authentication system
 Name: krb5
 Version: 1.13
-Release: 0%{?dist}.alpha1.3
+Release: 1%{?dist}.alpha1.3
 # Maybe we should explode from the now-available-to-everybody tarball instead?
 # http://web.mit.edu/kerberos/dist/krb5/1.13/krb5-1.13-alpha1-signed.tar
 Source0: krb5-%{version}%{prerelease}.tar.gz
@@ -90,6 +90,7 @@ Patch105: krb5-kvno-230379.patch
 Patch129: krb5-1.11-run_user_0.patch
 Patch134: krb5-1.11-kpasswdtest.patch
 Patch135: krb5-bug_1145425_CVE-2014-5351.patch
+Patch136: krb5-socket_wrapper_eventfd_prototype_mismatch.patch
 
 License: MIT
 URL: http://web.mit.edu/kerberos/www/
@@ -308,6 +309,7 @@ ln NOTICE LICENSE
 %patch134 -p1 -b .kpasswdtest
 
 %patch135 -p1
+%patch136 -p1
 
 # Take the execute bit off of documentation.
 chmod -x doc/krb5-protocol/*.txt doc/ccapi/*.html
@@ -976,6 +978,10 @@ exit 0
 %{_sbindir}/uuserver
 
 %changelog
+* Tue Sep 30 2014 Roland Mainz <rmainz at redhat.com> - 1.13-0.alpha1.3
+- fix build failure caused by change of prototype for glibc
+  |eventfd()| (#1147887)
+
 * Mon Sep 29 2014 Roland Mainz <rmainz at redhat.com> - 1.13-0.alpha1.3
 - fix for CVE-2014-5351 (#1145425) "krb5: current keys returned when
   randomizing the keys for a service principal"


More information about the scm-commits mailing list