From dbd6f9757c0a774b09f6558d462dc32cae071f2e Mon Sep 17 00:00:00 2001 From: Agostino Sarubbo Date: Tue, 10 Jan 2012 10:21:27 +0000 Subject: [PATCH] Add zlib as RDEPEND and 'die' where missing Package-Manager: portage-2.1.10.41/cvs/Linux i686 --- dev-libs/nss/ChangeLog | 7 ++-- dev-libs/nss/Manifest | 22 ++++++------- dev-libs/nss/nss-3.13.1-r1.ebuild | 55 ++++++++++++++++--------------- 3 files changed, 44 insertions(+), 40 deletions(-) diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog index 113fa9830299..66c1936e1034 100644 --- a/dev-libs/nss/ChangeLog +++ b/dev-libs/nss/ChangeLog @@ -1,6 +1,9 @@ # 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.230 2011/12/19 14:13:10 anarchy Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.231 2012/01/10 10:21:27 ago Exp $ + + 10 Jan 2012; Agostino Sarubbo nss-3.13.1-r1.ebuild: + Add zlib as RDEPEND and 'die' where missing *nss-3.13.1-r1 (19 Dec 2011) diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest index acc368166044..fc5fbbe5dcc4 100644 --- a/dev-libs/nss/Manifest +++ b/dev-libs/nss/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA512 AUX nss-3.12.11-CVE-2011-3640.patch 4608 RMD160 02f2c0c428dd40904f8eee5bf6a2d2fc3ecba1ac SHA1 c3f93b6b9996e4abe7a2fa2963cadf24f3c56367 SHA256 d48b2117c52a30c8ef659fc7222f501cce175ead29891ed8dceadd6f7d8bada4 AUX nss-3.12.4-solaris-gcc.patch 842 RMD160 83324ac0ecde97e1976bf5162e7ce01ab2ca07e6 SHA1 769562dc8fd7ecc85e4f06a88d568433f2f3f5e2 SHA256 cf2695f4d73ad9de267ffd2e47b2f8940bf56d94b51e66d1e36907b5d6368865 @@ -14,17 +14,17 @@ DIST nss-3.13.1.tar.gz 5985329 RMD160 c1743308c380169d666e5c08b23a455f86b360bd S EBUILD nss-3.12.10.ebuild 6764 RMD160 bd101be19e59dadd3fcacaa09bdc225af789cf00 SHA1 d609a403c153faaf0e42ffadc4a2e39dde0eda9e SHA256 247fb02791f7a4879327a2d6a2119d12a6aa5d736809f3c58352d9e619136d5b EBUILD nss-3.12.11-r1.ebuild 7127 RMD160 4c9528b288fab68583d31b63c058c377660f3f63 SHA1 6de4415f2d2df2601c6815d2a4d0c156780c51e3 SHA256 e007958db501dc133b1e11d8d4220ca24f4978bf62347b0b92d0eec48c038a75 EBUILD nss-3.12.9-r1.ebuild 6793 RMD160 14bbb410ee3e7794ae463eb834434de50b44bc37 SHA1 7107004afd31fda20cb72124d7c81809ce97e777 SHA256 692c1e4c8756663d73b6be3ed73a62b0939f4d67b7dd54d5b95b445060f80368 -EBUILD nss-3.13.1-r1.ebuild 6679 RMD160 8449f9112c11a347b80cd8427f3d6968435e53e9 SHA1 c0fe981222f4eb10a7bc0ee2ebd3fcd8a4ab86b6 SHA256 9e03fdd4cd50cd7fcff1d7ef10a4966291e05dc004ddb0e4e13733b88430f14a -MISC ChangeLog 29436 RMD160 34235fd36943181720ade387b94ac97110981370 SHA1 8d03c1caa64457bfc8e1e7149d88d30b683c4e3c SHA256 14ec991748cafe3da8e140272886e916e1cdb37e1b37769e07cfdf70c9db0795 +EBUILD nss-3.13.1-r1.ebuild 6858 RMD160 425b90666c32c5f8301e864ad5cc0e03ad6a0cb8 SHA1 591d36c8d92190ecccd78abb7e38a99663b62e3f SHA256 f4d0279b43e1f1169403509161c3f9e0ad5c0e2b98a2cf3f8a36bcc07d9be38c +MISC ChangeLog 29550 RMD160 c3731a3ebd6a9849fa5871181ecfec6a9bb87bb6 SHA1 85c9e0f9647b2e9f9fb49ad1d58b7181feaf265e SHA256 94169654f7830b100e659dc59b0d0c642b2d816fcaa61ccb5912a314e23106f2 MISC metadata.xml 245 RMD160 f0c9fbd458bca39f235195807582f530797bcd27 SHA1 a2c000437e0149764d8aa0a4e58b8cf106685d83 SHA256 58443b11f9dff75b5d4391f03dbafd90305a0ec8f046f8f0068fb95777c01bd4 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iQEcBAEBAgAGBQJO70Z2AAoJEIXV9xahDnCoA9EH/2UpLkjFzi5umlnsXmN4OzKT -s0q2xrMzQxRg0I2zHUcsPzbaZpdSlPNZAoFzb7/VVpMGO1uNSsV5Lw1Gpy8EhFNH -jtQP4Nv8JeyOMl0uwFH6fRmRr29cFf0CKPHTxIUeCggQ1QbHzYqc+X0TVO4eek5o -cMEFKAPi8LdEmfdb3f2ATiIoU1fqDP1eCtsjeo5qsWuCRH2lyIQ9dq46WX1arYS+ -fyXkSMAQGz6y8LIayiHlz2zbMa02ZHkKoZPFWX9ZQU4rjsNCkoOCSld87zfzRX0w -TqcCziew/rK+DD8VvySqPm0F4pvmHtFDykCWFsoXpnrKGnAFcMUPS6fp76HLxU8= -=L3so +iQEcBAEBCgAGBQJPDBEiAAoJEOTDgjZ80txdzfcIAJmRX//Rjib7B7EVwjbkqFit +OOuMyf7igGshWWfeMOOaXgLQQ/JFfVGMjFEq2XiZxvX3sQY6VfJpumU2sLlsRoIX +zvm2dDpPqccO64yNuVa1WbmIMXWc8e9ZCscKJu2OhhKnHXwA0bd7yAcZnVdqpv19 +GoI5cIdXO3rfvNRY3oD1pDSwwFxlEJ/V/2DCeZL/5FMCEexhnvu1VY7gC/5IXHrQ +jB2b74pzdB9axR4697XCShxcT+SCSp63dhVQxuLxBKrruUyVWqDRHoTj1u0ljQUQ +8vbIroAO7ANprvbftryHWi8cjYts7Zpq3LDNg+Y2DGUBnMCsK4Pqlhh6/UXNs7c= +=lkb0 -----END PGP SIGNATURE----- diff --git a/dev-libs/nss/nss-3.13.1-r1.ebuild b/dev-libs/nss/nss-3.13.1-r1.ebuild index dba6274a8195..0cf5ce88209b 100644 --- a/dev-libs/nss/nss-3.13.1-r1.ebuild +++ b/dev-libs/nss/nss-3.13.1-r1.ebuild @@ -1,6 +1,6 @@ -# 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.13.1-r1.ebuild,v 1.1 2011/12/19 14:13:10 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 @@ -18,7 +18,8 @@ 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 @@ -26,29 +27,29 @@ src_prepare() { epatch "${FILESDIR}/${PN}-3.12.6-gentoo-fixup-warnings.patch" epatch "${FILESDIR}/nss-3.13.1-pkcs11n-header-fix.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" # 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 +59,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 +77,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 +132,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 +173,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 +185,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() { -- 2.26.2