cvsdist 8e2462b
--- procmail-3.22/Makefile.rhconfig	2001-09-10 22:53:09.000000000 -0600
cvsdist 8e2462b
+++ procmail-3.22/Makefile	2003-09-12 07:44:34.000000000 -0600
cvsdist 69de0a2
@@ -23,7 +23,7 @@
cvsdist 69de0a2
 
cvsdist 69de0a2
 # Uncomment to install compressed man pages (possibly add extra suffix
cvsdist 69de0a2
 # to the definitions of MAN?DIR and/or MAN?SUFFIX by hand)
cvsdist 69de0a2
-#MANCOMPRESS = compress
cvsdist 69de0a2
+# MANCOMPRESS = compress
cvsdist 69de0a2
 
cvsdist 69de0a2
 ############################*#
cvsdist 69de0a2
 # Things that can be made are:
cvsdist 69de0a2
@@ -55,7 +55,7 @@
cvsdist 69de0a2
 
cvsdist 69de0a2
 LOCKINGTEST=__defaults__
cvsdist 69de0a2
 
cvsdist 69de0a2
-#LOCKINGTEST=/tmp .	# Uncomment and add any directories you see fit.
cvsdist 69de0a2
+LOCKINGTEST=/tmp .	# Uncomment and add any directories you see fit.
cvsdist 69de0a2
 #			If LOCKINGTEST is defined, autoconf will NOT
cvsdist 69de0a2
 #			prompt you to enter additional directories.
cvsdist 69de0a2
 #			See INSTALL for more information about the
cvsdist 69de0a2
@@ -65,7 +65,7 @@
cvsdist 69de0a2
 # Only edit below this line if you *think* you know what you are doing #
cvsdist 69de0a2
 ########################################################################
cvsdist 69de0a2
 
cvsdist 69de0a2
-#LOCKINGTEST=100	# Uncomment (and change) if you think you know
cvsdist 69de0a2
+LOCKINGTEST=100	# Uncomment (and change) if you think you know
cvsdist 69de0a2
 #			it better than the autoconf lockingtests.
cvsdist 69de0a2
 #			This will cause the lockingtests to be hotwired.
cvsdist 69de0a2
 #			100	to enable fcntl()
cvsdist 8e2462b
@@ -74,8 +74,8 @@
cvsdist 8e2462b
 #			Or them together to get the desired combination.
cvsdist 8e2462b
 
cvsdist 8e2462b
 # Optional system libraries we search for
cvsdist 8e2462b
-SEARCHLIBS = -lm -ldir -lx -lsocket -lnet -linet -lnsl_s -lnsl_i -lnsl -lsun \
cvsdist 8e2462b
- -lgen -lsockdns -ldl
cvsdist 8e2462b
+SEARCHLIBS = -lm -ldir -lx -lsocket -lnet -linet -lnsl_s -lnsl_i -lsun \
cvsdist 8e2462b
+ -lgen -lsockdns
cvsdist 8e2462b
 #			-lresolv	# not really needed, is it?
cvsdist 8e2462b
 
cvsdist 8e2462b
 # Informal list of directories where we look for the libraries in SEARCHLIBS
cvsdist 69de0a2
@@ -86,8 +86,8 @@
cvsdist 69de0a2
  #-Wimplicit -Wshadow -Wid-clash-6 #-Wuninitialized
cvsdist 69de0a2
 
cvsdist 69de0a2
 # The place to put your favourite extra cc flag
cvsdist 69de0a2
-CFLAGS0 = -O #$(GCC_WARNINGS)
cvsdist 69de0a2
-LDFLAGS0= -s
cvsdist 69de0a2
+CFLAGS0 = $(RPM_OPT_FLAGS) #$(GCC_WARNINGS)
cvsdist 69de0a2
+LDFLAGS0= 
cvsdist 69de0a2
 # Read my libs :-)
cvsdist 69de0a2
 LIBS=
cvsdist 69de0a2
 
cvsdist 8e2462b
--- procmail-3.22/config.h.rhconfig	2001-09-10 22:53:50.000000000 -0600
cvsdist 8e2462b
+++ procmail-3.22/config.h	2003-09-12 07:41:40.000000000 -0600
cvsdist 69de0a2
@@ -35,7 +35,8 @@
cvsdist 69de0a2
  */
cvsdist 69de0a2
 /*#define DEFSPATH	"PATH=/bin:/usr/bin"			/* */
cvsdist 69de0a2
 /*#define DEFPATH	"PATH=$HOME/bin:/bin:/usr/bin"		/* */
cvsdist 69de0a2
-
cvsdist 69de0a2
+#define DEFPATH	"PATH=$HOME/bin:/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/X11R6/bin"		/* */
cvsdist 69de0a2
+ 
cvsdist 69de0a2
 /* every environment variable appearing in PRESTENV will be set or wiped
cvsdist 69de0a2
  * out of the environment (variables without an '=' sign will be thrown
cvsdist 69de0a2
  * out), e.g. you could define PRESTENV as follows:
cvsdist 69de0a2
@@ -46,13 +47,13 @@
cvsdist 69de0a2
  */
cvsdist 69de0a2
 #define PRESTENV	{"IFS","ENV","PWD",0}
cvsdist 69de0a2
 
cvsdist 69de0a2
-/*#define GROUP_PER_USER			/* uncomment this if each
cvsdist 69de0a2
+#define GROUP_PER_USER			/* uncomment this if each
cvsdist 69de0a2
 						   user has his or her own
cvsdist 69de0a2
 	group and procmail can therefore trust a $HOME/.procmailrc that
cvsdist 69de0a2
 	is group writable or contained in a group writable home directory
cvsdist 69de0a2
 	if the group involved is the user's default group. */
cvsdist 69de0a2
 
cvsdist 69de0a2
-/*#define LMTP					/* uncomment this if you
cvsdist 69de0a2
+#define LMTP					/* uncomment this if you
cvsdist 69de0a2
 						   want to use procmail
cvsdist 69de0a2
 	as an LMTP (rfc2033) server, presumably for invocation by an MTA.
cvsdist 69de0a2
 	The file examples/local_procmail_lmtp.m4 contains info on how to
cvsdist 69de0a2
@@ -79,7 +80,7 @@
cvsdist 69de0a2
 
cvsdist 69de0a2
 /*#define NO_fcntl_LOCK		/* uncomment any of these three if you	     */
cvsdist 69de0a2
 /*#define NO_lockf_LOCK		/* definitely do not want procmail to make   */
cvsdist 69de0a2
-/*#define NO_flock_LOCK		/* use of those kernel-locking methods	     */
cvsdist 69de0a2
+#define NO_flock_LOCK		/* use of those kernel-locking methods	     */
cvsdist 69de0a2
 				/* If you set LOCKINGTEST to a binary number
cvsdist 69de0a2
 	than there's no need to set these.  These #defines are only useful
cvsdist 69de0a2
 	if you want to disable particular locking styles but are unsure which
d7c3c07
@@ -91,7 +92,7 @@
cvsdist 69de0a2
 	mail present.  procmail automatically suppresses this when it isn't
cvsdist 69de0a2
 	needed or under heavy load. */
cvsdist 69de0a2
 
cvsdist 69de0a2
-/*#define DEFsendmail	"/usr/sbin/sendmail"	/* uncomment and/or change if
cvsdist 69de0a2
+#define DEFsendmail	"/usr/sbin/sendmail"	/* uncomment and/or change if
cvsdist 69de0a2
 						   the autoconfigured default
cvsdist 69de0a2
 	SENDMAIL is not suitable.  This program should quack like a sendmail:
cvsdist 69de0a2
 	it should accept the -oi flag (to tell it to _not_ treat a line