Date: Sun, 05 Jun 2016 13:02:53 +0000 From: bugzilla-noreply@freebsd.org To: freebsd-ports-bugs@FreeBSD.org Subject: [Bug 209929] sysutils/qjail: Update to 4.8 (bugfixes) Message-ID: <bug-209929-13-Gf32CKwJkF@https.bugs.freebsd.org/bugzilla/> In-Reply-To: <bug-209929-13@https.bugs.freebsd.org/bugzilla/> References: <bug-209929-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=3D209929 --- Comment #3 from Vladimir Krstulja <vlad-fbsd@acheronmedia.com> --- Joe, the patch cannot be applied against pkg-descr because it fails. The pa= tch command can't apply it: Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruN qjail-4.7/pkg-descr qjail/pkg-descr |--- qjail-4.7/pkg-descr 2016-04-16 18:29:58.000000000 -0400 |+++ qjail/pkg-descr 2016-05-29 09:30:59.454189000 -0400 -------------------------- Patching file pkg-descr using Plan A... Hunk #1 failed at 1. 1 out of 1 hunks failed while patching pkg-descr It looks to me the first paragraph you're removing, the "This version of qjail..." carries an extra space at the end of the line, before newline in = the patch, but there's no such space in pkg-descr in the head. It would be best if you could run 'svn diff sysutils/qjail' in the root of = your svn tree, that way svn can make a diff against unmodified orig. --=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-209929-13-Gf32CKwJkF>