Unbreak upgrade from <=mail-filter/opendkim-2.7.2 - bug #452856

Package-Manager: portage-2.2.0_alpha158/cvs/Linux x86_64
Manifest-Sign-Key: 0x77F1F175586A3B1F

4 files changed, 237 insertions, 15 deletions

diff --git a/mail-filter/opendkim/ChangeLog b/mail-filter/opendkim/ChangeLog
index 65927dc086fa..5c35610b5c3c 100644
--- a/mail-filter/opendkim/ChangeLog
+++ b/mail-filter/opendkim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-filter/opendkim
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/ChangeLog,v 1.55 2013/01/18 13:44:00 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/ChangeLog,v 1.56 2013/01/22 08:11:10 eras Exp $
+
+*opendkim-2.7.4-r1 (22 Jan 2013)
+
+  22 Jan 2013; Eray Aslan <eras@gentoo.org>
+  +files/opendkim-unbreak_upgrade.patch, +opendkim-2.7.4-r1.ebuild:
+  Unbreak upgrade from <=mail-filter/opendkim-2.7.2 - bug #452856
 
 *opendkim-2.7.4 (18 Jan 2013)
 
diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest
index c5fd01691063..3efaa7caa5c8 100644
--- a/mail-filter/opendkim/Manifest
+++ b/mail-filter/opendkim/Manifest
@@ -4,6 +4,7 @@ Hash: SHA256
 AUX opendkim-2.7.2-strl.patch 1158 SHA256 23d06779d843aecd8a8540d40effa90f7d3fa854eccbee22672731438be7c88f SHA512 57dae887354a164d6146c55d258b8b41cdfbf9df887d228ab6ae9f2868b2096b44d738897880e1ad39c2d1d2ccade655cdb2658a171499cb470e6aafc0ca72bc WHIRLPOOL 760706018224941090b82b65b613bb90f51c6cfdba4f87bd640e6f301719c137592fd54f0bc383e0fa384f4f8e4ecd3699906ad70b86ffdf85f5fb9c12842ae0
 AUX opendkim-2.7.4-DisableCryptoInit.patch 3747 SHA256 83c0fac5ed1393cdfda695637f337a2a43bcd45476f11ed7db1bc422a080f421 SHA512 c8c352a56150cf0e8a2ce4b0020c03d60da1e8c184e830b325348e1e9272df8634e014a4ae6b62d4c8c596d855ecdf163eb4c09104e31084d1643364bcf093f8 WHIRLPOOL d6ad3a4ea0c2ba7b41d06750beb3fb19dd26f29f44f1ffc6855e93f8a5e8af631c35c9b782d32a7fcb83361e881ea6dffb22d59035d9b3148cf39b37ee62f1db
 AUX opendkim-2.7.4-bsd.patch 18006 SHA256 a4cfb4d26dc7d27134f66f7b1e78b40f6c0c77f3986af787001c094c4734f95f SHA512 9ee24d02d2662b2898dd073b7ec882889fe9568d2afca8751c6ad6c68af60523d77ca79557f540607a68cb159bf0df7266122ed8fe3a3b67ca4e578b325b4892 WHIRLPOOL 8408536bd7fd080eedc99b3b133562d5049a63a61420b5a38759237dce09af8ab257f524152ca870de18c13113b6370bc5c0f8fe06fc43d89101ecbcfbb157e9
+AUX opendkim-unbreak_upgrade.patch 1050 SHA256 6518b34662ca366a4616ca1135d5cc529b62dd6b921d2b0074ba8fabedfbd739 SHA512 01755ba0675d19c6b1d582c502479ae843dccadc712e4af5e66fd63a333241cdd5e29fb1856020967faee5bbe454784745747c54c0994b216b7aaba340bc9107 WHIRLPOOL 6a0b6f9ebdc2a5b06a3a2b1ddd75adfe8e6109cf346ad3387718152e307db107c052b66fab7590a054a0977504f5eb705eca7e7c9d5d62c86f97d216b0d25366
 AUX opendkim.init.r2 1533 SHA256 0e8fab90020c109f602d8367a6501bfb3b397a50f020b6fade5024e2facf593c SHA512 8c7aef32c67e1ec4bf3afb0df48d861b6f1399c8a825161d00ca1400d87b084ad16de68401f9cece4cc9c07b06377641cc664d7e79750a0fc106f1088fb2dff7 WHIRLPOOL 00783d779d904118eb172f859c289d8b2b1832f1de1f17ab30a5a9f0af6ffa324395f2777b82fbde2e46d26f064d4ffec368b6734ce9cfe09173f24a7053de50
 AUX opendkim.init.r3 1545 SHA256 63f316ef776ad1a9fe87cff7748fac4574c2355b6205e3ef21285ddb84c8cb33 SHA512 c28b93f230b65ba483302dbb0f6cba0d8b2cf29cce0309521e67f6aa0e4c041b0dd69eaca8152d6b0b1b02dbe1ff9634fef0840856c8e192f17a1c24ffac7166 WHIRLPOOL f42cb79de47d2fdac26ef4a45132e996640da824aadaf0c3e66182160e941322ff78a37c18a32ca50efb0bb4fbf11b622a1ce5931146c47a06156c256d568b81
 DIST opendkim-2.6.7.tar.gz 1129124 SHA256 45da209ccddfb6f6888ac2366b6e38a6460b36ff0da527aed910217cead6fc84 SHA512 f47f4c4805b96a2c57774dd69a7770751649397866b29392aa756c4b143579d93951166c817342fde12b8994251a8b44d2de61e6059fd04686e04aa6e668cdd3 WHIRLPOOL df662ca97ac937720038b16fb8b5e8f3f1d6a9d5b73102082a889abddaa003ca8ddf8fcba670fb16f7d00e4fd8b07fc0ddaff97f070e795822350751b0cb0608
@@ -17,23 +18,24 @@ EBUILD opendkim-2.6.8.ebuild 6380 SHA256 1251c1d8ced6ad6b0c2c51fe20699623fc5d10c
 EBUILD opendkim-2.7.0.ebuild 5980 SHA256 bba11f3060774c3e665b8c9e0a91483a817d34f6c40268214ed2f66591059c6f SHA512 bbae17c344d99a982e549feeaeb85c9fefa3739c6b35e0e05ffc26c65b92befb4e44284c24dcd17a645e61545805fbb75b57192e8afea639a6595543bd30e87d WHIRLPOOL b256873263f8b861c8c67c453c6f737eccb526cb96ff04306bea949d002c06232f792d1a26945b943cee0db5b8b014f8557a7f54897e5854ff90f67239dcda6c
 EBUILD opendkim-2.7.1.ebuild 5980 SHA256 1b0ab9e9a9c3ad9ee31c7a55102c0e8eab149f56dce0c1348f9a981d09044379 SHA512 3b240ae0f2e2f2716a2f206fb668d4e01eea2c0ec04dbf638c78cb5ebaaf98c15ae45540a14a8433832222fcba2b25ac12e1c3bf4e35bc73b1a858f22f5b9c7a WHIRLPOOL ce2318ef0e7104ad756cd2f6d03114a653c0763f14ecbf8d001e52a01ac6f6dfe22fc0cd02e8c305b322d1aba8cddd8644b05c8a9633aefbb2ff9c9c439bf8ad
 EBUILD opendkim-2.7.2.ebuild 6018 SHA256 bf833332cc51619ef502df419bd1ea00f4cfac9580c0d769ee27d03e6d9be51e SHA512 46dd38590bc4683244bf57f65bf0d796cacded1a6c8507dddd7337e4b147169e7a21428b495863de52651af89020911651dc6b9d6b891fc761a61c0f886a9de1 WHIRLPOOL 4bafda1b64e90f60ead18947ec051fa55e4b7edf1be3be0208c6d365ebc5fa040253987e4b9a965e4b053f6450d41b3708d49db0f3a570a1cf397b28846f89e2
+EBUILD opendkim-2.7.4-r1.ebuild 6138 SHA256 16d706e507471182aa5d67e9451690287a3bbf6a0f4410807f8aee9277068b84 SHA512 eed7be4fb0ce31ed0d1f6f73ebfdeddb11d801f85c844cce7029526a7e3224d9d9c7d64ef968fa5c147109f8acfa06517cccd4f01360d8ca308ca9b07618b7a0 WHIRLPOOL 633101945aa98b8f0729b9c387e5a795c01101965ecd08f665009b0f773818953421c4f859e9db82631be2e7380b3e3dc21d194e5198e44f3c162ea8a352f12c
 EBUILD opendkim-2.7.4.ebuild 6085 SHA256 f94750bee3106d5cb84480fc2f0c6f211b2d5d077e287d481840ece3eb37d315 SHA512 b7fef312987158eba8c28bd8704cade8911805187465acc3bebd809fa4cc0518b23790b5205eb1d6421a868b427491f1e434de9bdea11582b5d7aa94402df3ae WHIRLPOOL 6d39660ae2a899647010ce3041b2e22794228e97ca2d45b67f6d7d3f262652ab73c9fa6c05da7565028cf6afd17c3506f3920f213462a97281780480f92880fd
-MISC ChangeLog 9825 SHA256 f2bcffb82f9b8d37e07a1a0a6f2ffd005a8e12f7971626d403045d888b1f9dae SHA512 73e24afa23ea5045bcac50e942cf08f2c2b7ded52165150d56b59fb41c78a04fabe52d484a31c9df8cf9e621b778e96fc6cc740da8edcc80b09e286e1ddf18f0 WHIRLPOOL 72cb953c62c555de14a512736d88f828a543b3b87dd0c3674a51ab89a7663c2c8704f3e7deaf6c747ad88e1628bc6fb078aca39fe049dfd58478f51128a3833c
+MISC ChangeLog 10038 SHA256 eae16c8dbf440bfca225fbfbf9de84cc5dbd0445845b6fbdab8ae00a5233766c SHA512 6d92b07908700da239de089535b16005b25ad16302fc3d998c71acdcf430308438b7ff9bb8f93c434489672efd1d0ce15b5dd331b34328e5020a0d4c0e896a2f WHIRLPOOL 8c316b02152debe4d2b4b23aea2397e08082d1665ef5c268777b9f921b3a48dd814cbaf0ef31547f77b418782366929d6136198b48195e4cca2cade0f1ee335c
 MISC metadata.xml 1325 SHA256 5c79e487583ffa41f2823235e61232f84c1ac18ef41b1b71150f8d32f76b82eb SHA512 ae25f27a0c0cc5c3460b150f3eb6369e34b3051984b58da6a81847b5e90edc62e91fdd8f0d428576ef73614db095dc3a415237cccc1cc3cc806f9d99ff588df5 WHIRLPOOL d8b1221d484e12c31d76a20e8a7e6e0d033e16884e7dd14f657d4383f24f8f9294bc51dea4f512896a4183f9299c2faef31e7540d95c418000245090a3a0cdfe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ+VGpAAoJEHfx8XVYajsfVj4QAIHI6wTMXAWAyIf1v2g35fpX
-u+cp9D9GaAcJq4gtPz5H2IurJCkd6IeyF8/Oh/EO3+qUB+J8CRr/Z6fKVk2tgTo9
-i13UvQJbenYu2/jvh+ZLWrDnn4aytCbIdBf0UjvJiguRxIuVwxg6Capsh85bL/xv
-uQS8CfFomi6+nPl/gTaDq5a6x7KErJn8WB5hF6Byyitlu4kdojXxMJAWTAiTtTpP
-C1umKXYdBNtuASbhGKAkOE2Q7ZLgufN8di+F50i+m1UED4Ruunu0C0wyGUBlBukA
-WyR4SeFmmzshR5PjAwEqVErRgwMwZYluvFXJKA8iCyrpQwmon4g87V0QeBJLHuK7
-RY7ofYDVsw9TJCZiNISts4chEdsvVTKjG16DtbTlGZ8ED2vm1szTup42xBV0a1OL
-yvvfKe1+AtX+Kt2+nyXPWZ2T8zRk9nw9RgMoXlwuqItfzdOwrEJ/bFBTnIUWSRiZ
-HDf6DEbPv7ShFkngmFaUMPSh4X8p3fri4h4QOKR6HLnIlY+TZWv6PJh8ySttYsHs
-nYQL2tq0Q5TeO9cSyKsI+vNsGhHryiBxpOz0sxhH/wPacby+h7eRopRC3IjMfRCV
-IzcGpdwHgZgZbOw2XsMLDEwAe13Q6IUwgHF9AsJCzH5s6fpMRR/UBDqFi3iRf96w
-MytYfTrNeO4G+neuIFDl
-=hrql
+iQIcBAEBCAAGBQJQ/kmpAAoJEHfx8XVYajsfbOcP/RLWCPfTE3g/kk/+MfKSxPvb
+nzEfgYjc1+CFR+k0zbnVO7RXORP1b/6fceY6ywW5199PwbohWhrvQo8XJZmwwt6B
+c+DYwISr21WyiW7dOpsy00siVM+VZWIzG1UYy6We78670CWpZfTD9XheTu8VO7aL
+V62VPe1nxvjQv6oat3MGqiYbcbnxDfiYKkrESsFL17w2NsfyO7/ULUEr+PhGK83I
+GwP8M3202eu0yYrbXQRLPvGELAkxnEWxye8LqWJh1/3iN55+ecqa7llx+aFwZbzY
+FfiNtGRfJPLrsdHHnPDdVqh0/tt0xtswv2jZe5MzR2m4amiqB+lMP10VJ86Kcl0C
+Jnt80hvxpBAyA0xjIeJk6n55KljsyJQDchEzdLYK/RXQ6JTvpqpztFpxwE4ToK1J
+7fq+fNZvxsZ8anlIb6y3VfKH+MtwXQHsTN8moACYxWrdFSOD8IifnpcxxGJipxBa
+wqkPjpBMHqPg7d+O5q7M60R6qXWoU3++fouWAK6IMA201018jsDfN5UJxszNpg+s
+4hQlpH/xZ6HF6Cyprniag/EZlAB/NG83oor7ocdD0Wkw9NzD+Us3CTpilg+9h+m1
+W3hhy1waUWDtJyHQXSO4DPfAGH0Bk1heuV8niE1bq9PyFZ9dgFV+6cS2VoyJZglw
+aA1hqnXfuucDeM3G9k+2
+=urbm
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/opendkim/files/opendkim-unbreak_upgrade.patch b/mail-filter/opendkim/files/opendkim-unbreak_upgrade.patch
new file mode 100644
index 000000000000..cc0808070b62
--- /dev/null
+++ b/mail-filter/opendkim/files/opendkim-unbreak_upgrade.patch
@@ -0,0 +1,22 @@
+--- configure.ac	2013-01-22 07:59:36.312240111 +0000
++++ configure.ac	2013-01-22 07:59:23.694397856 +0000
+@@ -240,11 +240,14 @@
+ # we need to include <strl.h> if:
+ # (a) strlcat and strlcpy weren't found, since we'll be rolling our own; OR
+ # (b) an installed strl.h was found and no installed bsd/string.h was found
+-if test x"$strl_h_found" = x"yes" -o \( x"$strl_found" = x"no" -a x"$libstrl_found" = x"no" \) -a x"$bsdstrl_h_found" = x"no"
+-then
+-	AC_DEFINE([USE_STRL_H], 1,
+-	          [Define to 1 if you need to include <strl.h> to get the `strlcat()' and `strlcpy()' functions.])
+-fi
++
++# Gentoo specific: Don't include strl.h - breaks upgrading from
++# <=mail-filter/opendkim-2.7.2.  We link against libbsd always.
++#if test x"$strl_h_found" = x"yes" -o \( x"$strl_found" = x"no" -a x"$libstrl_found" = x"no" \) -a x"$bsdstrl_h_found" = x"no"
++#then
++#	AC_DEFINE([USE_STRL_H], 1,
++#	          [Define to 1 if you need to include <strl.h> to get the `strlcat()' and `strlcpy()' functions.])
++#fi
+ 
+ if test x"$bsdstrl_h_found" = x"yes"
+ then
diff --git a/mail-filter/opendkim/opendkim-2.7.4-r1.ebuild b/mail-filter/opendkim/opendkim-2.7.4-r1.ebuild
new file mode 100644
index 000000000000..ede602cc3ebb
--- /dev/null
+++ b/mail-filter/opendkim/opendkim-2.7.4-r1.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-2.7.4-r1.ebuild,v 1.1 2013/01/22 08:11:10 eras Exp $
+
+EAPI=4
+inherit eutils db-use autotools user
+
+# for betas
+#MY_P=${P/_b/.B}
+#S=${WORKDIR}/${PN}-2.0.0
+#SRC_URI="mirror://sourceforge/opendkim/${MY_P}.tar.gz"
+
+DESCRIPTION="A milter-based application to provide DKIM signing and verification"
+HOMEPAGE="http://opendkim.org"
+SRC_URI="mirror://sourceforge/opendkim/${P}.tar.gz"
+
+LICENSE="Sendmail-Open-Source BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+berkdb gnutls ldap lua opendbx poll sasl +ssl static-libs unbound"
+
+DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
+	dev-libs/libbsd
+	ssl? ( >=dev-libs/openssl-0.9.8 )
+	berkdb? ( >=sys-libs/db-3.2 )
+	opendbx? ( >=dev-db/opendbx-1.4.0 )
+	lua? ( dev-lang/lua )
+	ldap? ( net-nds/openldap )
+	sasl? ( dev-libs/cyrus-sasl )
+	unbound? ( >=net-dns/unbound-1.4.1 net-dns/dnssec-root )
+	!unbound? ( net-libs/ldns )
+	gnutls? ( >=net-libs/gnutls-2.11.7 )"
+
+RDEPEND="${DEPEND}
+	sys-process/psmisc"
+
+REQUIRED_USE="sasl? ( ldap )"
+
+pkg_setup() {
+	enewgroup milter
+	# mail-milter/spamass-milter creates milter user with this home directory
+	# For consistency reasons, milter user must be created here with this home directory
+	# even though this package doesn't need a home directory for this user (#280571)
+	enewuser milter -1 -1 /var/lib/milter milter
+}
+
+src_prepare() {
+	sed -i -e 's:/var/db/dkim:/etc/opendkim:g' \
+	       -e 's:/var/db/opendkim:/var/lib/opendkim:g' \
+	       -e 's:/etc/mail:/etc/opendkim:g' \
+	       -e 's:mailnull:milter:g' \
+	       -e 's:^#[[:space:]]*PidFile.*:PidFile /var/run/opendkim/opendkim.pid:' \
+		   opendkim/opendkim.conf.sample opendkim/opendkim.conf.simple.in \
+		   stats/opendkim-reportstats || die
+
+	sed -i -e 's:dist_doc_DATA:dist_html_DATA:' libopendkim/docs/Makefile.am \
+		|| die
+
+	# don't go over the sock length and fail
+	sed -i -e '/^sock/s/t-sign-ss-macro-value-file.sock/t-s-s-m-v-f.sock/' \
+		opendkim/tests/t-sign-ss-macro-value-file.lua || die
+
+	epatch "${FILESDIR}/${P}-bsd.patch"
+	epatch "${FILESDIR}/${PN}-unbreak_upgrade.patch"
+	epatch "${FILESDIR}/${P}-DisableCryptoInit.patch"
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	if use berkdb ; then
+		myconf=$(db_includedir)
+		myconf="--with-db-incdir=${myconf#-I}"
+		myconf+=" --enable-popauth"
+		myconf+=" --enable-query_cache"
+		myconf+=" --enable-stats"
+	fi
+	if use unbound; then
+		myconf+=" --with-unbound"
+	else
+		myconf+=" --with-ldns"
+	fi
+	if use ldap; then
+		myconf+=" $(use_with sasl)"
+	fi
+	econf \
+		$(use_with berkdb db) \
+		$(use_with opendbx odbx) \
+		$(use_with lua) \
+		$(use_enable lua rbl) \
+		$(use_with ldap openldap) \
+		$(use_enable poll) \
+		$(use_enable static-libs static) \
+		$(use_with gnutls) \
+		${myconf} \
+		--docdir=/usr/share/doc/${PF} \
+		--htmldir=/usr/share/doc/${PF}/html \
+		--enable-filter \
+		--enable-adsp_lists \
+		--enable-dkim_reputation \
+		--enable-identity_header \
+		--enable-rate_limit \
+		--enable-redirect \
+		--enable-resign \
+		--enable-replace_rules \
+		--enable-default_sender \
+		--enable-sender_macro \
+		--enable-vbr \
+		--disable-rpath \
+		--disable-live-testing
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dosbin stats/opendkim-reportstats
+	newinitd "${FILESDIR}/opendkim.init.r3" opendkim
+	dodir /etc/opendkim /var/lib/opendkim
+	fowners milter:milter /var/lib/opendkim
+
+	# default configuration
+	if [ ! -f "${ROOT}"/etc/opendkim/opendkim.conf ]; then
+		grep ^[^#] "${S}"/opendkim/opendkim.conf.simple \
+			> "${D}"/etc/opendkim/opendkim.conf
+		if use unbound; then
+			echo TrustedAnchorFile /etc/dnssec/root-anchors.txt >> "${D}"/etc/opendkim/opendkim.conf
+		fi
+		echo UserID milter >> "${D}"/etc/opendkim/opendkim.conf
+		if use berkdb; then
+			echo Statistics /var/lib/opendkim/stats.dat >> \
+				"${D}"/etc/opendkim/opendkim.conf
+		fi
+	fi
+
+	use static-libs || find "${D}" -name "*.la" -delete
+}
+
+pkg_postinst() {
+	elog "If you want to sign your mail messages and need some help"
+	elog "please run:"
+	elog "  emerge --config ${CATEGORY}/${PN}"
+	elog "It will help you create your key and give you hints on how"
+	elog "to configure your DNS and MTA."
+
+	ewarn "Make sure your MTA has r/w access to the socket file."
+	ewarn "This can be done either by setting UMask to 002 and adding MTA's user"
+	ewarn "to milter group or you can simply set UMask to 000."
+}
+
+pkg_config() {
+	local selector keysize pubkey
+
+	read -p "Enter the selector name (default ${HOSTNAME}): " selector
+	[[ -n "${selector}" ]] || selector=${HOSTNAME}
+	if [[ -z "${selector}" ]]; then
+		eerror "Oddly enough, you don't have a HOSTNAME."
+		return 1
+	fi
+	if [[ -f "${ROOT}"etc/opendkim/${selector}.private ]]; then
+		ewarn "The private key for this selector already exists."
+	else
+		keysize=1024
+		# generate the private and public keys
+		opendkim-genkey -b ${keysize} -D "${ROOT}"etc/opendkim/ \
+			-s ${selector} -d '(your domain)' && \
+			chown milter:milter \
+			"${ROOT}"etc/opendkim/"${selector}".private || \
+				{ eerror "Failed to create private and public keys." ; return 1; }
+		chmod go-r "${ROOT}"etc/opendkim/"${selector}".private
+	fi
+
+	# opendkim selector configuration
+	echo
+	einfo "Make sure you have the following settings in your /etc/opendkim/opendkim.conf:"
+	einfo "  Keyfile /etc/opendkim/${selector}.private"
+	einfo "  Selector ${selector}"
+
+	# MTA configuration
+	echo
+	einfo "If you are using Postfix, add following lines to your main.cf:"
+	einfo "  smtpd_milters     = unix:/var/run/opendkim/opendkim.sock"
+	einfo "  non_smtpd_milters = unix:/var/run/opendkim/opendkim.sock"
+	einfo "  and read http://www.postfix.org/MILTER_README.html"
+
+	# DNS configuration
+	einfo "After you configured your MTA, publish your key by adding this TXT record to your domain:"
+	cat "${ROOT}"etc/opendkim/${selector}.txt
+	einfo "t=y signifies you only test the DKIM on your domain. See following page for the complete list of tags:"
+	einfo "  http://www.dkim.org/specs/rfc4871-dkimbase.html#key-text"
+	einfo
+	einfo "Also look at the ADSP http://tools.ietf.org/html/rfc5617"
+}