From owner-freebsd-git@freebsd.org Wed May 6 11:35:20 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 21E1D2C13D8 for ; Wed, 6 May 2020 11:35:20 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from mail-ot1-f52.google.com (mail-ot1-f52.google.com [209.85.210.52]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49HDzW1FX1z4WVV for ; Wed, 6 May 2020 11:35:18 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: by mail-ot1-f52.google.com with SMTP id k110so1054806otc.2 for ; Wed, 06 May 2020 04:35:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=i1D2UQw55i6S8jJKg9Q+3U1OI5ZhdQmHC9aTPQvyzjY=; b=bzvxYJ6jS3qkhG/AL853pf26qJ90K2u8fNWI6Ae7zIFME/ojEeY8qzjd0EeOtLKdFR N4V1/cT6IMp5USgQ2npVMBiVWI/Q7Fs42HfKqHu78O+HIjN4ExjQQhdUUNOvwsBs3D6F kWBd7mWYZbWLkwncUqzlmuiquoXszO14DDZ/pDiHA/vAWAah8OY5VUDxbssR7POIPFdA uA7PceRsaeAhTU79ixzylj7FU+c10NiyXl75uZE8YTBe4rVTmIiXgNeKpIjEXzjCdlMc j+Jjh9csJ5DsQfTJGlI3mnys534nvuQg20VtGiqOTxbuO1MU6JUx1UOwv/8+wdC+nTzU UAkg== X-Gm-Message-State: AGi0Pub0EV01F6lmMcqiwwg4y3argUgaRfwXbQPhH4Ztuvb5Bno5mUPJ 8jUszgwFeAkMzWCyLaOICCFHX0aTmA+wJZpG5/6lC8Iv X-Google-Smtp-Source: APiQypJ7CNUIFUEs+h97qwpgknjlb8CaPm+nzvfzbKmfXeXJJcnoOwCPI5DWtGfjN2uI/IJCcWzyek6PlTi9utN8vIE= X-Received: by 2002:a05:6830:1e1c:: with SMTP id s28mr5662543otr.207.1588764917090; Wed, 06 May 2020 04:35:17 -0700 (PDT) MIME-Version: 1.0 From: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Date: Wed, 6 May 2020 13:35:05 +0200 Message-ID: Subject: Where was ipfilter supposed to end up in the tree? To: freebsd-git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 49HDzW1FX1z4WVV X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of uspoerlein@gmail.com designates 209.85.210.52 as permitted sender) smtp.mailfrom=uspoerlein@gmail.com X-Spamd-Result: default: False [-1.25 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.99)[-0.987,0]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; RWL_MAILSPIKE_GOOD(0.00)[52.210.85.209.rep.mailspike.net : 127.0.0.18]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; TO_DN_NONE(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; NEURAL_HAM_LONG(-0.99)[-0.987,0]; MIME_TRACE(0.00)[0:+]; RCVD_IN_DNSWL_NONE(0.00)[52.210.85.209.list.dnswl.org : 127.0.5.0]; IP_SCORE(-0.27)[ip: (-0.51), ipnet: 209.85.128.0/17(-0.39), asn: 15169(-0.43), country: US(-0.05)]; FORGED_SENDER(0.30)[uqs@freebsd.org,uspoerlein@gmail.com]; DMARC_NA(0.00)[freebsd.org]; R_DKIM_NA(0.00)[]; SUBJECT_ENDS_QUESTION(1.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[uqs@freebsd.org,uspoerlein@gmail.com]; FREEMAIL_ENVFROM(0.00)[gmail.com]; TO_DOM_EQ_FROM_DOM(0.00)[] 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 11:35:20 -0000 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. 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) Is /head/sys/contrib/ipfilter/netinet correct, or /head/sys/netinet/ (and: was it maybe repo-copied at some point?) 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. ------------------------------------------------------------------------ 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.