rpms/nss/devel fake-kstat.h, NONE, 1.1 nss-use-netstat-hack.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 nss.spec, 1.21, 1.22 sources, 1.8, 1.9 nss-clobber.sh, 1.2, NONE

[Kai Engert (kengert)]

Author: kengert

Update of /cvs/extras/rpms/nss/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2220

Modified Files:
	.cvsignore nss.spec sources 
Added Files:
	fake-kstat.h nss-use-netstat-hack.patch 
Removed Files:
	nss-clobber.sh 
Log Message:
* Fri Jun 01 2007 Kai Engert <kengert at redhat.com> - 3.11.7-2
- Update to 3.11.7, but freebl/softokn remain at 3.11.5.
- Use a workaround to avoid mozilla bug 51429.



--- NEW FILE fake-kstat.h ---
struct tag_kstat_t
{
  struct tag_kstat_t *ks_next;
  char* ks_data;
  PRUint32 ks_data_size;
  int ks_ndata;
};

struct tag_kstat_ctl_t
{
  struct tag_kstat_t *kc_chain;
};

typedef struct tag_kstat_t kstat_t;
typedef struct tag_kstat_ctl_t kstat_ctl_t;

#define kstat_open() NULL
#define kstat_read(a,b,c) -1
#define kstat_close(x) -1


nss-use-netstat-hack.patch:

--- NEW FILE nss-use-netstat-hack.patch ---
--- ./mozilla/security/coreconf/config.mk.org	2007-05-25 01:53:04.000000000 +0200
+++ ./mozilla/security/coreconf/config.mk	2007-05-25 01:52:58.000000000 +0200
@@ -185,3 +185,8 @@
 ifdef NSS_ALLOW_UNSUPPORTED_CRITICAL
 DEFINES += -DNSS_ALLOW_UNSUPPORTED_CRITICAL
 endif
+
+ifdef USE_NETSTAT_HACK
+DEFINES += -DSOLARIS
+INCLUDES += -I../fake
+endif


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	24 Feb 2007 08:43:08 -0000	1.8
+++ .cvsignore	1 Jun 2007 01:59:53 -0000	1.9
@@ -1 +1 @@
-nss-3.11.5.tar.gz
+nss-3.11.7-fbst3115-stripped.tar.gz


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- nss.spec	2 Mar 2007 18:53:44 -0000	1.21
+++ nss.spec	1 Jun 2007 01:59:53 -0000	1.22
@@ -3,7 +3,7 @@
 
 Summary:          Network Security Services
 Name:             nss
-Version:          3.11.5
+Version:          3.11.7
 Release:          2%{?dist}
 License:          MPL/GPL/LGPL
 URL:              http://www.mozilla.org/projects/security/pki/nss/
@@ -16,16 +16,17 @@
 Provides:         mozilla-nss
 Obsoletes:        mozilla-nss
 
-Source0:          %{name}-%{version}.tar.gz
+Source0:          %{name}-%{version}-fbst3115-stripped.tar.gz
 Source1:          nss.pc.in
 Source2:          nss-config.in
 Source3:          blank-cert8.db
 Source4:          blank-key3.db
 Source5:          blank-secmod.db
-Source6:	  nss-clobber.sh
+Source7:          fake-kstat.h
 
 Patch1:           nss-no-rpath.patch
 Patch2:           nss-smartcard-auth.patch
+Patch3:           nss-use-netstat-hack.patch
 
 %description
 Network Security Services (NSS) is a set of libraries designed to
@@ -75,9 +76,11 @@
 
 %prep
 %setup -q
-sh %{SOURCE6} > /dev/null
 %patch1  -p0
 %patch2 -p0 -b .smartcard-auth.patch
+%patch3 -p0
+%{__mkdir_p} mozilla/security/nss/lib/fake/
+cp -i %{SOURCE7} mozilla/security/nss/lib/fake/kstat.h
 
 %build
 
@@ -114,6 +117,14 @@
 
 %{__make} -C ./mozilla/security/coreconf
 %{__make} -C ./mozilla/security/dbm
+%{__make} -C ./mozilla/security/nss export
+
+%{__make} -C ./mozilla/security/nss/lib/util
+%{__make} -C ./mozilla/security/nss/lib/freebl
+
+touch ./mozilla/security/nss/lib/freebl/unix_rand.c
+USE_NETSTAT_HACK=1 %{__make} -C ./mozilla/security/nss/lib/freebl
+
 %{__make} -C ./mozilla/security/nss 
 
 # Set up our package file
@@ -355,6 +366,10 @@
 
 
 %changelog
+* Fri Jun 01 2007 Kai Engert <kengert at redhat.com> - 3.11.7-2
+- Update to 3.11.7, but freebl/softokn remain at 3.11.5.
+- Use a workaround to avoid mozilla bug 51429.
+
 * Fri Mar 02 2007 Kai Engert <kengert at redhat.com> - 3.11.5-2
 - Fix rhbz#230545, failure to enable FIPS mode
 - Fix rhbz#220542, make NSS more tolerant of resets when in the 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	24 Feb 2007 08:43:08 -0000	1.8
+++ sources	1 Jun 2007 01:59:53 -0000	1.9
@@ -1 +1 @@
-1add44e6a41dbf5091cfd000f19ad6b9  nss-3.11.5.tar.gz
+d57e4dd494f04f4c26c9035e660a1fba  nss-3.11.7-fbst3115-stripped.tar.gz


--- nss-clobber.sh DELETED ---