From 628d0e15e379a9ec6d32ccf7cbc01bedfcedbd99 Mon Sep 17 00:00:00 2001 From: heftig Date: Sat, 6 May 2023 16:43:27 +0000 Subject: [PATCH] db-move: moved gdm from [testing] to [extra] (x86_64) git-svn-id: file:///srv/repos/svn-packages/svn@476812 eb2447ed-0c53-47e4-bac8-5bc4a241df78 --- gdm/repos/extra-x86_64/PKGBUILD | 4 +- ...Xsession-Don-t-start-ssh-agent-by-default.patch | 28 ----- gdm/repos/testing-x86_64/PKGBUILD | 139 --------------------- gdm/repos/testing-x86_64/gdm.install | 7 -- 4 files changed, 2 insertions(+), 176 deletions(-) delete mode 100644 gdm/repos/testing-x86_64/0001-Xsession-Don-t-start-ssh-agent-by-default.patch delete mode 100644 gdm/repos/testing-x86_64/PKGBUILD delete mode 100644 gdm/repos/testing-x86_64/gdm.install diff --git a/gdm/repos/extra-x86_64/PKGBUILD b/gdm/repos/extra-x86_64/PKGBUILD index 612d683a5b2..1aa448fe72b 100644 --- a/gdm/repos/extra-x86_64/PKGBUILD +++ b/gdm/repos/extra-x86_64/PKGBUILD @@ -6,7 +6,7 @@ pkgname=( gdm libgdm ) -pkgver=44.0 +pkgver=44.1 pkgrel=1 pkgdesc="Display manager and login screen" url="https://wiki.gnome.org/Projects/GDM" @@ -32,7 +32,7 @@ makedepends=( yelp-tools ) checkdepends=(check) -_commit=6f137e9b59a0bb4b5a47d4af723c64bce053ea1d # tags/44.0^0 +_commit=b622872c5f24960c18900ebf14b5233b8701a8f9 # tags/44.1^0 source=( "git+https://gitlab.gnome.org/GNOME/gdm.git#commit=$_commit" 0001-Xsession-Don-t-start-ssh-agent-by-default.patch diff --git a/gdm/repos/testing-x86_64/0001-Xsession-Don-t-start-ssh-agent-by-default.patch b/gdm/repos/testing-x86_64/0001-Xsession-Don-t-start-ssh-agent-by-default.patch deleted file mode 100644 index 56699008c6f..00000000000 --- a/gdm/repos/testing-x86_64/0001-Xsession-Don-t-start-ssh-agent-by-default.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" -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 diff --git a/gdm/repos/testing-x86_64/PKGBUILD b/gdm/repos/testing-x86_64/PKGBUILD deleted file mode 100644 index 1aa448fe72b..00000000000 --- a/gdm/repos/testing-x86_64/PKGBUILD +++ /dev/null @@ -1,139 +0,0 @@ -# Maintainer: Jan Alexander Steffens (heftig) -# Contributor: Jan de Groot - -pkgbase=gdm -pkgname=( - gdm - libgdm -) -pkgver=44.1 -pkgrel=1 -pkgdesc="Display manager and login screen" -url="https://wiki.gnome.org/Projects/GDM" -arch=(x86_64) -license=(GPL) -depends=( - gnome-session - gnome-shell - libcanberra - libxdmcp - systemd - upower - xorg-server - xorg-xhost - xorg-xrdb -) -makedepends=( - docbook-xsl - git - gobject-introspection - meson - plymouth - yelp-tools -) -checkdepends=(check) -_commit=b622872c5f24960c18900ebf14b5233b8701a8f9 # tags/44.1^0 -source=( - "git+https://gitlab.gnome.org/GNOME/gdm.git#commit=$_commit" - 0001-Xsession-Don-t-start-ssh-agent-by-default.patch -) -b2sums=('SKIP' - 'f7e868fdd7cc121433de1572583eb728f4d186cd4f52c6d6c8f2ccf4a3cf781144ff71f704f13571ddb97a1ff4ec55cfa3df25d38737ad19da21e84ddc2d3ee4') - -pkgver() { - cd gdm - git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g' -} - -prepare() { - cd gdm - - # https://gitlab.gnome.org/GNOME/gdm/-/issues/730 - git cherry-pick -n b29510dbc51ccf71a7c0ed656d21634a83766c0c - - # 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 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 </dev/null - fi -} - -# vim:set ft=sh sw=2 et: -- 2.11.4.GIT