diff options
Diffstat (limited to 'net/isc-dhcp30-server/files')
| -rw-r--r-- | net/isc-dhcp30-server/files/patch-aj | 43 | ||||
| -rw-r--r-- | net/isc-dhcp30-server/files/patch-clparse.c | 5 | ||||
| -rw-r--r-- | net/isc-dhcp30-server/files/patch-dhclient.8 | 23 | ||||
| -rw-r--r-- | net/isc-dhcp30-server/files/patch-dhclient.c | 39 | ||||
| -rw-r--r-- | net/isc-dhcp30-server/files/patch-freebsd | 89 | ||||
| -rw-r--r-- | net/isc-dhcp30-server/files/patch-site.conf | 23 |
6 files changed, 0 insertions, 222 deletions
diff --git a/net/isc-dhcp30-server/files/patch-aj b/net/isc-dhcp30-server/files/patch-aj deleted file mode 100644 index 14f7db13ff15..000000000000 --- a/net/isc-dhcp30-server/files/patch-aj +++ /dev/null @@ -1,43 +0,0 @@ ---- includes/dhcpd.h.orig Wed Feb 2 18:01:17 2000 -+++ includes/dhcpd.h Mon Jul 17 21:21:04 2000 -@@ -329,7 +329,7 @@ - #endif - - #ifndef CL_DEFAULT_SCRIPT_NAME --# define CL_DEFAULT_SCRIPT_NAME "/etc/dhclient-script" -+# define CL_DEFAULT_SCRIPT_NAME "!!PREFIX!!/etc/dhclient-script" - #endif - - #ifndef CL_DEFAULT_REQUESTED_OPTIONS -@@ -771,11 +771,11 @@ - #define _PATH_DHCPD_DB "dhcpd.leases" - #else - #ifndef _PATH_DHCPD_CONF --#define _PATH_DHCPD_CONF "/etc/dhcpd.conf" -+#define _PATH_DHCPD_CONF "!!PREFIX!!/etc/dhcpd.conf" - #endif - - #ifndef _PATH_DHCPD_DB --#define _PATH_DHCPD_DB "/etc/dhcpd.leases" -+#define _PATH_DHCPD_DB "!!PREFIX!!/etc/dhcpd.leases" - #endif - - #ifndef _PATH_DHCPD_PID -@@ -784,7 +784,7 @@ - #endif - - #ifndef _PATH_DHCLIENT_CONF --#define _PATH_DHCLIENT_CONF "/etc/dhclient.conf" -+#define _PATH_DHCLIENT_CONF "!!PREFIX!!/etc/dhclient.conf" - #endif - - #ifndef _PATH_DHCLIENT_PID -@@ -792,7 +792,7 @@ - #endif - - #ifndef _PATH_DHCLIENT_DB --#define _PATH_DHCLIENT_DB "/etc/dhclient.leases" -+#define _PATH_DHCLIENT_DB "!!PREFIX!!/etc/dhclient.leases" - #endif - - #ifndef _PATH_RESOLV_CONF diff --git a/net/isc-dhcp30-server/files/patch-clparse.c b/net/isc-dhcp30-server/files/patch-clparse.c deleted file mode 100644 index f2da52a15884..000000000000 --- a/net/isc-dhcp30-server/files/patch-clparse.c +++ /dev/null @@ -1,5 +0,0 @@ ---- client/clparse.c.orig Wed Jul 19 21:13:10 2000 -+++ client/clparse.c Thu Jul 20 21:52:53 2000 -@@ -46 +46 @@ --char client_script_name [] = "/etc/dhclient-script"; -+char client_script_name [] = CL_DEFAULT_SCRIPT_NAME; diff --git a/net/isc-dhcp30-server/files/patch-dhclient.8 b/net/isc-dhcp30-server/files/patch-dhclient.8 deleted file mode 100644 index 160c451e445b..000000000000 --- a/net/isc-dhcp30-server/files/patch-dhclient.8 +++ /dev/null @@ -1,23 +0,0 @@ ---- client/dhclient.8.orig Wed May 10 02:36:03 2000 -+++ client/dhclient.8 Wed May 10 02:39:43 2000 -@@ -34,7 +34,7 @@ - .B -q - ] - [ --.B -c -+.B -1 - ] - [ - .B -lf -@@ -170,6 +170,11 @@ - .B -q - flag prevents any messages other than errors from being printed to the - standard error descriptor. -+.PP -+The -+.B -1 -+flag cause dhclient to try once to get a lease. If it fails, dhclient exits -+with exit code two. - .PP - The DHCP client normally gets its configuration information from - .B ETCDIR/dhclient.conf, diff --git a/net/isc-dhcp30-server/files/patch-dhclient.c b/net/isc-dhcp30-server/files/patch-dhclient.c deleted file mode 100644 index bb43074fbd36..000000000000 --- a/net/isc-dhcp30-server/files/patch-dhclient.c +++ /dev/null @@ -1,39 +0,0 @@ ---- client/dhclient.c.orig Thu Sep 14 05:42:01 2000 -+++ client/dhclient.c Wed Sep 27 03:31:33 2000 -@@ -78,6 +78,7 @@ - u_int16_t remote_port; - int no_daemon; - int save_scripts; -+int onetry; - - static void usage PROTO ((void)); - -@@ -176,6 +177,8 @@ - } else if (!strcmp (argv [i], "-w")) { - /* do not exit if there are no broadcast interfaces. */ - persist = 1; -+ } else if (!strcmp (argv [i], "-1")) { -+ onetry = 1; - } else if (argv [i][0] == '-') { - usage (); - } else { -@@ -417,7 +420,7 @@ - log_info (arr); - log_info (url); - -- log_error ("Usage: dhclient [-d] [-D] [-q] [-p <port>] %s", -+ log_error ("Usage: dhclient [-1] [-d] [-D] [-q] [-p <port>] %s", - "[-s server]"); - log_fatal (" [-lf lease-file] [-pf pid-file]%s", - "[-cf config-file] [interface]"); -@@ -1402,6 +1405,10 @@ - /* No leases were available, or what was available didn't work, so - tell the shell script that we failed to allocate an address, - and try again later. */ -+ if (onetry) { -+ exit(2); -+ log_info ("Unable to obtain a lease on first try - exiting.\n"); -+ } - log_info ("No working leases in persistent database - sleeping."); - script_init (client, "FAIL", (struct string_list *)0); - if (client -> alias) diff --git a/net/isc-dhcp30-server/files/patch-freebsd b/net/isc-dhcp30-server/files/patch-freebsd deleted file mode 100644 index 293aa2a33130..000000000000 --- a/net/isc-dhcp30-server/files/patch-freebsd +++ /dev/null @@ -1,89 +0,0 @@ ---- client/scripts/freebsd.orig Wed Sep 20 02:38:03 2000 -+++ client/scripts/freebsd Wed Sep 27 03:33:29 2000 -@@ -1,5 +1,11 @@ - #!/bin/sh - -+if [ -x /usr/bin/logger ]; then -+ LOGGER="/usr/bin/logger -s -p user.notice -t dhclient" -+else -+ LOGGER=echo -+fi -+ - make_resolv_conf() { - echo search $new_domain_name >/etc/resolv.conf - for nameserver in $new_domain_name_servers; do -@@ -10,17 +16,17 @@ - # Must be used on exit. Invokes the local dhcp client exit hooks, if any. - exit_with_hooks() { - exit_status=$1 -- if [ -x /etc/dhclient-exit-hooks ]; then -- . /etc/dhclient-exit-hooks -+ if [ -x !!PREFIX!!/etc/dhclient-exit-hooks ]; then -+ . !!PREFIX!!/etc/dhclient-exit-hooks - fi - # probably should do something with exit status of the local script - exit $exit_status - } - - # Invoke the local dhcp client enter hooks, if they exist. --if [ -x /etc/dhclient-enter-hooks ]; then -+if [ -x !!PREFIX!!/etc/dhclient-enter-hooks ]; then - exit_status=0 -- . /etc/dhclient-enter-hooks -+ . !!PREFIX!!/etc/dhclient-enter-hooks - # allow the local script to abort processing of this state - # local script must set exit_status variable to nonzero. - if [ $exit_status -ne 0 ]; then -@@ -29,11 +35,10 @@ - fi - - if [ x$new_network_number != x ]; then -- echo New Network Number: $new_network_number -+ $LOGGER "New Network Number: $new_network_number" - fi - - if [ x$new_broadcast_address != x ]; then -- echo New Broadcast Address: $new_broadcast_address - new_broadcast_arg="broadcast $new_broadcast_address" - fi - if [ x$old_broadcast_address != x ]; then -@@ -77,6 +82,7 @@ - [ x$current_hostname = x$old_host_name ]; then - if [ x$current_hostname = x ] || \ - [ x$new_host_name != x$old_host_name ]; then -+ $LOGGER "New Hostname: $new_host_name" - hostname $new_host_name - fi - fi -@@ -105,11 +111,18 @@ - [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then - ifconfig $interface inet $new_ip_address $new_netmask_arg \ - $new_broadcast_arg $medium -+ $LOGGER "New IP Address($interface): $new_ip_address" -+ $LOGGER "New Subnet Mask ($interface): $new_subnet_mask" -+ $LOGGER "New Broadcast Address($interface): $new_broadcast_address" -+ if [ "$new_routers" != "" ]; then -+ $LOGGER "New Routers: $new_routers" -+ fi - route add $new_ip_address 127.1 >/dev/null 2>&1 - for router in $new_routers; do - route add default $router >/dev/null 2>&1 - done - if [ "$new_static_routes" != "" ]; then -+ $LOGGER "New Static Routes: $new_static_routes" - set $new_static_routes - while [ $# -gt 1 ]; do - route add $1 $2 -@@ -161,8 +174,12 @@ - fi - ifconfig $interface inet $new_ip_address $new_netmask_arg \ - $new_broadcast_arg $medium -+ $LOGGER "New IP Address($interface): $new_ip_address" -+ $LOGGER "New Subnet Mask($interface): $new_subnet_mask" -+ $LOGGER "New Broadcast Address($interface): $new_broadcast_address" - sleep 1 - if [ "$new_routers" != "" ]; then -+ $LOGGER "New Routers: $new_routers" - set $new_routers - if ping -q -c 1 $1; then - if [ x$new_ip_address != x$alias_ip_address ] && \ diff --git a/net/isc-dhcp30-server/files/patch-site.conf b/net/isc-dhcp30-server/files/patch-site.conf deleted file mode 100644 index afe3d066ff89..000000000000 --- a/net/isc-dhcp30-server/files/patch-site.conf +++ /dev/null @@ -1,23 +0,0 @@ ---- site.conf.orig Wed Jul 7 08:20:10 1999 -+++ site.conf Tue Oct 3 08:59:57 2000 -@@ -1,2 +1,20 @@ - # Put local site configuration stuff here to override the default - # settings in Makefile.conf -+ -+PREFIX ?= /usr/local -+ -+ETC = $(PREFIX)/etc -+BINDIR = $(PREFIX)/sbin -+CLIENTBINDIR = $(PREFIX)/sbin -+MANCAT = man -+ADMMANDIR = $(PREFIX)/man/man8 -+ADMMANEXT = .8 -+FFMANDIR = $(PREFIX)/man/man5 -+FFMANEXT = .5 -+LIBMANDIR = $(PREFIX)/man/man3 -+LIBMANEXT = .3 -+ -+DEBUG ?= #none -+CFLAGS += -DCL_DEFAULT_SCRIPT_NAME=\"$(ETC)/dhclient-script\" -+CFLAGS += -D_PATH_DHCPD_CONF=\"$(ETC)/dhcpd.conf\" -+CFLAGS += -D_PATH_DHCLIENT_CONF=\"$(ETC)/dhclient.conf\" |