From owner-freebsd-git@freebsd.org Mon May 4 18:50:40 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 3129D2D73B9 for ; Mon, 4 May 2020 18:50:40 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-f54.google.com (mail-io1-f54.google.com [209.85.166.54]) (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 49GBkl2g0kz4b3P; Mon, 4 May 2020 18:50:39 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io1-f54.google.com with SMTP id z2so13483530iol.11; Mon, 04 May 2020 11:50:39 -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:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=c678IC7VNp8lRiAfROpuQDx2yOZ9toDvIg2CPMWTJRo=; b=gyBYc6C6OC7PltGIEU+rTdE9iU2hUBj1kezv6c8jmFSvptAdfB4GY8BvGbgDgCF4Td 5GEVnpOtpeORjRin34CPYKLGym908IwSu+xtuYUhYhPVno2J9RCAoysD7zHsAS4GN9Lc z8/EBYSqH4Kh8GKoyx0GER05fsa/2+eEjH/xz/fTFyiD8GiQLT3vqzxgJVws29EJGn34 Fd3g43VMcdPmn2XM/Q9eC4R47MElY62RyuASeP9KGcvIJ3DsdTcq7ll2iZQ6+GYPm2yJ AbViHVcFQo/a5WF7jdtc/c74owJ2fNTD0qhSHGYuXFTyEhdvqtlRVAdQcMWVdHEqe66L QbiQ== X-Gm-Message-State: AGi0PuaJ5KBujXs5ZsODVVvMayyOLngT7APwLfZRt3HH+KdGW75xgUpk pB/ZDx4xMD62szsC6jYn22o74to3QO3zlEkj/f9YIGW9 X-Google-Smtp-Source: APiQypLCAPlrXK7ty8LYNblgbKDM4fGrI8G+KgoPLz91hawsbv+qck2VHuzohscD6LnIqq66zaU1MdHBBT1ki+wdct0= X-Received: by 2002:a6b:ee15:: with SMTP id i21mr3847194ioh.179.1588618237208; Mon, 04 May 2020 11:50:37 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Ed Maste Date: Mon, 4 May 2020 14:50:24 -0400 Message-ID: Subject: Re: cvs2svn made lots of old ports tags basically empty To: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Cc: freebsd-git@freebsd.org, "portmgr@FreeBSD.org" Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 49GBkl2g0kz4b3P X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of carpeddiem@gmail.com designates 209.85.166.54 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-3.11 / 15.00]; ARC_NA(0.00)[]; TO_DN_EQ_ADDR_SOME(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; MIME_TRACE(0.00)[0:+]; DMARC_NA(0.00)[freebsd.org]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; IP_SCORE(-1.11)[ip: (-4.69), ipnet: 209.85.128.0/17(-0.40), asn: 15169(-0.43), country: US(-0.05)]; RCVD_IN_DNSWL_NONE(0.00)[54.166.85.209.list.dnswl.org : 127.0.5.0]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[54.166.85.209.rep.mailspike.net : 127.0.0.17]; R_DKIM_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.29 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: Mon, 04 May 2020 18:50:40 -0000 On Sat, 2 May 2020 at 11:09, Ulrich Sp=C3=B6rlein wrote: > > Note that it copies the root, but then deletes everything _but_ Mk. I > take it this is not what was wanted and the release tags are supposed > to ship a full tree, not just Mk? I presume so. I think we'd need to look at the CVS version of the repo to determine what happened here. I wonder if we can just skip these old tags in the conversion though? If they were already broken by cvs2svn we probably don't need them now. From owner-freebsd-git@freebsd.org Tue May 5 08:05:35 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 EE26C2DBD3C for ; Tue, 5 May 2020 08:05:35 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from mail-ot1-f66.google.com (mail-ot1-f66.google.com [209.85.210.66]) (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 49GXMz6284z4VY7; Tue, 5 May 2020 08:05:35 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: by mail-ot1-f66.google.com with SMTP id j4so903040otr.11; Tue, 05 May 2020 01:05:35 -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:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=b4W0pauTu4WRmhs9nJNdzmASfa36weqNvLqNqxQDPbI=; b=e9Qx8oTI2w752+kHP5L9/R+Q2bD97TSUGf9v7mt1e1Iq28wTirlgRymVGR95xd7NNK MsJ3JlDuxOSNyLrm04uCK8UZ5QpIocxojmPZZW/owggr413t6M+Hs+Hzwx7awfS3s3Bf oqPhthziTfgCLpL49XaLux9fPSOptoH9SY0Vz6v4FEXk+uYXbsQr3+kWAUulI3UWXpID h8pQ5jM3bLg8QhqDUbGDWTULbj2UhMAQA6GbW95yvnuvuaNz2WIp9dysIOo4zXRuZf2N i5hErXZcQNyOf4eaTUMtLfxR1j/xwpM2PqTFWWZCwSgFO8Uj91UnwMqofqVRxkh8RMFT GxUQ== X-Gm-Message-State: AGi0Pub3FPHK8SMleau4xw9TlKMkaESe4Q469UX70c6M0gEtyWsKmr81 NmpnMQEpzOZw2ALaig146nLqJJNK8WOYQytPVTJG+7op X-Google-Smtp-Source: APiQypLMuqEfpDDfrDsecD7fKkmU+pSxoasT1M4ElV5z+z7TvQE2HJEbv7gyf5NP0kPtuGANhnS3478AaQdtbi7pYWE= X-Received: by 2002:a05:6830:1241:: with SMTP id s1mr1281448otp.119.1588665933747; Tue, 05 May 2020 01:05:33 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Date: Tue, 5 May 2020 10:05:19 +0200 Message-ID: Subject: Re: cvs2svn made lots of old ports tags basically empty To: Ed Maste Cc: freebsd-git@freebsd.org, "portmgr@FreeBSD.org" Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 49GXMz6284z4VY7 X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-6.00 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] 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: Tue, 05 May 2020 08:05:36 -0000 Am Mo., 4. Mai 2020 um 20:50 Uhr schrieb Ed Maste : > > On Sat, 2 May 2020 at 11:09, Ulrich Sp=C3=B6rlein wrote= : > > > > Note that it copies the root, but then deletes everything _but_ Mk. I > > take it this is not what was wanted and the release tags are supposed > > to ship a full tree, not just Mk? > > I presume so. I think we'd need to look at the CVS version of the repo > to determine what happened here. > > I wonder if we can just skip these old tags in the conversion though? > If they were already broken by cvs2svn we probably don't need them > now. Parts of the "back outs" are repo-copies for sure. Consider this tag of 2.2.1 in 1997 (I don't think postgresql 9.2 was a thing back then ...) r7590 | cvs2svn | 1997-08-15 17:44:59 +0200 (Fri, 15 Aug 1997) | 1 line Changed paths: A /tags/RELEASE_2_2_1 (from /head:5975) D /tags/RELEASE_2_2_1/CVSROOT D /tags/RELEASE_2_2_1/Mk D /tags/RELEASE_2_2_1/archivers/sharutils D /tags/RELEASE_2_2_1/audio/speak_freely D /tags/RELEASE_2_2_1/audio/vat D /tags/RELEASE_2_2_1/benchmarks/unixbench D /tags/RELEASE_2_2_1/comms/mgetty+sendfax/files/mgettycfg.in D /tags/RELEASE_2_2_1/databases/msql3 D /tags/RELEASE_2_2_1/databases/p5-DBI-137 D /tags/RELEASE_2_2_1/databases/postgresql-devel D /tags/RELEASE_2_2_1/databases/postgresql-devel-server D /tags/RELEASE_2_2_1/databases/postgresql73 D /tags/RELEASE_2_2_1/databases/postgresql73-server D /tags/RELEASE_2_2_1/databases/postgresql74-server D /tags/RELEASE_2_2_1/databases/postgresql80-server D /tags/RELEASE_2_2_1/databases/postgresql81-server D /tags/RELEASE_2_2_1/databases/postgresql82-server D /tags/RELEASE_2_2_1/databases/postgresql83-server D /tags/RELEASE_2_2_1/databases/postgresql84-server D /tags/RELEASE_2_2_1/databases/postgresql90-server D /tags/RELEASE_2_2_1/databases/postgresql91-server D /tags/RELEASE_2_2_1/databases/postgresql92-server Which means it shouldn't end up in the tag, but then again, it should also not be in head at that point in time. And that tag is utterly useless w/o the Mk/, which sadly also gets deleted (did we ever repo-copy this around?). This affects all tags up to and including 3.0.0; the 3.1.0 tag looks more sane. I've patched this up in a way I think that makes sense, but really, portmgr needs to bless this. It should be ok to have the "extra" directories there, as they are not hooked up to the category Makefile (IIUC), it would also be possible to go in, detect all ports-repocopies at least for the release tags and delete the extras. Should be straight-forward to script, but it would need to be done by someone else. For ports especially, the state is easy enough to detect, e.g. % git ls-tree -r release/2.2.1|egrep "postgresql.*server"|sort 100644 blob 2743afb2583571c35102bf8eaaea63811cb418bc databases/postgresql-devel-server/pkg-descr 100644 blob 2743afb2583571c35102bf8eaaea63811cb418bc databases/postgresql73-server/pkg-descr 100644 blob 2743afb2583571c35102bf8eaaea63811cb418bc databases/postgresql74-server/pkg-descr 100644 blob 2743afb2583571c35102bf8eaaea63811cb418bc databases/postgresql80-server/pkg-descr 100644 blob 2743afb2583571c35102bf8eaaea63811cb418bc databases/postgresql81-server/pkg-descr 100644 blob 2743afb2583571c35102bf8eaaea63811cb418bc databases/postgresql82-server/pkg-descr 100644 blob 2743afb2583571c35102bf8eaaea63811cb418bc databases/postgresql83-server/pkg-descr 100644 blob 2743afb2583571c35102bf8eaaea63811cb418bc databases/postgresql84-server/pkg-descr 100644 blob 2743afb2583571c35102bf8eaaea63811cb418bc databases/postgresql90-server/pkg-descr 100644 blob 2743afb2583571c35102bf8eaaea63811cb418bc databases/postgresql91-server/pkg-descr 100644 blob 2743afb2583571c35102bf8eaaea63811cb418bc databases/postgresql92-server/pkg-descr 100644 blob 43a0ebb2e780459c3f2a8b053a5817a554ab9848 databases/postgresql-devel-server/pkg-plist 100644 blob 43a0ebb2e780459c3f2a8b053a5817a554ab9848 databases/postgresql73-server/pkg-plist 100644 blob 43a0ebb2e780459c3f2a8b053a5817a554ab9848 databases/postgresql74-server/pkg-plist 100644 blob 43a0ebb2e780459c3f2a8b053a5817a554ab9848 databases/postgresql80-server/pkg-plist 100644 blob 43a0ebb2e780459c3f2a8b053a5817a554ab9848 databases/postgresql81-server/pkg-plist 100644 blob 43a0ebb2e780459c3f2a8b053a5817a554ab9848 databases/postgresql82-server/pkg-plist 100644 blob 43a0ebb2e780459c3f2a8b053a5817a554ab9848 databases/postgresql83-server/pkg-plist 100644 blob 43a0ebb2e780459c3f2a8b053a5817a554ab9848 databases/postgresql84-server/pkg-plist 100644 blob 43a0ebb2e780459c3f2a8b053a5817a554ab9848 databases/postgresql90-server/pkg-plist 100644 blob 43a0ebb2e780459c3f2a8b053a5817a554ab9848 databases/postgresql91-server/pkg-plist 100644 blob 43a0ebb2e780459c3f2a8b053a5817a554ab9848 databases/postgresql92-server/pkg-plist 100644 blob 4c24a164fbd6f2794b789df0556480c3806a3e0f databases/postgresql-devel-server/scripts/createuser 100644 blob 4c24a164fbd6f2794b789df0556480c3806a3e0f databases/postgresql73-server/scripts/createuser 100644 blob 4c24a164fbd6f2794b789df0556480c3806a3e0f databases/postgresql74-server/scripts/createuser 100644 blob 4c24a164fbd6f2794b789df0556480c3806a3e0f databases/postgresql80-server/scripts/createuser 100644 blob 4c24a164fbd6f2794b789df0556480c3806a3e0f databases/postgresql81-server/scripts/createuser 100644 blob 4c24a164fbd6f2794b789df0556480c3806a3e0f databases/postgresql82-server/scripts/createuser 100644 blob 4c24a164fbd6f2794b789df0556480c3806a3e0f databases/postgresql83-server/scripts/createuser 100644 blob 4c24a164fbd6f2794b789df0556480c3806a3e0f databases/postgresql84-server/scripts/createuser 100644 blob 4c24a164fbd6f2794b789df0556480c3806a3e0f databases/postgresql90-server/scripts/createuser 100644 blob 4c24a164fbd6f2794b789df0556480c3806a3e0f databases/postgresql91-server/scripts/createuser 100644 blob 4c24a164fbd6f2794b789df0556480c3806a3e0f databases/postgresql92-server/scripts/createuser 100644 blob 55a303f3106a6b5ed65d9fc73ef4cc0f8ecef48c databases/postgresql-devel-server/pkg-comment 100644 blob 55a303f3106a6b5ed65d9fc73ef4cc0f8ecef48c databases/postgresql73-server/pkg-comment 100644 blob 55a303f3106a6b5ed65d9fc73ef4cc0f8ecef48c databases/postgresql74-server/pkg-comment 100644 blob 55a303f3106a6b5ed65d9fc73ef4cc0f8ecef48c databases/postgresql80-server/pkg-comment 100644 blob 55a303f3106a6b5ed65d9fc73ef4cc0f8ecef48c databases/postgresql81-server/pkg-comment 100644 blob 55a303f3106a6b5ed65d9fc73ef4cc0f8ecef48c databases/postgresql82-server/pkg-comment 100644 blob 55a303f3106a6b5ed65d9fc73ef4cc0f8ecef48c databases/postgresql83-server/pkg-comment 100644 blob 55a303f3106a6b5ed65d9fc73ef4cc0f8ecef48c databases/postgresql84-server/pkg-comment 100644 blob 55a303f3106a6b5ed65d9fc73ef4cc0f8ecef48c databases/postgresql90-server/pkg-comment 100644 blob 55a303f3106a6b5ed65d9fc73ef4cc0f8ecef48c databases/postgresql91-server/pkg-comment 100644 blob 55a303f3106a6b5ed65d9fc73ef4cc0f8ecef48c databases/postgresql92-server/pkg-comment 100644 blob 9974efd8df42684a748c41b6287226a7a776982c databases/postgresql-devel-server/files/post-install-notes 100644 blob 9974efd8df42684a748c41b6287226a7a776982c databases/postgresql73-server/files/post-install-notes 100644 blob 9974efd8df42684a748c41b6287226a7a776982c databases/postgresql74-server/files/post-install-notes 100644 blob 9974efd8df42684a748c41b6287226a7a776982c databases/postgresql80-server/files/post-install-notes 100644 blob 9974efd8df42684a748c41b6287226a7a776982c databases/postgresql81-server/files/post-install-notes 100644 blob 9974efd8df42684a748c41b6287226a7a776982c databases/postgresql82-server/files/post-install-notes 100644 blob 9974efd8df42684a748c41b6287226a7a776982c databases/postgresql83-server/files/post-install-notes 100644 blob 9974efd8df42684a748c41b6287226a7a776982c databases/postgresql84-server/files/post-install-notes 100644 blob 9974efd8df42684a748c41b6287226a7a776982c databases/postgresql90-server/files/post-install-notes 100644 blob 9974efd8df42684a748c41b6287226a7a776982c databases/postgresql91-server/files/post-install-notes 100644 blob 9974efd8df42684a748c41b6287226a7a776982c databases/postgresql92-server/files/post-install-notes 100644 blob c0343bd90bf8602451a28bba3d8895f59549517d databases/postgresql-devel-server/Makefile 100644 blob c0343bd90bf8602451a28bba3d8895f59549517d databases/postgresql73-server/Makefile 100644 blob c0343bd90bf8602451a28bba3d8895f59549517d databases/postgresql74-server/Makefile 100644 blob c0343bd90bf8602451a28bba3d8895f59549517d databases/postgresql80-server/Makefile 100644 blob c0343bd90bf8602451a28bba3d8895f59549517d databases/postgresql81-server/Makefile 100644 blob c0343bd90bf8602451a28bba3d8895f59549517d databases/postgresql82-server/Makefile 100644 blob c0343bd90bf8602451a28bba3d8895f59549517d databases/postgresql83-server/Makefile 100644 blob c0343bd90bf8602451a28bba3d8895f59549517d databases/postgresql84-server/Makefile 100644 blob c0343bd90bf8602451a28bba3d8895f59549517d databases/postgresql90-server/Makefile 100644 blob c0343bd90bf8602451a28bba3d8895f59549517d databases/postgresql91-server/Makefile 100644 blob c0343bd90bf8602451a28bba3d8895f59549517d databases/postgresql92-server/Makefile % git ls-tree -r release/2.2.1|egrep "databases/Makefile" 100644 blob d53f752d7966588ffc8846d72ce2841f2e607299 databases/Makefile % git cat-file -p d53f752d7966588ffc8846d72ce2841f2e607299 # $Id: Makefile,v 1.10 1996/10/24 00:02:50 jfitz Exp $ # SUBDIR +=3D exodus SUBDIR +=3D gdbm SUBDIR +=3D gnats SUBDIR +=3D msql SUBDIR +=3D p5-DBD-mSQL SUBDIR +=3D p5-DBI SUBDIR +=3D p5-Msql SUBDIR +=3D p5-Pg SUBDIR +=3D postgres95 SUBDIR +=3D xfsql .include See? Only "postgres95" should be there. Hmm, except that doesn't match any of the blobs. Let's see where this stuff came from: databases/postgresql7/Makefile is blob c0343bd90bf8602451a28bba3d8895f59549= 517d and that claims it comes for postgres ca. 1996 % git cat-file -p c0343bd90bf8602451a28bba3d8895f59549517d # New ports collection makefile for: postgres95 # Version required: 1.08 # Date created: Oct 9 1996 # Whom: Matthew Stein # # $Id: Makefile,v 1.2 1996/09/26 01:40:19 jfitz Exp $ ... Hmm, it's not even there. This might be stranger than I thought? Compare the SUBDIRs above with the directory listing: % git ls-tree release/2.2.1 databases/ 100644 blob d53f752d7966588ffc8846d72ce2841f2e607299 databases/Makefile 040000 tree 2f21209c87b795930ac42df96a4a55cf3094d0d3 databases/gdbm 040000 tree c80f624a8c058d96f6574f5b50d4ea12687a08a1 databases/gnats 040000 tree fdb4de7f9a9356bf9729a0f4da44ac921f4a286f databases/msql 040000 tree fdb4de7f9a9356bf9729a0f4da44ac921f4a286f databases/msql3 040000 tree a59f600d794680c8b6df0aa6a1475a2968d385e6 databases/p5-DBI-13= 7 040000 tree a59f600d794680c8b6df0aa6a1475a2968d385e6 databases/p5-DBI 040000 tree 2ad63299bea9b2becc7ff58907d08dbf3b0382ad databases/p5-Msql 040000 tree 17fa463531776f8d0adc11a8ea23f2a0c351fd68 databases/p5-Pg 040000 tree 95624879e5e003f9c0531209e614d33a86979bdf databases/pkg 040000 tree 9bd099838d36d8a09274ae03bbf50011d0cd4c02 databases/postgresql-devel-server 040000 tree 9bd099838d36d8a09274ae03bbf50011d0cd4c02 databases/postgresql-devel 040000 tree 9bd099838d36d8a09274ae03bbf50011d0cd4c02 databases/postgresq= l7 040000 tree 9bd099838d36d8a09274ae03bbf50011d0cd4c02 databases/postgresql73-server 040000 tree 9bd099838d36d8a09274ae03bbf50011d0cd4c02 databases/postgresq= l73 040000 tree 9bd099838d36d8a09274ae03bbf50011d0cd4c02 databases/postgresql74-server 040000 tree 9bd099838d36d8a09274ae03bbf50011d0cd4c02 databases/postgresql80-server 040000 tree 9bd099838d36d8a09274ae03bbf50011d0cd4c02 databases/postgresql81-server 040000 tree 9bd099838d36d8a09274ae03bbf50011d0cd4c02 databases/postgresql82-server 040000 tree 9bd099838d36d8a09274ae03bbf50011d0cd4c02 databases/postgresql83-server 040000 tree 9bd099838d36d8a09274ae03bbf50011d0cd4c02 databases/postgresql84-server 040000 tree 9bd099838d36d8a09274ae03bbf50011d0cd4c02 databases/postgresql90-server 040000 tree 9bd099838d36d8a09274ae03bbf50011d0cd4c02 databases/postgresql91-server 040000 tree 9bd099838d36d8a09274ae03bbf50011d0cd4c02 databases/postgresql92-server Ah, I think this wasn't a repo-copy then, but instead a repo move! postgres95 got retroactively renamed to postgresqlX at some point in time, thus the history was fouled up. This should've been a repo-copy plus deletion if we had wanted to reserve some semblance of history. I'm afraid that looking at the CVS repo then will not help, as it has been butchered. If someone had all CVS commit mails from back then, it might be reconstructable ... Then again, there were very few ports back then and there are only a handful of tags. So motivated archaeologists could reconstruct this pretty easily with a handful of scripts and a couple of spare weekends. Cheers Uli 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. 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" >