rpms/openssh/devel openssh-5.5p1-keygen.patch, NONE, 1.1 openssh-5.5p1-staterr.patch, NONE, 1.1 openssh.spec, 1.206, 1.207 openssh-5.1p1-cloexec.patch, 1.4, NONE openssh-5.4p1-staterr.patch, 1.1, NONE
Jan F. Chadima
jfch2222 at fedoraproject.org
Tue May 4 07:27:28 UTC 2010
Author: jfch2222
Update of /cvs/pkgs/rpms/openssh/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv4914
Modified Files:
openssh.spec
Added Files:
openssh-5.5p1-keygen.patch openssh-5.5p1-staterr.patch
Removed Files:
openssh-5.1p1-cloexec.patch openssh-5.4p1-staterr.patch
Log Message:
* Tue May 4 2010 Jan F. Chadima <jchadima at redhat.com> - 5.5p1-6 + 0.9.2-26
- Comment spec.file
- Sync patches from upstream
openssh-5.5p1-keygen.patch:
ssh-keygen.0 | 4 +++-
ssh-keygen.1 | 3 +++
ssh-keygen.c | 8 ++++++--
3 files changed, 12 insertions(+), 3 deletions(-)
--- NEW FILE openssh-5.5p1-keygen.patch ---
diff -up openssh-5.5p1/ssh-keygen.0.keygen openssh-5.5p1/ssh-keygen.0
--- openssh-5.5p1/ssh-keygen.0.keygen 2010-04-16 02:17:11.000000000 +0200
+++ openssh-5.5p1/ssh-keygen.0 2010-05-04 08:19:22.000000000 +0200
@@ -4,7 +4,7 @@ NAME
ssh-keygen - authentication key generation, management and conversion
SYNOPSIS
- ssh-keygen [-q] [-b bits] -t type [-N new_passphrase] [-C comment]
+ ssh-keygen [-q] [-o] [-b bits] -t type [-N new_passphrase] [-C comment]
[-f output_keyfile]
ssh-keygen -p [-P old_passphrase] [-N new_passphrase] [-f keyfile]
ssh-keygen -i [-f input_keyfile]
@@ -222,6 +222,8 @@ DESCRIPTION
-q Silence ssh-keygen. Used by /etc/rc when creating a new key.
+ -o Overwrite the key without prompting user.
+
-R hostname
Removes all keys belonging to hostname from a known_hosts file.
This option is useful to delete hashed hosts (see the -H option
diff -up openssh-5.5p1/ssh-keygen.1.keygen openssh-5.5p1/ssh-keygen.1
--- openssh-5.5p1/ssh-keygen.1.keygen 2010-03-21 19:57:49.000000000 +0100
+++ openssh-5.5p1/ssh-keygen.1 2010-05-04 08:19:22.000000000 +0200
@@ -47,6 +47,7 @@
.Nm ssh-keygen
.Bk -words
.Op Fl q
+.Op Fl o
.Op Fl b Ar bits
.Fl t Ar type
.Op Fl N Ar new_passphrase
@@ -370,6 +371,8 @@ Silence
Used by
.Pa /etc/rc
when creating a new key.
+.It Fl o
+Overwrite the key without prompting user.
.It Fl R Ar hostname
Removes all keys belonging to
.Ar hostname
diff -up openssh-5.5p1/ssh-keygen.c.keygen openssh-5.5p1/ssh-keygen.c
--- openssh-5.5p1/ssh-keygen.c.keygen 2010-03-21 19:58:24.000000000 +0100
+++ openssh-5.5p1/ssh-keygen.c 2010-05-04 08:22:22.000000000 +0200
@@ -72,6 +72,7 @@ int change_passphrase = 0;
int change_comment = 0;
int quiet = 0;
+int overwrite = 0;
int log_level = SYSLOG_LEVEL_INFO;
@@ -1540,7 +1541,7 @@ main(int argc, char **argv)
exit(1);
}
- while ((opt = getopt(argc, argv, "degiqpclBHLhvxXyF:b:f:t:D:I:P:N:n:"
+ while ((opt = getopt(argc, argv, "degiqopclBHLhvxXyF:b:f:t:D:I:P:N:n:"
"O:C:r:g:R:T:G:M:S:s:a:V:W:")) != -1) {
switch (opt) {
case 'b':
@@ -1605,6 +1606,9 @@ main(int argc, char **argv)
case 'q':
quiet = 1;
break;
+ case 'o':
+ overwrite = 1;
+ break;
case 'e':
case 'x':
/* export key */
@@ -1835,7 +1839,7 @@ main(int argc, char **argv)
printf("Created directory '%s'.\n", dotsshdir);
}
/* If the file already exists, ask the user to confirm. */
- if (stat(identity_file, &st) >= 0) {
+ if (!overwrite && stat(identity_file, &st) >= 0) {
char yesno[3];
printf("%s already exists.\n", identity_file);
printf("Overwrite (y/n)? ");
openssh-5.5p1-staterr.patch:
ssh-keygen.c | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
--- NEW FILE openssh-5.5p1-staterr.patch ---
diff -up openssh-5.5p1/ssh-keygen.c.staterr openssh-5.5p1/ssh-keygen.c
--- openssh-5.5p1/ssh-keygen.c.staterr 2010-05-04 09:01:14.000000000 +0200
+++ openssh-5.5p1/ssh-keygen.c 2010-05-04 09:03:32.000000000 +0200
@@ -1831,13 +1831,19 @@ main(int argc, char **argv)
ask_filename(pw, "Enter file in which to save the key");
/* Create ~/.ssh directory if it doesn't already exist. */
- 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)
- error("Could not create directory '%s'.", dotsshdir);
- else if (!quiet)
- printf("Created directory '%s'.\n", dotsshdir);
+ snprintf(dotsshdir, sizeof dotsshdir, "%s/%s",
+ pw->pw_dir, _PATH_SSH_USER_DIR);
+ if (strstr(identity_file, dotsshdir) != NULL) {
+ if (stat(dotsshdir, &st) < 0) {
+ if (errno != ENOENT) {
+ error("Could not stat %s: %s", dotsshdir,
+ strerror(errno));
+ } else if (mkdir(dotsshdir, 0700) < 0) {
+ error("Could not create directory '%s': %s",
+ dotsshdir, strerror(errno));
+ } else if (!quiet)
+ printf("Created directory '%s'.\n", dotsshdir);
+ }
}
/* If the file already exists, ask the user to confirm. */
if (!overwrite && stat(identity_file, &st) >= 0) {
Index: openssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -p -r1.206 -r1.207
--- openssh.spec 3 May 2010 13:32:38 -0000 1.206
+++ openssh.spec 4 May 2010 07:27:28 -0000 1.207
@@ -70,7 +70,7 @@
%endif
# Do not forget to bump pam_ssh_agent_auth release if you rewind the main package release to 1
-%define openssh_rel 5
+%define openssh_rel 6
%define openssh_ver 5.5p1
%define pam_ssh_agent_rel 26
%define pam_ssh_agent_ver 0.9.2
@@ -92,29 +92,42 @@ Source2: sshd.pam
Source3: sshd.init
Source4: http://prdownloads.sourceforge.net/pamsshagentauth/pam_ssh_agent_auth/pam_ssh_agent_auth-%{pam_ssh_agent_ver}.tar.bz2
Source5: pam_ssh_agent-rmheaders
+
Patch0: openssh-5.4p1-redhat.patch
+#https://bugzilla.mindrot.org/show_bug.cgi?id=1638
Patch2: openssh-5.3p1-skip-initial.patch
+#https://bugzilla.mindrot.org/show_bug.cgi?id=1640
Patch4: openssh-5.2p1-vendor.patch
Patch10: pam_ssh_agent_auth-0.9-build.patch
+#https://bugzilla.mindrot.org/show_bug.cgi?id=1641
Patch12: openssh-5.4p1-selinux.patch
Patch13: openssh-5.5p1-mls.patch
+#https://bugzilla.mindrot.org/show_bug.cgi?id=1402
Patch16: openssh-5.3p1-audit.patch
Patch18: openssh-5.4p1-pam_selinux.patch
+#https://bugzilla.mindrot.org/show_bug.cgi?id=1663
+Patch20: openssh-5.5p1-pka-ldap.patch
+#https://bugzilla.mindrot.org/show_bug.cgi?id=1668
+Patch23: openssh-5.5p1-keygen.patch
Patch24: openssh-4.3p1-fromto-remote.patch
+#https://bugzilla.mindrot.org/show_bug.cgi?id=1636
Patch27: openssh-5.1p1-log-in-chroot.patch
Patch30: openssh-4.0p1-exit-deadlock.patch
Patch35: openssh-5.1p1-askpass-progress.patch
Patch38: openssh-4.3p2-askpass-grab-info.patch
+#https://bugzilla.mindrot.org/show_bug.cgi?id=1644
Patch44: openssh-5.2p1-allow-ip-opts.patch
Patch49: openssh-4.3p2-gssapi-canohost.patch
Patch62: openssh-5.1p1-scp-manpage.patch
Patch65: openssh-5.5p1-fips.patch
Patch69: openssh-5.3p1-selabel.patch
Patch71: openssh-5.2p1-edns.patch
-Patch72: openssh-5.5p1-pka-ldap.patch
Patch73: openssh-5.5p1-gsskex.patch
+#https://bugzilla.mindrot.org/show_bug.cgi?id=1701
Patch74: openssh-5.3p1-randclean.patch
-Patch76: openssh-5.4p1-staterr.patch
+#https://bugzilla.mindrot.org/show_bug.cgi?id=1740
+Patch76: openssh-5.5p1-staterr.patch
+#https://bugzilla.mindrot.org/show_bug.cgi?id=1750
Patch77: openssh-5.5p1-stderr.patch
License: BSD
@@ -270,7 +283,8 @@ popd
%patch18 -p1 -b .pam_selinux
%endif
-%patch72 -p1 -b .pka
+%patch20 -p1 -b .pka
+%patch23 -p1 -b .keygen
%patch24 -p1 -b .fromto-remote
%patch27 -p1 -b .log-chroot
%patch30 -p1 -b .exit-deadlock
@@ -562,6 +576,10 @@ fi
%endif
%changelog
+* Tue May 4 2010 Jan F. Chadima <jchadima at redhat.com> - 5.5p1-6 + 0.9.2-26
+- Comment spec.file
+- Sync patches from upstream
+
* Mon May 3 2010 Jan F. Chadima <jchadima at redhat.com> - 5.5p1-5 + 0.9.2-26
- Create separate ldap package
- Tweak the ldap patch
--- openssh-5.1p1-cloexec.patch DELETED ---
--- openssh-5.4p1-staterr.patch DELETED ---
More information about the scm-commits
mailing list