head	1.17;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.17
	OPENPKG_E1_MP:1.17
	OPENPKG_E1_MP_2_STABLE:1.17.2.2
	OPENPKG_E1_FP:1.17.2.2
	OPENPKG_2_STABLE_MP:1.17
	OPENPKG_2_STABLE_20061018:1.17.2.2
	OPENPKG_2_STABLE:1.17.0.2
	OPENPKG_CW_FP:1.15
	OPENPKG_1_STABLE_MP:1.5;
locks; strict;
comment	@# @;


1.17
date	2006.08.24.10.19.04;	author rse;	state Exp;
branches
	1.17.2.1;
next	1.16;
commitid	5hjETmFw3JXod5Kr;

1.16
date	2006.03.10.14.59.51;	author rse;	state Exp;
branches;
next	1.15;
commitid	XXoo6ftWNWTx8Eor;

1.15
date	2005.01.07.13.07.30;	author ms;	state Exp;
branches;
next	1.14;

1.14
date	2005.01.06.09.50.14;	author rse;	state Exp;
branches;
next	1.13;

1.13
date	2004.06.25.15.16.20;	author ms;	state Exp;
branches;
next	1.12;

1.12
date	2004.04.15.06.55.22;	author rse;	state Exp;
branches;
next	1.11;

1.11
date	2004.01.21.13.01.54;	author rse;	state Exp;
branches;
next	1.10;

1.10
date	2003.11.24.23.24.24;	author thl;	state Exp;
branches;
next	1.9;

1.9
date	2003.10.06.09.48.04;	author ms;	state Exp;
branches;
next	1.8;

1.8
date	2003.09.26.15.01.06;	author ms;	state Exp;
branches;
next	1.7;

1.7
date	2003.09.25.21.41.44;	author ms;	state Exp;
branches;
next	1.6;

1.6
date	2003.09.24.22.37.23;	author ms;	state Exp;
branches;
next	1.5;

1.5
date	2003.06.26.09.39.49;	author thl;	state Exp;
branches;
next	1.4;

1.4
date	2003.02.22.10.34.18;	author rse;	state Exp;
branches;
next	1.3;

1.3
date	2003.02.21.10.44.42;	author ps;	state Exp;
branches;
next	1.2;

1.2
date	2003.02.20.14.50.42;	author ps;	state Exp;
branches;
next	1.1;

1.1
date	2003.02.18.14.52.05;	author ps;	state Exp;
branches;
next	;

1.17.2.1
date	2006.08.24.10.19.04;	author rse;	state dead;
branches;
next	1.17.2.2;
commitid	iZxwRSmmWscPXUQr;

1.17.2.2
date	2006.10.16.14.51.01;	author rse;	state Exp;
branches;
next	;
commitid	iZxwRSmmWscPXUQr;


desc
@@


1.17
log
@upgrade to latest version and cleanup packaging
@
text
@Index: command.c
--- command.c.orig	2006-08-19 09:10:40 +0200
+++ command.c	2006-08-24 12:14:21 +0200
@@@@ -72,6 +72,9 @@@@
 #include "pyextend.h"
 #include "honeyd_overload.h"
 #include "util.h"
+#ifndef HAVE_SETENV
+#include "setenv.h"
+#endif
 
 ssize_t atomicio(ssize_t (*)(), int, void *, size_t);
 
Index: compat/getopt.h
--- compat/getopt.h.orig	2006-08-19 09:10:40 +0200
+++ compat/getopt.h	2006-08-24 12:14:21 +0200
@@@@ -40,7 +40,11 @@@@
 #ifndef _GETOPT_H_
 #define _GETOPT_H_
 
+#ifdef HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
+#else
+#include "cdefs.h"
+#endif
 
 /*
  * GNU-like getopt_long() and 4.4BSD getsubopt()/optreset extensions
Index: compat/sha1.h
--- compat/sha1.h.orig	2006-08-19 09:10:40 +0200
+++ compat/sha1.h	2006-08-24 12:14:21 +0200
@@@@ -15,7 +15,11 @@@@
     unsigned char buffer[64];
 } SHA1_CTX;
 
+#ifdef HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
+#else
+#include "cdefs.h"
+#endif
 
 __BEGIN_DECLS
 void SHA1Transform(u_int32_t [5], const unsigned char [64])
Index: config.h.in
--- config.h.in.orig	2006-01-17 18:11:44 +0100
+++ config.h.in	2006-08-24 12:14:21 +0200
@@@@ -222,6 +222,9 @@@@
 /* Define to 1 if you have the `strtoul' function. */
 #undef HAVE_STRTOUL
 
+/* Define to 1 if you have the `setenv' function. */
+#undef HAVE_SETENV
+
 /* Define if your system defines struct sockaddr_storage */
 #undef HAVE_STRUCT_SOCKADDR_STORAGE
 
@@@@ -255,6 +258,9 @@@@
 /* Define to 1 if you have the <sys/types.h> header file. */
 #undef HAVE_SYS_TYPES_H
 
+/* Define to 1 if you have the <sys/cdefs.h> header file. */
+#undef HAVE_SYS_CDEFS_H
+
 /* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
 #undef HAVE_SYS_WAIT_H
 
Index: configure
--- configure.orig	2006-08-19 09:11:11 +0200
+++ configure	2006-08-24 12:14:21 +0200
@@@@ -22317,7 +22317,7 @@@@
 
 
 
-for ac_header in stdarg.h errno.h fcntl.h paths.h stdlib.h string.h time.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h sys/ioccom.h sys/file.h syslog.h unistd.h assert.h
+for ac_header in stdarg.h errno.h fcntl.h paths.h stdlib.h string.h time.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h sys/ioccom.h sys/file.h syslog.h unistd.h assert.h sys/cdefs.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@@@ -23483,7 +23483,7 @@@@
 
 
 
-for ac_func in asprintf dup2 fgetln gettimeofday memmove memset strcasecmp strchr strdup strncasecmp strtoul strspn getaddrinfo getnameinfo freeaddrinfo setgroups sendmsg recvmsg setregid setruid kqueue
+for ac_func in asprintf dup2 fgetln gettimeofday memmove memset strcasecmp strchr strdup strncasecmp strtoul strspn getaddrinfo getnameinfo freeaddrinfo setgroups sendmsg recvmsg setregid setruid setenv kqueue
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5
Index: dhcpclient.c
--- dhcpclient.c.orig	2006-08-19 09:10:41 +0200
+++ dhcpclient.c	2006-08-24 12:14:21 +0200
@@@@ -94,6 +94,13 @@@@
 
 #define NTRIES 10
 
+#ifndef MIN
+# define MIN(a,b)	(((a) < (b)) ? (a) : (b))
+#endif /* MIN */
+#ifndef MAX
+# define MAX(a,b)	(((a) > (b)) ? (a) : (b))
+#endif /* MAX */
+
 static int  _pack_request(struct dhcpclient_req *, void *, size_t *);
 static int  _pack_release(struct dhcpclient_req *, void *, size_t *);
 static int  _bcast(struct template *,
Index: honeyd.c
--- honeyd.c.orig	2006-08-19 09:14:36 +0200
+++ honeyd.c	2006-08-24 12:14:21 +0200
@@@@ -101,6 +101,9 @@@@
 #include "histogram.h"
 #include "update.h"
 #include "util.h"
+#ifndef HAVE_SETENV
+#include "setenv.h"
+#endif
 
 #ifdef HAVE_PYTHON
 #include <Python.h>
Index: honeyd_overload.c
--- honeyd_overload.c.orig	2006-08-19 09:10:41 +0200
+++ honeyd_overload.c	2006-08-24 12:14:21 +0200
@@@@ -295,7 +295,7 @@@@
 	struct fd *nfd;
 	int pair[2];
 
-	if (socketpair(AF_LOCAL, type, 0, pair) == -1) {
+	if (socketpair(AF_UNIX, type, 0, pair) == -1) {
 		warn("%s: socketpair", __func__);
 		return (NULL);
 	}
@@@@ -625,7 +625,7 @@@@
 	}
 
 	/* Get another socketpair */
-	if (socketpair(AF_LOCAL, SOCK_STREAM, 0, pair) == -1) {
+	if (socketpair(AF_UNIX, SOCK_STREAM, 0, pair) == -1) {
 		DPRINTF((stderr, "%s: socketpair failed", __func__));
 		errno = ETIMEDOUT; /* XXX */
 		return (-1);
@@@@ -732,6 +732,7 @@@@
 }
 #endif /* !__FreeBSD__ */
 
+#ifndef sun
 ssize_t
 recvfrom(int sock, void *buf, size_t len, int flags, struct sockaddr *from,
     socklen_t *fromlen)
@@@@ -759,6 +760,7 @@@@
  out:
 	return (ret);
 }
+#endif /* !sun */
 
 ssize_t
 sendto(int sock, const void *buf, size_t len, int flags,
@@@@ -795,6 +797,7 @@@@
 	return (ret);
 }
 
+#ifndef sun
 int
 getsockname(int sock, struct sockaddr *to, socklen_t *tolen)
 {
@@@@ -832,6 +835,7 @@@@
 
 	return (0);
 }
+#endif /* !sun */
 
 ssize_t
 recvmsg(int sock, struct msghdr *msg, int flags)
@@@@ -1120,6 +1124,7 @@@@
 	return (ret);
 }
 
+#ifndef sun
 int
 accept(int sock, struct sockaddr *addr, socklen_t *addrlen)
 {
@@@@ -1169,6 +1174,7 @@@@
 
 	return (fd);
 }
+#endif /* !sun */
 
 #if 0
 
Index: personality.c
--- personality.c.orig	2006-08-19 09:10:40 +0200
+++ personality.c	2006-08-24 12:14:21 +0200
@@@@ -32,6 +32,9 @@@@
 
 #include <sys/param.h>
 #include <sys/types.h>
+#ifndef UINT_MAX
+#define UINT_MAX    4294967295U
+#endif
 
 #include "config.h"
 
Index: pf_osfp.c
--- pf_osfp.c.orig	2006-08-19 09:10:40 +0200
+++ pf_osfp.c	2006-08-24 12:14:21 +0200
@@@@ -50,6 +50,10 @@@@
 #  define DPFPRINTF(format, x...)	((void)0)
 # endif /* PFDEBUG */
 
+#ifndef MAX
+# define MAX(a,b)  (((a) > (b)) ? (a) : (b))
+#endif
+
 SLIST_HEAD(pf_osfp_list, pf_os_fingerprint) pf_osfp_list;
 pool_t pf_osfp_entry_pl;
 pool_t pf_osfp_pl;
@


1.17.2.1
log
@file honeyd.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:51:01 +0000
@
text
@d1 213
@


1.17.2.2
log
@Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class)
@
text
@a0 213
Index: command.c
--- command.c.orig	2006-08-19 09:10:40 +0200
+++ command.c	2006-08-24 12:14:21 +0200
@@@@ -72,6 +72,9 @@@@
 #include "pyextend.h"
 #include "honeyd_overload.h"
 #include "util.h"
+#ifndef HAVE_SETENV
+#include "setenv.h"
+#endif
 
 ssize_t atomicio(ssize_t (*)(), int, void *, size_t);
 
Index: compat/getopt.h
--- compat/getopt.h.orig	2006-08-19 09:10:40 +0200
+++ compat/getopt.h	2006-08-24 12:14:21 +0200
@@@@ -40,7 +40,11 @@@@
 #ifndef _GETOPT_H_
 #define _GETOPT_H_
 
+#ifdef HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
+#else
+#include "cdefs.h"
+#endif
 
 /*
  * GNU-like getopt_long() and 4.4BSD getsubopt()/optreset extensions
Index: compat/sha1.h
--- compat/sha1.h.orig	2006-08-19 09:10:40 +0200
+++ compat/sha1.h	2006-08-24 12:14:21 +0200
@@@@ -15,7 +15,11 @@@@
     unsigned char buffer[64];
 } SHA1_CTX;
 
+#ifdef HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
+#else
+#include "cdefs.h"
+#endif
 
 __BEGIN_DECLS
 void SHA1Transform(u_int32_t [5], const unsigned char [64])
Index: config.h.in
--- config.h.in.orig	2006-01-17 18:11:44 +0100
+++ config.h.in	2006-08-24 12:14:21 +0200
@@@@ -222,6 +222,9 @@@@
 /* Define to 1 if you have the `strtoul' function. */
 #undef HAVE_STRTOUL
 
+/* Define to 1 if you have the `setenv' function. */
+#undef HAVE_SETENV
+
 /* Define if your system defines struct sockaddr_storage */
 #undef HAVE_STRUCT_SOCKADDR_STORAGE
 
@@@@ -255,6 +258,9 @@@@
 /* Define to 1 if you have the <sys/types.h> header file. */
 #undef HAVE_SYS_TYPES_H
 
+/* Define to 1 if you have the <sys/cdefs.h> header file. */
+#undef HAVE_SYS_CDEFS_H
+
 /* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
 #undef HAVE_SYS_WAIT_H
 
Index: configure
--- configure.orig	2006-08-19 09:11:11 +0200
+++ configure	2006-08-24 12:14:21 +0200
@@@@ -22317,7 +22317,7 @@@@
 
 
 
-for ac_header in stdarg.h errno.h fcntl.h paths.h stdlib.h string.h time.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h sys/ioccom.h sys/file.h syslog.h unistd.h assert.h
+for ac_header in stdarg.h errno.h fcntl.h paths.h stdlib.h string.h time.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h sys/ioccom.h sys/file.h syslog.h unistd.h assert.h sys/cdefs.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@@@ -23483,7 +23483,7 @@@@
 
 
 
-for ac_func in asprintf dup2 fgetln gettimeofday memmove memset strcasecmp strchr strdup strncasecmp strtoul strspn getaddrinfo getnameinfo freeaddrinfo setgroups sendmsg recvmsg setregid setruid kqueue
+for ac_func in asprintf dup2 fgetln gettimeofday memmove memset strcasecmp strchr strdup strncasecmp strtoul strspn getaddrinfo getnameinfo freeaddrinfo setgroups sendmsg recvmsg setregid setruid setenv kqueue
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5
Index: dhcpclient.c
--- dhcpclient.c.orig	2006-08-19 09:10:41 +0200
+++ dhcpclient.c	2006-08-24 12:14:21 +0200
@@@@ -94,6 +94,13 @@@@
 
 #define NTRIES 10
 
+#ifndef MIN
+# define MIN(a,b)	(((a) < (b)) ? (a) : (b))
+#endif /* MIN */
+#ifndef MAX
+# define MAX(a,b)	(((a) > (b)) ? (a) : (b))
+#endif /* MAX */
+
 static int  _pack_request(struct dhcpclient_req *, void *, size_t *);
 static int  _pack_release(struct dhcpclient_req *, void *, size_t *);
 static int  _bcast(struct template *,
Index: honeyd.c
--- honeyd.c.orig	2006-08-19 09:14:36 +0200
+++ honeyd.c	2006-08-24 12:14:21 +0200
@@@@ -101,6 +101,9 @@@@
 #include "histogram.h"
 #include "update.h"
 #include "util.h"
+#ifndef HAVE_SETENV
+#include "setenv.h"
+#endif
 
 #ifdef HAVE_PYTHON
 #include <Python.h>
Index: honeyd_overload.c
--- honeyd_overload.c.orig	2006-08-19 09:10:41 +0200
+++ honeyd_overload.c	2006-08-24 12:14:21 +0200
@@@@ -295,7 +295,7 @@@@
 	struct fd *nfd;
 	int pair[2];
 
-	if (socketpair(AF_LOCAL, type, 0, pair) == -1) {
+	if (socketpair(AF_UNIX, type, 0, pair) == -1) {
 		warn("%s: socketpair", __func__);
 		return (NULL);
 	}
@@@@ -625,7 +625,7 @@@@
 	}
 
 	/* Get another socketpair */
-	if (socketpair(AF_LOCAL, SOCK_STREAM, 0, pair) == -1) {
+	if (socketpair(AF_UNIX, SOCK_STREAM, 0, pair) == -1) {
 		DPRINTF((stderr, "%s: socketpair failed", __func__));
 		errno = ETIMEDOUT; /* XXX */
 		return (-1);
@@@@ -732,6 +732,7 @@@@
 }
 #endif /* !__FreeBSD__ */
 
+#ifndef sun
 ssize_t
 recvfrom(int sock, void *buf, size_t len, int flags, struct sockaddr *from,
     socklen_t *fromlen)
@@@@ -759,6 +760,7 @@@@
  out:
 	return (ret);
 }
+#endif /* !sun */
 
 ssize_t
 sendto(int sock, const void *buf, size_t len, int flags,
@@@@ -795,6 +797,7 @@@@
 	return (ret);
 }
 
+#ifndef sun
 int
 getsockname(int sock, struct sockaddr *to, socklen_t *tolen)
 {
@@@@ -832,6 +835,7 @@@@
 
 	return (0);
 }
+#endif /* !sun */
 
 ssize_t
 recvmsg(int sock, struct msghdr *msg, int flags)
@@@@ -1120,6 +1124,7 @@@@
 	return (ret);
 }
 
+#ifndef sun
 int
 accept(int sock, struct sockaddr *addr, socklen_t *addrlen)
 {
@@@@ -1169,6 +1174,7 @@@@
 
 	return (fd);
 }
+#endif /* !sun */
 
 #if 0
 
Index: personality.c
--- personality.c.orig	2006-08-19 09:10:40 +0200
+++ personality.c	2006-08-24 12:14:21 +0200
@@@@ -32,6 +32,9 @@@@
 
 #include <sys/param.h>
 #include <sys/types.h>
+#ifndef UINT_MAX
+#define UINT_MAX    4294967295U
+#endif
 
 #include "config.h"
 
Index: pf_osfp.c
--- pf_osfp.c.orig	2006-08-19 09:10:40 +0200
+++ pf_osfp.c	2006-08-24 12:14:21 +0200
@@@@ -50,6 +50,10 @@@@
 #  define DPFPRINTF(format, x...)	((void)0)
 # endif /* PFDEBUG */
 
+#ifndef MAX
+# define MAX(a,b)  (((a) > (b)) ? (a) : (b))
+#endif
+
 SLIST_HEAD(pf_osfp_list, pf_os_fingerprint) pf_osfp_list;
 pool_t pf_osfp_entry_pl;
 pool_t pf_osfp_pl;
@


1.16
log
@upgrading package: honeyd 1.0 -> 1.5a
@
text
@a0 16
Index: Makefile.in
--- Makefile.in.orig	2006-03-01 07:34:47 +0100
+++ Makefile.in	2006-03-01 14:19:35 +0100
@@@@ -1318,9 +1318,9 @@@@
 
 install-data-local:
 	(cd $(top_srcdir) && tar -cf - $(top_srcdir)/webserver) | \
-	(cd $(honeyddatadir) && tar -xf -)
-	find $(honeyddatadir)/webserver -type f | xargs chmod a+r
-	find $(honeyddatadir)/webserver -type d | xargs chmod a+xr
+	(cd $(DESTDIR)$(honeyddatadir) && tar -xf -)
+	find $(DESTDIR)$(honeyddatadir)/webserver -type f | xargs chmod a+r
+	find $(DESTDIR)$(honeyddatadir)/webserver -type d | xargs chmod a+xr
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
d2 3
a4 3
--- command.c.orig	2005-09-22 05:34:04 +0200
+++ command.c	2006-03-01 14:20:03 +0100
@@@@ -47,6 +47,9 @@@@
d15 2
a16 2
--- compat/getopt.h.orig	2003-05-31 17:56:25 +0200
+++ compat/getopt.h	2006-03-01 07:34:47 +0100
d30 2
a31 2
--- compat/sha1.h.orig	2004-04-25 05:54:23 +0200
+++ compat/sha1.h	2006-03-01 07:34:47 +0100
d45 2
a46 2
--- config.h.in.orig	2006-02-19 23:39:06 +0100
+++ config.h.in	2006-03-01 14:20:27 +0100
d68 3
a70 3
--- configure.orig	2006-02-19 23:38:31 +0100
+++ configure	2006-03-01 14:21:13 +0100
@@@@ -22332,7 +22332,7 @@@@
d79 1
a79 1
@@@@ -23485,7 +23485,7 @@@@
d89 3
a91 3
--- dhcpclient.c.orig	2005-09-22 05:17:47 +0200
+++ dhcpclient.c	2006-03-01 07:34:47 +0100
@@@@ -69,6 +69,13 @@@@
d106 3
a108 3
--- honeyd.c.orig	2006-02-19 23:35:25 +0100
+++ honeyd.c	2006-03-01 14:21:32 +0100
@@@@ -76,6 +76,9 @@@@
d119 3
a121 3
--- honeyd_overload.c.orig	2006-02-19 23:35:25 +0100
+++ honeyd_overload.c	2006-03-01 14:22:11 +0100
@@@@ -270,7 +270,7 @@@@
d130 1
a130 1
@@@@ -600,7 +600,7 @@@@
d139 1
a139 1
@@@@ -707,6 +707,7 @@@@
d147 1
a147 1
@@@@ -734,6 +735,7 @@@@
d155 1
a155 1
@@@@ -770,6 +772,7 @@@@
d163 1
a163 1
@@@@ -807,6 +810,7 @@@@
d171 1
a171 1
@@@@ -1095,6 +1099,7 @@@@
d179 1
a179 1
@@@@ -1144,6 +1149,7 @@@@
d188 3
a190 3
--- personality.c.orig	2004-12-10 04:09:22 +0100
+++ personality.c	2006-03-01 07:34:47 +0100
@@@@ -7,6 +7,9 @@@@
d201 2
a202 2
--- pf_osfp.c.orig	2003-11-23 05:52:31 +0100
+++ pf_osfp.c	2006-03-01 07:34:47 +0100
@


1.15
log
@patch again to work on platforms without cdefs, include vasprintf(3) sources from libiberty project for building on several platforms missing it, and correct build configuration for honeydctl target on Solaris
@
text
@d2 3
a4 9
--- Makefile.in.orig	2004-12-31 20:13:47 +0100
+++ Makefile.in	2005-01-06 10:37:07 +0100
@@@@ -659,7 +659,7 @@@@
 		-rpath $(libdir)/honeyd $(LIBHONEYDFILES) $(LIBS) $(LDFLAGS) \
 		-module -avoid-version -nostdlib @@LIBDL@@
 	rm -f libtmp$@@.la tmp$@@.so* $@@
-	cp .libs/libtmp$@@.so $@@ || cp .libs/libtmp$@@ $@@
+	cp .libs/libtmp$@@.a $@@ || cp .libs/libtmp$@@ $@@
 	rm -f .libs/libtmp$@@.*
d7 10
d18 3
a20 5
--- command.c.orig	2004-12-31 20:13:37 +0100
+++ command.c	2005-01-06 10:37:07 +0100
@@@@ -69,6 +69,9 @@@@
 #include "fdpass.h"
 #include "osfp.h"
d22 2
d31 2
a32 2
--- compat/getopt.h.orig	2004-12-31 20:13:36 +0100
+++ compat/getopt.h	2005-01-06 10:37:07 +0100
d46 2
a47 2
--- compat/sha1.h.orig	2004-12-31 20:13:36.000000000 +0100
+++ compat/sha1.h	2005-01-07 13:53:01.066282520 +0100
d61 4
a64 4
--- config.h.in.orig	2004-12-06 04:17:14 +0100
+++ config.h.in	2005-01-06 10:37:07 +0100
@@@@ -210,6 +210,9 @@@@
 /* Define if you have the `strtoul' function. */
d73 2
a74 2
@@@@ -240,6 +243,9 @@@@
 /* Define if you have the <sys/types.h> header file. */
d80 1
a80 1
 /* Define if you have <sys/wait.h> that is POSIX.1 compatible. */
d84 3
a86 3
--- configure.orig	2004-12-31 20:13:48 +0100
+++ configure	2005-01-06 10:37:40 +0100
@@@@ -4631,7 +4631,7 @@@@
a87 1
 fi
d89 3
a91 2
-for ac_header in stdarg.h errno.h fcntl.h paths.h stdlib.h string.h time.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h sys/ioccom.h syslog.h unistd.h assert.h
+for ac_header in stdarg.h errno.h fcntl.h paths.h stdlib.h string.h time.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h sys/ioccom.h syslog.h unistd.h assert.h sys/cdefs.h
d94 4
a97 4
 echo "$as_me:4637: checking for $ac_header" >&5
@@@@ -5593,7 +5593,7 @@@@
 fi
 done
d99 2
a100 2
-for ac_func in dup2 fgetln gettimeofday memmove memset strcasecmp strchr strdup strncasecmp strtoul strspn getaddrinfo getnameinfo freeaddrinfo setgroups sendmsg recvmsg setregid setruid
+for ac_func in dup2 fgetln gettimeofday memmove memset strcasecmp strchr strdup strncasecmp strtoul strspn getaddrinfo getnameinfo freeaddrinfo setgroups sendmsg recvmsg setregid setruid setenv
d103 18
a120 1
 echo "$as_me:5599: checking for $ac_func" >&5
d122 3
a124 4
--- honeyd.c.orig	2004-12-31 20:13:37 +0100
+++ honeyd.c	2005-01-06 10:38:13 +0100
@@@@ -98,6 +98,9 @@@@
 #include "rrdtool.h"
d127 1
d133 1
a133 1
 #include "pyextend.h"
d135 3
a137 3
--- honeyd_overload.c.orig	2004-12-31 20:13:44 +0100
+++ honeyd_overload.c	2005-01-06 10:37:07 +0100
@@@@ -252,7 +252,7 @@@@
d146 1
a146 1
@@@@ -530,7 +530,7 @@@@
d155 1
a155 1
@@@@ -637,6 +637,7 @@@@
d163 1
a163 1
@@@@ -664,6 +665,7 @@@@
d171 1
a171 1
@@@@ -688,6 +690,7 @@@@
d179 1
a179 1
@@@@ -713,6 +716,7 @@@@
d186 2
a187 2
 sendmsg(int sock, const struct msghdr *msg, int flags)
@@@@ -805,6 +809,7 @@@@
d195 1
a195 1
@@@@ -843,3 +848,4 @@@@
d200 3
d204 3
a206 3
--- personality.c.orig	2004-12-31 20:13:38 +0100
+++ personality.c	2005-01-06 10:37:07 +0100
@@@@ -32,6 +32,9 @@@@
d217 2
a218 2
--- pf_osfp.c.orig	2004-12-31 20:13:43 +0100
+++ pf_osfp.c	2005-01-06 10:37:07 +0100
a229 33
Index: Makefile.in
--- Makefile.in.orig	2005-01-06 10:38:41 +0100
+++ Makefile.in	2005-01-06 10:40:54 +0100
@@@@ -664,9 +664,9 @@@@
 
 install-data-local:
 	(cd $(top_srcdir) && tar -cf - $(top_srcdir)/webserver) | \
-	(cd $(honeyddatadir) && tar -xf -)
-	find $(honeyddatadir)/webserver -type f | xargs chmod a+r
-	find $(honeyddatadir)/webserver -type d | xargs chmod a+xr
+	(cd $(DESTDIR)$(honeyddatadir) && tar -xf -)
+	find $(DESTDIR)$(honeyddatadir)/webserver -type f | xargs chmod a+r
+	find $(DESTDIR)$(honeyddatadir)/webserver -type d | xargs chmod a+xr
 
 dist-hook:
 	./distribute.py $(distdir)/
Index: dhcpclient.c
--- dhcpclient.c.orig	2005-01-07 13:06:46.552453044 +0100
+++ dhcpclient.c	2005-01-07 13:06:48.391812793 +0100
@@@@ -94,6 +94,13 @@@@
 
 #define NTRIES 10
 
+#ifndef MIN
+# define MIN(a,b)	(((a) < (b)) ? (a) : (b))
+#endif /* MIN */
+#ifndef MAX
+# define MAX(a,b)	(((a) > (b)) ? (a) : (b))
+#endif /* MAX */
+
 static int  _pack_request(struct dhcpclient_req *, void *, size_t *);
 static int  _pack_release(struct dhcpclient_req *, void *, size_t *);
 static int  _bcast(struct template *,
@


1.14
log
@upgrading package: honeyd 0.8b -> 1.0
@
text
@d41 15
d222 17
@


1.13
log
@repair an embarassing vendor Makefile with a hack, and handle a nonoverwrite condition in our own setenv(3) code
@
text
@d1 12
d14 3
a16 4
--- command.c.orig	2004-04-15 05:29:22.000000000 +0200
+++ command.c	2004-04-15 08:46:29.000000000 +0200
@@@@ -68,6 +68,9 @@@@
 #include "udp.h"
d18 1
d27 2
a28 2
--- compat/getopt.h.orig	2004-04-15 05:29:22.000000000 +0200
+++ compat/getopt.h	2004-04-15 08:46:29.000000000 +0200
d42 3
a44 3
--- config.h.in.orig	2004-02-04 08:03:04.000000000 +0100
+++ config.h.in	2004-04-15 08:46:29.000000000 +0200
@@@@ -198,6 +198,9 @@@@
d54 1
a54 1
@@@@ -228,6 +231,9 @@@@
d65 3
a67 3
--- configure.orig	2004-04-15 04:47:32.000000000 +0200
+++ configure	2004-04-15 08:47:28.000000000 +0200
@@@@ -4258,7 +4258,7 @@@@
d71 2
a72 2
-for ac_header in stdarg.h errno.h fcntl.h paths.h stdlib.h string.h time.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h sys/ioccom.h syslog.h unistd.h
+for ac_header in stdarg.h errno.h fcntl.h paths.h stdlib.h string.h time.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h sys/ioccom.h syslog.h unistd.h sys/cdefs.h
d75 2
a76 2
 echo "$as_me:4264: checking for $ac_header" >&5
@@@@ -5220,7 +5220,7 @@@@
d84 1
a84 1
 echo "$as_me:5226: checking for $ac_func" >&5
d86 6
a91 6
--- honeyd.c.orig	2004-04-15 05:29:22.000000000 +0200
+++ honeyd.c	2004-04-15 08:48:06.000000000 +0200
@@@@ -91,6 +91,9 @@@@
 #include "parser.h"
 #include "ui.h"
 #include "ethernet.h"
d99 2
a100 2
--- honeyd_overload.c.orig	2004-04-15 05:29:22.000000000 +0200
+++ honeyd_overload.c	2004-04-15 08:46:29.000000000 +0200
d165 2
a166 2
--- personality.c.orig	2004-04-15 05:29:22.000000000 +0200
+++ personality.c	2004-04-15 08:46:29.000000000 +0200
d178 2
a179 2
--- pf_osfp.c.orig	2004-04-15 05:29:22.000000000 +0200
+++ pf_osfp.c	2004-04-15 08:46:29.000000000 +0200
d192 12
a203 9
--- Makefile.in.orig	2004-06-25 17:08:03 +0200
+++ Makefile.in	2004-06-25 17:11:30 +0200
@@@@ -642,7 +642,7 @@@@
 		-rpath $(libdir)/honeyd $(LIBHONEYDFILES) $(LIBS) $(LDFLAGS) \
 		-module -avoid-version -nostdlib @@LIBDL@@
 	rm -f libtmp$@@.la tmp$@@.so* $@@
-	cp .libs/libtmp$@@.so $@@ || cp .libs/libtmp$@@ $@@
+	cp .libs/libtmp$@@.a $@@ || cp .libs/libtmp$@@ $@@
 	rm -f .libs/libtmp$@@.*
d206 1
@


1.12
log
@upgrading package: honeyd 0.8 -> 0.8a
@
text
@d179 12
@


1.11
log
@upgrading package: honeyd 0.7a -> 0.8
@
text
@d2 2
a3 2
--- command.c.orig	2004-01-21 09:31:42.000000000 +0100
+++ command.c	2004-01-21 13:58:27.000000000 +0100
d15 2
a16 2
--- compat/getopt.h.orig	2004-01-21 09:31:42.000000000 +0100
+++ compat/getopt.h	2004-01-21 13:58:27.000000000 +0100
d30 3
a32 3
--- config.h.in.orig	2004-01-21 06:57:25.000000000 +0100
+++ config.h.in	2004-01-21 13:58:27.000000000 +0100
@@@@ -189,6 +189,9 @@@@
d42 1
a42 1
@@@@ -216,6 +219,9 @@@@
d53 3
a55 3
--- configure.orig	2004-01-21 06:57:27.000000000 +0100
+++ configure	2004-01-21 13:59:02.000000000 +0100
@@@@ -4143,7 +4143,7 @@@@
d59 2
a60 2
-for ac_header in errno.h fcntl.h paths.h stdlib.h string.h time.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h sys/ioccom.h syslog.h unistd.h
+for ac_header in errno.h fcntl.h paths.h stdlib.h string.h time.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h sys/ioccom.h sys/cdefs.h syslog.h unistd.h
d63 2
a64 2
 echo "$as_me:4149: checking for $ac_header" >&5
@@@@ -5105,7 +5105,7 @@@@
d72 1
a72 1
 echo "$as_me:5111: checking for $ac_func" >&5
d74 6
a79 6
--- honeyd.c.orig	2004-01-21 09:31:42.000000000 +0100
+++ honeyd.c	2004-01-21 13:58:27.000000000 +0100
@@@@ -88,6 +88,9 @@@@
 #include "gre.h"
 #include "log.h"
 #include "osfp.h"
d87 2
a88 2
--- honeyd_overload.c.orig	2004-01-21 09:31:42.000000000 +0100
+++ honeyd_overload.c	2004-01-21 13:58:27.000000000 +0100
d153 2
a154 2
--- personality.c.orig	2004-01-21 09:31:42.000000000 +0100
+++ personality.c	2004-01-21 13:58:27.000000000 +0100
d166 2
a167 2
--- pf_osfp.c.orig	2004-01-21 09:31:42.000000000 +0100
+++ pf_osfp.c	2004-01-21 13:58:27.000000000 +0100
@


1.10
log
@flush pending work; FreeBSD, Linux ok; Solaris broken
@
text
@d1 13
d15 2
a16 2
--- compat/getopt.h.orig	2003-05-31 17:44:36.000000000 +0200
+++ compat/getopt.h	2003-11-24 23:36:41.000000000 +0100
a28 13
Index: command.c
--- command.c.orig	2003-11-22 21:56:25.000000000 +0100
+++ command.c	2003-11-24 23:36:41.000000000 +0100
@@@@ -66,6 +66,9 @@@@
 #include "udp.h"
 #include "fdpass.h"
 #include "pyextend.h"
+#ifndef HAVE_SETENV
+#include "setenv.h"
+#endif
 
 ssize_t atomicio(ssize_t (*)(), int, void *, size_t);
 
d30 3
a32 3
--- config.h.in.orig	2003-11-23 00:27:41.000000000 +0100
+++ config.h.in	2003-11-24 23:36:41.000000000 +0100
@@@@ -183,6 +183,9 @@@@
d42 1
a42 1
@@@@ -210,6 +213,9 @@@@
d53 2
a54 2
--- configure.orig	2003-11-23 00:27:08.000000000 +0100
+++ configure	2003-11-24 23:36:41.000000000 +0100
d68 2
a69 2
-for ac_func in dup2 fgetln gettimeofday memmove memset strcasecmp strchr strdup strncasecmp strtoul strspn getaddrinfo getnameinfo freeaddrinfo setgroups sendmsg recvmsg
+for ac_func in dup2 fgetln gettimeofday memmove memset strcasecmp strchr strdup strncasecmp strtoul strspn getaddrinfo getnameinfo freeaddrinfo setgroups sendmsg recvmsg setenv
d74 3
a76 3
--- honeyd.c.orig	2003-11-23 05:47:22.000000000 +0100
+++ honeyd.c	2003-11-24 23:36:41.000000000 +0100
@@@@ -86,6 +86,9 @@@@
d86 4
a89 31
Index: personality.c
--- personality.c.orig	2003-11-08 20:44:22.000000000 +0100
+++ personality.c	2003-11-24 23:36:41.000000000 +0100
@@@@ -30,6 +30,9 @@@@
 
 #include <sys/param.h>
 #include <sys/types.h>
+#ifndef UINT_MAX
+#define UINT_MAX    4294967295U
+#endif
 
 #include "config.h"
 
Index: pf_osfp.c
--- pf_osfp.c.orig	2003-11-22 23:43:19.000000000 +0100
+++ pf_osfp.c	2003-11-24 23:57:40.000000000 +0100
@@@@ -50,6 +50,10 @@@@
 #  define DPFPRINTF(format, x...)	((void)0)
 # endif /* PFDEBUG */
 
+#ifndef MAX
+# define MAX(a,b)  (((a) > (b)) ? (a) : (b))
+#endif
+
 SLIST_HEAD(pf_osfp_list, pf_os_fingerprint) pf_osfp_list;
 pool_t pf_osfp_entry_pl;
 pool_t pf_osfp_pl;
diff -Naur honeyd-0.6a.orig/honeyd_overload.c honeyd-0.6a/honeyd_overload.c
--- honeyd_overload.c.orig	2003-09-24 22:40:49.815986404 +0200
+++ honeyd_overload.c	2003-09-24 22:40:15.154417000 +0200
@@@@ -222,7 +222,7 @@@@
d98 1
a98 1
@@@@ -500,7 +500,7 @@@@
d107 1
a107 1
@@@@ -607,6 +607,7 @@@@
d115 1
a115 1
@@@@ -634,6 +635,7 @@@@
d123 1
a123 1
@@@@ -658,6 +660,7 @@@@
d131 1
a131 1
@@@@ -683,6 +686,7 @@@@
d139 1
a139 1
@@@@ -775,6 +779,7 @@@@
d147 1
a147 1
@@@@ -813,3 +818,4 @@@@
d152 27
@


1.9
log
@Remove redundant patch code
@
text
@d1 112
d114 2
a115 2
--- honeyd-0.6a.orig/honeyd_overload.c	2003-09-24 22:40:49.815986404 +0200
+++ honeyd-0.6a/honeyd_overload.c	2003-09-24 22:40:15.154417000 +0200
a178 249
diff -Naur honeyd-0.6a.orig/command.c honeyd-0.6a/command.c
--- honeyd-0.6a.orig/command.c	2003-06-26 07:34:18.000000000 +0200
+++ honeyd-0.6a/command.c	2003-09-24 20:54:20.208451644 +0200
@@@@ -65,6 +65,9 @@@@
 #include "tcp.h"
 #include "udp.h"
 #include "fdpass.h"
+#ifndef HAVE_SETENV
+#include "setenv.h"
+#endif
 
 ssize_t atomicio(ssize_t (*)(), int, void *, size_t);
 
@@@@ -458,7 +461,7 @@@@
 	else
 		cb = &cb_udp;
 
-        if (socketpair(AF_LOCAL, hdr->type, 0, pair) == -1) {
+        if (socketpair(AF_UNIX, hdr->type, 0, pair) == -1) {
                 warn("socketpair");
                 return (-1);
         }
diff -Naur honeyd-0.6a.orig/util.c honeyd-0.6a/util.c
--- honeyd-0.6a.orig/util.c	2003-06-12 04:31:52.000000000 +0200
+++ honeyd-0.6a/util.c	2003-09-24 21:10:53.916758139 +0200
@@@@ -125,7 +125,7 @@@@
 
 	/* Try to match against the variable */
 	while ((p = strchr(p, match[0])) != NULL) {
-		if (!strncmp(p, match, len) && !isalnum(p[len]))
+		if (!strncmp(p, match, len) && !isalnum((int)p[len]))
 			break;
 		p += len;
 
diff -Naur honeyd-0.6a.orig/personality.c honeyd-0.6a/personality.c
--- honeyd-0.6a.orig/personality.c	2003-05-30 00:51:34.000000000 +0200
+++ honeyd-0.6a/personality.c	2003-09-24 21:09:37.623869975 +0200
@@@@ -51,6 +51,7 @@@@
 #include <unistd.h>
 #include <dnet.h>
 #include <ctype.h>
+#include <limits.h>
 
 #undef timeout_pending
 #undef timeout_initialized
@@@@ -1202,7 +1203,7 @@@@
 		if (CMP(p, FINGERPRINT) == 0) {
 			p += sizeof(FINGERPRINT) - 1;
 			p += strspn(p, ": \t");
-			if (!isalnum(*p)) {
+			if (!isalnum((int)*p)) {
 				fprintf(stderr, "%d: bad name \"%s\"\n",
 				    lineno, p);
 				return (-1);
@@@@ -1450,7 +1451,7 @@@@
 		strsep (&p2, "#\r\n");
 
 		/* Remove trailing whitespace  */
-		for (p2 -= 2; (p2 >= p) && isspace (*p2); p2--)
+		for (p2 -= 2; (p2 >= p) && isspace ((int)*p2); p2--)
 			*p2 = '\0';
 
 		/* Ignore the "fingperint {" line */
diff -Naur honeyd-0.6a.orig/honeyd.c honeyd-0.6a/honeyd.c
--- honeyd-0.6a.orig/honeyd.c	2003-07-14 15:12:33.000000000 +0200
+++ honeyd-0.6a/honeyd.c	2003-09-24 20:50:08.413297423 +0200
@@@@ -85,6 +85,9 @@@@
 #include "arp.h"
 #include "gre.h"
 #include "log.h"
+#ifndef HAVE_SETENV
+#include "setenv.h"
+#endif
 
 /* Prototypes */
 void honeyd_tcp_timeout(int, short, void *);
@@@@ -2502,7 +2505,7 @@@@
 			err(1, "daemon");
 		}
 	}
-	fprintf(fp, "%d\n", getpid());
+	fprintf(fp, "%d\n", (int)getpid());
 	fclose(fp);
 	
 	chmod(PIDFILE, 0644);
diff -Naur honeyd-0.6a.orig/compat/getopt.h honeyd-0.6a/compat/getopt.h
--- honeyd-0.6a.orig/compat/getopt.h	2003-05-31 17:44:36.000000000 +0200
+++ honeyd-0.6a/compat/getopt.h	2003-09-24 20:23:37.000000000 +0200
@@@@ -40,7 +40,11 @@@@
 #ifndef _GETOPT_H_
 #define _GETOPT_H_
 
+#ifdef HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
+#else
+#include "cdefs.h"
+#endif
 
 /*
  * GNU-like getopt_long() and 4.4BSD getsubopt()/optreset extensions
diff -Naur honeyd-0.6a.orig/config.h.in honeyd-0.6a/config.h.in
--- honeyd-0.6a.orig/config.h.in	2003-06-24 02:03:05.000000000 +0200
+++ honeyd-0.6a/config.h.in	2003-09-24 20:20:36.000000000 +0200
@@@@ -180,6 +180,9 @@@@
 /* Define to 1 if you have the `strtoul' function. */
 #undef HAVE_STRTOUL
 
+/* Define to 1 if you have the `setenv' function. */
+#undef HAVE_SETENV
+
 /* Define if your system defines struct sockaddr_storage */
 #undef HAVE_STRUCT_SOCKADDR_STORAGE
 
@@@@ -207,6 +210,9 @@@@
 /* Define to 1 if you have the <sys/types.h> header file. */
 #undef HAVE_SYS_TYPES_H
 
+/* Define to 1 if you have the <sys/cdefs.h> header file. */
+#undef HAVE_SYS_CDEFS_H
+
 /* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
 #undef HAVE_SYS_WAIT_H
 
diff -Naur honeyd-0.6a.orig/configure honeyd-0.6a/configure
--- honeyd-0.6a.orig/configure	2003-07-21 22:56:08.000000000 +0200
+++ honeyd-0.6a/configure	2003-09-24 20:19:21.000000000 +0200
@@@@ -8387,11 +8387,11 @@@@
   *)
      echo "$as_me:$LINENO: result: $withval" >&5
 echo "${ECHO_T}$withval" >&6
-     if test -f $withval/pcap.h -a -f $withval/libpcap.a; then
+     if test -f $withval/include/pcap.h -a -f $withval/lib/libpcap.a; then
         owd=`pwd`
         if cd $withval; then withval=`pwd`; cd $owd; fi
-	PCAPINC="-I$withval -I$withval/bpf"
-	PCAPLIB="-L$withval -lpcap"
+	PCAPINC="-I$withval/include -I$withval/bpf"
+	PCAPLIB="-L$withval/lib -lpcap"
      else
         { { echo "$as_me:$LINENO: error: pcap.h or libpcap.a not found in $withval" >&5
 echo "$as_me: error: pcap.h or libpcap.a not found in $withval" >&2;}
@@@@ -8437,9 +8437,9 @@@@
 echo $ECHO_N "checking for libdnet... $ECHO_C" >&6
      echo "$as_me:$LINENO: result: $withval" >&5
 echo "${ECHO_T}$withval" >&6
-     if test -f $withval/src/libdnet.a; then
+     if test -f $withval/lib/libdnet.a; then
 	DNETINC="-I$withval/include"
-	DNETLIB="-L$withval/src -ldnet `$withval/dnet-config --libs`"
+	DNETLIB="-L$withval/lib -ldnet `$withval/bin/dnet-config --libs`"
      elif test -x $withval/bin/dnet-config; then
 	DNETINC="`$withval/bin/dnet-config --cflags`"
 	DNETLIB="`$withval/bin/dnet-config --libs`"
@@@@ -8540,11 +8540,11 @@@@
   *)
      echo "$as_me:$LINENO: result: $withval" >&5
 echo "${ECHO_T}$withval" >&6
-     if test -f $withval/event.h -a -f $withval/libevent.a; then
+     if test -f $withval/include/event.h -a -f $withval/lib/libevent.a; then
         owd=`pwd`
         if cd $withval; then withval=`pwd`; cd $owd; fi
-        EVENTINC="-I$withval"
-        EVENTLIB="-L$withval -levent"
+        EVENTINC="-I$withval/include"
+        EVENTLIB="-L$withval/lib -levent"
      else
         { { echo "$as_me:$LINENO: error: event.h or libevent.a not found in $withval" >&5
 echo "$as_me: error: event.h or libevent.a not found in $withval" >&2;}
@@@@ -8785,7 +8785,7 @@@@
 
 
 
-for ac_header in errno.h fcntl.h paths.h stdlib.h string.h time.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h sys/ioccom.h syslog.h unistd.h
+for ac_header in errno.h fcntl.h paths.h stdlib.h string.h time.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h sys/ioccom.h sys/cdefs.h syslog.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@@@ -9697,7 +9697,7 @@@@
 
 
 
-for ac_func in dup2 gettimeofday memmove memset strcasecmp strchr strdup strncasecmp strtoul strspn getaddrinfo getnameinfo freeaddrinfo setgroups sendmsg recvmsg
+for ac_func in dup2 gettimeofday memmove memset strcasecmp strchr strdup strncasecmp strtoul strspn getaddrinfo getnameinfo freeaddrinfo setgroups sendmsg recvmsg setenv
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5
@@@@ -10097,6 +10097,8 @@@@
 rm -f conftest*
 
 
+SAVED_CFLAGS=$CFLAGS
+SAVED_LIBS=$LIBS
 CFLAGS=$DNETINC
 LIBS=$DNETLIB
 
@@@@ -10155,8 +10157,8 @@@@
 rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
-CFLAGS=""
-LIBS=""
+CFLAGS="$SAVED_CFLAGS"
+LIBS="$SAVED_LIBS"
 
 echo "$as_me:$LINENO: checking for struct sockaddr_storage" >&5
 echo $ECHO_N "checking for struct sockaddr_storage... $ECHO_C" >&6
diff -Naur honeyd-0.6a.orig/nmap.prints honeyd-0.6a/nmap.prints
--- honeyd-0.6a.orig/nmap.prints	2002-09-13 18:22:12.000000000 +0200
+++ honeyd-0.6a/nmap.prints	2003-09-24 20:18:04.000000000 +0200
@@@@ -6715,18 +6715,6 @@@@
 T7(DF=N%W=0%ACK=S++%Flags=AR%Ops=)
 PU(Resp=N|Y)
 
-# Contributed by Nick Hone nhone@@telus.net
-Fingerprint Windows NT 4 SP3
-TSeq(Class=TD|RI%gcd=<18%SI=<2A00DA&>6B73)
-T1(DF=Y%W=7FFF|2017%ACK=S++%Flags=AS%Ops=M|MNWNNT)
-T2(Resp=Y%DF=N%W=0%ACK=S%Flags=AR%Ops=)
-T3(Resp=Y%DF=Y%W=7FFF|2017%ACK=S++|O%Flags=AS|A%Ops=M|NNT)
-T4(DF=N%W=0%ACK=O|S%Flags=R%Ops=)
-T5(DF=N%W=0%ACK=S++%Flags=AR%Ops=)
-T6(DF=N%W=0%ACK=O|S++%Flags=R%Ops=)
-T7(DF=N%W=0%ACK=S++%Flags=AR%Ops=)
-PU(TOS=0%IPLEN=38%RIPTL=148%RID=E%RIPCK=E%UCK=E%ULEN=134%DAT=E)
-
 # Contributed by grunby grunby@@hades.ss.purchase.edu
 Fingerprint Microsoft NT 4.0 SP5-SP6
 TSeq(Class=RI%gcd=<6%SI=<DA16&>21A)
diff -Naur honeyd-0.6a.or/Makefile.in honeyd-0.6a/Makefile.in
--- honeyd-0.6a.or/Makefile.in	2003-07-21 22:56:07.000000000 +0200
+++ honeyd-0.6a/Makefile.in	2003-09-24 21:21:51.000000000 +0200
@@@@ -127,7 +127,7 @@@@
 pkgincludedir = $(honeydincludedir)
 pkginclude_HEADERS = hooks.h plugins.h plugins_config.h debug.h
 
-honeyd_SOURCES = honeyd.c command.c parse.y lex.l config.c personality.c 	util.c ipfrag.c router.c tcp.c udp.c xprobe_assoc.c log.c 	fdpass.c atomicio.c subsystem.c hooks.c plugins.c 	plugins_config.c pool.c interface.c arp.c gre.c 	honeyd.h personality.h ipfrag.h	router.h tcp.h udp.h parse.h 	xprobe_assoc.h subsystem.h fdpass.h hooks.h plugins.h 	plugins_config.h template.h pool.h interface.h arp.h gre.h 	log.h
+honeyd_SOURCES = honeyd.c command.c parse.y lex.l config.c personality.c 	util.c ipfrag.c router.c tcp.c udp.c xprobe_assoc.c log.c 	fdpass.c atomicio.c subsystem.c hooks.c plugins.c 	plugins_config.c pool.c interface.c arp.c gre.c setenv.c	honeyd.h personality.h ipfrag.h	router.h tcp.h udp.h parse.h 	xprobe_assoc.h subsystem.h fdpass.h hooks.h plugins.h 	plugins_config.h template.h pool.h interface.h arp.h gre.h setenv.h	log.h
 
 
 honeyd_LDADD = @@LIBOBJS@@ @@EVENTLIB@@ @@PCAPLIB@@ @@DNETLIB@@ @@PLUGINLIB@@ -lm
@@@@ -173,7 +173,7 @@@@
 xprobe_assoc.$(OBJEXT) log.$(OBJEXT) fdpass.$(OBJEXT) \
 atomicio.$(OBJEXT) subsystem.$(OBJEXT) hooks.$(OBJEXT) \
 plugins.$(OBJEXT) plugins_config.$(OBJEXT) pool.$(OBJEXT) \
-interface.$(OBJEXT) arp.$(OBJEXT) gre.$(OBJEXT)
+interface.$(OBJEXT) arp.$(OBJEXT) gre.$(OBJEXT) setenv.$(OBJEXT)
 honeyd_DEPENDENCIES =  @@LIBOBJS@@
 LEXLIB = @@LEXLIB@@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@


1.8
log
@Whoops missed a AF_LOCAL so fix it, and also clean up our custom cdefs header
@
text
@a151 11
diff -Naur honeyd-0.6a.orig/arp.c honeyd-0.6a/arp.c
--- honeyd-0.6a.orig/arp.c	2003-07-10 10:19:38.000000000 +0200
+++ honeyd-0.6a/arp.c	2003-09-24 20:18:04.000000000 +0200
@@@@ -48,6 +48,7 @@@@
 #include <syslog.h>
 #include <unistd.h>
 
+#include <sys/time.h>
 #include <event.h>
 #include <pcap.h>
 #include <dnet.h>
a272 22
diff -Naur honeyd-0.6a.orig/gre.c honeyd-0.6a/gre.c
--- honeyd-0.6a.orig/gre.c	2003-06-26 17:51:52.000000000 +0200
+++ honeyd-0.6a/gre.c	2003-09-24 20:18:04.000000000 +0200
@@@@ -53,6 +53,7 @@@@
 #undef timeout_pending
 #undef timeout_initialized
 
+#include <sys/time.h>
 #include <event.h>
 
 #include "honeyd.h"
diff -Naur honeyd-0.6a.orig/interface.c honeyd-0.6a/interface.c
--- honeyd-0.6a.orig/interface.c	2003-07-21 21:22:40.000000000 +0200
+++ honeyd-0.6a/interface.c	2003-09-24 20:18:04.000000000 +0200
@@@@ -50,6 +50,7 @@@@
 #include <syslog.h>
 #include <unistd.h>
 
+#include <sys/time.h>
 #include <event.h>
 #include <pcap.h>
 #include <dnet.h>
@


1.7
log
@Fix broken configure script, reorganize patch, remove redundant AF_LOCAL substitution, add with_gui option, write honey launch script, add postscript documentation, correct FSL linkage, minimize installation logic, add FTP, POP3, and SMTP service decoys, add Linux, AIX, and Windows host definitions, add missing uids and gids to host definitions, remove log files, use 192.168.1/24 as the default network, improve run command start logic, correct log file rotation, correct setenv(3) replacement method, and reorder dependencies
@
text
@d13 9
@


1.6
log
@I give up, sometimes arpd+honeyd works and sometimes not, but finish this package off anyways, adding features from ticket #202, a big patch job for portable builds, and a better default configuration
@
text
@d58 22
a142 22
diff -Naur honeyd-0.6a.orig/command.c honeyd-0.6a/command.c
--- honeyd-0.6a.orig/command.c	2003-06-26 07:34:18.000000000 +0200
+++ honeyd-0.6a/command.c	2003-09-24 20:54:20.208451644 +0200
@@@@ -65,6 +65,9 @@@@
 #include "tcp.h"
 #include "udp.h"
 #include "fdpass.h"
+#ifndef HAVE_SETENV
+#include "setenv.h"
+#endif
 
 ssize_t atomicio(ssize_t (*)(), int, void *, size_t);
 
@@@@ -458,7 +461,7 @@@@
 	else
 		cb = &cb_udp;
 
-        if (socketpair(AF_LOCAL, hdr->type, 0, pair) == -1) {
+        if (socketpair(AF_UNIX, hdr->type, 0, pair) == -1) {
                 warn("socketpair");
                 return (-1);
         }
d255 20
@


1.5
log
@upgrading package: honeyd 0.5a -> 0.6
@
text
@d1 195
a195 3
--- configure.org	Tue Feb 18 15:31:11 2003
+++ configure	Tue Feb 18 15:32:56 2003
@@@@ -3435,11 +3435,11 @@@@
d197 1
a197 1
      echo "$as_me:3436: result: $withval" >&5
d208 1
a208 1
         { { echo "$as_me:3444: error: pcap.h or libpcap.a not found in $withval" >&5
d210 3
a212 3
@@@@ -3482,9 +3482,9 @@@@
   *)
      echo "$as_me:3483: result: $withval" >&5
d222 1
a222 1
@@@@ -3525,11 +3525,11 @@@@
d224 1
a224 1
      echo "$as_me:3526: result: $withval" >&5
d235 1
a235 1
         { { echo "$as_me:3534: error: event.h or libevent.a not found in $withval" >&5
d237 43
a279 2
--- nmap.prints.org	Thu Feb 20 15:39:35 2003
+++ nmap.prints	Thu Feb 20 15:40:04 2003
d299 6
a304 5
--- interface.c.orig	Sat Jun 14 05:45:26 2003
+++ interface.c	Thu Jun 26 11:23:20 2003
@@@@ -47,6 +47,7 @@@@
 #include <syslog.h>
 #include <unistd.h>
d306 2
a307 19
+#include <sys/time.h>
 #include <event.h>
 #include <pcap.h>
 #include <dnet.h>
--- arp.c.orig	Fri May 30 14:19:46 2003
+++ arp.c	Thu Jun 26 11:23:26 2003
@@@@ -45,6 +45,7 @@@@
 #include <syslog.h>
 #include <unistd.h>
 
+#include <sys/time.h>
 #include <event.h>
 #include <pcap.h>
 #include <dnet.h>
--- gre.c.orig	Sat Jun 14 06:33:27 2003
+++ gre.c	Thu Jun 26 11:23:38 2003
@@@@ -50,6 +50,7 @@@@
 #undef timeout_pending
 #undef timeout_initialized
a308 2
+#include <sys/time.h>
 #include <event.h>
d310 10
a319 1
 #include "honeyd.h"
@


1.4
log
@if a vendor patch is available for easy download, then use it this way instead of merging into own .patch file. Else we forget this and think it was our own patch and perhaps forward it to the author for inclusion into his code. This would be awkward.
@
text
@d66 30
@


1.3
log
@Appending an updated version of honey package
@
text
@a65 30
Index: ipfrag.c
===================================================================
RCS file: /cvs/honeyd/ipfrag.c,v
retrieving revision 1.9
diff -u -r1.9 ipfrag.c
--- ipfrag.c	17 Apr 2002 16:38:40 -0000	1.9
+++ ipfrag.c	19 Feb 2003 02:59:39 -0000
@@@@ -241,12 +241,12 @@@@
 	if (prev && prev->off + prev->len > off) {
 		overlap = prev->off + prev->len - off;
 
-		if (overlap > len) {
+		if (overlap >= len) {
 			if (fragq->fragp == FRAG_NEW) {
 				u_char *odata = prev->data + off - prev->off;
 				memcpy(odata, ent->data, len);
 			}
-			goto drop_fragment;
+			goto free_fragment;
 		}
 
 		if (fragq->fragp == FRAG_OLD) {
@@@@ -316,6 +316,7 @@@@
 
  drop_fragment:
 	TAILQ_REMOVE(&fragq->fraglist, ent, next);
+ free_fragment:
 	ip_fragent_free(ent);
 	return (0);
 }
@


1.2
log
@Appending standard configuration file and rc file.
Removing sudo usage.
@
text
@d66 30
@


1.1
log
@Append honeyd to the correct directory
@
text
@d26 1
a26 1
+	DNETLIB="-L$withval/lib -ldnet `$withval/dnet-config --libs`"
d45 21
@