diff --git a/sendmail-8.13.7-pid.patch b/sendmail-8.13.7-pid.patch index e5955ea..0025923 100644 --- a/sendmail-8.13.7-pid.patch +++ b/sendmail-8.13.7-pid.patch @@ -4,7 +4,7 @@ # divert(0)dnl --VERSIONID(`$Id: sendmail-8.13.7-pid.patch,v 1.2 2007/08/27 10:25:00 twoerner Exp $') +-VERSIONID(`$Id: submit.mc,v 8.14 2006/04/05 05:54:41 ca Exp $') +sinclude(`/usr/share/sendmail-cf/m4/cf.m4')dnl +VERSIONID(`linux setup')dnl define(`confCF_VERSION', `Submit')dnl diff --git a/sendmail.spec b/sendmail.spec index 331f51d..73695e4 100644 --- a/sendmail.spec +++ b/sendmail.spec @@ -11,15 +11,10 @@ %define spooldir %{_localstatedir}/spool %define maildir %{_sysconfdir}/mail -%define compatdb 4.7.25 -%if "x%{compatdb}" != "x" -%define compatdbpkg compat-db%(echo "%{compatdb}" | sed 's/\\([0-9]\\+\\)\\.\\([0-9]\\+\\)\\.[0-9]\\+/\\1\\2/') -%endif - Summary: A widely used Mail Transport Agent (MTA) Name: sendmail Version: 8.14.4 -Release: 4%{?dist} +Release: 5%{?dist} License: Sendmail Group: System Environment/Daemons URL: http://www.sendmail.org/ @@ -56,11 +51,7 @@ Patch20: sendmail-8.14.3-milterfdleaks.patch Patch21: sendmail-8.14.3-ipv6-bad-helo.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: tcp_wrappers-devel -%if "x%{compatdb}" != "x" -BuildRequires: %{compatdbpkg} -%else BuildRequires: db4-devel -%endif BuildRequires: hesiod-devel BuildRequires: groff BuildRequires: ghostscript @@ -75,9 +66,6 @@ Requires(pre): shadow-utils Requires(preun): %{_sbindir}/alternatives chkconfig Requires(post): %{_sbindir}/alternatives chkconfig coreutils Requires(postun): %{_sbindir}/alternatives coreutils -%if "x%{compatdb}" != "x" -Requires: %{compatdbpkg} -%endif Requires: initscripts Requires: procmail Requires: bash >= 2.0 @@ -184,13 +172,8 @@ done cat > redhat.config.m4 << EOF define(\`confMAPDEF', \`-DNEWDB -DNIS -DHESIOD -DMAP_REGEX -DSOCKETMAP -DNAMED_BIND=1') define(\`confOPTIMIZE', \`\`\`\`${RPM_OPT_FLAGS}'''') -%if "x%{compatdb}" != "x" -define(\`confENVDEF', \`-I%{_includedir}/db%{compatdb} -I/usr/kerberos/include -Wall -DXDEBUG=0 -DTCPWRAPPERS -DNETINET6 -DHES_GETMAILHOST -DUSE_VENDOR_CF_PATH=1 -D_FFR_TLS_1') -define(\`confLIBDIRS', \`-L/usr/kerberos/%{_lib} -L/usr/%{_lib}/db%{compatdb}') -%else define(\`confENVDEF', \`-I%{_includedir}/db -I/usr/kerberos/include -Wall -DXDEBUG=0 -DTCPWRAPPERS -DNETINET6 -DHES_GETMAILHOST -DUSE_VENDOR_CF_PATH=1 -D_FFR_TLS_1') define(\`confLIBDIRS', \`-L/usr/kerberos/%{_lib}') -%endif define(\`confLIBS', \`-lnsl -lwrap -lhesiod -lcrypt -ldb -lresolv') define(\`confMANOWN', \`root') define(\`confMANGRP', \`root') @@ -579,6 +562,9 @@ exit 0 %changelog +* Tue Sep 14 2010 Jaroslav Škarvada - 8.14.4-5 +- rebuilt with db4-4.8.30 (#633269) + * Mon Mar 29 2010 Jaroslav Škarvada - 8.14.4-4 - rebuilt with compatdb-4.7.25 (#556148)