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:23:10 +02:00
parent 137827bacb
commit b5ab13a5ff
2 changed files with 36 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/networking/instant-messengers/pidgin/pidgin-makefile.patch
+26 -22
View File
@@ -1,15 +1,16 @@
diff -ru pidgin-2.6.4/pidgin/Makefile.am pidgin-2.6.4.new/pidgin/Makefile.am
--- pidgin-2.6.4/pidgin/Makefile.am 2009-11-30 04:13:54.000000000 +0100
+++ pidgin-2.6.4.new/pidgin/Makefile.am 2009-12-27 17:30:58.000000000 +0100
@@ -200,6 +200,7 @@
diff --git a/pidgin/Makefile.am b/pidgin/Makefile.am
index 84d927b..1467c19 100644
--- a/pidgin/Makefile.am
+++ b/pidgin/Makefile.am
@@ -151,6 +151,7 @@ pidgin_LDADD = \
$(GLIB_LIBS) \
$(DBUS_LIBS) \
$(GSTREAMER_LIBS) \
+ $(GSTINTERFACES_LIBS) \
$(GSTVIDEO_LIBS) \
$(XSS_LIBS) \
$(SM_LIBS) \
$(INTLLIBS) \
@@ -224,6 +225,7 @@
@@ -171,6 +172,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \
$(GLIB_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) \
$(GTK_CFLAGS) \
$(DBUS_CFLAGS) \
diff -ru pidgin-2.6.4/pidgin/Makefile.in pidgin-2.6.4.new/pidgin/Makefile.in
--- pidgin-2.6.4/pidgin/Makefile.in 2009-11-30 05:12:21.000000000 +0100
+++ pidgin-2.6.4.new/pidgin/Makefile.in 2009-12-27 17:30:36.000000000 +0100
@@ -645,6 +645,7 @@
diff --git a/pidgin/Makefile.in b/pidgin/Makefile.in
index 0d51e25..dd5d879 100644
--- a/pidgin/Makefile.in
+++ b/pidgin/Makefile.in
@@ -703,6 +703,7 @@ EXTRA_DIST = \
@ENABLE_GTK_TRUE@ $(GLIB_LIBS) \
@ENABLE_GTK_TRUE@ $(DBUS_LIBS) \
@ENABLE_GTK_TRUE@ $(GSTREAMER_LIBS) \
+@ENABLE_GTK_TRUE@ $(GSTINTERFACES_LIBS) \
@ENABLE_GTK_TRUE@ $(GSTVIDEO_LIBS) \
@ENABLE_GTK_TRUE@ $(XSS_LIBS) \
@ENABLE_GTK_TRUE@ $(SM_LIBS) \
@ENABLE_GTK_TRUE@ $(INTLLIBS) \
@@ -666,6 +667,7 @@
@@ -723,6 +724,7 @@ EXTRA_DIST = \
@ENABLE_GTK_TRUE@ -I$(top_srcdir) \
@ENABLE_GTK_TRUE@ $(GLIB_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@ $(GTK_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
--- pidgin-2.6.4/pidgin/plugins/Makefile.am 2009-11-30 04:13:57.000000000 +0100
+++ pidgin-2.6.4.new/pidgin/plugins/Makefile.am 2009-12-27 16:58:50.000000000 +0100
@@ -137,6 +137,7 @@
$(DEBUG_CFLAGS) \
diff --git a/pidgin/plugins/Makefile.am b/pidgin/plugins/Makefile.am
index 3bb8c22..6d1e869 100644
--- a/pidgin/plugins/Makefile.am
+++ b/pidgin/plugins/Makefile.am
@@ -145,6 +145,7 @@ AM_CPPFLAGS = \
$(GTK_CFLAGS) \
$(UNITY_CFLAGS) \
$(GSTREAMER_CFLAGS) \
+ $(GSTINTERFACES_CFLAGS) \
$(PLUGIN_CFLAGS)
#
diff -ru pidgin-2.6.4/pidgin/plugins/Makefile.in pidgin-2.6.4.new/pidgin/plugins/Makefile.in
--- pidgin-2.6.4/pidgin/plugins/Makefile.in 2009-11-30 05:12:22.000000000 +0100
+++ pidgin-2.6.4.new/pidgin/plugins/Makefile.in 2009-12-27 16:59:13.000000000 +0100
@@ -644,6 +644,7 @@
$(DEBUG_CFLAGS) \
diff --git a/pidgin/plugins/Makefile.in b/pidgin/plugins/Makefile.in
index 82a34aa..1f7db00 100644
--- a/pidgin/plugins/Makefile.in
+++ b/pidgin/plugins/Makefile.in
@@ -781,6 +781,7 @@ AM_CPPFLAGS = \
$(GTK_CFLAGS) \
$(UNITY_CFLAGS) \
$(GSTREAMER_CFLAGS) \
+ $(GSTINTERFACES_CFLAGS) \
$(PLUGIN_CFLAGS)