Re: I need help with git

2013-02-06 Thread Shane Ambler

On 06/02/2013 00:27, Wesley Shields wrote:


I don't know if we have a way to express this in the ports framework but
you absolutely can grab a tarball of a repo at any specific commit on
github even if it is not tagged.

This is the URL to grab ironbee/libhtp at
234fd5bab1225e483ea263a5a15faebed0bd61b9:

https://github.com/ironbee/libhtp/archive/234fd5bab1225e483ea263a5a15faebed0bd61b9.tar.gz



/usr/ports/Mk/bsd.sites.mk contains --

# GitHub files can also be obtained, without the commit hashes, by doing:
#
# MASTER_SITES= 
http://github.com/accountname/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/

# FETCH_ARGS=   -Fpr

Where PORTVERSION would be expected to equal the tag name. I think that 
would mean not defining USE_GITHUB.


I haven't tested this yet - but it looks like PORTVERSION can be swapped 
for the long commit hash.


So you could probably use --

MASTER_SITES= 
http://github.com/${GH_ACCOUNT}/${GH_PROJECT}/archive/${GH_COMMIT}.tar.gz?dummy=/

DISTFILES=${GH_PROJECT}-${GH_COMMIT}.tar.gz
FETCH_ARGS= -Fpr
GH_ACCOUNT= ironbee
GH_PROJECT= libhtp
GH_COMMIT= 234fd5bab1225e483ea263a5a15faebed0bd61b9

Without USE_GITHUB you may need to add WRKSRC= 
${WRKDIR}/${GH_ACCOUNT}-${GH_COMMIT}


That could be the workaround for getting an untagged commit.

___
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: I need help with git

2013-02-05 Thread Wesley Shields
On Tue, Feb 05, 2013 at 11:30:43AM +1030, Shane Ambler wrote:
 
 
  GH_COMMIT=  4dfdc80
 
  Probably not needed if you specify a tag other than master.
 
  If I pull master, I get commit f57e464.  That's not what I want.
  Why doesn't this thing pull the commit I'm telling it to pull?
 
 I think the thing most people miss here is that GH_COMMIT doesn't
 effect what gets downloaded, it's not used like an svn rev number
 - it is only used to define WRKSRC
 
 When a github tarball gets extracted GH_COMMIT is part of the dir name.
 
 Which is why it is mandatory and needs to match the tag. It is just
 needed to work with the way github creates tarballs. It is inconvenient
 but github is only setup to let you download tarballs of specific tags
 not specific commits. If the main devs don't tag the specific points you
 want the only option is to fork and create your own tags.

I don't know if we have a way to express this in the ports framework but
you absolutely can grab a tarball of a repo at any specific commit on
github even if it is not tagged.

This is the URL to grab ironbee/libhtp at
234fd5bab1225e483ea263a5a15faebed0bd61b9:

https://github.com/ironbee/libhtp/archive/234fd5bab1225e483ea263a5a15faebed0bd61b9.tar.gz

-- 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


I need help with git

2013-02-04 Thread Paul Schmehl
I'm the maintainer for security/barnyard2.  The software recently changed 
so that all distros are pulled from github.  The developers made new 
commits, and now the port is broken, and I cannot figure out how to fix it.


Here's the relevant code from the Makefile:

PORTNAME=   barnyard2
PORTVERSION=1.11
CATEGORIES= security

MAINTAINER= pa...@utdallas.edu
COMMENT=Interpreter for Snort unified2 binary output files

LICENSE=GPLv2

USE_GITHUB= yes
GH_ACCOUNT= firnsy
GH_PROJECT= ${PORTNAME}
GH_TAGNAME= master
GH_COMMIT=  4dfdc80

The master tagname apparently gets moved to the new commit every time the 
developers commit changes.  This is NOT what I want.  I want the port to 
stay at the release version until a new version is released.


I've tried everything I can think of to get this port to pull the commit I 
want.  It does not work.  I've tried changing the tagname to v2-1.11, 
v2-${PORTVERSION}, stable, dev-next, etc., etc.  Nothing works.


Here's the git site:  https://github.com/firnsy/barnyard2/commits/master

If I pull master, I get commit f57e464.  That's not what I want.  Why 
doesn't this thing pull the commit I'm telling it to pull?


I'm so frustrated by this I'm about to drop this port.  I do NOT want to 
have to update the port every time the developers commit more code.  That 
is NOT how software should work.


Is there anyone who can tell me how to fix this problem so the port will 
remain at the release version until the next version is released no matter 
how many commits the developers make?


--
Paul Schmehl, Senior Infosec Analyst
As if it wasn't already obvious, my opinions
are my own and not those of my employer.
***
It is as useless to argue with those who have
renounced the use of reason as to administer
medication to the dead. Thomas Jefferson
There are some ideas so wrong that only a very
intelligent person could believe in them. George Orwell

___
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: I need help with git

2013-02-04 Thread Chess Griffin
On Mon, Feb 4, 2013, at 11:21 AM, Paul Schmehl wrote:
 I'm the maintainer for security/barnyard2.  The software recently changed 
 so that all distros are pulled from github.  The developers made new 
 commits, and now the port is broken, and I cannot figure out how to fix
 it.
 

I am no git expert so this is just a guess but can you pull from a
specific tag?

https://github.com/firnsy/barnyard2/commits/v2-1.11

Looks like they tag the master branch at release.

-- 
Chess Griffin
___
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: I need help with git

2013-02-04 Thread Micheas Herman
On Monday, February 4, 2013, Paul Schmehl wrote:

 I'm the maintainer for security/barnyard2.  The software recently changed
 so that all distros are pulled from github.  The developers made new
 commits, and now the port is broken, and I cannot figure out how to fix it.

 Here's the relevant code from the Makefile:

 PORTNAME=   barnyard2
 PORTVERSION=1.11
 CATEGORIES= security

 MAINTAINER= pa...@utdallas.edu
 COMMENT=Interpreter for Snort unified2 binary output files

 LICENSE=GPLv2

 USE_GITHUB= yes
 GH_ACCOUNT= firnsy
 GH_PROJECT= ${PORTNAME}
 GH_TAGNAME= master


You need to change th GH_TAGNAME to the release you want if you go to the
repository on github and you can find the tags that the maintainers have
added to the project.

If you want a snapshot in time that is not tagged you could either request
the authors tag it, or fork it on github tag it yourself and put your own
account as the GH_ACCOUNT.



 GH_COMMIT=  4dfdc80



Probably not needed if you specify a tag other than master.


 The master tagname apparently gets moved to the new commit every time the
 developers commit changes.  This is NOT what I want.  I want the port to
 stay at the release version until a new version is released.

 I've tried everything I can think of to get this port to pull the commit I
 want.  It does not work.  I've tried changing the tagname to v2-1.11,
 v2-${PORTVERSION}, stable, dev-next, etc., etc.  Nothing works.

 Here's the git site:  https://github.com/firnsy/**
 barnyard2/commits/masterhttps://github.com/firnsy/barnyard2/commits/master
 

 If I pull master, I get commit f57e464.  That's not what I want.  Why
 doesn't this thing pull the commit I'm telling it to pull?

 I'm so frustrated by this I'm about to drop this port.  I do NOT want to
 have to update the port every time the developers commit more code.  That
 is NOT how software should work.

 Is there anyone who can tell me how to fix this problem so the port will
 remain at the release version until the next version is released no matter
 how many commits the developers make?

 --
 Paul Schmehl, Senior Infosec Analyst
 As if it wasn't already obvious, my opinions
 are my own and not those of my employer.
 *
 It is as useless to argue with those who have
 renounced the use of reason as to administer
 medication to the dead. Thomas Jefferson
 There are some ideas so wrong that only a very
 intelligent person could believe in them. George Orwell

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

___
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: I need help with git

2013-02-04 Thread Greg Larkin
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

On 2/4/13 11:21 AM, Paul Schmehl wrote:
 I'm the maintainer for security/barnyard2.  The software recently 
 changed so that all distros are pulled from github.  The developers
 made new commits, and now the port is broken, and I cannot figure
 out how to fix it.
 
 Here's the relevant code from the Makefile:
 
 PORTNAME=   barnyard2 PORTVERSION=1.11 CATEGORIES=
 security
 
 MAINTAINER= pa...@utdallas.edu COMMENT=Interpreter for
 Snort unified2 binary output files
 
 LICENSE=GPLv2
 
 USE_GITHUB= yes GH_ACCOUNT= firnsy GH_PROJECT=
 ${PORTNAME} GH_TAGNAME= master GH_COMMIT=  4dfdc80
 
 The master tagname apparently gets moved to the new commit every
 time the developers commit changes.  This is NOT what I want.  I
 want the port to stay at the release version until a new version is
 released.
 
 I've tried everything I can think of to get this port to pull the
 commit I want.  It does not work.  I've tried changing the tagname
 to v2-1.11, v2-${PORTVERSION}, stable, dev-next, etc., etc.
 Nothing works.
 
 Here's the git site:
 https://github.com/firnsy/barnyard2/commits/master
 
 If I pull master, I get commit f57e464.  That's not what I want.
 Why doesn't this thing pull the commit I'm telling it to pull?
 
 I'm so frustrated by this I'm about to drop this port.  I do NOT
 want to have to update the port every time the developers commit
 more code. That is NOT how software should work.
 
 Is there anyone who can tell me how to fix this problem so the port
 will remain at the release version until the next version is
 released no matter how many commits the developers make?
 

Hi Paul,

I just changed this line:

GH_TAGNAME= master

to this:

GH_TAGNAME= v2-1.11

and it worked fine.

FWIW,
Greg

- -- 
Greg Larkin

http://www.FreeBSD.org/   - The Power To Serve
http://www.sourcehosting.net/ - Ready. Set. Code.
http://twitter.com/cpucycle/  - Follow you, follow me
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.13 (Darwin)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iEYEARECAAYFAlEP5MkACgkQ0sRouByUApDsCwCePQYMCZ6/Avm0lUSbGazexoz5
kBkAnjLstH0h/pZ4y52BMZVgh9uFYFcv
=5E4Z
-END PGP SIGNATURE-
___
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: I need help with git

2013-02-04 Thread Paul Schmehl

--On February 4, 2013 8:33:06 AM -0800 Micheas Herman m...@micheas.net wrote:




On Monday, February 4, 2013, Paul Schmehl wrote:

I'm the maintainer for security/barnyard2.  The software recently
changed so that all distros are pulled from github.  The developers made
new commits, and now the port is broken, and I cannot figure out how to
fix it.

Here's the relevant code from the Makefile:

PORTNAME=       barnyard2
PORTVERSION=    1.11
CATEGORIES=     security

MAINTAINER=     pa...@utdallas.edu
COMMENT=        Interpreter for Snort unified2 binary output files

LICENSE=        GPLv2

USE_GITHUB=     yes
GH_ACCOUNT=     firnsy
GH_PROJECT=     ${PORTNAME}
GH_TAGNAME=     master




You need to change th GH_TAGNAME to the release you want if you go to the
repository on github and you can find the tags that the maintainers have
added to the project.


If you want a snapshot in time that is not tagged you could either
request the authors tag it, or fork it on github tag it yourself and put
your own account as the GH_ACCOUNT.



So now I have to maintain a git repository just to maintain my port?  No 
thanks.  I'll abandon it first.  This is volunteer work.  I'm not going to 
double my workload just because the system changed and doesn't work as 
expected.




 

GH_COMMIT=      4dfdc80






Probably not needed if you specify a tag other than master. 



According to /usr/ports/Mk/bsd.sites.mk, GH_COMMIT is mandatory.

# In order to use GitHub your port must define USE_GITHUB and the following
# variables:
#
# GH_ACCOUNT- account name of the GitHub user hosting the project
# default: not set, mandatory
#
# GH_PROJECT- name of the project on GitHub
# default: ${PORTNAME}
#
# GH_TAGNAME- name of the tag to download (master, 2.0.1, ...)
# default: ${DISTVERSION}
#
# GH_COMMIT - first 7 digits of the commit that generated GH_TAGNAME
# (man git-describe(1))
# default: not set, mandatory
#

Never mind.  I finally figured it out.  I had to change GH_TAGNAME to 
v2-${PORTVERSION}.  Now it pulls the commit for the release version as 
desired.


--
Paul Schmehl, Senior Infosec Analyst
As if it wasn't already obvious, my opinions
are my own and not those of my employer.
***
It is as useless to argue with those who have
renounced the use of reason as to administer
medication to the dead. Thomas Jefferson
There are some ideas so wrong that only a very
intelligent person could believe in them. George Orwell

___
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: I need help with git

2013-02-04 Thread Michael Gmelin
On Mon, 04 Feb 2013 10:21:35 -0600
Paul Schmehl pschmehl_li...@tx.rr.com wrote:

 I'm the maintainer for security/barnyard2.  The software recently
 changed so that all distros are pulled from github.  The developers
 made new commits, and now the port is broken, and I cannot figure out
 how to fix it. Here's the relevant code from the Makefile:
 PORTNAME=   barnyard2 PORTVERSION=1.11 CATEGORIES=
 security MAINTAINER= pa...@utdallas.edu
 COMMENT=Interpreter for Snort unified2 binary output files
 LICENSE=GPLv2
 USE_GITHUB= yes
 GH_ACCOUNT= firnsy
 GH_PROJECT= ${PORTNAME}
 GH_TAGNAME= master
 GH_COMMIT=  4dfdc80
 The master tagname apparently gets moved to the new commit every time
 the developers commit changes.  This is NOT what I want.  I want the
 port to stay at the release version until a new version is released.
 I've tried everything I can think of to get this port to pull the
 commit I want.  It does not work.  I've tried changing the tagname to
 v2-1.11, v2-${PORTVERSION}, stable, dev-next, etc., etc.  Nothing
 works. Here's the git site:
 https://github.com/firnsy/barnyard2/commits/master If I pull
 master, I get commit f57e464.  That's not what I want.  Why doesn't
 this thing pull the commit I'm telling it to pull? I'm so frustrated
 by this I'm about to drop this port.  I do NOT want to have to update
 the port every time the developers commit more code.  That is NOT how
 software should work. Is there anyone who can tell me how to fix this
 problem so the port will remain at the release version until the next
 version is released no matter how many commits the developers make?

Hi Paul,

Could you revisit what I write to you about this a couple of months ago?

I just tried changing GH_TAGNAME to v2-1.11 in Makefile and it just
worked fine (by the way, that's what I suggested back then, you should
never depend on master, since it is a moving target)

USE_GITHUB= yes
GH_ACCOUNT= firnsy
GH_PROJECT= ${PORTNAME}
GH_TAGNAME= v2-1.11
GH_COMMIT=  4dfdc80

Are you sure there's nothing left in your build environment that stops
you from building the port successfully?

Cheers,

-- 
Michael Gmelin
___
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: I need help with git

2013-02-04 Thread Paul Schmehl
--On February 4, 2013 5:36:02 PM +0100 Michael Gmelin free...@grem.de 
wrote:


Hi Paul,

Could you revisit what I write to you about this a couple of months ago?

I just tried changing GH_TAGNAME to v2-1.11 in Makefile and it just
worked fine (by the way, that's what I suggested back then, you should
never depend on master, since it is a moving target)

USE_GITHUB= yes
GH_ACCOUNT= firnsy
GH_PROJECT= ${PORTNAME}
GH_TAGNAME= v2-1.11
GH_COMMIT=  4dfdc80

Are you sure there's nothing left in your build environment that stops
you from building the port successfully?



Somehow I missed your response.  I figured it out before seeing your email 
though, but thanks for providing the correct answer.



Cheers,




--
Paul Schmehl, Senior Infosec Analyst
As if it wasn't already obvious, my opinions
are my own and not those of my employer.
***
It is as useless to argue with those who have
renounced the use of reason as to administer
medication to the dead. Thomas Jefferson
There are some ideas so wrong that only a very
intelligent person could believe in them. George Orwell

___
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: I need help with git

2013-02-04 Thread Paul Schmehl
--On February 4, 2013 11:41:45 AM -0500 Greg Larkin glar...@freebsd.org 
wrote:



-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

On 2/4/13 11:21 AM, Paul Schmehl wrote:

I'm the maintainer for security/barnyard2.  The software recently
changed so that all distros are pulled from github.  The developers
made new commits, and now the port is broken, and I cannot figure
out how to fix it.

Here's the relevant code from the Makefile:

PORTNAME=   barnyard2 PORTVERSION=1.11 CATEGORIES=
security

MAINTAINER= pa...@utdallas.edu COMMENT=Interpreter for
Snort unified2 binary output files

LICENSE=GPLv2

USE_GITHUB= yes GH_ACCOUNT= firnsy GH_PROJECT=
${PORTNAME} GH_TAGNAME= master GH_COMMIT=  4dfdc80

The master tagname apparently gets moved to the new commit every
time the developers commit changes.  This is NOT what I want.  I
want the port to stay at the release version until a new version is
released.

I've tried everything I can think of to get this port to pull the
commit I want.  It does not work.  I've tried changing the tagname
to v2-1.11, v2-${PORTVERSION}, stable, dev-next, etc., etc.
Nothing works.

Here's the git site:
https://github.com/firnsy/barnyard2/commits/master

If I pull master, I get commit f57e464.  That's not what I want.
Why doesn't this thing pull the commit I'm telling it to pull?

I'm so frustrated by this I'm about to drop this port.  I do NOT
want to have to update the port every time the developers commit
more code. That is NOT how software should work.

Is there anyone who can tell me how to fix this problem so the port
will remain at the release version until the next version is
released no matter how many commits the developers make?



Hi Paul,

I just changed this line:

GH_TAGNAME= master

to this:

GH_TAGNAME= v2-1.11

and it worked fine.



Thanks, Greg.  That is the correct answer.

--
Paul Schmehl, Senior Infosec Analyst
As if it wasn't already obvious, my opinions
are my own and not those of my employer.
***
It is as useless to argue with those who have
renounced the use of reason as to administer
medication to the dead. Thomas Jefferson
There are some ideas so wrong that only a very
intelligent person could believe in them. George Orwell

___
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: I need help with git

2013-02-04 Thread Shane Ambler





GH_COMMIT=  4dfdc80


Probably not needed if you specify a tag other than master.



If I pull master, I get commit f57e464.  That's not what I want.
Why doesn't this thing pull the commit I'm telling it to pull?


I think the thing most people miss here is that GH_COMMIT doesn't
effect what gets downloaded, it's not used like an svn rev number
- it is only used to define WRKSRC

When a github tarball gets extracted GH_COMMIT is part of the dir name.

Which is why it is mandatory and needs to match the tag. It is just
needed to work with the way github creates tarballs. It is inconvenient
but github is only setup to let you download tarballs of specific tags
not specific commits. If the main devs don't tag the specific points you
want the only option is to fork and create your own tags.
___
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