From 71d6df3266fe08719e62e50f928f85c7dd49367f Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Thu, 6 Dec 2018 13:51:04 +0100 Subject: [PATCH] Use %%autopatch --- nss-539183.patch | 8 ++++---- nss.spec | 5 +---- rhbz1185708-enable-ecc-3des-ciphers-by-default.patch | 4 ++-- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/nss-539183.patch b/nss-539183.patch index eda3249..267e71e 100644 --- a/nss-539183.patch +++ b/nss-539183.patch @@ -1,5 +1,5 @@ ---- ./nss/cmd/httpserv/httpserv.c.539183 2016-05-21 18:31:39.879585420 -0700 -+++ ./nss/cmd/httpserv/httpserv.c 2016-05-21 18:37:22.374464057 -0700 +--- nss/cmd/httpserv/httpserv.c.539183 2016-05-21 18:31:39.879585420 -0700 ++++ nss/cmd/httpserv/httpserv.c 2016-05-21 18:37:22.374464057 -0700 @@ -953,23 +953,23 @@ getBoundListenSocket(unsigned short port) { @@ -29,8 +29,8 @@ if (prStatus < 0) { PR_Close(listen_sock); errExit("PR_SetSocketOption(PR_SockOpt_Nonblocking)"); ---- ./nss/cmd/selfserv/selfserv.c.539183 2016-05-21 18:31:39.882585367 -0700 -+++ ./nss/cmd/selfserv/selfserv.c 2016-05-21 18:41:43.092801174 -0700 +--- nss/cmd/selfserv/selfserv.c.539183 2016-05-21 18:31:39.882585367 -0700 ++++ nss/cmd/selfserv/selfserv.c 2016-05-21 18:41:43.092801174 -0700 @@ -1711,23 +1711,23 @@ getBoundListenSocket(unsigned short port) { diff --git a/nss.spec b/nss.spec index b6ff2d2..1daedf5 100644 --- a/nss.spec +++ b/nss.spec @@ -235,11 +235,8 @@ Header and library files for doing development with Network Security Services. %prep %setup -q -n %{name}-%{nss_archive_version} - -%patch2 -p0 -b .539183 -%patch5 -p0 -b .1185708_3des pushd nss -%patch6 -p1 -b .paypal-certs +%autopatch -p1 cp %{SOURCE29} %{SOURCE30} tests/libpkix/certs popd diff --git a/rhbz1185708-enable-ecc-3des-ciphers-by-default.patch b/rhbz1185708-enable-ecc-3des-ciphers-by-default.patch index 455c747..2fbdbe9 100644 --- a/rhbz1185708-enable-ecc-3des-ciphers-by-default.patch +++ b/rhbz1185708-enable-ecc-3des-ciphers-by-default.patch @@ -1,5 +1,5 @@ ---- ./nss/lib/ssl/ssl3con.c.1185708_3des 2016-06-23 21:10:09.765992512 -0400 -+++ ./nss/lib/ssl/ssl3con.c 2016-06-23 22:58:39.121398601 -0400 +--- nss/lib/ssl/ssl3con.c.1185708_3des 2016-06-23 21:10:09.765992512 -0400 ++++ nss/lib/ssl/ssl3con.c 2016-06-23 22:58:39.121398601 -0400 @@ -118,18 +118,18 @@ { TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, SSL_ALLOWED, PR_TRUE, PR_FALSE}, { TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA, SSL_ALLOWED, PR_TRUE, PR_FALSE},