From owner-freebsd-git@freebsd.org Wed May 6 15:09:41 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C73B12C731A for ; Wed, 6 May 2020 15:09:41 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from smtp-out-no.shaw.ca (smtp-out-no.shaw.ca [64.59.134.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 49HKkr1npCz3Gkm; Wed, 6 May 2020 15:09:40 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from spqr.komquats.com ([70.67.125.17]) by shaw.ca with ESMTPA id WLg1jUprT62brWLg2jN0nN; Wed, 06 May 2020 09:09:38 -0600 X-Authority-Analysis: v=2.3 cv=LKf9vKe9 c=1 sm=1 tr=0 a=VFtTW3WuZNDh6VkGe7fA3g==:117 a=VFtTW3WuZNDh6VkGe7fA3g==:17 a=xqWC_Br6kY4A:10 a=8nJEP1OIZ-IA:10 a=sTwFKg_x9MkA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=8h2LOIoHSUJt1Q-27H4A:9 a=Kn9TQwD0uF55taPt:21 a=wPNLvfGTeEIA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [IPv6:fc00:1:1:1::5b]) by spqr.komquats.com (Postfix) with ESMTPS id A6013C5F; Wed, 6 May 2020 08:09:36 -0700 (PDT) Received: from slippy.cwsent.com (localhost [127.0.0.1]) by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id 046F9aVc005327; Wed, 6 May 2020 08:09:36 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Received: from slippy (cy@localhost) by slippy.cwsent.com (8.15.2/8.15.2/Submit) with ESMTP id 046F9ad6005324; Wed, 6 May 2020 08:09:36 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <202005061509.046F9ad6005324@slippy.cwsent.com> X-Authentication-Warning: slippy.cwsent.com: cy owned process doing -bs X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.7.1 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Ed Maste , uqs@freebsd.org cc: Cy Schubert , freebsd-git@freebsd.org Subject: Re: Fwd: Where was ipfilter supposed to end up in the tree? In-reply-to: References: Comments: In-reply-to Ed Maste message dated "Wed, 06 May 2020 09:42:33 -0400." Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Date: Wed, 06 May 2020 08:09:36 -0700 X-CMAE-Envelope: MS4wfOMlYKAIrkTRHIvZGuPGm7ujO3zL2PehFuk/r6su95/VtTt7lnrL8aAELm/A9F/SrZlM/tfVGWUdkMUull328OLJgbn86TiqmpOEtDthoPl+fKZ0L+VP gyhHrOYuIIUyK1Sg/DAl1K1DfNToUyk5C6023sKPqoXzsHRZdgCdPWz2h0N/NQ1HpEqF2Whb4YCkGXhJIG6u+pDABq1sWCTi+QqFg8fYZVl3rSocBupx4erR AI84LCwDynmc/vTEd3FmmJt/aRaNYVHDBuvpuC+eEig= X-Rspamd-Queue-Id: 49HKkr1npCz3Gkm X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=none; spf=none (mx1.freebsd.org: domain of cy.schubert@cschubert.com has no SPF policy when checking 64.59.134.9) smtp.mailfrom=cy.schubert@cschubert.com X-Spamd-Result: default: False [-3.24 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_COUNT_FIVE(0.00)[5]; HAS_REPLYTO(0.00)[Cy.Schubert@cschubert.com]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; HAS_XAW(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; RWL_MAILSPIKE_GOOD(0.00)[9.134.59.64.rep.mailspike.net : 127.0.0.18]; MV_CASE(0.50)[]; REPLYTO_EQ_FROM(0.00)[]; RECEIVED_SPAMHAUS_PBL(0.00)[17.125.67.70.khpj7ygk5idzvmvt5x4ziurxhy.zen.dq.spamhaus.net : 127.0.0.11]; RCVD_TLS_LAST(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; R_SPF_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; SUBJECT_ENDS_QUESTION(1.00)[]; ASN(0.00)[asn:6327, ipnet:64.59.128.0/20, country:CA]; MIME_TRACE(0.00)[0:+]; IP_SCORE(-2.54)[ip: (-6.76), ipnet: 64.59.128.0/20(-3.30), asn: 6327(-2.58), country: CA(-0.09)]; RCVD_IN_DNSWL_LOW(-0.10)[9.134.59.64.list.dnswl.org : 127.0.5.1] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 May 2020 15:09:41 -0000 In message , Ed Maste writes: > Hi Cy, a question on the FreeBSD-git mailing list about ipfilter > vendor branching: > > ---------- Forwarded message --------- > From: Ulrich Spörlein > Date: Wed, 6 May 2020 at 07:35 > Subject: Where was ipfilter supposed to end up in the tree? > To: > > > Hey folks, another vendor branch oddity I need some guidance on. > > vendor-sys/ipfilter did most imports into `dist` *and* `dist-old`. The > merges into head are recorded from dist-old for the early parts of the > history, so I can collapse this into 1 dist branch easily. dist-old was before my time. I've never questioned why. Looking at the history today it appears that vendor/dist was split into vendor-sys/dist and vendor/dist. > > But looking at it, it is a bit more strange than that. The merges to > head merge into 2 different places, and I wonder what the correct > place is (so I can blacklist the other) dist is the authoritative directory. I cannot answer why darrenr@ chose to import into dist-old. One would think that a clean break should have been made at the point peter@ created it. > > Is /head/sys/contrib/ipfilter/netinet correct, or /head/sys/netinet/ > (and: was it maybe repo-copied at some point?) For kernel sources, head/sys/contrib/ipfilter/inet is the correct location. > > It currently lives in sys/contrib/ipfilter/netinet, but for example > the tagging of releng/6.3 still deleted it, so it likely was > repo-copied. It likely was. I wasn't a src comitter (or even a ports committer) then. But looking at svn history peter@ moved it from head/sys/netinet to head/sys/contrib/ipfilter/netinet in r2328: 23283 | peter | 1997-03-02 07:49:41 -0800 (Sun, 02 Mar 1997). The reason for the change is that darrenr@ changed the ipfilter license at about that time when he was employed by Sun. And ipfilter became part of Solaris (7 or 8, my memory is foggy about this). This is also when OpenBSD ripped ipfilter out of their sources and wrote pf, in response to the license change. Though I wasn't a committer at that time I do recall discussions on the mailing lists to move ipfilter to contrib. Merging dist-old into dist would be logical. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org The need of the many outweighs the greed of the few. > > > ------------------------------------------------------------------------ > r23282 | peter | 1997-03-02 16:49:41 +0100 (Sun, 02 Mar 1997) | 3 lines > Changed paths: > A /vendor-sys/ipfilter > A /vendor-sys/ipfilter/dist > A /vendor-sys/ipfilter/dist/sys > A /vendor-sys/ipfilter/dist/sys/contrib > A /vendor-sys/ipfilter/dist/sys/contrib/ipfilter > A /vendor-sys/ipfilter/dist/sys/contrib/ipfilter/netinet > A /vendor-sys/ipfilter/dist/sys/contrib/ipfilter/netinet/fil.c > A /vendor-sys/ipfilter/dist/sys/contrib/ipfilter/netinet/ip_compat.h > A /vendor-sys/ipfilter/dist/sys/contrib/ipfilter/netinet/ip_fil.c > A /vendor-sys/ipfilter/dist/sys/contrib/ipfilter/netinet/ip_fil.h > A /vendor-sys/ipfilter/dist/sys/contrib/ipfilter/netinet/ip_frag.c > A /vendor-sys/ipfilter/dist/sys/contrib/ipfilter/netinet/ip_frag.h > A /vendor-sys/ipfilter/dist/sys/contrib/ipfilter/netinet/ip_nat.c > A /vendor-sys/ipfilter/dist/sys/contrib/ipfilter/netinet/ip_nat.h > A /vendor-sys/ipfilter/dist/sys/contrib/ipfilter/netinet/ip_state.c > A /vendor-sys/ipfilter/dist/sys/contrib/ipfilter/netinet/ip_state.h > A /vendor-sys/ipfilter/dist-old > A /vendor-sys/ipfilter/dist-old/sys > A /vendor-sys/ipfilter/dist-old/sys/netinet > A /vendor-sys/ipfilter/dist-old/sys/netinet/fil.c > A /vendor-sys/ipfilter/dist-old/sys/netinet/ip_compat.h > A /vendor-sys/ipfilter/dist-old/sys/netinet/ip_fil.c > A /vendor-sys/ipfilter/dist-old/sys/netinet/ip_fil.h > A /vendor-sys/ipfilter/dist-old/sys/netinet/ip_frag.c > A /vendor-sys/ipfilter/dist-old/sys/netinet/ip_frag.h > A /vendor-sys/ipfilter/dist-old/sys/netinet/ip_nat.c > A /vendor-sys/ipfilter/dist-old/sys/netinet/ip_nat.h > A /vendor-sys/ipfilter/dist-old/sys/netinet/ip_state.c > A /vendor-sys/ipfilter/dist-old/sys/netinet/ip_state.h > > Replacement import of ipfilter 3.1.7 components used in kernel. > (This is to repair the vendor branching) > > ------------------------------------------------------------------------ > r23283 | peter | 1997-03-02 16:49:41 +0100 (Sun, 02 Mar 1997) | 3 lines > Changed paths: > A /head/sys/contrib > A /head/sys/contrib/ipfilter > A /head/sys/contrib/ipfilter/netinet > A /head/sys/contrib/ipfilter/netinet/fil.c (from > /vendor-sys/ipfilter/dist/sys/contrib/ipfilter/netinet/fil.c:23282) > A /head/sys/contrib/ipfilter/netinet/ip_compat.h (from > /vendor-sys/ipfilter/dist/sys/contrib/ipfilter/netinet/ip_compat.h:23282) > A /head/sys/contrib/ipfilter/netinet/ip_fil.c (from > /vendor-sys/ipfilter/dist/sys/contrib/ipfilter/netinet/ip_fil.c:23282) > A /head/sys/contrib/ipfilter/netinet/ip_fil.h (from > /vendor-sys/ipfilter/dist/sys/contrib/ipfilter/netinet/ip_fil.h:23282) > A /head/sys/contrib/ipfilter/netinet/ip_frag.c (from > /vendor-sys/ipfilter/dist/sys/contrib/ipfilter/netinet/ip_frag.c:23282) > A /head/sys/contrib/ipfilter/netinet/ip_frag.h (from > /vendor-sys/ipfilter/dist/sys/contrib/ipfilter/netinet/ip_frag.h:23282) > A /head/sys/contrib/ipfilter/netinet/ip_nat.c (from > /vendor-sys/ipfilter/dist/sys/contrib/ipfilter/netinet/ip_nat.c:23282) > A /head/sys/contrib/ipfilter/netinet/ip_nat.h (from > /vendor-sys/ipfilter/dist/sys/contrib/ipfilter/netinet/ip_nat.h:23282) > A /head/sys/contrib/ipfilter/netinet/ip_state.c (from > /vendor-sys/ipfilter/dist/sys/contrib/ipfilter/netinet/ip_state.c:23282) > A /head/sys/contrib/ipfilter/netinet/ip_state.h (from > /vendor-sys/ipfilter/dist/sys/contrib/ipfilter/netinet/ip_state.h:23282) > A /head/sys/netinet/fil.c (from > /vendor-sys/ipfilter/dist-old/sys/netinet/fil.c:23282) > A /head/sys/netinet/ip_compat.h (from > /vendor-sys/ipfilter/dist-old/sys/netinet/ip_compat.h:23282) > A /head/sys/netinet/ip_fil.c (from > /vendor-sys/ipfilter/dist-old/sys/netinet/ip_fil.c:23282) > A /head/sys/netinet/ip_fil.h (from > /vendor-sys/ipfilter/dist-old/sys/netinet/ip_fil.h:23282) > A /head/sys/netinet/ip_frag.c (from > /vendor-sys/ipfilter/dist-old/sys/netinet/ip_frag.c:23282) > A /head/sys/netinet/ip_frag.h (from > /vendor-sys/ipfilter/dist-old/sys/netinet/ip_frag.h:23282) > A /head/sys/netinet/ip_nat.c (from > /vendor-sys/ipfilter/dist-old/sys/netinet/ip_nat.c:23282) > A /head/sys/netinet/ip_nat.h (from > /vendor-sys/ipfilter/dist-old/sys/netinet/ip_nat.h:23282) > A /head/sys/netinet/ip_state.c (from > /vendor-sys/ipfilter/dist-old/sys/netinet/ip_state.c:23282) > A /head/sys/netinet/ip_state.h (from > /vendor-sys/ipfilter/dist-old/sys/netinet/ip_state.h:23282) > > This commit was generated by cvs2svn to compensate for changes in r23282, > which included commits to RCS files with non-trunk default branches. > > ------------------------------------------------------------------------ > r23284 | cvs2svn | 1997-03-02 16:49:42 +0100 (Sun, 02 Mar 1997) | 2 lines > Changed paths: > A /vendor-sys/ipfilter/ipfilter3_1_7 (from > /vendor-sys/ipfilter/dist-old:23282) > > This commit was manufactured by cvs2svn to create tag > 'ipfilter3_1_7'. > ------------------------------------------------------------------------ > > > > Ah, some more spelunking finds: > > r77859 | jlemon | 2001-06-07 07:13:35 +0200 (Thu, 07 Jun 2001) | 2 > lines > Changed paths: > D /head/sys/netinet/fil.c > D /head/sys/netinet/ip_auth.c > D /head/sys/netinet/ip_auth.h > D /head/sys/netinet/ip_compat.h > D /head/sys/netinet/ip_fil.c > D /head/sys/netinet/ip_fil.h > D /head/sys/netinet/ip_frag.c > D /head/sys/netinet/ip_frag.h > D /head/sys/netinet/ip_ftp_pxy.c > D /head/sys/netinet/ip_log.c > D /head/sys/netinet/ip_nat.c > D /head/sys/netinet/ip_nat.h > D /head/sys/netinet/ip_proxy.c > D /head/sys/netinet/ip_proxy.h > D /head/sys/netinet/ip_raudio_pxy.c > D /head/sys/netinet/ip_rcmd_pxy.c > D /head/sys/netinet/ip_state.c > D /head/sys/netinet/ip_state.h > D /head/sys/netinet/ipl.h > D /head/sys/netinet/mlfk_ipl.c > > Move IPFilter into contrib. > _______________________________________________ > freebsd-git@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-git > To unsubscribe, send any mail to "freebsd-git-unsubscribe@freebsd.org" >