[gentoo-commits] proj/mozilla:master commit in: dev-libs/nss/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Jory Pratt" <anarchy@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/mozilla:master commit in: dev-libs/nss/
Date: Wed, 11 Jan 2012 05:04:02 +0000 (UTC)	[thread overview]
Message-ID: <2e0ea6c347f4c422549cc7524c540523897fd2ed.anarchy@gentoo> (raw)

commit:     2e0ea6c347f4c422549cc7524c540523897fd2ed
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 11 05:03:09 2012 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Wed Jan 11 05:03:09 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=2e0ea6c3

update for security, also include support for ca certs.

---
 dev-libs/nss/Manifest                              |    5 +-
 .../{nss-3.13.1-r1.ebuild => nss-3.13.1-r2.ebuild} |   62 ++++++++++---------
 2 files changed, 36 insertions(+), 31 deletions(-)

diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 2b1c71f..ac62e94 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -2,5 +2,6 @@ AUX nss-3.12.5-gentoo-fixups.diff 6669 RMD160 af35db729406c62d0e8582e7db18f2f80a
 AUX nss-3.12.6-gentoo-fixup-warnings.patch 301 RMD160 9bd51d07ba7e568b6f29b7c347a71c1717912234 SHA1 620bec7adc3c36c94075bffead0ce73cd8d3d7df SHA256 e14b227f762bd21875208e241029966b1e3873edfdf0592ca69bd9714859d329
 AUX nss-3.13.1-pkcs11n-header-fix.patch 614 RMD160 343142563f7cf53e85cd09ba707fb40cdd0ecb5b SHA1 fe8d58b545e8456f1f5f626526855ed9d5576298 SHA256 1792baa694e86a79fb07b8d69bf41665daedaa8692e22b83e327443b15c193ec
 AUX nss-3.13.1-solaris-gcc.patch 994 RMD160 f6bfc9b34aebf2fd4b47187884fe572e446aa2c0 SHA1 37ad83887a91073c94bbed698677b82160392771 SHA256 2633e73f8bba27fb34b5872464946b1abe03a7e73e544be4f751655c6276487b
-DIST nss-3.13.1.tar.gz 5985329 RMD160 c1743308c380169d666e5c08b23a455f86b360bd SHA1 d8e7ee9f9f1e0bfa2ea8b72d25727634fea130a6 SHA256 95d933b59be466f19f90f595a35b4b92213fef084caecafeb89f4e2ce7160660
-EBUILD nss-3.13.1-r1.ebuild 6675 RMD160 3165579141151a32c31f4300a7dcfe98356f7478 SHA1 342a277d717916a01984d071305bebb73a3b62dd SHA256 06c3b67c157603d5f0b364d36016b685526384fab8c6b98af5208d22fdd73b45
+DIST nss-3.13.1-add_cacert_ca_certs.patch 71117 RMD160 1d5a90f1afe3b645ac75c38540454d011f06985e SHA1 d9fc8c3ba90f4470cfdaeac457d2bc8d073ef5b4 SHA256 c9a38ebbafc49ec5eda87af4528e7c91bf13c49c9894b9a37464978c9b8eaf64
+DIST nss-3.13.1.with.ckbi.1.88.tar.gz 6065634 RMD160 20bf77259d92cb054a4e4c40fbd931da335fc58c SHA1 ebc0258c8d1a3c2fe80941bd991b766552464fc6 SHA256 456fd2ad036976660ae7e4e24edddc49f2f47e7ca490c1c5372771bbb5207879
+EBUILD nss-3.13.1-r2.ebuild 7061 RMD160 1228a0271d51d5c0a7386cefa3bc3e3a6f5c064d SHA1 7652fef21248fc9cbd881afd3bb4ea86982e2dd8 SHA256 1e8535702a7c4dcaf5b7b6ea8d3e140409462a364f00f603414bd973e4796686

diff --git a/dev-libs/nss/nss-3.13.1-r1.ebuild b/dev-libs/nss/nss-3.13.1-r2.ebuild
similarity index 81%
rename from dev-libs/nss/nss-3.13.1-r1.ebuild
rename to dev-libs/nss/nss-3.13.1-r2.ebuild
index e27853d..d21d892 100644
--- a/dev-libs/nss/nss-3.13.1-r1.ebuild
+++ b/dev-libs/nss/nss-3.13.1-r2.ebuild
@@ -1,15 +1,17 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.10.ebuild,v 1.2 2011/07/31 14:29:19 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.13.1-r1.ebuild,v 1.2 2012/01/10 10:21:27 ago Exp $
 
 EAPI=3
 inherit eutils flag-o-matic multilib toolchain-funcs
 
 NSPR_VER="4.8.9"
 RTM_NAME="NSS_${PV//./_}_RTM"
+RTM_NAMECKBI="NSS_${PV//./_}_WITH_CKBI_1_88_RTM"
 DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
 HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
-SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz"
+SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAMECKBI}/src/${P}.with.ckbi.1.88.tar.gz
+	http://dev.gentoo.org/~anarchy/patches/nss-3.13.1-add_cacert_ca_certs.patch"
 
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
 SLOT="0"
@@ -18,37 +20,39 @@ IUSE="utils"
 
 DEPEND="dev-util/pkgconfig"
 RDEPEND=">=dev-libs/nspr-${NSPR_VER}
-	>=dev-db/sqlite-3.5"
+	>=dev-db/sqlite-3.5
+	sys-libs/zlib"
 
 src_prepare() {
 	# Custom changes for gentoo
 	epatch "${FILESDIR}/${PN}-3.12.5-gentoo-fixups.diff"
 	epatch "${FILESDIR}/${PN}-3.12.6-gentoo-fixup-warnings.patch"
 	epatch "${FILESDIR}/nss-3.13.1-pkcs11n-header-fix.patch"
+	epatch "${DISTDIR}/nss-3.13.1-add_cacert_ca_certs.patch"
 
-	cd "${S}"/mozilla/security/coreconf
+	cd "${S}"/mozilla/security/coreconf || die
 	# hack nspr paths
 	echo 'INCLUDES += -I'"${EPREFIX}"'/usr/include/nspr -I$(DIST)/include/dbm' \
 		>> headers.mk || die "failed to append include"
 
 	# modify install path
 	sed -e 's:SOURCE_PREFIX = $(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
-		-i source.mk
+		-i source.mk || die
 
 	# Respect LDFLAGS
-	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
+	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk || die
 
 	# Ensure we stay multilib aware
 	sed -i -e "s:gentoo\/nss:$(get_libdir):" "${S}"/mozilla/security/nss/config/Makefile || die "Failed to fix for multilib"
 
 	# Fix pkgconfig file for Prefix
 	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
-		"${S}"/mozilla/security/nss/config/Makefile
+		"${S}"/mozilla/security/nss/config/Makefile || die
 
-	epatch ${FILESDIR}/nss-3.13.1-solaris-gcc.patch
+	epatch "${FILESDIR}/nss-3.13.1-solaris-gcc.patch"
 
 	# dirty hack
-	cd "${S}"/mozilla/security/nss
+	cd "${S}"/mozilla/security/nss || die
 	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
 		lib/ssl/config.mk || die
 	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
@@ -58,8 +62,8 @@ src_prepare() {
 src_compile() {
 	strip-flags
 
-	echo > "${T}"/test.c
-	$(tc-getCC) ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o
+	echo > "${T}"/test.c || die
+	$(tc-getCC) ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die
 	case $(file "${T}"/test.o) in
 	*64-bit*|*ppc64*|*x86_64*) export USE_64=1;;
 	*32-bit*|*ppc*|*i386*) ;;
@@ -76,11 +80,11 @@ src_compile() {
 	export FREEBL_NO_DEPEND=1
 	export ASFLAGS=""
 
-	cd "${S}"/mozilla/security/coreconf
+	cd "${S}"/mozilla/security/coreconf || die
 	emake -j1 CC="$(tc-getCC)" || die "coreconf make failed"
-	cd "${S}"/mozilla/security/dbm
+	cd "${S}"/mozilla/security/dbm || die
 	emake -j1 CC="$(tc-getCC)" || die "dbm make failed"
-	cd "${S}"/mozilla/security/nss
+	cd "${S}"/mozilla/security/nss || die
 	emake -j1 CC="$(tc-getCC)" || die "nss make failed"
 }
 
@@ -131,29 +135,29 @@ cleanup_chk() {
 
 src_install () {
 	MINOR_VERSION=12
-	cd "${S}"/mozilla/security/dist
+	cd "${S}"/mozilla/security/dist || die
 
-	dodir /usr/$(get_libdir)
+	dodir /usr/$(get_libdir) || die
 	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
 	# We generate these after stripping the libraries, else they don't match.
 	#cp -L */lib/*.chk "${ED}"/usr/$(get_libdir) || die "copying chk files failed"
 	cp -L */lib/libcrmf.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
 
 	# Install nss-config and pkgconfig file
-	dodir /usr/bin
-	cp -L */bin/nss-config "${ED}"/usr/bin
-	dodir /usr/$(get_libdir)/pkgconfig
-	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig
+	dodir /usr/bin || die
+	cp -L */bin/nss-config "${ED}"/usr/bin || die
+	dodir /usr/$(get_libdir)/pkgconfig || die
+	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
 
 	# all the include files
 	insinto /usr/include/nss
-	doins public/nss/*.h
-	cd "${ED}"/usr/$(get_libdir)
+	doins public/nss/*.h || die
+	cd "${ED}"/usr/$(get_libdir) || die
 	local n=
 	for file in *$(get_libname); do
 		n=${file%$(get_libname)}$(get_libname ${MINOR_VERSION})
-		mv ${file} ${n}
-		ln -s ${n} ${file}
+		mv ${file} ${n} || die
+		ln -s ${n} ${file} || die
 		if [[ ${CHOST} == *-darwin* ]]; then
 			install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${n}" ${n} || die
 		fi
@@ -172,9 +176,9 @@ src_install () {
 		pk12util pp rsaperf selfserv shlibsign signtool signver ssltap strsclnt
 		symkeyutil tstclnt vfychain vfyserv"
 	fi
-	cd "${S}"/mozilla/security/dist/*/bin/
+	cd "${S}"/mozilla/security/dist/*/bin/ || die
 	for f in $nssutils; do
-		dobin ${f}
+		dobin ${f} || die
 	done
 
 	# Prelink breaks the CHK files. We don't have any reliable way to run
@@ -184,9 +188,9 @@ src_install () {
 		libs+=("${EPREFIX}/usr/$(get_libdir)/lib${l}.so")
 	done
 	OLD_IFS="${IFS}" IFS=":" ; liblist="${libs[*]}" ; IFS="${OLD_IFS}"
-	echo -e "PRELINK_PATH_MASK=${liblist}" >"${T}/90nss"
+	echo -e "PRELINK_PATH_MASK=${liblist}" >"${T}/90nss" || die
 	unset libs liblist
-	doenvd "${T}/90nss"
+	doenvd "${T}/90nss" || die
 }
 
 pkg_postinst() {

next             reply	other threads:[~2012-01-11  5:04 UTC|newest]

Thread overview: 47+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-01-11  5:04 Jory Pratt [this message]
  -- strict thread matches above, loose matches on Subject: below --
2012-02-27 15:50 [gentoo-commits] proj/mozilla:master commit in: dev-libs/nss/ Jory Pratt
2012-03-25  3:37 Jory Pratt
2012-04-09  0:36 Jory Pratt
2012-06-11 20:14 Jory Pratt
2012-09-01 13:46 Jory Pratt
2013-01-22  4:47 Lars Wendler
2013-08-11 21:34 Jory Pratt
2013-09-27  1:16 Jory Pratt
2013-11-14 11:50 Lars Wendler
2013-12-11 14:03 Jory Pratt
2014-03-31 18:21 Jory Pratt
2014-06-14  4:50 Ian Stakenvicius
2014-06-14  5:19 Ian Stakenvicius
2015-11-15 18:58 Jory Pratt
2016-02-16  7:28 Lars Wendler
2016-07-09  3:25 Ian Stakenvicius
2017-02-08  0:34 Jory Pratt
2017-06-12 13:36 Jory Pratt
2017-09-17 18:46 Jory Pratt
2017-09-21 22:28 Lars Wendler
2018-01-20 10:06 Lars Wendler
2018-03-07 13:00 Lars Wendler
2018-03-21  7:49 Lars Wendler
2018-05-22  8:33 Lars Wendler
2018-06-06 16:03 Jory Pratt
2019-03-31 19:43 Jory Pratt
2019-04-27 22:07 Jory Pratt
2019-04-27 22:22 Jory Pratt
2019-05-13 12:03 Lars Wendler
2019-05-17  1:55 Jory Pratt
2019-06-25  8:03 Lars Wendler
2019-07-10  8:24 Lars Wendler
2019-08-23 20:23 Jory Pratt
2019-08-31 15:39 Jory Pratt
2019-10-06 11:15 Lars Wendler
2019-11-22  9:10 Lars Wendler
2019-12-06  5:44 Jory Pratt
2019-12-16  3:11 Jory Pratt
2020-01-07 20:46 Jory Pratt
2020-01-15 10:36 Lars Wendler
2020-02-08 15:17 Jory Pratt
2020-02-10 17:46 Jory Pratt
2020-03-07 15:17 Jory Pratt
2020-04-10 11:14 Lars Wendler
2020-04-20  7:49 Lars Wendler
2020-04-20  9:01 Lars Wendler

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:2b1c71f dfblob:ac62e94 dfblob:e27853d dfblob:d21d892 )
 OR (
bs:"[gentoo-commits] proj/mozilla:master commit in: dev-libs/nss/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=2e0ea6c347f4c422549cc7524c540523897fd2ed.anarchy@gentoo \
    --to=anarchy@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox