[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

ssh-nonfree -> OpenSSH transition proposal



Does this sound reasonable?

1. OpenSSH-based packages (ssh, ssh-krb5) prepare for the transition:
   * "Conflicts: ssh-nonfree" becomes "Conflicts: ssh-nonfree (<< 2)".
   * Maintainer scripts changed to DTRT if /etc/ssh-nonfree exists
     but /etc/ssh does not.  I think something like this should work:

--- debian/preinst.dist	Sat Mar  9 10:40:32 2002
+++ debian/preinst	Sat Mar  9 10:42:58 2002
@@ -3,6 +3,10 @@
 action=$1
 version=$2
 
+if [ -d /etc/ssh-nonfree -a ! -d /etc/ssh ]; then
+  version=1.2.27
+fi
+
 if [ "$action" = upgrade -o "$action" = install ]
 then
   # check if debconf is missing
@@ -35,6 +39,9 @@
     # work around for missing debconf
     db_get() { : ; }
     RET=true
+    if [ -d /etc/ssh-nonfree -a ! -d /etc/ssh ]; then
+      cp -a /etc/ssh-nonfree /etc/ssh
+    fi
   else
     # Source debconf library.
     . /usr/share/debconf/confmodule
--- debian/config.dist	Sat Mar  9 10:40:41 2002
+++ debian/config	Sat Mar  9 10:43:05 2002
@@ -3,6 +3,11 @@
 action=$1
 version=$2
 
+if [ -d /etc/ssh-nonfree -a ! -d /etc/ssh ]; then
+  version=1.2.27
+  cp -a /etc/ssh-nonfree /etc/ssh
+fi
+
 # Source debconf library.
 . /usr/share/debconf/confmodule
 db_version 2.0

2. ssh-nonfree packages change version to 2, switch over:
   * ssh-nonfree becomes an empty package depending on ssh-krb5|ssh.
   * ssh-askpass-nonfree becomes an empty package depending on ssh-askpass.
   * ssh-socks disappears temporarily.
   * All bugs against the above packages get closed as no longer relevant.

3. ssh-socks reappears as a binary package built from openssh
   sources.  (Bdale, you expressed interest in this in November.)

-- 
Aaron M. Ucko, KB1CJC (amu at alum.mit.edu, ucko at debian.org)
Finger amu@monk.mit.edu for more info.



Reply to: