From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 9BEEF1381F3 for ; Sat, 15 Dec 2012 13:46:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DF76421C044; Sat, 15 Dec 2012 13:46:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5BFDC21C044 for ; Sat, 15 Dec 2012 13:46:16 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4276533DC98 for ; Sat, 15 Dec 2012 13:46:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id D4BCBE543C for ; Sat, 15 Dec 2012 13:46:13 +0000 (UTC) From: "Jory Pratt" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jory Pratt" Message-ID: <1355579148.90fd4a4f8de1aae08595c589943219ca06b65258.anarchy@gentoo> Subject: [gentoo-commits] proj/mozilla:master commit in: dev-libs/nss/files/, dev-libs/nss/ X-VCS-Repository: proj/mozilla X-VCS-Files: dev-libs/nss/Manifest dev-libs/nss/files/nss-3.13-gentoo-fixup.patch dev-libs/nss/files/nss-3.14.1-gentoo-fixups.patch dev-libs/nss/nss-3.14.1.ebuild dev-libs/nss/nss-3.14.ebuild X-VCS-Directories: dev-libs/nss/files/ dev-libs/nss/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: 90fd4a4f8de1aae08595c589943219ca06b65258 X-VCS-Branch: master Date: Sat, 15 Dec 2012 13:46:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7e134eee-35ee-496d-a3c7-e528fdc14689 X-Archives-Hash: 2ec88c58a6336c08ae8831059d0c9d9e commit: 90fd4a4f8de1aae08595c589943219ca06b65258 Author: Jory A. Pratt gentoo org> AuthorDate: Sat Dec 15 13:45:48 2012 +0000 Commit: Jory Pratt gentoo org> CommitDate: Sat Dec 15 13:45:48 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=90fd4a4f nss-3.14.1 update --- dev-libs/nss/Manifest | 8 ++-- ...-fixup.patch => nss-3.14.1-gentoo-fixups.patch} | 30 +++++++++---------- .../nss/{nss-3.14.ebuild => nss-3.14.1.ebuild} | 6 ++-- 3 files changed, 21 insertions(+), 23 deletions(-) diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest index 4b10732..2f3c0d8 100644 --- a/dev-libs/nss/Manifest +++ b/dev-libs/nss/Manifest @@ -1,8 +1,8 @@ AUX nss-3.12.6-gentoo-fixup-warnings.patch 301 SHA256 e14b227f762bd21875208e241029966b1e3873edfdf0592ca69bd9714859d329 SHA512 fcb47b120860436987858be53971f020db2d7c2f1bef1300bdca6dcf45d76a9b595c545112c1e7553ac29c412f72eafe3d29cd91ed1ab196b03146a7d8bc1870 WHIRLPOOL 1f59af79d4d7565185a3b841b3e936f7d3dddc642630d261be22c04d04cb0f8dfdd13ddacaa0fe8d69256fcffaee5fc273dfe73fc72f539abb5ed501dd1439c2 -AUX nss-3.13-gentoo-fixup.patch 6423 SHA256 48cc7824fd90bf2b03954495c93d5466a2ce831c70f876a0e14a7859132db02c SHA512 9a5b79bf77b8105f6417c387554326c41ca176ed78150069cfe13645fd3d63f0c54bbb249b1b0b9a85186129e6eb19eb15f340c8bf417546cdcf7a98891ffd9c WHIRLPOOL 5f8a58562e5df68d7387ddf1dd44b17cbfc231052046066980ee98bd66eb3f50f574446c34aa7c36a8f9055be617b337fd02d24c91d007e24c4591f7c674881c AUX nss-3.13.1-solaris-gcc.patch 994 SHA256 2633e73f8bba27fb34b5872464946b1abe03a7e73e544be4f751655c6276487b SHA512 6e06499d39c89fa60b9efac8dc5b38296d9e26003fc7fc9165434e5a545a50845ca920611cd722c9599b3c2652169ea9f0820a327dab74761e3db2dfab22cf0c WHIRLPOOL d1e3822e279361fd2b96c3e1fbac445aeddde0eca53371c0335c054d644f74de07c883466c20c0ab8d1d34f1bc3f8f4f10ff2111d2b4a1fef769bb74081063c7 AUX nss-3.13.5-x32.patch 2304 SHA256 ae402bef2c97cdeac3a00430729d3668167af5f957b1c217e3a79a3d54a3d206 SHA512 c9c4aeca3b7cc62037534b8b6dea04088e07f6d817a4f8a9f3af0de1e494119f140b67b1ed79c8c8af670cd6f86faa5366ae34afe4dda353d5e310c68a8122ee WHIRLPOOL a1507439d64dae60c237c105c3e47d5e20ff80451f97bedfa71b693aa99e9590dfb63f7fdb1bad057a6256159e3efa0a58a5941a9fb4f2d9de7aba3ca7b08102 +AUX nss-3.14.1-gentoo-fixups.patch 6405 SHA256 f0e6348d757fa1a0840b2fdae7ca53dbf8fd02846cd47026c4c815b929141df5 SHA512 8be37bd621fc8101928b8782910f41df4ba9e47d26937aa3c95f9da646c14daad1d6ac9acd2e856a159efcb7fe661c96fcaf23511dc917ce8a9db40e09b75e29 WHIRLPOOL 8b32fbb736c5ca43d8bf9b99eb51c1fabeb8f6a011cb920708f65271c3a056aa7ca37d18a6f6d39a04257af57458b9c029b6cda5d090ff478fb10b38385dc47f DIST nss-3.13.3_pem.support 191571 SHA256 cb6cf7955203514b3c1210c9b32504b0d2f1c158fa9b5d2509ef0bb34b68374c SHA512 223026adbacf2f325f808210cc050f95cb65cb0fe8c6022109a42bd991fd576e2e96beb5ec8e185dbbd649f4bd4516bc0f7fc10401f47eda806ab2d63f0c23a3 WHIRLPOOL 78345665e54fe67f57bc09311567ad525f9a8dae7d17e600a9639fac820fcf9c64e9f4bacc5df3f90b90a224e374ac44e938962c5248189fe76dad7143bf3476 -DIST nss-3.14-add_spi+cacerts_ca_certs.patch 52742 SHA256 15ed527acdf49922fcfab624c8d796d908e65217f40887963bb2457c7e1585cd SHA512 60f1123d98ebd0f6f5d03f5f9accd77e4a2e287be576a1d339902ee5f6b5e3ddfb6e4c96260c4a1902e5b89fed5865c8f5fa721105868ef11c204e845f591a8c WHIRLPOOL 2dfa0738ab7b15493c3935a9d8297dc9734b8f12895373e58853c84c2257d4f0145a5600081da4d63e0f59341a8756d366fe1b5ce6214c54e91aabe2ef76f3e5 -DIST nss-3.14.tar.gz 6068755 SHA256 b01868959d50263265aacc5a09f9a9eefbbde5f35604c2977f9714696f1d3e2b SHA512 c5aba091fddcdd57a8cda879a90cf05eeacedf5d734be8eaaec9051aaa6c468b0c8b9816db3cb864859702f90f49fd37971eca98754763b778dcd5fb3d1f7358 WHIRLPOOL b795c55c4dcb7878c4e887b6dc52213d1c31e09ea969df0d8b642b1010b5900c8734de70287141be2ca93a77631b312e68e9e781689f158bb104c501882046ae -EBUILD nss-3.14.ebuild 6931 SHA256 336b091e9a7667cd885b6e4dbcfaeb6da5a4e1dff7d33969468757f6997a2a24 SHA512 f1aec90e16a8b08314c4766c14a3bf0f3c29728b5c2e427e56738736f7a3a9d6808c1189aeae9b562ad57b8e9ab86707ee8874e43e8092c39e6980c06ed3d840 WHIRLPOOL 8811c4e6e70e0fa4e9343e13cdd382126abc6bda4ff6d35936628c0b955f43e2712ffb870d59d24f4f4c28b9b97963c6c0c5785ade83a6a3a45d2a110c7c9981 +DIST nss-3.14.1-add_spi+cacerts_ca_certs.patch 25018 SHA256 82ca25982828fd7153ad15fc6e81408c115476eeeb4045d3a71469380b56824b SHA512 2aafbd972b073061bfd66a66a4b50060691957f2910f716f7a69d22d655c499f186f05db2101bea5248a00949f339327ba8bfffec024c61c8ee908766201ae00 WHIRLPOOL c9fe397e316dac7983b187acf7227078ebd8f8da5df53f77f2564489e85f123c4d2afb88d56e8dc14b9ebfffe8a71ade4724b3c1ea683c5c4c487cb3a64eda43 +DIST nss-3.14.1.tar.gz 5814063 SHA256 80a5d4872da13d0272636ad04e1beddcf8d4572bcc0d47dbea1d12fb592fb7e5 SHA512 f62a7ebcdade8815379f80929c63de1284c3ca3f5c87214cb5b327f6689635118d301969d4ef0e1940c7a426253b13ce54acd68a91abc23ab32626341217580e WHIRLPOOL 8b292433ec764cfe857bd7cb25c216905b785c536176ece14571c9e7017a93c7a8562502645d71eed7da9f5cc52c65564c294a8a2b75ea43bda19049d6c393bb +EBUILD nss-3.14.1.ebuild 6938 SHA256 51d6eed368dfe267f64e3b5bce60e54492b42c79fd92a874e22c10f35c409af9 SHA512 72bdf721a4cc20d84b9362e5ca45acf359932d23e36cf1278a833f3e2db7588b680fc0c955f62076704e2f4f082983aaa5c13351e5463f4cdcb5f2c236d0f87b WHIRLPOOL ab49e850550a8deac3c3bd6d4c4de4f7a0d118c64ad70a1ff3083dc52ca66127e575feb0a52f0c6a16ec6446e40c9ae11317650789bc0c741d0c622298906304 diff --git a/dev-libs/nss/files/nss-3.13-gentoo-fixup.patch b/dev-libs/nss/files/nss-3.14.1-gentoo-fixups.patch similarity index 88% rename from dev-libs/nss/files/nss-3.13-gentoo-fixup.patch rename to dev-libs/nss/files/nss-3.14.1-gentoo-fixups.patch index 42f26c6..300da5d 100644 --- a/dev-libs/nss/files/nss-3.13-gentoo-fixup.patch +++ b/dev-libs/nss/files/nss-3.14.1-gentoo-fixups.patch @@ -1,6 +1,6 @@ diff -urN a/mozilla/security/nss/config/Makefile b/mozilla/security/nss/config/Makefile --- a/mozilla/security/nss/config/Makefile 1969-12-31 18:00:00.000000000 -0600 -+++ b/mozilla/security/nss/config/Makefile 2009-09-14 21:45:45.619639265 -0500 ++++ b/mozilla/security/nss/config/Makefile 2012-12-15 07:27:20.650148987 -0600 @@ -0,0 +1,40 @@ +CORE_DEPTH = ../.. +DEPTH = ../.. @@ -44,7 +44,7 @@ diff -urN a/mozilla/security/nss/config/Makefile b/mozilla/security/nss/config/M + diff -urN a/mozilla/security/nss/config/nss-config.in b/mozilla/security/nss/config/nss-config.in --- a/mozilla/security/nss/config/nss-config.in 1969-12-31 18:00:00.000000000 -0600 -+++ b/mozilla/security/nss/config/nss-config.in 2009-09-14 21:47:45.190638078 -0500 ++++ b/mozilla/security/nss/config/nss-config.in 2012-12-15 07:27:20.651148959 -0600 @@ -0,0 +1,145 @@ +#!/bin/sh + @@ -193,7 +193,7 @@ diff -urN a/mozilla/security/nss/config/nss-config.in b/mozilla/security/nss/con + diff -urN a/mozilla/security/nss/config/nss.pc.in b/mozilla/security/nss/config/nss.pc.in --- a/mozilla/security/nss/config/nss.pc.in 1969-12-31 18:00:00.000000000 -0600 -+++ b/mozilla/security/nss/config/nss.pc.in 2009-09-14 21:45:45.653637310 -0500 ++++ b/mozilla/security/nss/config/nss.pc.in 2012-12-15 07:27:20.651148959 -0600 @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ @@ -208,9 +208,9 @@ diff -urN a/mozilla/security/nss/config/nss.pc.in b/mozilla/security/nss/config/ +Cflags: -I${includedir} + diff -urN a/mozilla/security/nss/Makefile b/mozilla/security/nss/Makefile ---- a/mozilla/security/nss/Makefile 2008-12-02 17:24:39.000000000 -0600 -+++ b/mozilla/security/nss/Makefile 2009-09-14 21:45:45.678657145 -0500 -@@ -78,7 +78,7 @@ +--- a/mozilla/security/nss/Makefile 2012-11-13 19:14:07.000000000 -0600 ++++ b/mozilla/security/nss/Makefile 2012-12-15 07:27:57.235162137 -0600 +@@ -44,7 +44,7 @@ # (7) Execute "local" rules. (OPTIONAL). # ####################################################################### @@ -219,27 +219,25 @@ diff -urN a/mozilla/security/nss/Makefile b/mozilla/security/nss/Makefile nss_clean_all: clobber_coreconf clobber_nspr clobber_dbm clobber -@@ -140,12 +140,6 @@ +@@ -106,12 +106,6 @@ --with-dist-prefix='$(NSPR_PREFIX)' \ --with-dist-includedir='$(NSPR_PREFIX)/include' -build_nspr: $(NSPR_CONFIG_STATUS) -- cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; $(MAKE) +- $(MAKE) -C $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) - -clobber_nspr: $(NSPR_CONFIG_STATUS) -- cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; $(MAKE) clobber +- $(MAKE) -C $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) clobber - build_dbm: - ifndef NSS_DISABLE_DBM - cd $(CORE_DEPTH)/dbm ; $(MAKE) export libs + ifdef NSS_DISABLE_DBM + @echo "skipping the build of DBM" diff -urN a/mozilla/security/nss/manifest.mn b/mozilla/security/nss/manifest.mn ---- a/mozilla/security/nss/manifest.mn 2008-04-04 15:36:59.000000000 -0500 -+++ b/mozilla/security/nss/manifest.mn 2009-09-14 21:45:45.703656167 -0500 -@@ -42,6 +42,6 @@ +--- a/mozilla/security/nss/manifest.mn 2012-03-20 09:46:49.000000000 -0500 ++++ b/mozilla/security/nss/manifest.mn 2012-12-15 07:27:20.652148933 -0600 +@@ -10,6 +10,6 @@ RELEASE = nss -DIRS = lib cmd +DIRS = lib cmd config - - diff --git a/dev-libs/nss/nss-3.14.ebuild b/dev-libs/nss/nss-3.14.1.ebuild similarity index 97% rename from dev-libs/nss/nss-3.14.ebuild rename to dev-libs/nss/nss-3.14.1.ebuild index e8d104a..4164857 100644 --- a/dev-libs/nss/nss-3.14.ebuild +++ b/dev-libs/nss/nss-3.14.1.ebuild @@ -11,7 +11,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 - http://dev.gentoo.org/~anarchy/patches/${PN}-3.14-add_spi+cacerts_ca_certs.patch + http://dev.gentoo.org/~anarchy/patches/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch http://dev.gentoo.org/~anarchy/patches/${PN}-3.13.3_pem.support" LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" @@ -32,9 +32,9 @@ src_setup() { src_prepare() { # Custom changes for gentoo - epatch "${FILESDIR}/${PN}-3.13-gentoo-fixup.patch" + epatch "${FILESDIR}/${PN}-3.14.1-gentoo-fixups.patch" epatch "${FILESDIR}/${PN}-3.12.6-gentoo-fixup-warnings.patch" - epatch "${DISTDIR}/${PN}-3.14-add_spi+cacerts_ca_certs.patch" + epatch "${DISTDIR}/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch" epatch "${DISTDIR}/${PN}-3.13.3_pem.support" epatch "${FILESDIR}/${PN}-3.13.5-x32.patch"