- release 3 (by relup.sh)

[packages/postfix.git] / postfix.spec

diff --git a/postfix.spec b/postfix.spec
index 8e8c9436be409ad63e74bfa808c5c6f72e74ad68..b572d5a49a15b1a19a7a6dba2657b954293a9f0e 100644 (file)
--- a/postfix.spec
+++ b/postfix.spec
@@ -3,6 +3,7 @@
 %bcond_without ldap    # without LDAP map module
 %bcond_without mysql   # without MySQL map module
 %bcond_without pgsql   # without PostgreSQL map module
+%bcond_without sqlite  # without SQLite map module
 %bcond_without sasl    # without SMTP AUTH support
 %bcond_without ssl     # without SSL/TLS support
 %bcond_without cdb     # without cdb map support
@@ -23,7 +24,7 @@
 %bcond_without epoll   # disable epoll for 2.4 kernels
 %endif
 
-%define                vda_ver 2.7.0
+%define                vda_ver v11-2.9.1
 Summary:       Postfix Mail Transport Agent
 Summary(cs.UTF-8):     Postfix - program pro přepravu pošty (MTA)
 Summary(es.UTF-8):     Postfix - Un MTA (Mail Transport Agent) de alto desempeño
@@ -32,13 +33,13 @@ Summary(pl.UTF-8):  Serwer SMTP Postfix
 Summary(pt_BR.UTF-8):  Postfix - Um MTA (Mail Transport Agent) de alto desempenho
 Summary(sk.UTF-8):     Agent prenosu pošty Postfix
 Name:          postfix
-Version:       2.7.2
+Version:       2.9.4
 Release:       3
 Epoch:         2
 License:       distributable
 Group:         Networking/Daemons/SMTP
 Source0:       ftp://ftp.porcupine.org/mirrors/postfix-release/official/%{name}-%{version}.tar.gz
-# Source0-md5: 9a91e4f6f1bed6a04e0852cb6604191c
+# Source0-md5: 230bc3c00c051946eccd850058d75f6c
 Source1:       %{name}.aliases
 Source2:       %{name}.cron
 Source3:       %{name}.init
@@ -46,7 +47,7 @@ Source4:      %{name}.sysconfig
 Source5:       %{name}.sasl
 Source6:       %{name}.pamd
 Source7:       http://vda.sourceforge.net/VDA/%{name}-vda-%{vda_ver}.patch
-# Source7-md5: f73d119fc9e00f31f23599176554e763
+# Source7-md5: a54a21428de5eeae91b4bb670976e37a
 Source8:       %{name}-bounce.cf.pl
 # http://postfix.state-of-mind.de/bounce-templates/bounce.de-DE.cf
 Source9:       %{name}-bounce.cf.de
@@ -66,6 +67,7 @@ Patch7:               %{name}-conf.patch
 Patch8:                %{name}-dictname.patch
 Patch9:                %{name}-make-jN.patch
 Patch10:       %{name}-link.patch
+Patch11:       %{name}-scache_clnt.patch
 URL:           http://www.postfix.org/
 %{?with_sasl:BuildRequires:    cyrus-sasl-devel}
 BuildRequires: db-devel
@@ -80,6 +82,7 @@ BuildRequires:        perl-base
 BuildRequires: rpm >= 4.4.9-56
 BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: sed >= 4.0
+%{?with_sqlite:BuildRequires:  sqlite3-devel}
 %{?with_cdb:BuildRequires:     tinycdb-devel}
 %{?with_mysql:BuildRequires:   zlib-devel}
 Requires(post):        /bin/hostname
@@ -218,6 +221,18 @@ This package provides support for PostgreSQL maps in Postfix.
 %description dict-pgsql -l pl.UTF-8
 Ten pakiet dodaje obsługę map PostgreSQL do Postfiksa.
 
+%package dict-sqlite
+Summary:       SQLite map support for Postfix
+Summary(pl.UTF-8):     Obsługa map SQLite dla Postfiksa
+Group:         Networking/Daemons/SMTP
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+
+%description dict-sqlite
+This package provides support for SQLite maps in Postfix.
+
+%description dict-sqlite -l pl.UTF-8
+Ten pakiet dodaje obsługę map SQLite do Postfiksa.
+
 %package qshape
 Summary:       qshape - Print Postfix queue domain and age distribution
 Summary(pl.UTF-8):     qshape - wypisywanie rozkładu domen i wieku z kolejki Postfiksa
@@ -275,6 +290,7 @@ sed -i '/scache_clnt_create/s/server/var_scache_service/' src/global/scache_clnt
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 %if %{with tcp}
 sed -i 's/ifdef SNAPSHOT/if 1/' src/util/dict_open.c
@@ -287,7 +303,7 @@ CC="%{__cc}"
 export CC
 %{__make} \
        DEBUG="" \
-       OPT="%{rpmcflags} -D_FILE_OFFSET_BITS=64" \
+       OPT="%{rpmcflags} %{rpmcppflags} -D_FILE_OFFSET_BITS=64" \
        %{!?with_ldap:LDAPSO=""} \
        %{!?with_mysql:MYSQLSO=""} \
        %{!?with_pgsql:PGSQLSO=""} \
@@ -302,7 +318,7 @@ install -d $RPM_BUILD_ROOT/etc/{cron.daily,rc.d/init.d,sysconfig,pam.d,security,
        $RPM_BUILD_ROOT{%{_includedir}/postfix,%{_mandir}} \
        $RPM_BUILD_ROOT%{_var}/spool/postfix/{active,corrupt,deferred,maildrop,private,saved,bounce,defer,incoming,pid,public} \
        $RPM_BUILD_ROOT%{_var}/lib/postfix
-rm -f html/Makefile.in conf/{LICENSE,main.cf.default}
+%{__rm} html/Makefile.in conf/{LICENSE,main.cf.default}
 
 install -p bin/* $RPM_BUILD_ROOT%{_sbindir}
 install -p libexec/* $RPM_BUILD_ROOT%{_libdir}/postfix
@@ -344,10 +360,10 @@ touch $RPM_BUILD_ROOT/etc/security/blacklist.smtp
 
 > $RPM_BUILD_ROOT/var/spool/postfix/.nofinger
 
-rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/mail/makedefs.out
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/mail/TLS_LICENSE
+%{__rm} -r $RPM_BUILD_ROOT%{_sysconfdir}/mail/makedefs.out
+%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/mail/TLS_LICENSE
 
-rm $RPM_BUILD_ROOT%{_sysconfdir}/mail/{postfix-files,postfix-script,post-install}
+%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/mail/{postfix-files,postfix-script,post-install}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -368,7 +384,7 @@ if [ "$1" = "1" ]; then
        # postfix expects gethostname() to return FQDN, which is obviously wrong
        if ! grep -qE "^my(domain|hostname)" %{_sysconfdir}/mail/main.cf; then
                domain=$(/bin/hostname -d 2>/dev/null)
-               [ "$domain" != 'localdomain' ] && \
+               [ -n "$domain" -a "$domain" != 'localdomain' ] && \
                        postconf -e mydomain="$domain"
        fi
 else
@@ -444,6 +460,7 @@ fi
 %dir %{_libdir}/postfix
 %attr(755,root,root) %{_libdir}/postfix/[!d]*
 %attr(755,root,root) %{_libdir}/postfix/discard
+%attr(755,root,root) %{_libdir}/postfix/dnsblog
 %attr(755,root,root) %dir %{_var}/spool/postfix
 %attr(700,postfix,root) %dir %{_var}/spool/postfix/active
 %attr(700,postfix,root) %dir %{_var}/spool/postfix/bounce
@@ -473,6 +490,7 @@ fi
 %{_mandir}/man5/generic.5*
 %{_mandir}/man5/header_checks.5*
 %{_mandir}/man5/master.5*
+%{_mandir}/man5/memcache_table.5*
 %{_mandir}/man5/nisplus_table.5*
 %{_mandir}/man5/postconf.5*
 %{_mandir}/man5/postfix-wrapper.5*
@@ -515,6 +533,13 @@ fi
 %{_mandir}/man5/pgsql_table.5*
 %endif
 
+%if %{with sqlite}
+%files dict-sqlite
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/postfix/dict_sqlite.so
+%{_mandir}/man5/sqlite_table.5*
+%endif
+
 %files qshape
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qshape