Re: Release date for Privoxy 3.0.19 stable
Lee <[email protected]>
| Newsgroups | gmane.comp.web.privoxy.devel |
|---|---|
| Message-ID | <CAD8GWssPGL0GJGt6CqPM4ei+PzLEVvUApWjSAQJOtYo_E3gLjA@mail.gmail.com> |
On 12/28/11, Fabian Keil <[email protected]> wrote: > Lee <[email protected]> wrote: > >> On 12/28/11, Fabian Keil <[email protected]> wrote: >> > Lee <[email protected]> wrote: >> > >> >> On 12/27/11, Fabian Keil <[email protected]> wrote: >> >> > Lee <[email protected]> wrote: >> > >> >> >> I finally got around to checking email again.. Windows build is up >> >> >> on >> >> >> SF and, after a bit of poking around, privoxy-setup 3.0.19 is the >> >> >> default windows download :) >> >> > >> >> > Great. I assume you built it with IPv6 support? >> >> >> >> Yes. I did the build on a Vista machine using winsetup/GNUmakefile so >> >> the configure options were >> >> ./configure --enable-mingw32 --disable-pthread >> >> --disable-dynamic-pcre --enable-zlib >> > >> > It's unfortunate that --disable-dynamic-pcre seems to be >> > necessary on Windows, but other than that these look like >> > reasonable settings for most users. >> >> All that's required is "./configure --enable-mingw32". > > My main concern (which I didn't clearly articulate above) is that > the outdated internal pcre version is used. At least a few years > ago linking to a more recent version wasn't an option on Windows. Ahh.. yes, I missed that. Does the internal pcre version have modifications to handle the host part of regular expressions in the action files or is it two separate functions? eg .example.com/ matches any host name ending in ".example.com". A normal [??] RE would treat the periods as match any single character. Privoxy doesn't treat periods as wildcards until after a "/" character. >> >> > Do you think it would be feasible to provide both flavours? >> >> >> >> There's a slight problem. Doing a build on Vista after a >> >> ./configure --enable-mingw32 --disable-ipv6-support >> >> dies with >> >> gcc -c -pipe -O2 -DWINVER=0x501 -mwindows -mno-cygwin -Wall -Ipcre >> >> jbsockets.c -o jbsockets.o >> >> jbsockets.c: In function `get_host_information': >> >> jbsockets.c:979: error: `NI_MAXSERV' undeclared (first use in this >> >> function) >> >> jbsockets.c:979: error: (Each undeclared identifier is reported only >> >> once >> >> jbsockets.c:979: error: for each function it appears in.) >> >> make[1]: *** [jbsockets.o] Error 1 >> >> For whatever it's worth >> ./configure --enable-mingw32 --disable-ipv6-support >> make >> on WinXP also dies > > I don't think we can blame it (this time). ^shrug^ it was easy enough to try >> > Interesting. We probably shouldn't use that define when >> > --disable-ipv6-support has been used anyway. >> >> Probably not.. dunno if it's worth the effort to redo the code when we >> could just do a >> #ifndef NI_MAXSERV > > Using our own define, naming it to something like > MAX_PORTSTRING_LENGTH and setting it to NI_MAXSERV > if it's available, and 32 otherwise, would also make > the code easier to read (I think), so I'd consider it > worth it. Whatever you think is best. I got lost trying to figure out how configure did it's thing & ended up putting the define of NI_MAXSERV in jbsockets.c diff -U4 /cvs/privoxy/current/jbsockets.c current/jbsockets.c --- /cvs/privoxy/current/jbsockets.c 2011-12-18 17:00:39.731285800 -0500 +++ current/jbsockets.c 2011-12-28 23:53:48.007010200 -0500 @@ -961,8 +961,16 @@ #endif /* def HAVE_GETHOSTBYADDR_R_(8|7|5)_ARGS */ #endif /* ifndef HAVE_RFC2553 */ s_length = s_length_provided = sizeof(server); + +/* work-around for "./configure --enable-mingw32 --disable-ipv6-support" not + * pulling in whatever it is that defines NI_MAXSERV + */ +#ifndef NI_MAXSERV +#define NI_MAXSERV 32 +#endif /* NI_MAXSERV is undefined */ + if (NULL != hostname) { *hostname = NULL; } That works, http://config.privoxy.org/show-status says FEATURE_IPV6_SUPPORT No Allows IPv6 addresses in incoming requests, when resolving domains to IP addresses and in the configuration files. and ws2_32 is not pulled in as a library: diff -U4 /cvs/privoxy/current//GNUmakefile current/GNUmakefile --- /cvs/privoxy/current//GNUmakefile 2011-12-19 20:54:27.179600000 -0500 +++ current/GNUmakefile 2011-12-28 15:37:16.551010200 -0500 @@ -225,9 +225,9 @@ SRCS = $(C_SRC) $(W32_SRC) $(PCRS_SRC) $(PCRE_SRC) $(REGEX_SRC) OBJS = $(C_OBJS) $(W32_OBJS) $(PCRS_OBJS) $(PCRE_OBJS) $(REGEX_OBJS) HDRS = $(C_HDRS) $(W32_HDRS) $(PCRS_HDRS) $(PCRE_OBJS) $(REGEX_HDRS) -LIBS = -lws2_32 -lz $(W32_LIB) $(SOCKET_LIB) $(PTHREAD_LIB) +LIBS = -lz $(W32_LIB) $(SOCKET_LIB) $(PTHREAD_LIB) So are you OK with adding #ifndef NI_MAXSERV #define NI_MAXSERV 32 #endif /* NI_MAXSERV is undefined */ to jbsockets.c ... at least as a short-term work-around? Lee ------------------------------------------------------------------------------ Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex infrastructure or vast IT resources to deliver seamless, secure access to virtual desktops. With this all-in-one solution, easily deploy virtual desktops for less than the cost of PCs and save 60% on VDI infrastructure costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox