Hello community,
here is the log from the commit of package gnome-keyring
checked in at Thu Aug 2 23:52:35 CEST 2007.
--------
--- GNOME/gnome-keyring/gnome-keyring.changes 2007-04-11 18:41:57.000000000 +0200
+++ /mounts/work_src_done/STABLE/gnome-keyring/gnome-keyring.changes 2007-08-02 22:39:54.256750000 +0200
@@ -1,0 +2,26 @@
+Thu Aug 2 22:39:42 CEST 2007 - jpr@suse.de
+
+- Build with pam support in gnome-keyring-pam
+
+-------------------------------------------------------------------
+Thu Aug 2 19:34:07 CEST 2007 - maw@suse.de
+
+- Update to version 2.19.6.1:
+ + Sync with current gnome version numbers
+ + Build fixes
+ + Use libgcrypt instead of hand-rolled encryption algorithms
+ + Code refactoring and cleanup
+ + Error and warning messages are logged to syslog when running
+ as a daemon
+ + Use non-pageable memory for secrets and passwords
+ + Use NULL consistently in the API to represent the default
+ keyrong
+ + Improved prompts
+ + Handle unix signals properly
+ + Keyrings supported on removeable drives
+ + New API
+ + API docs
+ + Unit tests are run automagically when building
+ + Misc. bug fixes
+
+-------------------------------------------------------------------
Old:
----
gnome-keyring-0.8.1.tar.bz2
New:
----
gnome-keyring-2.19.6.1.tar.bz2
gnome-keyring-with-pam-dir.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-keyring.spec ++++++
--- /var/tmp/diff_new_pack.Z23448/_old 2007-08-02 23:49:02.000000000 +0200
+++ /var/tmp/diff_new_pack.Z23448/_new 2007-08-02 23:49:02.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package gnome-keyring (Version 0.8.1)
+# spec file for package gnome-keyring (Version 2.19.6.1)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,16 +12,18 @@
Name: gnome-keyring
#BuildRequires: CASA-devel
-BuildRequires: gtk-doc gtk2-devel intltool update-desktop-files
-Version: 0.8.1
+BuildRequires: gtk-doc gtk2-devel intltool libgcrypt-devel pam-devel update-desktop-files
+Version: 2.19.6.1
Release: 1
URL: http://www.gnome.org/
Group: System/GUI/GNOME
-License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL)
+License: GPL v2 or later, LGPL v2 or later
Summary: GNOME Keyring Password Manager
Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/0.6/%{name}-%{version}.tar.bz2
Patch1: gnome-keyring-use-markup-correctly.patch
+# FIXME: This patch needs to be redone!
Patch3: gnome-keyring-0.4.6-casa-integration.patch
+Patch4: gnome-keyring-with-pam-dir.patch
Autoreqprov: on
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -37,9 +39,26 @@
--------
Alexander Larsson
-%package devel
+%package pam
Group: System/GUI/GNOME
Summary: GNOME Keyring Password Manager
+Requires: %{name} = %{version}
+
+%description pam
+GNOME Keyring Manager is a program that keeps passwords and other
+secrets for users. It is run as a daemon in the session, similar to
+ssh-agent, and other applications can locate it by an environment
+variable.
+
+
+
+Authors:
+--------
+ Alexander Larsson
+
+%package devel
+Group: Development/Libraries/GNOME
+Summary: GNOME Keyring Password Manager
Requires: %{name} = %{version} glib2-devel
%description devel
@@ -76,28 +95,53 @@
%prep
%setup -q
%patch1
-%patch3 -p1
+### %patch3 -p1
+%patch4
%build
autoreconf -f -i
# needed for gnome-keyring-0.6.0:
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%configure\
- --libexecdir=%{_prefix}/lib/gnome-keyring-1
+ --libexecdir=%{_prefix}/lib/gnome-keyring-1\
+ --with-pam-dir=/%{_lib}/security
make %{?jobs:-j%jobs}
%install
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=$RPM_BUILD_ROOT install install-pam
%find_lang %{name}
%clean
# rm -rf $RPM_BUILD_ROOT
-%post
-%run_ldconfig
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
-%postun
-%run_ldconfig
+%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 auto_start\
+session optional pam_gnome_keyring.so' etc/pam.d/gdm
+fi
+fi
+
+%post pam
+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 auto_start\
+session optional pam_gnome_keyring.so' 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
+fi
%files -f %{name}.lang
%defattr (-, root, root)
@@ -106,6 +150,10 @@
%{_libdir}/*.so.*
%{_prefix}/lib/gnome-keyring-1
+%files pam
+%defattr (-, root, root)
+%attr(555,root,root) /%{_lib}/security/*.so
+
%files devel
%defattr (-, root, root)
%{_libdir}/*.so
@@ -118,6 +166,26 @@
%{_datadir}/gtk-doc/html/gnome-keyring
%changelog
+* Thu Aug 02 2007 - jpr@suse.de
+- Build with pam support in gnome-keyring-pam
+* Thu Aug 02 2007 - maw@suse.de
+- Update to version 2.19.6.1:
+ + Sync with current gnome version numbers
+ + Build fixes
+ + Use libgcrypt instead of hand-rolled encryption algorithms
+ + Code refactoring and cleanup
+ + Error and warning messages are logged to syslog when running
+ as a daemon
+ + Use non-pageable memory for secrets and passwords
+ + Use NULL consistently in the API to represent the default
+ keyrong
+ + Improved prompts
+ + Handle unix signals properly
+ + Keyrings supported on removeable drives
+ + New API
+ + API docs
+ + Unit tests are run automagically when building
+ + Misc. bug fixes
* Wed Apr 11 2007 - maw@suse.de
- Update to version 0.8.1, which
- Fixes a crash when called with a NULL keyring
++++++ gnome-keyring-0.8.1.tar.bz2 -> gnome-keyring-2.19.6.1.tar.bz2 ++++++
++++ 87344 lines of diff (skipped)
++++++ gnome-keyring-use-markup-correctly.patch ++++++
--- /var/tmp/diff_new_pack.Z23448/_old 2007-08-02 23:49:04.000000000 +0200
+++ /var/tmp/diff_new_pack.Z23448/_new 2007-08-02 23:49:04.000000000 +0200
@@ -1,31 +1,32 @@
? gnome-keyring-use-markup-correctly.patch
-Index: gnome-keyring-ask.c
+Index: ui/gkr-ask-tool.c
===================================================================
-RCS file: /cvs/gnome/gnome-keyring/gnome-keyring-ask.c,v
-retrieving revision 1.13
-diff -u -p -u -r1.13 gnome-keyring-ask.c
---- gnome-keyring-ask.c 24 Oct 2005 07:03:34 -0000 1.13
-+++ gnome-keyring-ask.c 8 May 2006 18:11:36 -0000
-@@ -51,7 +51,8 @@ const char *env_item_name;
- static char *
- create_markup (const char *primary, const char *secondary)
+--- ui/gkr-ask-tool.c.orig
++++ ui/gkr-ask-tool.c
+@@ -45,8 +45,9 @@ static gchar*
+ create_markup (const gchar *primary, const gchar *secondary)
{
-- return g_strconcat ("", primary, "</span>\n\n", secondary, NULL);
+ /* We're passed markup for both of these */
+- return g_strdup_printf ("%s</span>\n\n%s",
+- primary, secondary ? secondary : "");
+ return g_markup_printf_escaped ("%s</span>\n\n%s",
-+ primary, secondary);
++ primary, secondary ? secondary : "");
++
}
- static char *
-@@ -142,9 +143,10 @@ run_dialog (const char *title,
- 0, 1, 0 ,1);
+ static gchar*
+@@ -271,9 +272,12 @@ run_dialog (gboolean include_password,
+ g_free (value);
+ g_free (value2);
- message = create_markup (primary, secondary);
- message_widget = GTK_LABEL (gtk_label_new (message));
+- g_free (message);
++ /* message_widget = GTK_LABEL (gtk_label_new (message)); */
+ message_widget = GTK_LABEL (gtk_label_new (NULL));
-+ gtk_label_set_use_markup (message_widget, TRUE);
+ gtk_label_set_use_markup (message_widget, TRUE);
+ gtk_label_set_markup (message_widget, message);
- g_free (message);
-- gtk_label_set_use_markup (message_widget, TRUE);
++ g_free (message);
++ /* gtk_label_set_use_markup (message_widget, TRUE); */
gtk_misc_set_alignment (GTK_MISC (message_widget), 0.0, 0.5);
gtk_label_set_line_wrap (message_widget, TRUE);
gtk_label_set_justify (message_widget,
++++++ gnome-keyring-with-pam-dir.patch ++++++
Index: configure.in
===================================================================
--- configure.in (revision 746)
+++ configure.in (revision 747)
@@ -236,20 +236,14 @@
if test "$enable_pam" = "yes" -a "$have_pam" = "no"; then
AC_MSG_ERROR(The PAM headers are missing)
fi
-
- case "$host" in
- *-redhat-linux-gnu)
- PAM_DEST_DIR="/lib/security"
- ;;
- *-*-linux*)
- PAM_DEST_DIR="\$(prefix)/../lib/security"
- ;;
- *)
- PAM_DEST_DIR="/usr/lib"
- ;;
- esac
- AC_SUBST(PAM_DEST_DIR)
fi
+
+AC_ARG_WITH([pam-dir],
+ [AC_HELP_STRING([--with-pam-dir=DIR],
+ [directory to install pam modules in])],
+ [], [with_pam_dir="/usr/lib"])
+PAM_DEST_DIR="$with_pam_dir"
+AC_SUBST(PAM_DEST_DIR)
AM_CONDITIONAL(WITH_PAM, test "$have_pam" = "yes")
Index: pam/Makefile.am
===================================================================
--- pam/Makefile.am (revision 746)
+++ pam/Makefile.am (revision 747)
@@ -21,13 +21,13 @@
-Wl,--version-script=$(srcdir)/gkr-pam-export.map
install-pam: install
- $(mkinstalldirs) $(DESTDIR)$(PAM_DEST_DIR)
- cp $(DESTDIR)$(libdir)/pam_gnome_keyring.so $(DESTDIR)$(PAM_DEST_DIR)
- ( cd $(DESTDIR)$(PAM_DEST_DIR); $(LN_S) -f pam_gnome_keyring.so pam_gnome_keyring_auth.so )
- ( cd $(DESTDIR)$(PAM_DEST_DIR); $(LN_S) -f pam_gnome_keyring.so pam_gnome_keyring_session.so )
+ $(mkinstalldirs) "$(DESTDIR)$(PAM_DEST_DIR)"
+ cp "$(DESTDIR)$(libdir)/pam_gnome_keyring.so" "$(DESTDIR)$(PAM_DEST_DIR)"
+ ( cd "$(DESTDIR)$(PAM_DEST_DIR)"; $(LN_S) -f pam_gnome_keyring.so pam_gnome_keyring_auth.so )
+ ( cd "$(DESTDIR)$(PAM_DEST_DIR)"; $(LN_S) -f pam_gnome_keyring.so pam_gnome_keyring_session.so )
uninstall-pam:
- rm -f $(PAM_DEST_DIR)/pam_gnome_keyring.so
- rm -f $(PAM_DEST_DIR)/pam_gnome_keyring_auth.so
- rm -f $(PAM_DEST_DIR)/pam_gnome_keyring_session.so
+ rm -f "$(DESTDIR)$(PAM_DEST_DIR)/pam_gnome_keyring.so"
+ rm -f "$(DESTDIR)$(PAM_DEST_DIR)/pam_gnome_keyring_auth.so"
+ rm -f "$(DESTDIR)$(PAM_DEST_DIR)/pam_gnome_keyring_session.so"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org