FreeBSD Port: git-2.0.2_1

[Sebastian Bach]

-----Original Message-----
From: Kubilay Kocak [mailto:koobs.freebsd at gmail.com] On Behalf Of Kubilay Kocak
Sent: Monday, August 25, 2014 5:14 PM
To: Sebastian Bach
Cc: Michael Gmelin; ports at FreeBSD.org; wxs at FreeBSD.org
Subject: Re: FreeBSD Port: git-2.0.2_1

On 26/08/2014 1:02 AM, Kubilay Kocak wrote:
> On 26/08/2014 12:52 AM, Michael Gmelin wrote:
>> On Mon, 25 Aug 2014 13:39:50 +0000
>> Sebastian Bach <sbach at nuith.pl> wrote:
>>
>>> Hi!
>>>
>>> I've an urgent problem with the current port devel/git (2.0.2). 
>>> After upgrading  we can't use our Atlassian Stash server anymore. 
>>> Stash rejects (hard check of 2.0.2 and 2.0.3) to use this specific 
>>> git version due to a critical bug in 'git diff-tree' which breaks 
>>> Stash's commit page. Please see the 'DVCS clients' section on their 
>>> system requirements page:
>>> https://confluence.atlassian.com/display/STASH/Supported+platforms
>>> https://jira.atlassian.com/browse/STASH-5052
>>>
>>> I don't know how to downgrade this port. Is this even possible on 
>>> FreeBSD? However, can you tell me when git 2.0.4 or 2.1.0 will be 
>>> available in the ports collections?
>>>
>>> Best regards
>>> Sebastian Bach
>>>
>>
>> If you're using pkg you might be lucky and still have a cached copy 
>> in /var/cache/pkg. In that case try pkg delete git and pkg add 
>> /var/cache/pkg/git-<version>.txz.
>>
>> Otherwise one way of doing this is getting the old package skeleton 
>> from svn and build it from ports. You need revision 362475 of the 
>> ports tree for git version 2.0.1. Alternatively you can download the 
>> files from svnweb (a bit clumsy, but doesn't require you to install
>> subversion):
>>
>> http://svnweb.freebsd.org/ports/head/devel/git/?pathrev=362475
>>
>> If you don't have a ports tree yet, do: portsnap fetch extract
>>
>> Then copy the files in /usr/ports/devel/git, go there and do make 
>> install (do pkg delete git beforehand).
>>
> 
> Thanks for the assist Michael :)
> 
> I have a patch updating git to 2.1.0 thats 98% complete (just updating 
> minor pkg-plist stuff for HTMLDOCS option)
> 
> I'll have it to you in 10-15
> 

Sebastian,

Find attached a patch updating devel/git to 2.1.0 with the following
changes:

- Update to 2.1.0
- Sort pkg-plist (much easier to update when sorted!)
- Use CONFIGURE_ARGS user-knob to disable libiconv

There is a leftover issue (in the current version of the port too) building *without* ICONV and *with* CONTRIB options, so avoid that combination.

Otherwise it builds and packages cleanly (tested with poudriere).

Let us know how the update goes for you, whether it fixes your Atlassian Stash issue, and report back.

I can then create a Bugzilla issue report and submit the update so you can revert to using ports rather than a local patch :)

Hope that helps!

Koobs

---


Hi Koobs!

I followed the hint from Michael (checkout of git 2.0.1 from svn) and my system was running again.
Then I've uninstalled git again,  cleaned up, updated the skeleton back to the head revision and patched it with your diff. There were no problems to compile & install. Stash started normally and is running with git 2.1.0. So your patch is working. Thank you again for quick help.
Sebastian