From nobody Mon Apr 10 13:38:09 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pw95t2f9zz44GWQ; Mon, 10 Apr 2023 13:38:10 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pw95t0SbHz4Pcd; Mon, 10 Apr 2023 13:38:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681133890; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YHiysuGW2Ui55Ltkr3cMfGtsQhkNA9mIt8ExpciKM/o=; b=fTnIHm/fw2/en4zF286il34z7mKc7K7m/S3+lDGHAwt9Ts67CzftAKVyeRn+NMqbtaoO8P /d47cTXfXicw94dQKWinSJ/IJ6MhwTp0trHdKhOAa6LvyKxgpCCjkDitK/n4E+hgMK9Bb9 x6qaJ1ZcMW8deaUON3+ZYiSLoQExP+djOjmTPxUnpWwj4wUzLGWnanjwb5qz0RJUOREm03 thxnva/kEOW9XTW5yRU+GBjDKSJhRBrb07x+qIV4+gGUA8C6si3Va1s4eZvJC2dNXOhY73 WTXg310u/GF3DWotVd1NeGQNLXT/h9WmcmhnG+k12vsFWjiqza7ZPi8OPc6BmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681133890; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YHiysuGW2Ui55Ltkr3cMfGtsQhkNA9mIt8ExpciKM/o=; b=d3cjdZA1W/DKGJYJUYwa0XyLTM21IzJoWIcEM7fjx9/HYDYSUfNFe4RUEsztyhfU7lqUyt y0mvhbDCNsPYClGrGDGvJtIqwagSHFCWMAjpOfKJuFRePrl5xDcYmhW2vl3XMBHhWHll7S rjVcTpvORxYMPRlBMBtJsppI3OaJ43hKba/CJe8daCGrGu6ISGYI95EDv7YlCzhaVVh0R2 0AYujJJwUMM6kJybxHc76Bv7JqlK4+Evm3HEHsoTB88WDCJLWkz/FRB9ZfZlzmELp9Gnv5 mjV6SKAbBSoSx3g55xfM5fpFoqmiSjNeFknvvWPEb4F3y7TNdWMUxebum5KGAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681133890; a=rsa-sha256; cv=none; b=nawZLIWaJdysnKAnHPph2AFQQi2LBXF3RqK+pcrlAT3CYYvzZAMcX18b/XNOnQJRsnkvJJ 3QCFBsHqkbcmX1opxbVuyq9lvQ+spurOKXl7Z1nvvwqrx49gy6401BiHcfFIqI02VvbgN/ 42WnOuPs64VxHImXJ3MK5KdEXmx+ykfdvOlRxTWqRBA5Fbl+w692f4ZK7FaDGYnLIyb6UH vGuunq4FgTVeRozcnTHKSXvTqCmgTPaKmD7SJeN5Zs0R42npmqUEyiaG+J5Mso3ON8gERU 8UFPreNpLBNDVbt/xaaHF/v/UrStToSUO7Yi2BMsJ1+6Aq4d2LWykY++d31I7A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pw95s6VVvzs7g; Mon, 10 Apr 2023 13:38:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33ADc9V7062819; Mon, 10 Apr 2023 13:38:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33ADc9ts062818; Mon, 10 Apr 2023 13:38:09 GMT (envelope-from git) Date: Mon, 10 Apr 2023 13:38:09 GMT Message-Id: <202304101338.33ADc9ts062818@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 62f8e141920c - stable/13 - makefs: correct iso9660 Rock Ridge NM values List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 62f8e141920c555f4a80038062ba8d0edc3b79c5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=62f8e141920c555f4a80038062ba8d0edc3b79c5 commit 62f8e141920c555f4a80038062ba8d0edc3b79c5 Author: Ed Maste AuthorDate: 2023-03-23 12:35:34 +0000 Commit: Ed Maste CommitDate: 2023-04-10 13:37:40 +0000 makefs: correct iso9660 Rock Ridge NM values These are not actually used by makefs (yet), but ought to match the spec. See RRIP 4.1.4 Description of the "NM" System Use Entry for details. PR: 203531 Sponsored by: The FreeBSD Foundation (cherry picked from commit c3ec19359e05c3b609e461896aa6ab4d6ad8121f) --- usr.sbin/makefs/cd9660/iso9660_rrip.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/makefs/cd9660/iso9660_rrip.h b/usr.sbin/makefs/cd9660/iso9660_rrip.h index ef35405c62e6..72323ab695e1 100644 --- a/usr.sbin/makefs/cd9660/iso9660_rrip.h +++ b/usr.sbin/makefs/cd9660/iso9660_rrip.h @@ -60,9 +60,9 @@ #define TF_EXPIRATION 0x20 #define TF_EFFECTIVE 0x40 #define TF_LONG_FORM 0x80 -#define NM_CONTINUE 0x80 -#define NM_CURRENT 0x100 -#define NM_PARENT 0x200 +#define NM_CONTINUE 0x01 +#define NM_CURRENT 0x02 +#define NM_PARENT 0x04 #define SUSP_LOC_ENTRY 0x01