Update to 3.20.0

3 files changed, 40 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 86151ec6fe18..33021926ec13 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Mon Apr 11 06:39:16 UTC 2016
 pkgbase = gdm-plymouth
 	pkgdesc = Gnome Display Manager with Plymouth support.
-	pkgver = 3.18.2
+	pkgver = 3.20.0
 	pkgrel = 1
 	url = http://www.gnome.org
 	arch = i686
@@ -19,12 +21,10 @@ pkgbase = gdm-plymouth
 	depends = xorg-server
 	depends = xorg-server-xwayland
 	depends = xorg-xhost
-	source = http://ftp.gnome.org/pub/gnome/sources/gdm/3.18/gdm-3.18.2.tar.xz
-	source = 0001-Add-Arch-Linux-PAM-config-files.patch
+	source = http://ftp.gnome.org/pub/gnome/sources/gdm/3.20/gdm-3.20.0.tar.xz
 	source = 0002-Xsession-Don-t-start-ssh-agent-by-default.patch
-	sha256sums = 549235247611d74f0d5d5a4aa01ba9350a4d3468e44ac013b40791c6a986f822
-	sha256sums = c4598b38cf92dd47fb06b2125e808ce66dabcc3bbcdf7508b97ba87e1ead0ac5
-	sha256sums = e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+	sha256sums = c64fba0bb07a86504bc8cb877fd529938c1cc931b6ff1cbca0e99b4a24d9d3c2
+	sha256sums = 63f99db7623f078e390bf755350e5793db8b2c4e06622caf42eddc63cd39ecca
 
 pkgname = gdm-plymouth
 	install = gdm-plymouth.install
diff --git a/0002-Xsession-Don-t-start-ssh-agent-by-default.patch b/0002-Xsession-Don-t-start-ssh-agent-by-default.patch
index e69de29bb2d1..e5b6dd94b49b 100644
--- a/0002-Xsession-Don-t-start-ssh-agent-by-default.patch
+++ b/0002-Xsession-Don-t-start-ssh-agent-by-default.patch
@@ -0,0 +1,30 @@
+From 8bf4d553ba9e7a5978ed8920ca0b06e624de2eda Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
+Date: Sat, 20 Jun 2015 17:22:38 +0200
+Subject: [PATCH 2/2] Xsession: Don't start ssh-agent by default
+
+---
+ data/Xsession.in | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/data/Xsession.in b/data/Xsession.in
+index f253375..c143b30 100755
+--- a/data/Xsession.in
++++ b/data/Xsession.in
+@@ -184,14 +184,6 @@ if [ "x$command" = "xdefault" ] ; then
+   fi
+ fi
+ 
+-# add ssh-agent if found
+-sshagent="`gdmwhich ssh-agent`"
+-if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then
+-    command="$sshagent -- $command"
+-elif [ -z "$sshagent" ] ; then
+-    echo "$0: ssh-agent not found!"
+-fi
+-
+ echo "$0: Setup done, will execute: $command"
+ 
+ eval exec $command
+-- 
+2.4.5
diff --git a/PKGBUILD b/PKGBUILD
index cc505d0c64d5..2ce3a884a2af 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Sebastian Lau <lauseb644@gmail.com>
+# Maintainer: Sebastian Lau <archlinux _at_ slau _dot_ info>
 # Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Damian01w <damian01w@gmail.com>
@@ -6,7 +6,7 @@
 _pkgbase=gdm
 pkgbase=gdm-plymouth
 pkgname=(gdm-plymouth libgdm-plymouth)
-pkgver=3.18.2
+pkgver=3.20.0
 pkgrel=1
 pkgdesc="Gnome Display Manager with Plymouth support."
 arch=(i686 x86_64)
@@ -16,16 +16,13 @@ depends=(plymouth gnome-shell gnome-session upower xorg-xrdb xorg-server xorg-se
 makedepends=(itstool intltool yelp-tools gobject-introspection)
 checkdepends=('check')
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbase/${pkgver:0:4}/$_pkgbase-$pkgver.tar.xz
-        0001-Add-Arch-Linux-PAM-config-files.patch
 	0002-Xsession-Don-t-start-ssh-agent-by-default.patch)
-sha256sums=('549235247611d74f0d5d5a4aa01ba9350a4d3468e44ac013b40791c6a986f822'
-            'c4598b38cf92dd47fb06b2125e808ce66dabcc3bbcdf7508b97ba87e1ead0ac5'
-            'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855')
+sha256sums=('c64fba0bb07a86504bc8cb877fd529938c1cc931b6ff1cbca0e99b4a24d9d3c2'
+            '63f99db7623f078e390bf755350e5793db8b2c4e06622caf42eddc63cd39ecca')
 
 prepare() {
   cd $_pkgbase-$pkgver
 
-  patch -Np1 -i ../0001-Add-Arch-Linux-PAM-config-files.patch
   patch -Np1 -i ../0002-Xsession-Don-t-start-ssh-agent-by-default.patch
 
   AUTOPOINT='intltoolize --automake -c' autoreconf -fi