diff -Nur sendmail-8.12.10.orig/devtools/OS/Linux sendmail-8.12.10/devtools/OS/Linux --- sendmail-8.12.10.orig/devtools/OS/Linux 2003-12-17 20:14:54 +0500 +++ sendmail-8.12.10/devtools/OS/Linux 2003-12-17 20:16:37 +0500 @@ -5,9 +5,10 @@ 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') +define(`confSTDIR', `/var/log') APPENDDEF(`confLIBSEARCH', `crypt nsl') define(`confLD', `ld') @@ -15,6 +16,8 @@ define(`confMTLDOPTS', `-lpthread') define(`confLDOPTS_SO', `-shared') define(`confSONAME',`-soname') +define('confSBINGRP', 'mail') +define('confSBINMODE', '6755') ifelse(confBLDVARIANT, `DEBUG', dnl Debug build diff -Nur sendmail-8.12.10.orig/devtools/Site/site.config.m4 sendmail-8.12.10/devtools/Site/site.config.m4 --- sendmail-8.12.10.orig/devtools/Site/site.config.m4 1970-01-01 05:00:00 +0500 +++ sendmail-8.12.10/devtools/Site/site.config.m4 2003-12-17 20:17:16 +0500 @@ -0,0 +1,15 @@ +define(`confMAPDEF', `-DNEWDB -DNIS -DMAP_REGEX -DLDAPMAP -DSOCKETMAP') +define(`confENVDEF', `$(RPM_OPT_FLAGS) -fPIC -DPIC -DXDEBUG=0 -DTCPWRAPPERS -DSASL -DSTARTTLS -I /usr/include/sasl ') +define(`confLIBS', `-ldb -lwrap -lldap -llber -lsasl2 -lcrypt -lgdbm -lssl -lcrypto') +define(`confSTDIO_TYPE', `portable') +define(`confLDOPTS', `-s') +define(`confMANOWN', `root') +define(`confMANGRP', `root') +define(`confMANMODE', `644') +define(`confMAN1SRC', `1') +define(`confMAN5SRC', `5') +define(`confMAN8SRC', `8') +define(`confLDOPTS_SO', `-shared -Wl') +APPENDDEF(`conf_sendmail_ENVDEF', `-DSTARTTLS -DSASL -DFALSE=0 -DTRUE=1 ') +APPENDDEF(`conf_sendmail_LIBS', `-lssl -lcrypto -lsasl2') +APPENDDEF(`conf_sendmail_ENVDEF', `-DMILTER') diff -Nur sendmail-8.12.10.orig/Makefile sendmail-8.12.10/Makefile --- sendmail-8.12.10.orig/Makefile 2003-12-17 20:14:54 +0500 +++ sendmail-8.12.10/Makefile 2003-12-17 20:16:37 +0500 @@ -2,7 +2,7 @@ SHELL= /bin/sh SUBDIRS= libsm libsmutil libsmdb sendmail editmap mail.local \ - mailstats makemap praliases rmail smrsh vacation + mailstats makemap praliases rmail smrsh vacation libmilter # libmilter: requires pthread BUILD= ./Build OPTIONS= $(CONFIG) $(FLAGS) diff -Nur sendmail-8.12.10.orig/sendmail/daemon.c sendmail-8.12.10/sendmail/daemon.c --- sendmail-8.12.10.orig/sendmail/daemon.c 2003-12-17 20:14:54 +0500 +++ sendmail-8.12.10/sendmail/daemon.c 2003-12-17 20:16:37 +0500 @@ -3481,7 +3481,7 @@ /* get result */ p = &ibuf[0]; - nleft = sizeof ibuf - 1; + nleft = sizeof(ibuf) - 1; while ((i = read(s, p, nleft)) > 0) { p += i; diff -Nur sendmail-8.12.10.orig/sendmail/README sendmail-8.12.10/sendmail/README --- sendmail-8.12.10.orig/sendmail/README 2003-12-17 20:14:54 +0500 +++ sendmail-8.12.10/sendmail/README 2003-12-17 20:17:28 +0500 @@ -719,7 +719,7 @@ you should at least set the following variables: APPENDDEF(`conf_sendmail_ENVDEF', `-DSASL') -APPENDDEF(`conf_sendmail_LIBS', `-lsasl') +APPENDDEF(`conf_sendmail_LIBS', `-lsasl2') If you have installed the Cyrus SASL library and include files in a location that your C compiler doesn't use by default you should