cvs commit: src/contrib/pf - Imported sources

[Max Laier]

mlaier      2005-05-03 16:47:38 UTC

  FreeBSD src repository

  src/contrib/pf - Imported sources
  Update of /home/ncvs/src/contrib/pf
  In directory repoman.freebsd.org:/tmp/cvs-serv53813
  
  Log Message:
  Import pf userland from OpenBSD 3.7 (OPENBSD_3_7 as of today)
  
  Status:
  
  Vendor Tag:	OPENBSD
  Release Tags:	pf_openbsd_3_7
  		
  U src/contrib/pf/authpf/pathnames.h
  C src/contrib/pf/authpf/authpf.c
  U src/contrib/pf/authpf/authpf.8
  U src/contrib/pf/ftp-proxy/util.h
  U src/contrib/pf/ftp-proxy/util.c
  U src/contrib/pf/ftp-proxy/getline.c
  C src/contrib/pf/ftp-proxy/ftp-proxy.c
  C src/contrib/pf/ftp-proxy/ftp-proxy.8
  C src/contrib/pf/man/pfsync.4
  U src/contrib/pf/man/pflog.4
  C src/contrib/pf/man/pf.4
  U src/contrib/pf/man/pf.os.5
  C src/contrib/pf/man/pf.conf.5
  C src/contrib/pf/pfctl/parse.y
  U src/contrib/pf/pfctl/pfctl_radix.c
  C src/contrib/pf/pfctl/pfctl_qstats.c
  C src/contrib/pf/pfctl/pfctl_parser.h
  C src/contrib/pf/pfctl/pfctl_parser.c
  U src/contrib/pf/pfctl/pfctl_osfp.c
  N src/contrib/pf/pfctl/pfctl_optimize.c
  C src/contrib/pf/pfctl/pfctl_altq.c
  C src/contrib/pf/pfctl/pfctl.h
  C src/contrib/pf/pfctl/pfctl.c
  U src/contrib/pf/pfctl/pfctl.8
  C src/contrib/pf/pfctl/pf_print_state.c
  C src/contrib/pf/pfctl/pfctl_table.c
  U src/contrib/pf/pflogd/privsep_fdpass.c
  C src/contrib/pf/pflogd/privsep.c
  U src/contrib/pf/pflogd/pflogd.h
  C src/contrib/pf/pflogd/pflogd.c
  U src/contrib/pf/pflogd/pflogd.8
  U src/contrib/pf/pflogd/pidfile.h
  U src/contrib/pf/pflogd/pidfile.c
  
  17 conflicts created by this import.
  Use the following command to help the merge:
  
  	cvs checkout -jOPENBSD:yesterday -jOPENBSD src/contrib/pf