rpms/sendmail
5
0
Fork 0
Code Issues Pull Requests Releases Activity

auto-import changelog data from sendmail-8.13.0-1.1.src.rpm

Browse Source 
Wed Jun 30 2004 Thomas Woerner <twoerner@redhat.com> 8.13.0-1.1
- fixed init script to not complain missing sendmail-cf package (#126975)
- better message in /etc/mail/Makefile for missing sendmail-cf package.
This commit is contained in:
cvsdist 2004-09-09 12:27:14 +00:00
parent 67548a7d79
commit da90ff0935
4 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sendmail-8.13.0-cyrus.patch Normal file
View File

@ -0,0 +1,11 @@
--- sendmail-8.13.0/cf/mailer/cyrus.m4.cyrus 2004-06-30 11:47:47.116910591 +0200
+++ sendmail-8.13.0/cf/mailer/cyrus.m4 2004-06-30 11:49:02.262556546 +0200
@@ -36,7 +36,7 @@
#
_DEFIFNOT(`CYRUS_MAILER_FLAGS', `Ah5@/:|')
-ifdef(`CYRUS_MAILER_PATH',, `define(`CYRUS_MAILER_PATH', /usr/cyrus/bin/deliver)')
+ifdef(`CYRUS_MAILER_PATH',, `define(`CYRUS_MAILER_PATH', /usr/lib/cyrus-imapd/deliver)')
ifdef(`CYRUS_MAILER_ARGS',, `define(`CYRUS_MAILER_ARGS', `deliver -e -m $h -- $u')')
ifdef(`CYRUS_MAILER_USER',, `define(`CYRUS_MAILER_USER', `cyrus:mail')')
_DEFIFNOT(`CYRUS_BB_MAILER_FLAGS', `u')

2
sendmail.etc-mail-Makefile
View File

@ -24,7 +24,7 @@ userdb.db: userdb
mv -f $@ $@.bak; \
m4 $< > $@; \
else \
echo "ERROR: package sendmail-cf is not installed.. aborting!"; \
echo -e "WARNING: '$<' is modified. Please install package sendmail-cf to update your configuration."; \
fi
clean:

4
sendmail.init
View File

@ -39,7 +39,7 @@ start() {
echo -n $"Starting $prog: "
if test -x /usr/bin/make -a -f /etc/mail/Makefile ; then
make all -C /etc/mail -s
make all -C /etc/mail -s > /dev/null
else
for i in virtusertable access domaintable mailertable ; do
if [ -f /etc/mail/$i ] ; then
@ -76,7 +76,7 @@ reload() {
echo -n $"reloading $prog: "
/usr/bin/newaliases > /dev/null 2>&1
if [ -x /usr/bin/make -a -f /etc/mail/Makefile ]; then
make all -C /etc/mail -s
make all -C /etc/mail -s > /dev/null
else
for i in virtusertable access domaintable mailertable ; do
if [ -f /etc/mail/$i ] ; then

17
sendmail.spec
View File

@ -18,7 +18,7 @@
Summary: A widely used Mail Transport Agent (MTA).
Name: sendmail
Version: 8.13.0
Release: 1
Release: 1.1
License: Sendmail
Group: System Environment/Daemons
Provides: smtpdaemon
@ -41,6 +41,7 @@ Patch7: sendmail-8.13.0-pid.patch
Patch9: sendmail-8.12.7-hesiod.patch
Patch10: sendmail-8.12.7-manpage.patch
Patch11: sendmail-8.13.0-dynamic.patch
Patch12: sendmail-8.13.0-cyrus.patch
Buildroot: %{_tmppath}/%{name}-root
BuildRequires: tcp_wrappers
BuildRequires: db4-devel
@ -130,6 +131,7 @@ your sendmail.cf file.
%patch9 -p1 -b .hesiod
%patch10 -p1 -b .manpage
%patch11 -p1 -b .dynamic
%patch12 -p1 -b .cyrus
%build
# generate redhat config file
@ -153,7 +155,6 @@ EOF
cat >> redhat.config.m4 << EOF
APPENDDEF(\`confOPTIMIZE', \`-DSM_CONF_SHM=0')
EOF
# %define enable_pie no
%endif
%if "%{enable_pie}" == "yes"
@ -211,9 +212,6 @@ APPENDDEF(\`confLIBS',\`%{l_ldflags mysql .} -lmysqlclient -lz -lm')dnl
EOF
%endif
# set path to cyrus-imapd deliver
perl -pi -e 's:/usr/cyrus/bin/deliver:/usr/lib/cyrus-imapd/deliver:' cf/mailer/cyrus.m4
DIRS="libsmutil sendmail mailstats rmail praliases smrsh makemap"
%if "%{with_milter}" == "yes"
@ -303,11 +301,6 @@ echo "# local-host-names - include all aliases for your machine here." \
echo "# apache, mailman, majordomo, uucp, are good candidates" ) \
> $RPM_BUILD_ROOT/etc/mail/trusted-users
#root=..
#while [ ! -r $RPM_BUILD_ROOT/%{_libdir}/${root}/rootfile ] ; do
# root=${root}/..
#done
#ln -sf ${root}%{_sbindir}/sendmail $RPM_BUILD_ROOT/%{_libdir}/sendmail
ln -sf ../sbin/sendmail $RPM_BUILD_ROOT/usr/lib/sendmail.sendmail
install -d -m775 $RPM_BUILD_ROOT/var/spool/mqueue
install -d -m755 $RPM_BUILD_ROOT/var/spool/clientmqueue
@ -574,6 +567,10 @@ exit 0
%{_docdir}/sendmail
%changelog
* Wed Jun 30 2004 Thomas Woerner <twoerner@redhat.com> 8.13.0-1.1
- fixed init script to not complain missing sendmail-cf package (#126975)
- better message in /etc/mail/Makefile for missing sendmail-cf package.
* Mon Jun 21 2004 Thomas Woerner <twoerner@redhat.com> 8.13.0-1
- new version 8.13.0
- made /etc/mail/Makefile complain missing sendmail-cf package (#123348)