Merge branch 'deb-src-release-593'

Conflicts: resources/install/build-debian.xml resources/install/debian/copyright resources/install/debian/patches/sdes4j.patch

Merge branch 'deb-src-release-593'
9598fe93 · Damian Minkov · bc2892ce · 3fbf68af · 9598fe93 · 9598fe93
Commit 9598fe93 authored 9 years ago by Damian Minkov
--- a/resources/install/build-debian.xml
+++ b/resources/install/build-debian.xml
 <project name="libjitsi-debian" basedir=".">

    <property name="tmp" value="tmp"/>
-    <property name="sdes4j" value="sdes4j-r1.1.3"/>

    <!-- The target that is called just after clean and before building. Will
    prepare all sources in ${tmp} folder. Expects ../fmj, ../ice4j,
@@ -81,6 +80,14 @@
        <!-- sdes -->
        <unzip src="../libsrc/sdes4j.zip"
               dest="${tmp}/libjitsi/lib/src/"/>
+        <path id="sdes_name">
+            <dirset dir="${tmp}/libjitsi/lib/src/">
+                <include name="sdes4j-*"/>
+            </dirset>
+        </path>
+        <property name="sdes-pkg-name" refid="sdes_name" />
+        <echo message="renaming ${sdes-pkg-name} to ${tmp}/libjitsi/lib/src/sdes4j" />
+        <move file="${sdes-pkg-name}" tofile="${tmp}/libjitsi/lib/src/sdes4j" />

        <!-- fmj
        svn checkout http://svn.code.sf.net/p/fmj/code/fmj fmj
@@ -132,7 +139,11 @@

        <!-- zrtp4j -->
        <unzip src="../libsrc/zrtp4j-src-3.2.0.zip"
-               dest="${tmp}/libjitsi/lib/src"/>
+               dest="${tmp}/libjitsi/lib/src">
+            <patternset>
+                <exclude name="**/demo/**"/>
+            </patternset>
+        </unzip>

        <!-- bccontrib -->
        <unzip src="../libsrc/bccontrib.zip"
@@ -190,7 +201,7 @@
            <fileset dir="lib/src/zrtp4j/lib">
                <include name="*"/>
            </fileset>
-            <fileset dir="lib/src/${sdes4j}/lib">
+            <fileset dir="lib/src/sdes4j/lib">
                <include name="*"/>
            </fileset>
            <fileset dir="lib/src/jsip/lib">
@@ -214,7 +225,7 @@
        <ant dir="lib/src/ice4j"
             inheritAll="false"
             target="clean"/>
-        <exec   dir="lib/src/${sdes4j}"
+        <exec   dir="lib/src/sdes4j"
                executable="mvn-debian"
                resolveexecutable="true"
                failonerror="true">
@@ -264,8 +275,9 @@
        <ant target="clean-native"/>
    </target>

-    <!-- Used to build sources for debuilding deb package. Invoked from rules.
-    -->
+    <!-- used to build sources for debuilding deb package
+    invoked from rules
+     -->
    <target name="deb-src-rebuild">
            <!--depends="make"-->

@@ -275,7 +287,7 @@
                 link="lib/src/ice4j/lib/weupnp-0.1.2-SNAPSHOT.jar"/>

        <!-- sdes -->
-        <exec   dir="lib/src/${sdes4j}"
+        <exec   dir="lib/src/sdes4j"
                executable="mvn-debian"
                resolveexecutable="true"
                failonerror="true">
@@ -285,7 +297,7 @@
            <arg value="package" />
        </exec>
        <copy tofile="lib/sdes4j.jar"
-              file="lib/src/${sdes4j}/target/sdes4j-1.1.3.jar"/>
+              file="lib/src/sdes4j/target/sdes4j-1.1.3.jar"/>

        <symlink resource="/usr/share/java/org.apache.felix.framework.jar"
                 overwrite="true"

--- a/resources/install/debian/README.embedded-libraries
+++ b/resources/install/debian/README.embedded-libraries
@@ -14,6 +14,7 @@ This project provides a Java implementation of the ICE protocol
 that would be usable by both SIP and XMPP applications.
 The Jitsi community is the maintainer of this project.
 Reason: No Debian package.
+ITP: http://bugs.debian.org/698412

 - jsip http://jsip.java.net/
 This project publishes a full implementation of the RFC 3261 Specification
@@ -33,6 +34,7 @@ This project contains the Skein hash function, the Threefish encryption
 function and the Fortuna random generator as a Java implementation. The API is
 designed to be compatible to BouncyCastle.
 Reason: No Debian package.
+ITP: http://bugs.debian.org/754198

 - sdes4j http://code.google.com/p/sdes4j/
 Implementation of RFC4568: Session Description Protocol (SDP)

--- a/resources/install/debian/copyright
+++ b/resources/install/debian/copyright
@@ -12,25 +12,21 @@ Files: lib/src/fmj/*
 Copyright: UNKNOWN:
 License: LGPL-2.1

-Files: src.capture/net/sf/fmj/media/protocol/javasound/SimpleAudioRecorder.java
+Files: lib/src/fmj/src.capture/net/sf/fmj/media/protocol/javasound/SimpleAudioRecorder.java
 Copyright: 1999 - 2003 by Matthias Pfisterer
 License: BSD-2-clause

-Files: src.rtp/net/sf/fmj/media/rtp/RTPParticipant.java
-       src.rtp/net/sf/fmj/media/rtp/RTCPReport.java
-       src.rtp/net/sf/fmj/media/rtp/RTCPSenderInfo.java
-       src.rtp/net/sf/fmj/media/rtp/RTCPHeader.java
-       src.rtp/net/sf/fmj/media/rtp/RTCPSenderReport.java
-       src.rtp/net/sf/fmj/media/rtp/RTPHeader.java
-       src.rtp/net/sf/fmj/media/rtp/RTCPFeedback.java
+Files: lib/src/fmj/src.rtp/net/sf/fmj/media/rtp/RTPParticipant.java
+       lib/src/fmj/src.rtp/net/sf/fmj/media/rtp/RTCPReport.java
+       lib/src/fmj/src.rtp/net/sf/fmj/media/rtp/RTCPSenderInfo.java
+       lib/src/fmj/src.rtp/net/sf/fmj/media/rtp/RTCPHeader.java
+       lib/src/fmj/src.rtp/net/sf/fmj/media/rtp/RTCPSenderReport.java
+       lib/src/fmj/src.rtp/net/sf/fmj/media/rtp/RTPHeader.java
+       lib/src/fmj/src.rtp/net/sf/fmj/media/rtp/RTCPFeedback.java
 Copyright:
 2005-2006, University of Manchester,  Andrew G D Rowleym, Modified by Christian Vincenot
 License: BSD-3-clause

-Files: lib/src/jsip/src/gov/nist/core/MultiMap.java
-Copyright: 1999-2004 The Apache Software Foundation
-License: Apache-2.0
-
 Files: lib/src/jsip/src/gov/*
       lib/src/jsip/src/test/*
       lib/src/jsip/src/tools/*
@@ -53,11 +49,9 @@ License: public-domain
 not limited to the correctness, accuracy, reliability or usefulness of
 this software.

-Files: lib/src/bccontrib/src/main/java/prng/*
-Copyright:
- Copyright (C) 2010 Werner Dittmann <Werner.Dittmann@t-online.de>
- Copyright (C) 2004, 2006 Free Software Foundation, Inc.
-License: GPL-2+ with classpath exception
+Files: lib/src/jsip/src/gov/nist/core/MultiMap.java
+Copyright: 1999-2004 The Apache Software Foundation
+License: Apache-2.0

 Files: lib/src/bccontrib/*
 Copyright:
@@ -65,6 +59,12 @@ Copyright:
 2004, 2006 Free Software Foundation, Inc.
 License: MIT

+Files: lib/src/bccontrib/src/main/java/org/jitsi/bccontrib/prng/*
+Copyright:
+ Copyright (C) 2010 Werner Dittmann <Werner.Dittmann@t-online.de>
+ Copyright (C) 2004, 2006 Free Software Foundation, Inc.
+License: GPL-2+ with classpath exception
+
 Files: lib/src/portaudio/*
 Copyright:
 1999-2006 Ross Bencina and Phil Burk
@@ -88,21 +88,60 @@ Copyright:
 2010 The WebM Project authors
 License: BSD-3-clause

+Files: lib/src/zrtp4j/src/gnu/java/zrtp/*
+Copyright:
+ 2006-2008 Werner Dittmann
+License: GPL-3+ with classpath exception
+
+Files: lib/src/zrtp4j/src/org/bouncycastle/*
+Copyright:
+ 2000 - 2008 The Legion Of The Bouncy Castle
+License: MIT
+
 Files: lib/src/zrtp4j/src/gnu/java/math/*
 Copyright:
- 1999, 2000, 2001, 2004  Free Software Foundation, Inc.
+ 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
 License: GPL-2+ with classpath exception

 Files: lib/src/zrtp4j/src/gnu/java/bigintcrypto/*
 Copyright:
- 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006, 2007, 2009  Free Software Foundation, Inc.
+ 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006, 2007, 2009 Free Software Foundation, Inc.
 License: GPL-3+ with classpath exception

 Files: lib/src/zrtp4j/src/gnu/java/bigintcrypto/test/*
-       lib/src/zrtp4j/src/gnu/java/zrtp/*
+       lib/src/zrtp4j/src/gnu/java/zrtp/utils/ZrtpFortuna.java
+Copyright: UNKNOWN:
+License: GPL-3+ with classpath exception
+
+Files: lib/src/zrtp4j/src/gnu/java/bigintcrypto/test/BigIntegerCryptoTest.java
 Copyright:
 2006-2008 Werner Dittmann
-License: GPL-3+
+License: GPL-3+ with classpath exception
+
+Files: lib/src/zrtp4j/src/gnu/java/zrtp/jmf/transform/*
+Copyright:
+ 2004-2012 Emil Ivov
+License: LGPL-2.1
+
+Files: lib/src/zrtp4j/src/gnu/java/zrtp/jmf/transform/zrtp/*
+Copyright:
+ 2006-2008 Werner Dittmann
+License: GPL-3+ with classpath exception
+
+Files: lib/src/zrtp4j/src/gnu/java/zrtp/jmf/transform/zrtp/ZRTPTransformEngine.java
+Copyright:
+ 2004-2012 Emil Ivov
+License: LGPL-2.1
+
+Files: lib/src/zrtp4j/src/gnu/java/zrtp/jmf/transform/srtp/SRTCPCryptoContext.java
+       lib/src/zrtp4j/src/gnu/java/zrtp/jmf/transform/srtp/SRTPCipherCTR.java
+       lib/src/zrtp4j/src/gnu/java/zrtp/jmf/transform/srtp/SRTPCipherF8.java
+       lib/src/zrtp4j/src/gnu/java/zrtp/jmf/transform/srtp/SRTPCryptoContext.java
+       lib/src/zrtp4j/src/gnu/java/zrtp/jmf/transform/srtp/SRTPTransformer.java
+Copyright:
+ 2004-2012 Emil Ivov
+ 2004-2006 the Minisip Team
+License: LGPL-2.1

 License: LGPL-2.1
 On Debian systems, the full text of the GNU
@@ -110,12 +149,6 @@ License: LGPL-2.1
 2.1 can be found in the file
 '/usr/share/common-licenses/LGPL-2.1'.

-License: LGPL-2
- On Debian systems, the full text of the GNU
- Lesser General Public License (LGPL) version
- 2 can be found in the file
- '/usr/share/common-licenses/LGPL-2'.
-
 License: BSD-2-clause
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -248,20 +281,6 @@ License: GPL-3+ with classpath exception
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version.

-License: GPL-3+
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
 License: Apache-2.0
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

--- a/resources/install/debian/patches/remove-gsm
+++ b/resources/install/debian/patches/remove-gsm
+Description: Removes gsm codec due to patent issues.
 Index: libjitsi/src/org/jitsi/impl/neomedia/codec/FMJPlugInConfiguration.java
 ===================================================================
 --- libjitsi.orig/src/org/jitsi/impl/neomedia/codec/FMJPlugInConfiguration.java

--- a/resources/install/debian/patches/sdes4j.patch
+++ b/resources/install/debian/patches/sdes4j.patch
-Index: libjitsi/lib/src/sdes4j-r1.1.3/pom.xml
-Description: Updates pom.xml to be able to build with mvn-debian
-===================================================================
--- libjitsi.orig/lib/src/sdes4j-r1.1.3/pom.xml
-+++ libjitsi/lib/src/sdes4j-r1.1.3/pom.xml
-@@ -37,10 +37,10 @@
+Index: libjitsi/lib/src/sdes4j-r1.1.3/pom.xml
+Description: Updates pom.xml to be able to build with mvn-debian
+===================================================================
+--- libjitsi.orig/lib/src/sdes4j-r1.1.3/pom.xml
+++ libjitsi/lib/src/sdes4j-r1.1.3/pom.xml
+@@ -37,10 +37,10 @@
 		<dependency>
 			<groupId>commons-codec</groupId>
 			<artifactId>commons-codec</artifactId>
@@ -16,7 +16,7 @@ Description: Updates pom.xml to be able to build with mvn-debian
 			<groupId>org.easymock</groupId>
 			<artifactId>easymock</artifactId>
 			<version>[2.5,3.0.0)</version>
-@@ -57,14 +57,13 @@
+@@ -57,14 +57,13 @@
 			<artifactId>junit</artifactId>
 			<version>[4.9,5.0)</version>
 			<scope>test</scope>
@@ -32,7 +32,7 @@ Description: Updates pom.xml to be able to build with mvn-debian
 				<configuration>
 					<source>1.5</source>
 					<target>1.5</target>
-@@ -78,7 +77,7 @@
+@@ -78,7 +77,7 @@
 				<extensions>true</extensions>
 				<configuration />
 			</plugin>
@@ -41,7 +41,7 @@ Description: Updates pom.xml to be able to build with mvn-debian
 				<artifactId>maven-surefire-plugin</artifactId>
 				<version>2.14</version>
 				<configuration>
-@@ -86,7 +85,7 @@
+@@ -86,7 +85,7 @@
 						<include>**/*.java</include>
 					</includes>
 				</configuration>

--- a/resources/install/debian/watch
+++ b/resources/install/debian/watch
 version=3
-https://github.com/jitsi/libjitsi/tags \
-  .*/archive/([\d\.]+)\.tar\.gz
\ No newline at end of file
+https://download.jitsi.org/jitsi/debian-src libjitsi_(.+).orig.tar.gz
--- a/src/native/build.xml
+++ b/src/native/build.xml
@@ -1281,9 +1281,8 @@
                <linkerarg value="-Wl,--no-undefined" />
                <linkerarg value="-Wl,-z,relro" if="is.running.debian"/>
                <linkerarg value="-L/usr/local/lib/" if="is.running.freebsd"/>
-                <linkerarg value="-lpulse" />
-                <linkerarg value="-ldl" if="is.running.linux"/>
-
+                <linkerarg value="-lpulse" location="end" />
+                <linkerarg value="-ldl" location="end" if="is.running.linux"/>
                <compilerarg value="-m32" if="cross_32" />
                <compilerarg value="-m64" if="cross_64" />