Created attachment 165732 [details] Patch to upgrade victorops-nagios from 1.1.8 to 1.4.20 The attached diff updates net-mgmt/victorops-nagios from 1.1.8 to 1.4.20. This supersedes Bug 200955 which updates victorops-nagios to 1.3.16.
It fails to patch for me: $ make ===> Found saved configuration for victorops-nagios-1.4.20 ===> victorops-nagios-1.4.20 depends on file: /usr/local/sbin/pkg - found ===> Fetching all distfiles required by victorops-nagios-1.4.20 for building ===> Extracting for victorops-nagios-1.4.20 => SHA256 Checksum OK for victorops-nagios-1.4.20.tar.gz. ===> Patching for victorops-nagios-1.4.20 ===> Applying FreeBSD patches for victorops-nagios-1.4.20 1 out of 1 hunks failed--saving rejects to opt/victorops/nagios_plugin/bin/check_victorops_cmds.rej => Patch patch-check_victorops_cmds failed to apply cleanly. *** Error code 1
(In reply to Mathieu Arnold from comment #1) Correct, none of these patches currently apply. I looked to see if it was simple but it's going to take more time to fix than I have today.
Created attachment 168371 [details] New (a.k.a. working) patch to update VictorOps from 1.1.8 to 1.4.20 Sorry, I completely munged the first patch for this. Left old patches in the files directory. Among other problems. Sorry about this. This leaves a few 0 byte patch- files, which need to be deleted. Again, sorry for the hassle.
This still does not apply cleanly. These entries in your patch are not files in the port directory, so it doesn't do anything: ---- opt/victorops/nagios_plugin/bin/send_email_alert.orig 2014-06-11 10:39:13.918151547 -0500 ---- opt/victorops/nagios_plugin/bin/utils.orig 2014-06-16 20:12:16.713013963 -0500 This is the result of trying to apply your patch: # svn patch /tmp/patch C Makefile > applied hunk @@ -21,7 +18,8 @@ with offset 2 > applied hunk @@ -37,13 +35,15 @@ with offset 2 > rejected hunk @@ -2,16 +2,13 @@ U distinfo U files/qpage-patch U pkg-plist
Created attachment 168427 [details] Third try. Is it the charm? I'd swear I uploaded the correct patch file last time. But clearly I didn't. Very sorry for the hassle. SHA256 (/home/Agena/rand/Downloads/victorops.patch) = 8b7dc60c83e44f4044a09ecd3a56637ae0953982f45aea42a15f4cc7ab764766
Created attachment 168428 [details] I'm an idiot. This one works. The good news is I figured out what was wrong with the previous patches. The bad news is that it is exceptionally embarrassing. ~/Downloads exists on my workstation and laptop, did the port work on the workstation but uploaded the patch from my laptop. And I didn't update the file on my laptop. Sorry. SHA256 (/home/Agena/rand/Downloads/victorops.2016-03-20.patch) = 8b7dc60c83e44f4044a09ecd3a56637ae0953982f45aea42a15f4cc7ab764766
And I just tested it, and it works: [Delta:~/work/test]% fetch -o victorops.patch https://bz-attachments.freebsd.org/attachment.cgi?id=168428 fetch: https://bz-attachments.freebsd.org/attachment.cgi?id=168428: size of remote file is not known victorops.patch 16 kB 127 kBps 00m00s [Delta:~/work/test]% sha256 victorops.patch SHA256 (victorops.patch) = 8b7dc60c83e44f4044a09ecd3a56637ae0953982f45aea42a15f4cc7ab764766 [Delta:~/work/test]% cmp victorops.patch ~/Downloads/victorops.2016-03-20.patch [Delta:~/work/test]% svn co http://svn.freebsd.org/ports/head/net-mgmt/victorops-nagios A victorops-nagios/files A victorops-nagios/Makefile A victorops-nagios/pkg-plist A victorops-nagios/distinfo A victorops-nagios/files/patch-check_victorops_cmds A victorops-nagios/files/patch-check_victorops_forwarder A victorops-nagios/files/patch-do_victorops_heartbeat A victorops-nagios/files/patch-enqueue_alert A victorops-nagios/files/patch-forward_alerts A victorops-nagios/files/patch-support_collect.sh A victorops-nagios/files/patch-utils A victorops-nagios/files/patch-victorops.cron A victorops-nagios/files/qpage-patch A victorops-nagios/pkg-descr A victorops-nagios/pkg-message Checked out revision 411467. [Delta:~/work/test]% cd victorops-nagios [Delta:work/test/victorops-nagios]% svn patch ../victorops.patch U Makefile U distinfo D files/patch-check_victorops_cmds D files/patch-check_victorops_forwarder D files/patch-do_victorops_heartbeat D files/patch-enqueue_alert D files/patch-forward_alerts D files/patch-support_collect.sh D files/patch-utils D files/patch-victorops.cron U files/qpage-patch U pkg-plist Again, sorry for all the hassle. Thanks for being patient.
(In reply to rand from comment #7) No worries! Thanks for hanging in there! This has applied cleanly and I will get it committed once I verify a build.
A commit references this bug: Author: feld Date: Sun Mar 20 18:16:58 UTC 2016 New revision: 411471 URL: https://svnweb.freebsd.org/changeset/ports/411471 Log: net-mgmt/victorops-nagios: Unbreak port - Update to 1.4.20 - Port modernization PR: 206350 MFH: 2016Q1 Changes: head/net-mgmt/victorops-nagios/Makefile head/net-mgmt/victorops-nagios/distinfo head/net-mgmt/victorops-nagios/files/patch-check_victorops_cmds head/net-mgmt/victorops-nagios/files/patch-check_victorops_forwarder head/net-mgmt/victorops-nagios/files/patch-do_victorops_heartbeat head/net-mgmt/victorops-nagios/files/patch-enqueue_alert head/net-mgmt/victorops-nagios/files/patch-forward_alerts head/net-mgmt/victorops-nagios/files/patch-support_collect.sh head/net-mgmt/victorops-nagios/files/patch-utils head/net-mgmt/victorops-nagios/files/patch-victorops.cron head/net-mgmt/victorops-nagios/files/qpage-patch head/net-mgmt/victorops-nagios/pkg-plist
Committed with minor changes, thanks!
A commit references this bug: Author: feld Date: Sun Mar 20 18:18:21 UTC 2016 New revision: 411472 URL: https://svnweb.freebsd.org/changeset/ports/411472 Log: MFH: r411471 net-mgmt/victorops-nagios: Unbreak port - Update to 1.4.20 - Port modernization PR: 206350 Approved by: ports-secteam (with hat) Changes: _U branches/2016Q1/ branches/2016Q1/net-mgmt/victorops-nagios/Makefile branches/2016Q1/net-mgmt/victorops-nagios/distinfo branches/2016Q1/net-mgmt/victorops-nagios/files/patch-check_victorops_cmds branches/2016Q1/net-mgmt/victorops-nagios/files/patch-check_victorops_forwarder branches/2016Q1/net-mgmt/victorops-nagios/files/patch-do_victorops_heartbeat branches/2016Q1/net-mgmt/victorops-nagios/files/patch-enqueue_alert branches/2016Q1/net-mgmt/victorops-nagios/files/patch-forward_alerts branches/2016Q1/net-mgmt/victorops-nagios/files/patch-support_collect.sh branches/2016Q1/net-mgmt/victorops-nagios/files/patch-utils branches/2016Q1/net-mgmt/victorops-nagios/files/patch-victorops.cron branches/2016Q1/net-mgmt/victorops-nagios/files/qpage-patch branches/2016Q1/net-mgmt/victorops-nagios/pkg-plist