[arch-commits] Commit in gdm/trunk (3 files)
Date: Wednesday, August 12, 2020 @ 21:16:25 Author: heftig Revision: 393574 3.36.3-5: Match new pambase Added: gdm/trunk/0004-pam-arch-Update-to-match-pambase-20200721.1-2.patch Modified: gdm/trunk/PKGBUILD Deleted: gdm/trunk/0004-pam-arch-Replace-pam_tally-with-pam_faillock.patch --+ 0004-pam-arch-Replace-pam_tally-with-pam_faillock.patch | 33 -- 0004-pam-arch-Update-to-match-pambase-20200721.1-2.patch | 200 + PKGBUILD |8 3 files changed, 204 insertions(+), 37 deletions(-) Deleted: 0004-pam-arch-Replace-pam_tally-with-pam_faillock.patch === --- 0004-pam-arch-Replace-pam_tally-with-pam_faillock.patch 2020-08-12 19:45:01 UTC (rev 393573) +++ 0004-pam-arch-Replace-pam_tally-with-pam_faillock.patch 2020-08-12 21:16:25 UTC (rev 393574) @@ -1,33 +0,0 @@ -From Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" -Date: Sun, 9 Aug 2020 00:34:37 + -Subject: [PATCH] pam-arch: Replace pam_tally with pam_faillock - -pam 1.4.0 removed the former and replaces it with the latter. - -https://bugs.archlinux.org/task/67485 - data/pam-arch/gdm-fingerprint.pam | 2 +- - data/pam-arch/gdm-smartcard.pam | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/data/pam-arch/gdm-fingerprint.pam b/data/pam-arch/gdm-fingerprint.pam -index a4808617..57d57925 100644 a/data/pam-arch/gdm-fingerprint.pam -+++ b/data/pam-arch/gdm-fingerprint.pam -@@ -1,4 +1,4 @@ --auth required pam_tally.so onerr=succeed file=/var/log/faillog -+auth required pam_faillock.so onerr=succeed file=/var/log/tallylog - auth required pam_shells.so - auth requisite pam_nologin.so - auth required pam_env.so -diff --git a/data/pam-arch/gdm-smartcard.pam b/data/pam-arch/gdm-smartcard.pam -index ec6f75d5..0852476a 100644 a/data/pam-arch/gdm-smartcard.pam -+++ b/data/pam-arch/gdm-smartcard.pam -@@ -1,4 +1,4 @@ --auth required pam_tally.so onerr=succeed file=/var/log/faillog -+auth required pam_faillock.so onerr=succeed file=/var/log/tallylog - auth required pam_shells.so - auth requisite pam_nologin.so - auth required pam_env.so Added: 0004-pam-arch-Update-to-match-pambase-20200721.1-2.patch === --- 0004-pam-arch-Update-to-match-pambase-20200721.1-2.patch (rev 0) +++ 0004-pam-arch-Update-to-match-pambase-20200721.1-2.patch2020-08-12 21:16:25 UTC (rev 393574) @@ -0,0 +1,200 @@ +From Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" +Date: Sun, 9 Aug 2020 00:34:37 + +Subject: [PATCH] pam-arch: Update to match pambase 20200721.1-2 + +https://bugs.archlinux.org/task/67485 +--- + data/pam-arch/gdm-autologin.pam | 22 + + data/pam-arch/gdm-fingerprint.pam| 31 +++- + data/pam-arch/gdm-launch-environment.pam | 24 ++ + data/pam-arch/gdm-password.pam | 17 +++-- + data/pam-arch/gdm-pin.pam| 13 -- + data/pam-arch/gdm-smartcard.pam | 31 +++- + 6 files changed, 75 insertions(+), 63 deletions(-) + delete mode 100644 data/pam-arch/gdm-pin.pam + +diff --git a/data/pam-arch/gdm-autologin.pam b/data/pam-arch/gdm-autologin.pam +index 99b14209..30bdf529 100644 +--- a/data/pam-arch/gdm-autologin.pam b/data/pam-arch/gdm-autologin.pam +@@ -1,13 +1,15 @@ +-auth requisite pam_nologin.so +-auth required pam_env.so +-auth optional pam_gdm.so +-auth optional pam_gnome_keyring.so +-auth optional pam_permit.so ++#%PAM-1.0 + +-account include system-local-login ++auth requiredpam_shells.so ++auth requisite pam_nologin.so ++auth optionalpam_permit.so ++auth requiredpam_env.so ++auth [success=ok default=1] pam_gdm.so ++auth optionalpam_gnome_keyring.so + +-password include system-local-login ++accountinclude system-local-login + +-session optional pam_keyinit.so force revoke +-session include system-local-login +-session optional pam_gnome_keyring.so auto_start ++password requiredpam_deny.so ++ ++sessioninclude system-local-login ++sessionoptionalpam_gnome_keyring.so auto_start +diff --git a/data/pam-arch/gdm-fingerprint.pam b/data/pam-arch/gdm-fingerprint.pam +index a4808617..cc660d9a 100644 +--- a/data/pam-arch/gdm-fingerprint.pam b/data/pam-arch/gdm-fingerprint.pam +@@ -1,14 +1,23 @@ +-auth required pam_tally.so onerr=succeed file=/var/log/faillog +-auth required
[arch-commits] Commit in gdm/trunk (3 files)
Date: Tuesday, September 10, 2019 @ 21:03:56
Author: heftig
Revision: 362176
reword patch
Modified:
gdm/trunk/0002-pam-arch-Don-t-check-greeter-account-for-expiry.patch
gdm/trunk/0003-pam-arch-Restrict-greeter-service-to-the-gdm-user.patch
gdm/trunk/PKGBUILD
--+
0002-pam-arch-Don-t-check-greeter-account-for-expiry.patch |5 +++--
0003-pam-arch-Restrict-greeter-service-to-the-gdm-user.patch |2 +-
PKGBUILD |4 ++--
3 files changed, 6 insertions(+), 5 deletions(-)
Modified: 0002-pam-arch-Don-t-check-greeter-account-for-expiry.patch
===
--- 0002-pam-arch-Don-t-check-greeter-account-for-expiry.patch 2019-09-10
20:52:26 UTC (rev 362175)
+++ 0002-pam-arch-Don-t-check-greeter-account-for-expiry.patch 2019-09-10
21:03:56 UTC (rev 362176)
@@ -1,4 +1,4 @@
-From c4f5540306a4efb8baeba46f68d6566f95e56802 Mon Sep 17 00:00:00 2001
+From a9c2cb0ae478caf40cc24001fbf6cfbbcc19196e Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)"
Date: Tue, 10 Sep 2019 20:37:08 +
Subject: [PATCH 2/3] pam-arch: Don't check greeter account for expiry
@@ -6,7 +6,8 @@
systemd-sysusers now creates expired accounts, which broke the greeter
on new installations.
-Fixes https://bugs.archlinux.org/task/63706
+Doesn't actually fully fix the problem as the user@.service still fails
+to launch.
---
data/pam-arch/gdm-launch-environment.pam | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: 0003-pam-arch-Restrict-greeter-service-to-the-gdm-user.patch
===
--- 0003-pam-arch-Restrict-greeter-service-to-the-gdm-user.patch
2019-09-10 20:52:26 UTC (rev 362175)
+++ 0003-pam-arch-Restrict-greeter-service-to-the-gdm-user.patch
2019-09-10 21:03:56 UTC (rev 362176)
@@ -1,4 +1,4 @@
-From d4d0a149153700b06215dbb5bb8d569080149c9f Mon Sep 17 00:00:00 2001
+From 3b6ca2e211b9874e61e9a6950c52b52f2a79dca3 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)"
Date: Tue, 10 Sep 2019 20:41:10 +
Subject: [PATCH 3/3] pam-arch: Restrict greeter service to the gdm user
Modified: PKGBUILD
===
--- PKGBUILD2019-09-10 20:52:26 UTC (rev 362175)
+++ PKGBUILD2019-09-10 21:03:56 UTC (rev 362176)
@@ -19,8 +19,8 @@
0003-pam-arch-Restrict-greeter-service-to-the-gdm-user.patch)
sha256sums=('SKIP'
'098ffb1cdc0232f014e5fe5fb8d268b752afc54d6ee661664036879acd075b22'
-'38c92ea27881112c601356e615b926fbef6e92737048406eead56a47e961ea56'
-'6c20bf8929fdd996d89ad6aeeb53166252670961746e187f27598fd32921a6ce')
+'2e2b12d4609004a010245de51a8c017b164e84f249cd19706d020cb599d2d7e7'
+'3fa02eb7bbbe1586eae4ae98221a284251ca2869dc731c80b753e7effc443379')
pkgver() {
cd gdm
[arch-commits] Commit in gdm/trunk (3 files)
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.patch2018-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.steff...@gmail.com>
+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 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.patch2018-11-06
22:14:20 UTC (rev 338008)
+++ 0002-Xsession-Don-t-start-ssh-agent-by-default.patch2018-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)"
-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
===
--- PKGBUILD2018-11-06 22:14:20 UTC (rev 338008)
+++ PKGBUILD2018-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
[arch-commits] Commit in gdm/trunk (3 files)
Date: Sunday, March 31, 2013 @ 08:20:07 Author: heftig Revision: 181049 3.8.0 Modified: gdm/trunk/PKGBUILD Deleted: gdm/trunk/git-fixes.patch gdm/trunk/maintain-FamilyLocal-cookie.patch ---+ PKGBUILD | 20 git-fixes.patch | 9067 maintain-FamilyLocal-cookie.patch | 124 3 files changed, 7 insertions(+), 9204 deletions(-) The diff is longer than the limit of 200KB. Use svn diff -r 181048:181049 to see the changes.
[arch-commits] Commit in gdm/trunk (3 files)
Date: Monday, February 18, 2013 @ 17:38:15 Author: jgc Revision: 178234 upgpkg: gdm 3.6.2-2 Add upstream fixes from 3.6 branch. Backport an additional fix from master to fix backwards compatibility. Should fix FS#32967, FS#33580 Added: gdm/trunk/git-fixes.patch gdm/trunk/maintain-FamilyLocal-cookie.patch Modified: gdm/trunk/PKGBUILD ---+ PKGBUILD | 13 git-fixes.patch | 9067 maintain-FamilyLocal-cookie.patch | 124 3 files changed, 9201 insertions(+), 3 deletions(-) The diff is longer than the limit of 200KB. Use svn diff -r 178233:178234 to see the changes.
[arch-commits] Commit in gdm/trunk (3 files)
Date: Monday, March 19, 2012 @ 18:40:17
Author: ibiru
Revision: 153850
update to 3.3.92.1
Modified:
gdm/trunk/PKGBUILD
gdm/trunk/fix_external_program_directories.patch
gdm/trunk/gdm.install
+
PKGBUILD | 48 ++-
fix_external_program_directories.patch | 20 ++--
gdm.install| 13 +++-
3 files changed, 39 insertions(+), 42 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-03-19 21:13:34 UTC (rev 153849)
+++ PKGBUILD2012-03-19 22:40:17 UTC (rev 153850)
@@ -2,7 +2,7 @@
# Maintainer: Jan de Groot j...@archlinux.org
pkgname=gdm
-pkgver=3.2.1.1
+pkgver=3.3.92.1
pkgrel=1
pkgdesc=Gnome Display Manager (a reimplementation of xdm)
arch=('i686' 'x86_64')
@@ -17,26 +17,15 @@
optdepends=('gnome-shell: new login interface'
'fprintd: fingerprint authentication')
install=gdm.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*.*}/$pkgname-$pkgver.tar.xz
fix_external_program_directories.patch
gdm-vt-allocation-hack.patch
gdm
gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam
gdm-smartcard.pam gdm-welcome.pam)
-sha256sums=('85a1383f93870fb5d47a938cc2e04b6f0d74cb611a2b5d94d9651b78a5ccffbd'
-'2014ae3a6077546f7c07e80a6acc8a1c80c6765ad319ec389f52500c5a4fb363'
-'3c8b588d4af08d94dc93bcd5e4c2a983c3f4fbbbe40833bceac2a1df4f1e8215'
-'272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550'
-'b30dfa217718b43ff3aa4e8af08985963175b79ff30698ec54e8396d2905922d'
-'5bc3ff3ea7b31219dfcb7d9fc0eb2819eca1c5573a0f426d288a17560a69633e'
-'f1dfa4d88288d4b0a631a68a51b46c2da537bee8fe5a99f9f288c8ff75a50b19'
-'92aded0804bad8a609fd150448ad4a2edb8166c17cb4e2b581559e80603bbb6c'
-'df74b0dcfb17ea43cc1e268a27cd256c552672457db1af40b285452d16b3e2fd'
-'39bf3824cc505043dc3136356da16dab9df9f369f1077435a324be2ac16cf834')
-
build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- patch -Np1 -i ${srcdir}/fix_external_program_directories.patch
- patch -Np1 -i ${srcdir}/gdm-vt-allocation-hack.patch
+ cd $srcdir/$pkgname-$pkgver
+ patch -Np1 -i $srcdir/fix_external_program_directories.patch
+ patch -Np1 -i $srcdir/gdm-vt-allocation-hack.patch
./configure --prefix=/usr --sysconfdir=/etc \
--libexecdir=/usr/lib/gdm \
@@ -44,24 +33,33 @@
--with-at-spi-registryd-directory=/usr/lib/at-spi2-core \
--disable-scrollkeeper \
--disable-static \
- --without-tcp-wrappers
+ --without-tcp-wrappers \
+ --disable-schemas-compile
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/if test
$export_dynamic = yes test -n $export_dynamic_flag_spec; then/
func_append compile_command -Wl,-O1,--as-needed\n func_append
finalize_command -Wl,-O1,--as-needed\n\0/' libtool
make
}
package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${pkgdir} install
- install -m755 -d ${pkgdir}/usr/share/gconf/schemas
- gconf-merge-schema ${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas
--domain gdm ${pkgdir}/etc/gconf/schemas/*.schemas
+ cd $srcdir/$pkgname-$pkgver
+ make DESTDIR=$pkgdir install
for i in gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam
gdm-smartcard.pam gdm-welcome.pam;do
- install -m644 ${srcdir}/${i} ${pkgdir}/etc/pam.d/${i%.pam}
+ install -m644 $srcdir/$i $pkgdir/etc/pam.d/${i%.pam}
done
install -Dm755 ${srcdir}/gdm ${pkgdir}/etc/rc.d/gdm
- chmod 1770 ${pkgdir}/var/log/gdm
- chmod 700 ${pkgdir}/var/lib/gdm/.config/dconf
- rm -rf ${pkgdir}/var/run ${pkgdir}/var/gdm ${pkgdir}/etc/gconf
+ chmod 1770 $pkgdir/var/log/gdm
+ chmod 700 $pkgdir/var/lib/gdm/.config/dconf
+ rm -rf $pkgdir/var/run $pkgdir/var/gdm
}
+sha256sums=('957456fa8f3c5243c45d5f0be89931a515b79efd881a0423e8552a8f46c5379c'
+'f68600ccf80f475deb417d58ab3306c4a1ba4622688e2901996c8549c85a9ee6'
+'3c8b588d4af08d94dc93bcd5e4c2a983c3f4fbbbe40833bceac2a1df4f1e8215'
+'272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550'
+'b30dfa217718b43ff3aa4e8af08985963175b79ff30698ec54e8396d2905922d'
+'5bc3ff3ea7b31219dfcb7d9fc0eb2819eca1c5573a0f426d288a17560a69633e'
+'f1dfa4d88288d4b0a631a68a51b46c2da537bee8fe5a99f9f288c8ff75a50b19'
+'92aded0804bad8a609fd150448ad4a2edb8166c17cb4e2b581559e80603bbb6c'
+'df74b0dcfb17ea43cc1e268a27cd256c552672457db1af40b285452d16b3e2fd'
+'39bf3824cc505043dc3136356da16dab9df9f369f1077435a324be2ac16cf834')
Modified: fix_external_program_directories.patch
[arch-commits] Commit in gdm/trunk (3 files)
Date: Saturday, October 1, 2011 @ 21:21:56
Author: ibiru
Revision: 139469
g-s-d is now a requirement, make fallback mode fault by adding metacity as
dependency
Added:
gdm/trunk/check-for-shell.patch
Modified:
gdm/trunk/PKGBUILD
gdm/trunk/fix_external_program_directories.patch
+
PKGBUILD | 14 +-
check-for-shell.patch | 26 ++
fix_external_program_directories.patch | 22 +++---
3 files changed, 46 insertions(+), 16 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-10-02 00:35:06 UTC (rev 139468)
+++ PKGBUILD2011-10-02 01:21:56 UTC (rev 139469)
@@ -1,8 +1,9 @@
# $Id$
# Maintainer: Jan de Groot j...@archlinux.org
+
pkgname=gdm
pkgver=3.2.0
-pkgrel=1
+pkgrel=2
pkgdesc=Gnome Display Manager (a reimplementation of xdm)
arch=('i686' 'x86_64')
license=('GPL')
@@ -11,7 +12,7 @@
'etc/pam.d/gdm-smartcard' 'etc/pam.d/gdm-welcome'
'etc/gdm/custom.conf')
groups=('gnome-extra')
options=('!libtool')
-depends=('libcanberra' 'libxklavier' 'gnome-session' 'upower'
'accountsservice' 'consolekit' 'xorg-xrdb' 'nss')
+depends=('libcanberra' 'libxklavier' 'gnome-session' 'gnome-settings-daemon'
'metacity' 'upower' 'accountsservice' 'consolekit' 'xorg-xrdb' 'nss')
makedepends=('intltool' 'gnome-doc-utils' 'xorg-server'
'gobject-introspection')
optdepends=('gnome-shell: new login interface')
install=gdm.install
@@ -19,9 +20,10 @@
fix_external_program_directories.patch
gdm-vt-allocation-hack.patch
gdm
-gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam
gdm-smartcard.pam gdm-welcome.pam)
+gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam
gdm-smartcard.pam gdm-welcome.pam
+
check-for-shell.patch::http://git.gnome.org/browse/gdm/patch/?id=64e6b10f98fe7226a2f41807268dae3afa80236d)
sha256sums=('f827f5500827acef94ad2d60f02ec489bc35cb6392d8f4a60ec814599c2991b7'
-'55654861b14fea344bc7a43fa265c9aaffcd16f5cf56360483fff5d4dc83cf15'
+'2014ae3a6077546f7c07e80a6acc8a1c80c6765ad319ec389f52500c5a4fb363'
'3c8b588d4af08d94dc93bcd5e4c2a983c3f4fbbbe40833bceac2a1df4f1e8215'
'272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550'
'b30dfa217718b43ff3aa4e8af08985963175b79ff30698ec54e8396d2905922d'
@@ -29,10 +31,12 @@
'f1dfa4d88288d4b0a631a68a51b46c2da537bee8fe5a99f9f288c8ff75a50b19'
'0dbb37b4e2a2a2dd2305f0f69cf32d63d353d34aacaf805d2c2ec52fbe558bb4'
'df74b0dcfb17ea43cc1e268a27cd256c552672457db1af40b285452d16b3e2fd'
-'39bf3824cc505043dc3136356da16dab9df9f369f1077435a324be2ac16cf834')
+'39bf3824cc505043dc3136356da16dab9df9f369f1077435a324be2ac16cf834'
+'ae54f11e593e97e031d2dd7b33ce9899038356cef87b354f3c4c596a3153155d')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
+ patch -Np1 -i ${srcdir}/check-for-shell.patch
patch -Np1 -i ${srcdir}/fix_external_program_directories.patch
patch -Np1 -i ${srcdir}/gdm-vt-allocation-hack.patch
Added: check-for-shell.patch
===
--- check-for-shell.patch (rev 0)
+++ check-for-shell.patch 2011-10-02 01:21:56 UTC (rev 139469)
@@ -0,0 +1,26 @@
+From 64e6b10f98fe7226a2f41807268dae3afa80236d Mon Sep 17 00:00:00 2001
+From: György Balló ball...@freestart.hu
+Date: Fri, 30 Sep 2011 21:48:40 +
+Subject: data: add back check for gnome-shell before running gdm-shell session
+
+Add back commit 4892c9447324f2248ce944f150abe3143f78eaa3
+
+This commit does a quick check to make sure gnome-shell is
+installed, and supports --gdm-mode. If either of those fail,
+then fall back to the old greeter.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=660409
+---
+diff --git a/data/gdm-shell.session.in b/data/gdm-shell.session.in
+index 3d408c3..496cc10 100644
+--- a/data/gdm-shell.session.in
b/data/gdm-shell.session.in
+@@ -1,5 +1,5 @@
+ [GNOME Session]
+ Name=Display Manager
+ RequiredComponents=gnome-shell;gnome-settings-daemon;
+-IsRunnableHelper=@libexecdir@/gnome-session-check-accelerated
++IsRunnableHelper=bash -c 'gnome-shell --help | grep -q gdm-mode
@libexecdir@/gnome-session-check-accelerated'
+ FallbackSession=gdm-fallback
+--
+cgit v0.9.0.2
Modified: fix_external_program_directories.patch
===
--- fix_external_program_directories.patch 2011-10-02 00:35:06 UTC (rev
139468)
+++ fix_external_program_directories.patch 2011-10-02 01:21:56 UTC (rev
139469)
@@ -1,6 +1,6 @@
-diff -Nur gdm-3.1.91.orig/daemon/gdm-server.c gdm-3.1.91/daemon/gdm-server.c
gdm-3.1.91.orig/daemon/gdm-server.c2011-09-09 21:58:06.586838200
+
-+++ gdm-3.1.91/daemon/gdm-server.c
[arch-commits] Commit in gdm/trunk (3 files)
Date: Friday, September 9, 2011 @ 18:07:35
Author: ibiru
Revision: 137580
update to 3.1.91
Modified:
gdm/trunk/PKGBUILD
gdm/trunk/fix_external_program_directories.patch
Deleted:
gdm/trunk/fix-consolekit-registration.patch
+
PKGBUILD | 17 ++---
fix-consolekit-registration.patch | 98 ---
fix_external_program_directories.patch | 22 +++---
3 files changed, 19 insertions(+), 118 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-09-09 21:39:09 UTC (rev 137579)
+++ PKGBUILD2011-09-09 22:07:35 UTC (rev 137580)
@@ -1,8 +1,8 @@
# $Id$
# Maintainer: Jan de Groot j...@archlinux.org
pkgname=gdm
-pkgver=3.1.90
-pkgrel=4
+pkgver=3.1.91
+pkgrel=1
pkgdesc=Gnome Display Manager (a reimplementation of xdm)
arch=('i686' 'x86_64')
license=('GPL')
@@ -17,22 +17,20 @@
source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
fix_external_program_directories.patch
gdm
-gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam
gdm-smartcard.pam gdm-welcome.pam
-fix-consolekit-registration.patch)
-sha256sums=('3fb9c52b8a18f39539c53d84645b89836de25a3eb3a0b84388e76a4f988178bf'
-'b7c19ab68dc38216f751be6d1e66d617fb9011e23185590e52ac1974d3bc1afb'
+gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam
gdm-smartcard.pam gdm-welcome.pam)
+sha256sums=('a9163b711f9cdd005b872575226dd97e06b3eb5e34369aae905e96677e682ef2'
+'55654861b14fea344bc7a43fa265c9aaffcd16f5cf56360483fff5d4dc83cf15'
'272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550'
'b30dfa217718b43ff3aa4e8af08985963175b79ff30698ec54e8396d2905922d'
'5bc3ff3ea7b31219dfcb7d9fc0eb2819eca1c5573a0f426d288a17560a69633e'
'f1dfa4d88288d4b0a631a68a51b46c2da537bee8fe5a99f9f288c8ff75a50b19'
'0dbb37b4e2a2a2dd2305f0f69cf32d63d353d34aacaf805d2c2ec52fbe558bb4'
'df74b0dcfb17ea43cc1e268a27cd256c552672457db1af40b285452d16b3e2fd'
-'39bf3824cc505043dc3136356da16dab9df9f369f1077435a324be2ac16cf834'
-'405d82ad12ea6371ddc031e7d86e5d2ade6fe054bebbfaf24c89ac0a85fcef1c')
+'39bf3824cc505043dc3136356da16dab9df9f369f1077435a324be2ac16cf834')
+
build() {
cd ${srcdir}/${pkgname}-${pkgver}
patch -Np1 -i ${srcdir}/fix_external_program_directories.patch
- patch -Np1 -i ${srcdir}/fix-consolekit-registration.patch
./configure --prefix=/usr --sysconfdir=/etc \
--libexecdir=/usr/lib/gdm \
@@ -57,5 +55,6 @@
install -Dm755 ${srcdir}/gdm ${pkgdir}/etc/rc.d/gdm
chmod 1770 ${pkgdir}/var/log/gdm
+ chmod 700 ${pkgdir}/var/lib/gdm/.config/dconf
rm -rf ${pkgdir}/var/run ${pkgdir}/var/gdm ${pkgdir}/etc/gconf
}
Deleted: fix-consolekit-registration.patch
===
--- fix-consolekit-registration.patch 2011-09-09 21:39:09 UTC (rev 137579)
+++ fix-consolekit-registration.patch 2011-09-09 22:07:35 UTC (rev 137580)
@@ -1,98 +0,0 @@
-From 984038d2df357750f49658ad0c5bfe0d2e812ffd Mon Sep 17 00:00:00 2001
-From: Ray Strode rstr...@redhat.com
-Date: Tue, 06 Sep 2011 15:41:07 +
-Subject: daemon: fix consolekit registration
-
-ioni pointed out on IRC, that since commit
-647cad5bf59a4ff3776ba1ae5cda6b11cfb2
-
-the greeter session isn't getting fully registered
-with consolekit and so udev acls weren't being
-properly applied.
-
-This commit passes the tty to the worker process
-so that it can be used for registration.
-
-It also passes hostname, merely for completeness.
-diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
-index 1d5c16a..c25bc9b 100644
a/daemon/gdm-session-direct.c
-+++ b/daemon/gdm-session-direct.c
-@@ -1401,6 +1401,8 @@ do_introspect (DBusConnection *connection,
-signal name=\SetupForProgram\\n
- arg name=\service_name\
type=\s\/\n
- arg name=\x11_display_name\
type=\s\/\n
-+ arg name=\display_device\
type=\s\/\n
-+ arg name=\hostname\ type=\s\/\n
- arg name=\x11_authority_file\
type=\s\/\n
- arg name=\log_file\ type=\s\/\n
-/signal\n
-@@ -2052,6 +2054,8 @@ send_setup_for_program (GdmSessionDirect *session,
- DBusMessage*message;
- DBusMessageIter iter;
- const char *display_name;
-+const char *display_device;
-+const char *display_hostname;
- const char *display_x11_authority_file;
- GdmSessionConversation *conversation;
-
-@@ -2062,6 +2066,16 @@ send_setup_for_program
[arch-commits] Commit in gdm/trunk (3 files)
Date: Thursday, December 2, 2010 @ 19:13:34 Author: ibiru Revision: 101947 upgpkg: gdm 2.32.0-3 port user switcher applet to libpanel-applet-3.0, dropping gnome-panel-bonobo optdepend. https://bugzilla.gnome.org/show_bug.cgi?id=571877 Added: gdm/trunk/0001-port-to-libpanel-applet-3.0.patch Modified: gdm/trunk/PKGBUILD Deleted: gdm/trunk/ck-since.patch + 0001-port-to-libpanel-applet-3.0.patch | 506 +++ PKGBUILD | 13 ck-since.patch | 45 -- 3 files changed, 515 insertions(+), 49 deletions(-) Added: 0001-port-to-libpanel-applet-3.0.patch === --- 0001-port-to-libpanel-applet-3.0.patch (rev 0) +++ 0001-port-to-libpanel-applet-3.0.patch 2010-12-03 00:13:34 UTC (rev 101947) @@ -0,0 +1,506 @@ +diff --git a/configure.ac b/configure.ac +index ed07dce..bf98669 100644 +--- a/configure.ac b/configure.ac +@@ -45,7 +45,7 @@ GTK_REQUIRED_VERSION=2.20.0 + PANGO_REQUIRED_VERSION=1.3.0 + SCROLLKEEPER_REQUIRED_VERSION=0.1.4 + GCONF_REQUIRED_VERSION=2.31.3 +-GNOME_PANEL_REQUIRED_VERSION=2.0.0 ++GNOME_PANEL_REQUIRED_VERSION=2.31.90 + LIBXKLAVIER_REQUIRED_VERSION=4.0 + LIBCANBERRA_GTK_REQUIRED_VERSION=0.4 + #FONTCONFIG_REQUIRED_VERSION=2.6.0 +@@ -152,7 +152,7 @@ AC_SUBST(SIMPLE_CHOOSER_LIBS) + PKG_CHECK_MODULES(APPLET, + dbus-glib-1 = $DBUS_GLIB_REQUIRED_VERSION + gtk+-2.0 = $GTK_REQUIRED_VERSION +-libpanelapplet-2.0 = $GNOME_PANEL_REQUIRED_VERSION) ++libpanelapplet-3.0 = $GNOME_PANEL_REQUIRED_VERSION) + AC_SUBST(APPLET_CFLAGS) + AC_SUBST(APPLET_LIBS) + +diff --git a/gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in b/gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in +deleted file mode 100644 +index a9b775f..000 +--- a/gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in /dev/null +@@ -1,38 +0,0 @@ +-oaf_info +- oaf_server iid=OAFIID:GNOME_FastUserSwitchApplet_Factory type=exe +- location=@LIBEXECDIR@/gdm-user-switch-applet +- +-oaf_attribute name=repo_ids type=stringv +- item value=IDL:Bonobo/GenericFactory:1.0/ +- item value=IDL:Bonobo/Unknown:1.0/ +-/oaf_attribute +-oaf_attribute name=name type=string _value=User Switcher Applet Factory/ +-oaf_attribute name=description type=string _value=User Switcher Applet Factory/ +-oaf_attribute name=bonobo:environment type=stringv +- item value=DBUS_SESSION_BUS_ADDRESS/ +- oaf_attribute name=bugzilla:bugzilla type=string value=GNOME/ +- oaf_attribute name=bugzilla:product type=string value=gdm/ +- oaf_attribute name=bugzilla:component type=string value=general/ +- oaf_attribute name=bugzilla:version type=string value=@VERSION@/ +- oaf_attribute name=bugzilla:other_binaries type=string value=gdm-user-switch-applet/ +-/oaf_attribute +- /oaf_server +- +- oaf_server iid=OAFIID:GNOME_FastUserSwitchApplet type=factory +- location=OAFIID:GNOME_FastUserSwitchApplet_Factory +- +-oaf_attribute name=repo_ids type=stringv +- item value=IDL:GNOME/Vertigo/PanelAppletShell:1.0/ +- item value=IDL:Bonobo/Control:1.0/ +- item value=IDL:Bonobo/Unknown:1.0/ +-/oaf_attribute +-oaf_attribute name=name type=string _value=User Switcher/ +-oaf_attribute name=description type=string _value=A menu to quickly switch between users/ +-oaf_attribute name=panel:icon type=string value=stock_people/ +-oaf_attribute name=bugzilla:bugzilla type=string value=GNOME/ +-oaf_attribute name=bugzilla:product type=string value=gdm/ +-oaf_attribute name=bugzilla:component type=string value=general/ +-oaf_attribute name=bugzilla:version type=string value=@VERSION@/ +-oaf_attribute name=bugzilla:other_binaries type=string value=gdm-user-switch-applet/ +- /oaf_server +-/oaf_info +diff --git a/gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml b/gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml +deleted file mode 100644 +index e1845c8..000 +--- a/gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml /dev/null +@@ -1,20 +0,0 @@ +-Root +- popups +-popup name=button3 +- menuitem +- name=About Me Item +- verb=GdmAboutMe +- _label=Edit Personal _Information/ +- menuitem +- name=Users and Groups Admin Item +- verb=GdmUsersGroupsAdmin +- _label=_Edit Users and Groups/ +- menuitem +- name=About Item +- verb=GdmAbout +- _label=_About +- pixtype=stock +- pixname=gtk-about/ +-/popup +- /popups +-/Root +diff --git a/gui/user-switch-applet/Makefile.am b/gui/user-switch-applet/Makefile.am +index 2d2cdc0..cebe890 100644 +--- a/gui/user-switch-applet/Makefile.am b/gui/user-switch-applet/Makefile.am +@@ -13,6 +13,7 @@ AM_CPPFLAGS = \ +
[arch-commits] Commit in gdm/trunk (3 files)
Date: Tuesday, August 10, 2010 @ 14:27:07
Author: jgc
Revision: 87084
Remove old patch, add patch to utilize the --since option from consolekit to
fix issues with ck-history taking a long time
Added:
gdm/trunk/ck-since.patch
Modified:
gdm/trunk/PKGBUILD
Deleted:
gdm/trunk/keyboard-use-xklavier.patch
-+
PKGBUILD|7 ++-
ck-since.patch | 45 ++
keyboard-use-xklavier.patch | 85 --
3 files changed, 50 insertions(+), 87 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-08-10 18:06:13 UTC (rev 87083)
+++ PKGBUILD2010-08-10 18:27:07 UTC (rev 87084)
@@ -2,7 +2,7 @@
# Maintainer: Jan de Groot j...@archlinux.org
pkgname=gdm
pkgver=2.30.4
-pkgrel=1
+pkgrel=2
pkgdesc=Gnome Display Manager (a reimplementation of xdm)
arch=('i686' 'x86_64')
license=('GPL')
@@ -10,7 +10,7 @@
backup=('etc/pam.d/gdm' 'etc/pam.d/gdm-autologin' 'etc/gdm/custom.conf')
groups=('gnome-extra')
options=('!libtool')
-depends=('libcanberra=0.23' 'libxklavier=5.0' 'tcp_wrappers'
'gnome-session=2.30.2' 'upower=0.9.4')
+depends=('libcanberra=0.23' 'libxklavier=5.0' 'tcp_wrappers'
'gnome-session=2.30.2' 'upower=0.9.4' 'consolekit=0.4.1-4')
makedepends=('intltool' 'gnome-doc-utils=0.20.1' 'xorg-server'
'gnome-panel=2.30.2')
optdepends=('gnome-panel: needed for user switch applet')
conflicts=('fast-user-switch-applet')
@@ -18,11 +18,13 @@
install=gdm.install
source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2
04_fix_external_program_directories.patch
+ck-since.patch
gdm.pam
gdm-autologin.pam
gdm)
sha256sums=('3a1c7fd590622d5291584d98ce5cf3e7888adf949655041549561f3a5983b5a9'
'cb585c39c6671387b5a25f21a99c97e3a20eaf4188fea1b62871681a1ebf8bff'
+'bbe7dcfa162fd4eb362e15d5742beef6881535bd449524097a14c54afec99bff'
'f1dfa4d88288d4b0a631a68a51b46c2da537bee8fe5a99f9f288c8ff75a50b19'
'3daff680ff6b7ea56f84f40843e46e72477c81e9e405028203c942af04d07ae5'
'272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550')
@@ -30,6 +32,7 @@
build() {
cd ${srcdir}/${pkgname}-${pkgver}
patch -Np1 -i ${srcdir}/04_fix_external_program_directories.patch
+ patch -Np1 -i ${srcdir}/ck-since.patch
./configure --prefix=/usr --sysconfdir=/etc \
--libexecdir=/usr/lib/gdm --localstatedir=/var --disable-static \
--with-at-spi-registryd-directory=/usr/lib/at-spi \
Added: ck-since.patch
===
--- ck-since.patch (rev 0)
+++ ck-since.patch 2010-08-10 18:27:07 UTC (rev 87084)
@@ -0,0 +1,45 @@
+diff -ruN gdm-2.30.4/gui/simple-greeter/gdm-user-manager.c
gdm-2.30.4.since//gui/simple-greeter/gdm-user-manager.c
+--- gdm-2.30.4/gui/simple-greeter/gdm-user-manager.c 2010-06-26
00:09:31.0 +0200
gdm-2.30.4.since//gui/simple-greeter/gdm-user-manager.c2010-08-10
20:11:21.08061 +0200
+@@ -75,6 +75,10 @@
+ #define GDM_USERNAME gdm
+ #endif
+
++/* approximately two months */
++#define LOGIN_FREQUENCY_TIME_WINDOW_SECS (60 * 24 * 60 * 60)
++
++
+ #define RELOAD_PASSWD_THROTTLE_SECS 5
+
+ typedef enum {
+@@ -1579,12 +1583,14 @@
+ load_ck_history (GdmUserManager *manager)
+ {
+ char *command;
++char *since;
+ const char *seat_id;
+ GError *error;
+ gbooleanres;
+ char **argv;
+ int standard_out;
+ GIOChannel *channel;
++GTimeValtv;
+
+ g_assert (manager-priv-ck_history_id == 0);
+
+@@ -1602,8 +1608,14 @@
+ goto out;
+ }
+
+-command = g_strdup_printf (ck-history --frequent --seat='%s'
--session-type='',
++g_get_current_time (tv);
++tv.tv_sec -= LOGIN_FREQUENCY_TIME_WINDOW_SECS;
++since = g_time_val_to_iso8601 (tv);
++
++command = g_strdup_printf (ck-history --frequent --since='%s'
--seat='%s' --session-type='',
++ since,
+seat_id);
++g_free (since);
+ g_debug (GdmUserManager: running '%s', command);
+ error = NULL;
+ if (! g_shell_parse_argv (command, NULL, argv, error)) {
Deleted: keyboard-use-xklavier.patch
===
--- keyboard-use-xklavier.patch 2010-08-10 18:06:13 UTC (rev 87083)
+++ keyboard-use-xklavier.patch 2010-08-10 18:27:07 UTC (rev 87084)
@@ -1,85 +0,0 @@
-Ubuntu hal patch translated to libxklavier.
-Always overrides keyboard layout variants:
https://bugzilla.gnome.org/show_bug.cgi?id=572765
gdm-2.28.1.orig/daemon/gdm-session-direct.c2009-10-20
00:12:45.0 +0200
-+++ gdm-2.28.1/daemon/gdm-session-direct.c
