开源软件构建与测试

_service:download_src_package:tzdata.spec Deleted

@@ -1,1312 +0,0 @@
-Summary: Timezone data
-Name: tzdata
-Version: 2021e
-%define tzdata_version 2021e
-%define tzcode_version 2021e
-Release: 3%{?dist}
-License: Public Domain
-URL: https://www.iana.org/time-zones
-Source0: ftp://ftp.iana.org/tz/releases/tzdata%{tzdata_version}.tar.gz
-Source1: ftp://ftp.iana.org/tz/releases/tzcode%{tzcode_version}.tar.gz
-
-Patch002: 0002-Fix-have-snprintf-error.patch
-%if 0%{?rhel} || 0%{?eln}
-Patch003: 0003-continue-to-ship-posixrules.patch
-%endif
-
-BuildRequires: make
-BuildRequires: gawk, glibc, perl-interpreter
-BuildRequires: java-devel
-BuildRequires: java-1.8.0-devel
-BuildRequires: glibc-common >= 2.5.90-7
-Conflicts: glibc-common <= 2.3.2-63
-BuildArchitectures: noarch
-
-%description
-This package contains data files with rules for various timezones around
-the world.
-
-%package java
-Summary: Timezone data for Java
-Source3: javazic.tar.gz
-Source4: javazic-1.8-37392f2f5d59.tar.xz
-Patch100: javazic-fixup.patch
-Patch101: rebase-01.patch
-Patch102: rebase-02.patch
-Patch103: 7090844.patch
-Patch104: 7133138.patch
-
-%description java
-This package contains timezone information for use by Java runtimes.
-
-%prep
-%setup -q -c -a 1
-
-%patch002 -p1
-%if 0%{?rhel} || 0%{?eln}
-%patch003 -p1
-%endif
-
-# tzdata-2018g introduced 25:00 transition times.  This breaks OpenJDK.
-# Use rearguard for java
-mkdir rearguard
-make VERSION=%{version} tzdata%{version}-rearguard.tar.gz
-mv tzdata%{version}-rearguard.tar.gz rearguard
-pushd rearguard
-tar zxf tzdata%{version}-rearguard.tar.gz
-popd
-
-%if 0%{?rhel} || 0%{?eln}
-# Use rearguard for rhel (overwrite default vangaurd data)
-tar zxf rearguard/tzdata%{version}-rearguard.tar.gz
-%endif
-
-mkdir javazic
-tar zxf %{SOURCE3} -C javazic
-pushd javazic
-%patch100
-%patch101
-%patch102
-%patch103
-%patch104
-
-# Hack alert! sun.tools may be defined and installed in the
-# VM. In order to guarantee that we are using IcedTea/OpenJDK
-# for creating the zoneinfo files, rebase all the packages
-# from "sun." to "rht.". Unfortunately, gcj does not support
-# any of the -Xclasspath options, so we must go this route
-# to ensure the greatest compatibility.
-mv sun rht
-find . -type f -name '*.java' -print0 \
-    | xargs -0 -- sed -i -e 's:sun\.tools\.:rht.tools.:g' \
-                         -e 's:sun\.util\.:rht.util.:g'
-popd
-
-tar xf %{SOURCE4}
-
-echo "%{name}%{tzdata_version}" >> VERSION
-
-%build
-# Run make to create the tzdata.zi file
-rm tzdata.zi
-%if 0%{?rhel} || 0%{?eln}
-make VERSION=%{version} DATAFORM=rearguard tzdata.zi
-%else
-make tzdata.zi
-%endif
-
-FILES="africa antarctica asia australasia europe northamerica southamerica
-       etcetera backward factory"
-
-mkdir zoneinfo/{,posix,right}
-zic -y ./yearistype -d zoneinfo -L /dev/null -p America/New_York $FILES
-zic -y ./yearistype -d zoneinfo/posix -L /dev/null $FILES
-zic -y ./yearistype -d zoneinfo/right -L leapseconds $FILES
-
-# grep -v tz-art.htm tz-link.htm > tz-link.html
-
-# tzdata-2018g introduced 25:00 which breaks java - use the rearguard files for java
-JAVA_FILES="rearguard/africa rearguard/antarctica rearguard/asia \
-      rearguard/australasia rearguard/europe rearguard/northamerica \
-      rearguard/southamerica rearguard/etcetera \
-      rearguard/backward"
-
-# Java 6/7 tzdata
-pushd javazic
-/usr/lib/jvm/java-1.8.0-openjdk/bin/javac -source 1.6 -target 1.6 -classpath . `find . -name \*.java`
-popd
-
-java -classpath javazic/ rht.tools.javazic.Main -V %{version} \
-  -d javazi \
-  $JAVA_FILES javazic/tzdata_jdk/gmt javazic/tzdata_jdk/jdk11_backward
-
-# Java 8 tzdata
-pushd javazic-1.8
-/usr/lib/jvm/java-11-openjdk/bin/javac -source 1.8 -target 1.8 -classpath . `find . -name \*.java`
-popd
-
-java -classpath javazic-1.8 build.tools.tzdb.TzdbZoneRulesCompiler \
-    -srcdir . -dstfile tzdb.dat \
-    -verbose \
-    $JAVA_FILES javazic-1.8/tzdata_jdk/gmt javazic-1.8/tzdata_jdk/jdk11_backward
-
-%install
-rm -fr $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_datadir}
-cp -prd zoneinfo $RPM_BUILD_ROOT%{_datadir}
-install -p -m 644 zone.tab zone1970.tab iso3166.tab leapseconds tzdata.zi $RPM_BUILD_ROOT%{_datadir}/zoneinfo
-cp -prd javazi $RPM_BUILD_ROOT%{_datadir}/javazi
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/javazi-1.8
-install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
-
-%files
-%{_datadir}/zoneinfo
-%license LICENSE
-%doc README
-%doc theory.html
-%doc tz-link.html
-%doc tz-art.html
-
-%files java
-%{_datadir}/javazi
-%{_datadir}/javazi-1.8
-
-%changelog
-* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 2021e-3
-- Rebuilt for java-17-openjdk as system jdk
-- to keep the legacy tzdata, now build requires both jdk8 and system jdk.
-- I recommend to put legacy tz data to separate subpkg or to drop them at all.
-- Also I would recomend to  rename legacy tzdat.to versioned ones (eg avazi-1.7) and to keep future, rolling tzdata unversioned, as javazi only
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2021e-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Tue Oct 26 2021 Patsy Griffin <patsy@redhat.com> - 2021e-1
-- Rebase to tzdata-2021e - supersedes tzdata-2021d
-  - Pacific/Fiji suspended DST for the 2021/2022 season.
-  - 'zic -r' now marks unspecified timestamps with "-00".
-  - Palestine will fall back 2021-10-29 at 01:00, rather
-    than the predicted 2021-10-30.
-
-* Thu Oct 07 2021 Patsy Griffin <patsy@redhat.com> - 2021c-1
-- Rebase to tzdata-2021c
-  - Revert most 2021b changes to the 'backward' file.
-  - Fix 'zic -b fat' bug in pre-1970 32-bit data reported in tzdata-2021b.
-  - Fix two Link line typos from tzdata-2021b.
-  - Distribute the new SECURITY file.
-
-* Sat Sep 25 2021 Patsy Griffin <patsy@redhat.com> - 2021b-1
-- Rebase to tzdata-2021b
-  - Jordan now starts DST on February's last Thursday.
-  - Samoa no longer observes DST.
-  - Merge more location-based Zones whose timestamps agree since 1970.
-  - Move some backward-compatibility links to 'backward'.
-  - Rename Pacific/Enderbury to Pacific/Kanton.
-  - Correct many pre-1993 transitions in Malawi, Portugal, etc.
-  - zic now creates each output file or link atomically.
-  - zic -L no longer omits the POSIX TZ string in its output.
-  - zic fixes for truncation and leap second table expiration.
-  - zic now follows POSIX for TZ strings using all-year DST.
-  - Fix some localtime crashes and bugs in obscure cases.
-  - zdump -v now outputs more-useful boundary cases.
-  - tzfile.5 better matches a draft successor to RFC 8536.
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2021a-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Mon Jan 25 2021 Patsy Griffin <patsy@redhat.com> - 2021a-1
-- Rebase to tzdata-2021a
-  - South Sudan will change from +03 to +02 on 2021-02-01.

_service:tar_scm:tzdata.spec Added

@@ -0,0 +1,1289 @@
+Summary: Timezone data
+Name: tzdata
+Version: 2022a
+%define tzdata_version 2022a
+%define tzcode_version 2022a
+Release: 1%{?dist}
+License: Public Domain
+Group: System Environment/Base
+URL: https://www.iana.org/time-zones
+Source0: ftp://ftp.iana.org/tz/releases/tzdata%{tzdata_version}.tar.gz
+Source1: ftp://ftp.iana.org/tz/releases/tzcode%{tzcode_version}.tar.gz
+
+Patch002: 0002-Fix-have-snprintf-error.patch
+Patch003: 0003-continue-to-ship-posixrules.patch
+
+BuildRequires: gawk, glibc, perl-interpreter
+BuildRequires: java-devel
+BuildRequires: glibc-common >= 2.5.90-7
+Conflicts: glibc-common <= 2.3.2-63
+BuildArchitectures: noarch
+
+%description
+This package contains data files with rules for various timezones around
+the world.
+
+%package java
+Summary: Timezone data for Java
+Group: System Environment/Base
+Source3: javazic.tar.gz
+Source4: javazic-1.8-37392f2f5d59.tar.xz
+Patch100: javazic-fixup.patch
+Patch101: rebase-01.patch
+Patch102: rebase-02.patch
+Patch103: 7090844.patch
+Patch104: 7133138.patch
+Patch105: 8051641.patch
+
+%description java
+This package contains timezone information for use by Java runtimes.
+
+%prep
+%setup -q -c -a 1
+
+%patch002 -p1
+%patch003 -p1
+
+# Currently tzdata is providing the "rearguard" data set for maximum
+# compatibility with existing Red Hat Enterprise Linux installs. Future releases of
+# Red Hat Enterprise Linux will be transitioning to the default or "vanguard" tzdata
+# data set.
+#
+# The "rearguard" and "vanguard" data sets are defined by the upstream tzdata project
+# and represent approximately the same data, with "vanguard" optimized for newer time
+# zone data tooling, and "rearguard" optimized for compatibility with existing tooling.
+# For example "vanguard" implements support for negative DST offsets, while "rearguard"
+# supports the traditional format.
+
+# Create the reargard data files.
+make VERSION=%{version} tzdata%{version}-rearguard.tar.gz
+tar zxf tzdata%{version}-rearguard.tar.gz
+
+# Run make to re-create the tzdata.zi file for rearguard format
+rm tzdata.zi
+make VERSION=%{version} DATAFORM=rearguard tzdata.zi
+
+mkdir javazic
+tar zxf %{SOURCE3} -C javazic
+pushd javazic
+%patch100
+%patch101
+%patch102
+%patch103
+%patch104
+
+# Hack alert! sun.tools may be defined and installed in the
+# VM. In order to guarantee that we are using IcedTea/OpenJDK
+# for creating the zoneinfo files, rebase all the packages
+# from "sun." to "rht.". Unfortunately, gcj does not support
+# any of the -Xclasspath options, so we must go this route
+# to ensure the greatest compatibility.
+mv sun rht
+find . -type f -name '*.java' -print0 \
+    | xargs -0 -- sed -i -e 's:sun\.tools\.:rht.tools.:g' \
+                         -e 's:sun\.util\.:rht.util.:g'
+popd
+
+tar xf %{SOURCE4}
+%patch105
+
+echo "%{name}%{tzdata_version}" >> VERSION
+
+%build
+
+FILES="africa antarctica asia australasia europe northamerica southamerica
+       pacificnew etcetera backward"
+
+mkdir zoneinfo/{,posix,right}
+zic -y ./yearistype -d zoneinfo -L /dev/null -p America/New_York $FILES
+zic -y ./yearistype -d zoneinfo/posix -L /dev/null $FILES
+zic -y ./yearistype -d zoneinfo/right -L leapseconds $FILES
+
+# grep -v tz-art.htm tz-link.htm > tz-link.html
+
+# Java 6/7 tzdata
+pushd javazic
+javac -source 1.5 -target 1.5 -classpath . `find . -name \*.java`
+popd
+
+java -classpath javazic/ rht.tools.javazic.Main -V %{version} \
+  -d javazi \
+  $FILES javazic/tzdata_jdk/gmt javazic/tzdata_jdk/jdk11_backward
+
+# Java 8 tzdata
+pushd javazic-1.8
+javac -source 1.7 -target 1.7 -classpath . `find . -name \*.java`
+popd
+
+java -classpath javazic-1.8 build.tools.tzdb.TzdbZoneRulesCompiler \
+    -srcdir . -dstfile tzdb.dat \
+    -verbose \
+    $FILES javazic-1.8/tzdata_jdk/gmt javazic-1.8/tzdata_jdk/jdk11_backward
+
+%install
+rm -fr $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_datadir}
+cp -prd zoneinfo $RPM_BUILD_ROOT%{_datadir}
+install -p -m 644 zone.tab zone1970.tab iso3166.tab leapseconds tzdata.zi $RPM_BUILD_ROOT%{_datadir}/zoneinfo
+cp -prd javazi $RPM_BUILD_ROOT%{_datadir}/javazi
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/javazi-1.8
+install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
+
+%check
+echo ============TESTING===============
+/usr/bin/env LANG=C make -k VALIDATE=':' check && true
+echo ============END TESTING===========
+
+%files
+%defattr(-,root,root)
+%{_datadir}/zoneinfo
+%license LICENSE
+%doc README
+%doc theory.html
+%doc tz-link.html
+%doc tz-art.html
+
+%files java
+%defattr(-,root,root)
+%{_datadir}/javazi
+%{_datadir}/javazi-1.8
+
+%changelog
+* Wed Mar 16 2022 Patsy Griffin <patsy@redhat.com> - 2022a-1
+- Rebase to tzdata-2022a
+  - Palestine springs forward on 2022-03-27, not -03-26.
+  - zdump -v now outputs better failure information
+  - fixes for code that reads corrupted TZif data
+
+* Fri Oct 22 2021 Patsy Griffin <patsy@redhat.com> - 2021e-1
+- Rebase to tzdata-2021e - supersedes tzdata-2021d
+  - Pacific/Fiji suspended DST for the 2021/2022 season.
+  - 'zic -r' now marks unspecified timestamps with "-00".
+  - Palestine will fall back 2021-10-29 at 01:00, rather
+    than the predicted 2021-10-30.
+
+* Wed Oct 06 2021 Patsy Griffin <patsy@redhat.com> - 2021c-1
+- Rebase to tzdata-2021c - supersedes tzdata-2021b
+  - Revert most of 2021b changes to 'backward'.
+  - Fix 'zic -b fat' bug in pre-1970 32-bit data.
+  - Fix two Link line typos.
+  - Distribute SECURITY file.
+- Includes changes in tzdata-2021b
+  - Innclude patch for Mayen
+  - Jordan now starts DST on February's last Thursday.
+  - Samoa no longer observes DST.
+  - Merge more location-based Zones whose timestamps agree since 1970.
+  - Move some backward-compatibility links to 'backward'.
+  - Rename Pacific/Enderbury to Pacific/Kanton.
+  - Correct many pre-1993 transitions in Malawi, Portugal, etc.
+  - zic now creates each output file or link atomically.
+  - zic -L no longer omits the POSIX TZ string in its output.
+  - zic fixes for truncation and leap second table expiration.
+  - zic now follows POSIX for TZ strings using all-year DST.
+  - Fix some localtime crashes and bugs in obscure cases.
+  - zdump -v now outputs more-useful boundary cases.
+  - tzfile.5 better matches a draft successor to RFC 8536.
+
+* Sun Jan 24 2021 Patsy Griffin <patsy@redhat.com> - 2021a-1
+- Rebase to tzdata-2021a
+  - South Sudan will change from +03 to +02 on 2021-02-01.
+
+* Tue Dec 29 2020 Patsy Griffin <patsy@redhat.com> - 2020f-1
+- Rebase to tzdata-2020f including changes for tzdata-2020e
+  - tzdata-2020f fixes a bug in tzdata-2020e that caused an
+    invalid zi file in rearguard format
+  - Volgograd changes time zone from UTC+04 to UTC+03 on 2020-12-27.
+  - Australia/Currie is identical to Australia/Hobart for all
+    timestamps since 1970 and was therefore created by mistake,
+    now moved to the "backward" file.
+

_service:download_src_package:0002-Fix-have-snprintf-error.patch Deleted

_service:download_src_package:7090844.patch Deleted

@@ -1,44 +0,0 @@
-diff --git a/7090844.patch b/7090844.patch
-new file mode 100644
-index 0000000..fd5b531
---- /dev/null
-+++ b/7090844.patch
-@@ -0,0 +1,38 @@
-+--- sun/tools/javazic/Mappings.java.orig       2015-04-13 12:42:30.000000000 -0400
-++++ sun/tools/javazic/Mappings.java    2015-04-13 12:43:32.000000000 -0400
-+@@ -1,5 +1,5 @@
-+ /*
-+- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
-++ * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
-+  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+  *
-+  * This code is free software; you can redistribute it and/or modify it
-+@@ -26,9 +26,6 @@
-+ package sun.tools.javazic;
-+ 
-+ import        java.util.ArrayList;
-+-import        java.util.HashMap;
-+-import        java.util.HashSet;
-+-import        java.util.Iterator;
-+ import        java.util.LinkedList;
-+ import        java.util.List;
-+ import        java.util.Map;
-+@@ -79,8 +76,8 @@
-+           // If the GMT offset of this Zone will change in some
-+           // future time, this Zone is added to the exclude list.
-+             boolean isExcluded = false;
-+-          if (zone.size() > 1) {
-+-              ZoneRec zrec = zone.get(zone.size()-2);
-++            for (int i = 0; i < zone.size(); i++) {
-++                ZoneRec zrec = zone.get(i);
-+               if ((zrec.getGmtOffset() != rawOffset)
-+                   && (zrec.getUntilTime(0) > Time.getCurrentTime())) {
-+                   if (excludeList == null) {
-+@@ -88,6 +85,7 @@
-+                   }
-+                   excludeList.add(zone.getName());
-+                     isExcluded = true;
-++                    break;
-+               }
-+           }
-+

_service:download_src_package:7133138.patch Deleted

@@ -1,44 +0,0 @@
-diff --git a/7133138.patch b/7133138.patch
-new file mode 100644
-index 0000000..882f15f
---- /dev/null
-+++ b/7133138.patch
-@@ -0,0 +1,38 @@
-+--- sun/tools/javazic/Mappings.java.orig       2015-04-13 12:44:10.000000000 -0400
-++++ sun/tools/javazic/Mappings.java    2015-04-13 12:45:28.000000000 -0400
-+@@ -1,5 +1,5 @@
-+ /*
-+- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
-++ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-+  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+  *
-+  * This code is free software; you can redistribute it and/or modify it
-+@@ -26,6 +26,7 @@
-+ package sun.tools.javazic;
-+ 
-+ import        java.util.ArrayList;
-++import java.util.HashMap;
-+ import        java.util.LinkedList;
-+ import        java.util.List;
-+ import        java.util.Map;
-+@@ -162,6 +163,20 @@
-+       for (String key : toBeRemoved) {
-+           aliases.remove(key);
-+       }
-++        // Eliminate any alias-to-alias mappings. For example, if
-++        // there are A->B and B->C, A->B is changed to A->C.
-++        Map<String, String> newMap = new HashMap<String, String>();
-++        for (String key : aliases.keySet()) {
-++            String realid = aliases.get(key);
-++            String leaf = realid;
-++            while (aliases.get(leaf) != null) {
-++                leaf = aliases.get(leaf);
-++            }
-++            if (!realid.equals(leaf)) {
-++                newMap.put(key, leaf);
-++            }
-++        }
-++        aliases.putAll(newMap);
-+     }
-+ 
-+     Map<String,String> getAliases() {

_service:download_src_package:javazic-fixup.patch Deleted

@@ -1,34 +0,0 @@
---- sun/util/calendar/LocalGregorianCalendar.java.keiths	2007-09-07 14:48:19.000000000 -0700
-+++ sun/util/calendar/LocalGregorianCalendar.java	2007-09-07 14:52:58.000000000 -0700
-@@ -120,8 +120,7 @@ public class LocalGregorianCalendar exte
-     static LocalGregorianCalendar getLocalGregorianCalendar(String name) {
- 	Properties calendarProps = null;
- 	try {
--	    String homeDir = (String) AccessController.doPrivileged(
--				new sun.security.action.GetPropertyAction("java.home"));
-+  	    String homeDir = (String) System.getProperty("java.home");
- 	    final String fname = homeDir + File.separator + "lib" + File.separator
- 				 + "calendars.properties";
- 	    calendarProps = (Properties) AccessController.doPrivileged(new PrivilegedExceptionAction() {
---- sun/util/calendar/ZoneInfoFile.java.keiths	2007-09-07 14:54:58.000000000 -0700
-+++ sun/util/calendar/ZoneInfoFile.java	2007-09-07 14:55:36.000000000 -0700
-@@ -1021,8 +1021,7 @@ public class ZoneInfoFile {
- 	byte buffer = null;
- 
- 	try {
--	    String zi_dir = (String) AccessController.doPrivileged(
--			        new sun.security.action.GetPropertyAction("user.zoneinfo.dir"));
-+	    String zi_dir = (String) System.getProperty("user.zoneinfo.dir");
- 	    File dir = null;
- 	    if (zi_dir != null)
- 	      dir = new File(zi_dir);
-@@ -1035,8 +1034,7 @@ public class ZoneInfoFile {
- 	    }
- 
- 	    if (dir == null) {
--	      String homeDir = (String) AccessController.doPrivileged(
--				new sun.security.action.GetPropertyAction("java.home"));
-+	      String homeDir = (String) System.getProperty("java.home");
- 	      zi_dir = homeDir + File.separator + "lib" + File.separator
- 		+ "zi";
- 	    }

_service:download_src_package:rebase-01.patch Deleted

@@ -1,37 +0,0 @@
-diff --git a/rebase-01.patch b/rebase-01.patch
-new file mode 100644
-index 0000000..bca6ed4
---- /dev/null
-+++ b/rebase-01.patch
-@@ -0,0 +1,31 @@
-+--- sun/tools/javazic/Mappings.java.orig       2007-08-30 03:55:48.000000000 -0400
-++++ sun/tools/javazic/Mappings.java    2015-04-13 12:39:44.000000000 -0400
-+@@ -1,12 +1,12 @@
-+ /*
-+- * Copyright 2000-2004 Sun Microsystems, Inc.  All Rights Reserved.
-++ * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
-+  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+  *
-+  * This code is free software; you can redistribute it and/or modify it
-+  * under the terms of the GNU General Public License version 2 only, as
-+- * published by the Free Software Foundation.  Sun designates this
-++ * published by the Free Software Foundation.  Oracle designates this
-+  * particular file as subject to the "Classpath" exception as provided
-+- * by Sun in the LICENSE file that accompanied this code.
-++ * by Oracle in the LICENSE file that accompanied this code.
-+  *
-+  * This code is distributed in the hope that it will be useful, but WITHOUT
-+  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+@@ -18,9 +18,9 @@
-+  * 2 along with this work; if not, write to the Free Software Foundation,
-+  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+  *
-+- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-+- * CA 95054 USA or visit www.sun.com if you need additional information or
-+- * have any questions.
-++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-++ * or visit www.oracle.com if you need additional information or have any
-++ * questions.
-+  */
-+ 
-+ package sun.tools.javazic;

_service:download_src_package:rebase-02.patch Deleted

@@ -1,42 +0,0 @@
-diff --git a/rebase-02.patch b/rebase-02.patch
-new file mode 100644
-index 0000000..0f57125
---- /dev/null
-+++ b/rebase-02.patch
-@@ -0,0 +1,36 @@
-+--- sun/tools/javazic/Mappings.java.orig       2015-04-13 12:40:26.000000000 -0400
-++++ sun/tools/javazic/Mappings.java    2015-04-13 12:42:11.000000000 -0400
-+@@ -75,8 +75,10 @@
-+           Zone zone = zones.get(zoneName);
-+           String zonename = zone.getName();
-+           int rawOffset = zone.get(zone.size()-1).getGmtOffset();
-++
-+           // If the GMT offset of this Zone will change in some
-+           // future time, this Zone is added to the exclude list.
-++            boolean isExcluded = false;
-+           if (zone.size() > 1) {
-+               ZoneRec zrec = zone.get(zone.size()-2);
-+               if ((zrec.getGmtOffset() != rawOffset)
-+@@ -85,7 +87,7 @@
-+                       excludeList = new ArrayList<String>();
-+                   }
-+                   excludeList.add(zone.getName());
-+-                  continue;
-++                    isExcluded = true;
-+               }
-+           }
-+ 
-+@@ -101,9 +103,11 @@
-+               rawOffsetsIndex.add(i, rawOffset);
-+ 
-+               Set<String> perRawOffset = new TreeSet<String>();
-+-              perRawOffset.add(zonename);
-++                if (!isExcluded) {
-++                    perRawOffset.add(zonename);
-++                }
-+               rawOffsetsIndexTable.add(i, perRawOffset);
-+-          } else {
-++            } else if (!isExcluded) {
-+               int i = rawOffsetsIndex.indexOf(new Integer(rawOffset));
-+               Set<String> perRawOffset = rawOffsetsIndexTable.get(i);
-+               perRawOffset.add(zonename);

_service:tar_scm:0002-Fix-have-snprintf-error.patch Added

_service:tar_scm:0003-continue-to-ship-posixrules.patch Added

_service:tar_scm:7090844.patch Added

@@ -0,0 +1,44 @@
+diff --git a/7090844.patch b/7090844.patch
+new file mode 100644
+index 0000000..fd5b531
+--- /dev/null
++++ b/7090844.patch
+@@ -0,0 +1,38 @@
++--- sun/tools/javazic/Mappings.java.orig       2015-04-13 12:42:30.000000000 -0400
+++++ sun/tools/javazic/Mappings.java    2015-04-13 12:43:32.000000000 -0400
++@@ -1,5 +1,5 @@
++ /*
++- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
+++ * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
++  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++  *
++  * This code is free software; you can redistribute it and/or modify it
++@@ -26,9 +26,6 @@
++ package sun.tools.javazic;
++ 
++ import        java.util.ArrayList;
++-import        java.util.HashMap;
++-import        java.util.HashSet;
++-import        java.util.Iterator;
++ import        java.util.LinkedList;
++ import        java.util.List;
++ import        java.util.Map;
++@@ -79,8 +76,8 @@
++           // If the GMT offset of this Zone will change in some
++           // future time, this Zone is added to the exclude list.
++             boolean isExcluded = false;
++-          if (zone.size() > 1) {
++-              ZoneRec zrec = zone.get(zone.size()-2);
+++            for (int i = 0; i < zone.size(); i++) {
+++                ZoneRec zrec = zone.get(i);
++               if ((zrec.getGmtOffset() != rawOffset)
++                   && (zrec.getUntilTime(0) > Time.getCurrentTime())) {
++                   if (excludeList == null) {
++@@ -88,6 +85,7 @@
++                   }
++                   excludeList.add(zone.getName());
++                     isExcluded = true;
+++                    break;
++               }
++           }
++

_service:tar_scm:7133138.patch Added

@@ -0,0 +1,44 @@
+diff --git a/7133138.patch b/7133138.patch
+new file mode 100644
+index 0000000..882f15f
+--- /dev/null
++++ b/7133138.patch
+@@ -0,0 +1,38 @@
++--- sun/tools/javazic/Mappings.java.orig       2015-04-13 12:44:10.000000000 -0400
+++++ sun/tools/javazic/Mappings.java    2015-04-13 12:45:28.000000000 -0400
++@@ -1,5 +1,5 @@
++ /*
++- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+++ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
++  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++  *
++  * This code is free software; you can redistribute it and/or modify it
++@@ -26,6 +26,7 @@
++ package sun.tools.javazic;
++ 
++ import        java.util.ArrayList;
+++import java.util.HashMap;
++ import        java.util.LinkedList;
++ import        java.util.List;
++ import        java.util.Map;
++@@ -162,6 +163,20 @@
++       for (String key : toBeRemoved) {
++           aliases.remove(key);
++       }
+++        // Eliminate any alias-to-alias mappings. For example, if
+++        // there are A->B and B->C, A->B is changed to A->C.
+++        Map<String, String> newMap = new HashMap<String, String>();
+++        for (String key : aliases.keySet()) {
+++            String realid = aliases.get(key);
+++            String leaf = realid;
+++            while (aliases.get(leaf) != null) {
+++                leaf = aliases.get(leaf);
+++            }
+++            if (!realid.equals(leaf)) {
+++                newMap.put(key, leaf);
+++            }
+++        }
+++        aliases.putAll(newMap);
++     }
++ 
++     Map<String,String> getAliases() {

_service:tar_scm:8051641.patch Added

_service:tar_scm:javazic-fixup.patch Added

@@ -0,0 +1,34 @@
+--- sun/util/calendar/LocalGregorianCalendar.java.keiths	2007-09-07 14:48:19.000000000 -0700
++++ sun/util/calendar/LocalGregorianCalendar.java	2007-09-07 14:52:58.000000000 -0700
+@@ -120,8 +120,7 @@ public class LocalGregorianCalendar exte
+     static LocalGregorianCalendar getLocalGregorianCalendar(String name) {
+ 	Properties calendarProps = null;
+ 	try {
+-	    String homeDir = (String) AccessController.doPrivileged(
+-				new sun.security.action.GetPropertyAction("java.home"));
++  	    String homeDir = (String) System.getProperty("java.home");
+ 	    final String fname = homeDir + File.separator + "lib" + File.separator
+ 				 + "calendars.properties";
+ 	    calendarProps = (Properties) AccessController.doPrivileged(new PrivilegedExceptionAction() {
+--- sun/util/calendar/ZoneInfoFile.java.keiths	2007-09-07 14:54:58.000000000 -0700
++++ sun/util/calendar/ZoneInfoFile.java	2007-09-07 14:55:36.000000000 -0700
+@@ -1021,8 +1021,7 @@ public class ZoneInfoFile {
+ 	byte buffer = null;
+ 
+ 	try {
+-	    String zi_dir = (String) AccessController.doPrivileged(
+-			        new sun.security.action.GetPropertyAction("user.zoneinfo.dir"));
++	    String zi_dir = (String) System.getProperty("user.zoneinfo.dir");
+ 	    File dir = null;
+ 	    if (zi_dir != null)
+ 	      dir = new File(zi_dir);
+@@ -1035,8 +1034,7 @@ public class ZoneInfoFile {
+ 	    }
+ 
+ 	    if (dir == null) {
+-	      String homeDir = (String) AccessController.doPrivileged(
+-				new sun.security.action.GetPropertyAction("java.home"));
++	      String homeDir = (String) System.getProperty("java.home");
+ 	      zi_dir = homeDir + File.separator + "lib" + File.separator
+ 		+ "zi";
+ 	    }

_service:tar_scm:rebase-01.patch Added

@@ -0,0 +1,37 @@
+diff --git a/rebase-01.patch b/rebase-01.patch
+new file mode 100644
+index 0000000..bca6ed4
+--- /dev/null
++++ b/rebase-01.patch
+@@ -0,0 +1,31 @@
++--- sun/tools/javazic/Mappings.java.orig       2007-08-30 03:55:48.000000000 -0400
+++++ sun/tools/javazic/Mappings.java    2015-04-13 12:39:44.000000000 -0400
++@@ -1,12 +1,12 @@
++ /*
++- * Copyright 2000-2004 Sun Microsystems, Inc.  All Rights Reserved.
+++ * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
++  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++  *
++  * This code is free software; you can redistribute it and/or modify it
++  * under the terms of the GNU General Public License version 2 only, as
++- * published by the Free Software Foundation.  Sun designates this
+++ * published by the Free Software Foundation.  Oracle designates this
++  * particular file as subject to the "Classpath" exception as provided
++- * by Sun in the LICENSE file that accompanied this code.
+++ * by Oracle in the LICENSE file that accompanied this code.
++  *
++  * This code is distributed in the hope that it will be useful, but WITHOUT
++  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++@@ -18,9 +18,9 @@
++  * 2 along with this work; if not, write to the Free Software Foundation,
++  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++  *
++- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
++- * CA 95054 USA or visit www.sun.com if you need additional information or
++- * have any questions.
+++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+++ * or visit www.oracle.com if you need additional information or have any
+++ * questions.
++  */
++ 
++ package sun.tools.javazic;

_service:tar_scm:rebase-02.patch Added

@@ -0,0 +1,42 @@
+diff --git a/rebase-02.patch b/rebase-02.patch
+new file mode 100644
+index 0000000..0f57125
+--- /dev/null
++++ b/rebase-02.patch
+@@ -0,0 +1,36 @@
++--- sun/tools/javazic/Mappings.java.orig       2015-04-13 12:40:26.000000000 -0400
+++++ sun/tools/javazic/Mappings.java    2015-04-13 12:42:11.000000000 -0400
++@@ -75,8 +75,10 @@
++           Zone zone = zones.get(zoneName);
++           String zonename = zone.getName();
++           int rawOffset = zone.get(zone.size()-1).getGmtOffset();
+++
++           // If the GMT offset of this Zone will change in some
++           // future time, this Zone is added to the exclude list.
+++            boolean isExcluded = false;
++           if (zone.size() > 1) {
++               ZoneRec zrec = zone.get(zone.size()-2);
++               if ((zrec.getGmtOffset() != rawOffset)
++@@ -85,7 +87,7 @@
++                       excludeList = new ArrayList<String>();
++                   }
++                   excludeList.add(zone.getName());
++-                  continue;
+++                    isExcluded = true;
++               }
++           }
++ 
++@@ -101,9 +103,11 @@
++               rawOffsetsIndex.add(i, rawOffset);
++ 
++               Set<String> perRawOffset = new TreeSet<String>();
++-              perRawOffset.add(zonename);
+++                if (!isExcluded) {
+++                    perRawOffset.add(zonename);
+++                }
++               rawOffsetsIndexTable.add(i, perRawOffset);
++-          } else {
+++            } else if (!isExcluded) {
++               int i = rawOffsetsIndex.indexOf(new Integer(rawOffset));
++               Set<String> perRawOffset = rawOffsetsIndexTable.get(i);
++               perRawOffset.add(zonename);

_service Changed

_service:download_src_package:javazic-1.8-37392f2f5d59.tar.xz Deleted

_service:download_src_package:javazic.tar.gz Deleted

_service:download_src_package:tzcode2021e.tar.gz Deleted

_service:download_src_package:tzdata2021e.tar.gz Deleted

_service:tar_scm:javazic-1.8-37392f2f5d59.tar.xz Added

_service:tar_scm:javazic.tar.gz Added

_service:tar_scm:tzcode2022a.tar.gz Added

_service:tar_scm:tzdata2022a.tar.gz Added

Changes of Revision 2