Date: Fri, 12 May 2000 05:10:51 GMT From: Udo Schweigert <ust@cert.siemens.de> To: FreeBSD-gnats-submit@freebsd.org Subject: misc/18512: Change request: Upgrade to sendmail-8.10.1 Message-ID: <200005120510.e4C5Apm55591@alaska.cert.siemens.de>
next in thread | raw e-mail | index | archive | help
>Number: 18512 >Category: misc >Synopsis: Upgrade to sendmail-8.10.1 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu May 11 22:20:00 PDT 2000 >Closed-Date: >Last-Modified: >Originator: Udo Schweigert >Release: FreeBSD 5.0-CURRENT i386 >Organization: Siemens AG, ZT Ik 3 >Environment: FreeBSD 5.0-CURRENT >Description: -CURRENT at the moment stays with sendmail-8.9.3. Since sendmail-8.10.1 has many new, interesting features (multiple queues, etc.) I would vote for an upgrade. >How-To-Repeat: >Fix: 1. Download sendmail.8.10.1.tar.gz $ fetch ftp://ftp.sendmail.org/pub/sendmail/sendmail.8.10.1.tar.gz 2. Unpack at /tmp $ cd /tmp $ tar xzvf sendmail.8.10.1.tar.gz 3. Copy to /usr/src/contrib $ cd /tmp/sendmail-8.10.1 $ pax -rw -v . /usr/src/contrib/sendmail 4. Apply the included patch $ cd /usr/src $ patch -p3 < /home/ust/sendmail-8.10.1.diff 5. make world ================== sendmail-8.10.1.diff ======================== diff -ruN /usr/src.saved/etc/sendmail/freebsd.mc /usr/src/etc/sendmail/freebsd.mc --- /usr/src.saved/bin/rmail/Makefile Sat Aug 28 01:15:02 1999 +++ /usr/src/bin/rmail/Makefile Thu May 11 20:47:17 2000 @@ -6,11 +6,12 @@ PROG= rmail MAN8= rmail.8 -# If you want to have your rmail queuing the mail only, uncomment the -# following: -# CFLAGS+= -DQUEUE_ONLY +CFLAGS+=-I${.CURDIR}/../../contrib/sendmail/include # Not much point this being static. It calls a shared sendmail... NOSHARED?= NO + +LDADD+= -lsmutil +DPADD+= -lsmutil .include <bsd.prog.mk> diff -ruN /usr/src.saved/etc/sendmail/freebsd.mc /usr/src/etc/sendmail/freebsd.mc --- /usr/src.saved/etc/sendmail/freebsd.mc Wed Dec 29 19:20:23 1999 +++ /usr/src/etc/sendmail/freebsd.mc Thu May 11 22:37:13 2000 @@ -43,7 +43,7 @@ # divert(0)dnl -VERSIONID(`$FreeBSD: src/etc/sendmail/freebsd.mc,v 1.10 1999/12/29 18:20:23 peter Exp $') +VERSIONID(`$FreeBSD: src/etc/sendmail/freebsd.mc,v 1.10 ust Exp $') OSTYPE(bsd4.4)dnl DOMAIN(generic)dnl FEATURE(relay_based_on_MX)dnl @@ -59,7 +59,8 @@ dnl Dialup users should uncomment and define this appropriately dnl define(`SMART_HOST', `your.isp.mail.server')dnl FEATURE(local_lmtp)dnl -define(`LOCAL_MAILER_FLAGS', LOCAL_MAILER_FLAGS`'P)dnl +define(`ALIAS_FILE',`/etc/aliases') +define(`LOCAL_MAILER_FLAGS', LOCAL_MAILER_FLAGS`'PS)dnl define(`confCW_FILE', `-o /etc/mail/sendmail.cw')dnl define(`confNO_RCPT_ACTION', `add-to-undisclosed')dnl define(`confMAX_MIME_HEADER_LENGTH', `256/128')dnl diff -ruN /usr/src.saved/lib/Makefile /usr/src/lib/Makefile --- /usr/src.saved/lib/Makefile Tue May 2 21:00:50 2000 +++ /usr/src/lib/Makefile Thu May 11 18:42:07 2000 @@ -26,7 +26,7 @@ libftpio libgnumalloc ${_libio} libipsec libipx libkvm libmenu \ ${_libncp} \ libnetgraph libopie libpam libpanel libpcap \ - libposix1e libresolv librpcsvc libss \ + libposix1e libresolv librpcsvc libsmutil libsmdb libss \ libstand ${_libtelnet} ${_libvgl} libwrap libxpg4 liby libz .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-${OBJFORMAT}) diff -ruN /usr/src.saved/lib/libsmdb/Makefile /usr/src/lib/libsmdb/Makefile --- /usr/src.saved/lib/libsmdb/Makefile Thu Jan 1 01:00:00 1970 +++ /usr/src/lib/libsmdb/Makefile Thu May 11 17:47:56 2000 @@ -0,0 +1,18 @@ +# +# $FreeBSD$ +# + +MAINTAINER= + +LIB= smdb +NOPIC= YES + +.PATH: ${.CURDIR}/../../contrib/sendmail/libsmdb + +CFLAGS+= -I${.CURDIR}/../../contrib/sendmail/include \ + -I${.CURDIR}/../../contrib/sendmail/sendmail + +SRCS= smdb.c smdb1.c smdb2.c smndbm.c + + +.include <bsd.lib.mk> diff -ruN /usr/src.saved/lib/libsmutil/Makefile /usr/src/lib/libsmutil/Makefile --- /usr/src.saved/lib/libsmutil/Makefile Thu Jan 1 01:00:00 1970 +++ /usr/src/lib/libsmutil/Makefile Thu May 11 17:46:11 2000 @@ -0,0 +1,17 @@ +# +# $FreeBSD$ +# + +MAINTAINER= + +LIB= smutil +NOPIC= YES + +.PATH: ${.CURDIR}/../../contrib/sendmail/libsmutil + +CFLAGS+= -I${.CURDIR}/../../contrib/sendmail/include \ + -I${.CURDIR}/../../contrib/sendmail/sendmail + +SRCS= debug.c errstring.c lockfile.c safefile.c snprintf.c strl.c + +.include <bsd.lib.mk> diff -ruN /usr/src.saved/libexec/mail.local/Makefile /usr/src/libexec/mail.local/Makefile --- /usr/src.saved/libexec/mail.local/Makefile Sat Aug 28 02:09:38 1999 +++ /usr/src/libexec/mail.local/Makefile Thu May 11 20:08:03 2000 @@ -1,13 +1,14 @@ # @(#)Makefile 8.1 (Berkeley) 7/19/93 # $FreeBSD: src/libexec/mail.local/Makefile,v 1.10 1999/08/28 00:09:38 peter Exp $ -.PATH: ${.CURDIR}/../../contrib/sendmail/mail.local \ - ${.CURDIR}/../../contrib/sendmail/src +.PATH: ${.CURDIR}/../../contrib/sendmail/mail.local + +CFLAGS+=-I${.CURDIR}/../../contrib/sendmail/include +LDADD= -lsmutil +DPADD= -lsmutil PROG= mail.local -SRCS= mail.local.c snprintf.c +SRCS= mail.local.c MAN8= mail.local.8 -BINMODE=4555 -INSTALLFLAGS=-fschg .include <bsd.prog.mk> diff -ruN /usr/src.saved/libexec/smrsh/Makefile /usr/src/libexec/smrsh/Makefile --- /usr/src.saved/libexec/smrsh/Makefile Tue Aug 4 17:31:31 1998 +++ /usr/src/libexec/smrsh/Makefile Thu May 11 22:26:28 2000 @@ -4,6 +4,8 @@ PROG= smrsh MAN8= smrsh.8 -CFLAGS+=-I${.CURDIR}/../../contrib/sendmail/src -DNEWDB +CFLAGS+=-I${.CURDIR}/../../contrib/sendmail/include -DNEWDB +LDADD= -lsmutil +DPADD= -lsmutil .include <bsd.prog.mk> diff -ruN /usr/src.saved/usr.sbin/mailstats/Makefile /usr/src/usr.sbin/mailstats/Makefile --- /usr/src.saved/usr.sbin/mailstats/Makefile Tue Aug 4 17:25:32 1998 +++ /usr/src/usr.sbin/mailstats/Makefile Thu May 11 14:49:40 2000 @@ -2,7 +2,8 @@ PROG= mailstats MAN8= mailstats.8 -CFLAGS+=-I${.CURDIR}/../../contrib/sendmail/src +CFLAGS+=-I${.CURDIR}/../../contrib/sendmail/include \ + -I${.CURDIR}/../../contrib/sendmail/sendmail .PATH: ${.CURDIR}/../../contrib/sendmail/mailstats diff -ruN /usr/src.saved/usr.sbin/makemap/Makefile /usr/src/usr.sbin/makemap/Makefile --- /usr/src.saved/usr.sbin/makemap/Makefile Fri Aug 7 01:01:49 1998 +++ /usr/src/usr.sbin/makemap/Makefile Thu May 11 17:55:59 2000 @@ -1,12 +1,15 @@ # @(#)Makefile 8.4 (Berkeley) 6/10/97 PROG= makemap -SRCS= makemap.c safefile.c snprintf.c +SRCS= makemap.c MAN8= makemap.8 -CFLAGS+=-I${.CURDIR}/../../contrib/sendmail/src -DNEWDB -DNOT_SENDMAIL -.PATH: ${.CURDIR}/../../contrib/sendmail/makemap \ - ${.CURDIR}/../../contrib/sendmail/src +CFLAGS+=-I${.CURDIR}/../../contrib/sendmail/include \ + -I${.CURDIR}/../../contrib/sendmail/sendmail \ + -DNEWDB -DNIS -DMAP_REGEX -DNOT_SENDMAIL +LDADD+= -lsmdb -lsmutil +DPADD+= -lsmdb -lsmutil +.PATH: ${.CURDIR}/../../contrib/sendmail/makemap .include <bsd.prog.mk> diff -ruN /usr/src.saved/usr.sbin/praliases/Makefile /usr/src/usr.sbin/praliases/Makefile --- /usr/src.saved/usr.sbin/praliases/Makefile Tue Aug 4 17:26:57 1998 +++ /usr/src/usr.sbin/praliases/Makefile Thu May 11 17:56:35 2000 @@ -4,6 +4,11 @@ PROG= praliases MAN8= praliases.8 -CFLAGS+=-I${.CURDIR}/../../contrib/sendmail/src -DNEWDB + +CFLAGS+=-I${.CURDIR}/../../contrib/sendmail/include \ + -I${.CURDIR}/../../contrib/sendmail/sendmail \ + -DNEWDB -DNIS -DMAP_REGEX -DNOT_SENDMAIL +LDADD+= -lsmdb -lsmutil +DPADD+= -lsmdb -lsmutil .include <bsd.prog.mk> diff -ruN /usr/src.saved/usr.sbin/sendmail/Makefile /usr/src/usr.sbin/sendmail/Makefile --- /usr/src.saved/usr.sbin/sendmail/Makefile Wed Dec 29 19:56:55 1999 +++ /usr/src/usr.sbin/sendmail/Makefile Thu May 11 17:52:47 2000 @@ -1,7 +1,7 @@ # @(#)Makefile 8.8 (Berkeley) 3/28/97 # $FreeBSD: src/usr.sbin/sendmail/Makefile,v 1.15 1999/12/29 18:56:55 peter Exp $ -SMDIR= ${.CURDIR}/../../contrib/sendmail/src +SMDIR= ${.CURDIR}/../../contrib/sendmail/sendmail .PATH: ${SMDIR} BINDIR?=/usr/libexec/sendmail @@ -17,17 +17,19 @@ # Map extensions MAPS= -DMAP_REGEX -CFLAGS+=-I${SMDIR} ${DBMDEF} ${NIS} -DTCPWRAPPERS ${MAPS} +CFLAGS+=-I${SMDIR} -I${SMDIR}/../include ${DBMDEF} ${NIS} -DTCPWRAPPERS ${MAPS} CFLAGS+=-D_FFR_MAX_MIME_HEADER_LENGTH CFLAGS+=-D_FFR_MAX_HEADERS_LENGTH -SRCS= alias.c arpadate.c clock.c collect.c conf.c control.c convtime.c \ - daemon.c deliver.c domain.c envelope.c err.c headers.c macro.c \ - main.c map.c mci.c mime.c parseaddr.c queue.c readcf.c recipient.c \ - safefile.c savemail.c snprintf.c srvrsmtp.c stab.c stats.c \ - sysexits.c trace.c udb.c usersmtp.c util.c version.c -DPADD= ${LIBUTIL} ${LIBWRAP} -LDADD= -lutil -lwrap +SRCS= alias.c arpadate.c bf_torek.c clock.c collect.c conf.c \ + control.c convtime.c daemon.c deliver.c domain.c envelope.c err.c \ + headers.c macro.c main.c map.c mci.c milter.c mime.c parseaddr.c \ + queue.c readcf.c recipient.c savemail.c sfsasl.c shmticklib.c \ + srvrsmtp.c stab.c stats.c sysexits.c timers.c trace.c udb.c \ + usersmtp.c util.c version.c + +DPADD= ${LIBUTIL} ${LIBWRAP} -lsmutil +LDADD= -lutil -lwrap -lsmutil MAN1= mailq.1 newaliases.1 MAN5= aliases.5 MAN8= sendmail.8 @@ -36,8 +38,11 @@ beforeinstall: ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \ ${DESTDIR}/var/log/sendmail.st - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${SMDIR}/sendmail.hf \ - ${DESTDIR}/usr/share/misc + @if [ -f ${DESTDIR}/usr/share/misc/sendmail.hf ]; then \ + rm -f ${DESTDIR}/usr/share/misc/sendmail.hf; \ + fi + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${SMDIR}/helpfile \ + ${DESTDIR}/usr/share/misc/sendmail-helpfile afterinstall: @if [ -d ${DESTDIR}/etc/mail -a -f ${DESTDIR}/etc/sendmail.cf -a \ >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200005120510.e4C5Apm55591>