From owner-cvs-src@FreeBSD.ORG Sun Nov 11 06:36:12 2007 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CD0FF16A417; Sun, 11 Nov 2007 06:36:12 +0000 (UTC) (envelope-from max@love2party.net) Received: from moutng.kundenserver.de (moutng.kundenserver.de [212.227.126.171]) by mx1.freebsd.org (Postfix) with ESMTP id 5F34F13C48E; Sun, 11 Nov 2007 06:36:12 +0000 (UTC) (envelope-from max@love2party.net) Received: from amd64.laiers.local (dslb-088-066-025-148.pools.arcor-ip.net [88.66.25.148]) by mrelayeu.kundenserver.de (node=mrelayeu2) with ESMTP (Nemesis) id 0MKwtQ-1Ir6CN39iZ-0001c6; Sun, 11 Nov 2007 07:21:36 +0100 From: Max Laier Organization: FreeBSD To: Doug Barton Date: Sun, 11 Nov 2007 07:21:22 +0100 User-Agent: KMail/1.9.7 References: <200711110116.lAB1GqRr030079@repoman.freebsd.org> In-Reply-To: X-Face: ,,8R(x[kmU]tKN@>gtH1yQE4aslGdu+2]; R]*pL,U>^H?)gW@49@wdJ`H<=?utf-8?q?=25=7D*=5FBD=0A=09U=5For=3D=5CmOZf764=26nYj=3DJYbR1PW0ud?=>|!~,,CPC.1-D$FG@0h3#'5"k{V]a~.<=?utf-8?q?mZ=7D44=23Se=7Em=0A=09Fe=7E=5C=5DX5B=5D=5Fxj?=(ykz9QKMw_l0C2AQ]}Ym8)fU MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart4074443.Rq2nao8WPq"; protocol="application/pgp-signature"; micalg=pgp-sha1 Content-Transfer-Encoding: 7bit Message-Id: <200711110721.33559.max@love2party.net> X-Provags-ID: V01U2FsdGVkX195BUg9g3r8NHKLl9dHDqubUEkItp6hiUGAwie AE28PmtTqL91RyKqa82F4lXpRtbK+SafbUSvRFznaGEY52So1h Q8ihqXKvrKiB5eSSJMsJAwcc7ItNdiHWb/3x1Zcs5o= Cc: cvs-src@freebsd.org, Max Laier , src-committers@freebsd.org, cvs-all@freebsd.org Subject: Re: cvs commit: src/share/examples/pf Makefile ackpri faq-example1 faq-example2 faq-example3 pf.conf queue1 queue2 queue3 queue4 spamd src/etc Makefile pf.conf X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Nov 2007 06:36:12 -0000 --nextPart4074443.Rq2nao8WPq Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Sunday 11 November 2007, Doug Barton wrote: > On Sun, 11 Nov 2007, Max Laier wrote: > > mlaier 2007-11-11 01:16:52 UTC > > > > FreeBSD src repository > > > > Modified files: > > share/examples/pf Makefile ackpri faq-example1 faq-example2 > > faq-example3 queue1 queue2 queue3 queue4 > > spamd > > etc Makefile > > Added files: > > share/examples/pf pf.conf > > Removed files: > > etc pf.conf > > Log: > > Update pf examples from OpenBSD to catch up with new stateful > > defaults and other syntax changes. Move pf.conf from /etc to > > examples, too. > > In regards to the last bit, it seems to me that moving pf.conf (which I > agree is a good idea) should be a repo-copy, not a delete/add. I also > think that this change requires an update to pf.conf.5, and > ObsoleteFiles.inc. I didn't do a repo-copy as there is really no history to preserve. As for= =20 the pf.conf.5 changes - what do you have in mind? I don't see what=20 should be changed. /etc/pf.conf is still the default location for the=20 ruleset (as set by defaults/rc.conf) and there is already a pointer to=20 the examples. ObsoleteFiles.inc doesn't make sense at all, as there=20 should be an /etc/pf.conf. The whole point of this is that you can have=20 your own ruleset and not have it overwritten every time you run=20 mergemaster. In contrast to other default settings we install in /etc=20 the pf.conf example doesn't have any function as is - thus the desire for=20 human interaction which is the point of this commit. > If any of this has been done already and I missed it, I apologize for > the noise. =2D-=20 /"\ Best regards, | mlaier@freebsd.org \ / Max Laier | ICQ #67774661 X http://pf4freebsd.love2party.net/ | mlaier@EFnet / \ ASCII Ribbon Campaign | Against HTML Mail and News --nextPart4074443.Rq2nao8WPq Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.4 (FreeBSD) iD8DBQBHNp9tXyyEoT62BG0RAjg4AJ4jMwWj7iX1O4+TKZRt3at9yASmQwCfZ7sG KeP1EF5sreV6VXdsM2t7QCM= =aX2w -----END PGP SIGNATURE----- --nextPart4074443.Rq2nao8WPq--