@@ -1,22 +1,22 @@

-Summary:	Platform-neutral API

-Name:		nspr

-Version:	4.14

-Release:	2%{?dist}

-License:	MPLv2.0

-URL:		http://ftp.mozilla.org/pub/mozilla.org

-Group:		Applications/System

-Vendor:		VMware, Inc.

-Distribution: Photon

-Source0:	http://ftp.mozilla.org/pub/mozilla.org/%{name}/releases/v%{version}/src/%{name}-%{version}.tar.gz

-%define sha1 nspr=4c9ffda940882229104090f8fc8539f6412e1ff7

+Summary:        Platform-neutral API

+Name:           nspr

+Version:        4.15

+Release:        1%{?dist}

+License:        MPLv2.0

+URL:            http://ftp.mozilla.org/pub/mozilla.org

+Group:          Applications/System

+Vendor:         VMware, Inc.

+Distribution:   Photon

+Source0:        http://ftp.mozilla.org/pub/nspr/releases/v%{version}/src/%{name}-%{version}.tar.gz

+%define sha1    nspr=56030e0177849034ba3027a23ae2a7f8ed41f379

 %description

 Netscape Portable Runtime (NSPR) provides a platform-neutral API

 for system level and libc like functions.

-%package    devel

-Summary:    Header and development files for nspr

-Requires:   %{name} = %{version}-%{release}

+%package        devel

+Summary:        Header and development files for nspr

+Requires:       %{name} = %{version}-%{release}

 %description    devel

 It contains the libraries and header files to create applications

@@ -29,12 +29,12 @@ sed -i 's#$(LIBRARY) ##' config/rules.mk

 %build

 cd nspr

 ./configure \

-	--prefix=%{_prefix} \

-	--bindir=%{_bindir} \

-	--with-mozilla \

-	--with-pthreads \

-	$([ $(uname -m) = x86_64 ] && echo --enable-64bit) \

-	--disable-silent-rules

+    --prefix=%{_prefix} \

+    --bindir=%{_bindir} \

+    --with-mozilla \

+    --with-pthreads \

+    $([ $(uname -m) = x86_64 ] && echo --enable-64bit) \

+    --disable-silent-rules

 make %{?_smp_mflags}

@@ -42,9 +42,9 @@ make %{?_smp_mflags}

 cd nspr

 make DESTDIR=%{buildroot} install

-%post	-p /sbin/ldconfig

+%post   -p /sbin/ldconfig

-%postun	-p /sbin/ldconfig

+%postun -p /sbin/ldconfig

 %files

 %defattr(-,root,root)

@@ -58,6 +58,8 @@ make DESTDIR=%{buildroot} install

 %{_datarootdir}/aclocal/*

 %changelog

+*   Tue Jun 20 2017 Xiaolin Li <xiaolinl@vmware.com> 4.15-1

+-   Upgrade to 4.15.

 *   Fri May 05 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.14-2

 -   Fix error - binary packed in devel.

 *   Sat Apr 15 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.14-1

new file mode 100644

@@ -0,0 +1,246 @@

+Submitted By:            DJ Lucas <dj_AT_linuxfromscratch_DOT_org>

+Date:                    2016-12-27

+Initial Package Version: 3.12.4

+Upstream Status:         Not applicable

+Origin:                  Self, rediffed for nss-3.28.

+Description:             Adds auto-generated nss.pc and nss-config script, and

+                         allows building without nspr in the source tree.

+

+diff -Naurp nss-3.28-orig/nss/Makefile nss-3.28/nss/Makefile

+--- nss-3.28-orig/nss/Makefile	2016-12-21 05:56:27.000000000 -0600

+@@ -46,7 +46,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk

+ # (7) Execute "local" rules. (OPTIONAL).                              #

+ #######################################################################

+ 

+-nss_build_all: build_nspr all latest

++nss_build_all: all latest

+ 

+ nss_clean_all: clobber_nspr clobber

+ 

+diff -Naurp nss-3.28-orig/nss/config/Makefile nss-3.28/nss/config/Makefile

+--- nss-3.28-orig/nss/config/Makefile	1969-12-31 18:00:00.000000000 -0600

+@@ -0,0 +1,40 @@

++CORE_DEPTH = ..

++DEPTH      = ..

++

++include $(CORE_DEPTH)/coreconf/config.mk

++

++NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'`

++NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'`

++NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'`

++PREFIX = /usr

++

++all: export libs

++

++export:

++	# Create the nss.pc file

++	mkdir -p $(DIST)/lib/pkgconfig

++	sed -e "s,@prefix@,$(PREFIX)," \

++	    -e "s,@exec_prefix@,\$${prefix}," \

++	    -e "s,@libdir@,\$${prefix}/lib," \

++	    -e "s,@includedir@,\$${prefix}/include/nss," \

++	    -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \

++	    -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \

++	    -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \

++	    nss.pc.in > nss.pc

++	chmod 0644 nss.pc

++	ln -sf ../../../../nss/config/nss.pc $(DIST)/lib/pkgconfig

++

++	# Create the nss-config script

++	mkdir -p $(DIST)/bin

++	sed -e "s,@prefix@,$(PREFIX)," \

++	    -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \

++	    -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \

++	    -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \

++	    nss-config.in > nss-config

++	chmod 0755 nss-config

++	ln -sf ../../../nss/config/nss-config $(DIST)/bin

++

++libs:

++

++dummy: all export libs

++

+diff -Naurp nss-3.28-orig/nss/config/nss-config.in nss-3.28/nss/config/nss-config.in

+--- nss-3.28-orig/nss/config/nss-config.in	1969-12-31 18:00:00.000000000 -0600

+@@ -0,0 +1,153 @@

++#!/bin/sh

++

++prefix=@prefix@

++

++major_version=@NSS_MAJOR_VERSION@

++minor_version=@NSS_MINOR_VERSION@

++patch_version=@NSS_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

++	smime

++	ssl

++	softokn

++EOF

++	exit $1

++}

++

++if test $# -eq 0; then

++	usage 1 1>&2

++fi

++

++lib_nss=yes

++lib_nssutil=yes

++lib_smime=yes

++lib_ssl=yes

++lib_softokn=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

++      ;;

++    nss)

++      lib_nss=yes

++      ;;

++    nssutil)

++      lib_nssutil=yes

++      ;;

++    smime)

++      lib_smime=yes

++      ;;

++    ssl)

++      lib_ssl=yes

++      ;;

++    softokn)

++      lib_softokn=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="-L$libdir"

++      if test -n "$lib_nss"; then

++	libdirs="$libdirs -lnss${major_version}"

++      fi

++      if test -n "$lib_nssutil"; then

++        libdirs="$libdirs -lnssutil${major_version}"

++      fi

++      if test -n "$lib_smime"; then

++	libdirs="$libdirs -lsmime${major_version}"

++      fi

++      if test -n "$lib_ssl"; then

++	libdirs="$libdirs -lssl${major_version}"

++      fi

++      if test -n "$lib_softokn"; then

++        libdirs="$libdirs -lsoftokn${major_version}"

++      fi

++      echo $libdirs

++fi      

++

+diff -Naurp nss-3.28-orig/nss/config/nss.pc.in nss-3.28/nss/config/nss.pc.in

+--- nss-3.28-orig/nss/config/nss.pc.in	1969-12-31 18:00:00.000000000 -0600

+@@ -0,0 +1,12 @@

++prefix=@prefix@

++exec_prefix=@exec_prefix@

++libdir=@libdir@

++includedir=@includedir@

++

++Name: NSS

++Description: Network Security Services

++Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@

++Requires: nspr >= 4.10

++Libs: -L@libdir@ -lnss@NSS_MAJOR_VERSION@ -lnssutil@NSS_MAJOR_VERSION@ -lsmime@NSS_MAJOR_VERSION@ -lssl@NSS_MAJOR_VERSION@ -lsoftokn@NSS_MAJOR_VERSION@

++Cflags: -I${includedir}

++

+diff -Naurp nss-3.28-orig/nss/manifest.mn nss-3.28/nss/manifest.mn

+--- nss-3.28-orig/nss/manifest.mn	2016-12-21 05:56:27.000000000 -0600

+@@ -10,4 +10,4 @@ IMPORTS =	nspr20/v4.8 \

+ 

+ RELEASE = nss

+ 

+-DIRS = coreconf lib cmd gtests

++DIRS = coreconf lib cmd gtests config

@@ -1,18 +1,18 @@

-Summary:	Security client

-Name:		nss

-Version:	3.30.1

-Release:	1%{?dist}

-License:	MPLv2.0

-URL:		https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_30_1_RTM/src/%{name}-%{version}.tar.gz

-Group:		Applications/System

-Vendor:		VMware, Inc.

-Distribution:	Photon

-Source0:	%{name}-%{version}.tar.gz

-%define sha1 nss=3e1207b1293605435106148aa8e7205b37aeae74

-Patch:		nss-3.30.1-standalone-1.patch

-Requires:	nspr

-BuildRequires:	nspr-devel

-BuildRequires:	sqlite-devel

+Summary:        Security client

+Name:           nss

+Version:        3.31

+Release:        1%{?dist}

+License:        MPLv2.0

+URL:            http://ftp.mozilla.org/pub/security/nss/releases/NSS_3_31_RTM/src/%{name}-%{version}.tar.gz

+Group:          Applications/System

+Vendor:         VMware, Inc.

+Distribution:   Photon

+Source0:        %{name}-%{version}.tar.gz

+%define sha1    nss=006a13a5e52867c49ea1e7d986b7c02a3cd8ebfb

+Patch:          nss-3.31-standalone-1.patch

+Requires:       nspr

+BuildRequires:  nspr-devel

+BuildRequires:  sqlite-devel

 Requires:       nss-libs = %{version}-%{release}

 %description

@@ -34,8 +34,8 @@ Header files for doing development with Network Security Services.

 %package libs

 Summary: Libraries for Network Security Services

 Group:      System Environment/Libraries

-Requires:	sqlite-libs

-Requires:	nspr

+Requires:   sqlite-libs

+Requires:   nspr

 %description libs

 This package contains minimal set of shared nss libraries.

@@ -46,11 +46,11 @@ This package contains minimal set of shared nss libraries.

 cd nss

 # -j is not supported by nss

 make VERBOSE=1 BUILD_OPT=1 \

-	NSPR_INCLUDE_DIR=%{_includedir}/nspr \

-	USE_SYSTEM_ZLIB=1 \

-	ZLIB_LIBS=-lz \

-	$([ $(uname -m) = x86_64 ] && echo USE_64=1) \

-	$([ -f %{_includedir}/sqlite3.h ] && echo NSS_USE_SYSTEM_SQLITE=1)

+    NSPR_INCLUDE_DIR=%{_includedir}/nspr \

+    USE_SYSTEM_ZLIB=1 \

+    ZLIB_LIBS=-lz \

+    $([ $(uname -m) = x86_64 ] && echo USE_64=1) \

+    $([ -f %{_includedir}/sqlite3.h ] && echo NSS_USE_SYSTEM_SQLITE=1)

 %install

 cd nss

 cd ../dist

@@ -70,7 +70,7 @@ cd nss/tests

 HOST=localhost DOMSUF=localdomain

 ./all.sh

-%post	-p /sbin/ldconfig

+%post   -p /sbin/ldconfig

 %files

 %defattr(-,root,root)

@@ -94,6 +94,8 @@ HOST=localhost DOMSUF=localdomain

 %{_libdir}/libsoftokn3.so

 %changelog

+*   Tue Jun 20 2017 Xiaolin Li <xiaolinl@vmware.com> 3.31-1

+-   Upgrade to 3.31.

 *   Sat Apr 15 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.30.1-1

 -   Update to 3.30.1

 *   Fri Apr 14 2017 Alexey Makhalov <amakhalov@vmware.com> 3.25-4