diff options
| -rw-r--r-- | dev-libs/nspr/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-libs/nspr/nspr-4.8.8.ebuild | 105 | ||||
| -rw-r--r-- | dev-libs/nss/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-libs/nss/nss-3.12.10.ebuild | 202 |
4 files changed, 319 insertions, 2 deletions
diff --git a/dev-libs/nspr/ChangeLog b/dev-libs/nspr/ChangeLog index bbbcc61d2c6d..a785f2679cfc 100644 --- a/dev-libs/nspr/ChangeLog +++ b/dev-libs/nspr/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-libs/nspr # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.160 2011/05/07 17:52:13 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.161 2011/05/13 21:13:30 anarchy Exp $ + +*nspr-4.8.8 (13 May 2011) + + 13 May 2011; Jory A. Pratt <anarchy@gentoo.org> +nspr-4.8.8.ebuild: + Version bump 07 May 2011; Raúl Porcel <armin76@gentoo.org> nspr-4.8.7.ebuild: alpha/arm/ia64/sparc stable wrt #360315 diff --git a/dev-libs/nspr/nspr-4.8.8.ebuild b/dev-libs/nspr/nspr-4.8.8.ebuild new file mode 100644 index 000000000000..b7963b4a325f --- /dev/null +++ b/dev-libs/nspr/nspr-4.8.8.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.8.8.ebuild,v 1.1 2011/05/13 21:13:30 anarchy Exp $ + +EAPI=3 + +inherit eutils multilib toolchain-funcs versionator + +MIN_PV="$(get_version_component_range 2)" + +DESCRIPTION="Netscape Portable Runtime" +HOMEPAGE="http://www.mozilla.org/projects/nspr/" +SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/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 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="debug" + +src_prepare() { + mkdir build inst + epatch "${FILESDIR}"/${PN}-4.8-config.patch + epatch "${FILESDIR}"/${PN}-4.6.1-config-1.patch + epatch "${FILESDIR}"/${PN}-4.6.1-lang.patch + epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch + epatch "${FILESDIR}"/${PN}-4.8-pkgconfig-gentoo-3.patch + epatch "${FILESDIR}"/${PN}-4.7.1-solaris.patch + epatch "${FILESDIR}"/${PN}-4.7.4-solaris.patch + epatch "${FILESDIR}"/${PN}-4.8.3-aix-gcc.patch + # Patch needs updating + #epatch "${FILESDIR}"/${PN}-4.8.3-aix-soname.patch + epatch "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch + # make sure it won't find Perl out of Prefix + sed -i -e "s/perl5//g" mozilla/nsprpub/configure || die + + # Respect LDFLAGS + sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \ + mozilla/nsprpub/config/rules.mk +} + +src_configure() { + cd "${S}"/build + + echo > "${T}"/test.c + $(tc-getCC) -c "${T}"/test.c -o "${T}"/test.o + case $(scanelf -BF'%M' "${T}"/test.o)$(scanmacho -BF'%M' "${T}"/test.o) in + ELFCLASS64*|POWERPC64*|X86_64*) myconf="${myconf} --enable-64bit";; + ELFCLASS32*|POWERPC*|I386*|ARM*) ;; + *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";; + esac + + myconf="${myconf} --libdir=${EPREFIX}/usr/$(get_libdir)" + + ECONF_SOURCE="../mozilla/nsprpub" econf \ + $(use_enable debug) \ + $(use_enable !debug optimize) \ + ${myconf} || die "econf failed" +} + +src_compile() { + cd "${S}"/build + emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die "failed to build" +} + +src_install () { + # Their build system is royally confusing, as usual + MINOR_VERSION=${MIN_PV} # Used for .so version + cd "${S}"/build + emake DESTDIR="${D}" install || die "emake install failed" + + cd "${ED}"/usr/$(get_libdir) + for file in *.a; do + einfo "removing static libraries as upstream has requested!" + rm -f ${file} || die "failed to remove static libraries." + done + + local n= + # aix-soname.patch does this already + [[ ${CHOST} == *-aix* ]] || + for file in *$(get_libname); do + n=${file%$(get_libname)}$(get_libname ${MINOR_VERSION}) + mv ${file} ${n} || die "failed to mv files around" + ln -s ${n} ${file} || die "failed to symlink files." + if [[ ${CHOST} == *-darwin* ]]; then + install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${n}" ${n} || die + fi + done + + # install nspr-config + dobin "${S}"/build/config/nspr-config || die "failed to install nspr-config" + + # create pkg-config file + insinto /usr/$(get_libdir)/pkgconfig/ + doins "${S}"/build/config/nspr.pc || die "failed to insall nspr pkg-config file" + + # Remove stupid files in /usr/bin + rm -f "${ED}"/usr/bin/prerr.properties || die "failed to cleanup unneeded files" +} + +pkg_postinst() { + ewarn + ewarn "Please make sure you run revdep-rebuild after upgrade." + ewarn "This is *extremely* important to ensure your system nspr works properly." + ewarn +} diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog index 274cf8629f65..acf31ac81675 100644 --- a/dev-libs/nss/ChangeLog +++ b/dev-libs/nss/ChangeLog @@ -1,6 +1,11 @@ # 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.206 2011/05/07 17:55:46 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.207 2011/05/13 21:13:30 anarchy Exp $ + +*nss-3.12.10 (13 May 2011) + + 13 May 2011; Jory A. Pratt <anarchy@gentoo.org> +nss-3.12.10.ebuild: + Version bump 07 May 2011; Raúl Porcel <armin76@gentoo.org> nss-3.12.9-r1.ebuild: alpha/arm/ia64/sparc stable wrt #360315 diff --git a/dev-libs/nss/nss-3.12.10.ebuild b/dev-libs/nss/nss-3.12.10.ebuild new file mode 100644 index 000000000000..c94b1e1f942d --- /dev/null +++ b/dev-libs/nss/nss-3.12.10.ebuild @@ -0,0 +1,202 @@ +# 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.10.ebuild,v 1.1 2011/05/13 21:13:30 anarchy Exp $ + +EAPI=3 +inherit eutils flag-o-matic multilib toolchain-funcs + +NSPR_VER="4.8.8" +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) +} |