wok annotate nss/stuff/nss-3.17.4-standalone-1.patch @ rev 25083

updated p11-kit and p11-kit-dev (0.23.20 -> 0.24.1)
author Hans-G?nter Theisgen
date Wed Jun 15 17:22:15 2022 +0100 (2022-06-15)
parents
children
rev   line source
devl547@17789 1 Submitted By: Armin K. <krejzi at email dot com>
devl547@17789 2 Date: 2014-09-26
devl547@17789 3 Initial Package Version: 3.15
devl547@17789 4 Comment: Modified manifest.mn diff (Fernando)
devl547@17789 5 Upstream Status: Not applicable
devl547@17789 6 Origin: Based on dj's original patch, rediffed and modified for 3.15
devl547@17789 7 Description: Adds auto-generated nss.pc and nss-config script, and allows
devl547@17789 8 building without nspr in the source tree.
devl547@17789 9
devl547@17789 10 --- a/nss/config/Makefile 1970-01-01 01:00:00.000000000 +0100
devl547@17789 11 +++ b/nss/config/Makefile 2013-07-02 14:53:56.684750636 +0200
devl547@17789 12 @@ -0,0 +1,40 @@
devl547@17789 13 +CORE_DEPTH = ..
devl547@17789 14 +DEPTH = ..
devl547@17789 15 +
devl547@17789 16 +include $(CORE_DEPTH)/coreconf/config.mk
devl547@17789 17 +
devl547@17789 18 +NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'`
devl547@17789 19 +NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'`
devl547@17789 20 +NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'`
devl547@17789 21 +PREFIX = /usr
devl547@17789 22 +
devl547@17789 23 +all: export libs
devl547@17789 24 +
devl547@17789 25 +export:
devl547@17789 26 + # Create the nss.pc file
devl547@17789 27 + mkdir -p $(DIST)/lib/pkgconfig
devl547@17789 28 + sed -e "s,@prefix@,$(PREFIX)," \
devl547@17789 29 + -e "s,@exec_prefix@,\$${prefix}," \
devl547@17789 30 + -e "s,@libdir@,\$${prefix}/lib," \
devl547@17789 31 + -e "s,@includedir@,\$${prefix}/include/nss," \
devl547@17789 32 + -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
devl547@17789 33 + -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
devl547@17789 34 + -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
devl547@17789 35 + nss.pc.in > nss.pc
devl547@17789 36 + chmod 0644 nss.pc
devl547@17789 37 + ln -sf ../../../../nss/config/nss.pc $(DIST)/lib/pkgconfig
devl547@17789 38 +
devl547@17789 39 + # Create the nss-config script
devl547@17789 40 + mkdir -p $(DIST)/bin
devl547@17789 41 + sed -e "s,@prefix@,$(PREFIX)," \
devl547@17789 42 + -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \
devl547@17789 43 + -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
devl547@17789 44 + -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
devl547@17789 45 + nss-config.in > nss-config
devl547@17789 46 + chmod 0755 nss-config
devl547@17789 47 + ln -sf ../../../nss/config/nss-config $(DIST)/bin
devl547@17789 48 +
devl547@17789 49 +libs:
devl547@17789 50 +
devl547@17789 51 +dummy: all export libs
devl547@17789 52 +
devl547@17789 53 --- a/nss/config/nss-config.in 1970-01-01 01:00:00.000000000 +0100
devl547@17789 54 +++ b/nss/config/nss-config.in 2013-07-02 14:52:58.328084334 +0200
devl547@17789 55 @@ -0,0 +1,153 @@
devl547@17789 56 +#!/bin/sh
devl547@17789 57 +
devl547@17789 58 +prefix=@prefix@
devl547@17789 59 +
devl547@17789 60 +major_version=@NSS_MAJOR_VERSION@
devl547@17789 61 +minor_version=@NSS_MINOR_VERSION@
devl547@17789 62 +patch_version=@NSS_PATCH_VERSION@
devl547@17789 63 +
devl547@17789 64 +usage()
devl547@17789 65 +{
devl547@17789 66 + cat <<EOF
devl547@17789 67 +Usage: nss-config [OPTIONS] [LIBRARIES]
devl547@17789 68 +Options:
devl547@17789 69 + [--prefix[=DIR]]
devl547@17789 70 + [--exec-prefix[=DIR]]
devl547@17789 71 + [--includedir[=DIR]]
devl547@17789 72 + [--libdir[=DIR]]
devl547@17789 73 + [--version]
devl547@17789 74 + [--libs]
devl547@17789 75 + [--cflags]
devl547@17789 76 +Dynamic Libraries:
devl547@17789 77 + nss
devl547@17789 78 + nssutil
devl547@17789 79 + smime
devl547@17789 80 + ssl
devl547@17789 81 + softokn
devl547@17789 82 +EOF
devl547@17789 83 + exit $1
devl547@17789 84 +}
devl547@17789 85 +
devl547@17789 86 +if test $# -eq 0; then
devl547@17789 87 + usage 1 1>&2
devl547@17789 88 +fi
devl547@17789 89 +
devl547@17789 90 +lib_nss=yes
devl547@17789 91 +lib_nssutil=yes
devl547@17789 92 +lib_smime=yes
devl547@17789 93 +lib_ssl=yes
devl547@17789 94 +lib_softokn=yes
devl547@17789 95 +
devl547@17789 96 +while test $# -gt 0; do
devl547@17789 97 + case "$1" in
devl547@17789 98 + -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
devl547@17789 99 + *) optarg= ;;
devl547@17789 100 + esac
devl547@17789 101 +
devl547@17789 102 + case $1 in
devl547@17789 103 + --prefix=*)
devl547@17789 104 + prefix=$optarg
devl547@17789 105 + ;;
devl547@17789 106 + --prefix)
devl547@17789 107 + echo_prefix=yes
devl547@17789 108 + ;;
devl547@17789 109 + --exec-prefix=*)
devl547@17789 110 + exec_prefix=$optarg
devl547@17789 111 + ;;
devl547@17789 112 + --exec-prefix)
devl547@17789 113 + echo_exec_prefix=yes
devl547@17789 114 + ;;
devl547@17789 115 + --includedir=*)
devl547@17789 116 + includedir=$optarg
devl547@17789 117 + ;;
devl547@17789 118 + --includedir)
devl547@17789 119 + echo_includedir=yes
devl547@17789 120 + ;;
devl547@17789 121 + --libdir=*)
devl547@17789 122 + libdir=$optarg
devl547@17789 123 + ;;
devl547@17789 124 + --libdir)
devl547@17789 125 + echo_libdir=yes
devl547@17789 126 + ;;
devl547@17789 127 + --version)
devl547@17789 128 + echo ${major_version}.${minor_version}.${patch_version}
devl547@17789 129 + ;;
devl547@17789 130 + --cflags)
devl547@17789 131 + echo_cflags=yes
devl547@17789 132 + ;;
devl547@17789 133 + --libs)
devl547@17789 134 + echo_libs=yes
devl547@17789 135 + ;;
devl547@17789 136 + nss)
devl547@17789 137 + lib_nss=yes
devl547@17789 138 + ;;
devl547@17789 139 + nssutil)
devl547@17789 140 + lib_nssutil=yes
devl547@17789 141 + ;;
devl547@17789 142 + smime)
devl547@17789 143 + lib_smime=yes
devl547@17789 144 + ;;
devl547@17789 145 + ssl)
devl547@17789 146 + lib_ssl=yes
devl547@17789 147 + ;;
devl547@17789 148 + softokn)
devl547@17789 149 + lib_softokn=yes
devl547@17789 150 + ;;
devl547@17789 151 + *)
devl547@17789 152 + usage 1 1>&2
devl547@17789 153 + ;;
devl547@17789 154 + esac
devl547@17789 155 + shift
devl547@17789 156 +done
devl547@17789 157 +
devl547@17789 158 +# Set variables that may be dependent upon other variables
devl547@17789 159 +if test -z "$exec_prefix"; then
devl547@17789 160 + exec_prefix=`pkg-config --variable=exec_prefix nss`
devl547@17789 161 +fi
devl547@17789 162 +if test -z "$includedir"; then
devl547@17789 163 + includedir=`pkg-config --variable=includedir nss`
devl547@17789 164 +fi
devl547@17789 165 +if test -z "$libdir"; then
devl547@17789 166 + libdir=`pkg-config --variable=libdir nss`
devl547@17789 167 +fi
devl547@17789 168 +
devl547@17789 169 +if test "$echo_prefix" = "yes"; then
devl547@17789 170 + echo $prefix
devl547@17789 171 +fi
devl547@17789 172 +
devl547@17789 173 +if test "$echo_exec_prefix" = "yes"; then
devl547@17789 174 + echo $exec_prefix
devl547@17789 175 +fi
devl547@17789 176 +
devl547@17789 177 +if test "$echo_includedir" = "yes"; then
devl547@17789 178 + echo $includedir
devl547@17789 179 +fi
devl547@17789 180 +
devl547@17789 181 +if test "$echo_libdir" = "yes"; then
devl547@17789 182 + echo $libdir
devl547@17789 183 +fi
devl547@17789 184 +
devl547@17789 185 +if test "$echo_cflags" = "yes"; then
devl547@17789 186 + echo -I$includedir
devl547@17789 187 +fi
devl547@17789 188 +
devl547@17789 189 +if test "$echo_libs" = "yes"; then
devl547@17789 190 + libdirs="-L$libdir"
devl547@17789 191 + if test -n "$lib_nss"; then
devl547@17789 192 + libdirs="$libdirs -lnss${major_version}"
devl547@17789 193 + fi
devl547@17789 194 + if test -n "$lib_nssutil"; then
devl547@17789 195 + libdirs="$libdirs -lnssutil${major_version}"
devl547@17789 196 + fi
devl547@17789 197 + if test -n "$lib_smime"; then
devl547@17789 198 + libdirs="$libdirs -lsmime${major_version}"
devl547@17789 199 + fi
devl547@17789 200 + if test -n "$lib_ssl"; then
devl547@17789 201 + libdirs="$libdirs -lssl${major_version}"
devl547@17789 202 + fi
devl547@17789 203 + if test -n "$lib_softokn"; then
devl547@17789 204 + libdirs="$libdirs -lsoftokn${major_version}"
devl547@17789 205 + fi
devl547@17789 206 + echo $libdirs
devl547@17789 207 +fi
devl547@17789 208 +
devl547@17789 209 --- a/nss/config/nss.pc.in 1970-01-01 01:00:00.000000000 +0100
devl547@17789 210 +++ b/nss/config/nss.pc.in 2013-07-02 14:52:58.328084334 +0200
devl547@17789 211 @@ -0,0 +1,12 @@
devl547@17789 212 +prefix=@prefix@
devl547@17789 213 +exec_prefix=@exec_prefix@
devl547@17789 214 +libdir=@libdir@
devl547@17789 215 +includedir=@includedir@
devl547@17789 216 +
devl547@17789 217 +Name: NSS
devl547@17789 218 +Description: Network Security Services
devl547@17789 219 +Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@
devl547@17789 220 +Requires: nspr >= 4.8
devl547@17789 221 +Libs: -L@libdir@ -lnss@NSS_MAJOR_VERSION@ -lnssutil@NSS_MAJOR_VERSION@ -lsmime@NSS_MAJOR_VERSION@ -lssl@NSS_MAJOR_VERSION@ -lsoftokn@NSS_MAJOR_VERSION@
devl547@17789 222 +Cflags: -I${includedir}
devl547@17789 223 +
devl547@17789 224 --- a/nss/Makefile 2013-05-28 23:43:24.000000000 +0200
devl547@17789 225 +++ b/nss/Makefile 2013-07-02 14:52:58.328084334 +0200
devl547@17789 226 @@ -44,7 +44,7 @@
devl547@17789 227 # (7) Execute "local" rules. (OPTIONAL). #
devl547@17789 228 #######################################################################
devl547@17789 229
devl547@17789 230 -nss_build_all: build_nspr all
devl547@17789 231 +nss_build_all: all
devl547@17789 232
devl547@17789 233 nss_clean_all: clobber_nspr clobber
devl547@17789 234
devl547@17789 235 --- a/nss/manifest.mn.orig 2014-09-26 16:46:44.201965538 -0300
devl547@17789 236 +++ b/nss/manifest.mn 2014-09-26 16:51:11.386336520 -0300
devl547@17789 237 @@ -10,7 +10,7 @@
devl547@17789 238
devl547@17789 239 RELEASE = nss
devl547@17789 240
devl547@17789 241 -DIRS = coreconf lib cmd
devl547@17789 242 +DIRS = coreconf lib cmd config
devl547@17789 243
devl547@17789 244 ifdef NSS_BUILD_GTESTS
devl547@17789 245 DIRS += external_tests