X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=sendmail.spec;h=741be7ca8915a3cd0f3cdc25f19e4d94b965fca1;hb=2747c047802ff7ef52cd166e479c159c611f7fb5;hp=1b49c36788a7601ed5e27414ecc804ca9cf15da1;hpb=7ca6cd051139a68577814bab2d047b3510bf7467;p=packages%2Fsendmail.git

diff --git a/sendmail.spec b/sendmail.spec
index 1b49c36..741be7c 100644
--- a/sendmail.spec
+++ b/sendmail.spec
@@ -2,45 +2,48 @@
 # Conditional build:
 # _without_ldap		without LDAP support
 # _without_tls		without TLS (SSL) support
-# _with_auth		with AUTH support
 
 Summary:	A widely used Mail Transport Agent (MTA)
 Summary(de):	sendmail-Mail-Übertragungsagent
 Summary(fr):	Agent de transport de courrier sendmail
 Summary(pl):	Sendmail - serwer poczty elektronicznej
+Summary(ru):	ðÏÞÔÏ×ÙÊ ÔÒÁÎÓÐÏÒÔÎÙÊ ÁÇÅÎÔ sendmail
 Summary(tr):	Elektronik posta hizmetleri sunucusu
+Summary(uk):	ðÏÛÔÏ×ÉÊ ÔÒÁÎÓÐÏÒÔÎÉÊ ÁÇÅÎÔ sendmail
 Name:		sendmail
-Version:	8.12.2
-Release:	1
+Version:	8.12.3
+Release:	3
 License:	BSD
 Group:		Networking/Daemons
 Source0:	ftp://ftp.sendmail.org/pub/sendmail/%{name}.%{version}.tar.gz
 Source1:	%{name}.init
 Source2:	http://www.informatik.uni-kiel.de/~ca/email/rules/check.tar
-Source3:	aliases
+Source3:	%{name}.aliases
 Source4:	%{name}.sysconfig
 Source5:	%{name}-etc-mail-Makefile
 Source6:	%{name}.mc
 Source7:	%{name}-config.m4
 Source8:	%{name}.sasl
+Source9:	%{name}.access
+Source10:	%{name}.mailertable
+Source11:	%{name}.virtusertable
+Source12:	%{name}.domaintable
+Source13:	%{name}-smtp.pamd
+# From http://doc.phpauction.org/sendmail/examples/
+Source14:	%{name}-examples.tar.bz2
 Patch0:		%{name}-makemapman.patch
 Patch1:		%{name}-smrsh-paths.patch
 Patch2:		%{name}-rmail.patch
 Patch3:		%{name}-os-paths.patch
 Patch4:		%{name}-m4path.patch
-Patch5:		%{name}-dtelnet.patch
-Patch6:		%{name}-pld.mc.patch
-Patch7:		%{name}-redirect.patch
-Patch8:		%{name}-hprescan-dos.patch
-Patch9:		%{name}-auth.patch
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Patch5:		%{name}-redirect.patch
+Patch6:		%{name}-hprescan-dos.patch
 BuildRequires:	cyrus-sasl-devel
 BuildRequires:	db3-devel
 %{!?_without_ldap:BuildRequires:	openldap-devel}
 %{!?_without_tls:BuildRequires:	openssl-devel}
 Requires:	m4
 Requires:	procmail
-%{?_with_auth:Requires: cyrus-sasl-plain}
 PreReq:		/sbin/chkconfig
 Requires(pre):	/bin/id
 Requires(pre):	/usr/bin/getgid
@@ -51,6 +54,7 @@ Requires(post):	textutils
 Requires(postun):	/usr/sbin/groupdel
 Requires(postun):	/usr/sbin/userdel
 Provides:	smtpdaemon
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:	smtpdaemon
 Obsoletes:	exim
 Obsoletes:	masqmail
@@ -94,11 +98,23 @@ dodatkowym atutem jest prosta konfiguracja. Dzi
 mo¿liwo¶ciom konfiguracyjnym jest w stanie dostarczaæ przesy³ki za
 po¶rednictwem protoko³ów: SMTP, ESMTP, UUCP, X.400 i innych.
 
+%description -l ru
+Sendmail - ÜÔÏ Mail Transport Agent, ÐÒÏÇÒÁÍÍÁ ÐÅÒÅÓÙÌÁÀÝÁÑ ÐÏÞÔÕ Ó
+ÍÁÛÉÎÙ ÎÁ ÍÁÛÉÎÕ. Sendmail ÐÒÅÄÏÓÔÁ×ÌÑÅÔ ÓÔÁÎÄÁÒÔÎÙÅ ÓÒÅÄÓÔ×Á
+ÍÅÖÓÅÔÅ×ÏÊ ÍÁÒÛÒÕÔÉÚÁÃÉÉ ÐÏÞÔÙ, aliasing, forwarding, Á×ÔÏÍÁÔÉÞÅÓËÕÀ
+ÍÁÒÛÒÕÔÉÚÁÃÉÀ ÄÌÑ ÓÅÔÅ×ÙÈ ÛÌÀÚÏ× É ÇÉÂËÉÊ ÍÅÈÁÎÉÚÍ ËÏÎÆÉÇÕÒÁÃÉÉ.
+
 %description -l tr
 Sendmail, bir mektubu bir makineden diðerine taþýr. Pek çok davranýþý
 ayarlanabilir. Internet üzerinden mektup almak veya göndermek
 istiyorsanýz bu pakete gereksiniminiz olacaktýr.
 
+%description -l uk
+Sendmail - ÃÅ Mail Transport Agent, ÐÒÏÇÒÁÍÁ ÝÏ ÐÅÒÅÓÉÌÁ¤ ÐÏÛÔÕ Ú
+ÍÁÛÉÎÉ ÎÁ ÍÁÛÉÎÕ. Sendmail ÎÁÄÁ¤ ÓÔÁÎÄÁÒÔΦ ÚÁÓÏÂÉ Í¦ÖÍÅÒÅÖÅ×ϧ
+ÍÁÒÛÒÕÔÉÚÁæ§ ÐÏÛÔÉ, aliasing, forwarding, Á×ÔÏÍÁÔÉÞÎÕ ÍÁÒÛÒÕÔÉÚÁæÀ
+ÄÌÑ ÍÅÒÅÖÅ×ÉÈ ÛÌÀÚ¦× ÔÁ ÇÎÕÞËÉÊ ÍÅÈÁΦÚÍ ÍÁÒÛÒÕÔÉÚÁæ§.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -108,20 +124,17 @@ istiyorsan
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%if %{?_with_auth:1}%{!?_with_auth:0}
-patch -p0 %{SOURCE6} %{PATCH9}
-%endif
 
 # seems to be obsoleted...
 #tar xf %{SOURCE2} -C cf
 
-sed -e 's|@@PATH@@|\.\.|' < %{SOURCE6} > cf/cf/redhat.mc
+sed -e 's|@@PATH@@|\.\.|' < %{SOURCE6} > cf/cf/pld.mc
 
 install %{SOURCE7} config.m4
 
 %build
+echo "define(\`confCC', \`%{__cc}')" >> config.m4
+echo "define(\`confOPTIMIZE', \`%{rpmcflags} -DUSE_VENDOR_CF_PATH=1 -DNETINET6')" >> config.m4
 %if %{?debug:0}%{!?debug:1}
 echo "define(\`confLDOPTS', \`-s')" >> config.m4
 %endif
@@ -134,9 +147,6 @@ echo "APPENDDEF(\`confENVDEF', \`-DSTARTTLS')" >> config.m4
 echo "APPENDDEF(\`confLIBS', \`-lssl -lcrypto')" >> config.m4
 %endif
 
-RPM_OPT_FLAGS="%{rpmcflags} -DUSE_VENDOR_CF_PATH=1 -DNETINET6"
-export RPM_OPT_FLAGS
-
 cd sendmail	&& sh Build -f ../config.m4
 cd ../mailstats	&& sh Build -f ../config.m4
 cd ../rmail	&& sh Build -f ../config.m4
@@ -144,7 +154,7 @@ cd ../makemap	&& sh Build -f ../config.m4
 cd ../praliases	&& sh Build -f ../config.m4
 cd ../smrsh	&& sh Build -f ../config.m4
 cd ../cf/cf
-m4 redhat.mc > redhat.cf
+m4 pld.mc > pld.cf
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -153,6 +163,7 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/{rc.d/init.d,sysconfig,sasl,smrsh
 	$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 \
 
 OBJDIR=obj.$(uname -s).$(uname -r).$(arch)
 
@@ -177,7 +188,7 @@ cp -ar * $RPM_BUILD_ROOT%{_libdir}/sendmail-cf
 cd -
 
 # sendmail.{cf,mc}
-install cf/cf/redhat.cf $RPM_BUILD_ROOT%{_sysconfdir}/sendmail.cf
+install cf/cf/pld.cf $RPM_BUILD_ROOT%{_sysconfdir}/sendmail.cf
 sed -e 's|@@PATH@@|%{_libdir}/sendmail-cf|' < %{SOURCE6} \
 	> $RPM_BUILD_ROOT%{_sysconfdir}/sendmail.mc
 
@@ -194,17 +205,6 @@ for f in hoststat mailq newaliases purgestat ; do
 	ln -sf ../sbin/sendmail $RPM_BUILD_ROOT%{_bindir}/${f}
 done
 
-cat <<EOF > $RPM_BUILD_ROOT%{_sysconfdir}/access
-# Check the %{_prefix}/doc/sendmail-%{version}/README.cf file for a description
-# of the format of this file. (search for access_db in that file)
-# The %{_prefix}/doc/sendmail-%{version}/README.cf is part of the sendmail-doc
-# package.
-#
-# by default we allow relaying from localhost...
-localhost.localdomain		RELAY
-localhost			RELAY
-127.0.0.1			RELAY
-EOF
 
 for map in virtusertable access domaintable mailertable ; do
 	touch $RPM_BUILD_ROOT%{_sysconfdir}/${map}
@@ -220,11 +220,23 @@ install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/sendmail
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/sendmail
 install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/Makefile
 install %{SOURCE8} $RPM_BUILD_ROOT/etc/sasl/Sendmail.conf
+install %{SOURCE13} $RPM_BUILD_ROOT/etc/pam.d/smtp
+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
+
+#cp -f %{SOURCE9} ./access.sample
+#cp -f %{SOURCE10} ./mailertable.sample
+#cp -f %{SOURCE11} ./virtusertable.sample
+#cp -f %{SOURCE12} ./domaintable.sample
 
 mv -f smrsh/README README.smrsh
 mv -f cf/README README.cf
 mv -f doc/op/op.me .
 
+bzip2 -d %{SOURCE14} | tar xf -
+
 gzip -9nf FAQ KNOWNBUGS README* op.me RELEASE_NOTES
 
 %clean
@@ -256,14 +268,14 @@ if [ -f /etc/mail/deny ] ; then
 	cat /etc/mail/deny | \
 		awk 'BEGIN{ print "# Entries from obsoleted /etc/mail/deny"} \
 		{print $1" REJECT"}' >> /etc/mail/access
-	cp -f /etc/mail/deny /etc/mail/deny.rpmorig
+	mv -f /etc/mail/deny /etc/mail/deny.rpmorig
 fi
 for oldfile in relay_allow ip_allow name_allow ; do
 	if [ -f /etc/mail/$oldfile ] ; then
 		cat /etc/mail/$oldfile | \
 			awk "BEGIN { print \"# Entries from obsoleted /etc/mail/$oldfile\" ;} \
 			{ print $1\" RELAY\" }" >> /etc/mail/access
-		cp -f /etc/mail/$oldfile /etc/mail/$oldfile.rpmorig
+		mv -f /etc/mail/$oldfile /etc/mail/$oldfile.rpmorig
 	fi
 done
 
@@ -274,7 +286,7 @@ if [ -f /etc/sendmail.cw ] ; then
 	cat /etc/sendmail.cw | \
 		awk 'BEGIN { print "# Entries from obsoleted /etc/sendmail.cw" ;} \
 		{ print $1 }' >> /etc/mail/local-host-names
-	cp -f /etc/sendmail.cw /etc/sendmail.cw.rpmorig
+	mv -f /etc/sendmail.cw /etc/sendmail.cw.rpmorig
 fi
 #
 # Rebuild maps (next reboot will rebuild also)
@@ -315,7 +327,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc *.gz
+%doc *.gz examples/
 %attr(755,root,root) %{_sbindir}/mailstats
 %attr(755,root,root) %{_sbindir}/praliases
 %attr(755,root,root) %{_bindir}/hoststat
@@ -350,6 +362,7 @@ fi
 %attr(0644,root,mail) %ghost %{_sysconfdir}/aliases.db
 %attr(0770,root,smmsp) %dir /var/spool/clientmqueue
 %attr(0750,root,mail) %dir /var/spool/mqueue
+%attr(0755,root,root) %dir /etc/pam.d
 
 %config %{_sysconfdir}/Makefile
 %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/access
@@ -365,6 +378,7 @@ fi
 %attr(754,root,root) /etc/rc.d/init.d/sendmail
 %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