|
From: Daniel M. <mar...@gm...> - 2023-04-11 21:41:32
|
Never mind; I started cherry picking locally on the 3.1 branch and recalled that managing / testing yet another branch is too much of an overhead. The risk of inadvertently breaking something while cherry picking might be even higher. The one truly risky change, I think, is the iniparser 3.x to 4.x version bump, which turned out pretty messily with a bunch of regressions. So perhaps one idea would be to revert those changes, tag the release, and then restore them in preparation for a future release (3.2.0?) Best, Daniel On Tue, Apr 11, 2023 at 11:28 AM Daniel Markstedt <mar...@gm...> wrote: > Thanks Ralph. I put up three additional small PRs to: > - fix a compiler warning > - update a manpage > - update NEWS > > Now one thing I wanted to throw out there for discussion: > The changelog has grown quite huge, with a number of improvements that > should arguably not be in a patch release. > > > https://github.com/Netatalk/netatalk/blob/adfb74868f9aca6c509ac59432e866a3906daa7c/NEWS > > Can a case be made for cherry-picking a subset of the changelog into > branch-netatalk-3-1 at this point? > Namely: CVEs, clear-cut bugfixes, documentation corrections... > > With such a large changeset, and the lack of UT / test automation, the > risk of breaking something for one or more downstream distro is > significant, I think. > > Thoughts? > > Daniel > > On Tue, Apr 11, 2023 at 3:06 AM Ralph Boehme <sl...@sa...> wrote: > >> Hi Daniel, >> >> I've just merged everything that was there. >> >> Let me know when to make a release. >> >> -slow >> >> On 4/9/23 00:05, Daniel Markstedt wrote: >> > Hi Ralph, >> > >> > I have two small PRs lined up that I think should round out the next >> 3.1 >> > release. >> > >> > https://github.com/Netatalk/netatalk/pull/280 >> > <https://github.com/Netatalk/netatalk/pull/280> >> > https://github.com/Netatalk/netatalk/pull/292 >> > <https://github.com/Netatalk/netatalk/pull/292> >> > >> > Plus updating NEWS >> > >> > https://github.com/Netatalk/netatalk/pull/293 >> > <https://github.com/Netatalk/netatalk/pull/293> >> > >> > My only worry is that I can't for the life of me get Spotlight to work, >> > so I can't validate the changes that we made there. >> > >> > Other than that my cursory testing reveals no issues. >> > >> > Thanks, >> > Daniel >> > >> > On Tue, Apr 4, 2023 at 11:35 PM Daniel Markstedt <mar...@gm... >> > <mailto:mar...@gm...>> wrote: >> > >> > Ralph, >> > >> > The generated man pages PR is here: >> > https://github.com/Netatalk/netatalk/pull/268 >> > <https://github.com/Netatalk/netatalk/pull/268> >> > >> > >> > On Mon, Apr 3, 2023 at 9:11 AM Daniel Markstedt < >> mar...@gm... >> > <mailto:mar...@gm...>> wrote: >> > >> > Sounds good! Please note that we need to regenerate the man >> > pages before the release. >> > I can run the docbook job and submit a PR once the other PRs >> > have been merged. >> > >> > On Mon, Apr 3, 2023 at 8:51 AM Ralph Boehme <sl...@sa... >> > <mailto:sl...@sa...>> wrote: >> > >> > On 4/3/23 17:37, Daniel Markstedt wrote: >> > > Of course! Whenever you have an hour to spare, please >> > review my 18 >> > > pending PRs <https://github.com/Netatalk/netatalk/pulls >> > <https://github.com/Netatalk/netatalk/pulls>>. :) >> > I'll take a look tomorrow morning! >> > >> > -slow >> > >> > -- >> > Ralph Boehme, Samba Team https://samba.org/ < >> https://samba.org/> >> > SerNet Samba Team Lead https://sernet.de/en/team-samba >> > <https://sernet.de/en/team-samba> >> > SAMBA+ packages https://samba.plus/ <https://samba.plus/> >> > >> > |