Compare commits
16 Commits
Author | SHA1 | Date |
---|---|---|
Fedora Release Engineering | 792a4c9d32 | |
Bill Nottingham | e3b5a19cc5 | |
Kai Engert | 9a75c3c7f7 | |
Kai Engert | ec83aa72b0 | |
Kai Engert | cdc4314cff | |
Kai Engert | 648bff3c1c | |
Kai Engert | e4c5f10b15 | |
Kai Engert | 51fff2b534 | |
Kai Engert | 2eb0e471ef | |
Kai Engert | 6e75e143e3 | |
Dennis Gilmore | 4d85e78461 | |
Kai Engert | 6fa708723c | |
Kai Engert | bcd67a11a8 | |
Kai Engert | 0d8160acc5 | |
Kai Engert | cdf0dd20eb | |
Jesse Keating | e736d505eb |
|
@ -1,2 +0,0 @@
|
|||
nss-pem-20080124.tar.bz2
|
||||
nss-3.12.0.1-stripped.tar.gz
|
|
@ -0,0 +1,2 @@
|
|||
nss-pem-20080124.tar.bz2
|
||||
nss-3.12.3.99.3-stripped.tar.bz2
|
21
Makefile
21
Makefile
|
@ -1,21 +0,0 @@
|
|||
# Makefile for source rpm: nss
|
||||
# $Id: Makefile,v 1.1 2005/12/15 19:34:51 caillon Exp $
|
||||
NAME := nss
|
||||
SPECFILE = $(firstword $(wildcard *.spec))
|
||||
|
||||
define find-makefile-common
|
||||
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(find-makefile-common))
|
||||
|
||||
ifeq ($(MAKEFILE_COMMON),)
|
||||
# attempt a checkout
|
||||
define checkout-makefile-common
|
||||
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
|
||||
endif
|
||||
|
||||
include $(MAKEFILE_COMMON)
|
Binary file not shown.
Binary file not shown.
|
@ -1,11 +1,7 @@
|
|||
Index: mozilla/security/nss/lib/ckfw/manifest.mn
|
||||
===================================================================
|
||||
RCS file: /cvsroot/mozilla/security/nss/lib/ckfw/manifest.mn,v
|
||||
retrieving revision 1.9
|
||||
diff -u -r1.9 manifest.mn
|
||||
--- mozilla/security/nss/lib/ckfw/manifest.mn 16 Dec 2005 00:48:01 -0000 1.9
|
||||
+++ mozilla/security/nss/lib/ckfw/manifest.mn 31 Aug 2007 17:58:23 -0000
|
||||
@@ -38,7 +38,7 @@
|
||||
diff -up ./mozilla/security/nss/lib/ckfw/manifest.mn.libpem ./mozilla/security/nss/lib/ckfw/manifest.mn
|
||||
--- ./mozilla/security/nss/lib/ckfw/manifest.mn.libpem 2007-08-15 17:29:52.000000000 +0200
|
||||
+++ ./mozilla/security/nss/lib/ckfw/manifest.mn 2009-01-23 05:49:59.000000000 +0100
|
||||
@@ -38,7 +38,7 @@ MANIFEST_CVS_ID = "@(#) $RCSfile: manife
|
||||
|
||||
CORE_DEPTH = ../../..
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
diff -up mozilla/security/nss/lib/Makefile.nolocalsql mozilla/security/nss/lib/Makefile
|
||||
--- mozilla/security/nss/lib/Makefile.nolocalsql 2007-11-06 15:12:37.000000000 +0100
|
||||
+++ mozilla/security/nss/lib/Makefile 2007-11-06 15:13:35.000000000 +0100
|
||||
diff -up ./mozilla/security/nss/lib/Makefile.nolocalsql ./mozilla/security/nss/lib/Makefile
|
||||
--- ./mozilla/security/nss/lib/Makefile.nolocalsql 2007-07-19 23:36:49.000000000 +0200
|
||||
+++ ./mozilla/security/nss/lib/Makefile 2009-04-14 17:07:40.000000000 +0200
|
||||
@@ -62,11 +62,11 @@ ifeq ($(OS_TARGET), WINCE)
|
||||
DIRS := $(filter-out fortcrypt,$(DIRS))
|
||||
endif
|
||||
|
@ -18,9 +18,9 @@ diff -up mozilla/security/nss/lib/Makefile.nolocalsql mozilla/security/nss/lib/M
|
|||
|
||||
#######################################################################
|
||||
# (5) Execute "global" rules. (OPTIONAL) #
|
||||
diff -up mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql mozilla/security/nss/lib/softoken/legacydb/manifest.mn
|
||||
--- mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql 2007-11-06 15:10:59.000000000 +0100
|
||||
+++ mozilla/security/nss/lib/softoken/legacydb/manifest.mn 2007-11-06 15:11:07.000000000 +0100
|
||||
diff -up ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn
|
||||
--- ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql 2007-07-19 23:36:50.000000000 +0200
|
||||
+++ ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn 2009-04-14 17:07:40.000000000 +0200
|
||||
@@ -46,9 +46,9 @@ MAPFILE = $(OBJDIR)/nssdbm.def
|
||||
|
||||
DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\"
|
||||
|
@ -34,9 +34,9 @@ diff -up mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql mozil
|
|||
|
||||
CSRCS = \
|
||||
dbmshim.c \
|
||||
diff -up mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql mozilla/security/nss/lib/softoken/manifest.mn
|
||||
--- mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql 2007-11-06 15:08:14.000000000 +0100
|
||||
+++ mozilla/security/nss/lib/softoken/manifest.mn 2007-11-06 15:10:21.000000000 +0100
|
||||
diff -up ./mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql ./mozilla/security/nss/lib/softoken/manifest.mn
|
||||
--- ./mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql 2009-03-25 17:21:37.000000000 +0100
|
||||
+++ ./mozilla/security/nss/lib/softoken/manifest.mn 2009-04-14 17:07:40.000000000 +0200
|
||||
@@ -47,9 +47,9 @@ MAPFILE = $(OBJDIR)/softokn.def
|
||||
|
||||
DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\" -DSHLIB_VERSION=\"$(LIBRARY_VERSION)\"
|
||||
|
@ -49,5 +49,4 @@ diff -up mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql mozilla/securi
|
|||
+#endif
|
||||
|
||||
EXPORTS = \
|
||||
pkcs11.h \
|
||||
diff -up mozilla/security/nss/lib/softoken/config.mk.nolocalsql mozilla/security/nss/lib/softoken/config.mk
|
||||
secmodt.h \
|
||||
|
|
|
@ -0,0 +1,12 @@
|
|||
diff -u --recursive mozilla.orig/security/nss/lib/ckfw/pem/pobject.c mozilla/security/nss/lib/ckfw/pem/pobject.c
|
||||
--- mozilla.orig/security/nss/lib/ckfw/pem/pobject.c 2007-09-06 16:46:30.000000000 -0400
|
||||
+++ mozilla/security/nss/lib/ckfw/pem/pobject.c 2008-08-13 21:08:43.000000000 -0400
|
||||
@@ -160,7 +160,7 @@
|
||||
(void *) &ck_false, (PRUint32) sizeof(CK_BBOOL)
|
||||
};
|
||||
static const NSSItem pem_x509Item = {
|
||||
- (void *) &ckc_x509, (PRUint32) sizeof(CKC_X_509)
|
||||
+ (void *) &ckc_x509, (PRUint32) sizeof(CK_ULONG)
|
||||
};
|
||||
static const NSSItem pem_rsaItem = {
|
||||
(void *) &ckk_rsa, (PRUint32) sizeof(CK_KEY_TYPE)
|
|
@ -0,0 +1,15 @@
|
|||
diff -ruNp mozilla.orig/security/nss/lib/ckfw/pem/pobject.c mozilla/security/nss/lib/ckfw/pem/pobject.c
|
||||
--- mozilla.orig/security/nss/lib/ckfw/pem/pobject.c 2009-02-28 15:03:36.719964516 +0100
|
||||
+++ mozilla/security/nss/lib/ckfw/pem/pobject.c 2009-02-28 15:03:55.964074075 +0100
|
||||
@@ -987,10 +987,7 @@ pem_CreateObject
|
||||
char *ivstring = NULL;
|
||||
|
||||
count = pem_nobjs;
|
||||
- if (count > 0)
|
||||
- size = ((count / PEM_ITEM_CHUNK) + 1) * PEM_ITEM_CHUNK;
|
||||
- else
|
||||
- size = 0;
|
||||
+ size = (count / PEM_ITEM_CHUNK) * PEM_ITEM_CHUNK;
|
||||
|
||||
/*
|
||||
* only create token objects
|
64
nss.spec
64
nss.spec
|
@ -1,10 +1,11 @@
|
|||
%define nspr_version 4.7
|
||||
%define unsupported_tools_directory %{_libdir}/nss/unsupported-tools
|
||||
%define ckbi_version 1.73
|
||||
|
||||
Summary: Network Security Services
|
||||
Name: nss
|
||||
Version: 3.12.0.1
|
||||
Release: 1%{?dist}
|
||||
Version: 3.12.3.99.3
|
||||
Release: 2.9.2%{?dist}
|
||||
License: MPLv1.1 or GPLv2+ or LGPLv2+
|
||||
URL: http://www.mozilla.org/projects/security/pki/nss/
|
||||
Group: System Environment/Libraries
|
||||
|
@ -17,8 +18,10 @@ BuildRequires: pkgconfig
|
|||
BuildRequires: gawk
|
||||
BuildRequires: psmisc
|
||||
BuildRequires: perl
|
||||
BuildRequires: zlib-devel
|
||||
|
||||
Source0: %{name}-%{version}-stripped.tar.gz
|
||||
Source0: %{name}-%{version}-stripped.tar.bz2
|
||||
#Source0: %{name}-%{version}-ckbi-%{ckbi_version}-stripped.tar.bz2
|
||||
|
||||
Source1: nss.pc.in
|
||||
Source2: nss-config.in
|
||||
|
@ -27,11 +30,14 @@ Source4: blank-key3.db
|
|||
Source5: blank-secmod.db
|
||||
Source8: nss-prelink.conf
|
||||
Source12: %{name}-pem-20080124.tar.bz2
|
||||
Source13: PayPalEE.cert
|
||||
Source14: PayPalICA.cert
|
||||
|
||||
Patch1: nss-no-rpath.patch
|
||||
Patch2: nss-nolocalsql.patch
|
||||
Patch4: nss-pem-bug483855.patch
|
||||
Patch5: nss-pem-bug429175.patch
|
||||
Patch6: nss-enable-pem.patch
|
||||
patch7: nss-fix-tests.patch
|
||||
|
||||
%description
|
||||
Network Security Services (NSS) is a set of libraries designed to
|
||||
|
@ -45,6 +51,7 @@ v3 certificates, and other security standards.
|
|||
Summary: Tools for the Network Security Services
|
||||
Group: System Environment/Base
|
||||
Requires: nss = %{version}-%{release}
|
||||
Requires: zlib
|
||||
|
||||
%description tools
|
||||
Network Security Services (NSS) is a set of libraries designed to
|
||||
|
@ -62,6 +69,7 @@ Summary: Development libraries for Network Security Services
|
|||
Group: Development/Libraries
|
||||
Requires: nss = %{version}-%{release}
|
||||
Requires: nspr-devel >= %{nspr_version}
|
||||
Requires: pkgconfig
|
||||
|
||||
%description devel
|
||||
Header and Library files for doing development with Network Security Services.
|
||||
|
@ -83,8 +91,13 @@ low level services.
|
|||
|
||||
%patch1 -p0
|
||||
%patch2 -p0
|
||||
%patch4 -p0 -b .483855
|
||||
%patch5 -p0 -b .429175
|
||||
%patch6 -p0 -b .libpem
|
||||
%patch7 -p0 -b .prex
|
||||
|
||||
#need newer certs to make test suite work
|
||||
#remove once we update to NSS 3.12.4
|
||||
cp %{SOURCE13} %{SOURCE14} mozilla/security/nss/tests/libpkix/certs
|
||||
|
||||
|
||||
%build
|
||||
|
@ -112,7 +125,7 @@ NSPR_LIB_DIR=`/usr/bin/pkg-config --libs-only-L nspr | sed 's/-L//'`
|
|||
export NSPR_INCLUDE_DIR
|
||||
export NSPR_LIB_DIR
|
||||
|
||||
%ifarch x86_64 ppc64 ia64 s390x
|
||||
%ifarch x86_64 ppc64 ia64 s390x sparc64
|
||||
USE_64=1
|
||||
export USE_64
|
||||
%endif
|
||||
|
@ -297,6 +310,7 @@ done
|
|||
%config(noreplace) %{_sysconfdir}/pki/nssdb/cert8.db
|
||||
%config(noreplace) %{_sysconfdir}/pki/nssdb/key3.db
|
||||
%config(noreplace) %{_sysconfdir}/pki/nssdb/secmod.db
|
||||
%dir %{_sysconfdir}/prelink.conf.d
|
||||
%{_sysconfdir}/prelink.conf.d/nss-prelink.conf
|
||||
|
||||
%files tools
|
||||
|
@ -374,6 +388,7 @@ done
|
|||
%{_includedir}/nss3/nsspem.h
|
||||
%{_includedir}/nss3/nssrwlk.h
|
||||
%{_includedir}/nss3/nssrwlkt.h
|
||||
%{_includedir}/nss3/nssutil.h
|
||||
%{_includedir}/nss3/ocsp.h
|
||||
%{_includedir}/nss3/ocspt.h
|
||||
%{_includedir}/nss3/p12.h
|
||||
|
@ -420,7 +435,6 @@ done
|
|||
%{_includedir}/nss3/sslproto.h
|
||||
%{_includedir}/nss3/sslt.h
|
||||
%{_includedir}/nss3/utilrename.h
|
||||
%{_includedir}/nss3/watcomfx.h
|
||||
|
||||
|
||||
%files pkcs11-devel
|
||||
|
@ -440,6 +454,42 @@ done
|
|||
|
||||
|
||||
%changelog
|
||||
* Fri Jun 05 2009 Kai Engert <kaie@redhat.com> - 3.12.3.99.3-2.9.2
|
||||
- don't have nsslowhash.h
|
||||
* Fri Jun 05 2009 Kai Engert <kaie@redhat.com> - 3.12.3.99.3-2.9.1
|
||||
- update list of header files
|
||||
- switch to release 2.9.1 to ensure it will remain lower than
|
||||
release numbers of nss in later fedora versions.
|
||||
* Fri Jun 05 2009 Kai Engert <kaie@redhat.com> - 3.12.3.99.3-2
|
||||
- fix test suite failure
|
||||
* Fri Jun 05 2009 Kai Engert <kaie@redhat.com> - 3.12.3.99.3-1
|
||||
- updated to NSS_3_12_4_FIPS1_WITH_CKBI_1_75
|
||||
* Tue Mar 31 2009 Kai Engert <kaie@redhat.com> - 3.12.2.0-3
|
||||
- add upstream patch to fix bug 483855
|
||||
* Fri Jan 23 2009 Kai Engert <kengert@redhat.com> - 3.12.2.0-2
|
||||
- Update to NSS_3_12_2_WITH_CKBI_1_73_RTM
|
||||
* Wed Nov 19 2008 Kai Engert <kengert@redhat.com> - 3.12.2.0-1.1
|
||||
- Update to NSS_3_12_2_RC1
|
||||
- Use system zlib
|
||||
* Thu Nov 06 2008 Kai Engert <kengert@redhat.com> - 3.12.1.1-5
|
||||
- Update to NSS_3_12_1_WITH_CKBI_1_72_RTM
|
||||
* Tue Sep 30 2008 Dennis Gilmore <dennis@ausil.us> - 3.12.1.1-4
|
||||
- add sparc64 to the list of 64 bit arches
|
||||
* Wed Sep 24 2008 Kai Engert <kaie@redhat.com> - 3.12.1.1-3
|
||||
- bug 456847, move pkgconfig requirement to devel package
|
||||
* Fri Sep 05 2008 Kai Engert <kengert@redhat.com> - 3.12.1.1-2
|
||||
- Update to NSS_3_12_1_RC2
|
||||
* Fri Aug 22 2008 Kai Engert <kaie@redhat.com> - 3.12.1.0-2
|
||||
- NSS 3.12.1 RC1
|
||||
* Fri Aug 15 2008 Kai Engert <kaie@redhat.com> - 3.12.0.3-7
|
||||
- fix bug bug 429175 in libpem module
|
||||
* Tue Aug 05 2008 Kai Engert <kengert@redhat.com> - 3.12.0.3-6
|
||||
- bug 456847, add Requires: pkgconfig
|
||||
* Tue Jun 24 2008 Kai Engert <kengert@redhat.com> - 3.12.0.3-3
|
||||
- nss package should own /etc/prelink.conf.d folder, rhbz#452062
|
||||
- use upstream patch to fix test suite abort
|
||||
* Mon Jun 02 2008 Kai Engert <kengert@redhat.com> - 3.12.0.3-2
|
||||
- Update to NSS_3_12_RC4
|
||||
* Mon Apr 14 2008 Kai Engert <kengert@redhat.com> - 3.12.0.1-1
|
||||
- Update to NSS_3_12_RC2
|
||||
* Thu Mar 20 2008 Jesse Keating <jkeating@redhat.com> - 3.11.99.5-2
|
||||
|
|
Loading…
Reference in New Issue