Do not force SSLv3, also allow TLSv1_X (#1091544)

(http://sourceforge.net/p/xchat/bugs/1506/)
- Use name and generic name correctly in desktop file
  (http://sourceforge.net/p/xchat/bugs/1397/)

0001-Don-t-force-the-use-of-SSLv3.patch

@@ -0,0 +1,37 @@
+From 527eb322a5bfa97d5716e7f8178e319c515065a2 Mon Sep 17 00:00:00 2001
+From: Marc Deslauriers <marc.deslauriers@ubuntu.com>
+Date: Mon, 20 Oct 2014 10:08:26 -0400
+Subject: [PATCH] Don't force the use of SSLv3.
+
+SSLv3 should no longer be used for security reasons. Let the best
+connection method be automatically determined by using SSLv23_client_method()
+and SSLv23_server_method().
+---
+ src/common/ssl.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/common/ssl.c b/src/common/ssl.c
+index a18ad47..35eb237 100644
+--- a/src/common/ssl.c
++++ b/src/common/ssl.c
+@@ -70,7 +70,7 @@ _SSL_context_init (void (*info_cb_func), int server)
+ 
+ 	SSLeay_add_ssl_algorithms ();
+ 	SSL_load_error_strings ();
+-	ctx = SSL_CTX_new (server ? SSLv3_server_method() : SSLv3_client_method ());
++	ctx = SSL_CTX_new (server ? SSLv23_server_method() : SSLv23_client_method ());
+ 
+ 	SSL_CTX_set_session_cache_mode (ctx, SSL_SESS_CACHE_BOTH);
+ 	SSL_CTX_set_timeout (ctx, 300);
+@@ -281,7 +281,7 @@ _SSL_socket (SSL_CTX *ctx, int sd)
+ 		__SSL_critical_error ("SSL_new");
+ 
+ 	SSL_set_fd (ssl, sd);
+-	if (ctx->method == SSLv3_client_method())
++	if (ctx->method == SSLv23_client_method())
+ 		SSL_set_connect_state (ssl);
+ 	else
+ 	        SSL_set_accept_state(ssl);
+-- 
+2.1.0
+

xchat-2.8.8-desktop-file-name.patch

@@ -0,0 +1,13 @@
+diff -urNp xchat-2.8.8.orig/xchat.desktop xchat-2.8.8/xchat.desktop
+--- xchat-2.8.8.orig/xchat.desktop	2013-06-10 14:01:07.408432973 +0200
++++ xchat-2.8.8/xchat.desktop	2013-06-10 14:12:56.044209785 +0200
+@@ -1,7 +1,8 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-Name=XChat IRC
++Name=XChat
+ Name[zh_TW]=網路清談
++GenericName=IRC Client
+ Comment[de]=IRC-Client
+ Comment[es]=Aplicación de IRC
+ Comment[fi]=IRC-sovellus

xchat-2.8.8-hires-icons.patch

@@ -0,0 +1,85 @@
+diff -urNp xchat-2.8.8.orig/configure.in xchat-2.8.8/configure.in
+--- xchat-2.8.8.orig/configure.in	2013-06-07 17:33:41.600172433 +0200
++++ xchat-2.8.8/configure.in	2013-06-07 17:39:02.672190284 +0200
+@@ -792,6 +792,7 @@ plugins/python/Makefile
+ plugins/perl/Makefile
+ plugins/tcl/Makefile
+ intl/Makefile
++icons/Makefile
+ po/Makefile.in
+ ])
+ 
+diff -urNp xchat-2.8.8.orig/icons/Makefile.am xchat-2.8.8/icons/Makefile.am
+--- xchat-2.8.8.orig/icons/Makefile.am	1970-01-01 01:00:00.000000000 +0100
++++ xchat-2.8.8/icons/Makefile.am	2013-06-07 17:35:09.053456817 +0200
+@@ -0,0 +1,59 @@
++public_icon_themes = \
++	hicolor	\
++	$(NULL)
++
++public_icons = \
++	hicolor_apps_16x16_xchat.png \
++	hicolor_apps_22x22_xchat.png \
++	hicolor_apps_24x24_xchat.png \
++	hicolor_apps_32x32_xchat.png \
++	hicolor_apps_48x48_xchat.png \
++	hicolor_apps_256x256_xchat.png \
++	$(NULL)
++
++noinst_DATA = \
++	xchat.svg \
++	$(NULL)
++
++EXTRA_DIST = \
++	$(public_icons) \
++	$(noinst_DATA) \
++	$(NULL)
++
++gtk_update_icon_cache = gtk-update-icon-cache -f -t
++
++update-icon-cache:
++	@-if test -z "$(DESTDIR)"; then \
++		echo "Updating Gtk icon cache."; \
++		for theme in $(public_icon_themes); do \
++			$(gtk_update_icon_cache) $(datadir)/icons/$$theme; \
++		done; \
++	else \
++		echo "*** Icon cache not updated.  After (un)install, run this:"; \
++		for theme in $(public_icon_themes); do \
++			echo "***   $(gtk_update_icon_cache) $(datadir)/icons/$$theme"; \
++		done; \
++	fi
++
++install-icons:
++	for icon in $(public_icons); do \
++		THEME=`echo $$icon | cut -d_ -f1`; \
++		CONTEXT=`echo $$icon | cut -d_ -f2`; \
++		SIZE=`echo $$icon | cut -d_ -f3`; \
++		ICONFILE=`echo $$icon | cut -d_ -f4`; \
++		mkdir -p $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
++		$(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
++	done
++
++uninstall-icons:
++	-for icon in $(public_icons); do \
++		THEME=`echo $$icon | cut -d_ -f1`; \
++		CONTEXT=`echo $$icon | cut -d_ -f2`; \
++		SIZE=`echo $$icon | cut -d_ -f3`; \
++		ICONFILE=`echo $$icon | cut -d_ -f4`; \
++		rm -f $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
++	done
++
++install-data-local: install-icons update-icon-cache
++
++uninstall-local: uninstall-icons update-icon-cache
+diff -urNp xchat-2.8.8.orig/Makefile.am xchat-2.8.8/Makefile.am
+--- xchat-2.8.8.orig/Makefile.am	2013-06-07 17:33:41.600172433 +0200
++++ xchat-2.8.8/Makefile.am	2013-06-10 13:25:06.316773350 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-SUBDIRS = po intl src plugins
++SUBDIRS = po icons intl src plugins
+ 
+ EXTRA_DIST = autogen.sh HACKING INSTALL.w32 faq.html xchat.png \
+ 		xchat.desktop xchat.spec config.h.w32 xchat.ico

xchat.spec

@@ -4,12 +4,22 @@
 Summary:   A popular and easy to use graphical IRC (chat) client
 Name:      xchat
 Version:   2.8.8
-Release:   17%{?dist}
+Release:   20%{?dist}
 Epoch:     1
 Group:     Applications/Internet
 License:   GPLv2+
 URL:       http://www.xchat.org
-Source:    http://www.xchat.org/files/source/2.8/xchat-%{version}.tar.xz
+Source0:   http://www.xchat.org/files/source/2.8/xchat-%{version}.tar.xz
+
+# http://sourceforge.net/p/xchat/bugs/1504/
+Source1:   hicolor_apps_16x16_%{name}.png
+Source2:   hicolor_apps_22x22_%{name}.png
+Source3:   hicolor_apps_24x24_%{name}.png
+Source4:   hicolor_apps_32x32_%{name}.png
+Source5:   hicolor_apps_48x48_%{name}.png
+Source6:   hicolor_apps_256x256_%{name}.png
+Source7:   %{name}.svg
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Patches 0-9 reserved for official xchat.org patches
@@ -36,11 +46,20 @@ Patch52: xchat-2.8.8-libnotify07.patch
 Patch53: xchat-2.8.8-link-against-libnotify.patch
 # Only glib.h can be included and g_thread_init  should no longer be used
 Patch54: xchat-2.8.8-glib.patch
+# http://sourceforge.net/p/xchat/bugs/1504/
+Patch55: xchat-2.8.8-hires-icons.patch
+# http://sourceforge.net/p/xchat/bugs/1506/
+Patch56: xchat-2.8.8-xdg-dirs.patch
+# http://sourceforge.net/p/xchat/bugs/1397/
+Patch57: xchat-2.8.8-desktop-file-name.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=1091544
+Patch58: 0001-Don-t-force-the-use-of-SSLv3.patch
+
 BuildRequires: perl perl(ExtUtils::Embed) python-devel openssl-devel pkgconfig, tcl-devel
 BuildRequires: GConf2-devel
 BuildRequires: dbus-devel >= 0.60, dbus-glib-devel >= 0.60
 BuildRequires: glib2-devel >= 2.10.0, gtk2-devel >= 2.10.0, bison >= 1.35
-BuildRequires: gettext /bin/sed
+BuildRequires: gettext-devel /bin/sed
 BuildRequires: libtool
 BuildRequires: libntlm-devel
 BuildRequires: libsexy-devel
@@ -48,6 +67,8 @@ BuildRequires: desktop-file-utils >= 0.10
 BuildRequires: libnotify-devel
 # For xchat-2.8.8-link-against-libnotify.patch
 BuildRequires: autoconf
+BuildRequires: automake
+
 # For gconftool-2:
 Requires(post): GConf2 >= %{gconf_version}
 Requires(preun): GConf2 >= %{gconf_version}
@@ -91,9 +112,21 @@ This package contains the X-Chat plugin providing the Tcl scripting interface.
 %patch52 -p1 -b .libnotify07
 %patch53 -p1 -b .link-against-libnotify
 %patch54 -p0 -b .glib
+%patch55 -p1 -b .hires-icons
+%patch56 -p1 -b .xdg-dirs
+%patch57 -p1 -b .desktop-file-name
+%patch58 -p1 -b .allow-tls
 
 sed -i -e 's/#define GTK_DISABLE_DEPRECATED//g' src/fe-gtk/*.c
 
+cp -p %{SOURCE1} icons/
+cp -p %{SOURCE2} icons/
+cp -p %{SOURCE3} icons/
+cp -p %{SOURCE4} icons/
+cp -p %{SOURCE5} icons/
+cp -p %{SOURCE6} icons/
+cp -p %{SOURCE7} icons/
+
 %build
 # Remove CVS files from source dirs so they're not installed into doc dirs.
 find . -name CVS -type d | xargs rm -rf
@@ -102,8 +135,7 @@ export CFLAGS="$RPM_OPT_FLAGS $(perl -MExtUtils::Embed -e ccopts)"
 export LDFLAGS=$(perl -MExtUtils::Embed -e ldopts)
 
 # For xchat-2.8.8-link-against-libnotify.patch
-autoconf
-autoheader
+./autogen.sh
 
 %configure --disable-textfe \
            --enable-gtkfe \
@@ -152,18 +184,14 @@ EOF
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule /etc/gconf/schemas/apps_xchat_url_handler.schemas >& /dev/null || :
 
-
-%pre
-if [ "$1" -gt 1 ]; then
-  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  gconftool-2 --makefile-uninstall-rule /etc/gconf/schemas/apps_xchat_url_handler.schemas >& /dev/null || :
+%postun
+if [ $1 -eq 0 ] ; then
+    /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    /usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
-%preun
-if [ "$1" -eq 0 ]; then
-  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  gconftool-2 --makefile-uninstall-rule /etc/gconf/schemas/apps_xchat_url_handler.schemas >& /dev/null || :
-fi
+%posttrans
+/usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -178,6 +206,7 @@ fi
 %{_libdir}/xchat/plugins/perl.so
 %{_libdir}/xchat/plugins/python.so
 %{_datadir}/applications/xchat.desktop
+%{_datadir}/icons/hicolor/*/apps/xchat.png
 %{_datadir}/pixmaps/*
 %{_sysconfdir}/gconf/schemas/apps_xchat_url_handler.schemas
 %{_datadir}/dbus-1/services/org.xchat.service.service
@@ -187,6 +216,18 @@ fi
 %{_libdir}/xchat/plugins/tcl.so
 
 %changelog
+* Wed Oct 29 2014 Debarshi Ray <rishi@fedoraproject.org> - 1:2.8.8-20
+- Do not force SSLv3, also allow TLSv1_X (#1091544)
+
+* Mon Jun 10 2013 Debarshi Ray <rishi@fedoraproject.org> - 1:2.8.8-19
+- Use XDG_CONFIG_HOME instead of home for config files
+  (http://sourceforge.net/p/xchat/bugs/1506/)
+- Use name and generic name correctly in desktop file
+  (http://sourceforge.net/p/xchat/bugs/1397/)
+
+* Fri Jun 07 2013 Debarshi Ray <rishi@fedoraproject.org> - 1:2.8.8-18
+- Add hi-res icons (http://sourceforge.net/p/xchat/bugs/1504/)
+
 * Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:2.8.8-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
@@ -211,10 +252,10 @@ fi
 * Fri Jun 17 2011 Marcela Mašláňová <mmaslano@redhat.com> - 1:2.8.8-10
 - Perl mass rebuild
 
-* Tue Apr  7 2011 Christopher Aillon <caillon@redhat.com> - 1:2.8.8-9
+* Thu Apr 07 2011 Christopher Aillon <caillon@redhat.com> - 1:2.8.8-9
 - Link against libnotify (#693362)
 
-* Tue Apr  7 2011 Christopher Aillon <caillon@redhat.com> - 1:2.8.8-8
+* Thu Apr 07 2011 Christopher Aillon <caillon@redhat.com> - 1:2.8.8-8
 - Update the dynamic libnotify check for the newer soname (#693362)
 
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:2.8.8-7