Author: dj
Date: 2009-08-28 17:17:05 -0600 (Fri, 28 Aug 2009)
New Revision: 7992
Modified:
trunk/BOOK/general.ent
trunk/BOOK/general/genlib/nspr.xml
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/postlfs/security/nss.xml
Log:
Updated to nss-3.12.4
Modified: trunk/BOOK/general/genlib/nspr.xml
===================================================================
--- trunk/BOOK/general/genlib/nspr.xml 2009-08-28 21:04:12 UTC (rev 7991)
+++ trunk/BOOK/general/genlib/nspr.xml 2009-08-28 23:17:05 UTC (rev 7992)
@@ -122,7 +122,7 @@
<?dbfo list-presentation="list"?>
<?dbhtml list-presentation="table"?>
- <varlistentry id="nspr-nspr-config">
+ <varlistentry id="nspr-config">
<term><command>nspr-config</command></term>
<listitem>
<para>provides compiler and linker options to other packages that
Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent 2009-08-28 21:04:12 UTC (rev 7991)
+++ trunk/BOOK/general.ent 2009-08-28 23:17:05 UTC (rev 7992)
@@ -87,7 +87,7 @@
<!ENTITY cyrus-sasl-version "2.1.22">
<!ENTITY stunnel-version "4.21">
<!ENTITY sudo-version "1.7.0">
-<!ENTITY nss-version "3.11.7">
+<!ENTITY nss-version "3.12.4">
<!ENTITY policykit-version "0.9">
<!-- Chapter 5 -->
Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml 2009-08-28 21:04:12 UTC
(rev 7991)
+++ trunk/BOOK/introduction/welcome/changelog.xml 2009-08-28 23:17:05 UTC
(rev 7992)
@@ -46,6 +46,9 @@
<listitem>
<para>[dj] - Added nspr-4.8.</para>
</listitem>
+ <listitem>
+ <para>[dj] - Updated to nss-3.12.4.</para>
+ </listitem>
</itemizedlist>
</listitem>
Modified: trunk/BOOK/postlfs/security/nss.xml
===================================================================
--- trunk/BOOK/postlfs/security/nss.xml 2009-08-28 21:04:12 UTC (rev 7991)
+++ trunk/BOOK/postlfs/security/nss.xml 2009-08-28 23:17:05 UTC (rev 7992)
@@ -4,9 +4,8 @@
<!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
- <!ENTITY nspr-version "4.6.7">
- <!ENTITY nss-download-http
"http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_11_7_RTM/src/nss-&nss-version;-with-nspr-&nspr-version;.tar.gz";>
- <!ENTITY nss-download-ftp
"ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_11_7_RTM/src/nss-&nss-version;-with-nspr-&nspr-version;.tar.gz";>
+ <!ENTITY nss-download-http
"http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_11_7_RTM/src/nss-&nss-version;.tar.gz";>
+ <!ENTITY nss-download-ftp
"ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_11_7_RTM/src/nss-&nss-version;.tar.gz";>
<!ENTITY nss-md5sum "0b0c6bdf63c442d68453e470b8747a9d">
<!ENTITY nss-size "5.0 MB">
<!ENTITY nss-buildsize "71 MB">
@@ -38,15 +37,6 @@
security standards. This is useful for implementing SSL and S/MIME or
other Internet security standards into an application.</para>
- <para>The <application>NSS</application> package requires the Netscape
- Portable Runtime (NSPR) libraries as a prerequisite for building. The
- <application>NSS</application> package tarball contains the code necessary
- to build the NSPR libraries. These libraries are built and installed using
- the instructions below. Essentially, the <application>NSS</application>
- package is now a combined <application>NSS</application>/NSPR
- installation.</para>
-
-
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
<listitem>
@@ -73,7 +63,7 @@
<itemizedlist spacing="compact">
<listitem>
<para>Required patch: <ulink
-
url="&patch-root;/nss-&nss-version;-with-nspr-&nspr-version;-fedora_fixes-1.patch"/></para>
+ url="&patch-root;/nss-&nss-version;-standalone-1.patch"/></para>
</listitem>
</itemizedlist>
@@ -90,17 +80,14 @@
<screen><userinput>bash
-export WORKINGDIR=$PWD &&
export BUILD_OPT=1 &&
+export NSS_USE_SYSTEM_SQLITE=1 &&
+export NSPR_INCLUDE_DIR=/usr/include/nspr &&
+export USE_SYSTEM_ZLIB=1 &&
+export ZLIB_LIBS=-lz &&
+patch -Np1 -i ../nss-&nss-version;-standalone-1.patch &&
+make -C mozilla/security/nss nss_build_all</userinput></screen>
-patch -Np1 -i
../nss-&nss-version;-with-nspr-&nspr-version;-fedora_fixes-1.patch &&
-
-cd mozilla/security/nss &&
-make nss_build_all &&
-cd ../.. &&
-
-export NSS_LINUXDIR=$(basename `ls -d
$WORKINGDIR/mozilla/dist/Linux*`)</userinput></screen>
-
<para>To test the results, you'll need to set the domain name of your
system in the <envar>DOMSUF</envar> environment variable. Most of the tests
will fail if you don't provide the correct domain name. A self-generated
@@ -113,10 +100,10 @@
<screen><userinput>bash
export DOMSUF=<replaceable><validdomain.name></replaceable> &&
-export PATH=$PATH:$WORKINGDIR/mozilla/dist/$NSS_LINUXDIR/bin &&
-export TEST_RESULTSDIR=$WORKINGDIR/mozilla/tests_results/security &&
+export PATH=$PATH:$PWD/mozilla/dist/$NSS_LINUXDIR/bin &&
+export TEST_RESULTSDIR=$PWD/mozilla/tests_results/security &&
-cd security/nss/tests &&
+cd mozilla/security/nss/tests &&
sed -i 's/gmake/make/' common/init.sh &&
./all.sh &&
@@ -124,35 +111,17 @@
exit</userinput></screen>
- <caution>
- <para>If you switch to the <systemitem class="username">root</systemitem>
- user using a method that does not inherit the environment from the
- unprivileged user, ensure that
- <systemitem class="username">root</systemitem>'s
- <envar>NSS_LINUXDIR</envar> environment variable is set correctly before
- proceeding with the installation commands.</para>
- </caution>
-
<para>Now, as the <systemitem class="username">root</systemitem>
user:</para>
-<screen role="root"><userinput>install -v -m755
nsprpub/$NSS_LINUXDIR/config/nspr-config \
- security/nss/cmd/config/nss-config \
- /usr/bin &&
-install -v -m755 -d /usr/lib/pkgconfig &&
-install -v -m644 nsprpub/lib/pkgconfig/nspr.pc \
- security/nss/lib/pkgconfig/nss.pc \
- /usr/lib/pkgconfig &&
-
-cd dist &&
-
+<screen role="root"><userinput>export NSS_LINUXDIR=$(basename `ls -d
$PWD/mozilla/dist/Linux*`) &&
+cd mozilla/dist &&
install -v -m755 $NSS_LINUXDIR/lib/*.so /usr/lib &&
install -v -m644 $NSS_LINUXDIR/lib/{*.chk,libcrmf.a} /usr/lib &&
+install -v -m755 -d /usr/include/nss &&
+install -v -m755 $NSS_LINUXDIR/bin/nss-config /usr/bin &&
+install -v -m644 $NSS_LINUXDIR/lib/pkgconfig/nss.pc /usr/lib/pkgconfig
&&
+cp -v -RL {public,private}/nss/* /usr/include/nss</userinput></screen>
-install -v -m755 -d /usr/include/{nss,nspr} &&
-install -v -m644 {public,private}/nss/* /usr/include/nss &&
-cp -v -RL $NSS_LINUXDIR/include/* /usr/include/nspr &&
-chmod -v 644 /usr/include/nspr/prvrsion.h</userinput></screen>
-
<para>Now as the unprivileged user, exit the <command>bash</command>
shell started at the beginning of the installation to restore the
environment to the original state.</para>
@@ -169,32 +138,34 @@
serves the purpose of restoring the environment and returning back to the
original directory when the installation is complete.</para>
- <para><command>export WORKINGDIR=$PWD</command>: This variable is set
- because many of the commands are dependent on knowing the full path of
- certain directories. <envar>WORKINGDIR</envar> establishes a known path
- so that all others can be determined relative to this.</para>
-
<para><command>export BUILD_OPT=1</command>: This variable is set so that
the build is performed with no debugging symbols built into the binaries
and that the default compiler optimizations are used.</para>
+ <para><command>export NSPR_INCLUDE_DIR=/usr/include/nspr</command>: This
+ command sets the location of the nspr headers.</para>
+
+ <para><command>export USE_SYSTEM_*</command>: These commands ensure that
+ the system installed libraries are used instead of the in-tree
+ versions.</para>
+
+ <para><command>export ZLIB_LIBS=-lz</command>: This command provides the
+ needed linker flags to link to the system zlib.</para>
+
<para><command>export NSS_LINUXDIR=...</command>: This variable is set so
that the exact name of the architecture specific directories where the
binaries are stored in the source tree can be determined.</para>
- <para><command>make nss_build_all</command>: This command builds the NSPR
- and <application>NSS</application> libraries and creates a
+ <para><command>make -C mozilla/security/nss nss_build_all</command>: This
+ command builds the <application>NSS</application> libraries and creates a
<filename class='directory'>dist</filename> directory which houses all the
programs, libraries and interface headers. None of the programs created by
- this process are installed onto the system using the default instructions.
- If you need any of these programs installed, you can find them in the
- <filename class='directory'>mozilla/dist/bin</filename> directory of the
- source tree.</para>
+ this process are installed onto the system using the default instructions
+ (except for <application>nss-config</application>). If you need any of
+ these programs installed, you can find them in the
+ <filename class='directory'>mozilla/*.OBJ/dist/bin</filename> directory of
+ the source tree.</para>
- <para><command>export PATH=...</command>: This command sets the
- <envar>PATH</envar> environment variable to include the executables in
- the source tree as some of them are required to run the test suite.</para>
-
<para><command>sed -i 's/gmake/make/' common/init.sh</command>: This
command changes the command used to compile some test programs.</para>
@@ -209,11 +180,10 @@
<segtitle>Installed Directories</segtitle>
<seglistitem>
- <seg>nspr-config and nss-config</seg>
- <seg>libcrmf.a, libfreebl3.so, libnspr4.so, libnss3.so, libnssckbi.so,
- libplc4.so, libplds4.so, libsmime3.so, libsoftokn3.so and
- libssl3.so</seg>
- <seg>/usr/include/nspr and /usr/include/nss</seg>
+ <seg>nss-config</seg>
+ <seg>libcrmf.a, libfreebl3.so, libnss3.so, libnssckbi.so,
+ libsmime3.so, libsoftokn3.so and libssl3.so</seg>
+ <seg>/usr/include/nss</seg>
</seglistitem>
</segmentedlist>
@@ -222,17 +192,6 @@
<?dbfo list-presentation="list"?>
<?dbhtml list-presentation="table"?>
- <varlistentry id="nspr-config">
- <term><command>nspr-config</command></term>
- <listitem>
- <para>is used to determine the NSPR installation settings
- of the installed NSPR libraries.</para>
- <indexterm zone="nss nspr-config">
- <primary sortas="b-nspr-config">nspr-config</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
<varlistentry id="nss-config">
<term><command>nss-config</command></term>
<listitem>
@@ -245,23 +204,6 @@
</varlistentry>
</variablelist>
- <para>The <filename class='libraryfile'>libnspr4.so</filename>,
- <filename class='libraryfile'>libplc4.so</filename> and
- <filename class='libraryfile'>libplds4.so</filename> libraries make up
the
- Netscape Portable Runtime (NSPR) libraries. These libraries provide a
- platform-neutral API for system level and libc like functions. The API
- is used in the Mozilla client, many of the Netscape/AOL/iPlanet offerings
- and other software applications.</para>
-
- <para>The <filename class='libraryfile'>libcrmf.a</filename>,
- <filename class='libraryfile'>libfreebl.so</filename>,
- <filename class='libraryfile'>libnss3.so</filename>,
- <filename class='libraryfile'>libnssckbi.so</filename>,
- <filename class='libraryfile'>libsmime3.so</filename>,
- <filename class='libraryfile'>libsoftokn3.so</filename> and
- <filename class='libraryfile'>libnssl3.so</filename> libraries make up
- the <application>NSS</application> libraries.</para>
-
</sect2>
</sect1>
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
