mergesiteset automates upgrades of custom siteXY.tgz sets to a
different release of OpenBSD.

Modifications made to base system files are merged using merge(1).
Merge conflicts can be resolved in a text editor or with sdiff(1),
in a way similar to sysmerge(8).

Required OpenBSD installation sets will be downloaded and verified
automatically. Root privileges are not required. Regardless, file
permissions and ownership are preserved in the generated archive.

I have been using this script for some time now when upgrading
systems which carry custom changes in files that are part of the
base system.
It works a bit like sysmerge(8), but unlike sysmerge it can be used
to prepare files destined for a different OpenBSD machine.

Since this script might help others who have local changes applied
across multiple systems, I propose to add this script to the ports tree.
I am hosting a public Git repository in case others want to help and
make submit improvements.

See https://chirpysoft.be/mergesiteset/ for more information.

ok to import?

• mergesiteset.tgz (1K)