From owner-freebsd-ports@FreeBSD.ORG Mon Aug 25 17:18:08 2014 Return-Path: Delivered-To: ports@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 852B824D; Mon, 25 Aug 2014 17:18:08 +0000 (UTC) Received: from mail.nuith.eu (nuith.eu [91.232.102.93]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 00B843367; Mon, 25 Aug 2014 17:18:07 +0000 (UTC) Received: from gds-exchange1.NUITH.local (10.0.7.14) by gds-exchange1.NUITH.local (10.0.7.14) with Microsoft SMTP Server (TLS) id 15.0.516.32; Mon, 25 Aug 2014 19:17:53 +0200 Received: from gds-exchange1.NUITH.local ([::1]) by gds-exchange1.NUITH.local ([::1]) with mapi id 15.00.0516.029; Mon, 25 Aug 2014 19:17:53 +0200 From: Sebastian Bach To: "koobs@FreeBSD.org" Subject: RE: FreeBSD Port: git-2.0.2_1 Thread-Topic: FreeBSD Port: git-2.0.2_1 Thread-Index: Ac/AZPOGjXPJvicfTmmN4ta7d+5WLv///NgAgAAC5gCAAANLgP//xuRQ Date: Mon, 25 Aug 2014 17:17:52 +0000 Message-ID: <7c557dc5ecab4b56ba3517faba62bd89@gds-exchange1.NUITH.local> References: <5b109c99bada4b39b622e3c5257fe2c4@gds-exchange1.NUITH.local> <20140825165206.40cc5eba@bsd64.grem.de> <53FB5004.1010709@FreeBSD.org> <53FB52C7.8000206@FreeBSD.org> In-Reply-To: <53FB52C7.8000206@FreeBSD.org> Accept-Language: pl-PL, en-US Content-Language: pl-PL X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.0.7.101] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Cc: "ports@FreeBSD.org" , "wxs@FreeBSD.org" , Michael Gmelin X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 17:18:08 -0000 -----Original Message----- From: Kubilay Kocak [mailto:koobs.freebsd@gmail.com] On Behalf Of Kubilay K= ocak Sent: Monday, August 25, 2014 5:14 PM To: Sebastian Bach Cc: Michael Gmelin; ports@FreeBSD.org; wxs@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 wrote: >> >>> Hi! >>> >>> I've an urgent problem with the current port devel/git (2.0.2).=20 >>> After upgrading we can't use our Atlassian Stash server anymore.=20 >>> Stash rejects (hard check of 2.0.2 and 2.0.3) to use this specific=20 >>> git version due to a critical bug in 'git diff-tree' which breaks=20 >>> Stash's commit page. Please see the 'DVCS clients' section on their=20 >>> 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=20 >>> FreeBSD? However, can you tell me when git 2.0.4 or 2.1.0 will be=20 >>> available in the ports collections? >>> >>> Best regards >>> Sebastian Bach >>> >> >> If you're using pkg you might be lucky and still have a cached copy=20 >> in /var/cache/pkg. In that case try pkg delete git and pkg add=20 >> /var/cache/pkg/git-.txz. >> >> Otherwise one way of doing this is getting the old package skeleton=20 >> from svn and build it from ports. You need revision 362475 of the=20 >> ports tree for git version 2.0.1. Alternatively you can download the=20 >> files from svnweb (a bit clumsy, but doesn't require you to install >> subversion): >> >> http://svnweb.freebsd.org/ports/head/devel/git/?pathrev=3D362475 >> >> 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=20 >> install (do pkg delete git beforehand). >> >=20 > Thanks for the assist Michael :) >=20 > I have a patch updating git to 2.1.0 thats 98% complete (just updating=20 > minor pkg-plist stuff for HTMLDOCS option) >=20 > I'll have it to you in 10-15 >=20 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 St= ash 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 sy= stem 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