SliTaz Repositories

     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/nss/stuff/nss-3.14.1-standalone-1.patch	Sat Apr 06 15:35:11 2013 +0200
     1.3 @@ -0,0 +1,243 @@
     1.4 +Submitted By:            Armin K. <krejzi at email dot com>
     1.5 +Date:                    2012-12-31
     1.6 +Initial Package Version: 3.14.1
     1.7 +Upstream Status:         Not applicable
     1.8 +Origin:                  Based on dj's original patch, rediffed for 3.14.1
     1.9 +Description:             Adds auto-generated nss.pc and nss-config script, and allows
    1.10 +                         building without nspr in the source tree.
    1.11 +
    1.12 +--- nss.orig/mozilla/security/nss/config/Makefile	1970-01-01 01:00:00.000000000 +0100
    1.13 ++++ nss/mozilla/security/nss/config/Makefile	2012-12-31 13:27:51.694572567 +0100
    1.14 +@@ -0,0 +1,40 @@
    1.15 ++CORE_DEPTH = ../..
    1.16 ++DEPTH      = ../..
    1.17 ++
    1.18 ++include $(CORE_DEPTH)/coreconf/config.mk
    1.19 ++
    1.20 ++NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'`
    1.21 ++NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'`
    1.22 ++NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'`
    1.23 ++PREFIX = /usr
    1.24 ++
    1.25 ++all: export libs
    1.26 ++
    1.27 ++export:
    1.28 ++	# Create the nss.pc file
    1.29 ++	mkdir -p $(DIST)/lib/pkgconfig
    1.30 ++	sed -e "s,@prefix@,$(PREFIX)," \
    1.31 ++	    -e "s,@exec_prefix@,\$${prefix}," \
    1.32 ++	    -e "s,@libdir@,\$${prefix}/lib," \
    1.33 ++	    -e "s,@includedir@,\$${prefix}/include/nss," \
    1.34 ++	    -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
    1.35 ++	    -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
    1.36 ++	    -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
    1.37 ++	    nss.pc.in > nss.pc
    1.38 ++	chmod 0644 nss.pc
    1.39 ++	ln -sf ../../../../security/nss/config/nss.pc $(DIST)/lib/pkgconfig
    1.40 ++
    1.41 ++	# Create the nss-config script
    1.42 ++	mkdir -p $(DIST)/bin
    1.43 ++	sed -e "s,@prefix@,$(PREFIX)," \
    1.44 ++	    -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \
    1.45 ++	    -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
    1.46 ++	    -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
    1.47 ++	    nss-config.in > nss-config
    1.48 ++	chmod 0755 nss-config
    1.49 ++	ln -sf ../../../security/nss/config/nss-config $(DIST)/bin
    1.50 ++
    1.51 ++libs:
    1.52 ++
    1.53 ++dummy: all export libs
    1.54 ++
    1.55 +--- nss.orig/mozilla/security/nss/config/nss-config.in	1970-01-01 01:00:00.000000000 +0100
    1.56 ++++ nss/mozilla/security/nss/config/nss-config.in	2012-12-31 13:27:51.695572567 +0100
    1.57 +@@ -0,0 +1,153 @@
    1.58 ++#!/bin/sh
    1.59 ++
    1.60 ++prefix=@prefix@
    1.61 ++
    1.62 ++major_version=@NSS_MAJOR_VERSION@
    1.63 ++minor_version=@NSS_MINOR_VERSION@
    1.64 ++patch_version=@NSS_PATCH_VERSION@
    1.65 ++
    1.66 ++usage()
    1.67 ++{
    1.68 ++	cat <<EOF
    1.69 ++Usage: nss-config [OPTIONS] [LIBRARIES]
    1.70 ++Options:
    1.71 ++	[--prefix[=DIR]]
    1.72 ++	[--exec-prefix[=DIR]]
    1.73 ++	[--includedir[=DIR]]
    1.74 ++	[--libdir[=DIR]]
    1.75 ++	[--version]
    1.76 ++	[--libs]
    1.77 ++	[--cflags]
    1.78 ++Dynamic Libraries:
    1.79 ++	nss
    1.80 ++	nssutil
    1.81 ++	smime
    1.82 ++	ssl
    1.83 ++	softokn
    1.84 ++EOF
    1.85 ++	exit $1
    1.86 ++}
    1.87 ++
    1.88 ++if test $# -eq 0; then
    1.89 ++	usage 1 1>&2
    1.90 ++fi
    1.91 ++
    1.92 ++lib_nss=yes
    1.93 ++lib_nssutil=yes
    1.94 ++lib_smime=yes
    1.95 ++lib_ssl=yes
    1.96 ++lib_softokn=yes
    1.97 ++
    1.98 ++while test $# -gt 0; do
    1.99 ++  case "$1" in
   1.100 ++  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
   1.101 ++  *) optarg= ;;
   1.102 ++  esac
   1.103 ++
   1.104 ++  case $1 in
   1.105 ++    --prefix=*)
   1.106 ++      prefix=$optarg
   1.107 ++      ;;
   1.108 ++    --prefix)
   1.109 ++      echo_prefix=yes
   1.110 ++      ;;
   1.111 ++    --exec-prefix=*)
   1.112 ++      exec_prefix=$optarg
   1.113 ++      ;;
   1.114 ++    --exec-prefix)
   1.115 ++      echo_exec_prefix=yes
   1.116 ++      ;;
   1.117 ++    --includedir=*)
   1.118 ++      includedir=$optarg
   1.119 ++      ;;
   1.120 ++    --includedir)
   1.121 ++      echo_includedir=yes
   1.122 ++      ;;
   1.123 ++    --libdir=*)
   1.124 ++      libdir=$optarg
   1.125 ++      ;;
   1.126 ++    --libdir)
   1.127 ++      echo_libdir=yes
   1.128 ++      ;;
   1.129 ++    --version)
   1.130 ++      echo ${major_version}.${minor_version}.${patch_version}
   1.131 ++      ;;
   1.132 ++    --cflags)
   1.133 ++      echo_cflags=yes
   1.134 ++      ;;
   1.135 ++    --libs)
   1.136 ++      echo_libs=yes
   1.137 ++      ;;
   1.138 ++    nss)
   1.139 ++      lib_nss=yes
   1.140 ++      ;;
   1.141 ++    nssutil)
   1.142 ++      lib_nssutil=yes
   1.143 ++      ;;
   1.144 ++    smime)
   1.145 ++      lib_smime=yes
   1.146 ++      ;;
   1.147 ++    ssl)
   1.148 ++      lib_ssl=yes
   1.149 ++      ;;
   1.150 ++    softokn)
   1.151 ++      lib_softokn=yes
   1.152 ++      ;;
   1.153 ++    *)
   1.154 ++      usage 1 1>&2
   1.155 ++      ;;
   1.156 ++  esac
   1.157 ++  shift
   1.158 ++done
   1.159 ++
   1.160 ++# Set variables that may be dependent upon other variables
   1.161 ++if test -z "$exec_prefix"; then
   1.162 ++    exec_prefix=`pkg-config --variable=exec_prefix nss`
   1.163 ++fi
   1.164 ++if test -z "$includedir"; then
   1.165 ++    includedir=`pkg-config --variable=includedir nss`
   1.166 ++fi
   1.167 ++if test -z "$libdir"; then
   1.168 ++    libdir=`pkg-config --variable=libdir nss`
   1.169 ++fi
   1.170 ++
   1.171 ++if test "$echo_prefix" = "yes"; then
   1.172 ++    echo $prefix
   1.173 ++fi
   1.174 ++
   1.175 ++if test "$echo_exec_prefix" = "yes"; then
   1.176 ++    echo $exec_prefix
   1.177 ++fi
   1.178 ++
   1.179 ++if test "$echo_includedir" = "yes"; then
   1.180 ++    echo $includedir
   1.181 ++fi
   1.182 ++
   1.183 ++if test "$echo_libdir" = "yes"; then
   1.184 ++    echo $libdir
   1.185 ++fi
   1.186 ++
   1.187 ++if test "$echo_cflags" = "yes"; then
   1.188 ++    echo -I$includedir
   1.189 ++fi
   1.190 ++
   1.191 ++if test "$echo_libs" = "yes"; then
   1.192 ++      libdirs="-L$libdir"
   1.193 ++      if test -n "$lib_nss"; then
   1.194 ++	libdirs="$libdirs -lnss${major_version}"
   1.195 ++      fi
   1.196 ++      if test -n "$lib_nssutil"; then
   1.197 ++        libdirs="$libdirs -lnssutil${major_version}"
   1.198 ++      fi
   1.199 ++      if test -n "$lib_smime"; then
   1.200 ++	libdirs="$libdirs -lsmime${major_version}"
   1.201 ++      fi
   1.202 ++      if test -n "$lib_ssl"; then
   1.203 ++	libdirs="$libdirs -lssl${major_version}"
   1.204 ++      fi
   1.205 ++      if test -n "$lib_softokn"; then
   1.206 ++        libdirs="$libdirs -lsoftokn${major_version}"
   1.207 ++      fi
   1.208 ++      echo $libdirs
   1.209 ++fi      
   1.210 ++
   1.211 +--- nss.orig/mozilla/security/nss/config/nss.pc.in	1970-01-01 01:00:00.000000000 +0100
   1.212 ++++ nss/mozilla/security/nss/config/nss.pc.in	2012-12-31 13:27:51.695572567 +0100
   1.213 +@@ -0,0 +1,12 @@
   1.214 ++prefix=@prefix@
   1.215 ++exec_prefix=@exec_prefix@
   1.216 ++libdir=@libdir@
   1.217 ++includedir=@includedir@
   1.218 ++
   1.219 ++Name: NSS
   1.220 ++Description: Network Security Services
   1.221 ++Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@
   1.222 ++Requires: nspr >= 4.8
   1.223 ++Libs: -L@libdir@ -lnss@NSS_MAJOR_VERSION@ -lnssutil@NSS_MAJOR_VERSION@ -lsmime@NSS_MAJOR_VERSION@ -lssl@NSS_MAJOR_VERSION@ -lsoftokn@NSS_MAJOR_VERSION@
   1.224 ++Cflags: -I${includedir}
   1.225 ++
   1.226 +--- nss.orig/mozilla/security/nss/Makefile	2012-11-14 02:14:07.000000000 +0100
   1.227 ++++ nss/mozilla/security/nss/Makefile	2012-12-31 13:27:51.696572567 +0100
   1.228 +@@ -44,7 +44,7 @@
   1.229 + # (7) Execute "local" rules. (OPTIONAL).                              #
   1.230 + #######################################################################
   1.231 + 
   1.232 +-nss_build_all: build_coreconf build_nspr build_dbm all
   1.233 ++nss_build_all: build_coreconf build_dbm all
   1.234 + 
   1.235 + nss_clean_all: clobber_coreconf clobber_nspr clobber_dbm clobber
   1.236 + 
   1.237 +--- nss.orig/mozilla/security/nss/manifest.mn	2012-03-20 15:46:49.000000000 +0100
   1.238 ++++ nss/mozilla/security/nss/manifest.mn	2012-12-31 13:27:51.696572567 +0100
   1.239 +@@ -10,6 +10,6 @@
   1.240 + 
   1.241 + RELEASE = nss
   1.242 + 
   1.243 +-DIRS = lib cmd
   1.244 ++DIRS = lib cmd config
   1.245 + 
   1.246 +