Djam/dhcp
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/dhcp.git synced 2025-02-23 13:32:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Automatic import for version 4.2.4

Browse source
This commit is contained in:
Rosa 2012-07-28 04:45:13 +00:00
parent 20c82f51a1
commit 0db6ac5f98
5 changed files with 109 additions and 261 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.abf.yml
View file

@ -1,3 +1,3 @@
sources: sources:
"dhcp-4.2.3-P2.tar.gz": 6ce113d8e6301343b66d4d71be59a3c34805378d "dhcp-4.2.4-P1.tar.gz": 0fe0f20b7be597d60e61951d2ccafe547d3bcec2
"dhcp-dynamic-dns-examples.tar.bz2": d33980aad3e0380fc89f8346ab37786d39157696 "dhcp-dynamic-dns-examples.tar.bz2": d33980aad3e0380fc89f8346ab37786d39157696

11
dhcp-4.2.3-P2.tar.gz.sha512.asc
View file

@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
iQEVAwUATwzDx6v5WqfJazUKAQoHTwf+M4/AoxtBUDSw8JYVFKJ1coz9wLMm3tTg
PGuxk2mWPTYw2F6QCZ//mgCC/NVUJEdH/6rCsLUM2Ps9vLpvQgeQWEjKc8u5iTpw
8fsO9elkKIy7sle7MoQ/PDz2iOaz3TW9GCrOlh7df4QeJARZOU+tcQdzIyZSWE6p
FssVOQ5Yqm2u6OcSNUXtgkTcNL6GrraQTMiU7kbSUAcybKX1OPixX20Aa5ktT1OB
vJHIqMWaICxVzJhdsPuB/FjftJhE6/pAvm8TT/YB0Jjoz3rRgOSswQRI6XZjJjR5
CQOywkXQ+WfuY6vEkV8KtEYLazOGUQT7/NlcFRhqvUs05baTD07gAQ==
=CLdh
-----END PGP SIGNATURE-----

36
dhcp-4.2.1-64_bit_lease_parse.patch → dhcp-4.2.4-64_bit_lease_parse.patch
View file

@ -1,19 +1,18 @@
diff -up dhcp-4.2.1b1/common/dispatch.c.64-bit_lease_parse dhcp-4.2.1b1/common/dispatch.c diff -up dhcp-4.2.4b1/common/parse.c.64-bit_lease_parse dhcp-4.2.4b1/common/parse.c
diff -up dhcp-4.2.1b1/common/parse.c.64-bit_lease_parse dhcp-4.2.1b1/common/parse.c --- dhcp-4.2.4b1/common/parse.c.64-bit_lease_parse 2012-03-09 12:28:10.000000000 +0100
--- dhcp-4.2.1b1/common/parse.c.64-bit_lease_parse 2010-12-30 00:01:42.000000000 +0100 +++ dhcp-4.2.4b1/common/parse.c 2012-04-16 17:30:55.867045149 +0200
+++ dhcp-4.2.1b1/common/parse.c 2011-01-28 08:01:10.000000000 +0100 @@ -906,8 +906,8 @@ TIME
@@ -909,8 +909,8 @@ TIME
parse_date_core(cfile) parse_date_core(cfile)
struct parse *cfile; struct parse *cfile;
{ {
- int guess; - int guess;
- int tzoff, wday, year, mon, mday, hour, min, sec; - int tzoff, year, mon, mday, hour, min, sec;
+ TIME guess; + TIME guess;
+ long int tzoff, wday, year, mon, mday, hour, min, sec; + long int tzoff, year, mon, mday, hour, min, sec;
const char *val; const char *val;
enum dhcp_token token; enum dhcp_token token;
static int months[11] = { 31, 59, 90, 120, 151, 181, static int months[11] = { 31, 59, 90, 120, 151, 181,
@@ -936,7 +936,7 @@ parse_date_core(cfile) @@ -933,7 +933,7 @@ parse_date_core(cfile)
} }
token = next_token(&val, NULL, cfile); /* consume number */ token = next_token(&val, NULL, cfile); /* consume number */
@ -22,16 +21,7 @@ diff -up dhcp-4.2.1b1/common/parse.c.64-bit_lease_parse dhcp-4.2.1b1/common/pars
return((TIME)guess); return((TIME)guess);
} }
@@ -948,7 +948,7 @@ parse_date_core(cfile) @@ -961,7 +961,7 @@ parse_date_core(cfile)
return((TIME)0);
}
token = next_token(&val, NULL, cfile); /* consume day of week */
- wday = atoi(val);
+ wday = atol(val);
/* Year... */
token = peek_token(&val, NULL, cfile);
@@ -964,7 +964,7 @@ parse_date_core(cfile)
somebody invents a time machine, I think we can safely disregard somebody invents a time machine, I think we can safely disregard
it. This actually works around a stupid Y2K bug that was present it. This actually works around a stupid Y2K bug that was present
in a very early beta release of dhcpd. */ in a very early beta release of dhcpd. */
@ -40,7 +30,7 @@ diff -up dhcp-4.2.1b1/common/parse.c.64-bit_lease_parse dhcp-4.2.1b1/common/pars
if (year > 1900) if (year > 1900)
year -= 1900; year -= 1900;
@@ -988,7 +988,7 @@ parse_date_core(cfile) @@ -985,7 +985,7 @@ parse_date_core(cfile)
return((TIME)0); return((TIME)0);
} }
token = next_token(&val, NULL, cfile); /* consume month */ token = next_token(&val, NULL, cfile); /* consume month */
@ -49,7 +39,7 @@ diff -up dhcp-4.2.1b1/common/parse.c.64-bit_lease_parse dhcp-4.2.1b1/common/pars
/* Slash separating month from day... */ /* Slash separating month from day... */
token = peek_token(&val, NULL, cfile); token = peek_token(&val, NULL, cfile);
@@ -1010,7 +1010,7 @@ parse_date_core(cfile) @@ -1007,7 +1007,7 @@ parse_date_core(cfile)
return((TIME)0); return((TIME)0);
} }
token = next_token(&val, NULL, cfile); /* consume day of month */ token = next_token(&val, NULL, cfile); /* consume day of month */
@ -58,7 +48,7 @@ diff -up dhcp-4.2.1b1/common/parse.c.64-bit_lease_parse dhcp-4.2.1b1/common/pars
/* Hour... */ /* Hour... */
token = peek_token(&val, NULL, cfile); token = peek_token(&val, NULL, cfile);
@@ -1021,7 +1021,7 @@ parse_date_core(cfile) @@ -1018,7 +1018,7 @@ parse_date_core(cfile)
return((TIME)0); return((TIME)0);
} }
token = next_token(&val, NULL, cfile); /* consume hour */ token = next_token(&val, NULL, cfile); /* consume hour */
@ -67,7 +57,7 @@ diff -up dhcp-4.2.1b1/common/parse.c.64-bit_lease_parse dhcp-4.2.1b1/common/pars
/* Colon separating hour from minute... */ /* Colon separating hour from minute... */
token = peek_token(&val, NULL, cfile); token = peek_token(&val, NULL, cfile);
@@ -1043,7 +1043,7 @@ parse_date_core(cfile) @@ -1040,7 +1040,7 @@ parse_date_core(cfile)
return((TIME)0); return((TIME)0);
} }
token = next_token(&val, NULL, cfile); /* consume minute */ token = next_token(&val, NULL, cfile); /* consume minute */
@ -76,7 +66,7 @@ diff -up dhcp-4.2.1b1/common/parse.c.64-bit_lease_parse dhcp-4.2.1b1/common/pars
/* Colon separating minute from second... */ /* Colon separating minute from second... */
token = peek_token(&val, NULL, cfile); token = peek_token(&val, NULL, cfile);
@@ -1065,13 +1065,13 @@ parse_date_core(cfile) @@ -1062,13 +1062,13 @@ parse_date_core(cfile)
return((TIME)0); return((TIME)0);
} }
token = next_token(&val, NULL, cfile); /* consume second */ token = next_token(&val, NULL, cfile); /* consume second */

11
dhcp-4.2.4-P1.tar.gz.sha512.asc Normal file
View file

@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQEcBAABCgAGBQJQDUjkAAoJEKv5WqfJazUKE38H/0OOq8Ww/exUWUYg28Jeyxqj
NX/jqyma6amjVDhmnDu/l4HekYl2DExb71slg4iYMCatKbPVV8Aak1o8BdRzQ/pi
u0lNvPNxYH6+z3AxffY7zONgY/YYXlYxt2QdAvn86NHepIzdJxHlZP/Axpu6kQwk
9N6519CjXgtfai9J1K4rKTjOqM3vFVYrqe1e5uRIlEuPmyWcfQl2mzgG0B5p6pts
dPXJ0RvV8UAsCSc4noNUnpd8XWtqCK7I4795LEJ/iA9CWUj0HDn8D35nMZ4q1vVe
fr2FEtyTfqIj0VvIX6W7mlDZm8tOgfrXqgiZYhmKbNeJcPqQfjJ08WWau/eWDGw=
=ONl/
-----END PGP SIGNATURE-----

310
dhcp.spec
View file

@ -1,18 +1,14 @@
%define plevelversion 2 %define plevelversion 1
%if %plevelversion < 1 %if %{plevelversion} >= 1
%undefine plevel
%else
%define plevel P%{plevelversion} %define plevel P%{plevelversion}
%endif %endif
%define _catdir /var/cache/man
Summary: The ISC DHCP (Dynamic Host Configuration Protocol) server/relay agent/client Summary: The ISC DHCP (Dynamic Host Configuration Protocol) server/relay agent/client
Name: dhcp Name: dhcp
Epoch: 3 Epoch: 3
Version: 4.2.3 Version: 4.2.4
Release: 1.P%{plevelversion}.2 Release: 0.P%{plevelversion}.1
License: Distributable License: Distributable
Group: System/Servers Group: System/Servers
URL: http://www.isc.org/software/dhcp URL: http://www.isc.org/software/dhcp
@ -40,11 +36,12 @@ Patch102: dhcp-4.1.1-prevent_wireless_deassociation.patch
Patch8: dhcp-4.2.2-xen-checksum.patch Patch8: dhcp-4.2.2-xen-checksum.patch
Patch15: dhcp-4.2.2-missing-ipv6-not-fatal.patch Patch15: dhcp-4.2.2-missing-ipv6-not-fatal.patch
Patch17: dhcp-4.2.0-add_timeout_when_NULL.patch Patch17: dhcp-4.2.0-add_timeout_when_NULL.patch
Patch18: dhcp-4.2.1-64_bit_lease_parse.patch Patch18: dhcp-4.2.4-64_bit_lease_parse.patch
BuildRequires: autoconf automake libtool
BuildRequires: groff-for-man BuildRequires: groff-for-man
BuildRequires: openldap-devel BuildRequires: openldap-devel
BuildRequires: bind-devel BuildRequires: bind-devel
%if %mdkver >= 201100 %if %{mdkver} >= 201100
BuildRequires: systemd-units BuildRequires: systemd-units
%endif %endif
@ -60,11 +57,11 @@ or pump or dhcpxd, which provides the DHCP client daemon, on client machines.
If you want the DHCP server and/or relay, you will also need to install the If you want the DHCP server and/or relay, you will also need to install the
dhcp-server and/or dhcp-relay packages. dhcp-server and/or dhcp-relay packages.
%package common %package common
Summary: The ISC DHCP (Dynamic Host Configuration Protocol) server Summary: The ISC DHCP (Dynamic Host Configuration Protocol) server
Group: System/Servers Group: System/Servers
%description common %description common
DHCP (Dynamic Host Configuration Protocol) is a protocol which allows DHCP (Dynamic Host Configuration Protocol) is a protocol which allows
individual devices on an IP network to get their own network individual devices on an IP network to get their own network
configuration information (IP address, subnetmask, broadcast address, configuration information (IP address, subnetmask, broadcast address,
@ -77,11 +74,11 @@ dhcpxd, which provides the DHCP client daemon, on client machines. If you
want the DHCP server and/or relay, you will also need to install the want the DHCP server and/or relay, you will also need to install the
dhcp-server and/or dhcp-relay packages. dhcp-server and/or dhcp-relay packages.
%package doc %package doc
Summary: Documentation about the ISC DHCP server/client Summary: Documentation about the ISC DHCP server/client
Group: System/Servers Group: System/Servers
%description doc %description doc
This package contains RFC/API/protocol documentation about the ISC This package contains RFC/API/protocol documentation about the ISC
DHCP server and client. DHCP server and client.
@ -92,17 +89,17 @@ etc.) from a DHCP server. The overall purpose of DHCP is to make it
easier to administer a large network. The dhcp package includes the easier to administer a large network. The dhcp package includes the
DHCP server and a DHCP relay agent. DHCP server and a DHCP relay agent.
%package server %package server
Summary: The ISC DHCP (Dynamic Host Configuration Protocol) server Summary: The ISC DHCP (Dynamic Host Configuration Protocol) server
Group: System/Servers Group: System/Servers
Requires: dhcp-common >= %{epoch}:%{version}-%{release} Requires: dhcp-common >= %{EVRD}
Requires(post): rpm-helper Requires(post): rpm-helper
Requires(preun): rpm-helper Requires(preun):rpm-helper
%if %mdkver >= 201100 %if %{mdkver} >= 201100
Requires(post,postun): systemd-units Requires(post,postun): systemd-units
%endif %endif
%description server %description server
DHCP server is the Internet Software Consortium (ISC) DHCP server for various DHCP server is the Internet Software Consortium (ISC) DHCP server for various
UNIX operating systems. It allows a UNIX mac hine to serve DHCP requests from UNIX operating systems. It allows a UNIX mac hine to serve DHCP requests from
the network. the network.
@ -110,12 +107,13 @@ the network.
You should install dhcp-server if you want to set up a DHCP server on your You should install dhcp-server if you want to set up a DHCP server on your
network. You will also need to install the base dhcp package. network. You will also need to install the base dhcp package.
%package client %package client
Summary: The ISC DHCP (Dynamic Host Configuration Protocol) client Summary: The ISC DHCP (Dynamic Host Configuration Protocol) client
Group: System/Servers Group: System/Servers
Requires: dhcp-common >= %{epoch}:%{version}-%{release} Requires: dhcp-common >= %{EVRD}
Provides: dhcp-client-daemon
%description client %description client
DHCP client is the Internet Software Consortium (ISC) DHCP client for various DHCP client is the Internet Software Consortium (ISC) DHCP client for various
UNIX operating systems. It allows a UNIX mac hine to obtain it's networking UNIX operating systems. It allows a UNIX mac hine to obtain it's networking
parameters from a DHCP server. parameters from a DHCP server.
@ -124,39 +122,39 @@ You should install dhcp-client if you want to use the ISC DHCP client instead
of the Red Hat DHCP client, pump, or dhcpcd, or dhcpxd. You will also need to of the Red Hat DHCP client, pump, or dhcpcd, or dhcpxd. You will also need to
install the base dhcp package. install the base dhcp package.
%package relay %package relay
Summary: The ISC DHCP (Dynamic Host Configuration Protocol) relay Summary: The ISC DHCP (Dynamic Host Configuration Protocol) relay
Group: System/Servers Group: System/Servers
Requires: dhcp-common >= %{epoch}:%{version}-%{release} Requires: dhcp-common >= %{EVRD}
Requires(post): rpm-helper Requires(post): rpm-helper
Requires(preun): rpm-helper Requires(preun):rpm-helper
%description relay %description relay
DHCP relay is the Internet Software Consortium (ISC) relay agent for DHCP DHCP relay is the Internet Software Consortium (ISC) relay agent for DHCP
packets. It is used on a subnet with DHCP clients to "relay" their requests packets. It is used on a subnet with DHCP clients to "relay" their requests
to a subnet that has a DHCP server on it. Because DHCP packets can be to a subnet that has a DHCP server on it. Because DHCP packets can be
broadcast, they will not be routed off of the local subnet. The DHCP relay broadcast, they will not be routed off of the local subnet. The DHCP relay
takes care of this for the client. You will need to set the environment takes care of this for the client. You will need to set the environment
variable SERVERS and optionally OPTIONS in /etc/sysconfig/dhcrelay before variable SERVERS and optionally OPTIONS in %{_sysconfdir}/sysconfig/dhcrelay before
starting the server. starting the server.
%package devel %package devel
Summary: Development headers and libraries for the dhcpctl API Summary: Development headers and libraries for the dhcpctl API
Group: Development/Other Group: Development/Other
Requires: dhcp-common >= %{epoch}:%{version}-%{release} Requires: dhcp-common >= %{EVRD}
%description devel %description devel
DHCP devel contains all of the libraries and headers for developing with the DHCP devel contains all of the libraries and headers for developing with the
Internet Software Consortium (ISC) dhcpctl API. Internet Software Consortium (ISC) dhcpctl API.
%prep %prep
%setup -q -n %{name}-%{version}%{?plevel:-%{plevel}} %setup -q -n %{name}-%{version}%{?plevel:-%{plevel}}
%patch100 -p1 -b .ifup %patch100 -p1 -b .ifup
%patch101 -p1 -b .format_not_a_string_literal_and_no_format_arguments %patch101 -p1 -b .format_not_a_string_literal_and_no_format_arguments
%patch102 -p1 -b .prevent_wireless_deassociation %patch102 -p1 -b .prevent_wireless_deassociation
# Handle Xen partial UDP checksums # Handle Xen partial UDP checksums
%patch8 -p1 -b .xen %patch8 -p1 -b .xen
# If the ipv6 kernel module is missing, do not segfault # If the ipv6 kernel module is missing, do not segfault
@ -168,21 +166,27 @@ Internet Software Consortium (ISC) dhcpctl API.
# Ensure 64-bit platforms parse lease file dates & times correctly # Ensure 64-bit platforms parse lease file dates & times correctly
%patch18 -p1 -b .64-bit_lease_parse %patch18 -p1 -b .64-bit_lease_parse
install -m0644 %{SOURCE10} doc # remove empty files
find -size 0 |grep ldap | xargs rm -rf
cp %{SOURCE10} doc
%build %build
%if %mdkver >= 201200 autoreconf -fi
%if %{mdkver} >= 201200
%serverbuild_hardened %serverbuild_hardened
%else %else
%serverbuild %serverbuild
%endif %endif
%configure2_5x --enable-paranoia --enable-early-chroot \ %configure2_5x \
--enable-paranoia \
--enable-early-chroot \
--with-ldapcrypto \ --with-ldapcrypto \
--with-srv-lease-file=%{_var}/lib/dhcp/dhcpd.leases \ --with-srv-lease-file=%{_localstatedir}/lib/dhcp/dhcpd.leases \
--with-srv6-lease-file=%{_var}/lib/dhcp/dhcpd6.leases \ --with-srv6-lease-file=%{_localstatedir}/lib/dhcp/dhcpd6.leases \
--with-cli-lease-file=%{_var}/lib/dhcp/dhclient.leases \ --with-cli-lease-file=%{_localstatedir}/lib/dhcp/dhclient.leases \
--with-cli6-lease-file=%{_var}/lib/dhcp/dhclient6.leases \ --with-cli6-lease-file=%{_localstatedir}/lib/dhcp/dhclient6.leases \
--with-srv-pid-file=%{_var}/run/dhcpd/dhcpd.pid \ --with-srv-pid-file=%{_var}/run/dhcpd/dhcpd.pid \
--with-srv6-pid-file=%{_var}/run/dhcpd/dhcpd6.pid \ --with-srv6-pid-file=%{_var}/run/dhcpd/dhcpd6.pid \
--with-cli-pid-file=%{_var}/run/dhclient.pid \ --with-cli-pid-file=%{_var}/run/dhclient.pid \
@ -192,47 +196,36 @@ install -m0644 %{SOURCE10} doc
%make %make
%install %install
rm -rf %{buildroot}
install -d %{buildroot}%{_bindir}
install -d %{buildroot}%{_sysconfdir}/sysconfig
install -d %{buildroot}%{_initrddir}
install -d %{buildroot}%{_unitdir}/system
install -d %{buildroot}%{_var}/lib/dhcp
install -d %{buildroot}%{_var}/run/dhcpd
%makeinstall_std %makeinstall_std
# Install correct dhclient-script # Install correct dhclient-script
%{__mkdir} -p %{buildroot}/sbin install -p -m755 client/scripts/linux -D %{buildroot}/sbin/dhclient-script
%{__mv} %{buildroot}%{_sbindir}/dhclient %{buildroot}/sbin/dhclient mv %{buildroot}%{_sbindir}/dhclient %{buildroot}/sbin/dhclient
%{__install} -p -m 0755 client/scripts/linux %{buildroot}/sbin/dhclient-script
%if %mdkver >= 201100 install -m644 %{SOURCE12} -D %{buildroot}%{_unitdir}/dhcpd.service
install -m 644 %{SOURCE12} %{buildroot}%{_unitdir}/dhcpd.service install -m644 %{SOURCE14} -D %{buildroot}%{_unitdir}/dhcpd6.service
install -m 644 %{SOURCE14} %{buildroot}%{_unitdir}/dhcpd6.service install -m644 %{SOURCE16} -D %{buildroot}%{_unitdir}/dhcrelay.service
install -m 644 %{SOURCE16} %{buildroot}%{_unitdir}/dhcrelay.service install -m755 %{SOURCE11} -D %{buildroot}%{_initrddir}/dhcpd
%else install -m755 %{SOURCE13} -D %{buildroot}%{_initrddir}/dhcpd6
install -m0755 %{SOURCE11} %{buildroot}%{_initrddir}/dhcpd install -m755 %{SOURCE15} -D %{buildroot}%{_initrddir}/dhcrelay
install -m0755 %{SOURCE13} %{buildroot}%{_initrddir}/dhcpd6
install -m0755 %{SOURCE15} %{buildroot}%{_initrddir}/dhcrelay
%endif
install -m0755 %{SOURCE7} %{SOURCE8} %{buildroot}%{_sbindir}/ install -m755 %{SOURCE7} -D %{buildroot}%{_sbindir}/dhcpreport.pl
install -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/ install -m755 %{SOURCE8} -D %{buildroot}%{_sbindir}/dhcpd-chroot.sh
install -m0755 contrib/ldap/dhcpd-conf-to-ldap %{buildroot}%{_sbindir}/ install -m644 %{SOURCE2} -D %{buildroot}%{_sysconfdir}/dhcpd.conf
install -m755 contrib/ldap/dhcpd-conf-to-ldap -D %{buildroot}%{_sbindir}/dhcpd-conf-to-ldap
# install exit-hooks script to /etc/ # install exit-hooks script to /etc/
install -m0755 %{SOURCE9} %{buildroot}%{_sysconfdir}/ install -m755 %{SOURCE9} -D %{buildroot}%{_sysconfdir}/dhclient-exit-hooks
install -d %{buildroot}%{_sysconfdir}/sysconfig
cat > %{buildroot}%{_sysconfdir}/sysconfig/dhcpd <<EOF cat > %{buildroot}%{_sysconfdir}/sysconfig/dhcpd <<EOF
# You can set here various option for dhcpd # You can set here various option for dhcpd
# Which configuration file to use. # Which configuration file to use.
CONFIGFILE="/etc/dhcpd.conf" CONFIGFILE="%{_sysconfdir}/dhcpd.conf"
# Where to store the lease state information. # Where to store the lease state information.
LEASEFILE="/var/lib/dhcp/dhcpd.leases" LEASEFILE="%{_localstatedir}/lib/dhcp/dhcpd.leases"
# Define INTERFACES to limit which network interfaces dhcpd listens on. # Define INTERFACES to limit which network interfaces dhcpd listens on.
# The default null value causes dhcpd to listen on all interfaces. # The default null value causes dhcpd to listen on all interfaces.
@ -244,8 +237,11 @@ OPTIONS="-q"
EOF EOF
touch %{buildroot}%{_var}/lib/dhcp/dhcpd.leases install -d %{buildroot}%{_localstatedir}/lib/dhcp
touch %{buildroot}%{_var}/lib/dhcp/dhclient.leases install -d %{buildroot}%{_var}/run/dhcpd
touch %{buildroot}%{_localstatedir}/lib/dhcp/dhcpd.leases
touch %{buildroot}%{_localstatedir}/lib/dhcp/dhclient.leases
cat > %{buildroot}%{_sysconfdir}/sysconfig/dhcrelay <<EOF cat > %{buildroot}%{_sysconfdir}/sysconfig/dhcrelay <<EOF
# Define SERVERS with a list of one or more DHCP servers where # Define SERVERS with a list of one or more DHCP servers where
@ -273,8 +269,8 @@ rm -f %{buildroot}%{_sysconfdir}/dhclient.conf
%post server %post server
%_post_service dhcpd %_post_service dhcpd
# New dhcpd lease file # New dhcpd lease file
if [ ! -f %{_var}/lib/dhcp/dhcpd.leases ]; then if [ ! -f %{_localstatedir}/lib/dhcp/dhcpd.leases ]; then
touch %{_var}/lib/dhcp/dhcpd.leases touch %{_localstatedir}/lib/dhcp/dhcpd.leases
fi fi
%preun server %preun server
@ -287,15 +283,15 @@ fi
%_preun_service dhcrelay %_preun_service dhcrelay
%post client %post client
touch /var/lib/dhcp/dhclient.leases touch %{_localstatedir}/lib/dhcp/dhclient.leases
%postun client %postun client
rm -rf /var/lib/dhcp/dhclient.leases rm -rf %{_localstatedir}/lib/dhcp/dhclient.leases
%files common %files common
%doc README contrib/ldap/README.ldap RELNOTES %doc README contrib/ldap/README.ldap RELNOTES
%doc contrib/3.0b1-lease-convert %doc contrib/3.0b1-lease-convert
%dir %{_var}/lib/dhcp %dir %{_localstatedir}/lib/dhcp
%{_mandir}/man5/dhcp-options.5* %{_mandir}/man5/dhcp-options.5*
%files doc %files doc
@ -303,19 +299,14 @@ rm -rf /var/lib/dhcp/dhclient.leases
%files server %files server
%doc server/dhcpd.conf tests/failover contrib/ldap/dhcp.schema %doc server/dhcpd.conf tests/failover contrib/ldap/dhcp.schema
%if %mdkver >= 201100
%{_unitdir}/dhcpd.service %{_unitdir}/dhcpd.service
%{_unitdir}/dhcpd6.service %{_unitdir}/dhcpd6.service
%else
%{_initrddir}/dhcpd %{_initrddir}/dhcpd
%{_initrddir}/dhcpd6 %{_initrddir}/dhcpd6
%endif
%config(noreplace) %{_sysconfdir}/dhcpd.conf %config(noreplace) %{_sysconfdir}/dhcpd.conf
%config(noreplace) %{_sysconfdir}/dhclient-exit-hooks %config(noreplace) %{_sysconfdir}/dhclient-exit-hooks
%config(noreplace) %{_sysconfdir}/sysconfig/dhcpd %config(noreplace) %{_sysconfdir}/sysconfig/dhcpd
%config(noreplace) %ghost %{_var}/lib/dhcp/dhcpd.leases %config(noreplace) %ghost %{_localstatedir}/lib/dhcp/dhcpd.leases
%{_sbindir}/dhcpd %{_sbindir}/dhcpd
%{_sbindir}/dhcpreport.pl %{_sbindir}/dhcpreport.pl
%{_sbindir}/dhcpd-conf-to-ldap %{_sbindir}/dhcpd-conf-to-ldap
@ -329,12 +320,8 @@ rm -rf /var/lib/dhcp/dhclient.leases
%dir %{_var}/run/dhcpd %dir %{_var}/run/dhcpd
%files relay %files relay
%if %mdkver >= 201100
%{_unitdir}/dhcrelay.service %{_unitdir}/dhcrelay.service
%else
%{_initrddir}/dhcrelay %{_initrddir}/dhcrelay
%endif
%config(noreplace) %{_sysconfdir}/sysconfig/dhcrelay %config(noreplace) %{_sysconfdir}/sysconfig/dhcrelay
%{_sbindir}/dhcrelay %{_sbindir}/dhcrelay
@ -342,7 +329,7 @@ rm -rf /var/lib/dhcp/dhclient.leases
%files client %files client
%doc client/dhclient.conf %doc client/dhclient.conf
%config(noreplace) %ghost %{_var}/lib/dhcp/dhclient.leases %config(noreplace) %ghost %{_localstatedir}/lib/dhcp/dhclient.leases
%attr (0755,root,root) /sbin/dhclient-script %attr (0755,root,root) /sbin/dhclient-script
/sbin/dhclient /sbin/dhclient
%{_mandir}/man5/dhclient.conf.5* %{_mandir}/man5/dhclient.conf.5*
@ -357,6 +344,20 @@ rm -rf /var/lib/dhcp/dhclient.leases
%changelog %changelog
* Fri Jul 27 2012 Oden Eriksson <oeriksson@mandriva.com> 3:4.2.4-0.P1.1
+ Revision: 811205
- fix build
- 4.2.4-P1
* Mon May 28 2012 Per Øyvind Karlsen <peroyvind@mandriva.org> 3:4.2.3-1.P2.3
+ Revision: 800879
- untill we've decided to sys v init compatibility completely, install init
scripts in parallel with systemd services
- really clean up..
- clean out some junk
- use %%{EVRD} macro
- provide 'dhcp-client-daemon'
* Sun Jan 15 2012 Tomasz Pawel Gajc <tpg@mandriva.org> 3:4.2.3-1.P2.2 * Sun Jan 15 2012 Tomasz Pawel Gajc <tpg@mandriva.org> 3:4.2.3-1.P2.2
+ Revision: 761630 + Revision: 761630
- adjust spec file and services file for systemd - adjust spec file and services file for systemd
@ -537,146 +538,3 @@ rm -rf /var/lib/dhcp/dhclient.leases
+ Revision: 48227 + Revision: 48227
- use serverbuild macro (-fstack-protector-all) - use serverbuild macro (-fstack-protector-all)
* Wed Mar 28 2007 Olivier Blin <oblin@mandriva.com> 3.0.5-7mdv2007.1
+ Revision: 149230
- dhcpcd should start ldap (Daggett)
* Fri Mar 16 2007 Olivier Blin <oblin@mandriva.com> 2:3.0.5-6mdv2007.1
+ Revision: 144641
- drop useless perl(Win32API::Registry) requires exception
- move RFC/API/protocol doc in a dhcp-doc sub-package
* Sat Mar 10 2007 Olivier Blin <oblin@mandriva.com> 2:3.0.5-5mdv2007.1
+ Revision: 140432
- PEERGATEWAY support (#20806)
* Sat Mar 10 2007 Olivier Blin <oblin@mandriva.com> 2:3.0.5-4mdv2007.1
+ Revision: 140295
- default to NEEDHOSTNAME=no, as described in initscripts documentation
* Thu Jan 11 2007 Olivier Blin <oblin@mandriva.com> 2:3.0.5-3mdv2007.1
+ Revision: 107599
- make dhclient-script set DEVICE variable when no ifcfg file is present (to call resolvconf correctly)
* Tue Jan 02 2007 Olivier Blin <oblin@mandriva.com> 2:3.0.5-2mdv2007.1
+ Revision: 103318
- bump release
- do not call unknown /sbin/update-resolvrdv in dhclient-script
- set metric before creating resolv.conf (useful for resolvconf)
* Thu Nov 16 2006 Guillaume Rousse <guillomovitch@mandriva.org> 2:3.0.5-1mdv2007.1
+ Revision: 84730
- new version
install configuration file under real name, not as sample
* Fri Sep 01 2006 Olivier Blin <oblin@mandriva.com> 2:3.0.4-2mdv2007.0
+ Revision: 59227
- add METRIC support in dhclient-script (from Fabrice Facorat, #23164)
- bunzip sources and patches
- Import dhcp
* Mon May 22 2006 Oden Eriksson <oeriksson@mandriva.com> 3.0.4-1mdk
- 3.0.4
- added new rediffed ldap patch (P1)
* Mon Feb 06 2006 Olivier Blin <oblin@mandriva.com> 3.0.4-0.b2.8mdk
- use $'\n' in dhclient-script (required for initscripts >= 7.66,
since change_resolv_conf doesn't use "echo -e" anymore)
* Mon Jan 09 2006 Olivier Blin <oblin@mandriva.com> 3.0.4-0.b2.7mdk
- fix requires post and preun
- fix typo in initscript
* Mon Jan 09 2006 Olivier Blin <oblin@mandriva.com> 3.0.4-0.b2.6mdk
- convert parallel init to LSB
* Mon Jan 02 2006 Olivier Blin <oblin@mandriva.com> 3.0.4-0.b2.5mdk
- parallel init support
* Tue Dec 06 2005 Frederic Lepied <flepied@mandriva.com> 3.0.4-0.b2.4mdk
- use change_resolv_conf in dhclient-scripts to be able to do the right
thing wrt nscd.
* Tue Nov 29 2005 Thierry Vignaud <tvignaud@mandriva.com> 3.0.4-0.b2.3mdk
- fix build on x86_64
* Thu Nov 24 2005 Oden Eriksson <oeriksson@mandriva.com> 3.0.4-0.b2.2mdk
- exclude debug files in the -devel package, temporary solution
* Mon Nov 14 2005 Oden Eriksson <oeriksson@mandriva.com> 3.0.4-0.b2.1mdk
- 3.0.4b2
- pass "-DLDAP_DEPRECATED" to the CFLAGS
- updated rediffed P1 (dhcp-3.0.3-ldap-patch)
- fix the chroot script so it won't touch the /etc/dhcpd.conf file
* Wed Aug 31 2005 Oden Eriksson <oeriksson@mandriva.com> 3.0.3-3mdk
- rebuilt against new openldap-2.3.6 libs
* Sat Aug 06 2005 Michael Scherer <misc@mandriva.org> 3.0.3-2mdk
- fill a default config file
* Mon Aug 01 2005 Oden Eriksson <oeriksson@mandriva.com> 3.0.3-1mdk
- 3.0.3
- fix deps
- drop the gcc343 patch (P3), it's fixed upstream
- use the %%mkrel macro
* Sat Apr 23 2005 Olivier Blin <oblin@mandriva.com> 3.0.2-2mdk
- do not make dhclient-script fail and return DENY return code when no
config file for the interface is found (update and re-indent Patch0)
* Thu Feb 24 2005 Oden Eriksson <oeriksson@mandrakesoft.com> 3.0.2-1mdk
- 3.0.2
* Fri Feb 04 2005 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.1-9mdk
- rebuild for ldap2.2_7
* Wed Feb 02 2005 Frederic Lepied <flepied@mandrakesoft.com> 3.0.1-8mdk
- back to standard 60 seconds timeout.
* Wed Feb 02 2005 Frederic Lepied <flepied@mandrakesoft.com> 3.0.1-7mdk
- default timeout to 5 seconds
* Fri Dec 24 2004 Oden Eriksson <oeriksson@mandrakesoft.com> 3.0.1-6mdk
- new ldap patch
- renumber sources and patches
- bzip sources
- added P2 that allows us to run it chroot
- added S8 that makes it easier to chroot the server
- fixed S3 to make use of P2 & S8
- fix pid file location for the dhcpd daemon
- added P3 to make it build with latest cooker gcc (rock linux)
- misc spec file fixes
* Sat Jul 31 2004 Frederic Lepied <flepied@mandrakesoft.com> 3.0.1-5mdk
- by default hostname is set
* Sat Jul 31 2004 Frederic Lepied <flepied@mandrakesoft.com> 3.0.1-4mdk
- assign default gateway by interface (updated patch1)
* Fri Jul 30 2004 Frederic Lepied <flepied@mandrakesoft.com> 3.0.1-3mdk
- only change the hostname if NEEDHOSTNAME=yes (updated patch1)
* Thu Jul 29 2004 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.1-2mdk
- update ldap patch
* Thu Jul 29 2004 Per Øyvind Karlsen <peroyvind@linux-mandrake.com> 3.0.1-1mdk
- 3.0.1
* Thu Jul 01 2004 Florin <florin@mandrakesoft.com> 3.0-1.rc14.2mdk
- bring back the ldap patch and buildrequires
* Tue Jun 29 2004 Florin <florin@mandrakesoft.com> 3.0-1.rc14.1mdk
- rebuild for cooker
* Tue Jun 22 2004 Vincent Danen <vdanen@mandrakesoft.com> 3.0-1.rc14.0.1.100mdk
- 3.0.1rc14
- security fixes for CAN-2004-0460 (VU#317350) and CAN-2004-0461 (VU#654390)
* Wed May 05 2004 Per Øyvind Karlsen <peroyvind@linux-mandrake.com> 3.0-1.rc13.6mdk
- fix buildrequires
* Sat Apr 24 2004 Florin <florin@mandrakesoft.com> 3.0-1.rc13.5mdk
- add the dhcp-ldap support