Hello community,
here is the log from the commit of package mozilla-xulrunner181
checked in at Sat Nov 8 20:05:31 CET 2008.
--------
--- mozilla-xulrunner181/mozilla-xulrunner181.changes 2008-10-02 00:28:31.000000000 +0200
+++ /mounts/work_src_done/STABLE/mozilla-xulrunner181/mozilla-xulrunner181.changes 2008-11-06 10:20:46.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Nov 5 22:40:52 CST 2008 - hpj@novell.com
+
+- Add mozilla-shared-nss-db.patch, which migrates the old NSS DB
+ to the new, shared format and location.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
milestone.patch
unused-includes.patch
New:
----
mozilla-shared-nss-db.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mozilla-xulrunner181.spec ++++++
--- /var/tmp/diff_new_pack.O30903/_old 2008-11-08 20:05:15.000000000 +0100
+++ /var/tmp/diff_new_pack.O30903/_new 2008-11-08 20:05:15.000000000 +0100
@@ -19,13 +19,13 @@
Name: mozilla-xulrunner181
-BuildRequires: gcc-c++ java2-devel-packages libgnomeui-devel libidl-devel mozilla-nss-devel update-desktop-files zip
+BuildRequires: gcc-c++ java2-devel-packages libgnomeui-devel libidl-devel mozilla-nss-devel nss-shared-helper-devel update-desktop-files zip
%if %suse_version > 1020
BuildRequires: fdupes
%endif
License: GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL)
Version: 1.8.1.17
-Release: 1
+Release: 2
Summary: Mozilla Runtime Environment 1.8.1.x
Url: http://www.mozilla.org/
Group: Productivity/Other
@@ -54,6 +54,7 @@
Patch8: nsIPermission.patch
Patch9: rpath.patch
Patch10: system-proxies.patch
+Patch11: mozilla-shared-nss-db.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: libstdc++ expat pango xorg-x11-libs fontconfig freetype2
PreReq: gtk2 atk glib2 update-alternatives
@@ -170,6 +171,7 @@
%patch8
%patch9
%patch10
+%patch11 -p1
%build
export MOZ_BUILD_DATE=%{releasedate}
@@ -407,6 +409,9 @@
%defattr(-,root,root)
%changelog
+* Wed Nov 05 2008 hpj@novell.com
+- Add mozilla-shared-nss-db.patch, which migrates the old NSS DB
+ to the new, shared format and location.
* Wed Oct 01 2008 maw@suse.de
- Security update to version 1.8.1.17 (bnc#429179)
- Drop milestone.patch and unused-includes.patch, both of which
@@ -464,10 +469,10 @@
from 10.2 beta/rc versions (#223891)
* Wed Nov 22 2006 sbrabec@suse.cz
- Obsolete old xulrunner (#216100).
-* Fri Sep 08 2006 stark@suse.de
+* Thu Sep 07 2006 stark@suse.de
- update to snapshot 1.8.1-20060907
* upstreamed file-saver.patch
-* Tue Aug 29 2006 stark@suse.de
+* Mon Aug 28 2006 stark@suse.de
- fixed system-proxies.patch to build again
* Sun Aug 27 2006 stark@suse.de
- update to snapshot 1.8.1-20060826
++++++ mozilla-shared-nss-db.patch ++++++
diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index becb493..d73809c 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -495,6 +495,9 @@ LIBIDL_CFLAGS = @LIBIDL_CFLAGS@
LIBIDL_LIBS = @LIBIDL_LIBS@
STATIC_LIBIDL = @STATIC_LIBIDL@
+NSSHELPER_CFLAGS = @NSSHELPER_CFLAGS@
+NSSHELPER_LIBS = @NSSHELPER_LIBS@
+
MOZ_NATIVE_MAKEDEPEND = @SYSTEM_MAKEDEPEND@
# Used for LD_LIBRARY_PATH
diff --git a/configure b/configure
index d436121..80c3415 100755
--- a/configure
+++ b/configure
@@ -19336,6 +19336,100 @@ fi
+succeeded=no
+
+if test -z "$PKG_CONFIG"; then
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:20250: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ case "$PKG_CONFIG" in
+ /*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ ?:/*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path.
+ ;;
+ *)
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
+ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+ ;;
+esac
+fi
+PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+if test -n "$PKG_CONFIG"; then
+ echo "$ac_t""$PKG_CONFIG" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ fi
+
+ if test "$PKG_CONFIG" = "no" ; then
+ echo "*** The pkg-config script could not be found. Make sure it is"
+ echo "*** in your path, or set the PKG_CONFIG environment variable"
+ echo "*** to the full path to pkg-config."
+ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+ else
+ PKG_CONFIG_MIN_VERSION=0.9.0
+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+ echo $ac_n "checking for nss-shared-helper""... $ac_c" 1>&6
+echo "configure:20294: checking for nss-shared-helper" >&5
+
+ if $PKG_CONFIG --exists "nss-shared-helper" ; then
+ echo "$ac_t""yes" 1>&6
+ succeeded=yes
+
+ echo $ac_n "checking NSSHELPER_CFLAGS""... $ac_c" 1>&6
+echo "configure:20301: checking NSSHELPER_CFLAGS" >&5
+ NSSHELPER_CFLAGS=`$PKG_CONFIG --cflags "nss-shared-helper"`
+ echo "$ac_t""$NSSHELPER_CFLAGS" 1>&6
+
+ echo $ac_n "checking NSSHELPER_LIBS""... $ac_c" 1>&6
+echo "configure:20306: checking NSSHELPER_LIBS" >&5
+ ## Remove evil flags like -Wl,--export-dynamic
+ NSSHELPER_LIBS="`$PKG_CONFIG --libs \"nss-shared-helper\" |sed s/-Wl,--export-dynamic//g`"
+ echo "$ac_t""$NSSHELPER_LIBS" 1>&6
+ else
+ NSSHELPER_CFLAGS=""
+ NSSHELPER_LIBS=""
+ ## If we have a custom action on failure, don't print errors, but
+ ## do set a variable so people can do so.
+ NSSHELPER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nss-shared-helper"`
+ echo $NSSHELPER_PKG_ERRORS
+ fi
+
+
+
+ else
+ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+ echo "*** See http://www.freedesktop.org/software/pkgconfig"
+ fi
+ fi
+
+ if test $succeeded = yes; then
+ :
+ else
+ if test "$COMPILE_ENVIRONMENT"; then
+ { echo "configure: error: Library requirements (nss-shared-helper) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&2; exit 1; }
+ fi
+ fi
+
+
+
+
# Check whether --enable-xul or --disable-xul was given.
@@ -20585,6 +20679,8 @@ s%@MOZ_TREE_CAIRO@%$MOZ_TREE_CAIRO%g
s%@MOZ_CAIRO_CFLAGS@%$MOZ_CAIRO_CFLAGS%g
s%@MOZ_CAIRO_LIBS@%$MOZ_CAIRO_LIBS%g
s%@MOZ_XUL@%$MOZ_XUL%g
+s%@NSSHELPER_CFLAGS@%$NSSHELPER_CFLAGS%g
+s%@NSSHELPER_LIBS@%$NSSHELPER_LIBS%g
s%@MOZ_PYTHON@%$MOZ_PYTHON%g
s%@MOZ_PYTHON_PREFIX@%$MOZ_PYTHON_PREFIX%g
s%@MOZ_PYTHON_INCLUDES@%$MOZ_PYTHON_INCLUDES%g
diff --git a/configure.in b/configure.in
index 8516c84..2b50d05 100644
--- a/configure.in
+++ b/configure.in
@@ -6809,6 +6809,15 @@ AC_SUBST(MOZ_CAIRO_CFLAGS)
AC_SUBST(MOZ_CAIRO_LIBS)
dnl ========================================================
+dnl Check for nss-shared-helper
+dnl ========================================================
+
+PKG_CHECK_MODULES(NSSHELPER, nss-shared-helper)
+
+AC_SUBST(NSSHELPER_CFLAGS)
+AC_SUBST(NSSHELPER_LIBS)
+
+dnl ========================================================
dnl disable xul
dnl ========================================================
MOZ_ARG_DISABLE_BOOL(xul,
diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in
index 6853938..f397eaa 100644
--- a/security/manager/ssl/src/Makefile.in
+++ b/security/manager/ssl/src/Makefile.in
@@ -131,12 +131,13 @@ DEFINES += -DNSS_ENABLE_ECC
# Use local includes because they are inserted before INCLUDES
# so that Mozilla's nss.h is used, not glibc's
-LOCAL_INCLUDES += $(NSS_CFLAGS)
+LOCAL_INCLUDES += $(NSS_CFLAGS) $(NSSHELPER_CFLAGS)
EXTRA_DSO_LDOPTS += \
$(MOZ_UNICHARUTIL_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(MOZ_JS_LIBS) \
+ $(NSSHELPER_LIBS) \
$(NSS_LIBS) \
$(NULL)
diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp
index 18989d5..08d2557 100644
--- a/security/manager/ssl/src/nsNSSComponent.cpp
+++ b/security/manager/ssl/src/nsNSSComponent.cpp
@@ -44,6 +44,10 @@
*
* ***** END LICENSE BLOCK ***** */
+#pragma GCC visibility push(default)
+#include