public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

jitsi: 2.8.5426 -> 2.10.5550 for CVE-2017-5603

This commit is contained in:
Graham Christensen 2017-03-04 08:47:07 -05:00
parent dc2bf68d7b
commit 6011e3ea93
No known key found for this signature in database
GPG Key ID: 06121D366FE9435C
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/instant-messengers/jitsi/default.nix
View File

@ -8,11 +8,11 @@ assert stdenv.isLinux;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "jitsi-${version}"; name = "jitsi-${version}";
version = "2.8.5426"; version = "2.10.5550";
src = fetchurl { src = fetchurl {
url = "https://download.jitsi.org/jitsi/src/jitsi-src-${version}.zip"; url = "https://download.jitsi.org/jitsi/src/jitsi-src-${version}.zip";
sha256 = "0v7k16in2i57z5amr7k5c3fc8f0azrzrs5dvn729bwbc31z8cjg6"; sha256 = "11vjchc3dnzj55x7c62wsm6masvwmij1ifkds917r1qvil1nzz6d";
}; };

10
pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch
View File

@ -8,20 +8,20 @@
+#mkdir -p $HOME/.sip-communicator/log +#mkdir -p $HOME/.sip-communicator/log
+ +
+cd "$(dirname "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")")" +cd "$(dirname "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")")"
# Get architecture # Get architecture
ARCH=`uname -m | sed -e s/x86_64/64/ -e s/i.86/32/` ARCH=`uname -m | sed -e s/x86_64/64/ -e s/i.86/32/`
@@ -6,10 +11,12 @@ @@ -6,7 +11,9 @@
# Additionnal JVM arguments # Additionnal JVM arguments
CLIENTARGS="" CLIENTARGS=""
+NATIVELIBS="lib/native/linux-64" +NATIVELIBS="lib/native/linux-64"
if [ $ARCH -eq 32 ] if [ $ARCH = 32 ]
then then
CLIENTARGS="-client -Xmx256m" CLIENTARGS="-client -Xmx256m"
+ NATIVELIBS="lib/native/linux" + NATIVELIBS="lib/native/linux"
fi fi
export PATH=$PATH:native export PATH=$PATH:native
-java $CLIENTARGS -classpath "lib/felix.jar:sc-bundles/sc-launcher.jar:sc-bundles/util.jar:lib/" -Djava.library.path=native -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties net.java.sip.communicator.launcher.SIPCommunicator -java $CLIENTARGS -classpath "lib/felix.jar:sc-bundles/sc-launcher.jar:sc-bundles/util.jar:lib/" -Djava.library.path=native -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties net.java.sip.communicator.launcher.SIPCommunicator
+LD_LIBRARY_PATH=@EXTRALIBS@ exec @JAVA@ $CLIENTARGS -classpath "lib/felix.jar:sc-bundles/sc-launcher.jar:sc-bundles/util.jar:lib/" -Djava.library.path=$NATIVELIBS -Dfelix.config.properties=file:lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties net.java.sip.communicator.launcher.SIPCommunicator +LD_LIBRARY_PATH=@EXTRALIBS@ exec @JAVA@ $CLIENTARGS -classpath "lib/felix.jar:sc-bundles/sc-launcher.jar:sc-bundles/util.jar:lib/" -Djava.library.path=$NATIVELIBS -Dfelix.config.properties=file:lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties net.java.sip.communicator.launcher.SIPCommunicator