Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Jory Pratt <anarchy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/mozilla:master commit in: dev-libs/nss/, dev-libs/nss/files/
Date: Fri, 28 Jul 2017 19:09:28
Message-Id: 1501268937.df0904e6ce4711d56d6abb2ec6f435282b22fb28.anarchy@gentoo
1 commit: df0904e6ce4711d56d6abb2ec6f435282b22fb28
2 Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jul 28 19:08:57 2017 +0000
4 Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
5 CommitDate: Fri Jul 28 19:08:57 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=df0904e6
7
8 dev-libs/nss: nss-3.32 version bump, fix gentoo pkg-config patch
9
10 dev-libs/nss/Manifest | 1 -
11 ...o-fixups.patch => nss-3.32-gentoo-fixups.patch} | 109 ++++++++++++++-------
12 dev-libs/nss/{nss-3.31.ebuild => nss-3.32.ebuild} | 4 +-
13 3 files changed, 73 insertions(+), 41 deletions(-)
14
15 diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
16 index 1627dc6..2d3743d 100644
17 --- a/dev-libs/nss/Manifest
18 +++ b/dev-libs/nss/Manifest
19 @@ -1,4 +1,3 @@
20 -DIST nss-3.31.tar.gz 9537011 SHA256 e90561256a3271486162c1fbe8d614d118c333d36a4455be2af8688bd420a65d SHA512 2b56405b32d37cc4386cbbe54462cc57092e47b3418a743adbae14e1825ca69d07256fbfe16c0cfd7540c46cea67259151b42a0d95419c80964015eacdcafea1 WHIRLPOOL b63b481436feaf48ef3acc03e7af3831b743e91fda802f1fb5d4e782cbefab979dda5b643766f3a600b16ff815a90dacabd0b06b79baa76386237b56e74676fb
21 DIST nss-3.32.tar.gz 9493574 SHA256 35c6f381cc96bb25e4f924469f6ba3e57b3a16e0c2fb7e295a284a00d57ed335 SHA512 7a01f81e23ef9649fd26b8423b015f4df5878c94f6ff591727086644b01db3dbc36de4e131cf70a6f84564e46c8decb7c4f7780fca12270eb900de1f8a11ee3c WHIRLPOOL bd1a9a8da509143ba995c2a4aac43df991703c1170e2654a8e762fbaf1b26e4f95f85c9d06db45126247a6d52828060c5283fb9cf1e4328952bc518ee38316c4
22 DIST nss-cacert-class1-class3.patch 22950 SHA256 6bba29cee34276e2ca6436dabedfeba2b61fb46668c5d5ceabf0c871574649bf SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0 WHIRLPOOL 1246223b01292604e5609bb9c580f092dc5937bf8c98f6891b099e8bab960e03612b6617e30a55d6ff8817d88f190e03812fe8f89f84f25c20970493dc2f7700
23 DIST nss-pem-20160329.tar.xz 27732 SHA256 6c13c342e7a9fe34b585556099beca33c3078b3df3e11b72827fb70232ac1443 SHA512 5834b06e4c64205447573d4f4c8989e20986ae67ee00eebce3817eb73794a6355a404143ba1c676ec302ceefaf9df103cb879b1d4ff14ba4e3790dbee3e40eb2 WHIRLPOOL 16fb714fab29e44f7a15fa1928a0f4c1a770f0847b8da97816e29a3b124dee782cffe2357648c445f4d29081f349571b6fffe48c5bc725c7c2dde491f3e0e836
24
25 diff --git a/dev-libs/nss/files/nss-3.28-gentoo-fixups.patch b/dev-libs/nss/files/nss-3.32-gentoo-fixups.patch
26 similarity index 76%
27 rename from dev-libs/nss/files/nss-3.28-gentoo-fixups.patch
28 rename to dev-libs/nss/files/nss-3.32-gentoo-fixups.patch
29 index 69aa652..1773da9 100644
30 --- a/dev-libs/nss/files/nss-3.28-gentoo-fixups.patch
31 +++ b/dev-libs/nss/files/nss-3.32-gentoo-fixups.patch
32 @@ -1,5 +1,54 @@
33 ---- nss/config/Makefile
34 -+++ nss/config/Makefile
35 +From 8e49e1c92dadc2e7a41cad44637f4a224e4f5b39 Mon Sep 17 00:00:00 2001
36 +From: "Jory A. Pratt" <anarchy@g.o>
37 +Date: Fri, 28 Jul 2017 14:00:41 -0500
38 +Subject: [PATCH] add pkg-config file
39 +
40 +Signed-off-by: Jory A. Pratt <anarchy@g.o>
41 +---
42 + Makefile | 11 +---
43 + config/Makefile | 40 ++++++++++++++
44 + config/nss-config.in | 145 +++++++++++++++++++++++++++++++++++++++++++++++++++
45 + config/nss.pc.in | 12 +++++
46 + manifest.mn | 2 +-
47 + 5 files changed, 199 insertions(+), 11 deletions(-)
48 + create mode 100644 config/Makefile
49 + create mode 100644 config/nss-config.in
50 + create mode 100644 config/nss.pc.in
51 +
52 +diff --git a/Makefile b/Makefile
53 +index 48bae37..9850883 100644
54 +--- a/Makefile
55 ++++ b/Makefile
56 +@@ -47,7 +47,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
57 + # (7) Execute "local" rules. (OPTIONAL). #
58 + #######################################################################
59 +
60 +-nss_build_all: build_nspr all latest
61 ++nss_build_all: all latest
62 +
63 + nss_clean_all: clobber_nspr clobber
64 +
65 +@@ -135,15 +135,6 @@ $(NSPR_CONFIG_STATUS): $(NSPR_CONFIGURE)
66 + --prefix='$(NSS_GYP_PREFIX)'
67 + endif
68 +
69 +-build_nspr: $(NSPR_CONFIG_STATUS)
70 +- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)
71 +-
72 +-install_nspr: build_nspr
73 +- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) install
74 +-
75 +-clobber_nspr: $(NSPR_CONFIG_STATUS)
76 +- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) clobber
77 +-
78 + build_docs:
79 + $(MAKE) -C $(CORE_DEPTH)/doc
80 +
81 +diff --git a/config/Makefile b/config/Makefile
82 +new file mode 100644
83 +index 0000000..600fe48
84 +--- /dev/null
85 ++++ b/config/Makefile
86 @@ -0,0 +1,40 @@
87 +CORE_DEPTH = ..
88 +DEPTH = ..
89 @@ -41,8 +90,11 @@
90 +
91 +dummy: all export libs
92 +
93 ---- nss/config/nss-config.in
94 -+++ nss/config/nss-config.in
95 +diff --git a/config/nss-config.in b/config/nss-config.in
96 +new file mode 100644
97 +index 0000000..1d7c444
98 +--- /dev/null
99 ++++ b/config/nss-config.in
100 @@ -0,0 +1,145 @@
101 +#!/bin/sh
102 +
103 @@ -189,8 +241,11 @@
104 + echo $libdirs
105 +fi
106 +
107 ---- nss/config/nss.pc.in
108 -+++ nss/config/nss.pc.in
109 +diff --git a/config/nss.pc.in b/config/nss.pc.in
110 +new file mode 100644
111 +index 0000000..df9e2cf
112 +--- /dev/null
113 ++++ b/config/nss.pc.in
114 @@ -0,0 +1,12 @@
115 +prefix=@prefix@
116 +exec_prefix=@exec_prefix@
117 @@ -204,38 +259,16 @@
118 +Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3
119 +Cflags: -I${includedir}
120 +
121 ---- nss/Makefile
122 -+++ nss/Makefile
123 -@@ -46,7 +46,7 @@
124 - # (7) Execute "local" rules. (OPTIONAL). #
125 - #######################################################################
126 -
127 --nss_build_all: build_nspr all latest
128 -+nss_build_all: all latest
129 -
130 - nss_clean_all: clobber_nspr clobber
131 -
132 -@@ -143,15 +143,6 @@
133 - --prefix='$(NSS_GYP_PREFIX)'
134 - endif
135 -
136 --build_nspr: $(NSPR_CONFIG_STATUS)
137 -- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)
138 --
139 --install_nspr: build_nspr
140 -- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) install
141 --
142 --clobber_nspr: $(NSPR_CONFIG_STATUS)
143 -- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) clobber
144 --
145 - build_docs:
146 - $(MAKE) -C $(CORE_DEPTH)/doc
147 -
148 ---- nss/manifest.mn
149 -+++ nss/manifest.mn
150 -@@ -10,4 +10,4 @@
151 +diff --git a/manifest.mn b/manifest.mn
152 +index 500a5ad..87c905e 100644
153 +--- a/manifest.mn
154 ++++ b/manifest.mn
155 +@@ -10,4 +10,4 @@ IMPORTS = nspr20/v4.8 \
156
157 RELEASE = nss
158
159 --DIRS = coreconf lib cmd gtests
160 -+DIRS = coreconf lib cmd config
161 +-DIRS = coreconf lib cmd cpputil gtests
162 ++DIRS = coreconf lib cmd cpputil config
163 +--
164 +2.13.3
165 +
166
167 diff --git a/dev-libs/nss/nss-3.31.ebuild b/dev-libs/nss/nss-3.32.ebuild
168 similarity index 99%
169 rename from dev-libs/nss/nss-3.31.ebuild
170 rename to dev-libs/nss/nss-3.32.ebuild
171 index 3d6f566..2932e76 100644
172 --- a/dev-libs/nss/nss-3.31.ebuild
173 +++ b/dev-libs/nss/nss-3.32.ebuild
174 @@ -5,7 +5,7 @@ EAPI=6
175
176 inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
177
178 -NSPR_VER="4.13.1"
179 +NSPR_VER="4.16"
180 RTM_NAME="NSS_${PV//./_}_RTM"
181 # Rev of https://git.fedorahosted.org/cgit/nss-pem.git
182 PEM_GIT_REV="429b0222759d8ad8e6dcd29e62875ae3efd69116"
183 @@ -43,7 +43,7 @@ MULTILIB_CHOST_TOOLS=(
184
185 PATCHES=(
186 # Custom changes for gentoo
187 - "${FILESDIR}/${PN}-3.28-gentoo-fixups.patch"
188 + "${FILESDIR}/${PN}-3.32-gentoo-fixups.patch"
189 "${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
190 "${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
191 )
Report Message
Find on MARC Find on Google Groups