- (dtucker) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec

   contrib/README CREDITS INSTALL] Bug #873: Correct URLs for x11-ssh-askpass
   and Jim Knoble's email address , from Jim himself.

diff --git a/CREDITS b/CREDITS
index c27b65dca2b94adce2fb4f0d3b16a339a121ec11..e3877686d7f4fb5617122eda8914e6abd43c6bd5 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -44,7 +44,7 @@ Holger Trapp <Holger.Trapp@Informatik.TU-Chemnitz.DE> - KRB4/AFS config patch
 IWAMURO Motonori <iwa@mmp.fujitsu.co.jp> - bugfixes
 Jani Hakala <jahakala@cc.jyu.fi> - Patches
 Jarno Huuskonen <jhuuskon@hytti.uku.fi> - Bugfixes
-Jim Knoble <jmknoble@jmknoble.cx> - Many patches
+Jim Knoble <jmknoble@pobox.com> - Many patches
 Jonchen (email unknown) - the original author of PAM support of SSH
 Juergen Keil <jk@tools.de> - scp bugfixing
 KAMAHARA Junzo <kamahara@cc.kshosen.ac.jp> - Configure fixes

diff --git a/ChangeLog b/ChangeLog
index 2abf2d65a18b05295472bb671a399fa8fd0f1b40..ca7a590cf510f121d9d46844b3ab383f41360859 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+20040527
+ - (dtucker) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec
+   contrib/README CREDITS INSTALL] Bug #873: Correct URLs for x11-ssh-askpass
+   and Jim Knoble's email address , from Jim himself.
+
 20040524
  - (dtucker) OpenBSD CVS Sync
    - djm@cvs.openbsd.org 2004/05/19 12:17:33

diff --git a/INSTALL b/INSTALL
index eecc3863e9614fe78a96d602cc9ccd0ddda77d6a..0fa4a6d29f6f396d06e27537488c170fd472b401 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -30,7 +30,7 @@ libraries and headers.
 GNOME:
 http://www.gnome.org/
 
-Alternatively, Jim Knoble <jmknoble@jmknoble.cx> has written an excellent X11
+Alternatively, Jim Knoble <jmknoble@pobox.com> has written an excellent X11
 passphrase requester. This is maintained separately at:
 
 http://www.jmknoble.net/software/x11-ssh-askpass/

diff --git a/contrib/README b/contrib/README
index 9de3d961d4957c1a20e385cca2cdc5788bb5994a..b5e590e82dbc360550088b5d7f8b37b9b09dee84 100644 (file)
--- a/contrib/README
+++ b/contrib/README
@@ -19,7 +19,7 @@ X11 SSH Askpass:
 Jim Knoble <jmknoble@pobox.com> has written an excellent X11
 passphrase requester. This is highly recommended:
 
-http://www.ntrnet.net/~jmknoble/software/x11-ssh-askpass/index.html
+http://www.jmknoble.net/software/x11-ssh-askpass/
 
 
 In this directory

diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec
index 71396ffe294910de2005ec2e5b4ae7cd70cde261..78cd98dff4c2c07e5d2dc9aaaf3ceaebd8653d90 100644 (file)
--- a/contrib/caldera/openssh.spec
+++ b/contrib/caldera/openssh.spec
@@ -60,7 +60,7 @@ Source0: see-above:/.../openssh-%{version}.tar.gz
 %if %{use_stable}
 Source1: see-above:/.../openssh-%{version}.tar.gz.sig
 %endif
-Source2: http://www.ntrnet.net/~jmknoble/software/%{xsa}/%{askpass}.tar.gz
+Source2: http://www.jmknoble.net/software/%{xsa}/%{askpass}.tar.gz
 Source3: http://www.openssh.com/faq.html
 
 %Package server
@@ -80,7 +80,7 @@ Summary(pt_BR)        : Servidor do protocolo Secure Shell OpenSSH (sshd).
 %Package askpass
 Group          : System/Network
 Requires       : openssh = %{version}
-URL            : http://www.ntrnet.net/~jmknoble/software/x11-ssh-askpass/
+URL            : http://www.jmknoble.net/software/x11-ssh-askpass/
 Obsoletes      : ssh-extras
 
 Summary        : OpenSSH X11 pass-phrase dialog.

diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index b7470092b50fcd5f3910c5e0b209a8550d56a4f5..f625a9e5a364d6d4e5da4fea7e8e066931cd1f66 100644 (file)
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -74,7 +74,7 @@ Release: %{rel}
 %endif
 URL: http://www.openssh.com/portable.html
 Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
-Source1: http://www.pobox.com/~jmknoble/software/x11-ssh-askpass/x11-ssh-askpass-%{aversion}.tar.gz
+Source1: http://www.jmknoble.net/software/x11-ssh-askpass/x11-ssh-askpass-%{aversion}.tar.gz
 License: BSD
 Group: Applications/Internet
 BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot