Browse Source

postfix: update to 2.8.2

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@3427 ec354946-7b23-47d6-9f5a-488ba84defc7
daisuke 13 years ago
parent
commit
0933620d4b
1 changed files with 13 additions and 6 deletions
  1. 13 6
      p/postfix/postfix-vl.spec

+ 13 - 6
p/postfix/postfix-vl.spec

@@ -7,7 +7,7 @@
 %define _sysconfdir   /etc
 %define _data_dir     %{_var}/lib/postfix
 
-%define origversion 2.6.8
+%define origversion 2.8.2
 
 # japanese documant for 2.5.x is not ready.
 # %define jconfversion 2.2.0
@@ -19,7 +19,7 @@ Summary:   Postfix Mail Transport Agent
 Summary(ja):   Postfix メールトランスポートエージェント
 Name:      postfix
 Version:   %{origversion}
-Release:   5%{?_dist_release}
+Release:   1%{?_dist_release}
 URL:       http://www.postfix.org/
 License:   Distributable - IBM PUBLIC LICENSE VERSION 1.0 - SECURE MAILER
 Group:     System Environment/Daemons
@@ -39,8 +39,9 @@ Patch0:    postfix-2.1.5-vine.patch
 Patch1:    postfix-2.2.10-main.cf-lib64.patch
 
 # patches 100-199 are imported from debian package.
-# patches 100/101 for postfix 2.5.x are from suse.  
-Patch100: postfix-2.6.8-dynamicmaps.patch
+# patches 100/101 for postfix 2.8.x are from suse.  
+Patch100: postfix-2.8.2-dynamicmaps.patch
+Patch101: postfix-2.8.2-dynamicmaps-pie.patch
 
 # patches 200-299 are imported from rh/fedora
 Patch200: postfix-2.5.7-large-fs.patch	   
@@ -68,7 +69,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 Vendor: Project Vine
 Distribution: Vine Linux
-Packager: Daisuke SUZUKI <daisuke@linux.or.jp>
+Packager: daisuke
 
 
 %description
@@ -156,6 +157,7 @@ PCRE map on Postfix.
 %endif
 
 %patch100 -p1 -b .dynamicmaps
+%patch101 -p0 -b .dynamicmaps-pie
 perl -pi -e 's,/usr/lib/,/usr/lib64/,' conf/postfix-files
 perl -pi -e 's,-lmysqlclient,-lmysqlclient -L%{_libdir}/mysql,' src/global/Makefile.in
 
@@ -177,6 +179,7 @@ sed -ie "s/ dict_pgsql.so/ /" Makefile.in
 popd
 
 %build
+export PIE="-pie"
 make makefiles \
 	CCARGS="-DMAX_DYNAMIC_MAPS \
 	        -DUSE_SASL_AUTH -I/usr/include/sasl \
@@ -193,7 +196,7 @@ make makefiles \
 		-DUSE_TLS" \
 	AUXLIBS="-lsasl2 -lssl -lcrypto" \
 	OPT="$RPM_OPT_FLAGS" DEBUG=""
-for libs in master global util dns tls xsasl milter
+for libs in master global util dns tls milter
 do
   ln -sf lib${libs}.a lib/libpostfix-${libs}.so.1
 done
@@ -505,6 +508,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/postfix/dict_pcre.so
 
 %changelog
+* Wed Apr 13 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.8.2-1
+- update to 2.8.2
+- add dynamicmaps patch
+
 * Tue Apr 12 2011 Shu KONNO <owa@bg.wakwak.com> 2.6.8-5
 - rebuilt with postgresql-9.0.3