| 1 |
commit: 2e0ea6c347f4c422549cc7524c540523897fd2ed |
| 2 |
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 11 05:03:09 2012 +0000 |
| 4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 11 05:03:09 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=2e0ea6c3 |
| 7 |
|
| 8 |
update for security, also include support for ca certs. |
| 9 |
|
| 10 |
--- |
| 11 |
dev-libs/nss/Manifest | 5 +- |
| 12 |
.../{nss-3.13.1-r1.ebuild => nss-3.13.1-r2.ebuild} | 62 ++++++++++--------- |
| 13 |
2 files changed, 36 insertions(+), 31 deletions(-) |
| 14 |
|
| 15 |
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest |
| 16 |
index 2b1c71f..ac62e94 100644 |
| 17 |
--- a/dev-libs/nss/Manifest |
| 18 |
+++ b/dev-libs/nss/Manifest |
| 19 |
@@ -2,5 +2,6 @@ AUX nss-3.12.5-gentoo-fixups.diff 6669 RMD160 af35db729406c62d0e8582e7db18f2f80a |
| 20 |
AUX nss-3.12.6-gentoo-fixup-warnings.patch 301 RMD160 9bd51d07ba7e568b6f29b7c347a71c1717912234 SHA1 620bec7adc3c36c94075bffead0ce73cd8d3d7df SHA256 e14b227f762bd21875208e241029966b1e3873edfdf0592ca69bd9714859d329 |
| 21 |
AUX nss-3.13.1-pkcs11n-header-fix.patch 614 RMD160 343142563f7cf53e85cd09ba707fb40cdd0ecb5b SHA1 fe8d58b545e8456f1f5f626526855ed9d5576298 SHA256 1792baa694e86a79fb07b8d69bf41665daedaa8692e22b83e327443b15c193ec |
| 22 |
AUX nss-3.13.1-solaris-gcc.patch 994 RMD160 f6bfc9b34aebf2fd4b47187884fe572e446aa2c0 SHA1 37ad83887a91073c94bbed698677b82160392771 SHA256 2633e73f8bba27fb34b5872464946b1abe03a7e73e544be4f751655c6276487b |
| 23 |
-DIST nss-3.13.1.tar.gz 5985329 RMD160 c1743308c380169d666e5c08b23a455f86b360bd SHA1 d8e7ee9f9f1e0bfa2ea8b72d25727634fea130a6 SHA256 95d933b59be466f19f90f595a35b4b92213fef084caecafeb89f4e2ce7160660 |
| 24 |
-EBUILD nss-3.13.1-r1.ebuild 6675 RMD160 3165579141151a32c31f4300a7dcfe98356f7478 SHA1 342a277d717916a01984d071305bebb73a3b62dd SHA256 06c3b67c157603d5f0b364d36016b685526384fab8c6b98af5208d22fdd73b45 |
| 25 |
+DIST nss-3.13.1-add_cacert_ca_certs.patch 71117 RMD160 1d5a90f1afe3b645ac75c38540454d011f06985e SHA1 d9fc8c3ba90f4470cfdaeac457d2bc8d073ef5b4 SHA256 c9a38ebbafc49ec5eda87af4528e7c91bf13c49c9894b9a37464978c9b8eaf64 |
| 26 |
+DIST nss-3.13.1.with.ckbi.1.88.tar.gz 6065634 RMD160 20bf77259d92cb054a4e4c40fbd931da335fc58c SHA1 ebc0258c8d1a3c2fe80941bd991b766552464fc6 SHA256 456fd2ad036976660ae7e4e24edddc49f2f47e7ca490c1c5372771bbb5207879 |
| 27 |
+EBUILD nss-3.13.1-r2.ebuild 7061 RMD160 1228a0271d51d5c0a7386cefa3bc3e3a6f5c064d SHA1 7652fef21248fc9cbd881afd3bb4ea86982e2dd8 SHA256 1e8535702a7c4dcaf5b7b6ea8d3e140409462a364f00f603414bd973e4796686 |
| 28 |
|
| 29 |
diff --git a/dev-libs/nss/nss-3.13.1-r1.ebuild b/dev-libs/nss/nss-3.13.1-r2.ebuild |
| 30 |
similarity index 81% |
| 31 |
rename from dev-libs/nss/nss-3.13.1-r1.ebuild |
| 32 |
rename to dev-libs/nss/nss-3.13.1-r2.ebuild |
| 33 |
index e27853d..d21d892 100644 |
| 34 |
--- a/dev-libs/nss/nss-3.13.1-r1.ebuild |
| 35 |
+++ b/dev-libs/nss/nss-3.13.1-r2.ebuild |
| 36 |
@@ -1,15 +1,17 @@ |
| 37 |
-# Copyright 1999-2011 Gentoo Foundation |
| 38 |
+# Copyright 1999-2012 Gentoo Foundation |
| 39 |
# Distributed under the terms of the GNU General Public License v2 |
| 40 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.10.ebuild,v 1.2 2011/07/31 14:29:19 anarchy Exp $ |
| 41 |
+# $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 $ |
| 42 |
|
| 43 |
EAPI=3 |
| 44 |
inherit eutils flag-o-matic multilib toolchain-funcs |
| 45 |
|
| 46 |
NSPR_VER="4.8.9" |
| 47 |
RTM_NAME="NSS_${PV//./_}_RTM" |
| 48 |
+RTM_NAMECKBI="NSS_${PV//./_}_WITH_CKBI_1_88_RTM" |
| 49 |
DESCRIPTION="Mozilla's Network Security Services library that implements PKI support" |
| 50 |
HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/" |
| 51 |
-SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz" |
| 52 |
+SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAMECKBI}/src/${P}.with.ckbi.1.88.tar.gz |
| 53 |
+ http://dev.gentoo.org/~anarchy/patches/nss-3.13.1-add_cacert_ca_certs.patch" |
| 54 |
|
| 55 |
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" |
| 56 |
SLOT="0" |
| 57 |
@@ -18,37 +20,39 @@ IUSE="utils" |
| 58 |
|
| 59 |
DEPEND="dev-util/pkgconfig" |
| 60 |
RDEPEND=">=dev-libs/nspr-${NSPR_VER} |
| 61 |
- >=dev-db/sqlite-3.5" |
| 62 |
+ >=dev-db/sqlite-3.5 |
| 63 |
+ sys-libs/zlib" |
| 64 |
|
| 65 |
src_prepare() { |
| 66 |
# Custom changes for gentoo |
| 67 |
epatch "${FILESDIR}/${PN}-3.12.5-gentoo-fixups.diff" |
| 68 |
epatch "${FILESDIR}/${PN}-3.12.6-gentoo-fixup-warnings.patch" |
| 69 |
epatch "${FILESDIR}/nss-3.13.1-pkcs11n-header-fix.patch" |
| 70 |
+ epatch "${DISTDIR}/nss-3.13.1-add_cacert_ca_certs.patch" |
| 71 |
|
| 72 |
- cd "${S}"/mozilla/security/coreconf |
| 73 |
+ cd "${S}"/mozilla/security/coreconf || die |
| 74 |
# hack nspr paths |
| 75 |
echo 'INCLUDES += -I'"${EPREFIX}"'/usr/include/nspr -I$(DIST)/include/dbm' \ |
| 76 |
>> headers.mk || die "failed to append include" |
| 77 |
|
| 78 |
# modify install path |
| 79 |
sed -e 's:SOURCE_PREFIX = $(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \ |
| 80 |
- -i source.mk |
| 81 |
+ -i source.mk || die |
| 82 |
|
| 83 |
# Respect LDFLAGS |
| 84 |
- sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk |
| 85 |
+ sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk || die |
| 86 |
|
| 87 |
# Ensure we stay multilib aware |
| 88 |
sed -i -e "s:gentoo\/nss:$(get_libdir):" "${S}"/mozilla/security/nss/config/Makefile || die "Failed to fix for multilib" |
| 89 |
|
| 90 |
# Fix pkgconfig file for Prefix |
| 91 |
sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \ |
| 92 |
- "${S}"/mozilla/security/nss/config/Makefile |
| 93 |
+ "${S}"/mozilla/security/nss/config/Makefile || die |
| 94 |
|
| 95 |
- epatch ${FILESDIR}/nss-3.13.1-solaris-gcc.patch |
| 96 |
+ epatch "${FILESDIR}/nss-3.13.1-solaris-gcc.patch" |
| 97 |
|
| 98 |
# dirty hack |
| 99 |
- cd "${S}"/mozilla/security/nss |
| 100 |
+ cd "${S}"/mozilla/security/nss || die |
| 101 |
sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \ |
| 102 |
lib/ssl/config.mk || die |
| 103 |
sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \ |
| 104 |
@@ -58,8 +62,8 @@ src_prepare() { |
| 105 |
src_compile() { |
| 106 |
strip-flags |
| 107 |
|
| 108 |
- echo > "${T}"/test.c |
| 109 |
- $(tc-getCC) ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o |
| 110 |
+ echo > "${T}"/test.c || die |
| 111 |
+ $(tc-getCC) ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die |
| 112 |
case $(file "${T}"/test.o) in |
| 113 |
*64-bit*|*ppc64*|*x86_64*) export USE_64=1;; |
| 114 |
*32-bit*|*ppc*|*i386*) ;; |
| 115 |
@@ -76,11 +80,11 @@ src_compile() { |
| 116 |
export FREEBL_NO_DEPEND=1 |
| 117 |
export ASFLAGS="" |
| 118 |
|
| 119 |
- cd "${S}"/mozilla/security/coreconf |
| 120 |
+ cd "${S}"/mozilla/security/coreconf || die |
| 121 |
emake -j1 CC="$(tc-getCC)" || die "coreconf make failed" |
| 122 |
- cd "${S}"/mozilla/security/dbm |
| 123 |
+ cd "${S}"/mozilla/security/dbm || die |
| 124 |
emake -j1 CC="$(tc-getCC)" || die "dbm make failed" |
| 125 |
- cd "${S}"/mozilla/security/nss |
| 126 |
+ cd "${S}"/mozilla/security/nss || die |
| 127 |
emake -j1 CC="$(tc-getCC)" || die "nss make failed" |
| 128 |
} |
| 129 |
|
| 130 |
@@ -131,29 +135,29 @@ cleanup_chk() { |
| 131 |
|
| 132 |
src_install () { |
| 133 |
MINOR_VERSION=12 |
| 134 |
- cd "${S}"/mozilla/security/dist |
| 135 |
+ cd "${S}"/mozilla/security/dist || die |
| 136 |
|
| 137 |
- dodir /usr/$(get_libdir) |
| 138 |
+ dodir /usr/$(get_libdir) || die |
| 139 |
cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed" |
| 140 |
# We generate these after stripping the libraries, else they don't match. |
| 141 |
#cp -L */lib/*.chk "${ED}"/usr/$(get_libdir) || die "copying chk files failed" |
| 142 |
cp -L */lib/libcrmf.a "${ED}"/usr/$(get_libdir) || die "copying libs failed" |
| 143 |
|
| 144 |
# Install nss-config and pkgconfig file |
| 145 |
- dodir /usr/bin |
| 146 |
- cp -L */bin/nss-config "${ED}"/usr/bin |
| 147 |
- dodir /usr/$(get_libdir)/pkgconfig |
| 148 |
- cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig |
| 149 |
+ dodir /usr/bin || die |
| 150 |
+ cp -L */bin/nss-config "${ED}"/usr/bin || die |
| 151 |
+ dodir /usr/$(get_libdir)/pkgconfig || die |
| 152 |
+ cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die |
| 153 |
|
| 154 |
# all the include files |
| 155 |
insinto /usr/include/nss |
| 156 |
- doins public/nss/*.h |
| 157 |
- cd "${ED}"/usr/$(get_libdir) |
| 158 |
+ doins public/nss/*.h || die |
| 159 |
+ cd "${ED}"/usr/$(get_libdir) || die |
| 160 |
local n= |
| 161 |
for file in *$(get_libname); do |
| 162 |
n=${file%$(get_libname)}$(get_libname ${MINOR_VERSION}) |
| 163 |
- mv ${file} ${n} |
| 164 |
- ln -s ${n} ${file} |
| 165 |
+ mv ${file} ${n} || die |
| 166 |
+ ln -s ${n} ${file} || die |
| 167 |
if [[ ${CHOST} == *-darwin* ]]; then |
| 168 |
install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${n}" ${n} || die |
| 169 |
fi |
| 170 |
@@ -172,9 +176,9 @@ src_install () { |
| 171 |
pk12util pp rsaperf selfserv shlibsign signtool signver ssltap strsclnt |
| 172 |
symkeyutil tstclnt vfychain vfyserv" |
| 173 |
fi |
| 174 |
- cd "${S}"/mozilla/security/dist/*/bin/ |
| 175 |
+ cd "${S}"/mozilla/security/dist/*/bin/ || die |
| 176 |
for f in $nssutils; do |
| 177 |
- dobin ${f} |
| 178 |
+ dobin ${f} || die |
| 179 |
done |
| 180 |
|
| 181 |
# Prelink breaks the CHK files. We don't have any reliable way to run |
| 182 |
@@ -184,9 +188,9 @@ src_install () { |
| 183 |
libs+=("${EPREFIX}/usr/$(get_libdir)/lib${l}.so") |
| 184 |
done |
| 185 |
OLD_IFS="${IFS}" IFS=":" ; liblist="${libs[*]}" ; IFS="${OLD_IFS}" |
| 186 |
- echo -e "PRELINK_PATH_MASK=${liblist}" >"${T}/90nss" |
| 187 |
+ echo -e "PRELINK_PATH_MASK=${liblist}" >"${T}/90nss" || die |
| 188 |
unset libs liblist |
| 189 |
- doenvd "${T}/90nss" |
| 190 |
+ doenvd "${T}/90nss" || die |
| 191 |
} |
| 192 |
|
| 193 |
pkg_postinst() { |
Archives