[groovy2] 02/08: Refreshed the patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Tue Feb 2 17:12:04 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository groovy2.
commit df7e5de8ac60bf29fe30ec4941641013093cba97
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Tue Feb 2 13:05:03 2016 +0100
Refreshed the patches
---
debian/changelog | 8 +++
debian/patches/01_fix_doc_gradle.diff | 64 +++++++++++++---------
debian/patches/02_fix_start_script.diff | 12 ++--
...or_gradle-1.12.diff => 03_ignore_codenarc.diff} | 8 +--
debian/patches/CVE-2015-3253.patch | 36 ------------
.../patches/change_bsf_dependencies_version.diff | 8 +--
debian/patches/change_junit_version.diff | 3 +-
.../patches/change_servlet_dependency_version.diff | 4 +-
.../patches/change_testng_dependency_version.diff | 9 ++-
debian/patches/series | 3 +-
10 files changed, 67 insertions(+), 88 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8fee799..2e71035 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+groovy2 (2.4.5-1) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * New upstream release
+ - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org> Tue, 02 Feb 2016 12:54:37 +0100
+
groovy2 (2.4.3+dfsg-4) UNRELEASED; urgency=medium
* Team upload.
diff --git a/debian/patches/01_fix_doc_gradle.diff b/debian/patches/01_fix_doc_gradle.diff
index 733a278..9d13ef2 100644
--- a/debian/patches/01_fix_doc_gradle.diff
+++ b/debian/patches/01_fix_doc_gradle.diff
@@ -4,16 +4,16 @@ Forwarded: no
Last-Update: 2015-06-22
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: alioth-groovy2/gradle/docs.gradle
-===================================================================
---- alioth-groovy2.orig/gradle/docs.gradle
-+++ alioth-groovy2/gradle/docs.gradle
-@@ -1,22 +1,8 @@
+--- a/gradle/docs.gradle
++++ b/gradle/docs.gradle
+@@ -17,24 +17,10 @@
+ * under the License.
+ */
task doc(dependsOn: ['javadocAll', 'groovydocAll', 'docGDK']) {
- if (JavaVersion.current().java7Compatible) {
- dependsOn 'asciidocAll', 'assembleAsciidoc'
- }
- ext.footer = 'Copyright © 2003-2014 The Codehaus. All rights reserved.'
+ ext.footer = 'Copyright © 2003-2015 The Apache Software Foundation. All rights reserved.'
ext.title = "Groovy ${groovyVersion}"
}
@@ -31,7 +31,7 @@ Index: alioth-groovy2/gradle/docs.gradle
def javadocSpec = {
maxMemory = javaDoc_mx
project.configure(options) {
-@@ -102,66 +88,10 @@ task docProjectVersionInfo(type: Copy) {
+@@ -120,71 +106,10 @@
task docGDK {
// ext.extraDocGDKclasses = []
@@ -43,7 +43,7 @@ Index: alioth-groovy2/gradle/docs.gradle
- }
- dependsOn docProjectVersionInfo
ext.destinationDir = "$buildDir/html/groovy-jdk"
- inputs.files sourceSets.tools.runtimeClasspath
+ inputs.files sourceSets.main.runtimeClasspath + configurations.tools
outputs.dir destinationDir
- doLast { task ->
- try {
@@ -51,13 +51,13 @@ Index: alioth-groovy2/gradle/docs.gradle
- java(classname: 'org.codehaus.groovy.tools.DocGenerator',
- fork: 'true',
- failonerror: 'true',
-- classpath: (configurations.tools + groovydocAll.groovyClasspath).asPath,
+- classpath: (sourceSets.main.runtimeClasspath + configurations.tools + groovydocAll.groovyClasspath).asPath,
- errorproperty: 'edr',
- outputproperty: 'odr') {
- arg(value: '-title')
- arg(value: 'Groovy JDK enhancements')
- arg(value: '-link')
-- arg(value: 'groovy,org.codehaus.groovy=http://groovy.codehaus.org/gapi/')
+- arg(value: 'groovy,org.codehaus.groovy=http://docs.groovy-lang.org/latest/html/gapi/')
- arg(value: '-link')
- arg(value: 'java,org.xml,javax,org.w3c=http://docs.oracle.com/javase/7/docs/api/')
- // either package name if in core or fully qualified path otherwise
@@ -95,28 +95,38 @@ Index: alioth-groovy2/gradle/docs.gradle
- from 'src/tools/org/codehaus/groovy/tools/groovy.ico', 'src/tools/org/codehaus/groovy/tools/stylesheet.css'
- }
- }
+-}
+-
+-// apply javadoc fix tool to generated javadocs - ensures no vulnerability even on old JDK versions
+-allprojects {
+- apply plugin: 'javadocHotfix'
}
- // this will apply the javadoc fix tool to all generated javadocs
-@@ -170,10 +100,10 @@ allprojects {
- tasks.withType(Javadoc).all {
- doLast {
- logger.lifecycle("Applying Javadoc fix tool (see http://www.kb.cert.org/vuls/id/225657) into $destinationDir".toString())
-- def javadocFix = new JavadocFixTool()
-- javadocFix.recursive = true
-- javadocFix.doPatch = true
-- javadocFix.searchAndPatch(destinationDir)
-+ // def javadocFix = new JavadocFixTool()
-+ // javadocFix.recursive = true
-+ // javadocFix.doPatch = true
-+ // javadocFix.searchAndPatch(destinationDir)
- }
- }
- }
-@@ -189,4 +119,4 @@ if (JavaVersion.current().isJava8Compati
+ if (JavaVersion.current().isJava7Compatible()) {
+@@ -198,4 +123,4 @@
options.addStringOption('Xdoclint:none', '-quiet')
}
}
-}
\ No newline at end of file
+}
+--- a/build.gradle
++++ b/build.gradle
+@@ -45,7 +45,6 @@
+ apply from: 'gradle/filter.gradle'
+ apply from: 'gradle/indy.gradle'
+ apply from: 'gradle/bintray.gradle'
+-apply plugin: 'javadocHotfix'
+
+ File javaHome = new File(System.getProperty('java.home'))
+ logger.lifecycle "Using Java from $javaHome (version ${System.getProperty('java.version')})"
+@@ -70,9 +69,6 @@
+
+ apply plugin: 'groovy'
+ apply from: "${rootProject.projectDir}/gradle/indy.gradle"
+- if (JavaVersion.current().java7Compatible) {
+- apply from: "${rootProject.projectDir}/gradle/asciidoctor.gradle"
+- }
+ }
+
+ // todo: use the conventional "resources" directory for classpath resources
diff --git a/debian/patches/02_fix_start_script.diff b/debian/patches/02_fix_start_script.diff
index c9f9ddf..e62693f 100644
--- a/debian/patches/02_fix_start_script.diff
+++ b/debian/patches/02_fix_start_script.diff
@@ -3,14 +3,14 @@ Author: Miguel Landaeta <nomadium at debian.org>
Forwarded: no
Last-Update: 2013-10-27
---- groovy-2.1.6+dfsg.orig/src/bin/startGroovy
-+++ groovy-2.1.6+dfsg/src/bin/startGroovy
+--- a/src/bin/startGroovy
++++ b/src/bin/startGroovy
@@ -1,3 +1,4 @@
+#!/bin/sh
# -*- mode:sh -*-
-
- ##############################################################################
-@@ -17,6 +18,9 @@ PROGNAME=`basename "$0"`
+ # ----------------------------------------------------------------------------
+ # Licensed to the Apache Software Foundation (ASF) under one
+@@ -35,6 +36,9 @@
SCRIPT_PATH="$0"
@@ -20,7 +20,7 @@ Last-Update: 2013-10-27
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
-@@ -72,7 +76,7 @@ if [ -z "$JAVA_HOME" ] ; then
+@@ -90,7 +94,7 @@
[ -z "$JAVA_HOME" -a -d "/Library/Java/Home" ] && export JAVA_HOME="/Library/Java/Home"
[ -z "$JAVA_HOME" -a -d "/System/Library/Frameworks/JavaVM.framework/Home" ] && export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Home"
else
diff --git a/debian/patches/fix_for_gradle-1.12.diff b/debian/patches/03_ignore_codenarc.diff
similarity index 69%
rename from debian/patches/fix_for_gradle-1.12.diff
rename to debian/patches/03_ignore_codenarc.diff
index f1743c0..072fb13 100644
--- a/debian/patches/fix_for_gradle-1.12.diff
+++ b/debian/patches/03_ignore_codenarc.diff
@@ -4,11 +4,9 @@ Forwarded: no
Last-Update: 2015-06-22
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: debian-groovy2/gradle/quality.gradle
-===================================================================
---- debian-groovy2.orig/gradle/quality.gradle 2015-06-06 13:24:16.403972433 +0530
-+++ debian-groovy2/gradle/quality.gradle 2015-06-06 13:27:52.359978033 +0530
-@@ -46,8 +46,7 @@
+--- a/gradle/quality.gradle
++++ b/gradle/quality.gradle
+@@ -59,8 +59,7 @@
codenarcClasspath = rootProject.sourceSets.main.output +
project(':groovy-templates').sourceSets.main.output +
project(':groovy-xml').sourceSets.main.output +
diff --git a/debian/patches/CVE-2015-3253.patch b/debian/patches/CVE-2015-3253.patch
deleted file mode 100644
index 20f86b1..0000000
--- a/debian/patches/CVE-2015-3253.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: Fix remote execution of untrusted code when deserializing (CVE-2015-3253)
-Author: Cedric Champeau <cchampeau at apache.org>
-Bug-Debian: https://bugs.debian.org/793398
-Origin: upstream, https://github.com/apache/incubator-groovy/commit/09e9778e8a33052d8c27105aee5310649637233d
-Forwarded: no
-Last-Update: 2015-07-25
-
---- groovy2-2.4.3+dfsg.orig/src/main/org/codehaus/groovy/runtime/MethodClosure.java
-+++ groovy2-2.4.3+dfsg/src/main/org/codehaus/groovy/runtime/MethodClosure.java
-@@ -32,9 +32,11 @@
- */
- public class MethodClosure extends Closure {
-
-+ public static boolean ALLOW_RESOLVE = false;
-+
- private static final Class[] EMPTY_CLASS_ARRAY = new Class[0];
- private String method;
--
-+
- public MethodClosure(Object owner, String method) {
- super(owner);
- this.method = method;
-@@ -62,6 +64,13 @@ public String getMethod() {
- protected Object doCall(Object arguments) {
- return InvokerHelper.invokeMethod(getOwner(), method, arguments);
- }
-+
-+ private Object readResolve() {
-+ if (ALLOW_RESOLVE) {
-+ return this;
-+ }
-+ throw new UnsupportedOperationException();
-+ }
-
- public Object getProperty(String property) {
- if ("method".equals(property)) {
diff --git a/debian/patches/change_bsf_dependencies_version.diff b/debian/patches/change_bsf_dependencies_version.diff
index 2ae045c..8f8f755 100644
--- a/debian/patches/change_bsf_dependencies_version.diff
+++ b/debian/patches/change_bsf_dependencies_version.diff
@@ -4,11 +4,9 @@ Forwarded: no
Last-Update: 2015-06-22
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: debian-groovy2/subprojects/groovy-bsf/build.gradle
-===================================================================
---- debian-groovy2.orig/subprojects/groovy-bsf/build.gradle
-+++ debian-groovy2/subprojects/groovy-bsf/build.gradle
-@@ -2,7 +2,7 @@ dependencies {
+--- a/subprojects/groovy-bsf/build.gradle
++++ b/subprojects/groovy-bsf/build.gradle
+@@ -20,7 +20,7 @@
compile('bsf:bsf:2.4.0') {
exclude(group: 'commons-logging', module: 'commons-logging')
}
diff --git a/debian/patches/change_junit_version.diff b/debian/patches/change_junit_version.diff
index 55ffce7..1413364 100644
--- a/debian/patches/change_junit_version.diff
+++ b/debian/patches/change_junit_version.diff
@@ -6,7 +6,8 @@ Last-Update: 2015-06-22
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/subprojects/groovy-test/build.gradle
+++ b/subprojects/groovy-test/build.gradle
-@@ -1,7 +1,7 @@
+@@ -18,8 +18,8 @@
+ */
dependencies {
compile rootProject
- compile 'junit:junit:4.12'
diff --git a/debian/patches/change_servlet_dependency_version.diff b/debian/patches/change_servlet_dependency_version.diff
index 80aa97e..b7c0a0b 100644
--- a/debian/patches/change_servlet_dependency_version.diff
+++ b/debian/patches/change_servlet_dependency_version.diff
@@ -6,7 +6,9 @@ Last-Update: 2015-06-22
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/subprojects/groovy-servlet/build.gradle
+++ b/subprojects/groovy-servlet/build.gradle
-@@ -1,8 +1,8 @@
+@@ -17,10 +17,10 @@
+ * under the License.
+ */
dependencies {
- compile('javax.servlet:servlet-api:2.4') { dep ->
+ compile('javax.servlet:servlet-api:debian') { dep ->
diff --git a/debian/patches/change_testng_dependency_version.diff b/debian/patches/change_testng_dependency_version.diff
index b1b9fbc..939b43a 100644
--- a/debian/patches/change_testng_dependency_version.diff
+++ b/debian/patches/change_testng_dependency_version.diff
@@ -4,11 +4,10 @@ Forwarded: no
Last-Update: 2015-06-22
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: alioth-groovy2/subprojects/groovy-testng/build.gradle
-===================================================================
---- alioth-groovy2.orig/subprojects/groovy-testng/build.gradle
-+++ alioth-groovy2/subprojects/groovy-testng/build.gradle
-@@ -1,10 +1,10 @@
+--- a/subprojects/groovy-testng/build.gradle
++++ b/subprojects/groovy-testng/build.gradle
+@@ -18,11 +18,11 @@
+ */
dependencies {
compile rootProject
- runtime('org.testng:testng:6.8.13') {
diff --git a/debian/patches/series b/debian/patches/series
index 8a4570a..ea9a3be 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,10 +1,9 @@
01_fix_doc_gradle.diff
02_fix_gradle_build.diff
02_fix_start_script.diff
-fix_for_gradle-1.12.diff
+03_ignore_codenarc.diff
change_bsf_dependencies_version.diff
change_servlet_dependency_version.diff
change_junit_version.diff
change_testng_dependency_version.diff
-CVE-2015-3253.patch
mavenRepo.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/groovy2.git
More information about the pkg-java-commits
mailing list