diff --git a/.abf.yml b/.abf.yml index d604231..6be5bd3 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,9 +1,9 @@ removed_sources: dhcp-4.2.5.tar.gz: d029505509aee83ea28972d5d1c95dc4b5db99f1 -sources: dhcp-4.2.5-P1.tar.gz: 120b6e476b2ac0d35e1dc8dee53752c42449b925 dhcp-4.2.5-P1.tar.gz.sha512.asc: d43248ba82d8a2f393f2f6c283ea06fb2df38d18 dhcp-4.2.5.tar.gz.sha512.asc: ac49b30ef17acb36cc5603faa5d780e423aa0e06 +sources: dhcp-4.3.0.tar.gz: deed72a4636461042b74de68c2825dc52623e1d1 dhcp-4.3.0.tar.gz.sha512.asc: e05375f86430f0d92a371fe8f619aa73e65de19a dhcp-dynamic-dns-examples.tar.bz2: d33980aad3e0380fc89f8346ab37786d39157696 diff --git a/dhcp.spec.diff b/dhcp.spec.diff deleted file mode 100644 index dbcac4b..0000000 --- a/dhcp.spec.diff +++ /dev/null @@ -1,8 +0,0 @@ - -< BuildRequires: libtool -< BuildRequires: groff-base -< BuildRequires: systemd-units -< BuildRequires: bind-devel ---- -> BuildRequires: groff-for-man -50a41,42 diff --git a/dhcp.spec.old b/dhcp.spec.old deleted file mode 100644 index 899937e..0000000 --- a/dhcp.spec.old +++ /dev/null @@ -1,342 +0,0 @@ -%define plevel P1 - -Summary: The ISC DHCP (Dynamic Host Configuration Protocol) server/relay agent/client -Name: dhcp -Epoch: 3 -Version: 4.2.5 -Release: 0.%{?plevel:%{plevel}}.5 -License: Distributable -Group: System/Servers -Url: http://www.isc.org/software/dhcp -Source0: ftp://ftp.isc.org/isc/%{name}/%{version}-%{?plevel:%{plevel}}/%{name}-%{version}%{?plevel:-%{plevel}}.tar.gz -Source1: ftp://ftp.isc.org/isc/%{name}/%{version}-%{?plevel:%{plevel}}/%{name}-%{version}%{?plevel:-%{plevel}}.tar.gz.sha512.asc -Source2: dhcpd.conf -Source4: dhcp-dynamic-dns-examples.tar.bz2 -Source7: dhcpreport.pl -Source8: dhcpd-chroot.sh -# (eugeni) dhclient-exit-hooks script -Source9: dhclient-exit-hooks -Source10: draft-ietf-dhc-ldap-schema-01.txt -Source11: dhcpd.init -Source12: dhcpd.service -Source13: dhcpd6.init -Source14: dhcpd6.service -Source15: dhcrelay.init -Source16: dhcrelay.service -Source17: dhcpd.tmpfiles -Source18: dhclient.tmpfiles -Source19: dhcrelay.tmpfiles -# mageia patches -Patch100: dhcp-4.2.2-ifup.patch -Patch101: dhcp-4.2.2-fix-format-errors.patch -# prevents needless deassociation, working around mdv bug #43441 -Patch102: dhcp-4.1.1-prevent_wireless_deassociation.patch -# fedora patches -# Handle Xen partial UDP checksums -Patch8: dhcp-4.2.2-xen-checksum.patch -# If the ipv6 kernel module is missing, do not segfault -# (Submitted to dhcp-bugs@isc.org - [ISC-Bugs #19367]) -Patch15: dhcp-4.2.2-missing-ipv6-not-fatal.patch -# Handle cases in add_timeout() where the function is called with a NULL -# value for the 'when' parameter -Patch17: dhcp-4.2.0-add_timeout_when_NULL.patch -# Ensure 64-bit platforms parse lease file dates & times correctly -Patch18: dhcp-4.2.4-64_bit_lease_parse.patch - -BuildRequires: libtool -BuildRequires: groff-base -BuildRequires: systemd-units -BuildRequires: bind-devel -BuildRequires: openldap-devel - -%description -DHCP (Dynamic Host Configuration Protocol) is a protocol which allows -individual devices on an IP network to get their own network configuration -information (IP address, subnetmask, broadcast address, 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 DHCP server and a DHCP relay -agent. You will also need to install the dhcp-client or dhcpcd package, -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 -dhcp-server and/or dhcp-relay packages. - -%package common -Summary: The ISC DHCP (Dynamic Host Configuration Protocol) server -Group: System/Servers - -%description common -DHCP (Dynamic Host Configuration Protocol) is a protocol which allows -individual devices on an IP network to get their own network -configuration information (IP address, subnetmask, broadcast address, -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 -DHCP server and a DHCP relay agent. - -You will also need to install the dhcp-client or dhcpcd package, 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 -dhcp-server and/or dhcp-relay packages. - -%package doc -Summary: Documentation about the ISC DHCP server/client -Group: System/Servers - -%description doc -This package contains RFC/API/protocol documentation about the ISC -DHCP server and client. - -DHCP (Dynamic Host Configuration Protocol) is a protocol which allows -individual devices on an IP network to get their own network -configuration information (IP address, subnetmask, broadcast address, -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 -DHCP server and a DHCP relay agent. - -%package server -Summary: The ISC DHCP (Dynamic Host Configuration Protocol) server -Group: System/Servers -Requires: dhcp-common >= %{EVRD} -Requires(post,preun): rpm-helper -Requires(post,postun): systemd-units - -%description server -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 -the network. - -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. - -%package client -Summary: The ISC DHCP (Dynamic Host Configuration Protocol) client -Group: System/Servers -Requires: dhcp-common >= %{EVRD} -Provides: dhcp-client-daemon - -%description client -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 -parameters from a DHCP server. - -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 -install the base dhcp package. - -%package relay -Summary: The ISC DHCP (Dynamic Host Configuration Protocol) relay -Group: System/Servers -Requires: dhcp-common >= %{EVRD} -Requires(post,preun): rpm-helper - -%description relay -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 -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 -takes care of this for the client. You will need to set the environment -variable SERVERS and optionally OPTIONS in %{_sysconfdir}/sysconfig/dhcrelay before -starting the server. - -%package devel -Summary: Development headers and libraries for the dhcpctl API -Group: Development/Other -Requires: dhcp-common >= %{EVRD} - -%description devel -DHCP devel contains all of the libraries and headers for developing with the -Internet Software Consortium (ISC) dhcpctl API. - -%prep -%setup -qn %{name}-%{version}%{?plevel:-%{plevel}} -%apply_patches -autoreconf -fi - -# remove empty files -find -size 0 |grep ldap | xargs rm -rf - -cp %{SOURCE10} doc - -%build -%serverbuild_hardened -%configure2_5x \ - --enable-paranoia \ - --enable-early-chroot \ - --with-ldapcrypto \ - --with-srv-lease-file=%{_localstatedir}/lib/dhcp/dhcpd.leases \ - --with-srv6-lease-file=%{_localstatedir}/lib/dhcp/dhcpd6.leases \ - --with-cli-lease-file=%{_localstatedir}/lib/dhcp/dhclient.leases \ - --with-cli6-lease-file=%{_localstatedir}/lib/dhcp/dhclient6.leases \ - --with-srv-pid-file=%{_var}/run/dhcpd/dhcpd.pid \ - --with-srv6-pid-file=%{_var}/run/dhcpd/dhcpd6.pid \ - --with-cli-pid-file=%{_var}/run/dhclient.pid \ - --with-cli6-pid-file=%{_var}/run/dhclient6.pid \ - --with-relay-pid-file=%{_var}/run/dhcrelay.pid - -%make - -%install -%makeinstall_std - -# Install correct dhclient-script -install -p -m755 client/scripts/linux -D %{buildroot}/sbin/dhclient-script -mv %{buildroot}%{_sbindir}/dhclient %{buildroot}/sbin/dhclient - -install -m644 %{SOURCE12} -D %{buildroot}%{_unitdir}/dhcpd.service -install -m644 %{SOURCE14} -D %{buildroot}%{_unitdir}/dhcpd6.service -install -m644 %{SOURCE16} -D %{buildroot}%{_unitdir}/dhcrelay.service - -install -D -p -m 644 %{SOURCE17} %{buildroot}%{_prefix}/lib/tmpfiles.d/dhcpd.conf -install -D -p -m 644 %{SOURCE18} %{buildroot}%{_prefix}/lib/tmpfiles.d/dhclient.conf -install -D -p -m 644 %{SOURCE19} %{buildroot}%{_prefix}/lib/tmpfiles.d/dhcrelay.conf - -install -m755 %{SOURCE11} -D %{buildroot}%{_initrddir}/dhcpd -install -m755 %{SOURCE13} -D %{buildroot}%{_initrddir}/dhcpd6 -install -m755 %{SOURCE15} -D %{buildroot}%{_initrddir}/dhcrelay - -install -m755 %{SOURCE7} -D %{buildroot}%{_sbindir}/dhcpreport.pl -install -m755 %{SOURCE8} -D %{buildroot}%{_sbindir}/dhcpd-chroot.sh -install -m644 %{SOURCE2} -D %{buildroot}%{_sysconfdir}/dhcpd.conf -install -m755 contrib/ldap/dhcpd-conf-to-ldap -D %{buildroot}%{_sbindir}/dhcpd-conf-to-ldap - -install -d %{buildroot}%{_var}/lib/dhclient -touch %{buildroot}%{_var}/lib/dhclient/dhclient.leases - -# install exit-hooks script to /etc/ -install -m755 %{SOURCE9} -D %{buildroot}%{_sysconfdir}/dhclient-exit-hooks - -install -d %{buildroot}%{_sysconfdir}/sysconfig -cat > %{buildroot}%{_sysconfdir}/sysconfig/dhcpd < %{buildroot}%{_sysconfdir}/sysconfig/dhcrelay <