[arch-commits] Commit in gdm/repos/extra-x86_64 (6 files)
Jan Steffens
heftig at gemini.archlinux.org
Sat Feb 12 01:53:43 UTC 2022
Date: Saturday, February 12, 2022 @ 01:53:43
Author: heftig
Revision: 437002
archrelease: copy trunk to extra-x86_64
Added:
gdm/repos/extra-x86_64/0001-Xsession-Don-t-start-ssh-agent-by-default.patch
(from rev 437001, gdm/trunk/0001-Xsession-Don-t-start-ssh-agent-by-default.patch)
gdm/repos/extra-x86_64/PKGBUILD
(from rev 437001, gdm/trunk/PKGBUILD)
gdm/repos/extra-x86_64/gdm.install
(from rev 437001, gdm/trunk/gdm.install)
Deleted:
gdm/repos/extra-x86_64/0001-Xsession-Don-t-start-ssh-agent-by-default.patch
gdm/repos/extra-x86_64/PKGBUILD
gdm/repos/extra-x86_64/gdm.install
------------------------------------------------------+
0001-Xsession-Don-t-start-ssh-agent-by-default.patch | 56 ++--
PKGBUILD | 232 ++++++++---------
gdm.install | 14 -
3 files changed, 151 insertions(+), 151 deletions(-)
Deleted: 0001-Xsession-Don-t-start-ssh-agent-by-default.patch
===================================================================
--- 0001-Xsession-Don-t-start-ssh-agent-by-default.patch 2022-02-12 01:53:24 UTC (rev 437001)
+++ 0001-Xsession-Don-t-start-ssh-agent-by-default.patch 2022-02-12 01:53:43 UTC (rev 437002)
@@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 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] 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 2e4de4fe384f..29ebc30ea0c5 100755
---- a/data/Xsession.in
-+++ b/data/Xsession.in
-@@ -207,14 +207,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
Copied: gdm/repos/extra-x86_64/0001-Xsession-Don-t-start-ssh-agent-by-default.patch (from rev 437001, gdm/trunk/0001-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 2022-02-12 01:53:43 UTC (rev 437002)
@@ -0,0 +1,28 @@
+From 0000000000000000000000000000000000000000 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] 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 2e4de4fe384f..29ebc30ea0c5 100755
+--- a/data/Xsession.in
++++ b/data/Xsession.in
+@@ -207,14 +207,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
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-02-12 01:53:24 UTC (rev 437001)
+++ PKGBUILD 2022-02-12 01:53:43 UTC (rev 437002)
@@ -1,116 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-
-pkgbase=gdm
-pkgname=(gdm libgdm)
-pkgver=41.3
-pkgrel=1
-pkgdesc="Display manager and login screen"
-url="https://wiki.gnome.org/Projects/GDM"
-arch=(x86_64)
-license=(GPL)
-depends=(gnome-shell gnome-session upower xorg-xrdb xorg-server xorg-xhost
- libxdmcp systemd)
-makedepends=(yelp-tools gobject-introspection git docbook-xsl meson)
-checkdepends=(check)
-_commit=cb49bac2fe1160094eae360f985e54073be3c49a # tags/41.3^0
-source=("git+https://gitlab.gnome.org/GNOME/gdm.git#commit=$_commit"
- 0001-Xsession-Don-t-start-ssh-agent-by-default.patch)
-sha256sums=('SKIP'
- '39a7e1189d423dd428ace9baac77ba0442c6706a861d3c3db9eb3a6643e223f8')
-
-pkgver() {
- cd gdm
- git describe --tags | sed 's/\.rc/rc/;s/[^-]*-g/r&/;s/-/+/g'
-}
-
-prepare() {
- cd gdm
-
- # Don't start ssh-agent by default
- git apply -3 ../0001-Xsession-Don-t-start-ssh-agent-by-default.patch
-}
-
-build() {
- local meson_options=(
- -D dbus-sys="/usr/share/dbus-1/system.d"
- -D default-pam-config=arch
- -D default-path="/usr/local/bin:/usr/local/sbin:/usr/bin"
- -D gdm-xsession=true
- -D ipv6=true
- -D plymouth=disabled
- -D run-dir=/run/gdm
- -D selinux=disabled
- )
-
- arch-meson gdm build "${meson_options[@]}"
- meson compile -C build
-}
-
-check() {
- meson test -C build --print-errorlogs
-}
-
-_pick() {
- local p="$1" f d; shift
- for f; do
- d="$srcdir/$p/${f#$pkgdir/}"
- mkdir -p "$(dirname "$d")"
- mv "$f" "$d"
- rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
- done
-}
-
-package_gdm() {
- depends+=(libgdm)
- optdepends=('fprintd: fingerprint authentication')
- backup=(etc/pam.d/gdm-autologin etc/pam.d/gdm-fingerprint etc/pam.d/gdm-launch-environment
- etc/pam.d/gdm-password etc/pam.d/gdm-smartcard etc/gdm/custom.conf
- etc/gdm/Xsession etc/gdm/PostSession/Default etc/gdm/PreSession/Default)
- groups=(gnome)
- install=gdm.install
-
- meson install -C build --destdir "$pkgdir"
-
- cd "$pkgdir"
-
- install -d -o 0 -g 0 -m 0755 var
- install -d -o 0 -g 0 -m 0755 var/lib
- install -d -o 120 -g 120 -m 1770 var/lib/gdm
- install -d -o 120 -g 120 -m 0700 var/lib/gdm/.config
- install -d -o 120 -g 120 -m 0700 var/lib/gdm/.config/pulse
- install -d -o 120 -g 120 -m 0700 var/lib/gdm/.local
- install -d -o 120 -g 120 -m 0755 var/lib/gdm/.local/share
- install -d -o 120 -g 120 -m 0755 var/lib/gdm/.local/share/applications
-
- # https://src.fedoraproject.org/rpms/gdm/blob/master/f/default.pa-for-gdm
- install -o120 -g120 -m644 /dev/stdin var/lib/gdm/.config/pulse/default.pa <<END
-load-module module-device-restore
-load-module module-card-restore
-load-module module-udev-detect
-load-module module-native-protocol-unix
-load-module module-default-device-restore
-load-module module-always-sink
-load-module module-intended-roles
-load-module module-suspend-on-idle
-load-module module-systemd-login
-load-module module-position-event-sounds
-END
-
- install -Dm644 /dev/stdin usr/lib/sysusers.d/gdm.conf <<END
-g gdm 120 -
-u gdm 120 "Gnome Display Manager" /var/lib/gdm
-END
-
- _pick libgdm usr/include
- _pick libgdm usr/lib/{girepository-1.0,libgdm*,pkgconfig}
- _pick libgdm usr/share/{gir-1.0,glib-2.0}
-}
-
-package_libgdm() {
- pkgdesc+=" - support library"
- depends=(libsystemd.so libg{lib,object,io}-2.0.so)
- provides=(libgdm.so)
-
- mv libgdm/* "$pkgdir"
-}
Copied: gdm/repos/extra-x86_64/PKGBUILD (from rev 437001, gdm/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-02-12 01:53:43 UTC (rev 437002)
@@ -0,0 +1,116 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=gdm
+pkgname=(gdm libgdm)
+pkgver=41.3
+pkgrel=2
+pkgdesc="Display manager and login screen"
+url="https://wiki.gnome.org/Projects/GDM"
+arch=(x86_64)
+license=(GPL)
+depends=(gnome-shell gnome-session upower xorg-xrdb xorg-server xorg-xhost
+ libxdmcp systemd libcanberra)
+makedepends=(yelp-tools gobject-introspection git docbook-xsl meson)
+checkdepends=(check)
+_commit=cb49bac2fe1160094eae360f985e54073be3c49a # tags/41.3^0
+source=("git+https://gitlab.gnome.org/GNOME/gdm.git#commit=$_commit"
+ 0001-Xsession-Don-t-start-ssh-agent-by-default.patch)
+sha256sums=('SKIP'
+ '39a7e1189d423dd428ace9baac77ba0442c6706a861d3c3db9eb3a6643e223f8')
+
+pkgver() {
+ cd gdm
+ git describe --tags | sed 's/\.rc/rc/;s/[^-]*-g/r&/;s/-/+/g'
+}
+
+prepare() {
+ cd gdm
+
+ # Don't start ssh-agent by default
+ git apply -3 ../0001-Xsession-Don-t-start-ssh-agent-by-default.patch
+}
+
+build() {
+ local meson_options=(
+ -D dbus-sys="/usr/share/dbus-1/system.d"
+ -D default-pam-config=arch
+ -D default-path="/usr/local/bin:/usr/local/sbin:/usr/bin"
+ -D gdm-xsession=true
+ -D ipv6=true
+ -D plymouth=disabled
+ -D run-dir=/run/gdm
+ -D selinux=disabled
+ )
+
+ arch-meson gdm build "${meson_options[@]}"
+ meson compile -C build
+}
+
+check() {
+ meson test -C build --print-errorlogs
+}
+
+_pick() {
+ local p="$1" f d; shift
+ for f; do
+ d="$srcdir/$p/${f#$pkgdir/}"
+ mkdir -p "$(dirname "$d")"
+ mv "$f" "$d"
+ rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
+ done
+}
+
+package_gdm() {
+ depends+=(libgdm)
+ optdepends=('fprintd: fingerprint authentication')
+ backup=(etc/pam.d/gdm-autologin etc/pam.d/gdm-fingerprint etc/pam.d/gdm-launch-environment
+ etc/pam.d/gdm-password etc/pam.d/gdm-smartcard etc/gdm/custom.conf
+ etc/gdm/Xsession etc/gdm/PostSession/Default etc/gdm/PreSession/Default)
+ groups=(gnome)
+ install=gdm.install
+
+ meson install -C build --destdir "$pkgdir"
+
+ cd "$pkgdir"
+
+ install -d -o 0 -g 0 -m 0755 var
+ install -d -o 0 -g 0 -m 0755 var/lib
+ install -d -o 120 -g 120 -m 1770 var/lib/gdm
+ install -d -o 120 -g 120 -m 0700 var/lib/gdm/.config
+ install -d -o 120 -g 120 -m 0700 var/lib/gdm/.config/pulse
+ install -d -o 120 -g 120 -m 0700 var/lib/gdm/.local
+ install -d -o 120 -g 120 -m 0755 var/lib/gdm/.local/share
+ install -d -o 120 -g 120 -m 0755 var/lib/gdm/.local/share/applications
+
+ # https://src.fedoraproject.org/rpms/gdm/blob/master/f/default.pa-for-gdm
+ install -o120 -g120 -m644 /dev/stdin var/lib/gdm/.config/pulse/default.pa <<END
+load-module module-device-restore
+load-module module-card-restore
+load-module module-udev-detect
+load-module module-native-protocol-unix
+load-module module-default-device-restore
+load-module module-always-sink
+load-module module-intended-roles
+load-module module-suspend-on-idle
+load-module module-systemd-login
+load-module module-position-event-sounds
+END
+
+ install -Dm644 /dev/stdin usr/lib/sysusers.d/gdm.conf <<END
+g gdm 120 -
+u gdm 120 "Gnome Display Manager" /var/lib/gdm
+END
+
+ _pick libgdm usr/include
+ _pick libgdm usr/lib/{girepository-1.0,libgdm*,pkgconfig}
+ _pick libgdm usr/share/{gir-1.0,glib-2.0}
+}
+
+package_libgdm() {
+ pkgdesc+=" - support library"
+ depends=(libsystemd.so libg{lib,object,io}-2.0.so)
+ provides=(libgdm.so)
+
+ mv libgdm/* "$pkgdir"
+}
Deleted: gdm.install
===================================================================
--- gdm.install 2022-02-12 01:53:24 UTC (rev 437001)
+++ gdm.install 2022-02-12 01:53:43 UTC (rev 437002)
@@ -1,7 +0,0 @@
-post_upgrade() {
- if (( $(vercmp $2 3.34.0-2) < 0 )); then
- usermod --expiredate= gdm >/dev/null
- fi
-}
-
-# vim:set ft=sh sw=2 et:
Copied: gdm/repos/extra-x86_64/gdm.install (from rev 437001, gdm/trunk/gdm.install)
===================================================================
--- gdm.install (rev 0)
+++ gdm.install 2022-02-12 01:53:43 UTC (rev 437002)
@@ -0,0 +1,7 @@
+post_upgrade() {
+ if (( $(vercmp $2 3.34.0-2) < 0 )); then
+ usermod --expiredate= gdm >/dev/null
+ fi
+}
+
+# vim:set ft=sh sw=2 et:
More information about the arch-commits
mailing list