summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
Diffstat (limited to 'libre')
-rw-r--r--libre/xchat/PKGBUILD13
-rw-r--r--libre/xchat/xchat-sslv23.patch22
2 files changed, 31 insertions, 4 deletions
diff --git a/libre/xchat/PKGBUILD b/libre/xchat/PKGBUILD
index 0bd62f95e..2cec3b3fc 100644
--- a/libre/xchat/PKGBUILD
+++ b/libre/xchat/PKGBUILD
@@ -1,20 +1,22 @@
-# $Id: PKGBUILD 213744 2014-05-28 22:09:31Z eric $
+# $Id: PKGBUILD 240318 2015-06-04 02:23:39Z eric $
# Maintainer (Arch): Eric BĂ©langer <eric@archlinux.org>
# Maintainer (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org>
# Maintainer: André Silva <emulatorman@parabola.nu>
pkgname=xchat
pkgver=2.8.8
-pkgrel=14.parabola1
+pkgrel=15.parabola1
pkgdesc="A GTK+ based IRC client, without nonfree browser reference"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.xchat.org/"
replaces=('xchat-libre')
conflicts=('xchat-libre')
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
@@ -22,6 +24,7 @@ source=(http://www.xchat.org/files/source/${pkgver%.*}/${pkgname}-${pkgver}.tar.
xchat-2.8.8-libnotify07.patch
xchat-2.8.8-link-against-libnotify.patch
xchat-2.8.8-glib-2.31.patch
+ xchat-sslv23.patch
remove-non-free-suggestion.patch
no-firefox.patch)
sha1sums=('e12305da42d1aacc26c2ca25e239f393d4dd3532'
@@ -29,6 +32,7 @@ sha1sums=('e12305da42d1aacc26c2ca25e239f393d4dd3532'
'a053fba4e1911d1ee6a8248fe19e344797920fe3'
'70c3cc29fc55ff35f701ef8ac23078b6e3761ce1'
'aecaf6176a7cfd62555207b02f2793b360aa39da'
+ 'ff2a3ca5ac297071c8a084d90fe9562e14745bc1'
'e6a3b69ba333fc7ba0f70792d78d44fba7c4a911'
'20aef0ae608af6b30e1b4249f9c53830f8f514f6')
@@ -38,6 +42,7 @@ prepare() {
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"
patch -p1 -i "${srcdir}/remove-non-free-suggestion.patch"
patch -p1 -i "${srcdir}/no-firefox.patch"
}
diff --git a/libre/xchat/xchat-sslv23.patch b/libre/xchat/xchat-sslv23.patch
new file mode 100644
index 000000000..fc8f02e97
--- /dev/null
+++ b/libre/xchat/xchat-sslv23.patch
@@ -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);