Bug 260488

Summary: sysutils/bhyve+: FAILED Applying extra patch patch-custom-libs
Product: Ports & Packages Reporter: O. Hartmann <ohartmann>
Component: Individual Port(s)Assignee: Ashish SHUKLA <ashish>
Status: Closed FIXED    
Severity: Affects Many People CC: ashish, mikael
Priority: ---    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
v0
none
git am none

Description O. Hartmann 2021-12-17 07:41:50 UTC 
The port sysutils/bhyve+ fails to apply a provided patch cleanly:

[...]

===========================================================================
=======================<phase: patch-depends  >============================
===== env: USE_PACKAGE_DEPENDS_ONLY=1 USER=root UID=0 GID=0
===========================================================================
=======================<phase: patch          >============================
===== env: NO_DEPENDS=yes USER=root UID=0 GID=0
===>  Patching for bhyve+-0.1.0
===>  Applying extra patch patches for bhyve+-0.1.0 from /usr/ports/sysutils/bhyve+/files/freebsd-13
1 out of 2 hunks failed--saving rejects to usr.sbin/bhyve/Makefile.rej
===>  FAILED Applying extra patch patch-custom-libs
===> FAILED to apply cleanly extra patch patch(es)  patch-custom-libs
*** Error code 1
Comment 1 Mikael Urankar freebsd_committer freebsd_triage 2021-12-17 08:31:25 UTC 
Created attachment 230196 [details]
v0

Try the attached patch.
Comment 2 Mikael Urankar freebsd_committer freebsd_triage 2021-12-17 08:39:46 UTC 
Created attachment 230197 [details]
git am
Comment 3 Ashish SHUKLA freebsd_committer freebsd_triage 2021-12-18 16:51:19 UTC 
(In reply to O. Hartmann from comment #0)

Hi,

I tried latest git HEAD (dbe1af6795fb48ab8c3a397597759a9c83892466) on a 13-RELEASE host, and I'm not able to reproduce it:

# git -C /usr/ports log -1 /usr/ports/sysutils/bhyve+
commit 58f8d6ca4907d12a07863333204a576126d0cc04
Author: PÁLI Gábor János <pali.gabor@gmail.com>
Date:   Sat Dec 18 11:18:22 2021 +0000

    sysutils/bhyve+: Update for 12.3-RELEASE, and 14-CURRENT

# make -C /usr/ports/sysutils/bhyve+ clean patch
===>  Cleaning for bhyve+-0.1.0
===>  License BSD2CLAUSE accepted by the user
===>   bhyve+-0.1.0 depends on file: /usr/local/sbin/pkg - found
===> Fetching all distfiles required by bhyve+-0.1.0 for building
===>  Extracting for bhyve+-0.1.0
=> SHA256 Checksum OK for conclusiveeng-lib9p-0.1.0-7ef466772108856ee3e093735033232a6f1a3f04_GH0.tar.gz.
===>  Patching for bhyve+-0.1.0
===>  Applying extra patch patches for bhyve+-0.1.0 from /usr/ports/sysutils/bhyve+/files/freebsd-13
===>  Applying FreeBSD patches for bhyve+-0.1.0 from /usr/ports/sysutils/bhyve+/files


Could you share more details about your environment, e.g. uname -a output, the version of commit your ports tree is on ?

Also, I made a commit to the port few hours ago in main branch, in case your ports tree is not updated.

Thanks!
Comment 4 Ashish SHUKLA freebsd_committer freebsd_triage 2021-12-18 16:57:27 UTC 
(In reply to Mikael Urankar from comment #2)

Sorry, but I don't understand how this diff fixes the problem mentioned by OP.

Also, I tried patching port on a 14-CURRENT host I have access to, but I'm not able to reproduce the patching problem:

% git -C $PORTSDIR log -1 $PORTSDIR/sysutils/bhyve+
commit 58f8d6ca4907d12a07863333204a576126d0cc04
Author: PÁLI Gábor János <pali.gabor@gmail.com>
Date:   Sat Dec 18 11:18:22 2021 +0000

    sysutils/bhyve+: Update for 12.3-RELEASE, and 14-CURRENT


% make -C $PORTSDIR/sysutils/bhyve+ SRC_BASE=$HOME/src clean patch
===>  Cleaning for bhyve+-0.1.0
/!\ WARNING /!\

It is strongly recommended to upgrade to a newer version of pkg first

===>  License BSD2CLAUSE accepted by the user
===>   bhyve+-0.1.0 depends on file: /scratch/tmp/ashish/prefix/sbin/pkg - found
===> Fetching all distfiles required by bhyve+-0.1.0 for building
===>  Extracting for bhyve+-0.1.0
=> SHA256 Checksum OK for conclusiveeng-lib9p-0.1.0-7ef466772108856ee3e093735033232a6f1a3f04_GH0.tar.gz.
===>  Patching for bhyve+-0.1.0
===>  Applying extra patch patches for bhyve+-0.1.0 from /scratch/tmp/ashish/ports/sysutils/bhyve+/files/freebsd-14
===>  Applying FreeBSD patches for bhyve+-0.1.0 from /scratch/tmp/ashish/ports/sysutils/bhyve+/files


Could you share more details ?

Thanks!
Comment 5 Ashish SHUKLA freebsd_committer freebsd_triage 2021-12-18 17:23:46 UTC 
Sorry, I just noticed the time of this PR, and seems like the latest commit fixes the problem.

Please let me know if you're still able to reproduce it.

Thanks!