SOURCES: dhcp-libdhcp4client.patch, dhcp-options.patch, dhcp-ldap....
glen
glen at pld-linux.org
Sun Apr 27 15:33:54 CEST 2008
Author: glen Date: Sun Apr 27 13:33:54 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- back to 4.0.0 on HEAD, 4.1.0a1 moved to DEVEL
---- Files affected:
SOURCES:
dhcp-libdhcp4client.patch (1.6 -> 1.7) , dhcp-options.patch (1.3 -> 1.4) , dhcp-ldap.patch (1.8 -> 1.9) , dhcp-dhclient.script.patch (1.4 -> 1.5)
---- Diffs:
================================================================
Index: SOURCES/dhcp-libdhcp4client.patch
diff -u SOURCES/dhcp-libdhcp4client.patch:1.6 SOURCES/dhcp-libdhcp4client.patch:1.7
--- SOURCES/dhcp-libdhcp4client.patch:1.6 Sun Apr 27 15:05:01 2008
+++ SOURCES/dhcp-libdhcp4client.patch Sun Apr 27 15:33:49 2008
@@ -1,3 +1,4 @@
+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 2008-01-22 17:04:28.000000000 -1000
@@ -1,5 +1,32 @@
@@ -43,6 +44,7 @@
AC_CONFIG_HEADERS([includes/config.h])
# 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
--- 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-22 17:04:28.000000000 -1000
@@ -1,10 +1,18 @@
@@ -64,17 +66,18 @@
man_MANS = omapi.3
EXTRA_DIST = $(man_MANS)
---- dhcp-4.1.0a1/omapip/dispatch.c~ 2008-04-27 16:03:42.000000000 +0300
-+++ dhcp-4.1.0a1/omapip/dispatch.c 2008-04-27 16:04:03.347565427 +0300
+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 2008-01-22 17:04:28.000000000 -1000
@@ -37,7 +37,7 @@
#include <omapip/omapip_p.h>
#include <sys/time.h>
-static omapi_io_object_t omapi_io_states;
+omapi_io_object_t omapi_io_states;
- struct timeval cur_tv;
+ time_t cur_time;
- struct eventqueue *rw_queue_empty;
+ OMAPI_OBJECT_ALLOC (omapi_io,
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-22 17:04:28.000000000 -1000
+++ dhcp-4.0.0/omapip/errwarn.c 2008-01-22 17:04:28.000000000 -1000
@@ -195,6 +198,7 @@
return 0;
}
+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 2008-01-22 17:04:28.000000000 -1000
@@ -37,6 +37,33 @@
@@ -252,6 +256,7 @@
}
#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
--- dhcp-4.0.0/dst/Makefile.am.libdhcp4client 2008-01-22 17:04:28.000000000 -1000
+++ dhcp-4.0.0/dst/Makefile.am 2008-01-22 17:04:28.000000000 -1000
@@ -2,7 +2,7 @@ AM_CPPFLAGS = -DMINIRES_LIB -DHMAC_MD5
@@ -272,6 +277,7 @@
+ base64.c prandom.c
+
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
--- 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-22 17:04:28.000000000 -1000
@@ -39,6 +39,10 @@ static const char rcsid[] = "$Header: /p
@@ -359,6 +365,7 @@
if (dst_t_func[KEY_HMAC_MD5] == NULL)
return (0);
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
--- 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-22 17:04:28.000000000 -1000
@@ -1,11 +1,17 @@
@@ -380,6 +387,7 @@
man_MANS = dhcp-eval.5 dhcp-options.5
EXTRA_DIST = $(man_MANS)
+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 2008-01-22 17:04:28.000000000 -1000
@@ -883,6 +883,10 @@ add_ipv6_addr_to_interface(struct interf
@@ -421,6 +429,7 @@
#if defined (F_SETFD)
if (fallback_interface) {
+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 2008-01-22 17:04:28.000000000 -1000
@@ -41,7 +41,7 @@
@@ -440,6 +449,7 @@
int evaluate_option_cache (result, packet, lease, client_state,
in_options, cfg_options, scope, oc, file, line)
struct data_string *result;
+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 2008-01-22 17:04:28.000000000 -1000
@@ -3392,6 +3392,7 @@ fqdn6_universe_decode(struct option_stat
@@ -450,6 +460,7 @@
void option_space_foreach (struct packet *packet, struct lease *lease,
struct client_state *client_state,
struct option_state *in_options,
+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-22 17:04:28.000000000 -1000
+++ dhcp-4.0.0/common/dispatch.c 2008-01-22 17:04:28.000000000 -1000
@@ -34,8 +34,24 @@
@@ -721,6 +732,7 @@
}
+#endif
}
+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 2008-01-22 17:04:28.000000000 -1000
@@ -1004,7 +1004,11 @@ int executable_statement_reference (ptr,
@@ -735,23 +747,24 @@
#if defined (DEBUG_MEMORY_LEAKAGE) || \
defined (DEBUG_MEMORY_LEAKAGE_ON_EXIT)
---- dhcp-4.1.0a1/includes/dhcpd.h~ 2008-04-27 15:59:29.000000000 +0300
-+++ dhcp-4.1.0a1/includes/dhcpd.h 2008-04-27 16:00:57.528854928 +0300
-@@ -1211,14 +1211,6 @@
+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-22 17:04:28.000000000 -1000
++++ dhcp-4.0.0/includes/dhcpd.h 2008-01-22 17:05:02.000000000 -1000
+@@ -1199,14 +1199,6 @@ struct hardware_link {
typedef void (*tvref_t)(void *, void *, const char *, int);
typedef void (*tvunref_t)(void *, const char *, int);
-struct timeout {
- struct timeout *next;
-- struct timeval when;
+- TIME when;
- void (*func) PROTO ((void *));
- void *what;
- tvref_t ref;
- tvunref_t unref;
-};
- struct eventqueue {
- struct eventqueue *next;
+ struct protocol {
+ struct protocol *next;
@@ -1664,7 +1656,6 @@ extern const char *path_dhcpd_pid;
extern int dhcp_max_agent_option_packet_length;
@@ -779,6 +792,7 @@
extern int dhcp_option_default_priority_list [];
extern int dhcp_option_default_priority_list_count;
extern const char *hardware_types [256];
+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 2008-01-22 17:04:28.000000000 -1000
@@ -1,10 +1,18 @@
@@ -800,6 +814,7 @@
man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
EXTRA_DIST = $(man_MANS)
+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-22 17:04:28.000000000 -1000
+++ dhcp-4.0.0/client/dhclient.c 2008-01-22 17:05:47.000000000 -1000
@@ -83,14 +83,50 @@ int nowait=0;
================================================================
Index: SOURCES/dhcp-options.patch
diff -u SOURCES/dhcp-options.patch:1.3 SOURCES/dhcp-options.patch:1.4
--- SOURCES/dhcp-options.patch:1.3 Wed Mar 12 23:08:04 2008
+++ SOURCES/dhcp-options.patch Sun Apr 27 15:33:49 2008
@@ -26,13 +26,13 @@
diff -up dhcp-4.0.0/includes/dhctoken.h.options dhcp-4.0.0/includes/dhctoken.h
--- dhcp-4.0.0/includes/dhctoken.h.options 2007-10-31 09:13:33.000000000 -1000
+++ dhcp-4.0.0/includes/dhctoken.h 2007-12-29 11:13:51.000000000 -1000
-@@ -349,7 +349,8 @@
- WHITESPACE = 652,
- TOKEN_ALSO = 653,
- AFTER = 654,
-- ZEROLEN = 655
-+ ZEROLEN = 655,
-+ BOOTP_BROADCAST_ALWAYS = 656
+@@ -345,7 +345,8 @@ enum dhcp_token {
+ RANGE6 = 648,
+ WHITESPACE = 649,
+ TOKEN_ALSO = 650,
+- AFTER = 651
++ AFTER = 651,
++ BOOTP_BROADCAST_ALWAYS = 652
};
#define is_identifier(x) ((x) >= FIRST_TOKEN && \
================================================================
Index: SOURCES/dhcp-ldap.patch
diff -u SOURCES/dhcp-ldap.patch:1.8 SOURCES/dhcp-ldap.patch:1.9
--- SOURCES/dhcp-ldap.patch:1.8 Wed Mar 12 23:01:00 2008
+++ SOURCES/dhcp-ldap.patch Sun Apr 27 15:33:49 2008
@@ -2257,30 +2257,31 @@
--- 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-22 15:09:56.000000000 -1000
@@ -238,9 +238,107 @@ static struct option server_options[] =
+ { "dhcpv6-lease-file-name", "t", &server_universe, 54, 1 },
{ "dhcpv6-pid-file-name", "t", &server_universe, 55, 1 },
{ "limit-addrs-per-ia", "L", &server_universe, 56, 1 },
- { "delayed-ack", "S", &server_universe, 57, 1 },
+#if defined(LDAP_CONFIGURATION)
-+ { "ldap-server", "t", &server_universe, 58, 1 },
-+ { "ldap-port", "d", &server_universe, 59, 1 },
-+ { "ldap-username", "t", &server_universe, 60, 1 },
-+ { "ldap-password", "t", &server_universe, 61, 1 },
-+ { "ldap-base-dn", "t", &server_universe, 62, 1 },
-+ { "ldap-method", "Nldap-methods.", &server_universe, 63, 1 },
-+ { "ldap-debug-file", "t", &server_universe, 64, 1 },
-+ { "ldap-dhcp-server-cn", "t", &server_universe, 65, 1 },
-+ { "ldap-referrals", "f", &server_universe, 66, 1 },
++ { "ldap-server", "t", &server_universe, 57, 1 },
++ { "ldap-port", "d", &server_universe, 58, 1 },
++ { "ldap-username", "t", &server_universe, 59, 1 },
++ { "ldap-password", "t", &server_universe, 60, 1 },
++ { "ldap-base-dn", "t", &server_universe, 61, 1 },
++ { "ldap-method", "Nldap-methods.", &server_universe, 62, 1 },
++ { "ldap-debug-file", "t", &server_universe, 63, 1 },
++ { "ldap-dhcp-server-cn", "t", &server_universe, 64, 1 },
++ { "ldap-referrals", "f", &server_universe, 65, 1 },
+#if defined(USE_SSL)
-+ { "ldap-ssl", "Nldap-ssl-usage.", &server_universe, 67, 1 },
-+ { "ldap-tls-reqcert", "Nldap-tls-reqcert.", &server_universe, 68, 1 },
-+ { "ldap-tls-ca-file", "t", &server_universe, 69, 1 },
-+ { "ldap-tls-ca-dir", "t", &server_universe, 70, 1 },
-+ { "ldap-tls-cert", "t", &server_universe, 71, 1 },
-+ { "ldap-tls-key", "t", &server_universe, 72, 1 },
-+ { "ldap-tls-crlcheck", "Nldap-tls-crlcheck.", &server_universe, 73, 1 },
-+ { "ldap-tls-ciphers", "t", &server_universe, 74, 1 },
-+ { "ldap-tls-randfile", "t", &server_universe, 75, 1 },
++ { "ldap-ssl", "Nldap-ssl-usage.", &server_universe, 66, 1 },
++ { "ldap-tls-reqcert", "Nldap-tls-reqcert.", &server_universe, 67, 1 },
++ { "ldap-tls-ca-file", "t", &server_universe, 68, 1 },
++ { "ldap-tls-ca-dir", "t", &server_universe, 69, 1 },
++ { "ldap-tls-cert", "t", &server_universe, 70, 1 },
++ { "ldap-tls-key", "t", &server_universe, 71, 1 },
++ { "ldap-tls-crlcheck", "Nldap-tls-crlcheck.", &server_universe, 72, 1 },
++ { "ldap-tls-ciphers", "t", &server_universe, 73, 1 },
++ { "ldap-tls-randfile", "t", &server_universe, 74, 1 },
+#else
++ { "unknown-66", "X", &server_universe, 66, 1 },
+ { "unknown-67", "X", &server_universe, 67, 1 },
+ { "unknown-68", "X", &server_universe, 68, 1 },
+ { "unknown-69", "X", &server_universe, 69, 1 },
@@ -2289,9 +2290,9 @@
+ { "unknown-72", "X", &server_universe, 72, 1 },
+ { "unknown-73", "X", &server_universe, 73, 1 },
+ { "unknown-74", "X", &server_universe, 74, 1 },
-+ { "unknown-75", "X", &server_universe, 75, 1 },
+#endif
+#else
++ { "unknown-57", "X", &server_universe, 57, 1 },
+ { "unknown-58", "X", &server_universe, 58, 1 },
+ { "unknown-59", "X", &server_universe, 59, 1 },
+ { "unknown-60", "X", &server_universe, 60, 1 },
@@ -2300,7 +2301,6 @@
+ { "unknown-63", "X", &server_universe, 63, 1 },
+ { "unknown-64", "X", &server_universe, 64, 1 },
+ { "unknown-65", "X", &server_universe, 65, 1 },
-+ { "unknown-66", "X", &server_universe, 66, 1 },
+#endif
{ NULL, NULL, NULL, 0, 0 }
};
================================================================
Index: SOURCES/dhcp-dhclient.script.patch
diff -u SOURCES/dhcp-dhclient.script.patch:1.4 SOURCES/dhcp-dhclient.script.patch:1.5
--- SOURCES/dhcp-dhclient.script.patch:1.4 Wed Mar 12 22:53:06 2008
+++ SOURCES/dhcp-dhclient.script.patch Sun Apr 27 15:33:49 2008
@@ -1,7 +1,6 @@
-diff -urN dhcp-4.1.0a1.org/client/scripts/linux dhcp-4.1.0a1/client/scripts/linux
---- dhcp-4.1.0a1.org/client/scripts/linux 2008-01-17 00:02:10.000000000 +0100
-+++ dhcp-4.1.0a1/client/scripts/linux 2008-03-12 22:39:33.024221732 +0100
-@@ -1,296 +1,308 @@
+--- dhcp-3.1.0a3/client/scripts/linux.orig 2006-07-22 04:24:16.000000000 +0200
++++ dhcp-3.1.0a3/client/scripts/linux 2007-04-16 17:25:06.000000000 +0200
+@@ -1,290 +1,302 @@
-#!/bin/bash
+#!/bin/sh
# dhclient-script for Linux. Dan Halbert, March, 1997.
@@ -239,9 +238,6 @@
- route add -net $new_network_number $new_subnet_arg dev $interface
- fi
- for router in $new_routers; do
-- if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
-- route add -host $router dev $interface
-- fi
- route add default gw $router
- done
- fi
@@ -292,9 +288,6 @@
- route add -net $new_network_number
- fi
- for router in $new_routers; do
-- if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
-- route add -host $router dev $interface
-- fi
- route add default gw $router
- done
- make_resolv_conf
@@ -379,9 +372,6 @@
+ /sbin/ip addr add $new_ip_address/$new_subnet_arg $new_broadcast_arg dev $interface
+ # Add a network route to the computed network address.
+ for router in $new_routers; do
-+ if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
-+ /sbin/ip route add $router dev $interface
-+ fi
+ /sbin/ip route add default via $router
+ done
+ if [ -n "$new_static_routes" ]; then
@@ -434,9 +424,6 @@
+ /sbin/ip addr add $alias_ip_address/$alias_subnet_arg dev $interface
+ fi
+ for router in $new_routers; do
-+ if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
-+ /sbin/ip route add $router dev $interface
-+ fi
+ /sbin/ip route add default via $router
+ done
+ if [ -n "$new_static_routes" ]; then
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/dhcp-libdhcp4client.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/dhcp-options.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/dhcp-ldap.patch?r1=1.8&r2=1.9&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/dhcp-dhclient.script.patch?r1=1.4&r2=1.5&f=u
More information about the pld-cvs-commit
mailing list