X-Git-Url: http://git.pld-linux.org/?p=packages%2Fsendmail.git;a=blobdiff_plain;f=sendmail.spec;h=a43c8820389f03f3b36515d0fba643bcd234260a;hp=6751b8b64ef4ae6b64a37155860f0bac5f0ddbdc;hb=HEAD;hpb=5f958ea21c14c0bd2f51500441bc9a457bea30a0

diff --git a/sendmail.spec b/sendmail.spec
index 6751b8b..e3cd829 100644
--- a/sendmail.spec
+++ b/sendmail.spec
@@ -2,9 +2,8 @@
 # - make sid-milter support:
 #   http://sourceforge.net/projects/sid-milter/
 #   http://www.sendmail.net/
-# - http://blue-labs.org/clue/bluelabs.patch-8.12.3 has been updated upstream
 # - fix re-entrancy of install
-# - add tests bcond and/or disable tests tha fail on (AC-)builders
+# - add tests bcond?
 #
 # Conditional build:
 %bcond_without	ldap	# without LDAP support
@@ -22,12 +21,12 @@ Summary(ru.UTF-8):	Почтовый транспортный агент sendmail
 Summary(tr.UTF-8):	Elektronik posta hizmetleri sunucusu
 Summary(uk.UTF-8):	Поштовий транспортний агент sendmail
 Name:		sendmail
-Version:	8.14.8
-Release:	2
+Version:	8.18.1
+Release:	1
 License:	BSD
 Group:		Networking/Daemons/SMTP
-Source0:	ftp://ftp.sendmail.org/pub/sendmail/%{name}.%{version}.tar.gz
-# Source0-md5:	73bfc621c75dbdd3d719e54685d92577
+Source0:	https://ftp.sendmail.org/%{name}.%{version}.tar.gz
+# Source0-md5:	b6b332295b5779036d4c9246f96f673c
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Source3:	%{name}.aliases
@@ -50,17 +49,19 @@ Patch3:		%{name}-os-paths.patch
 Patch4:		%{name}-m4path.patch
 Patch5:		%{name}-redirect.patch
 Patch6:		%{name}-hprescan-dos.patch
-Patch7:		%{name}-db.patch
-# originally from http://blue-labs.org/clue/bluelabs.patch-8.12.3
-Patch8:		bluelabs.patch-8.12.3
-URL:		http://www.sendmail.org/
-BuildRequires:	cyrus-sasl-devel
-BuildRequires:	db-devel >= 4.1.25
+Patch7:		%{name}-cyrus.patch
+# https://blue-labs.org/software/sm-pgsql/sendmail.php
+# https://blue-labs.org/software/sm-pgsql/bluelabs-smpgsql-8.14.3.patch.bz2
+Patch8:		bluelabs-smpgsql-8.14.3.patch
+URL:		https://www.sendmail.org/
+BuildRequires:	cyrus-sasl-devel >= 2.1.21
+BuildRequires:	db-devel >= 5.0
+BuildRequires:	libnsl-devel
 # man or man-db
 BuildRequires:	man-db
 %{?with_ldap:BuildRequires:	openldap-devel >= 2.3.0}
-%{?with_tls:BuildRequires:	openssl-devel >= 0.9.7d}
-%{?with_pgsql:BuildRequires:	postgresql-devel}
+%{?with_tls:BuildRequires:	openssl-devel >= 0.9.8}
+%{?with_pgsql:BuildRequires:	postgresql-devel >= 8.1}
 BuildRequires:	rpmbuild(macros) >= 1.310
 BuildRequires:	sed >= 4.0
 %ifarch sparc
@@ -189,18 +190,6 @@ sed -e 's|@@PATH@@|\.\.|' < %{SOURCE6} > cf/cf/pld.mc
 
 cp -p %{SOURCE7} config.m4
 
-# Ac-specific hack:
-# It's problem with _simultanous_ building when builders are on the same
-# machine. These are anonymous SHM tests (AFAIR) which must fail when called
-# simultanously...
-#
-# send on builders requests only for some arch - it won't fail.
-#- blues
-%ifarch i386 i586 athlon
-%{__sed} -i -e 's/^\(smtest.*t-shm\)/dnl \1/' libsm/Makefile.m4
-%{__sed} -i -e 's/^\(smtest.*t-sem\)/dnl \1/' libsm/Makefile.m4
-%endif
-
 %build
 echo "define(\`confLIBSEARCHPATH', \`/%{_lib} %{_prefix}/%{_lib}')" >> config.m4
 echo "define(\`confCC', \`%{__cc}')" >> config.m4
@@ -223,6 +212,7 @@ echo "APPENDDEF(\`confENVDEF', \`-DSTARTTLS')" >> config.m4
 echo "APPENDDEF(\`confENVDEF', \`-D_FFR_TLS_1')" >> config.m4
 echo "APPENDDEF(\`confLIBS', \`-lssl -lcrypto')" >> config.m4
 %endif
+echo "APPENDDEF(\`confENVDEF', \`-DHASFLOCK')" >> config.m4
 
 %ifarch sparc
 %define		Build		sparc32 sh Build
@@ -292,10 +282,6 @@ cp -p cf/cf/pld.cf $RPM_BUILD_ROOT%{_sysconfdir}/sendmail.cf
 sed -e 's|@@PATH@@|%{_datadir}/sendmail-cf|' < %{SOURCE6} \
 	> $RPM_BUILD_ROOT%{_sysconfdir}/sendmail.mc
 
-%if %{with pgsql}
-cp -p bluelabs.mc $RPM_BUILD_ROOT%{_sysconfdir}/bluelabs.mc
-%endif
-
 # submit.mc (submit.cf is installed automatically)
 cp -p cf/cf/submit.mc $RPM_BUILD_ROOT%{_sysconfdir}
 
@@ -331,9 +317,9 @@ cp -p %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/domaintable
 
 touch $RPM_BUILD_ROOT/etc/security/blacklist.smtp
 
-mv -f smrsh/README README.smrsh
-mv -f cf/README README.cf
-mv -f doc/op/op.me .
+%{__mv} smrsh/README README.smrsh
+%{__mv} cf/README README.cf
+%{__mv} doc/op/op.me .
 
 bzip2 -dc %{SOURCE4} | tar xf -
 
@@ -458,7 +444,6 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/submit.mc
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/local-host-names
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/aliases
-%{?with_pgsql:%{_sysconfdir}/bluelabs.mc}
 %attr(644,root,mail) %ghost %{_sysconfdir}/aliases.db
 %attr(770,root,smmsp) %dir /var/spool/clientmqueue
 %attr(750,root,mail) %dir /var/spool/mqueue
@@ -492,6 +477,7 @@ fi
 %dir %{_datadir}/sendmail-cf/domain
 %{_datadir}/sendmail-cf/domain/generic.m4
 %{_datadir}/sendmail-cf/feature
+%{_datadir}/sendmail-cf/hack
 %{_datadir}/sendmail-cf/m4
 %{_datadir}/sendmail-cf/mailer
 %dir %{_datadir}/sendmail-cf/ostype