diff options
| author | Graham Christensen <graham@grahamc.com> | 2017-03-04 08:47:07 -0500 |
|---|---|---|
| committer | Graham Christensen <graham@grahamc.com> | 2017-03-04 08:47:07 -0500 |
| commit | 6011e3ea93e78e45dc2cb6cdf63afeb516670681 (patch) | |
| tree | 30330ce824dd35b6389d8cf7ce5d5f0e2684ff1c /pkgs/applications/networking/instant-messengers/jitsi | |
| parent | dc2bf68d7b72cd9655931923ac1b07bd04e1c676 (diff) | |
jitsi: 2.8.5426 -> 2.10.5550 for CVE-2017-5603
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/jitsi')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/jitsi/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index ee05f16a8f4f8..30fedec1a4bbe 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -8,11 +8,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { name = "jitsi-${version}"; - version = "2.8.5426"; + version = "2.10.5550"; src = fetchurl { url = "https://download.jitsi.org/jitsi/src/jitsi-src-${version}.zip"; - sha256 = "0v7k16in2i57z5amr7k5c3fc8f0azrzrs5dvn729bwbc31z8cjg6"; + sha256 = "11vjchc3dnzj55x7c62wsm6masvwmij1ifkds917r1qvil1nzz6d"; }; diff --git a/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch b/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch index 9db7ec368b08e..e477bdfe2fd41 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch +++ b/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch @@ -8,20 +8,20 @@ +#mkdir -p $HOME/.sip-communicator/log + +cd "$(dirname "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")")" - + # Get architecture 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 CLIENTARGS="" - + +NATIVELIBS="lib/native/linux-64" - if [ $ARCH -eq 32 ] + if [ $ARCH = 32 ] then CLIENTARGS="-client -Xmx256m" + NATIVELIBS="lib/native/linux" fi - + 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 +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 |