4 files changed, 28 insertions, 22 deletions

diff --git a/debian/changelog b/debian/changelog
index 6b1599f1b..209b379fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openssh (1:7.2p2-3) UNRELEASED; urgency=medium
+
+  * Change all openssh.org references to openssh.com (closes: #819213).
+
+ -- Colin Watson <cjwatson@debian.org>  Sun, 03 Apr 2016 18:09:59 +0100
+
 openssh (1:7.2p2-2) unstable; urgency=medium
 
   * Fix kexgss_server to cope with DH_GRP_MIN/DH_GRP_MAX being stricter on
@@ -950,7 +956,7 @@ openssh (1:6.0p1-1) unstable; urgency=low
   * Update OpenSSH FAQ to revision 1.113, fixing missing line break (closes:
     #669667).
   * New upstream release (closes: #671010,
-    http://www.openssh.org/txt/release-6.0).
+    http://www.openssh.com/txt/release-6.0).
     - Fix IPQoS not being set on non-mapped v4-in-v6 addressed connections
       (closes: #643312, #650512, #671075).
     - Add a new privilege separation sandbox implementation for Linux's new
@@ -1000,7 +1006,7 @@ openssh (1:5.9p1-2) unstable; urgency=low
 
 openssh (1:5.9p1-1) unstable; urgency=low
 
-  * New upstream release (http://www.openssh.org/txt/release-5.9).
+  * New upstream release (http://www.openssh.com/txt/release-5.9).
     - Introduce sandboxing of the pre-auth privsep child using an optional
       sshd_config(5) "UsePrivilegeSeparation=sandbox" mode that enables
       mandatory restrictions on the syscalls the privsep child can perform.
@@ -1083,7 +1089,7 @@ openssh (1:5.8p1-2) unstable; urgency=low
 
 openssh (1:5.8p1-1) experimental; urgency=low
 
-  * New upstream release (http://www.openssh.org/txt/release-5.8):
+  * New upstream release (http://www.openssh.com/txt/release-5.8):
     - Fix stack information leak in legacy certificate signing
       (http://www.openssh.com/txt/legacy-cert.adv).
 
@@ -1098,7 +1104,7 @@ openssh (1:5.7p1-2) experimental; urgency=low
 
 openssh (1:5.7p1-1) experimental; urgency=low
 
-  * New upstream release (http://www.openssh.org/txt/release-5.7):
+  * New upstream release (http://www.openssh.com/txt/release-5.7):
     - Implement Elliptic Curve Cryptography modes for key exchange (ECDH)
       and host/user keys (ECDSA) as specified by RFC5656.  ECDH and ECDSA
       offer better performance than plain DH and DSA at the same equivalent
@@ -1900,7 +1906,7 @@ openssh (1:4.7p1-3) unstable; urgency=low
 openssh (1:4.7p1-2) unstable; urgency=low
 
   * Adjust many relative links in faq.html to point to
-    http://www.openssh.org/ (thanks, Dan Jacobson; mentioned in #459807).
+    http://www.openssh.com/ (thanks, Dan Jacobson; mentioned in #459807).
   * Pass --with-mantype=doc to configure rather than build-depending on
     groff (closes: #460121).
   * Add armel to architecture list for libselinux1-dev build-dependency
@@ -2071,7 +2077,7 @@ openssh (1:4.6p1-1) unstable; urgency=low
 
   * New upstream release (closes: #395507, #397961, #420035). Important
     changes not previously backported to 4.3p2:
-    - 4.4/4.4p1 (http://www.openssh.org/txt/release-4.4):
+    - 4.4/4.4p1 (http://www.openssh.com/txt/release-4.4):
       + On portable OpenSSH, fix a GSSAPI authentication abort that could be
         used to determine the validity of usernames on some platforms.
       + Implemented conditional configuration in sshd_config(5) using the
@@ -2113,7 +2119,7 @@ openssh (1:4.6p1-1) unstable; urgency=low
       + ssh-add doesn't ask for a passphrase if key file permissions are too
         liberal (closes: #103677).
       + Likewise, ssh doesn't ask either (closes: #99675).
-    - 4.6/4.6p1 (http://www.openssh.org/txt/release-4.6):
+    - 4.6/4.6p1 (http://www.openssh.com/txt/release-4.6):
       + sshd now allows the enabling and disabling of authentication methods
         on a per user, group, host and network basis via the Match directive
         in sshd_config.
diff --git a/debian/control b/debian/control
index 79394822a..a36122686 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian OpenSSH Maintainers <debian-ssh@lists.debian.org>
 Build-Depends: libwrap0-dev | libwrap-dev, zlib1g-dev (>= 1:1.2.3), libssl-dev (>= 0.9.8g), libpam0g-dev | libpam-dev, libgtk2.0-dev, libedit-dev, debhelper (>= 9~), dh-exec, libselinux1-dev [linux-any], libkrb5-dev | heimdal-dev, dpkg-dev (>= 1.16.1~), dh-autoreconf, autotools-dev, dh-systemd (>= 1.4), libaudit-dev [linux-any], libsystemd-dev [linux-any]
 Standards-Version: 3.9.6
 Uploaders: Colin Watson <cjwatson@debian.org>, Matthew Vernon <matthew@debian.org>
-Homepage: http://www.openssh.org/
+Homepage: http://www.openssh.com/
 Vcs-Git: https://anonscm.debian.org/git/pkg-ssh/openssh.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ssh/openssh.git
 
diff --git a/debian/faq.html b/debian/faq.html
index d6eb7fda5..7f0252891 100644
--- a/debian/faq.html
+++ b/debian/faq.html
@@ -12,7 +12,7 @@
 </head>
 
 <body bgcolor= "#ffffff" text= "#000000" link= "#23238E">
-<a href="http://www.openssh.org/index.html"><img alt="[OpenSSH]" height="30" width="141" src="images/smalltitle.gif" border="0"></a>
+<a href="http://www.openssh.com/index.html"><img alt="[OpenSSH]" height="30" width="141" src="images/smalltitle.gif" border="0"></a>
 <p>
 
 <h1>OpenSSH FAQ (Frequently asked questions)</h1>
@@ -96,7 +96,7 @@ OpenSSH has also added
 <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sftp&amp;sektion=1">sftp(1)</a> and 
 <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sftp-server&amp;sektion=8">sftp-server(8)</a> 
 which implement an easier solution for file-transfer. This is based upon the 
-<a href="http://www.openssh.org/txt/draft-ietf-secsh-filexfer-02.txt">secsh-filexfer</a> IETF draft.
+<a href="http://www.openssh.com/txt/draft-ietf-secsh-filexfer-02.txt">secsh-filexfer</a> IETF draft.
 
 
 <p><strong>OpenSSH consists of a number of programs.</strong>
@@ -139,8 +139,8 @@ You may also wish to use OpenSSH on your embedded application.
 
 <p>
 Non-OpenBSD users will want to download, compile and install the
-multi-platform <a href="http://www.openssh.org/portable.html">Portable</a> distribution from a
-<a href="http://www.openssh.org/portable.html#mirrors">mirror</a> near you.
+multi-platform <a href="http://www.openssh.com/portable.html">Portable</a> distribution from a
+<a href="http://www.openssh.com/portable.html#mirrors">mirror</a> near you.
 
 
 <h2><a name= "1.2">1.2 - Why should it be used?</a></h2>
@@ -212,7 +212,7 @@ Even though OpenSSH is developed on
 ports to other operating systems exist. The portable version of OpenSSH 
 is headed by <a href="mailto:djm@openbsd.org">Damien Miller</a>. 
 For a quick overview of the portable version of OpenSSH see 
-<a href="http://www.openssh.org/portable.html">OpenSSH Portable Release</a>.
+<a href="http://www.openssh.com/portable.html">OpenSSH Portable Release</a>.
 Currently, the supported operating systems are:
 
 
@@ -235,7 +235,7 @@ Currently, the supported operating systems are:
 
 <p>
 A list of vendors that include OpenSSH in their distributions 
-is located in the <a href="http://www.openssh.org/users.html">OpenSSH Users page</a>.
+is located in the <a href="http://www.openssh.com/users.html">OpenSSH Users page</a>.
 
 <h2><a name= "1.4">1.4 - What about copyrights, usage and patents?</a></h2>
 <p>
@@ -259,7 +259,7 @@ of RSA algorithm using software, including OpenBSD.
 <h2><a name= "1.5">1.5 - Where should I ask for help?</a></h2>
 <p>
 There are many places to turn to for help. In addition to the main
-<a href="http://www.openssh.org/index.html">OpenSSH website</a>, 
+<a href="http://www.openssh.com/index.html">OpenSSH website</a>, 
 there are many mailing lists to try. Before trying any mailing lists, 
 please search through all mailing list archives to see if your question 
 has already been answered. The OpenSSH Mailing List has been archived and 
@@ -268,12 +268,12 @@ put in searchable form and can be found at
 
 <p>
 For more information on subscribing to OpenSSH related mailing lists, 
-please see <a href="http://www.openssh.org/list.html">OpenSSH Mailing lists</a>.
+please see <a href="http://www.openssh.com/list.html">OpenSSH Mailing lists</a>.
 
 <h2><a name= "1.6">1.6 - I have found a bug. Where do I report it?</a></h2>
 <p>
 Information about submitting bug reports can be found at the OpenSSH
-<a href="http://www.openssh.org/report.html">Reporting bugs</a> page.
+<a href="http://www.openssh.com/report.html">Reporting bugs</a> page.
 <p>
 If you wish to report a security bug, please contact the private developers
 list &lt;<a href="mailto:openssh@openssh.com">openssh@openssh.com</a>&gt;.
@@ -971,7 +971,7 @@ If there is no 'configure' file in the tar.gz file that you downloaded
 or make fails with "missing separator" errors, you have probably 
 downloaded the OpenBSD distribution of OpenSSH and are attempting to 
 compile it on another platform. Please refer to the information on the 
-<a href="http://www.openssh.org/portable.html">portable version</a>.
+<a href="http://www.openssh.com/portable.html">portable version</a>.
 
 
 <h2><a name= "3.10">3.10 - Hangs when exiting ssh</a></h2>
@@ -1054,7 +1054,7 @@ This is true for HP-UX 11.X.<p>
 X11 programs stopped working.</a></h2>
 
 <p>
-As documented in the <a href="http://www.openssh.org/txt/release-3.8">3.8 release notes</a>,
+As documented in the <a href="http://www.openssh.com/txt/release-3.8">3.8 release notes</a>,
 <code>ssh</code> will now use untrusted X11 cookies by 
 default.  The previous behaviour can be restored by setting
 <b>ForwardX11Trusted yes</b> in <i>ssh_config</i>.
@@ -1178,7 +1178,7 @@ entries when run on AIX 5.x.  This can be fixed by simply recompiling
 sshd on an AIX 5.x system and using that.
 
 <hr>
-<a href="http://www.openssh.org/index.html"><img height=24 width=24 src="back.gif" border=0 alt=OpenSSH></a>
+<a href="http://www.openssh.com/index.html"><img height=24 width=24 src="back.gif" border=0 alt=OpenSSH></a>
 <a href="mailto:www@openbsd.org">www@openbsd.org</a>
 <br>
 <small>$OpenBSD: faq.html,v 1.113 2012/04/21 12:12:22 dtucker Exp $</small>
diff --git a/debian/rules b/debian/rules
index 01937b39e..5021b34a3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -245,6 +245,6 @@ override_dh_builddeb:
         dh_builddeb -- -Zxz
 
 debian/faq.html:
-        wget -O - http://www.openssh.org/faq.html | \
-                sed 's,\(href="\)\(txt/\|[^":]*\.html\),\1http://www.openssh.org/\2,g' \
+        wget -O - http://www.openssh.com/faq.html | \
+                sed 's,\(href="\)\(txt/\|[^":]*\.html\),\1http://www.openssh.com/\2,g' \
                 > debian/faq.html