From ecd7f40b0ad9f7228a032b3f54154756108c0057 Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Sun, 10 Aug 2014 10:03:46 +0000
Subject: [PATCH] Ouch... fuck cvs

---
 usr.sbin/pkg_add/OpenBSD/Ustar.pm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/usr.sbin/pkg_add/OpenBSD/Ustar.pm b/usr.sbin/pkg_add/OpenBSD/Ustar.pm
index a0ab18c070b..bc8df81cfd9 100644
--- a/usr.sbin/pkg_add/OpenBSD/Ustar.pm
+++ b/usr.sbin/pkg_add/OpenBSD/Ustar.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: Ustar.pm,v 1.81 2014/08/10 10:01:03 espie Exp $
+# $OpenBSD: Ustar.pm,v 1.82 2014/08/10 10:03:46 espie Exp $
 #
 # Copyright (c) 2002-2014 Marc Espie <espie@openbsd.org>
 #
@@ -313,7 +313,7 @@ sub pack_header
 		    sprintf("%07o", $entry->{uid}),
 		    sprintf("%07o", $entry->{gid}),
 		    sprintf("%011o", $size),
-		    sprintf("%011o", $entry->{mtime}),
+		    sprintf("%011o", $entry->{mtime} // 0),
 		    $cksum,
 		    $type,
 		    $linkname,
@@ -488,8 +488,10 @@ package OpenBSD::Ustar::Object;
 sub recheck_owner
 {
 	my $entry = shift;
-	$entry->{uid} //= $OpenBSD: Ustar.pm,v 1.81 2014/08/10 10:01:03 espie Exp $entry->{uname});
-	$entry->{gid} //= $OpenBSD: Ustar.pm,v 1.81 2014/08/10 10:01:03 espie Exp $entry->{gname});
+	$entry->{uid} //= $OpenBSD::Ustar::uidcache
+	    ->lookup($entry->{uname});
+	$entry->{gid} //= $OpenBSD::Ustar::gidcache
+	    ->lookup($entry->{gname});
 }
 
 sub fatal
-- 
2.20.1