Re: Problems with GITHUB pulls

2013-01-29 Thread Shane Ambler

On 30/01/2013 07:54, Paul Schmehl wrote:

I maintain the security/barnyard2 port.  It pulls the software from git,
which is the only place where it's available.



The problem is, master's commit tag and md5 sum and size have changed.
I *could* update the port by changing the commit tag and the distino
file, but that's seems rather kludgy to me.  The version hasn't
changed.  The developers simply fixed some problems in the software and
then bumped master to the newer commit.

Is that really the correct way to handle software at git?  If so, am I
going to be forced to update the port every time the developers make
minor changes to a version?

Is there a way for me to work around this problem so that the port
version remains at the stable commit until the version actually gets
bumped? GH_COMMIT is mandatory, so I can't leave that out.  Yet the git
tagname has changed.  What's the best way to handle this?



Following the head of a branch is always dynamic. The way to get a 
consistent download from github is to use tags. Try the tag v2-1.11


If you want to keep closer to the head of a branch then either get the 
devs to tag some stable points along the way or fork your own version 
and add tags as you want and use your repo for the port.


___
freebsd-ports@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to freebsd-ports-unsubscr...@freebsd.org


Re: Problems with GITHUB pulls

2013-01-29 Thread Wesley Shields
On Tue, Jan 29, 2013 at 03:24:31PM -0600, Paul Schmehl wrote:
 I maintain the security/barnyard2 port.  It pulls the software from git, 
 which is the only place where it's available.
 
 Here's the relevant portion of the port's Makefile:
 
 USE_GITHUB= yes
 GH_ACCOUNT= firnsy
 GH_PROJECT= ${PORTNAME}
 GH_TAGNAME= master
 GH_COMMIT= 4dfdc80
 
 The problem is, master's commit tag and md5 sum and size have changed.  I 
 *could* update the port by changing the commit tag and the distino file, 
 but that's seems rather kludgy to me.  The version hasn't changed.  The 
 developers simply fixed some problems in the software and then bumped 
 master to the newer commit.

The point of GH_COMMIT is to checkout a specific commit. I think you
don't need GH_TAGNAME set here as that is probably overriding the
desired behavior (and always fetching the latest from master). For an
idea of how to fetch a specific commit from git check out devel/libhtp.

-- WXS
___
freebsd-ports@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to freebsd-ports-unsubscr...@freebsd.org


Re: Problems with GITHUB pulls

2013-01-29 Thread Wesley Shields
On Tue, Jan 29, 2013 at 10:10:13PM -0500, Wesley Shields wrote:
 On Tue, Jan 29, 2013 at 03:24:31PM -0600, Paul Schmehl wrote:
  I maintain the security/barnyard2 port.  It pulls the software from git, 
  which is the only place where it's available.
  
  Here's the relevant portion of the port's Makefile:
  
  USE_GITHUB= yes
  GH_ACCOUNT= firnsy
  GH_PROJECT= ${PORTNAME}
  GH_TAGNAME= master
  GH_COMMIT= 4dfdc80
  
  The problem is, master's commit tag and md5 sum and size have changed.  I 
  *could* update the port by changing the commit tag and the distino file, 
  but that's seems rather kludgy to me.  The version hasn't changed.  The 
  developers simply fixed some problems in the software and then bumped 
  master to the newer commit.
 
 The point of GH_COMMIT is to checkout a specific commit. I think you
 don't need GH_TAGNAME set here as that is probably overriding the
 desired behavior (and always fetching the latest from master). For an
 idea of how to fetch a specific commit from git check out devel/libhtp.

I think I might have completely misspoken here. What's happening is you
are fetching master at the appropriate commit, but distinfo is getting
the filename with the DISTVERSION string in it. When you update to the
next commit the DISTVERSION isn't changing and thus distinfo is now out
of date.

The best way to approach this is as was suggested by someone else. Get
upstream to tag releases and use those. The way you are doing it you
will have to set a PORTVERSION that is not accurate at all and bump
PORTREVISION everytime you update.

The devel/libhtp port is using a very old tag because upstream has not
tagged a new version in the last 7 months and I don't want to end up in
the situation you are experiencing.

-- WXS
___
freebsd-ports@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to freebsd-ports-unsubscr...@freebsd.org