X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=sendmail.spec;h=e753fed734cb36cbc776f2b735bdfbdd477cde8a;hb=9e4e860109e90bb11b6f0216c1cb364399498526;hp=59430988e998f09d82a1bf9c13792fb994117f5d;hpb=19aabebb606399705637d5193c22df6b4b6e9ad2;p=packages%2Fsendmail.git

diff --git a/sendmail.spec b/sendmail.spec
index 5943098..e753fed 100644
--- a/sendmail.spec
+++ b/sendmail.spec
@@ -1,3 +1,8 @@
+# 
+# TODO:
+# - make sid-milter support:
+#   http://sourceforge.net/projects/sid-milter/
+#   http://www.sendmail.net/
 #
 # Conditional build:
 %bcond_without	ldap	# without LDAP support
@@ -16,12 +21,12 @@ Summary(ru):	
 Summary(tr):	Elektronik posta hizmetleri sunucusu
 Summary(uk):	ðÏÛÔÏ×ÉÊ ÔÒÁÎÓÐÏÒÔÎÉÊ ÁÇÅÎÔ sendmail
 Name:		sendmail
-Version:	8.12.11
-Release:	4
+Version:	8.13.1
+Release:	1
 License:	BSD
 Group:		Networking/Daemons
 Source0:	ftp://ftp.sendmail.org/pub/sendmail/%{name}.%{version}.tar.gz
-# Source0-md5:	fafda7f8043f0c34b9aa295618aa598c
+# Source0-md5:	5407db289086261d7e7a09920d2ea14e
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Source3:	%{name}.aliases
@@ -37,6 +42,7 @@ Source10:	%{name}.mailertable
 Source11:	%{name}.virtusertable
 Source12:	%{name}.domaintable
 Source13:	%{name}-smtp.pamd
+Source14:	%{name}.monitrc
 Patch0:		%{name}-makemapman.patch
 Patch1:		%{name}-smrsh-paths.patch
 Patch2:		%{name}-rmail.patch
@@ -52,6 +58,7 @@ BuildRequires:	man
 %{?with_ldap:BuildRequires:	openldap-devel}
 %{?with_tls:BuildRequires:	openssl-devel >= 0.9.7d}
 %{?with_pgsql:BuildRequires:	postgresql-devel}
+BuildRequires:	rpmbuild(macros) >= 1.159
 Requires(pre):	/bin/id
 Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
@@ -65,8 +72,9 @@ Requires(postun):	/usr/sbin/userdel
 Requires:	m4
 Requires:	procmail
 Requires:	pam >= 0.77.3
+Provides:	group(smmsp)
 Provides:	smtpdaemon
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Provides:	user(smmsp)
 Obsoletes:	courier
 Obsoletes:	exim
 Obsoletes:	masqmail
@@ -80,6 +88,7 @@ Obsoletes:	smail
 Obsoletes:	smtpdaemon
 Obsoletes:	ssmtp
 Obsoletes:	zmailer
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sysconfdir	/etc/mail
 
@@ -223,12 +232,11 @@ m4 pld.mc > pld.cf
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/{rc.d/init.d,sysconfig,sasl,smrsh}} \
-	$RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT%{_libdir} \
-	$RPM_BUILD_ROOT%{_mandir}/man{1,5,8} \
-	$RPM_BUILD_ROOT/var/log $RPM_BUILD_ROOT/var/spool/mqueue \
-	$RPM_BUILD_ROOT%{_libdir}/sendmail-cf \
-	$RPM_BUILD_ROOT/etc/pam.d $RPM_BUILD_ROOT%{_includedir}\
+install -d $RPM_BUILD_ROOT%{_mandir}/man{1,5,8} \
+	$RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d,monit,sysconfig,sasl,smrsh} \
+	$RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}/sendmail-cf} \
+	$RPM_BUILD_ROOT/var/{log,spool/mqueue} \
+	$RPM_BUILD_ROOT{%{_sysconfdir},%{_includedir}}
 
 OBJDIR=obj.$(uname -s).$(uname -r).$(arch)
 
@@ -252,7 +260,8 @@ SMINSTOPT="DESTDIR=$RPM_BUILD_ROOT SBINOWN=$IDNU SBINGRP=$IDNG \
 %{__make} -C $OBJDIR/smrsh install \
 	$SMINSTOPT
 %{__make} -C $OBJDIR/libmilter install \
-	$SMINSTOPT
+	$SMINSTOPT \
+	LIBDIR=%{_libdir}
 
 ln -sf %{_sbindir}/makemap $RPM_BUILD_ROOT%{_bindir}/makemap
 
@@ -303,6 +312,7 @@ install %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/access
 install %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/mailertable
 install %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/virtusertable
 install %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/domaintable
+install %{SOURCE14} $RPM_BUILD_ROOT/etc/monit/
 
 mv -f smrsh/README README.smrsh
 mv -f cf/README README.cf
@@ -321,7 +331,7 @@ if [ -n "`/usr/bin/getgid smmsp`" ]; then
 		exit 1
 	fi
 else
-	/usr/sbin/groupadd -g 25 -r -f smmsp
+	/usr/sbin/groupadd -g 25 smmsp 1>&2
 fi
 if [ -n "`/bin/id -u smmsp 2>/dev/null`" ]; then
 	if [ "`/bin/id -u smmsp`" != "25" ]; then
@@ -329,7 +339,8 @@ if [ -n "`/bin/id -u smmsp 2>/dev/null`" ]; then
 		exit 1
 	fi
 else
-	/usr/sbin/useradd -u 25 -r -d /var/spool/clientqueue -s /bin/false -c "Sendmail Message Submission Program" -g smmsp smmsp 1>&2
+	/usr/sbin/useradd -u 25 -d /var/spool/clientqueue -s /bin/false \
+		-c "Sendmail Message Submission Program" -g smmsp smmsp 1>&2
 fi
 
 %post
@@ -390,8 +401,8 @@ fi
 
 %postun
 if [ "$1" = "0" ]; then
-	/usr/sbin/userdel smmsp 2>/dev/null
-	/usr/sbin/groupdel smmsp 2>/dev/null
+	%userremove smmsp
+	%groupremove smmsp
 fi
 
 # removal of compatibility links
@@ -453,6 +464,7 @@ fi
 %config(noreplace) %verify(not md5 size mtime) /etc/sysconfig/sendmail
 %config(noreplace) %verify(not md5 size mtime) /etc/sasl/Sendmail.conf
 %config(noreplace) %verify(not md5 size mtime) /etc/pam.d/smtp
+%attr(750,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/monit/*.monitrc
 
 %dir %{_libdir}/sendmail-cf
 %dir %{_libdir}/sendmail-cf/cf