Version bump to 4.80 release

Package-Manager: portage-2.2.01.20430-prefix/cvs/SunOS i386

3 files changed, 43 insertions, 19 deletions

diff --git a/mail-mta/exim/ChangeLog b/mail-mta/exim/ChangeLog
index ceb5fd4819d3..743d384206ec 100644
--- a/mail-mta/exim/ChangeLog
+++ b/mail-mta/exim/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-mta/exim
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.222 2012/05/29 14:53:40 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.223 2012/05/31 10:51:53 grobian Exp $
+
+*exim-4.80 (31 May 2012)
+
+  31 May 2012; Fabian Groffen <grobian@gentoo.org> -exim-4.80_rc7.ebuild,
+  +exim-4.80.ebuild:
+  Version bump to 4.80 release. This version uses SSLv3, and disables v2 by
+  default. Supports TLSv1.{1,2} when using OpenSSL >=1.0.1. ChangeLog should
+  become available at ftp://ftp.exim.org/pub/exim/ChangeLogs/ChangeLog-4.80
 
 *exim-4.80_rc7 (29 May 2012)
 
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 9db2ee25c19f..fe9deb3e96a8 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX auth_conf.sub 790 RMD160 5d6a71cf9fb593fc34ddce8dc421fcd843356c82 SHA1 5744531af5ee282ae29bdbb4e89fbee16c0034a7 SHA256 d0631d487f115c07a178d48bc7168cd16d7b22c8879b1e926923152cde95ba78
 AUX exim-4.14-tail.patch 446 RMD160 685e27ff995710f3b8d77d8785b04503170e7e27 SHA1 d52b5d10656ead546beda128068ed2f9dbc67200 SHA256 74d1044bb94e167180fd8f8aba7449ca3d2b09b1ce170a1a2e4e54ca0cd660da
 AUX exim-4.20-maildir.patch 478 RMD160 50c6a1dd6ae3f7bb1776696d3d0d7a161c351fce SHA1 c8287f7e44d93b0ca8761b8f7111974cfe1280a5 SHA256 2704c4db67bb7c58c2421656d942f533d1eedf1df187e76297ab72d2c2a2fb4c
@@ -16,14 +19,21 @@ AUX exim.rc6 719 RMD160 633adab3bae7ec5a3a30aae547119aabd01e1f40 SHA1 cd875de79b
 AUX exim.rc7 765 RMD160 209b4e0f1703c01811c5c85b52273059596e80fc SHA1 52ece649ce7d01377d0c6e32c312a850c9afd6ab SHA256 9f98b698bc74e69f1b1595a108c49500dfc58d15b193bd59f3ec36bbbe648cf6
 DIST exim-4.76.tar.bz2 1605832 RMD160 b619e6e6674584c97ae0503911e95e1016407c34 SHA1 b0df27b0407eef2d79e130597916cde18f2bbe30 SHA256 4625b0fb916835ae60a73311a8956267fa1248e888f584c337a5b7df20174e95
 DIST exim-4.77.tar.bz2 1576148 RMD160 b70ced4c6323ccc167db68f3a7d30163287b2240 SHA1 0aad2cf08d03ad9e809d86521eac8f3f31398a1d SHA256 0ccc13cf2f052b1163fcdf71c55a3578765050848ba413a6473d3ab5d20b1475
-DIST exim-4.80_RC7.tar.bz2 1651368 RMD160 c183661bb4d16f9f11278c7cc3722db551956f59 SHA1 3744586866919182965300b1512bc02032c0df48 SHA256 4a0127158e7be3b45dd72f827298cd334dfaedf5f0602eba64aaf45d9764ddd2
+DIST exim-4.80.tar.bz2 1649827 RMD160 d81fd5ec876b27faef46dff7aba7804e16af986b SHA1 ba9b78b9dfab48f45409ab7c1c94ad085347899d SHA256 787b6defd37fa75311737bcfc42e9e2b2cc62c5d027eed35bb7d800b2d9a0984
 DIST exim-html-4.77.tar.bz2 416407 RMD160 f758f2953fc077c78229b28c7750ba04e673f085 SHA1 bccf154854ed855aa031018a84f34c260fe00723 SHA256 05823ebe0c0554215d928bee1a856bb2011e993f170edadbad57f0fb21dd9c76
-DIST exim-html-4.80_RC7.tar.bz2 426741 RMD160 86b80632cd403460a066624be74aef44c2587669 SHA1 fe38c63ed195cd43a359f4c795c600ee7e092c2e SHA256 d02a7ca2ec1e4bba51f9c53eea8475418a9424cb0804d7c714257d6e3fddd1f4
+DIST exim-html-4.80.tar.bz2 425933 RMD160 2679da912bb975d47ede251fbde5fee92e2b04de SHA1 2e485cf4404d41909a3b79477702a765bcc50cb3 SHA256 4d33239e787d4a509bdbf0bdb74a9da7c9ea2df8a953fe6dc5dd139b92301d7e
 DIST exim_469_dsn_1_3.patch 40222 RMD160 c744d6b5b388716e423529eda5b807aa8b9da2eb SHA1 3d1d7115dd80a974d40febbdef844d87860b8729 SHA256 605c520ea79507fd387772796c62303c5a49d1dc47b744b4267301096eedd49a
 DIST system_filter.exim.gz 3075 RMD160 47bcc6de402d896b73fd01d7f0d3c3ecbad9cf0b SHA1 384d138d8612f3a80b2b68f272b43cd69bc4411a SHA256 3a3471b486a09e0a0153f7b520e1eaf26d21b97d73ea8348bdc593c00eb1e437
 EBUILD exim-4.76-r1.ebuild 10443 RMD160 865f6423041b7210e21f8543dccd535ec8c69443 SHA1 70cccc3b9fe805476383e80c499aec47343d6967 SHA256 146343370a30a6a2c5d5a6a2a6821e047dafcce7ee849dc296f8f129344488ca
 EBUILD exim-4.76.ebuild 10340 RMD160 c23a4553630f7a0e9667375d77718f7b0c310bce SHA1 ecfcfefe9b614b97cb3b68feef1f1363e2b91197 SHA256 4ff6b14244c970063480b8c8d4588f523650e70ee3613582286ee1e03f192afe
 EBUILD exim-4.77.ebuild 11018 RMD160 ca5f5b61f2d6395ab4f840a461f2ed97b86aacc3 SHA1 25d97681d821f6fe4c30c09df044167eee5489c4 SHA256 99e4c90e1aa82a2d48e78b2508571973a7f24150edb48d5191d796c298bf60b1
-EBUILD exim-4.80_rc7.ebuild 11035 RMD160 c89891db9ca7599205d0cc11c8671a33c181f7b7 SHA1 1036a2de01c7d0afc8adae9895831a412e8a1603 SHA256 f87b36c778cf8c92fe0af42cdd7040a6cd8c3ac89dea1fb39fb63bfba4858ab5
-MISC ChangeLog 44332 RMD160 e5f0756ac7803e26ce196376cfdb8d676b0fbf76 SHA1 fdc1a2c0d01fb5b8de35f2a6ce72e1a178683693 SHA256 b840bc1da414721ff130d5c8ccfd43f8f880c60f1f9dcf154055394008af00f4
+EBUILD exim-4.80.ebuild 11120 RMD160 e642aa89cfaa3e6db2d8219d869506a9700dc838 SHA1 3470480ec0d0728b30b26bba81a17fb135d590f2 SHA256 54c7474493e9761971043571d9539b1179df103dd48d4b9c0f524b13db401d61
+MISC ChangeLog 44683 RMD160 f4ae61eaa289108a4d44f52f4360429f764543c9 SHA1 b293240a1e641e88435f4424019965926e6971ea SHA256 d4bdff914c8c8e0c70cc369d099a34f8960a1fc7b06561b228b7f0e6d2697062
 MISC metadata.xml 1745 RMD160 9a78e06e7038d79e2eb1e08017a2a5e6b53aa63f SHA1 892aff75716b8b21fda4d61289cc388ce0b7a3d1 SHA256 6c25800686eeb918e03fbe6caa54c38512c843e8eca3a2db8783289a9b12bea5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (SunOS)
+
+iEYEARECAAYFAk/HTU8ACgkQX3X2B8XHTonkWACdHuGTOSQuxcllMV0zSu6ybJRE
+7gcAnRhZBZYQwYni/9ERyhj0z1YZIhy6
+=qHgQ
+-----END PGP SIGNATURE-----
diff --git a/mail-mta/exim/exim-4.80_rc7.ebuild b/mail-mta/exim/exim-4.80.ebuild
index 2803f446915b..8a9a1a6e8a2c 100644
--- a/mail-mta/exim/exim-4.80_rc7.ebuild
+++ b/mail-mta/exim/exim-4.80.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.80_rc7.ebuild,v 1.1 2012/05/29 14:53:40 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.80.ebuild,v 1.1 2012/05/31 10:51:53 grobian Exp $
 
 EAPI="3"
 
@@ -21,7 +21,7 @@ HOMEPAGE="http://www.exim.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
 
 DEPEND=">=sys-apps/sed-4.0.5
 	>=sys-libs/db-3.2
@@ -46,6 +46,7 @@ DEPEND=">=sys-apps/sed-4.0.5
 	)
 	sqlite? ( dev-db/sqlite )
 	radius? ( net-dialup/radiusclient )
+	virtual/pkgconfig
 	virtual/libiconv
 	"
 	# added X check for #57206
@@ -87,6 +88,14 @@ src_prepare() {
 		epatch "${FILESDIR}"/${PN}-4.76-dsn.patch
 		epatch exim_${DSN_EXIM_V}_dsn_${DSN_V}.patch
 	fi
+
+	# user Exim believes it should be
+	MAILUSER=mail
+	MAILGROUP=mail
+	if use prefix && [[ ${EUID} != 0 ]] ; then
+		MAILUSER=$(id -un)
+		MAILGROUP=$(id -gn)
+	fi
 }
 
 src_configure() {
@@ -106,7 +115,7 @@ src_configure() {
 		-e "s:# SPOOL_DIRECTORY=/var/spool/exim:SPOOL_DIRECTORY=${EPREFIX}/var/spool/exim:" \
 		-e "s:# SUPPORT_MAILDIR=yes:SUPPORT_MAILDIR=yes:" \
 		-e "s:# SUPPORT_MAILSTORE=yes:SUPPORT_MAILSTORE=yes:" \
-		-e "s:EXIM_USER=:EXIM_USER=mail:" \
+		-e "s:EXIM_USER=:EXIM_USER=${MAILUSER}:" \
 		-e "s:# AUTH_SPA=yes:AUTH_SPA=yes:" \
 		-e "s:# AUTH_CRAM_MD5=yes:AUTH_CRAM_MD5=yes:" \
 		-e "s:# AUTH_PLAINTEXT=yes:AUTH_PLAINTEXT=yes:" \
@@ -188,15 +197,12 @@ src_configure() {
 	use !elibc_glibc && echo "EXTRALIBS_EXIM=-liconv" >> Makefile
 
 	if use ssl; then
-		sed -i \
-			-e "s:# \(SUPPORT_TLS=yes\):\1:" Makefile
+		echo "SUPPORT_TLS=yes" >> Makefile
 		if use gnutls; then
-			sed -i \
-				-e "s:# \(USE_GNUTLS=yes\):\1:" \
-				-e "s:# \(TLS_LIBS=-lgnutls -ltasn1 -lgcrypt\):\1:" Makefile
+			echo "USE_GNUTLS=yes" >> Makefile
+			echo "USE_GNUTLS_PC=gnutls" >> Makefile
 		else
-			sed -i \
-				-e "s:# \(TLS_LIBS=-lssl -lcrypto\):\1:" Makefile
+			echo "USE_OPENSSL_PC=openssl" >> Makefile
 		fi
 	fi
 
@@ -224,9 +230,8 @@ src_configure() {
 	fi
 
 	if use sqlite; then
-		sed -i "s:# LOOKUP_SQLITE=yes: LOOKUP_SQLITE=yes:" Makefile
-		LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I${EROOT}usr/include/sqlite"
-		LOOKUP_LIBS="$LOOKUP_LIBS -lsqlite3"
+		echo "LOOKUP_SQLITE=yes" >> Makefile
+		echo "LOOKUP_SQLITE_PC=sqlite3" >> Makefile
 	fi
 
 	if [[ -n ${LOOKUP_INCLUDE} ]]; then
@@ -266,6 +271,7 @@ src_configure() {
 
 	# use the "native" interface to the DBM library
 	echo "USE_DB=yes" >> Makefile
+	echo "DBMLIB=-ldb" >> Makefile
 }
 
 src_compile() {
@@ -323,7 +329,7 @@ src_install () {
 
 	newconfd "${FILESDIR}"/exim.confd exim
 
-	DIROPTIONS="--mode=0750 --owner=mail --group=mail"
+	DIROPTIONS="--mode=0750 --owner=${MAILUSER} --group=${MAILGROUP}"
 	dodir /var/log/${PN}
 }