Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mtree: Sync with upstream #918

Closed
wants to merge 20 commits into from
Closed

Conversation

jlduran
Copy link
Contributor

@jlduran jlduran commented Dec 6, 2023

It provides a commit-by-commit history, with some commits done only for the metadata (RCSID) changes.
Added here for convenience.
Differential review: D42926

Merging remarks:

We had this problem fixed in 1c32456.
This commit exists purely for metadata changes.

Obtained from:	NetBSD/src@24a21ee
Merging remarks:

This commit exists purely for metadata changes.

Obtained from:	NetBSD/src@91b18a3
With same hash value in directory and leaf.

Obtained from:	NetBSD/src@e857ec7
Merging remarks:

We had this problem fixed in 1c32456.
This commit exists purely for metadata changes.

Obtained from:	NetBSD/src@ab39b7f
We only want to return the structure member if the result is not NULL.

Heads up by Sascha Wildner @ DragonFly BSD.

Merging remarks:

We had this problem fixed in 09c9ed3.
This commit exists purely for metadata changes.

Obtained from:	NetBSD/src@05de7c4
[Upstream] PR 53769 from silas.

Obtained from:	NetBSD/src@f71c1f4
Merging remarks:

Originally an en dash was used, the intention was to use \(en, however
an em dash was ultimately committed.

Per our manual of style, we prefer an em dash in this situation.  No
upstream fix will be submitted.

Obtained from:	NetBSD/src@40e56fc
As the docs did not match the source.

Obtained from:	NetBSD/src@0a7bdda
(eg when mtree is called by MAKEDEV) and the stat buffer contains
information about the original device before checking/setting the
owner/group/mode of the new device file.

Obtained from:	NetBSD/src@353a61b
Didn't touch the section that describes the spec file format.  We have
the format documented here, in mtree(8), and we also have the format
description in mtree(5) that comes from libarchive.

Obtained from:	NetBSD/src@563f063
Upstream PR bin/57735.

Merging remarks:

Originally obtained from 4f4b548.
This commit exists purely for metadata changes.

Obtained from:	NetBSD/src@6a63b82
@emaste
Copy link
Member

emaste commented Dec 6, 2023

We'll presumably want to bring this in via a vendor import, and merge to contrib/mtree.
See e.g. 6554780 in vendor/NetBSD/mtree

@jlduran
Copy link
Contributor Author

jlduran commented Dec 6, 2023

This should facilitate the vendor import of vendor/NetBSD/mtree.
cc/ @brooksdavis

@jlduran
Copy link
Contributor Author

jlduran commented Dec 6, 2023

We'll presumably want to bring this in via a vendor import, and merge to contrib/mtree. See e.g. 6554780 in vendor/NetBSD/mtree

You beat me to it!

Upstream PR bin/57735.

Merging remarks:

Originally obtained from da232c0.
This commit exists purely for metadata changes.

Obtained from:	NetBSD/src@7580daf
Upstream PR bin/57735.

Merging remarks:

This commit exists purely for metadata changes.

Originally obtained from 2dfa4b6.
While it should not be necessary to set errno = 0 before an fts_read(),
our current differences between upstream (OpenBSD), and more importantly
in this case NetBSD, have made us keep it.  In order to remove it, we
should sync our current fts code, and desirably, add tests for this
corner cases before reverting 2dfa4b6.
Until that happens we have opted to keep it out of an abundance of
caution.

Obtained from:	NetBSD/src@0d9ef1f
Upstream PR bin/57735.

Merging remarks:

Originally obtained from 4f4b548.
This commit exists purely for metadata changes.

Obtained from:	NetBSD/src@20b493d
@jlduran
Copy link
Contributor Author

jlduran commented Dec 7, 2023

Note to self:
It will likely land as two separate commits:

  1. Vendor import of vendor/NetBSD/mtree.
  2. Vendor import of vendor/NetBSD/tests.

At any rate, FreeBSD's local changes have already been upstreamed.

@jlduran jlduran closed this Dec 7, 2023
@jlduran jlduran deleted the merge-mtree-upstream branch January 4, 2024 08:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants