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

- Upgrade to ISC dhcp-4.0.0 (#426634)

Browse Source 
- first ISC release to incorporate DHCPv6 protocol support
- source tree now uses GNU autoconf/automake
- Removed the libdhcp4client-static package
This commit is contained in:
David Cantrell 2008-01-14 00:38:44 +00:00
parent 82186fd6db
commit dcf32f5236
4 changed files with 60 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
dhcp-4.0.0-ldap-configuration.patch
View File

@ -1,24 +1,25 @@
diff -up dhcp-4.0.0/server/Makefile.am.ldap dhcp-4.0.0/server/Makefile.am diff -up dhcp-4.0.0/server/Makefile.am.ldap dhcp-4.0.0/server/Makefile.am
--- dhcp-4.0.0/server/Makefile.am.ldap 2007-05-29 06:32:11.000000000 -1000 --- dhcp-4.0.0/server/Makefile.am.ldap 2007-05-29 06:32:11.000000000 -1000
+++ dhcp-4.0.0/server/Makefile.am 2008-01-11 17:45:47.000000000 -1000 +++ dhcp-4.0.0/server/Makefile.am 2008-01-13 12:55:37.000000000 -1000
@@ -4,12 +4,12 @@ dist_sysconf_DATA = dhcpd.conf @@ -4,12 +4,10 @@ dist_sysconf_DATA = dhcpd.conf
sbin_PROGRAMS = dhcpd sbin_PROGRAMS = dhcpd
dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \
omapi.c mdb.c stables.c salloc.c ddns.c dhcpleasequery.c \ omapi.c mdb.c stables.c salloc.c ddns.c dhcpleasequery.c \
- dhcpv6.c mdb6.c - dhcpv6.c mdb6.c
+ dhcpv6.c mdb6.c ldap.c ldap_casa.c + dhcpv6.c mdb6.c ldap.c ldap_casa.c
# libomapi.a this is here twice to handle circular library dependencies :( -# libomapi.a this is here twice to handle circular library dependencies :(
dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a ../dst/libdst.a \ -dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a ../dst/libdst.a \
../dhcpctl/libdhcpctl.a ../minires/libres.a \ - ../dhcpctl/libdhcpctl.a ../minires/libres.a \
- ../omapip/libomapi.a - ../omapip/libomapi.a
+ ../omapip/libomapi.a -lldap +dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a ../minires/libres.a \
+ ../dhcpctl/libdhcpctl.a ../dst/libdstnomd5.a -lldap
man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5 man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
EXTRA_DIST = $(man_MANS) EXTRA_DIST = $(man_MANS)
diff -up dhcp-4.0.0/server/mdb.c.ldap dhcp-4.0.0/server/mdb.c diff -up dhcp-4.0.0/server/mdb.c.ldap dhcp-4.0.0/server/mdb.c
--- dhcp-4.0.0/server/mdb.c.ldap 2007-11-30 11:51:43.000000000 -1000 --- dhcp-4.0.0/server/mdb.c.ldap 2007-11-30 11:51:43.000000000 -1000
+++ dhcp-4.0.0/server/mdb.c 2008-01-11 17:45:28.000000000 -1000 +++ dhcp-4.0.0/server/mdb.c 2008-01-13 12:54:54.000000000 -1000
@@ -600,6 +600,12 @@ int find_hosts_by_haddr (struct host_dec @@ -600,6 +600,12 @@ int find_hosts_by_haddr (struct host_dec
const char *file, int line) const char *file, int line)
{ {
@ -34,7 +35,7 @@ diff -up dhcp-4.0.0/server/mdb.c.ldap dhcp-4.0.0/server/mdb.c
h.hbuf [0] = htype; h.hbuf [0] = htype;
diff -up /dev/null dhcp-4.0.0/server/ldap_casa.c diff -up /dev/null dhcp-4.0.0/server/ldap_casa.c
--- /dev/null 2008-01-11 10:40:59.147013395 -1000 --- /dev/null 2008-01-11 10:40:59.147013395 -1000
+++ dhcp-4.0.0/server/ldap_casa.c 2008-01-11 17:45:28.000000000 -1000 +++ dhcp-4.0.0/server/ldap_casa.c 2008-01-13 12:54:54.000000000 -1000
@@ -0,0 +1,138 @@ @@ -0,0 +1,138 @@
+/* ldap_casa.c +/* ldap_casa.c
+ +
@ -176,7 +177,7 @@ diff -up /dev/null dhcp-4.0.0/server/ldap_casa.c
+ +
diff -up dhcp-4.0.0/server/dhcpd.c.ldap dhcp-4.0.0/server/dhcpd.c diff -up dhcp-4.0.0/server/dhcpd.c.ldap dhcp-4.0.0/server/dhcpd.c
--- dhcp-4.0.0/server/dhcpd.c.ldap 2007-11-30 11:51:43.000000000 -1000 --- dhcp-4.0.0/server/dhcpd.c.ldap 2007-11-30 11:51:43.000000000 -1000
+++ dhcp-4.0.0/server/dhcpd.c 2008-01-11 17:45:28.000000000 -1000 +++ dhcp-4.0.0/server/dhcpd.c 2008-01-13 12:54:54.000000000 -1000
@@ -505,6 +505,14 @@ main(int argc, char **argv) { @@ -505,6 +505,14 @@ main(int argc, char **argv) {
/* Add the ddns update style enumeration prior to parsing. */ /* Add the ddns update style enumeration prior to parsing. */
add_enumeration (&ddns_styles); add_enumeration (&ddns_styles);
@ -194,7 +195,7 @@ diff -up dhcp-4.0.0/server/dhcpd.c.ldap dhcp-4.0.0/server/dhcpd.c
log_fatal ("Can't allocate root group!"); log_fatal ("Can't allocate root group!");
diff -up /dev/null dhcp-4.0.0/server/ldap.c diff -up /dev/null dhcp-4.0.0/server/ldap.c
--- /dev/null 2008-01-11 10:40:59.147013395 -1000 --- /dev/null 2008-01-11 10:40:59.147013395 -1000
+++ dhcp-4.0.0/server/ldap.c 2008-01-11 17:45:28.000000000 -1000 +++ dhcp-4.0.0/server/ldap.c 2008-01-13 12:54:54.000000000 -1000
@@ -0,0 +1,2004 @@ @@ -0,0 +1,2004 @@
+/* ldap.c +/* ldap.c
+ +
@ -2202,7 +2203,7 @@ diff -up /dev/null dhcp-4.0.0/server/ldap.c
+#endif +#endif
diff -up dhcp-4.0.0/server/confpars.c.ldap dhcp-4.0.0/server/confpars.c diff -up dhcp-4.0.0/server/confpars.c.ldap dhcp-4.0.0/server/confpars.c
--- dhcp-4.0.0/server/confpars.c.ldap 2007-11-30 11:51:43.000000000 -1000 --- dhcp-4.0.0/server/confpars.c.ldap 2007-11-30 11:51:43.000000000 -1000
+++ dhcp-4.0.0/server/confpars.c 2008-01-11 17:45:28.000000000 -1000 +++ dhcp-4.0.0/server/confpars.c 2008-01-13 12:54:54.000000000 -1000
@@ -60,7 +60,17 @@ void parse_trace_setup () @@ -60,7 +60,17 @@ void parse_trace_setup ()
isc_result_t readconf () isc_result_t readconf ()
@ -2224,7 +2225,7 @@ diff -up dhcp-4.0.0/server/confpars.c.ldap dhcp-4.0.0/server/confpars.c
isc_result_t read_conf_file (const char *filename, struct group *group, isc_result_t read_conf_file (const char *filename, struct group *group,
diff -up dhcp-4.0.0/server/class.c.ldap dhcp-4.0.0/server/class.c diff -up dhcp-4.0.0/server/class.c.ldap dhcp-4.0.0/server/class.c
--- dhcp-4.0.0/server/class.c.ldap 2007-09-05 07:32:10.000000000 -1000 --- dhcp-4.0.0/server/class.c.ldap 2007-09-05 07:32:10.000000000 -1000
+++ dhcp-4.0.0/server/class.c 2008-01-11 17:45:28.000000000 -1000 +++ dhcp-4.0.0/server/class.c 2008-01-13 12:54:54.000000000 -1000
@@ -84,6 +84,7 @@ int check_collection (packet, lease, col @@ -84,6 +84,7 @@ int check_collection (packet, lease, col
int matched = 0; int matched = 0;
int status; int status;
@ -2254,7 +2255,7 @@ diff -up dhcp-4.0.0/server/class.c.ldap dhcp-4.0.0/server/class.c
print_hex_1 (data.len, print_hex_1 (data.len,
diff -up dhcp-4.0.0/server/stables.c.ldap dhcp-4.0.0/server/stables.c diff -up dhcp-4.0.0/server/stables.c.ldap dhcp-4.0.0/server/stables.c
--- dhcp-4.0.0/server/stables.c.ldap 2007-11-20 08:34:37.000000000 -1000 --- dhcp-4.0.0/server/stables.c.ldap 2007-11-20 08:34:37.000000000 -1000
+++ dhcp-4.0.0/server/stables.c 2008-01-11 17:45:28.000000000 -1000 +++ dhcp-4.0.0/server/stables.c 2008-01-13 12:54:54.000000000 -1000
@@ -238,9 +238,107 @@ static struct option server_options[] = @@ -238,9 +238,107 @@ static struct option server_options[] =
{ "dhcpv6-lease-file-name", "t", &server_universe, 54, 1 }, { "dhcpv6-lease-file-name", "t", &server_universe, 54, 1 },
{ "dhcpv6-pid-file-name", "t", &server_universe, 55, 1 }, { "dhcpv6-pid-file-name", "t", &server_universe, 55, 1 },
@ -2365,19 +2366,23 @@ diff -up dhcp-4.0.0/server/stables.c.ldap dhcp-4.0.0/server/stables.c
{ "ad-hoc", 1 }, { "ad-hoc", 1 },
diff -up dhcp-4.0.0/dst/Makefile.am.ldap dhcp-4.0.0/dst/Makefile.am diff -up dhcp-4.0.0/dst/Makefile.am.ldap dhcp-4.0.0/dst/Makefile.am
--- dhcp-4.0.0/dst/Makefile.am.ldap 2007-05-29 06:32:10.000000000 -1000 --- dhcp-4.0.0/dst/Makefile.am.ldap 2007-05-29 06:32:10.000000000 -1000
+++ dhcp-4.0.0/dst/Makefile.am 2008-01-11 17:45:28.000000000 -1000 +++ dhcp-4.0.0/dst/Makefile.am 2008-01-13 12:54:54.000000000 -1000
@@ -2,7 +2,7 @@ AM_CPPFLAGS = -DMINIRES_LIB -DHMAC_MD5 @@ -2,7 +2,12 @@ AM_CPPFLAGS = -DMINIRES_LIB -DHMAC_MD5
lib_LIBRARIES = libdst.a lib_LIBRARIES = libdst.a
-libdst_a_SOURCES = dst_support.c dst_api.c hmac_link.c md5_dgst.c \ +noinst_LIBRARIES = libdstnomd5.a
+libdst_a_SOURCES = dst_support.c dst_api.c hmac_link.c \ +
libdst_a_SOURCES = dst_support.c dst_api.c hmac_link.c md5_dgst.c \
base64.c prandom.c base64.c prandom.c
+libdstnomd5_a_SOURCES = dst_support.c dst_api.c hmac_link.c \
+ base64.c prandom.c
+
EXTRA_DIST = dst_internal.h md5.h md5_locl.h EXTRA_DIST = dst_internal.h md5.h md5_locl.h
diff -up dhcp-4.0.0/common/print.c.ldap dhcp-4.0.0/common/print.c diff -up dhcp-4.0.0/common/print.c.ldap dhcp-4.0.0/common/print.c
--- dhcp-4.0.0/common/print.c.ldap 2007-10-01 04:47:35.000000000 -1000 --- dhcp-4.0.0/common/print.c.ldap 2007-10-01 04:47:35.000000000 -1000
+++ dhcp-4.0.0/common/print.c 2008-01-11 17:45:28.000000000 -1000 +++ dhcp-4.0.0/common/print.c 2008-01-13 12:54:54.000000000 -1000
@@ -163,9 +163,9 @@ char *print_base64 (const unsigned char @@ -163,9 +163,9 @@ char *print_base64 (const unsigned char
} }
@ -2393,7 +2398,7 @@ diff -up dhcp-4.0.0/common/print.c.ldap dhcp-4.0.0/common/print.c
char *s; char *s;
diff -up dhcp-4.0.0/common/conflex.c.ldap dhcp-4.0.0/common/conflex.c diff -up dhcp-4.0.0/common/conflex.c.ldap dhcp-4.0.0/common/conflex.c
--- dhcp-4.0.0/common/conflex.c.ldap 2007-10-31 09:13:33.000000000 -1000 --- dhcp-4.0.0/common/conflex.c.ldap 2007-10-31 09:13:33.000000000 -1000
+++ dhcp-4.0.0/common/conflex.c 2008-01-11 17:45:28.000000000 -1000 +++ dhcp-4.0.0/common/conflex.c 2008-01-13 12:54:54.000000000 -1000
@@ -43,6 +43,7 @@ static enum dhcp_token read_string PROTO @@ -43,6 +43,7 @@ static enum dhcp_token read_string PROTO
static enum dhcp_token read_number PROTO ((int, struct parse *)); static enum dhcp_token read_number PROTO ((int, struct parse *));
static enum dhcp_token read_num_or_name PROTO ((int, struct parse *)); static enum dhcp_token read_num_or_name PROTO ((int, struct parse *));
@ -2456,7 +2461,7 @@ diff -up dhcp-4.0.0/common/conflex.c.ldap dhcp-4.0.0/common/conflex.c
+} +}
diff -up dhcp-4.0.0/includes/dhcpd.h.ldap dhcp-4.0.0/includes/dhcpd.h diff -up dhcp-4.0.0/includes/dhcpd.h.ldap dhcp-4.0.0/includes/dhcpd.h
--- dhcp-4.0.0/includes/dhcpd.h.ldap 2007-12-08 09:36:00.000000000 -1000 --- dhcp-4.0.0/includes/dhcpd.h.ldap 2007-12-08 09:36:00.000000000 -1000
+++ dhcp-4.0.0/includes/dhcpd.h 2008-01-11 17:45:28.000000000 -1000 +++ dhcp-4.0.0/includes/dhcpd.h 2008-01-13 12:54:54.000000000 -1000
@@ -101,6 +101,11 @@ typedef time_t TIME; @@ -101,6 +101,11 @@ typedef time_t TIME;
#include <isc-dhcp/result.h> #include <isc-dhcp/result.h>
#include <omapip/omapip_p.h> #include <omapip/omapip_p.h>
@ -2573,7 +2578,7 @@ diff -up dhcp-4.0.0/includes/dhcpd.h.ldap dhcp-4.0.0/includes/dhcpd.h
HASH_FUNCTIONS_DECL(ia_na, unsigned char *, struct ia_na, ia_na_hash_t); HASH_FUNCTIONS_DECL(ia_na, unsigned char *, struct ia_na, ia_na_hash_t);
diff -up dhcp-4.0.0/includes/site.h.ldap dhcp-4.0.0/includes/site.h diff -up dhcp-4.0.0/includes/site.h.ldap dhcp-4.0.0/includes/site.h
--- dhcp-4.0.0/includes/site.h.ldap 2006-07-31 12:19:51.000000000 -1000 --- dhcp-4.0.0/includes/site.h.ldap 2006-07-31 12:19:51.000000000 -1000
+++ dhcp-4.0.0/includes/site.h 2008-01-11 17:45:28.000000000 -1000 +++ dhcp-4.0.0/includes/site.h 2008-01-13 12:54:54.000000000 -1000
@@ -183,3 +183,13 @@ @@ -183,3 +183,13 @@
traces. */ traces. */
@ -2590,7 +2595,7 @@ diff -up dhcp-4.0.0/includes/site.h.ldap dhcp-4.0.0/includes/site.h
+#define USE_SSL +#define USE_SSL
diff -up /dev/null dhcp-4.0.0/includes/ldap_casa.h diff -up /dev/null dhcp-4.0.0/includes/ldap_casa.h
--- /dev/null 2008-01-11 10:40:59.147013395 -1000 --- /dev/null 2008-01-11 10:40:59.147013395 -1000
+++ dhcp-4.0.0/includes/ldap_casa.h 2008-01-11 17:45:28.000000000 -1000 +++ dhcp-4.0.0/includes/ldap_casa.h 2008-01-13 12:54:54.000000000 -1000
@@ -0,0 +1,83 @@ @@ -0,0 +1,83 @@
+/* ldap_casa.h +/* ldap_casa.h
+ +

56
dhcp-4.0.0-libdhcp4client.patch
View File

@ -1,6 +1,6 @@
diff -up dhcp-4.0.0/configure.ac.libdhcp4client dhcp-4.0.0/configure.ac diff -up dhcp-4.0.0/configure.ac.libdhcp4client dhcp-4.0.0/configure.ac
--- dhcp-4.0.0/configure.ac.libdhcp4client 2007-12-14 08:24:56.000000000 -1000 --- dhcp-4.0.0/configure.ac.libdhcp4client 2007-12-14 08:24:56.000000000 -1000
+++ dhcp-4.0.0/configure.ac 2008-01-12 17:19:29.000000000 -1000 +++ dhcp-4.0.0/configure.ac 2008-01-13 12:51:31.000000000 -1000
@@ -1,5 +1,32 @@ @@ -1,5 +1,32 @@
AC_INIT([DHCP], [4.0.0], [dhcp-users@isc.org]) AC_INIT([DHCP], [4.0.0], [dhcp-users@isc.org])
@ -46,7 +46,7 @@ diff -up dhcp-4.0.0/configure.ac.libdhcp4client dhcp-4.0.0/configure.ac
# we sometimes need to know byte order for building packets # we sometimes need to know byte order for building packets
diff -up dhcp-4.0.0/omapip/Makefile.am.libdhcp4client dhcp-4.0.0/omapip/Makefile.am diff -up dhcp-4.0.0/omapip/Makefile.am.libdhcp4client dhcp-4.0.0/omapip/Makefile.am
--- dhcp-4.0.0/omapip/Makefile.am.libdhcp4client 2007-05-29 06:32:11.000000000 -1000 --- dhcp-4.0.0/omapip/Makefile.am.libdhcp4client 2007-05-29 06:32:11.000000000 -1000
+++ dhcp-4.0.0/omapip/Makefile.am 2008-01-12 17:19:29.000000000 -1000 +++ dhcp-4.0.0/omapip/Makefile.am 2008-01-13 12:51:31.000000000 -1000
@@ -1,10 +1,18 @@ @@ -1,10 +1,18 @@
lib_LIBRARIES = libomapi.a lib_LIBRARIES = libomapi.a
+noinst_LIBRARIES = libomapiLIBDHCP.a +noinst_LIBRARIES = libomapiLIBDHCP.a
@ -68,7 +68,7 @@ diff -up dhcp-4.0.0/omapip/Makefile.am.libdhcp4client dhcp-4.0.0/omapip/Makefile
diff -up dhcp-4.0.0/omapip/dispatch.c.libdhcp4client dhcp-4.0.0/omapip/dispatch.c diff -up dhcp-4.0.0/omapip/dispatch.c.libdhcp4client dhcp-4.0.0/omapip/dispatch.c
--- dhcp-4.0.0/omapip/dispatch.c.libdhcp4client 2007-11-30 11:51:43.000000000 -1000 --- dhcp-4.0.0/omapip/dispatch.c.libdhcp4client 2007-11-30 11:51:43.000000000 -1000
+++ dhcp-4.0.0/omapip/dispatch.c 2008-01-12 17:19:29.000000000 -1000 +++ dhcp-4.0.0/omapip/dispatch.c 2008-01-13 12:51:31.000000000 -1000
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
#include <omapip/omapip_p.h> #include <omapip/omapip_p.h>
#include <sys/time.h> #include <sys/time.h>
@ -79,8 +79,8 @@ diff -up dhcp-4.0.0/omapip/dispatch.c.libdhcp4client dhcp-4.0.0/omapip/dispatch.
OMAPI_OBJECT_ALLOC (omapi_io, OMAPI_OBJECT_ALLOC (omapi_io,
diff -up dhcp-4.0.0/omapip/errwarn.c.libdhcp4client dhcp-4.0.0/omapip/errwarn.c diff -up dhcp-4.0.0/omapip/errwarn.c.libdhcp4client dhcp-4.0.0/omapip/errwarn.c
--- dhcp-4.0.0/omapip/errwarn.c.libdhcp4client 2008-01-12 17:19:29.000000000 -1000 --- dhcp-4.0.0/omapip/errwarn.c.libdhcp4client 2008-01-13 12:51:31.000000000 -1000
+++ dhcp-4.0.0/omapip/errwarn.c 2008-01-12 17:19:29.000000000 -1000 +++ dhcp-4.0.0/omapip/errwarn.c 2008-01-13 12:51:31.000000000 -1000
@@ -37,6 +37,11 @@ @@ -37,6 +37,11 @@
#include <errno.h> #include <errno.h>
#include <syslog.h> #include <syslog.h>
@ -200,7 +200,7 @@ diff -up dhcp-4.0.0/omapip/errwarn.c.libdhcp4client dhcp-4.0.0/omapip/errwarn.c
diff -up dhcp-4.0.0/omapip/alloc.c.libdhcp4client dhcp-4.0.0/omapip/alloc.c diff -up dhcp-4.0.0/omapip/alloc.c.libdhcp4client dhcp-4.0.0/omapip/alloc.c
--- dhcp-4.0.0/omapip/alloc.c.libdhcp4client 2007-07-12 20:43:42.000000000 -1000 --- dhcp-4.0.0/omapip/alloc.c.libdhcp4client 2007-07-12 20:43:42.000000000 -1000
+++ dhcp-4.0.0/omapip/alloc.c 2008-01-12 17:19:29.000000000 -1000 +++ dhcp-4.0.0/omapip/alloc.c 2008-01-13 12:51:31.000000000 -1000
@@ -37,6 +37,33 @@ @@ -37,6 +37,33 @@
#include <omapip/omapip_p.h> #include <omapip/omapip_p.h>
@ -257,25 +257,29 @@ diff -up dhcp-4.0.0/omapip/alloc.c.libdhcp4client dhcp-4.0.0/omapip/alloc.c
#if defined (DEBUG_MEMORY_LEAKAGE) || defined (DEBUG_MALLOC_POOL) || \ #if defined (DEBUG_MEMORY_LEAKAGE) || defined (DEBUG_MALLOC_POOL) || \
diff -up dhcp-4.0.0/dst/Makefile.am.libdhcp4client dhcp-4.0.0/dst/Makefile.am diff -up dhcp-4.0.0/dst/Makefile.am.libdhcp4client dhcp-4.0.0/dst/Makefile.am
--- dhcp-4.0.0/dst/Makefile.am.libdhcp4client 2008-01-12 17:19:29.000000000 -1000 --- dhcp-4.0.0/dst/Makefile.am.libdhcp4client 2008-01-13 12:51:31.000000000 -1000
+++ dhcp-4.0.0/dst/Makefile.am 2008-01-12 17:19:29.000000000 -1000 +++ dhcp-4.0.0/dst/Makefile.am 2008-01-13 12:52:19.000000000 -1000
@@ -2,7 +2,13 @@ AM_CPPFLAGS = -DMINIRES_LIB -DHMAC_MD5 @@ -2,7 +2,7 @@ AM_CPPFLAGS = -DMINIRES_LIB -DHMAC_MD5
lib_LIBRARIES = libdst.a lib_LIBRARIES = libdst.a
+noinst_LIBRARIES = libdstLIBDHCP.a -noinst_LIBRARIES = libdstnomd5.a
+ +noinst_LIBRARIES = libdstnomd5.a libdstLIBDHCP.a
libdst_a_SOURCES = dst_support.c dst_api.c hmac_link.c \
libdst_a_SOURCES = dst_support.c dst_api.c hmac_link.c md5_dgst.c \
base64.c prandom.c
@@ -10,4 +10,8 @@ libdst_a_SOURCES = dst_support.c dst_api
libdstnomd5_a_SOURCES = dst_support.c dst_api.c hmac_link.c \
base64.c prandom.c base64.c prandom.c
+libdstLIBDHCP_a_CFLAGS = -DLIBDHCP +libdstLIBDHCP_a_CFLAGS = -DLIBDHCP
+libdstLIBDHCP_a_SOURCES = dst_support.c dst_api.c hmac_link.c \ +libdstLIBDHCP_a_SOURCES = dst_support.c dst_api.c hmac_link.c md5_dgst.c \
+ base64.c prandom.c + base64.c prandom.c
+ +
EXTRA_DIST = dst_internal.h md5.h md5_locl.h EXTRA_DIST = dst_internal.h md5.h md5_locl.h
diff -up dhcp-4.0.0/dst/hmac_link.c.libdhcp4client dhcp-4.0.0/dst/hmac_link.c diff -up dhcp-4.0.0/dst/hmac_link.c.libdhcp4client dhcp-4.0.0/dst/hmac_link.c
--- dhcp-4.0.0/dst/hmac_link.c.libdhcp4client 2007-12-05 14:50:22.000000000 -1000 --- dhcp-4.0.0/dst/hmac_link.c.libdhcp4client 2007-12-05 14:50:22.000000000 -1000
+++ dhcp-4.0.0/dst/hmac_link.c 2008-01-12 17:19:29.000000000 -1000 +++ dhcp-4.0.0/dst/hmac_link.c 2008-01-13 12:51:31.000000000 -1000
@@ -39,6 +39,10 @@ static const char rcsid[] = "$Header: /p @@ -39,6 +39,10 @@ static const char rcsid[] = "$Header: /p
#include "dst_internal.h" #include "dst_internal.h"
@ -363,7 +367,7 @@ diff -up dhcp-4.0.0/dst/hmac_link.c.libdhcp4client dhcp-4.0.0/dst/hmac_link.c
memset(dst_t_func[KEY_HMAC_MD5], 0, sizeof(struct dst_func)); memset(dst_t_func[KEY_HMAC_MD5], 0, sizeof(struct dst_func));
diff -up dhcp-4.0.0/common/Makefile.am.libdhcp4client dhcp-4.0.0/common/Makefile.am diff -up dhcp-4.0.0/common/Makefile.am.libdhcp4client dhcp-4.0.0/common/Makefile.am
--- dhcp-4.0.0/common/Makefile.am.libdhcp4client 2007-11-16 01:04:11.000000000 -1000 --- dhcp-4.0.0/common/Makefile.am.libdhcp4client 2007-11-16 01:04:11.000000000 -1000
+++ dhcp-4.0.0/common/Makefile.am 2008-01-12 17:19:29.000000000 -1000 +++ dhcp-4.0.0/common/Makefile.am 2008-01-13 12:51:31.000000000 -1000
@@ -1,11 +1,17 @@ @@ -1,11 +1,17 @@
AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"' AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"'
@ -385,7 +389,7 @@ diff -up dhcp-4.0.0/common/Makefile.am.libdhcp4client dhcp-4.0.0/common/Makefile
diff -up dhcp-4.0.0/common/discover.c.libdhcp4client dhcp-4.0.0/common/discover.c diff -up dhcp-4.0.0/common/discover.c.libdhcp4client dhcp-4.0.0/common/discover.c
--- dhcp-4.0.0/common/discover.c.libdhcp4client 2007-10-05 12:29:51.000000000 -1000 --- dhcp-4.0.0/common/discover.c.libdhcp4client 2007-10-05 12:29:51.000000000 -1000
+++ dhcp-4.0.0/common/discover.c 2008-01-12 17:19:29.000000000 -1000 +++ dhcp-4.0.0/common/discover.c 2008-01-13 12:51:31.000000000 -1000
@@ -883,6 +883,10 @@ add_ipv6_addr_to_interface(struct interf @@ -883,6 +883,10 @@ add_ipv6_addr_to_interface(struct interf
register that interface with the network I/O software, figure out what register that interface with the network I/O software, figure out what
subnet it's on, and add it to the list of interfaces. */ subnet it's on, and add it to the list of interfaces. */
@ -427,7 +431,7 @@ diff -up dhcp-4.0.0/common/discover.c.libdhcp4client dhcp-4.0.0/common/discover.
if (fallback_interface) { if (fallback_interface) {
diff -up dhcp-4.0.0/common/tree.c.libdhcp4client dhcp-4.0.0/common/tree.c diff -up dhcp-4.0.0/common/tree.c.libdhcp4client dhcp-4.0.0/common/tree.c
--- dhcp-4.0.0/common/tree.c.libdhcp4client 2007-08-22 03:41:37.000000000 -1000 --- dhcp-4.0.0/common/tree.c.libdhcp4client 2007-08-22 03:41:37.000000000 -1000
+++ dhcp-4.0.0/common/tree.c 2008-01-12 17:19:29.000000000 -1000 +++ dhcp-4.0.0/common/tree.c 2008-01-13 12:51:31.000000000 -1000
@@ -41,7 +41,7 @@ @@ -41,7 +41,7 @@
# include <regex.h> # include <regex.h>
#endif #endif
@ -447,7 +451,7 @@ diff -up dhcp-4.0.0/common/tree.c.libdhcp4client dhcp-4.0.0/common/tree.c
struct data_string *result; struct data_string *result;
diff -up dhcp-4.0.0/common/options.c.libdhcp4client dhcp-4.0.0/common/options.c diff -up dhcp-4.0.0/common/options.c.libdhcp4client dhcp-4.0.0/common/options.c
--- dhcp-4.0.0/common/options.c.libdhcp4client 2007-11-30 11:51:43.000000000 -1000 --- dhcp-4.0.0/common/options.c.libdhcp4client 2007-11-30 11:51:43.000000000 -1000
+++ dhcp-4.0.0/common/options.c 2008-01-12 17:19:29.000000000 -1000 +++ dhcp-4.0.0/common/options.c 2008-01-13 12:51:31.000000000 -1000
@@ -3392,6 +3392,7 @@ fqdn6_universe_decode(struct option_stat @@ -3392,6 +3392,7 @@ fqdn6_universe_decode(struct option_stat
return 0; return 0;
} }
@ -457,8 +461,8 @@ diff -up dhcp-4.0.0/common/options.c.libdhcp4client dhcp-4.0.0/common/options.c
struct client_state *client_state, struct client_state *client_state,
struct option_state *in_options, struct option_state *in_options,
diff -up dhcp-4.0.0/common/dispatch.c.libdhcp4client dhcp-4.0.0/common/dispatch.c diff -up dhcp-4.0.0/common/dispatch.c.libdhcp4client dhcp-4.0.0/common/dispatch.c
--- dhcp-4.0.0/common/dispatch.c.libdhcp4client 2008-01-12 17:19:29.000000000 -1000 --- dhcp-4.0.0/common/dispatch.c.libdhcp4client 2008-01-13 12:51:31.000000000 -1000
+++ dhcp-4.0.0/common/dispatch.c 2008-01-12 17:19:29.000000000 -1000 +++ dhcp-4.0.0/common/dispatch.c 2008-01-13 12:51:31.000000000 -1000
@@ -34,8 +34,24 @@ @@ -34,8 +34,24 @@
#include "dhcpd.h" #include "dhcpd.h"
@ -730,7 +734,7 @@ diff -up dhcp-4.0.0/common/dispatch.c.libdhcp4client dhcp-4.0.0/common/dispatch.
} }
diff -up dhcp-4.0.0/common/alloc.c.libdhcp4client dhcp-4.0.0/common/alloc.c diff -up dhcp-4.0.0/common/alloc.c.libdhcp4client dhcp-4.0.0/common/alloc.c
--- dhcp-4.0.0/common/alloc.c.libdhcp4client 2007-10-23 14:54:11.000000000 -1000 --- dhcp-4.0.0/common/alloc.c.libdhcp4client 2007-10-23 14:54:11.000000000 -1000
+++ dhcp-4.0.0/common/alloc.c 2008-01-12 17:19:29.000000000 -1000 +++ dhcp-4.0.0/common/alloc.c 2008-01-13 12:51:31.000000000 -1000
@@ -1004,7 +1004,11 @@ int executable_statement_reference (ptr, @@ -1004,7 +1004,11 @@ int executable_statement_reference (ptr,
return 1; return 1;
} }
@ -744,8 +748,8 @@ diff -up dhcp-4.0.0/common/alloc.c.libdhcp4client dhcp-4.0.0/common/alloc.c
#if defined (DEBUG_MEMORY_LEAKAGE) || \ #if defined (DEBUG_MEMORY_LEAKAGE) || \
defined (DEBUG_MEMORY_LEAKAGE_ON_EXIT) defined (DEBUG_MEMORY_LEAKAGE_ON_EXIT)
diff -up dhcp-4.0.0/includes/dhcpd.h.libdhcp4client dhcp-4.0.0/includes/dhcpd.h diff -up dhcp-4.0.0/includes/dhcpd.h.libdhcp4client dhcp-4.0.0/includes/dhcpd.h
--- dhcp-4.0.0/includes/dhcpd.h.libdhcp4client 2008-01-12 17:19:29.000000000 -1000 --- dhcp-4.0.0/includes/dhcpd.h.libdhcp4client 2008-01-13 12:51:31.000000000 -1000
+++ dhcp-4.0.0/includes/dhcpd.h 2008-01-12 17:19:29.000000000 -1000 +++ dhcp-4.0.0/includes/dhcpd.h 2008-01-13 12:51:31.000000000 -1000
@@ -1199,14 +1199,6 @@ struct hardware_link { @@ -1199,14 +1199,6 @@ struct hardware_link {
typedef void (*tvref_t)(void *, void *, const char *, int); typedef void (*tvref_t)(void *, void *, const char *, int);
@ -779,7 +783,7 @@ diff -up dhcp-4.0.0/includes/dhcpd.h.libdhcp4client dhcp-4.0.0/includes/dhcpd.h
extern trace_type_t *interface_trace; extern trace_type_t *interface_trace;
diff -up dhcp-4.0.0/client/Makefile.am.libdhcp4client dhcp-4.0.0/client/Makefile.am diff -up dhcp-4.0.0/client/Makefile.am.libdhcp4client dhcp-4.0.0/client/Makefile.am
--- dhcp-4.0.0/client/Makefile.am.libdhcp4client 2007-12-12 09:23:42.000000000 -1000 --- dhcp-4.0.0/client/Makefile.am.libdhcp4client 2007-12-12 09:23:42.000000000 -1000
+++ dhcp-4.0.0/client/Makefile.am 2008-01-12 17:21:17.000000000 -1000 +++ dhcp-4.0.0/client/Makefile.am 2008-01-13 12:51:31.000000000 -1000
@@ -1,10 +1,19 @@ @@ -1,10 +1,19 @@
dist_sysconf_DATA = dhclient.conf dist_sysconf_DATA = dhclient.conf
sbin_PROGRAMS = dhclient sbin_PROGRAMS = dhclient
@ -801,8 +805,8 @@ diff -up dhcp-4.0.0/client/Makefile.am.libdhcp4client dhcp-4.0.0/client/Makefile
EXTRA_DIST = $(man_MANS) EXTRA_DIST = $(man_MANS)
diff -up dhcp-4.0.0/client/dhclient.c.libdhcp4client dhcp-4.0.0/client/dhclient.c diff -up dhcp-4.0.0/client/dhclient.c.libdhcp4client dhcp-4.0.0/client/dhclient.c
--- dhcp-4.0.0/client/dhclient.c.libdhcp4client 2008-01-12 17:19:29.000000000 -1000 --- dhcp-4.0.0/client/dhclient.c.libdhcp4client 2008-01-13 12:51:31.000000000 -1000
+++ dhcp-4.0.0/client/dhclient.c 2008-01-12 17:19:29.000000000 -1000 +++ dhcp-4.0.0/client/dhclient.c 2008-01-13 12:51:31.000000000 -1000
@@ -83,14 +83,50 @@ int nowait=0; @@ -83,14 +83,50 @@ int nowait=0;
char *mockup_relay = NULL; char *mockup_relay = NULL;
int bootp_broadcast_always = 0; int bootp_broadcast_always = 0;

16
dhcp-4.0.0-server-Makefile.patch
View File

@ -1,16 +0,0 @@
diff -up dhcp-4.0.0/server/Makefile.am.mf dhcp-4.0.0/server/Makefile.am
--- dhcp-4.0.0/server/Makefile.am.mf 2008-01-12 12:40:59.000000000 -1000
+++ dhcp-4.0.0/server/Makefile.am 2008-01-12 12:41:55.000000000 -1000
@@ -6,10 +6,8 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c c
omapi.c mdb.c stables.c salloc.c ddns.c dhcpleasequery.c \
dhcpv6.c mdb6.c ldap.c ldap_casa.c
-# libomapi.a this is here twice to handle circular library dependencies :(
-dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a ../dst/libdst.a \
- ../dhcpctl/libdhcpctl.a ../minires/libres.a \
- ../omapip/libomapi.a -lldap
+dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a ../minires/libres.a \
+ ../dhcpctl/libdhcpctl.a ../dst/libdst.a -lldap
man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
EXTRA_DIST = $(man_MANS)

7
dhcp.spec
View File

@ -42,13 +42,14 @@ Patch13: %{name}-4.0.0-dhclient-anycast.patch
Patch14: %{name}-4.0.0-manpages.patch Patch14: %{name}-4.0.0-manpages.patch
Patch15: %{name}-4.0.0-paths.patch Patch15: %{name}-4.0.0-paths.patch
Patch16: %{name}-4.0.0-libdhcp4client.patch Patch16: %{name}-4.0.0-libdhcp4client.patch
Patch17: %{name}-4.0.0-server-Makefile.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
BuildRequires: groff BuildRequires: groff
BuildRequires: libtool
BuildRequires: openldap-devel BuildRequires: openldap-devel
BuildRequires: openssl-devel
# For /etc/openldap/schema (and slapd, if you're using that with dhcpd) # For /etc/openldap/schema (and slapd, if you're using that with dhcpd)
Requires: openldap-servers Requires: openldap-servers
@ -188,9 +189,6 @@ client library.
# Add the libdhcp4client target (library version of dhclient) # Add the libdhcp4client target (library version of dhclient)
%patch16 -p1 %patch16 -p1
# Modify LDADD in server/Makefile.am
%patch17 -p1
# Copy in documentation and example scripts for LDAP patch to dhcpd # Copy in documentation and example scripts for LDAP patch to dhcpd
%{__install} -p -m 0644 %{SOURCE5} . %{__install} -p -m 0644 %{SOURCE5} .
%{__install} -p -m 0644 %{SOURCE6} doc/ %{__install} -p -m 0644 %{SOURCE6} doc/
@ -232,6 +230,7 @@ autoheader
automake --foreign --add-missing --copy automake --foreign --add-missing --copy
%build %build
CFLAGS="%{optflags} -fPIC" \
%configure \ %configure \
--enable-dhcpv6 \ --enable-dhcpv6 \
--with-srv-lease-file=%{_localstatedir}/lib/dhcpd/dhcpd.leases \ --with-srv-lease-file=%{_localstatedir}/lib/dhcpd/dhcpd.leases \