summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/nss
diff options
context:
space:
mode:
authorAdrian Dudau <adrian.dudau@enea.com>2013-12-12 13:38:32 +0100
committerAdrian Dudau <adrian.dudau@enea.com>2013-12-12 13:50:20 +0100
commite2e6f6fe07049f33cb6348780fa975162752e421 (patch)
treeb1813295411235d1297a0ed642b1346b24fdfb12 /meta/recipes-support/nss
downloadpoky-e2e6f6fe07049f33cb6348780fa975162752e421.tar.gz
initial commit of Enea Linux 3.1
Migrated from the internal git server on the dora-enea branch Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
Diffstat (limited to 'meta/recipes-support/nss')
-rw-r--r--meta/recipes-support/nss/files/nss-fix-incorrect-shebang-of-perl.patch110
-rw-r--r--meta/recipes-support/nss/files/nss-fix-support-cross-compiling.patch71
-rw-r--r--meta/recipes-support/nss/files/nss-no-rpath-for-cross-compiling.patch26
-rw-r--r--meta/recipes-support/nss/files/nss.pc.in11
-rw-r--r--meta/recipes-support/nss/files/signlibs.sh20
-rw-r--r--meta/recipes-support/nss/nss.inc196
-rw-r--r--meta/recipes-support/nss/nss_3.15.1.bb9
7 files changed, 443 insertions, 0 deletions
diff --git a/meta/recipes-support/nss/files/nss-fix-incorrect-shebang-of-perl.patch b/meta/recipes-support/nss/files/nss-fix-incorrect-shebang-of-perl.patch
new file mode 100644
index 0000000000..547594d5b6
--- /dev/null
+++ b/meta/recipes-support/nss/files/nss-fix-incorrect-shebang-of-perl.patch
@@ -0,0 +1,110 @@
1nss: fix incorrect shebang of perl
2
3Replace incorrect shebang of perl with `#!/usr/bin/env perl'.
4
5Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
6Upstream-Status: Pending
7---
8 nss/cmd/smimetools/smime | 2 +-
9 nss/coreconf/cpdist.pl | 2 +-
10 nss/coreconf/import.pl | 2 +-
11 nss/coreconf/jniregen.pl | 2 +-
12 nss/coreconf/outofdate.pl | 2 +-
13 nss/coreconf/release.pl | 2 +-
14 nss/coreconf/version.pl | 2 +-
15 nss/tests/clean_tbx | 2 +-
16 nss/tests/path_uniq | 2 +-
17 9 files changed, 9 insertions(+), 9 deletions(-)
18
19diff --git a/nss/cmd/smimetools/smime b/nss/cmd/smimetools/smime
20--- a/nss/cmd/smimetools/smime
21+++ b/nss/cmd/smimetools/smime
22@@ -1,4 +1,4 @@
23-#!/usr/local/bin/perl
24+#!/usr/bin/env perl
25
26 # This Source Code Form is subject to the terms of the Mozilla Public
27 # License, v. 2.0. If a copy of the MPL was not distributed with this
28diff --git a/nss/coreconf/cpdist.pl b/nss/coreconf/cpdist.pl
29index 800edfb..652187f 100755
30--- a/nss/coreconf/cpdist.pl
31+++ b/nss/coreconf/cpdist.pl
32@@ -1,4 +1,4 @@
33-#! /usr/local/bin/perl
34+#!/usr/bin/env perl
35 #
36 # This Source Code Form is subject to the terms of the Mozilla Public
37 # License, v. 2.0. If a copy of the MPL was not distributed with this
38diff --git a/nss/coreconf/import.pl b/nss/coreconf/import.pl
39index dd2d177..428eaa5 100755
40--- a/nss/coreconf/import.pl
41+++ b/nss/coreconf/import.pl
42@@ -1,4 +1,4 @@
43-#! /usr/local/bin/perl
44+#!/usr/bin/env perl
45 #
46 # This Source Code Form is subject to the terms of the Mozilla Public
47 # License, v. 2.0. If a copy of the MPL was not distributed with this
48diff --git a/nss/coreconf/jniregen.pl b/nss/coreconf/jniregen.pl
49index 2039180..5f4f69c 100755
50--- a/nss/coreconf/jniregen.pl
51+++ b/nss/coreconf/jniregen.pl
52@@ -1,4 +1,4 @@
53-#!/usr/local/bin/perl
54+#!/usr/bin/env perl
55 #
56 # This Source Code Form is subject to the terms of the Mozilla Public
57 # License, v. 2.0. If a copy of the MPL was not distributed with this
58diff --git a/nss/coreconf/outofdate.pl b/nss/coreconf/outofdate.pl
59index 33d80bb..01fc097 100755
60--- a/nss/coreconf/outofdate.pl
61+++ b/nss/coreconf/outofdate.pl
62@@ -1,4 +1,4 @@
63-#!/usr/local/bin/perl
64+#!/usr/bin/env perl
65 #
66 # This Source Code Form is subject to the terms of the Mozilla Public
67 # License, v. 2.0. If a copy of the MPL was not distributed with this
68diff --git a/nss/coreconf/release.pl b/nss/coreconf/release.pl
69index 7cde19d..b5df2f6 100755
70--- a/nss/coreconf/release.pl
71+++ b/nss/coreconf/release.pl
72@@ -1,4 +1,4 @@
73-#! /usr/local/bin/perl
74+#!/usr/bin/env perl
75 #
76 # This Source Code Form is subject to the terms of the Mozilla Public
77 # License, v. 2.0. If a copy of the MPL was not distributed with this
78diff --git a/nss/coreconf/version.pl b/nss/coreconf/version.pl
79index d2a4942..79359fe 100644
80--- a/nss/coreconf/version.pl
81+++ b/nss/coreconf/version.pl
82@@ -1,4 +1,4 @@
83-#!/usr/sbin/perl
84+#!/usr/bin/env perl
85 #
86 # This Source Code Form is subject to the terms of the Mozilla Public
87 # License, v. 2.0. If a copy of the MPL was not distributed with this
88diff --git a/nss/tests/clean_tbx b/nss/tests/clean_tbx
89index 4de9555..a7def9f 100755
90--- a/nss/tests/clean_tbx
91+++ b/nss/tests/clean_tbx
92@@ -1,4 +1,4 @@
93-#! /bin/perl
94+#!/usr/bin/env perl
95
96 #######################################################################
97 #
98diff --git a/nss/tests/path_uniq b/nss/tests/path_uniq
99index f29f60a..08fbffa 100755
100--- a/nss/tests/path_uniq
101+++ b/nss/tests/path_uniq
102@@ -1,4 +1,4 @@
103-#! /bin/perl
104+#!/usr/bin/env perl
105
106 ########################################################################
107 #
108--
1091.8.1.2
110
diff --git a/meta/recipes-support/nss/files/nss-fix-support-cross-compiling.patch b/meta/recipes-support/nss/files/nss-fix-support-cross-compiling.patch
new file mode 100644
index 0000000000..f0b3550bff
--- /dev/null
+++ b/meta/recipes-support/nss/files/nss-fix-support-cross-compiling.patch
@@ -0,0 +1,71 @@
1nss: fix support cross compiling
2
3Let some make variables be assigned from outside makefile.
4
5Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
6Upstream-Status: Inappropriate [configuration]
7---
8 nss/coreconf/Linux.mk | 12 +++++++++++-
9 nss/coreconf/arch.mk | 2 +-
10 nss/lib/freebl/Makefile | 6 ++++++
11 3 files changed, 18 insertions(+), 2 deletions(-)
12
13diff --git a/nss/coreconf/Linux.mk b/nss/coreconf/Linux.mk
14--- a/nss/coreconf/Linux.mk
15+++ b/nss/coreconf/Linux.mk
16@@ -16,11 +16,21 @@ ifeq ($(USE_PTHREADS),1)
17 IMPL_STRATEGY = _PTH
18 endif
19
20+ifndef CC
21 CC = gcc
22+endif
23+
24+ifdef CXX
25+CCC = $(CXX)
26+else
27 CCC = g++
28+endif
29+
30+ifndef RANLIB
31 RANLIB = ranlib
32+endif
33
34-DEFAULT_COMPILER = gcc
35+DEFAULT_COMPILER = $(CC)
36
37 ifeq ($(OS_TARGET),Android)
38 ifndef ANDROID_NDK
39diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk
40index 6557348..b722412 100644
41--- a/nss/coreconf/arch.mk
42+++ b/nss/coreconf/arch.mk
43@@ -37,7 +37,7 @@ OS_TEST := $(shell uname -m)
44 ifeq ($(OS_TEST),i86pc)
45 OS_RELEASE := $(shell uname -r)_$(OS_TEST)
46 else
47- OS_RELEASE := $(shell uname -r)
48+ OS_RELEASE ?= $(shell uname -r)
49 endif
50
51 #
52diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile
53index 0d293f1..678f506 100644
54--- a/nss/lib/freebl/Makefile
55+++ b/nss/lib/freebl/Makefile
56@@ -36,6 +36,12 @@ ifdef USE_64
57 DEFINES += -DNSS_USE_64
58 endif
59
60+ifeq ($(OS_TEST),mips)
61+ifndef USE_64
62+ DEFINES += -DNS_PTR_LE_32
63+endif
64+endif
65+
66 ifdef USE_ABI32_FPU
67 DEFINES += -DNSS_USE_ABI32_FPU
68 endif
69--
701.8.1.2
71
diff --git a/meta/recipes-support/nss/files/nss-no-rpath-for-cross-compiling.patch b/meta/recipes-support/nss/files/nss-no-rpath-for-cross-compiling.patch
new file mode 100644
index 0000000000..7661dc93a0
--- /dev/null
+++ b/meta/recipes-support/nss/files/nss-no-rpath-for-cross-compiling.patch
@@ -0,0 +1,26 @@
1nss:no rpath for cross compiling
2
3Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
4Upstream-Status: Inappropriate [configuration]
5---
6 nss/cmd/platlibs.mk | 4 ++--
7 1 file changed, 2 insertions(+), 2 deletions(-)
8
9diff --git a/nss/cmd/platlibs.mk b/nss/cmd/platlibs.mk
10--- a/nss/cmd/platlibs.mk
11+++ b/nss/cmd/platlibs.mk
12@@ -18,9 +18,9 @@ endif
13
14 ifeq ($(OS_ARCH), Linux)
15 ifeq ($(USE_64), 1)
16-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib'
17+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib'
18 else
19-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib'
20+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib'
21 endif
22 endif
23
24--
251.8.1.2
26
diff --git a/meta/recipes-support/nss/files/nss.pc.in b/meta/recipes-support/nss/files/nss.pc.in
new file mode 100644
index 0000000000..200f635c65
--- /dev/null
+++ b/meta/recipes-support/nss/files/nss.pc.in
@@ -0,0 +1,11 @@
1prefix=OEPREFIX
2exec_prefix=OEEXECPREFIX
3libdir=OELIBDIR
4includedir=OEINCDIR
5
6Name: NSS
7Description: Network Security Services
8Version: %NSS_VERSION%
9Requires: nspr >= %NSPR_VERSION%
10Libs: -lssl3 -lsmime3 -lnss3 -lsoftokn3 -lnssutil3
11Cflags: -IOEINCDIR
diff --git a/meta/recipes-support/nss/files/signlibs.sh b/meta/recipes-support/nss/files/signlibs.sh
new file mode 100644
index 0000000000..1ec79f4576
--- /dev/null
+++ b/meta/recipes-support/nss/files/signlibs.sh
@@ -0,0 +1,20 @@
1#!/bin/sh
2
3# signlibs.sh
4#
5# (c)2010 Wind River Systems, Inc.
6#
7# regenerates the .chk files for the NSS libraries that require it
8# since the ones that are built have incorrect checksums that were
9# calculated on the host where they really need to be done on the
10# target
11
12CHK_FILES=`find /lib* /usr/lib* -name "*.chk"`
13SIGN_BINARY=`which shlibsign`
14for I in $CHK_FILES
15do
16 DN=`dirname $I`
17 BN=`basename $I .chk`
18 FN=$DN/$BN.so
19 $SIGN_BINARY -i $FN
20done
diff --git a/meta/recipes-support/nss/nss.inc b/meta/recipes-support/nss/nss.inc
new file mode 100644
index 0000000000..2b2b668762
--- /dev/null
+++ b/meta/recipes-support/nss/nss.inc
@@ -0,0 +1,196 @@
1SUMMARY = "Mozilla's SSL and TLS implementation"
2DESCRIPTION = "Network Security Services (NSS) is a set of libraries \
3designed to support cross-platform development of \
4security-enabled client and server applications. \
5Applications built with NSS can support SSL v2 and v3, \
6TLS, PKCS 5, PKCS 7, PKCS 11, PKCS 12, S/MIME, X.509 \
7v3 certificates, and other security standards."
8HOMEPAGE = "http://www.mozilla.org/projects/security/pki/nss/"
9SECTION = "libs"
10
11LICENSE = "MPL-1.1 GPL-2.0 LGPL-2.1"
12
13LIC_FILES_CHKSUM = "file://nss/lib/freebl/mpi/doc/LICENSE;md5=491f158d09d948466afce85d6f1fe18f \
14 file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=6bf96825e3d7ce4de25621ae886cc859"
15SRC_URI = "\
16 file://nss-fix-support-cross-compiling.patch \
17 file://nss-no-rpath-for-cross-compiling.patch \
18 file://nss-fix-incorrect-shebang-of-perl.patch \
19"
20SRC_URI_append_class-target += "\
21 file://nss.pc.in \
22 file://signlibs.sh \
23"
24inherit siteinfo
25PR = "r0"
26DEPENDS = "sqlite3 nspr zlib nss-native"
27DEPENDS_class-native = "sqlite3-native nspr-native zlib-native"
28RDEPENDS_${PN} = "perl"
29
30TD = "${S}/tentative-dist"
31TDS = "${S}/tentative-dist-staging"
32
33TARGET_CC_ARCH += "${LDFLAGS}"
34
35do_compile_prepend_class-native() {
36 export NSPR_INCLUDE_DIR=${STAGING_INCDIR_NATIVE}
37 export NSPR_LIB_DIR=${STAGING_LIBDIR_NATIVE}
38}
39
40do_compile() {
41 export CROSS_COMPILE=1
42 export NATIVE_CC="gcc"
43 export BUILD_OPT=1
44
45 export FREEBL_NO_DEPEND=1
46 export FREEBL_LOWHASH=1
47
48 export LIBDIR=${libdir}
49 export MOZILLA_CLIENT=1
50 export NS_USE_GCC=1
51 export NSS_USE_SYSTEM_SQLITE=1
52 export NSS_ENABLE_ECC=1
53
54 export OS_RELEASE=3.4
55 export OS_TARGET=Linux
56 export OS_ARCH=Linux
57
58 if [ "${TARGET_ARCH}" = "powerpc" ]; then
59 OS_TEST=ppc
60 elif [ "${TARGET_ARCH}" = "powerpc64" ]; then
61 OS_TEST=ppc64
62 elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then
63 OS_TEST=mips
64 else
65 OS_TEST="${TARGET_ARCH}"
66 fi
67
68 if [ "${SITEINFO_BITS}" = "64" ]; then
69 export USE_64=1
70 fi
71
72 make -C ./nss CCC="${CXX}" \
73 OS_TEST=${OS_TEST} \
74}
75
76do_install() {
77 export CROSS_COMPILE=1
78 export NATIVE_CC="gcc"
79 export BUILD_OPT=1
80
81 export FREEBL_NO_DEPEND=1
82
83 export LIBDIR=${libdir}
84 export MOZILLA_CLIENT=1
85 export NS_USE_GCC=1
86 export NSS_USE_SYSTEM_SQLITE=1
87 export NSS_ENABLE_ECC=1
88
89 export OS_RELEASE=3.4
90 export OS_TARGET=Linux
91 export OS_ARCH=Linux
92
93 if [ "${TARGET_ARCH}" = "powerpc" ]; then
94 OS_TEST=ppc
95 elif [ "${TARGET_ARCH}" = "powerpc64" ]; then
96 OS_TEST=ppc64
97 elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then
98 OS_TEST=mips
99 else
100 OS_TEST="${TARGET_ARCH}"
101 fi
102 if [ "${SITEINFO_BITS}" = "64" ]; then
103 export USE_64=1
104 fi
105
106 make -C ./nss \
107 CCC="${CXX}" \
108 OS_TEST=${OS_TEST} \
109 SOURCE_LIB_DIR="${TD}/${libdir}" \
110 SOURCE_BIN_DIR="${TD}/${bindir}" \
111 install
112
113 install -d ${D}/${libdir}/
114 for file in ${S}/dist/*.OBJ/lib/*.so; do
115 echo "Installing `basename $file`..."
116 cp $file ${D}/${libdir}/
117 done
118
119 for shared_lib in ${TD}/${libdir}/*.so.*; do
120 if [ -f $shared_lib ]; then
121 cp $shared_lib ${D}/${libdir}
122 ln -sf $(basename $shared_lib) ${D}/${libdir}/$(basename $shared_lib .1oe)
123 fi
124 done
125 for shared_lib in ${TD}/${libdir}/*.so; do
126 if [ -f $shared_lib -a ! -e ${D}/${libdir}/$shared_lib ]; then
127 cp $shared_lib ${D}/${libdir}
128 fi
129 done
130
131 install -d ${D}/${includedir}/nss3
132 install -m 644 -t ${D}/${includedir}/nss3 dist/public/nss/*
133
134 install -d ${D}/${bindir}
135 for binary in ${TD}/${bindir}/*; do
136 install -m 755 -t ${D}/${bindir} $binary
137 done
138}
139
140do_install_append_class-target() {
141 # Create empty .chk files for the NSS libraries at build time. They could
142 # be regenerated at target's boot time.
143 for file in libsoftokn3.chk libfreebl3.chk libnssdbm3.chk; do
144 touch ${D}/${libdir}/$file
145 chmod 755 ${D}/${libdir}/$file
146 done
147 install -D -m 755 ${WORKDIR}/signlibs.sh ${D}/${bindir}/signlibs.sh
148
149 install -d ${D}${libdir}/pkgconfig/
150 sed 's/%NSS_VERSION%/${PV}/' ${WORKDIR}/nss.pc.in | sed 's/%NSPR_VERSION%/4.9.2/' > ${D}${libdir}/pkgconfig/nss.pc
151 sed -i s:OEPREFIX:${prefix}:g ${D}${libdir}/pkgconfig/nss.pc
152 sed -i s:OEEXECPREFIX:${exec_prefix}:g ${D}${libdir}/pkgconfig/nss.pc
153 sed -i s:OELIBDIR:${libdir}:g ${D}${libdir}/pkgconfig/nss.pc
154 sed -i s:OEINCDIR:${includedir}/nss3:g ${D}${libdir}/pkgconfig/nss.pc
155
156 # Create a blank certificate
157 mkdir -p ${D}/etc/pki/nssdb/
158 touch ./empty_password
159 certutil -N -d ${D}/etc/pki/nssdb/ -f ./empty_password
160 chmod 644 ${D}/etc/pki/nssdb/*.db
161 rm ./empty_password
162}
163
164pkg_postinst_${PN} () {
165 if [ -n "$D" ]; then
166 for I in $D/${libdir}/lib*.chk; do
167 DN=`dirname $I`
168 BN=`basename $I .chk`
169 FN=$DN/$BN.so
170 shlibsign -i $FN
171 if [ $? -ne 0 ]; then
172 exit 1
173 fi
174 done
175 exit 0
176 fi
177 signlibs.sh
178}
179
180FILES_${PN} = "\
181 ${sysconfdir} \
182 ${bindir} \
183 ${libdir}/lib*.chk \
184 ${libdir}/lib*.so \
185 "
186FILES_${PN}-dev = "\
187 ${libdir}/nss \
188 ${libdir}/pkgconfig/* \
189 ${includedir}/* \
190 "
191FILES_${PN}-dbg = "\
192 ${bindir}/.debug/* \
193 ${libdir}/.debug/* \
194 "
195
196BBCLASSEXTEND = "native"
diff --git a/meta/recipes-support/nss/nss_3.15.1.bb b/meta/recipes-support/nss/nss_3.15.1.bb
new file mode 100644
index 0000000000..7b06f00cde
--- /dev/null
+++ b/meta/recipes-support/nss/nss_3.15.1.bb
@@ -0,0 +1,9 @@
1require nss.inc
2
3SRC_URI += "\
4 http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_15_1_RTM/src/${BPN}-${PV}.tar.gz \
5"
6
7SRC_URI[md5sum] = "fb68f4d210ac9397dd0d3c39c4f938eb"
8SRC_URI[sha256sum] = "f994106a33d1f3210f4151bbb3419a1c28fd1cb545caa7dc9afdebd6da626284"
9