mirror of
https://abf.rosa.ru/djam/dhcp.git
synced 2025-02-23 13:32:48 +00:00
Continue changes: it builds
This commit is contained in:
Mikhail Novosyolov
parent
fa84235961
commit
643b60520d
1 changed files with 18 additions and 35 deletions
53
dhcp.spec
53
dhcp.spec
|
|
@ -12,7 +12,7 @@ License: Distributable
|
|||
Group: System/Servers
|
||||
URL: http://www.isc.org/software/dhcp
|
||||
Source0: ftp://ftp.isc.org/isc/%{name}/%{major_version}%{patch_version}/%{name}-%{major_version}%{patch_version}.tar.gz
|
||||
Source1: ftp://ftp.isc.org/isc/%{name}/%{major_version}%{patch_version}/%{name}-%{major_version}%{patch_version}.tar.gz.sha512.asc
|
||||
#Source1: ftp://ftp.isc.org/isc/%{name}/%{major_version}%{patch_version}/%{name}-%{major_version}%{patch_version}.tar.gz.sha512.asc
|
||||
Source2: dhcpd.conf
|
||||
Source4: dhcp-dynamic-dns-examples.tar.bz2
|
||||
Source7: dhcpreport.pl
|
||||
|
|
@ -32,16 +32,6 @@ Source21: isc-dhcp-client.conf
|
|||
Source22: dhclient@.service
|
||||
Source100: ROSA-NEWS
|
||||
|
||||
# mageia patches
|
||||
Patch100: dhcp-4.2.2-ifup.patch
|
||||
#Patch101: dhcp-4.2.2-fix-format-errors.patch # I see it applied in the source already
|
||||
# prevents needless deassociation, working around mdv bug #43441
|
||||
Patch102: dhcp-4.1.1-prevent_wireless_deassociation.patch
|
||||
Patch103: dhcp-4.2.5-P1-man.patch
|
||||
# fedora patches
|
||||
Patch7: dhcp-4.2.0-default-requested-options.patch
|
||||
#Patch8: dhcp-4.2.2-xen-checksum.patch # fixed in upstream since 4.3.2
|
||||
Patch15: dhcp-4.2.2-missing-ipv6-not-fatal.patch
|
||||
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
|
||||
|
|
@ -159,36 +149,24 @@ BuildArch: noarch
|
|||
Requires(pre): openldap-config
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{major_version}%{patch_version}
|
||||
%patch100 -p1 -b .ifup
|
||||
#patch101 -p1 -b .format_not_a_string_literal_and_no_format_arguments
|
||||
%patch102 -p1 -b .prevent_wireless_deassociation
|
||||
%patch103 -p1 -b .man
|
||||
#%setup -q -n %{name}-%{major_version}%{patch_version}
|
||||
%setup
|
||||
pushd bind ; tar -xvf bind.tar.gz >/dev/null ; popd
|
||||
|
||||
# Add NIS domain, NIS servers, NTP servers, interface-mtu and domain-search
|
||||
# to the list of default requested DHCP options
|
||||
%patch7 -p1 -b .requested
|
||||
# Handle Xen partial UDP checksums
|
||||
#patch8 -p1 -b .xen
|
||||
# If the ipv6 kernel module is missing, do not segfault
|
||||
# (Submitted to dhcp-bugs@isc.org - [ISC-Bugs #19367])
|
||||
%patch15 -p1 -b .noipv6
|
||||
# Handle cases in add_timeout() where the function is called with a NULL
|
||||
# value for the 'when' parameter
|
||||
%patch17 -p1 -b .dracut
|
||||
# Ensure 64-bit platforms parse lease file dates & times correctly
|
||||
%patch18 -p1 -b .64-bit_lease_parse
|
||||
|
||||
# change ipconfig to modern ip (from Arch)
|
||||
%patch19 -p1
|
||||
|
||||
install -m0644 %{SOURCE10} doc
|
||||
|
||||
%build
|
||||
%serverbuild_hardened
|
||||
##/bin/cp configure.ac+lt configure.ac
|
||||
#%autoreconf
|
||||
##autoreconf -ifv
|
||||
%configure2_5x \
|
||||
--enable-paranoia \
|
||||
--enable-early-chroot \
|
||||
--with-ldapcrypto \
|
||||
--with-srv-lease-file=%{var_dhcpd}/dhcpd.leases \
|
||||
--with-srv6-lease-file=%{var_dhcpd}/dhcpd6.leases \
|
||||
--with-cli-lease-file=%{var_dhclient}/dhclient.leases \
|
||||
|
|
@ -198,13 +176,16 @@ install -m0644 %{SOURCE10} doc
|
|||
--with-cli-pid-file=/run/dhclient/dhclient.pid \
|
||||
--with-cli6-pid-file=/run/dhclient/dhclient6.pid \
|
||||
--with-relay-pid-file=/run/dhcrelay/dhcrelay.pid \
|
||||
--disable-static
|
||||
%make
|
||||
--enable-paranoia \
|
||||
--enable-early-chroot \
|
||||
--with-ldapcrypto
|
||||
make
|
||||
|
||||
%install
|
||||
|
||||
%makeinstall_std
|
||||
|
||||
install -m0644 %{SOURCE10} doc
|
||||
# Install correct dhclient-script
|
||||
install -d %{buildroot}/sbin
|
||||
mv %{buildroot}%{_sbindir}/dhclient %{buildroot}/sbin/dhclient
|
||||
|
|
@ -250,12 +231,12 @@ cat > %{buildroot}%{_sysconfdir}/sysconfig/dhcpd <<EOF
|
|||
OPTIONS="-q"
|
||||
EOF
|
||||
|
||||
cat %{buildroot}%{_sysconfdir}/sysconfig | sed 's,dhcpd,dhcpd6,g' > %{buildroot}%{_sysconfdir}/sysconfig6
|
||||
cat %{buildroot}%{_sysconfdir}/sysconfig | sed 's,dhcpd,dhcpd6,g' > %{buildroot}%{_sysconfdir}/sysconfig/dhcpd6
|
||||
|
||||
install -d %{buildroot}%{var_dhcpd}
|
||||
#touch %{buildroot}%{var_dhcpd}/dhcpd.leases
|
||||
touch %{buildroot}%{var_dhcpd}/dhcpd.leases
|
||||
install -d %{buildroot}%{var_dhclient}
|
||||
#touch %{buildroot}%{var_dhclient}/dhclient.leases
|
||||
touch %{buildroot}%{var_dhclient}/dhclient.leases
|
||||
|
||||
cat > %{buildroot}%{_sysconfdir}/sysconfig/dhcrelay <<EOF
|
||||
# Define SERVERS with a list of one or more DHCP servers where
|
||||
|
|
@ -370,6 +351,7 @@ rm -rf %{var_dhclient}/dhclient.leases
|
|||
%{_mandir}/man8/dhcpd.8*
|
||||
%dir %{var_dhcpd}
|
||||
%config(noreplace) %ghost %{var_dhcpd}/dhcpd.leases
|
||||
%config %{_sysusersdir}/isc-dhcpd.conf
|
||||
|
||||
%files relay
|
||||
%{_unitdir}/dhcrelay.service
|
||||
|
|
@ -390,6 +372,7 @@ rm -rf %{var_dhclient}/dhclient.leases
|
|||
%{_mandir}/man8/dhclient-script.8*
|
||||
%dir %{var_dhclient}
|
||||
%config(noreplace) %ghost %{var_dhclient}/dhclient.leases
|
||||
%config %{_sysusersdir}/isc-dhcp-client.conf
|
||||
|
||||
%files devel
|
||||
%{_includedir}/*
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue