Bug 234009

Summary:	security/py-certbot: Fails to patch: saving rejects to certbot/compat.py.rej
Product:	Ports & Packages	Reporter:	Gerard Seibert <gerard_seibert>
Component:	Individual Port(s)	Assignee:	Matthew Seaman <matthew>
Status:	Closed Not A Bug
Severity:	Affects Some People	CC:	koobs, matthew, python
Priority:	---	Flags:	koobs: maintainer-feedback+
Version:	Latest
Hardware:	amd64
OS:	Any

Description Gerard Seibert 2018-12-14 10:50:35 UTC

FreeBSD 11.2-RELEASE-p6

I attempted to update perl to version 5.28 from version 5.26 today. At the very beginning of the run, poudriere issued a warning that
"security/py-certbot | py36-certbot-0.29.1_1,1" failed. This is from the end
of the log file:

===========================================================================
=======================<phase: patch          >============================
===>  Patching for py36-certbot-0.29.1_1,1
===>  Applying FreeBSD patches for py36-certbot-0.29.1_1,1
Ignoring previously applied (or reversed) patch.
2 out of 2 hunks ignored--saving rejects to certbot/compat.py.rej
=> FreeBSD patch patch-certbot_compat.py failed to apply cleanly.
*** Error code 1

Stop.
make: stopped in /usr/ports/security/py-certbot
=>> Cleaning up wrkdir
===>  Cleaning for py36-certbot-0.29.1_1,1
build of security/py-certbot | py36-certbot-0.29.1_1,1 ended at Fri Dec 14
05:35:15 EST 2018 build time: 00:00:05
!!! build failure encountered !!!

Comment 1 Kubilay Kocak freebsd_committer

2018-12-14 10:55:39 UTC

Thank you for your report Gerard.

This is very unlikely related to perl, but may be related to bug 233909 which just had its fix committed in ports r487414.

Can you update your ports tree to at least that revision and confirm whether or not the issue is still reproducible please.

Comment 2 Matthew Seaman freebsd_committer

2018-12-14 12:13:06 UTC

Hi, Gerard,

Did you test the patches from PR 233909?  If so, you've probably ended up with a merge conflict in py-certbot/files/patch-* -- try 'svn status' to see if that's so.

You should be able to fix the problem by:

   cd ${PORTSDIR}/security/py-certbot
   svn revert -R .

so that your local changes are replaced by a clean copy from the ports repository.

Comment 3 Gerard Seibert 2018-12-14 12:19:49 UTC

(In reply to Matthew Seaman from comment #2)

I just ran "portsnap" again, and it appeared to download a "security/py-certbot" patch. I updated the poudriere ports and ran poudriere again. This time everything went fine and "security/py-certbot", aka "py36-certbot" built correctly.

Thanks!

Comment 4 Kubilay Kocak freebsd_committer

2018-12-14 12:24:06 UTC

Winning, thank you for the analysis Matthew and your report Gerard