diff options
| -rw-r--r-- | chapter01/changelog.xml | 11 | ||||
| -rw-r--r-- | chapter01/whatsnew.xml | 10 | ||||
| -rw-r--r-- | chapter03/patches.xml | 14 | ||||
| -rw-r--r-- | chapter05/perl.xml | 9 | ||||
| -rw-r--r-- | chapter06/perl.xml | 25 | ||||
| -rw-r--r-- | general.ent | 4 | ||||
| -rw-r--r-- | patches.ent | 15 |
7 files changed, 57 insertions, 31 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 47c2fec0f..73a138530 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -37,6 +37,17 @@ --> <listitem> + <para>2008-10-30</para> + <itemizedlist> + <listitem> + <para>[bdubbs] - Added a consolidated patch to perl to address security + and othe rissues. Canged the configure options for perl to define + a venor library location.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>2008-10-29</para> <itemizedlist> <listitem> diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 81c42cb2b..6eeba511f 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -278,17 +278,21 @@ <para>MPFR-&mpfr-version;</para> </listitem> - <listitem> + <!--<listitem> <para>&perl-libc-patch;</para> </listitem> <listitem> <para>&perl-page-patch;</para> - </listitem> + </listitem> --> <listitem> + <para>&perl-consolidated-patch;</para> + </listitem> + + <!--<listitem> <para>&perl-security-patch;</para> - </listitem> + </listitem>--> <listitem> <para>&procps-watch-patch;</para> diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 8db104c1f..495a260da 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -202,15 +202,23 @@ </listitem> </varlistentry> - <varlistentry> + <!-- <varlistentry> <term>Perl Libc Patch - <token>&perl-libc-patch-size;</token>:</term> <listitem> <para>Download: <ulink url="&patches-root;&perl-libc-patch;"/></para> <para>MD5 sum: <literal>&perl-libc-patch-md5;</literal></para> </listitem> - </varlistentry> + </varlistentry> --> <varlistentry> + <term>Perl Consolidated Patch - <token>&perl-consolidated-patch-size;</token>:</term> + <listitem> + <para>Download: <ulink url="&patches-root;&perl-consolidated-patch;"/></para> + <para>MD5 sum: <literal>&perl-consolidated-patch-md5;</literal></para> + </listitem> + </varlistentry> + + <!-- <varlistentry> <term>Perl Page Patch - <token>&perl-page-patch-size;</token>:</term> <listitem> <para>Download: <ulink url="&patches-root;&perl-page-patch;"/></para> @@ -224,7 +232,7 @@ <para>Download: <ulink url="&patches-root;&perl-security-patch;"/></para> <para>MD5 sum: <literal>&perl-security-patch-md5;</literal></para> </listitem> - </varlistentry> + </varlistentry> --> <varlistentry> <term>Procps Watch Patch - <token>&procps-watch-patch-size;</token>:</term> diff --git a/chapter05/perl.xml b/chapter05/perl.xml index 30f176bef..1b00465b3 100644 --- a/chapter05/perl.xml +++ b/chapter05/perl.xml @@ -43,10 +43,10 @@ <sect2 role="installation"> <title>Installation of Perl</title> - <para>First adapt some hard-wired paths to the C library by applying - the following patch:</para> + <para>First apply a series of patches to address security issues and adapt some + hard-wired paths to the C library by applying the following patch:</para> -<screen><userinput remap="pre">patch -Np1 -i ../&perl-libc-patch;</userinput></screen> +<screen><userinput remap="pre">patch -Np1 -i ../&perl-consolidated-patch;</userinput></screen> <!-- <para>Fix an incompatibility with gcc-&gcc-version;:</para> @@ -57,7 +57,8 @@ sed 's/command /command[ -]/' makedepend.SH.orig > makedepend.SH</userinput>< 'Data/Dumper Fcntl IO POSIX' part of the command correct—they are all letters):</para> -<screen><userinput remap="configure">./configure.gnu --prefix=/tools -Dstatic_ext='Data/Dumper Fcntl IO POSIX'</userinput></screen> +<screen><userinput remap="configure">sh Configure -des -Dprefix=/tools \ + -Dstatic_ext='Data/Dumper Fcntl IO POSIX'</userinput></screen> <variablelist> <title>The meaning of the configure options:</title> diff --git a/chapter06/perl.xml b/chapter06/perl.xml index 721809dbe..c467c3236 100644 --- a/chapter06/perl.xml +++ b/chapter06/perl.xml @@ -47,14 +47,16 @@ <screen><userinput remap="pre">echo "127.0.0.1 localhost $(hostname)" > /etc/hosts</userinput></screen> - <para>The following patch fixes known vulnerabilities:</para> + <para>The following patch fixes known vulnerabilities and other issues + identified by the developers:</para> -<screen><userinput remap="pre">patch -Np1 -i ../&perl-security-patch;</userinput></screen> +<screen><userinput remap="pre">patch -Np1 -i ../&perl-consolidated-patch;</userinput></screen> - <para>The following patch fixes an incompatibility with + <!-- <para>The following patch fixes an incompatibility with Glibc-&glibc-version;:</para> <screen><userinput remap="pre">patch -Np1 -i ../&perl-page-patch;</userinput></screen> + --> <!-- Confirmed that this is not required any longer <para>Fix an incompatibility with gcc-&gcc-version;:</para> @@ -77,15 +79,24 @@ package is built. If you prefer, you can use the defaults that Perl auto-detects, by preparing Perl for compilation with:</para> -<screen><userinput remap="configure">./configure.gnu --prefix=/usr \ - -Dman1dir=/usr/share/man/man1 \ - -Dman3dir=/usr/share/man/man3 \ - -Dpager="/usr/bin/less -isR"</userinput></screen> +<screen><userinput remap="configure">sh Configure -des -Dprefix=/usr \ + -Dvendorprefix=/usr \ + -Dman1dir=/usr/share/man/man1 \ + -Dman3dir=/usr/share/man/man3 \ + -Dpager="/usr/bin/less -isR"</userinput></screen> <variablelist> <title>The meaning of the configure options:</title> <varlistentry> + <term><parameter>-Dvendorprefix=/usr</parameter></term> + <listitem> + <para>This ensures <command>perl</command> knows how to + tell packages where they should install their perl modules.</para> + </listitem> + </varlistentry> + + <varlistentry> <term><parameter>-Dpager="/usr/bin/less -isR"</parameter></term> <listitem> <para>This corrects an error in the way that <command>perldoc</command> diff --git a/general.ent b/general.ent index 69b5691b3..bc38a4870 100644 --- a/general.ent +++ b/general.ent @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!ENTITY version "SVN-20081029"> -<!ENTITY releasedate "October 28, 2009"> +<!ENTITY version "SVN-20081030"> +<!ENTITY releasedate "October 30, 2009"> <!ENTITY copyrightdate "1999-2008"><!-- jhalfs needs a literal dash, not – --> <!ENTITY milestone "7.0"> <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" --> diff --git a/patches.ent b/patches.ent index c3a8d3ce9..6271c12d6 100644 --- a/patches.ent +++ b/patches.ent @@ -113,18 +113,9 @@ <!ENTITY ncurses-coverity-patch-size "16.8 KB"> -<!ENTITY perl-libc-patch "perl-&perl-version;-libc-1.patch"> -<!ENTITY perl-libc-patch-md5 "3bf8aef1fb6eb6110405e699e4141f99"> -<!ENTITY perl-libc-patch-size "1.1 KB"> - -<!ENTITY perl-page-patch "perl-&perl-version;-page-1.patch"> -<!ENTITY perl-page-patch-md5 "16abf98d92d896601250ca610243cdf5"> -<!ENTITY perl-page-patch-size "0.7 KB"> - -<!ENTITY perl-security-patch "perl-&perl-version;-security_fix-1.patch"> -<!ENTITY perl-security-patch-md5 "4b1384ba595abd070824c2519d1d3176"> -<!ENTITY perl-security-patch-size "0.8 KB"> - +<!ENTITY perl-consolidated-patch "perl-&perl-version;-consolidated-1.patch"> +<!ENTITY perl-consolidated-patch-md5 "d1bcffb5d671bd659f7ca5c451a0c752"> +<!ENTITY perl-consolidated-patch-size "7.1 KB"> <!ENTITY procps-watch-patch "procps-&procps-version;-watch_unicode-1.patch"> <!ENTITY procps-watch-patch-md5 "2e5b57608177bd54349c718db9b5843d"> |