diff options
| -rw-r--r-- | gnome-keyring/.footprint.i686 | 2 | ||||
| -rw-r--r-- | gnome-keyring/.footprint.x86_64 | 2 | ||||
| -rw-r--r-- | gnome-keyring/.md5sum.i686 | 3 | ||||
| -rw-r--r-- | gnome-keyring/.md5sum.x86_64 | 3 | ||||
| -rw-r--r-- | gnome-keyring/Pkgfile | 6 | ||||
| -rw-r--r-- | gnome-keyring/nopass.patch | 22 |
6 files changed, 32 insertions, 6 deletions
diff --git a/gnome-keyring/.footprint.i686 b/gnome-keyring/.footprint.i686 index f72f531..9de01be 100644 --- a/gnome-keyring/.footprint.i686 +++ b/gnome-keyring/.footprint.i686 @@ -17,7 +17,7 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/gcr-viewer lrwxrwxrwx root/root usr/bin/gnome-keyring -> gnome-keyring-3 -rwxr-xr-x root/root usr/bin/gnome-keyring-3 --rwsr-xr-x root/root usr/bin/gnome-keyring-daemon +-rwxr-xr-x root/root usr/bin/gnome-keyring-daemon drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/gck-1/ drwxr-xr-x root/root usr/include/gck-1/gck/ diff --git a/gnome-keyring/.footprint.x86_64 b/gnome-keyring/.footprint.x86_64 index f72f531..9de01be 100644 --- a/gnome-keyring/.footprint.x86_64 +++ b/gnome-keyring/.footprint.x86_64 @@ -17,7 +17,7 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/gcr-viewer lrwxrwxrwx root/root usr/bin/gnome-keyring -> gnome-keyring-3 -rwxr-xr-x root/root usr/bin/gnome-keyring-3 --rwsr-xr-x root/root usr/bin/gnome-keyring-daemon +-rwxr-xr-x root/root usr/bin/gnome-keyring-daemon drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/gck-1/ drwxr-xr-x root/root usr/include/gck-1/gck/ diff --git a/gnome-keyring/.md5sum.i686 b/gnome-keyring/.md5sum.i686 index b862c74..b25945b 100644 --- a/gnome-keyring/.md5sum.i686 +++ b/gnome-keyring/.md5sum.i686 @@ -1 +1,2 @@ -e6a122836570af7339c0a64a8468b043 gnome-keyring-3.1.92.tar.xz +0f0922c66d6a412ddaa5171b5b8a2175 gnome-keyring-3.2.0.tar.xz +9098f5b8d52353cd3a05823b7e7662f7 nopass.patch diff --git a/gnome-keyring/.md5sum.x86_64 b/gnome-keyring/.md5sum.x86_64 index b862c74..b25945b 100644 --- a/gnome-keyring/.md5sum.x86_64 +++ b/gnome-keyring/.md5sum.x86_64 @@ -1 +1,2 @@ -e6a122836570af7339c0a64a8468b043 gnome-keyring-3.1.92.tar.xz +0f0922c66d6a412ddaa5171b5b8a2175 gnome-keyring-3.2.0.tar.xz +9098f5b8d52353cd3a05823b7e7662f7 nopass.patch diff --git a/gnome-keyring/Pkgfile b/gnome-keyring/Pkgfile index 61ba988..b212ee7 100644 --- a/gnome-keyring/Pkgfile +++ b/gnome-keyring/Pkgfile @@ -6,12 +6,14 @@ # Run on: libtasn1,dconf,gtk3,libgcrypt,p11-kit name=gnome-keyring -version=3.1.92 +version=3.2.0 release=1 -source=(http://download.gnome.org/sources/$name/${version%.*}/$name-$version.tar.xz) +source=(http://download.gnome.org/sources/$name/${version%.*}/$name-$version.tar.xz + nopass.patch) build() { cd $name-$version + patch -p1 < ../nopass.patch ./configure --prefix=/usr \ --libexecdir=/usr/lib/gnome-keyring \ --sysconfdir=/etc \ diff --git a/gnome-keyring/nopass.patch b/gnome-keyring/nopass.patch new file mode 100644 index 0000000..1e42a0b --- /dev/null +++ b/gnome-keyring/nopass.patch @@ -0,0 +1,22 @@ +diff -up gnome-keyring-2.28.1/pam/gkr-pam-module.c.nopass gnome-keyring-2.28.1/pam/gkr-pam-module.c +--- gnome-keyring-2.28.1/pam/gkr-pam-module.c.nopass 2009-09-25 21:55:50.000000000 -0400 ++++ gnome-keyring-2.28.1/pam/gkr-pam-module.c 2009-10-19 11:27:34.000000000 -0400 +@@ -866,6 +866,7 @@ pam_sm_authenticate (pam_handle_t *ph, i + + started_daemon = 0; + ++ + /* Should we start the daemon? */ + if (args & ARG_AUTO_START) { + ret = start_daemon_if_necessary (ph, pwd, password, &started_daemon); +@@ -932,8 +933,9 @@ pam_sm_open_session (pam_handle_t *ph, i + * different PAM callbacks from different processes. + * + * No use complaining ++ * Do not start gnome-keyring, dbus will start it on login. + */ +- password = NULL; ++ return PAM_SUCCESS; + } + + started_daemon = 0; |