Created attachment 208927 [details] diffs to update sanoid and sanoid-devel to current versions The attached patch updates the sanoid port to v2.0.3 and the sanoid-devel port to commit 45d0898. I'm the maintainer, but I'm new at this, for what it's worth. Feedback encouraged.
*** Bug 241770 has been marked as a duplicate of this bug. ***
*** Bug 241771 has been marked as a duplicate of this bug. ***
I just composed a patch for 2.0.3 and found this PR when composing my own.
The patch files to apply cleanly. I can see what you want to do. I suspect it might not have been created correctly. This should work correctly: cd /usr/ports svn di sysutils/sanoid-devel sysutils/sanoid > /tmp/patch-sanoid Then attach the file to the PR If you still have the files sitting around and you'd like to try again, please do so. Otherwise, I have enough to do this commit.
(In reply to Dan Langille from comment #4) *patch fails to apply cleanly...
Created attachment 209323 [details] diff to update sanoid and sanoid-devel Second try at at this patch. It applies cleanly for me: ``` hartzell@foo:/usr/ports % sudo patch -C < ~/tmp/sanoid.patch Password: Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |--- sysutils/sanoid-devel/Makefile |+++ sysutils/sanoid-devel/Makefile -------------------------- Patching file sysutils/sanoid-devel/Makefile using Plan A... Hunk #1 succeeded at 1 with fuzz 1. Hunk #2 succeeded at 22. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- sysutils/sanoid-devel/distinfo |+++ sysutils/sanoid-devel/distinfo -------------------------- Patching file sysutils/sanoid-devel/distinfo using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- sysutils/sanoid/Makefile |+++ sysutils/sanoid/Makefile -------------------------- Patching file sysutils/sanoid/Makefile using Plan A... Hunk #1 succeeded at 2. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- sysutils/sanoid/distinfo |+++ sysutils/sanoid/distinfo -------------------------- Patching file sysutils/sanoid/distinfo using Plan A... Hunk #1 succeeded at 1. done hartzell@foo:/usr/ports % ```
That applies cleanly here.
excellent!
A commit references this bug: Author: dvl Date: Thu Nov 21 18:04:02 UTC 2019 New revision: 518105 URL: https://svnweb.freebsd.org/changeset/ports/518105 Log: Update to latest versions PR: 241769 Submitted by: hartzell@alerce.com Changes: head/sysutils/sanoid/Makefile head/sysutils/sanoid/distinfo head/sysutils/sanoid-devel/Makefile head/sysutils/sanoid-devel/distinfo
Thank you. Much appreciated. :)