From e8511c900beb2c4c4f9bc0ab5467b335bc91d4715f0629a12f6f05df97822c6c Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 25 Aug 2016 07:48:35 +0000 Subject: [PATCH] Accepting request 418020 from Base:System 1 OBS-URL: https://build.opensuse.org/request/show/418020 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/timezone?expand=0&rev=106 --- 0001-Positive-leap-second-on-2016-12-31.patch | 66 +++++++++++++++++++ timezone-java.changes | 12 ++++ timezone-java.spec | 7 ++ timezone.changes | 12 ++++ timezone.keyring | 28 ++++++++ timezone.spec | 9 ++- tzcode2016f.tar.gz.asc | 11 ++++ tzdata2016f.tar.gz.asc | 11 ++++ 8 files changed, 155 insertions(+), 1 deletion(-) create mode 100644 0001-Positive-leap-second-on-2016-12-31.patch create mode 100644 timezone.keyring create mode 100644 tzcode2016f.tar.gz.asc create mode 100644 tzdata2016f.tar.gz.asc diff --git a/0001-Positive-leap-second-on-2016-12-31.patch b/0001-Positive-leap-second-on-2016-12-31.patch new file mode 100644 index 0000000..1f60c2e --- /dev/null +++ b/0001-Positive-leap-second-on-2016-12-31.patch @@ -0,0 +1,66 @@ +From 6d5fc7fed0690f22574a9b795575e2bb7962716c Mon Sep 17 00:00:00 2001 +From: Tim Parenti +Date: Mon, 18 Jul 2016 23:10:36 -0400 +Subject: [PATCH] Positive leap second on 2016-12-31 + +* leap-seconds.list: Per IERS Bulletin C52 (2016-07-06), a +positive leap second will be inserted into the UTC time scale at the end +of 2016-12-31. Update file from NIST, retrieved from +. +--- + leap-seconds.list | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/leap-seconds.list b/leap-seconds.list +index 7552796..22fa785 100644 +--- a/leap-seconds.list ++++ b/leap-seconds.list +@@ -143,7 +143,7 @@ + # Boulder, Colorado + # Judah.Levine@nist.gov + # +-# Last Update of leap second values: 5 January 2015 ++# Last Update of leap second values: 8 July 2016 + # + # The following line shows this last update date in NTP timestamp + # format. This is the date on which the most recent change to +@@ -151,7 +151,7 @@ + # be identified by the unique pair of characters in the first two + # columns as shown below. + # +-#$ 3629404800 ++#$ 3676924800 + # + # The NTP timestamps are in units of seconds since the NTP epoch, + # which is 1 January 1900, 00:00:00. The Modified Julian Day number +@@ -199,10 +199,10 @@ + # current -- the update time stamp, the data and the name of the file + # will not change. + # +-# Updated through IERS Bulletin C51 +-# File expires on: 28 December 2016 ++# Updated through IERS Bulletin C52 ++# File expires on: 28 June 2017 + # +-#@ 3691872000 ++#@ 3707596800 + # + 2272060800 10 # 1 Jan 1972 + 2287785600 11 # 1 Jul 1972 +@@ -231,6 +231,7 @@ + 3439756800 34 # 1 Jan 2009 + 3550089600 35 # 1 Jul 2012 + 3644697600 36 # 1 Jul 2015 ++3692217600 37 # 1 Jan 2017 + # + # the following special comment contains the + # hash value of the data in this file computed +@@ -246,4 +247,4 @@ + # the hash line is also ignored in the + # computation. + # +-#h afc03691 8ff53838 42080ba1 cdd22f1 48192c10 ++#h dacf2c42 2c4765d6 3c797af8 2cf630eb 699c8c67 +-- +2.6.6 + diff --git a/timezone-java.changes b/timezone-java.changes index 95a8d26..610f8e6 100644 --- a/timezone-java.changes +++ b/timezone-java.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Aug 8 17:29:14 UTC 2016 - astieger@suse.com + +- A positive leap second will be added at the end of 2016-12-31 + (bsc#988184) 0001-Positive-leap-second-on-2016-12-31.patch + +------------------------------------------------------------------- +Tue Aug 2 08:28:03 UTC 2016 - astieger@suse.com + +- add new signing key which is now available. Next release will + revert to previous key. + ------------------------------------------------------------------- Tue Jul 5 19:56:01 UTC 2016 - astieger@suse.com diff --git a/timezone-java.spec b/timezone-java.spec index d27b43b..fde4bed 100644 --- a/timezone-java.spec +++ b/timezone-java.spec @@ -29,6 +29,10 @@ Version: 2016f Release: 0 Source: ftp://ftp.iana.org/tz/releases/tzdata%{version}.tar.gz Source1: ftp://ftp.iana.org/tz/releases/tzcode%{version}.tar.gz +Source2: ftp://ftp.iana.org/tz/releases/tzdata%{version}.tar.gz.asc +Source3: ftp://ftp.iana.org/tz/releases/tzcode%{version}.tar.gz.asc +# http://sks.mrball.net/pks/lookup?op=get&search=0xED97E90E62AA7E34 +Source4: timezone.keyring Patch100: tzcode-revert-01-8c9cb9580.patch Patch101: tzcode-revert-02-301f794f3.patch Patch102: tzcode-revert-03-39fd078a6.patch @@ -39,6 +43,8 @@ Patch2: tzcode-fromname.patch Patch3: iso3166-uk.diff Patch4: tzcode-link.diff Patch5: tzcode-symlink.patch +# PATCH-FIX-UPSTREAM 0001-Positive-leap-second-on-2016-12-31.patch bsc#988184 +Patch6: 0001-Positive-leap-second-on-2016-12-31.patch # COMMON-END # COMMON-END Url: http://www.gnu.org/software/libc/libc.html @@ -70,6 +76,7 @@ package is intended for Java Virtual Machine based on OpenJDK. %else %patch5 -p1 %endif +%patch6 -p1 sed -ri 's@/usr/local/etc/zoneinfo@%{_datadir}/zoneinfo@g' *.[1358] # COMMON-PREP-END # COMMON-PREP-END diff --git a/timezone.changes b/timezone.changes index 95a8d26..610f8e6 100644 --- a/timezone.changes +++ b/timezone.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Aug 8 17:29:14 UTC 2016 - astieger@suse.com + +- A positive leap second will be added at the end of 2016-12-31 + (bsc#988184) 0001-Positive-leap-second-on-2016-12-31.patch + +------------------------------------------------------------------- +Tue Aug 2 08:28:03 UTC 2016 - astieger@suse.com + +- add new signing key which is now available. Next release will + revert to previous key. + ------------------------------------------------------------------- Tue Jul 5 19:56:01 UTC 2016 - astieger@suse.com diff --git a/timezone.keyring b/timezone.keyring new file mode 100644 index 0000000..cc0ae78 --- /dev/null +++ b/timezone.keyring @@ -0,0 +1,28 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: SKS 1.1.5+ +Comment: Hostname: keys2.kfwebs.net + +mQENBFd7yYMBCADFWTwWRdWOZnZQG5cu6ZSJj47tyrXbSvwRinr2kGw7zP83YLFYLFt9HqzV +jeN1DXgWYaTPzrqg5ZK6h5YVoS+XLTMIAmMhgglXUtxuZ1bI97Qi48SVHQTtCBuOH/lVuqp1 +AVroqW/iK9hzNrmXm+NNZ5OwhVo1kOlnp/B8/425DgCg9Xwt8dueYtlrmTpFn+so/MbfsXgf +6+r4Bip5/bYebz9IKRoH4zvX7SHYkXmC47UozuKKSIkh6Fc7gFnGtyDR7fy2wb9TR181PqPg +/anRBFpEegez4g0Nkglh5w8+l3pG/RFEAW7HBt3ee7+hMuNj23uoIH4KivBgMM6V0foBABEB +AAG0IFBhdWwgRWdnZXJ0IDxlZ2dlcnRAY3MudWNsYS5lZHU+iQE4BBMBAgAiBQJXe8mDAhsD +BgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRAEPbY3RK1BjLtyB/90UnWXhNJLawcsjErp +ufHSwrM+vCXcn7X9pXqPfGY7fPxGwaClWUK2q6PG80NaNrncDihhc/NV3Avput7mrWw0o2GL +LHeDnqdGoddytXG3aO1uOkXOx4590p+Y7mtaD3AMCctQrm8n/6M2OEEHessxcJc4VpCznOXU +A/6mrom+VJvqkSaZEznMZmiZe5rA8zWp2GWKl1K0KJHtUZyDV4qlOtD+pNOm29yGJT0uCUuH +YFTx5PEcwuLnvJYosx33e82iPSKztb+9TchuAt7GiG05H8EQv4/+Yl6uBPFN1DUPezFpfqUo +jLh+J+2Sjt3zvLiS7nB/0nVzC94bnkYD2ujPuQENBFd7yYMBCACicN4ZgrhjxJAQ88wD/Ifn +Jh7c5O0xo8C9K4WLI/cPjo9Utybw+/C0wl2hDtx5no68U5Bw68n973SxGqZpNiJK201VwLHC +DpuDB1UPdmhgF58mDbchDoTEBbYxOJSLzy7eVcuISzm59Ui0vXRMT4dxoh808MxGk5dx7IaH +jwHc/DgEOk9tzk2pWY7mTe9xGfzTjU1KlrmAzL5vNz1IoVbBDRKuGUXLL6soY5BQQXyS874C +Pxk02QfIV+QLgET3is9Gw6J7wxQCxJwp53aHYxk/Uvp/VhoJJXNADVisH1IlL2ZJs8TfPTcp +xhSfU8+TNMcYwKdxnJ9fsl8pPBGayIY7ABEBAAGJAR8EGAECAAkFAld7yYMCGwwACgkQBD22 +N0StQYxQDAgAsqemuGs020uYbP4fchwVy3bVgfQyVnobZhkg6z4vb9Wvw3f37sFBFsjPylMZ +doUuX2jpmVPZgYK4ENV8gJKsm6ocneit07kAdZRGxeP5Lkt2kAhrZ6/2YSKZkiMFH+0WN7Ch +1ITsLoxe++9WxIQGI66RgTxfnlLnbuEXhIO8Qjepa1LcI/k+Yh9gLdRgtan9VAg0C4r40Cip +Yzuf9mKImYIPlJpGKIb7SAQDIAcmOkWK8cbCL7XRsd0ZjTrBbPxlmB2nB9+g4L3dCe0TmRq4 +SFM/8RjpqdxqdFknCMo4r9EaoagG0wbUKybbYHXiFD2bJ8ShriUwkp8vrInbj7cIww== +=+hBC +-----END PGP PUBLIC KEY BLOCK----- diff --git a/timezone.spec b/timezone.spec index 9dde82b..d301761 100644 --- a/timezone.spec +++ b/timezone.spec @@ -27,6 +27,10 @@ Version: 2016f Release: 0 Source: ftp://ftp.iana.org/tz/releases/tzdata%{version}.tar.gz Source1: ftp://ftp.iana.org/tz/releases/tzcode%{version}.tar.gz +Source2: ftp://ftp.iana.org/tz/releases/tzdata%{version}.tar.gz.asc +Source3: ftp://ftp.iana.org/tz/releases/tzcode%{version}.tar.gz.asc +# http://sks.mrball.net/pks/lookup?op=get&search=0xED97E90E62AA7E34 +Source4: timezone.keyring Patch100: tzcode-revert-01-8c9cb9580.patch Patch101: tzcode-revert-02-301f794f3.patch Patch102: tzcode-revert-03-39fd078a6.patch @@ -37,6 +41,8 @@ Patch2: tzcode-fromname.patch Patch3: iso3166-uk.diff Patch4: tzcode-link.diff Patch5: tzcode-symlink.patch +# PATCH-FIX-UPSTREAM 0001-Positive-leap-second-on-2016-12-31.patch bsc#988184 +Patch6: 0001-Positive-leap-second-on-2016-12-31.patch # COMMON-END BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -64,6 +70,7 @@ can select an appropriate time zone for your system with YaST. %else %patch5 -p1 %endif +%patch6 -p1 sed -ri 's@/usr/local/etc/zoneinfo@%{_datadir}/zoneinfo@g' *.[1358] # COMMON-PREP-END @@ -74,7 +81,7 @@ LC_ALL=POSIX AREA=%{AREA} ZONE=%{ZONE} export AREA LANG LC_ALL ZONE -make %{?_smp_mflags} TZDIR=%{_datadir}/zoneinfo CFLAGS="$RPM_OPT_FLAGS -DHAVE_GETTEXT=1 -DTZDEFAULT='\"/etc/localtime\"' -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone" AWK=awk +make %{?_smp_mflags} TZDIR=%{_datadir}/zoneinfo CFLAGS="$RPM_OPT_FLAGS -DHAVE_GETTEXT=1 -DTZDEFAULT='\"/etc/localtime\"' -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone -Dlint" AWK=awk make %{?_smp_mflags} TZDIR=zoneinfo AWK=awk zones # Generate posixrules ./zic -y ./yearistype -d zoneinfo -p %{AREA}/%{ZONE} diff --git a/tzcode2016f.tar.gz.asc b/tzcode2016f.tar.gz.asc new file mode 100644 index 0000000..65dd4b8 --- /dev/null +++ b/tzcode2016f.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQEcBAABAgAGBQJXe8puAAoJEAQ9tjdErUGMYo8IAKif54YlyHHNdLSWzAseY1jf +80hiZG4bIDVNXD5qNAN5sIf7FexBNS9h/KB3H2xJ+47UZHfBqEIRSdNM3+1cFhPg +EZShIc8PKPkjS3/pxdR+7Sz/JWGDq1FyNCnBNoyRhKAcDWH3rsa2L7Q3hvkZ7Xcg +8DlhCcixLSX/rhJEs7k61FcGXivUkrht8trrvoTTBkoFpGUqt+x+cNan0z0qyiqF +PLQq7YJAjstGRsli97+P72WdJDRY6JL716slICKO5IYDki9xmpcBuj4l0bAxR+6c +PiZWlePe1TTyT0+shefy0eZmq1F7seTmkpAL7bhPR3E4ATYZfJfsMm6b/5seBFs= +=62wb +-----END PGP SIGNATURE----- diff --git a/tzdata2016f.tar.gz.asc b/tzdata2016f.tar.gz.asc new file mode 100644 index 0000000..1805a0e --- /dev/null +++ b/tzdata2016f.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQEcBAABAgAGBQJXe8p1AAoJEAQ9tjdErUGMmc0H/i837mGKBIJLmS1xtr64uaT+ +LLLvI1gFTGJsqTaCya7aAVFlN/STM07otvYdkBDwQ6uIgjm8qAL33lGdi9IpTPp2 +YOj03QkWpyPRFtM1A9EcsVkKOfezGSiY7WQiOEk7R05lH1SRBlZ+eXVQl9fhadrj +qCRkcCasVIDQWMKCOhSch1HyUuR+Z1Ujomi7Z4d0AyQbMKhB1yGxYKCVGzN8KaOK +AFr0Dd44p72dqgPdC/V7G0xjTNOpuM1zt8SdJuOE2EASRraIvnnQctmKlbYI8l8L +ANvy9xl+p8VkuZi7yuSoqVSLYTQDE8pAMsfg0DZpAbnjV1G07FxekBMdNzdr5/E= +=7jGR +-----END PGP SIGNATURE-----