From owner-freebsd-arch@freebsd.org Fri Jun 15 17:46:34 2018 Return-Path: Delivered-To: freebsd-arch@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 390A610162B4 for ; Fri, 15 Jun 2018 17:46:34 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: from mail-yw0-x22e.google.com (mail-yw0-x22e.google.com [IPv6:2607:f8b0:4002:c05::22e]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D065B7AF95 for ; Fri, 15 Jun 2018 17:46:33 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: by mail-yw0-x22e.google.com with SMTP id s201-v6so3612342ywg.8 for ; Fri, 15 Jun 2018 10:46:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eitanadler.com; s=0xdeadbeef; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=UPtxJ6008aXQ7gIA/bV7MkVz2DFCJjQzrIZ5hMne2iU=; b=TJ5baZlKa1PaqmU/F4bYS4Jk+DrtOtxFkBLFiET+6bd1PzxoWlxHjjkV7h+Brp6tuI YoQNH0k7W8gPoUHMof2oxJL3Me0tRQxo6Rtoj/+R6HzDH6LYaLQFZ2JWe7IposaV6QOx LNLN6XSez9zrc9Y6km/IV/pxS1bkdRaXWLZcg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=UPtxJ6008aXQ7gIA/bV7MkVz2DFCJjQzrIZ5hMne2iU=; b=B5KcuWHZt41/HSgBNQknfCqKMzrplAITtyNSi3A8VIUMvDiNkoB1nwnfXlXRk6jC1z gJWWuVmk7TVKs5MU6jJWwEbFRiCu/JPpM6Ktkz7W49oFR79Pk5vzABiZdBO3k9ez0IgE yaeqt0gCtB5kw7ebPvbG6CrrObhP+WVCsCZnNBu/Lf78khB7QolGD2VrQ/VfmaGBWkXe MBWysI/Jw9Njh8DuYxVU1Om/ro0QEhHVbKzwiPFZLUkWlihLoFbCF4yb0UPM8TEln5R0 CaB1tLhBH7dG0uB2SzSraQpZ6UGQiTqjANK4SgTs3dy03ikN2zbliD6VXMoxLDrx3X/H /Alw== X-Gm-Message-State: APt69E0h5dT6o5CrDusvQzPOh0cwa9WE5iUQ1fSXN41LCsxAVXGcy8oB W9bagrmvKHdINGiiZBJxrn8kIhEwhv5oD2YSK7mwqQ== X-Google-Smtp-Source: ADUXVKLmHx+1v/1WPb8i64Ypte7wERREAKssVI0rm8QQRE2xZzVeM4oQPwpqn/ROVH1vOIs/eM5qVDj2KHx2V6DuXik= X-Received: by 2002:a81:af1d:: with SMTP id n29-v6mr1381254ywh.113.1529084792887; Fri, 15 Jun 2018 10:46:32 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a25:ef50:0:0:0:0:0 with HTTP; Fri, 15 Jun 2018 10:46:02 -0700 (PDT) In-Reply-To: References: From: Eitan Adler Date: Fri, 15 Jun 2018 10:46:02 -0700 Message-ID: Subject: Re: upstream for contrib/tzcode/stdtme? To: John Baldwin Cc: "freebsd-arch@freebsd.org" Content-Type: text/plain; charset="UTF-8" X-BeenThere: freebsd-arch@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: Discussion related to FreeBSD architecture List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jun 2018 17:46:34 -0000 On 15 June 2018 at 09:03, John Baldwin wrote: > On 6/15/18 7:28 AM, Philip Paeps wrote: >> On 2018-06-10 21:40:21 (+0200), Eitan Adler wrote: >>> What's the upstream for contrib/tzcode/stdtme? >> >> https://www.iana.org/time-zones (and https://github.com/eggert/tz). >> >>> There are a couple of PRs for it and I'd like to either update, fix >>> upstream, or move to non-contrib & fix. >> >> I've started updating it several times but the rather awkward layout of >> the vendor tree makes doing just about anything else more attractive. :) >> >> More than happy to review an update if you actually manage to complete >> one! I'll attempt one this weekend. :) >> I wonder if we should just make the "moving around files" in the vendor >> tree go away... +1 > I do think we should perhaps import the vendor tree to contrib/stdtime or > some such and then apply our local patches from libc to there. I'd like to do the following: - identify what local patches we have and divide them into two parts: (a) issues already fixed upstream (b) issues not already fixed [or local changes] - import the latest stdtime into vendor - copy from vendor into our contrib/stdtime without flattening the structure - reapply all (b) patches manually This will make the mergeinfo correct and also make it clear what patches are local and what are upstream > Alternatively, > we could move the the files from libc into suitable locations in contrib/stdtime > and then do an 'svn merge --record-only' to bootstrap the vendor mergeinfo > for the current version and use that as a basis for updating? Exactly. -- Eitan Adler