--- imap-2000.RELEASE-CANDIDATE.7/Makefile.redhat	Wed Sep 20 19:55:50 2000
+++ imap-2000.RELEASE-CANDIDATE.7/Makefile	Wed Oct  4 17:58:44 2000
@@ -273,7 +273,7 @@
 #	gradually-increasing intervals, starting at 2800-2900, and becoming
 #	permanent at 48,300.
 
-EXTRACFLAGS=
+EXTRACFLAGS= -DDISABLE_POP_PROXY=1
 
 
 # Extra linker flags (additional/alternative libraries, etc.)
diff -ruN imap-2001a.orig/src/imapd/imapd.8c imap-2001a/src/imapd/imapd.8c
--- imap-2001a.orig/src/imapd/imapd.8c	Mon Oct 12 22:31:21 1998
+++ imap-2001a/src/imapd/imapd.8c	Sun Jan 13 14:41:17 2002
@@ -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
@@ -26,7 +26,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(1C) ipopd(8C)
diff -ruN imap-2001a.orig/src/ipopd/ipopd.8c imap-2001a/src/ipopd/ipopd.8c
--- imap-2001a.orig/src/ipopd/ipopd.8c	Thu Jan 16 20:52:10 1992
+++ imap-2001a/src/ipopd/ipopd.8c	Sun Jan 13 14:41:17 2002
@@ -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 imap-2001a.orig/src/osdep/unix/tcp_unix.c imap-2001a/src/osdep/unix/tcp_unix.c
--- imap-2001a.orig/src/osdep/unix/tcp_unix.c	Fri Oct 26 23:25:12 2001
+++ imap-2001a/src/osdep/unix/tcp_unix.c	Sun Jan 13 14:41:17 2002
@@ -334,12 +334,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? */
--- imap-2000.RELEASE-CANDIDATE.7/src/osdep/unix/Makefile.linux	Wed Sep 20 19:59:13 2000
+++ imap-2000.RELEASE-CANDIDATE.7/src/osdep/unix/Makefile	Wed Oct  4 17:53:58 2000
@@ -59,13 +59,12 @@
 LOGINPW=std
 SIGTYPE=bsd
 CRXTYPE=std
-ACTIVEFILE=/usr/lib/news/active
-SPOOLDIR=/usr/spool
+ACTIVEFILE=/var/lib/news/active
+SPOOLDIR=/var/spool
 MAILSPOOL=$(SPOOLDIR)/mail
 NEWSSPOOL=$(SPOOLDIR)/news
-RSHPATH=/usr/ucb/rsh
-LOCKPGM=/etc/mlock
-
+RSHPATH=/usr/bin/rsh
+#LOCKPGM=/etc/mlock
 
 # Default formats for creating new mailboxes and for empty mailboxes in the
 # default namespace; must be set to the associated driver's prototype.
@@ -393,7 +392,7 @@
 	 SPOOLDIR=/var/spool \
 	 ACTIVEFILE=/var/lib/news/active \
 	 RSHPATH=/usr/bin/rsh \
-	 BASECFLAGS="-g -fno-omit-frame-pointer -O6" \
+	 BASECFLAGS="${RPM_OPT_FLAGS}" \
 	 BASELDFLAGS="-lpam -ldl"
 
 lnx:	# Linux non-shadow passwords