From 5cb7aebf4211294fd2891b0bc45c383ab7fd66af Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Thu, 26 May 2022 06:53:38 +0000
Subject: [PATCH] first step in simplifying the always-update case: tweak
 @option always-update to allow parsing @option always-update
 <hash_value_for_the_whole_plist>

once this is safely in snapshots, we can generate it
directly within PkgCreate.pm, compare it directly in
Signature.pm and get rid of the whole special case
of having to keep the whole plist around
---
 usr.sbin/pkg_add/OpenBSD/PackingElement.pm | 32 +++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/usr.sbin/pkg_add/OpenBSD/PackingElement.pm b/usr.sbin/pkg_add/OpenBSD/PackingElement.pm
index 3a3dcda06d5..98264c5c117 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.279 2022/04/01 10:14:17 sthen Exp $
+# $OpenBSD: PackingElement.pm,v 1.280 2022/05/26 06:53:38 espie Exp $
 #
 # Copyright (c) 2003-2014 Marc Espie <espie@openbsd.org>
 #
@@ -864,6 +864,8 @@ sub new
 		return OpenBSD::PackingElement::ManualInstallation->new;
 	} elsif ($args eq 'firmware') {
 		return OpenBSD::PackingElement::Firmware->new;
+	} elsif ($args =~ m/always-update\s+(\S+)/) {
+		return OpenBSD::PackingElement::AlwaysUpdate->new_with_hash($1);
 	} elsif ($args eq 'always-update') {
 		return OpenBSD::PackingElement::AlwaysUpdate->new;
 	} elsif ($args eq 'is-branch') {
@@ -915,6 +917,34 @@ sub category()
 	'always-update';
 }
 
+sub stringize
+{
+	my $self = shift;
+	my @l = ($self->category);
+	if (defined $self->{hash}) {
+		push(@l, $self->{hash});
+	}
+	return join(' ', @l);
+}
+
+sub hash_plist
+{
+	my ($self, $plist) = @_;
+	delete $self->{hash};
+	my $content;
+	open my $fh, '>', \$content;
+	$plist->write($fh);
+	close $fh;
+	my $digest = Digest::SHA::sha256_base64($content);
+	$self->{hash} = $digest;
+}
+
+sub new_with_hash
+{
+	my ($class, $hash) = @_;
+	bless { hash => $hash}, $class;
+}
+
 package OpenBSD::PackingElement::IsBranch;
 our @ISA=qw(OpenBSD::PackingElement::UniqueOption);
 
-- 
2.20.1