From 7b4b5e65b07886ab75168585b313d225a2471322 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@debian.org>
Date: Thu, 6 Dec 2018 19:10:49 +0000
Subject: Move /etc/ssh/moduli to openssh-server

It's reasonably large and only used by sshd.

Closes: #858050
---
 debian/changelog              | 7 +++++++
 debian/control                | 3 ++-
 debian/openssh-client.install | 1 -
 debian/openssh-server.install | 1 +
 debian/rules                  | 2 +-
 5 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f0c0623ee..cf0ff261b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openssh (1:7.9p1-5) UNRELEASED; urgency=medium
+
+  * Move /etc/ssh/moduli to openssh-server, since it's reasonably large and
+    only used by sshd (closes: #858050).
+
+ -- Colin Watson <cjwatson@debian.org>  Thu, 06 Dec 2018 18:16:30 +0000
+
 openssh (1:7.9p1-4) unstable; urgency=medium
 
   * Fix Ubuntu detection in debian/rules, since the documentation comment
diff --git a/debian/control b/debian/control
index b4abd4a5c..a225752f9 100644
--- a/debian/control
+++ b/debian/control
@@ -88,7 +88,8 @@ Recommends: libpam-systemd,
 Conflicts: sftp,
            ssh-socks,
            ssh2,
-Replaces: ssh,
+Replaces: openssh-client (<< 1:7.9p1-5),
+          ssh,
           ssh-krb5,
 Suggests: molly-guard,
           monkeysphere,
diff --git a/debian/openssh-client.install b/debian/openssh-client.install
index 838f98116..310907648 100755
--- a/debian/openssh-client.install
+++ b/debian/openssh-client.install
@@ -1,6 +1,5 @@
 #! /usr/bin/dh-exec
 
-etc/ssh/moduli
 etc/ssh/ssh_config
 usr/bin/scp
 usr/bin/sftp
diff --git a/debian/openssh-server.install b/debian/openssh-server.install
index e0cc13cec..5c166fc02 100755
--- a/debian/openssh-server.install
+++ b/debian/openssh-server.install
@@ -1,5 +1,6 @@
 #! /usr/bin/dh-exec
 
+etc/ssh/moduli
 usr/sbin/sshd
 usr/share/man/man5/authorized_keys.5
 usr/share/man/man5/sshd_config.5
diff --git a/debian/rules b/debian/rules
index 94990e023..550306d4f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -178,7 +178,7 @@ endif
 	# Remove version control tags to avoid unnecessary conffile
 	# resolution steps for administrators.
 	sed -i '/\$$OpenBSD:/d' \
-		debian/openssh-client/etc/ssh/moduli \
+		debian/openssh-server/etc/ssh/moduli \
 		debian/openssh-client/etc/ssh/ssh_config
 
 # We'd like to use dh_install --fail-missing here, but that doesn't work
-- 
cgit v1.2.3