Bug 226941
| Summary: | www/gitea: Update to 1.4.0 | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Stefan Bethke <stb> | ||||||
| Component: | Individual Port(s) | Assignee: | Yuri Victorovich <yuri> | ||||||
| Status: | Closed FIXED | ||||||||
| Severity: | Affects Only Me | CC: | yuri | ||||||
| Priority: | --- | ||||||||
| Version: | Latest | ||||||||
| Hardware: | Any | ||||||||
| OS: | Any | ||||||||
| Attachments: |
|
||||||||
|
Description
Stefan Bethke
2018-03-26 10:58:00 UTC
Did you save the patch from Windows? Patch fails: |$ svn diff |Index: Makefile |=================================================================== |--- Makefile (revision 465577) |+++ Makefile (working copy) -------------------------- Patching file Makefile using Plan A... Hunk #1 failed at 3. Hunk #2 failed at 62. 2 out of 2 hunks failed--saving rejects to Makefile.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- Created attachment 191852 [details]
2nd try for patch
Huh. Just copy/pasted the patch again. If it still fails, I'll recreate it.
You still have windows newlines. Do you use Windows? I don't use Windows. There are no CRs in the attached patch. I actually downloaded the patch from Bugzilla and hexdumped it. I just tried to apply the patch (downloaded from this PR), and it applies cleanly. Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |--- Makefile (revision 465636) |+++ Makefile (working copy) -------------------------- Patching file Makefile using Plan A... Hunk #1 succeeded at 3. Hunk #2 succeeded at 62. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- distinfo (revision 465636) |+++ distinfo (working copy) -------------------------- Patching file distinfo using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- pkg-plist (revision 465636) |+++ pkg-plist (working copy) -------------------------- Patching file pkg-plist using Plan A... Hunk #1 succeeded at 507. Hunk #2 succeeded at 520. Hunk #3 succeeded at 542. Hunk #4 succeeded at 1911. Hunk #5 succeeded at 1938. Hunk #6 succeeded at 2008. Hunk #7 succeeded at 2029. done Here's a fragment of its hex dump: 000000c0 3d 3d 3d 3d 3d 3d 3d 3d 0d 0a 2d 2d 2d 20 4d 61 |========..--- Ma| 000000d0 6b 65 66 69 6c 65 09 28 72 65 76 69 73 69 6f 6e |kefile.(revision| 000000e0 20 34 36 35 36 33 36 29 0d 0a 2b 2b 2b 20 4d 61 | 465636)..+++ Ma| Please see "0d 0a" combinations. I believe you have them on your system. But they're not in Bugzilla. Here's the beginning of the hexdump from the file I just downloaded: 00000000 2d 2d 2d 20 4d 61 6b 65 66 69 6c 65 09 28 72 65 |--- Makefile.(re| 00000010 76 69 73 69 6f 6e 20 34 36 35 36 33 36 29 0a 2b |vision 465636).+| 00000020 2b 2b 20 4d 61 6b 65 66 69 6c 65 09 28 77 6f 72 |++ Makefile.(wor| 00000030 6b 69 6e 67 20 63 6f 70 79 29 0a 40 40 20 2d 33 |king copy).@@ -3| 00000040 2c 37 20 2b 33 2c 37 20 40 40 20 0a 20 0a 20 50 |,7 +3,7 @@ . . P| As I said, I just downloaded the patch from Bugzilla and was able to apply it. It's ok, don't worry about this. I've fixed them. (In reply to stb from comment #7) I'm not sure what adds them. Sorry, it appears they are indeed in Bugzilla. Copy/pasting out of Bugzilla into a terminal window works, but downloading the patch file produces a file with CRLF. It appears that Bugzilla cannot accept patch files copy/pasted into a browser. A commit references this bug: Author: yuri Date: Mon Mar 26 22:01:22 UTC 2018 New revision: 465641 URL: https://svnweb.freebsd.org/changeset/ports/465641 Log: www/gitea: Update 1.3.3 -> 1.4.0 Port changes: * Silence non-install commands * Remove unnecessary mkdir * Change WWW to their official homepage * Add to description from the homepage PR: 226941 Submitted by: stb@lassitu.de (maintainer) Changes: head/www/gitea/Makefile head/www/gitea/distinfo head/www/gitea/pkg-descr head/www/gitea/pkg-plist Committed with changes. Thank you for the update! |
