Bug #311243: version bump. Also use Fedora patch for Digest::SHA support.

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

4 files changed, 197 insertions, 12 deletions

diff --git a/mail-filter/razor/ChangeLog b/mail-filter/razor/ChangeLog
index f2b923d7fbb7..8db6be8388e1 100644
--- a/mail-filter/razor/ChangeLog
+++ b/mail-filter/razor/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-filter/razor
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/razor/ChangeLog,v 1.87 2010/01/01 18:23:45 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/razor/ChangeLog,v 1.88 2010/03/25 00:39:36 robbat2 Exp $
+
+*razor-2.85 (25 Mar 2010)
+
+  25 Mar 2010; Robin H. Johnson <robbat2@gentoo.org> +razor-2.85.ebuild,
+  +files/razor-2.85-use-sha-not-sha1.patch:
+  Bug #311243: version bump. Also use Fedora patch for Digest::SHA support.
 
   01 Jan 2010; Christian Faulhammer <fauli@gentoo.org> razor-2.84.ebuild:
   Transfer Prefix keywords
diff --git a/mail-filter/razor/Manifest b/mail-filter/razor/Manifest
index 2dae87ca1e46..1587e5d02978 100644
--- a/mail-filter/razor/Manifest
+++ b/mail-filter/razor/Manifest
@@ -1,19 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX no-install-razor-agents.patch 292 RMD160 8ea639c438deb1da6a72339d7585a96132593f50 SHA1 7b0615aa6a36717f7aa0f6b1c9e51a05f601af18 SHA256 0a333ef827ffb4b6da05c17bf0cfc36a33447466be90d3ec65533f396bbb2a5b
+AUX razor-2.85-use-sha-not-sha1.patch 3971 RMD160 2e405db6e6a5d5a1c0952f311b4fc596a4e9b0e3 SHA1 92dcc16e1a1250e5ab9e5ef3e87b63c736ba40f5 SHA256 a8d5e844747c69a9ed6e5aaa8e76dcc194fa1859502eedd18d98b19474b724a8
 DIST razor-agents-2.77.tar.bz2 78516 RMD160 b038b426d42636414dfae40f5e2730a72fd19dcf SHA1 ba64b9d7540a75604deef2a239868061d3d4e12c SHA256 d96ff95bc140ac75eb751c816cb372ebd19d8c3b678ef909408153efa2cb6661
 DIST razor-agents-2.82.tar.bz2 79021 RMD160 4015686818e24084319ae2c13c82bbf74df54035 SHA1 76b9efdd2b09726e68b19ecf8bd98293ac646db8 SHA256 e423d6abab60318700573978954b02e1d64f5061e0df762e8688208598ab7a02
 DIST razor-agents-2.84.tar.bz2 79196 RMD160 204fc2b68ca6f01329676a62b36ca87be659565d SHA1 53bcf78beeea36d8e20441a506c285ff0ef4b75a SHA256 1e9eb8e4d562de79f01e059a7885e5e2a87f47688f146310a0400893edf3077c
+DIST razor-agents-2.85.tar.bz2 81691 RMD160 c98096da14ff4fb772f6d7501e9d14c5b4b4e58f SHA1 bf5797ae9faf20f7e3635883767a95cdf0739ba9 SHA256 7fe0afe73e5b3979444dd86e2ad25ea99bc05b23d5648d357544f78f0b6eb6d7
 EBUILD razor-2.77.ebuild 2537 RMD160 45c91c4ba52c123e0841bf9233dfcde787450e8b SHA1 127377a6106f7fef578dc617797732c7b9f37e3a SHA256 797988c6ed454ce2464c63c1a2d280b18afed3365e8c73513f3161032c6f1773
 EBUILD razor-2.82.ebuild 2536 RMD160 a4d8739f52e55ae3fd4ac79f37c824e8914189e2 SHA1 dd3502cacc0dde5c6cf186f27db17f5ae1d17277 SHA256 61e0bf8831588d3f8c13acfb9fa5dbc4e1f9bb5ecae321c47432961610596ed7
 EBUILD razor-2.84.ebuild 2569 RMD160 728e5fec5824b0b2fd3a8d7d7b90093c17182a00 SHA1 9a2643b20c40acd21f50080f8c8e9ad1d81fc851 SHA256 d2c8a27c3d98114b71f3fee1b8002312f0fe8d72e142812cac947982be29f57c
-MISC ChangeLog 12279 RMD160 f91bd377b858196bfde4b0d62b4203a9eb402834 SHA1 d5a55d254cc6b22545d9d50461b0a6c23e83fc6f SHA256 494d50e6e2c0b55ec4beabf9d314c572de55ae3e5c2ca57b061dc6e474fa7f3d
+EBUILD razor-2.85.ebuild 2671 RMD160 751d7f5ede6956a7045a4815253070f73f88ede7 SHA1 2c291bedc04b4f644f57c8df97a38530f1217bf0 SHA256 f68c9aff729187092ec7d72dc43f21532a3f65ea935263f83dba322fc74cec14
+MISC ChangeLog 12502 RMD160 fe8f62c209aa358c40484f1bd287a33f5dfdc473 SHA1 93eb2c6450a4c789249007f598436112e49d4429 SHA256 4c076cae6fba896cfb641c6197dda9bc7055a1ff1e9dcb5a6e803ea6cf8c83db
 MISC metadata.xml 417 RMD160 a5abe18dc7b0720bef3aae926ffd5c2afdc10e4c SHA1 6d186e8558de61570c8d0c7d597a276f7fe08cc0 SHA256 f0db9dbeb86e5682b3b47b805e6ae29686321ef05e6d1b99b3ddc1a309f17167
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAks+PbcACgkQNQqtfCuFneOG8wCcCzWiNrtk+Wp9tscUXasqRKCp
-ZIUAn1akagAftdb23NNPDMnDGIpOkXNQ
-=cvmy
------END PGP SIGNATURE-----
diff --git a/mail-filter/razor/files/razor-2.85-use-sha-not-sha1.patch b/mail-filter/razor/files/razor-2.85-use-sha-not-sha1.patch
new file mode 100644
index 000000000000..ade2af67bd32
--- /dev/null
+++ b/mail-filter/razor/files/razor-2.85-use-sha-not-sha1.patch
@@ -0,0 +1,119 @@
+Patch-URL: http://cvs.fedoraproject.org/viewvc/devel/perl-Razor-Agent/razor-agents-2.85-use-sha-not-sha1.patch?view=log
+
+diff -urN razor-agents-2.85.orig/lib/Razor2/Client/Engine.pm razor-agents-2.85/lib/Razor2/Client/Engine.pm
+--- razor-agents-2.85.orig/lib/Razor2/Client/Engine.pm	2005-06-13 19:42:25.000000000 -0400
++++ razor-agents-2.85/lib/Razor2/Client/Engine.pm	2009-11-01 13:45:08.125369192 -0500
+@@ -1,7 +1,6 @@
+ package Razor2::Client::Engine;
+ 
+ use strict;
+-use Digest::SHA1 qw(sha1_hex);
+ use Data::Dumper;
+ use Razor2::Signature::Ephemeral;
+ use Razor2::Engine::VR8;
+diff -urN razor-agents-2.85.orig/lib/Razor2/Signature/Ephemeral.pm razor-agents-2.85/lib/Razor2/Signature/Ephemeral.pm
+--- razor-agents-2.85.orig/lib/Razor2/Signature/Ephemeral.pm	2003-03-03 18:09:50.000000000 -0500
++++ razor-agents-2.85/lib/Razor2/Signature/Ephemeral.pm	2009-11-01 13:45:08.125369192 -0500
+@@ -2,9 +2,13 @@
+ 
+ package Razor2::Signature::Ephemeral;
+ use strict;
+-use Digest::SHA1;
+ use Data::Dumper;
+ 
++BEGIN {
++  eval  { require Digest::SHA;  import Digest::SHA  qw(sha1_hex); 1 }
++  or do { require Digest::SHA1; import Digest::SHA1 qw(sha1_hex) }
++}
++
+ sub new {
+ 
+     my ($class, %args) = @_;
+@@ -86,16 +90,12 @@
+     }
+ 
+     my $digest;
+-    my $ctx = Digest::SHA1->new;
+ 
+     if ($seclength > 128) { 
+-        $ctx->add($section1);
+-        $ctx->add($section2);
+-        $digest = $ctx->hexdigest;
++        $digest = sha1_hex($section1, $section2);
+     } else { 
+         debug("Sections too small... reverting back to orginal content.");
+-        $ctx->add($content);
+-        $digest = $ctx->hexdigest;
++        $digest = sha1_hex($content);
+     }
+ 
+     debug("Computed e-hash is $digest");
+diff -urN razor-agents-2.85.orig/lib/Razor2/Signature/Whiplash.pm razor-agents-2.85/lib/Razor2/Signature/Whiplash.pm
+--- razor-agents-2.85.orig/lib/Razor2/Signature/Whiplash.pm	2007-05-08 18:22:36.000000000 -0400
++++ razor-agents-2.85/lib/Razor2/Signature/Whiplash.pm	2009-11-01 13:45:08.124368017 -0500
+@@ -7,7 +7,10 @@
+ 
+ package Razor2::Signature::Whiplash; 
+ 
+-use Digest::SHA1;
++BEGIN {
++  eval  { require Digest::SHA;  import Digest::SHA  qw(sha1_hex); 1 }
++  or do { require Digest::SHA1; import Digest::SHA1 qw(sha1_hex) }
++}
+ 
+ sub new { 
+ 
+@@ -683,13 +686,8 @@
+         # the value of length to the nearest multiple of ``length_error''.
+         # Take the first 20 hex chars from SHA1 and call it the signature.
+ 
+-        my $sha1 = Digest::SHA1->new();
+-
+-        $sha1->add($host);
+-        $sig = substr $sha1->hexdigest, 0, 12;
+-
+-        $sha1->add($corrected_length);
+-        $sig .= substr $sha1->hexdigest, 0, 4;
++        $sig = substr sha1_hex($host), 0, 12;
++        $sig .= substr sha1_hex($corrected_length), 0, 4;
+ 
+         push @sigs, $sig;
+         $sig_meta{$sig} = [$host, $corrected_length];
+diff -urN razor-agents-2.85.orig/lib/Razor2/String.pm razor-agents-2.85/lib/Razor2/String.pm
+--- razor-agents-2.85.orig/lib/Razor2/String.pm	2005-06-13 17:09:59.000000000 -0400
++++ razor-agents-2.85/lib/Razor2/String.pm	2009-11-01 13:45:08.123368518 -0500
+@@ -1,11 +1,15 @@
+ # $Id: razor-2.85-use-sha-not-sha1.patch,v 1.1 2010/03/25 00:39:36 robbat2 Exp $
+ package Razor2::String;
+ 
+-use Digest::SHA1 qw(sha1_hex);
+ use URI::Escape;
+ use Razor2::Preproc::enBase64;
+ use Data::Dumper;
+ 
++BEGIN {
++  eval  { require Digest::SHA;  import Digest::SHA  qw(sha1_hex); 1 }
++  or do { require Digest::SHA1; import Digest::SHA1 qw(sha1_hex) }
++}
++
+ #use MIME::Parser;
+ 
+ require Exporter;
+@@ -69,15 +73,8 @@
+     return unless $text && $iv1 && $iv2;
+     die "no ref's allowed" if ref($text);
+ 
+-    my $ctx = Digest::SHA1->new;
+-    $ctx->add($iv2);
+-    $ctx->add($text);
+-    my $digest = $ctx->hexdigest;
+-
+-    $ctx = Digest::SHA1->new;
+-    $ctx->add($iv1);
+-    $ctx->add($digest);
+-    $digest = $ctx->hexdigest;
++    my $digest = sha1_hex($iv2, $text);
++    $digest = sha1_hex($iv1, $digest);
+ 
+     return (hextobase64($digest), $digest);
+ }
diff --git a/mail-filter/razor/razor-2.85.ebuild b/mail-filter/razor/razor-2.85.ebuild
new file mode 100644
index 000000000000..a59abf916540
--- /dev/null
+++ b/mail-filter/razor/razor-2.85.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/razor/razor-2.85.ebuild,v 1.1 2010/03/25 00:39:36 robbat2 Exp $
+
+inherit perl-app
+
+DESCRIPTION="Vipul's Razor is a distributed, collaborative spam detection and filtering network"
+HOMEPAGE="http://razor.sourceforge.net/"
+SRC_URI="mirror://sourceforge/razor/razor-agents-${PV}.tar.bz2"
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+
+RDEPEND="dev-perl/Net-DNS
+	virtual/perl-net-ping
+	virtual/perl-Time-HiRes
+	|| ( virtual/perl-Digest-SHA dev-perl/Digest-SHA1 )
+	dev-perl/URI
+	dev-perl/Digest-Nilsimsa"
+
+PATCHES=( "${FILESDIR}/${PN}-2.85-use-sha-not-sha1.patch" )
+
+S=${WORKDIR}/razor-agents-${PV}
+
+pkg_postinst() {
+	elog
+	elog "Run 'razor-admin -create' to create a default config file in your"
+	elog "home directory under /home/user/.razor. (Remember to change user to"
+	elog "your username from root before running razor-admin)"
+	elog
+	elog "Razor v2 requires reporters to be registered so their reputations can"
+	elog "be computed over time and they can participate in the revocation"
+	elog "mechanism. Registration is done with razor-admin -register. It has to be"
+	elog "manually invoked in either of the following ways:"
+	elog
+	elog "To register user foo with 's1kr3t' as password: "
+	elog
+	elog "razor-admin -register -user=foo -pass=s1kr3t"
+	elog
+	elog "To register with an email address and have the password assigned:"
+	elog
+	elog "razor-admin -register -user=foo@bar.com      "
+	elog
+	elog "To have both (random) username and password assgined: "
+	elog
+	elog "razor-admin -register "
+	elog
+	elog "razor-admin -register negotiates a registration with the Nomination Server"
+	elog "and writes the identity information in"
+	elog "/home/user/.razor/identity-username, or /etc/razor/identity-username"
+	elog "when invoked as root."
+	elog
+	elog "You can edit razor-agent.conf to change the defaults. Config options"
+	elog "and their values are defined in the razor-agent.conf(5) manpage."
+	elog
+	elog "The next step is to integrate razor-check, razor-report and"
+	elog "razor-revoke in your mail system. If you are running Razor v1, the"
+	elog "change will be transparent, new versions of razor agents will overwrite"
+	elog "the old ones. You would still need to plugin razor-revoke in your MUA,"
+	elog "since it's a new addition in Razor v2. If you are not running Razor v1,"
+	elog "refer to manpages of razor-check(1), razor-report(1), and"
+	elog "razor-revoke(1) for integration instructions."
+	elog
+}