rpms/dhcp
7
0
Fork 0
Code Issues Pull Requests Releases Activity

fix bugs 147375 147502 146600 146524 147739

Browse Source
This commit is contained in:
jvdias 2005-02-11 01:08:07 +00:00
parent 0fb8215b80
commit 0684c91532
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dhcp.spec
View File

@ -1,9 +1,9 @@
Summary: A DHCP (Dynamic Host Configuration Protocol) server and relay agent. Summary: A DHCP (Dynamic Host Configuration Protocol) server and relay agent.
Name: dhcp Name: dhcp
Version: 3.0.2rc3 Version: 3.0.2rc3
Release: 2 Release: 3
Epoch: 8 Epoch: 8
Copyright: distributable License: distributable
Group: System Environment/Daemons Group: System Environment/Daemons
Source0: ftp://ftp.isc.org/isc/dhcp/dhcp-%{version}.tar.gz Source0: ftp://ftp.isc.org/isc/dhcp/dhcp-%{version}.tar.gz
Source1: dhcpd.conf.sample Source1: dhcpd.conf.sample
@ -35,6 +35,8 @@ Patch129: dhcp-3.0.1-fix-ntp.patch
Patch130: dhcp-3.0.1-release-mode-ifup.patch Patch130: dhcp-3.0.1-release-mode-ifup.patch
Patch131: dhcp-3.0.1-dhclient-script-big-fix.patch Patch131: dhcp-3.0.1-dhclient-script-big-fix.patch
Patch132: dhcp-3.0.2rc3-fix-hex.patch Patch132: dhcp-3.0.2rc3-fix-hex.patch
Patch133: dhcp-3.0.2rc3-mem.patch
Patch134: dhcp-3.0.2rc3-dhclient_routes.patch
URL: http://isc.org/products/DHCP/ URL: http://isc.org/products/DHCP/
BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRoot: %{_tmppath}/%{name}-%{version}-root
@ -113,6 +115,8 @@ Libraries for interfacing with the ISC DHCP server.
%patch130 -p1 -b .release-mode-ifup %patch130 -p1 -b .release-mode-ifup
%patch131 -p1 -b .dhclient-script-big-fix %patch131 -p1 -b .dhclient-script-big-fix
%patch132 -p1 -b .fix-hex %patch132 -p1 -b .fix-hex
%patch133 -p1 -b .mem
%patch134 -p1 -b .dhclient_routes
cp %SOURCE1 . cp %SOURCE1 .
cat <<EOF >site.conf cat <<EOF >site.conf
@ -136,13 +140,14 @@ int main(void) { printf("%%d\n", sizeof(void *)); return 0; }
EOF EOF
cc -o findptrsize findptrsize.c cc -o findptrsize findptrsize.c
[ "`./findptrsize`" -ge 8 ] && RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DPTRSIZE_64BIT" [ "`./findptrsize`" -ge 8 ] && RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DPTRSIZE_64BIT"
%ifarch s390 s390x #%ifarch s390 s390x
RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIE" #RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIE"
%else #%else
RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fpie" #RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fpie"
%endif #%endif
#RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's/\ \-mtune\=[^\=\ ]*//'` #RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's/\ \-mtune\=[^\=\ ]*//'`
./configure --copts "$RPM_OPT_FLAGS" ./configure --copts "$RPM_OPT_FLAGS"
# -DDEBUG_MEMORY_LEAKAGE -DDEBUG_MALLOC_POOL -DDEBUG_REFCNT_DMALLOC_FREE -DDEBUG_RC_HISTORY -DDEBUG_MALLOC_POOL_EXHAUSTIVELY -DDEBUG_MEMORY_LEAKAGE_ON_EXIT -DRC_MALLOC=3"
#make %{?_smp_mflags} CC="gcc33" #make %{?_smp_mflags} CC="gcc33"
make %{?_smp_mflags} CC="cc" make %{?_smp_mflags} CC="cc"
@ -173,9 +178,11 @@ EOF
# Copy sample dhclient.conf file into position # Copy sample dhclient.conf file into position
cp client/dhclient.conf dhclient.conf.sample cp client/dhclient.conf dhclient.conf.sample
chmod 755 %{buildroot}/sbin/dhclient-script chmod 755 %{buildroot}/sbin/dhclient-script
touch debugfiles.list
:;
%clean %clean
rm -rf %{buildroot} #rm -rf %{buildroot}
%post %post
/sbin/chkconfig --add dhcpd /sbin/chkconfig --add dhcpd
@ -233,6 +240,13 @@ fi
%{_mandir}/man3/* %{_mandir}/man3/*
%changelog %changelog
* Thu Feb 10 2005 Jason Vas Dias <jvdias@redhat.com> 8.3.0.4rc3-3
- fix bug 147375: dhcpd heap corruption on 32-bit 'subnet' masks
- fix bug 147502: dhclient should honor GATEWAYDEV and GATEWAY settings
- fix bug 146600: dhclient's timeout mode ping should use -I
- fix bug 146524: dhcpd.init should discard dhcpd's initial output message
- fix bug 147739: dhcpd.init configtest should honor -cf in DHCPDARGS
* Mon Jan 24 2005 Jason Vas Dias <jvdias@redhat.com> 8:3.0.2rc3-2 * Mon Jan 24 2005 Jason Vas Dias <jvdias@redhat.com> 8:3.0.2rc3-2
- fix bug 145997: allow hex 32-bit integers in user specified options - fix bug 145997: allow hex 32-bit integers in user specified options