summaryrefslogtreecommitdiff
path: root/package/dhcp6/patches
diff options
context:
space:
mode:
authorwbx <wbx@hydrogenium.(none)>2009-05-17 14:41:34 +0200
committerwbx <wbx@hydrogenium.(none)>2009-05-17 14:41:34 +0200
commit219a6dab8995aad9ac4860cc1a84d6f3509a03a4 (patch)
treeb9c0f3c43aebba2fcfef777592d0add39f2072f4 /package/dhcp6/patches
Initial import
Diffstat (limited to 'package/dhcp6/patches')
-rw-r--r--package/dhcp6/patches/patch-client_Makefile58
-rw-r--r--package/dhcp6/patches/patch-client_clilib_c22
-rw-r--r--package/dhcp6/patches/patch-client_macros_h10
-rw-r--r--package/dhcp6/patches/patch-client_solicit_c12
-rw-r--r--package/dhcp6/patches/patch-server_Makefile38
-rw-r--r--package/dhcp6/patches/patch-server_macros_h10
-rw-r--r--package/dhcp6/patches/patch-server_reply_c21
7 files changed, 171 insertions, 0 deletions
diff --git a/package/dhcp6/patches/patch-client_Makefile b/package/dhcp6/patches/patch-client_Makefile
new file mode 100644
index 000000000..6004a355b
--- /dev/null
+++ b/package/dhcp6/patches/patch-client_Makefile
@@ -0,0 +1,58 @@
+$Id$
+--- w-dhcp6-1.0-1.orig/client/Makefile 2025-06-28 23:21:40.000000000 +0200
++++ w-dhcp6-1.0-1/client/Makefile 2008-10-20 13:29:40.000000000 +0200
+@@ -1,42 +1,40 @@
+-
+-CC = gcc
+ STD_HEADERS = stdhead.h head.h struct.h options_type.h message_type.h states.h timer_val.h constants.h macros.h status_codes.h
+ OBJECT_FILES = client.o solicit.o clilib.o parse.o request.o decline.o renew.o rebind.o release.o
+ HEADER_FILES = solicit.h clilib.h parse.h request.h decline.h renew.h rebind.h release.h
+-
++IFLAGS = -I$(STAGING_DIR)/usr/include
+
+ dhcpv6_client : dhcpv6_client.c cli
+- $(CC) -g3 dhcpv6_client.c -o dhcpv6_client
++ $(CC) $(IFLAGS) dhcpv6_client.c -o dhcpv6_client
+
+ cli : $(OBJECT_FILES)
+- $(CC) -g3 $(OBJECT_FILES) -o cli -lncurses
++ $(CC) $(IFLAGS) $(OBJECT_FILES) -o cli -L$(STAGING_DIR)/usr/lib -lncurses
+
+ client.o : client.c $(STD_HEADERS) $(HEADER_FILES)
+- $(CC) -g3 -c client.c -o client.o
++ $(CC) $(IFLAGS) -c client.c -o client.o
+
+ release.o : release.c release.h clilib.h
+- $(CC) -g3 -c release.c -o release.o
++ $(CC) $(IFLAGS) -c release.c -o release.o
+
+ rebind.o : rebind.c rebind.h clilib.h
+- $(CC) -g3 -c rebind.c -o rebind.o
++ $(CC) $(IFLAGS) -c rebind.c -o rebind.o
+
+ renew.o : renew.c renew.h clilib.h
+- $(CC) -g3 -c renew.c -o renew.o
++ $(CC) $(IFLAGS) -c renew.c -o renew.o
+
+ request.o : request.c request.h clilib.h
+- $(CC) -g3 -c request.c -o request.o
++ $(CC) $(IFLAGS) -c request.c -o request.o
+
+ decline.o : decline.c decline.h clilib.h parse.h solicit.h
+- $(CC) -g3 -c decline.c -o decline.o
++ $(CC) $(IFLAGS) -c decline.c -o decline.o
+
+ solicit.o : solicit.c solicit.h clilib.h parse.h
+- $(CC) -g3 -c solicit.c -o solicit.o
++ $(CC) $(IFLAGS) -c solicit.c -o solicit.o
+
+ clilib.o : clilib.c clilib.h parse.h
+- $(CC) -g3 -c clilib.c -o clilib.o
++ $(CC) $(IFLAGS) -c clilib.c -o clilib.o
+
+ parse.o : parse.c parse.h clilib.h
+- $(CC) -g3 -c parse.c -o parse.o
++ $(CC) $(IFLAGS) -c parse.c -o parse.o
+
+ clean :
+ rm -f *.o cli dhcpv6_client
diff --git a/package/dhcp6/patches/patch-client_clilib_c b/package/dhcp6/patches/patch-client_clilib_c
new file mode 100644
index 000000000..a9f416fa6
--- /dev/null
+++ b/package/dhcp6/patches/patch-client_clilib_c
@@ -0,0 +1,22 @@
+$Id$
+--- w-dhcp6-1.0-1.orig/client/clilib.c Sat Jun 28 23:21:17 2025
++++ w-dhcp6-1.0-1/client/clilib.c Tue Jul 25 10:37:06 2006
+@@ -554,7 +554,7 @@ u_int8_t convert_character_to_hex (char
+
+ void generate_trans_id (u_int32_t *trans_id)
+ {
+- extern u_int32_t g_trans_id;
++ extern int g_trans_id;
+ time_t t;
+ srand (time (&t));
+ *trans_id = 0;
+@@ -890,9 +890,7 @@ void read_option (char *m, int index, in
+ break;
+
+ default :
+-#if DEBUG == 3
+ printf ("Unrecognized DUID type\n");
+-#endif
+ }
+
+ next_opt = (struct OPTIONS *) malloc (sizeof (struct OPTIONS));
diff --git a/package/dhcp6/patches/patch-client_macros_h b/package/dhcp6/patches/patch-client_macros_h
new file mode 100644
index 000000000..f918cd5fd
--- /dev/null
+++ b/package/dhcp6/patches/patch-client_macros_h
@@ -0,0 +1,10 @@
+$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
+--- w-dhcp6-1.0-1.orig/client/macros.h 2025-06-28 23:21:40.000000000 +0200
++++ w-dhcp6-1.0-1/client/macros.h 2008-10-20 15:31:08.000000000 +0200
+@@ -1,5 +1,5 @@
+ #define INITIALIZE_SOCKADDR(x){ \
+- bzero((char *) &(x), sizeof((x))); \
++ memset((char *) &(x), 0, sizeof((x))); \
+ (x).sin6_family = AF_INET6; \
+ (x).sin6_flowinfo = htonl(0); \
+ (x).sin6_scope_id = 0; \
diff --git a/package/dhcp6/patches/patch-client_solicit_c b/package/dhcp6/patches/patch-client_solicit_c
new file mode 100644
index 000000000..7214598f0
--- /dev/null
+++ b/package/dhcp6/patches/patch-client_solicit_c
@@ -0,0 +1,12 @@
+$Id$
+--- w-dhcp6-1.0-1.orig/client/solicit.c Sat Jun 28 23:21:17 2025
++++ w-dhcp6-1.0-1/client/solicit.c Tue Jul 25 10:37:07 2006
+@@ -18,7 +18,7 @@ struct DHCP_MESSAGE * create_solicit_mes
+ dhcp_message_ptr -> opt = add_client_id_option (interface_details);
+
+ opt_ptr = (struct OPTIONS *) dhcp_message_ptr -> opt;
+- (struct OPTIONS *) ((struct DUID *) opt_ptr -> opt_data) -> opt = add_ia_option (interface_details);
++ ((struct DUID *) opt_ptr -> opt_data) -> opt = add_ia_option (interface_details);
+ return dhcp_message_ptr;
+ }
+
diff --git a/package/dhcp6/patches/patch-server_Makefile b/package/dhcp6/patches/patch-server_Makefile
new file mode 100644
index 000000000..0ae2e4825
--- /dev/null
+++ b/package/dhcp6/patches/patch-server_Makefile
@@ -0,0 +1,38 @@
+$Id$
+--- w-dhcp6-1.0-1.orig/server/Makefile Fri Jun 28 14:49:42 2002
++++ w-dhcp6-1.0-1/server/Makefile Tue Jul 25 10:37:06 2006
+@@ -1,27 +1,26 @@
+-CC = gcc
+ STD_HEADERS = stdhead.h head.h struct.h options_type.h message_type.h macros.h status_codes.h constants.h
+ OBJECT_FILES = server.o lib.o advertise.o parse.o leases.o reply.o
+
+ serv: $(OBJECT_FILES)
+- $(CC) -g3 $(OBJECT_FILES) -o serv
++ $(CC) $(OBJECT_FILES) -o serv
+
+ lib.o: lib.c lib.h $(STD_HEADERS)
+- $(CC) -g3 -c lib.c -o lib.o
++ $(CC) -c lib.c -o lib.o
+
+ parse.o: parse.c parse.h $(STD_HEADERS)
+- $(CC) -g3 -c parse.c -o parse.o
++ $(CC) -c parse.c -o parse.o
+
+ leases.o: leases.c leases.h $(STD_HEADERS)
+- $(CC) -g3 -c leases.c -o leases.o
++ $(CC) -c leases.c -o leases.o
+
+ advertise.o: advertise.c advertise.h $(STD_HEADERS)
+- $(CC) -g3 -c advertise.c -o advertise.o
++ $(CC) -c advertise.c -o advertise.o
+
+ reply.o: reply.c reply.h $(STD_HEADERS)
+- $(CC) -g3 -c reply.c -o reply.o
++ $(CC) -c reply.c -o reply.o
+
+ server.o: server.c lib.h advertise.h reply.h leases.h parse.h $(STD_HEADERS)
+- $(CC) -g3 -c server.c -o server.o
++ $(CC) -c server.c -o server.o
+
+ clean:
+ rm -f *.o serv
diff --git a/package/dhcp6/patches/patch-server_macros_h b/package/dhcp6/patches/patch-server_macros_h
new file mode 100644
index 000000000..916e4c798
--- /dev/null
+++ b/package/dhcp6/patches/patch-server_macros_h
@@ -0,0 +1,10 @@
+$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
+--- w-dhcp6-1.0-1.orig/server/macros.h 2002-06-28 14:50:04.000000000 +0200
++++ w-dhcp6-1.0-1/server/macros.h 2008-10-20 15:30:53.000000000 +0200
+@@ -1,5 +1,5 @@
+ #define INITIALIZE_SOCKADDR(x){ \
+- bzero((char *) &(x), sizeof((x))); \
++ memset((char *) &(x), 0, sizeof((x))); \
+ (x).sin6_family = AF_INET6; \
+ (x).sin6_flowinfo = htonl(0); \
+ (x).sin6_scope_id = 0; \
diff --git a/package/dhcp6/patches/patch-server_reply_c b/package/dhcp6/patches/patch-server_reply_c
new file mode 100644
index 000000000..bafca5ae1
--- /dev/null
+++ b/package/dhcp6/patches/patch-server_reply_c
@@ -0,0 +1,21 @@
+$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
+--- w-dhcp6-1.0-1.orig/server/reply.c 2002-06-28 14:50:04.000000000 +0200
++++ w-dhcp6-1.0-1/server/reply.c 2008-10-20 15:29:52.000000000 +0200
+@@ -147,7 +147,7 @@ struct DHCP_MESSAGE * create_dummy_reply
+ opt_ptr -> u_opt_len.opt_len = opt_src_ptr -> u_opt_len.opt_len;
+ ia_ptr = (struct IA *) malloc (sizeof (struct IA));
+ opt_ptr -> opt_data = ia_ptr;
+- bzero (ia_ptr, sizeof (struct IA));
++ memset (ia_ptr, 0, sizeof (struct IA));
+ ia_ptr -> u_iaid.iaid = ia_src_ptr -> u_iaid.iaid;
+
+ // set IAADDR option with values set to null
+@@ -159,7 +159,7 @@ struct DHCP_MESSAGE * create_dummy_reply
+ opt_ptr -> u_opt_len.opt_len = opt_src_ptr -> u_opt_len.opt_len;
+ iaaddr_ptr = (struct IA_ADDRESS *) malloc (sizeof (struct IA_ADDRESS));
+ opt_ptr -> opt_data = iaaddr_ptr;
+- bzero (iaaddr_ptr, sizeof (struct IA_ADDRESS));
++ memset (iaaddr_ptr, 0, sizeof (struct IA_ADDRESS));
+
+ return dhcp_message_ptr;
+ }