diff --git a/openssh-6.8p1-880575.patch b/openssh-6.8p1-880575.patch new file mode 100644 index 0000000..9936282 --- /dev/null +++ b/openssh-6.8p1-880575.patch @@ -0,0 +1,11 @@ +--- openssh-6.8p1/authfile.c.orig 2015-03-26 09:59:06.646924879 +0100 ++++ openssh-6.8p1/authfile.c 2015-03-26 09:59:19.310905998 +0100 +@@ -194,7 +194,7 @@ + error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"); + error("Permissions 0%3.3o for '%s' are too open.", + (u_int)st.st_mode & 0777, filename); +- error("It is recommended that your private key files are NOT accessible by others."); ++ error("It is required that your private key files are NOT accessible by others."); + error("This private key will be ignored."); + return SSH_ERR_KEY_BAD_PERMISSIONS; + } diff --git a/openssh.spec b/openssh.spec index 67e5341..a8f36bf 100644 --- a/openssh.spec +++ b/openssh.spec @@ -217,6 +217,8 @@ Patch925: openssh-6.7p1-ssh-copy-id-truncated-keys.patch Patch926: openssh-6.7p1-sftp-force-permission.patch # Workaround krb5-config bug #1204646 Patch927: openssh-6.8p1-workaround-krb5-config-bug.patch +# Upstream bug #1878 reintroduced in openssh6.7p1 +Patch928: openssh-6.8p1-880575.patch @@ -438,6 +440,7 @@ popd %patch925 -p1 -b .newline %patch926 -p1 -b .sftp-force-mode %patch927 -p1 -b .bz1204646 +%patch928 -p1 -b .bz880575 %patch200 -p1 -b .audit %patch700 -p1 -b .fips