rpms/dhcp/devel dhcp-3.0.5-libdhcp4client.patch, 1.3, 1.4 dhcp.spec, 1.124, 1.125
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Nov 14 21:04:48 UTC 2006
Author: dcantrel
Update of /cvs/dist/rpms/dhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4509
Modified Files:
dhcp-3.0.5-libdhcp4client.patch dhcp.spec
Log Message:
- Do not link res_query.o in to libdhcp4client (#215501)
dhcp-3.0.5-libdhcp4client.patch:
Makefile.dist | 2
client/dhclient.c | 311 +++++++++++++++++++++++++++++++++------
common/alloc.c | 16 --
common/discover.c | 26 +--
common/lpf.c | 4
configure | 2
dst/hmac_link.c | 32 +++-
libdhcp4client/Makefile.dist | 104 +++++++++++++
libdhcp4client/dhcp4client.h | 24 +++
libdhcp4client/libdhcp_control.h | 102 ++++++++++++
omapip/alloc.c | 43 +++++
omapip/dispatch.c | 2
omapip/errwarn.c | 50 +++++-
13 files changed, 638 insertions(+), 80 deletions(-)
Index: dhcp-3.0.5-libdhcp4client.patch
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcp-3.0.5-libdhcp4client.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dhcp-3.0.5-libdhcp4client.patch 14 Nov 2006 03:48:34 -0000 1.3
+++ dhcp-3.0.5-libdhcp4client.patch 14 Nov 2006 21:04:45 -0000 1.4
@@ -1,5 +1,5 @@
---- dhcp-3.0.5/client/dhclient.c.libdhcp4client 2006-11-13 22:25:37.000000000 -0500
-+++ dhcp-3.0.5/client/dhclient.c 2006-11-13 22:25:37.000000000 -0500
+--- dhcp-3.0.5/client/dhclient.c.libdhcp4client 2006-11-14 15:46:27.000000000 -0500
++++ dhcp-3.0.5/client/dhclient.c 2006-11-14 15:46:27.000000000 -0500
@@ -78,7 +78,9 @@
int extended_option_environment = 0;
#endif
@@ -587,8 +587,8 @@
ddns_dhcid, client_identifier;
struct option_cache *oc;
int ignorep;
---- dhcp-3.0.5/common/alloc.c.libdhcp4client 2006-11-13 22:25:37.000000000 -0500
-+++ dhcp-3.0.5/common/alloc.c 2006-11-13 22:25:37.000000000 -0500
+--- dhcp-3.0.5/common/alloc.c.libdhcp4client 2006-11-14 15:46:27.000000000 -0500
++++ dhcp-3.0.5/common/alloc.c 2006-11-14 15:46:27.000000000 -0500
@@ -48,7 +48,6 @@
const char *file;
int line;
@@ -669,8 +669,8 @@
struct dns_zone *d;
if (!ptr) {
---- dhcp-3.0.5/common/discover.c.libdhcp4client 2006-11-13 22:25:37.000000000 -0500
-+++ dhcp-3.0.5/common/discover.c 2006-11-13 22:25:37.000000000 -0500
+--- dhcp-3.0.5/common/discover.c.libdhcp4client 2006-11-14 15:46:27.000000000 -0500
++++ dhcp-3.0.5/common/discover.c 2006-11-14 15:46:27.000000000 -0500
@@ -120,28 +120,30 @@
For each interface that's of type INET and not the loopback interface,
register that interface with the network I/O software, figure out what
@@ -761,7 +761,7 @@
if (h -> type != dhcp_type_interface)
--- dhcp-3.0.5/common/lpf.c.libdhcp4client 2004-11-24 12:39:15.000000000 -0500
-+++ dhcp-3.0.5/common/lpf.c 2006-11-13 22:25:37.000000000 -0500
++++ dhcp-3.0.5/common/lpf.c 2006-11-14 15:46:27.000000000 -0500
@@ -69,8 +69,6 @@
struct interface_info *info;
{
@@ -788,7 +788,7 @@
int offset = 0;
unsigned char ibuf [1536];
--- dhcp-3.0.5/dst/hmac_link.c.libdhcp4client 2001-02-22 02:22:08.000000000 -0500
-+++ dhcp-3.0.5/dst/hmac_link.c 2006-11-13 22:25:37.000000000 -0500
++++ dhcp-3.0.5/dst/hmac_link.c 2006-11-14 15:46:27.000000000 -0500
@@ -38,6 +38,10 @@
#include "dst_internal.h"
@@ -876,7 +876,7 @@
return (0);
memset(dst_t_func[KEY_HMAC_MD5], 0, sizeof(struct dst_func));
--- dhcp-3.0.5/omapip/alloc.c.libdhcp4client 2006-02-22 17:43:27.000000000 -0500
-+++ dhcp-3.0.5/omapip/alloc.c 2006-11-13 22:25:37.000000000 -0500
++++ dhcp-3.0.5/omapip/alloc.c 2006-11-14 15:46:27.000000000 -0500
@@ -40,6 +40,41 @@
#include <omapip/omapip_p.h>
@@ -948,8 +948,8 @@
}
#if defined (DEBUG_MEMORY_LEAKAGE) || defined (DEBUG_MALLOC_POOL) || \
---- dhcp-3.0.5/omapip/dispatch.c.libdhcp4client 2006-11-13 22:25:37.000000000 -0500
-+++ dhcp-3.0.5/omapip/dispatch.c 2006-11-13 22:25:37.000000000 -0500
+--- dhcp-3.0.5/omapip/dispatch.c.libdhcp4client 2006-11-14 15:46:27.000000000 -0500
++++ dhcp-3.0.5/omapip/dispatch.c 2006-11-14 15:46:27.000000000 -0500
@@ -34,7 +34,7 @@
#include <omapip/omapip_p.h>
@@ -959,8 +959,8 @@
TIME cur_time;
OMAPI_OBJECT_ALLOC (omapi_io,
---- dhcp-3.0.5/omapip/errwarn.c.libdhcp4client 2006-11-13 22:25:37.000000000 -0500
-+++ dhcp-3.0.5/omapip/errwarn.c 2006-11-13 22:25:37.000000000 -0500
+--- dhcp-3.0.5/omapip/errwarn.c.libdhcp4client 2006-11-14 15:46:27.000000000 -0500
++++ dhcp-3.0.5/omapip/errwarn.c 2006-11-14 15:46:27.000000000 -0500
@@ -39,6 +39,11 @@
#include <omapip/omapip_p.h>
#include <errno.h>
@@ -1083,7 +1083,7 @@
}
--- dhcp-3.0.5/configure.libdhcp4client 2004-09-10 17:02:30.000000000 -0400
-+++ dhcp-3.0.5/configure 2006-11-13 22:25:37.000000000 -0500
++++ dhcp-3.0.5/configure 2006-11-14 15:46:27.000000000 -0500
@@ -246,7 +246,7 @@
fi
@@ -1093,8 +1093,8 @@
fi
for foo in $dirs; do
---- /dev/null 2006-11-12 08:14:14.401605657 -0500
-+++ dhcp-3.0.5/libdhcp4client/Makefile.dist 2006-11-13 22:25:58.000000000 -0500
+--- /dev/null 2006-11-14 14:31:39.117054826 -0500
++++ dhcp-3.0.5/libdhcp4client/Makefile.dist 2006-11-14 15:47:02.000000000 -0500
@@ -0,0 +1,104 @@
+# Makefile.dist for libdhcp4client
+#
@@ -1194,14 +1194,14 @@
+# used by any dhcp code, and is optimized out by the linker when producing
+# the dhclient executable or a shared library
+libdhcp4client.a: $(OBJS) libres.a
-+ $(AR) crus $@ $(OBJS) `$(AR) t libres.a`
++ $(AR) crus $@ $(OBJS) `$(AR) t libres.a | grep -v res_query.o`
+
+libdhcp4client.so.1: $(OBJS) libres.a
-+ $(CC) -shared -o $@ -Wl,-soname,$@ $(OBJS) `$(AR) t libres.a`
++ $(CC) -shared -o $@ -Wl,-soname,$@ $(OBJS) `$(AR) t libres.a | grep -v res_query.o`
+
+# Dependencies (semi-automatically-generated)
---- /dev/null 2006-11-12 08:14:14.401605657 -0500
-+++ dhcp-3.0.5/libdhcp4client/dhcp4client.h 2006-11-13 22:25:37.000000000 -0500
+--- /dev/null 2006-11-14 14:31:39.117054826 -0500
++++ dhcp-3.0.5/libdhcp4client/dhcp4client.h 2006-11-14 15:46:27.000000000 -0500
@@ -0,0 +1,24 @@
+/* dhcp4client.h
+ *
@@ -1227,8 +1227,8 @@
+extern int dhcpv4_client( struct libdhcp_control_s *dhc_ctl, int argc, char **argv, char **envp);
+ /* The ISC IPv4 DHCP client main() function .
+ */
---- /dev/null 2006-11-12 08:14:14.401605657 -0500
-+++ dhcp-3.0.5/libdhcp4client/libdhcp_control.h 2006-11-13 22:25:37.000000000 -0500
+--- /dev/null 2006-11-14 14:31:39.117054826 -0500
++++ dhcp-3.0.5/libdhcp4client/libdhcp_control.h 2006-11-14 15:46:27.000000000 -0500
@@ -0,0 +1,102 @@
+/* libdhcp_control.h
+ *
@@ -1333,7 +1333,7 @@
+
+#endif
--- dhcp-3.0.5/Makefile.dist.libdhcp4client 2004-06-10 13:59:10.000000000 -0400
-+++ dhcp-3.0.5/Makefile.dist 2006-11-13 22:25:37.000000000 -0500
++++ dhcp-3.0.5/Makefile.dist 2006-11-14 15:46:27.000000000 -0500
@@ -22,7 +22,7 @@
# http://www.isc.org/
Index: dhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- dhcp.spec 14 Nov 2006 03:48:34 -0000 1.124
+++ dhcp.spec 14 Nov 2006 21:04:46 -0000 1.125
@@ -8,7 +8,7 @@
Summary: DHCP (Dynamic Host Configuration Protocol) server and relay agent.
Name: dhcp
Version: 3.0.5
-Release: 4%{?dist}
+Release: 5%{?dist}
Epoch: 12
License: distributable
Group: System Environment/Daemons
@@ -340,6 +340,9 @@
%{_libdir}/libdhcp4client.so
%changelog
+* Tue Nov 14 2006 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-5
+- Do not link res_query.o in to libdhcp4client (#215501)
+
* Mon Nov 13 2006 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-4
- Enable relinquish_timeouts() and cancel_all_timeouts() even when
DEBUG_MEMORY_LEAKAGE_ON_EXIT is not defined
More information about the fedora-cvs-commits
mailing list