Package: activemq Version: 5.15.3-1 Severity: important Tags: patch Dear Maintainer,
I'm currently using activemq on wheezy configured as jdbc master-slave. When I tried to update the server to the current stable version, the activemq service refused to start. I've since learned, that the activemq-jdbc-store module was disabled some time in the past, though in the description of the package still mentions "persistence using JDBC along with journaling". Please find attached two patches (for the versions in stretch and sid), which re-enable the module. I've tested the patched packages and they seem to do what I need. With best regards, Michail Bachmann -- System Information: Debian Release: buster/sid APT prefers unstable APT policy: (500, 'unstable'), (1, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 4.15.0-1-amd64 (SMP w/8 CPU cores) Locale: LANG=C.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE= (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled Versions of packages activemq depends on: ii adduser 3.117 ii default-jre-headless [java7-runtime-headless] 2:1.9-62 ii libactivemq-java 5.15.3-1 ii liblog4j1.2-java 1.2.17-8 ii lsb-base 9.20170808 ii openjdk-7-jre-headless [java7-runtime-headless] 7u111-2.6.7-1 ii openjdk-8-jre-headless [java7-runtime-headless] 8u162-b12-1 ii openjdk-9-jre-headless [java7-runtime-headless] 9.0.4+12-2 activemq recommends no packages. activemq suggests no packages. -- no debconf information
>From e5dd33e48735f09b4d0664a8015c3ad7a783c367 Mon Sep 17 00:00:00 2001 From: Michail Bachmann <michail.bachm...@cms.hu-berlin.de> Date: Thu, 5 Apr 2018 15:00:41 +0200 Subject: [PATCH] Enable activemq-jdbc-store module --- debian/activemq.links | 4 +- debian/changelog | 9 ++++ debian/control | 2 + debian/libactivemq-java.README.Debian | 1 - debian/libactivemq-java.poms | 2 +- debian/maven.ignoreRules | 1 - debian/patches/enable-activemq-jdbc-store.patch | 61 +++++++++++++++++++++++++ debian/patches/series | 1 + 8 files changed, 77 insertions(+), 4 deletions(-) create mode 100644 debian/patches/enable-activemq-jdbc-store.patch diff --git a/debian/activemq.links b/debian/activemq.links index 271e1e47..73863a0f 100644 --- a/debian/activemq.links +++ b/debian/activemq.links @@ -4,6 +4,7 @@ /usr/share/java/activemq-console.jar /usr/share/activemq/lib/activemq-console.jar /usr/share/java/activemq-jaas.jar /usr/share/activemq/lib/activemq-jaas.jar /usr/share/java/activemq-kahadb-store.jar /usr/share/activemq/lib/activemq-kahadb-store.jar +/usr/share/java/activemq-jdbc-store.jar /usr/share/activemq/lib/activemq-jdbc-store.jar /usr/share/java/activemq-mqtt.jar /usr/share/activemq/lib/activemq-mqtt.jar /usr/share/java/activemq-openwire-legacy.jar /usr/share/activemq/lib/activemq-openwire-legacy.jar /usr/share/java/activemq-protobuf.jar /usr/share/activemq/lib/activemq-protobuf.jar @@ -18,7 +19,8 @@ /usr/share/java/commons-httpclient.jar /usr/share/activemq/lib/optional/commons-httpclient.jar /usr/share/java/commons-lang.jar /usr/share/activemq/lib/optional/commons-lang.jar /usr/share/java/commons-net.jar /usr/share/activemq/lib/optional/commons-net.jar -/usr/share/java/commons-pool2.jar /usr/share/activemq/lib/optional/commons-pool2jar +/usr/share/java/commons-pool.jar /usr/share/activemq/lib/optional/commons-pool.jar +/usr/share/java/commons-pool2.jar /usr/share/activemq/lib/optional/commons-pool2.jar /usr/share/java/glassfish-javaee.jar /usr/share/activemq/lib/glassfish-javaee.jar /usr/share/java/hawtbuf.jar /usr/share/activemq/lib/hawtbuf.jar /usr/share/java/jackson-annotations.jar /usr/share/activemq/lib/jackson-annotations.jar diff --git a/debian/changelog b/debian/changelog index 7e55660f..b4a7e7fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +activemq (5.14.3-3cmspackage1) unstable; urgency=medium + + * Non-maintainer upload. + * Enable activemq-jdbc-store module + * Add optional dependencies on commons-pool and commons-dbcp + * Fix commons-pool2.jar symlink + + -- Michail Bachmann <m.bachm...@cms.hu-berlin.de> Thu, 05 Apr 2018 10:24:19 +0200 + activemq (5.14.3-3) unstable; urgency=medium * Team upload. diff --git a/debian/control b/debian/control index 411201dd..be5a1270 100644 --- a/debian/control +++ b/debian/control @@ -23,6 +23,8 @@ Build-Depends: libcommons-logging-java-doc, libcommons-net-java (>= 3), libcommons-net-java-doc (>= 3), + libcommons-dbcp-java, + libcommons-pool-java, libcommons-pool2-java, libderby-java, libgentlyweb-utils-java, diff --git a/debian/libactivemq-java.README.Debian b/debian/libactivemq-java.README.Debian index ab33574a..760999e4 100644 --- a/debian/libactivemq-java.README.Debian +++ b/debian/libactivemq-java.README.Debian @@ -11,7 +11,6 @@ Here is a complete list of disabled modules : - activemq-openwire-generator - activemq-amqp - - activemq-jdbc-store - activemq-leveldb-store - activemq-unit-tests - activemq-all diff --git a/debian/libactivemq-java.poms b/debian/libactivemq-java.poms index 4dc53a69..ccb555cf 100644 --- a/debian/libactivemq-java.poms +++ b/debian/libactivemq-java.poms @@ -35,7 +35,7 @@ activemq-stomp/pom.xml --has-package-version activemq-mqtt/pom.xml --has-package-version activemq-amqp/pom.xml --ignore activemq-kahadb-store/pom.xml --has-package-version -activemq-jdbc-store/pom.xml --ignore +activemq-jdbc-store/pom.xml --has-package-version activemq-leveldb-store/pom.xml --ignore activemq-unit-tests/pom.xml --ignore activemq-all/pom.xml --ignore diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules index 6d8f0218..a3d75810 100644 --- a/debian/maven.ignoreRules +++ b/debian/maven.ignoreRules @@ -25,7 +25,6 @@ org.apache.activemq activemq-web jar * * * org.apache.activemq apache-activemq pom * * * org.apache.activemq.tooling activemq-tooling pom * * * commons-collections commons-collections * * * * -org.apache.activemq activeio-core * * * * org.apache.activemq activemq-unit-tests * * * * org.apache.camel camel-core * * * * org.apache.directory.server apacheds-core-integ * * * * diff --git a/debian/patches/enable-activemq-jdbc-store.patch b/debian/patches/enable-activemq-jdbc-store.patch new file mode 100644 index 00000000..06355f48 --- /dev/null +++ b/debian/patches/enable-activemq-jdbc-store.patch @@ -0,0 +1,61 @@ +Description: Enable activemq-jdbc-store module +Author: Michail Bachmann <m.bachm...@cms.hu-berlin.de> + + * Enable activemq-jdbc-store module + * Add optional dependencies on commons-pool and commons-dbcp + * Fix commons-pool2.jar symlink + +--- +--- activemq-5.14.3.orig/activemq-jdbc-store/pom.xml ++++ activemq-5.14.3/activemq-jdbc-store/pom.xml +@@ -49,6 +49,16 @@ + <artifactId>activeio-core</artifactId> + <optional>true</optional> + </dependency> ++ <dependency> ++ <groupId>commons-dbcp</groupId> ++ <artifactId>commons-dbcp</artifactId> ++ <optional>true</optional> ++ </dependency> ++ <dependency> ++ <groupId>commons-pool</groupId> ++ <artifactId>commons-pool</artifactId> ++ <optional>true</optional> ++ </dependency> + + <!-- =============================== --> + <!-- Testing Dependencies --> +--- activemq-5.14.3.orig/pom.xml ++++ activemq-5.14.3/pom.xml +@@ -53,10 +53,12 @@ + <commons-beanutils-version>1.9.2</commons-beanutils-version> + <commons-collections-version>3.2.2</commons-collections-version> + <commons-daemon-version>1.0.15</commons-daemon-version> ++ <commons-dbcp-version>1.4</commons-dbcp-version> + <commons-dbcp2-version>2.1.1</commons-dbcp2-version> + <commons-io-version>2.5</commons-io-version> + <commons-lang-version>2.6</commons-lang-version> + <commons-logging-version>1.2</commons-logging-version> ++ <commons-pool-version>1.6</commons-pool-version> + <commons-pool2-version>2.4.2</commons-pool2-version> + <commons-primitives-version>1.0</commons-primitives-version> + <commons-net-version>3.5</commons-net-version> +@@ -865,6 +867,18 @@ + <version>${commons-pool2-version}</version> + </dependency> + ++ <dependency> ++ <groupId>commons-dbcp</groupId> ++ <artifactId>commons-dbcp</artifactId> ++ <version>${commons-dbcp-version}</version> ++ </dependency> ++ ++ <dependency> ++ <groupId>commons-pool</groupId> ++ <artifactId>commons-pool</artifactId> ++ <version>${commons-pool-version}</version> ++ </dependency> ++ + <!-- Optional Journal Implementation --> + <!-- + <dependency> diff --git a/debian/patches/series b/debian/patches/series index 9e926237..b9560692 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ activemq-spring.patch activemq-client-jar.patch disable-broker-test-dependency.patch CVE-2017-7559.patch +enable-activemq-jdbc-store.patch -- 2.16.2
>From a2834b35630c68781b5f782065745d54753f16d3 Mon Sep 17 00:00:00 2001 From: Michail Bachmann <michail.bachm...@cms.hu-berlin.de> Date: Thu, 5 Apr 2018 15:04:08 +0200 Subject: [PATCH] Enable activemq-jdbc-store module --- debian/activemq.links | 4 +- debian/changelog | 9 ++++ debian/control | 2 + debian/libactivemq-java.README.Debian | 1 - debian/libactivemq-java.poms | 2 +- debian/maven.ignoreRules | 1 - debian/patches/enable-activemq-jdbc-store.patch | 62 +++++++++++++++++++++++++ debian/patches/series | 1 + 8 files changed, 78 insertions(+), 4 deletions(-) create mode 100644 debian/patches/enable-activemq-jdbc-store.patch diff --git a/debian/activemq.links b/debian/activemq.links index fd8111c9..c08b01f8 100644 --- a/debian/activemq.links +++ b/debian/activemq.links @@ -4,6 +4,7 @@ /usr/share/java/activemq-console.jar /usr/share/activemq/lib/activemq-console.jar /usr/share/java/activemq-jaas.jar /usr/share/activemq/lib/activemq-jaas.jar /usr/share/java/activemq-kahadb-store.jar /usr/share/activemq/lib/activemq-kahadb-store.jar +/usr/share/java/activemq-jdbc-store.jar /usr/share/activemq/lib/activemq-jdbc-store.jar /usr/share/java/activemq-mqtt.jar /usr/share/activemq/lib/activemq-mqtt.jar /usr/share/java/activemq-openwire-legacy.jar /usr/share/activemq/lib/activemq-openwire-legacy.jar /usr/share/java/activemq-protobuf.jar /usr/share/activemq/lib/activemq-protobuf.jar @@ -18,7 +19,8 @@ /usr/share/java/commons-httpclient.jar /usr/share/activemq/lib/optional/commons-httpclient.jar /usr/share/java/commons-lang.jar /usr/share/activemq/lib/optional/commons-lang.jar /usr/share/java/commons-net.jar /usr/share/activemq/lib/optional/commons-net.jar -/usr/share/java/commons-pool2.jar /usr/share/activemq/lib/optional/commons-pool2jar +/usr/share/java/commons-pool.jar /usr/share/activemq/lib/optional/commons-pool.jar +/usr/share/java/commons-pool2.jar /usr/share/activemq/lib/optional/commons-pool2.jar /usr/share/java/geronimo-j2ee-connector-1.5-spec.jar /usr/share/activemq/lib/geronimo-j2ee-connector-1.5-spec.jar /usr/share/java/geronimo-j2ee-management-1.1-spec.jar /usr/share/activemq/lib/geronimo-j2ee-management-1.1-spec.jar /usr/share/java/geronimo-jacc_1.1_spec.jar /usr/share/activemq/lib/geronimo-jacc_1.1_spec.jar diff --git a/debian/changelog b/debian/changelog index b7eea9ee..ad2536fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +activemq (5.15.3-1cmspackage1) unstable; urgency=medium + + * Non-maintainer upload. + * Enable activemq-jdbc-store module + * Add optional dependencies on commons-pool and commons-dbcp + * Fix commons-pool2.jar symlink + + -- Michail Bachmann <m.bachm...@cms.hu-berlin.de> Thu, 05 Apr 2018 10:24:19 +0200 + activemq (5.15.3-1) unstable; urgency=medium * Team upload. diff --git a/debian/control b/debian/control index 4071644f..36fde0ca 100644 --- a/debian/control +++ b/debian/control @@ -22,6 +22,8 @@ Build-Depends: libcommons-logging-java-doc, libcommons-net-java (>= 3), libcommons-net-java-doc (>= 3), + libcommons-dbcp-java, + libcommons-pool-java, libcommons-pool2-java, libderby-java, libgentlyweb-utils-java, diff --git a/debian/libactivemq-java.README.Debian b/debian/libactivemq-java.README.Debian index ab33574a..760999e4 100644 --- a/debian/libactivemq-java.README.Debian +++ b/debian/libactivemq-java.README.Debian @@ -11,7 +11,6 @@ Here is a complete list of disabled modules : - activemq-openwire-generator - activemq-amqp - - activemq-jdbc-store - activemq-leveldb-store - activemq-unit-tests - activemq-all diff --git a/debian/libactivemq-java.poms b/debian/libactivemq-java.poms index 4dc53a69..ccb555cf 100644 --- a/debian/libactivemq-java.poms +++ b/debian/libactivemq-java.poms @@ -35,7 +35,7 @@ activemq-stomp/pom.xml --has-package-version activemq-mqtt/pom.xml --has-package-version activemq-amqp/pom.xml --ignore activemq-kahadb-store/pom.xml --has-package-version -activemq-jdbc-store/pom.xml --ignore +activemq-jdbc-store/pom.xml --has-package-version activemq-leveldb-store/pom.xml --ignore activemq-unit-tests/pom.xml --ignore activemq-all/pom.xml --ignore diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules index 685827e2..ea4198cb 100644 --- a/debian/maven.ignoreRules +++ b/debian/maven.ignoreRules @@ -25,7 +25,6 @@ org.apache.activemq activemq-web jar * * * org.apache.activemq apache-activemq pom * * * org.apache.activemq.tooling activemq-tooling pom * * * commons-collections commons-collections * * * * -org.apache.activemq activeio-core * * * * org.apache.activemq activemq-unit-tests * * * * org.apache.camel camel-core * * * * org.apache.directory.server apacheds-core-integ * * * * diff --git a/debian/patches/enable-activemq-jdbc-store.patch b/debian/patches/enable-activemq-jdbc-store.patch new file mode 100644 index 00000000..de80f1f8 --- /dev/null +++ b/debian/patches/enable-activemq-jdbc-store.patch @@ -0,0 +1,62 @@ +Author: Michail Bachmann <michail.bachm...@cms.hu-berlin.de> +Date: Thu Apr 5 15:04:08 2018 +0200 + + Enable activemq-jdbc-store module + +diff --git a/activemq-jdbc-store/pom.xml b/activemq-jdbc-store/pom.xml +index c0390d77..30ade33c 100644 +--- a/activemq-jdbc-store/pom.xml ++++ b/activemq-jdbc-store/pom.xml +@@ -49,6 +49,16 @@ + <artifactId>activeio-core</artifactId> + <optional>true</optional> + </dependency> ++ <dependency> ++ <groupId>commons-dbcp</groupId> ++ <artifactId>commons-dbcp</artifactId> ++ <optional>true</optional> ++ </dependency> ++ <dependency> ++ <groupId>commons-pool</groupId> ++ <artifactId>commons-pool</artifactId> ++ <optional>true</optional> ++ </dependency> + + <!-- =============================== --> + <!-- Testing Dependencies --> +diff --git a/pom.xml b/pom.xml +index db96209a..9320b94e 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -53,10 +53,12 @@ + <commons-beanutils-version>1.9.3</commons-beanutils-version> + <commons-collections-version>3.2.2</commons-collections-version> + <commons-daemon-version>1.0.15</commons-daemon-version> ++ <commons-dbcp-version>1.4</commons-dbcp-version> + <commons-dbcp2-version>2.1.1</commons-dbcp2-version> + <commons-io-version>2.5</commons-io-version> + <commons-lang-version>2.6</commons-lang-version> + <commons-logging-version>1.2</commons-logging-version> ++ <commons-pool-version>1.6</commons-pool-version> + <commons-pool2-version>2.4.2</commons-pool2-version> + <commons-primitives-version>1.0</commons-primitives-version> + <commons-net-version>3.6</commons-net-version> +@@ -861,6 +863,18 @@ + <version>${commons-pool2-version}</version> + </dependency> + ++ <dependency> ++ <groupId>commons-dbcp</groupId> ++ <artifactId>commons-dbcp</artifactId> ++ <version>${commons-dbcp-version}</version> ++ </dependency> ++ ++ <dependency> ++ <groupId>commons-pool</groupId> ++ <artifactId>commons-pool</artifactId> ++ <version>${commons-pool-version}</version> ++ </dependency> ++ + <!-- Optional Journal Implementation --> + <!-- + <dependency> diff --git a/debian/patches/series b/debian/patches/series index 6a549fda..4d9a0a15 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ init-debian-default-values.patch activemq-spring.patch activemq-client-jar.patch disable-broker-test-dependency.patch +enable-activemq-jdbc-store.patch -- 2.16.2