devel/procmail/procmail-3.22-rhconfig.patch

--- procmail-3.22/Makefile.rhconfig	2001-09-10 22:53:09.000000000 -0600
+++ procmail-3.22/Makefile	2003-09-12 07:44:34.000000000 -0600
@@ -23,7 +23,7 @@
 
 # Uncomment to install compressed man pages (possibly add extra suffix
 # to the definitions of MAN?DIR and/or MAN?SUFFIX by hand)
-#MANCOMPRESS = compress
+# MANCOMPRESS = compress
 
 ############################*#
 # Things that can be made are:
@@ -55,7 +55,7 @@
 
 LOCKINGTEST=__defaults__
 
-#LOCKINGTEST=/tmp .	# Uncomment and add any directories you see fit.
+LOCKINGTEST=/tmp .	# Uncomment and add any directories you see fit.
 #			If LOCKINGTEST is defined, autoconf will NOT
 #			prompt you to enter additional directories.
 #			See INSTALL for more information about the
@@ -65,7 +65,7 @@
 # Only edit below this line if you *think* you know what you are doing #
 ########################################################################
 
-#LOCKINGTEST=100	# Uncomment (and change) if you think you know
+LOCKINGTEST=100	# Uncomment (and change) if you think you know
 #			it better than the autoconf lockingtests.
 #			This will cause the lockingtests to be hotwired.
 #			100	to enable fcntl()
@@ -74,8 +74,8 @@
 #			Or them together to get the desired combination.
 
 # Optional system libraries we search for
-SEARCHLIBS = -lm -ldir -lx -lsocket -lnet -linet -lnsl_s -lnsl_i -lnsl -lsun \
- -lgen -lsockdns -ldl
+SEARCHLIBS = -lm -ldir -lx -lsocket -lnet -linet -lnsl_s -lnsl_i -lsun \
+ -lgen -lsockdns
 #			-lresolv	# not really needed, is it?
 
 # Informal list of directories where we look for the libraries in SEARCHLIBS
@@ -86,8 +86,8 @@
  #-Wimplicit -Wshadow -Wid-clash-6 #-Wuninitialized
 
 # The place to put your favourite extra cc flag
-CFLAGS0 = -O #$(GCC_WARNINGS)
-LDFLAGS0= -s
+CFLAGS0 = $(RPM_OPT_FLAGS) #$(GCC_WARNINGS)
+LDFLAGS0= 
 # Read my libs :-)
 LIBS=
 
--- procmail-3.22/config.h.rhconfig	2001-09-10 22:53:50.000000000 -0600
+++ procmail-3.22/config.h	2003-09-12 07:41:40.000000000 -0600
@@ -35,7 +35,8 @@
  */
 /*#define DEFSPATH	"PATH=/bin:/usr/bin"			/* */
 /*#define DEFPATH	"PATH=$HOME/bin:/bin:/usr/bin"		/* */
-
+#define DEFPATH	"PATH=$HOME/bin:/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/X11R6/bin"		/* */
+ 
 /* every environment variable appearing in PRESTENV will be set or wiped
  * out of the environment (variables without an '=' sign will be thrown
  * out), e.g. you could define PRESTENV as follows:
@@ -46,13 +47,13 @@
  */
 #define PRESTENV	{"IFS","ENV","PWD",0}
 
-/*#define GROUP_PER_USER			/* uncomment this if each
+#define GROUP_PER_USER			/* uncomment this if each
 						   user has his or her own
 	group and procmail can therefore trust a $HOME/.procmailrc that
 	is group writable or contained in a group writable home directory
 	if the group involved is the user's default group. */
 
-/*#define LMTP					/* uncomment this if you
+#define LMTP					/* uncomment this if you
 						   want to use procmail
 	as an LMTP (rfc2033) server, presumably for invocation by an MTA.
 	The file examples/local_procmail_lmtp.m4 contains info on how to
@@ -79,7 +80,7 @@
 
 /*#define NO_fcntl_LOCK		/* uncomment any of these three if you	     */
 /*#define NO_lockf_LOCK		/* definitely do not want procmail to make   */
-/*#define NO_flock_LOCK		/* use of those kernel-locking methods	     */
+#define NO_flock_LOCK		/* use of those kernel-locking methods	     */
 				/* If you set LOCKINGTEST to a binary number
 	than there's no need to set these.  These #defines are only useful
 	if you want to disable particular locking styles but are unsure which
@@ -91,14 +92,14 @@
 	restriction does not apply to the /etc/procmailrc and
 	/etc/procmailrcs files) */
 
-/*#define NO_NFS_ATIME_HACK	/* uncomment if you're definitely not using
+#define NO_NFS_ATIME_HACK	/* uncomment if you're definitely not using
 				   NFS mounted filesystems and can't afford
 	procmail to sleep for 1 sec. before writing to an empty regular
 	mailbox.  This lets programs correctly judge whether there is unread
 	mail present.  procmail automatically suppresses this when it isn't
 	needed or under heavy load. */
 
-/*#define DEFsendmail	"/usr/sbin/sendmail"	/* uncomment and/or change if
+#define DEFsendmail	"/usr/sbin/sendmail"	/* uncomment and/or change if
 						   the autoconfigured default
 	SENDMAIL is not suitable.  This program should quack like a sendmail:
 	it should accept the -oi flag (to tell it to _not_ treat a line
1	--- procmail-3.22/Makefile.rhconfig 2001-09-10 22:53:09.000000000 -0600
2	+++ procmail-3.22/Makefile 2003-09-12 07:44:34.000000000 -0600
3	@@ -23,7 +23,7 @@
4
5	# Uncomment to install compressed man pages (possibly add extra suffix
6	# to the definitions of MAN?DIR and/or MAN?SUFFIX by hand)
7	-#MANCOMPRESS = compress
8	+# MANCOMPRESS = compress
9
10	############################*#
11	# Things that can be made are:
12	@@ -55,7 +55,7 @@
13
14	LOCKINGTEST=__defaults__
15
16	-#LOCKINGTEST=/tmp . # Uncomment and add any directories you see fit.
17	+LOCKINGTEST=/tmp . # Uncomment and add any directories you see fit.
18	# If LOCKINGTEST is defined, autoconf will NOT
19	# prompt you to enter additional directories.
20	# See INSTALL for more information about the
21	@@ -65,7 +65,7 @@
22	# Only edit below this line if you think you know what you are doing #
23	########################################################################
24
25	-#LOCKINGTEST=100 # Uncomment (and change) if you think you know
26	+LOCKINGTEST=100 # Uncomment (and change) if you think you know
27	# it better than the autoconf lockingtests.
28	# This will cause the lockingtests to be hotwired.
29	# 100 to enable fcntl()
30	@@ -74,8 +74,8 @@
31	# Or them together to get the desired combination.
32
33	# Optional system libraries we search for
34	-SEARCHLIBS = -lm -ldir -lx -lsocket -lnet -linet -lnsl_s -lnsl_i -lnsl -lsun \
35	- -lgen -lsockdns -ldl
36	+SEARCHLIBS = -lm -ldir -lx -lsocket -lnet -linet -lnsl_s -lnsl_i -lsun \
37	+ -lgen -lsockdns
38	# -lresolv # not really needed, is it?
39
40	# Informal list of directories where we look for the libraries in SEARCHLIBS
41	@@ -86,8 +86,8 @@
42	#-Wimplicit -Wshadow -Wid-clash-6 #-Wuninitialized
43
44	# The place to put your favourite extra cc flag
45	-CFLAGS0 = -O #$(GCC_WARNINGS)
46	-LDFLAGS0= -s
47	+CFLAGS0 = $(RPM_OPT_FLAGS) #$(GCC_WARNINGS)
48	+LDFLAGS0=
49	# Read my libs :-)
50	LIBS=
51
52	--- procmail-3.22/config.h.rhconfig 2001-09-10 22:53:50.000000000 -0600
53	+++ procmail-3.22/config.h 2003-09-12 07:41:40.000000000 -0600
54	@@ -35,7 +35,8 @@
55	*/
56	/#define DEFSPATH "PATH=/bin:/usr/bin" / */
57	/#define DEFPATH "PATH=$HOME/bin:/bin:/usr/bin" / */
58	-
59	+#define DEFPATH "PATH=$HOME/bin:/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/X11R6/bin" /* */
60	+
61	/* every environment variable appearing in PRESTENV will be set or wiped
62	* out of the environment (variables without an '=' sign will be thrown
63	* out), e.g. you could define PRESTENV as follows:
64	@@ -46,13 +47,13 @@
65	*/
66	#define PRESTENV {"IFS","ENV","PWD",0}
67
68	-/#define GROUP_PER_USER / uncomment this if each
69	+#define GROUP_PER_USER /* uncomment this if each
70	user has his or her own
71	group and procmail can therefore trust a $HOME/.procmailrc that
72	is group writable or contained in a group writable home directory
73	if the group involved is the user's default group. */
74
75	-/#define LMTP / uncomment this if you
76	+#define LMTP /* uncomment this if you
77	want to use procmail
78	as an LMTP (rfc2033) server, presumably for invocation by an MTA.
79	The file examples/local_procmail_lmtp.m4 contains info on how to
80	@@ -79,7 +80,7 @@
81
82	/#define NO_fcntl_LOCK / uncomment any of these three if you */
83	/#define NO_lockf_LOCK / definitely do not want procmail to make */
84	-/#define NO_flock_LOCK / use of those kernel-locking methods */
85	+#define NO_flock_LOCK /* use of those kernel-locking methods */
86	/* If you set LOCKINGTEST to a binary number
87	than there's no need to set these. These #defines are only useful
88	if you want to disable particular locking styles but are unsure which
89	@@ -91,14 +92,14 @@
90	restriction does not apply to the /etc/procmailrc and
91	/etc/procmailrcs files) */
92
93	-/#define NO_NFS_ATIME_HACK / uncomment if you're definitely not using
94	+#define NO_NFS_ATIME_HACK /* uncomment if you're definitely not using
95	NFS mounted filesystems and can't afford
96	procmail to sleep for 1 sec. before writing to an empty regular
97	mailbox. This lets programs correctly judge whether there is unread
98	mail present. procmail automatically suppresses this when it isn't
99	needed or under heavy load. */
100
101	-/#define DEFsendmail "/usr/sbin/sendmail" / uncomment and/or change if
102	+#define DEFsendmail "/usr/sbin/sendmail" /* uncomment and/or change if
103	the autoconfigured default
104	SENDMAIL is not suitable. This program should quack like a sendmail:
105	it should accept the -oi flag (to tell it to _not_ treat a line
admin@fedoraproject.org	ViewVC Help
Powered by ViewVC 1.1.2