Bug 226941 - www/gitea: Update to 1.4.0
Summary: www/gitea: Update to 1.4.0
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: Yuri Victorovich
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2018-03-26 10:58 UTC by stb
Modified: 2018-03-26 22:01 UTC (History)
1 user (show)

See Also:


Attachments
patch to update the port to gitea 1.4.0 (4.71 KB, patch)
2018-03-26 10:58 UTC, stb
yuri: maintainer-approval+
Details | Diff
2nd try for patch (4.82 KB, patch)
2018-03-26 21:19 UTC, stb
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description stb 2018-03-26 10:58:00 UTC
Created attachment 191831 [details]
patch to update the port to gitea 1.4.0

Update to Gitea 1.4.0

Release notes: https://blog.gitea.io/2018/03/gitea-1.4.0-is-released/

Many new features plus bug fixes.
Comment 1 Yuri Victorovich freebsd_committer 2018-03-26 19:54:14 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:
--------------------------
Comment 2 stb 2018-03-26 21:19:33 UTC
Created attachment 191852 [details]
2nd try for patch

Huh. Just copy/pasted the patch again.  If it still fails, I'll recreate it.
Comment 3 Yuri Victorovich freebsd_committer 2018-03-26 21:22:49 UTC
You still have windows newlines.
Do you use Windows?
Comment 4 stb 2018-03-26 21:27:05 UTC
I don't use Windows. There are no CRs in the attached patch. I actually downloaded the patch from Bugzilla and hexdumped it.
Comment 5 stb 2018-03-26 21:28:36 UTC
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
Comment 6 Yuri Victorovich freebsd_committer 2018-03-26 21:30:25 UTC
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.
Comment 7 stb 2018-03-26 21:32:58 UTC
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.
Comment 8 Yuri Victorovich freebsd_committer 2018-03-26 21:33:09 UTC
It's ok, don't worry about this. I've fixed them.
Comment 9 Yuri Victorovich freebsd_committer 2018-03-26 21:33:40 UTC
(In reply to stb from comment #7)

I'm not sure what adds them.
Comment 10 stb 2018-03-26 21:53:55 UTC
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.
Comment 11 commit-hook freebsd_committer 2018-03-26 22:01:27 UTC
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
Comment 12 Yuri Victorovich freebsd_committer 2018-03-26 22:01:37 UTC
Committed with changes.
Thank you for the update!