@md5 annotations died at the end of 2008, so it's reasonable to scrape the

code now.

2 files changed, 3 insertions, 58 deletions

diff --git a/usr.sbin/pkg_add/OpenBSD/PackingElement.pm b/usr.sbin/pkg_add/OpenBSD/PackingElement.pm
index 5da3a022702..56aa10fa2fa 100644
--- a/usr.sbin/pkg_add/OpenBSD/PackingElement.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PackingElement.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: PackingElement.pm,v 1.227 2014/01/11 11:51:01 espie Exp $
+# $OpenBSD: PackingElement.pm,v 1.228 2014/01/31 15:48:44 espie Exp $
 #
 # Copyright (c) 2003-2014 Marc Espie <espie@openbsd.org>
 #
@@ -711,21 +711,6 @@ sub keyword() { 'comment' }
 
 sub category() { 'cvstags'}
 
-package OpenBSD::PackingElement::md5;
-our @ISA=qw(OpenBSD::PackingElement::Annotation);
-
-__PACKAGE__->register_with_factory('md5');
-
-sub add
-{
-	my ($class, $plist, $args) = @_;
-
-	require OpenBSD::md5;
-
-	$plist->{state}->{lastchecksummable}->add_digest(OpenBSD::md5->fromstring($args));
-	return;
-}
-
 package OpenBSD::PackingElement::sha;
 our @ISA=qw(OpenBSD::PackingElement::Annotation);
 
@@ -1839,7 +1824,7 @@ sub register_old_keyword
 }
 
 for my $k (qw(src display mtree ignore_inst dirrm pkgcfl pkgdep newdepend
-    libdepend endfake ignore vendor incompatibility)) {
+    libdepend endfake ignore vendor incompatibility md5)) {
 	__PACKAGE__->register_old_keyword($k);
 }
 
diff --git a/usr.sbin/pkg_add/OpenBSD/md5.pm b/usr.sbin/pkg_add/OpenBSD/md5.pm
index 8d3405bc88c..3c9d1bc3e25 100644
--- a/usr.sbin/pkg_add/OpenBSD/md5.pm
+++ b/usr.sbin/pkg_add/OpenBSD/md5.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: md5.pm,v 1.15 2011/06/27 12:14:25 espie Exp $
+# $OpenBSD: md5.pm,v 1.16 2014/01/31 15:48:44 espie Exp $
 #
 # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org>
 #
@@ -74,46 +74,6 @@ sub equals
 	return ref($a) eq ref($b) && $$a eq $$b;
 }
 
-package OpenBSD::md5;
-our @ISA=(qw(OpenBSD::digest));
-
-sub fromfile
-{
-	my $fname = shift;
-	return OpenBSD::md5->digest_file($fname);
-}
-
-sub fromfh
-{
-	my $file = shift;
-	return OpenBSD::md5->digest_fh($file);
-}
-
-sub algo
-{
-	my $self = shift;
-	require Digest::MD5;
-
-	return Digest::MD5->new;
-}
-
-sub stringize
-{
-	my $self = shift;
-	return unpack('H*', $$self);
-}
-
-sub unstringize
-{
-	my ($class, $arg) = @_;
-	return pack('H*', $arg);
-}
-
-sub keyword
-{
-	return "md5";
-}
-
 package OpenBSD::sha;
 our @ISA=(qw(OpenBSD::digest));