Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 01 Aug 2017 06:28:33 +0000
From:      bugzilla-noreply@freebsd.org
To:        freebsd-ports-bugs@FreeBSD.org
Subject:   [Bug 220926] sysutils/linux-crashplan: Update to 4.8.3
Message-ID:  <bug-220926-13-lv88CYNoNR@https.bugs.freebsd.org/bugzilla/>
In-Reply-To: <bug-220926-13@https.bugs.freebsd.org/bugzilla/>
References:  <bug-220926-13@https.bugs.freebsd.org/bugzilla/>

next in thread | previous in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D220926

--- Comment #6 from Dan Moutal <dan@moutal.ca> ---
Making some progress, but still having issues
Converting the line ending to UNIX-style helps but the patch only partially
applies

$ sudo patch -i ../crashplan.txt
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/sysutils/linux-crashplan/Makefile
b/sysutils/linux-crashplan/Makefile
|index 8284e8946395..f81c7b192ab3 100644
|--- a/sysutils/linux-crashplan/Makefile
|+++ b/sysutils/linux-crashplan/Makefile
--------------------------
Patching file Makefile using Plan A...
Hunk #1 failed at 2.
Hunk #2 failed at 35.
2 out of 2 hunks failed--saving rejects to Makefile.rej
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/sysutils/linux-crashplan/distinfo
b/sysutils/linux-crashplan/distinfo
|index c7486cb3b96a..7dcd48bc95bc 100644
|--- a/sysutils/linux-crashplan/distinfo
|+++ b/sysutils/linux-crashplan/distinfo
--------------------------
Patching file 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:
--------------------------
|diff --git a/sysutils/linux-crashplan/pkg-plist
b/sysutils/linux-crashplan/pkg-plist
|index 9d8382e78772..4c81d8c7e95b 100644
|--- a/sysutils/linux-crashplan/pkg-plist
|+++ b/sysutils/linux-crashplan/pkg-plist
--------------------------
Patching file pkg-plist using Plan A...
Hunk #1 succeeded at 1.
Hunk #2 succeeded at 32.
Hunk #3 succeeded at 71.
Hunk #4 succeeded at 133.
done




If other people are having better luck then likely the issue is with my lac=
k of
patching ability rather than a problem with the patch. More importantly if =
the
patched port works correctly we probably shouldn't let my difficulty in
patching stop this patch from moving forward

--=20
You are receiving this mail because:
You are the assignee for the bug.=



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-220926-13-lv88CYNoNR>