diff -uNr ffproxy-1.6-RC2/BUGS ffproxy-1.6/BUGS --- ffproxy-1.6-RC2/BUGS Fri Aug 8 22:44:47 2003 +++ ffproxy-1.6/BUGS Wed Jan 5 13:18:35 2005 @@ -1,12 +1,15 @@ I've access to a limited number of different systems only, so it's not guaranteed that -ffproxy will compile at all. +ffproxy will compile or work at all. So far, I've tested ffproxy to work under -OpenBSD, FreeBSD, Linux, and Solaris8. +OpenBSD (x86), NetBSD (x86), FreeBSD (x86), +Linux (x86) and Solaris9 (sparc) +(compiled with gcc). If you've patches to make ffproxy work -on other systems, please let me know. +on other systems, or if you've success stories, +please let me know. Send bug reports, comments, questions to Niklas Olmes diff -uNr ffproxy-1.6-RC2/ChangeLog ffproxy-1.6/ChangeLog --- ffproxy-1.6-RC2/ChangeLog Fri Dec 31 05:55:04 2004 +++ ffproxy-1.6/ChangeLog Wed Jan 5 15:13:20 2005 @@ -22,6 +22,11 @@ to parse some numbers in http.c and introduced numbers.c +* now using freshmeat.net's project + description in README and manpages + +* updated file BUGS + Version 1.5.1 ============= diff -uNr ffproxy-1.6-RC2/Makefile.in ffproxy-1.6/Makefile.in --- ffproxy-1.6-RC2/Makefile.in Fri Dec 31 09:38:55 2004 +++ ffproxy-1.6/Makefile.in Wed Jan 5 15:50:10 2005 @@ -1,5 +1,5 @@ # -# $Id: Makefile.in,v 1.12 2004/12/31 08:12:50 niklas Exp $ +# $Id: Makefile.in,v 1.13 2005/01/05 15:50:08 niklas Exp niklas $ # #OPTIONS = -DDEBUG @@ -41,7 +41,7 @@ man: for i in $(MANPAGES); do \ - sed -e 's|_BASE_|$(pkgdatadir)|g' $$i.s > $$i; \ + sed -e 's|_BASE_|$(pkgdatadir)|g' -e 's|_CFGFILE_|$(sysconfdir)/ffproxy.conf|g' $$i.s > $$i; \ done || for i in $(MANPAGES); do \ cp $$i $$i.s; done diff -uNr ffproxy-1.6-RC2/README ffproxy-1.6/README --- ffproxy-1.6-RC2/README Fri Dec 31 05:07:42 2004 +++ ffproxy-1.6/README Wed Jan 5 13:18:31 2005 @@ -1,12 +1,12 @@ Description =========== -ffproxy is a filtering HTTP(S) proxy server. It is able to filter by host, -url, and header. Custom header entries can be filtered and added. It -can even drop its privileges and chroot(2) to some directory. Logging to -syslogd(8) is supported, as is using another auxiliary proxy server. -It is able to serve as a HTTP accelerator (front-end to a HTTP server). -IPv6 is fully supported and allows IPv6 HTTP over IPv4 tunneling (and -vice versa). +ffproxy is a filtering HTTP/HTTPS proxy server. It is able to filter by host, +URL, and header. Custom header entries can be filtered and added. +It can even drop its privileges and optionally chroot() to some directory. +Logging to syslog() is supported, as is using another auxiliary proxy server. +An HTTP accelerator feature (acting as a front-end to an HTTP server) is +included. Contacting IPv6 servers as well as binding to IPv6 is supported +and allows transparent IPv6 over IPv4 browsing (and vice versa). -Website: http://faith.eu.org/programs.html +Website: http://faith.eu.org/programs.html diff -uNr ffproxy-1.6-RC2/configure ffproxy-1.6/configure --- ffproxy-1.6-RC2/configure Fri Dec 31 09:39:20 2004 +++ ffproxy-1.6/configure Wed Jan 5 15:13:37 2005 @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.ac Revision: 1.3 . +# From configure.ac Revision: 1.4 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for ffproxy 1.6-RC2. +# Generated by GNU Autoconf 2.59 for ffproxy 1.6. # # Report bugs to . # @@ -270,8 +270,8 @@ # Identity of this package. PACKAGE_NAME='ffproxy' PACKAGE_TARNAME='ffproxy' -PACKAGE_VERSION='1.6-RC2' -PACKAGE_STRING='ffproxy 1.6-RC2' +PACKAGE_VERSION='1.6' +PACKAGE_STRING='ffproxy 1.6' PACKAGE_BUGREPORT='niklas@noxa.de' ac_unique_file="main.c" @@ -781,7 +781,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ffproxy 1.6-RC2 to adapt to many kinds of systems. +\`configure' configures ffproxy 1.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -838,7 +838,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ffproxy 1.6-RC2:";; + short | recursive ) echo "Configuration of ffproxy 1.6:";; esac cat <<\_ACEOF @@ -950,7 +950,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -ffproxy configure 1.6-RC2 +ffproxy configure 1.6 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -964,7 +964,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ffproxy $as_me 1.6-RC2, which was +It was created by ffproxy $as_me 1.6, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -5022,7 +5022,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by ffproxy $as_me 1.6-RC2, which was +This file was extended by ffproxy $as_me 1.6, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5082,7 +5082,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -ffproxy config.status 1.6-RC2 +ffproxy config.status 1.6 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -uNr ffproxy-1.6-RC2/configure.ac ffproxy-1.6/configure.ac --- ffproxy-1.6-RC2/configure.ac Fri Dec 31 09:38:55 2004 +++ ffproxy-1.6/configure.ac Wed Jan 5 15:11:08 2005 @@ -1,11 +1,11 @@ # Process this file with autoconf to produce a configure script. # -# $Id: configure.ac,v 1.3 2004/12/31 09:38:35 niklas Exp $ +# $Id: configure.ac,v 1.4 2005/01/05 15:11:06 niklas Exp niklas $ # AC_PREREQ(2.59) -AC_INIT([ffproxy],[1.6-RC2],[niklas@noxa.de]) -AC_REVISION($Revision: 1.3 $) +AC_INIT([ffproxy],[1.6],[niklas@noxa.de]) +AC_REVISION($Revision: 1.4 $) AC_CONFIG_SRCDIR([main.c]) AC_CONFIG_HEADERS([configure.h]) diff -uNr ffproxy-1.6-RC2/ffproxy.8.s ffproxy-1.6/ffproxy.8.s --- ffproxy-1.6-RC2/ffproxy.8.s Fri Dec 31 09:02:21 2004 +++ ffproxy-1.6/ffproxy.8.s Wed Jan 5 15:55:31 2005 @@ -1,12 +1,12 @@ -.\" $Id: ffproxy.8.s,v 2.1 2004/12/31 09:02:05 niklas Exp $ -.\" Copyright (c) 2002-2004 Niklas Olmes +.\" $Id: ffproxy.8.s,v 2.3 2005/01/05 15:55:30 niklas Exp niklas $ +.\" Copyright (c) 2002-2005 Niklas Olmes .\" See COPYING for license (GNU GPL) .\" http://faith.eu.org -.Dd Dec 31, 2004 +.Dd Jan 5, 2005 .Dt ffproxy 8 .Sh NAME .Nm ffproxy -.Nd filtering HTTP(S) proxy server +.Nd filtering HTTP/HTTPS proxy server .Sh SYNOPSIS .Nm ffproxy .Op Fl p Ar port @@ -23,16 +23,16 @@ .Op Fl ds4bBhv .Sh DESCRIPTION .Nm ffproxy -is a filtering HTTP(S) proxy server. It is able to filter -by host, url, and header. Custom header entries can be filtered -and added. It can even drop its privileges and +is a filtering HTTP/HTTPS proxy server. It is able to filter +by host, URL, and header. Custom header entries can be filtered +and added. It can even drop its privileges and optionally .Xr chroot 2 -to some -directory. Logging to -.Xr syslogd 8 -is supported, as is using another auxiliary proxy server. -IPv6 is fully supported and allows IPv6 HTTP over IPv4 -tunneling (and vice versa). +to some directory. Logging to +.Xr syslog 3 +is supported, as is using another auxiliary proxy server. +An HTTP accelerator feature (acting as a front-end to an HTTP server) +is included. Contacting IPv6 servers as well as binding to IPv6 is +supported and allows transparent IPv6 over IPv4 browsing (and vice versa). .Pp Remind that there is an alternative to command line options by using configuration files. See @@ -89,7 +89,7 @@ User configuration file to load. Please note that command line options get overwritten by set configuration file options. Default location is -.Pa /etc/ffproxy.conf . +.Pa _CFGFILE_ . Read .Xr ffproxy.conf 5 for details. Use -f "" to disable configuration files. @@ -290,7 +290,7 @@ Send a SIGHUP to the pid of the ffproxy master process to let it reload db/ files, html/ files, *and* configuration file. If no configuration file was specified, -.Pa /etc/ffproxy.conf +.Pa _CFGFILE_ is tried. Of course, only some changes to the program can be done at runtime. See .Xr ffproxy.conf 5 @@ -316,7 +316,7 @@ .It startup options given either on the command line or read from configuration files -- -.Pa /etc/ffproxy.conf +.Pa _CFGFILE_ is loaded by default. .It the files in db/ which specify filtering options @@ -333,7 +333,7 @@ .Pa sample.config for a sample configuration file .Pp -.Pa /etc/ffproxy.conf +.Pa _CFGFILE_ for default configuration file .Pp .Xr ffproxy.conf 5 @@ -354,7 +354,7 @@ Dobrica Pavlinusic provided patches for http accelerator feature .Sh VERSION -This manual documents ffproxy 1.6 (2004-12-31). +This manual documents ffproxy 1.6 (2005-01-05). .Pp Send bug reports, comments, suggestions to .Sh AUTHOR diff -uNr ffproxy-1.6-RC2/ffproxy.conf.5.s ffproxy-1.6/ffproxy.conf.5.s --- ffproxy-1.6-RC2/ffproxy.conf.5.s Fri Dec 31 09:02:21 2004 +++ ffproxy-1.6/ffproxy.conf.5.s Wed Jan 5 15:54:39 2005 @@ -1,24 +1,24 @@ -.\" $Id: ffproxy.conf.5.s,v 2.1 2004/12/31 09:02:05 niklas Exp $ -.\" Copyright (c) 2002-2004 Niklas Olmes +.\" $Id: ffproxy.conf.5.s,v 2.3 2005/01/05 15:54:39 niklas Exp niklas $ +.\" Copyright (c) 2002-2005 Niklas Olmes .\" See COPYING for license (GNU GPL) .\" http://faith.eu.org -.Dd Dec 31, 2004 +.Dd Jan 5, 2005 .Dt ffproxy.conf 5 .Sh NAME .Nm ffproxy.conf -.Nd filtering HTTP(S) proxy server configuration file +.Nd filtering HTTP/HTTPS proxy server configuration file .Sh DESCRIPTION .Nm ffproxy -is a filtering HTTP(S) proxy server. It is able to filter -by host, url, and header. Custom header entries can be filtered -and added. It can even drop its privileges and +is a filtering HTTP/HTTPS proxy server. It is able to filter +by host, URL, and header. Custom header entries can be filtered +and added. It can even drop its privileges and optionally .Xr chroot 2 -to some -directory. Logging to -.Xr syslogd 8 -is supported, as is using another auxiliary proxy server. -IPv6 is fully supported and allows IPv6 HTTP over IPv4 -tunneling (and vice versa). +to some directory. Logging to +.Xr syslog 3 +is supported, as is using another auxiliary proxy server. +An HTTP accelerator feature (acting as a front-end to an HTTP server) +is included. Contacting IPv6 servers as well as binding to IPv6 is +supported and allows transparent IPv6 over IPv4 browsing (and vice versa). .Pp This manual describes how to use configuration files with the program and documents the options. @@ -26,7 +26,7 @@ .Ss Default ffproxy.conf If the command line parameters -f or -F are not used, the proxy tries to open -.Pa /etc/ffproxy.conf . +.Pa _CFGFILE_ . If this file does not exist, the program continues execution. .Ss User Configuration File Use command line parameter -f to load a non-default configuration @@ -206,9 +206,9 @@ #backlog_size 4 .Ed .Sh VERSION -This manual documents ffproxy 1.6 (2004-12-31). +This manual documents ffproxy 1.6 (2005-01-05). .Sh FILES -.Pa /etc/ffproxy.conf +.Pa _CFGFILE_ default configuration file .Pp .Pa sample.config diff -uNr ffproxy-1.6-RC2/ffproxy.quick.7.s ffproxy-1.6/ffproxy.quick.7.s --- ffproxy-1.6-RC2/ffproxy.quick.7.s Fri Dec 31 09:02:21 2004 +++ ffproxy-1.6/ffproxy.quick.7.s Wed Jan 5 15:12:35 2005 @@ -1,24 +1,24 @@ -.\" $Id: ffproxy.quick.7.s,v 2.1 2004/12/31 09:02:05 niklas Exp $ -.\" Copyright (c) 2002-2004 Niklas Olmes +.\" $Id: ffproxy.quick.7.s,v 2.2 2005/01/05 15:12:34 niklas Exp niklas $ +.\" Copyright (c) 2002-2005 Niklas Olmes .\" See COPYING for license (GNU GPL) .\" http://faith.eu.org -.Dd Dec 31, 2004 +.Dd Jan 5, 2005 .Dt ffproxy.quick 7 .Sh NAME .Nm ffproxy.quick -.Nd filtering HTTP(S) proxy server quick introduction +.Nd filtering HTTP/HTTPS proxy server quick introduction .Sh DESCRIPTION .Nm ffproxy -is a filtering HTTP(S) proxy server. It is able to filter -by host, url, and header. Custom header entries can be filtered -and added. It can even drop its privileges and +is a filtering HTTP/HTTPS proxy server. It is able to filter +by host, URL, and header. Custom header entries can be filtered +and added. It can even drop its privileges and optionally .Xr chroot 2 -to some -directory. Logging to -.Xr syslogd 8 -is supported, as is using another auxiliary proxy server. -IPv6 is fully supported and allows IPv6 HTTP over IPv4 -tunneling (and vice versa). +to some directory. Logging to +.Xr syslog 3 +is supported, as is using another auxiliary proxy server. +An HTTP accelerator feature (acting as a front-end to an HTTP server) +is included. Contacting IPv6 servers as well as binding to IPv6 is +supported and allows transparent IPv6 over IPv4 browsing (and vice versa). .Pp This manual describes how to set up a basic HTTP proxy installation. It is assumed that you already have compiled the program or @@ -138,7 +138,7 @@ .Pa /etc/pf.conf . See your NAT's documentation for details on how to do this. .Sh VERSION -This manual documents ffproxy 1.6 (2004-12-31). +This manual documents ffproxy 1.6 (2005-01-05). .Sh SEE ALSO .Xr ffproxy 8 , .Xr ffproxy.conf 5 , diff -uNr ffproxy-1.6-RC2/main.c ffproxy-1.6/main.c --- ffproxy-1.6-RC2/main.c Fri Dec 31 08:59:54 2004 +++ ffproxy-1.6/main.c Wed Jan 5 15:12:51 2005 @@ -1,8 +1,8 @@ /* - * ffproxy (c) 2002-2004 Niklas Olmes + * ffproxy (c) 2002-2005 Niklas Olmes * http://faith.eu.org * - * $Id: main.c,v 2.1 2004/12/31 08:59:15 niklas Exp $ + * $Id: main.c,v 2.2 2005/01/05 15:12:49 niklas Exp niklas $ * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free @@ -73,8 +73,8 @@ static void usage(void); static void drop_privileges(void); -static const char version[] = "1.6-RC2"; -static const char rcsid[] = "$Id: main.c,v 2.1 2004/12/31 08:59:15 niklas Exp $"; +static const char version[] = "1.6"; +static const char rcsid[] = "$Id: main.c,v 2.2 2005/01/05 15:12:49 niklas Exp niklas $"; char loop_header[100]; struct cfg config; @@ -288,7 +288,7 @@ static void usage(void) { - (void) fprintf(stderr, "ffproxy %s -- (c) 2002-2004 Niklas Olmes \n", version); + (void) fprintf(stderr, "ffproxy %s -- (c) 2002-2005 Niklas Olmes \n", version); (void) fprintf(stderr, " GNU GPL. Website: http://faith.eu.org/programs.html\n"); (void) fprintf(stderr, "usage: ffproxy [-vhds4bB] [-c host|ip] [-C host|ip] [-p port]\n"