]> git.pld-linux.org Git - packages/postfix.git/blobdiff - postfix.spec
projects / packages / postfix.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
- rebuild with mysql 5.7
[packages/postfix.git] / postfix.spec
diff --git a/postfix.spec b/postfix.spec
index 1420b43c6b285f617498893b16ddc845aabb6a37..2e0688aa98797ed3f175c1363872fd376be1913f 100644 (file)
--- a/postfix.spec
+++ b/postfix.spec
@@ -24,7 +24,7 @@
 %bcond_without epoll   # disable epoll for 2.4 kernels
 %endif
 
-%define                vda_ver v10-2.8.1
+%define                vda_ver v13-2.10.0
 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
@@ -33,21 +33,22 @@ 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.8.3
-Release:       1
+Version:       2.11.10
+Release:       2
 Epoch:         2
 License:       distributable
 Group:         Networking/Daemons/SMTP
 Source0:       ftp://ftp.porcupine.org/mirrors/postfix-release/official/%{name}-%{version}.tar.gz
-# Source0-md5: b3922ededd3fd6051f759e58a4ada3ae
+# Source0-md5: 0f947753a3864dc3bd40aa211f3202bb
 Source1:       %{name}.aliases
 Source2:       %{name}.cron
 Source3:       %{name}.init
 Source4:       %{name}.sysconfig
 Source5:       %{name}.sasl
 Source6:       %{name}.pamd
-Source7:       http://vda.sourceforge.net/VDA/%{name}-vda-%{vda_ver}.patch
-# Source7-md5: 5d5156e51cc07057bf347bbb34934d3e
+Source7:       %{name}-vda.patch
+#Source7:      http://vda.sourceforge.net/VDA/%{name}-vda-%{vda_ver}.patch
+# -ource7-md5: 01e1b031d79b85f3cb67d98ceddd775d
 Source8:       %{name}-bounce.cf.pl
 # http://postfix.state-of-mind.de/bounce-templates/bounce.de-DE.cf
 Source9:       %{name}-bounce.cf.de
@@ -55,6 +56,7 @@ Source10:     %{name}.monitrc
 Source11:      %{name}-vda-bigquota.patch
 #Source11:     http://vda.sourceforge.net/VDA/%{name}-%{vda_ver}-vda-ng-bigquota.patch.gz
 # -ource11-md5:        d46103195b43ec5784ea2c166b238f71
+Source12:      %{name}.service
 Patch0:                %{name}-config.patch
 Patch1:                %{name}-conf_msg.patch
 Patch2:                %{name}-dynamicmaps.patch
@@ -68,6 +70,9 @@ Patch8:               %{name}-dictname.patch
 Patch9:                %{name}-make-jN.patch
 Patch10:       %{name}-link.patch
 Patch11:       %{name}-scache_clnt.patch
+Patch12:       format-security.patch
+Patch13:       %{name}-no_cdb.patch
+Patch14:       %{name}-vbuf_print.patch
 URL:           http://www.postfix.org/
 %{?with_sasl:BuildRequires:    cyrus-sasl-devel}
 BuildRequires: db-devel
@@ -80,7 +85,7 @@ BuildRequires:        pcre-devel
 BuildRequires: perl-base
 %{?with_pgsql:BuildRequires:   postgresql-devel}
 BuildRequires: rpm >= 4.4.9-56
-BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: rpmbuild(macros) >= 1.644
 BuildRequires: sed >= 4.0
 %{?with_sqlite:BuildRequires:  sqlite3-devel}
 %{?with_cdb:BuildRequires:     tinycdb-devel}
@@ -100,6 +105,7 @@ Requires:   findutils
 Requires:      rc-scripts
 Requires:      sed
 %{?with_cdb:Requires:tinycdb}
+Requires:      systemd-units >= 38
 Suggests:      cyrus-sasl-saslauthd
 Provides:      group(postfix)
 Provides:      smtpdaemon
@@ -291,6 +297,11 @@ sed -i '/scache_clnt_create/s/server/var_scache_service/' src/global/scache_clnt
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%if %{with vda}
+%patch12 -p1
+%endif
+%{!?with_cdb:%patch13 -p1}
+%patch14 -p1
 
 %if %{with tcp}
 sed -i 's/ifdef SNAPSHOT/if 1/' src/util/dict_open.c
@@ -299,11 +310,10 @@ sed -i 's/ifdef SNAPSHOT/if 1/' src/util/dict_open.c
 %build
 %{__make} -f Makefile.init makefiles
 %{__make} tidy
-CC="%{__cc}"
-export CC
-%{__make} \
+export CC="%{__cc}"
+%{__make} -j1 \
        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=""} \
@@ -317,8 +327,10 @@ install -d $RPM_BUILD_ROOT/etc/{cron.daily,rc.d/init.d,sysconfig,pam.d,security,
        $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}/postfix,/usr/lib}\
        $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}
+       $RPM_BUILD_ROOT%{_var}/lib/postfix \
+       $RPM_BUILD_ROOT%{systemdunitdir}
+
+%{__rm} html/Makefile.in conf/{LICENSE,main.cf.default}
 
 install -p bin/* $RPM_BUILD_ROOT%{_sbindir}
 install -p libexec/* $RPM_BUILD_ROOT%{_libdir}/postfix
@@ -346,6 +358,7 @@ cp -a %{SOURCE6} $RPM_BUILD_ROOT/etc/pam.d/smtp
 cp -a %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/mail/bounce.cf.pl
 cp -a %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/mail/bounce.cf.de
 cp -a %{SOURCE10} $RPM_BUILD_ROOT/etc/monit/%{name}.monitrc
+cp -a %{SOURCE12} $RPM_BUILD_ROOT%{systemdunitdir}/%{name}.service
 install -p auxiliary/rmail/rmail $RPM_BUILD_ROOT%{_bindir}/rmail
 install -p auxiliary/qshape/qshape.pl $RPM_BUILD_ROOT%{_bindir}/qshape
 
@@ -360,10 +373,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
@@ -384,7 +397,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
@@ -394,12 +407,14 @@ fi
 %{_bindir}/newaliases
 /sbin/chkconfig --add postfix
 %service postfix restart "Postfix Daemon"
+%systemd_post postfix.service
 
 %preun
 if [ "$1" = "0" ]; then
        %service postfix stop
        /sbin/chkconfig --del postfix
 fi
+%systemd_preun postfix.service
 
 %postun
 /sbin/ldconfig
@@ -408,6 +423,10 @@ if [ "$1" = "0" ]; then
        %userremove postfix
        %groupremove postfix
 fi
+%systemd_reload
+
+%triggerpostun -- postfix < 2:2.9.4-4
+%systemd_trigger postfix.service
 
 %files
 %defattr(644,root,root,755)
@@ -453,6 +472,7 @@ fi
 %attr(755,root,root) %{_sbindir}/postmulti
 %attr(2755,root,maildrop) %{_sbindir}/postqueue
 %attr(755,root,root) %{_sbindir}/postsuper
+%attr(755,root,root) %{_sbindir}/posttls-finger
 %attr(2755,root,maildrop) %{_sbindir}/postdrop
 %attr(755,root,root) %{_sbindir}/qmqp-sink
 %attr(755,root,root) %{_sbindir}/qmqp-source
@@ -460,6 +480,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
@@ -488,16 +509,20 @@ fi
 %{_mandir}/man5/cidr_table.5*
 %{_mandir}/man5/generic.5*
 %{_mandir}/man5/header_checks.5*
+%{_mandir}/man5/lmdb_table.5*
 %{_mandir}/man5/master.5*
+%{_mandir}/man5/memcache_table.5*
 %{_mandir}/man5/nisplus_table.5*
 %{_mandir}/man5/postconf.5*
 %{_mandir}/man5/postfix-wrapper.5*
 %{_mandir}/man5/regexp_table.5*
 %{_mandir}/man5/relocated.5*
+%{_mandir}/man5/socketmap_table.5*
 %{_mandir}/man5/tcp_table.5*
 %{_mandir}/man5/transport.5*
 %{_mandir}/man5/virtual.5*
 %{_mandir}/man8/*.8*
+%{systemdunitdir}/%{name}.service
 
 %files devel
 %defattr(644,root,root,755)
Postfix Mail Transport Agent
This page took 0.034765 seconds and 4 git commands to generate.