Hello community,
here is the log from the commit of package sendmail for openSUSE:Factory checked in at 2017-04-13 10:45:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sendmail (Old)
and /work/SRC/openSUSE:Factory/.sendmail.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sendmail"
Thu Apr 13 10:45:55 2017 rev:77 rq:487576 version:8.15.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/sendmail/sendmail.changes 2017-03-13 15:35:16.923025908 +0100
+++ /work/SRC/openSUSE:Factory/.sendmail.new/sendmail.changes 2017-04-13 10:46:11.487912255 +0200
@@ -1,0 +2,25 @@
+Wed Apr 12 13:36:38 UTC 2017 - werner@suse.de
+
+- Add bitdomain and uudomain to possible targets for refresh
+
+-------------------------------------------------------------------
+Wed Apr 12 08:43:12 UTC 2017 - werner@suse.de
+
+- Change spec file name scheme used for getting soname down into
+ libmilter
+
+-------------------------------------------------------------------
+Tue Apr 11 11:33:02 UTC 2017 - jengelh@inai.de
+
+- Replace a find|xargs rm by -delete
+
+-------------------------------------------------------------------
+Thu Mar 23 09:34:38 UTC 2017 - werner@suse.de
+
+- New package libmilter1_0 for the shared library version of
+ libmilter, the Sendmail Content Management API
+- Also new package libmilter-doc for the substantial documentation
+ about Sendmail Content Management API (milter)
+- Make sendmail-tls a noarch package
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sendmail.spec ++++++
--- /var/tmp/diff_new_pack.Om1irY/_old 2017-04-13 10:46:14.455492586 +0200
+++ /var/tmp/diff_new_pack.Om1irY/_new 2017-04-13 10:46:14.459492020 +0200
@@ -23,6 +23,11 @@
%global with_sysvinit 1
%endif
%bcond_with sysvinit
+%define libmilter_somajor 1
+%define libmilter_sominor 0
+%define libmilter_sopatch 1
+%define libmilter_soversion %{libmilter_somajor}.%{libmilter_sominor}.%{libmilter_sopatch}
+%define libmilter_soname libmilter.so.%{libmilter_somajor}.%{libmilter_sominor}
Name: sendmail
BuildRequires: cyrus-sasl-devel
@@ -112,12 +117,6 @@
"sendmail" is a trademark of Sendmail, Inc.
-
-
-Authors:
---------
- Eric Allman
-
%package -n sendmail-devel
Summary: BSD Sendmail Development Kit
Group: Development/Libraries/Other
@@ -128,17 +127,47 @@
"sendmail" is a trademark of Sendmail, Inc.
+%package -n libmilter%{libmilter_somajor}_%{libmilter_sominor}
+Summary: BSD Sendmail Content Management API (milter)
+Group: System/Libraries
+Requires: sendmail >= 8.13
+
+%description -n libmilter%{libmilter_somajor}_%{libmilter_sominor}
+Sendmail's Content Management API (milter) provides third-party programs to
+access mail messages as they are being processed by the Mail Transfer Agent
+(MTA), allowing them to examine and modify message content and
+meta-information. Filtering policies implemented by Milter-conformant filters
+may then be centrally configured and composed in an end-user's MTA
+configuration file.
+"sendmail" is a trademark of Sendmail, Inc.
+
+%package -n libmilter-doc
+Summary: BSD Sendmail Content Management API (milter)
+Group: Documentation/HTML
+Requires: libmilter%{libmilter_somajor}_%{libmilter_sominor}
+%if 0%{?suse_version} > 1140
+BuildArch: noarch
+%endif
-Authors:
---------
- Eric Allman
+%description -n libmilter-doc
+Sendmail's Content Management API (milter) provides third-party programs to
+access mail messages as they are being processed by the Mail Transfer Agent
+(MTA), allowing them to examine and modify message content and
+meta-information. Filtering policies implemented by Milter-conformant filters
+may then be centrally configured and composed in an end-user's MTA
+configuration file.
+
+"sendmail" is a trademark of Sendmail, Inc.
%package -n sendmail-starttls
Summary: BSD Sendmail Starttls helper scripts
Group: Productivity/Networking/Security
Requires: cyrus-sasl-saslauthd
Requires: openssl
+%if 0%{?suse_version} > 1140
+BuildArch: noarch
+%endif
%description -n sendmail-starttls
This package includes the directory layout as well as some useful
@@ -156,18 +185,12 @@
Rmail interprets incoming mail received via uucp and passing the
processed mail on to the MTA (e.g. sendmail).
-
-
-Authors:
---------
- Eric Allman
-
%prep
%setup -n sendmail-%{version}
%patch1 -p0 -b .select
-%patch0 -p0 -b .p0
%patch4 -p0 -b .m4head
%patch5 -p1 -b .fdmilt
+%patch0 -p0 -b .p0
tar --strip-components=1 -xf %{S:1}
set -f
cat <<-EOF > file-list
@@ -186,6 +209,17 @@
%%config %%attr(0644,root,root) %{_sysconfdir}/permissions.d/sendmail
%%config %%attr(0644,root,root) %{_sysconfdir}/permissions.d/sendmail.paranoid
EOF
+ cat <<-EOF > milterversion.c
+ #include "libmilter/mfapi.h"
+ #include
+ int main()
+ {
+ return printf("%d.%d.%d\n",
+ SM_LM_VRS_MAJOR(SMFI_VERSION),
+ SM_LM_VRS_MINOR(SMFI_VERSION),
+ SM_LM_VRS_PLVL(SMFI_VERSION)) > 0 ? 0 : 1;
+ }
+ EOF
set +f
%build
@@ -194,6 +228,13 @@
RPM_OPT_FLAGS="%{optflags} -fno-strict-aliasing -D_GNU_SOURCE"
ARCH_LIB=%{_lib}
export ARCH_LIB
+ gcc $RPM_OPT_FLAGS -I./include -o milterversion milterversion.c
+ MILTERVERSION=$(./milterversion)
+ test %libmilter_soversion = $MILTERVERSION || exit 1
+ sed -ri -e 's/@sm_libmilter_somajor@/%{libmilter_somajor}/' \
+ -e 's/@sm_libmilter_soname@/%{libmilter_soname}/' \
+ -e 's/@sm_libmilter_soversion@/%{libmilter_soversion}/' \
+ devtools/Site/site.config.m4
make clean
# ingnore vacation (we have our own)
make %{?_smp_mflags} SUBDIRS="%{SUBDIRS}"
@@ -224,6 +265,7 @@
type -p install
fi
mkdir -p ${doc}
+ mkdir -p ${doc}/libmilter
mkdir -p %{buildroot}/sbin/conf.d
mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_sbindir}
@@ -339,11 +381,11 @@
rm -f %{buildroot}%{_datadir}/sendmail/cf/Makefile
rm -f %{buildroot}%{_datadir}/sendmail/cf/*.cf
rm -fr %{buildroot}%{_datadir}/sendmail/*/*~ ${doc}/*~
- find %{buildroot}%{_datadir}/sendmail/ ${doc}/ %{buildroot}%{_includedir}/ \
+ find %{buildroot}%{_datadir}/sendmail/ ${doc}/ %{buildroot}%{_includedir}/ "(" \
-name '*.ldap' -o -name '*.mime' -o \
-name '*.mrbl' -o -name '*.util' -o \
-name '*.p0' -o -name '*.auth2' -o \
- -name '*.dif' -o -name '*.orig' | xargs -r rm -f
+ -name '*.dif' -o -name '*.orig' ")" -delete
cd suse/
# etc/aliases and %{_sysconfdir}/aliases.d are in other packages
#install -m 0644 aliases %{buildroot}%{_sysconfdir}/
@@ -366,6 +408,9 @@
install -m 0644 smtp %{buildroot}%{_sysconfdir}/pam.d/smtp
install -m 0644 fw %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/sendmail
install update.sendmail %{buildroot}%{_libexecdir}/sendmail.d/update
+%if 0%{?suse_version} <= 1140
+ sed -ri 's/,,//g' %{buildroot}%{_libexecdir}/sendmail.d/update
+%endif
cat > %{buildroot}%{_sbindir}/config.sendmail <<-'EOF'
#!/bin/bash
VERBOSE=true exec %{_libexecdir}/sendmail.d/update
@@ -424,6 +469,11 @@
chmod 0755 %{buildroot}/%{_mailcnfdir}/system/sm-client.pre
%endif
#
+ # Documentation for libmilter
+ #
+ install -m 0644 libmilter/docs/* ${doc}/libmilter/
+
+ #
# Remove some files we don't wish to package
#
rm -f %{buildroot}%{_sysconfdir}/aliases %{buildroot}%{_mailcnfdir}/*.db
@@ -534,6 +584,9 @@
VERBOSE=false %{_libexecdir}/sendmail.d/update
fi
+%post -n libmilter%{libmilter_somajor}_%{libmilter_sominor} -p /sbin/ldconfig
+%postun -n libmilter%{libmilter_somajor}_%{libmilter_sominor} -p /sbin/ldconfig
+
%files -f file-list
%defattr(-,root,root)
%dir %{_mailcnfdir}
@@ -568,6 +621,9 @@
%config(noreplace) %verify(not md5 size mtime) %{_mailcnfdir}/local-host-names
%config(noreplace) %verify(not md5 size mtime) %{_mailcnfdir}/submit.cf
%doc %{_defaultdocdir}/sendmail
+%exclude %{_defaultdocdir}/sendmail/README.libmilter
+%exclude %dir %{_defaultdocdir}/sendmail/libmilter
+%exclude %{_defaultdocdir}/sendmail/libmilter/*
%{_datadir}/sendmail
%{_localstatedir}/adm/fillup-templates/sysconfig.sendmail
%{_localstatedir}/adm/fillup-templates/sysconfig.mail-sendmail
@@ -619,7 +675,7 @@
%{_sbindir}/sendmail.nissl
%{_sbindir}/rcsendmail*
-%files -n sendmail-devel
+%files devel
%defattr(-,root,root)
%dir %{_includedir}/libmilter
%{_includedir}/libmilter/*.h
@@ -628,9 +684,20 @@
%dir %{_includedir}/sm/os
%{_includedir}/sm/os/*.h
%{_libdir}/libmilter.a
+%{_libdir}/libmilter.so
%{_libdir}/libsmutil.a
%{_libdir}/libsm.a
+%files -n libmilter%{libmilter_somajor}_%{libmilter_sominor}
+%defattr(-,root,root)
+%{_libdir}/libmilter.so.*
+%doc %{_defaultdocdir}/sendmail/README.libmilter
+
+%files -n libmilter-doc
+%defattr(-,root,root)
+%dir %doc %{_defaultdocdir}/sendmail/libmilter/
+%doc %{_defaultdocdir}/sendmail/libmilter/*
+
%files -n sendmail-starttls
%defattr(-,root,root)
%dir %attr(0700,root,root) %{_mailcnfdir}/certs/certs/
++++++ sendmail-8.14.8-m4header.patch ++++++
--- /var/tmp/diff_new_pack.Om1irY/_old 2017-04-13 10:46:14.491487496 +0200
+++ /var/tmp/diff_new_pack.Om1irY/_new 2017-04-13 10:46:14.491487496 +0200
@@ -1,10 +1,10 @@
---
- devtools/M4/header.m4 | 1 +
- 1 file changed, 1 insertion(+)
+ devtools/M4/header.m4 | 4 ++++
+ 1 file changed, 4 insertions(+)
--- devtools/M4/header.m4
+++ devtools/M4/header.m4 2016-04-14 07:36:39.329213548 +0000
-@@ -31,6 +31,7 @@ define(`confSHAREDLIB_EXT', `.so')
+@@ -31,7 +31,11 @@ define(`confSHAREDLIB_EXT', `.so')
define(`confSITECONFIG', `site.config')
define(`confBUILDBIN', `${SRCDIR}/devtools/bin')
define(`confRANLIB', `echo')
@@ -12,3 +12,7 @@
define(`PUSHDIVERT', `pushdef(`__D__', divnum)divert($1)')
define(`POPDIVERT', `divert(__D__)popdef(`__D__')')
define(`APPENDDEF', `define(`$1', ifdef(`$1', `$1 $2', `$2'))')
+ define(`PREPENDDEF', `define(`$1', ifdef(`$1', `$2 $1', `$2'))')
++define(`REPLACEDEF', `define(`_$1', `esyscmd(`x='$1`;echo -n ${x//$2/$3}')')dnl
++define(`$1', _$1)dnl
++undefine(`_$1')')
++++++ sendmail-8.15.2.dif ++++++
--- /var/tmp/diff_new_pack.Om1irY/_old 2017-04-13 10:46:14.499486365 +0200
+++ /var/tmp/diff_new_pack.Om1irY/_new 2017-04-13 10:46:14.499486365 +0200
@@ -26,12 +26,11 @@
contrib/smcontrol.pl | 2 -
devtools/M4/UNIX/manpage.m4 | 2 -
devtools/M4/depend/CC-M.m4 | 2 -
- devtools/M4/header.m4 | 3 ++
devtools/OS/Linux | 3 +-
devtools/bin/install.sh | 5 ++-
doc/op/op.me | 52 +++++++++++++++++++-------------------
include/sm/conf.h | 48 +++++++++++++++++++++++++++--------
- libmilter/Makefile.m4 | 2 +
+ libmilter/Makefile.m4 | 28 ++++++++++++++++++++
libsm/Makefile.m4 | 3 ++
libsm/inet6_ntop.c | 2 -
libsmutil/Makefile.m4 | 3 ++
@@ -51,10 +50,10 @@
smrsh/README | 32 +++++++++++------------
smrsh/smrsh.8 | 25 ++++++++----------
vacation/vacation.c | 3 ++
- 52 files changed, 264 insertions(+), 139 deletions(-)
+ 51 files changed, 287 insertions(+), 139 deletions(-)
--- cf/README
-+++ cf/README 2016-04-14 07:28:41.690015988 +0000
++++ cf/README 2017-03-22 18:07:23.194336265 +0000
@@ -364,7 +364,7 @@ LOCAL_MAILER_DSN_DIAGNOSTIC_CODE
local mailer. This should be changed with care.
LOCAL_SHELL_PATH [/bin/sh] The shell used to deliver piped email.
@@ -65,7 +64,7 @@
mail.
LOCAL_SHELL_DIR [$z:/] The directory search path in which the
--- cf/domain/generic.m4
-+++ cf/domain/generic.m4 2016-04-14 07:28:41.690015988 +0000
++++ cf/domain/generic.m4 2017-03-22 18:07:23.194336265 +0000
@@ -25,4 +25,4 @@ define(`confFORWARD_PATH', `$z/.forward.
define(`confMAX_HEADERS_LENGTH', `32768')dnl
FEATURE(`redirect')dnl
@@ -73,7 +72,7 @@
-EXPOSED_USER(`root')
+ifdef(`_MAILER_uucp_', `EXPOSED_USER(`root uucp')',`EXPOSED_USER(`root')')dnl
--- cf/feature/masquerade_envelope.m4
-+++ cf/feature/masquerade_envelope.m4 2016-04-14 07:28:41.690015988 +0000
++++ cf/feature/masquerade_envelope.m4 2017-03-22 18:07:23.194336265 +0000
@@ -17,3 +17,5 @@ VERSIONID(`$Id: masquerade_envelope.m4,v
divert(-1)
@@ -81,7 +80,7 @@
+
+divert(0)dnl
--- cf/feature/msp.m4
-+++ cf/feature/msp.m4 2016-04-14 07:28:41.690015988 +0000
++++ cf/feature/msp.m4 2017-03-22 18:07:23.194336265 +0000
@@ -20,7 +20,7 @@ define(`confPRIVACY_FLAGS', `goaway,noet
define(`confDONT_PROBE_INTERFACES', `True')
dnl ---------------------------------------------
@@ -111,7 +110,7 @@
LOCAL_RULESETS
SLocal_localaddr
--- cf/feature/use_cw_file.m4
-+++ cf/feature/use_cw_file.m4 2016-04-14 07:28:41.690015988 +0000
++++ cf/feature/use_cw_file.m4 2017-03-22 18:07:23.198336192 +0000
@@ -22,4 +22,4 @@ divert(-1)
define(`USE_CW_FILE', `')
@@ -119,7 +118,7 @@
-divert(0)
+divert(0)dnl
--- cf/m4/cfhead.m4
-+++ cf/m4/cfhead.m4 2016-04-14 07:28:41.690015988 +0000
++++ cf/m4/cfhead.m4 2017-03-22 18:07:23.198336192 +0000
@@ -304,6 +304,7 @@ define(`confMILTER_MACROS_HELO', ``{tls_
define(`confMILTER_MACROS_ENVFROM', ``i, {auth_type}, {auth_authen}, {auth_ssf}, {auth_author}, {mail_mailer}, {mail_host}, {mail_addr}'')
define(`confMILTER_MACROS_ENVRCPT', ``{rcpt_mailer}, {rcpt_host}, {rcpt_addr}'')
@@ -129,7 +128,7 @@
divert(0)dnl
--- cf/m4/proto.m4
-+++ cf/m4/proto.m4 2016-04-14 07:28:41.690015988 +0000
++++ cf/m4/proto.m4 2017-03-22 18:07:23.198336192 +0000
@@ -1279,6 +1279,12 @@ ifdef(`_PRESERVE_LUSER_HOST_', `dnl
R< $+ > $+ $: < $1 > $2 $&{Host}')
dnl')
@@ -144,7 +143,7 @@
R< > $+ $: < $H > $1 try hub', `dnl')
ifdef(`LOCAL_RELAY', `dnl
--- cf/mailer/cyrus.m4
-+++ cf/mailer/cyrus.m4 2016-04-14 07:28:41.690015988 +0000
++++ cf/mailer/cyrus.m4 2017-03-22 18:07:23.198336192 +0000
@@ -36,7 +36,7 @@ PUSHDIVERT(-1)
#
@@ -163,7 +162,7 @@
ifdef(`CYRUS_MAILER_MAX', `M=CYRUS_MAILER_MAX, ')U=CYRUS_MAILER_USER, T=DNS/RFC822/X-Unix,_CYRUS_QGRP
A=CYRUS_MAILER_ARGS
--- cf/mailer/fax.m4
-+++ cf/mailer/fax.m4 2016-04-14 07:28:41.690015988 +0000
++++ cf/mailer/fax.m4 2017-03-22 18:07:23.198336192 +0000
@@ -30,6 +30,7 @@ POPDIVERT
VERSIONID(`$Id: fax.m4,v 8.17 2013-11-22 20:51:14 ca Exp $')
@@ -173,7 +172,7 @@
M=FAX_MAILER_MAX, T=X-Phone/X-FAX/X-Unix,_FAX_QGRP
A=FAX_MAILER_ARGS
--- cf/mailer/local.m4
-+++ cf/mailer/local.m4 2016-04-14 07:28:41.690015988 +0000
++++ cf/mailer/local.m4 2017-03-22 18:07:23.198336192 +0000
@@ -34,6 +34,7 @@ POPDIVERT
VERSIONID(`$Id: local.m4,v 8.60 2013-11-22 20:51:14 ca Exp $')
@@ -191,7 +190,7 @@
_OPTINS(`LOCAL_MAILER_MAX', `M=', `, ')_OPTINS(`LOCAL_MAILER_MAXMSGS', `m=', `, ')_OPTINS(`LOCAL_MAILER_MAXRCPTS', `r=', `, ')_OPTINS(`LOCAL_MAILER_CHARSET', `C=', `, ')T=DNS/RFC822/LOCAL_MAILER_DSN_DIAGNOSTIC_CODE,_LOCAL_QGRP
A=LOCAL_MAILER_ARGS
--- cf/mailer/mail11.m4
-+++ cf/mailer/mail11.m4 2016-04-14 07:28:41.690015988 +0000
++++ cf/mailer/mail11.m4 2017-03-22 18:07:23.198336192 +0000
@@ -34,7 +34,7 @@ R$* < @ $=w .DECNET. > $#_LOCAL_ $: $1
R$+ < @ $+ .DECNET. > $#mail11 $@ $2 $: $1 DECnet user
POPDIVERT
@@ -221,7 +220,7 @@
+ T=DNS/X-DECnet/X-Unix,_MAIL11_QGRP
+ A=MAIL11_MAILER_ARGS
--- cf/mailer/phquery.m4
-+++ cf/mailer/phquery.m4 2016-04-14 07:28:41.690015988 +0000
++++ cf/mailer/phquery.m4 2017-03-22 18:07:23.198336192 +0000
@@ -27,6 +27,7 @@ POPDIVERT
VERSIONID(`$Id: phquery.m4,v 8.18 2013-11-22 20:51:14 ca Exp $')
@@ -231,7 +230,7 @@
T=DNS/RFC822/X-Unix,_PH_QGRP
A=PH_MAILER_ARGS
--- cf/mailer/pop.m4
-+++ cf/mailer/pop.m4 2016-04-14 07:28:41.690015988 +0000
++++ cf/mailer/pop.m4 2017-03-22 18:07:23.198336192 +0000
@@ -25,6 +25,7 @@ POPDIVERT
VERSIONID(`$Id: pop.m4,v 8.23 2013-11-22 20:51:14 ca Exp $')
@@ -241,7 +240,7 @@
T=DNS/RFC822/X-Unix,_POP_QGRP
A=POP_MAILER_ARGS
--- cf/mailer/procmail.m4
-+++ cf/mailer/procmail.m4 2016-04-14 07:28:41.690015988 +0000
++++ cf/mailer/procmail.m4 2017-03-22 18:07:23.198336192 +0000
@@ -29,6 +29,7 @@ POPDIVERT
VERSIONID(`$Id: procmail.m4,v 8.23 2013-11-22 20:51:14 ca Exp $')
@@ -251,7 +250,7 @@
ifdef(`PROCMAIL_MAILER_MAX', `M=PROCMAIL_MAILER_MAX, ')T=DNS/RFC822/X-Unix,_PROCMAIL_QGRP
A=PROCMAIL_MAILER_ARGS
--- cf/mailer/qpage.m4
-+++ cf/mailer/qpage.m4 2016-04-14 07:28:41.702015767 +0000
++++ cf/mailer/qpage.m4 2017-03-22 18:07:23.242335370 +0000
@@ -26,6 +26,7 @@ POPDIVERT
VERSIONID(`$Id: qpage.m4,v 8.11 2013-11-22 20:51:14 ca Exp $')
@@ -261,7 +260,7 @@
M=QPAGE_MAILER_MAX, T=DNS/RFC822/X-Unix,_QPAGE_QGRP
A=QPAGE_MAILER_ARGS
--- cf/mailer/smtp.m4
-+++ cf/mailer/smtp.m4 2016-04-14 07:28:41.702015767 +0000
++++ cf/mailer/smtp.m4 2017-03-22 18:07:23.242335370 +0000
@@ -33,6 +33,7 @@ POPDIVERT
VERSIONID(`$Id: smtp.m4,v 8.66 2013-11-22 20:51:14 ca Exp $')
@@ -279,7 +278,7 @@
_OPTINS(`SMTP_MAILER_MAX', `M=', `, ')_OPTINS(`SMTP_MAILER_MAXMSGS', `m=', `, ')_OPTINS(`SMTP_MAILER_MAXRCPTS', `r=', `, ')_OPTINS(`SMTP_MAILER_CHARSET', `C=', `, ')T=DNS/RFC822/SMTP,_SMTP_QGRP
A=SMTP_MAILER_ARGS
--- cf/mailer/usenet.m4
-+++ cf/mailer/usenet.m4 2016-04-14 07:28:41.702015767 +0000
++++ cf/mailer/usenet.m4 2017-03-22 18:07:23.242335370 +0000
@@ -23,6 +23,7 @@ POPDIVERT
VERSIONID(`$Id: usenet.m4,v 8.23 2013-11-22 20:51:14 ca Exp $')
@@ -289,7 +288,7 @@
_OPTINS(`USENET_MAILER_MAX', `M=', `, ')T=X-Usenet/X-Usenet/X-Unix,_USENET_QGRP
A=USENET_MAILER_ARGS $u
--- cf/mailer/uucp.m4
-+++ cf/mailer/uucp.m4 2016-04-14 07:28:41.702015767 +0000
++++ cf/mailer/uucp.m4 2017-03-22 18:07:23.242335370 +0000
@@ -26,6 +26,7 @@ POPDIVERT
VERSIONID(`$Id: uucp.m4,v 8.45 2013-11-22 20:51:14 ca Exp $')
@@ -312,7 +311,7 @@
-
--- cf/sh/makeinfo.sh
-+++ cf/sh/makeinfo.sh 2016-04-14 07:28:41.702015767 +0000
++++ cf/sh/makeinfo.sh 2017-03-22 18:07:23.242335370 +0000
@@ -22,7 +22,7 @@ do
then
p="."
@@ -354,7 +353,7 @@
echo '#####' using $1 as configuration include directory | sed 's/\/tmp_mnt//'
echo "define(\`__HOST__', $host)dnl"
--- contrib/bounce-resender.pl
-+++ contrib/bounce-resender.pl 2016-04-14 07:28:41.702015767 +0000
++++ contrib/bounce-resender.pl 2017-03-22 18:07:23.242335370 +0000
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl -w
+#!/usr/bin/perl -w
@@ -371,7 +370,7 @@
# FIXME: Define the functions "major" and "minor" for your OS.
--- contrib/doublebounce.pl
-+++ contrib/doublebounce.pl 2016-04-14 07:28:41.702015767 +0000
++++ contrib/doublebounce.pl 2017-03-22 18:07:23.242335370 +0000
@@ -111,6 +111,11 @@ EOT
return $result;
}
@@ -401,7 +400,7 @@
exit(0);
-
--- contrib/etrn.pl
-+++ contrib/etrn.pl 2016-04-14 07:28:41.702015767 +0000
++++ contrib/etrn.pl 2017-03-22 18:07:23.242335370 +0000
@@ -1,4 +1,4 @@
-#!/usr/perl5/bin/perl -w
+#!/usr/bin/perl -w
@@ -409,7 +408,7 @@
# CDDL HEADER START
#
--- contrib/expn.pl
-+++ contrib/expn.pl 2016-04-14 07:28:41.706015694 +0000
++++ contrib/expn.pl 2017-03-22 18:07:23.242335370 +0000
@@ -101,6 +101,7 @@ use Fcntl;
$have_nslookup = 1; # we have the nslookup program
@@ -484,7 +483,7 @@
.BR nslookup .
.SH SEE ALSO
--- contrib/passwd-to-alias.pl
-+++ contrib/passwd-to-alias.pl 2016-04-14 07:28:41.706015694 +0000
++++ contrib/passwd-to-alias.pl 2017-03-22 18:07:23.246335294 +0000
@@ -1,4 +1,4 @@
-#!/bin/perl
+#!/usr/bin/perl
@@ -492,7 +491,7 @@
#
# Convert GECOS information in password files to alias syntax.
--- contrib/smcontrol.pl
-+++ contrib/smcontrol.pl 2016-04-14 07:28:41.706015694 +0000
++++ contrib/smcontrol.pl 2017-03-22 18:07:23.246335294 +0000
@@ -25,7 +25,7 @@ sub get_controlname
my $cn = undef;
my $qd = undef;
@@ -503,7 +502,7 @@
{
chomp;
--- devtools/M4/UNIX/manpage.m4
-+++ devtools/M4/UNIX/manpage.m4 2016-04-14 07:28:41.706015694 +0000
++++ devtools/M4/UNIX/manpage.m4 2017-03-22 18:07:23.246335294 +0000
@@ -69,7 +69,7 @@ ifdef(`confNO_MAN_INSTALL', `divert(-1)'
define(`bldMAN_INSTALL_CMD',
`ifdef(`confDONT_INSTALL_CATMAN', `dnl',
@@ -514,7 +513,7 @@
` ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN} ]; then confMKDIR -p ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}; else :; fi ')
${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).bldGET_MAN_SOURCE_NUM($1) `${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}'', `dnl')'
--- devtools/M4/depend/CC-M.m4
-+++ devtools/M4/depend/CC-M.m4 2016-04-14 07:28:41.706015694 +0000
++++ devtools/M4/depend/CC-M.m4 2017-03-22 18:07:23.246335294 +0000
@@ -3,6 +3,6 @@ depend: ${BEFORE} ${LINKS}
@mv Makefile Makefile.old
@sed -e '/^# Do not edit or remove this line or anything below it.$$/,$$d' < Makefile.old > Makefile
@@ -523,17 +522,21 @@
+ ${CC} -M ${O} ${COPTS} ${SRCS} >> Makefile
# End of $RCSfile: CC-M.m4,v $
---- devtools/M4/header.m4
-+++ devtools/M4/header.m4 2016-04-14 07:28:41.706015694 +0000
-@@ -35,3 +35,6 @@ define(`PUSHDIVERT', `pushdef(`__D__', d
- define(`POPDIVERT', `divert(__D__)popdef(`__D__')')
- define(`APPENDDEF', `define(`$1', ifdef(`$1', `$1 $2', `$2'))')
- define(`PREPENDDEF', `define(`$1', ifdef(`$1', `$2 $1', `$2'))')
-+define(`REPLACEDEF', `define(`_$1', `esyscmd(`x='$1`;echo -n ${x//$2/$3}')')dnl
-+define(`$1', _$1)dnl
-+undefine(`_$1')')
+--- devtools/OS/Linux
++++ devtools/OS/Linux 2017-03-22 18:07:23.254335146 +0000
+@@ -5,8 +5,9 @@ dnl Place personal settings in devtools/
+
+ define(`confDEPEND_TYPE', `CC-M')
+ define(`confCCOPTS_SO', `-fPIC')
++define(`confENVDEF', `-DNETINET6')
+ 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')
--- devtools/bin/install.sh
-+++ devtools/bin/install.sh 2016-04-14 07:28:41.706015694 +0000
++++ devtools/bin/install.sh 2017-03-22 18:07:23.246335294 +0000
@@ -16,6 +16,7 @@ owner=""
group=""
mode=""
@@ -561,7 +564,7 @@
chgrp $group $dst
if [ $? != 0 ]
--- doc/op/op.me
-+++ doc/op/op.me 2016-04-14 07:28:41.706015694 +0000
++++ doc/op/op.me 2017-03-22 18:07:23.246335294 +0000
@@ -588,7 +588,7 @@ The binary for
.i sendmail
is located in /usr/\*(SD\**.
@@ -797,7 +800,7 @@
nothing can replace looking at what your own system generates.
.)f
--- include/sm/conf.h
-+++ include/sm/conf.h 2016-04-14 07:28:41.706015694 +0000
++++ include/sm/conf.h 2017-03-22 18:07:23.250335221 +0000
@@ -1460,23 +1460,47 @@ extern void *malloc();
# define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
# endif /* !defined(KERNEL_VERSION) */
@@ -908,7 +911,7 @@
# ifndef HASFCHOWN
# define HASFCHOWN 1 /* fchown(2) */
--- libmilter/Makefile.m4
-+++ libmilter/Makefile.m4 2016-04-14 07:28:41.706015694 +0000
++++ libmilter/Makefile.m4 2017-03-23 08:51:06.231522895 +0000
@@ -12,6 +12,8 @@ PREPENDDEF(`confINCDIRS', `-I${SMSRCDIR}
bldPRODUCT_START(`library', `libmilter')
define(`bldINSTALLABLE', `true')
@@ -918,8 +921,41 @@
APPENDDEF(`confENVDEF', `-DNOT_SENDMAIL -Dsm_snprintf=snprintf')
define(`bldSOURCES', `main.c engine.c listener.c worker.c handler.c comm.c smfi.c signal.c sm_gethost.c monitor.c LIBMILTER_EXTRAS ')
define(`confBEFORE', `LIBMILTER_EXTRAS')
+@@ -28,6 +30,32 @@ POPDIVERT
+
+
+ divert(bldTARGETS_SECTION)
++sm_libmilter_somajor = conf_libmilter_SOMAJOR
++sm_libmilter_soname = conf_libmilter_SONAME
++sm_libmilter_soversion = conf_libmilter_SOVERSION
++
++libmilter.a: libmilter.so.${sm_libmilter_soversion}
++libmilter.so.${sm_libmilter_soversion}: ${BEFORE} ${libmilterOBJS}
++ ${CC} -shared -pthread \
++ -o libmilter.so.${sm_libmilter_soversion} \
++ -fPIC ${CFLAGS} \
++ -Wl,-soname,${sm_libmilter_soname} \
++ $(filter-out -fpie,${LDFLAGS}) \
++ ${libmilterOBJS}
++ ${LN} ${LNOPTS} libmilter.so.${sm_libmilter_soversion} ${sm_libmilter_soname}
++ ${LN} ${LNOPTS} libmilter.so.${sm_libmilter_soversion} libmilter.so
++
++install-libmilter: install-libmilter-shared
++install-libmilter-shared: libmilter.so.${sm_libmilter_soversion}
++ ${INSTALL} -d ${DESTDIR}${LIBDIR}
++ ${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} libmilter.so.${sm_libmilter_soversion} ${DESTDIR}${LIBDIR}
++ ${LN} ${LNOPTS} libmilter.so.${sm_libmilter_soversion} ${DESTDIR}${LIBDIR}/${sm_libmilter_soname}
++ ${LN} ${LNOPTS} libmilter.so.${sm_libmilter_soversion} ${DESTDIR}${LIBDIR}/libmilter.so
++
++libmilter-clean: libmilter-clean-shared
++libmilter-clean-shared:
++ rm -f libmilter.so libmilter.so.${sm_libmilter_soname} libmilter.so.${sm_libmilter_soversion}
++
+ # Install the API header files
+ MFAPI= ${SRCDIR}/inc`'lude/libmilter/mfapi.h
+ MFDEF= ${SRCDIR}/inc`'lude/libmilter/mfdef.h
--- libsm/Makefile.m4
-+++ libsm/Makefile.m4 2016-04-14 07:31:33.914851731 +0000
++++ libsm/Makefile.m4 2017-03-22 18:07:23.250335221 +0000
@@ -4,8 +4,11 @@ include(confBUILDTOOLSDIR`/M4/switch.m4'
define(`confREQUIRE_LIBSM', `true')
@@ -932,8 +968,20 @@
define(`bldSOURCES', ` assert.c debug.c errstring.c exc.c heap.c match.c rpool.c strdup.c strerror.c strl.c clrerr.c fclose.c feof.c ferror.c fflush.c fget.c fpos.c findfp.c flags.c fopen.c fprintf.c fpurge.c fput.c fread.c fscanf.c fseek.c fvwrite.c fwalk.c fwrite.c get.c makebuf.c put.c refill.c rewind.c setvbuf.c smstdio.c snprintf.c sscanf.c stdio.c strio.c ungetc.c vasprintf.c vfprintf.c vfscanf.c vprintf.c vsnprintf.c wbuf.c wsetup.c string.c stringf.c xtrap.c strto.c test.c strcasecmp.c strrevcmp.c signal.c clock.c config.c shm.c sem.c mbdb.c strexit.c cf.c ldap.c niprop.c mpeix.c memstat.c util.c inet6_ntop.c ')
bldPRODUCT_END
dnl msg.c
+--- libsm/inet6_ntop.c
++++ libsm/inet6_ntop.c 2017-03-22 18:07:23.254335146 +0000
+@@ -11,8 +11,8 @@
+ #include
+ SM_RCSID("@(#)$Id: inet6_ntop.c,v 1.2 2013-11-22 20:51:43 ca Exp $")
+
+-#if NETINET6
+ # include
++#if NETINET6
+ # include
+ # include
+ # include
--- libsmutil/Makefile.m4
-+++ libsmutil/Makefile.m4 2016-04-14 07:28:41.710015622 +0000
++++ libsmutil/Makefile.m4 2017-03-22 18:07:23.250335221 +0000
@@ -6,8 +6,11 @@ define(`confREQUIRE_SM_OS_H', `true')
SMSRCDIR= ifdef(`confSMSRCDIR', `confSMSRCDIR', `${SRCDIR}/sendmail')
PREPENDDEF(`confENVDEF', `confMAPDEF')
@@ -947,7 +995,7 @@
APPENDDEF(`confENVDEF', `-DNOT_SENDMAIL')
bldPRODUCT_END
--- mail.local/Makefile.m4
-+++ mail.local/Makefile.m4 2016-04-14 07:28:41.710015622 +0000
++++ mail.local/Makefile.m4 2017-03-22 18:07:23.250335221 +0000
@@ -20,8 +20,12 @@ bldPRODUCT_START(`manpage', `mail.local'
define(`bldSOURCES', `mail.local.8')
bldPRODUCT_END
@@ -963,7 +1011,7 @@
@echo " systems such as HP-UX and Solaris. Please consult the"
@echo " README file in the mail.local directory. You can force"
--- mail.local/mail.local.8
-+++ mail.local/mail.local.8 2016-04-14 07:28:41.710015622 +0000
++++ mail.local/mail.local.8 2017-03-22 18:07:23.250335221 +0000
@@ -123,10 +123,10 @@ Used to set the appropriate time zone on
/tmp/local.XXXXXX
temporary files
@@ -978,7 +1026,7 @@
.PD
.SH SEE ALSO
--- mailstats/mailstats.8
-+++ mailstats/mailstats.8 2016-04-14 07:28:41.710015622 +0000
++++ mailstats/mailstats.8 2017-03-22 18:07:23.250335221 +0000
@@ -108,10 +108,13 @@ The default
.B sendmail
configuration file.
@@ -995,7 +1043,7 @@
.SH SEE ALSO
mailq(1),
--- makemap/makemap.8
-+++ makemap/makemap.8 2016-04-14 07:28:41.710015622 +0000
++++ makemap/makemap.8 2017-03-22 18:07:23.250335221 +0000
@@ -44,20 +44,13 @@ It reads input from the standard input
and outputs them to the indicated
.I mapname.
@@ -1019,7 +1067,7 @@
B-Tree format maps.
This requires the new Berkeley DB
--- praliases/Makefile.m4
-+++ praliases/Makefile.m4 2016-04-14 07:28:41.710015622 +0000
++++ praliases/Makefile.m4 2017-03-22 18:07:23.250335221 +0000
@@ -9,7 +9,8 @@ PREPENDDEF(`confENVDEF', `confMAPDEF')
PREPENDDEF(`confINCDIRS', `-I${SMSRCDIR} ')
@@ -1031,7 +1079,7 @@
bldPUSH_SMLIB(`sm')
bldPUSH_SMLIB(`smutil')
--- rmail/rmail.c
-+++ rmail/rmail.c 2016-04-14 07:28:41.710015622 +0000
++++ rmail/rmail.c 2017-03-22 18:07:23.250335221 +0000
@@ -276,7 +276,7 @@ main(argc, argv)
args[i++] = _PATH_SENDMAIL; /* Build sendmail's argument list. */
args[i++] = "-G"; /* relay submission */
@@ -1042,7 +1090,7 @@
/* set from system and protocol used */
--- sendmail/Makefile.m4
-+++ sendmail/Makefile.m4 2016-04-14 07:28:41.710015622 +0000
++++ sendmail/Makefile.m4 2017-03-22 18:07:23.250335221 +0000
@@ -49,13 +49,16 @@ ${DESTDIR}/etc/mail/submit.cf:
cd ${SRCDIR}/cf/cf && make install-submit-cf
@@ -1061,7 +1109,7 @@
chmod 0770 ${DESTDIR}${MSPQ}
--- sendmail/SECURITY
-+++ sendmail/SECURITY 2016-04-14 07:28:41.710015622 +0000
++++ sendmail/SECURITY 2017-03-22 18:07:23.250335221 +0000
@@ -49,14 +49,14 @@ The default configuration starting with
sendmail binary which acts differently based on operation mode and
supplied options.
@@ -1158,7 +1206,7 @@
STARTTLS: If sendmail is compiled with STARTTLS support on a platform
that does not have HASURANDOMDEV defined, you either need to specify
--- sendmail/control.c
-+++ sendmail/control.c 2016-04-14 07:28:41.710015622 +0000
++++ sendmail/control.c 2017-03-22 18:07:23.250335221 +0000
@@ -137,7 +137,7 @@ opencontrolsocket()
}
}
@@ -1169,7 +1217,7 @@
save_errno = errno;
closecontrolsocket(true);
--- sendmail/domain.c
-+++ sendmail/domain.c 2016-04-14 07:28:41.710015622 +0000
++++ sendmail/domain.c 2017-03-22 18:07:23.250335221 +0000
@@ -870,14 +870,20 @@ cnameloop:
if (qtype == initial)
gotmx = false;
@@ -1194,7 +1242,7 @@
ret = res_querydomain(host, *dp, C_IN, qtype,
answer.qb2, sizeof(answer.qb2));
--- sendmail/readcf.c
-+++ sendmail/readcf.c 2016-04-14 07:28:41.710015622 +0000
++++ sendmail/readcf.c 2017-03-22 18:07:23.254335146 +0000
@@ -1751,15 +1751,20 @@ makemailer(line)
#endif /* NETUNIX */
)
@@ -1219,7 +1267,7 @@
if (m->m_mtatype == NULL)
m->m_mtatype = "dns";
--- sendmail/sendmail.h
-+++ sendmail/sendmail.h 2016-04-14 07:28:41.710015622 +0000
++++ sendmail/sendmail.h 2017-03-22 18:07:23.254335146 +0000
@@ -154,14 +154,14 @@ typedef int (*sasl_callback_ft)(void);
# define SASL SASL_VERSION
# else /* SASL == 1 || SASL == 2 */
@@ -1240,7 +1288,7 @@
# endif /* defined(SASL_VERSION_MAJOR) && defined(SASL_VERSION_MINOR) && defined(SASL_VERSION_STEP) */
#endif /* SASL */
--- sendmail/udb.c
-+++ sendmail/udb.c 2016-04-14 07:28:41.710015622 +0000
++++ sendmail/udb.c 2017-03-22 18:07:23.254335146 +0000
@@ -1040,24 +1040,29 @@ _udbx_init(e)
# if DB_VERSION_MAJOR < 2
@@ -1288,7 +1336,7 @@
up->udb_type = UDB_DBFETCH;
up->udb_pid = CurrentPid;
--- smrsh/README
-+++ smrsh/README 2016-04-14 07:28:41.710015622 +0000
++++ smrsh/README 2017-03-22 18:07:23.254335146 +0000
@@ -6,7 +6,7 @@ Software Engineering Institute, Carnegie
intended as a supplement to the CERT advisory CA-93:16.sendmail.vulnerability,
and to the software, smrsh.c, written by Eric Allman.
@@ -1391,7 +1439,7 @@
After modifying the Mprog definition in the sendmail.cf file, if a frozen
--- smrsh/smrsh.8
-+++ smrsh/smrsh.8 2016-04-14 07:28:41.710015622 +0000
++++ smrsh/smrsh.8 2017-03-22 18:07:23.254335146 +0000
@@ -39,7 +39,7 @@ Briefly,
.I smrsh
limits programs to be in a single directory,
@@ -1457,7 +1505,7 @@
.SH SEE ALSO
sendmail(8)
--- vacation/vacation.c
-+++ vacation/vacation.c 2016-04-14 07:28:41.710015622 +0000
++++ vacation/vacation.c 2017-03-22 18:07:23.254335146 +0000
@@ -699,6 +699,7 @@ junkmail(from)
{ "uucp", 4 },
{ "mailer-daemon", 13 },
@@ -1475,28 +1523,3 @@
{ NULL, 0 }
};
---- devtools/OS/Linux
-+++ devtools/OS/Linux 2016-04-14 08:17:12.048270718 +0000
-@@ -5,8 +5,9 @@ dnl Place personal settings in devtools/
-
- define(`confDEPEND_TYPE', `CC-M')
- define(`confCCOPTS_SO', `-fPIC')
-+define(`confENVDEF', `-DNETINET6')
- 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')
---- libsm/inet6_ntop.c
-+++ libsm/inet6_ntop.c 2016-04-14 08:23:34.517208262 +0000
-@@ -11,8 +11,8 @@
- #include
- SM_RCSID("@(#)$Id: inet6_ntop.c,v 1.2 2013-11-22 20:51:43 ca Exp $")
-
--#if NETINET6
- # include
-+#if NETINET6
- # include
- # include
- # include
++++++ sendmail-rpmlintrc ++++++
--- /var/tmp/diff_new_pack.Om1irY/_old 2017-04-13 10:46:14.547479577 +0200
+++ /var/tmp/diff_new_pack.Om1irY/_new 2017-04-13 10:46:14.551479012 +0200
@@ -15,3 +15,5 @@
addFilter(".*no-manual-page-for-binary.*config.sendmail.*")
addFilter(".*name-repeated-in-summary.*")
addFilter(".*binary-or-shlib-calls-gethostbyname.*")
+addFilter(".*sendmail-devel.*no-dependency-on.*sendmail.*")
+addFilter(".*explicit-lib-dependency.*libmilter1_0.*")
++++++ sendmail-suse.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sendmail-suse/devtools/Site/site.config.m4 new/sendmail-suse/devtools/Site/site.config.m4
--- old/sendmail-suse/devtools/Site/site.config.m4 2010-01-26 15:58:45.000000000 +0100
+++ new/sendmail-suse/devtools/Site/site.config.m4 2017-03-23 10:00:47.044631141 +0100
@@ -107,6 +107,14 @@
appdef(`conf_sendmail_LIB_POST', SMDB)dnl
appdef(`conf_sendmail_LIB_POST', `-lnsl -lresolv 'SMLDAP` -lwrap')dnl
dnl
+dnl libmilter
+dnl
+appdef(`conf_libmilter_ENVDEF', `-DSM_CONF_POLL=1')dnl
+appdef(`conf_libmilter_ENVDEF', `-D_FFR_WORKERS_POOL=1')dnl
+define(`conf_libmilter_SOMAJOR', `@sm_libmilter_somajor@')dnl
+define(`conf_libmilter_SONAME', `@sm_libmilter_soname@')dnl
+define(`conf_libmilter_SOVERSION', `@sm_libmilter_soversion@')dnl
+dnl
dnl libsm
dnl
appdef(`conf_libsm_LIB_POST', SMLDAP)dnl
Binary files old/sendmail-suse/suse/.Makefile.swp and new/sendmail-suse/suse/.Makefile.swp differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sendmail-suse/suse/Makefile new/sendmail-suse/suse/Makefile
--- old/sendmail-suse/suse/Makefile 2011-08-12 11:41:31.000000000 +0200
+++ new/sendmail-suse/suse/Makefile 2017-04-12 14:57:23.232226802 +0200
@@ -8,22 +8,24 @@
test "$$SENDMAIL_DB_FOLD" = "no" && echo -f)
CONF = $(shell test -n "$(DESTDIR)" && echo "-C $(ETC)sendmail.cf")
-all: $(ETC)aliases.db \
- $(MAIL)mailertable.db \
- $(MAIL)genericstable.db \
- $(MAIL)virtusertable.db \
- $(MAIL)access.db \
- $(MAIL)auth/auth-info.db \
- $(MAIL)domaintable.db \
- $(MAIL)userdb.db
-
-short: $(MAIL)mailertable.db \
- $(MAIL)genericstable.db \
- $(MAIL)virtusertable.db \
- $(MAIL)access.db \
- $(MAIL)auth/auth-info.db \
- $(MAIL)domaintable.db \
- $(MAIL)userdb.db
+DB = $(MAIL)access.db \
+ $(MAIL)auth/auth-info.db \
+ $(MAIL)domaintable.db \
+ $(MAIL)genericstable.db \
+ $(MAIL)mailertable.db \
+ $(MAIL)userdb.db \
+ $(MAIL)virtusertable.db
+
+ifneq (,$(wildcard $(MAIL)bitdomain))
+ DB += $(MAIL)bitdomain.db
+endif
+ifneq (,$(wildcard $(MAIL)uudomain))
+ DB += $(MAIL)uudomain.db
+endif
+
+all: $(ETC)aliases.db short
+aliases: short
+short: ${DB}
#
# newaliases
@@ -53,5 +55,4 @@
makemap $(CONF) btree $(NOFOLD) $@ < $<
test -e $@ && touch $@
chmod --reference=$< $@
-
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sendmail-suse/suse/update.sendmail new/sendmail-suse/suse/update.sendmail
--- old/sendmail-suse/suse/update.sendmail 2013-10-02 10:25:23.294234952 +0200
+++ new/sendmail-suse/suse/update.sendmail 2017-04-12 15:27:03.942540586 +0200
@@ -8,7 +8,7 @@
# (The usual stdout is redirected to stderr)
test "$1" = "-m4" && exec 5>&1 1>&2
-e=0
+typeset -i e=0
VERSION=8.14.7-0.9
DATE=2013/10/01
@@ -440,10 +440,10 @@
EOF
else
gen_sendmail_m4 | m4 - > $sendupdate
- test $? -eq 0 || e=1
+ test $? -eq 0 || let e++
fi
gen_submit_m4 | m4 - > $submupdate
- test $? -eq 0 || e=1
+ test $? -eq 0 || let e++
mv -f $sendupdate /etc/sendmail.cf.update
sendupdate=/etc/sendmail.cf.update
@@ -457,110 +457,63 @@
nofold=""
test "${SENDMAIL_DB_FOLD,,}" = no && nofold=-f
-test -e /etc/aliases && \
- if test /etc/aliases -nt /etc/aliases.db \
- -o ! -e /etc/aliases.db ; then
- echo "Rebuilding /etc/aliases.db."
- setmask /etc/aliases
- sendmail -bi
- if test $? -eq 0 ; then
- test -e /etc/aliases.db && touch /etc/aliases.db
- chmod --reference=/etc/aliases /etc/aliases.db
- else
- e=1
- fi
- fi
-test -e /etc/mail/mailertable && \
- if test /etc/mail/mailertable -nt /etc/mail/mailertable.db \
- -o ! -e /etc/mail/mailertable.db ; then
- echo "Rebuilding /etc/mail/mailertable.db."
- setmask /etc/mail/mailertable
- makemap hash ${nofold} /etc/mail/mailertable.db < /etc/mail/mailertable
- if test $? -eq 0 ; then
- test -e /etc/mail/mailertable.db && touch /etc/mail/mailertable.db
- chmod --reference=/etc/mail/mailertable /etc/mail/mailertable.db
- else
- e=1
- fi
- fi
-test -e /etc/mail/genericstable && \
- if test /etc/mail/genericstable -nt /etc/mail/genericstable.db \
- -o ! -e /etc/mail/genericstable.db ; then
- echo "Rebuilding /etc/mail/genericstable.db."
- setmask /etc/mail/genericstable
- makemap hash ${nofold} /etc/mail/genericstable.db < /etc/mail/genericstable
- if test $? -eq 0 ; then
- test -e /etc/mail/genericstable.db && touch /etc/mail/genericstable.db
- chmod --reference=/etc/mail/genericstable /etc/mail/genericstable.db
+makedb () {
+ local type=hash
+ local db="${1}"
+ local src="${db%.db}"
+ db="${src}.db"
+
+ test -e "$src" || return
+ test "${src##*/}" = userdb && type=btree
+
+ if test "$src" -nt "$db" -o ! -e "$db"
+ then
+ echo "Rebuilding ${db}."
+ setmask "$src"
+ makemap $type $nofold $db < $src
+ if test $? -eq 0
+ then
+ test -e $db && touch $db
+ chmod --reference="$src" $db
else
- e=1
+ let e++
fi
fi
-test -e /etc/mail/virtusertable && \
- if test /etc/mail/virtusertable -nt /etc/mail/virtusertable.db \
- -o ! -e /etc/mail/virtusertable.db ; then
- echo "Rebuilding /etc/mail/virtusertable.db."
- setmask /etc/mail/virtusertable
- makemap hash ${nofold} /etc/mail/virtusertable.db < /etc/mail/virtusertable
- if test $? -eq 0 ; then
- test -e /etc/mail/virtusertable.db && touch /etc/mail/virtusertable.db
- chmod --reference=/etc/mail/virtusertable /etc/mail/virtusertable.db
- else
- e=1
- fi
- fi
-test -e /etc/mail/access && \
- if test /etc/mail/access -nt /etc/mail/access.db \
- -o ! -e /etc/mail/access.db ; then
- echo "Rebuilding /etc/mail/access.db."
- setmask /etc/mail/access
- makemap hash ${nofold} /etc/mail/access.db < /etc/mail/access
- if test $? -eq 0 ; then
- test -e /etc/mail/access.db && touch /etc/mail/access.db
- chmod --reference=/etc/mail/access /etc/mail/access.db
- else
- e=1
- fi
- fi
-test -e /etc/mail/userdb && \
- if test /etc/mail/userdb -nt /etc/mail/userdb.db \
- -o ! -e /etc/mail/userdb.db ; then
- echo "Rebuilding /etc/mail/userdb.db."
- setmask /etc/mail/userdb
- makemap btree ${nofold} /etc/mail/userdb.db < /etc/mail/userdb
- if test $? -eq 0 ; then
- test -e /etc/mail/userdb.db && touch /etc/mail/userdb.db
- chmod --reference=/etc/mail/userdb /etc/mail/userdb.db
- else
- e=1
- fi
- fi
-test -e /etc/mail/auth/auth-info && \
- if test /etc/mail/auth/auth-info -nt /etc/mail/auth/auth-info.db \
- -o ! -e /etc/mail/auth/auth-info.db ; then
- echo "Rebuilding /etc/mail/auth/auth-info.db."
- setmask /etc/mail/auth/auth-info
- makemap hash ${nofold} /etc/mail/auth/auth-info.db < /etc/mail/auth/auth-info
- if test $? -eq 0 ; then
- touch /etc/mail/auth/auth-info
- chmod 0750 /etc/mail/auth
- chmod 0600 /etc/mail/auth/auth-info*
- else
- e=1
- fi
- fi
-test -e /etc/mail/domaintable && \
- if test /etc/mail/domaintable -nt /etc/mail/domaintable.db \
- -o ! -e /etc/mail/domaintable.db ; then
- echo "Rebuilding /etc/mail/domaintable.db."
- setmask /etc/mail/domaintable
- makemap hash ${nofold} /etc/mail/domaintable.db < /etc/mail/domaintable
+}
+
+if test -e /etc/aliases
+then
+ typeset -i new=0
+
+ test -e /etc/aliases.db || let new++
+
+ for a in /etc/aliases /etc/mail/aliases.d/*
+ do
+ test -e "$a" || continue
+ test "$a" -nt /etc/aliases && let new++
+ done
+ if ((new > 0))
+ then
+ echo "Rebuilding /etc/aliases.db."
+ setmask /etc/aliases
+ sendmail -bi
if test $? -eq 0 ; then
- test -e /etc/mail/domaintable.db && touch /etc/mail/domaintable.db
- chmod --reference=/etc/mail/domaintable /etc/mail/domaintable.db
+ test -e /etc/aliases.db && touch /etc/aliases.db
+ chmod --reference=/etc/aliases /etc/aliases.db
else
- e=1
+ let e++
fi
fi
+fi
+
+makedb /etc/mail/access.db
+makedb /etc/mail/auth/auth-info.db
+makedb /etc/mail/bitdomain.db
+makedb /etc/mail/domaintable.db
+makedb /etc/mail/genericstable.db
+makedb /etc/mail/mailertable.db
+makedb /etc/mail/userdb.db
+makedb /etc/mail/uudomain.db
+makedb /etc/mail/virtusertable.db
exit $e