lkundrak / rpms / sendmail

Forked from rpms/sendmail 4 years ago
Clone
e861a83
diff -up sendmail-8.14.3/cf/cf/Build.makemapman sendmail-8.14.3/cf/cf/Build
e861a83
--- sendmail-8.14.3/cf/cf/Build.makemapman	1999-03-02 03:37:12.000000000 +0100
e861a83
+++ sendmail-8.14.3/cf/cf/Build	2008-12-02 18:04:37.000000000 +0100
e861a83
@@ -18,7 +18,7 @@
e861a83
 SMROOT=${SMROOT-../..}
e861a83
 BUILDTOOLS=${BUILDTOOLS-$SMROOT/devtools}
e861a83
 
e861a83
-M4=`sh $BUILDTOOLS/bin/find_m4.sh`
e861a83
+M4=/usr/bin/m4
e861a83
 ret=$?
e861a83
 if [ $ret -ne 0 ]
e861a83
 then
e861a83
diff -up sendmail-8.14.3/devtools/OS/Linux.makemapman sendmail-8.14.3/devtools/OS/Linux
e861a83
--- sendmail-8.14.3/devtools/OS/Linux.makemapman	2002-03-22 00:59:25.000000000 +0100
e861a83
+++ sendmail-8.14.3/devtools/OS/Linux	2008-12-02 18:06:18.000000000 +0100
e861a83
@@ -5,7 +5,7 @@ dnl	Place personal settings in devtools/
e861a83
 
33f964f
 define(`confDEPEND_TYPE', `CC-M')
33f964f
 define(`confSM_OS_HEADER', `sm_os_linux')
33f964f
-define(`confMANROOT', `/usr/man/man')
33f964f
+define(`confMANROOT', `/usr/share/man/man')
33f964f
 define(`confLIBS', `-ldl')
33f964f
 define(`confEBINDIR', `/usr/sbin')
33f964f
 APPENDDEF(`confLIBSEARCH', `crypt nsl')
e861a83
@@ -15,6 +15,8 @@ define(`confMTCCOPTS', `-D_REENTRANT')
33f964f
 define(`confMTLDOPTS', `-lpthread')
33f964f
 define(`confLDOPTS_SO', `-shared')
33f964f
 define(`confSONAME',`-soname')
33f964f
+define('confSBINGRP', 'mail')
33f964f
+define('confSBINMODE', '6755')
33f964f
 
33f964f
 ifelse(confBLDVARIANT, `DEBUG',
33f964f
 dnl Debug build
e861a83
diff -up sendmail-8.14.3/makemap/makemap.8.makemapman sendmail-8.14.3/makemap/makemap.8
e861a83
--- sendmail-8.14.3/makemap/makemap.8.makemapman	2008-05-03 01:07:48.000000000 +0200
e861a83
+++ sendmail-8.14.3/makemap/makemap.8	2008-12-02 18:04:37.000000000 +0100
e861a83
@@ -52,12 +52,6 @@ selected using the
33f964f
 parameter.  
33f964f
 They may be
33f964f
 .TP
33f964f
-dbm
33f964f
-DBM format maps.  
33f964f
-This requires the 
33f964f
-ndbm(3) 
33f964f
-library.
33f964f
-.TP
33f964f
 btree
33f964f
 B-Tree format maps.  
33f964f
 This requires the new Berkeley DB 
e861a83
diff -up sendmail-8.14.3/rmail/rmail.c.makemapman sendmail-8.14.3/rmail/rmail.c
e861a83
--- sendmail-8.14.3/rmail/rmail.c.makemapman	2001-09-18 23:45:29.000000000 +0200
e861a83
+++ sendmail-8.14.3/rmail/rmail.c	2008-12-02 18:04:37.000000000 +0100
e861a83
@@ -276,7 +276,6 @@ main(argc, argv)
33f964f
 	args[i++] = _PATH_SENDMAIL;	/* Build sendmail's argument list. */
33f964f
 	args[i++] = "-G";		/* relay submission */
33f964f
 	args[i++] = "-oee";		/* No errors, just status. */
33f964f
-	args[i++] = "-odq";		/* Queue it, don't try to deliver. */
33f964f
 	args[i++] = "-oi";		/* Ignore '.' on a line by itself. */
33f964f
 
33f964f
 	/* set from system and protocol used */