[Bug 240177] sysutils/iocage: [patch] Fix `iocage upgrade` (to 11.3-RELEASE and future 12.x releases)

[bugzilla-noreply at freebsd.org]

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=240177

            Bug ID: 240177
           Summary: sysutils/iocage: [patch] Fix `iocage upgrade` (to
                    11.3-RELEASE and future 12.x releases)
           Product: Ports & Packages
           Version: Latest
          Hardware: Any
               URL: https://github.com/iocage/iocage/pull/1027
                OS: Any
            Status: New
          Severity: Affects Some People
          Priority: ---
         Component: Individual Port(s)
          Assignee: araujo at FreeBSD.org
          Reporter: grembo at FreeBSD.org
          Assignee: araujo at FreeBSD.org
             Flags: maintainer-feedback?(araujo at FreeBSD.org)
             Flags: merge-quarterly?

Created attachment 206984
  --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=206984&action=edit
Fix iocage upgrade - patch

This addresses a couple problems that prevented `iocage upgrade' from working
properly.

1. Bug #229346 changed freebsd-update to exit with status code 1 in case of no
more updates are available. This fixed ezjail and iocell, but broke iocage. As
a result, iocage upgrade -r 11.3-RELEASE would not finish updating iocage jail
config and exit with an error message. This happened first on 11.3-RELEASE and
will also happen on 12.1-RELEASE

2. When updating a jail to 11.x-RELEASE on a 12.x machine, merging config files
will create empty files (which then all end up as merge errors). As a result,
all configuration is lost (or the attentive sysadmin exits the process in time
and fixes things manually). This is caused by the fact that rcs was removed
from base in 12.x. Its freebsd-update uses diff3 instead. As iocage always
fetches the freebsd-update script of the target release, it gets one from 11.x
which will break. This was fixed by adding rcs57 as a dependency of the package
(based on the existence of "merge").

3. Upgrading multiple jails (iocage upgrade ALL -r <release>) would break,
because of a workaround (setting UNAME_r in the environment) that shouldn't be
required any more (iocage 1.2RC already has it removed).

I also:
- bumped revision
- moved NO_ARCH to pacify portlint

See also:
https://github.com/iocage/iocage/pull/1027

-- 
You are receiving this mail because:
You are the assignee for the bug.