From f0db09dfc66d50f6730c2ac3c805074faeb95980685f200090d47e43183ab523 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 11 Dec 2007 00:09:04 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mozilla-nss?expand=0&rev=7 --- mozilla-nss.changes | 5 +++++ mozilla-nss.spec | 8 ++++++-- nss-amd64-comba.patch | 13 +++++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 nss-amd64-comba.patch diff --git a/mozilla-nss.changes b/mozilla-nss.changes index ee0bee0..cb2ea2a 100644 --- a/mozilla-nss.changes +++ b/mozilla-nss.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Dec 10 16:22:37 CET 2007 - rguenther@suse.de + +- disable use of freebl/mpi/mp_comba.c. [#346256] + ------------------------------------------------------------------- Sun Sep 16 10:27:06 CEST 2007 - coolo@suse.de diff --git a/mozilla-nss.spec b/mozilla-nss.spec index 3415776..082cf9f 100644 --- a/mozilla-nss.spec +++ b/mozilla-nss.spec @@ -12,9 +12,9 @@ Name: mozilla-nss BuildRequires: gcc-c++ mozilla-nspr-devel -License: GPL v2 or later, LGPL v2 or later +License: GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL) Version: 3.11.7 -Release: 12 +Release: 25 Summary: Network (Netscape) Security Services Url: http://www.mozilla.org/projects/security/pki/nss/ Group: System/Libraries @@ -26,6 +26,7 @@ Patch1: nss-opt.patch Patch2: uninit.patch Patch3: system-nspr.patch Patch4: char.patch +Patch5: nss-amd64-comba.patch PreReq: mozilla-nspr >= %( echo `rpm -q --queryformat '%{VERSION}' mozilla-nspr`) PreReq: /bin/mkdir PreReq: /bin/mkdir @@ -74,6 +75,7 @@ cd mozilla %patch2 %patch3 %patch4 +%patch5 -p1 # additional CA certificates #cd security/nss/lib/ckfw/builtins #cat %{SOURCE2} >> certdata.txt @@ -172,6 +174,8 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_bindir}/nss-config %changelog +* Mon Dec 10 2007 - rguenther@suse.de +- disable use of freebl/mpi/mp_comba.c. [#346256] * Sun Sep 16 2007 - coolo@suse.de - fixing errors in %%post during installation * Thu Sep 13 2007 - jberkman@novell.com diff --git a/nss-amd64-comba.patch b/nss-amd64-comba.patch new file mode 100644 index 0000000..3fc7d2a --- /dev/null +++ b/nss-amd64-comba.patch @@ -0,0 +1,13 @@ +Index: mozilla/security/nss/lib/freebl/Makefile +=================================================================== +--- mozilla.orig/security/nss/lib/freebl/Makefile 2007-06-19 19:46:15.000000000 +0200 ++++ mozilla/security/nss/lib/freebl/Makefile 2007-12-10 16:18:51.000000000 +0100 +@@ -130,7 +130,7 @@ ifeq ($(CPU_ARCH),x86_64) + ASFILES = arcfour-amd64-gas.s mpi_amd64_gas.s + ASFLAGS += -march=opteron -m64 -fPIC + DEFINES += -DNSS_BEVAND_ARCFOUR -DMPI_AMD64 -DMP_ASSEMBLY_MULTIPLY +- DEFINES += -DNSS_USE_COMBA ++# DEFINES += -DNSS_USE_COMBA + DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN + # DEFINES += -DMPI_AMD64_ADD + MPI_SRCS += mpi_amd64.c mp_comba.c