[arch-commits] Commit in gdm/trunk (3 files)
Jan Steffens
heftig at archlinux.org
Tue Nov 6 22:16:32 UTC 2018
Date: Tuesday, November 6, 2018 @ 22:16:32
Author: heftig
Revision: 338009
3.30.2-1
Added:
gdm/trunk/0001-Xsession-Don-t-start-ssh-agent-by-default.patch
(from rev 338008, gdm/trunk/0002-Xsession-Don-t-start-ssh-agent-by-default.patch)
Modified:
gdm/trunk/PKGBUILD
Deleted:
gdm/trunk/0002-Xsession-Don-t-start-ssh-agent-by-default.patch
------------------------------------------------------+
0001-Xsession-Don-t-start-ssh-agent-by-default.patch | 32 +++++++++++++
0002-Xsession-Don-t-start-ssh-agent-by-default.patch | 31 -------------
PKGBUILD | 39 +++++++----------
3 files changed, 50 insertions(+), 52 deletions(-)
Copied: gdm/trunk/0001-Xsession-Don-t-start-ssh-agent-by-default.patch (from rev 338008, gdm/trunk/0002-Xsession-Don-t-start-ssh-agent-by-default.patch)
===================================================================
--- 0001-Xsession-Don-t-start-ssh-agent-by-default.patch (rev 0)
+++ 0001-Xsession-Don-t-start-ssh-agent-by-default.patch 2018-11-06 22:16:32 UTC (rev 338009)
@@ -0,0 +1,32 @@
+From 328a315c21ec71e563d00699f0a79186b229270a Mon Sep 17 00:00:00 2001
+Message-Id: <328a315c21ec71e563d00699f0a79186b229270a.1541542184.git.jan.steffens at gmail.com>
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Sat, 20 Jun 2015 17:22:38 +0200
+Subject: [PATCH] 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 9d79558c..ff6d9de0 100755
+--- a/data/Xsession.in
++++ b/data/Xsession.in
+@@ -175,14 +175,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.19.1
+
Deleted: 0002-Xsession-Don-t-start-ssh-agent-by-default.patch
===================================================================
--- 0002-Xsession-Don-t-start-ssh-agent-by-default.patch 2018-11-06 22:14:20 UTC (rev 338008)
+++ 0002-Xsession-Don-t-start-ssh-agent-by-default.patch 2018-11-06 22:16:32 UTC (rev 338009)
@@ -1,31 +0,0 @@
-From 8bf4d553ba9e7a5978ed8920ca0b06e624de2eda Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at 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
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-11-06 22:14:20 UTC (rev 338008)
+++ PKGBUILD 2018-11-06 22:16:32 UTC (rev 338009)
@@ -3,7 +3,7 @@
pkgbase=gdm
pkgname=(gdm libgdm)
-pkgver=3.30.1
+pkgver=3.30.2
pkgrel=1
pkgdesc="Display manager and login screen"
url="https://wiki.gnome.org/Projects/GDM"
@@ -12,28 +12,29 @@
depends=(gnome-shell gnome-session upower xorg-xrdb xorg-server xorg-server-xwayland xorg-xhost)
makedepends=(yelp-tools intltool gobject-introspection git docbook-xsl)
checkdepends=(check)
-_commit=9e532ea4b400914704e063d81d21c73c9b84c048 # tags/3.30.1^0
+_commit=9b3f09c782cc0628cc20c96c4cf53a2c1f778a39 # tags/3.30.2^0
source=("git+https://gitlab.gnome.org/GNOME/gdm.git#commit=$_commit"
- 0002-Xsession-Don-t-start-ssh-agent-by-default.patch
+ 0001-Xsession-Don-t-start-ssh-agent-by-default.patch
gdm.sysusers)
sha256sums=('SKIP'
- '9449da0b6ee58aa3fde65e6d8d1f30513e4176a7dc6d176f17f320ce82cb1d82'
+ '3412f7da0205409f08a126a1d166b644fe0f1d0444f7cdebdce8e59cea2d672c'
'6d9c8e38c7de85b6ec75e488585b8c451f5d9b4fabd2a42921dc3bfcc4aa3e13')
pkgver() {
- cd $pkgbase
+ cd gdm
git describe --tags | sed 's/-/+/g'
}
prepare() {
- cd $pkgbase
- patch -Np1 -i ../0002-Xsession-Don-t-start-ssh-agent-by-default.patch
+ mkdir build
+ cd gdm
+ patch -Np1 -i ../0001-Xsession-Don-t-start-ssh-agent-by-default.patch
NOCONFIGURE=1 ./autogen.sh
}
build() {
- cd $pkgbase
- ./configure \
+ cd build
+ ../gdm/configure \
--prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
@@ -52,8 +53,7 @@
}
check() {
- cd $pkgbase
- make check
+ make -C build check
}
package_gdm() {
@@ -64,8 +64,7 @@
etc/gdm/Xsession etc/gdm/PostSession/Default etc/gdm/PreSession/Default)
groups=(gnome)
- cd $pkgbase
- make DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" make -C build install
chown -Rc 120:120 "$pkgdir/var/lib/gdm"
@@ -72,19 +71,17 @@
# Unused or created at start
rm -r "$pkgdir"/var/{cache,log,run}
- install -Dm644 ../gdm.sysusers "$pkgdir/usr/lib/sysusers.d/gdm.conf"
+ install -Dm644 gdm.sysusers "$pkgdir/usr/lib/sysusers.d/gdm.conf"
### Split libgdm
- make -C libgdm DESTDIR="$pkgdir" uninstall
- mv "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.login-screen.gschema.xml" "$srcdir"
+ mkdir -p libgdm/{lib,share}
+ mv -t libgdm "$pkgdir"/usr/include
+ mv -t libgdm/lib "$pkgdir"/usr/lib/{girepository-1.0,libgdm*,pkgconfig}
+ mv -t libgdm/share "$pkgdir"/usr/share/{gir-1.0,glib-2.0}
}
package_libgdm() {
pkgdesc="GDM support library"
depends=(systemd glib2 dconf)
-
- cd $pkgbase
- make -C libgdm DESTDIR="$pkgdir" install
- install -Dt "$pkgdir/usr/share/glib-2.0/schemas" -m644 \
- "$srcdir/org.gnome.login-screen.gschema.xml"
+ mv libgdm "$pkgdir/usr"
}
More information about the arch-commits
mailing list