From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3C04613832F for ; Sun, 17 Jul 2016 08:11:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 41DB4E0B27; Sun, 17 Jul 2016 08:11:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B9534E0B27 for ; Sun, 17 Jul 2016 08:11:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4FBEF34092D for ; Sun, 17 Jul 2016 08:11:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9F1F9244E for ; Sun, 17 Jul 2016 08:11:17 +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: <1468742426.079533a48385db794fadedd864912b43dc5098c0.anarchy@gentoo> Subject: [gentoo-commits] proj/mozilla:master commit in: dev-libs/nss/files/ X-VCS-Repository: proj/mozilla X-VCS-Files: dev-libs/nss/files/nss-3.21-enable-pem.patch dev-libs/nss/files/nss-3.21-gentoo-fixup-warnings.patch dev-libs/nss/files/nss-3.21-gentoo-fixups.patch dev-libs/nss/files/nss-3.21-hppa-byte_order.patch dev-libs/nss/files/nss-3.21-pem-werror.patch dev-libs/nss/files/nss-3.23-hppa-byte_order.patch X-VCS-Directories: dev-libs/nss/files/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: 079533a48385db794fadedd864912b43dc5098c0 X-VCS-Branch: master Date: Sun, 17 Jul 2016 08:11:17 +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: 482df4a8-6985-473d-ab79-4d0a4e372304 X-Archives-Hash: 1742573bf2d9f24b5cb87d3c58a7eb99 commit: 079533a48385db794fadedd864912b43dc5098c0 Author: Jory A. Pratt gentoo org> AuthorDate: Sun Jul 17 08:00:26 2016 +0000 Commit: Jory Pratt gentoo org> CommitDate: Sun Jul 17 08:00:26 2016 +0000 URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=079533a4 dev-libs/nss : sync with tree support dev-libs/nss/files/nss-3.21-enable-pem.patch | 5 ++--- .../nss/files/nss-3.21-gentoo-fixup-warnings.patch | 7 +++--- dev-libs/nss/files/nss-3.21-gentoo-fixups.patch | 25 +++++++++------------- dev-libs/nss/files/nss-3.21-pem-werror.patch | 25 +++++++++------------- ..._order.patch => nss-3.23-hppa-byte_order.patch} | 8 +++---- 5 files changed, 29 insertions(+), 41 deletions(-) diff --git a/dev-libs/nss/files/nss-3.21-enable-pem.patch b/dev-libs/nss/files/nss-3.21-enable-pem.patch index c60f051..e6de275 100644 --- a/dev-libs/nss/files/nss-3.21-enable-pem.patch +++ b/dev-libs/nss/files/nss-3.21-enable-pem.patch @@ -1,6 +1,5 @@ -diff -urN a/nss/lib/ckfw/manifest.mn b/nss/lib/ckfw/manifest.mn ---- a/nss/lib/ckfw/manifest.mn 2015-11-15 09:25:06.130786072 -0600 -+++ b/nss/lib/ckfw/manifest.mn 2015-11-15 09:31:03.372770145 -0600 +--- nss/lib/ckfw/manifest.mn ++++ nss/lib/ckfw/manifest.mn @@ -5,7 +5,7 @@ CORE_DEPTH = ../.. diff --git a/dev-libs/nss/files/nss-3.21-gentoo-fixup-warnings.patch b/dev-libs/nss/files/nss-3.21-gentoo-fixup-warnings.patch index ed8a0aa..14234e8 100644 --- a/dev-libs/nss/files/nss-3.21-gentoo-fixup-warnings.patch +++ b/dev-libs/nss/files/nss-3.21-gentoo-fixup-warnings.patch @@ -1,6 +1,5 @@ -diff -urN a/nss/coreconf/Linux.mk b/nss/coreconf/Linux.mk ---- a/nss/coreconf/Linux.mk 2015-11-15 09:25:06.672786048 -0600 -+++ b/nss/coreconf/Linux.mk 2015-11-15 09:29:26.682774456 -0600 +--- nss/coreconf/Linux.mk ++++ nss/coreconf/Linux.mk @@ -130,6 +130,7 @@ OPTIMIZER += -gdwarf-2 endif @@ -8,4 +7,4 @@ diff -urN a/nss/coreconf/Linux.mk b/nss/coreconf/Linux.mk +OPTIMIZER += -fno-strict-aliasing endif - ifndef COMPILER_TAG \ No newline at end of file + ifndef COMPILER_TAG diff --git a/dev-libs/nss/files/nss-3.21-gentoo-fixups.patch b/dev-libs/nss/files/nss-3.21-gentoo-fixups.patch index 3381982..29cda28 100644 --- a/dev-libs/nss/files/nss-3.21-gentoo-fixups.patch +++ b/dev-libs/nss/files/nss-3.21-gentoo-fixups.patch @@ -1,6 +1,5 @@ -diff -urN a/nss/config/Makefile b/nss/config/Makefile ---- a/nss/config/Makefile 1969-12-31 18:00:00.000000000 -0600 -+++ b/nss/config/Makefile 2015-11-15 10:42:46.249578304 -0600 +--- nss/config/Makefile ++++ nss/config/Makefile @@ -0,0 +1,40 @@ +CORE_DEPTH = .. +DEPTH = .. @@ -42,9 +41,8 @@ diff -urN a/nss/config/Makefile b/nss/config/Makefile + +dummy: all export libs + -diff -urN a/nss/config/nss-config.in b/nss/config/nss-config.in ---- a/nss/config/nss-config.in 1969-12-31 18:00:00.000000000 -0600 -+++ b/nss/config/nss-config.in 2015-11-15 10:42:46.250578304 -0600 +--- nss/config/nss-config.in ++++ nss/config/nss-config.in @@ -0,0 +1,145 @@ +#!/bin/sh + @@ -191,9 +189,8 @@ diff -urN a/nss/config/nss-config.in b/nss/config/nss-config.in + echo $libdirs +fi + -diff -urN a/nss/config/nss.pc.in b/nss/config/nss.pc.in ---- a/nss/config/nss.pc.in 1969-12-31 18:00:00.000000000 -0600 -+++ b/nss/config/nss.pc.in 2015-11-15 10:42:46.251578304 -0600 +--- nss/config/nss.pc.in ++++ nss/config/nss.pc.in @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ @@ -207,9 +204,8 @@ diff -urN a/nss/config/nss.pc.in b/nss/config/nss.pc.in +Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3 +Cflags: -I${includedir} + -diff -urN a/nss/Makefile b/nss/Makefile ---- a/nss/Makefile 2015-11-15 09:25:06.410786060 -0600 -+++ b/nss/Makefile 2015-11-15 10:42:46.252578304 -0600 +--- nss/Makefile ++++ nss/Makefile @@ -46,7 +46,7 @@ # (7) Execute "local" rules. (OPTIONAL). # ####################################################################### @@ -232,9 +228,8 @@ diff -urN a/nss/Makefile b/nss/Makefile build_docs: $(MAKE) -C $(CORE_DEPTH)/doc -diff -urN a/nss/manifest.mn b/nss/manifest.mn ---- a/nss/manifest.mn 2015-11-15 09:25:06.411786060 -0600 -+++ b/nss/manifest.mn 2015-11-15 10:43:15.633576994 -0600 +--- nss/manifest.mn ++++ nss/manifest.mn @@ -10,4 +10,4 @@ RELEASE = nss diff --git a/dev-libs/nss/files/nss-3.21-pem-werror.patch b/dev-libs/nss/files/nss-3.21-pem-werror.patch index 392d74a..5a984ae 100644 --- a/dev-libs/nss/files/nss-3.21-pem-werror.patch +++ b/dev-libs/nss/files/nss-3.21-pem-werror.patch @@ -1,6 +1,5 @@ -diff -up ./nss/lib/ckfw/pem/ckpem.h.compile_Werror ./nss/lib/ckfw/pem/ckpem.h ---- ./nss/lib/ckfw/pem/ckpem.h.compile_Werror 2014-01-23 06:28:18.000000000 -0800 -+++ ./nss/lib/ckfw/pem/ckpem.h 2015-11-13 12:07:29.219887390 -0800 +--- nss/lib/ckfw/pem/ckpem.h ++++ nss/lib/ckfw/pem/ckpem.h @@ -233,6 +233,9 @@ struct pemLOWKEYPrivateKeyStr { }; typedef struct pemLOWKEYPrivateKeyStr pemLOWKEYPrivateKey; @@ -11,9 +10,8 @@ diff -up ./nss/lib/ckfw/pem/ckpem.h.compile_Werror ./nss/lib/ckfw/pem/ckpem.h SECStatus ReadDERFromFile(SECItem ***derlist, char *filename, PRBool ascii, int *cipher, char **ivstring, PRBool certsonly); const NSSItem * pem_FetchAttribute ( pemInternalObject *io, CK_ATTRIBUTE_TYPE type); void pem_PopulateModulusExponent(pemInternalObject *io); -diff -up ./nss/lib/ckfw/pem/pinst.c.compile_Werror ./nss/lib/ckfw/pem/pinst.c ---- ./nss/lib/ckfw/pem/pinst.c.compile_Werror 2014-01-23 06:28:18.000000000 -0800 -+++ ./nss/lib/ckfw/pem/pinst.c 2015-11-13 12:07:29.219887390 -0800 +--- nss/lib/ckfw/pem/pinst.c ++++ nss/lib/ckfw/pem/pinst.c @@ -472,7 +472,9 @@ AddCertificate(char *certfile, char *key char *ivstring = NULL; int cipher; @@ -37,9 +35,8 @@ diff -up ./nss/lib/ckfw/pem/pinst.c.compile_Werror ./nss/lib/ckfw/pem/pinst.c &ivstring, PR_FALSE); if (kobjs < 1) { error = CKR_GENERAL_ERROR; -diff -up ./nss/lib/ckfw/pem/pobject.c.compile_Werror ./nss/lib/ckfw/pem/pobject.c ---- ./nss/lib/ckfw/pem/pobject.c.compile_Werror 2014-01-23 06:28:18.000000000 -0800 -+++ ./nss/lib/ckfw/pem/pobject.c 2015-11-13 12:07:29.220887368 -0800 +--- nss/lib/ckfw/pem/pobject.c ++++ nss/lib/ckfw/pem/pobject.c @@ -630,6 +630,11 @@ pem_DestroyInternalObject if (io->u.key.ivstring) free(io->u.key.ivstring); @@ -85,9 +82,8 @@ diff -up ./nss/lib/ckfw/pem/pobject.c.compile_Werror ./nss/lib/ckfw/pem/pobject. if (nobjs < 1) goto loser; -diff -up ./nss/lib/ckfw/pem/rsawrapr.c.compile_Werror ./nss/lib/ckfw/pem/rsawrapr.c ---- ./nss/lib/ckfw/pem/rsawrapr.c.compile_Werror 2014-01-23 06:28:18.000000000 -0800 -+++ ./nss/lib/ckfw/pem/rsawrapr.c 2015-11-13 12:07:29.220887368 -0800 +--- nss/lib/ckfw/pem/rsawrapr.c ++++ nss/lib/ckfw/pem/rsawrapr.c @@ -93,6 +93,8 @@ pem_PublicModulusLen(NSSLOWKEYPublicKey return 0; } @@ -105,9 +101,8 @@ diff -up ./nss/lib/ckfw/pem/rsawrapr.c.compile_Werror ./nss/lib/ckfw/pem/rsawrap /* * Format one block of data for public/private key encryption using -diff -up ./nss/lib/ckfw/pem/util.c.compile_Werror ./nss/lib/ckfw/pem/util.c ---- ./nss/lib/ckfw/pem/util.c.compile_Werror 2014-01-23 06:28:18.000000000 -0800 -+++ ./nss/lib/ckfw/pem/util.c 2015-11-13 12:22:52.282196306 -0800 +--- nss/lib/ckfw/pem/util.c ++++ nss/lib/ckfw/pem/util.c @@ -131,7 +131,8 @@ static SECStatus FileToItem(SECItem * ds return SECFailure; } diff --git a/dev-libs/nss/files/nss-3.21-hppa-byte_order.patch b/dev-libs/nss/files/nss-3.23-hppa-byte_order.patch similarity index 62% rename from dev-libs/nss/files/nss-3.21-hppa-byte_order.patch rename to dev-libs/nss/files/nss-3.23-hppa-byte_order.patch index 703df99..63cfadd 100644 --- a/dev-libs/nss/files/nss-3.21-hppa-byte_order.patch +++ b/dev-libs/nss/files/nss-3.23-hppa-byte_order.patch @@ -1,5 +1,5 @@ ---- a/nss/lib/dbm/include/mcom_db.h -+++ b/nss/lib/dbm/include/mcom_db.h +--- nss/lib/dbm/include/mcom_db.h ++++ nss/lib/dbm/include/mcom_db.h @@ -110,11 +110,13 @@ #endif /* !BYTE_ORDER */ #endif /* __sun */ @@ -7,8 +7,8 @@ +#ifndef BYTE_ORDER #if defined(__hpux) || defined(__hppa) #define BYTE_ORDER BIG_ENDIAN - #define BIG_ENDIAN 4321 - #define LITTLE_ENDIAN 1234 /* LSB first: i386, vax, all NT risc */ + #define BIG_ENDIAN 4321 + #define LITTLE_ENDIAN 1234 /* LSB first: i386, vax, all NT risc */ #endif +#endif /* !BYTE_ORDER */