diff --git a/sendmail.spec b/sendmail.spec index beec357..85feff7 100644 --- a/sendmail.spec +++ b/sendmail.spec @@ -18,7 +18,7 @@ Summary: A widely used Mail Transport Agent (MTA). Name: sendmail Version: 8.13.3 -Release: 1.2 +Release: 2 License: Sendmail Group: System Environment/Daemons Provides: smtpdaemon @@ -43,13 +43,11 @@ Patch10: sendmail-8.12.7-manpage.patch Patch11: sendmail-8.13.2-dynamic.patch Patch12: sendmail-8.13.0-cyrus.patch Patch13: sendmail-8.13.3-close_wait.p2.patch -Patch14: sendmail-8.13.3-fix_for_libbind.patch Buildroot: %{_tmppath}/%{name}-root BuildRequires: tcp_wrappers BuildRequires: db4-devel BuildRequires: hesiod-devel BuildRequires: groff -BuildRequires: bind-libbind-devel PreReq: /usr/sbin/alternatives Provides: %{_sbindir}/sendmail %{_bindir}/mailq %{_bindir}/newaliases Provides: %{_bindir}/rmail %{_mandir}/man1/mailq.1.gz @@ -58,7 +56,6 @@ PreReq: chkconfig >= 1.3 PreReq: /usr/sbin/useradd /bin/mktemp fileutils gawk sed sh-utils Requires: procmail Requires: bash >= 2.0 -Requires: bind-libbind-devel %if "%{old_setup}" != "yes" Requires: setup >= 2.5.31-1 BuildRequires: setup >= 2.5.31-1 @@ -138,13 +135,12 @@ your sendmail.cf file. %patch11 -p1 -b .dynamic %patch12 -p1 -b .cyrus %patch13 -p1 -b .close_wait.p2 -%patch14 -p1 -b .fix_for_libbind %build # generate redhat config file cat > redhat.config.m4 << EOF -define(\`confMAPDEF', \`-DNEWDB -DNIS -DHESIOD -DMAP_REGEX -DSOCKETMAP') -define(\`confOPTIMIZE', \`\`\`${RPM_OPT_FLAGS}''') +define(\`confMAPDEF', \`-DNEWDB -DNIS -DHESIOD -DMAP_REGEX -DSOCKETMAP -DNAMED_BIND=1') +define(\`confOPTIMIZE', \`\`${RPM_OPT_FLAGS}'') define(\`confENVDEF', \`-I/usr/include/db4 -I/usr/kerberos/include -Wall -DXDEBUG=0 -DTCPWRAPPERS -DNETINET6 -DHES_GETMAILHOST -DUSE_VENDOR_CF_PATH=1 -D_FFR_WORKAROUND_BROKEN_NAMESERVERS -D_FFR_SMTP_SSL') define(\`confLIBDIRS', \`-L/usr/kerberos/%{_lib}') define(\`confLIBS', \`-lnsl -lwrap -lhesiod -lcrypt -ldb') @@ -156,6 +152,7 @@ define(\`confMAN5SRC', \`5') define(\`confMAN8SRC', \`8') define(\`confSTDIR', \`%{stdir}') define(\`STATUS_FILE', \`%{stdir}/statistics') +define(\`confLIBSEARCH', \`db resolv 44bsd') EOF %ifarch ppc ppc64 s390x @@ -219,13 +216,6 @@ APPENDDEF(\`confLIBS',\`%{l_ldflags mysql .} -lmysqlclient -lz -lm')dnl EOF %endif -# on s390x and ppc64 and x86_64, (but not on ia64) we end up getting NAMED_BIND=1 but no -lbind ?!?! -%ifarch s390x ppc64 x86_64 -cat >> redhat.config.m4 << EOF -APPENDDEF(\`confLIBS',\` -lbind')dnl -EOF -%endif - DIRS="libsmutil sendmail mailstats rmail praliases smrsh makemap" %if "%{with_milter}" == "yes" @@ -581,6 +571,11 @@ exit 0 %{_docdir}/sendmail %changelog +* Thu Mar 17 2005 Thomas Woerner 8.13.3-2 +- dropped direct support for bind: no bind in confLIBSEARCH anymore, + using libresolv again +- dropped triple-quotes + * Wed Mar 10 2005 Jason Vas Dias 8.13.3-1.2 - fix libbind include path - use /usr/include/bind/netdb.h, no - /usr/include/netdb.h - bug: 150339