X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=sendmail.spec;h=1a40a7837e8585e4ebfc720739b99ec9c8993dcd;hb=a6d88ee0168a59583d7875fc971d0b899edf717c;hp=b592b9dfaf7338337bf6c7d31aa6fab9a26edea7;hpb=0d2f4853017e6d7162a42f856ba6d642bc5b0520;p=packages%2Fsendmail.git

diff --git a/sendmail.spec b/sendmail.spec
index b592b9d..1a40a78 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:	0.2
+Version:	8.13.1
+Release:	2.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
@@ -46,12 +52,13 @@ Patch5:		%{name}-redirect.patch
 Patch6:		%{name}-hprescan-dos.patch
 Patch7:		http://blue-labs.org/clue/bluelabs.patch-8.12.3
 BuildRequires:	cyrus-sasl-devel
-BuildRequires:	man
 %{?with_db3:BuildRequires:	db3-devel}
 %{!?with_db3:BuildRequires:	db-devel >= 4.1.25}
+BuildRequires:	man
 %{?with_ldap:BuildRequires:	openldap-devel}
-%{?with_tls:BuildRequires:	openssl-devel >= 0.9.7c}
+%{?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
 
@@ -152,6 +161,17 @@ Sendmail - 
 ÍÁÒÛÒÕÔÉÚÁæ§ ÐÏÛÔÉ, aliasing, forwarding, Á×ÔÏÍÁÔÉÞÎÕ ÍÁÒÛÒÕÔÉÚÁæÀ
 ÄÌÑ ÍÅÒÅÖÅ×ÉÈ ÛÌÀÚ¦× ÔÁ ÇÎÕÞËÉÊ ÍÅÈÁΦÚÍ ÍÁÒÛÒÕÔÉÚÁæ§.
 
+%package devel
+Summary:	Header files and static libmilter library
+Summary(pl):	Pliki nag³ówkowe i statyczna biblioteka libmilter
+Group:		Development/Libraries
+
+%description devel
+Header files and static libmilter library.
+
+%description devel -l pl
+Pliki nag³ówkowe i statyczna biblioteka libmilter.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -206,17 +226,18 @@ cd ../rmail	&& sh Build -f ../config.m4
 cd ../makemap	&& sh Build -f ../config.m4
 cd ../praliases	&& sh Build -f ../config.m4
 cd ../smrsh	&& sh Build -f ../config.m4
+cd ../libmilter	&& sh Build -f ../config.m4
 cd ../cf/cf
 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 \
+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},%{_prefix}/lib} \
+	$RPM_BUILD_ROOT{%{_datadir}/sendmail-cf,%{_libdir}} \
+	$RPM_BUILD_ROOT/var/{log,spool/mqueue} \
+	$RPM_BUILD_ROOT{%{_sysconfdir},%{_includedir}}
 
 OBJDIR=obj.$(uname -s).$(uname -r).$(arch)
 
@@ -225,7 +246,8 @@ IDNG=`id -ng`
 SMINSTOPT="DESTDIR=$RPM_BUILD_ROOT SBINOWN=$IDNU SBINGRP=$IDNG \
 	UBINOWN=$IDNU UBINGRP=$IDNG MANOWN=$IDNU MANGRP=$IDNG \
 	CFOWN=$IDNU CFGRP=$IDNG MSPQOWN=$IDNU GBINGRP=$IDNG GBINOWN=$IDNU \
-	BINOWN=$IDNU BINGRP=$IDNG"
+	BINOWN=$IDNU BINGRP=$IDNG LIBOWN=$IDNU LIBGRP=$IDNG INCOWN=$IDNU INCGRP=$IDNG"
+
 %{__make} -C $OBJDIR/sendmail install \
 	$SMINSTOPT
 %{__make} -C $OBJDIR/mailstats install \
@@ -238,18 +260,21 @@ SMINSTOPT="DESTDIR=$RPM_BUILD_ROOT SBINOWN=$IDNU SBINGRP=$IDNG \
 	$SMINSTOPT
 %{__make} -C $OBJDIR/smrsh install \
 	$SMINSTOPT
+%{__make} -C $OBJDIR/libmilter install \
+	$SMINSTOPT \
+	LIBDIR=%{_libdir}
 
 ln -sf %{_sbindir}/makemap $RPM_BUILD_ROOT%{_bindir}/makemap
 
 # install the cf files
 cd cf
 rm -f cf/{Build,Makefile} feature/*~
-cp -ar * $RPM_BUILD_ROOT%{_libdir}/sendmail-cf
+cp -ar * $RPM_BUILD_ROOT%{_datadir}/sendmail-cf
 cd -
 
 # sendmail.{cf,mc}
 install cf/cf/pld.cf $RPM_BUILD_ROOT%{_sysconfdir}/sendmail.cf
-sed -e 's|@@PATH@@|%{_libdir}/sendmail-cf|' < %{SOURCE6} \
+sed -e 's|@@PATH@@|%{_datadir}/sendmail-cf|' < %{SOURCE6} \
 	> $RPM_BUILD_ROOT%{_sysconfdir}/sendmail.mc
 
 %if %{with pgsql}
@@ -262,7 +287,7 @@ install cf/cf/submit.mc $RPM_BUILD_ROOT%{_sysconfdir}
 echo "# local-host-names - include all aliases for your machine here." \
 	> $RPM_BUILD_ROOT%{_sysconfdir}/local-host-names
 
-ln -sf /usr/sbin/sendmail $RPM_BUILD_ROOT%{_libdir}/sendmail
+ln -sf /usr/sbin/sendmail $RPM_BUILD_ROOT%{_prefix}/lib/sendmail
 
 # dangling symlinks
 for f in hoststat mailq newaliases purgestat ; do
@@ -288,11 +313,13 @@ 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
 mv -f doc/op/op.me .
 
+
 bzip2 -dc %{SOURCE4} | tar xf -
 
 %clean
@@ -305,7 +332,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
@@ -313,7 +340,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
@@ -374,8 +402,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
@@ -396,7 +424,7 @@ fi
 %attr(755,root,root) %{_bindir}/newaliases
 %attr(755,root,root) %{_bindir}/mailq
 %attr(755,root,root) %{_sbindir}/smrsh
-%{_libdir}/sendmail
+%{_prefix}/lib/sendmail
 
 %{_mandir}/man1/mailq.1*
 %{_mandir}/man1/newaliases.1*
@@ -437,15 +465,21 @@ 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
-
-%dir %{_libdir}/sendmail-cf
-%dir %{_libdir}/sendmail-cf/cf
-%{_libdir}/sendmail-cf/cf/pld.mc
-%{_libdir}/sendmail-cf/feature
-%{_libdir}/sendmail-cf/m4
-%{_libdir}/sendmail-cf/mailer
-%dir %{_libdir}/sendmail-cf/ostype
-%{_libdir}/sendmail-cf/ostype/linux.m4
-%dir %{_libdir}/sendmail-cf/sh
-%{_libdir}/sendmail-cf/sh/makeinfo.sh
-%{_libdir}/sendmail-cf/siteconfig
+%attr(750,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/monit/*.monitrc
+
+%dir %{_datadir}/sendmail-cf
+%dir %{_datadir}/sendmail-cf/cf
+%{_datadir}/sendmail-cf/cf/pld.mc
+%{_datadir}/sendmail-cf/feature
+%{_datadir}/sendmail-cf/m4
+%{_datadir}/sendmail-cf/mailer
+%dir %{_datadir}/sendmail-cf/ostype
+%{_datadir}/sendmail-cf/ostype/linux.m4
+%dir %{_datadir}/sendmail-cf/sh
+%{_datadir}/sendmail-cf/sh/makeinfo.sh
+%{_datadir}/sendmail-cf/siteconfig
+
+%files devel
+%defattr(644,root,root,755)
+%{_libdir}/libmilter.a
+%{_includedir}/libmilter