pool/ant
SHA256
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 805700 from Java:packages

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/805700
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ant?expand=0&rev=83
This commit is contained in:
Dominique Leuenberger 2020-05-16 20:25:11 +00:00 committed by Git OBS Bridge
commit b480149d66
13 changed files with 126 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ant-antlr.changes
View File

@ -1,3 +1,28 @@
-------------------------------------------------------------------
Thu May 14 17:31:18 UTC 2020 - Pedro Monreal Gonzalez <pmonrealgonzalez@suse.com>
- 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 <pmonrealgonzalez@suse.com>

10
ant-antlr.spec
View File

@ -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

25
ant-junit.changes
View File

@ -1,3 +1,28 @@
-------------------------------------------------------------------
Thu May 14 17:31:18 UTC 2020 - Pedro Monreal Gonzalez <pmonrealgonzalez@suse.com>
- 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 <pmonrealgonzalez@suse.com>

10
ant-junit.spec
View File

@ -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

25
ant-junit5.changes
View File

@ -1,3 +1,28 @@
-------------------------------------------------------------------
Thu May 14 17:31:18 UTC 2020 - Pedro Monreal Gonzalez <pmonrealgonzalez@suse.com>
- 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 <pmonrealgonzalez@suse.com>

10
ant-junit5.spec
View File

@ -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

86
ant-python3.patch
View File

@ -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!

25
ant.changes
View File

@ -1,3 +1,28 @@
-------------------------------------------------------------------
Thu May 14 17:31:18 UTC 2020 - Pedro Monreal Gonzalez <pmonrealgonzalez@suse.com>
- 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 <pmonrealgonzalez@suse.com>

10
ant.spec
View File

@ -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

3
apache-ant-1.10.7-src.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:39882eff327f4a056d77605f0a973d4f30d003083e54fa0885ddab6055b6c8de
size 4530166

16
apache-ant-1.10.7-src.tar.bz2.asc
View File

@ -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-----

3
apache-ant-1.10.8-src.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:40570314bad3b46abe4ee0669a8f8feb56fe767f1642a801fa7fd4fafcd362ca
size 4509004

7
apache-ant-1.10.8-src.tar.xz.asc Normal file
View File

@ -0,0 +1,7 @@
-----BEGIN PGP SIGNATURE-----
iHEEABECADEWIQTOgHWiUVR77iSbwVGiEVrhX2uLcgUCXrgRRBMcYm9kZXdpZ0Bh
cGFjaGUub3JnAAoJEKIRWuFfa4tyLvQAnisliyItLK21cxqdIxY2TuSWAYN3AKDF
4uXOYiDFqrE2cpmpMhSlDqMInw==
=lY6Z
-----END PGP SIGNATURE-----