diff --git a/SOURCES/pidgin-2.10.11-drop-aim.patch b/SOURCES/pidgin-2.10.11-drop-aim.patch new file mode 100644 index 0000000..bf3af26 --- /dev/null +++ b/SOURCES/pidgin-2.10.11-drop-aim.patch @@ -0,0 +1,45 @@ +From cc96432e17b40d72dd5cef2d65ae5c8f99d3d4fb Mon Sep 17 00:00:00 2001 +From: Debarshi Ray +Date: Thu, 12 Oct 2017 18:33:51 +0200 +Subject: [PATCH] Drop AIM + +https://bugzilla.redhat.com/show_bug.cgi?id=1500403 +--- + libpurple/protocols/oscar/Makefile.am | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +diff --git a/libpurple/protocols/oscar/Makefile.am b/libpurple/protocols/oscar/Makefile.am +index fc78e47b0c35..4e23f42059ee 100644 +--- a/libpurple/protocols/oscar/Makefile.am ++++ b/libpurple/protocols/oscar/Makefile.am +@@ -50,25 +50,21 @@ OSCARSOURCES = \ + + AM_CFLAGS = $(st) + +-libaim_la_LDFLAGS = -module -avoid-version + libicq_la_LDFLAGS = -module -avoid-version + if STATIC_OSCAR + + st = -DPURPLE_STATIC_PRPL + noinst_LTLIBRARIES = liboscar.la +-liboscar_la_SOURCES = $(OSCARSOURCES) libaim.c libicq.c ++liboscar_la_SOURCES = $(OSCARSOURCES) libicq.c + liboscar_la_CFLAGS = $(AM_CFLAGS) + + else + + st = +-pkg_LTLIBRARIES = liboscar.la libaim.la libicq.la ++pkg_LTLIBRARIES = liboscar.la libicq.la + liboscar_la_SOURCES = $(OSCARSOURCES) + liboscar_la_LIBADD = $(GLIB_LIBS) + +-libaim_la_SOURCES = libaim.c +-libaim_la_LIBADD = liboscar.la +- + libicq_la_SOURCES = libicq.c + libicq_la_LIBADD = liboscar.la + +-- +2.14.2 + diff --git a/SOURCES/pidgin-2.10.11-drop-gadu-gadu-msn-mxit-etc.patch b/SOURCES/pidgin-2.10.11-drop-gadu-gadu-msn-mxit-etc.patch new file mode 100644 index 0000000..c8f8a56 --- /dev/null +++ b/SOURCES/pidgin-2.10.11-drop-gadu-gadu-msn-mxit-etc.patch @@ -0,0 +1,39 @@ +From 8e07fad7e7526be54b3d828549fe2abee7ead34b Mon Sep 17 00:00:00 2001 +From: Debarshi Ray +Date: Fri, 19 May 2017 18:33:44 +0200 +Subject: [PATCH] Drop Gadu-Gadu, MSN, MXit, MySpace and Yahoo! + +https://bugzilla.redhat.com/show_bug.cgi?id=1026505 +https://bugzilla.redhat.com/show_bug.cgi?id=1439296 +https://bugzilla.redhat.com/show_bug.cgi?id=1470677 +https://bugzilla.redhat.com/show_bug.cgi?id=1470681 +https://bugzilla.redhat.com/show_bug.cgi?id=1470685 +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 51471b1f5deb..edfc9377189a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1091,7 +1091,7 @@ if test "x$STATIC_PRPLS" != "x" -a "x$DYNAMIC_PRPLS" = "xall"; then + fi + + if test "x$STATIC_PRPLS" = "xall" ; then +- STATIC_PRPLS="bonjour gg irc jabber msn myspace mxit novell oscar sametime silc simple yahoo zephyr" ++ STATIC_PRPLS="bonjour irc jabber novell oscar sametime silc simple zephyr" + fi + if test "x$have_meanwhile" != "xyes" ; then + STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/sametime//'` +@@ -1176,7 +1176,7 @@ AC_DEFINE_UNQUOTED(STATIC_PROTO_INIT, $extern_init static void static_proto_init + + AC_ARG_WITH(dynamic_prpls, [AC_HELP_STRING([--with-dynamic-prpls], [specify which protocols to build dynamically])], [DYNAMIC_PRPLS=`echo $withval | $sedpath 's/,/ /g'`]) + if test "x$DYNAMIC_PRPLS" = "xall" ; then +- DYNAMIC_PRPLS="bonjour gg irc jabber msn myspace mxit novell oscar sametime silc simple yahoo zephyr" ++ DYNAMIC_PRPLS="bonjour irc jabber novell oscar sametime silc simple zephyr" + fi + if test "x$have_meanwhile" != "xyes"; then + DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/sametime//'` +-- +2.9.5 + diff --git a/SOURCES/pidgin-2.10.11-drop-gadu-gadu-mxit.patch b/SOURCES/pidgin-2.10.11-drop-gadu-gadu-mxit.patch deleted file mode 100644 index 31cf4f9..0000000 --- a/SOURCES/pidgin-2.10.11-drop-gadu-gadu-mxit.patch +++ /dev/null @@ -1,36 +0,0 @@ -From af6bebddeb6a9e4c5c731d3c075dc5f955cbd94f Mon Sep 17 00:00:00 2001 -From: Debarshi Ray -Date: Fri, 19 May 2017 18:33:44 +0200 -Subject: [PATCH] Drop Gadu-Gadu and MXit - -https://bugzilla.redhat.com/show_bug.cgi?id=1026505 -https://bugzilla.redhat.com/show_bug.cgi?id=1439296 ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 51471b1f5deb..eeec35350d20 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1091,7 +1091,7 @@ if test "x$STATIC_PRPLS" != "x" -a "x$DYNAMIC_PRPLS" = "xall"; then - fi - - if test "x$STATIC_PRPLS" = "xall" ; then -- STATIC_PRPLS="bonjour gg irc jabber msn myspace mxit novell oscar sametime silc simple yahoo zephyr" -+ STATIC_PRPLS="bonjour irc jabber msn myspace novell oscar sametime silc simple yahoo zephyr" - fi - if test "x$have_meanwhile" != "xyes" ; then - STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/sametime//'` -@@ -1176,7 +1176,7 @@ AC_DEFINE_UNQUOTED(STATIC_PROTO_INIT, $extern_init static void static_proto_init - - AC_ARG_WITH(dynamic_prpls, [AC_HELP_STRING([--with-dynamic-prpls], [specify which protocols to build dynamically])], [DYNAMIC_PRPLS=`echo $withval | $sedpath 's/,/ /g'`]) - if test "x$DYNAMIC_PRPLS" = "xall" ; then -- DYNAMIC_PRPLS="bonjour gg irc jabber msn myspace mxit novell oscar sametime silc simple yahoo zephyr" -+ DYNAMIC_PRPLS="bonjour irc jabber msn myspace novell oscar sametime silc simple yahoo zephyr" - fi - if test "x$have_meanwhile" != "xyes"; then - DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/sametime//'` --- -2.9.4 - diff --git a/SPECS/pidgin.spec b/SPECS/pidgin.spec index 5610aab..6b82d11 100644 --- a/SPECS/pidgin.spec +++ b/SPECS/pidgin.spec @@ -30,7 +30,6 @@ %global nss_md2_disabled 0 %global vv_support 0 %global libidn_support 0 -%global disable_silc 0 %global disable_evolution 0 %global split_evolution 0 %global use_system_certs 0 @@ -82,12 +81,6 @@ %if 0%{?fedora} >= 12 %global krb4_removed 1 %endif -# EL6: Disable SILC protocol -# (get rid of extra crypto lib for perpetually broken protocol that nobody uses) -# (the above comment is not necessarily the view held by all maintaners of this package) -%if 0%{?rhel} >= 6 -%global disable_silc 1 -%endif # F13+ Split Evolution plugin to separate package (#581144) %if 0%{?fedora} >= 13 %global split_evolution 1 @@ -117,10 +110,10 @@ Name: pidgin Version: 2.10.11 -Release: 5%{?dist} +Release: 7%{?dist} License: GPLv2+ and GPLv2 and MIT # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls -# GPLv2 - silc & novell prpls +# GPLv2 - novell prpls # MIT - Zephyr prpl Group: Applications/Internet URL: http://pidgin.im/ @@ -156,7 +149,13 @@ Patch1: pidgin-2.10.9-valgrind.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1026505 # https://bugzilla.redhat.com/show_bug.cgi?id=1439296 -Patch2: pidgin-2.10.11-drop-gadu-gadu-mxit.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1470677 +# https://bugzilla.redhat.com/show_bug.cgi?id=1470681 +# https://bugzilla.redhat.com/show_bug.cgi?id=1470685 +Patch2: pidgin-2.10.11-drop-gadu-gadu-msn-mxit-etc.patch + +# https://bugzilla.redhat.com/show_bug.cgi?id=1500403 +Patch3: pidgin-2.10.11-drop-aim.patch ## Patches 100+: To be Included in Future Upstream Patch100: pidgin-2.10.11-CVE-2017-2640.patch @@ -219,10 +218,6 @@ BuildRequires: libxml2-devel # krb5 needed for Zephyr (FC1+) BuildRequires: krb5-devel %endif -# SILC integration (FC3+) -%if ! %{disable_silc} -BuildRequires: libsilc-devel -%endif # DBus integration (FC5+) %if %{dbus_integration} BuildRequires: dbus-devel >= 0.60 @@ -297,17 +292,16 @@ BuildRequires: valgrind-devel %description Pidgin allows you to talk to anyone using a variety of messaging -protocols including AIM, MSN, Yahoo!, Jabber, Bonjour, Gadu-Gadu, -ICQ, IRC, Novell Groupwise, QQ, Lotus Sametime, SILC, Simple and -Zephyr. These protocols are implemented using a modular, easy to -use design. To use a protocol, just add an account using the -account editor. +protocols including AIM, Jabber, Bonjour, ICQ, IRC, Novell Groupwise, +QQ, Lotus Sametime, Simple and Zephyr. These protocols are implemented +using a modular, easy to use design. To use a protocol, just add an +account using the account editor. Pidgin supports many common features of other clients, as well as many unique features, such as perl scripting, TCL scripting and C plugins. Pidgin is not affiliated with or endorsed by America Online, Inc., -Microsoft Corporation, Yahoo! Inc., or ICQ Inc. +Microsoft Corporation, or ICQ Inc. %if %{split_evolution} %package evolution @@ -377,9 +371,8 @@ Obsoletes: pidgin-docs = 2.5.2 libpurple contains the core IM support for IM clients such as Pidgin and Finch. -libpurple supports a variety of messaging protocols including AIM, MSN, -Yahoo!, Jabber, Bonjour, Gadu-Gadu, ICQ, IRC, Novell Groupwise, QQ, -Lotus Sametime, SILC, Simple and Zephyr. +libpurple supports a variety of messaging protocols including AIM, Jabber, +Bonjour, ICQ, IRC, Novell Groupwise, QQ, Lotus Sametime, Simple and Zephyr. %package -n libpurple-devel @@ -467,6 +460,7 @@ echo "FEDORA=%{fedora} RHEL=%{rhel}" %endif %patch1 -p1 %patch2 -p1 -b .gadu-gadu +%patch3 -p1 -b .aim ## Patches 100+: To be Included in Future Upstream @@ -544,7 +538,6 @@ SWITCHES="--with-extraversion=%{release}" export RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-fstack-protector /-fstack-protector-all } export CFLAGS="$RPM_OPT_FLAGS" -# remove after irc-sasl patch has been merged upstream autoreconf --force --install # gnutls is buggy so use mozilla-nss on all distributions @@ -770,6 +763,14 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Thu Oct 12 2017 Debarshi Ray - 2.10.11-7 +- Drop AIM in RHEL + Resolves: #1500403 + +* Fri Oct 06 2017 Debarshi Ray - 2.10.11-6 +- Drop MSN, MySpace and Yahoo! support in RHEL + Resolves: #1470677, #1470681, #1470685 + * Fri May 19 2017 Debarshi Ray - 2.10.11-5 - Drop MXit support in RHEL Resolves: #1439296