Initial import

_attribute

@@ -0,0 +1,5 @@
+<attributes>
+  <attribute namespace="Mer" name="MeeGoUpstreamRev">
+    <value>f75bca7a9337a2fb10581f49cf34fd9d</value>
+  </attribute>
+</attributes>

_meta

@@ -0,0 +1,11 @@
+<package project="Mer:Trunk:Base" name="nss">
+  <title>Network Security Services</title>
+  <description>Network Security Services (NSS) is a set of libraries designed to
+support cross-platform development of security-enabled client and
+server applications. Applications built with NSS can support SSL v2
+and v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509
+v3 certificates, and other security standards.
+
+</description>
+  <url>http://www.mozilla.org/projects/security/pki/nss/</url>
+</package>

nss-3.12.8-char.patch

@@ -0,0 +1,11 @@
+--- a/mozilla/security/nss/cmd/modutil/install-ds.c
++++ b/mozilla/security/nss/cmd/modutil/install-ds.c
+@@ -252,7 +252,7 @@ Pk11Install_File_Generate(Pk11Install_Fi
+ 					goto loser;
+ 				}
+ 				_this->permissions = (int) strtol(subval->string, &endp, 8);
+-				if(*endp != '\0' || subval->string == "\0") {
++				if(*endp != '\0' || subval->string[0] == '\0') {
+ 					errStr = PR_smprintf(errString[BOGUS_FILE_PERMISSIONS],
+                                     _this->jarPath);
+ 					goto loser;

nss-config.in

@@ -0,0 +1,145 @@
+#!/bin/sh
+
+prefix=@prefix@
+
+major_version=@MOD_MAJOR_VERSION@
+minor_version=@MOD_MINOR_VERSION@
+patch_version=@MOD_PATCH_VERSION@
+
+usage()
+{
+	cat <<EOF
+Usage: nss-config [OPTIONS] [LIBRARIES]
+Options:
+	[--prefix[=DIR]]
+	[--exec-prefix[=DIR]]
+	[--includedir[=DIR]]
+	[--libdir[=DIR]]
+	[--version]
+	[--libs]
+	[--cflags]
+Dynamic Libraries:
+	nss
+	nssutil
+	ssl
+	smime
+EOF
+	exit $1
+}
+
+if test $# -eq 0; then
+	usage 1 1>&2
+fi
+
+lib_ssl=yes
+lib_smime=yes
+lib_nss=yes
+lib_nssutil=yes
+
+while test $# -gt 0; do
+  case "$1" in
+  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+  *) optarg= ;;
+  esac
+
+  case $1 in
+    --prefix=*)
+      prefix=$optarg
+      ;;
+    --prefix)
+      echo_prefix=yes
+      ;;
+    --exec-prefix=*)
+      exec_prefix=$optarg
+      ;;
+    --exec-prefix)
+      echo_exec_prefix=yes
+      ;;
+    --includedir=*)
+      includedir=$optarg
+      ;;
+    --includedir)
+      echo_includedir=yes
+      ;;
+    --libdir=*)
+      libdir=$optarg
+      ;;
+    --libdir)
+      echo_libdir=yes
+      ;;
+    --version)
+      echo ${major_version}.${minor_version}.${patch_version}
+      ;;
+    --cflags)
+      echo_cflags=yes
+      ;;
+    --libs)
+      echo_libs=yes
+      ;;
+    ssl)
+      lib_ssl=yes
+      ;;
+    smime)
+      lib_smime=yes
+      ;;
+    nss)
+      lib_nss=yes
+      ;;
+    nssutil)
+      lib_nssutil=yes
+      ;;
+    *)
+      usage 1 1>&2
+      ;;
+  esac
+  shift
+done
+
+# Set variables that may be dependent upon other variables
+if test -z "$exec_prefix"; then
+    exec_prefix=`pkg-config --variable=exec_prefix nss`
+fi
+if test -z "$includedir"; then
+    includedir=`pkg-config --variable=includedir nss`
+fi
+if test -z "$libdir"; then
+    libdir=`pkg-config --variable=libdir nss`
+fi
+
+if test "$echo_prefix" = "yes"; then
+    echo $prefix
+fi
+
+if test "$echo_exec_prefix" = "yes"; then
+    echo $exec_prefix
+fi
+
+if test "$echo_includedir" = "yes"; then
+    echo $includedir
+fi
+
+if test "$echo_libdir" = "yes"; then
+    echo $libdir
+fi
+
+if test "$echo_cflags" = "yes"; then
+    echo -I$includedir
+fi
+
+if test "$echo_libs" = "yes"; then
+      libdirs="-Wl,-rpath-link,$libdir -L$libdir"
+      if test -n "$lib_ssl"; then
+	libdirs="$libdirs -lssl${major_version}"
+      fi
+      if test -n "$lib_smime"; then
+	libdirs="$libdirs -lsmime${major_version}"
+      fi
+      if test -n "$lib_nss"; then
+	libdirs="$libdirs -lnss${major_version}"
+      fi
+      if test -n "$lib_nssutil"; then
+	libdirs="$libdirs -lnssutil${major_version}"
+      fi
+      echo $libdirs
+fi      
+

nss-enable-pem.patch

@@ -0,0 +1,12 @@
+diff -up ./mozilla/security/nss/lib/ckfw/manifest.mn.prepem ./mozilla/security/nss/lib/ckfw/manifest.mn
+--- ./mozilla/security/nss/lib/ckfw/manifest.mn.prepem	2008-08-05 16:34:23.000000000 -0700
++++ ./mozilla/security/nss/lib/ckfw/manifest.mn	2008-08-05 16:34:30.000000000 -0700
+@@ -38,7 +38,7 @@ MANIFEST_CVS_ID = "@(#) $RCSfile: manife
+
+ CORE_DEPTH = ../../..
+
+-DIRS = builtins 
++DIRS = builtins pem
+
+ PRIVATE_EXPORTS = \
+ 	ck.h		  \

nss-no-rpath.patch

@@ -0,0 +1,14 @@
+--- ./mozilla/security/nss/cmd/platlibs.mk.withrpath	2007-02-19 07:17:06.000000000 +0100
++++ ./mozilla/security/nss/cmd/platlibs.mk	2007-02-19 07:18:07.000000000 +0100
+@@ -52,9 +52,9 @@
+
+ ifeq ($(OS_ARCH), Linux)
+ ifeq ($(USE_64), 1)
+-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib'
++#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib'
+ else
+-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib'
++#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib'
+ endif
+ endif
+

nss-nolocalsql.patch

@@ -0,0 +1,34 @@
+--- mozilla/security/nss/lib/Makefile	2010/11/16 13:55:53	1.1
++++ mozilla/security/nss/lib/Makefile	2010/11/16 13:57:29
+@@ -62,11 +62,11 @@
+ ZLIB_SRCDIR = zlib  # Add the zlib directory to DIRS.
+ endif
+
+-ifndef MOZILLA_CLIENT
+-ifndef NSS_USE_SYSTEM_SQLITE
+-SQLITE_SRCDIR = sqlite  # Add the sqlite directory to DIRS.
+-endif
+-endif
++#ifndef MOZILLA_CLIENT
++#ifndef NSS_USE_SYSTEM_SQLITE
++#SQLITE_SRCDIR = sqlite  # Add the sqlite directory to DIRS.
++#endif
++#endif
+
+ ifndef MOZILLA_CLIENT
+ ifeq ($(OS_ARCH),Linux)
+--- mozilla/security/nss/lib/softoken/manifest.mn	2010/11/16 13:56:14	1.1
++++ mozilla/security/nss/lib/softoken/manifest.mn	2010/11/16 13:58:24
+@@ -47,9 +47,9 @@
+
+ DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\" -DSHLIB_VERSION=\"$(LIBRARY_VERSION)\"
+
+-ifdef SQLITE_INCLUDE_DIR
+-INCLUDES += -I$(SQLITE_INCLUDE_DIR)
+-endif
++#ifdef SQLITE_INCLUDE_DIR
++#INCLUDES += -I$(SQLITE_INCLUDE_DIR)
++#endif
+
+ EXPORTS = \
+ 	secmodt.h \

nss-prelink.conf

@@ -0,0 +1,2 @@
+-b /lib{,64}/libfreebl3.so
+-b /lib{,64}/libsoftokn3.so

nss-sysinit-userdb-first.patch

@@ -0,0 +1,54 @@
+diff -up ./mozilla/security/nss/lib/sysinit/nsssysinit.c.603313 ./mozilla/security/nss/lib/sysinit/nsssysinit.c
+--- ./mozilla/security/nss/lib/sysinit/nsssysinit.c.603313	2010-10-15 13:57:42.719738316 -0700
++++ ./mozilla/security/nss/lib/sysinit/nsssysinit.c	2010-10-15 14:07:51.704637349 -0700
+@@ -263,16 +263,26 @@ get_list(char *filename, char *stripped_
+     sysdb = getSystemDB();
+     userdb = getUserDB();
+
+-    /* Don't open root's user DB */
++    /* return a list of databases to open. First the system database */
++    if (sysdb) {
++        const char *readonly = userCanModifySystemDB() ? "" : "flags=readonly";
++	module_list[next++] = PR_smprintf(
++	    "library= "
++	    "module=\"NSS system database\" "
++	    "parameters=\"configdir='sql:%s' tokenDescription='NSS system database' %s\" "
++	    "NSS=\"trustOrder=80 %sflags=internal,critical\"",
++            sysdb, readonly, nssflags);
++    }
++
++    /* Next the user database, but not for root. */
+     if (userdb != NULL && !userIsRoot()) {
+-	/* return a list of databases to open. First the user Database */
+ 	module_list[next++] = PR_smprintf(
+ 	    "library= "
+ 	    "module=\"NSS User database\" "
+ 	    "parameters=\"configdir='sql:%s' %s tokenDescription='NSS user database'\" "
+-        "NSS=\"trustOrder=75 %sflags=internal%s\"",
+-        userdb, stripped_parameters, nssflags,
+-        isFIPS ? ",FIPS" : "");
++            "NSS=\"trustOrder=75 %sflags=internal%s\"",
++            userdb, stripped_parameters, nssflags,
++            isFIPS ? ",FIPS" : "");
+
+ 	/* now open the user's defined PKCS #11 modules */
+ 	/* skip the local user DB entry */
+@@ -283,17 +293,7 @@ get_list(char *filename, char *stripped_
+ 	    "module=\"NSS User database\" "
+ 	    "parameters=\"configdir='sql:%s' %s\" "
+ 	    "NSS=\"flags=internal,moduleDBOnly,defaultModDB,skipFirst\"", 
+-		userdb, stripped_parameters);
+-	}
+-
+-    /* now the system database (always read only unless it's root) */
+-    if (sysdb) {
+-	    const char *readonly = userCanModifySystemDB() ? "" : "flags=readonly";
+-	    module_list[next++] = PR_smprintf(
+-	      "library= "
+-	      "module=\"NSS system database\" "
+-	      "parameters=\"configdir='sql:%s' tokenDescription='NSS system database' %s\" "
+-	      "NSS=\"trustOrder=80 %sflags=internal,critical\"",sysdb, readonly, nssflags);
++            userdb, stripped_parameters);
+     }
+
+     /* that was the last module */

nss.changes

@@ -0,0 +1,50 @@
+* Fri Jul 15 2011 Elena Reshetova <elena.reshetova@linux.intel.com> - 3.12.10
+- Upgrade to 3.12.10
+  - patch nss-sysinit-fix-trustorder.patch removed
+  - patch nss-sysinit-userdb-first.patch upgraded
+
+
+* Wed Jul 13 2011 Ulf Hofemeier <ulf.hofemeier@linux.intel.com> - 3.12.9
+- Removed patch nss-bug524013.patch from project directory
+
+* Tue Jun 28 2011 Yan Li <yan.i.li@intel.com> - 3.12.9
+- Fixed bugs of importing certs into user db, required by enterprise
+  features (RH#643123, RH#603313)
+- Remove obsoleted patch files
+  - nss-sysinit.patch
+  - nss-sysinit-2.patch
+  - nss-bug524013.patch
+
+* Fri May 13 2011 Anas Nashif <anas.nashif@intel.com> - 3.12.9
+- Do not run test code, it does not work
+
+* Wed 02 Mar 2011 Passion Zhao <passion.zhao@intel.com>
+- Update to 3.12.9 from fennec requirement #BMC13425
+
+* Tue 16 Nov 2010 Stephan Binner <stephan.binner@basyskom.de>
+- Update to 3.12.8, disable non-applying likely obsolete patches, BMC#10122
+
+* Fri Apr 30 2010 David Woodhouse <David.Woodhouse@intel.com>
+- Fix Mozilla bug #524013 (hopefully MeeGo bug #1558)
+
+* Tue Feb 16 2010 Anas Nashif <anas.nashif@intel.com> - 3.12.5
+- Fixed compile warnings
+
+* Wed Dec 16 2009 David Woodhouse <David.Woodhouse@intel.com>
+- nss-sysinit package needs to require coreutils
+
+* Sun Dec 13 2009 David Woodhouse <David.Woodhouse@intel.com>
+- Update to 3.12.5
+- Support shared system database
+
+* Sat Apr 25 2009 Anas Nashif <anas.nashif@intel.com> 3.12.3
+- Update to 3.12.3
+
+* Fri Apr 03 2009 Anas Nashif <anas.nashif@intel.com> 3.11.99.5
+- Add PreReq on ldconfig
+
+* Fri Apr 03 2009 Anas Nashif <anas.nashif@intel.com> 3.11.99.5
+- Add PreReq on ldconfig
+
+* Tue Dec 02 2008 Anas Nashif <anas.nashif@intel.com> 3.11.99.5
+- Fixed %install section

nss.pc.in

@@ -0,0 +1,11 @@
+prefix=%prefix%
+exec_prefix=%exec_prefix%
+libdir=%libdir%
+includedir=%includedir%
+
+Name: NSS
+Description: Network Security Services
+Version: %NSS_VERSION%
+Requires: nspr >= %NSPR_VERSION%
+Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3
+Cflags: -I${includedir}