[SCM] Debian packaging for activemq branch, master, updated. debian/5.5.0+dfsg-7-12-ga42d5b4
Damien Raude-Morvan
drazzib at debian.org
Wed May 30 00:09:07 UTC 2012
The following commit has been merged in the master branch:
commit c7758ab921b1ed0971dba319b304062befb0ef83
Author: Damien Raude-Morvan <drazzib at debian.org>
Date: Fri May 25 01:10:55 2012 +0200
Refresh all patches:
* Refresh all patches:
- Drop d/patches/CVE-2011-4605.diff: merged upstream.
diff --git a/debian/changelog b/debian/changelog
index b65c4c8..d403218 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
activemq (5.6.0+dfsg-1) UNRELEASED; urgency=low
* New upstream release.
+ * Refresh all patches:
+ - Drop d/patches/CVE-2011-4605.diff: merged upstream.
-- Damien Raude-Morvan <drazzib at debian.org> Fri, 25 May 2012 00:47:55 +0200
diff --git a/debian/patches/CVE-2011-4605.diff b/debian/patches/CVE-2011-4605.diff
deleted file mode 100644
index 4e36785..0000000
--- a/debian/patches/CVE-2011-4605.diff
+++ /dev/null
@@ -1,98 +0,0 @@
-Description: Fix for CVE-2011-4905
-Bug-vendor: https://issues.apache.org/jira/browse/AMQ-3294
-Applied-Upstream: http://svn.apache.org/viewvc?view=revision&revision=1209700,
- http://svn.apache.org/viewvc?view=revision&revision=1209841,
- http://svn.apache.org/viewvc?view=revision&revision=1211844,
- http://svn.apache.org/viewvc?view=revision&revision=1213642
---- a/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java
-+++ b/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java
-@@ -1292,10 +1292,17 @@
- }
- JMSException jmsEx = null;
- try {
-- jmsEx = JMSExceptionSupport.create(er.getException());
-+ jmsEx = JMSExceptionSupport.create(er.getException());
- }catch(Throwable e) {
- LOG.error("Caught an exception trying to create a JMSException for " +er.getException(),e);
- }
-+ //dispose of transport for security exceptions
-+ if (er.getException() instanceof SecurityException){
-+ Transport t = this.transport;
-+ if (null != t){
-+ ServiceSupport.dispose(t);
-+ }
-+ }
- if(jmsEx !=null) {
- throw jmsEx;
- }
-@@ -1504,6 +1511,12 @@
- started.set(false);
- }
-
-+ public void finalize() throws Throwable{
-+ if (scheduler != null){
-+ scheduler.stop();
-+ }
-+ }
-+
- /**
- * Changes the associated username/password that is associated with this
- * connection. If the connection has been used, you must called cleanup()
-@@ -2206,10 +2219,17 @@
- protected void onControlCommand(ControlCommand command) {
- String text = command.getCommand();
- if (text != null) {
-- if (text.equals("shutdown")) {
-+ if ("shutdown".equals(text)) {
- LOG.info("JVM told to shutdown");
- System.exit(0);
- }
-+ if (false && "close".equals(text)){
-+ LOG.error("Broker " + getBrokerInfo() + "shutdown connection");
-+ try {
-+ close();
-+ } catch (JMSException e) {
-+ }
-+ }
- }
- }
-
---- a/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java
-+++ b/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java
-@@ -311,6 +311,10 @@
- }
- if (responseRequired) {
- response = new ExceptionResponse(e);
-+ if(e instanceof java.lang.SecurityException){
-+ //still need to close this down - incase the peer of this transport doesn't play nice
-+ delayedStop(2000, "Failed with SecurityException: " + e.getLocalizedMessage());
-+ }
- } else {
- serviceException(e);
- }
-@@ -932,6 +936,25 @@
- }
- }
-
-+ public void delayedStop(final int waitTime, final String reason) {
-+ if (waitTime > 0) {
-+ try {
-+ DefaultThreadPools.getDefaultTaskRunnerFactory().execute(new Runnable() {
-+ public void run() {
-+ try {
-+ Thread.sleep(waitTime);
-+ stopAsync();
-+ LOG.info("Stopping " + transport.getRemoteAddress() + " because " + reason);
-+ } catch (InterruptedException e) {
-+ }
-+ }
-+ }, "delayedStop:" + transport.getRemoteAddress());
-+ } catch (Throwable t) {
-+ LOG.warn("cannot create stopAsync :", t);
-+ }
-+ }
-+ }
-+
- public void stopAsync() {
- // If we're in the middle of starting
- // then go no further... for now.
diff --git a/debian/patches/activemq-admin.patch b/debian/patches/activemq-admin.patch
index d15b2d6..f3b9706 100644
--- a/debian/patches/activemq-admin.patch
+++ b/debian/patches/activemq-admin.patch
@@ -6,11 +6,11 @@ Forwarded: no
--- a/assembly/src/release/bin/activemq-admin
+++ b/assembly/src/release/bin/activemq-admin
-@@ -129,7 +129,7 @@
+@@ -146,7 +146,7 @@
# Set default classpath
- ACTIVEMQ_CLASSPATH="${ACTIVEMQ_BASE}/conf;"$ACTIVEMQ_CLASSPATH
+ ACTIVEMQ_CLASSPATH="${ACTIVEMQ_CONF};"$ACTIVEMQ_CLASSPATH
--if [ $1 = "start" ] ; then
+-if [ ""$1 = "start" ] ; then
+if [ "$1" = "start" ] ; then
if [ -z "$ACTIVEMQ_OPTS" ] ; then
ACTIVEMQ_OPTS="-Xmx512M -Dorg.apache.activemq.UseDedicatedTaskRunner=true -Djava.util.logging.config.file=logging.properties"
diff --git a/debian/patches/disable_some_modules.diff b/debian/patches/disable_some_modules.diff
index 53fef93..a39e20b 100644
--- a/debian/patches/disable_some_modules.diff
+++ b/debian/patches/disable_some_modules.diff
@@ -4,7 +4,7 @@ Last-Update: 2011-05-08
Forwarded: not-needed
--- a/pom.xml
+++ b/pom.xml
-@@ -135,27 +135,35 @@
+@@ -171,27 +171,35 @@
</distributionManagement>
<modules>
diff --git a/debian/patches/init_debian_default_values.diff b/debian/patches/init_debian_default_values.diff
index f656689..87c744f 100644
--- a/debian/patches/init_debian_default_values.diff
+++ b/debian/patches/init_debian_default_values.diff
@@ -10,8 +10,6 @@ Author: Damien Raude-Morvan <drazzib at debian.org>
Last-Update: 2011-07-22
Forwarded: not-needed
-diff --git a/assembly/src/release/bin/activemq b/assembly/src/release/bin/activemq
-index c159d11..ccd67d2 100755
--- a/assembly/src/release/bin/activemq
+++ b/assembly/src/release/bin/activemq
@@ -29,18 +29,16 @@
@@ -20,26 +18,26 @@ index c159d11..ccd67d2 100755
# CONFIGURATION
-ACTIVEMQ_CONFIGS="/etc/default/activemq $HOME/.activemqrc"
--# Backup invocation parameters
--COMMANDLINE_ARGS="$@"
+ACTIVEMQ_CONFIGS="/usr/share/activemq/activemq-options"
++
++if [ -r "/etc/activemq/instances-enabled/$INSTANCE/options" ]; then
++ ACTIVEMQ_CONFIGS="/etc/activemq/instances-enabled/$INSTANCE/options"
++ fi
++
+ # Backup invocation parameters
+ COMMANDLINE_ARGS="$@"
-# For using instances
-if ( basename $0 | grep "activemq-instance-" > /dev/null);then
-- INST="$(basename $0|sed 's/^activemq-instance-//;s/\.sh$//')"
+- INST="`basename $0|sed 's/^activemq-instance-//;s/\.sh$//'`"
- ACTIVEMQ_CONFIGS="/etc/default/activemq-instance-${INST} $HOME/.activemqrc-instance-${INST}"
-- echo "INFO: Using alternative activemq configuration files: $ACCTIVEMQ_CONFIGS"
-+if [ -r "/etc/activemq/instances-enabled/$INSTANCE/options" ]; then
-+ ACTIVEMQ_CONFIGS="/etc/activemq/instances-enabled/$INSTANCE/options"
- fi
-
-+# Backup invocation parameters
-+COMMANDLINE_ARGS="$@"
-+
+- echo "INFO: Using alternative activemq configuration files: $ACTIVEMQ_CONFIGS"
+-fi
+-
## START:DEFAULTCONFIG
# ------------------------------------------------------------------------
# Configuration file for running Apache Active MQ as standalone provider
-@@ -50,71 +48,34 @@ fi
+@@ -50,43 +48,13 @@
# Active MQ installation dir
if [ -z "$ACTIVEMQ_HOME" ] ; then
# try to find ACTIVEMQ
@@ -86,46 +84,33 @@ index c159d11..ccd67d2 100755
fi
# Active MQ configuration directory
--ACTIVEMQ_CONFIG_DIR="$ACTIVEMQ_BASE/conf"
--
--# Active MQ configuration directory
- if [ -z "$ACTIVEMQ_DATA_DIR" ]; then
- ACTIVEMQ_DATA_DIR="$ACTIVEMQ_BASE/data"
+@@ -102,7 +70,7 @@
+
+ # Configure a user with non root priviledges, if no user is specified do not change user
+ if [ -z "$ACTIVEMQ_USER" ] ; then
+- ACTIVEMQ_USER=""
++ ACTIVEMQ_USER="activemq"
fi
--if [ ! -d "$ACTIVEMQ_DATA_DIR" ]; then
-- mkdir $ACTIVEMQ_DATA_DIR
--fi
--
+ # Active MQ data directory
+@@ -140,14 +108,14 @@
+
# Location of the pidfile
if [ -z "$ACTIVEMQ_PIDFILE" ]; then
-- ACTIVEMQ_PIDFILE="$ACTIVEMQ_DATA_DIR/activemq.pid"
+- ACTIVEMQ_PIDFILE="$ACTIVEMQ_DATA/activemq-`hostname`.pid"
+ ACTIVEMQ_PIDFILE="/var/run/activemq.pid"
fi
# Location of the java installation
- # Specify the location of your java installation using JAVA_HOME, or specify the
+ # Specify the location of your java installation using JAVA_HOME, or specify the
# path to the "java" binary using JAVACMD
# (set JAVACMD to "auto" for automatic detection)
-#JAVA_HOME=""
+JAVA_HOME="/usr/lib/jvm/java-6-openjdk/"
JAVACMD="auto"
- # Configure a user with non root priviledges, if no user is specified do not change user
--ACTIVEMQ_USER=""
-+ACTIVEMQ_USER="activemq"
-
# Set jvm memory configuration
- ACTIVEMQ_OPTS_MEMORY="-Xms256M -Xmx256M"
-@@ -318,7 +279,6 @@ if [ "${ACTIVEMQ_BASE}" != "${ACTIVEMQ_HOME}" ]; then
- fi
-
-
--
- # ------------------------------------------------------------------------
- # HELPER FUNCTIONS
-
-@@ -357,6 +317,15 @@ invokeJar(){
+@@ -391,6 +359,15 @@
DOIT_POSTFIX=" - $ACTIVEMQ_USER"
echo "INFO: changing to user '$ACTIVEMQ_USER' to invoke java"
fi
diff --git a/debian/patches/javadoc_links.diff b/debian/patches/javadoc_links.diff
index c4ba78b..8ec5bb5 100644
--- a/debian/patches/javadoc_links.diff
+++ b/debian/patches/javadoc_links.diff
@@ -2,47 +2,47 @@ Description: Use Javadoc installed system-wide for HTML links.
Author: Damien Raude-Morvan <drazzib at debian.org>
Last-Update: 2011-07-22
Forwarded: not-needed
+--- a/activemq-core/pom.xml
++++ b/activemq-core/pom.xml
+@@ -303,7 +303,7 @@
+ <link>${javase-javadoc-url}</link>
+ <link>${javaee-javadoc-url}</link>
+ <link>${slf4j-javadoc-url}</link>
+- <link>http://junit.sourceforge.net/javadoc/</link>
++ <link>/usr/share/doc/junit4/api/</link>
+ </links>
+ <stylesheetfile>${basedir}/../etc/css/stylesheet.css</stylesheetfile>
+ <linksource>true</linksource>
--- a/pom.xml
+++ b/pom.xml
-@@ -1235,16 +1235,15 @@
- <version>2.5</version>
- <configuration>
+@@ -102,7 +102,7 @@
+ <site-repo-url>scpexe://people.apache.org/www/activemq.apache.org/maven/</site-repo-url>
+ <source-version>1.6</source-version>
+ <target-version>1.6</target-version>
+- <javase-javadoc-url>http://download.oracle.com/javase/6/docs/api/</javase-javadoc-url>
++ <javase-javadoc-url>/usr/share/doc/default-jdk-doc/api/</javase-javadoc-url>
+ <javaee-javadoc-url>http://download.oracle.com/javaee/6/api/</javaee-javadoc-url>
+ <slf4j-javadoc-url>http://www.slf4j.org/apidocs/</slf4j-javadoc-url>
+ <!-- Maven Plugin Version for this Project -->
+@@ -1268,14 +1268,14 @@
<links>
-- <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
-- <link>http://java.sun.com/javaee/5/docs/api/</link>
+ <link>${javase-javadoc-url}</link>
+ <link>${javaee-javadoc-url}</link>
- <link>http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_0/</link>
- <link>http://jakarta.apache.org/commons/dbcp/apidocs/</link>
- <link>http://jakarta.apache.org/commons/fileupload/apidocs/</link>
-- <link>http://jakarta.apache.org/commons/httpclient/apidocs/</link>
-- <link>http://jakarta.apache.org/commons/logging/apidocs/</link>
-- <link>http://jakarta.apache.org/commons/pool/apidocs/</link>
-- <link>http://junit.sourceforge.net/javadoc/</link>
-- <link>http://logging.apache.org/log4j/docs/api/</link>
-+ <link>/usr/share/doc/default-jdk-doc/api/</link>
+- <link>http://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/</link>
+ <link>/usr/share/doc/libcommons-collections3-java-doc/api/</link>
+ <link>/usr/share/doc/libcommons-dbcp-java/api/</link>
+ <link>/usr/share/doc/libcommons-fileupload-java/api/</link>
+ <link>/usr/share/doc/libcommons-httpclient-java-doc/docs/apidocs/</link>
-+ <link>/usr/share/doc/libcommons-logging-java/api/</link>
+ <link>${slf4j-javadoc-url}</link>
+- <link>http://jakarta.apache.org/commons/pool/apidocs/</link>
+- <link>http://junit.sourceforge.net/javadoc/</link>
+- <link>http://logging.apache.org/log4j/docs/api/</link>
+ <link>/usr/share/doc/libcommons-pool-java/api/</link>
+ <link>/usr/share/doc/junit4/api/</link>
+ <link>/usr/share/doc/liblog4j1.2-java/api/</link>
</links>
<stylesheetfile>${basedir}/../etc/css/stylesheet.css</stylesheetfile>
<linksource>true</linksource>
---- a/activemq-core/pom.xml
-+++ b/activemq-core/pom.xml
-@@ -291,10 +291,9 @@
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <links>
-- <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
-- <link>http://java.sun.com/j2ee/1.4/docs/api/</link>
-- <link>http://jakarta.apache.org/commons/logging/apidocs/</link>
-- <link>http://junit.sourceforge.net/javadoc/</link>
-+ <link>/usr/share/doc/default-jdk-doc/api/</link>
-+ <link>/usr/share/doc/libcommons-logging-java/api/</link>
-+ <link>/usr/share/doc/junit4/api/</link>
- </links>
- <stylesheetfile>${basedir}/../etc/css/stylesheet.css</stylesheetfile>
- <linksource>true</linksource>
diff --git a/debian/patches/series b/debian/patches/series
index c777eee..8cdb9d7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,5 +4,4 @@ exclude_geronimo_jca.diff
exclude_spring_osgi.diff
javadoc_links.diff
init_debian_default_values.diff
-CVE-2011-4605.diff
activemq-admin.patch
--
Debian packaging for activemq
More information about the pkg-java-commits
mailing list