diff -ruN pine4.64.orig/imap/src/imapd/imapd.8 pine4.64/imap/src/imapd/imapd.8

--- pine4.64.orig/imap/src/imapd/imapd.8	2004-05-18 20:46:54 +0300

+++ pine4.64/imap/src/imapd/imapd.8	2006-03-01 12:41:20 +0200

@@ -3,7 +3,7 @@

 .SH NAME

 IMAPd \- Internet Message Access Protocol server

 .SH SYNOPSIS

-.B /usr/etc/imapd

+.B /usr/sbin/imapd

 .SH DESCRIPTION

 .I imapd

 is a server which supports the

@@ -29,7 +29,7 @@

 by many Unix-based clients.  To do this, the

 .I imapd

 binary must have a link to

-.I /etc/rimapd

+.I /usr/sbin/rimapd

 since this is where this software expects it to be located.

 .SH "SEE ALSO"

 rsh(1) ipopd(8)

diff -ruN pine4.64.orig/imap/src/ipopd/ipopd.8 pine4.64/imap/src/ipopd/ipopd.8

--- pine4.64.orig/imap/src/ipopd/ipopd.8	2004-05-18 20:50:05 +0300

+++ pine4.64/imap/src/ipopd/ipopd.8	2006-03-01 12:41:20 +0200

@@ -3,9 +3,9 @@

 .SH NAME

 IPOPd \- Post Office Protocol server

 .SH SYNOPSIS

-.B /usr/etc/ipop2d

+.B /usr/sbin/ipop2d

 .PP

-.B /usr/etc/ipop3d

+.B /usr/sbin/ipop3d

 .SH DESCRIPTION

 .I ipop2d

 and

diff -ruN pine4.64.orig/imap/src/osdep/unix/Makefile pine4.64/imap/src/osdep/unix/Makefile

--- pine4.64.orig/imap/src/osdep/unix/Makefile	2006-03-01 12:39:02 +0200

+++ pine4.64/imap/src/osdep/unix/Makefile	2006-03-01 12:44:22 +0200

@@ -88,7 +88,7 @@

 MAILSPOOL=/var/mail

 NEWSSPOOL=$(SPOOLDIR)/news

 RSHPATH=/usr/bin/rsh

-LOCKPGM=/etc/mlock

+#LOCKPGM=/etc/mlock

 # Default formats for creating new mailboxes and for empty mailboxes in the

@@ -455,7 +455,7 @@

 	 SPOOLDIR=/var/spool \

 	 ACTIVEFILE=/var/lib/news/active \

 	 RSHPATH=/usr/bin/rsh \

-	 BASECFLAGS="-g -fno-omit-frame-pointer $(GCCOPTLEVEL)" \

+	 BASECFLAGS="${RPM_OPT_FLAGS}" \

 	 BASELDFLAGS="$(PAMLDFLAGS)"

 lnx:	# Linux non-shadow passwords

diff -ruN pine4.64.orig/imap/src/osdep/unix/tcp_unix.c pine4.64/imap/src/osdep/unix/tcp_unix.c

--- pine4.64.orig/imap/src/osdep/unix/tcp_unix.c	2005-08-16 23:56:14 +0300

+++ pine4.64/imap/src/osdep/unix/tcp_unix.c	2006-03-01 12:41:20 +0200

@@ -317,12 +317,12 @@

 				/* return immediately if ssh disabled */

     if (!(sshpath && (ti = sshtimeout))) return NIL;

 				/* ssh command prototype defined yet? */

-    if (!sshcommand) sshcommand = cpystr ("%s %s -l %s exec /etc/r%sd");

+    if (!sshcommand) sshcommand = cpystr ("%s %s -l %s exec /usr/sbin/r%sd");

   }

   else if (ti = rshtimeout) {	/* set rsh timeout */

 				/* rsh path/command prototypes defined yet? */

     if (!rshpath) rshpath = cpystr (RSHPATH);

-    if (!rshcommand) rshcommand = cpystr ("%s %s -l %s exec /etc/r%sd");

+    if (!rshcommand) rshcommand = cpystr ("%s %s -l %s exec /usr/sbin/r%sd");

   }

   else return NIL;		/* rsh disabled */

 				/* look like domain literal? */