Bug 227442 - sysutils/logstash6: Patch fails to apply
Summary: sysutils/logstash6: Patch fails to apply
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Mark Felder
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2018-04-11 08:31 UTC by Daniel Ylitalo
Modified: 2018-05-17 14:51 UTC (History)
2 users (show)

See Also:
bugzilla: maintainer-feedback? (elastic)

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Daniel Ylitalo 2018-04-11 08:31:42 UTC 
Hi!

The Gemfile patch fails to apply when trying to build in poudriere:
=======================<phase: patch          >============================
===>  Patching for logstash6-6.2.3
===>  Applying FreeBSD patches for logstash6-6.2.3
Ignoring previously applied (or reversed) patch.
1 out of 1 hunks ignored--saving rejects to Gemfile.rej
=> FreeBSD patch patch-Gemfile failed to apply cleanly.
*** Error code 1

Stop.
make: stopped in /usr/ports/sysutils/logstash6
=>> Cleaning up wrkdir
===>  Cleaning for logstash6-6.2.3

This is with poudriere in a 11.1 jail from todays portstree
Comment 1 Steve Wills freebsd_committer freebsd_triage 2018-04-13 16:13:01 UTC 
Seeing the same here. I think ports/sysutils/logstash6/files/patch-Gemfile and ports/sysutils/logstash6/files/patch-Gemfile.lock need to be deleted, the new version seems to have those changes.
Comment 2 commit-hook freebsd_committer freebsd_triage 2018-04-14 15:43:20 UTC 
A commit references this bug:

Author: feld
Date: Sat Apr 14 15:42:38 UTC 2018
New revision: 467323
URL: https://svnweb.freebsd.org/changeset/ports/467323

Log:
  sysutils/logstash6: Fix build

  PR:		227442

Changes:
  head/sysutils/logstash6/files/patch-Gemfile
  head/sysutils/logstash6/files/patch-Gemfile.lock
Comment 3 Mark Felder freebsd_committer freebsd_triage 2018-04-14 15:43:54 UTC 
Apologies. Those patches were to fix the logstash-plugin utility and I mistakenly left them in when I updated the port. I have tested and confirmed that installing plugins still works.
Comment 4 commit-hook freebsd_committer freebsd_triage 2018-05-17 14:51:15 UTC 
A commit references this bug:

Author: feld
Date: Thu May 17 14:50:51 UTC 2018
New revision: 470223
URL: https://svnweb.freebsd.org/changeset/ports/470223

Log:
  MFH: r467323

  sysutils/logstash6: Fix build

  PR:		227442

Changes:
_U  branches/2018Q2/
  branches/2018Q2/sysutils/logstash6/files/patch-Gemfile
  branches/2018Q2/sysutils/logstash6/files/patch-Gemfile.lock