Hello community, here is the log from the commit of package nss-shared-helper for openSUSE:Factory checked in at Thu Mar 18 23:33:50 CET 2010. -------- --- nss-shared-helper/nss-shared-helper.changes 2009-12-18 12:43:19.000000000 +0100 +++ nss-shared-helper/nss-shared-helper.changes 2010-03-11 08:27:08.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Mar 11 08:25:42 CET 2010 - wr@rosenauer.org + +- use /etc/pki/nssdb as default shared location as + mozilla-nss-sysinit will manage to merge system and user dbs + saved in ~/.pki/nssdb at runtime + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- nss-shared-helper-1.0.7.tar.bz2 New: ---- nss-shared-helper-1.0.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nss-shared-helper.spec ++++++ --- /var/tmp/diff_new_pack.RfNS4Z/_old 2010-03-18 23:31:21.000000000 +0100 +++ /var/tmp/diff_new_pack.RfNS4Z/_new 2010-03-18 23:31:21.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package nss-shared-helper (Version 1.0.7) +# spec file for package nss-shared-helper (Version 1.0.8) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,8 +19,8 @@ Name: nss-shared-helper BuildRequires: mozilla-nss-devel pkg-config -Version: 1.0.7 -Release: 2 +Version: 1.0.8 +Release: 1 Summary: Helper functions for sharing NSS database Group: Development/Libraries/C and C++ License: LGPLv2.0+ ++++++ nss-shared-helper-1.0.7.tar.bz2 -> nss-shared-helper-1.0.8.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nss-shared-helper-1.0.7/configure new/nss-shared-helper-1.0.8/configure --- old/nss-shared-helper-1.0.7/configure 2009-07-08 21:26:38.000000000 +0200 +++ new/nss-shared-helper-1.0.8/configure 2010-03-11 08:24:18.000000000 +0100 @@ -2374,7 +2374,7 @@ # Define the identity of the package. PACKAGE=nss-shared-helper - VERSION=1.0.7 + VERSION=1.0.8 cat >>confdefs.h <<_ACEOF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nss-shared-helper-1.0.7/configure.ac new/nss-shared-helper-1.0.8/configure.ac --- old/nss-shared-helper-1.0.7/configure.ac 2009-07-08 21:26:11.000000000 +0200 +++ new/nss-shared-helper-1.0.8/configure.ac 2010-03-11 08:24:05.000000000 +0100 @@ -8,7 +8,7 @@ dnl --- Package configuration --- -AM_INIT_AUTOMAKE(nss-shared-helper, 1.0.7) +AM_INIT_AUTOMAKE(nss-shared-helper, 1.0.8) AM_CONFIG_HEADER(config.h) AC_SUBST(VERSION) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nss-shared-helper-1.0.7/nss-shared-helper/db.c new/nss-shared-helper-1.0.8/nss-shared-helper/db.c --- old/nss-shared-helper-1.0.7/nss-shared-helper/db.c 2009-07-08 22:51:37.000000000 +0200 +++ new/nss-shared-helper-1.0.8/nss-shared-helper/db.c 2010-03-11 12:59:28.000000000 +0100 @@ -3,7 +3,7 @@ /* db.c - Helper funcs for shared NSS database * * Copyright (C) 2008 Hans Petter Jansson - * 2008-2009 Wolfgang Rosenauer + * 2008-2010 Wolfgang Rosenauer * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -38,7 +38,8 @@ #include "nss-shared-helper.h" -#define DEFAULT_RELATIVE_PATH ".pki/nssdb" +//#define DEFAULT_RELATIVE_PATH ".pki/nssdb" +char default_path[] = "/etc/pki/nssdb"; typedef struct { enum { @@ -60,12 +61,10 @@ env = getenv ("NSS_SHARED_DB_PATH"); - if (env && *env) - { + if (env && *env) { path = strdup (env); - } - else - { + } else { + /* env = getenv ("HOME"); if (!env || !*env) { @@ -77,6 +76,8 @@ strcpy (path, env); strcat (path, "/"); strcat (path, DEFAULT_RELATIVE_PATH); + */ + path = default_path; } /* Create path if it doesn't exist */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org