From nobody Sun Sep 25 06:01:31 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MZwHw121lz4dLsN; Sun, 25 Sep 2022 06:01:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MZwHw0Pypz3FHR; Sun, 25 Sep 2022 06:01:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664085692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SJDnaItrYEWKMvo6OfKMfgmet/L77xym2FeitmuAfZk=; b=Fto+V4CajajpSiwSFwIUF9Zf+vKuNzHwtMTWGKLssnunPVnHIvR0PQ9qc0+wNXfT/MbE/V eE7x1aLZFMPeh88bVul78Sho9FzPD2DwzttFn2P2/u47Jh6JffKZjJKlLRntsUe7eewlHc 33jhAviur4OQ0MwssVlomWtr5O0a5ApEprltRJ1MrwrCzu9wFwv0bRVG2joU2jktdha1V7 /mG0srLsiV7d/32ftppL01dnGKm+h76Jz0+xpNHzytkKD1TriUp7YDpiK17/FYRPTwGJvY Zqli2H82wj5zznzfUvSb1mNf9RkT4lzRq9pOT17neYcn9r2Z929xm0Vgn1OMKg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MZwHv6R0zzKd1; Sun, 25 Sep 2022 06:01:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28P61VjU048280; Sun, 25 Sep 2022 06:01:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28P61VHD048279; Sun, 25 Sep 2022 06:01:31 GMT (envelope-from git) Date: Sun, 25 Sep 2022 06:01:31 GMT Message-Id: <202209250601.28P61VHD048279@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Philip Paeps Subject: git: da038df8c92b - main - share/zoneinfo: don't build obsolete SystemV zones List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: philip X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: da038df8c92b71060965bdc5dc400db54de35587 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664085692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SJDnaItrYEWKMvo6OfKMfgmet/L77xym2FeitmuAfZk=; b=MN5K+kM5+9S2lTJLCBShr2rrXePN8bNas0KHkcB85j1CTHzLHNx0Pkh/7SFqspXfZb//k0 //1BIvyCgIrVLxSD80kp9SZYB3LCr09WqwH0W1wAhFqxDaGbkUZRmStg2A/U4benYVbRXK TZNSTX5gzRjMMfSQFYENbGSZv5zHq4LKdh/pDBGNsHE34LmDk2+pGedOwV3kcn8JtyW6tu qbVr4yW+DZW2r2mV41/LtQk/MSJSsC5YUY/lpaLLlSwpUbAY0iLZ/fAKdtyO/dfDP+MQxa W7sHTuOmRWGRbmOQk1GnEeXcTzKyCKLp3LqYzngopceJnE/bqqW75kmzggHKLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664085692; a=rsa-sha256; cv=none; b=GiKAdBxu2BjlGJgLcW7cjmCwitho+UhSqXOFqD8XGK74xebw/QVVnyFGHE8QtNcpZR6ep7 SBs88s7LfhB3Vzav4nn1ZEwppvAof4oNVmg6stZD4sH7qnJaSdn304utvaiCKuNIjOymba vQciJGcATL0phH83rEqKac4+54XJx6cUUFCLgcSCuiFmqI2c4aLefvyPovQRi575U72ozr naUpfiyD05te5ms3ei6ylcssHlJI/DkGkAnbrz36eMBBjPf994RpYfc8V75b3C9MoKM+3g JJ7uYMZDnHuchKv5+IpXoc3ofy9FIwlVEW5wUXVoa1D5Nu6BdAYa25/tf4wgSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=da038df8c92b71060965bdc5dc400db54de35587 commit da038df8c92b71060965bdc5dc400db54de35587 Author: Philip Paeps AuthorDate: 2022-09-25 05:42:18 +0000 Commit: Philip Paeps CommitDate: 2022-09-25 05:54:20 +0000 share/zoneinfo: don't build obsolete SystemV zones The /usr/share/zoneinfo/SystemV directory has been empty on FreeBSD since 2006. The upstream source file was removed in 2020. Also stop passing yearisdate to zic(8). This has not been necessary for years. The script has been removed upstream since 2020. MFC after: 3 days --- ObsoleteFiles.inc | 1 + share/zoneinfo/Makefile | 10 ++++------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index dc206ffafcef..2d3dcd361151 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -16424,6 +16424,7 @@ OLD_FILES+=usr/share/zoneinfo/SystemV/EST5 OLD_FILES+=usr/share/zoneinfo/SystemV/AST4ADT OLD_FILES+=usr/share/zoneinfo/SystemV/CST6 OLD_FILES+=usr/share/zoneinfo/SystemV/AST4 +OLD_DIRS+=usr/share/zoneinfo OLD_FILES+=usr/share/doc/ntp/accopt.htm OLD_FILES+=usr/share/doc/ntp/assoc.htm OLD_FILES+=usr/share/doc/ntp/audio.htm diff --git a/share/zoneinfo/Makefile b/share/zoneinfo/Makefile index 0360b59288ab..dfe148544bd6 100644 --- a/share/zoneinfo/Makefile +++ b/share/zoneinfo/Makefile @@ -33,7 +33,6 @@ .include PACKAGE= zoneinfo -CLEANFILES+= yearistype CLEANDIRS+= builddir CONTRIBDIR= ${SRCTOP}/contrib/tzdata/ .PATH: ${CONTRIBDIR} @@ -51,7 +50,7 @@ LEAPFILE= TZFILES= africa antarctica asia australasia etcetera europe \ factory northamerica southamerica -TZFILES+= backward systemv +TZFILES+= backward POSIXRULES= America/New_York TZFILES:= ${TZFILES:S/^/${CONTRIBDIR}/} @@ -71,8 +70,7 @@ TZBUILDSUBDIRS= \ Etc \ Europe \ Indian \ - Pacific \ - SystemV + Pacific TZBUILDSUBDIRS+= US Mexico Chile Canada Brazil .if !defined(_SKIP_BUILD) @@ -80,12 +78,12 @@ all: zoneinfo .endif META_TARGETS+= zoneinfo install-zoneinfo -zoneinfo: yearistype ${TDATA} +zoneinfo: ${TDATA} mkdir -p ${TZBUILDDIR} cd ${TZBUILDDIR}; mkdir -p ${TZBUILDSUBDIRS} umask 022; cd ${.CURDIR}; \ zic -D -d ${TZBUILDDIR} -p ${POSIXRULES} -m ${NOBINMODE} \ - ${LEAPFILE} -y ${.OBJDIR}/yearistype ${TZFILES} + ${LEAPFILE} ${TZFILES} # # Sort TZS to ensure they are the same every build. find -s might