Bug 257056

Summary:	sysutils/py-salt: py37-salt-3002.6_1 Fails to apply patch
Product:	Ports & Packages	Reporter:	Danny McGrath <danmcgrath.ca>
Component:	Individual Port(s)	Assignee:	freebsd-ports-bugs (Nobody) <ports-bugs>
Status:	Closed FIXED
Severity:	Affects Only Me	CC:	christer.edwards
Priority:	---	Keywords:	needs-qa, regression
Version:	Latest	Flags:	bugzilla: maintainer-feedback? (christer.edwards)
Hardware:	Any
OS:	Any

Description Danny McGrath 2021-07-08 16:16:41 UTC

It seems that the latest saltmaster port is having a problem applying the patch cleanly:

===>  Extracting for py37-salt-3002.6_1
=> SHA256 Checksum OK for salt-3002.6.tar.gz.
===========================================================================
=======================<phase: patch-depends  >============================
===========================================================================
=======================<phase: patch          >============================
===>  Patching for py37-salt-3002.6_1
===>  Applying FreeBSD patches for py37-salt-3002.6_1 from /usr/ports/sysutils/py-salt/files
Ignoring previously applied (or reversed) patch.
1 out of 1 hunks ignored--saving rejects to requirements/base.txt.rej
===>  FAILED Applying FreeBSD patch-requirements_base.txt
===> FAILED to apply cleanly FreeBSD patch(es)  patch-requirements_base.txt
*** Error code 1

Stop.
make: stopped in /usr/ports/sysutils/py-salt
=>> Cleaning up wrkdir
===>  Cleaning for py37-salt-3002.6_1
build of sysutils/py-salt | py37-salt-3002.6_1 ended at Thu Jul  8 16:58:40 CEST 2021
build time: 00:00:05
!!! build failure encountered !!!



An attempt build it on the host appears to have failed as well. It also failed in a clean VM install with 11.4 and a make in /usr/ports dir. I did notice that a 13.x host wants to pull in py38-salt, but I didn't catch if it was the old compile yet.

Any ideas?

Comment 1 Kubilay Kocak freebsd_committer

2021-07-09 05:34:24 UTC

Thank you for your report Danny. 

The version of the port (in the latest branch) is 3003.1_1. Are you using the latest branch, or quarterly?

If you haven't already, update your ports tree and try to reproduce the issue again.

Comment 2 Danny McGrath 2021-07-09 10:17:54 UTC

Ah, that could very well be the problem!

A quick check of the poudriere system indeed shows that it was still on 2021Q2. I updated to Q3 and kicked off the build, but it will be a while until I know for sure, but I suspect this is very much the case.

Thanks!

Comment 3 Danny McGrath 2021-07-10 11:41:56 UTC

I can confirm that the build did go off without a hitch. Thanks for the quick reply, and sorry for the noise! o/