wok view nss/stuff/nss-3.17.4-standalone-1.patch @ rev 20497

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