components/library/uwimap/patches/2004_no_binaries_below_etc.patch

   1 diff -ruN uw-imap-2006b.dfsg.orig/src/imapd/imapd.8 uw-imap-2006b.dfsg/src/imapd/imapd.8
   2 --- uw-imap-2006b.dfsg.orig/src/imapd/imapd.8   2006-10-09 18:48:56.000000000 +0200
   3 +++ uw-imap-2006b.dfsg/src/imapd/imapd.8        2006-10-09 19:22:42.000000000 +0200
   4 @@ -16,7 +16,7 @@
   5  .SH NAME
   6  IMAPd \- Internet Message Access Protocol server
   7  .SH SYNOPSIS
   8 -.B /usr/etc/imapd
   9 +.B /usr/sbin/imapd
  10  .SH DESCRIPTION
  11  .I imapd
  12  is a server which supports the
  13 @@ -42,7 +42,7 @@
  14  by many Unix-based clients.  To do this, the
  15  .I imapd
  16  binary must have a link to
  17 -.I /etc/rimapd
  18 +.I /usr/sbin/rimapd
  19  since this is where this software expects it to be located.
  20  .SH "SEE ALSO"
  21  rsh(1) ipopd(8)
  22 diff -ruN uw-imap-2006b.dfsg.orig/src/ipopd/ipopd.8 uw-imap-2006b.dfsg/src/ipopd/ipopd.8
  23 --- uw-imap-2006b.dfsg.orig/src/ipopd/ipopd.8   2006-10-09 18:48:56.000000000 +0200
  24 +++ uw-imap-2006b.dfsg/src/ipopd/ipopd.8        2006-10-09 19:22:42.000000000 +0200
  25 @@ -16,9 +16,9 @@
  26  .SH NAME
  27  IPOPd \- Post Office Protocol server
  28  .SH SYNOPSIS
  29 -.B /usr/etc/ipop2d
  30 +.B /usr/sbin/ipop2d
  31  .PP
  32 -.B /usr/etc/ipop3d
  33 +.B /usr/sbin/ipop3d
  34  .SH DESCRIPTION
  35  .I ipop2d
  36  and
  37 diff -ruN uw-imap-2006b.dfsg.orig/src/osdep/unix/tcp_unix.c uw-imap-2006b.dfsg/src/osdep/unix/tcp_unix.c
  38 --- uw-imap-2006b.dfsg.orig/src/osdep/unix/tcp_unix.c   2006-10-09 18:48:56.000000000 +0200
  39 +++ uw-imap-2006b.dfsg/src/osdep/unix/tcp_unix.c        2006-10-09 19:22:42.000000000 +0200
  40 @@ -346,12 +346,12 @@
  41                                 /* return immediately if ssh disabled */
  42      if (!(sshpath && (ti = sshtimeout))) return NIL;
  43                                 /* ssh command prototype defined yet? */
  44 -    if (!sshcommand) sshcommand = cpystr ("%s %s -l %s exec /etc/r%sd");
  45 +    if (!sshcommand) sshcommand = cpystr ("%s %s -l %s exec /usr/sbin/r%sd");
  46    }
  47                                 /* want rsh? */
  48    else if (rshpath && (ti = rshtimeout)) {
  49                                 /* rsh command prototype defined yet? */
  50 -    if (!rshcommand) rshcommand = cpystr ("%s %s -l %s exec /etc/r%sd");
  51 +    if (!rshcommand) rshcommand = cpystr ("%s %s -l %s exec /usr/sbin/r%sd");
  52    }
  53    else return NIL;             /* rsh disabled */
  54                                 /* look like domain literal? */