From 8bddc884ac44d6281e9a835e6ade4373bf4b8e28 Mon Sep 17 00:00:00 2001 From: Robbie Harwood Date: Feb 22 2016 22:06:57 +0000 Subject: Fix log file permissions patch with our selinux Resolves: #1309421 --- diff --git a/krb5-1.14.1-log_file_permissions.patch b/krb5-1.14.1-log_file_permissions.patch index 2e8795b..0fb965c 100644 --- a/krb5-1.14.1-log_file_permissions.patch +++ b/krb5-1.14.1-log_file_permissions.patch @@ -10,7 +10,7 @@ allows them. [ghudson@mit.edu: wrote commit message, de-indented post-open setup code] -[rharwood@redhat.com: backport not clean for some reason?] +[rharwood@redhat.com: backport not clean due to SELinux patching] ticket: 8344 (new) --- @@ -45,7 +45,7 @@ index 19c4355..f4a9387 100644 - } else { + append = (cp[4] == ':') ? O_APPEND : 0; + if (append || cp[4] == '=') { -+ fd = open(&cp[5], O_CREAT | O_WRONLY | append, ++ fd = THREEPARAMOPEN(&cp[5], O_CREAT | O_WRONLY | append, + S_IRUSR | S_IWUSR | S_IRGRP); + if (fd != -1) + f = fdopen(fd, append ? "a" : "w"); diff --git a/krb5.spec b/krb5.spec index 4b4df2b..893f41c 100644 --- a/krb5.spec +++ b/krb5.spec @@ -13,7 +13,7 @@ Summary: The Kerberos network authentication system Name: krb5 Version: 1.14 -Release: 22%{?dist} +Release: 23%{?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 @@ -777,6 +777,10 @@ exit 0 %changelog +* Mon Feb 22 2016 Robbie Harwood - 1.14-23 +- Fix log file permissions patch with our selinux +- Resolves: #1309421 + * Fri Feb 19 2016 Robbie Harwood - 1.14-22 - Backport my interposer fixes from upstream - Supersedes krb5-mechglue_inqure_attrs.patch