Mailinglist Archive: opensuse-commit (999 mails)
| < Previous | Next > |
commit nss-shared-helper for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Thu, 23 Jul 2009 16:14:31 +0200
- Message-id: <20090723141431.46B2F6316@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package nss-shared-helper for
openSUSE:Factory
checked in at Thu Jul 23 16:14:31 CEST 2009.
--------
--- nss-shared-helper/nss-shared-helper.changes 2009-01-22 19:24:54.000000000
+0100
+++ nss-shared-helper/nss-shared-helper.changes 2009-07-21 22:57:59.000000000
+0200
@@ -1,0 +2,8 @@
+Tue Jul 21 22:56:23 CEST 2009 - wr@xxxxxxxxxxxxx
+
+- Update to version 1.0.6
+ * removed workaround for bnc#448259 but require NSS 3.12.3
+ * changed default location to $HOME/.pki/nssdb which is the
+ agreed one between integrators
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
nss-shared-helper-1.0.6.tar.bz2
New:
----
nss-shared-helper-1.0.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nss-shared-helper.spec ++++++
--- /var/tmp/diff_new_pack.xqAOI8/_old 2009-07-23 16:13:08.000000000 +0200
+++ /var/tmp/diff_new_pack.xqAOI8/_new 2009-07-23 16:13:08.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package nss-shared-helper (Version 1.0.6)
+# spec file for package nss-shared-helper (Version 1.0.7)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,7 +19,7 @@
Name: nss-shared-helper
BuildRequires: mozilla-nss-devel pkg-config
-Version: 1.0.6
+Version: 1.0.7
Release: 1
Summary: Helper functions for sharing NSS database
Group: Development/Libraries/C and C++
@@ -32,8 +32,6 @@
This library provides helper functions for programs that want to share
an NSS crypto database.
-
-
Authors:
--------
Hans Petter Jansson <hpj@xxxxxxxxxxx>
@@ -49,8 +47,6 @@
This library provides helper functions for programs that want to share
an NSS crypto database.
-
-
Authors:
--------
Hans Petter Jansson <hpj@xxxxxxxxxxx>
@@ -66,8 +62,6 @@
Header and library files for helpers meant to enable sharing of NSS
crypto database.
-
-
Authors:
--------
Hans Petter Jansson <hpj@xxxxxxxxxxx>
++++++ nss-shared-helper-1.0.6.tar.bz2 -> nss-shared-helper-1.0.7.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nss-shared-helper-1.0.6/configure
new/nss-shared-helper-1.0.7/configure
--- old/nss-shared-helper-1.0.6/configure 2009-01-22 19:21:00.000000000
+0100
+++ new/nss-shared-helper-1.0.7/configure 2009-07-08 21:26:38.000000000
+0200
@@ -2023,7 +2023,7 @@
-NSS_REQUIRED=3.12.0
+NSS_REQUIRED=3.12.3
am__api_version='1.10'
@@ -2374,7 +2374,7 @@
# Define the identity of the package.
PACKAGE=nss-shared-helper
- VERSION=1.0.6
+ VERSION=1.0.7
cat >>confdefs.h <<_ACEOF
@@ -12298,12 +12298,12 @@
pkg_cv_ALL_CFLAGS="$ALL_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nss >=
3.12.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "nss >= 3.12.0") 2>&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nss >=
3.12.3\"") >&5
+ ($PKG_CONFIG --exists --print-errors "nss >= 3.12.3") 2>&5
ac_status=$?
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_ALL_CFLAGS=`$PKG_CONFIG --cflags "nss >= 3.12.0" 2>/dev/null`
+ pkg_cv_ALL_CFLAGS=`$PKG_CONFIG --cflags "nss >= 3.12.3" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -12314,12 +12314,12 @@
pkg_cv_ALL_LIBS="$ALL_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nss >=
3.12.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "nss >= 3.12.0") 2>&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nss >=
3.12.3\"") >&5
+ ($PKG_CONFIG --exists --print-errors "nss >= 3.12.3") 2>&5
ac_status=$?
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_ALL_LIBS=`$PKG_CONFIG --libs "nss >= 3.12.0" 2>/dev/null`
+ pkg_cv_ALL_LIBS=`$PKG_CONFIG --libs "nss >= 3.12.3" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -12337,14 +12337,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- ALL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "nss
= 3.12.0" 2>&1`+ ALL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "nss
= 3.12.3" 2>&1`else
- ALL_PKG_ERRORS=`$PKG_CONFIG --print-errors "nss >= 3.12.0" 2>&1`
+ ALL_PKG_ERRORS=`$PKG_CONFIG --print-errors "nss >= 3.12.3" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$ALL_PKG_ERRORS" >&5
- { { $as_echo "$as_me:$LINENO: error: Package requirements (nss >=
3.12.0) were not met:
+ { { $as_echo "$as_me:$LINENO: error: Package requirements (nss >=
3.12.3) were not met:
$ALL_PKG_ERRORS
@@ -12355,7 +12355,7 @@
and ALL_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
-$as_echo "$as_me: error: Package requirements (nss >= 3.12.0) were not met:
+$as_echo "$as_me: error: Package requirements (nss >= 3.12.3) were not met:
$ALL_PKG_ERRORS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nss-shared-helper-1.0.6/configure.ac
new/nss-shared-helper-1.0.7/configure.ac
--- old/nss-shared-helper-1.0.6/configure.ac 2009-01-22 19:19:46.000000000
+0100
+++ new/nss-shared-helper-1.0.7/configure.ac 2009-07-08 21:26:11.000000000
+0200
@@ -4,11 +4,11 @@
dnl Automake/autoconf input file
dnl ----------------------------
-NSS_REQUIRED=3.12.0
+NSS_REQUIRED=3.12.3
dnl --- Package configuration ---
-AM_INIT_AUTOMAKE(nss-shared-helper, 1.0.6)
+AM_INIT_AUTOMAKE(nss-shared-helper, 1.0.7)
AM_CONFIG_HEADER(config.h)
AC_SUBST(VERSION)
@@ -29,7 +29,7 @@
AM_DISABLE_STATIC
AM_PROG_LIBTOOL
-PKG_CHECK_MODULES(ALL, nss >= 3.12.0)
+PKG_CHECK_MODULES(ALL, nss >= 3.12.3)
dnl --- Set up directories ---
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nss-shared-helper-1.0.6/nss-shared-helper/db.c
new/nss-shared-helper-1.0.7/nss-shared-helper/db.c
--- old/nss-shared-helper-1.0.6/nss-shared-helper/db.c 2009-01-22
19:18:27.000000000 +0100
+++ new/nss-shared-helper-1.0.7/nss-shared-helper/db.c 2009-07-08
22:51:37.000000000 +0200
@@ -3,7 +3,7 @@
/* db.c - Helper funcs for shared NSS database
*
* Copyright (C) 2008 Hans Petter Jansson
- * 2008 Wolfgang Rosenauer
+ * 2008-2009 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,7 @@
#include "nss-shared-helper.h"
-#define DEFAULT_RELATIVE_PATH ".local/var/pki/nssdb"
+#define DEFAULT_RELATIVE_PATH ".pki/nssdb"
typedef struct {
enum {
@@ -150,18 +150,6 @@
fprintf (stderr, "*** nss-shared-helper: Using shared location %s\n",
new_path);
sdb_path = PR_smprintf ("sql:%s", new_path);
- /* NSS_InitWithMerge() is not safe if the db doesn't exist before
- * https://bugzilla.mozilla.org/show_bug.cgi?id=465709
- * so we initialize it before first merge */
- result = stat (PR_smprintf("%s/cert9.db", new_path), &sbuf);
- if (result != 0) {
- rv = NSS_Initialize (sdb_path,
- "", "", "secmod.db",
- flags);
- rv = NSS_Shutdown();
- }
- free (new_path);
-
/* simple update (application does not care about the
* underlying state machine). */
@@ -190,28 +178,28 @@
return rv;
}
- slot = PK11_GetInternalKeySlot ();
+ slot = PK11_GetInternalKeySlot();
/* Step 2: Determine if update/merge is needed. */
- if (PK11_IsRemovable (slot))
+ if (PK11_IsRemovable(slot))
{
/* need to update/Merge the database */
/* Step 3: Authenticate to the token */
- rv = PK11_Authenticate (slot, PR_FALSE, &pwdata);
+ rv = PK11_Authenticate(slot, PR_FALSE, &pwdata);
if (rv == SECSuccess)
{
/* just update the state machine */
/* Step 4: */
- PK11_IsLoggedIn (slot, &pwdata);
+ PK11_IsLoggedIn(slot, &pwdata);
/* Step 5: */
- PK11_IsPresent (slot);
+ PK11_IsPresent(slot);
/* Step 6: */
- rv = PK11_Authenticate (slot, PR_FALSE, &pwdata);
+ rv = PK11_Authenticate(slot, PR_FALSE, &pwdata);
if (rv != SECSuccess)
{
fprintf (stderr, "*** nss-shared-helper: Second auth call failed:
%u.\n",
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |