Index: head/www/junkbuster/pkg-descr =================================================================== --- head/www/junkbuster/pkg-descr (revision 139566) +++ head/www/junkbuster/pkg-descr (nonexistent) @@ -1,12 +0,0 @@ -This is a port of The Internet Junkbuster Proxy(TM). An excelent way -to enhance your privacy while browsing the web. And it also happens -to do a great job of filtering out all those annoying banner ads! - -This modified version allows one to specify appearance of blocked GIFs. -It can automatically compress text/html and text/plain documents for clients -which support Accept-Encoding: gzip (e.g. Netscape 4.7, Internet Explorer 5, -Lynx 2.8.3) to save downstream modem/network bandwidth. It uses the zlib -compression library to perform on-the-fly compression of HTML documents. - -WWW: http://www.junkbusters.com/ht/en/ijb.html - http://f2.org/products/ijb-zlib/ Property changes on: head/www/junkbuster/pkg-descr ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.3 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/www/junkbuster/pkg-message =================================================================== --- head/www/junkbuster/pkg-message (revision 139566) +++ head/www/junkbuster/pkg-message (nonexistent) @@ -1,3 +0,0 @@ -Please, review the samples of the configuration files (somewhere in -/usr/local/etc/junkbuster/*.sample) and create your own config files. -Read the junkbuster man-page (man junkbuster) for even more information. Property changes on: head/www/junkbuster/pkg-message ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/www/junkbuster/distinfo =================================================================== --- head/www/junkbuster/distinfo (revision 139566) +++ head/www/junkbuster/distinfo (nonexistent) @@ -1,2 +0,0 @@ -MD5 (ijb-zlib-10.tgz) = 3c410f61eeb7e24641fc7eaf3dc5063e -SIZE (ijb-zlib-10.tgz) = 145917 Property changes on: head/www/junkbuster/distinfo ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.5 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/www/junkbuster/pkg-plist =================================================================== --- head/www/junkbuster/pkg-plist (revision 139566) +++ head/www/junkbuster/pkg-plist (nonexistent) @@ -1,9 +0,0 @@ -sbin/junkbuster -etc/junkbuster/aclfile.sample -etc/junkbuster/blockfile.sample -etc/junkbuster/cookiefile.sample -etc/junkbuster/configfile.sample -etc/junkbuster/forwardfile.sample -etc/junkbuster/trustfile.sample -etc/rc.d/junkbuster.sh -@dirrm etc/junkbuster Property changes on: head/www/junkbuster/pkg-plist ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.4 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/www/junkbuster/Makefile =================================================================== --- head/www/junkbuster/Makefile (revision 139566) +++ head/www/junkbuster/Makefile (nonexistent) @@ -1,66 +0,0 @@ -# New ports collection makefile for: junkbuster -# Date created: 2 May 1998 -# Whom: Ian Struble -# -# $FreeBSD$ - -# You need to delete the old distfile if you are upgrading, as the tar ball -# for ijb has not been changing names between minor revisions(ie 2.0->2.0.1). -# I have contacted the author about this though so we may see something new -# in the next revision. - -PORTNAME= junkbuster -PORTVERSION= 2.0.2 -PORTREVISION= 2 -CATEGORIES= www -MASTER_SITES= http://server44.hypermart.net/f2org/ \ - http://f2.org/download/ \ - http://www.junkbusters.com/ht/en/ -DISTNAME= ijb-zlib-10 -EXTRACT_SUFX= .tgz - -MAINTAINER= ports@FreeBSD.org -COMMENT= An HTTP proxy server that eliminates ads - -FORBIDDEN= http://vuxml.FreeBSD.org/97edf5ab-b319-11d9-837d-000e0c2e438a.html -DEPRECATED= ${FORBIDDEN} -EXPIRATION_DATE=2005-05-23 - -USE_REINPLACE= yes - -ALL_TARGET= # yes, an empty target. -JDIR= ${PREFIX}/etc/junkbuster -MAN1= junkbuster.1 - -.include - -.if ( ${OSVERSION} >= 500000 ) -GNUREGEXP= 's:gnu_regex.h:gnu/regex.h:' -.else -GNUREGEXP= 's:gnu_regex.h:gnuregex.h:' -.endif - -post-patch: - @${REINPLACE_CMD} -e "s:`/usr/bin/printf '\r'`::" ${WRKSRC}/* - @${REINPLACE_CMD} -e ${GNUREGEXP} ${WRKSRC}/*.c - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/junkbuster ${PREFIX}/sbin/junkbuster - ${MKDIR} -m 755 ${JDIR} - ${INSTALL_DATA} ${WRKSRC}/junkbstr.ini ${JDIR}/configfile.sample - ${INSTALL_DATA} ${WRKSRC}/sblock.ini ${JDIR}/blockfile.sample - ${INSTALL_DATA} ${WRKSRC}/saclfile.ini ${JDIR}/aclfile.sample - ${INSTALL_DATA} ${WRKSRC}/scookie.ini ${JDIR}/cookiefile.sample - ${INSTALL_DATA} ${WRKSRC}/sforward.ini ${JDIR}/forwardfile.sample - ${INSTALL_DATA} ${WRKSRC}/strust.ini ${JDIR}/trustfile.sample - $(INSTALL_MAN) ${WRKSRC}/junkbuster.1 $(PREFIX)/man/man1/ -# Create the startup script. JB will run as user nobody. - @${SED} 's|%%JDIR%%|${JDIR}|g ; s|%%PREFIX%%|${PREFIX}|g' \ - ${FILESDIR}/junkbuster.sh.in > ${WRKDIR}/junkbuster.sh - ${INSTALL_SCRIPT} ${WRKDIR}/junkbuster.sh \ - ${PREFIX}/etc/rc.d/junkbuster.sh - -post-install: - @${CAT} ${PKGMESSAGE} - -.include Property changes on: head/www/junkbuster/Makefile ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.19 \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/www/junkbuster/files/patch-aa =================================================================== --- head/www/junkbuster/files/patch-aa (revision 139566) +++ head/www/junkbuster/files/patch-aa (nonexistent) @@ -1,40 +0,0 @@ ---- Makefile.orig Fri Aug 4 15:40:15 2000 -+++ Makefile Fri Nov 3 12:23:48 2000 -@@ -5,20 +5,20 @@ - - # set include and library paths for the zlib compression library - # --ZLIB_INC_FLAGS=-I../zlib --ZLIB_LIB_FLAGS=-L ../zlib -+#ZLIB_INC_FLAGS=-I../zlib -+#ZLIB_LIB_FLAGS=-L ../zlib - - DEFAULT_CFLAGS = -I. $(ZLIB_INC_FLAGS) $(REGEX) -DSTDC_HEADERS -DHAVE_STRING - - PROG = junkbuster - O = o - RM = rm -f --MORE_CFLAGS = -g -+MORE_CFLAGS = - LD = $(CC) $(CFLAGS) $(ZLIB_LIB) - LDFLAGS = -lz - - # use this for Solaris 2.x --#LDFLAGS = -lnsl -lsocket -lz -+LDFLAGS += -lgnuregex - - # use these for SunOS 4.x - #LDFLAGS = -nsl -lz -@@ -63,10 +63,10 @@ - #MORE_CFLAGS = -relax_pointers - #LDFLAGS = -map junkbuster.xMAP - --CFLAGS = $(DEFAULT_CFLAGS) $(MORE_CFLAGS) -+CFLAGS += $(DEFAULT_CFLAGS) $(MORE_CFLAGS) - - OBJS = jcc.$(O) parsers.$(O) filters.$(O) loaders.$(O) bind.$(O) conn.$(O) \ -- encode.$(O) ssplit.$(O) socks4.$(O) acl.$(O) gnu_regex.$(O) win32.$(O) -+ encode.$(O) ssplit.$(O) socks4.$(O) acl.$(O) win32.$(O) - - $(PROG): $(OBJS) - $(LD) -o $(PROG) $(ZLIB_LIB_FLAGS) $(OBJS) $(LDFLAGS) Property changes on: head/www/junkbuster/files/patch-aa ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.5 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/www/junkbuster/files/patch-ag =================================================================== --- head/www/junkbuster/files/patch-ag (revision 139566) +++ head/www/junkbuster/files/patch-ag (nonexistent) @@ -1,12 +0,0 @@ ---- jcc.c.orig Fri Aug 4 14:31:14 2000 -+++ jcc.c Thu Apr 29 15:55:30 2004 -@@ -43,7 +43,8 @@ - #endif - - #include "jcc.h" --#include "zutil.h" -+#include "zlib.h" -+#define DEF_MEM_LEVEL 8 - - char *prog; - Property changes on: head/www/junkbuster/files/patch-ag ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.3 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/www/junkbuster/files/patch-ah =================================================================== --- head/www/junkbuster/files/patch-ah (revision 139566) +++ head/www/junkbuster/files/patch-ah (nonexistent) @@ -1,29 +0,0 @@ -diff -ruN /usr/ports/www/ijb/work/ijb20/loaders.c ./loaders.c ---- /usr/ports/www/ijb/work/ijb20/loaders.c Mon Feb 28 02:35:10 2000 -+++ ./loaders.c Mon Feb 28 02:34:29 2000 -@@ -8,7 +8,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include -@@ -1160,7 +1160,7 @@ - - extern char *acl_rcs, *bind_rcs, *conn_rcs, *encode_rcs, - *jcc_rcs, *loaders_rcs, *parsers_rcs, *filters_rcs, -- *socks4_rcs, *ssplit_rcs, *gnu_regex_rcs, *win32_rcs; -+ *socks4_rcs, *ssplit_rcs, *win32_rcs; - - b = strsav(b, "

Source versions:

\n"); - b = strsav(b, "
");
-@@ -1174,7 +1174,6 @@
- 	sprintf(buf, "%s\n", socks4_rcs    );	b = strsav(b, buf);
- 	sprintf(buf, "%s\n", ssplit_rcs    );	b = strsav(b, buf);
- 	sprintf(buf, "%s\n", acl_rcs       );	b = strsav(b, buf);
--	sprintf(buf, "%s\n", gnu_regex_rcs );	b = strsav(b, buf);
- 	sprintf(buf, "%s\n", win32_rcs     );	b = strsav(b, buf);
- 	b = strsav(b, "
"); - Property changes on: head/www/junkbuster/files/patch-ah ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.2 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/www/junkbuster/files/patch-ai =================================================================== --- head/www/junkbuster/files/patch-ai (revision 139566) +++ head/www/junkbuster/files/patch-ai (nonexistent) @@ -1,10 +0,0 @@ -diff -ruN /usr/ports/www/ijb/work/ijb20/loaders.h ./loaders.h ---- /usr/ports/www/ijb/work/ijb20/loaders.h Wed Dec 31 21:00:00 1969 -+++ ./loaders.h Mon Feb 28 02:22:47 2000 -@@ -0,0 +1,6 @@ -+#ifndef __LOADERS_H_INCLUDE__ -+#define __LOADERS_H_INCLUDE__ -+ -+void * zalloc(int); -+ -+#endif /* __LOADERS_H_INCLUDE__ */ Property changes on: head/www/junkbuster/files/patch-ai ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/www/junkbuster/files/patch-ak =================================================================== --- head/www/junkbuster/files/patch-ak (revision 139566) +++ head/www/junkbuster/files/patch-ak (nonexistent) @@ -1,20 +0,0 @@ ---- socks4.c.orig Fri Aug 4 08:39:21 2000 -+++ socks4.c Thu Apr 29 15:59:20 2004 -@@ -28,6 +28,8 @@ - - #include "jcc.h" - -+#define DEFAULT_FALLBACK_HTTP_PORT 80 -+ - #define SOCKS_REQUEST_GRANTED 90 - #define SOCKS_REQUEST_REJECT 91 - #define SOCKS_REQUEST_IDENT_FAILED 92 -@@ -60,7 +62,7 @@ - unsigned char sbuf[BUFSIZ]; - struct socks_op *c = (struct socks_op *)cbuf; - struct socks_reply *s = (struct socks_reply *)sbuf; -- int web_server_addr; -+ int web_server_addr = DEFAULT_FALLBACK_HTTP_PORT; - int n, csiz, sfd, target_port; - int err = 0; - char *errstr, *target_host; Property changes on: head/www/junkbuster/files/patch-ak ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.2 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/www/junkbuster/files/patch-al =================================================================== --- head/www/junkbuster/files/patch-al (revision 139566) +++ head/www/junkbuster/files/patch-al (nonexistent) @@ -1,10 +0,0 @@ ---- ssplit.c.orig Fri Aug 4 08:39:24 2000 -+++ ssplit.c Thu Apr 29 15:56:41 2004 -@@ -22,6 +22,7 @@ - * l = flag indicating whether to ignore leading field separators - */ - -+#include "loaders.h" - #include /* For free() */ - #include /* Required by jcc.h */ - #include "gnu_regex.h" Property changes on: head/www/junkbuster/files/patch-al ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.3 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/www/junkbuster/files/patch-ao =================================================================== --- head/www/junkbuster/files/patch-ao (revision 139566) +++ head/www/junkbuster/files/patch-ao (nonexistent) @@ -1,633 +0,0 @@ -Obtained from: ftp://ftp.linux.org.uk/pub/linux/rmk/ijb20.rmk.diff - ---- bind.c.orig Fri Nov 30 11:25:23 2001 -+++ bind.c Fri Nov 30 11:33:46 2001 -@@ -45,6 +45,242 @@ - long remote_ip_long; - char *remote_ip_str; - -+#ifdef HAVE_IPV6 -+#ifdef HAVE_POLL -+/* -+ * Do we have the superiour poll() interface? -+ */ -+#include -+ -+static struct pollfd *b_pfd; -+static int nr_fds; -+#else -+/* -+ * Argh, we've only got the select() interface. -+ */ -+#include -+ -+static fd_set sfd; -+static int max_fd; -+#endif -+ -+static int add_fd(fd) -+ int fd; -+{ -+#ifdef HAVE_POLL -+ struct pollfd *n; -+ int nr = nr_fds + 1; -+ -+ n = realloc(b_pfd, nr * sizeof(*n)); -+ if (!n) -+ return -3; -+ -+ n[nr_fds].fd = fd; -+ n[nr_fds].events = POLLIN; -+ -+ b_pfd = n; -+ nr_fds = nr; -+ -+ return 0; -+#else -+ if (fd >= max_fd) -+ max_fd = fd + 1; -+ FD_SET(fd, &sfd); -+ return 0; -+#endif -+} -+ -+/* -+ * Bind one port of an address family, specified by `ai' -+ */ -+static int bind_one(ai) -+ struct addrinfo *ai; -+{ -+ int fd, one = 1; -+ -+ fd = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol); -+ if (fd == -1) { -+ /* -+ * Is it an unsupported family or protocol? -+ * Move along please. -+ */ -+ if (errno == EINVAL || errno == EPROTONOSUPPORT) -+ return -1; -+ -+ /* -+ * Ok, something else went wrong - fatal error. -+ */ -+ return -3; -+ } -+ -+ setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, -+ (char *)&one, sizeof(one)); -+ -+ /* -+ * Now bind the socket. This may fail on Linux. -+ */ -+ if (bind(fd, ai->ai_addr, ai->ai_addrlen) < 0) { -+ close(fd); -+ -+ if (errno == EADDRINUSE) -+ return -2; -+ else -+ return -1; -+ } -+ -+ /* -+ * and ensure that it is listening. -+ */ -+ while (listen(fd, 5) == -1) { -+ if (errno != EINTR) { -+ close(fd); -+ return -1; -+ } -+ } -+ -+ return add_fd(fd); -+} -+ -+/* -+ * BIND-PORT (portnum) -+ * if success, return file descriptor -+ * if failure, returns -2 if address is in use, otherwise -1 -+ */ -+int bind_port (hostnam, portnum) -+char *hostnam; -+int portnum; -+{ -+ struct addrinfo *ai, *aip, aihint; -+ int rc, nr = 0; -+ char serv[NI_MAXSERV]; -+ -+ if (snprintf(serv, NI_MAXSERV, "%d", portnum) >= NI_MAXSERV) -+ return -1; -+ -+ memset(&aihint, 0, sizeof(aihint)); -+ -+ aihint.ai_flags = AI_PASSIVE; -+ aihint.ai_family = PF_UNSPEC; -+ aihint.ai_socktype = SOCK_STREAM; -+ -+ rc = getaddrinfo(hostnam, serv, &aihint, &ai); -+ if (rc) -+ return -1; -+ -+ /* -+ * Go through each entry creating a socket and trying -+ * to bind it. Note that on Linux, if we bind to an -+ * IPv6 address, we can't bind to it's corresponding -+ * IPv4 address, so we bind IPv6 first, then IPv4. -+ * -+ * We classify success as being able to establish at -+ * least one listening socket. -+ */ -+ for (aip = ai; aip; aip = aip->ai_next) { -+ if (aip->ai_family == PF_INET6) { -+ rc = bind_one(aip); -+ if (rc == 0) -+ nr++; -+ } -+ } -+ -+ for (aip = ai; aip; aip = aip->ai_next) { -+ if (aip->ai_family == PF_INET) { -+ rc = bind_one(aip); -+ if (rc == 0) -+ nr++; -+ } -+ } -+ -+ freeaddrinfo(ai); -+ -+ if (nr != 0) -+ rc = 0; -+ -+ return rc; -+} -+ -+/* -+ * ACCEPT-CONNECTION -+ * the argument, fd, is the value returned from bind_port -+ * -+ * when a connection is accepted, it returns the file descriptor -+ * for the connected port -+ */ -+int accept_connection (_fd) -+int _fd; -+{ -+ struct sockaddr_storage sa; -+ int afd, alen = sizeof(sa); -+ char host[NI_MAXHOST]; -+ int rc, fd; -+ -+#ifdef HAVE_POLL -+ int i; -+ -+ do { -+ rc = poll(b_pfd, nr_fds, -1); -+ } while (rc == 0 || (rc == -1 && errno == EINTR)); -+ -+ /* -+ * I wish we could spawn the handler here. Alas, without -+ * rewriting more of ijb... -+ */ -+ for (i = 0; i < nr_fds; i++) -+ if (b_pfd[i].revents) -+ break; -+ -+ /* -+ * hmm, if we ran out of fds to check, someone lied to us. -+ */ -+ if (i >= nr_fds) -+ return -1; -+ -+ fd = b_pfd[i].fd; -+#else -+ fd_set rfds; -+ -+ rfds = sfd; -+ do { -+ rc = select(max_fd, &rfds, NULL, NULL, NULL); -+ } while (rc == 0 || (rc == -1 && errno == EINTR)); -+ -+ /* -+ * Find the first fd. Same comment as above. -+ */ -+ for (fd = 0; fd < max_fd; fd++) -+ if (FD_ISSET(fd, &rfds)) -+ break; -+ -+ /* -+ * If we found no fds, someone lied to us. -+ */ -+ if (fd >= max_fd) -+ return -1; -+ -+#endif -+ afd = accept(fd, (struct sockaddr *)&sa, &alen); -+ if (afd < 0) -+ return -1; -+ -+ if (getnameinfo((struct sockaddr *)&sa, alen, -+ host, NI_MAXHOST, -+ NULL, 0, NI_NUMERICHOST)) -+ strcpy(host, "unknown"); -+ -+ remote_ip_str = strdup(host); -+ remote_ip_long = 0; -+ -+ return afd; -+} -+#else -+/* -+ * -------------------------------- IPv4 ---------------------------- -+ */ -+ -+extern int atoip(); -+ -+ - /* - * BIND-PORT (portnum) - * if success, return file descriptor -@@ -100,7 +336,6 @@ - return fd; - } - -- - /* - * ACCEPT-CONNECTION - * the argument, fd, is the value returned from bind_port -@@ -128,3 +363,5 @@ - - return afd; - } -+#endif -+ ---- conn.c.orig Fri Nov 30 11:25:23 2001 -+++ conn.c Fri Nov 30 11:30:30 2001 -@@ -41,6 +41,10 @@ - #include "gnuregex.h" - #endif - -+#ifdef HAVE_POLL -+#include -+#endif -+ - #include "jcc.h" - - int -@@ -82,14 +86,127 @@ - return(inaddr.sin_addr.s_addr); - } - -+#ifdef HAVE_IPV6 -+int connect_to(char *host, int portnum, struct client_state *csp) -+{ -+ struct addrinfo *ai, *aip, aihint; -+ int fd = -1, rc; -+ char serv[NI_MAXSERV]; -+ -+ if (snprintf(serv, NI_MAXSERV, "%d", portnum) >= NI_MAXSERV) { -+ errno = EOVERFLOW; -+ return -1; -+ } -+ -+ memset(&aihint, 0, sizeof(aihint)); -+ -+ aihint.ai_family = PF_UNSPEC; -+ aihint.ai_socktype = SOCK_STREAM; -+ -+ rc = getaddrinfo(host, serv, &aihint, &ai); -+ if (rc) -+ return -1; -+ -+ /* -+ * Go through each entry trying to connect to the host. -+ */ -+ for (aip = ai; aip; aip = aip->ai_next) { -+ int flags; -+ -+ fd = socket(aip->ai_family, aip->ai_socktype, aip->ai_protocol); -+ if (fd == -1) -+ continue; -+ -+#ifdef TCP_NODELAY /* turn off TCP coalescence */ -+ { -+ int mi = 1; -+ setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (char *)&mi, sizeof(mi)); -+ } -+#endif -+#if !defined(_WIN32) && !defined(__BEOS__) -+ flags = fcntl(fd, F_GETFL, 0); -+ if (flags != -1) -+ fcntl(fd, F_SETFL, flags | O_NDELAY); -+#endif -+ do { -+ rc = connect(fd, aip->ai_addr, aip->ai_addrlen); -+ } while (rc == -1 && errno == EINTR); -+ -+ if (rc == -1 && errno != EINPROGRESS) { -+ close(fd); -+ fd = -1; -+ continue; -+ } -+ -+ /* -+ * Ok, the connection is in progress. -+ */ -+#if !defined(_WIN32) && !defined(__BEOS__) -+ if (flags != -1) -+ fcntl(fd, F_SETFL, flags); -+#endif -+ { -+#ifdef HAVE_POLL -+ struct pollfd pfd; -+ -+ pfd.fd = fd; -+ pfd.events = POLLOUT | POLLERR | POLLHUP; -+ -+ if (poll(&pfd, 1, 30000) <= 0) { -+ close(fd); -+ fd = -1; -+ continue; -+ } -+ -+ if (pfd.revents & (POLLERR|POLLHUP)) { -+ close(fd); -+ fd = -1; -+ continue; -+ } -+#else -+ fd_set rfds, wfds; -+ struct timeval tv[1]; -+ -+ FD_ZERO(&rfds); -+ FD_ZERO(&wfds); -+ FD_SET(fd, &rfds); -+ FD_SET(fd, &wfds); -+ -+ tv->tv_sec = 30; -+ tv->tv_usec = 0; -+ -+ if (select(fd + 1, &rfds, &wfds, NULL, tv) <= 0) { -+ (void) close(fd); -+ fd = -1; -+ continue; -+ } -+ -+ if (FD_ISSET(fd, &rfds) && FD_ISSET(fd, &wfds)) { -+ int r = 0, l = sizeof(r); -+ -+ if (getsockopt(fd, SOL_SOCKET, SO_ERROR, &r, &l) -+ || r) { -+ (void) close(fd); -+ fd = -1; -+ continue; -+ } -+ } -+#endif -+ } -+ break; -+ } -+ -+ freeaddrinfo(ai); - -+ return fd; -+} -+ -+#else - int - connect_to(char *host, int portnum, struct client_state *csp) - { - struct sockaddr_in inaddr; - int fd, addr; -- fd_set wfds; -- struct timeval tv[1]; - int flags; - struct access_control_addr src[1], dst[1]; - -@@ -122,23 +239,19 @@ - } - - #ifdef TCP_NODELAY --{ /* turn off TCP coalescence */ -- int mi = 1; -- setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (char * ) &mi, sizeof (int)); --} -+ { /* turn off TCP coalescence */ -+ int mi = 1; -+ setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (char * ) &mi, sizeof (int)); -+ } - #endif -- --#ifndef _WIN32 --#ifndef __BEOS__ -+#if !defined(_WIN32) && !defined(__BEOS__) - if ((flags = fcntl(fd, F_GETFL, 0)) != -1) { - flags |= O_NDELAY; - fcntl(fd, F_SETFL, flags); - } - #endif --#endif - - while (connect(fd, (struct sockaddr *) & inaddr, sizeof inaddr) == -1) { -- - #ifdef _WIN32 - if (errno == WSAEINPROGRESS) - #else -@@ -154,25 +267,59 @@ - } - } - --#ifndef _WIN32 --#ifndef __BEOS__ -+#if !defined(_WIN32) && !defined(__BEOS__) - if (flags != -1) { - flags &= ~O_NDELAY; - fcntl(fd, F_SETFL, flags); - } - #endif --#endif - -- /* wait for connection to complete */ -- FD_ZERO(&wfds); -- FD_SET(fd, &wfds); -+ { -+#ifdef HAVE_POLL -+ struct pollfd pfd; -+ -+ pfd.fd = fd; -+ pfd.events = POLLOUT | POLLERR | POLLHUP; -+ -+ if (poll(&pfd, 1, 30000) <= 0) { -+ close(fd); -+ return -1; -+ } - -- tv->tv_sec = 30; -- tv->tv_usec = 0; -+ if (pfd.revents & (POLLERR|POLLHUP)) { -+ close(fd); -+ return -1; -+ } -+#else -+ fd_set rfds, wfds; -+ struct timeval tv[1]; - -- if (select(fd + 1, NULL, &wfds, NULL, tv) <= 0) { -- (void) close(fd); -- return(-1); -+ /* wait for connection to complete */ -+ FD_ZERO(&rfds); -+ FD_ZERO(&wfds); -+ FD_SET(fd, &rfds); -+ FD_SET(fd, &wfds); -+ -+ tv->tv_sec = 30; -+ tv->tv_usec = 0; -+ -+ if (select(fd + 1, &rfds, &wfds, NULL, tv) <= 0) { -+ (void) close(fd); -+ return(-1); -+ } -+ -+ if (FD_ISSET(fd, &rfds) && FD_ISSET(fd, &wfds)) { -+ int r = 0, l = sizeof(r); -+ -+ if (getsockopt(fd, SOL_SOCKET, SO_ERROR, &r, &l) -+ || r) { -+ (void) close(fd); -+ fd = -1; -+ } -+ } -+#endif - } -+ - return(fd); - } -+#endif ---- jcc.c.orig Fri Nov 30 11:25:24 2001 -+++ jcc.c Fri Nov 30 11:30:30 2001 -@@ -32,9 +32,13 @@ - #include /* declarations for threads and stuff. */ - #endif - -+#ifdef HAVE_POLL -+#include -+#else - #ifndef FD_ZERO - #include - #endif -+#endif - - #endif - -@@ -640,7 +644,26 @@ - - server_body = 0; - -+#ifdef HAVE_POLL -+ fds[0].fd = csp->cfd; -+ fds[0].events = POLLIN|POLLHUP; -+ fds[1].fd = csp->sfd; -+ fds[1].events = POLLIN|POLLHUP; -+#endif -+ - for(;;) { -+#ifdef HAVE_POLL -+ n = poll(fds, 2, -1); -+ -+ if (n < 0) { -+ fprintf(logfp, "%s: poll() failed!: ", prog); -+ fperror(logfp, ""); -+ return; -+ } -+ -+#define IS_CLIENT() (fds[0].revents & POLLIN) -+#define IS_SERVER() (fds[1].revents & POLLIN) -+#else - FD_ZERO(&rfds); - - FD_SET(csp->cfd, &rfds); -@@ -653,12 +676,14 @@ - fperror(logfp, ""); - return; - } -- -+#define IS_CLIENT() FD_ISSET(csp->cfd, &rfds) -+#define IS_SERVER() FD_ISSET(csp->sfd, &rfds) -+#endif - /* this is the body of the browser's request - * just read it and write it. - */ - -- if(FD_ISSET(csp->cfd, &rfds)) { -+ if(IS_CLIENT()) { - - n = read_socket(csp->cfd, buf, sizeof(buf)); - -@@ -679,7 +704,7 @@ - * otherwise it's the body - */ - -- if(FD_ISSET(csp->sfd, &rfds)) { -+ if(IS_SERVER()) { - - n = read_socket(csp->sfd, buf, sizeof(buf)); - ---- jcc.h.orig Fri Nov 30 11:25:24 2001 -+++ jcc.h Fri Nov 30 11:37:12 2001 -@@ -339,6 +339,7 @@ - extern void client_cookie_adder(struct client_state *csp); - extern void client_xtra_adder(struct client_state *csp); - extern void client_x_forwarded_adder(struct client_state *csp); -+extern void server_conn_close_adder(struct client_state *csp); - - /* interceptors from filters.c - */ ---- parsers.c.orig Fri Nov 30 11:25:24 2001 -+++ parsers.c Fri Nov 30 11:30:30 2001 -@@ -32,6 +32,7 @@ - { "cookie:", 7, client_send_cookie }, - { "x-forwarded-for:", 16, client_x_forwarded }, - { "proxy-connection:", 17, crumble }, -+ { "keep-alive:", 11, crumble }, - /* { "if-modified-since:", 18, crumble }, */ - { NULL, 0, NULL } - }; -@@ -57,6 +58,7 @@ - }; - - void (*add_server_headers[])() = { -+ server_conn_close_adder, /* for http/1.1 */ - NULL - }; - -@@ -608,6 +610,12 @@ - if(csp->accept_server_cookie == 0) return(crumble(v, s, csp)); - - return(strdup(s)); -+} -+ -+void server_conn_close_adder(struct client_state *csp) -+{ -+ char *p = strsav(NULL, "Connection: close"); -+ enlist(csp->headers, p); - } - - /* case insensitive string comparison */ ---- socks4.c.orig Fri Nov 30 11:25:25 2001 -+++ socks4.c Fri Nov 30 11:30:31 2001 -@@ -11,6 +11,7 @@ - - - #include -+#include - #include - #include - -@@ -112,6 +113,8 @@ - strcpy(((char *)cbuf) + csiz, http->host); - csiz = n; - break; -+ default: -+ return -1; /* oops */ - } - - c->vn = 4; Property changes on: head/www/junkbuster/files/patch-ao ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/www/junkbuster/files/junkbuster.sh.in =================================================================== --- head/www/junkbuster/files/junkbuster.sh.in (revision 139566) +++ head/www/junkbuster/files/junkbuster.sh.in (nonexistent) @@ -1,33 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -case $1 in -start) - if [ -d %%JDIR%% \ - -a -x %%PREFIX%%/sbin/junkbuster \ - -a -f %%JDIR%%/configfile ]; then - : seems OK - else - echo >&2 "$0: missing files!" - exit 1 - fi - cd %%JDIR%% - su -m nobody -c "%%PREFIX%%/sbin/junkbuster configfile &" \ - >/dev/null \ - && echo -n " junkbuster" \ - || echo " junkbuster FAILED TO START" - ;; -stop) - killall junkbuster && echo -n " junkbuster" - ;; -restart) - $0 stop - $0 start - ;; -*) - echo "Usage: `basename $0` {start|stop}" >&2 - exit 64 - ;; -esac - -exit 0 Property changes on: head/www/junkbuster/files/junkbuster.sh.in ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.6 \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/www/junkbuster/files/patch-junkbstr.ini =================================================================== --- head/www/junkbuster/files/patch-junkbstr.ini (revision 139566) +++ head/www/junkbuster/files/patch-junkbstr.ini (nonexistent) @@ -1,11 +0,0 @@ ---- junkbstr.ini.orig Fri Oct 30 22:58:48 1998 -+++ junkbstr.ini Sat Mar 11 11:45:45 2000 -@@ -126,3 +126,8 @@ - # debugging output "in order" for easy reading. - # - #single-threaded -+ -+# tinygif allows you to change the appearance of blocked images -+# tinygif 0 # Show a "broken icon" -+# tinygif 1 # Show a GIF of one transparent pixel -+# tinygif 2 # Show a GIF with the word "JUNKBUSTER" Property changes on: head/www/junkbuster/files/patch-junkbstr.ini ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/www/junkbuster/files/patch-junkbuster.1 =================================================================== --- head/www/junkbuster/files/patch-junkbuster.1 (revision 139566) +++ head/www/junkbuster/files/patch-junkbuster.1 (nonexistent) @@ -1,20 +0,0 @@ ---- junkbuster.1.orig Fri Oct 30 22:58:48 1998 -+++ junkbuster.1 Sat Mar 11 11:49:54 2000 -@@ -215,6 +215,17 @@ - In version 1.3 and later - the blockfile and cookiefile are checked for changes before each request. - .TP -+tinygif \fIN\fP -+Set appearance of blocked GIFs. You can select one of the following -+values: -+.br -+.br -+\h'-\w"0 = "u'0 = Show a ``broken icon'' in the browser -+.br -+\h'-\w"1 = "u'1 = Show a one pixel transparent GIF -+.br -+\h'-\w"2 = "u'2 = Show a GIF with the word ``JUNKBUSTER'' in it -+.TP - .\" anchor: o_w wafer - \fI-w NAME=VALUE\fP (Old) wafer \fINAME=VALUE\fP (New) - Specifies a pair to be sent as a cookie with every request Property changes on: head/www/junkbuster/files/patch-junkbuster.1 ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/www/junkbuster/files/patch-jcc.c =================================================================== --- head/www/junkbuster/files/patch-jcc.c (revision 139566) +++ head/www/junkbuster/files/patch-jcc.c (nonexistent) @@ -1,75 +0,0 @@ ---- jcc.c.orig Sun Sep 23 10:38:37 2001 -+++ jcc.c Sun Sep 23 10:39:23 2001 -@@ -100,9 +100,27 @@ - - char DEFAULT_USER_AGENT[] ="User-Agent: Mozilla/3.01Gold (Macintosh; I; 68K)"; - -+char BLANKGIF[] = "HTTP/1.0 200 OK\r\n" -+ "Content-type: image/gif\r\n\r\n" -+ "GIF89a\001\000\001\000\200\000\000\377\377\377\000\000" -+ "\000!\371\004\001\000\000\000\000,\000\000\000\000\001" -+ "\000\001\000\000\002\002D\001\000;"; -+ -+char JBGIF[] = "HTTP/1.0 200 OK\r\n" -+ "Content-type: image/gif\r\n\r\n" -+ "GIF89aD\000\013\000\360\000\000\000\000\000\377\377\377!" -+ "\371\004\001\000\000\001\000,\000\000\000\000D\000\013\000" -+ "\000\002a\214\217\251\313\355\277\000\200G&K\025\316hC\037" -+ "\200\234\230Y\2309\235S\230\266\206\372J\253<\3131\253\271" -+ "\270\215\342\254\013\203\371\202\264\334P\207\332\020o\266" -+ "N\215I\332=\211\312\3513\266:\026AK)\364\370\365aobr\305" -+ "\372\003S\275\274k2\354\254z\347?\335\274x\306^9\374\276" -+ "\037Q\000\000;"; -+ - int debug = 0; - int multi_threaded = 1; - int hideConsole = 0; -+int tinygif = 0; - - char *logfile = NULL; - FILE *logfp; -@@ -351,6 +369,9 @@ - struct http_request *http; - char *iob_buf; - int iob_len; -+ char *my_image_regexp = ".*(\\.gif|\\.jpe?g|\\gif$|\\jpe?g$)"; -+ regex_t my_regexp; -+ int errcode; - - - http = csp->http; -@@ -493,7 +514,21 @@ - prog, http->hostport, http->path); - } - -- write_socket(csp->cfd, p, strlen(p)); -+ if (tinygif > 0) { -+ errcode = regcomp(&my_regexp, my_image_regexp, -+ (REG_EXTENDED|REG_NOSUB|REG_ICASE)); -+ -+ if (regexec( &my_regexp, http->path, 0, NULL, 0) == 0) { -+ if (tinygif == 1) -+ write_socket(csp->cfd, BLANKGIF, sizeof(BLANKGIF)-1); -+ else -+ write_socket(csp->cfd, JBGIF, sizeof(JBGIF)-1); -+ } else { -+ write_socket(csp->cfd, p, strlen(p)); -+ } -+ regfree( &my_regexp ); -+ } else -+ write_socket(csp->cfd, p, strlen(p)); - - if(DEBUG(LOG)) fwrite(p, strlen(p), 1, logfp); - -@@ -926,6 +961,11 @@ - - if(strcmp(cmd, "debug") == 0) { - debug |= atoi(arg); -+ continue; -+ } -+ -+ if(strcmp(cmd, "tinygif") == 0) { -+ tinygif = atoi(arg); - continue; - } - Property changes on: head/www/junkbuster/files/patch-jcc.c ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.2 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/www/Makefile =================================================================== --- head/www/Makefile (revision 139566) +++ head/www/Makefile (revision 139567) @@ -1,866 +1,865 @@ # $FreeBSD$ # COMMENT = Ports related to the World Wide Web SUBDIR += MT SUBDIR += MT-PM SUBDIR += WebMagick SUBDIR += abcache SUBDIR += admuser SUBDIR += adzap SUBDIR += adzap2squirm SUBDIR += akregator SUBDIR += amaya SUBDIR += amphetadesk SUBDIR += amyc SUBDIR += analog SUBDIR += aolserver SUBDIR += apache-contrib SUBDIR += apache-forrest SUBDIR += apache-jserv SUBDIR += apache13 SUBDIR += apache13+ipv6 SUBDIR += apache13-modperl SUBDIR += apache13-modssl SUBDIR += apache13-modssl+ipv6 SUBDIR += apache13-ssl SUBDIR += apache2 SUBDIR += apache21 SUBDIR += arena SUBDIR += aria SUBDIR += ashe # requires Motif SUBDIR += asp2php SUBDIR += aswedit SUBDIR += aswiki SUBDIR += august SUBDIR += auth_ldap SUBDIR += autoindex SUBDIR += autoindex2 SUBDIR += awstats SUBDIR += axis SUBDIR += b2evo SUBDIR += bblog SUBDIR += bins SUBDIR += bk2site SUBDIR += bk_edit SUBDIR += bkmrkconv SUBDIR += bluefish SUBDIR += boa SUBDIR += bookmarkbridge SUBDIR += bozohttpd SUBDIR += bricolage SUBDIR += bugmenot SUBDIR += bugmenot-firefox SUBDIR += cadaver SUBDIR += calamaris SUBDIR += caudium10 SUBDIR += caudium12 SUBDIR += cgi-lib SUBDIR += cgi-lib.pl SUBDIR += cgic SUBDIR += cgicc SUBDIR += cgichk SUBDIR += cgihtml SUBDIR += cgiparse SUBDIR += cgiwrap SUBDIR += checkbot SUBDIR += cheetah SUBDIR += cherokee SUBDIR += chimera SUBDIR += chpasswd SUBDIR += chtml SUBDIR += cl-lml SUBDIR += cl-lml-clisp SUBDIR += cl-lml-cmucl SUBDIR += cl-lml-sbcl SUBDIR += clearsilver SUBDIR += clearsilver-python SUBDIR += cocoon SUBDIR += comclear SUBDIR += coppermine SUBDIR += crawl SUBDIR += crp SUBDIR += css-mode.el SUBDIR += cssed SUBDIR += cybercalendar SUBDIR += dansguardian SUBDIR += dansguardian-devel SUBDIR += decss SUBDIR += demoroniser SUBDIR += dhttpd SUBDIR += dillo SUBDIR += dokuwiki SUBDIR += dotproject SUBDIR += dpsearch SUBDIR += drupal SUBDIR += dtse SUBDIR += dummyflash SUBDIR += eaccelerator SUBDIR += eldav.el SUBDIR += elinks SUBDIR += emacs-w3m SUBDIR += emacs-w3m-emacs20 SUBDIR += emacs-w3m-xemacs21-mule SUBDIR += emp SUBDIR += epiphany SUBDIR += epiphany-extensions SUBDIR += erwn SUBDIR += evg SUBDIR += evolution-webcal SUBDIR += fcgi SUBDIR += feedonfeeds SUBDIR += ffproxy SUBDIR += fhttpd SUBDIR += firefox SUBDIR += firefox-remote SUBDIR += flashplugin SUBDIR += flashplugin-mozilla SUBDIR += flashpluginwrapper SUBDIR += flood SUBDIR += fnord SUBDIR += formication SUBDIR += frontpage SUBDIR += frontpage-ar SUBDIR += frontpage-de SUBDIR += frontpage-es SUBDIR += frontpage-fr SUBDIR += frontpage-he SUBDIR += frontpage-it SUBDIR += frontpage-ja SUBDIR += frontpage-ko SUBDIR += frontpage-nl SUBDIR += frontpage-sv SUBDIR += frontpage-th SUBDIR += frontpage-zh SUBDIR += fswiki SUBDIR += fxhtml SUBDIR += g-gcl SUBDIR += galeon SUBDIR += gallery SUBDIR += gatling SUBDIR += gecko-sharp SUBDIR += geeklog SUBDIR += geolizer SUBDIR += gforge SUBDIR += glibwww SUBDIR += gnome-user-share SUBDIR += gnuinfo SUBDIR += google-sitemapgen SUBDIR += goose SUBDIR += gtkhtml SUBDIR += gtkhtml3 SUBDIR += guile-www SUBDIR += gurlchecker SUBDIR += harvest SUBDIR += horde SUBDIR += horde-passwd SUBDIR += horde-php5 SUBDIR += hotjava SUBDIR += htdump SUBDIR += html2hdml SUBDIR += html2wml SUBDIR += htmlobject SUBDIR += htmlpp SUBDIR += http-analyze SUBDIR += http_get SUBDIR += http_load SUBDIR += httpgrabber SUBDIR += httptunnel SUBDIR += httrack SUBDIR += hydra SUBDIR += hypermail SUBDIR += igal SUBDIR += imgsizer SUBDIR += indexme SUBDIR += instiki SUBDIR += interchange SUBDIR += ismail SUBDIR += jakarta-jmeter SUBDIR += jakarta-tomcat3 SUBDIR += jakarta-tomcat4 SUBDIR += jakarta-tomcat41 SUBDIR += jakarta-tomcat5 SUBDIR += jakarta-tomcat55 SUBDIR += jdresolve SUBDIR += jesred SUBDIR += jetspeed SUBDIR += jetty - SUBDIR += junkbuster SUBDIR += jwchat SUBDIR += kannel SUBDIR += kazehakase SUBDIR += kdewebdev SUBDIR += knowledgekit SUBDIR += larbin SUBDIR += libghttp SUBDIR += libgtkhtml SUBDIR += libhttpd-persistent SUBDIR += libwww SUBDIR += lighttpd SUBDIR += linkcheck SUBDIR += linkchecker SUBDIR += links SUBDIR += links1 SUBDIR += linux-beonex SUBDIR += linux-firefox SUBDIR += linux-flashplugin SUBDIR += linux-flashplugin6 SUBDIR += linux-flashplugin7 SUBDIR += linux-lesstif-ns SUBDIR += linux-mozilla SUBDIR += linux-mozilla-devel SUBDIR += linux-nvu SUBDIR += linux-opera SUBDIR += linux-sunbird SUBDIR += linuxpluginwrapper SUBDIR += ljdeps SUBDIR += ljpms SUBDIR += ljsm SUBDIR += logtools SUBDIR += lws SUBDIR += lynx SUBDIR += lynx-current SUBDIR += lynx-ssl SUBDIR += mambo SUBDIR += man2web SUBDIR += mapedit SUBDIR += mathopd SUBDIR += mdw SUBDIR += mediawiki SUBDIR += mediawiki13 SUBDIR += mergelog SUBDIR += mgstat SUBDIR += mhonarc SUBDIR += micro_httpd SUBDIR += middleman SUBDIR += mini_httpd SUBDIR += mkapachepw SUBDIR += mknmz-wwwoffle SUBDIR += mmosaic SUBDIR += mnogosearch SUBDIR += mnogosearch31 SUBDIR += mod_access_identd SUBDIR += mod_access_referer SUBDIR += mod_accesscookie SUBDIR += mod_accounting SUBDIR += mod_auth_any SUBDIR += mod_auth_cookie_mysql SUBDIR += mod_auth_cookie_mysql2 SUBDIR += mod_auth_external SUBDIR += mod_auth_external2 SUBDIR += mod_auth_imap SUBDIR += mod_auth_imap2 SUBDIR += mod_auth_kerb SUBDIR += mod_auth_mysql SUBDIR += mod_auth_mysql41_ap2 SUBDIR += mod_auth_mysql_another SUBDIR += mod_auth_pam SUBDIR += mod_auth_pam2 SUBDIR += mod_auth_pgsql SUBDIR += mod_auth_pgsql2 SUBDIR += mod_auth_pwcheck SUBDIR += mod_auth_remote SUBDIR += mod_auth_useragent SUBDIR += mod_authenticache SUBDIR += mod_backhand SUBDIR += mod_bandwidth SUBDIR += mod_bf SUBDIR += mod_blosxom SUBDIR += mod_blowchunks SUBDIR += mod_bunzip2 SUBDIR += mod_cfg_ldap SUBDIR += mod_cgi_debug SUBDIR += mod_chroot SUBDIR += mod_clamav SUBDIR += mod_color SUBDIR += mod_cvs SUBDIR += mod_cvs2 SUBDIR += mod_dav SUBDIR += mod_dosevasive20 SUBDIR += mod_dtcl SUBDIR += mod_encoding SUBDIR += mod_extract_forwarded SUBDIR += mod_extract_forwarded2 SUBDIR += mod_fastcgi SUBDIR += mod_fcgid SUBDIR += mod_filter SUBDIR += mod_frontpage SUBDIR += mod_frontpage2-rtr SUBDIR += mod_frontpage-rtr SUBDIR += mod_geoip SUBDIR += mod_gzip SUBDIR += mod_hosts_access SUBDIR += mod_index_rss SUBDIR += mod_injection SUBDIR += mod_jk SUBDIR += mod_jk-apache2 SUBDIR += mod_jk2 SUBDIR += mod_jk2-apache2 SUBDIR += mod_layout SUBDIR += mod_layout2 SUBDIR += mod_limitipconn SUBDIR += mod_limitipconn2 SUBDIR += mod_log_config-st SUBDIR += mod_log_data SUBDIR += mod_log_mysql SUBDIR += mod_log_spread SUBDIR += mod_log_sql SUBDIR += mod_log_sql2 SUBDIR += mod_macro SUBDIR += mod_macro2 SUBDIR += mod_mp3 SUBDIR += mod_musicindex SUBDIR += mod_mya SUBDIR += mod_mylo SUBDIR += mod_mysqluserdir SUBDIR += mod_ntlm SUBDIR += mod_pcgi2 SUBDIR += mod_perl SUBDIR += mod_perl2 SUBDIR += mod_php4 SUBDIR += mod_php5 SUBDIR += mod_proxy_add_forward SUBDIR += mod_proxy_html SUBDIR += mod_put SUBDIR += mod_python SUBDIR += mod_python3 SUBDIR += mod_realip SUBDIR += mod_roaming SUBDIR += mod_roaming2 SUBDIR += mod_rpaf SUBDIR += mod_rpaf2 SUBDIR += mod_ruby SUBDIR += mod_scgi SUBDIR += mod_security SUBDIR += mod_sed SUBDIR += mod_sequester SUBDIR += mod_shapvh SUBDIR += mod_snake SUBDIR += mod_sqlinclude SUBDIR += mod_ticket SUBDIR += mod_tidy SUBDIR += mod_traf_thief SUBDIR += mod_transform SUBDIR += mod_trigger SUBDIR += mod_tsunami SUBDIR += mod_uid SUBDIR += mod_v2h SUBDIR += mod_vdbh SUBDIR += mod_vhs SUBDIR += mod_webapp SUBDIR += mod_zap SUBDIR += moinmoin SUBDIR += momspider SUBDIR += monkey SUBDIR += mozex SUBDIR += mozex-firefox SUBDIR += mozilla SUBDIR += mozilla-bonobo SUBDIR += mozilla-devel SUBDIR += mozplugger SUBDIR += mplayer-plugin SUBDIR += myghty SUBDIR += nanoblogger SUBDIR += nd SUBDIR += neon SUBDIR += neowebscript SUBDIR += netrik SUBDIR += netscape-remote SUBDIR += netscape-wrapper SUBDIR += nginx SUBDIR += notftp SUBDIR += npc SUBDIR += nscache SUBDIR += nspostgres SUBDIR += nvu SUBDIR += ocaml-net SUBDIR += ocaml-wdialog SUBDIR += oops SUBDIR += openvrml SUBDIR += opera SUBDIR += osb-browser SUBDIR += osb-nrcit SUBDIR += osb-nrcore SUBDIR += oscommerce SUBDIR += p5-AMF-Perl SUBDIR += p5-Acme-Monta SUBDIR += p5-Apache-ASP SUBDIR += p5-Apache-AddHostPath SUBDIR += p5-Apache-Admin-Config SUBDIR += p5-Apache-AntiSpam SUBDIR += p5-Apache-Archive SUBDIR += p5-Apache-AuthCookie SUBDIR += p5-Apache-AuthTicket SUBDIR += p5-Apache-AuthenCache SUBDIR += p5-Apache-AuthenURL SUBDIR += p5-Apache-AutoIndex SUBDIR += p5-Apache-AxKit-Plugin-AddXSLParams-Request SUBDIR += p5-Apache-Clean SUBDIR += p5-Apache-Compress SUBDIR += p5-Apache-CompressClientFixup SUBDIR += p5-Apache-ConfigFile SUBDIR += p5-Apache-DB SUBDIR += p5-Apache-DBI SUBDIR += p5-Apache-DebugInfo SUBDIR += p5-Apache-DumpHeaders SUBDIR += p5-Apache-Filter SUBDIR += p5-Apache-Gallery SUBDIR += p5-Apache-GopherHandler SUBDIR += p5-Apache-Icon SUBDIR += p5-Apache-Language SUBDIR += p5-Apache-MP3 SUBDIR += p5-Apache-NNTPGateway SUBDIR += p5-Apache-PageKit SUBDIR += p5-Apache-ParseFormData SUBDIR += p5-Apache-Peek SUBDIR += p5-Apache-Profiler SUBDIR += p5-Apache-Radius SUBDIR += p5-Apache-Reload SUBDIR += p5-Apache-SSI SUBDIR += p5-Apache-Scoreboard SUBDIR += p5-Apache-Session SUBDIR += p5-Apache-Session-PHP SUBDIR += p5-Apache-Session-SQLite3 SUBDIR += p5-Apache-Session-SharedMem SUBDIR += p5-Apache-Session-Wrapper SUBDIR += p5-Apache-Singleton SUBDIR += p5-Apache-SubProcess SUBDIR += p5-Apache-Test SUBDIR += p5-Apache2-Scoreboard SUBDIR += p5-ApacheBench SUBDIR += p5-AxKit SUBDIR += p5-AxKit-XSP-Cookie SUBDIR += p5-AxKit-XSP-ESQL SUBDIR += p5-AxKit-XSP-Exception SUBDIR += p5-AxKit-XSP-IfParam SUBDIR += p5-AxKit-XSP-Param SUBDIR += p5-AxKit-XSP-PerForm SUBDIR += p5-AxKit-XSP-Sendmail SUBDIR += p5-AxKit-XSP-Util SUBDIR += p5-AxKit-XSP-WebUtils SUBDIR += p5-B-LexInfo SUBDIR += p5-Bundle-Catalyst SUBDIR += p5-Bundle-Slash SUBDIR += p5-Bundle-Sledge SUBDIR += p5-CGI-Application SUBDIR += p5-CGI-Application-ValidateRM SUBDIR += p5-CGI-ArgChecker SUBDIR += p5-CGI-Builder SUBDIR += p5-CGI-Builder-TT2 SUBDIR += p5-CGI-Cache SUBDIR += p5-CGI-FastTemplate SUBDIR += p5-CGI-Framework SUBDIR += p5-CGI-Kwiki SUBDIR += p5-CGI-Minimal SUBDIR += p5-CGI-Response SUBDIR += p5-CGI-SSI SUBDIR += p5-CGI-Session SUBDIR += p5-CGI-Simple SUBDIR += p5-CGI-SpeedyCGI SUBDIR += p5-CGI-Untaint SUBDIR += p5-CGI-Untaint-email SUBDIR += p5-CGI-Upload SUBDIR += p5-CGI-XMLApplication SUBDIR += p5-CGI-modules SUBDIR += p5-CGI.pm SUBDIR += p5-CGI_Lite SUBDIR += p5-Catalyst SUBDIR += p5-Catalyst-Helper-Controller-Scaffold SUBDIR += p5-Catalyst-Model-CDBI SUBDIR += p5-Catalyst-Model-CDBI-Sweet SUBDIR += p5-Catalyst-Plugin-FillInForm SUBDIR += p5-Catalyst-Plugin-FormValidator SUBDIR += p5-Catalyst-Plugin-Prototype SUBDIR += p5-Catalyst-Plugin-Session-FastMmap SUBDIR += p5-Catalyst-Plugin-Static SUBDIR += p5-Catalyst-Plugin-SubRequest SUBDIR += p5-Catalyst-Plugin-Textile SUBDIR += p5-Catalyst-View-HTML-Template SUBDIR += p5-Catalyst-View-TT SUBDIR += p5-Class-DBI-FromForm SUBDIR += p5-Compress-LeadingBlankSpaces SUBDIR += p5-FAQ-OMatic SUBDIR += p5-FastCGI SUBDIR += p5-FastCGI-ProcManager SUBDIR += p5-Flickr-API SUBDIR += p5-Flickr-Upload SUBDIR += p5-GtkHTML SUBDIR += p5-HTML SUBDIR += p5-HTML-Breadcrumbs SUBDIR += p5-HTML-CalendarMonthSimple SUBDIR += p5-HTML-Clean SUBDIR += p5-HTML-Diff SUBDIR += p5-HTML-Element-Extended SUBDIR += p5-HTML-Embperl SUBDIR += p5-HTML-FillInForm SUBDIR += p5-HTML-FromText SUBDIR += p5-HTML-LinkExtractor SUBDIR += p5-HTML-Mason SUBDIR += p5-HTML-Pager SUBDIR += p5-HTML-Parser SUBDIR += p5-HTML-Prototype SUBDIR += p5-HTML-QuickCheck SUBDIR += p5-HTML-Scrubber SUBDIR += p5-HTML-SimpleLinkExtor SUBDIR += p5-HTML-SimpleParse SUBDIR += p5-HTML-StickyQuery SUBDIR += p5-HTML-Stream SUBDIR += p5-HTML-Strip SUBDIR += p5-HTML-Summary SUBDIR += p5-HTML-Table SUBDIR += p5-HTML-TableExtract SUBDIR += p5-HTML-TableLayout SUBDIR += p5-HTML-TableTiler SUBDIR += p5-HTML-Tagset SUBDIR += p5-HTML-Template SUBDIR += p5-HTML-Template-Associate SUBDIR += p5-HTML-Template-Expr SUBDIR += p5-HTML-Template-JIT SUBDIR += p5-HTML-TokeParser-Simple SUBDIR += p5-HTML-Tree SUBDIR += p5-HTML-Webmake SUBDIR += p5-HTML-Widgets-SelectLayers SUBDIR += p5-HTTP-BrowserDetect SUBDIR += p5-HTTP-DAV SUBDIR += p5-HTTP-GHTTP SUBDIR += p5-HTTP-Lite SUBDIR += p5-HTTP-MHTTP SUBDIR += p5-HTTP-MobileAgent SUBDIR += p5-HTTP-Proxy SUBDIR += p5-HTTP-Recorder SUBDIR += p5-HTTP-Server-Simple SUBDIR += p5-HTTP-Server-Simple-Mason SUBDIR += p5-HTTP-Server-Simple-Static SUBDIR += p5-HTTP-WebTest SUBDIR += p5-HTTPD-Log-Filter SUBDIR += p5-HTTPD-User-Manage SUBDIR += p5-IMDB-Movie SUBDIR += p5-Kwiki SUBDIR += p5-Kwiki-Archive-Rcs SUBDIR += p5-Kwiki-Archive-SVK SUBDIR += p5-Kwiki-Atom SUBDIR += p5-Kwiki-Diff SUBDIR += p5-Kwiki-Edit-RequireUserName SUBDIR += p5-Kwiki-GDGraphGenerator SUBDIR += p5-Kwiki-Icons-Gnome SUBDIR += p5-Kwiki-Infobox SUBDIR += p5-Kwiki-ModPerl SUBDIR += p5-Kwiki-NavigationToolbar SUBDIR += p5-Kwiki-NewPage SUBDIR += p5-Kwiki-Notify-Mail SUBDIR += p5-Kwiki-PagePrivacy SUBDIR += p5-Kwiki-RecentChanges SUBDIR += p5-Kwiki-RecentChangesRSS SUBDIR += p5-Kwiki-Revisions SUBDIR += p5-Kwiki-Search SUBDIR += p5-Kwiki-Theme-ColumnLayout SUBDIR += p5-Kwiki-UserName SUBDIR += p5-Kwiki-UserPreferences SUBDIR += p5-Kwiki-VimMode SUBDIR += p5-Kwiki-plugins SUBDIR += p5-LWP-Authen-Wsse SUBDIR += p5-MasonX-Apache2Handler SUBDIR += p5-MasonX-Interp-WithCallbacks SUBDIR += p5-MasonX-Profiler SUBDIR += p5-MasonX-Request-WithApacheSession SUBDIR += p5-MasonX-WebApp SUBDIR += p5-Maypole SUBDIR += p5-Maypole-Authentication-UserSessionCookie SUBDIR += p5-Maypole-Component SUBDIR += p5-PHP-Session SUBDIR += p5-PLP SUBDIR += p5-POE-Component-Client-HTTP SUBDIR += p5-POE-Component-Client-UserAgent SUBDIR += p5-POE-Component-Server-HTTP SUBDIR += p5-ParallelUA SUBDIR += p5-PodToHTML SUBDIR += p5-Sledge SUBDIR += p5-Sledge-Plugin-CacheContent SUBDIR += p5-Sledge-Plugin-Download SUBDIR += p5-Sledge-Plugin-Dumper SUBDIR += p5-Sledge-Plugin-HTML2HDML SUBDIR += p5-Sledge-Plugin-Log SUBDIR += p5-Sledge-Plugin-NoCache SUBDIR += p5-Sledge-Plugin-SaveUpload SUBDIR += p5-Sledge-Plugin-ScratchPad SUBDIR += p5-Sledge-Plugin-SessionAutoCleanup SUBDIR += p5-Sledge-Plugin-XSLT SUBDIR += p5-Sledge-SessionManager-CookieStore SUBDIR += p5-Sledge-Template-Expr SUBDIR += p5-Template-Multilingual SUBDIR += p5-Template-Plugin-Class SUBDIR += p5-Template-Plugin-Comma SUBDIR += p5-Template-Plugin-MP3 SUBDIR += p5-Template-Plugin-Monta SUBDIR += p5-Template-Timer SUBDIR += p5-Template-Toolkit SUBDIR += p5-URI-Sequin SUBDIR += p5-W3C-LinkChecker SUBDIR += p5-W3C-LogValidator SUBDIR += p5-WWW-Automate SUBDIR += p5-WWW-Babelfish SUBDIR += p5-WWW-Curl SUBDIR += p5-WWW-Dilbert SUBDIR += p5-WWW-IMDb SUBDIR += p5-WWW-Link SUBDIR += p5-WWW-Mechanize SUBDIR += p5-WWW-Mechanize-FormFiller SUBDIR += p5-WWW-Mechanize-Shell SUBDIR += p5-WWW-Robot SUBDIR += p5-WWW-Search SUBDIR += p5-WWW-Search-AltaVista SUBDIR += p5-WWW-Search-Google SUBDIR += p5-WWW-Shorten SUBDIR += p5-WWW-SourceForge SUBDIR += p5-WWW-Wikipedia SUBDIR += p5-WebService-Bloglines SUBDIR += p5-WebService-Technorati SUBDIR += p5-ldap-abook SUBDIR += p5-libapreq SUBDIR += p5-libapreq-static SUBDIR += p5-libapreq2 SUBDIR += p5-libservlet SUBDIR += p5-libwww SUBDIR += peacock SUBDIR += pear-HTTP SUBDIR += pear-HTTP_Client SUBDIR += pear-HTTP_Download SUBDIR += pear-HTTP_Header SUBDIR += pear-HTTP_Request SUBDIR += pear-HTTP_Server SUBDIR += pear-HTTP_Session SUBDIR += pear-HTTP_Upload SUBDIR += pear-Text_Wiki SUBDIR += pecl-APC SUBDIR += pgdriver SUBDIR += pglogd SUBDIR += photo_gallery SUBDIR += php-dyn SUBDIR += php-screw SUBDIR += php-templates SUBDIR += php4-cgi SUBDIR += php4-mnogosearch SUBDIR += php4-session SUBDIR += php5-cgi SUBDIR += php5-mnogosearch SUBDIR += php5-session SUBDIR += php5-tidy SUBDIR += phpSysInfo SUBDIR += phpadsnew SUBDIR += phpbb SUBDIR += phpgedview SUBDIR += phpmyfaq SUBDIR += phpsurveyor SUBDIR += phpwebapp SUBDIR += phpwiki SUBDIR += plog SUBDIR += plone SUBDIR += plugger SUBDIR += plugger-plugins-hubbe SUBDIR += pmwiki SUBDIR += pnews SUBDIR += podcastamatic SUBDIR += polipo SUBDIR += postnuke SUBDIR += pound SUBDIR += preferential SUBDIR += preferential-firefox SUBDIR += privoxy SUBDIR += privoxy+ipv6 SUBDIR += pserv SUBDIR += publicfile SUBDIR += pwebstats SUBDIR += py-HTMLgen SUBDIR += py-albatross SUBDIR += py-beautifulsoup SUBDIR += py-clientform SUBDIR += py-cssutils SUBDIR += py-fcgi SUBDIR += py-forgethtml SUBDIR += py-htmltestcase SUBDIR += py-imdbpy SUBDIR += py-mechanize SUBDIR += py-mt SUBDIR += py-nevow SUBDIR += py-pullparser SUBDIR += py-scgi SUBDIR += py-twistedWeb SUBDIR += py-websvcs SUBDIR += py-webware SUBDIR += py-webware-component SUBDIR += pyblosxom SUBDIR += pyphany SUBDIR += pyweblib SUBDIR += qdecoder SUBDIR += quixote SUBDIR += reportmagic SUBDIR += resin2 SUBDIR += resin3 SUBDIR += retawq SUBDIR += rnews SUBDIR += roundup SUBDIR += roxen SUBDIR += rt2 SUBDIR += rt3 SUBDIR += rt3-elixus SUBDIR += rt32 SUBDIR += ruboard SUBDIR += ruby-amazon SUBDIR += ruby-asp SUBDIR += ruby-borges SUBDIR += ruby-div SUBDIR += ruby-fcgi SUBDIR += ruby-google SUBDIR += ruby-gtkhtml2 SUBDIR += ruby-http-access SUBDIR += ruby-mnogosearch SUBDIR += ruby-nora SUBDIR += ruby-tmpl SUBDIR += ruby-webunit SUBDIR += sarg SUBDIR += sbox-dtc SUBDIR += scout SUBDIR += screem SUBDIR += script4rss SUBDIR += shttpd SUBDIR += sidplug SUBDIR += simplog SUBDIR += sitebar SUBDIR += sitecopy SUBDIR += slash SUBDIR += smarty SUBDIR += smb2www SUBDIR += smb_auth SUBDIR += snarf SUBDIR += snownews SUBDIR += spreadlogd SUBDIR += squid SUBDIR += squidclients SUBDIR += squidguard SUBDIR += squidpurge SUBDIR += squidtimes SUBDIR += squirm SUBDIR += squishdot SUBDIR += srg SUBDIR += ssserver SUBDIR += suphp SUBDIR += surfraw SUBDIR += swfdec-plugin SUBDIR += swiggle SUBDIR += swish++ SUBDIR += swish-e SUBDIR += syndigator SUBDIR += tasks SUBDIR += tclhttpd SUBDIR += tdiary SUBDIR += tdiary-devel SUBDIR += thttpd SUBDIR += thumbnail_index SUBDIR += tidy SUBDIR += tidy-devel SUBDIR += tidy-lib SUBDIR += tinyproxy SUBDIR += trac SUBDIR += transproxy SUBDIR += twhttpd SUBDIR += twig SUBDIR += twiki SUBDIR += typo3 SUBDIR += udmsearch SUBDIR += ump SUBDIR += urchin5 SUBDIR += usermanager SUBDIR += visitors SUBDIR += vtiger SUBDIR += w3 SUBDIR += w3-4 SUBDIR += w3c-httpd SUBDIR += w3m SUBDIR += w3m-img SUBDIR += w3m-m17n SUBDIR += w3m-m17n-img SUBDIR += w3mir SUBDIR += waccess SUBDIR += wacko SUBDIR += wb0 SUBDIR += wcol SUBDIR += web-traceroute SUBDIR += web2ldap SUBDIR += webalizer SUBDIR += webcalendar SUBDIR += webcheck SUBDIR += webcopy SUBDIR += webcrawl SUBDIR += webfs SUBDIR += webglimpse SUBDIR += weblint SUBDIR += webredirect SUBDIR += webreport SUBDIR += webresolve SUBDIR += webstats SUBDIR += webstone SUBDIR += webstone-ssl SUBDIR += wget4web SUBDIR += wiliki SUBDIR += winhelpcgi SUBDIR += wml SUBDIR += wnews SUBDIR += wordpress SUBDIR += wordpress-mu SUBDIR += wsdlpull SUBDIR += wsmake SUBDIR += www6to4 SUBDIR += wwwcount SUBDIR += wwwoffle SUBDIR += wwwstat SUBDIR += wyvern SUBDIR += xaraya SUBDIR += xist SUBDIR += xitami SUBDIR += xpath2rss SUBDIR += yaws SUBDIR += zerowait-httpd SUBDIR += znavigator SUBDIR += zope SUBDIR += zope-FileSystemSite SUBDIR += zope-annotations SUBDIR += zope-archetypes SUBDIR += zope-btreefolder2 SUBDIR += zope-cmf SUBDIR += zope-cmfactionicons SUBDIR += zope-cmfformcontroller SUBDIR += zope-cmfforum SUBDIR += zope-cmfphoto SUBDIR += zope-cmfphotoalbum SUBDIR += zope-cmfquickinstaller SUBDIR += zope-coreblog SUBDIR += zope-epoz SUBDIR += zope-exuserfolder SUBDIR += zope-formulator SUBDIR += zope-generator SUBDIR += zope-groupuserfolder SUBDIR += zope-guf SUBDIR += zope-i18nlayer SUBDIR += zope-kupu SUBDIR += zope-mimetypesregistry SUBDIR += zope-mindmapbbs SUBDIR += zope-mysqluserfolder SUBDIR += zope-parsedxml SUBDIR += zope-placelesstranslationservice SUBDIR += zope-plonelanguagetool SUBDIR += zope-portaltransforms SUBDIR += zope-proxyindex SUBDIR += zope-silva SUBDIR += zope-silvaviews SUBDIR += zope-simpleblog SUBDIR += zope-soapmethod SUBDIR += zope-ttwtype SUBDIR += zope-validation SUBDIR += zope-xmlmethods SUBDIR += zope-xmlwidgets SUBDIR += zope-zmysqlda SUBDIR += zope-zpt SUBDIR += zope-zwiki .include Property changes on: head/www/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1137 \ No newline at end of property +1.1138 \ No newline at end of property