From b823409b8f4232ba5aad1ed7784c41a6daea04b0 Mon Sep 17 00:00:00 2001 From: "Jan F. Chadima" Date: Fri, 19 Mar 2010 20:21:36 +0000 Subject: [PATCH] - repair configure script of pam_ssh_agent - repair error mesage in ssh-keygen --- openssh-5.4p1-staterr.patch | 14 ++++++++++++++ openssh.spec | 10 +++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 openssh-5.4p1-staterr.patch diff --git a/openssh-5.4p1-staterr.patch b/openssh-5.4p1-staterr.patch new file mode 100644 index 0000000..cc96026 --- /dev/null +++ b/openssh-5.4p1-staterr.patch @@ -0,0 +1,14 @@ +diff -up openssh-5.4p1/ssh-keygen.c.staterr openssh-5.4p1/ssh-keygen.c +--- openssh-5.4p1/ssh-keygen.c.staterr 2010-03-19 20:56:12.000000000 +0100 ++++ openssh-5.4p1/ssh-keygen.c 2010-03-19 20:59:41.000000000 +0100 +@@ -1829,7 +1829,9 @@ main(int argc, char **argv) + snprintf(dotsshdir, sizeof dotsshdir, "%s/%s", pw->pw_dir, _PATH_SSH_USER_DIR); + if (strstr(identity_file, dotsshdir) != NULL && + stat(dotsshdir, &st) < 0) { +- if (mkdir(dotsshdir, 0700) < 0) ++ if (errno == EPERM) ++ error("Do not have permisions to stat directory '%s'.", dotsshdir); ++ else if (mkdir(dotsshdir, 0700) < 0) + error("Could not create directory '%s'.", dotsshdir); + else if (!quiet) + printf("Created directory '%s'.\n", dotsshdir); diff --git a/openssh.spec b/openssh.spec index 00e8739..467d848 100644 --- a/openssh.spec +++ b/openssh.spec @@ -67,8 +67,13 @@ %endif # Do not forget to bump pam_ssh_agent_auth release if you rewind the main package release to 1 +<<<<<<< openssh.spec +%define openssh_rel 3 +%define pam_ssh_agent_rel 24 +======= %define openssh_rel 2 %define pam_ssh_agent_rel 25 +>>>>>>> 1.199 %define pam_ssh_agent_ver 0.9.2 Summary: An open source implementation of SSH protocol versions 1 and 2 @@ -111,6 +116,7 @@ Patch72: openssh-5.4p1-pka.patch Patch73: openssh-5.4p1-gsskex.patch Patch74: openssh-5.3p1-randclean.patch Patch75: openssh-5.3p1-dso.patch +Patch76: openssh-5.4p1-staterr.patch License: BSD Group: Applications/Internet @@ -264,6 +270,7 @@ popd %patch73 -p1 -b .gsskex %patch74 -p1 -b .randclean %patch75 -p1 -b .dso +%patch76 -p1 -b .staterr autoreconf pushd pam_ssh_agent_auth-%{pam_ssh_agent_ver} @@ -529,8 +536,9 @@ fi %endif %changelog -* Fri Mar 12 2010 Jan F. Chadima - 5.4p1-2 + 0.9.2-25 +* Fri Mar 12 2010 Jan F. Chadima - 5.4p1-3 + 0.9.2-25 - repair configure script of pam_ssh_agent +- repair error mesage in ssh-keygen * Fri Mar 12 2010 Jan F. Chadima - 5.4p1-2 - source krb5-devel profile script only if exists