From 35607f7fdfdf8083623dc4f113afddbc8ab36fc3 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 12:22:54 +0000 Subject: auto-import changelog data from sendmail-8.12.10-1.1.1.src.rpm Sun Sep 28 2003 Jakub Jelinek 8.12.10-1.1.1 - build sendmail as PIE Thu Sep 18 2003 Florian La Roche - update to 8.12.10 --- diff --git a/.cvsignore b/.cvsignore index e6e2c5c..9012962 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -sendmail.8.12.8.tar.gz +sendmail.8.12.10.tar.gz diff --git a/sendmail-8.12.2-movefiles.patch b/sendmail-8.12.2-movefiles.patch index bda41c5..41d0870 100644 --- a/sendmail-8.12.2-movefiles.patch +++ b/sendmail-8.12.2-movefiles.patch @@ -43,19 +43,19 @@ configuration file .TP /etc/mail/helpfile ---- sendmail-8.12.2/sendmail/newaliases.0 Sun Jan 13 14:57:15 2002 -+++ sendmail-8.12.2/sendmail/newaliases.0 Tue Feb 19 16:53:19 2002 -@@ -13,7 +13,7 @@ +--- sendmail-8.12.10/sendmail/newaliases.0 ++++ sendmail-8.12.10/sendmail/newaliases.0 +@@ -10,7 +10,7 @@ DDEESSCCRRIIPPTTIIOONN - NNeewwaalliiaasseess rebuilds the random access data base for the -- mail aliases file /etc/mail/aliases. It must be run each -+ mail aliases file /etc/aliases. It must be run each - time this file is changed in order for the change to take - effect. + NNeewwaalliiaasseess rebuilds the random access data base for the mail aliases +- file /etc/mail/aliases. It must be run each time this file is changed ++ file /etc/aliases. It must be run each time this file is changed + in order for the change to take effect. -@@ -27,7 +27,7 @@ - data base that is required by sseennddmmaaiill.. + NNeewwaalliiaasseess is identical to ``sendmail -bi''. +@@ -22,7 +22,7 @@ + sseennddmmaaiill.. FFIILLEESS - /etc/mail/aliases The mail aliases file diff --git a/sendmail-redhat.mc b/sendmail-redhat.mc index 4551f91..89a3279 100644 --- a/sendmail-redhat.mc +++ b/sendmail-redhat.mc @@ -17,7 +17,6 @@ dnl # dnl define(`SMART_HOST',`smtp.your.provider') dnl # define(`confDEF_USER_ID',``8:12'')dnl -define(`confTRUSTED_USER', `smmsp')dnl dnl define(`confAUTO_REBUILD')dnl define(`confTO_CONNECT', `1m')dnl define(`confTRY_NULL_MX_LIST',true)dnl diff --git a/sendmail.etc-mail-Makefile b/sendmail.etc-mail-Makefile index e5b531d..ee4be98 100644 --- a/sendmail.etc-mail-Makefile +++ b/sendmail.etc-mail-Makefile @@ -19,9 +19,10 @@ userdb.db: userdb %.cf: %.mc @if test -f /usr/share/sendmail-cf/m4/cf.m4; then \ + umask 022; \ mv -f $@ $@.bak; \ m4 $< > $@; \ - fi; + fi clean: rm -f *.db *~ diff --git a/sendmail.init b/sendmail.init index dafa761..d1989dc 100644 --- a/sendmail.init +++ b/sendmail.init @@ -14,7 +14,7 @@ . /etc/rc.d/init.d/functions # Source networking configuration. -. /etc/sysconfig/network +[ -f /etc/sysconfig/network ] && . /etc/sysconfig/network # Source sendmail configureation. if [ -f /etc/sysconfig/sendmail ] ; then @@ -27,7 +27,7 @@ fi [ -z "$SMQUEUE" ] && SMQUEUE=1h # Check that networking is up. -[ ${NETWORKING} = "no" ] && exit 0 +[ "${NETWORKING}" = "no" ] && exit 0 [ -f /usr/sbin/sendmail ] || exit 0 @@ -38,7 +38,6 @@ start() { # Start daemons. echo -n $"Starting $prog: " - /usr/bin/newaliases > /dev/null 2>&1 if test -x /usr/bin/make -a -f /etc/mail/Makefile ; then make all -C /etc/mail -s else @@ -48,8 +47,9 @@ start() { fi done fi + /usr/bin/newaliases > /dev/null 2>&1 daemon /usr/sbin/sendmail $([ "x$DAEMON" = xyes ] && echo -bd) \ - $([ -n "$QUEUE" ] && echo -q$QUEUE) + $([ -n "$QUEUE" ] && echo -q$QUEUE) $SENDMAIL_OPTARG RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/sendmail @@ -59,7 +59,7 @@ start() { touch /var/run/sm-client.pid chown smmsp:smmsp /var/run/sm-client.pid daemon --check sm-client /usr/sbin/sendmail -L sm-msp-queue -Ac \ - -q$SMQUEUE + -q $SMQUEUE $SENDMAIL_OPTARG RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/sm-client diff --git a/sendmail.spec b/sendmail.spec index 0a4060f..1e63c81 100644 --- a/sendmail.spec +++ b/sendmail.spec @@ -2,8 +2,8 @@ # If you want to build this on older Red Hat Linux releases, this defines # the version number to build on. Supported should be 62 70 71 72 for # Red Hat Linux 6.2 up to 7.2 and "100" for the current rawhide version. -%define errata 90 -%define release 9 +%define errata 100 +%define release 1.1.1 %if %{errata} <= 70 %define sendmailcf usr/lib/sendmail-cf @@ -19,13 +19,13 @@ Summary: A widely used Mail Transport Agent (MTA). Name: sendmail -Version: 8.12.8 +Version: 8.12.10 %if %{errata} == 100 Release: %{release} %else Release: %{release}.%{errata} %endif -License: BSD +License: Sendmail Group: System Environment/Daemons Provides: smtpdaemon Source0: ftp://ftp.cs.berkeley.edu/ucb/sendmail/sendmail.%{version}.tar.gz @@ -46,10 +46,7 @@ Patch5: sendmail-8.12.2-movefiles.patch Patch7: sendmail-8.12.5-pid.patch Patch9: sendmail-8.12.7-hesiod.patch Patch10: sendmail-8.12.7-manpage.patch -Patch11: sendmail-8.12.8-security.patch -Patch12: sendmail-8.12.9-sec.patch -Patch13: sendmail-8.12.9-security.patch -Patch14: sendmail-8.12.9-security2.patch +Patch11: sendmail-8.12.9-dynamic.patch Buildroot: %{_tmppath}/%{name}-root BuildRequires: gdbm-devel %if %{errata} > 62 @@ -111,6 +108,7 @@ of sendmail. %package cf Summary: The files needed to reconfigure Sendmail. Group: System Environment/Daemons +Requires: m4 %description cf This package includes the configuration files you need to generate the @@ -134,20 +132,17 @@ fi %patch9 -p1 %patch10 -p1 %patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 - -%build -%ifarch s390 -export RPM_OPT_FLAGS="-O1" +%ifarch s390 s390x +# Avoid GOT overflows +perl -pi -e 's/-fpie/-fPIE/' devtools/OS/Linux %endif +%build if test %{errata} -gt 72 ; then sed -e 's,%%{_libdir},%{_libdir},g' \ -e 's,%%{_lib},%{_lib},g' redhat.config.m4.in > redhat.config.m4 fi -if test %{errata} = 73 ; then +if test %{errata} -ge 73 ; then perl -pi -e 's,-ldb-4.0,-ldb,g' redhat.config.m4 fi @@ -287,19 +282,23 @@ install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/etc/mail/Makefile chmod u+w $RPM_BUILD_ROOT/usr/sbin/{mailstats,praliases} chmod u+w $RPM_BUILD_ROOT/usr/bin/rmail -%if %{errata} > 62 +if test %{errata} -gt 90 ; then +install -m755 -d $RPM_BUILD_ROOT%{_libdir}/sasl2 +install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_libdir}/sasl2/Sendmail.conf +install -m 644 %{SOURCE8} $RPM_BUILD_ROOT/etc/pam.d/smtp +elif test %{errata} -gt 62 ; then install -m755 -d $RPM_BUILD_ROOT%{_libdir}/sasl install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_libdir}/sasl/Sendmail.conf install -m 644 %{SOURCE8} $RPM_BUILD_ROOT/etc/pam.d/smtp -%endif +fi install -m 755 -d $RPM_BUILD_ROOT%{_libdir} install -m 644 $OBJDIR/libmilter/libmilter.a $RPM_BUILD_ROOT%{_libdir} install -m 644 $OBJDIR/libsmutil/libsmutil.a $RPM_BUILD_ROOT%{_libdir} install -m 644 $OBJDIR/libsm/libsm.a $RPM_BUILD_ROOT%{_libdir} -# get proper debug-symbol stripping done -chmod 755 $RPM_BUILD_ROOT%{_sbindir}/sendmail +# allow stripping of the sendmail app +chmod 755 $RPM_BUILD_ROOT%{_sbindir}/sendmail %if %{errata} > 72 mv $RPM_BUILD_ROOT%{_sbindir}/sendmail $RPM_BUILD_ROOT%{_sbindir}/sendmail.sendmail @@ -379,7 +378,7 @@ fi # # Oops, these files moved # -if [ -f /etc/sendmail.cw ] ; then +if [ -f /etc/sendmail.cw ]; then cat /etc/sendmail.cw | \ awk 'BEGIN { print "# Entries from obsoleted /etc/sendmail.cw" ;} \ { print $1 }' >> /etc/mail/local-host-names @@ -388,12 +387,13 @@ fi # # Rebuild maps (next reboot will rebuild also) # -{ /usr/bin/newaliases - for map in virtusertable access domaintable mailertable - do - if [ -f /etc/mail/${map} ] ; then +{ + chown root /etc/aliases.db /etc/mail/access.db /etc/mail/mailertable.db \ + /etc/mail/domaintable.db /etc/mail/virtusertable.db + /usr/bin/newaliases + for map in virtusertable access domaintable mailertable ; do + if [ -f /etc/mail/${map} ]; then /usr/bin/makemap hash /etc/mail/${map} < /etc/mail/${map} - sleep 1 fi done } > /dev/null 2>&1 @@ -468,7 +468,7 @@ exit 0 %dir /etc/smrsh %dir /etc/mail -%config /etc/mail/Makefile +%config(noreplace) /etc/mail/Makefile %attr(0644,root,root) %ghost /etc/mail/virtusertable.db %attr(0644,root,root) %config(noreplace) /etc/mail/virtusertable @@ -489,8 +489,8 @@ exit 0 %config %{initdir}/sendmail %if %{errata} > 62 -%config %{_libdir}/sasl/Sendmail.conf -/etc/pam.d/smtp +%config %{_libdir}/sasl*/Sendmail.conf +%config(noreplace) /etc/pam.d/smtp %endif %files cf @@ -509,11 +509,64 @@ exit 0 %{_docdir}/sendmail %changelog +* Tue Sep 28 2003 Jakub Jelinek 8.12.10-1.1.1 +- build sendmail as PIE + +* Thu Sep 18 2003 Florian La Roche +- update to 8.12.10 + * Wed Sep 17 2003 Florian La Roche - add security patches for CAN-2003-0694 and CAN-2003-0681 -* Tue Aug 26 2003 Florian La Roche -- add security patch +* Mon Sep 01 2003 Florian La Roche +- move debug information from sendmail into debuginfo rpm +- on %%post make sure /etc/aliases.db and /etc/mail/*.db is correctly + owned by root +- do not set confTRUSTED_USER to smmsp in sendmail-redhat.mc + +* Fri Aug 08 2003 Florian La Roche +- run "make -C /etc/mail" (maybe generating new sendmail.cf, then newaliases +- added $SENDMAIL_OPTARG that could be set by /etc/sysconfig/sendmail #99224 + +* Wed Jul 30 2003 Florian La Roche +- adjust rpm license tag to say "Sendmail" + +* Fri Jul 04 2003 Florian La Roche +- enable pie only for a few archs +- enable full optims for s390 again, compiler seems to be fixed + +* Mon Jun 30 2003 Florian La Roche +- apply patch from Ulrich Drepper to support -pie + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Sat May 31 2003 Florian La Roche +- make init script more robust #91879 + +* Sun May 11 2003 Florian La Roche +- sendmail-cf requires m4, #90513 + +* Fri May 9 2003 Nalin Dahyabhai 8.12.9-6 +- move Sendmail.conf from /usr/lib/sasl to /usr/lib/sasl2 and change the + default pwcheck method to "saslauthd" + +* Mon May 5 2003 Nalin Dahyabhai 8.12.9-5 +- configure to use libsasl2 instead of libsasl to avoid linking with both + (we also link to libldap, which now uses libsasl2) +- link with -ldb instead of -ldb-4.0 on all releases after RHL 7.3 instead + of just 7.3 (all versions of db4-devel thereafter are expected to provide + the right linking setup) + +* Tue Apr 15 2003 Florian La Roche +- add a "umask 022" before building the *.cf files in /etc/mail/Makefile + +* Fri Apr 04 2003 Florian La Roche +- mark /etc/mail/Makefile as config(noreplace) #87688 +- mark /etc/pam.d/smtp as config(noreplace) #87731 + +* Sun Mar 30 2003 Florian La Roche +- update to 8.12.9 * Wed Mar 26 2003 Florian La Roche - call make with the target "all" #86005 @@ -791,14 +844,14 @@ exit 0 * Fri Feb 16 2001 Tim Powers - don't obsolete postfix and exim, only conflict (for RHN purposes) -* Thu Feb 15 2001 Trond Eivind Glomsr�d +* Thu Feb 15 2001 Trond Eivind Glomsrød - obsolete and conflict with exim and postfix * Wed Feb 14 2001 Florian La Roche - fix devision by zero bug in #20395 - mv /usr/lib/sendmail-cf /usr/share/sendmail-cf -* Wed Feb 7 2001 Trond Eivind Glomsr�d +* Wed Feb 7 2001 Trond Eivind Glomsrød - i18n tweaks to initscript * Wed Feb 07 2001 Florian La Roche @@ -918,7 +971,7 @@ exit 0 * Thu Feb 17 2000 Cristian Gafton - break the hard link for makemap and create it as a symlnk (#8223) -* Thu Feb 17 2000 Bernhard Rosenkr�nzer +* Thu Feb 17 2000 Bernhard Rosenkränzer - Fix location of mailertable (Bug #6035) * Sat Feb 5 2000 Bill Nottingham diff --git a/sources b/sources index 8c49581..5b0324b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -71b4ce8276536b82d4acdf6ec8be306a sendmail.8.12.8.tar.gz +393f5d09d462f522c8288363870b2b42 sendmail.8.12.10.tar.gz