rpms
/
nss
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix sysinit to be under mozilla/security/nss/lib

This commit is contained in:
Elio Maldonado 2009-09-27 17:50:52 +00:00
parent fb2fffccbb
commit f6653922f7
2 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nss.spec
View File

@ -6,7 +6,7 @@
Summary: Network Security Services Summary: Network Security Services
Name: nss Name: nss
Version: 3.12.4 Version: 3.12.4
Release: 10%{?dist} Release: 11%{?dist}
License: MPLv1.1 or GPLv2+ or LGPLv2+ License: MPLv1.1 or GPLv2+ or LGPLv2+
URL: http://www.mozilla.org/projects/security/pki/nss/ URL: http://www.mozilla.org/projects/security/pki/nss/
Group: System Environment/Libraries Group: System Environment/Libraries
@ -469,6 +469,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h
%changelog %changelog
* Sun Sep 27 2009 Elio Maldonado<emaldona@redhat.com> - 3.12.4-11
- Fix sysinit to be under mozilla/security/nss/lib
* Sat Sep 26 2009 Elio Maldonado<emaldona@redhat.com> - 3.12.4-10 * Sat Sep 26 2009 Elio Maldonado<emaldona@redhat.com> - 3.12.4-10
- Add nss-sysinit activation/deactivation script - Add nss-sysinit activation/deactivation script

60
sysinit.patch
View File

@ -1,24 +1,24 @@
Index: ./mozilla/security/nss/cmd/manifest.mn Index: ./mozilla/security/nss/lib/manifest.mn
=================================================================== ===================================================================
RCS file: /cvsroot/mozilla/security/nss/cmd/manifest.mn,v RCS file: /cvsroot/mozilla/security/nss/lib/manifest.mn,v
retrieving revision 1.27 retrieving revision 1.19
diff -u -p -r1.27 manifest.mn diff -u -p -r1.19 manifest.mn
--- ./mozilla/security/nss/cmd/manifest.mn 4 Sep 2008 22:15:21 -0000 1.27 --- ./mozilla/security/nss/lib/manifest.mn 16 Nov 2007 05:29:23 -0000 1.19
+++ ./mozilla/security/nss/cmd/manifest.mn 18 Sep 2009 23:38:36 -0000 +++ ./mozilla/security/nss/lib/manifest.mn 27 Sep 2009 16:38:49 -0000
@@ -75,6 +75,7 @@ DIRS = lib \ @@ -56,6 +56,7 @@ DIRS = util freebl softoken \
ssltap \ pkcs12 pkcs7 smime \
strsclnt \ crmf jar \
symkeyutil \ ckfw \
+ sysinit \ + sysinit \
tests \ $(NULL)
tstclnt \
vfychain \ # fortcrypt is no longer built
Index: mozilla/security/nss/cmd/sysinit/Makefile Index: ./mozilla/security/nss/lib/sysinit/Makefile
=================================================================== ===================================================================
RCS file: security/nss/cmd/sysinit/Makefile RCS file: ./mozilla/security/nss/lib/sysinit/Makefile
diff -N security/nss/cmd/sysinit/Makefile diff -N ./mozilla/security/nss/lib/sysinit/Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000 --- /dev/null 1 Jan 1970 00:00:00 -0000
+++ ./mozilla/security/nss/cmd/sysinit/Makefile 18 Sep 2009 23:38:36 -0000 +++ ./mozilla/security/nss/lib/sysinit/Makefile 27 Sep 2009 16:38:50 -0000
@@ -0,0 +1,80 @@ @@ -0,0 +1,80 @@
+#! gmake +#! gmake
+# +#
@ -100,12 +100,12 @@ diff -N security/nss/cmd/sysinit/Makefile
+ +
+#include ../platrules.mk +#include ../platrules.mk
+ +
Index: mozilla/security/nss/cmd/sysinit/config.mk Index: ./mozilla/security/nss/lib/sysinit/config.mk
=================================================================== ===================================================================
RCS file: security/nss/cmd/sysinit/config.mk RCS file: ./mozilla/security/nss/lib/sysinit/config.mk
diff -N security/nss/cmd/sysinit/config.mk diff -N ./mozilla/security/nss/lib/sysinit/config.mk
--- /dev/null 1 Jan 1970 00:00:00 -0000 --- /dev/null 1 Jan 1970 00:00:00 -0000
+++ ./mozilla/security/nss/cmd/sysinit/config.mk 18 Sep 2009 23:38:36 -0000 +++ ./mozilla/security/nss/lib/sysinit/config.mk 27 Sep 2009 16:38:50 -0000
@@ -0,0 +1,121 @@ @@ -0,0 +1,121 @@
+# +#
+# ***** BEGIN LICENSE BLOCK ***** +# ***** BEGIN LICENSE BLOCK *****
@ -228,12 +228,12 @@ diff -N security/nss/cmd/sysinit/config.mk
+DLLFLAGS += -EXPORT:mktemp=nss_mktemp,PRIVATE +DLLFLAGS += -EXPORT:mktemp=nss_mktemp,PRIVATE
+endif +endif
+endif +endif
Index: mozilla/security/nss/cmd/sysinit/manifest.mn Index: ./mozilla/security/nss/lib/sysinit/manifest.mn
=================================================================== ===================================================================
RCS file: security/nss/cmd/sysinit/manifest.mn RCS file: ./mozilla/security/nss/lib/sysinit/manifest.mn
diff -N security/nss/cmd/sysinit/manifest.mn diff -N ./mozilla/security/nss/lib/sysinit/manifest.mn
--- /dev/null 1 Jan 1970 00:00:00 -0000 --- /dev/null 1 Jan 1970 00:00:00 -0000
+++ ./mozilla/security/nss/cmd/sysinit/manifest.mn 18 Sep 2009 23:38:36 -0000 +++ ./mozilla/security/nss/lib/sysinit/manifest.mn 27 Sep 2009 16:38:50 -0000
@@ -0,0 +1,50 @@ @@ -0,0 +1,50 @@
+# +#
+# ***** BEGIN LICENSE BLOCK ***** +# ***** BEGIN LICENSE BLOCK *****
@ -285,12 +285,12 @@ diff -N security/nss/cmd/sysinit/manifest.mn
+LIBRARY_NAME = nsssysinit +LIBRARY_NAME = nsssysinit
+#LIBRARY_VERSION = 3 +#LIBRARY_VERSION = 3
+ +
Index: mozilla/security/nss/cmd/sysinit/nsssysinit.c Index: ./mozilla/security/nss/lib/sysinit/nsssysinit.c
=================================================================== ===================================================================
RCS file: security/nss/cmd/sysinit/nsssysinit.c RCS file: ./mozilla/security/nss/lib/sysinit/nsssysinit.c
diff -N security/nss/cmd/sysinit/nsssysinit.c diff -N ./mozilla/security/nss/lib/sysinit/nsssysinit.c
--- /dev/null 1 Jan 1970 00:00:00 -0000 --- /dev/null 1 Jan 1970 00:00:00 -0000
+++ ./mozilla/security/nss/cmd/sysinit/nsssysinit.c 18 Sep 2009 23:38:36 -0000 +++ ./mozilla/security/nss/lib/sysinit/nsssysinit.c 27 Sep 2009 16:38:50 -0000
@@ -0,0 +1,356 @@ @@ -0,0 +1,356 @@
+/* ***** BEGIN LICENSE BLOCK ***** +/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1