Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/go/PKGBUILD
	core/openssl/PKGBUILD
	extra/libsigsegv/PKGBUILD
	gnome-unstable/gnome-control-center/PKGBUILD
	staging/boost/PKGBUILD
	staging/kactivities/PKGBUILD
	staging/kdeaccessibility-jovie/PKGBUILD
	staging/kdeaccessibility-kaccessible/PKGBUILD
	staging/kdeaccessibility-kmag/PKGBUILD
	staging/kdeaccessibility-kmousetool/PKGBUILD
	staging/kdeaccessibility-kmouth/PKGBUILD
	staging/kdeadmin/PKGBUILD
	staging/kdeartwork/PKGBUILD
	staging/kdebase-konsole/PKGBUILD
	staging/kdebase-runtime/PKGBUILD
	staging/kdebase-workspace/PKGBUILD
	staging/kdebase-workspace/kde-np.pam
	staging/kdebase-workspace/kde.pam
	staging/kdebase/PKGBUILD
	staging/kdebindings-kimono/PKGBUILD
	staging/kdebindings-korundum/PKGBUILD
	staging/kdebindings-kross/PKGBUILD
	staging/kdebindings-perlkde/PKGBUILD
	staging/kdebindings-perlqt/PKGBUILD
	staging/kdebindings-python/PKGBUILD
	staging/kdebindings-qtruby/PKGBUILD
	staging/kdebindings-qyoto/PKGBUILD
	staging/kdebindings-smokegen/PKGBUILD
	staging/kdebindings-smokekde/PKGBUILD
	staging/kdebindings-smokeqt/PKGBUILD
	staging/kdeedu-analitza/PKGBUILD
	staging/kdeedu-blinken/PKGBUILD
	staging/kdeedu-cantor/PKGBUILD
	staging/kdeedu-kalgebra/PKGBUILD
	staging/kdeedu-kalzium/PKGBUILD
	staging/kdeedu-kanagram/PKGBUILD
	staging/kdeedu-kbruch/PKGBUILD
	staging/kdeedu-kgeography/PKGBUILD
	staging/kdeedu-khangman/PKGBUILD
	staging/kdeedu-kig/PKGBUILD
	staging/kdeedu-kiten/PKGBUILD
	staging/kdeedu-klettres/PKGBUILD
	staging/kdeedu-kmplot/PKGBUILD
	staging/kdeedu-kstars/PKGBUILD
	staging/kdeedu-ktouch/PKGBUILD
	staging/kdeedu-kturtle/PKGBUILD
	staging/kdeedu-kwordquiz/PKGBUILD
	staging/kdeedu-marble/PKGBUILD
	staging/kdeedu-parley/PKGBUILD
	staging/kdeedu-rocs/PKGBUILD
	staging/kdeedu-step/PKGBUILD
	staging/kdegames/PKGBUILD
	staging/kdegraphics-gwenview/PKGBUILD
	staging/kdegraphics-kamera/PKGBUILD
	staging/kdegraphics-kcolorchooser/PKGBUILD
	staging/kdegraphics-kgamma/PKGBUILD
	staging/kdegraphics-kolourpaint/PKGBUILD
	staging/kdegraphics-kruler/PKGBUILD
	staging/kdegraphics-ksaneplugin/PKGBUILD
	staging/kdegraphics-ksnapshot/PKGBUILD
	staging/kdegraphics-mobipocket/PKGBUILD
	staging/kdegraphics-okular/PKGBUILD
	staging/kdegraphics-strigi-analyzer/PKGBUILD
	staging/kdegraphics-svgpart/PKGBUILD
	staging/kdegraphics-thumbnailers/PKGBUILD
	staging/kdemultimedia/PKGBUILD
	staging/kdenetwork/PKGBUILD
	staging/kdepim-runtime/PKGBUILD
	staging/kdepim/PKGBUILD
	staging/kdepimlibs/PKGBUILD
	staging/kdeplasma-addons/PKGBUILD
	staging/kdesdk-kate/PKGBUILD
	staging/kdesdk/PKGBUILD
	staging/kdetoys/PKGBUILD
	staging/kdeutils-filelight/PKGBUILD
	staging/kdeutils-kcalc/PKGBUILD
	staging/kdeutils-kcharselect/PKGBUILD
	staging/kdeutils-kdf/PKGBUILD
	staging/kdeutils-kfloppy/PKGBUILD
	staging/kdeutils-kgpg/PKGBUILD
	staging/kdeutils-kremotecontrol/PKGBUILD
	staging/kdeutils-ksecrets/PKGBUILD
	staging/kdeutils-ktimer/PKGBUILD
	staging/kdeutils-kwallet/PKGBUILD
	staging/kdeutils-superkaramba/PKGBUILD
	staging/kdeutils-sweeper/PKGBUILD
	staging/kdewebdev/PKGBUILD
	staging/libkdcraw/PKGBUILD
	staging/libkdeedu/PKGBUILD
	staging/libkexiv2/PKGBUILD
	staging/libkipi/PKGBUILD
	staging/libksane/PKGBUILD
	testing/e2fsprogs/PKGBUILD
	testing/iptables/PKGBUILD
	testing/ruby/PKGBUILD
	testing/xorg-server/PKGBUILD
	testing/xorg-server/autoconfig-nvidia.patch
	testing/xorg-server/autoconfig-sis.patch

1 files changed, 10 insertions, 5 deletions

diff --git a/core/openssl/PKGBUILD b/core/openssl/PKGBUILD
index 0f0238e2d..4835d5941 100644
--- a/core/openssl/PKGBUILD
+++ b/core/openssl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 153962 2012-03-21 06:20:46Z pierre $
+# $Id: PKGBUILD 154941 2012-03-31 12:48:22Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=openssl
@@ -6,7 +6,7 @@ _ver=1.0.1
 # use a pacman compatible version scheme
 # pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 pkgver=$_ver
-pkgrel=1
+pkgrel=2
 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security'
 arch=('i686' 'x86_64' 'mips64el')
 url='https://www.openssl.org'
@@ -19,12 +19,14 @@ source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz"
         'fix-manpages.patch'
         'no-rpath.patch'
         'gnu-linux-mips64el-gcc.patch'
-        'ca-dir.patch')
+        'ca-dir.patch'
+        'disable-tls12-client.patch')
 md5sums=('134f168bc2a8333f19f81d684841710b'
          '5bbc0655bda2af95bc8eb568963ce8ba'
          'dc78d3d06baffc16217519242ce92478'
          'd7115f0cc44df346d7b68c681819f94b'
-         '3bf51be3a1bbd262be46dc619f92aa90')
+         '3bf51be3a1bbd262be46dc619f92aa90'
+         '26432b9d7af63c63828b6405c9185400')
 
 build() {
 	cd $srcdir/$pkgname-$_ver
@@ -36,6 +38,8 @@ build() {
 	patch -p0 -i $srcdir/no-rpath.patch
 	# set ca dir to /etc/ssl by default
 	patch -p0 -i $srcdir/ca-dir.patch
+	# workaround for PR#2771
+	patch -p1 -i $srcdir/disable-tls12-client.patch
 
 #	patch -p0 -i $srcdir/gnu-linux-mips64el-gcc.patch
 
@@ -56,7 +60,8 @@ build() {
 	./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
 		shared zlib enable-md2 ${optflags} \
 		"${openssltarget}" \
-    -Wa,--noexecstack "${CFLAGS}" "${LDFLAGS}"
+		-Wa,--noexecstack "${CFLAGS}" "${LDFLAGS}" \
+		-DOPENSSL_NO_TLS1_2_CLIENT
 
 	make depend
 	make