Remove obsolete version. Correct selector TXT record (#199100).

(Portage version: 2.1.3.16)

7 files changed, 14 insertions, 180 deletions

diff --git a/mail-filter/dkim-milter/ChangeLog b/mail-filter/dkim-milter/ChangeLog
index 9ff9b67ea7f0..8b62562e180a 100644
--- a/mail-filter/dkim-milter/ChangeLog
+++ b/mail-filter/dkim-milter/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for mail-filter/dkim-milter
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dkim-milter/ChangeLog,v 1.10 2007/11/04 08:43:25 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dkim-milter/ChangeLog,v 1.11 2007/11/14 04:46:36 mrness Exp $
+
+  14 Nov 2007; Alin Năstac <mrness@gentoo.org>
+  -files/dkim-milter-2.3.0-diffheaders.patch,
+  -files/dkim-milter-2.3.0-gentoo.patch,
+  -files/dkim-milter-2.3.1-diffheaders.patch,
+  +files/dkim-milter-2.3.2-diffheaders.patch,
+  +files/dkim-milter-2.3.2-gentoo.patch, -dkim-milter-2.3.1.ebuild,
+  dkim-milter-2.3.2.ebuild:
+  Remove obsolete version. Correct selector TXT record (#199100).
 
   04 Nov 2007; Alin Năstac <mrness@gentoo.org> dkim-milter-2.3.1.ebuild,
   dkim-milter-2.3.2.ebuild:
diff --git a/mail-filter/dkim-milter/dkim-milter-2.3.1.ebuild b/mail-filter/dkim-milter/dkim-milter-2.3.1.ebuild
deleted file mode 100644
index 0fc61cd756a9..000000000000
--- a/mail-filter/dkim-milter/dkim-milter-2.3.1.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dkim-milter/dkim-milter-2.3.1.ebuild,v 1.2 2007/11/04 08:43:25 mrness Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A milter-based application to provide DomainKeys Identified Mail (DKIM) service"
-HOMEPAGE="http://sourceforge.net/projects/dkim-milter/"
-SRC_URI="mirror://sourceforge/dkim-milter/${P}.tar.gz"
-
-LICENSE="Sendmail-Open-Source"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ipv6 diffheaders"
-
-RDEPEND="dev-libs/openssl
-	>=sys-libs/db-3.2
-	|| ( mail-filter/libmilter mail-mta/sendmail )
-	diffheaders? ( dev-libs/tre )"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	enewgroup milter
-	enewuser milter -1 -1 -1 milter
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}" || die "source dir not found"
-
-	cp site.config.m4.dist devtools/Site/site.config.m4 || \
-		die "failed to generate site.config.m4"
-	#epatch "${FILESDIR}/${P}-gentoo.patch"
-	epatch "${FILESDIR}/${PN}-2.3.0-gentoo.patch"
-
-	local ENVDEF=""
-	use ipv6 && ENVDEF="${ENVDEF} -DNETINET6"
-	sed -i -e "s:@@CFLAGS@@:${CFLAGS}:" -e "s:@@ENVDEF@@:${ENVDEF}:" \
-		devtools/Site/site.config.m4
-
-	use diffheaders && epatch "${FILESDIR}/${P}-diffheaders.patch"
-}
-
-src_compile() {
-	emake -j1 CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_test() {
-	emake -j1 CC="$(tc-getCC)" OPTIONS=check \
-		|| die "emake check failed"
-}
-
-src_install() {
-	# no other program need to read from here
-	dodir /etc/mail/dkim-filter
-	fowners milter:milter /etc/mail/dkim-filter
-	fperms 700 /etc/mail/dkim-filter
-
-	insinto /etc/mail/dkim-filter
-	newins dkim-filter/dkim-filter.conf.sample dkim-filter.conf
-
-	newinitd "${FILESDIR}/dkim-filter.init" dkim-filter \
-		|| die "newinitd failed"
-
-	# prepare directory for .pid, .sock and .stats files
-	dodir /var/run/dkim-filter
-	fowners milter:milter /var/run/dkim-filter
-
-	dodir /usr/bin
-	emake -j1 DESTDIR="${D}" \
-		SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \
-		install || die "make install failed"
-
-	# man build is broken; do man page installation by hand
-	doman */*.{3,5,8}
-
-	# some people like docs
-	dodoc RELEASE_NOTES *.txt
-}
-
-pkg_postinst() {
-	elog "If you want to sign your mail messages, you will have to 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."
-}
-
-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/mail/dkim-filter/${selector}.private ]]; then
-		ewarn "The private key for this selector already exists."
-	else
-		einfo "Select the size of private key:"
-		einfo "  [1] 512 bits"
-		einfo "  [2] 1024 bits"
-		while read -n 1 -s -p "  Press 1 or 2 on the keyboard to select the key size " keysize ; do
-			[[ "${keysize}" == "1" || "${keysize}" == "2" ]] && echo && break
-		done
-		case ${keysize} in
-			1) keysize=512 ;;
-			*) keysize=1024 ;;
-		esac
-
-		# generate the private and public keys
-		openssl genrsa -out "${ROOT}"etc/mail/dkim-filter/${selector}.private ${keysize} && \
-			chown milter:milter "${ROOT}"etc/mail/dkim-filter/${selector}.private && chmod u=r,g-rwx,o-rwx "${ROOT}"etc/mail/dkim-filter/${selector}.private &&
-			openssl rsa -in "${ROOT}"etc/mail/dkim-filter/${selector}.private -out "${ROOT}"etc/mail/dkim-filter/${selector}.public -pubout -outform PEM || \
-				{ eerror "Failed to create private and public keys." ; return 1; }
-	fi
-
-	# dkim-filter selector configuration
-	echo
-	einfo "Make sure you have the following settings in your dkim-filter.conf:"
-	einfo "  Keyfile /etc/mail/dkim-filter/${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/dkim-filter/dkim-filter.sock"
-	einfo "  non_smtpd_milters = unix:/var/run/dkim-filter/dkim-filter.sock"
-
-	# DNS configuration
-	{
-		local line
-		pubkey=
-		while read line; do
-			[[ "${line}" == "--"* ]] || pubkey="${pubkey}${line}"
-		done
-	} < "${ROOT}"etc/mail/dkim-filter/${selector}.public
-	echo
-	einfo "After you configured your MTA, publish your key by adding this TXT record to your domain:"
-	einfo "  ${selector}._domainkey   IN   TXT  \"g=\\; k=rsa\\; t=y\\; p=${pubkey}\""
-	echo
-	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"
-}
diff --git a/mail-filter/dkim-milter/dkim-milter-2.3.2.ebuild b/mail-filter/dkim-milter/dkim-milter-2.3.2.ebuild
index a56afe7be578..b22c2aee67bf 100644
--- a/mail-filter/dkim-milter/dkim-milter-2.3.2.ebuild
+++ b/mail-filter/dkim-milter/dkim-milter-2.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dkim-milter/dkim-milter-2.3.2.ebuild,v 1.2 2007/11/04 08:43:25 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dkim-milter/dkim-milter-2.3.2.ebuild,v 1.3 2007/11/14 04:46:36 mrness Exp $
 
 inherit eutils toolchain-funcs
 
@@ -31,16 +31,14 @@ src_unpack() {
 
 	cp site.config.m4.dist devtools/Site/site.config.m4 || \
 		die "failed to generate site.config.m4"
-	#epatch "${FILESDIR}/${P}-gentoo.patch"
-	epatch "${FILESDIR}/${PN}-2.3.0-gentoo.patch"
+	epatch "${FILESDIR}/${P}-gentoo.patch"
 
 	local ENVDEF=""
 	use ipv6 && ENVDEF="${ENVDEF} -DNETINET6"
 	sed -i -e "s:@@CFLAGS@@:${CFLAGS}:" -e "s:@@ENVDEF@@:${ENVDEF}:" \
 		devtools/Site/site.config.m4
 
-	#use diffheaders && epatch "${FILESDIR}/${P}-diffheaders.patch"
-	use diffheaders && epatch "${FILESDIR}/${PN}-2.3.1-diffheaders.patch"
+	use diffheaders && epatch "${FILESDIR}/${P}-diffheaders.patch"
 }
 
 src_compile() {
@@ -139,7 +137,7 @@ pkg_config() {
 	} < "${ROOT}"etc/mail/dkim-filter/${selector}.public
 	echo
 	einfo "After you configured your MTA, publish your key by adding this TXT record to your domain:"
-	einfo "  ${selector}._domainkey   IN   TXT  \"g=\\; k=rsa\\; t=y\\; p=${pubkey}\""
+	einfo "  ${selector}._domainkey   IN   TXT  \"v=DKIM1\\; k=rsa\\; t=y\\; p=${pubkey}\""
 	echo
 	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"
diff --git a/mail-filter/dkim-milter/files/digest-dkim-milter-2.3.1 b/mail-filter/dkim-milter/files/digest-dkim-milter-2.3.1
deleted file mode 100644
index 0c4bcb279b93..000000000000
--- a/mail-filter/dkim-milter/files/digest-dkim-milter-2.3.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8e2a363fe5864dfa0dcb694a4273ca04 dkim-milter-2.3.1.tar.gz 577345
-RMD160 3e8ba0d097dc05d2fa0a2895cee81d3f414fac38 dkim-milter-2.3.1.tar.gz 577345
-SHA256 937bfd7fb01a1701ba3921bcd2c51baa6aa92d16d560634b5ffbba15c1989d73 dkim-milter-2.3.1.tar.gz 577345
diff --git a/mail-filter/dkim-milter/files/dkim-milter-2.3.0-diffheaders.patch b/mail-filter/dkim-milter/files/dkim-milter-2.3.0-diffheaders.patch
deleted file mode 100644
index d0f7fba29885..000000000000
--- a/mail-filter/dkim-milter/files/dkim-milter-2.3.0-diffheaders.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Nru dkim-milter-2.3.0.orig/devtools/Site/site.config.m4 dkim-milter-2.3.0/devtools/Site/site.config.m4
---- dkim-milter-2.3.0.orig/devtools/Site/site.config.m4	2007-10-10 18:10:18.000000000 +0300
-+++ dkim-milter-2.3.0/devtools/Site/site.config.m4	2007-10-10 18:18:35.000000000 +0300
-@@ -66,9 +66,10 @@
- dnl to have the "tre" library and its header files installed.  If necessary,
- dnl enable these lines by deleting "dnl" from the front of them and edit
- dnl paths as needed.
--dnl APPENDDEF(`confINCDIRS', `-I/usr/local/include ')
-+APPENDDEF(`confENVDEF',`-DTRE_APPROX ')
-+APPENDDEF(`confINCDIRS', `-I/usr/include/tre ')
- dnl APPENDDEF(`confLIBDIRS', `-L/usr/local/lib ')
--dnl APPENDDEF(`confLIBS', `-ltre ')
-+APPENDDEF(`confLIBS', `-ltre ')
- 
- dnl Code For Future Release (FFRs):
- dnl
-@@ -80,7 +81,7 @@
- dnl APPENDDEF(`confENVDEF', `-D_FFR_ANTICIPATE_SENDMAIL_MUNGE ')
- dnl APPENDDEF(`confENVDEF', `-D_FFR_CAPTURE_UNKNOWN_ERRORS ')
- dnl APPENDDEF(`confENVDEF', `-D_FFR_DNS_UPGRADE ')
--dnl APPENDDEF(`confENVDEF', `-D_FFR_DIFFHEADERS ')
-+APPENDDEF(`confENVDEF', `-D_FFR_DIFFHEADERS ')
- dnl APPENDDEF(`confENVDEF', `-D_FFR_QUERY_CACHE ')
- dnl APPENDDEF(`confENVDEF', `-D_FFR_REQUIRED_HEADERS ')
- dnl APPENDDEF(`confENVDEF', `-D_FFR_SELECT_CANONICALIZATION ')
diff --git a/mail-filter/dkim-milter/files/dkim-milter-2.3.1-diffheaders.patch b/mail-filter/dkim-milter/files/dkim-milter-2.3.2-diffheaders.patch
index 309fad4bd3d3..309fad4bd3d3 100644
--- a/mail-filter/dkim-milter/files/dkim-milter-2.3.1-diffheaders.patch
+++ b/mail-filter/dkim-milter/files/dkim-milter-2.3.2-diffheaders.patch
diff --git a/mail-filter/dkim-milter/files/dkim-milter-2.3.0-gentoo.patch b/mail-filter/dkim-milter/files/dkim-milter-2.3.2-gentoo.patch
index 8d10f4444834..8d10f4444834 100644
--- a/mail-filter/dkim-milter/files/dkim-milter-2.3.0-gentoo.patch
+++ b/mail-filter/dkim-milter/files/dkim-milter-2.3.2-gentoo.patch