diff --git a/dhcp.spec b/dhcp.spec index cc5bdb7..a7c8563 100644 --- a/dhcp.spec +++ b/dhcp.spec @@ -29,18 +29,24 @@ Source19: dhcrelay.tmpfiles # sysusers.d(5) (systemd-sysusers) Source20: isc-dhcpd.conf Source21: isc-dhcp-client.conf +# Per-interface dhclient service from Arch Linux (modified) Source22: dhclient@.service Source100: ROSA-NEWS Patch17: dhcp-4.2.0-add_timeout_when_NULL.patch Patch18: dhcp-4.3.0-64_bit_lease_parse.patch Patch19: Arch-0002-iproute2.patch -BuildRequires: bind-devel + +# Starting from dhcp 4.x built in Bind libs are used +#BuildRequires: bind-devel BuildRequires: groff-base BuildRequires: groff-for-man BuildRequires: libtool BuildRequires: openldap-devel BuildRequires: systemd-units +# --with-ldap-gssapi +BuildRequires: pkconfig(krb5-gssapi) +BuildRequires: pkgconfig(libcap-ng) Requires(post,preun): rpm-helper %description @@ -163,9 +169,6 @@ pushd bind ; tar -xvf bind.tar.gz >/dev/null ; popd %build %serverbuild_hardened -##/bin/cp configure.ac+lt configure.ac -#%autoreconf -##autoreconf -ifv %configure2_5x \ --with-srv-lease-file=%{var_dhcpd}/dhcpd.leases \ --with-srv6-lease-file=%{var_dhcpd}/dhcpd6.leases \ @@ -178,7 +181,9 @@ pushd bind ; tar -xvf bind.tar.gz >/dev/null ; popd --with-relay-pid-file=/run/dhcrelay/dhcrelay.pid \ --enable-paranoia \ --enable-early-chroot \ - --with-ldapcrypto + --with-ldap \ + --with-ldapcrypto \ + --with-ldap-gssapi make %install @@ -306,11 +311,11 @@ EOF %_preun_service dhcrelay %post client -#touch %{var_dhclient}/dhclient.leases # migrate from root:root as it was before ROSA package v4.4.1 # create this directory if it does not esist and then chmod it to allow dhcpd to work properly %sysusers_create isc-dhcp-client.conf [ ! -d %{var_dhclient}/ ] && mkdir -p %{var_dhclient}/ +touch %{var_dhclient}/dhclient.leases || true [ -d %{var_dhclient} ] && chown -R isc-dhcp-client:isc-dhcp-client %{var_dhclient}/ %tmpfiles_create dhclient.conf