On 07/01/2013 12:05 AM, bdu...@higgs.linuxfromscratch.org wrote: > Author: bdubbs > Date: Sun Jun 30 15:05:20 2013 > New Revision: 11345 > > Log: > Update to nss-3.15
... > Modified: trunk/BOOK/postlfs/security/nss.xml > ============================================================================== > --- trunk/BOOK/postlfs/security/nss.xml Sun Jun 30 14:16:22 2013 > (r11344) > +++ trunk/BOOK/postlfs/security/nss.xml Sun Jun 30 15:05:20 2013 > (r11345) > @@ -5,10 +5,10 @@ > %general-entities; > > <!ENTITY nss-download-http > - > "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_&nss-major-version;_&nss-minor-version;_RTM/src/nss-&nss-version;.tar.gz";> > + > "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_&nss-major-version;_RTM/src/nss-&nss-version;.tar.gz";> > <!ENTITY nss-download-ftp > - > "ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_&nss-major-version;_&nss-minor-version;_RTM/src/nss-&nss-version;.tar.gz";> > - <!ENTITY nss-md5sum "b326c2be8df277f62fb9c65fb3428148"> > + > "ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_&nss-major-version;_RTM/src/nss-&nss-version;.tar.gz";> > + <!ENTITY nss-md5sum "391fd6ef006f59ddc440054cad33d259"> > <!ENTITY nss-size "6.0 MB"> > <!ENTITY nss-buildsize "72 MB"> > <!ENTITY nss-time "0.8 SBU"> > @@ -41,7 +41,7 @@ > standards into an application. > </para> > > - &lfs72_checked; > + &lfs73_checked; > > <bridgehead renderas="sect3">Package Information</bridgehead> > <itemizedlist spacing="compact"> > @@ -77,16 +77,6 @@ > </listitem> > </itemizedlist> > > - <bridgehead renderas="sect3">Additional Downloads</bridgehead> > - <itemizedlist spacing="compact"> > - <listitem> > - <para> > - Required patch: > - <ulink url="&patch-root;/nss-&nss-version;-standalone-1.patch"/> > - </para> > - </listitem> > - </itemizedlist> > - > <bridgehead renderas="sect3">NSS Dependencies</bridgehead> > Hum, any reason why you removed the patch? Iirc, this patch adds nss-config and nss.pc which are necesary for other packages to build. > <bridgehead renderas="sect4">Required</bridgehead> > @@ -117,12 +107,11 @@ > Install <application>NSS</application> by running the following > commands: > </para> > > -<screen><userinput>patch -Np1 -i ../nss-&nss-version;-standalone-1.patch > && > -cd mozilla/security/nss && > -make nss_build_all BUILD_OPT=1 \ > - NSPR_INCLUDE_DIR=/usr/include/nspr \ > - USE_SYSTEM_ZLIB=1 \ > - ZLIB_LIBS=-lz \ > +<screen><userinput>cd nss && > +make BUILD_OPT=1 \ > + NSPR_INCLUDE_DIR=/usr/include/nspr \ > + USE_SYSTEM_ZLIB=1 \ > + ZLIB_LIBS=-lz \ > $([ $(uname -m) = x86_64 ] && echo USE_64=1) \ > $([ -f /usr/include/sqlite3.h ] && echo > NSS_USE_SYSTEM_SQLITE=1)</userinput></screen> > > @@ -134,14 +123,13 @@ > Now, as the <systemitem class="username">root</systemitem> user: > </para> > > -<screen role="root"><userinput>cd ../../dist && > -install -v -m755 Linux*/lib/*.so /usr/lib && > -install -v -m644 Linux*/lib/{*.chk,libcrmf.a} /usr/lib && > -install -v -m755 -d /usr/include/nss && > -cp -v -RL {public,private}/nss/* /usr/include/nss && > -chmod 644 /usr/include/nss/* && > -install -v -m755 Linux*/bin/{certutil,nss-config,pk12util} /usr/bin > && > -install -v -m644 Linux*/lib/pkgconfig/nss.pc > /usr/lib/pkgconfig</userinput></screen> > +<screen role="root"><userinput>cd ../dist > && > +install -v -m755 Linux*/lib/*.so /usr/lib && > +install -v -m644 Linux*/lib/{*.chk,libcrmf.a} /usr/lib && > +install -v -m755 -d /usr/include/nss && > +cp -v -RL {public,private}/nss/* /usr/include/nss && > +chmod 644 /usr/include/nss/* && > +install -v -m755 Linux*/bin/{certutil,pk12util} /usr/bin</userinput></screen> > </sect2> > > <sect2 role="commands"> > @@ -201,12 +189,12 @@ > > <seglistitem> > <seg> > - certutil, nss-config and pk12util > + certutil and pk12util > </seg> > <seg> > libcrmf.a, libfreebl3.so, libnss3.so, libnssckbi.so, > libnssdbm3.so, libnsssysinit.so, libnssutil3.so, > - libsmime3.so, libsoftokn3.so and libssl3.so > + libsmime3.so, libsoftokn3.so, and libssl3.so > </seg> > <seg> > /usr/include/nss > @@ -236,19 +224,6 @@ > </indexterm> > </listitem> > </varlistentry> > - > - <varlistentry id="nss-config"> > - <term><command>nss-config</command></term> > - <listitem> > - <para> > - is used to determine the NSS library settings of the installed > NSS > - libraries. > - </para> > - <indexterm zone="nss nss-config"> > - <primary sortas="b-nss-config">nss-config</primary> > - </indexterm> > - </listitem> > - </varlistentry> > > <varlistentry id="pk12util"> > <term><command>pk12util</command></term> > -- http://linuxfromscratch.org/mailman/listinfo/blfs-dev FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
