Reduce diff with OpenBSD by deleting whitespace.
add missing commas to .Dd fix, pointed out by wiz
OpenBSD uses a custom CVS hack to handle Dd fields ($Mdocdate$) whichwe don't have. Replace ".Dd $Mdocdate" with ".Dd Month Day Year" sothat the date comes out right when man pages get built. This
OpenBSD uses a custom CVS hack to handle Dd fields ($Mdocdate$) whichwe don't have. Replace ".Dd $Mdocdate" with ".Dd Month Day Year" sothat the date comes out right when man pages get built. This willdoubtless need hand conflict resolution whenever these pages arere-imported.Note that it would be interesting to have some similar facility forNetBSD, but I don't think a custom rcs keyword is the right thing --maybe we can teach groff to parse $Date$
show more ...
merge yamt-pf42 branch.(import newer pf from OpenBSD 4.2)ok'ed by peter@. requested by core@
Remove clause 3 and 4 from TNF licenses
Mention the ipf mode in more places, xref pf.conf(5) or ipnat.conf(5)when speaking about the configuration file commands. Bump date.
Do not use ntohs() on TCP ports passed to the NAT lookup ioctl, apparentlythey are expected in network order. Makes the proxy in ipf mode actuallywork (but tested only on NetBSD 3.0).
PR/35039: jklowden: Fix example to include -i or -p for ipf or pf.
PR 30870: Add user ``_proxy'' and make pf's ftp-proxy use it.Initial patch by rivo nurges, thanks!
ftp-proxy -i also supports '-R address[:port]' and '-S address'.ok peter@
Resolve conflicts (pf from OpenBSD 3.7, userland part).
Remove the distribution files of spamd. Future imports of pf will notinclude spamd anymore.
If path to /etc/spamd.conf is passed in on cpp command line, don't override it.
Instead of hardcoding /var/chroot/spamd in two places, use a macroSPAMD_CHROOT, which is passed in by src/usr.sbin/pf/spamd/Makefile.
Add MKIPFILTER; if set to no, don't build and install the ipf(4) programs,headers and LKM.Add MKPF; if set to no, don't build and install the pf(4) programs,headers, LKM and spamd.Both options
Add MKIPFILTER; if set to no, don't build and install the ipf(4) programs,headers and LKM.Add MKPF; if set to no, don't build and install the pf(4) programs,headers, LKM and spamd.Both options default to yes, so nothing changed in the default build.Reviewed by lukem.
fix a merge botch. pointed by Pavel Cahyna.
Sort options in usage, add missing "]" (OpenBSD v1.38).
Sort option descriptions (OpenBSD v1.42).
don't use variable arg macro, which is not supported by gcc2.
merge after importing pf from openbsd 3.6. (userland part)some files were imported to the different places from the previous version.v3_5: etc/pf.conf etc/pf.os etc/spamd.conf share/man/man4/p
merge after importing pf from openbsd 3.6. (userland part)some files were imported to the different places from the previous version.v3_5: etc/pf.conf etc/pf.os etc/spamd.conf share/man/man4/pf.4 share/man/man4/pflog.4 share/man/man5/pf.conf.5 share/man/man5/pf.os.5 share/man/man5/spamd.conf.5v3_6: dist/pf/etc/pf.conf dist/pf/etc/pf.os dist/pf/etc/spamd.conf dist/pf/share/man/man4/pf.4 dist/pf/share/man/man4/pflog.4 dist/pf/share/man/man5/pf.conf.5 dist/pf/share/man/man5/pf.os.5 dist/pf/share/man/man5/spamd.conf.5
reduce diffs from the original, using dummy impl. of openlog_r and syslog_r.
revert a function rename/move.this kind of change is not appropriate for sources under dist/.
Don't call seteuid() before setuid() since it makes setuid() fails.Actually, set[gu]id() changes effective ids also. From Shoichi Miyake.
revert change of listen to Listen (probably a typo here)
Modify ftp-proxy to support both ipfilter and pf. It now requires at leastone command line option to specify which firewall it is meant to interactwith. The implementation here puts the firewall
Modify ftp-proxy to support both ipfilter and pf. It now requires at leastone command line option to specify which firewall it is meant to interactwith. The implementation here puts the firewall specific code into separatefiles with markers for future changes that could enable a fully transparentmode for non-private network proxying.
12