wok rev 17789

Up: nss 3.17.4
author Alexander Medvedev <devl547@gmail.com>
date Sat Mar 14 21:49:28 2015 +0000 (2015-03-14)
parents 547cf085b858
children 74d396ffb02c
files nss-dev/receipt nss/receipt nss/stuff/nss-3.17.4-standalone-1.patch
line diff
     1.1 --- a/nss-dev/receipt	Sat Mar 14 21:47:18 2015 +0000
     1.2 +++ b/nss-dev/receipt	Sat Mar 14 21:49:28 2015 +0000
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="nss-dev"
     1.7 -VERSION="3.14.3"
     1.8 +VERSION="3.17.4"
     1.9  CATEGORY="development"
    1.10  SHORT_DESC="nss devel library."
    1.11  MAINTAINER="rocky@slitaz.org"
     2.1 --- a/nss/receipt	Sat Mar 14 21:47:18 2015 +0000
     2.2 +++ b/nss/receipt	Sat Mar 14 21:49:28 2015 +0000
     2.3 @@ -1,14 +1,14 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="nss"
     2.7 -VERSION="3.14.3"
     2.8 +VERSION="3.17.4"
     2.9  CATEGORY="utilities"
    2.10  SHORT_DESC="Mozilla Network Security Services (NSS)."
    2.11  MAINTAINER="rocky@slitaz.org"
    2.12  LICENSE="MPL"
    2.13  TARBALL="$PACKAGE-$VERSION.tar.gz"
    2.14  WEB_SITE="http://www.mozilla.org/projects/security/pki/nss/"
    2.15 -WGET_URL="ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${VERSION//./_}_RTM/src/${TARBALL}"
    2.16 +WGET_URL="http://ftp.mozilla.org/pub/security/nss/releases/NSS_${VERSION//./_}_RTM/src/${TARBALL}"
    2.17  
    2.18  DEPENDS="nspr sqlite zlib"
    2.19  BUILD_DEPENDS="nspr-dev sqlite-dev zlib-dev perl pkg-config"
    2.20 @@ -17,8 +17,8 @@
    2.21  compile_rules()
    2.22  {
    2.23      cd $src
    2.24 -	patch -Np1 -i $stuff/nss-3.14.1-standalone-1.patch &&
    2.25 -	cd mozilla/security/nss &&
    2.26 +	patch -Np1 -i $stuff/nss-3.17.4-standalone-1.patch &&
    2.27 +	cd nss &&
    2.28  	make -j1 nss_build_all BUILD_OPT=1 \
    2.29  		NSPR_INCLUDE_DIR=/usr/include/nspr \
    2.30  		USE_SYSTEM_ZLIB=1 \
    2.31 @@ -27,7 +27,7 @@
    2.32  		$([ -f /usr/include/sqlite3.h ] && echo NSS_USE_SYSTEM_SQLITE=1) &&
    2.33  	mkdir -p $install/usr/lib $install/usr/include/nss			&&
    2.34  	mkdir -p $install/usr/bin $install/usr/lib/pkgconfig		&&
    2.35 -	cd ../../dist												&&
    2.36 +	cd ../dist												&&
    2.37  	install -v -m755 Linux*/lib/*.so $install/usr/lib			&&
    2.38  	install -v -m644 Linux*/lib/*.chk $install/usr/lib			&&
    2.39  	install -v -m644 Linux*/lib/libcrmf.a $install/usr/lib		&&
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/nss/stuff/nss-3.17.4-standalone-1.patch	Sat Mar 14 21:49:28 2015 +0000
     3.3 @@ -0,0 +1,245 @@
     3.4 +Submitted By:            Armin K. <krejzi at email dot com>
     3.5 +Date:                    2014-09-26
     3.6 +Initial Package Version: 3.15
     3.7 +Comment:                 Modified manifest.mn diff (Fernando)
     3.8 +Upstream Status:         Not applicable
     3.9 +Origin:                  Based on dj's original patch, rediffed and modified for 3.15
    3.10 +Description:             Adds auto-generated nss.pc and nss-config script, and allows
    3.11 +                         building without nspr in the source tree.
    3.12 +
    3.13 +--- a/nss/config/Makefile	1970-01-01 01:00:00.000000000 +0100
    3.14 ++++ b/nss/config/Makefile	2013-07-02 14:53:56.684750636 +0200
    3.15 +@@ -0,0 +1,40 @@
    3.16 ++CORE_DEPTH = ..
    3.17 ++DEPTH      = ..
    3.18 ++
    3.19 ++include $(CORE_DEPTH)/coreconf/config.mk
    3.20 ++
    3.21 ++NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'`
    3.22 ++NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'`
    3.23 ++NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'`
    3.24 ++PREFIX = /usr
    3.25 ++
    3.26 ++all: export libs
    3.27 ++
    3.28 ++export:
    3.29 ++	# Create the nss.pc file
    3.30 ++	mkdir -p $(DIST)/lib/pkgconfig
    3.31 ++	sed -e "s,@prefix@,$(PREFIX)," \
    3.32 ++	    -e "s,@exec_prefix@,\$${prefix}," \
    3.33 ++	    -e "s,@libdir@,\$${prefix}/lib," \
    3.34 ++	    -e "s,@includedir@,\$${prefix}/include/nss," \
    3.35 ++	    -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
    3.36 ++	    -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
    3.37 ++	    -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
    3.38 ++	    nss.pc.in > nss.pc
    3.39 ++	chmod 0644 nss.pc
    3.40 ++	ln -sf ../../../../nss/config/nss.pc $(DIST)/lib/pkgconfig
    3.41 ++
    3.42 ++	# Create the nss-config script
    3.43 ++	mkdir -p $(DIST)/bin
    3.44 ++	sed -e "s,@prefix@,$(PREFIX)," \
    3.45 ++	    -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \
    3.46 ++	    -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
    3.47 ++	    -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
    3.48 ++	    nss-config.in > nss-config
    3.49 ++	chmod 0755 nss-config
    3.50 ++	ln -sf ../../../nss/config/nss-config $(DIST)/bin
    3.51 ++
    3.52 ++libs:
    3.53 ++
    3.54 ++dummy: all export libs
    3.55 ++
    3.56 +--- a/nss/config/nss-config.in	1970-01-01 01:00:00.000000000 +0100
    3.57 ++++ b/nss/config/nss-config.in	2013-07-02 14:52:58.328084334 +0200
    3.58 +@@ -0,0 +1,153 @@
    3.59 ++#!/bin/sh
    3.60 ++
    3.61 ++prefix=@prefix@
    3.62 ++
    3.63 ++major_version=@NSS_MAJOR_VERSION@
    3.64 ++minor_version=@NSS_MINOR_VERSION@
    3.65 ++patch_version=@NSS_PATCH_VERSION@
    3.66 ++
    3.67 ++usage()
    3.68 ++{
    3.69 ++	cat <<EOF
    3.70 ++Usage: nss-config [OPTIONS] [LIBRARIES]
    3.71 ++Options:
    3.72 ++	[--prefix[=DIR]]
    3.73 ++	[--exec-prefix[=DIR]]
    3.74 ++	[--includedir[=DIR]]
    3.75 ++	[--libdir[=DIR]]
    3.76 ++	[--version]
    3.77 ++	[--libs]
    3.78 ++	[--cflags]
    3.79 ++Dynamic Libraries:
    3.80 ++	nss
    3.81 ++	nssutil
    3.82 ++	smime
    3.83 ++	ssl
    3.84 ++	softokn
    3.85 ++EOF
    3.86 ++	exit $1
    3.87 ++}
    3.88 ++
    3.89 ++if test $# -eq 0; then
    3.90 ++	usage 1 1>&2
    3.91 ++fi
    3.92 ++
    3.93 ++lib_nss=yes
    3.94 ++lib_nssutil=yes
    3.95 ++lib_smime=yes
    3.96 ++lib_ssl=yes
    3.97 ++lib_softokn=yes
    3.98 ++
    3.99 ++while test $# -gt 0; do
   3.100 ++  case "$1" in
   3.101 ++  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
   3.102 ++  *) optarg= ;;
   3.103 ++  esac
   3.104 ++
   3.105 ++  case $1 in
   3.106 ++    --prefix=*)
   3.107 ++      prefix=$optarg
   3.108 ++      ;;
   3.109 ++    --prefix)
   3.110 ++      echo_prefix=yes
   3.111 ++      ;;
   3.112 ++    --exec-prefix=*)
   3.113 ++      exec_prefix=$optarg
   3.114 ++      ;;
   3.115 ++    --exec-prefix)
   3.116 ++      echo_exec_prefix=yes
   3.117 ++      ;;
   3.118 ++    --includedir=*)
   3.119 ++      includedir=$optarg
   3.120 ++      ;;
   3.121 ++    --includedir)
   3.122 ++      echo_includedir=yes
   3.123 ++      ;;
   3.124 ++    --libdir=*)
   3.125 ++      libdir=$optarg
   3.126 ++      ;;
   3.127 ++    --libdir)
   3.128 ++      echo_libdir=yes
   3.129 ++      ;;
   3.130 ++    --version)
   3.131 ++      echo ${major_version}.${minor_version}.${patch_version}
   3.132 ++      ;;
   3.133 ++    --cflags)
   3.134 ++      echo_cflags=yes
   3.135 ++      ;;
   3.136 ++    --libs)
   3.137 ++      echo_libs=yes
   3.138 ++      ;;
   3.139 ++    nss)
   3.140 ++      lib_nss=yes
   3.141 ++      ;;
   3.142 ++    nssutil)
   3.143 ++      lib_nssutil=yes
   3.144 ++      ;;
   3.145 ++    smime)
   3.146 ++      lib_smime=yes
   3.147 ++      ;;
   3.148 ++    ssl)
   3.149 ++      lib_ssl=yes
   3.150 ++      ;;
   3.151 ++    softokn)
   3.152 ++      lib_softokn=yes
   3.153 ++      ;;
   3.154 ++    *)
   3.155 ++      usage 1 1>&2
   3.156 ++      ;;
   3.157 ++  esac
   3.158 ++  shift
   3.159 ++done
   3.160 ++
   3.161 ++# Set variables that may be dependent upon other variables
   3.162 ++if test -z "$exec_prefix"; then
   3.163 ++    exec_prefix=`pkg-config --variable=exec_prefix nss`
   3.164 ++fi
   3.165 ++if test -z "$includedir"; then
   3.166 ++    includedir=`pkg-config --variable=includedir nss`
   3.167 ++fi
   3.168 ++if test -z "$libdir"; then
   3.169 ++    libdir=`pkg-config --variable=libdir nss`
   3.170 ++fi
   3.171 ++
   3.172 ++if test "$echo_prefix" = "yes"; then
   3.173 ++    echo $prefix
   3.174 ++fi
   3.175 ++
   3.176 ++if test "$echo_exec_prefix" = "yes"; then
   3.177 ++    echo $exec_prefix
   3.178 ++fi
   3.179 ++
   3.180 ++if test "$echo_includedir" = "yes"; then
   3.181 ++    echo $includedir
   3.182 ++fi
   3.183 ++
   3.184 ++if test "$echo_libdir" = "yes"; then
   3.185 ++    echo $libdir
   3.186 ++fi
   3.187 ++
   3.188 ++if test "$echo_cflags" = "yes"; then
   3.189 ++    echo -I$includedir
   3.190 ++fi
   3.191 ++
   3.192 ++if test "$echo_libs" = "yes"; then
   3.193 ++      libdirs="-L$libdir"
   3.194 ++      if test -n "$lib_nss"; then
   3.195 ++	libdirs="$libdirs -lnss${major_version}"
   3.196 ++      fi
   3.197 ++      if test -n "$lib_nssutil"; then
   3.198 ++        libdirs="$libdirs -lnssutil${major_version}"
   3.199 ++      fi
   3.200 ++      if test -n "$lib_smime"; then
   3.201 ++	libdirs="$libdirs -lsmime${major_version}"
   3.202 ++      fi
   3.203 ++      if test -n "$lib_ssl"; then
   3.204 ++	libdirs="$libdirs -lssl${major_version}"
   3.205 ++      fi
   3.206 ++      if test -n "$lib_softokn"; then
   3.207 ++        libdirs="$libdirs -lsoftokn${major_version}"
   3.208 ++      fi
   3.209 ++      echo $libdirs
   3.210 ++fi      
   3.211 ++
   3.212 +--- a/nss/config/nss.pc.in	1970-01-01 01:00:00.000000000 +0100
   3.213 ++++ b/nss/config/nss.pc.in	2013-07-02 14:52:58.328084334 +0200
   3.214 +@@ -0,0 +1,12 @@
   3.215 ++prefix=@prefix@
   3.216 ++exec_prefix=@exec_prefix@
   3.217 ++libdir=@libdir@
   3.218 ++includedir=@includedir@
   3.219 ++
   3.220 ++Name: NSS
   3.221 ++Description: Network Security Services
   3.222 ++Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@
   3.223 ++Requires: nspr >= 4.8
   3.224 ++Libs: -L@libdir@ -lnss@NSS_MAJOR_VERSION@ -lnssutil@NSS_MAJOR_VERSION@ -lsmime@NSS_MAJOR_VERSION@ -lssl@NSS_MAJOR_VERSION@ -lsoftokn@NSS_MAJOR_VERSION@
   3.225 ++Cflags: -I${includedir}
   3.226 ++
   3.227 +--- a/nss/Makefile	2013-05-28 23:43:24.000000000 +0200
   3.228 ++++ b/nss/Makefile	2013-07-02 14:52:58.328084334 +0200
   3.229 +@@ -44,7 +44,7 @@
   3.230 + # (7) Execute "local" rules. (OPTIONAL).                              #
   3.231 + #######################################################################
   3.232 + 
   3.233 +-nss_build_all: build_nspr all
   3.234 ++nss_build_all: all
   3.235 + 
   3.236 + nss_clean_all: clobber_nspr clobber
   3.237 + 
   3.238 +--- a/nss/manifest.mn.orig	2014-09-26 16:46:44.201965538 -0300
   3.239 ++++ b/nss/manifest.mn	2014-09-26 16:51:11.386336520 -0300
   3.240 +@@ -10,7 +10,7 @@
   3.241 + 
   3.242 + RELEASE = nss
   3.243 + 
   3.244 +-DIRS = coreconf lib cmd
   3.245 ++DIRS = coreconf lib cmd config
   3.246 + 
   3.247 + ifdef NSS_BUILD_GTESTS
   3.248 + DIRS += external_tests