diff options
| author | Robbie Harwood (frozencemetery) <rharwood@redhat.com> | 2015-10-19 17:38:34 +0000 |
|---|---|---|
| committer | Robbie Harwood (frozencemetery) <rharwood@redhat.com> | 2015-10-19 17:38:34 +0000 |
| commit | 582b087130ee7aeb71fb38d3e4e630b84f72a972 (patch) | |
| tree | c8abacfbe2b53d0fbfa46062e83253169b881018 | |
| parent | 98128c40387e673eab5a2a4dd84b23fb273c5d24 (diff) | |
| download | krb5-582b087130ee7aeb71fb38d3e4e630b84f72a972.tar.gz krb5-582b087130ee7aeb71fb38d3e4e630b84f72a972.tar.xz krb5-582b087130ee7aeb71fb38d3e4e630b84f72a972.zip | |
TEMPORARILY disable usage of OFD locks as a workaround for x86
| -rw-r--r-- | krb5-disable_ofd_locks.patch | 18 | ||||
| -rw-r--r-- | krb5.spec | 7 |
2 files changed, 24 insertions, 1 deletions
diff --git a/krb5-disable_ofd_locks.patch b/krb5-disable_ofd_locks.patch new file mode 100644 index 0000000..5535cfd --- /dev/null +++ b/krb5-disable_ofd_locks.patch @@ -0,0 +1,18 @@ +On x86 rawhide, usage of OFD locks causes deadlock in the test suite. +TEMPORARILY revert their usage until I can investigate the deeper issue with +their usage here. + +diff --git a/src/lib/krb5/os/lock_file.c b/src/lib/krb5/os/lock_file.c +index a2f247c..f7f5bb4 100644 +--- a/src/lib/krb5/os/lock_file.c ++++ b/src/lib/krb5/os/lock_file.c +@@ -68,7 +68,8 @@ + static int + ofdlock(int fd, int cmd, struct flock *lock_arg) + { +-#ifdef F_OFD_SETLKW ++#if 0 ++/* #ifdef F_OFD_SETLKW */ + int st, ofdcmd; + + assert(cmd == F_SETLKW || cmd == F_SETLK); @@ -43,7 +43,7 @@ Summary: The Kerberos network authentication system Name: krb5 Version: 1.14 -Release: 1%{?dist} +Release: 2%{?dist} # - Maybe we should explode from the now-available-to-everybody tarball instead? # http://web.mit.edu/kerberos/dist/krb5/1.13/krb5-1.13.2-signed.tar # - The sources below are stored in a lookaside cache. Upload with @@ -88,6 +88,7 @@ Patch129: krb5-1.11-run_user_0.patch Patch134: krb5-1.11-kpasswdtest.patch Patch143: krb5-tests_use_libs_from_build.patch Patch146: krb5-1.14-no_system_krb5_conf.patch +Patch148: krb5-disable_ofd_locks.patch License: MIT URL: http://web.mit.edu/kerberos/www/ @@ -272,6 +273,7 @@ ln NOTICE LICENSE %patch143 -p1 -b .krb5-tests_use_libs_from_build %patch146 -p1 -b .no_system_krb5_conf +%patch148 -p1 -b .disable_ofd_locks # Take the execute bit off of documentation. chmod -x doc/krb5-protocol/*.txt doc/ccapi/*.html @@ -885,6 +887,9 @@ exit 0 %changelog +* Mon Oct 19 2015 Robbie Harwood <rharwood@redhat.com> - 1.14-beta1-2 +- TEMPORARILY disable usage of OFD locks as a workaround for x86 + * Thu Oct 15 2015 Robbie Harwood <rharwood@redhat.com> - 1.14-beta1-1 - New upstream beta version |