From owner-freebsd-ports-bugs@freebsd.org Wed Aug 28 17:42:52 2019 Return-Path: Delivered-To: freebsd-ports-bugs@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3A11AE2A9E for ; Wed, 28 Aug 2019 17:42:52 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 46JY3w0r3zz4VGF for ; Wed, 28 Aug 2019 17:42:52 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 1CAEDE2A9D; Wed, 28 Aug 2019 17:42:52 +0000 (UTC) Delivered-To: ports-bugs@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1C71CE2A9C for ; Wed, 28 Aug 2019 17:42:52 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46JY3v73tzz4VGD for ; Wed, 28 Aug 2019 17:42:51 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2610:1c1:1:606c::50:1d]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BAFE0AF12 for ; Wed, 28 Aug 2019 17:42:51 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org ([127.0.1.5]) by kenobi.freebsd.org (8.15.2/8.15.2) with ESMTP id x7SHgpku046243 for ; Wed, 28 Aug 2019 17:42:51 GMT (envelope-from bugzilla-noreply@freebsd.org) Received: (from www@localhost) by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id x7SHgplM046242 for ports-bugs@FreeBSD.org; Wed, 28 Aug 2019 17:42:51 GMT (envelope-from bugzilla-noreply@freebsd.org) X-Authentication-Warning: kenobi.freebsd.org: www set sender to bugzilla-noreply@freebsd.org using -f From: bugzilla-noreply@freebsd.org To: ports-bugs@FreeBSD.org Subject: [Bug 240177] sysutils/iocage: [patch] Fix `iocage upgrade` (to 11.3-RELEASE and future 12.x releases) Date: Wed, 28 Aug 2019 17:42:51 +0000 X-Bugzilla-Reason: AssignedTo X-Bugzilla-Type: new X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Ports & Packages X-Bugzilla-Component: Individual Port(s) X-Bugzilla-Version: Latest X-Bugzilla-Keywords: X-Bugzilla-Severity: Affects Some People X-Bugzilla-Who: grembo@FreeBSD.org X-Bugzilla-Status: New X-Bugzilla-Resolution: X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: araujo@FreeBSD.org X-Bugzilla-Flags: maintainer-feedback? merge-quarterly? X-Bugzilla-Changed-Fields: bug_id short_desc product version rep_platform bug_file_loc op_sys bug_status bug_severity priority component assigned_to reporter flagtypes.name attachments.created Message-ID: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated MIME-Version: 1.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Aug 2019 17:42:52 -0000 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D240177 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@FreeBSD.org Reporter: grembo@FreeBSD.org Assignee: araujo@FreeBSD.org Flags: maintainer-feedback?(araujo@FreeBSD.org) Flags: merge-quarterly? Created attachment 206984 --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=3D206984&action= =3Dedit Fix iocage upgrade - patch This addresses a couple problems that prevented `iocage upgrade' from worki= ng 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 j= ail 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 f= iles will create empty files (which then all end up as merge errors). As a resul= t, all configuration is lost (or the attentive sysadmin exits the process in t= ime 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 1= 1.x which will break. This was fixed by adding rcs57 as a dependency of the pac= kage (based on the existence of "merge"). 3. Upgrading multiple jails (iocage upgrade ALL -r ) 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 --=20 You are receiving this mail because: You are the assignee for the bug.=