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

Conflicts:
	core/openssl/PKGBUILD
	testing/at-spi2-core/PKGBUILD
	testing/brasero/PKGBUILD
	testing/brasero/brasero.install
	testing/cheese/PKGBUILD
	testing/cheese/cheese.install
	testing/clutter/PKGBUILD
	testing/eog/PKGBUILD
	testing/gdm/PKGBUILD
	testing/gdm/gdm-autologin.pam
	testing/gdm/gdm-fingerprint.pam
	testing/gdm/gdm-password.pam
	testing/gdm/gdm-smartcard.pam
	testing/gedit/PKGBUILD
	testing/gedit/gedit.install
	testing/glib-networking/PKGBUILD
	testing/glib-networking/glib-networking.install
	testing/gnome-online-accounts/PKGBUILD
	testing/gnome-screenshot/PKGBUILD
	testing/gnome-system-log/PKGBUILD
	testing/gnome-system-monitor/PKGBUILD
	testing/gnome-system-monitor/gnome-system-monitor.install
	testing/gobject-introspection/PKGBUILD
	testing/gucharmap/PKGBUILD
	testing/gucharmap/gucharmap.install
	testing/libsoup/PKGBUILD
	testing/nautilus/PKGBUILD
	testing/nautilus/nautilus.install
	testing/tomboy/PKGBUILD
	testing/tomboy/tomboy.install
	testing/vinagre/PKGBUILD
	testing/vinagre/vinagre.install
	testing/vino/PKGBUILD
	testing/vino/vino.install

5 files changed, 87 insertions, 26 deletions

diff --git a/core/libgcrypt/PKGBUILD b/core/libgcrypt/PKGBUILD
index ec4077548..84aa8284c 100644
--- a/core/libgcrypt/PKGBUILD
+++ b/core/libgcrypt/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 130865 2011-07-08 14:06:03Z andyrtr $
+# $Id: PKGBUILD 156348 2012-04-17 15:57:54Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=libgcrypt
 pkgver=1.5.0
-pkgrel=1
+pkgrel=3
 pkgdesc="a general purpose crypto library based on the code used"
 arch=(i686 x86_64 'mips64el')
 url="http://www.gnupg.org"
 license=('LGPL')
-depends=('libgpg-error>=1.9')
+depends=('libgpg-error>=1.10-2')
 options=('!libtool' '!emptydirs')
 install=$pkgname.install
 source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2
@@ -18,24 +18,18 @@ sha1sums=('3e776d44375dc1a710560b98ae8437d5da6e32cf')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  [ "$CARCH" = "i686" ] && EXTRAFLAGS="--disable-aesni-support"
   ./configure --prefix=/usr \
 	--disable-static \
-	--disable-padlock-support $EXTRAFLAGS
+	--disable-padlock-support #$EXTRAFLAGS
   make
 }
 
 check() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  make -k check
+  make check
 }
 
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
-
-  # Move dynamic libraries to /lib
-  install -d -m755 "${pkgdir}"/lib/
-  mv "${pkgdir}"/usr/lib/libgcrypt.so* "${pkgdir}"/lib/
-  ln -sf /lib/libgcrypt.so "${pkgdir}"/usr/lib/libgcrypt.so
 }
diff --git a/core/libgpg-error/PKGBUILD b/core/libgpg-error/PKGBUILD
index d24c58623..382465a09 100644
--- a/core/libgpg-error/PKGBUILD
+++ b/core/libgpg-error/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 132298 2011-07-22 15:47:59Z andyrtr $
+# $Id: PKGBUILD 156350 2012-04-17 15:57:56Z andyrtr $
 # Maintainer: judd <jvinet@zeroflux.org>
 
 pkgname=libgpg-error
 pkgver=1.10
-pkgrel=1
+pkgrel=2
 pkgdesc="Support library for libgcrypt"
 arch=(i686 x86_64 'mips64el')
 url="http://www.gnupg.org"
@@ -29,9 +29,4 @@ check() {
 package() {
   cd "${srcdir}"/${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}/" install
-
-  # Move dynamic libraries to /lib
-  install -d -m755 "${pkgdir}"/lib/
-  mv "${pkgdir}"/usr/lib/libgpg-error.so* "${pkgdir}"/lib/
-  ln -sf /lib/libgpg-error.so "${pkgdir}"/usr/lib/libgpg-error.so
 }
diff --git a/core/openssl/PKGBUILD b/core/openssl/PKGBUILD
index 4835d5941..9cf6d19c7 100644
--- a/core/openssl/PKGBUILD
+++ b/core/openssl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 154941 2012-03-31 12:48:22Z pierre $
+# $Id: PKGBUILD 156330 2012-04-17 06:27:45Z 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=2
+pkgrel=3
 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security'
 arch=('i686' 'x86_64' 'mips64el')
 url='https://www.openssl.org'
@@ -20,13 +20,15 @@ source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz"
         'no-rpath.patch'
         'gnu-linux-mips64el-gcc.patch'
         'ca-dir.patch'
-        'disable-tls12-client.patch')
+        'disable-tls12-client.patch'
+        'vpaes.patch')
 md5sums=('134f168bc2a8333f19f81d684841710b'
          '5bbc0655bda2af95bc8eb568963ce8ba'
          'dc78d3d06baffc16217519242ce92478'
          'd7115f0cc44df346d7b68c681819f94b'
          '3bf51be3a1bbd262be46dc619f92aa90'
-         '26432b9d7af63c63828b6405c9185400')
+         '26432b9d7af63c63828b6405c9185400'
+         '55ad53e8ec3db1db6978af55e3ce1b5d')
 
 build() {
 	cd $srcdir/$pkgname-$_ver
@@ -40,6 +42,8 @@ build() {
 	patch -p0 -i $srcdir/ca-dir.patch
 	# workaround for PR#2771
 	patch -p1 -i $srcdir/disable-tls12-client.patch
+	# fix for PR#2775
+	patch -p1 -i $srcdir/vpaes.patch
 
 #	patch -p0 -i $srcdir/gnu-linux-mips64el-gcc.patch
 
diff --git a/core/openssl/vpaes.patch b/core/openssl/vpaes.patch
new file mode 100644
index 000000000..2688b0c0a
--- /dev/null
+++ b/core/openssl/vpaes.patch
@@ -0,0 +1,69 @@
+Index: openssl/crypto/aes/asm/vpaes-x86.pl
+RCS File: /v/openssl/cvs/openssl/crypto/aes/asm/vpaes-x86.pl,v
+rcsdiff -q -kk '-r1.5.4.4' '-r1.5.4.5' -u '/v/openssl/cvs/openssl/crypto/aes/asm/vpaes-x86.pl,v' 2>/dev/null
+--- vpaes-x86.pl	2011/12/15 22:20:26	1.5.4.4
++++ vpaes-x86.pl	2012/03/31 16:55:18	1.5.4.5
+@@ -843,6 +843,8 @@
+ 	&mov	($out,&wparam(1));		# out
+ 	&mov	($round,&wparam(2));		# len
+ 	&mov	($key,&wparam(3));		# key
++	&sub	($round,16);
++	&jc	(&label("cbc_abort"));
+ 	&lea	($base,&DWP(-56,"esp"));
+ 	&mov	($const,&wparam(4));		# ivp
+ 	&and	($base,-16);
+@@ -853,7 +855,6 @@
+ 	&mov	(&DWP(48,"esp"),$base);
+ 
+ 	&mov	(&DWP(0,"esp"),$out);		# save out
+-	&sub	($round,16);
+ 	&mov	(&DWP(4,"esp"),$key)		# save key
+ 	&mov	(&DWP(8,"esp"),$const);		# save ivp
+ 	&mov	($out,$round);			# $out works as $len
+@@ -896,6 +897,7 @@
+ 	&mov	($base,&DWP(8,"esp"));		# restore ivp
+ 	&mov	("esp",&DWP(48,"esp"));
+ 	&movdqu	(&QWP(0,$base),"xmm1");		# write IV
++&set_label("cbc_abort");
+ &function_end("${PREFIX}_cbc_encrypt");
+ 
+ &asm_finish();
+Index: openssl/crypto/aes/asm/vpaes-x86_64.pl
+RCS File: /v/openssl/cvs/openssl/crypto/aes/asm/vpaes-x86_64.pl,v
+rcsdiff -q -kk '-r1.4.4.2' '-r1.4.4.3' -u '/v/openssl/cvs/openssl/crypto/aes/asm/vpaes-x86_64.pl,v' 2>/dev/null
+--- vpaes-x86_64.pl	2011/11/14 21:01:17	1.4.4.2
++++ vpaes-x86_64.pl	2012/03/31 16:55:18	1.4.4.3
+@@ -263,7 +263,7 @@
+ 	pshufb  %xmm2,  %xmm4	# 4 = sbou
+ 	pxor	%xmm0,  %xmm4	# 4 = sb1u + k
+ 	movdqa	0x70(%r10), %xmm0	# 0 : sbot
+-	movdqa	.Lk_sr-.Lk_dsbd(%r11), %xmm2
++	movdqa	-0x160(%r11), %xmm2	# .Lk_sr-.Lk_dsbd=-0x160
+ 	pshufb  %xmm3,	%xmm0	# 0 = sb1t
+ 	pxor	%xmm4,	%xmm0	# 0 = A
+ 	pshufb	%xmm2,	%xmm0
+@@ -869,6 +869,8 @@
+ ___
+ ($len,$key)=($key,$len);
+ $code.=<<___;
++	sub	\$16,$len
++	jc	.Lcbc_abort
+ ___
+ $code.=<<___ if ($win64);
+ 	lea	-0xb8(%rsp),%rsp
+@@ -887,7 +889,6 @@
+ $code.=<<___;
+ 	movdqu	($ivp),%xmm6		# load IV
+ 	sub	$inp,$out
+-	sub	\$16,$len
+ 	call	_vpaes_preheat
+ 	cmp	\$0,${enc}d
+ 	je	.Lcbc_dec_loop
+@@ -932,6 +933,7 @@
+ .Lcbc_epilogue:
+ ___
+ $code.=<<___;
++.Lcbc_abort:
+ 	ret
+ .size	${PREFIX}_cbc_encrypt,.-${PREFIX}_cbc_encrypt
+ ___
diff --git a/core/rfkill/PKGBUILD b/core/rfkill/PKGBUILD
index 040eef5b6..611229827 100644
--- a/core/rfkill/PKGBUILD
+++ b/core/rfkill/PKGBUILD
@@ -1,15 +1,14 @@
-# $Id: PKGBUILD 142840 2011-11-16 20:25:37Z dan $
+# $Id: PKGBUILD 156346 2012-04-17 15:19:00Z bisson $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=rfkill
 pkgver=0.4
-pkgrel=3
+pkgrel=4
 pkgdesc="A tool for enabling and disabling wireless devices"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linuxwireless.org/en/users/Documentation/rfkill"
 license=('custom')
-depends=('glibc' 'filesystem>=2010.01')
 source=(http://wireless.kernel.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2
         60-rfkill.rules
         rfkill.conf.d
@@ -31,7 +30,7 @@ package() {
   # License
   install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
   # Udev rule
-  install -Dm644 "${srcdir}/60-rfkill.rules" "${pkgdir}/lib/udev/rules.d/60-rfkill.rules"
+  install -Dm644 "${srcdir}/60-rfkill.rules" "${pkgdir}/usr/lib/udev/rules.d/60-rfkill.rules"
   # Init script
   install -Dm644 "${srcdir}/rfkill.conf.d" "${pkgdir}/etc/conf.d/rfkill"
   install -Dm755 "${srcdir}/rfkill.rc.d" "${pkgdir}/etc/rc.d/rfkill"