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

pidgin: 2.10.11 -> 2.11.0

Browse Source 
Fix CVE-2016-1000030 & CVE-2016-2379.

cc #18856.
This commit is contained in:
Franz Pletz 2016-09-28 02:20:17 +02:00
parent 137827bacb
commit b5ab13a5ff
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
2 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/applications/networking/instant-messengers/pidgin/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, makeWrapper, pkgconfig, gtk2, gtkspell2, aspell { stdenv, fetchurl, makeWrapper, pkgconfig, gtk2, gtkspell2, aspell
, gstreamer, gst_plugins_base, gst_plugins_good, startupnotification, gettext , gst_all_1, startupnotification, gettext
, perl, perlXMLParser, libxml2, nss, nspr, farsight2 , perl, perlXMLParser, libxml2, nss, nspr, farstream, farsight2
, libXScrnSaver, ncurses, avahi, dbus, dbus_glib, intltool, libidn , libXScrnSaver, ncurses, avahi, dbus, dbus_glib, intltool, libidn
, lib, python, libICE, libXext, libSM , lib, python, libICE, libXext, libSM
, openssl ? null , openssl ? null
@ -14,21 +14,23 @@
let unwrapped = stdenv.mkDerivation rec { let unwrapped = stdenv.mkDerivation rec {
name = "pidgin-${version}"; name = "pidgin-${version}";
majorVersion = "2"; majorVersion = "2";
version = "${majorVersion}.10.11"; version = "${majorVersion}.11.0";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/pidgin/${name}.tar.bz2"; url = "mirror://sourceforge/pidgin/${name}.tar.bz2";
sha256 = "01s0q30qrjlzj7kkz6f8lvrwsdd55a9yjh2xjjwyyxzw849j3bpj"; sha256 = "0crkggjj6y07v1kdwil9vw532b0vrs6p33nmlvdkpnl60m2169pp";
}; };
inherit nss ncurses; inherit nss ncurses;
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
NIX_CFLAGS_COMPILE = "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0";
buildInputs = [ buildInputs = [
gtkspell2 aspell gtkspell2 aspell startupnotification
gstreamer gst_plugins_base gst_plugins_good startupnotification gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
libxml2 nss nspr farsight2 libxml2 nss nspr farstream farsight2
libXScrnSaver ncurses python libXScrnSaver ncurses python
avahi dbus dbus_glib intltool libidn avahi dbus dbus_glib intltool libidn
libICE libXext libSM libICE libXext libSM
@ -41,7 +43,7 @@ let unwrapped = stdenv.mkDerivation rec {
pkgconfig gtk2 perl perlXMLParser gettext pkgconfig gtk2 perl perlXMLParser gettext
]; ];
patches = [./pidgin-makefile.patch ./add-search-path.patch ]; patches = [ ./pidgin-makefile.patch ./add-search-path.patch ];
configureFlags = [ configureFlags = [
"--with-nspr-includes=${nspr.dev}/include/nspr" "--with-nspr-includes=${nspr.dev}/include/nspr"

48
pkgs/applications/networking/instant-messengers/pidgin/pidgin-makefile.patch
View File

@ -1,15 +1,16 @@
diff -ru pidgin-2.6.4/pidgin/Makefile.am pidgin-2.6.4.new/pidgin/Makefile.am diff --git a/pidgin/Makefile.am b/pidgin/Makefile.am
--- pidgin-2.6.4/pidgin/Makefile.am 2009-11-30 04:13:54.000000000 +0100 index 84d927b..1467c19 100644
+++ pidgin-2.6.4.new/pidgin/Makefile.am 2009-12-27 17:30:58.000000000 +0100 --- a/pidgin/Makefile.am
@@ -200,6 +200,7 @@ +++ b/pidgin/Makefile.am
@@ -151,6 +151,7 @@ pidgin_LDADD = \
$(GLIB_LIBS) \ $(GLIB_LIBS) \
$(DBUS_LIBS) \ $(DBUS_LIBS) \
$(GSTREAMER_LIBS) \ $(GSTREAMER_LIBS) \
+ $(GSTINTERFACES_LIBS) \ + $(GSTINTERFACES_LIBS) \
$(GSTVIDEO_LIBS) \
$(XSS_LIBS) \ $(XSS_LIBS) \
$(SM_LIBS) \ $(SM_LIBS) \
$(INTLLIBS) \ @@ -171,6 +172,7 @@ AM_CPPFLAGS = \
@@ -224,6 +225,7 @@
-I$(top_srcdir) \ -I$(top_srcdir) \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
$(GSTREAMER_CFLAGS) \ $(GSTREAMER_CFLAGS) \
@ -17,18 +18,19 @@ diff -ru pidgin-2.6.4/pidgin/Makefile.am pidgin-2.6.4.new/pidgin/Makefile.am
$(DEBUG_CFLAGS) \ $(DEBUG_CFLAGS) \
$(GTK_CFLAGS) \ $(GTK_CFLAGS) \
$(DBUS_CFLAGS) \ $(DBUS_CFLAGS) \
diff -ru pidgin-2.6.4/pidgin/Makefile.in pidgin-2.6.4.new/pidgin/Makefile.in diff --git a/pidgin/Makefile.in b/pidgin/Makefile.in
--- pidgin-2.6.4/pidgin/Makefile.in 2009-11-30 05:12:21.000000000 +0100 index 0d51e25..dd5d879 100644
+++ pidgin-2.6.4.new/pidgin/Makefile.in 2009-12-27 17:30:36.000000000 +0100 --- a/pidgin/Makefile.in
@@ -645,6 +645,7 @@ +++ b/pidgin/Makefile.in
@@ -703,6 +703,7 @@ EXTRA_DIST = \
@ENABLE_GTK_TRUE@ $(GLIB_LIBS) \ @ENABLE_GTK_TRUE@ $(GLIB_LIBS) \
@ENABLE_GTK_TRUE@ $(DBUS_LIBS) \ @ENABLE_GTK_TRUE@ $(DBUS_LIBS) \
@ENABLE_GTK_TRUE@ $(GSTREAMER_LIBS) \ @ENABLE_GTK_TRUE@ $(GSTREAMER_LIBS) \
+@ENABLE_GTK_TRUE@ $(GSTINTERFACES_LIBS) \ +@ENABLE_GTK_TRUE@ $(GSTINTERFACES_LIBS) \
@ENABLE_GTK_TRUE@ $(GSTVIDEO_LIBS) \
@ENABLE_GTK_TRUE@ $(XSS_LIBS) \ @ENABLE_GTK_TRUE@ $(XSS_LIBS) \
@ENABLE_GTK_TRUE@ $(SM_LIBS) \ @ENABLE_GTK_TRUE@ $(SM_LIBS) \
@ENABLE_GTK_TRUE@ $(INTLLIBS) \ @@ -723,6 +724,7 @@ EXTRA_DIST = \
@@ -666,6 +667,7 @@
@ENABLE_GTK_TRUE@ -I$(top_srcdir) \ @ENABLE_GTK_TRUE@ -I$(top_srcdir) \
@ENABLE_GTK_TRUE@ $(GLIB_CFLAGS) \ @ENABLE_GTK_TRUE@ $(GLIB_CFLAGS) \
@ENABLE_GTK_TRUE@ $(GSTREAMER_CFLAGS) \ @ENABLE_GTK_TRUE@ $(GSTREAMER_CFLAGS) \
@ -36,23 +38,25 @@ diff -ru pidgin-2.6.4/pidgin/Makefile.in pidgin-2.6.4.new/pidgin/Makefile.in
@ENABLE_GTK_TRUE@ $(DEBUG_CFLAGS) \ @ENABLE_GTK_TRUE@ $(DEBUG_CFLAGS) \
@ENABLE_GTK_TRUE@ $(GTK_CFLAGS) \ @ENABLE_GTK_TRUE@ $(GTK_CFLAGS) \
@ENABLE_GTK_TRUE@ $(DBUS_CFLAGS) \ @ENABLE_GTK_TRUE@ $(DBUS_CFLAGS) \
diff -ru pidgin-2.6.4/pidgin/plugins/Makefile.am pidgin-2.6.4.new/pidgin/plugins/Makefile.am diff --git a/pidgin/plugins/Makefile.am b/pidgin/plugins/Makefile.am
--- pidgin-2.6.4/pidgin/plugins/Makefile.am 2009-11-30 04:13:57.000000000 +0100 index 3bb8c22..6d1e869 100644
+++ pidgin-2.6.4.new/pidgin/plugins/Makefile.am 2009-12-27 16:58:50.000000000 +0100 --- a/pidgin/plugins/Makefile.am
@@ -137,6 +137,7 @@ +++ b/pidgin/plugins/Makefile.am
$(DEBUG_CFLAGS) \ @@ -145,6 +145,7 @@ AM_CPPFLAGS = \
$(GTK_CFLAGS) \ $(GTK_CFLAGS) \
$(UNITY_CFLAGS) \
$(GSTREAMER_CFLAGS) \ $(GSTREAMER_CFLAGS) \
+ $(GSTINTERFACES_CFLAGS) \ + $(GSTINTERFACES_CFLAGS) \
$(PLUGIN_CFLAGS) $(PLUGIN_CFLAGS)
# #
diff -ru pidgin-2.6.4/pidgin/plugins/Makefile.in pidgin-2.6.4.new/pidgin/plugins/Makefile.in diff --git a/pidgin/plugins/Makefile.in b/pidgin/plugins/Makefile.in
--- pidgin-2.6.4/pidgin/plugins/Makefile.in 2009-11-30 05:12:22.000000000 +0100 index 82a34aa..1f7db00 100644
+++ pidgin-2.6.4.new/pidgin/plugins/Makefile.in 2009-12-27 16:59:13.000000000 +0100 --- a/pidgin/plugins/Makefile.in
@@ -644,6 +644,7 @@ +++ b/pidgin/plugins/Makefile.in
$(DEBUG_CFLAGS) \ @@ -781,6 +781,7 @@ AM_CPPFLAGS = \
$(GTK_CFLAGS) \ $(GTK_CFLAGS) \
$(UNITY_CFLAGS) \
$(GSTREAMER_CFLAGS) \ $(GSTREAMER_CFLAGS) \
+ $(GSTINTERFACES_CFLAGS) \ + $(GSTINTERFACES_CFLAGS) \
$(PLUGIN_CFLAGS) $(PLUGIN_CFLAGS)