mail-mta/postfix: bump to 3.4_pre20180904

Package-Manager: Portage-2.3.49, Repoman-2.3.10
johu · Sep 18, 2018 · e303899 · e303899
1 parent 301d0d2
commit e303899
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
@@ -3,5 +3,5 @@ DIST postfix-3.1.6.tar.gz 4341308 BLAKE2B 6a5ec763cf96770240f63b35b4532c555cc6e5
 DIST postfix-3.2.4.tar.gz 4390376 BLAKE2B 132a6b467f9156d716a92cc7beae0f9a7c47e6a2045e83726a5e7305e6f9bf666ebcfb93a9ab1a96ec988431661059d62e926287bd13089eeb4bab3e8f4b9fc7 SHA512 6dc583d3b1c98f5c8d6486351bee9f92a98b5379cd0d76d26a382379c112317e7a2a58c3a200477a6d0f831c73395257d1a63170df17ea8a65a4048a7df391f8
 DIST postfix-3.2.6.tar.gz 4395159 BLAKE2B 2eef28f9189830725c02b98512ca7859770f090cbef3fe453b57fade967fd20f94cd3cd8e8955252dc230e674ed7827fc68ad910cd4fc63029dc2c92ea75f0af SHA512 081751fe9af7612e7ee01a80ceffbc09db60764e12099d2a5e053205d0e7c70c6ef4f96526e1a98780965c43354e0ccd6ef61b4dbe93b249179890b81836c705
 DIST postfix-3.3.1.tar.gz 4420912 BLAKE2B 065fd04cdfa343a6c50a629e8da47fad71465df790ca88adcad4efc7ab273330c39998c6bf503587b8bcba3d87bb98b1be6413e49449e2241258a99217473c11 SHA512 2307f50f8b7dab1db46ebe4ae30bc5682a25b9c49ae5ae65aa95b4620bb5450dd5929977c0f34b9e73a92ca6af36fd8e24167732420a1a2d89167c7a3b197276
-DIST postfix-3.4-20180826.tar.gz 4484669 BLAKE2B 9205b3f0c41067cd7365304b5831fabdde3dd5f830a110f0a7a133f4842213fe3bc0a46a8b3e406441fcad7e887b71b6cfd8f8cdd4bb201badc22c3eb9eb054a SHA512 f5172a09adf34dc3750846f88d0418618b76203583637aa58a018a41b63e6f7367f0c0444dbed825961b3840d5b502e5f4e706e22037ed56bfe82242c31996de
+DIST postfix-3.4-20180904.tar.gz 4484937 BLAKE2B 4c3b9582d306d4166ef89ee6312ac30fa7a1447bb6cb85dab16b83f3f4fa73c0f4ac338dd65ebe67711428b110b92c7cad6563636057d515a70f679dd08faf5b SHA512 27b3a9342c5c5c9314631d02189db48ef1a65d7c099b362266ee09de5c8741d7745fbdbcfed0a74cf490e10bc62df5c74ab87ce621fa205ac42e394aa24be97b
 DIST postfix-vda-v13-2.10.0.patch 55701 BLAKE2B d8df041bb4ae7457cd066e71b6ae9470840d42edc9990a550ae51356cd62bfb08516250249030da26d1ef475619f0ebd609570d84ce57f8cdc347a2824b29536 SHA512 0b4b53a8cd28abf56eee3b2ed63ca1814251b60816e6ca1143249d25fd6ef7f905bec3134125ac6e851af685db8aae878012113693261529ae2ddbcf1bd93e62
diff --git a/...ta/postfix/postfix-3.4_pre20180826.ebuild → ...ta/postfix/postfix-3.4_pre20180904.ebuild b/...ta/postfix/postfix-3.4_pre20180826.ebuild → ...ta/postfix/postfix-3.4_pre20180904.ebuild
@@ -16,7 +16,7 @@ SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
 LICENSE="|| ( IBM EPL-2.0 )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="+berkdb cdb doc dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
+IUSE="+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
 
 DEPEND=">=dev-libs/libpcre-3.4
 	dev-lang/perl
@@ -72,8 +72,9 @@ src_prepare() {
 		src/util/sys_defs.h || die "sed failed"
 	# change default paths to better comply with portage standard paths
 	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
-	eapply -p0 "${FILESDIR}/${PN}-libressl.patch"
-	eapply -p0 "${FILESDIR}/${PN}-libressl-runtime.patch"
+	eapply -p0 "${FILESDIR}/${PN}-libressl.patch" \
+		"${FILESDIR}/${PN}-libressl-runtime.patch" \
+		"${FILESDIR}/${PN}-libressl-eccurve.patch"
 }
 
 src_configure() {
@@ -195,10 +196,6 @@ src_configure() {
 }
 
 src_install () {
-	local myconf
-	use doc && myconf="readme_directory=\"/usr/share/doc/${PF}/readme\" \
-		html_directory=\"/usr/share/doc/${PF}/html\""
-
 	LD_LIBRARY_PATH="${S}/lib" \
 	/bin/sh postfix-install \
 		-non-interactive \
@@ -209,12 +206,12 @@ src_install () {
 		mailq_path="/usr/bin/mailq" \
 		newaliases_path="/usr/bin/newaliases" \
 		sendmail_path="/usr/sbin/sendmail" \
-		${myconf} \
 		|| die "postfix-install failed"
 
 	# Fix spool removal on upgrade
 	rm -Rf "${D}"/var
 	keepdir /var/spool/postfix
+	keepdir /etc/postfix/postfix-files.d
 
 	# Install rmail for UUCP, closes bug #19127
 	dobin auxiliary/rmail/rmail
@@ -254,7 +251,7 @@ src_install () {
 	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
 
 	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
-	use doc && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
+	mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
 
 	pamd_mimic_system smtp auth account