Debian release 3.5p1-2.

3 files changed, 21 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 6a6a6eb0c..7f7fc33eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+openssh (1:3.5p1-2) unstable; urgency=low
+
+  * Mention in the ssh package description that it provides both ssh and
+    sshd (closes: #99680).
+  * Create a system group for ssh-agent, not a user group (closes: #167669).
+
+ -- Colin Watson <cjwatson@debian.org>  Mon,  4 Nov 2002 13:43:53 +0000
+
 openssh (1:3.5p1-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 2fe062623..cb25d58ba 100644
--- a/debian/control
+++ b/debian/control
@@ -25,6 +25,8 @@ Description: Secure rlogin/rsh/rcp replacement (OpenSSH)
  It is intended as a replacement for rlogin, rsh and rcp, and can be
  used to provide applications with a secure communication channel.
  .
+ This package provides both the ssh client and the sshd server.
+ .
  --------------------------------------------------------------------
  .
  In some countries, particularly Russia, Iraq, and Pakistan, it may
diff --git a/debian/postinst b/debian/postinst
index 1b741c203..41221b9d6 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -280,9 +280,18 @@ set_sshd_permissions() {
 }
 
 
+fix_ssh_group() {
+        # Try to remove non-system group mistakenly created by 1:3.5p1-1.
+        # set_ssh_agent_permissions() below will re-create it properly.
+        if getent group | grep -q '^ssh:'; then
+                delgroup --quiet ssh || true
+        fi
+}
+
+
 set_ssh_agent_permissions() {
         if ! getent group | grep -q '^ssh:'; then
-                addgroup --quiet ssh
+                addgroup --system --quiet ssh
         fi
         if ! [ -x /usr/sbin/dpkg-statoverride ] || \
             ! dpkg-statoverride --list /usr/bin/ssh-agent >/dev/null ; then
@@ -323,6 +332,7 @@ fix_statoverride
 create_alternatives
 setup_sshd_user
 set_sshd_permissions
+if [ "$2" = "1:3.5p1-1" ]; then fix_ssh_group; fi
 set_ssh_agent_permissions
 setup_startup
 setup_init