e861a83e20
- print warning on service start when sendmail-cf is required (#447148) - replace Makefile with shell script to avoid dependency on make (#467841) - fix multiarch conflicts (#343161) - preserve timestamps on config files - gzip RELEASE_NOTES - defuzz patches - drop gcc2690 patch
61 lines
2.2 KiB
Diff
61 lines
2.2 KiB
Diff
diff -up sendmail-8.14.3/cf/cf/Build.makemapman sendmail-8.14.3/cf/cf/Build
|
|
--- sendmail-8.14.3/cf/cf/Build.makemapman 1999-03-02 03:37:12.000000000 +0100
|
|
+++ sendmail-8.14.3/cf/cf/Build 2008-12-02 18:04:37.000000000 +0100
|
|
@@ -18,7 +18,7 @@
|
|
SMROOT=${SMROOT-../..}
|
|
BUILDTOOLS=${BUILDTOOLS-$SMROOT/devtools}
|
|
|
|
-M4=`sh $BUILDTOOLS/bin/find_m4.sh`
|
|
+M4=/usr/bin/m4
|
|
ret=$?
|
|
if [ $ret -ne 0 ]
|
|
then
|
|
diff -up sendmail-8.14.3/devtools/OS/Linux.makemapman sendmail-8.14.3/devtools/OS/Linux
|
|
--- sendmail-8.14.3/devtools/OS/Linux.makemapman 2002-03-22 00:59:25.000000000 +0100
|
|
+++ sendmail-8.14.3/devtools/OS/Linux 2008-12-02 18:06:18.000000000 +0100
|
|
@@ -5,7 +5,7 @@ dnl Place personal settings in devtools/
|
|
|
|
define(`confDEPEND_TYPE', `CC-M')
|
|
define(`confSM_OS_HEADER', `sm_os_linux')
|
|
-define(`confMANROOT', `/usr/man/man')
|
|
+define(`confMANROOT', `/usr/share/man/man')
|
|
define(`confLIBS', `-ldl')
|
|
define(`confEBINDIR', `/usr/sbin')
|
|
APPENDDEF(`confLIBSEARCH', `crypt nsl')
|
|
@@ -15,6 +15,8 @@ define(`confMTCCOPTS', `-D_REENTRANT')
|
|
define(`confMTLDOPTS', `-lpthread')
|
|
define(`confLDOPTS_SO', `-shared')
|
|
define(`confSONAME',`-soname')
|
|
+define('confSBINGRP', 'mail')
|
|
+define('confSBINMODE', '6755')
|
|
|
|
ifelse(confBLDVARIANT, `DEBUG',
|
|
dnl Debug build
|
|
diff -up sendmail-8.14.3/makemap/makemap.8.makemapman sendmail-8.14.3/makemap/makemap.8
|
|
--- sendmail-8.14.3/makemap/makemap.8.makemapman 2008-05-03 01:07:48.000000000 +0200
|
|
+++ sendmail-8.14.3/makemap/makemap.8 2008-12-02 18:04:37.000000000 +0100
|
|
@@ -52,12 +52,6 @@ selected using the
|
|
parameter.
|
|
They may be
|
|
.TP
|
|
-dbm
|
|
-DBM format maps.
|
|
-This requires the
|
|
-ndbm(3)
|
|
-library.
|
|
-.TP
|
|
btree
|
|
B-Tree format maps.
|
|
This requires the new Berkeley DB
|
|
diff -up sendmail-8.14.3/rmail/rmail.c.makemapman sendmail-8.14.3/rmail/rmail.c
|
|
--- sendmail-8.14.3/rmail/rmail.c.makemapman 2001-09-18 23:45:29.000000000 +0200
|
|
+++ sendmail-8.14.3/rmail/rmail.c 2008-12-02 18:04:37.000000000 +0100
|
|
@@ -276,7 +276,6 @@ main(argc, argv)
|
|
args[i++] = _PATH_SENDMAIL; /* Build sendmail's argument list. */
|
|
args[i++] = "-G"; /* relay submission */
|
|
args[i++] = "-oee"; /* No errors, just status. */
|
|
- args[i++] = "-odq"; /* Queue it, don't try to deliver. */
|
|
args[i++] = "-oi"; /* Ignore '.' on a line by itself. */
|
|
|
|
/* set from system and protocol used */
|