remove 1.2.0 - few too many bugs. remove old 1.1.0 version too. Thanks Diego for QA bug 299881. Petteri for bugs 297703 and 297698 related to emerge --config section and 297700 released to a broken statistics function upstream.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

8 files changed, 24 insertions, 348 deletions

diff --git a/mail-filter/opendkim/ChangeLog b/mail-filter/opendkim/ChangeLog
index d789ab5ef876..375914fd1984 100644
--- a/mail-filter/opendkim/ChangeLog
+++ b/mail-filter/opendkim/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for mail-filter/opendkim
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/ChangeLog,v 1.4 2009/12/14 03:05:11 dragonheart Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/ChangeLog,v 1.5 2010/01/08 13:12:45 dragonheart Exp $
+
+*opendkim-1.2.1 (08 Jan 2010)
+
+  08 Jan 2010; Daniel Black <dragonheart@gentoo.org> -opendkim-1.1.0.ebuild,
+  -files/opendkim-1.1.0-autoconf-automake.patch,
+  -files/opendkim-1.1.0-flockinclude.patch,
+  -files/opendkim-1.1.0-rep-querycache.patch,
+  -files/opendkim-1.1.0-vbr-booliscpp.patch, -opendkim-1.2.0.ebuild,
+  +opendkim-1.2.1.ebuild:
+  remove 1.2.0 - few too many bugs. remove old 1.1.0 version too. Thanks
+  Diego for QA bug 299881. Petteri for bugs 297703 and 297698 related to
+  emerge --config section and 297700 released to a broken statistics
+  function upstream.
 
 *opendkim-1.2.0 (14 Dec 2009)
 
diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest
index 752f7a6e3717..2e362f85fde1 100644
--- a/mail-filter/opendkim/Manifest
+++ b/mail-filter/opendkim/Manifest
@@ -1,14 +1,8 @@
-AUX opendkim-1.1.0-autoconf-automake.patch 5368 RMD160 7ad8af2340e8d3b66720bc6f4ba0f557d0149d8d SHA1 632e4b4e60179c55e40669d7cb142165ceda40c2 SHA256 6e96f1857be4b5f508b81b0c1436efdb4857b4407f4d6b7b98e742f281e32e29
-AUX opendkim-1.1.0-flockinclude.patch 338 RMD160 43472c75ae308947a01debd90ac01180526ec3ee SHA1 c7222e1620638adf536a3c8e017275c072082631 SHA256 da523b528847c5b5fa3eda7aec96ea232147c64c15be00053394b1734948e281
-AUX opendkim-1.1.0-rep-querycache.patch 592 RMD160 2800dea4f7b05396a3b3869506e6b82f2f0f4595 SHA1 1e4759616da7573bba2c63c061915912522e572a SHA256 3ae2143ce3634b43122930af99a3237fe9612e409a17ddb68d7ee025e84bac2b
-AUX opendkim-1.1.0-vbr-booliscpp.patch 365 RMD160 5e33c81a731b11d9207f8fd100e9c2eba52ec913 SHA1 558dd9e0d1981733e2bc61443b5af74561c0e8b5 SHA256 295faafa4899feb6e1dd7caf22d842936a3ab6b7bbddb8159e566bc7ce728fd7
 AUX opendkim-1.1.2-test73.patch 309 RMD160 2caaf1bb4f1547c6f59c94733f4cc5cf6389ad52 SHA1 da98246f608c7bb3ed65bc327ee3ba039c66b29c SHA256 16084f7b5bccb3d82614d93fc43912009ca33c4bf2f471d9ab8352345cbdc2b0
 AUX opendkim.init 1417 RMD160 df83c4df3b5a6eaa86ff21f8557bcb41fe5cbf2a SHA1 5d70122b00fd11f2a1b26537faca50bda7647f45 SHA256 a79ff9fed5ee3834aa905f6df613035b1121a3b3e264362a74558d315d3c30d9
-DIST opendkim-1.1.0.tar.gz 887601 RMD160 99bb535a89945093030ca12a488eec121232bc82 SHA1 32f407dc1bb4835b0726413d4a27a8f01c210650 SHA256 e579f7ec6cf430a934bab24fc04e190f2a4f0f6fde18098dce0ac390d0d7d734
 DIST opendkim-1.1.2.tar.gz 856455 RMD160 c79918192ed26f771286f1c88efe29ac71e66d73 SHA1 1609c6ffb201e0aa99ddb6c3194f252916074abd SHA256 5f11526c9a490b6649794b0e5910cb6e6c9b3fe815cf8b731dbed8ddb077d078
-DIST opendkim-1.2.0.tar.gz 973738 RMD160 3aa933e96901952b50341ed0ee4173f138bb0187 SHA1 8f4c068c9e41428795ea7c9765d112ee1feec6c9 SHA256 eb048682ca587d466b9d01fde576ef7868e718abedb8a1a773aaa016719393d3
-EBUILD opendkim-1.1.0.ebuild 4820 RMD160 71d6466fed544a8bf7d7a2dbb55f17056f9915cd SHA1 2623f4fc318ffa196f197d33ddec9f5ea18fdbb3 SHA256 6297c1ab1541675b3c21278833ce253df5783f93f113a2597998f0e89e83f486
+DIST opendkim-1.2.1.tar.gz 878405 RMD160 fc17e72554f46d6c672a913111fa444b61f25e5e SHA1 393f5013926b0ef131a17f3c1a07645bae72b431 SHA256 5b47e4dddf3d4fe05afc30b26d2fbb5fe0c3ff93cc45e3ea826d652561fc44b4
 EBUILD opendkim-1.1.2.ebuild 4978 RMD160 60f9c9d991c192797740c81d9ac886b954281bb8 SHA1 df683fb692d2ee36f9c5d031796f7498da9dc340 SHA256 9362279db968010a95e7e4ebc59646e480cbda64df5c723306936d7c70336f13
-EBUILD opendkim-1.2.0.ebuild 5090 RMD160 6d6900fb1a3a2cec9c371cd7e7cf937e158745be SHA1 62de0fc5628dd2d3841bb0260a53b53dfab86a09 SHA256 afff56a3c782aa260421211718f4d77a8de4e1f6a42367b8fcea4d06fe1f3de8
-MISC ChangeLog 1112 RMD160 bc01f0564304fa3a9e34b4062a06d9cc8769971f SHA1 c2ddfe498caa847be86d772a68a4589ba9eac35d SHA256 b37a649a2d469b4625597dbc014b9bf9f6beb217e4d3b2d5b673f36ffb3a2766
+EBUILD opendkim-1.2.1.ebuild 5075 RMD160 a2f1c8e4b1446645afeef088b7f6269c3a192ba7 SHA1 f6db8cb9267f0f73b97e1276ff002c1b0a5a4323 SHA256 fad4ee48dc62bc48524dacb79e06a72d5fd2de79941c6cacae2d0665b5ca5b1d
+MISC ChangeLog 1691 RMD160 ba584e6a32c389c8a4b2d560e67048d34b03fc90 SHA1 556f4e54995686749d1cc396407abb4058bce365 SHA256 68400eeb4985f6e79a2f0ca58862a8bb7f36ea69025273e0bbc05e747efb22f0
 MISC metadata.xml 1058 RMD160 6750134c6f61c6e63034f6ca167ec15cde7ecde8 SHA1 3e511b0843049dde6e0086033f9c7b8be8ae874e SHA256 2774392c4952db7c7b8648b49cd1b642aa3d52a2470b8decfd79e7e7f31cf444
diff --git a/mail-filter/opendkim/files/opendkim-1.1.0-autoconf-automake.patch b/mail-filter/opendkim/files/opendkim-1.1.0-autoconf-automake.patch
deleted file mode 100644
index b2ddd1f9634f..000000000000
--- a/mail-filter/opendkim/files/opendkim-1.1.0-autoconf-automake.patch
+++ /dev/null
@@ -1,143 +0,0 @@
---- ./opendkim-1.1.0.orig/configure.ac	2009-09-16 08:29:38.000000000 +1000
-+++ ./opendkim-1.1.0/configure.ac	2009-10-06 18:21:08.000000000 +1100
-@@ -45,6 +45,11 @@
- 
- # Checks for library functions.
- AC_CHECK_FUNCS([dup2 endpwent getcwd gethostname gettimeofday isascii memchr memmove memset regcomp select socket strcasecmp strchr strdup strerror strncasecmp strrchr strtol strtoul strtoull strlcpy strlcat])
-+# Checks for library functions.
-+AC_FUNC_FORK
-+AC_FUNC_MALLOC
-+AC_FUNC_MKTIME
-+AC_FUNC_REALLOC
- 
- # Conditional stuff
- AC_ARG_ENABLE(arlib, AS_HELP_STRING(--enable-arlib, enable provided asynchronous resolver library))
---- ./opendkim-1.1.0.orig/opendkim/Makefile.am	2009-09-16 08:29:38.000000000 +1000
-+++ ./opendkim-1.1.0/opendkim/Makefile.am	2009-10-06 18:44:47.000000000 +1100
-@@ -7,10 +7,11 @@
- # this lists the binaries to produce, the (non-PHONY, binary) targets in
- # the previous manual Makefile
- sbin_PROGRAMS = opendkim-testkey opendkim-testadsp
--sbin_SCRIPTS = opendkim-genkey.sh
-+dist_sbin_SCRIPTS = opendkim-genkey.sh
- 
--exampledir = $(datarootdir)/doc/@PACKAGE@
--example_DATA = opendkim.conf.sample
-+EXTRA_DIST = opendkim.conf.sample
-+sampledir = $(docdir)
-+sample_DATA = opendkim.conf.sample
- 
- if BUILD_FILTER
- sbin_PROGRAMS += opendkim
-@@ -98,12 +99,8 @@
- sbin_PROGRAMS += opendkim-stats
- opendkim_stats_SOURCES = opendkim-db.c opendkim-stats.c
- opendkim_stats_CPPFLAGS = -DUSE_DB -I../libopendkim $(LIBCRYPTO_INCDIRS) $(LIBDB_INCDIRS)
--opendkim_stats_LDFLAGS = -L../libopendkim $(LIBCRYPTO_LIBDIRS) $(LIBUNBOUND_LIBDIRS) $(LIBDB_LIBDIRS)
--opendkim_stats_LDADD = ../libopendkim/libopendkim.la $(LIBUNBOUND_LIBS) $(LIBDB_LIBS)
--if USE_ARLIB
--opendkim_stats_LDFLAGS += -L../libar
--opendkim_stats_LDADD += -lar
--endif
-+opendkim_stats_LDFLAGS = $(LIBCRYPTO_LIBDIRS) $(LIBUNBOUND_LIBDIRS) $(LIBDB_LIBDIRS)
-+opendkim_stats_LDADD = ../libopendkim/libopendkim.la $(LIBDB_LIBS)
- if DEBUG
- opendkim_stats_CFLAGS = -g
- endif
-@@ -111,20 +108,11 @@
- 
- opendkim_testkey_SOURCES = opendkim-testkey.c
- opendkim_testkey_CPPFLAGS = -I../libopendkim $(LIBCRYPTO_INCDIRS)
--opendkim_testkey_LDFLAGS = -L../libopendkim $(LIBCRYPTO_LIBDIRS)
-+opendkim_testkey_LDFLAGS = $(LIBCRYPTO_LIBDIRS)
- opendkim_testkey_LDADD = ../libopendkim/libopendkim.la
- opendkim_testkey_CFLAGS = 
- if USE_ARLIB
--opendkim_testkey_LDFLAGS += -L../libar
--opendkim_testkey_LDADD += -lar
--endif
--if USE_DB_OPENDKIM
--opendkim_testkey_LDFLAGS += $(LIBDB_LIBDIRS)
--opendkim_testkey_LDADD += $(LIBDB_LIBS)
--endif
--if USE_UNBOUND
--opendkim_testkey_LDFLAGS += $(LIBUNBOUND_LIBDIRS)
--opendkim_testkey_LDADD += $(LIBUNBOUND_LIBS)
-+opendkim_testkey_LDADD += ../libar/libar.la
- endif
- if DEBUG
- opendkim_testkey_CFLAGS += -g
-@@ -132,31 +120,21 @@
- 
- opendkim_testadsp_SOURCES = opendkim-testadsp.c
- opendkim_testadsp_CPPFLAGS = -I../libopendkim $(LIBCRYPTO_INCDIRS)
--opendkim_testadsp_LDFLAGS = -L../libopendkim $(LIBCRYPTO_LIBDIRS)
-+opendkim_testadsp_LDFLAGS = $(LIBCRYPTO_LIBDIRS)
- opendkim_testadsp_LDADD = ../libopendkim/libopendkim.la
- opendkim_testadsp_CFLAGS = 
- if USE_ARLIB
--opendkim_testadsp_LDFLAGS += -L../libar
--opendkim_testadsp_LDADD += -lar
--endif
--if USE_DB_OPENDKIM
--opendkim_testadsp_LDFLAGS += $(LIBDB_LIBDIRS)
--opendkim_testadsp_LDADD += $(LIBDB_LIBS)
--endif
--if USE_UNBOUND
--opendkim_testadsp_LDFLAGS += $(LIBUNBOUND_LIBDIRS)
--opendkim_testadsp_LDADD += $(LIBUNBOUND_LIBS)
-+opendkim_testadsp_LDADD += ../libar/libar.la
- endif
- if DEBUG
- opendkim_testadsp_CFLAGS += -g
- endif
- 
--man_MANS = opendkim-genkey.8 opendkim-testadsp.8 opendkim-testkey.8
-+dist_man_MANS = opendkim-genkey.8 opendkim-testadsp.8 opendkim-testkey.8
- if BUILD_FILTER
--man_MANS += opendkim.conf.5 opendkim.8
-+dist_man_MANS += opendkim.conf.5 opendkim.8
- endif
- if STATS
--man_MANS += opendkim-stats.8
-+dist_man_MANS += opendkim-stats.8
- endif
- 
--EXTRA_DIST = $(example_DATA) $(man_MANS) opendkim-stats.8 $(sbin_SCRIPTS)
---- ./opendkim-1.1.0.orig/libopendkim/Makefile.am	2009-09-11 08:08:39.000000000 +1000
-+++ ./opendkim-1.1.0/libopendkim/Makefile.am	2009-10-06 18:59:33.000000000 +1100
-@@ -10,8 +10,8 @@
- endif
- libopendkimincludedir = $(includedir)/opendkim
- libopendkiminclude_HEADERS = dkim.h
--libopendkim_ladir = $(datadir)/opendkim
--libopendkim_la_DATA = docs/dkim.html docs/dkim_alg_t.html docs/dkim_body.html \
-+docsdir = $(htmldir)
-+docs_DATA = docs/dkim.html docs/dkim_alg_t.html docs/dkim_body.html \
- 	docs/dkim_canon_t.html docs/dkim_cbstat.html docs/dkim_chunk.html \
- 	docs/dkim_close.html docs/dkim_dnssec.html docs/dkim_eoh.html \
- 	docs/dkim_eom.html docs/dkim_flush_cache.html docs/dkim_free.html \
-@@ -77,7 +77,7 @@
- 
- if USE_ARLIB
- libopendkim_la_CFLAGS += -DUSE_ARLIB -I../libar
--libopendkim_la_LIBADD += ../libar/libar.a
-+libopendkim_la_LIBADD += ../libar/libar.la
- endif
- 
- if USE_DB_LIBOPENDKIM
---- ./opendkim-1.1.0.orig/libar/Makefile.am	2009-09-02 03:47:06.000000000 +1000
-+++ ./opendkim-1.1.0/libar/Makefile.am	2009-10-06 19:21:21.000000000 +1100
-@@ -1,8 +1,8 @@
- # $Id: opendkim-1.1.0-autoconf-automake.patch,v 1.1 2009/10/06 09:10:42 dragonheart Exp $
- 
--lib_LIBRARIES = libar.a
--libar_a_SOURCES = ar.c ar-strl.c manual.c ar-strl.h
-+lib_LTLIBRARIES = libar.la
-+libar_la_SOURCES = ar.c ar-strl.c manual.c ar-strl.h
-+libar_la_LIBADD = -lresolv
- libarincludedir = $(includedir)/ar
- libarinclude_HEADERS = ar.h manual.h
--man_MANS = ar.3
--EXTRA_DIST = $(man_MANS)
-+dist_man_MANS = ar.3
diff --git a/mail-filter/opendkim/files/opendkim-1.1.0-flockinclude.patch b/mail-filter/opendkim/files/opendkim-1.1.0-flockinclude.patch
deleted file mode 100644
index f9bde1056a0d..000000000000
--- a/mail-filter/opendkim/files/opendkim-1.1.0-flockinclude.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- opendkim-1.1.0.orig/opendkim/opendkim-db.c.orig	2009-10-06 14:57:17.000000000 +1100
-+++ opendkim-1.1.0/opendkim/opendkim-db.c	2009-10-06 15:01:42.000000000 +1100
-@@ -23,6 +23,9 @@
- #include <fcntl.h>
- #include <assert.h>
- 
-+/* flock function defination */
-+#include <sys/file.h>
-+
- /* opendkim includes */
- #include "opendkim-db.h"
- 
diff --git a/mail-filter/opendkim/files/opendkim-1.1.0-rep-querycache.patch b/mail-filter/opendkim/files/opendkim-1.1.0-rep-querycache.patch
deleted file mode 100644
index 7135f5547c47..000000000000
--- a/mail-filter/opendkim/files/opendkim-1.1.0-rep-querycache.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./opendkim-1.1.0/libopendkim/dkim-rep.c.orig	2009-10-06 19:11:04.000000000 +1100
-+++ ./opendkim-1.1.0/libopendkim/dkim-rep.c	2009-10-06 19:12:01.000000000 +1100
-@@ -37,6 +37,7 @@
- /* libopendkim includes */
- #include "dkim.h"
- #include "dkim-types.h"
-+#include "util.h"
- 
- /* prototypes */
- extern void dkim_error __P((DKIM *, const char *, ...));
-@@ -177,6 +178,9 @@
- 	char query[DKIM_MAXHOSTNAMELEN + 1];
- 	char qname[DKIM_MAXHOSTNAMELEN + 1];
- 	char buf[BUFRSZ + 1];
-+#ifdef QUERY_CACHE
-+        int ttl = 0;
-+#endif /* QUERY_CACHE */
- 
- 	assert(dkim != NULL);
- 	assert(user != NULL);
diff --git a/mail-filter/opendkim/files/opendkim-1.1.0-vbr-booliscpp.patch b/mail-filter/opendkim/files/opendkim-1.1.0-vbr-booliscpp.patch
deleted file mode 100644
index f740d7fa6158..000000000000
--- a/mail-filter/opendkim/files/opendkim-1.1.0-vbr-booliscpp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./opendkim-1.1.0/libopendkim/vbr.c.orig	2009-10-06 19:16:19.000000000 +1100
-+++ ./opendkim-1.1.0/libopendkim/vbr.c	2009-10-06 19:16:30.000000000 +1100
-@@ -235,7 +235,7 @@
- **  	TRUE iff ansbuf contains an IN TXT reply that could be deocde.
- */
- 
--static bool
-+static int
- vbr_txt_decode(u_char *ansbuf, size_t anslen, u_char *buf, size_t buflen)
- {
- 	int type;
diff --git a/mail-filter/opendkim/opendkim-1.1.0.ebuild b/mail-filter/opendkim/opendkim-1.1.0.ebuild
deleted file mode 100644
index a6d32f0c3354..000000000000
--- a/mail-filter/opendkim/opendkim-1.1.0.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-1.1.0.ebuild,v 1.3 2009/11/01 23:38:50 dragonheart Exp $
-
-EAPI="2"
-
-inherit eutils autotools toolchain-funcs
-
-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="+db"
-
-# FUTURE: unbound (dnssec lib) - bug #223103
-
-DEPEND="dev-libs/openssl
-	db? ( >=sys-libs/db-3.2 )
-	|| ( mail-filter/libmilter mail-mta/sendmail )"
-RDEPEND="${DEPEND}"
-
-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() {
-	epatch "${FILESDIR}/${P}"-flockinclude.patch
-	epatch "${FILESDIR}/${P}"-autoconf-automake.patch
-	epatch "${FILESDIR}/${P}"-rep-querycache.patch
-	epatch "${FILESDIR}/${P}"-vbr-booliscpp.patch
-	eautoreconf
-	sed -i -e 's:/var/db/dkim:/etc/opendkim:g' \
-	       -e 's:/etc/mail:/etc/opendkim:g' \
-		   opendkim/opendkim.conf.sample
-}
-
-src_configure() {
-	econf $(use_enable db bodylengthdb) \
-		$(use_enable db popauth) \
-		$(use_enable db querycache) \
-		$(use_enable db stats) \
-		--without-domainkeys \
-		--enable-arlib \
-		--enable-dkimreputation \
-		--enable-dnsupgrade \
-		--enable-multiplesigs \
-		--enable-reportintervals \
-		--enable-vbr
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	# file collision
-	rm "${D}"/usr/share/man/man3/ar.3
-
-	mv "${D}"/usr/share/doc/opendkim "${D}"/usr/share/doc/${PF}
-	newinitd "${FILESDIR}/opendkim.init" opendkim
-	dodir /etc/opendkim /var/run/opendkim /var/lib/opendkim
-	fowners milter:milter /var/run/opendkim /etc/opendkim /var/lib/opendkim
-
-	# default configuration
-	if [ ! -f /etc/opendkim/opendkim.conf ]; then
-		grep ^[^#] "${S}"/opendkim/opendkim.conf.sample \
-			> "${D}"/etc/opendkim/opendkim.conf
-		echo \# Socket local:/var/run/opendkim/opendkim.sock >> \
-			"${D}"/etc/opendkim/opendkim.conf
-		echo UserID milter >> "${D}"/etc/opendkim/opendkim.conf
-		if use db; then
-			echo Statistics /var/lib/opendkim/stats.db >> \
-				"${D}"/etc/opendkim/opendkim.conf
-		fi
-	fi
-}
-
-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."
-
-	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
-		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
-		opendkim-genkey.sh -b ${keysize} -D "${ROOT}"etc/opendkim/ \
-			-s ${selector} && \
-			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 dkim-filter.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"
-
-	# 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"
-}
diff --git a/mail-filter/opendkim/opendkim-1.2.0.ebuild b/mail-filter/opendkim/opendkim-1.2.1.ebuild
index 99b69103ac49..7e329dac0c42 100644
--- a/mail-filter/opendkim/opendkim-1.2.0.ebuild
+++ b/mail-filter/opendkim/opendkim-1.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-1.2.0.ebuild,v 1.1 2009/12/14 03:05:11 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-1.2.1.ebuild,v 1.1 2010/01/08 13:12:45 dragonheart Exp $
 
 EAPI="2"
 
@@ -40,7 +40,7 @@ src_prepare() {
 }
 
 src_configure() {
-	econf $(use_enable db bodylengthdb) \
+	econf $(use_enable db bodylength_db) \
 		$(use_enable db popauth) \
 		$(use_enable db query_cache) \
 		$(use_enable db report_intervals) \
@@ -61,14 +61,13 @@ src_configure() {
 		--enable-vbr \
 		--enable-ztags
 #		$(use_enable diffheaders) \
-	# post release error found.
-	use db && sed -i -e 's/_FFR_BODYLENGTHDB/_FFR_BODYLENGTH_DB/' build-config.h
 }
 
 src_install() {
 	emake DESTDIR="${D}" install
 	# file collision
 	rm "${D}"/usr/share/man/man3/ar.3
+	mv "${D}"/usr/share/doc/opendkim "${D}"/usr/share/doc/${PF}
 
 	newinitd "${FILESDIR}/opendkim.init" opendkim
 	dodir /etc/opendkim /var/run/opendkim /var/lib/opendkim
@@ -124,7 +123,7 @@ pkg_config() {
 
 		# generate the private and public keys
 		opendkim-genkey.sh -b ${keysize} -D "${ROOT}"etc/opendkim/ \
-			-s ${selector} && \
+			-s ${selector} -d '(your domain)' && \
 			chown milter:milter \
 			"${ROOT}"etc/opendkim/"${selector}".private || \
 				{ eerror "Failed to create private and public keys." ; return 1; }
@@ -133,7 +132,7 @@ pkg_config() {
 
 	# opendkim selector configuration
 	echo
-	einfo "Make sure you have the following settings in your dkim-filter.conf:"
+	einfo "Make sure you have the following settings in your /etc/opendkim/opendkim.conf:"
 	einfo "  Keyfile /etc/opendkim/${selector}.private"
 	einfo "  Selector ${selector}"