On 2010/07/12 18:00, Markus Lude wrote: > On Fri, Jul 02, 2010 at 11:13:53AM +0100, Stuart Henderson wrote: > > On 2010/07/02 10:49, Markus Lude wrote: > > > > generally looks ok, one thing I noticed though: can't the > > > > workarounds for the timeval conflict just be removed now that > > > > they have changed to timeval32? > > > > > > They only changed those places to sf_timeval32 which have to do with > > > unified output. > > > > > > The problems with calls to ts_print are related with our somewhat > > > special pcap (fixed 32 bit "timeval" instead of long), where differences > > > occur at least on sparc64 (maybe other 64bit archs too). > > > > > > I'll contact upstream to get this added too. > > > > Ah, I'm sorry, I misread the diff-of-a-diff. > > > > > > sorry for the delay reading this..I was hoping that somebody who > > > > uses snort themselves would get to it first ;) > > > > > > Thanks for commenting. > > > > > > Attached is an updated diff against in-tree 2.8.4.1p1. The workaround > > > for sparc64 in Makefile was removed lately. > > > > They have switched file distribution to amazon s3 which must be > > done via a redirect from http://dl.snort.org/downloads/14 > > > > If we use that URL directly we get a distfile named 14 which > > is unhelpful. > > > > We have a couple of options: mirror the distfile, or use some > > hack to get the correct filename: > > > > MASTER_SITES = http://r.spacehopper.org/dl.snort.org/downloads/14__/ > > > > this site runs a simple redirector: > > > > $HTTP["host"] =~ "^r\.spacehopper\.org$" { > > url.redirect = ( > > "^/(.*)__/(.*)" => "http://$1", > > ) > > } > > > > MASTER_SITES = http://dl.snort.org/downloads/14?/ > > > > this adds a bogus querystring which is enough to get a > > good filename out of ftp(1). > > > > Opinions? > > Unfortunatly I currently couldn't mirror the distfile. Any suggestions > so this could finally be committed?
I think I'd just go for the MASTER_SITES hack, if they change something to break it we can deal with it later...