Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 23 Sep 2020 09:18:27 -0600
From:      Warner Losh <imp@bsdimp.com>
To:        Shawn Webb <shawn.webb@hardenedbsd.org>
Cc:        "freebsd-arch@freebsd.org" <freebsd-arch@freebsd.org>
Subject:   Re: Re: svn commit: r365984 - head/usr.bin/calendar/calendars
Message-ID:  <CANCZdfpWcwt2gSF5m3_Z2DfBmURpk-UCeOfvFN8H_C8SQu_8WA@mail.gmail.com>
In-Reply-To: <20200923134334.czblcl2ppyxjnigs@mutt-hbsd>
References:  <20200923134334.czblcl2ppyxjnigs@mutt-hbsd>

next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, Sep 23, 2020 at 7:43 AM Shawn Webb <shawn.webb@hardenedbsd.org>
wrote:

> Forwarding to freebsd-arch@freebsd.org per Scott Long's request.
>
> ----- Forwarded message from Shawn Webb <shawn.webb@hardenedbsd.org> -----
>
> Date: Tue, 22 Sep 2020 15:24:24 -0400
> From: Shawn Webb <shawn.webb@hardenedbsd.org>
> To: Gordon Bergling <gbe@freebsd.org>
> Cc: Andriy Gapon <avg@freebsd.org>, cem@freebsd.org, Cy Schubert
>  <Cy.Schubert@cschubert.com>, src-committers <src-committers@freebsd.org>,
>  svn-src-all <svn-src-all@freebsd.org>, svn-src-head
>  <svn-src-head@freebsd.org>
> Subject: Re: svn commit: r365984 - head/usr.bin/calendar/calendars
>
> On Tue, Sep 22, 2020 at 09:18:43PM +0200, Gordon Bergling wrote:
> > On Tue, Sep 22, 2020 at 09:01:46PM +0300, Andriy Gapon wrote:
> > > On 22/09/2020 06:06, Conrad Meyer wrote:
> > > > Big ol plus one from me.
> > > >
> > > > On Mon, Sep 21, 2020 at 4:16 PM Cy Schubert <
> Cy.Schubert@cschubert.com> wrote:
> > > >>
> > > >> In message <202009212255.08LMtpSp078237@repo.freebsd.org>, Greg
> Lehey
> > > >> writes:
> > > >>> Author: grog
> > > >>> Date: Mon Sep 21 22:55:51 2020
> > > >>> New Revision: 365984
> > > >>> URL: https://svnweb.freebsd.org/changeset/base/365984
> > > >>>
> > > >>> Log:
> > > >>>   Remove claim that Allied Forces created "West Germany" in 1953.
> I can
> > > >>>   find no historic substantiation for such a claim.  The Federal
> > > >>>   Republic of Germany was created by Germans on 23 May 1949, as
> also
> > > >>>   noted in this file.
> > > >>>
> > > >>> Modified:
> > > >>>   head/usr.bin/calendar/calendars/calendar.history
> > > >>>
> > > >>> Modified: head/usr.bin/calendar/calendars/calendar.history
> > > >>>
> =============================================================================
> > > >>> =
> > > >>> --- head/usr.bin/calendar/calendars/calendar.history  Mon Sep 21
> 22:52:57 202
> > > >>> 0     (r365983)
> > > >>> +++ head/usr.bin/calendar/calendars/calendar.history  Mon Sep 21
> 22:55:51 202
> > > >>> 0     (r365984)
> > > >>> @@ -521,7 +521,6 @@
> > > >>>  09/20        Magellan leaves Spain on the first Round the World
> passage, 151
> > > >>> 9
> > > >>>  09/20        The Roxy Theater opens in Hollywood, 1973
> > > >>>  09/21        J. R. R. Tolkien's The Hobbit is published, 1937
> > > >>> -09/22        Allied forces form the independent nation West
> Germany, 1953
> > > >>>  09/22        US President Lincoln issues the Emancipation
> Proclamation, 1862
> > > >>>  09/22        Special prosecutor Leon Jeworski subpoenas US
> President Nixon,
> > > >>> 1974
> > > >>>  09/22        The first Soviet atomic bomb explodes, 1949
> > > >>>
> > > >>
> > > >> Does this file still need to be in FreeBSD? It may have been a
> novelty back
> > > >> in the day but IMO calendar.history has nothing to do with BSD,
> computers
> > > >> or anything else of interest to FreeBSD. At the very least this
> file should
> > > >> be moved to ports or better yet, removed entirely. I simply don't
> see the
> > > >> point of it being in the tree and distributed with an O/S, any O/S.
> >
> > We already had a similar discussion in march 2020 after r358561 [1].
> >
> > In the short, the calendar utility has it's historic place, even it's
> > just more a kind of tradition, like adding yourself as a FreeBSD
> committer
> > to calendar.freebsd.
> >
> > [1]
> https://lists.freebsd.org/pipermail/svn-src-all/2020-March/thread.html
>
> Would it make sense to prune calendar entries to only BSD-related
> entries?
>

First off, thanks for sending this. It gets the ball rolling...

However, this really isn't an actionable proposal. You can't just svn rm
some of the files, that will break things. Also, which files should you
remove? Without a concrete plan and someone signed up to do it, nothing is
going to happen, even if there's a dozen +1's here.

Fortunately, I have already contacted grog@ directly. He was quite
receptive to my email suggesting something be done. After a couple of
rounds, there's the rough plan we're talking about. Briefly:

1. I'll do for calendar what I did for CTM. We'll split it out into its own
git repo. git filter-patch is straight-forward to use, but has a number of
caveats with the imperfect github mirror we have. I'll do it against the
beta cgit mirror and write up the process since I'm pretty sure people will
want to replicate it in the future.
2. Delete the contentious bits (details to follow)
3. Adjust the build (since calendar uses cpp to build up its databases)
4. Prune the new repo to just the contentious bits into that repo (likely
under github.com/freebsd/calendar, like we've done for CTM and other things)
5. Create a port you can optionally install
6. Adjust calendar to work when things are there (or not there)
7. Remove the contentious bits from FreeBSD...

So, it's just an outline at this time, which is why I hadn't sent a
concrete proposal here just yet. Wanted to at least get a list of the files
that would remain so we can have an intelligent discussion about those, but
since this showed up I thought I'd send a heads up so people know what's
going on.

Warner



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfpWcwt2gSF5m3_Z2DfBmURpk-UCeOfvFN8H_C8SQu_8WA>