Changeset fa3e12e1


Ignore:
Timestamp:
12/01/2011 05:09:32 AM (13 years ago)
Author:
Ken Moffat <ken@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 12.2, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gimp3, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/for-12.3, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/spidermonkey128, xry111/test-20220226, xry111/xf86-video-removal
Children:
f0545c8
Parents:
1f23aa4f
Message:

Update to dhcp-4.2.3

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@9044 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:
4 edited

Legend:

Unmodified
Added
Removed

  • general.ent

    r1f23aa4f rfa3e12e1  
    44-->
    55
    6 <!ENTITY day          "30">                   <!-- Always 2 digits -->
    7 <!ENTITY month        "11">                   <!-- Always 2 digits -->
     6<!ENTITY day          "01">                   <!-- Always 2 digits -->
     7<!ENTITY month        "12">                   <!-- Always 2 digits -->
    88<!ENTITY year         "2011">
    99<!ENTITY copyrightdate "2001-&year;">
    1010<!ENTITY copyholder   "The BLFS Development Team">
    1111<!ENTITY version      "&year;-&month;-&day;">
    12 <!ENTITY releasedate  "November 28th, &year;">
     12<!ENTITY releasedate  "December 1st, &year;">
    1313<!-- <!ENTITY releasedate  "November &day;st, &year;"> -->
    1414<!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
    … …  
    421421
    422422<!-- Chapter 14 -->
    423 <!ENTITY dhcp-version                 "3.0.6">
     423<!ENTITY dhcp-version                 "4.2.3">
    424424<!ENTITY dhcpcd-version               "5.2.12">
    425425

  • introduction/welcome/changelog.xml

    r1f23aa4f rfa3e12e1  
    4343-->
    4444    <listitem>
     45      <para>December 1st, 2011</para>
     46      <itemizedlist>
     47        <listitem>
     48          <para>[ken] - Updated dhcp to 4.2.3.</para>
     49        </listitem>
     50      </itemizedlist>
     51    </listitem>
     52
     53    <listitem>
    4554      <para>November 30th, 2011</para>
    4655      <itemizedlist>

  • networking/connect/dhcp-client.xml

    r1f23aa4f rfa3e12e1  
    3838      <para id="dhclient-service">To configure <command>dhclient</command>,
    3939      you need to first install the network service script,
    40       <filename>/etc/sysconfig/network-devices/services/dhclient</filename>
     40      <filename>/lib/services/dhclient</filename>
    4141      included in the <xref linkend="bootscripts"/> package
    4242      (as <systemitem class="username">root</systemitem>):</para>
    … …  
    4949
    5050    <para id="dhclient-config1">Next, create the
    51     <filename>/etc/sysconfig/network-devices/ifconfig.eth0/dhclient</filename>
     51    <filename>/etc/sysconfig/ifconfig.eth0/dhclient</filename>
    5252    configuration file with the following commands as the <systemitem
    5353    class="username">root</systemitem> user.  Adjust as
    … …  
    5555
    5656    <indexterm zone="dhcp-client dhclient-config1">
    57       <primary sortas="e-etc-sysconfig-...-dhclient">/etc/sysconfig/.../dhclient</primary>
     57      <primary sortas="e-etc-sysconfig-...-dhclient">/etc/sysconfig/ifconfig.eth0</primary>
    5858    </indexterm>
    5959
    60 <screen role='root'><userinput>install -v -d /etc/sysconfig/network-devices/ifconfig.eth0 &amp;&amp;
    61 cat &gt; /etc/sysconfig/network-devices/ifconfig.eth0/dhclient &lt;&lt; "EOF"
     60<screen role='root'><userinput>install -v -d /etc/sysconfig/ifconfig.eth0 &amp;&amp;
     61cat &gt; /etc/sysconfig/ifconfig.eth0/dhclient &lt;&lt; "EOF"
    6262<literal>ONBOOT="yes"
     63IFACE="eth0"
    6364SERVICE="dhclient"
    64 DHCP_START="-q <replaceable>&lt;add additional start parameters here&gt;</replaceable>"
    65 DHCP_STOP="-q -r <replaceable>&lt;add additional stop parameters here&gt;</replaceable>"
     65DHCP_START="<replaceable>&lt;add additional start parameters here&gt;</replaceable> eth0"
     66DHCP_STOP="-r <replaceable>&lt;add additional stop parameters here&gt;</replaceable>"
    6667
    6768# Set PRINTIP="yes" to have the script print

  • networking/connect/dhcp.xml

    r1f23aa4f rfa3e12e1  
    44  <!ENTITY % general-entities SYSTEM "../../general.ent">
    55  %general-entities;
    6   <!ENTITY dhcp-download-http "http://gd.tuwien.ac.at/infosys/servers/isc/dhcp/dhcp-&dhcp-version;.tar.gz">
    7   <!ENTITY dhcp-download-ftp "ftp://ftp.isc.org/isc/dhcp/dhcp-&dhcp-version;.tar.gz">
    8   <!ENTITY dhcp-md5sum "724bad21ad8b638abadd5fcc07df1a0f">
    9   <!ENTITY dhcp-size "876 KB">
    10   <!ENTITY dhcp-buildsize "21 MB">
    11   <!ENTITY dhcp-time "0.1 SBU">
     6  <!-- isc have a weird way of offering the tarballs and without dots in version!
     7    FIXME - change hardcoded 423s in http url and version in ftp when upgrading -->
     8  <!ENTITY dhcp-download-http "http://www.isc.org/software/dhcp/423/download/dhcp-423targz?download=">
     9  <!ENTITY dhcp-download-ftp "ftp://ftp.isc.org/isc/dhcp/4.2.3/dhcp-&dhcp-version;.tar.gz">
     10  <!ENTITY dhcp-md5sum "a06649ec5336d284fc86a0232c0edd63">
     11  <!ENTITY dhcp-size "9.1 MB">
     12  <!ENTITY dhcp-buildsize "185 MB (client and server), 140MB client only, 172MB server only">
     13  <!ENTITY dhcp-time "0.7 SBU (client and server, or server), 0.6 SBU client only ">
    1214]>
    1315
    … …  
    3537    assigning network addresses on your private network.</para>
    3638
     39    &lfs70_checked;
     40
    3741    <bridgehead renderas="sect3">Package Information</bridgehead>
    3842    <itemizedlist spacing="compact">
    … …  
    6064    <itemizedlist spacing='compact'>
    6165      <listitem>
    62         <para>Required Patch:
    63         <ulink url="&patch-root;/dhcp-&dhcp-version;-client_dns-1.patch"/></para>
     66        <para>Recommended Patch (for client):
     67        <ulink url="&patch-root;/dhcp-&dhcp-version;-iproute2-1.patch"/></para>
    6468      </listitem>
    6569      <listitem>
    6670        <para>Optional Patch:
    67         <ulink url="&patch-root;/dhcp-&dhcp-version;-iproute2-1.patch"/></para>
     71        <ulink url="&patch-root;/dhcp-&dhcp-version;-missing_ipv6-1.patch"/></para>
    6872      </listitem>
    6973    </itemizedlist>
    … …  
    7276
    7377    <bridgehead renderas="sect4">Required</bridgehead>
    74     <para role="required"><xref linkend="net-tools"/> (you may omit
    75     <application>net-tools</application> by using the optional patch
    76     to utilize <application>iproute2</application>.</para>
     78    <para role="required"><xref linkend="net-tools"/> is required at runtime
     79    by <command>dhclient</command> if you do not use the iproute2 patch.</para>
    7780
    7881    <para condition="html" role="usernotes">User Notes:
    … …  
    8487    <title>Kernel Configuration</title>
    8588
    86     <para>You must have Packet Socket support (Device Drivers &rArr; Networking
     89    <para>You must have Packet Socket support (Networking
    8790    Support &rArr; Networking Options &rArr; Packet Socket) compiled into
    88     the kernel.</para>
     91    the kernel.  If you do not have IPv6 support (Networking Support &rArr;
     92    Networking Options &rArr; The IPv6 Protocol) compiled in, then you
     93    must use the missing_ipv6 patch.</para>
    8994
    9095    <indexterm zone="dhcp dhcp-kernel">
    … …  
    97102    <title>Installation of DHCP</title>
    98103
    99     <para>First fix a problem with always regenerating
    100           /etc/resolv.conf whether the DNS server has changed or not.</para>
    101 
    102 <screen><userinput>patch -Np1 -i ../dhcp-&dhcp-version;-client_dns-1.patch</userinput></screen>
    103 
    104     <para>If you chose not to install net-tools, apply the
    105     iproute2 patch:</para>
     104    <para>If you have not compiled IPv6 support into the kernel, apply the
     105    missing_ipv6 patch</para>
     106
     107<screen><userinput>patch -Np1 -i ../dhcp-&dhcp-version;-missing_ipv6-1.patch</userinput></screen>
     108
     109    <para>If you are installing the client, apply the iproute2 patch unless you
     110    will have installed <application>net-tools</application> by the time you wish
     111    to use the client:</para>
    106112
    107113<screen><userinput>patch -Np1 -i ../dhcp-&dhcp-version;-iproute2-1.patch</userinput></screen>
    … …  
    110116    the following commands:</para>
    111117
    112 <screen><userinput>./configure &amp;&amp;
    113 make</userinput></screen>
    114 
    115     <para>This package does not come with a test suite.</para>
     118<screen><userinput>sed -i 's%\(^sbindir =\).*%\1 @prefix@@sbindir@%' server/Makefile.in &amp;&amp;
     119./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     120 --sbindir=/sbin \
     121  --with-srv-lease-file=/var/state/dhcp/dhcpd.leases \
     122   --with-srv6-lease-file=/var/state/dhcp/dhcpd6.leases \
     123    --with-cli-lease-file=/var/state/dhclient.leases \
     124     --with-cli6-lease-file=/var/state/dhclient6.leases  &amp;&amp;
     125sed -i 's/-Werror//' {client,common,dst,omapip,relay,server,tests}/Makefile</userinput></screen>
     126
     127    <para>If you only wish to build the server, enter:</para>
     128<screen><userinput>sed -i 's/ client//' Makefile</userinput></screen>
     129
     130    <para>If you only wish to build the client, enter:</para>
     131<screen><userinput>sed -i 's/ dhcpctl relay server//' Makefile</userinput></screen>
     132
     133    <para>Build your chosen variant(s) with:</para>
     134<screen><userinput>make</userinput></screen>
     135
     136    <para>To test the results, issue: <command>make check</command></para>
    116137
    117138    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
    118139
    119 <screen role="root"><userinput>make LIBDIR=/usr/lib INCDIR=/usr/include install</userinput></screen>
     140<screen role="root"><userinput>make install</userinput></screen>
     141
     142    <para>The supplied <filename>/etc/dhcpd.conf</filename> (server) and
     143    <filename>/etc/dhclient.conf</filename> (client) are examples for a
     144    specific <literal>BSD</literal> system. They are unlikely to be appropriate
     145    to your needs, but you may wish to read them for ideas before deleting them
     146    or moving them to a different location.</para>
     147
     148    <para>Now create the director(y,ies) for the leases.</para>
     149
     150    <para>For the server:</para>
     151
     152<screen role="root"><userinput>mkdir -pv /var/state/dhcp</userinput></screen>
     153
     154    <para>For the client:</para>
     155<screen role="root"><userinput>mkdir -pv /var/state</userinput></screen>
    120156
    121157  </sect2>
    … …  
    124160    <title>Command Explanations</title>
    125161
    126     <para><parameter>LIBDIR=/usr/lib INCDIR=/usr/include</parameter>: This
    127     command installs the library and include files in
    128     <filename class="directory">/usr</filename> instead of
    129     <filename class="directory">/usr/local</filename>.</para>
     162    <para><command>sed -i 's%\(^sbindir =\).*%\1 @prefix@@sbindir@%' server/Makefile.in</command>
     163    This command moves the <command>dhcp</command> program to
     164    <filename class='directory'>/usr/sbin</filename> instead of
     165    <filename class='directory'>/sbin</filename> because it is not needed
     166    while the server is booting.</para>
     167
     168    <para><command>--sbindir=/sbin</command> The <command>dhclient</command>
     169    program is moved to <filename class='directory'>/sbin</filename> instead of
     170    <filename class='directory'>/usr/sbin</filename> so that it is available
     171    during boot, e.g. if <filename class='directory'>/usr</filename> is to be
     172    an <literal>nfs</literal> mount.</para>
     173
     174    <para><command>--with-*-lease-files=...</command> By default, lease files
     175    are placed in <filename class='directory'>/var/db</filename> which is an
     176    anachronism.</para>
     177
     178    <para><command>sed -i 's/-Werror//' {client,common,...}/Makefile</command> -
     179    the Makefiles in this package add <literal>-Werror</literal> to the
     180    <literal>CFLAGS</literal>.  On recent versions of <application>gcc</application>
     181    more things, particularly unused variables, create warnings.  The
     182    <literal>-Werror</literal> flag causes warnings to break the build, so we
     183    remove it where necessary.</para>
     184
     185    <para><command>sed -i 's/ something//' Makefile</command> - this stops the
     186    build from entering the director(y,ies) named here.</para>
     187
     188    <para><option>rm -v /usr/lib/lib{dhcpctl,dst,omapi}.a</option> - there is
     189    no easy way to prevent these static libraries being installed, but they are
     190    only needed during the build of this package. <filename>libdhcpctl.a</filename>
     191    is only installed if you build the server.</para>
    130192
    131193  </sect2>
    … …  
    185247<literal>default-lease-time 72000;
    186248max-lease-time 144000;
    187 ddns-update-style ad-hoc;
    188249
    189250subnet <replaceable>&lt;192.168.5.0&gt;</replaceable> netmask <replaceable>&lt;255.255.255.0&gt;</replaceable> {
    … …  
    210271      <seglistitem>
    211272        <seg>dhcpd, dhcrelay, dhclient, dhclient-script, and omshell</seg>
    212         <seg>bdhcpctl.a, libomapi.a</seg>
     273        <seg>libbdhcpctl.a, libdst.a, libomapi.a</seg>
    213274        <seg>/var/state/dhcp, /usr/include/omapip, and /usr/include/isi-dhcp</seg>
    214275      </seglistitem>
    … …  
    226287          <indexterm zone="dhcp dhclient">
    227288            <primary sortas="b-dhclient">dhclient</primary>
     289          </indexterm>
     290        </listitem>
     291      </varlistentry>
     292
     293      <varlistentry id="dhclient-script">
     294        <term><command>dhclient-script</command></term>
     295        <listitem>
     296          <para>is used by dhclient to (re)configure interfaces. It can make
     297          extra changes by invoking custom dhclient-{entry,exit}-hooks.</para>
     298          <indexterm zone="dhcp dhclient-script">
     299            <primary sortas="b-dhclient-script">dhclient-script</primary>
    228300          </indexterm>
    229301        </listitem>
Note: See TracChangeset for help on using the changeset viewer.