From: Lars Wendler Date: Sat, 5 Nov 2011 11:03:47 +0000 (+0000) Subject: Version bump. Removed old X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=6c5acf1a90279b3a5e2f3abdb3884866601d1814;p=gentoo.git Version bump. Removed old Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64 --- diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog index c363069c9715..2fa3ff8065b0 100644 --- a/dev-libs/nss/ChangeLog +++ b/dev-libs/nss/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-libs/nss # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.223 2011/10/30 12:39:15 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.224 2011/11/05 11:03:47 polynomial-c Exp $ + +*nss-3.13.1 (05 Nov 2011) + + 05 Nov 2011; Lars Wendler -nss-3.12.8.ebuild, + -nss-3.12.9.ebuild, -nss-3.12.11.ebuild, +nss-3.13.1.ebuild, + +files/nss-3.13.1-solaris-gcc.patch: + Version bump. Removed old. 30 Oct 2011; Pawel Hajdan jr nss-3.12.11-r1.ebuild: x86 stable wrt bug #388045 diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest index db64ff8ec27e..25e9e9b682eb 100644 --- a/dev-libs/nss/Manifest +++ b/dev-libs/nss/Manifest @@ -5,23 +5,31 @@ AUX nss-3.12.11-CVE-2011-3640.patch 4608 RMD160 02f2c0c428dd40904f8eee5bf6a2d2fc AUX nss-3.12.4-solaris-gcc.patch 842 RMD160 83324ac0ecde97e1976bf5162e7ce01ab2ca07e6 SHA1 769562dc8fd7ecc85e4f06a88d568433f2f3f5e2 SHA256 cf2695f4d73ad9de267ffd2e47b2f8940bf56d94b51e66d1e36907b5d6368865 AUX nss-3.12.5-gentoo-fixups.diff 6669 RMD160 af35db729406c62d0e8582e7db18f2f80a71c776 SHA1 e50b55be77f62516f735acfb41a1e47509572cd8 SHA256 24593640e682cb7a831cd8a0888397b7b20880c9cfabed76bb647cc12385aef6 AUX nss-3.12.6-gentoo-fixup-warnings.patch 301 RMD160 9bd51d07ba7e568b6f29b7c347a71c1717912234 SHA1 620bec7adc3c36c94075bffead0ce73cd8d3d7df SHA256 e14b227f762bd21875208e241029966b1e3873edfdf0592ca69bd9714859d329 +AUX nss-3.13.1-solaris-gcc.patch 854 RMD160 1b4190cae56a7e4399ac8f4f455346e2ab596353 SHA1 b3676c303de3272fefc8ba3ce91db4cf8f83117d SHA256 5a5406334c9ecd1e338fa91416fed5e8bc19eeb7115511552ba267ed8a25d117 DIST nss-3.12.10.tar.gz 6008914 RMD160 08c82ce0f4dc4c1806944cbc74adcad137878bf3 SHA1 229f65c8d4e2c1b34e145253bceddada5a82a142 SHA256 634f294507de6da93a5c3e08006156a469ff8d8af9ac9153f608800f4d20206e DIST nss-3.12.11.tar.gz 5944840 RMD160 4528d4be996bce801ff5f4c978457bd17c8e8625 SHA1 187ae83a8368512bb8729c206da2ed34db1725ad SHA256 d043f8d44212bc9418b6a954ca88e05b8ab2a71f8c59e6829a9a36d8a28e9f16 -DIST nss-3.12.8.tar.gz 5951955 RMD160 08f8118e194fcfd5225c4dc64873f0883b8278b6 SHA1 4469e79a806494c12a297213392699ca41c2c899 SHA256 9178ce29749e8d09cb93ce70c38f1c2c10630926b2bb7259c7dfff42cb090c14 -DIST nss-3.12.9.tar.gz 5984608 RMD160 d4da08fb2f363ea5ea90599bd90e54aaad0a3e56 SHA1 5b49da5e6f61610a718fcd0838dac365a5e17de2 SHA256 0dc77718016654bbf6ffdda09e968e2b2875c05dacec967abf5725b5daae5978 DIST nss-3.12.9.with.ckbi.1.82.tar.gz 6012144 RMD160 a5392169f240fe804aa4d55229a246c7f4997c65 SHA1 32d8c607c2301bdf053ab5d4fea7ec5af9d5d35a SHA256 b55ea655f3029737b4236f27301c1eb48b417714ff45ac8b8b67963ea80787a3 +DIST nss-3.13.1.tar.gz 5985329 RMD160 c1743308c380169d666e5c08b23a455f86b360bd SHA1 d8e7ee9f9f1e0bfa2ea8b72d25727634fea130a6 SHA256 95d933b59be466f19f90f595a35b4b92213fef084caecafeb89f4e2ce7160660 EBUILD nss-3.12.10.ebuild 6764 RMD160 bd101be19e59dadd3fcacaa09bdc225af789cf00 SHA1 d609a403c153faaf0e42ffadc4a2e39dde0eda9e SHA256 247fb02791f7a4879327a2d6a2119d12a6aa5d736809f3c58352d9e619136d5b EBUILD nss-3.12.11-r1.ebuild 7133 RMD160 6a91eb6b1f6ea8843283bbb50a55f0f2f2304b59 SHA1 f9a6d0e2ed8f1ad84df6304030a016e8c69e1300 SHA256 1ae9825dfb155ba4e3406061370c099a02f138fb4dcea8b7bf895f6f64d2826c -EBUILD nss-3.12.11.ebuild 7059 RMD160 c25bd402c4046b78710ce1c51620b2ac223eb11d SHA1 b2f4cb2c5983d4e04d5eb5ab70f2b8327a86171f SHA256 69c181ad7f6f12d48f448888dc26c7765b8cc11720590e8b2568ac35a1b65c6c -EBUILD nss-3.12.8.ebuild 6615 RMD160 f29d4249af89a8ac8d2f681ff4d954b27998c8f1 SHA1 42b3310d57b05fc3780e35562be4005573bd894b SHA256 05d6eb4d6f0ed6d9d117a3714647a445237ddfb3feb6268ca2c23604ddf24a3f EBUILD nss-3.12.9-r1.ebuild 6793 RMD160 14bbb410ee3e7794ae463eb834434de50b44bc37 SHA1 7107004afd31fda20cb72124d7c81809ce97e777 SHA256 692c1e4c8756663d73b6be3ed73a62b0939f4d67b7dd54d5b95b445060f80368 -EBUILD nss-3.12.9.ebuild 6624 RMD160 512c34751a753da29043b158c290a222bd0159ed SHA1 729be6566c55e02600ed0552775497a7a98953eb SHA256 385dd1ab26aa17bd61e15f4a9ae3c0683a35d2cb5e71458140e2aee76bdb7bff -MISC ChangeLog 28441 RMD160 d225988e11cf35233abf401cdfddea8e36531b5b SHA1 b5c9f8c627766de150fe6186aa4f54fc04487219 SHA256 9a55ee760bbddf14877fb313fa9c42e111b6874af23a938d5c984f454e91681a +EBUILD nss-3.13.1.ebuild 7063 RMD160 6a6c9f11edefc3b5e0ae3d47e13da90f9199d729 SHA1 8d2920a76191b69d5048b9a364217c0e1c81ce48 SHA256 8ca0f353bbe89de6e4b33c7d7897b2af187788c7afdb22f7c5657f4e7653015b +MISC ChangeLog 28676 RMD160 c426fd1a4f22c8fc4d742382c89c50979b772ac4 SHA1 70a4f6b914701510d553cfda95f8cf7e0c802034 SHA256 472aabba334af825feced7ccb65d007ebb61e4a3e8ce10e1694eb6f3f4f29109 MISC metadata.xml 245 RMD160 f0c9fbd458bca39f235195807582f530797bcd27 SHA1 a2c000437e0149764d8aa0a4e58b8cf106685d83 SHA256 58443b11f9dff75b5d4391f03dbafd90305a0ec8f046f8f0068fb95777c01bd4 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEAREKAAYFAk6tRXMACgkQuUQtlDBCeQLa9QCfesLziFYEFQ3yslx75j0pkFKH -t8sAnRW4GNTa66F44ZeRYJOgSDv2pgMm -=wAZQ +iQIcBAEBCgAGBQJOtRgYAAoJEPiazRVxLXTF/iAQAIzepAAEVH1+DZiBFuyyVhVd +l6NSryUHW2a5/gwRF4TRa7OxEcgi/gz3tffDPn34GjV33E5Rz8Qje5Sjpx/8OOHM +fnl3ceMraPCLgTlZ9croe5IAft/sGzzqMGbChBg2mSmmB0irZNEZj14WRblXBVkg +vCXafQR4DtjfBJ/hVEl4Pc1zW+nC860URQB0ic1iPUOKg9W22AkqqSKHj760puhs +f8OfbNXsGGesZls6L8BW703pFv/WLMErLqL6kB85JwlKk8XgIaRJ1Pm0ppWKXJpm +2oRT9Y+kuK9E6di+cUW2WfFpGOMjnLCY3/4eObEc7QaNQWbGa6H0ix7D7IeiVrzV +v6TCJNtRERzhMKy82J5du/gADOLOF8c3+Bxe4h+5/axN1zogu/fnWjReXNt+DnqI +T+ZaFZuP69Yv0F8lGFnXPsowQSooMQuoSeqBtX4g8X69eie+CZDgEAxXP5tRewv2 +e6uWJkr8GJ/ERPw5f5WAl5eDwKmcr2aURgrwFIyptpHTRhgEzou18gNs47E/AppU +4Eu5W5ypDxbqy30CpUtxktbi2HRRLROeGKir0qpcqytK0Ur9j2DQbqFkCkBbAeFb +KyhuN3G4hIjiGaTscweQyWtMKbt/x5+PKWgkWVvtc3JdPnw5tC3q/taGfLgpSQBb +mEoXekoUFldH/D0P+XF7 +=YD4r -----END PGP SIGNATURE----- diff --git a/dev-libs/nss/files/nss-3.13.1-solaris-gcc.patch b/dev-libs/nss/files/nss-3.13.1-solaris-gcc.patch new file mode 100644 index 000000000000..b775bac257f5 --- /dev/null +++ b/dev-libs/nss/files/nss-3.13.1-solaris-gcc.patch @@ -0,0 +1,33 @@ +--- nss-3.13.1/mozilla/security/coreconf/SunOS5.mk ++++ nss-3.13.1/mozilla/security/coreconf/SunOS5.mk +@@ -37,6 +37,9 @@ + + include $(CORE_DEPTH)/coreconf/UNIX.mk + ++NS_USE_GCC = 1 ++GCC_USE_GNU_LD = 1 ++ + # Sun's WorkShop defines v8, v8plus and v9 architectures. + # gcc on Solaris defines v8 and v9 "cpus". + # gcc's v9 is equivalent to Workshop's v8plus. +@@ -95,7 +98,7 @@ + endif + endif + +-INCLUDES += -I/usr/dt/include -I/usr/openwin/include ++#INCLUDES += -I/usr/dt/include -I/usr/openwin/include + + RANLIB = echo + CPU_ARCH = sparc +@@ -105,11 +108,6 @@ + NOMD_OS_CFLAGS += $(DSO_CFLAGS) $(OS_DEFINES) $(SOL_CFLAGS) + + MKSHLIB = $(CC) $(DSO_LDOPTS) $(RPATH) +-ifdef NS_USE_GCC +-ifeq (GNU,$(findstring GNU,$(shell `$(CC) -print-prog-name=ld` -v 2>&1))) +- GCC_USE_GNU_LD = 1 +-endif +-endif + ifdef MAPFILE + ifdef NS_USE_GCC + ifdef GCC_USE_GNU_LD diff --git a/dev-libs/nss/nss-3.12.8.ebuild b/dev-libs/nss/nss-3.12.8.ebuild deleted file mode 100644 index 672ba78e00d2..000000000000 --- a/dev-libs/nss/nss-3.12.8.ebuild +++ /dev/null @@ -1,202 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.8.ebuild,v 1.8 2010/10/31 12:01:04 armin76 Exp $ - -EAPI=3 -inherit eutils flag-o-matic multilib toolchain-funcs - -NSPR_VER="4.8.6" -RTM_NAME="NSS_${PV//./_}_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" - -LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="utils" - -DEPEND="dev-util/pkgconfig" -RDEPEND=">=dev-libs/nspr-${NSPR_VER} - >=dev-db/sqlite-3.5" - -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" - - cd "${S}"/mozilla/security/coreconf - # 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 - - # Respect LDFLAGS - sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk - - # 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 - - epatch "${FILESDIR}"/${PN}-3.12.4-solaris-gcc.patch # breaks non-gnu tools - # dirty hack - cd "${S}"/mozilla/security/nss - 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):" \ - cmd/platlibs.mk || die -} - -src_compile() { - strip-flags - - echo > "${T}"/test.c - $(tc-getCC) ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o - case $(file "${T}"/test.o) in - *64-bit*|*ppc64*|*x86_64*) export USE_64=1;; - *32-bit*|*ppc*|*i386*) ;; - *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";; - esac - - export NSPR_INCLUDE_DIR=`nspr-config --includedir` - export NSPR_LIB_DIR=`nspr-config --libdir` - export BUILD_OPT=1 - export NSS_USE_SYSTEM_SQLITE=1 - export NSDISTMODE=copy - export NSS_ENABLE_ECC=1 - export XCFLAGS="${CFLAGS}" - export FREEBL_NO_DEPEND=1 - - cd "${S}"/mozilla/security/coreconf - emake -j1 CC="$(tc-getCC)" || die "coreconf make failed" - cd "${S}"/mozilla/security/dbm - emake -j1 CC="$(tc-getCC)" || die "dbm make failed" - cd "${S}"/mozilla/security/nss - emake -j1 CC="$(tc-getCC)" || die "nss make failed" -} - -# Altering these 3 libraries breaks the CHK verification. -# All of the following cause it to break: -# - stripping -# - prelink -# - ELF signing -# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html -# Either we have to NOT strip them, or we have to forcibly resign after -# stripping. -#local_libdir="$(get_libdir)" -#export STRIP_MASK=" -# */${local_libdir}/libfreebl3.so* -# */${local_libdir}/libnssdbm3.so* -# */${local_libdir}/libsoftokn3.so*" - -export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3" - -generate_chk() { - local shlibsign="$1" - local libdir="$2" - einfo "Resigning core NSS libraries for FIPS validation" - shift 2 - for i in ${NSS_CHK_SIGN_LIBS} ; do - local libname=lib${i}.so - local chkname=lib${i}.chk - "${shlibsign}" \ - -i "${libdir}"/${libname} \ - -o "${libdir}"/${chkname}.tmp \ - && mv -f \ - "${libdir}"/${chkname}.tmp \ - "${libdir}"/${chkname} \ - || die "Failed to sign ${libname}" - done -} - -cleanup_chk() { - local libdir="$1" - shift 1 - for i in ${NSS_CHK_SIGN_LIBS} ; do - local libfname="${libdir}/lib${i}.so" - # If the major version has changed, then we have old chk files. - [ ! -f "${libfname}" -a -f "${libfname}.chk" ] \ - && rm -f "${libfname}.chk" - done -} - -src_install () { - MINOR_VERSION=12 - cd "${S}"/mozilla/security/dist - - dodir /usr/$(get_libdir) - 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 - - # all the include files - insinto /usr/include/nss - doins public/nss/*.h - cd "${ED}"/usr/$(get_libdir) - local n= - for file in *$(get_libname); do - n=${file%$(get_libname)}$(get_libname ${MINOR_VERSION}) - mv ${file} ${n} - ln -s ${n} ${file} - if [[ ${CHOST} == *-darwin* ]]; then - install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${n}" ${n} || die - fi - done - - local nssutils - # Always enabled because we need it for chk generation. - nssutils="shlibsign" - if use utils; then - # The tests we do not need to install. - #nssutils_test="bltest crmftest dbtest dertimetest - #fipstest remtest sdrtest" - nssutils="addbuiltin atob baddbdir btoa certcgi certutil checkcert - cmsutil conflict crlutil derdump digest makepqg mangle modutil multinit - nonspr10 ocspclnt oidcalc p7content p7env p7sign p7verify pk11mode - pk12util pp rsaperf selfserv shlibsign signtool signver ssltap strsclnt - symkeyutil tstclnt vfychain vfyserv" - fi - cd "${S}"/mozilla/security/dist/*/bin/ - for f in $nssutils; do - dobin ${f} - done - - # Prelink breaks the CHK files. We don't have any reliable way to run - # shlibsign after prelink. - declare -a libs - for l in ${NSS_CHK_SIGN_LIBS} ; do - 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" - unset libs liblist - doenvd "${T}/90nss" -} - -pkg_postinst() { - elog "We have reverted back to using upstreams soname." - elog "Please run revdep-rebuild --library libnss3.so.12 , this" - elog "will correct most issues. If you find a binary that does" - elog "not run please re-emerge package to ensure it properly" - elog " links after upgrade." - elog - # We must re-sign the libraries AFTER they are stripped. - generate_chk "${EROOT}"/usr/bin/shlibsign "${EROOT}"/usr/$(get_libdir) -} - -pkg_postrm() { - cleanup_chk "${EROOT}"/usr/$(get_libdir) -} diff --git a/dev-libs/nss/nss-3.12.9.ebuild b/dev-libs/nss/nss-3.12.9.ebuild deleted file mode 100644 index 8fb2fb849c40..000000000000 --- a/dev-libs/nss/nss-3.12.9.ebuild +++ /dev/null @@ -1,202 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.9.ebuild,v 1.1 2011/01/14 13:37:37 anarchy Exp $ - -EAPI=3 -inherit eutils flag-o-matic multilib toolchain-funcs - -NSPR_VER="4.8.7" -RTM_NAME="NSS_${PV//./_}_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" - -LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="utils" - -DEPEND="dev-util/pkgconfig" -RDEPEND=">=dev-libs/nspr-${NSPR_VER} - >=dev-db/sqlite-3.5" - -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" - - cd "${S}"/mozilla/security/coreconf - # 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 - - # Respect LDFLAGS - sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk - - # 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 - - epatch "${FILESDIR}"/${PN}-3.12.4-solaris-gcc.patch # breaks non-gnu tools - # dirty hack - cd "${S}"/mozilla/security/nss - 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):" \ - cmd/platlibs.mk || die -} - -src_compile() { - strip-flags - - echo > "${T}"/test.c - $(tc-getCC) ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o - case $(file "${T}"/test.o) in - *64-bit*|*ppc64*|*x86_64*) export USE_64=1;; - *32-bit*|*ppc*|*i386*) ;; - *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";; - esac - - export NSPR_INCLUDE_DIR=`nspr-config --includedir` - export NSPR_LIB_DIR=`nspr-config --libdir` - export BUILD_OPT=1 - export NSS_USE_SYSTEM_SQLITE=1 - export NSDISTMODE=copy - export NSS_ENABLE_ECC=1 - export XCFLAGS="${CFLAGS}" - export FREEBL_NO_DEPEND=1 - - cd "${S}"/mozilla/security/coreconf - emake -j1 CC="$(tc-getCC)" || die "coreconf make failed" - cd "${S}"/mozilla/security/dbm - emake -j1 CC="$(tc-getCC)" || die "dbm make failed" - cd "${S}"/mozilla/security/nss - emake -j1 CC="$(tc-getCC)" || die "nss make failed" -} - -# Altering these 3 libraries breaks the CHK verification. -# All of the following cause it to break: -# - stripping -# - prelink -# - ELF signing -# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html -# Either we have to NOT strip them, or we have to forcibly resign after -# stripping. -#local_libdir="$(get_libdir)" -#export STRIP_MASK=" -# */${local_libdir}/libfreebl3.so* -# */${local_libdir}/libnssdbm3.so* -# */${local_libdir}/libsoftokn3.so*" - -export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3" - -generate_chk() { - local shlibsign="$1" - local libdir="$2" - einfo "Resigning core NSS libraries for FIPS validation" - shift 2 - for i in ${NSS_CHK_SIGN_LIBS} ; do - local libname=lib${i}.so - local chkname=lib${i}.chk - "${shlibsign}" \ - -i "${libdir}"/${libname} \ - -o "${libdir}"/${chkname}.tmp \ - && mv -f \ - "${libdir}"/${chkname}.tmp \ - "${libdir}"/${chkname} \ - || die "Failed to sign ${libname}" - done -} - -cleanup_chk() { - local libdir="$1" - shift 1 - for i in ${NSS_CHK_SIGN_LIBS} ; do - local libfname="${libdir}/lib${i}.so" - # If the major version has changed, then we have old chk files. - [ ! -f "${libfname}" -a -f "${libfname}.chk" ] \ - && rm -f "${libfname}.chk" - done -} - -src_install () { - MINOR_VERSION=12 - cd "${S}"/mozilla/security/dist - - dodir /usr/$(get_libdir) - 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 - - # all the include files - insinto /usr/include/nss - doins public/nss/*.h - cd "${ED}"/usr/$(get_libdir) - local n= - for file in *$(get_libname); do - n=${file%$(get_libname)}$(get_libname ${MINOR_VERSION}) - mv ${file} ${n} - ln -s ${n} ${file} - if [[ ${CHOST} == *-darwin* ]]; then - install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${n}" ${n} || die - fi - done - - local nssutils - # Always enabled because we need it for chk generation. - nssutils="shlibsign" - if use utils; then - # The tests we do not need to install. - #nssutils_test="bltest crmftest dbtest dertimetest - #fipstest remtest sdrtest" - nssutils="addbuiltin atob baddbdir btoa certcgi certutil checkcert - cmsutil conflict crlutil derdump digest makepqg mangle modutil multinit - nonspr10 ocspclnt oidcalc p7content p7env p7sign p7verify pk11mode - pk12util pp rsaperf selfserv shlibsign signtool signver ssltap strsclnt - symkeyutil tstclnt vfychain vfyserv" - fi - cd "${S}"/mozilla/security/dist/*/bin/ - for f in $nssutils; do - dobin ${f} - done - - # Prelink breaks the CHK files. We don't have any reliable way to run - # shlibsign after prelink. - declare -a libs - for l in ${NSS_CHK_SIGN_LIBS} ; do - 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" - unset libs liblist - doenvd "${T}/90nss" -} - -pkg_postinst() { - elog "We have reverted back to using upstreams soname." - elog "Please run revdep-rebuild --library libnss3.so.12 , this" - elog "will correct most issues. If you find a binary that does" - elog "not run please re-emerge package to ensure it properly" - elog " links after upgrade." - elog - # We must re-sign the libraries AFTER they are stripped. - generate_chk "${EROOT}"/usr/bin/shlibsign "${EROOT}"/usr/$(get_libdir) -} - -pkg_postrm() { - cleanup_chk "${EROOT}"/usr/$(get_libdir) -} diff --git a/dev-libs/nss/nss-3.12.11.ebuild b/dev-libs/nss/nss-3.13.1.ebuild similarity index 97% rename from dev-libs/nss/nss-3.12.11.ebuild rename to dev-libs/nss/nss-3.13.1.ebuild index 029f1bc24bfb..5b574627bc21 100644 --- a/dev-libs/nss/nss-3.12.11.ebuild +++ b/dev-libs/nss/nss-3.13.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.11.ebuild,v 1.5 2011/09/24 18:50:12 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.13.1.ebuild,v 1.1 2011/11/05 11:03:47 polynomial-c Exp $ EAPI=3 inherit eutils flag-o-matic multilib toolchain-funcs @@ -55,7 +55,7 @@ src_prepare() { "${S}"/mozilla/security/coreconf/Darwin.mk \ "${S}"/mozilla/security/nss/lib/freebl/config.mk || die - epatch "${FILESDIR}"/${PN}-3.12.4-solaris-gcc.patch # breaks non-gnu tools + epatch "${FILESDIR}"/${PN}-3.13.1-solaris-gcc.patch # breaks non-gnu tools # dirty hack cd "${S}"/mozilla/security/nss sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \