Bug 192860 - ftp/wget patch failed to apply cleanly - fails to build under poudriere
Summary: ftp/wget patch failed to apply cleanly - fails to build under poudriere
Status: Closed Not A Bug
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: Vasil Dimov
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-08-20 17:37 UTC by Mark.Martinec
Modified: 2014-08-22 16:51 UTC (History)
0 users

See Also:


Attachments
The failing build log (7.42 KB, text/plain)
2014-08-20 17:37 UTC, Mark.Martinec
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description Mark.Martinec 2014-08-20 17:37:57 UTC
Created attachment 146080 [details]
The failing build log

wget-1.15_1 fails to build under poudriere: the patch fails to apply:

---Begin OPTIONS List---
===> The following configuration options are available for wget-1.15_1:
     IDN=on: International Domain Names support
     IPV6=on: IPv6 protocol support
     NLS=off: Native Language Support
     PCRE=off: Support Perl regular expressions in addition to POSIX
====> SSL protocol support: you can only select none or one of them
     GNUTLS=off: SSL/TLS support via GnuTLS
     OPENSSL=on: SSL/TLS support via OpenSSL
===> Use 'make config' to modify these settings
---End OPTIONS List---

[...]

  ===>  Patching for wget-1.15_1
  ===>  Applying FreeBSD patches for wget-1.15_1
  Ignoring previously applied (or reversed) patch.
  5 out of 5 hunks ignored--saving rejects to doc/wget.texi.rej
  => Patch patch-doc__wget.texi failed to apply cleanly.
  => Patch(es) patch-NEWS applied cleanly.
  *** Error code 1

The complete build log is attached.
Comment 1 John Marino freebsd_committer freebsd_triage 2014-08-20 18:37:20 UTC
over to maintainer
Comment 2 Vasil Dimov freebsd_committer freebsd_triage 2014-08-22 15:53:26 UTC
Hello,

But there is no such file in ftp/wget/files: patch-doc__wget.texi, it was deleted in r344165 http://svnweb.freebsd.org/ports?view=revision&revision=344165

Your tree is messed up with old files?
Comment 3 Mark.Martinec 2014-08-22 16:51:27 UTC
> But there is no such file in ftp/wget/files: patch-doc__wget.texi,
> it was deleted in r344165
> http://svnweb.freebsd.org/ports?view=revision&revision=344165
> 
> Your tree is messed up with old files?


I see, you are quite right, this PR can be closed now.


The ports tree as used by my poudriere was configured as being updated
by SVN:

  # poudriere ports -l
  PORTSTREE            METHOD     PATH
  default              svn        /big/poudriere/ports/default

It turns out that the svn update as invoked by 'poudriere ports -u'
was indeed bringing in fresh updates, but local changes were left
in the tree.

Running the command:

  # svn diff /poudriere/ports/default

manually revealed two local differences which were not jettisoned
by a 'poudriere ports -u' (i.e. 'svn update'), and one of these two
was a stale patch file

  /poudriere/ports/default/ftp/wget/files/patch-doc__wget.texi

which was messing up the wget port build.

Sorry for the noise and thanks for a quick response!

Lesson learned: 'poudriere ports -u' on a svn ports tree does not
necessarily bring a local copy to be an exact clone of a repository.