Mailinglist Archive: opensuse-commit (1117 mails)

< Previous Next >
commit gnome-keyring for openSUSE:Factory
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Mon, 23 Feb 2009 12:50:39 +0100
  • Message-id: <20090223115040.2D7C1678171@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package gnome-keyring for openSUSE:Factory
checked in at Mon Feb 23 12:50:39 CET 2009.


--------
--- GNOME/gnome-keyring/gnome-keyring.changes 2009-02-14 22:23:26.000000000
+0100
+++ /mounts/work_src_done/STABLE/gnome-keyring/gnome-keyring.changes
2009-02-22 01:33:29.000000000 +0100
@@ -1,0 +2,17 @@
+Sun Feb 22 01:32:53 CET 2009 - vuntz@xxxxxxxxxx
+
+- Better document the cleanup of /etc/pam.d/gdm
+
+-------------------------------------------------------------------
+Thu Feb 19 02:27:08 CET 2009 - vuntz@xxxxxxxxxx
+
+- Add gnome-keyring-pam-auth-prompt-password.patch: we make the pam
+ module prompt for a password during auth when none was set.
+- Use pam-config instead of hack in post/postun of the pam package.
+ We have to manually remove the pam_gnome_keyring.so from
+ /etc/pam.d/gdm in post, though.
+- Should fix bnc#466732.
+- Add gnome-keyring-pam-translate.patch to translate the prompt
+ strings in the pam module, using the pam translations.
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
gnome-keyring-pam-auth-prompt-password.patch
gnome-keyring-pam-translate.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gnome-keyring.spec ++++++
--- /var/tmp/diff_new_pack.RE3556/_old 2009-02-23 12:49:45.000000000 +0100
+++ /var/tmp/diff_new_pack.RE3556/_new 2009-02-23 12:49:45.000000000 +0100
@@ -29,8 +29,9 @@
BuildRequires: libtasn1-devel
BuildRequires: pam-devel
BuildRequires: update-desktop-files
+PreReq: pam-config
Version: 2.25.91
-Release: 1
+Release: 2
Url: http://www.gnome.org/
Group: System/GUI/GNOME
License: GPL v2 or later; LGPL v2.1 or later
@@ -40,6 +41,10 @@
Patch3: gnome-keyring-pam-auto-start-if.patch
# PATCH-FIX-OPENSUSE gnome-keyring-check-session.patch vuntz@xxxxxxxxxx --
Only start gnome-keyring in the pam module if GNOME is started
Patch4: gnome-keyring-check-session.patch
+# PATCH-FIX-OPENSUSE gnome-keyring-pam-auth-prompt-password.patch bnc466732
bgo560488 vuntz@xxxxxxxxxx -- Make the pam module prompt the password in auth,
so we can use pam-config. This is a workaround until bnc#477488 is implemented.
+Patch5: gnome-keyring-pam-auth-prompt-password.patch
+# PATCH-FIX-UPSTREAM gnome-keyring-pam-translate.patch bgo572360
vuntz@xxxxxxxxxx -- Mark the "Password: " prompt as translation, and use the
pam translation.
+Patch6: gnome-keyring-pam-translate.patch
Requires: %{name}-lang = %{version}
AutoReqProv: on
# bug437293
@@ -127,6 +132,8 @@
%setup -q
%patch3 -p1
%patch4
+%patch5 -p1
+%patch6 -p1

%build
# needed for gnome-keyring-0.6.0:
@@ -159,29 +166,21 @@
%preun -f %{name}.schemas_preun
%posttrans -f %{name}.schemas_posttrans

-%triggerin pam -- gdm
-if test -f etc/pam.d/gdm ; then
-if ! fgrep -q pam_gnome_keyring.so etc/pam.d/gdm ; then
- sed -i '/ pam_gnome_keyring\.so/d
-$aauth optional pam_gnome_keyring.so\
-session optional pam_gnome_keyring.so auto_start' etc/pam.d/gdm
-fi
-fi
-
%post pam
+%{_sbindir}/pam-config -a --gnome_keyring --gnome_keyring-auto_start_if=gdm ||
true
+# Remove leftover from the old way, before we used pam-config. We start
+# cleaning up in 11.2, so this can be removed in 12.2.
+# Note: this can safely be done after pam-config, since pam-config doesn't
+# touch /etc/pam.d/gdm
if test -f etc/pam.d/gdm; then
-if ! fgrep -q pam_gnome_keyring.so etc/pam.d/gdm ; then
- sed -i '/ pam_gnome_keyring\.so/d
-$aauth optional pam_gnome_keyring.so\
-session optional pam_gnome_keyring.so auto_start' etc/pam.d/gdm
+if fgrep -q pam_gnome_keyring.so etc/pam.d/gdm ; then
+ sed -i '/ pam_gnome_keyring\.so/d' etc/pam.d/gdm
fi
fi

%postun pam
-if test -f etc/pam.d/gdm ; then
-if ! test -f %{_lib}/security/pam_gnome_keyring.so ; then
- sed -i '/ pam_gnome_keyring\.so/d' etc/pam.d/gdm
-fi
+if [ "$1" == "0" ]; then
+ %{_sbindir}/pam-config -d --gnome_keyring || true
fi

%files -f %{name}.lst
@@ -217,6 +216,17 @@
%dir %{_datadir}/gtk-doc/html

%changelog
+* Sun Feb 22 2009 vuntz@xxxxxxxxxx
+- Better document the cleanup of /etc/pam.d/gdm
+* Thu Feb 19 2009 vuntz@xxxxxxxxxx
+- Add gnome-keyring-pam-auth-prompt-password.patch: we make the pam
+ module prompt for a password during auth when none was set.
+- Use pam-config instead of hack in post/postun of the pam package.
+ We have to manually remove the pam_gnome_keyring.so from
+ /etc/pam.d/gdm in post, though.
+- Should fix bnc#466732.
+- Add gnome-keyring-pam-translate.patch to translate the prompt
+ strings in the pam module, using the pam translations.
* Sat Feb 14 2009 mboman@xxxxxxx
- Update to version 2.25.91:
+ Complete certificate details display in the gcr library

++++++ gnome-keyring-pam-auth-prompt-password.patch ++++++
Index: gnome-keyring-2.24.1/pam/gkr-pam-module.c
===================================================================
--- gnome-keyring-2.24.1.orig/pam/gkr-pam-module.c
+++ gnome-keyring-2.24.1/pam/gkr-pam-module.c
@@ -844,12 +844,18 @@ pam_sm_authenticate (pam_handle_t *ph, i
/* Look up the password */
ret = pam_get_item (ph, PAM_AUTHTOK, (const void**)&password);
if (ret != PAM_SUCCESS || password == NULL) {
- if (ret == PAM_SUCCESS)
- syslog (GKR_LOG_WARN, "gkr-pam: no password is
available for user");
- else
- syslog (GKR_LOG_WARN, "gkr-pam: no password is
available for user: %s",
+ ret = prompt_password (ph);
+ if (ret != PAM_SUCCESS) {
+ syslog (GKR_LOG_ERR, "gkr-pam: couldn't get the
password from user: %s",
pam_strerror (ph, ret));
- return PAM_SUCCESS;
+ return PAM_AUTH_ERR;
+ }
+ ret = pam_get_item (ph, PAM_AUTHTOK, (const void**)&password);
+ if (ret != PAM_SUCCESS || password == NULL) {
+ syslog (GKR_LOG_ERR, "gkr-pam: couldn't get the
password from user: %s",
+ ret == PAM_SUCCESS ? "password was null" :
pam_strerror (ph, ret));
+ return PAM_AUTH_ERR;
+ }
}

started_daemon = 0;
++++++ gnome-keyring-pam-translate.patch ++++++
Index: gnome-keyring-2.24.1/pam/gkr-pam-module.c
===================================================================
--- gnome-keyring-2.24.1.orig/pam/gkr-pam-module.c
+++ gnome-keyring-2.24.1/pam/gkr-pam-module.c
@@ -54,6 +54,13 @@
#include <syslog.h>
#include <unistd.h>

+#ifdef ENABLE_NLS
+#include <libintl.h>
+#define gkr_pam_gettext(msgid) dgettext ("Linux-PAM", msgid)
+#else
+#define gkr_pam_gettext(msgid) (msgid)
+#endif /* ENABLE_NLS */
+
enum {
ARG_AUTO_START = 0x0010
};
@@ -760,7 +767,7 @@ prompt_password (pam_handle_t *ph)
memset (&msg, 0, sizeof (msg));
memset (&resp, 0, sizeof (resp));
msg.msg_style = PAM_PROMPT_ECHO_OFF;
- msg.msg = "Password: ";
+ msg.msg = gkr_pam_gettext ("Password: ");
msgs[0] = &msg;

/* Call away */

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread