Add ipv6 USE flag (#178501).

Package-Manager: portage-2.1.2.12

4 files changed, 41 insertions, 33 deletions

diff --git a/mail-filter/dkim-milter/ChangeLog b/mail-filter/dkim-milter/ChangeLog
index 46dcbec464f7..2c67d5b20a3b 100644
--- a/mail-filter/dkim-milter/ChangeLog
+++ b/mail-filter/dkim-milter/ChangeLog
@@ -1,6 +1,10 @@
 # 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.6 2007/10/11 13:29:06 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dkim-milter/ChangeLog,v 1.7 2007/10/12 14:06:36 mrness Exp $
+
+  12 Oct 2007; Alin Năstac <mrness@gentoo.org>
+  files/dkim-milter-2.3.0-gentoo.patch, dkim-milter-2.3.0-r2.ebuild:
+  Add ipv6 USE flag (#178501).
 
   11 Oct 2007; Alin Năstac <mrness@gentoo.org> metadata.xml,
   dkim-milter-2.3.0-r2.ebuild:
diff --git a/mail-filter/dkim-milter/Manifest b/mail-filter/dkim-milter/Manifest
index b0331814c0eb..814a2815c59f 100644
--- a/mail-filter/dkim-milter/Manifest
+++ b/mail-filter/dkim-milter/Manifest
@@ -9,23 +9,23 @@ AUX dkim-milter-2.3.0-diffheaders.patch 1263 RMD160 384b53898d33461bd8c467629b77
 MD5 5f5eddc92b82372cf21e2753d606b610 files/dkim-milter-2.3.0-diffheaders.patch 1263
 RMD160 384b53898d33461bd8c467629b773759d25f969f files/dkim-milter-2.3.0-diffheaders.patch 1263
 SHA256 7509fa3d6ed4b4251cb99a207b9f4073a45ef2d8a16a44a621a5e6b8d2d281f8 files/dkim-milter-2.3.0-diffheaders.patch 1263
-AUX dkim-milter-2.3.0-gentoo.patch 4396 RMD160 fbe4828a90b02ad254efd9c1caaab0484fd40578 SHA1 fc948bb3cae3a2206120b68bafe80ddfa32e887d SHA256 3e5405e3c28817ab13a79d1fbfc10ab075708a63786eb1535f1034de7bb3d785
-MD5 2a45b3e4b8c5de6c3e1538a914bd38dd files/dkim-milter-2.3.0-gentoo.patch 4396
-RMD160 fbe4828a90b02ad254efd9c1caaab0484fd40578 files/dkim-milter-2.3.0-gentoo.patch 4396
-SHA256 3e5405e3c28817ab13a79d1fbfc10ab075708a63786eb1535f1034de7bb3d785 files/dkim-milter-2.3.0-gentoo.patch 4396
+AUX dkim-milter-2.3.0-gentoo.patch 4432 RMD160 f4524d9821c3f16ffa46f4d0c337f08487ef07d0 SHA1 97204ec02bf911948e7aa8783ab81e85319c44c9 SHA256 c07e9005294095324bae1923d6fb7b81dcd263ceedb939ed160de51c7878911a
+MD5 8083d6a4d81b400d1c4166f050c6a5a0 files/dkim-milter-2.3.0-gentoo.patch 4432
+RMD160 f4524d9821c3f16ffa46f4d0c337f08487ef07d0 files/dkim-milter-2.3.0-gentoo.patch 4432
+SHA256 c07e9005294095324bae1923d6fb7b81dcd263ceedb939ed160de51c7878911a files/dkim-milter-2.3.0-gentoo.patch 4432
 AUX dkim-milter-2.3.0-test-headers.patch 274 RMD160 1b3bd3e75596d545fad02974f33c2c5f0341a733 SHA1 8a6a7db91785e05a51c81fb0771c8d6b61041878 SHA256 9ab288b63c4a44a37ead8398798fdfe994c76b178a684d89fa81ee189c0df5d2
 MD5 e710761e7af6ac1bc76b77725d8092b6 files/dkim-milter-2.3.0-test-headers.patch 274
 RMD160 1b3bd3e75596d545fad02974f33c2c5f0341a733 files/dkim-milter-2.3.0-test-headers.patch 274
 SHA256 9ab288b63c4a44a37ead8398798fdfe994c76b178a684d89fa81ee189c0df5d2 files/dkim-milter-2.3.0-test-headers.patch 274
 DIST dkim-milter-2.3.0.tar.gz 576570 RMD160 db1c2f839888f1291491ef18674c483341971321 SHA1 ee9bd67222de1c2624f36f5f87a21ef94b3fa44d SHA256 8fbbbb549db97f481e65f6cde9b71c86179140b8a199dcbe148a4a32fb4e4c50
-EBUILD dkim-milter-2.3.0-r2.ebuild 4603 RMD160 883ca025a5ffa3ed561b5c8aeab87d8ef386c303 SHA1 a957a245b43cbf6ee7fd57ae89733018c06f6aa9 SHA256 9698521079805dc13bd8b40579e8da1dd42da53ee52c05b7dca36aa10f1ca747
-MD5 84fc80c8c6752e10ebd9166443b4d155 dkim-milter-2.3.0-r2.ebuild 4603
-RMD160 883ca025a5ffa3ed561b5c8aeab87d8ef386c303 dkim-milter-2.3.0-r2.ebuild 4603
-SHA256 9698521079805dc13bd8b40579e8da1dd42da53ee52c05b7dca36aa10f1ca747 dkim-milter-2.3.0-r2.ebuild 4603
-MISC ChangeLog 2022 RMD160 1d723245df0c1499b3a2c0043b84d44398806354 SHA1 612126304bd34e626fbc827fefbfb4d4b4d21559 SHA256 422b41f0e1dabaec43df8585041ec4ce35ea84cf24bad07a22e6e887d56a239a
-MD5 d5bcb4e946507a49f17a4065dd531452 ChangeLog 2022
-RMD160 1d723245df0c1499b3a2c0043b84d44398806354 ChangeLog 2022
-SHA256 422b41f0e1dabaec43df8585041ec4ce35ea84cf24bad07a22e6e887d56a239a ChangeLog 2022
+EBUILD dkim-milter-2.3.0-r2.ebuild 4698 RMD160 31f8c6de14dfc36d156dea48f2cccfe8fb8776af SHA1 56120ecb28c6164f8efc0fa580f521a4495a92d4 SHA256 9cc33ef77b3413df3742ef375c503576d1753b8c38e70254e29b25f0dc4478cc
+MD5 9f45c734762e8a8db8e941dfba4f6ee4 dkim-milter-2.3.0-r2.ebuild 4698
+RMD160 31f8c6de14dfc36d156dea48f2cccfe8fb8776af dkim-milter-2.3.0-r2.ebuild 4698
+SHA256 9cc33ef77b3413df3742ef375c503576d1753b8c38e70254e29b25f0dc4478cc dkim-milter-2.3.0-r2.ebuild 4698
+MISC ChangeLog 2171 RMD160 14b3b126b30ff2413b2ab6254d72e2241c8b6edd SHA1 4481c0dd7f15a1579aefe8f15f804fd00072ae10 SHA256 01f37417e3c109bbb72e52757d8aa6edc9017d5640b92db3262e81773c206279
+MD5 a0f18eeeda2d88ac8dc4a2fd56d66fca ChangeLog 2171
+RMD160 14b3b126b30ff2413b2ab6254d72e2241c8b6edd ChangeLog 2171
+SHA256 01f37417e3c109bbb72e52757d8aa6edc9017d5640b92db3262e81773c206279 ChangeLog 2171
 MISC metadata.xml 470 RMD160 d6bce3384093365550d2728de1127be6ec5e638b SHA1 38d6d281eab07e1d1bdd5bfa96bb7b10f3f6acfb SHA256 2a797bd281b89c5cffd8de2feb41ea1c62a6107ac1d39681798fa922fcfdc043
 MD5 72766da9a21dfee5399abb0e34f2917a metadata.xml 470
 RMD160 d6bce3384093365550d2728de1127be6ec5e638b metadata.xml 470
@@ -36,7 +36,7 @@ SHA256 a273ee25fdc86e6d62091c9894e19a0dcae697ca2ef0b6d56802c1bc089437dc files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFHDiUxVSA5X31g7/gRAkZBAKCJ0IOxCcpi0R5dRwkO32NcXHsRHACbBJZh
-nQqdTRN9c7EDpv5YlUHX4is=
-=Kqp/
+iD8DBQFHD397VSA5X31g7/gRAn3FAJ9WuMG9+3/hwGNRz83tv3L3V5YkUQCgh+Up
+JuEf9SAWDkazZsItIfcKoPI=
+=KlpC
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/dkim-milter/dkim-milter-2.3.0-r2.ebuild b/mail-filter/dkim-milter/dkim-milter-2.3.0-r2.ebuild
index e6995aa56842..bdb71037d697 100644
--- a/mail-filter/dkim-milter/dkim-milter-2.3.0-r2.ebuild
+++ b/mail-filter/dkim-milter/dkim-milter-2.3.0-r2.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.0-r2.ebuild,v 1.3 2007/10/11 13:29:06 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dkim-milter/dkim-milter-2.3.0-r2.ebuild,v 1.4 2007/10/12 14:06:36 mrness Exp $
 
 inherit eutils toolchain-funcs
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/dkim-milter/${P}.tar.gz"
 LICENSE="Sendmail-Open-Source"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="diffheaders"
+IUSE="ipv6 diffheaders"
 
 RDEPEND="dev-libs/openssl
 	>=sys-libs/db-3.2
@@ -34,7 +34,10 @@ src_unpack() {
 	cp site.config.m4.dist devtools/Site/site.config.m4 || \
 		die "failed to generate site.config.m4"
 	epatch "${FILESDIR}/${P}-gentoo.patch"
-	sed -i -e "s:@@CFLAGS@@:${CFLAGS}:" \
+
+	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"
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.0-gentoo.patch
index 6a9dd2ce1e7a..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.0-gentoo.patch
@@ -1,10 +1,11 @@
 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 06:35:16.000000000 +0300
-+++ dkim-milter-2.3.0/devtools/Site/site.config.m4	2007-10-10 06:38:32.000000000 +0300
-@@ -6,18 +6,21 @@
+--- dkim-milter-2.3.0.orig/devtools/Site/site.config.m4	2007-10-12 17:01:00.000000000 +0300
++++ dkim-milter-2.3.0/devtools/Site/site.config.m4	2007-10-12 17:01:35.000000000 +0300
+@@ -6,18 +6,22 @@
  dnl values described in devtools/README by setting your preferred values
  dnl in this file.
  
++define(`confENVDEF', `@@ENVDEF@@')
 +dnl man build is broken
 +define(`confNO_MAN_BUILD',`')
 +
@@ -25,7 +26,7 @@ diff -Nru dkim-milter-2.3.0.orig/devtools/Site/site.config.m4 dkim-milter-2.3.0/
  dnl 
  dnl libar normally uses res_init() or res_ninit() to load the contents
  dnl of resolv.conf for its use.  If neither of these work on your system
-@@ -82,7 +85,7 @@
+@@ -82,7 +86,7 @@
  dnl APPENDDEF(`confENVDEF', `-D_FFR_REQUIRED_HEADERS ')
  dnl APPENDDEF(`confENVDEF', `-D_FFR_SELECT_CANONICALIZATION ')
  dnl APPENDDEF(`confENVDEF', `-D_FFR_SELECT_SIGN_HEADERS ')
@@ -36,8 +37,8 @@ diff -Nru dkim-milter-2.3.0.orig/devtools/Site/site.config.m4 dkim-milter-2.3.0/
  
 diff -Nru dkim-milter-2.3.0.orig/dkim-filter/dkim-filter.conf.sample dkim-milter-2.3.0/dkim-filter/dkim-filter.conf.sample
 --- dkim-milter-2.3.0.orig/dkim-filter/dkim-filter.conf.sample	2007-09-21 01:06:01.000000000 +0300
-+++ dkim-milter-2.3.0/dkim-filter/dkim-filter.conf.sample	2007-10-10 14:28:16.000000000 +0300
-@@ -20,13 +18,6 @@
++++ dkim-milter-2.3.0/dkim-filter/dkim-filter.conf.sample	2007-10-12 17:01:24.000000000 +0300
+@@ -20,13 +20,6 @@
  
  # AutoRestart		No
  
@@ -51,7 +52,7 @@ diff -Nru dkim-milter-2.3.0.orig/dkim-filter/dkim-filter.conf.sample dkim-milter
  ##  BodyLengths { yes | no }
  ##  	default "no"
  ##
-@@ -74,7 +65,7 @@
+@@ -74,7 +67,7 @@
  ##  Specify for which domain(s) signing should be done.  No default; must
  ##  be specified for signing.
  
@@ -60,7 +61,7 @@ diff -Nru dkim-milter-2.3.0.orig/dkim-filter/dkim-filter.conf.sample dkim-milter
  
  ##  ExternalIgnoreList filename
  ##
-@@ -89,7 +80,7 @@
+@@ -89,7 +82,7 @@
  ##  Specifies the path to the private key to use when signing.  Ignored if
  ##  Keylist is set.  No default; must be specified for signing.
  
@@ -69,7 +70,7 @@ diff -Nru dkim-milter-2.3.0.orig/dkim-filter/dkim-filter.conf.sample dkim-milter
  
  ##  KeyList filename
  ##
-@@ -106,7 +97,7 @@
+@@ -106,7 +99,7 @@
  ##  as the beginning of a comment.  See dkim-filter.conf(5) for more
  ##  information.
  
@@ -78,7 +79,7 @@ diff -Nru dkim-milter-2.3.0.orig/dkim-filter/dkim-filter.conf.sample dkim-milter
  
  ##  InternalHosts filename
  ##
-@@ -114,7 +105,7 @@
+@@ -114,7 +107,7 @@
  ##  hosts from which mail should be signed rather than verified.
  ##  Automatically contains 127.0.0.1.  See man page for file format.
  
@@ -87,7 +88,7 @@ diff -Nru dkim-milter-2.3.0.orig/dkim-filter/dkim-filter.conf.sample dkim-milter
  
  ##  MacroList macro[=value][,...]
  ##
-@@ -177,22 +168,6 @@
+@@ -177,22 +170,6 @@
  
  # PeerList		filename
  
@@ -110,7 +111,7 @@ diff -Nru dkim-milter-2.3.0.orig/dkim-filter/dkim-filter.conf.sample dkim-milter
  ##  Quarantine { yes | no }
  ##  	default "no"
  ##
-@@ -267,7 +242,7 @@
+@@ -267,7 +244,7 @@
  ##  inet:port			to listen on all interfaces
  ##  local:/path/to/socket	to listen on a UNIX domain socket
  
@@ -119,7 +120,7 @@ diff -Nru dkim-milter-2.3.0.orig/dkim-filter/dkim-filter.conf.sample dkim-milter
  
  ##  SubDomains { yes | no }
  ##  	default "no"
-@@ -296,7 +271,7 @@
+@@ -296,7 +273,7 @@
  ##  Change to user "userid" before starting normal operation?  May include
  ##  a group ID as well, separated from the userid by a colon.
  
@@ -128,7 +129,7 @@ diff -Nru dkim-milter-2.3.0.orig/dkim-filter/dkim-filter.conf.sample dkim-milter
  
  ##  UseSSPDeny { yes | no }
  ##  	default "no"
-@@ -314,3 +289,10 @@
+@@ -314,3 +291,10 @@
  ##  messages it has processed.
  
  # X-Header		No