On Mon, Sep 24, 2012 at 12:42:19PM -0400, Adam Jeanguenat wrote: > I've also given this some testing on -current i386 and have no issues > to report. Great work. > > Looking at http://lteo.net/stuff/snort-2.9.3.1.diff2, I noticed the > use of the auto-generated download IDs as the MASTER_SITES for daq and > snort. I've run into problems before when committing those IDs to > documentation, as I've seen them change within the same snort/daq > release. > > To make life easier, Sourcefire provides a URL that works without > respect to the automatically-incremented ID number for every file upload > to snort.org: > > http://www.snort.org/snort-downloads/cli > > Attached is a patch for net/snort/Makefile, (to be applied after > snort-2.9.3.1.diff2), and a corresponding patch for net/daq/Makefile. > These should make future maintenance a bit easier. > > I tested them both by starting fresh and following the instructions > here in the above URL, then applied both of the patches after > snort-2.9.3.1.diff2, then did a `make` in net/snort. With lteo's patch > daq is built automatically via WANTLIB, so it's not necessary to build > it separately first. > > Any thoughts?
Hi Adam, Thank you for letting us know about the better download URL. For now, I have gone ahead and committed Markus's original diff to make it easier to discuss changes to the Snort port going forward. About your diff, it looks good, but introducing VERSION is generally only needed if DISTNAME and PKGNAME are different (for an example, please look at productivity/taskwarrior/Makefile). I have modified your diff to match against the latest CVS checkout of the DAQ and Snort ports, and confirmed that the downloaded distfiles from that URL match the original checksums. Markus: are you OK with this diff? Thanks, Lawrence Index: daq/Makefile =================================================================== RCS file: /cvs/ports/net/daq/Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 Makefile --- daq/Makefile 26 Sep 2012 01:40:32 -0000 1.1.1.1 +++ daq/Makefile 26 Sep 2012 02:37:46 -0000 @@ -2,12 +2,8 @@ COMMENT = data acquisition library for snort -# Original URL http://www.snort.org/downloads/1850 redirects to a -# time-limited Amazon S3 url. This would mean a bad distfile name. -# The following hack allows it to work but XXX if updating, the -# MASTER_SITES URL will need to be adjusted, not just DISTNAME. DISTNAME = daq-1.1.1 -MASTER_SITES = http://www.snort.org/downloads/1850?/ +MASTER_SITES = http://www.snort.org/dl/snort-current/ CATEGORIES = net Index: snort/Makefile =================================================================== RCS file: /cvs/ports/net/snort/Makefile,v retrieving revision 1.68 diff -u -p -r1.68 Makefile --- snort/Makefile 26 Sep 2012 02:11:05 -0000 1.68 +++ snort/Makefile 26 Sep 2012 02:37:46 -0000 @@ -4,12 +4,8 @@ SHARED_ONLY = Yes COMMENT = highly flexible sniffer/NIDS -# Original URL http://dl.snort.org/downloads/1862 redirects to a -# time-limited Amazon S3 url. This would mean a bad distfile name. -# The following hack allows it to work but XXX if updating, the -# MASTER_SITES URL will need to be adjusted, not just DISTNAME. DISTNAME = snort-2.9.3.1 -MASTER_SITES = http://www.snort.org/downloads/1862?/ +MASTER_SITES = http://www.snort.org/dl/snort-current/ CATEGORIES = net security
