honeyd/honeyd.patch@9fe04d4d4e5a
honeyd/honeyd.patch
Mon, 17 Sep 2012 19:10:10 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Mon, 17 Sep 2012 19:10:10 +0200
- changeset 689
- 9fe04d4d4e5a
- parent 574
- 1074e5934dd9
- child 715
- c10fb90893b9
- permissions
- -rw-r--r--
Update to new version of vendor software although Oracle fails to deliver.
More specifically, newer db(3) patch revisions exist but Oracle has
removed them from the canonical download server URI for Berkely DB.
1 Index: command.c
2 --- command.c.orig 2006-08-19 09:10:40 +0200
3 +++ command.c 2006-08-24 12:14:21 +0200
4 @@ -72,6 +72,9 @@
5 #include "pyextend.h"
6 #include "honeyd_overload.h"
7 #include "util.h"
8 +#ifndef HAVE_SETENV
9 +#include "setenv.h"
10 +#endif
12 ssize_t atomicio(ssize_t (*)(), int, void *, size_t);
14 Index: compat/getopt.h
15 --- compat/getopt.h.orig 2006-08-19 09:10:40 +0200
16 +++ compat/getopt.h 2006-08-24 12:14:21 +0200
17 @@ -40,7 +40,11 @@
18 #ifndef _GETOPT_H_
19 #define _GETOPT_H_
21 +#ifdef HAVE_SYS_CDEFS_H
22 #include <sys/cdefs.h>
23 +#else
24 +#include "cdefs.h"
25 +#endif
27 /*
28 * GNU-like getopt_long() and 4.4BSD getsubopt()/optreset extensions
29 Index: compat/sha1.h
30 --- compat/sha1.h.orig 2006-08-19 09:10:40 +0200
31 +++ compat/sha1.h 2006-08-24 12:14:21 +0200
32 @@ -15,7 +15,11 @@
33 unsigned char buffer[64];
34 } SHA1_CTX;
36 +#ifdef HAVE_SYS_CDEFS_H
37 #include <sys/cdefs.h>
38 +#else
39 +#include "cdefs.h"
40 +#endif
42 __BEGIN_DECLS
43 void SHA1Transform(u_int32_t [5], const unsigned char [64])
44 Index: config.h.in
45 --- config.h.in.orig 2006-01-17 18:11:44 +0100
46 +++ config.h.in 2006-08-24 12:14:21 +0200
47 @@ -222,6 +222,9 @@
48 /* Define to 1 if you have the `strtoul' function. */
49 #undef HAVE_STRTOUL
51 +/* Define to 1 if you have the `setenv' function. */
52 +#undef HAVE_SETENV
53 +
54 /* Define if your system defines struct sockaddr_storage */
55 #undef HAVE_STRUCT_SOCKADDR_STORAGE
57 @@ -255,6 +258,9 @@
58 /* Define to 1 if you have the <sys/types.h> header file. */
59 #undef HAVE_SYS_TYPES_H
61 +/* Define to 1 if you have the <sys/cdefs.h> header file. */
62 +#undef HAVE_SYS_CDEFS_H
63 +
64 /* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
65 #undef HAVE_SYS_WAIT_H
67 Index: dhcpclient.c
68 --- dhcpclient.c.orig 2006-08-19 09:10:41 +0200
69 +++ dhcpclient.c 2006-08-24 12:14:21 +0200
70 @@ -94,6 +94,13 @@
72 #define NTRIES 10
74 +#ifndef MIN
75 +# define MIN(a,b) (((a) < (b)) ? (a) : (b))
76 +#endif /* MIN */
77 +#ifndef MAX
78 +# define MAX(a,b) (((a) > (b)) ? (a) : (b))
79 +#endif /* MAX */
80 +
81 static int _pack_request(struct dhcpclient_req *, void *, size_t *);
82 static int _pack_release(struct dhcpclient_req *, void *, size_t *);
83 static int _bcast(struct template *,
84 Index: honeyd.c
85 --- honeyd.c.orig 2006-08-19 09:14:36 +0200
86 +++ honeyd.c 2006-08-24 12:14:21 +0200
87 @@ -101,6 +101,9 @@
88 #include "histogram.h"
89 #include "update.h"
90 #include "util.h"
91 +#ifndef HAVE_SETENV
92 +#include "setenv.h"
93 +#endif
95 #ifdef HAVE_PYTHON
96 #include <Python.h>
97 Index: honeyd_overload.c
98 --- honeyd_overload.c.orig 2006-08-19 09:10:41 +0200
99 +++ honeyd_overload.c 2006-08-24 12:14:21 +0200
100 @@ -295,7 +295,7 @@
101 struct fd *nfd;
102 int pair[2];
104 - if (socketpair(AF_LOCAL, type, 0, pair) == -1) {
105 + if (socketpair(AF_UNIX, type, 0, pair) == -1) {
106 warn("%s: socketpair", __func__);
107 return (NULL);
108 }
109 @@ -625,7 +625,7 @@
110 }
112 /* Get another socketpair */
113 - if (socketpair(AF_LOCAL, SOCK_STREAM, 0, pair) == -1) {
114 + if (socketpair(AF_UNIX, SOCK_STREAM, 0, pair) == -1) {
115 DPRINTF((stderr, "%s: socketpair failed", __func__));
116 errno = ETIMEDOUT; /* XXX */
117 return (-1);
118 @@ -732,6 +732,7 @@
119 }
120 #endif /* !__FreeBSD__ */
122 +#ifndef sun
123 ssize_t
124 recvfrom(int sock, void *buf, size_t len, int flags, struct sockaddr *from,
125 socklen_t *fromlen)
126 @@ -759,6 +760,7 @@
127 out:
128 return (ret);
129 }
130 +#endif /* !sun */
132 ssize_t
133 sendto(int sock, const void *buf, size_t len, int flags,
134 @@ -795,6 +797,7 @@
135 return (ret);
136 }
138 +#ifndef sun
139 int
140 getsockname(int sock, struct sockaddr *to, socklen_t *tolen)
141 {
142 @@ -832,6 +835,7 @@
144 return (0);
145 }
146 +#endif /* !sun */
148 ssize_t
149 recvmsg(int sock, struct msghdr *msg, int flags)
150 @@ -1120,6 +1124,7 @@
151 return (ret);
152 }
154 +#ifndef sun
155 int
156 accept(int sock, struct sockaddr *addr, socklen_t *addrlen)
157 {
158 @@ -1169,6 +1174,7 @@
160 return (fd);
161 }
162 +#endif /* !sun */
164 #if 0
166 Index: personality.c
167 --- personality.c.orig 2006-08-19 09:10:40 +0200
168 +++ personality.c 2006-08-24 12:14:21 +0200
169 @@ -32,6 +32,9 @@
171 #include <sys/param.h>
172 #include <sys/types.h>
173 +#ifndef UINT_MAX
174 +#define UINT_MAX 4294967295U
175 +#endif
177 #include "config.h"
179 Index: pf_osfp.c
180 --- pf_osfp.c.orig 2006-08-19 09:10:40 +0200
181 +++ pf_osfp.c 2006-08-24 12:14:21 +0200
182 @@ -50,6 +50,10 @@
183 # define DPFPRINTF(format, x...) ((void)0)
184 # endif /* PFDEBUG */
186 +#ifndef MAX
187 +# define MAX(a,b) (((a) > (b)) ? (a) : (b))
188 +#endif
189 +
190 SLIST_HEAD(pf_osfp_list, pf_os_fingerprint) pf_osfp_list;
191 pool_t pf_osfp_entry_pl;
192 pool_t pf_osfp_pl;
