Piecuu/pmaports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

systemd/gdm: upgrade to 46.2 (MR 5361) (MR 5563)

Browse source
This commit is contained in:
Clayton Craft 2024-07-18 15:08:28 -07:00 • committed by Oliver Smith
parent f62410ba1d
commit f86b3c9a15
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
5 changed files with 25 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

5
extra-repos/systemd/gdm/0001-DOWNSTREAM-use-bin-touch-instead-of-usr-bin-touch.patch
View file

@ -1,7 +1,7 @@
From a12b01f4f71d7ca1ed528ea11f99520c10b0d93c Mon Sep 17 00:00:00 2001
From: Newbyte <newbie13xd@gmail.com>
Date: Tue, 14 Mar 2023 19:37:17 +0100
Subject: [PATCH 1/2] DOWNSTREAM: use /bin/touch instead of /usr/bin/touch
Subject: [PATCH 1/2] DOWNSTREAM: use /bin/touch and /bin/rm instead of /usr/bin/touch and /ust/bin/rm
as that's the path here in Alpine.
---
@ -60,8 +60,9 @@ index a4f841bdf..481c5b4dd 100644
@@ -79,7 +79,7 @@ SUBSYSTEM!="drm", GOTO="gdm_hybrid_graphics_check_end"
ACTION!="add", GOTO="gdm_hybrid_graphics_check_end"
IMPORT{program}="/bin/sh -c \"echo GDM_NUMBER_OF_GRAPHICS_CARDS=`ls -1d /sys/class/drm/card[0-9] | wc -l`\""
ENV{GDM_NUMBER_OF_GRAPHICS_CARDS}=="1", RUN+="/usr/bin/rm -f /run/udev/gdm-machine-has-hybrid-graphics"
-ENV{GDM_NUMBER_OF_GRAPHICS_CARDS}=="1", RUN+="/usr/bin/rm -f /run/udev/gdm-machine-has-hybrid-graphics"
-ENV{GDM_NUMBER_OF_GRAPHICS_CARDS}!="1", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-hybrid-graphics"
+ENV{GDM_NUMBER_OF_GRAPHICS_CARDS}=="1", RUN+="/bin/rm -f /run/udev/gdm-machine-has-hybrid-graphics"
+ENV{GDM_NUMBER_OF_GRAPHICS_CARDS}!="1", RUN+="/bin/touch /run/udev/gdm-machine-has-hybrid-graphics"
LABEL="gdm_hybrid_graphics_check_end"

11
extra-repos/systemd/gdm/0003-pam-rename-common-to-base.patch → extra-repos/systemd/gdm/0003-DOWNSTREAM-pam-rename-common-to-base.patch
View file

@ -1,3 +1,5 @@
we use base-* named configs
--
diff --git a/data/pam-openembedded/gdm-autologin.pam b/data/pam-openembedded/gdm-autologin.pam
index a9f4354..3e0708b 100644
--- a/data/pam-openembedded/gdm-autologin.pam
@ -13,7 +15,7 @@ index a9f4354..3e0708b 100644
+password include base-auth
+session include base-session
diff --git a/data/pam-openembedded/gdm-launch-environment.pam b/data/pam-openembedded/gdm-launch-environment.pam
index a9f4354..6f095e7 100644
index a9f4354..3e0708b 100644
--- a/data/pam-openembedded/gdm-launch-environment.pam
+++ b/data/pam-openembedded/gdm-launch-environment.pam
@@ -1,5 +1,5 @@
@ -27,19 +29,16 @@ index a9f4354..6f095e7 100644
+password include base-auth
+session include base-session
diff --git a/data/pam-openembedded/gdm-password.pam b/data/pam-openembedded/gdm-password.pam
index 758464d..dd324f8 100644
index 758464d..f4643d1 100644
--- a/data/pam-openembedded/gdm-password.pam
+++ b/data/pam-openembedded/gdm-password.pam
@@ -1,5 +1,8 @@
@@ -1,5 +1,5 @@
#%PAM-1.0
-auth include common-auth
-account include common-account
-password include common-password
-session include common-session
+auth include base-auth
+auth optional pam_gnome_keyring.so
+account include base-account
+password include base-password
+password optional pam_gnome_keyring.so use_authtok
+session include base-session
+session optional pam_gnome_keyring.so auto_start

17
extra-repos/systemd/gdm/APKBUILD
View file

@ -1,9 +1,9 @@
# Forked from Alpine for systemd support
pkgname=gdm
pkgver=9999
_pkgver=45.0.1
pkgrel=1
pkgver=99946.2
_pkgver=46.2
pkgrel=0
pkgdesc="GNOME display manager"
url="https://wiki.gnome.org/Projects/GDM"
# blocked by gnome-shell
@ -27,6 +27,7 @@ makedepends="
glib-dev
gtk+3.0-dev
itstool
json-glib-dev
libcanberra-dev
libgudev-dev
libsm-dev
@ -42,10 +43,10 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-systemd"
options="!check" # Causes circular dep with gnome-shell
source="https://download.gnome.org/sources/gdm/${_pkgver%%.*}/gdm-$_pkgver.tar.xz
0001-DOWNSTREAM-use-bin-touch-instead-of-usr-bin-touch.patch
0003-pam-rename-common-to-base.patch
0003-DOWNSTREAM-pam-rename-common-to-base.patch
Xsession
"
install="gdm.pre-install"
install="gdm.pre-install gdm.post-deinstall"
builddir="$srcdir/gdm-$_pkgver"
build() {
@ -76,8 +77,8 @@ package() {
}
sha512sums="
f0c667dd5df034087e284c2ec1131b55a85cd9e832c15c2aff1637e1e36d4d62a7d86528a2e524bb2782ca7d7cc7cb9c34a9ce9bba688ad222af409e2eb69abe gdm-45.0.1.tar.xz
f91ad0ccae448649e4a7c707b83c796988968a698718db0aedbf2b7c2b9aec0d0cfb12fb4bb7f5de99d3cf337bf4528608625d701872bad8bdc98f8020f0ea95 0001-DOWNSTREAM-use-bin-touch-instead-of-usr-bin-touch.patch
eef64cbc347a2ce894a84f7d1d7612af71b6731492ab67f78a17c9ab37db9cfa0f9d6e8415e58821404eb15336eedd263ca14bfc542b808b62bf684b1594e0fe 0003-pam-rename-common-to-base.patch
29cb00b42b64313f63cbf33a0caf9ecaf43f38699983017966fba951b867742129ef150cd927d02add5f7c1c20049ba1301e5ee094caa54835dc12cf29c86210 gdm-46.2.tar.xz
70b2bb6d6711c17a14c6e6a48b7b29f1b22cf858953f16723ba3e00570dce0416bcb72e4b3d3d4ef608eed32e1f7efa617f94f0a3327c7f5ceeb6b7232e4be84 0001-DOWNSTREAM-use-bin-touch-instead-of-usr-bin-touch.patch
66611d49fc4c9578415a7e554834edcb9de99396bd0ca511dcfd4fb256e8a1cd1fd5f10464f4668ffe04799d919bc22ddb58e8bf272017edba69a7951522e63d 0003-DOWNSTREAM-pam-rename-common-to-base.patch
f836cf0acdf148f2ae09ac28251b5126ce597f08254c43b1ec77596f75e1a3229926116c13f98554625be763e8d28415b27bd679b0a5de9f86bdca7857054c82 Xsession
"

6
extra-repos/systemd/gdm/gdm.post-deinstall Normal file
View file

@ -0,0 +1,6 @@
#!/bin/sh
deluser gdm 2>/dev/null
delgroup gdm 2>/dev/null
exit 0

4
extra-repos/systemd/gdm/gdm.pre-install
View file

@ -1,6 +1,6 @@
#!/bin/sh
addgroup -S gdm 2>/dev/null
adduser -S -D -H -h /var/lib/gdm -s /sbin/nologin -G gdm -g gdm gdm 2>/dev/null
addgroup -S -g 32 gdm 2>/dev/null
adduser -S -D -H -h /var/lib/gdm -s /sbin/nologin -G gdm -g gdm -u 32 gdm 2>/dev/null
exit 0