[smack] update to 4.0.6
gil
gil at fedoraproject.org
Thu Jan 1 20:41:47 UTC 2015
commit bb85ab8b9d9df0dc6db6f861371c9c0964edfca8
Author: gil <gil at localhost.localdomain>
Date: Thu Jan 1 21:39:23 2015 +0100
update to 4.0.6
.gitignore | 1 +
smack-3.2.2-CVE-2014-0363.patch | 505 ---------------------------------
smack-3.2.2-CVE-2014-5075.patch | 118 --------
smack-3.2.2-build.patch | 169 -----------
smack-3.2.2-test-config-test-case.xml | 16 -
smack-3.2.2.pom | 55 ----
smack-bosh-4.0.6.pom | 56 ++++
smack-compression-jzlib-4.0.6.pom | 56 ++++
smack-core-4.0.6.pom | 79 +++++
smack-debug-4.0.6.pom | 50 ++++
smack-experimental-4.0.6.pom | 58 ++++
smack-extensions-4.0.6.pom | 51 ++++
smack-legacy-4.0.6.pom | 57 ++++
smack-pom.xml | 58 ++++
smack-resolver-dnsjava-4.0.6.pom | 57 ++++
smack-resolver-javax-4.0.6.pom | 51 ++++
smack-resolver-minidns-4.0.6.pom | 63 ++++
smack-tcp-4.0.6.pom | 49 ++++
smack.spec | 236 +++++++++++-----
smackx-3.2.2.pom | 54 ----
smackx-debug-3.2.2.pom | 50 ----
sources | 2 +-
22 files changed, 846 insertions(+), 1045 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ca01ce9..81d38d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/smack_src_3_2_2.tar.gz
+/4.0.6.tar.gz
diff --git a/smack-bosh-4.0.6.pom b/smack-bosh-4.0.6.pom
new file mode 100644
index 0000000..9f33fc4
--- /dev/null
+++ b/smack-bosh-4.0.6.pom
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.igniterealtime.smack</groupId>
+ <artifactId>smack-bosh</artifactId>
+ <version>4.0.6</version>
+ <name>Smack</name>
+ <description>Smack BOSH API.
+This API is considered beta quality.</description>
+ <url>http://www.igniterealtime.org/projects/smack/</url>
+ <inceptionYear>2003</inceptionYear>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>flow</id>
+ <name>Florian Schmaus</name>
+ <email>flow at igniterealtime.org</email>
+ </developer>
+ </developers>
+ <issueManagement>
+ <system>JIRA</system>
+ <url>https://igniterealtime.org/issues/browse/SMACK</url>
+ </issueManagement>
+ <scm>
+ <connection>scm:git:https://github.com/igniterealtime/Smack.git</connection>
+ <developerConnection>scm:git:https://github.com/igniterealtime/Smack.git</developerConnection>
+ <url>https://github.com/igniterealtime/Smack</url>
+ </scm>
+ <distributionManagement>
+ <snapshotRepository>
+ <id>smack.snapshot</id>
+ <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+ </snapshotRepository>
+ </distributionManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.igniterealtime.jbosh</groupId>
+ <artifactId>jbosh</artifactId>
+ <version>0.8.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.igniterealtime.smack</groupId>
+ <artifactId>smack-core</artifactId>
+ <version>4.0.6</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/smack-compression-jzlib-4.0.6.pom b/smack-compression-jzlib-4.0.6.pom
new file mode 100644
index 0000000..0f5d2d3
--- /dev/null
+++ b/smack-compression-jzlib-4.0.6.pom
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.igniterealtime.smack</groupId>
+ <artifactId>smack-compression-jzlib</artifactId>
+ <version>4.0.6</version>
+ <name>Smack</name>
+ <description>Compression with jzlib
+Allow to compress the XMPP stream with help of jzlib.</description>
+ <url>http://www.igniterealtime.org/projects/smack/</url>
+ <inceptionYear>2003</inceptionYear>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>flow</id>
+ <name>Florian Schmaus</name>
+ <email>flow at igniterealtime.org</email>
+ </developer>
+ </developers>
+ <issueManagement>
+ <system>JIRA</system>
+ <url>https://igniterealtime.org/issues/browse/SMACK</url>
+ </issueManagement>
+ <scm>
+ <connection>scm:git:https://github.com/igniterealtime/Smack.git</connection>
+ <developerConnection>scm:git:https://github.com/igniterealtime/Smack.git</developerConnection>
+ <url>https://github.com/igniterealtime/Smack</url>
+ </scm>
+ <distributionManagement>
+ <snapshotRepository>
+ <id>smack.snapshot</id>
+ <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+ </snapshotRepository>
+ </distributionManagement>
+ <dependencies>
+ <dependency>
+ <groupId>com.jcraft</groupId>
+ <artifactId>jzlib</artifactId>
+ <version>1.1.3</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.igniterealtime.smack</groupId>
+ <artifactId>smack-core</artifactId>
+ <version>4.0.6</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/smack-core-4.0.6.pom b/smack-core-4.0.6.pom
new file mode 100644
index 0000000..d0922b0
--- /dev/null
+++ b/smack-core-4.0.6.pom
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.igniterealtime.smack</groupId>
+ <artifactId>smack-core</artifactId>
+ <version>4.0.6</version>
+ <name>Smack</name>
+ <description>Smack core components.</description>
+ <url>http://www.igniterealtime.org/projects/smack/</url>
+ <inceptionYear>2003</inceptionYear>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>flow</id>
+ <name>Florian Schmaus</name>
+ <email>flow at igniterealtime.org</email>
+ </developer>
+ </developers>
+ <issueManagement>
+ <system>JIRA</system>
+ <url>https://igniterealtime.org/issues/browse/SMACK</url>
+ </issueManagement>
+ <scm>
+ <connection>scm:git:https://github.com/igniterealtime/Smack.git</connection>
+ <developerConnection>scm:git:https://github.com/igniterealtime/Smack.git</developerConnection>
+ <url>https://github.com/igniterealtime/Smack</url>
+ </scm>
+ <distributionManagement>
+ <snapshotRepository>
+ <id>smack.snapshot</id>
+ <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+ </snapshotRepository>
+ </distributionManagement>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.+</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.jamesmurty.utils</groupId>
+ <artifactId>java-xmlbuilder</artifactId>
+ <version>0.6+</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ <version>1.5</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-module-junit4</artifactId>
+ <version>1.5.+</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-mockito</artifactId>
+ <version>1.5.+</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3</artifactId>
+ <version>1.1.4c</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/smack-debug-4.0.6.pom b/smack-debug-4.0.6.pom
new file mode 100644
index 0000000..20d4d7e
--- /dev/null
+++ b/smack-debug-4.0.6.pom
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.igniterealtime.smack</groupId>
+ <artifactId>smack-debug</artifactId>
+ <version>4.0.6</version>
+ <name>Smack</name>
+ <description>Smack GUI debugger.
+Inspect the exchanged XMPP stanzas.</description>
+ <url>http://www.igniterealtime.org/projects/smack/</url>
+ <inceptionYear>2003</inceptionYear>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>flow</id>
+ <name>Florian Schmaus</name>
+ <email>flow at igniterealtime.org</email>
+ </developer>
+ </developers>
+ <issueManagement>
+ <system>JIRA</system>
+ <url>https://igniterealtime.org/issues/browse/SMACK</url>
+ </issueManagement>
+ <scm>
+ <connection>scm:git:https://github.com/igniterealtime/Smack.git</connection>
+ <developerConnection>scm:git:https://github.com/igniterealtime/Smack.git</developerConnection>
+ <url>https://github.com/igniterealtime/Smack</url>
+ </scm>
+ <distributionManagement>
+ <snapshotRepository>
+ <id>smack.snapshot</id>
+ <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+ </snapshotRepository>
+ </distributionManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.igniterealtime.smack</groupId>
+ <artifactId>smack-core</artifactId>
+ <version>4.0.6</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/smack-experimental-4.0.6.pom b/smack-experimental-4.0.6.pom
new file mode 100644
index 0000000..258c49d
--- /dev/null
+++ b/smack-experimental-4.0.6.pom
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.igniterealtime.smack</groupId>
+ <artifactId>smack-experimental</artifactId>
+ <version>4.0.6</version>
+ <name>Smack</name>
+ <description>Smack experimental extensions.
+Classes and methods for XEPs that are in status 'experimental' or that should
+otherwise carefully considered for deployment. The API may change even
+between patch versions.</description>
+ <url>http://www.igniterealtime.org/projects/smack/</url>
+ <inceptionYear>2003</inceptionYear>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>flow</id>
+ <name>Florian Schmaus</name>
+ <email>flow at igniterealtime.org</email>
+ </developer>
+ </developers>
+ <issueManagement>
+ <system>JIRA</system>
+ <url>https://igniterealtime.org/issues/browse/SMACK</url>
+ </issueManagement>
+ <scm>
+ <connection>scm:git:https://github.com/igniterealtime/Smack.git</connection>
+ <developerConnection>scm:git:https://github.com/igniterealtime/Smack.git</developerConnection>
+ <url>https://github.com/igniterealtime/Smack</url>
+ </scm>
+ <distributionManagement>
+ <snapshotRepository>
+ <id>smack.snapshot</id>
+ <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+ </snapshotRepository>
+ </distributionManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.igniterealtime.smack</groupId>
+ <artifactId>smack-extensions</artifactId>
+ <version>4.0.6</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.igniterealtime.smack</groupId>
+ <artifactId>smack-core</artifactId>
+ <version>4.0.6</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/smack-extensions-4.0.6.pom b/smack-extensions-4.0.6.pom
new file mode 100644
index 0000000..88831fb
--- /dev/null
+++ b/smack-extensions-4.0.6.pom
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.igniterealtime.smack</groupId>
+ <artifactId>smack-extensions</artifactId>
+ <version>4.0.6</version>
+ <name>Smack</name>
+ <description>Smack extensions.
+Classes and methods that implement support for the various XMPP XEPs
+(Multi-User Chat, PubSub, …) and other XMPP extensions.</description>
+ <url>http://www.igniterealtime.org/projects/smack/</url>
+ <inceptionYear>2003</inceptionYear>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>flow</id>
+ <name>Florian Schmaus</name>
+ <email>flow at igniterealtime.org</email>
+ </developer>
+ </developers>
+ <issueManagement>
+ <system>JIRA</system>
+ <url>https://igniterealtime.org/issues/browse/SMACK</url>
+ </issueManagement>
+ <scm>
+ <connection>scm:git:https://github.com/igniterealtime/Smack.git</connection>
+ <developerConnection>scm:git:https://github.com/igniterealtime/Smack.git</developerConnection>
+ <url>https://github.com/igniterealtime/Smack</url>
+ </scm>
+ <distributionManagement>
+ <snapshotRepository>
+ <id>smack.snapshot</id>
+ <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+ </snapshotRepository>
+ </distributionManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.igniterealtime.smack</groupId>
+ <artifactId>smack-core</artifactId>
+ <version>4.0.6</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/smack-legacy-4.0.6.pom b/smack-legacy-4.0.6.pom
new file mode 100644
index 0000000..ceaa037
--- /dev/null
+++ b/smack-legacy-4.0.6.pom
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.igniterealtime.smack</groupId>
+ <artifactId>smack-legacy</artifactId>
+ <version>4.0.6</version>
+ <name>Smack</name>
+ <description>Smack legacy extensions.
+Usually XEPs in the state 'retracted', 'rejected', 'deprecated',
+'obsolete' or in a long standing 'deferred' state.</description>
+ <url>http://www.igniterealtime.org/projects/smack/</url>
+ <inceptionYear>2003</inceptionYear>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>flow</id>
+ <name>Florian Schmaus</name>
+ <email>flow at igniterealtime.org</email>
+ </developer>
+ </developers>
+ <issueManagement>
+ <system>JIRA</system>
+ <url>https://igniterealtime.org/issues/browse/SMACK</url>
+ </issueManagement>
+ <scm>
+ <connection>scm:git:https://github.com/igniterealtime/Smack.git</connection>
+ <developerConnection>scm:git:https://github.com/igniterealtime/Smack.git</developerConnection>
+ <url>https://github.com/igniterealtime/Smack</url>
+ </scm>
+ <distributionManagement>
+ <snapshotRepository>
+ <id>smack.snapshot</id>
+ <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+ </snapshotRepository>
+ </distributionManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.igniterealtime.smack</groupId>
+ <artifactId>smack-extensions</artifactId>
+ <version>4.0.6</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.igniterealtime.smack</groupId>
+ <artifactId>smack-core</artifactId>
+ <version>4.0.6</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/smack-pom.xml b/smack-pom.xml
new file mode 100644
index 0000000..7a09070
--- /dev/null
+++ b/smack-pom.xml
@@ -0,0 +1,58 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.igniterealtime.smack</groupId>
+ <artifactId>smack-parent</artifactId>
+ <packaging>pom</packaging>
+ <name>smack parent</name>
+ <version>@VERSION@</version>
+ <description>Smack is an Open Source XMPP (Jabber) client library for instant messaging and presence. This library provides the client side functionality as specified in the core XMPP specifications as related to the client side of said specifications.</description>
+
+ <organization>
+ <name>Ignite Realtime</name>
+ <url>http://www.igniterealtime.org</url>
+ </organization>
+ <url>http://www.igniterealtime.org/projects/smack/</url>
+ <developers>
+ <developer>
+ <name>Robin Collier</name>
+ <timezone>-5</timezone>
+ <roles>
+ <role>Project Lead</role>
+ </roles>
+ </developer>
+ </developers>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <issueManagement>
+ <system>jira</system>
+ <url>http://www.igniterealtime.org/issues/browse/SMACK</url>
+ </issueManagement>
+ <scm>
+ <connection>scm:svn:http://svn.igniterealtime.org/svn/repos/smack</connection>
+ <developerConnection>scm:svn:https://svn.igniterealtime.org/svn/repos/smack</developerConnection>
+ <url>http://svn.igniterealtime.org/svn/repos/smack</url>
+ </scm>
+
+ <modules>
+ <!-- These are not all the modules, only those that we can currently build: -->
+ <module>smack-bosh</module>
+ <module>smack-core</module>
+ <module>smack-compression-jzlib</module>
+ <module>smack-debug</module>
+ <module>smack-experimental</module>
+ <module>smack-extensions</module>
+ <!-- module>smack-jingle</module-->
+ <module>smack-legacy</module>
+ <module>smack-resolver-dnsjava</module>
+ <module>smack-resolver-javax</module>
+ <module>smack-resolver-minidns</module>
+ <module>smack-tcp</module>
+ </modules>
+
+</project>
diff --git a/smack-resolver-dnsjava-4.0.6.pom b/smack-resolver-dnsjava-4.0.6.pom
new file mode 100644
index 0000000..dfa11ed
--- /dev/null
+++ b/smack-resolver-dnsjava-4.0.6.pom
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.igniterealtime.smack</groupId>
+ <artifactId>smack-resolver-dnsjava</artifactId>
+ <version>4.0.6</version>
+ <name>Smack</name>
+ <description>DNS SRV with dnsjava
+Use dnsjava for DNS SRV lookups. For platforms that don't provide the
+javax.naming API (e.g. Android).</description>
+ <url>http://www.igniterealtime.org/projects/smack/</url>
+ <inceptionYear>2003</inceptionYear>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>flow</id>
+ <name>Florian Schmaus</name>
+ <email>flow at igniterealtime.org</email>
+ </developer>
+ </developers>
+ <issueManagement>
+ <system>JIRA</system>
+ <url>https://igniterealtime.org/issues/browse/SMACK</url>
+ </issueManagement>
+ <scm>
+ <connection>scm:git:https://github.com/igniterealtime/Smack.git</connection>
+ <developerConnection>scm:git:https://github.com/igniterealtime/Smack.git</developerConnection>
+ <url>https://github.com/igniterealtime/Smack</url>
+ </scm>
+ <distributionManagement>
+ <snapshotRepository>
+ <id>smack.snapshot</id>
+ <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+ </snapshotRepository>
+ </distributionManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.igniterealtime.smack</groupId>
+ <artifactId>smack-core</artifactId>
+ <version>4.0.6</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>dnsjava</groupId>
+ <artifactId>dnsjava</artifactId>
+ <version>2.1.+</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/smack-resolver-javax-4.0.6.pom b/smack-resolver-javax-4.0.6.pom
new file mode 100644
index 0000000..4cc7ca8
--- /dev/null
+++ b/smack-resolver-javax-4.0.6.pom
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.igniterealtime.smack</groupId>
+ <artifactId>smack-resolver-javax</artifactId>
+ <version>4.0.6</version>
+ <name>Smack</name>
+ <description>DNS SRV with Java7
+Use javax.naming for DNS SRV lookups. The javax.naming API is availabe in JavaSE
+since Java7.</description>
+ <url>http://www.igniterealtime.org/projects/smack/</url>
+ <inceptionYear>2003</inceptionYear>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>flow</id>
+ <name>Florian Schmaus</name>
+ <email>flow at igniterealtime.org</email>
+ </developer>
+ </developers>
+ <issueManagement>
+ <system>JIRA</system>
+ <url>https://igniterealtime.org/issues/browse/SMACK</url>
+ </issueManagement>
+ <scm>
+ <connection>scm:git:https://github.com/igniterealtime/Smack.git</connection>
+ <developerConnection>scm:git:https://github.com/igniterealtime/Smack.git</developerConnection>
+ <url>https://github.com/igniterealtime/Smack</url>
+ </scm>
+ <distributionManagement>
+ <snapshotRepository>
+ <id>smack.snapshot</id>
+ <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+ </snapshotRepository>
+ </distributionManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.igniterealtime.smack</groupId>
+ <artifactId>smack-core</artifactId>
+ <version>4.0.6</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/smack-resolver-minidns-4.0.6.pom b/smack-resolver-minidns-4.0.6.pom
new file mode 100644
index 0000000..045da64
--- /dev/null
+++ b/smack-resolver-minidns-4.0.6.pom
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.igniterealtime.smack</groupId>
+ <artifactId>smack-resolver-minidns</artifactId>
+ <version>4.0.6</version>
+ <name>Smack</name>
+ <description>DNS SRV with minidns
+Use minidns for DNS SRV lookups. For platforms that don't provide the
+javax.naming API (e.g. Android).</description>
+ <url>http://www.igniterealtime.org/projects/smack/</url>
+ <inceptionYear>2003</inceptionYear>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>flow</id>
+ <name>Florian Schmaus</name>
+ <email>flow at igniterealtime.org</email>
+ </developer>
+ </developers>
+ <issueManagement>
+ <system>JIRA</system>
+ <url>https://igniterealtime.org/issues/browse/SMACK</url>
+ </issueManagement>
+ <scm>
+ <connection>scm:git:https://github.com/igniterealtime/Smack.git</connection>
+ <developerConnection>scm:git:https://github.com/igniterealtime/Smack.git</developerConnection>
+ <url>https://github.com/igniterealtime/Smack</url>
+ </scm>
+ <distributionManagement>
+ <snapshotRepository>
+ <id>smack.snapshot</id>
+ <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+ </snapshotRepository>
+ </distributionManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.igniterealtime.jxmpp</groupId>
+ <artifactId>jxmpp-util-cache</artifactId>
+ <version>0.1.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.igniterealtime.smack</groupId>
+ <artifactId>smack-core</artifactId>
+ <version>4.0.6</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>de.measite.minidns</groupId>
+ <artifactId>minidns</artifactId>
+ <version>0.1.1</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/smack-tcp-4.0.6.pom b/smack-tcp-4.0.6.pom
new file mode 100644
index 0000000..9072cdd
--- /dev/null
+++ b/smack-tcp-4.0.6.pom
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.igniterealtime.smack</groupId>
+ <artifactId>smack-tcp</artifactId>
+ <version>4.0.6</version>
+ <name>Smack</name>
+ <description>Smack for standard XMPP connections over TCP.</description>
+ <url>http://www.igniterealtime.org/projects/smack/</url>
+ <inceptionYear>2003</inceptionYear>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>flow</id>
+ <name>Florian Schmaus</name>
+ <email>flow at igniterealtime.org</email>
+ </developer>
+ </developers>
+ <issueManagement>
+ <system>JIRA</system>
+ <url>https://igniterealtime.org/issues/browse/SMACK</url>
+ </issueManagement>
+ <scm>
+ <connection>scm:git:https://github.com/igniterealtime/Smack.git</connection>
+ <developerConnection>scm:git:https://github.com/igniterealtime/Smack.git</developerConnection>
+ <url>https://github.com/igniterealtime/Smack</url>
+ </scm>
+ <distributionManagement>
+ <snapshotRepository>
+ <id>smack.snapshot</id>
+ <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+ </snapshotRepository>
+ </distributionManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.igniterealtime.smack</groupId>
+ <artifactId>smack-core</artifactId>
+ <version>4.0.6</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/smack.spec b/smack.spec
index 4b4dba0..4591422 100644
--- a/smack.spec
+++ b/smack.spec
@@ -1,49 +1,47 @@
-%global pkg_version %(echo %version | tr . _)
Name: smack
-Version: 3.2.2
-Release: 8%{?dist}
+Version: 4.0.6
+Release: 1%{?dist}
Summary: Open Source XMPP (Jabber) client library
License: ASL 2.0
URL: http://www.igniterealtime.org/projects/smack/index.jsp
-# http://svn.igniterealtime.org/svn/repos/smack/tags/
-Source0: http://download.igniterealtime.org/smack/%{name}_src_%{pkg_version}.tar.gz
-# originally taken from http://repo1.maven.org/maven2/org/igniterealtime/smack/
-# change version
-# add xpp3
-Source1: %{name}-%{version}.pom
-# add jzlib as system deps
-Source2: %{name}x-%{version}.pom
-Source3: %{name}x-debug-%{version}.pom
-# unavailable test resources
-# wget -O smack-3.2.2-test-config-test-case.xml http://svn.igniterealtime.org/svn/repos/smack/tags/smack_3_2_2/test/config/test-case.xml
-Source4: %{name}-%{version}-test-config-test-case.xml
-# use system libraries
-# disable jzlib and xpp3 repackage
-# disable smack jingle extension. cause: unavailable deps
-# remove classpath from manifest files
-# fix javadoc link
-# fix build/javadoc/tests classpath
-Patch0: %{name}-%{version}-build.patch
-
-Patch1: %{name}-3.2.2-CVE-2014-5075.patch
-Patch2: %{name}-3.2.2-CVE-2014-0363.patch
-
-BuildRequires: java-javadoc
-BuildRequires: javapackages-local
-
-BuildRequires: ant
-BuildRequires: ant-contrib
-BuildRequires: ant-junit
-BuildRequires: aqute-bnd
-BuildRequires: junit
-BuildRequires: jzlib
-BuildRequires: xmlunit
-BuildRequires: xpp3
-%if %{?fedora} > 20
+Source0: https://github.com/igniterealtime/Smack/archive/%{version}.tar.gz
+Source1: http://repo1.maven.org/maven2/org/igniterealtime/smack/smack-core/%{version}/smack-core-%{version}.pom
+Source2: http://repo1.maven.org/maven2/org/igniterealtime/smack/smack-compression-jzlib/%{version}/smack-compression-jzlib-%{version}.pom
+Source3: http://repo1.maven.org/maven2/org/igniterealtime/smack/smack-debug/%{version}/smack-debug-%{version}.pom
+Source4: http://repo1.maven.org/maven2/org/igniterealtime/smack/smack-experimental/%{version}/smack-experimental-%{version}.pom
+Source5: http://repo1.maven.org/maven2/org/igniterealtime/smack/smack-extensions/%{version}/smack-extensions-%{version}.pom
+Source6: http://repo1.maven.org/maven2/org/igniterealtime/smack/smack-legacy/%{version}/smack-legacy-%{version}.pom
+Source7: http://repo1.maven.org/maven2/org/igniterealtime/smack/smack-resolver-dnsjava/%{version}/smack-resolver-dnsjava-%{version}.pom
+Source8: http://repo1.maven.org/maven2/org/igniterealtime/smack/smack-resolver-javax/%{version}/smack-resolver-javax-%{version}.pom
+Source9: http://repo1.maven.org/maven2/org/igniterealtime/smack/smack-tcp/%{version}/smack-tcp-%{version}.pom
+Source10: http://repo1.maven.org/maven2/org/igniterealtime/smack/smack-bosh/%{version}/smack-bosh-%{version}.pom
+Source11: http://repo1.maven.org/maven2/org/igniterealtime/smack/smack-resolver-minidns/%{version}/smack-resolver-minidns-%{version}.pom
+
+# http://repo1.maven.org/maven2/org/igniterealtime/smack/smack-jingle/4.0.0/smack-jingle-4.0.0.pom
+# javax.media:jmf:2.1.1e
+
+# Default use gradle
+Source12: smack-pom.xml
+
+BuildRequires: mvn(com.jamesmurty.utils:java-xmlbuilder)
+BuildRequires: mvn(com.jcraft:jzlib)
+BuildRequires: mvn(dnsjava:dnsjava)
+# https://bugzilla.redhat.com/show_bug.cgi?id=1177451
+BuildRequires: mvn(de.measite.minidns:minidns)
+BuildRequires: mvn(dnsjava:dnsjava)
+BuildRequires: mvn(junit:junit)
+# https://bugzilla.redhat.com/show_bug.cgi?id=1177442
+BuildRequires: mvn(org.igniterealtime.jbosh:jbosh)
+# https://bugzilla.redhat.com/show_bug.cgi?id=1177453
+BuildRequires: mvn(org.igniterealtime.jxmpp:jxmpp-util-cache)
+BuildRequires: mvn(org.mockito:mockito-core)
+BuildRequires: mvn(org.powermock:powermock-api-mockito)
+BuildRequires: mvn(org.powermock:powermock-module-junit4)
+BuildRequires: mvn(org.powermock:powermock-reflect)
BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:)
-%else
-BuildRequires: mvn(org.sonatype.oss:oss-parent)
-%endif
+BuildRequires: mvn(xmlunit:xmlunit)
+BuildRequires: mvn(xpp3:xpp3)
+BuildRequires: maven-local
BuildArch: noarch
@@ -61,7 +59,7 @@ Summary: Javadoc for %{name}
This package contains javadoc for %{name}.
%prep
-%setup -q -n %{name}_src_%{pkg_version}
+%setup -q -n %{name}-%{version}
# cleanup
find . -name "*.class" -print -delete
find . -name "*.dll" -print -delete
@@ -70,53 +68,137 @@ find . -name "*.jar" -print -delete
# remove prebuilt documentation
rm -rf javadoc/* documentation/*
-%patch0 -p0
-%if %{?fedora} > 21
-sed -i.ant-contrib "s|%{_javadir}/ant/ant-contrib.jar|%{_javadir}/ant-contrib/ant-contrib.jar|" build/build.xml
-%endif
-%patch1 -p1
-%patch2 -p1
-
-mkdir -p test/config
-cp -p %{SOURCE4} test/config/test-case.xml
-# tests problem:
-# caused by: java.net.ConnectException: Connection refused
-# remove this file unavailable class, in this release isn't available. error: cannot find symbol
-# [javac] import org.jivesoftware.smackx.bytestreams.socks5.Socks5PacketUtils;
-rm -r test/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamTest.java
-# these tests fails
-rm -r test/org/jivesoftware/smack/ChatTest.java \
- test/org/jivesoftware/smack/FloodTest.java \
- test/org/jivesoftware/smack/IQTest.java \
- test/org/jivesoftware/smack/LoginTest.java \
- test/org/jivesoftware/smack/MessageTest.java \
- test/org/jivesoftware/smack/PacketReaderTest.java \
- test/org/jivesoftware/smack/PresenceTest.java \
- test/org/jivesoftware/smack/ReconnectionTest.java \
- test/org/jivesoftware/smack/RosterListenerTest.java \
- test/org/jivesoftware/smack/RosterSmackTest.java \
- test/org/jivesoftware/smack/RosterInitializedBeforeConnectTest.java \
- test/org/jivesoftware/smack/packet/PrivacyTest.java
+cp -p %{SOURCE1} %{name}-core/pom.xml
+cp -p %{SOURCE2} %{name}-compression-jzlib/pom.xml
+cp -p %{SOURCE3} %{name}-debug/pom.xml
+cp -p %{SOURCE4} %{name}-experimental/pom.xml
+cp -p %{SOURCE5} %{name}-extensions/pom.xml
+cp -p %{SOURCE6} %{name}-legacy/pom.xml
+cp -p %{SOURCE7} %{name}-resolver-dnsjava/pom.xml
+cp -p %{SOURCE8} %{name}-resolver-javax/pom.xml
+cp -p %{SOURCE9} %{name}-tcp/pom.xml
+cp -p %{SOURCE10} %{name}-bosh/pom.xml
+cp -p %{SOURCE11} %{name}-resolver-minidns/pom.xml
+
+cp -p %{SOURCE12} pom.xml
+sed -i "s|@VERSION@|%{version}|" pom.xml
+
+for m in core compression-jzlib debug experimental extensions legacy resolver-dnsjava resolver-javax tcp bosh resolver-minidns; do
+
+%pom_add_plugin org.apache.maven.plugins:maven-jar-plugin %{name}-${m} "
+<configuration>
+ <archive>
+ <manifestFile>\${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ </manifest>
+ </archive>
+</configuration>"
+
+%pom_add_plugin org.apache.felix:maven-bundle-plugin %{name}-${m} "
+<extensions>true</extensions>
+<configuration>
+ <supportedProjectTypes>
+ <supportedProjectType>bundle</supportedProjectType>
+ <supportedProjectType>jar</supportedProjectType>
+ </supportedProjectTypes>
+ <instructions>
+ <Bundle-Name>\${project.artifactId}</Bundle-Name>
+ <Bundle-Version>\${project.version}</Bundle-Version>
+ </instructions>
+</configuration>
+<executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+</executions>"
+
+%pom_add_plugin org.apache.maven.plugins:maven-compiler-plugin %{name}-${m} "
+<configuration>
+ <source>1.7</source>
+ <target>1.7</target>
+</configuration>"
+
+sed -i "s|name>Smack|name>Smack ${m}|" %{name}-${m}/pom.xml
+
+done
+
+# Fix test deps
+%pom_add_dep junit:junit::test %{name}-extensions
+#%%pom_add_dep org.hamcrest:hamcrest-all::test %%{name}-extensions
+%pom_add_dep com.jamesmurty.utils:java-xmlbuilder::test %{name}-extensions
+%pom_add_dep org.mockito:mockito-core::test %{name}-extensions
+%pom_add_dep org.powermock:powermock-reflect::test %{name}-extensions
+# org.powermock:powermock-api-mockito
+%pom_add_dep xmlunit:xmlunit::test %{name}-extensions
+%pom_add_dep junit:junit::test %{name}-experimental
+%pom_add_dep junit:junit::test %{name}-legacy
+%pom_add_dep junit:junit::test %{name}-tcp
+
+# package org.jivesoftware.smack.test.util does not exist
+rm -r %{name}-extensions/src/test/java/org/jivesoftware/smackx/iqlast/LastActivityTest.java \
+ %{name}-extensions/src/test/java/org/jivesoftware/smackx/ping/PingTest.java \
+ %{name}-extensions/src/test/java/org/jivesoftware/smackx/pubsub/ItemValidationTest.java \
+ %{name}-extensions/src/test/java/org/jivesoftware/smackx/delay/provider/DelayInformationTest.java \
+ %{name}-extensions/src/test/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiatorTest.java \
+ %{name}-extensions/src/test/java/org/jivesoftware/smackx/jiveproperties/JivePropertiesExtensionTest.java \
+ %{name}-extensions/src/test/java/org/jivesoftware/smackx/privacy/provider/PrivacyProviderTest.java \
+ %{name}-extensions/src/test/java/org/jivesoftware/smackx/pubsub/ConfigureFormTest.java \
+ %{name}-extensions/src/test/java/org/jivesoftware/smackx/iqversion/VersionTest.java \
+ %{name}-extensions/src/test/java/org/jivesoftware/smackx/forward/ForwardedTest.java \
+ %{name}-extensions/src/test/java/org/jivesoftware/smackx/time/packet/TimeTest.java \
+ %{name}-extensions/src/test/java/org/jivesoftware/smackx/receipts/DeliveryReceiptTest.java \
+ %{name}-experimental/src/test/java/org/jivesoftware/smackx/carbons/CarbonTest.java \
+ %{name}-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/Base64BinaryChunkProviderTest.java \
+ %{name}-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/AbstractHttpOverXmppProviderTest.java \
+ %{name}-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppReqProviderTest.java \
+ %{name}-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppRespProviderTest.java
+
+# org.junit.ComparisonFailure
+rm -r %{name}-extensions/src/test/java/org/jivesoftware/smackx/caps/EntityCapsManagerTest.java
+
+# expected null, but was:<en>
+rm -r %{name}-core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java
+
+# fix non ASCII chars
+for s in %{name}-core/src/main/java/org/jivesoftware/smack/util/dns/HostAddress.java \
+ %{name}-extensions/src/main/java/org/jivesoftware/smackx/caps/cache/SimpleDirectoryPersistentCache.java \
+ %{name}-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java \
+ %{name}-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java \
+ %{name}-extensions/src/main/java/org/jivesoftware/smackx/caps/packet/CapsExtension.java \
+ %{name}-extensions/src/main/java/org/jivesoftware/smackx/caps/provider/CapsExtensionProvider.java \
+ %{name}-extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java \
+ %{name}-extensions/src/main/java/org/jivesoftware/smackx/caps/cache/EntityCapsPersistentCache.java;do
+ native2ascii -encoding UTF8 ${s} ${s}
+done
%build
-%ant -f build/build.xml jar javadoc test
+%mvn_package :%{name}-parent __noinstall
+%mvn_build -- -Dproject.build.sourceEncoding=UTF-8
%install
-%mvn_artifact %{SOURCE1} target/%{name}.jar
-%mvn_artifact %{SOURCE2} target/%{name}x.jar
-%mvn_artifact %{SOURCE3} target/%{name}x-debug.jar
-%mvn_alias : jivesoftware:
-%mvn_install -J target/javadoc
+%mvn_install
%files -f .mfiles
%dir %{_javadir}/%{name}
-%doc README.html changelog.html
+%doc README.md resources/releasedocs/README.html resources/releasedocs/changelog.html
%files javadoc -f .mfiles-javadoc
-%doc README.html
+%doc resources/releasedocs/README.html resources/releasedocs/changelog.html
%changelog
+* Wed Dec 24 2014 gil cattaneo <puntogil at libero.it> 4.0.6-1
+- update to 4.0.6
+
+* Thu Dec 04 2014 gil cattaneo <puntogil at libero.it> 4.0.0-1
+- update to 4.0.0
+
* Thu Dec 04 2014 gil cattaneo <puntogil at libero.it> 3.2.2-8
- fix for CVE-2014-0363 (rhbz#1093274)
- remove jzlib systemPath in smackx pom
diff --git a/sources b/sources
index e32b80b..dda0246 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8c9ac5d70711fabb404eb12d28fc1071 smack_src_3_2_2.tar.gz
+a426619d7a4960d3e8bb7323baece0be 4.0.6.tar.gz
More information about the scm-commits
mailing list