rpms/nss/devel .cvsignore, 1.11, 1.12 nss-create-obj.patch, 1.2, 1.3 nss.spec, 1.30, 1.31 sources, 1.12, 1.13 fake-kstat.h, 1.1, NONE nss-3.11-zdefs.patch, 1.1, NONE nss-bug180726.patch, 1.1, NONE nss-decouple-softokn.patch, 1.1, NONE nss-disable-build-freebl-softoken.patch, 1.1, NONE nss-limit-suite-b.patch, 1.1, NONE nss-smartcard-auth.patch, 1.1, NONE nss-use-netstat-hack.patch, 1.1, NONE
Kai Engert (kengert)
fedora-extras-commits at redhat.com
Wed Nov 7 00:37:53 UTC 2007
- Previous message (by thread): rpms/nspr/devel .cvsignore, 1.10, 1.11 nspr.spec, 1.24, 1.25 sources, 1.11, 1.12 nspr-ipv6-numerichost.patch, 1.3, NONE nspr-static-assert.patch, 1.1, NONE nspr-thread-cleanup.patch, 1.2, NONE
- Next message (by thread): rpms/nss/devel nss-nolocalsql.patch,NONE,1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: kengert
Update of /cvs/extras/rpms/nss/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3350
Modified Files:
.cvsignore nss-create-obj.patch nss.spec sources
Removed Files:
fake-kstat.h nss-3.11-zdefs.patch nss-bug180726.patch
nss-decouple-softokn.patch
nss-disable-build-freebl-softoken.patch
nss-limit-suite-b.patch nss-smartcard-auth.patch
nss-use-netstat-hack.patch
Log Message:
* Wed Nov 07 2007 Kai Engert <kengert at redhat.com> - 3.11.99.2-1
- NSS 3.12 alpha 2
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 5 Sep 2007 20:00:42 -0000 1.11
+++ .cvsignore 7 Nov 2007 00:37:19 -0000 1.12
@@ -1,4 +1,2 @@
-nss-3.11.5-fbst-stripped.tar.gz
-nss-3.11.7-no-fbst-with-ckbi-1.64.tar.gz
-nss-3.12-alpha-ckfw.tar.gz
-nss-3.12-alpha-pem.tar.gz
+nss-3.11.99.2-stripped.tar.bz2
+nss-pem.tar.gz
nss-create-obj.patch:
Index: nss-create-obj.patch
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss-create-obj.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nss-create-obj.patch 6 Sep 2007 16:06:32 -0000 1.2
+++ nss-create-obj.patch 7 Nov 2007 00:37:19 -0000 1.3
@@ -1,21 +1,17 @@
-Index: mozilla/security/nss/lib/nss/nss.def
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/lib/nss/nss.def,v
-retrieving revision 1.158.2.7
-diff -u -r1.158.2.7 nss.def
---- mozilla/security/nss/lib/nss/nss.def 25 Apr 2007 23:26:53 -0000 1.158.2.7
-+++ mozilla/security/nss/lib/nss/nss.def 31 Aug 2007 18:54:54 -0000
-@@ -899,3 +899,10 @@
- ;+ local:
- ;+ *;
- ;+};
-+;+NSS_3.12 {
-+;+ global:
+diff -up mozilla/security/nss/lib/nss/nss.def.createobj mozilla/security/nss/lib/nss/nss.def
+--- mozilla/security/nss/lib/nss/nss.def.createobj 2007-11-06 14:11:40.000000000 +0100
++++ mozilla/security/nss/lib/nss/nss.def 2007-11-06 14:11:59.000000000 +0100
+@@ -913,8 +913,10 @@ CERT_FindCRLEntryReasonExten;
+ CERT_FindCRLNumberExten;
+ CERT_FindNameConstraintsExten;
+ CERT_PKIXVerifyCert;
+PK11_CreateGenericObject;
+ PK11_GenerateKeyPairWithOpFlags;
+ PK11_GetAllSlotsForCert;
+PK11_WriteRawAttribute;
-+;+ local:
-+;+ *;
-+;+};
+ SECKEY_ECParamsToBasePointOrderLen;
+ SECKEY_ECParamsToKeySize;
+ SECMOD_DeleteModuleEx;
Index: mozilla/security/nss/lib/pk11wrap/pk11obj.c
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/pk11wrap/pk11obj.c,v
Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- nss.spec 11 Oct 2007 13:22:10 -0000 1.30
+++ nss.spec 7 Nov 2007 00:37:19 -0000 1.31
@@ -1,44 +1,35 @@
-%define nspr_version 4.6.2
+%define nspr_version 4.6.99
%define unsupported_tools_directory %{_libdir}/nss/unsupported-tools
-%define fips_source_version 3.11.5
-%define ckfw_source_version 3.12-alpha
-%define ckbi_version 1.64
Summary: Network Security Services
Name: nss
-Version: 3.11.7
-Release: 10%{?dist}
+Version: 3.11.99.2
+Release: 1%{?dist}
License: MPLv1.1 or GPLv2+ or LGPLv2+
URL: http://www.mozilla.org/projects/security/pki/nss/
Group: System Environment/Libraries
Requires: nspr >= %{nspr_version}
+Requires: sqlite
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: nspr-devel >= %{nspr_version}
+BuildRequires: sqlite-devel
BuildRequires: pkgconfig
BuildRequires: gawk
Provides: mozilla-nss
Obsoletes: mozilla-nss
-#Source0: %{name}-%{version}-no-fbst.tar.gz
-Source0: %{name}-%{version}-no-fbst-with-ckbi-%{ckbi_version}.tar.gz
-# ckbi is the builtin roots module which may get released separately.
+Source0: %{name}-%{version}-stripped.tar.bz2
Source1: nss.pc.in
Source2: nss-config.in
Source3: blank-cert8.db
Source4: blank-key3.db
Source5: blank-secmod.db
-Source7: fake-kstat.h
Source8: nss-prelink.conf
-Source10: %{name}-%{fips_source_version}-fbst-stripped.tar.gz
-Source11: %{name}-%{ckfw_source_version}-ckfw.tar.gz
-Source12: %{name}-%{ckfw_source_version}-pem.tar.gz
+Source12: %{name}-pem.tar.gz
Patch1: nss-no-rpath.patch
-Patch2: nss-smartcard-auth.patch
-Patch3: nss-use-netstat-hack.patch
-Patch4: nss-decouple-softokn.patch
-Patch5: nss-disable-build-freebl-softoken.patch
+Patch2: nss-nolocalsql.patch
Patch6: nss-enable-pem.patch
Patch7: nss-create-obj.patch
@@ -91,52 +82,13 @@
%prep
%setup -q
-%setup -q -T -D -n %{name}-%{version} -a 10
-%setup -q -T -D -n %{name}-%{version} -a 11
%setup -q -T -D -n %{name}-%{version} -a 12
-%define old_nss_lib %{name}-%{fips_source_version}/mozilla/security/nss/lib
-%define new_nss_lib mozilla/security/nss/lib
-%define new_ckfw_lib %{name}-%{ckfw_source_version}/mozilla/security/nss/lib
-
-# Ensure we will not use new freebl/softoken code
-rm -rf %{new_nss_lib}/freebl
-rm -rf %{new_nss_lib}/softoken
-
-# However, in order to build newer NSS we need some exports
-cp -a %{old_nss_lib}/freebl %{new_nss_lib}
-cp -a %{old_nss_lib}/softoken %{new_nss_lib}
-
-# set up ckfw
-rm -rf %{new_nss_lib}/ckfw
-cp -a %{new_ckfw_lib}/ckfw %{new_nss_lib}
-
-# Ensure the newer NSS tree will not build code, except the loader
-mv -i %{new_nss_lib}/freebl/loader.c %{new_nss_lib}/freebl/loader.c.save
-rm -rf %{new_nss_lib}/freebl/*.c %{new_nss_lib}/freebl/*.s
-rm -rf %{new_nss_lib}/softoken/*.c %{new_nss_lib}/softoken/*.s
-mv -i %{new_nss_lib}/freebl/loader.c.save %{new_nss_lib}/freebl/loader.c
-
-# These currently don't build without freebl/softoken in the same tree
-rm -rf mozilla/security/nss/cmd/bltest
-rm -rf mozilla/security/nss/cmd/fipstest
-rm -rf mozilla/security/nss/cmd/certcgi
-
-# Apply the patches to the newer NSS tree
%patch1 -p0
-%patch2 -p0 -b .smartcard-auth
-%patch4 -p0 -b .decouple-softokn
-%patch5 -p0 -b .nofbst
+%patch2 -p0
%patch6 -p0 -b .libpem
%patch7 -p0 -b .create-obj
-# Apply the patches to the tree where we build freebl/softoken
-cd nss-%{fips_source_version}
-%patch3 -p0 -b .use-netstat-hack
-%{__mkdir_p} mozilla/security/nss/lib/fake/
-cp -i %{SOURCE7} mozilla/security/nss/lib/fake/kstat.h
-cd ..
-
%build
@@ -171,26 +123,6 @@
# NSS_ENABLE_ECC=1
# export NSS_ENABLE_ECC
-##### first, build freebl and softokn shared libraries
-
-cd nss-%{fips_source_version}
-%{__make} -C ./mozilla/security/coreconf
-%{__make} -C ./mozilla/security/dbm
-%{__make} -C ./mozilla/security/nss export
-%{__make} -C ./mozilla/security/nss/lib/base
-%{__make} -C ./mozilla/security/nss/lib/util
-%{__make} -C ./mozilla/security/nss/lib/freebl
-touch ./mozilla/security/nss/lib/freebl/unix_rand.c
-rm -f ./mozilla/security/nss/lib/freebl/*/*/libfreebl3*
-rm -f ./mozilla/security/nss/lib/freebl/*/*/sysrand*
-USE_NETSTAT_HACK=1 %{__make} -C ./mozilla/security/nss/lib/freebl
-%{__make} -C ./mozilla/security/nss/lib/freebl install
-%{__make} -C ./mozilla/security/nss/lib/softoken
-%{__make} -C ./mozilla/security/nss/lib/softoken install
-cd ..
-
-##### second, build all the rest of NSS
-
%{__make} -C ./mozilla/security/coreconf
%{__make} -C ./mozilla/security/dbm
%{__make} -C ./mozilla/security/nss
@@ -236,14 +168,7 @@
%{__mkdir_p} $RPM_BUILD_ROOT/%{unsupported_tools_directory}
# Copy the binary libraries we want
-for file in libsoftokn3.so libfreebl3.so
-do
- %{__install} -m 755 nss-%{fips_source_version}/mozilla/dist/*.OBJ/lib/$file \
- $RPM_BUILD_ROOT/%{_libdir}
-done
-
-# Copy the binary libraries we want
-for file in libnss3.so libssl3.so libsmime3.so libnssckbi.so libnsspem.so
+for file in libsoftokn3.so libfreebl3.so libnss3.so libssl3.so libsmime3.so libnssckbi.so libnsspem.so libnssdbm3.so
do
%{__install} -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir}
done
@@ -278,12 +203,15 @@
%{__install} -m 755 mozilla/dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{unsupported_tools_directory}
done
-# Copy the include files we want from freebl/softoken sources
-# and remove those files from the other area
-for file in blapit.h shsign.h ecl-exp.h pkcs11.h pkcs11f.h pkcs11p.h pkcs11t.h pkcs11n.h pkcs11u.h
+# For now, we don't want any pkix files to be public
+for file in mozilla/dist/public/nss/pkix*.h
+do
+ rm $file
+done
+
+# For now, we don't want these files to be public
+for file in sdb.h sftkdbt.h
do
- %{__install} -m 644 nss-%{fips_source_version}/mozilla/dist/public/nss/$file \
- $RPM_BUILD_ROOT/%{_includedir}/nss3
rm mozilla/dist/public/nss/$file
done
@@ -311,6 +239,7 @@
%files
%defattr(-,root,root)
%{_libdir}/libnss3.so
+%{_libdir}/libnssdbm3.so
%{_libdir}/libssl3.so
%{_libdir}/libsmime3.so
%{_libdir}/libsoftokn3.so
@@ -457,6 +386,9 @@
%changelog
+* Wed Nov 07 2007 Kai Engert <kengert at redhat.com> - 3.11.99.2-1
+- NSS 3.12 alpha 2
+
* Wed Oct 10 2007 Kai Engert <kengert at redhat.com> - 3.11.7-10
- Add /etc/prelink.conf.d/nss-prelink.conf in order to blacklist
our signed libraries and protect them from modification.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 6 Sep 2007 21:42:39 -0000 1.12
+++ sources 7 Nov 2007 00:37:19 -0000 1.13
@@ -1,4 +1,2 @@
-68c5e1bd8ba091e5a50babcd9e552bc5 nss-3.11.5-fbst-stripped.tar.gz
-c1053d1e001a5b1eb4b7c296a968ca5c nss-3.11.7-no-fbst-with-ckbi-1.64.tar.gz
-baa96599af6f0a2b656479d8e4efd58f nss-3.12-alpha-ckfw.tar.gz
-cb4e4fc7c06ad3b02178ed453273abec nss-3.12-alpha-pem.tar.gz
+23ed668befdac5dbbb8b30dc96a3f332 nss-3.11.99.2-stripped.tar.bz2
+d656d49b02fe756bae4942acc90f61a4 nss-pem.tar.gz
--- fake-kstat.h DELETED ---
--- nss-3.11-zdefs.patch DELETED ---
--- nss-bug180726.patch DELETED ---
--- nss-decouple-softokn.patch DELETED ---
--- nss-disable-build-freebl-softoken.patch DELETED ---
--- nss-limit-suite-b.patch DELETED ---
--- nss-smartcard-auth.patch DELETED ---
--- nss-use-netstat-hack.patch DELETED ---
- Previous message (by thread): rpms/nspr/devel .cvsignore, 1.10, 1.11 nspr.spec, 1.24, 1.25 sources, 1.11, 1.12 nspr-ipv6-numerichost.patch, 1.3, NONE nspr-static-assert.patch, 1.1, NONE nspr-thread-cleanup.patch, 1.2, NONE
- Next message (by thread): rpms/nss/devel nss-nolocalsql.patch,NONE,1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list