[activemq] 02/04: Drop CVE-2017-7559.patch. Applied upstream.

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository activemq.

commit 40db51fcb7e6bb6a2d416fc0ba4f7aab13cc953f
Author: Markus Koschany <apo at debian.org>
Date:   Sat May 20 23:22:06 2017 +0200

    Drop CVE-2017-7559.patch. Applied upstream.
---
 debian/patches/CVE-2017-7559.patch | 49 --------------------------------------
 debian/patches/series              |  1 -
 2 files changed, 50 deletions(-)

diff --git a/debian/patches/CVE-2017-7559.patch b/debian/patches/CVE-2017-7559.patch
deleted file mode 100644
index 3bfeda8..0000000
--- a/debian/patches/CVE-2017-7559.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Fri, 21 Apr 2017 16:22:32 +0200
-Subject: CVE-2017-7559
-
-Bug-Debian: https://bugs.debian.org/860866
-Bug-Upstream: https://issues.apache.org/jira/browse/AMQ-6470
-Origin: https://git-wip-us.apache.org/repos/asf?p=activemq.git;h=b8fc78e
----
- .../java/org/apache/activemq/ActiveMQConnection.java | 20 --------------------
- 1 file changed, 20 deletions(-)
-
-diff --git a/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java
-index 1f360cb..8e6c157 100755
---- a/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java
-+++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java
-@@ -1873,7 +1873,6 @@ public class ActiveMQConnection implements Connection, TopicConnection, QueueCon
- 
-                     @Override
-                     public Response processControlCommand(ControlCommand command) throws Exception {
--                        onControlCommand(command);
-                         return null;
-                     }
- 
-@@ -2221,25 +2220,6 @@ public class ActiveMQConnection implements Connection, TopicConnection, QueueCon
-         }
-     }
- 
--    protected void onControlCommand(ControlCommand command) {
--        String text = command.getCommand();
--        if (text != null) {
--            if ("shutdown".equals(text)) {
--                LOG.info("JVM told to shutdown");
--                System.exit(0);
--            }
--
--            // TODO Should we handle the "close" case?
--            // if (false && "close".equals(text)){
--            //     LOG.error("Broker " + getBrokerInfo() + "shutdown connection");
--            //     try {
--            //         close();
--            //     } catch (JMSException e) {
--            //     }
--            // }
--        }
--    }
--
-     protected void onConnectionControl(ConnectionControl command) {
-         if (command.isFaultTolerant()) {
-             this.optimizeAcknowledge = false;
diff --git a/debian/patches/series b/debian/patches/series
index 9e92623..6a549fd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@ init-debian-default-values.patch
 activemq-spring.patch
 activemq-client-jar.patch
 disable-broker-test-dependency.patch
-CVE-2017-7559.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/activemq.git