[arch-commits] Commit in xchat/trunk (PKGBUILD xchat-sslv23.patch)

[Eric Bélanger]

    Date: Thursday, June 4, 2015 @ 04:23:39
  Author: eric
Revision: 240318

upgpkg: xchat 2.8.8-15

Rebuild against perl 5.22, Add TLS v1.0+ support (close FS#44021)

Added:
  xchat/trunk/xchat-sslv23.patch
Modified:
  xchat/trunk/PKGBUILD

--------------------+
 PKGBUILD           |   15 ++++++++++-----
 xchat-sslv23.patch |   22 ++++++++++++++++++++++
 2 files changed, 32 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-06-04 01:54:36 UTC (rev 240317)
+++ PKGBUILD	2015-06-04 02:23:39 UTC (rev 240318)
@@ -3,14 +3,16 @@
 
 pkgname=xchat
 pkgver=2.8.8
-pkgrel=14
+pkgrel=15
 pkgdesc="A GTK+ based IRC client"
 arch=('i686' 'x86_64')
 url="http://www.xchat.org/"
 license=('GPL')
-depends=('gtk2' 'openssl' 'dbus-glib' 'libnotify' 'hicolor-icon-theme')
+depends=('gtk2' 'openssl' 'dbus-glib' 'libnotify')
 makedepends=('tcl' 'perl' 'python2' 'librsvg')
-optdepends=('enchant: for spell checking support' 'tcl: for tcl plugin'
+optdepends=('enchant: for spell checking support'
+	    'perl: for perl plugin'
+	    'tcl: for tcl plugin'
             'python2: for python plugin')
 install=xchat.install
 source=(http://www.xchat.org/files/source/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
@@ -17,12 +19,14 @@
         http://xchat.org/files/icons/xchat-svg.tar.bz2
         xchat-2.8.8-libnotify07.patch
         xchat-2.8.8-link-against-libnotify.patch
-        xchat-2.8.8-glib-2.31.patch)
+        xchat-2.8.8-glib-2.31.patch
+        xchat-sslv23.patch)
 sha1sums=('e12305da42d1aacc26c2ca25e239f393d4dd3532'
           '0d366346cc11e0efb57fc2648fe423c94a3469bd'
           'a053fba4e1911d1ee6a8248fe19e344797920fe3'
           '70c3cc29fc55ff35f701ef8ac23078b6e3761ce1'
-          'aecaf6176a7cfd62555207b02f2793b360aa39da')
+          'aecaf6176a7cfd62555207b02f2793b360aa39da'
+          'ff2a3ca5ac297071c8a084d90fe9562e14745bc1')
 
 prepare() {
   cd ${pkgname}-${pkgver}
@@ -30,6 +34,7 @@
   patch -p1 -i "${srcdir}/xchat-2.8.8-libnotify07.patch"
   patch -p1 -i "${srcdir}/xchat-2.8.8-link-against-libnotify.patch"
   patch -p1 -i "${srcdir}/xchat-2.8.8-glib-2.31.patch"
+  patch -p1 -i "${srcdir}/xchat-sslv23.patch"
 }
 
 build() {

Added: xchat-sslv23.patch
===================================================================
--- xchat-sslv23.patch	                        (rev 0)
+++ xchat-sslv23.patch	2015-06-04 02:23:39 UTC (rev 240318)
@@ -0,0 +1,22 @@
+--- a/src/common/ssl.c
++++ b/src/common/ssl.c
+@@ -70,8 +70,9 @@
+ 
+ 	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_options(ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
+ 	SSL_CTX_set_session_cache_mode (ctx, SSL_SESS_CACHE_BOTH);
+ 	SSL_CTX_set_timeout (ctx, 300);
+ 
+@@ -281,7 +282,7 @@
+ 		__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);