From 8bb325589f20d3146376ca53a5f90ee168bab279eacf036cd9c6313383009eef Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 15 May 2020 05:24:55 +0000 Subject: [PATCH] Accepting request 805655 from home:pmonrealgonzalez:branches:Java:packages - Update to 1.10.8 * Security fix: [CVE-2020-1945, bsc#1171696] - A new property ant.tmpdir provides improved control over the location Ant uses to create temporary files * sshexec failed to write output to a file if the file didn't exist * Fixes a regression in javac task involving command line argument files. * sshexec, sshsession and scp now support a new sshConfig parameter. It specified the SSH configuration file (typically ${user.home}/.ssh/config) defining the username and keyfile to be used per host. * "legacy-xml" formatter of junitlauncher task wasn't writing out exceptions that happen in @BeforeAll method of a test. * Fixes a potential ConcurrentModificationException in XMLLogger. * Fixes a bug in junitlauncher task in forked mode, where if a listener element was used as a sibling element for either the test or testclasses element, then the forked mode launch would fail. * Fixes an issue in AntStructure where an incorrect DTD was being generated. * Fixes an incorrect variable name usage in junit-frames-xalan1.xsl. * The runant.py script should now work with Python 3. * rmic has been removed from Java 15. The task will now throw an exception if you try to use it while running Java 15 or newer. - Remove ant-python3.patch fixed upstream - Update to 1.10.8 * Security fix: [CVE-2020-1945, bsc#1171696] - A new property ant.tmpdir provides improved control over the location Ant uses to create temporary files * sshexec failed to write output to a file if the file didn't exist * Fixes a regression in javac task involving command line argument files. * sshexec, sshsession and scp now support a new sshConfig parameter. It specified the SSH configuration file (typically ${user.home}/.ssh/config) OBS-URL: https://build.opensuse.org/request/show/805655 OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=159 --- ant-antlr.changes | 25 +++++++++ ant-antlr.spec | 10 ++-- ant-junit.changes | 25 +++++++++ ant-junit.spec | 10 ++-- ant-junit5.changes | 25 +++++++++ ant-junit5.spec | 10 ++-- ant-python3.patch | 86 ------------------------------- ant.changes | 25 +++++++++ ant.spec | 10 ++-- apache-ant-1.10.7-src.tar.bz2 | 3 -- apache-ant-1.10.7-src.tar.bz2.asc | 16 ------ apache-ant-1.10.8-src.tar.xz | 3 ++ apache-ant-1.10.8-src.tar.xz.asc | 7 +++ 13 files changed, 126 insertions(+), 129 deletions(-) delete mode 100644 ant-python3.patch delete mode 100644 apache-ant-1.10.7-src.tar.bz2 delete mode 100644 apache-ant-1.10.7-src.tar.bz2.asc create mode 100644 apache-ant-1.10.8-src.tar.xz create mode 100644 apache-ant-1.10.8-src.tar.xz.asc diff --git a/ant-antlr.changes b/ant-antlr.changes index df8d7f9..775a061 100644 --- a/ant-antlr.changes +++ b/ant-antlr.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Thu May 14 17:31:18 UTC 2020 - Pedro Monreal Gonzalez + +- Update to 1.10.8 + * Security fix: [CVE-2020-1945, bsc#1171696] + - A new property ant.tmpdir provides improved control over the + location Ant uses to create temporary files + * sshexec failed to write output to a file if the file didn't exist + * Fixes a regression in javac task involving command line argument files. + * sshexec, sshsession and scp now support a new sshConfig parameter. + It specified the SSH configuration file (typically ${user.home}/.ssh/config) + defining the username and keyfile to be used per host. + * "legacy-xml" formatter of junitlauncher task wasn't writing out + exceptions that happen in @BeforeAll method of a test. + * Fixes a potential ConcurrentModificationException in XMLLogger. + * Fixes a bug in junitlauncher task in forked mode, where if a listener element + was used as a sibling element for either the test or testclasses element, + then the forked mode launch would fail. + * Fixes an issue in AntStructure where an incorrect DTD was being generated. + * Fixes an incorrect variable name usage in junit-frames-xalan1.xsl. + * The runant.py script should now work with Python 3. + * rmic has been removed from Java 15. The task will now throw an + exception if you try to use it while running Java 15 or newer. +- Remove ant-python3.patch fixed upstream + ------------------------------------------------------------------- Wed May 6 16:49:40 UTC 2020 - Pedro Monreal Gonzalez diff --git a/ant-antlr.spec b/ant-antlr.spec index d54c73e..0be3708 100644 --- a/ant-antlr.spec +++ b/ant-antlr.spec @@ -24,24 +24,23 @@ %bcond_with junit5 %bcond_without antlr Name: ant-antlr -Version: 1.10.7 +Version: 1.10.8 Release: 0 Summary: Antlr Task for ant License: Apache-2.0 Group: Development/Tools/Building -URL: http://ant.apache.org/ -Source0: http://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2 +URL: https://ant.apache.org/ +Source0: https://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.xz Source1: apache-ant-1.8.ant.conf Source10: ant-bootstrap.pom.in Source1000: pre_checkin.sh -Source1001: http://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2.asc +Source1001: https://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.xz.asc Source1002: ant.keyring Patch0: apache-ant-no-test-jar.patch Patch1: apache-ant-class-path-in-manifest.patch Patch2: apache-ant-bootstrap.patch #PATCH-FEATURE-OPENSUSE bmwiedemann -- have fixed build dates Patch3: reproducible-build-date.patch -Patch4: ant-python3.patch # PATCH-FEATURE-OPENSUSE reproducible-build-manifest.patch -- have fixed "Created-by" in manifest Patch5: reproducible-build-manifest.patch Patch6: apache-ant-xml-apis.patch @@ -376,7 +375,6 @@ find -name \*.jar -print -delete %patch1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 %patch5 -p1 %patch6 -p1 diff --git a/ant-junit.changes b/ant-junit.changes index df8d7f9..775a061 100644 --- a/ant-junit.changes +++ b/ant-junit.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Thu May 14 17:31:18 UTC 2020 - Pedro Monreal Gonzalez + +- Update to 1.10.8 + * Security fix: [CVE-2020-1945, bsc#1171696] + - A new property ant.tmpdir provides improved control over the + location Ant uses to create temporary files + * sshexec failed to write output to a file if the file didn't exist + * Fixes a regression in javac task involving command line argument files. + * sshexec, sshsession and scp now support a new sshConfig parameter. + It specified the SSH configuration file (typically ${user.home}/.ssh/config) + defining the username and keyfile to be used per host. + * "legacy-xml" formatter of junitlauncher task wasn't writing out + exceptions that happen in @BeforeAll method of a test. + * Fixes a potential ConcurrentModificationException in XMLLogger. + * Fixes a bug in junitlauncher task in forked mode, where if a listener element + was used as a sibling element for either the test or testclasses element, + then the forked mode launch would fail. + * Fixes an issue in AntStructure where an incorrect DTD was being generated. + * Fixes an incorrect variable name usage in junit-frames-xalan1.xsl. + * The runant.py script should now work with Python 3. + * rmic has been removed from Java 15. The task will now throw an + exception if you try to use it while running Java 15 or newer. +- Remove ant-python3.patch fixed upstream + ------------------------------------------------------------------- Wed May 6 16:49:40 UTC 2020 - Pedro Monreal Gonzalez diff --git a/ant-junit.spec b/ant-junit.spec index d6e1a71..40af092 100644 --- a/ant-junit.spec +++ b/ant-junit.spec @@ -24,24 +24,23 @@ %bcond_with junit5 %bcond_with antlr Name: ant-junit -Version: 1.10.7 +Version: 1.10.8 Release: 0 Summary: Optional junit tasks for ant License: Apache-2.0 Group: Development/Tools/Building -URL: http://ant.apache.org/ -Source0: http://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2 +URL: https://ant.apache.org/ +Source0: https://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.xz Source1: apache-ant-1.8.ant.conf Source10: ant-bootstrap.pom.in Source1000: pre_checkin.sh -Source1001: http://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2.asc +Source1001: https://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.xz.asc Source1002: ant.keyring Patch0: apache-ant-no-test-jar.patch Patch1: apache-ant-class-path-in-manifest.patch Patch2: apache-ant-bootstrap.patch #PATCH-FEATURE-OPENSUSE bmwiedemann -- have fixed build dates Patch3: reproducible-build-date.patch -Patch4: ant-python3.patch # PATCH-FEATURE-OPENSUSE reproducible-build-manifest.patch -- have fixed "Created-by" in manifest Patch5: reproducible-build-manifest.patch Patch6: apache-ant-xml-apis.patch @@ -376,7 +375,6 @@ find -name \*.jar -print -delete %patch1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 %patch5 -p1 %patch6 -p1 diff --git a/ant-junit5.changes b/ant-junit5.changes index df8d7f9..775a061 100644 --- a/ant-junit5.changes +++ b/ant-junit5.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Thu May 14 17:31:18 UTC 2020 - Pedro Monreal Gonzalez + +- Update to 1.10.8 + * Security fix: [CVE-2020-1945, bsc#1171696] + - A new property ant.tmpdir provides improved control over the + location Ant uses to create temporary files + * sshexec failed to write output to a file if the file didn't exist + * Fixes a regression in javac task involving command line argument files. + * sshexec, sshsession and scp now support a new sshConfig parameter. + It specified the SSH configuration file (typically ${user.home}/.ssh/config) + defining the username and keyfile to be used per host. + * "legacy-xml" formatter of junitlauncher task wasn't writing out + exceptions that happen in @BeforeAll method of a test. + * Fixes a potential ConcurrentModificationException in XMLLogger. + * Fixes a bug in junitlauncher task in forked mode, where if a listener element + was used as a sibling element for either the test or testclasses element, + then the forked mode launch would fail. + * Fixes an issue in AntStructure where an incorrect DTD was being generated. + * Fixes an incorrect variable name usage in junit-frames-xalan1.xsl. + * The runant.py script should now work with Python 3. + * rmic has been removed from Java 15. The task will now throw an + exception if you try to use it while running Java 15 or newer. +- Remove ant-python3.patch fixed upstream + ------------------------------------------------------------------- Wed May 6 16:49:40 UTC 2020 - Pedro Monreal Gonzalez diff --git a/ant-junit5.spec b/ant-junit5.spec index dbebea0..910703f 100644 --- a/ant-junit5.spec +++ b/ant-junit5.spec @@ -24,24 +24,23 @@ %bcond_without junit5 %bcond_with antlr Name: ant-junit5 -Version: 1.10.7 +Version: 1.10.8 Release: 0 Summary: Optional junit tasks for ant License: Apache-2.0 Group: Development/Tools/Building -URL: http://ant.apache.org/ -Source0: http://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2 +URL: https://ant.apache.org/ +Source0: https://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.xz Source1: apache-ant-1.8.ant.conf Source10: ant-bootstrap.pom.in Source1000: pre_checkin.sh -Source1001: http://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2.asc +Source1001: https://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.xz.asc Source1002: ant.keyring Patch0: apache-ant-no-test-jar.patch Patch1: apache-ant-class-path-in-manifest.patch Patch2: apache-ant-bootstrap.patch #PATCH-FEATURE-OPENSUSE bmwiedemann -- have fixed build dates Patch3: reproducible-build-date.patch -Patch4: ant-python3.patch # PATCH-FEATURE-OPENSUSE reproducible-build-manifest.patch -- have fixed "Created-by" in manifest Patch5: reproducible-build-manifest.patch Patch6: apache-ant-xml-apis.patch @@ -376,7 +375,6 @@ find -name \*.jar -print -delete %patch1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 %patch5 -p1 %patch6 -p1 diff --git a/ant-python3.patch b/ant-python3.patch deleted file mode 100644 index 54c2ab4..0000000 --- a/ant-python3.patch +++ /dev/null @@ -1,86 +0,0 @@ -Index: apache-ant-1.9.10/src/script/runant.py -=================================================================== ---- apache-ant-1.9.10.orig/src/script/runant.py -+++ apache-ant-1.9.10/src/script/runant.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python3 - # Licensed to the Apache Software Foundation (ASF) under one or more - # contributor license agreements. See the NOTICE file distributed with - # this work for additional information regarding copyright ownership. -@@ -36,7 +36,7 @@ debug = 0 - ####################################################################### - - # If ANT_HOME is not set default to script's parent directory --if os.environ.has_key('ANT_HOME'): -+if 'ANT_HOME' in os.environ: - ANT_HOME = os.environ['ANT_HOME'] - else: - ANT_HOME = os.path.dirname(os.path.dirname(os.path.abspath(sys.argv[0]))) -@@ -46,17 +46,17 @@ ANT_LIB = os.path.join(ANT_HOME, 'lib') - - # set JAVACMD (check variables JAVACMD and JAVA_HOME) - JAVACMD = None --if not os.environ.has_key('JAVACMD'): -- if os.environ.has_key('JAVA_HOME'): -+if 'JAVACMD' not in os.environ: -+ if 'JAVA_HOME' in os.environ: - if not os.path.exists(os.environ['JAVA_HOME']): -- print "Warning: JAVA_HOME is not defined correctly." -+ print("Warning: JAVA_HOME is not defined correctly.") - else: - JAVA_HOME = os.environ['JAVA_HOME'] - while JAVA_HOME[0] == JAVA_HOME[-1] == "\"": - JAVA_HOME = JAVA_HOME[1:-1] - JAVACMD = os.path.join(JAVA_HOME, 'bin', 'java') - else: -- print "Warning: JAVA_HOME not set." -+ print("Warning: JAVA_HOME not set.") - else: - JAVACMD = os.environ['JAVACMD'] - if not JAVACMD: -@@ -64,28 +64,28 @@ if not JAVACMD: - - launcher_jar = os.path.join(ANT_LIB, 'ant-launcher.jar') - if not os.path.exists(launcher_jar): -- print 'Warning: Unable to locate ant-launcher.jar. Expected to find it in %s' % \ -- ANT_LIB -+ print('Warning: Unable to locate ant-launcher.jar. Expected to find it in %s' % \ -+ ANT_LIB) - - # Build up standard classpath (LOCALCLASSPATH) - LOCALCLASSPATH = launcher_jar --if os.environ.has_key('LOCALCLASSPATH'): -+if 'LOCALCLASSPATH' in os.environ: - LOCALCLASSPATH += os.pathsep + os.environ['LOCALCLASSPATH'] - - ANT_OPTS = "" --if os.environ.has_key('ANT_OPTS'): -+if 'ANT_OPTS' in os.environ: - ANT_OPTS = os.environ['ANT_OPTS'] - - OPTS = "" --if os.environ.has_key('JIKESPATH'): -+if 'JIKESPATH' in os.environ: - OPTS = '-Djikes.class.path=\"%s\"' % os.environ['JIKESPATH'] - - ANT_ARGS = "" --if os.environ.has_key('ANT_ARGS'): -+if 'ANT_ARGS' in os.environ: - ANT_ARGS = os.environ['ANT_ARGS'] - - CLASSPATH = "" --if os.environ.has_key('CLASSPATH'): -+if 'CLASSPATH' in os.environ: - CLASSPATH = "-lib " + os.environ['CLASSPATH'] - - while JAVACMD[0] == JAVACMD[-1] == "\"": -@@ -98,7 +98,7 @@ cmdline = ('"%s" %s -classpath %s -Dant. - CLASSPATH, string.join(sys.argv[1:], ' ')) - - if debug: -- print '\n%s\n\n' % (cmdline) -+ print('\n%s\n\n' % (cmdline)) - sys.stdout.flush() - - # Run the biniou! diff --git a/ant.changes b/ant.changes index df8d7f9..775a061 100644 --- a/ant.changes +++ b/ant.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Thu May 14 17:31:18 UTC 2020 - Pedro Monreal Gonzalez + +- Update to 1.10.8 + * Security fix: [CVE-2020-1945, bsc#1171696] + - A new property ant.tmpdir provides improved control over the + location Ant uses to create temporary files + * sshexec failed to write output to a file if the file didn't exist + * Fixes a regression in javac task involving command line argument files. + * sshexec, sshsession and scp now support a new sshConfig parameter. + It specified the SSH configuration file (typically ${user.home}/.ssh/config) + defining the username and keyfile to be used per host. + * "legacy-xml" formatter of junitlauncher task wasn't writing out + exceptions that happen in @BeforeAll method of a test. + * Fixes a potential ConcurrentModificationException in XMLLogger. + * Fixes a bug in junitlauncher task in forked mode, where if a listener element + was used as a sibling element for either the test or testclasses element, + then the forked mode launch would fail. + * Fixes an issue in AntStructure where an incorrect DTD was being generated. + * Fixes an incorrect variable name usage in junit-frames-xalan1.xsl. + * The runant.py script should now work with Python 3. + * rmic has been removed from Java 15. The task will now throw an + exception if you try to use it while running Java 15 or newer. +- Remove ant-python3.patch fixed upstream + ------------------------------------------------------------------- Wed May 6 16:49:40 UTC 2020 - Pedro Monreal Gonzalez diff --git a/ant.spec b/ant.spec index 92d85dc..12f6a99 100644 --- a/ant.spec +++ b/ant.spec @@ -23,24 +23,23 @@ %bcond_with junit5 %bcond_with antlr Name: ant -Version: 1.10.7 +Version: 1.10.8 Release: 0 Summary: Java-based build tool License: Apache-2.0 Group: Development/Tools/Building -URL: http://ant.apache.org/ -Source0: http://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2 +URL: https://ant.apache.org/ +Source0: https://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.xz Source1: apache-ant-1.8.ant.conf Source10: ant-bootstrap.pom.in Source1000: pre_checkin.sh -Source1001: http://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2.asc +Source1001: https://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.xz.asc Source1002: ant.keyring Patch0: apache-ant-no-test-jar.patch Patch1: apache-ant-class-path-in-manifest.patch Patch2: apache-ant-bootstrap.patch #PATCH-FEATURE-OPENSUSE bmwiedemann -- have fixed build dates Patch3: reproducible-build-date.patch -Patch4: ant-python3.patch # PATCH-FEATURE-OPENSUSE reproducible-build-manifest.patch -- have fixed "Created-by" in manifest Patch5: reproducible-build-manifest.patch Patch6: apache-ant-xml-apis.patch @@ -375,7 +374,6 @@ find -name \*.jar -print -delete %patch1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 %patch5 -p1 %patch6 -p1 diff --git a/apache-ant-1.10.7-src.tar.bz2 b/apache-ant-1.10.7-src.tar.bz2 deleted file mode 100644 index f38b3dc..0000000 --- a/apache-ant-1.10.7-src.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:39882eff327f4a056d77605f0a973d4f30d003083e54fa0885ddab6055b6c8de -size 4530166 diff --git a/apache-ant-1.10.7-src.tar.bz2.asc b/apache-ant-1.10.7-src.tar.bz2.asc deleted file mode 100644 index 62dbb0b..0000000 --- a/apache-ant-1.10.7-src.tar.bz2.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEjacMAN968bDS+dx03bzBJwop0IEFAl1rY3EACgkQ3bzBJwop -0IF11g/9FL4Slu7usL4FA1biNcKxzj6Su/k+rf9EeJNy0j4pR62Uygevq4sfrSVi -bShsHGKlMFQMMbS80OCk9TXp9Q0xL5yRAQlC9RZ13k4JcCxyCLg1hKsiBcOHRHSG -rhfbkmWNj/a86JBazCu6R+uiAqC31LHN/5qrDFWCQ3bPFAIXHHVR7ZDl/L2etBlT -9mTLh1NH0Dh2tFwX7r+DWkn5UfLFXt0Mx3HJBkFcbT72FT1/PMhG3jKxdKQFri04 -UEglwA5dVurcHaNt/WchO+5Bijyp5CYCnga5JV9iyIhVQrU4n8g90rqCZKgZ0Idy -WMBJ5bOBlQ5gxuZRRFmx+qrZxuo+n6cyIvPgRZE8wWWYhC2eSEPy5xH0tZZJ1Yjl -do+dRAkloEmxxEQi6ptohmU23Z6zX5IHYT3F1IC/7GQFxaB+EXuUiXLMteQ2Ydwn -EwSvMPxO/tqAs4Eev2Cqpsq4ERXmKlJLIfZRbg+z7dpD8QrszBrXd4Q8mWHVE98c -OhMCvcVWT9DqnppZx7wRCb5ku6ZuSgqJQpVJ8iCG9xs5TQBUwYzTjryF6HElyOa0 -xVvrXaQEKcZUIpLkhJ6z7OZH6xtft/OoIy8VhIaphkYjc5M2ogG1k8oxm0kNNiLj -UkmpvJIImDxXX30M4A1DqmRHgHJCTaiJ1UDRy59tW21zFO1PGTQ= -=J/gx ------END PGP SIGNATURE----- diff --git a/apache-ant-1.10.8-src.tar.xz b/apache-ant-1.10.8-src.tar.xz new file mode 100644 index 0000000..1b24d17 --- /dev/null +++ b/apache-ant-1.10.8-src.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:40570314bad3b46abe4ee0669a8f8feb56fe767f1642a801fa7fd4fafcd362ca +size 4509004 diff --git a/apache-ant-1.10.8-src.tar.xz.asc b/apache-ant-1.10.8-src.tar.xz.asc new file mode 100644 index 0000000..8c6a129 --- /dev/null +++ b/apache-ant-1.10.8-src.tar.xz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- + +iHEEABECADEWIQTOgHWiUVR77iSbwVGiEVrhX2uLcgUCXrgRRBMcYm9kZXdpZ0Bh +cGFjaGUub3JnAAoJEKIRWuFfa4tyLvQAnisliyItLK21cxqdIxY2TuSWAYN3AKDF +4uXOYiDFqrE2cpmpMhSlDqMInw== +=lY6Z +-----END PGP SIGNATURE-----