Mods to install default files for black/gray lists & domain country lookup. Thanks again to Greg Watson <bugs@linuxlogin.com> in bug #180614

Package-Manager: portage-2.1.3_rc6

4 files changed, 24 insertions, 16 deletions

diff --git a/mail-filter/assp/ChangeLog b/mail-filter/assp/ChangeLog
index 1ca7ee8154d8..eb3cd5ce3b82 100644
--- a/mail-filter/assp/ChangeLog
+++ b/mail-filter/assp/ChangeLog
@@ -1,8 +1,15 @@
 # ChangeLog for mail-filter/assp
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/assp/ChangeLog,v 1.14 2007/07/02 16:26:03 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/assp/ChangeLog,v 1.15 2007/07/02 16:44:01 wltjr Exp $
 
-*assp-1.3.1 (23 Jun 2007)
+*assp-1.3.1-r1 (02 Jul 2007)
+
+  02 Jul 2007; William L. Thomson Jr. <wltjr@gentoo.org> -assp-1.3.1.ebuild,
+  +assp-1.3.1-r1.ebuild:
+  Mods to install default files for black/gray lists & domain country lookup.
+  Thanks again to Greg Watson <bugs@linuxlogin.com> in bug #180614
+
+*assp-1.3.1 (02 Jul 2007)
 
   23 Jun 2007; William L. Thomson Jr. <wltjr@gentoo.org>
   +files/assp-1.3.1.patch, +assp-1.3.1.ebuild:
diff --git a/mail-filter/assp/Manifest b/mail-filter/assp/Manifest
index 68bf93892a47..94fd4310ff59 100644
--- a/mail-filter/assp/Manifest
+++ b/mail-filter/assp/Manifest
@@ -13,14 +13,14 @@ EBUILD assp-1.2.6-r3.ebuild 2791 RMD160 7ff20e6f23309e0e991b1501f0423700c24ec80b
 MD5 6ecc657a4a34c6df374e29e4f86dcb6d assp-1.2.6-r3.ebuild 2791
 RMD160 7ff20e6f23309e0e991b1501f0423700c24ec80b assp-1.2.6-r3.ebuild 2791
 SHA256 4a85634913a54651a62da4e503a1fa284da2f7c487c9c9af8a056b57e251f4c6 assp-1.2.6-r3.ebuild 2791
-EBUILD assp-1.3.1.ebuild 3207 RMD160 291856d2ff729b01bbaf31f7ea6ffddf494cd2b2 SHA1 b983205283365fa205c3b6ef1d48ba80b881431f SHA256 486c15914155da314b58b565e39939d047b0363fc2f4138cc6613515da91e220
-MD5 08007ee4a3016d6ab9f1fa5cf50415f5 assp-1.3.1.ebuild 3207
-RMD160 291856d2ff729b01bbaf31f7ea6ffddf494cd2b2 assp-1.3.1.ebuild 3207
-SHA256 486c15914155da314b58b565e39939d047b0363fc2f4138cc6613515da91e220 assp-1.3.1.ebuild 3207
-MISC ChangeLog 3454 RMD160 a309e9b55dad9d2ffcd6b0984007290e5c1c98a4 SHA1 5ee3b6a20beed18b76d8a23569a8915bbefba7c3 SHA256 f8734ebca099e2423cc37faf27bf1a4f30e1d41b84018d2ab4a4a17266ec6a9f
-MD5 d67caa1e7bade1272061b4c8045f960b ChangeLog 3454
-RMD160 a309e9b55dad9d2ffcd6b0984007290e5c1c98a4 ChangeLog 3454
-SHA256 f8734ebca099e2423cc37faf27bf1a4f30e1d41b84018d2ab4a4a17266ec6a9f ChangeLog 3454
+EBUILD assp-1.3.1-r1.ebuild 3329 RMD160 95aa724e2216e0846407390f2297604252e5c85f SHA1 1eba26d70978f1df72997c728081fdd43c6326a2 SHA256 e254d1c4b04bbd42b68a3396f1e4d491a2a1217e514328a58605ed5d4b9fcf6a
+MD5 b27b3b2bf563cdfc7b9bc00df353b40c assp-1.3.1-r1.ebuild 3329
+RMD160 95aa724e2216e0846407390f2297604252e5c85f assp-1.3.1-r1.ebuild 3329
+SHA256 e254d1c4b04bbd42b68a3396f1e4d491a2a1217e514328a58605ed5d4b9fcf6a assp-1.3.1-r1.ebuild 3329
+MISC ChangeLog 3732 RMD160 15ab305d974845207b3460028e062045f951b6fb SHA1 86fb1a182c3c44edbdfda580ec05aa13b8e5e615 SHA256 cdb37738b4747d89d2c4085abefc6f36fc751700115574afaa7f23e1df6ecbbe
+MD5 8c2abfa41ce82ad255604d8a73da0215 ChangeLog 3732
+RMD160 15ab305d974845207b3460028e062045f951b6fb ChangeLog 3732
+SHA256 cdb37738b4747d89d2c4085abefc6f36fc751700115574afaa7f23e1df6ecbbe ChangeLog 3732
 MISC metadata.xml 808 RMD160 dc6fd8b7e0ae86eb40342064e3820cd8fbd83193 SHA1 c24f1667c370bfff799a6289bcdafc06b405f8ec SHA256 b33778bfaa6a4537f5e5ea54bee8641126c9655505b26c85cc11a91cc288b5a6
 MD5 31d7bb0d82eeb1c4fde76228f3d71a8d metadata.xml 808
 RMD160 dc6fd8b7e0ae86eb40342064e3820cd8fbd83193 metadata.xml 808
@@ -28,6 +28,6 @@ SHA256 b33778bfaa6a4537f5e5ea54bee8641126c9655505b26c85cc11a91cc288b5a6 metadata
 MD5 397e3a17bf5a7aa227a56ae5b949e5a1 files/digest-assp-1.2.6-r3 247
 RMD160 62ff070b13b038c5bfaf31b579a0e64e585d79da files/digest-assp-1.2.6-r3 247
 SHA256 020336ad57d85e5c03a76dbbc5c041ee345f51ad0ec4ea015671215ec1adc512 files/digest-assp-1.2.6-r3 247
-MD5 ab8089fd2500e4af263295543afb117f files/digest-assp-1.3.1 494
-RMD160 582d6c6388afd7534a6279f51d95a45b82905e31 files/digest-assp-1.3.1 494
-SHA256 59fc183091fbe35ee718c8c483a8d80d6120ca2982f95cda65729a459b43d07f files/digest-assp-1.3.1 494
+MD5 ab8089fd2500e4af263295543afb117f files/digest-assp-1.3.1-r1 494
+RMD160 582d6c6388afd7534a6279f51d95a45b82905e31 files/digest-assp-1.3.1-r1 494
+SHA256 59fc183091fbe35ee718c8c483a8d80d6120ca2982f95cda65729a459b43d07f files/digest-assp-1.3.1-r1 494
diff --git a/mail-filter/assp/assp-1.3.1.ebuild b/mail-filter/assp/assp-1.3.1-r1.ebuild
index 469aa33b47a6..adc19e024454 100644
--- a/mail-filter/assp/assp-1.3.1.ebuild
+++ b/mail-filter/assp/assp-1.3.1-r1.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/assp/assp-1.3.1.ebuild,v 1.1 2007/07/02 16:26:03 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/assp/assp-1.3.1-r1.ebuild,v 1.1 2007/07/02 16:44:01 wltjr Exp $
 
 inherit eutils
 
@@ -70,6 +70,9 @@ src_install() {
 	dodir /etc/assp
 
 	insinto /etc/assp
+	# Installs files that are used by assp for black/gray lists,
+	# and domain country lookup. To be changed by admin as needed.
+	doins files/*.txt
 
 	fowners assp:assp /etc/assp -R
 	fperms 770 /etc/assp
@@ -88,8 +91,6 @@ src_install() {
 	doexe *.pl *.sh
 	insinto /usr/share/assp
 	doins -r images/
-
-	insinto /usr/share/assp
 	doins *.txt
 
 	# Lock down the files/data
diff --git a/mail-filter/assp/files/digest-assp-1.3.1 b/mail-filter/assp/files/digest-assp-1.3.1-r1
index 82478a2597dd..82478a2597dd 100644
--- a/mail-filter/assp/files/digest-assp-1.3.1
+++ b/mail-filter/assp/files/digest-assp-1.3.1-r1