OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web openpkg$ Date: 25-Nov-2003 00:24:24
Branch: HEAD Handle: 2003112423242103
Modified files:
openpkg-re/vcheck vc.honeyd
openpkg-src/honeyd honeyd.patch honeyd.spec
openpkg-web news.txt
Log:
flush pending work; FreeBSD, Linux ok; Solaris broken
Summary:
Revision Changes Path
1.7 +1 -1 openpkg-re/vcheck/vc.honeyd
1.10 +114 -251 openpkg-src/honeyd/honeyd.patch
1.38 +12 -7 openpkg-src/honeyd/honeyd.spec
1.7528 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.honeyd
============================================================================
$ cvs diff -u -r1.6 -r1.7 vc.honeyd
--- openpkg-re/vcheck/vc.honeyd 22 Jul 2003 18:00:07 -0000 1.6
+++ openpkg-re/vcheck/vc.honeyd 24 Nov 2003 23:24:21 -0000 1.7
@@ -2,7 +2,7 @@
}
prog honeyd = {
- version = 0.6a
+ version = 0.7
url = http://www.citi.umich.edu/u/provos/honeyd/
regex = honeyd-(__VER__)\.tar\.gz
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/honeyd/honeyd.patch
============================================================================
$ cvs diff -u -r1.9 -r1.10 honeyd.patch
--- openpkg-src/honeyd/honeyd.patch 6 Oct 2003 09:48:04 -0000 1.9
+++ openpkg-src/honeyd/honeyd.patch 24 Nov 2003 23:24:24 -0000 1.10
@@ -1,6 +1,118 @@
+Index: compat/getopt.h
+--- compat/getopt.h.orig 2003-05-31 17:44:36.000000000 +0200
++++ compat/getopt.h 2003-11-24 23:36:41.000000000 +0100
+@@ -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: 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);
+
+Index: config.h.in
+--- 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 @@
+ /* Define 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
+
+@@ -210,6 +213,9 @@
+ /* Define 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 if you have <sys/wait.h> that is POSIX.1 compatible. */
+ #undef HAVE_SYS_WAIT_H
+
+Index: configure
+--- configure.orig 2003-11-23 00:27:08.000000000 +0100
++++ configure 2003-11-24 23:36:41.000000000 +0100
+@@ -4143,7 +4143,7 @@
+
+ fi
+
+-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`
+ echo "$as_me:4149: checking for $ac_header" >&5
+@@ -5105,7 +5105,7 @@
+ fi
+ done
+
+-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
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ echo "$as_me:5111: checking for $ac_func" >&5
+Index: honeyd.c
+--- 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 @@
+ #include "gre.h"
+ #include "log.h"
+ #include "osfp.h"
++#ifndef HAVE_SETENV
++#include "setenv.h"
++#endif
+
+ #ifdef HAVE_PYTHON
+ #include "pyextend.h"
+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-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
+--- 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 @@
struct fd *nfd;
int pair[2];
@@ -64,252 +176,3 @@
return (fd);
}
+#endif /* !sun */
-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 [EMAIL PROTECTED]
--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 [EMAIL PROTECTED]
- 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)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/honeyd/honeyd.spec
============================================================================
$ cvs diff -u -r1.37 -r1.38 honeyd.spec
--- openpkg-src/honeyd/honeyd.spec 9 Oct 2003 18:23:19 -0000 1.37
+++ openpkg-src/honeyd/honeyd.spec 24 Nov 2003 23:24:24 -0000 1.38
@@ -32,8 +32,8 @@
Distribution: OpenPKG [EVAL]
Group: Security
License: BSD
-Version: 0.6a
-Release: 20031009
+Version: 0.7
+Release: 20031125
# package options
%option with_fsl yes
@@ -87,7 +87,14 @@
%prep
%setup -q
- %patch -p1
+ %patch -p0
+ %{l_shtool} subst \
+ -e 's;AF_LOCAL;AF_UNIX;' \
+ *.c
+ %{l_shtool} subst \
+ -e 's;^\(honeyd_SOURCES *=[^\\]*\);\1 setenv.c ;' \
+ -e 's;^\(honeyd_OBJECTS *=[^\\]*\);\1 setenv.o ;' \
+ Makefile.in
cp -f %{SOURCE setenv.c} .
cp -f %{SOURCE setenv.h} .
cp -f %{SOURCE cdefs.h} .
@@ -102,10 +109,8 @@
LDFLAGS="%{l_fsl_ldflags}" \
LIBS="%{l_fsl_libs}" \
./configure \
- --prefix=%{l_prefix} \
- --with-libdnet=%{l_prefix} \
- --with-libpcap=%{l_prefix} \
- --with-libevent=%{l_prefix}
+ --without-python \
+ --prefix=%{l_prefix}
%{l_make} %{l_mflags}
%install
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7527 -r1.7528 news.txt
--- openpkg-web/news.txt 24 Nov 2003 19:32:17 -0000 1.7527
+++ openpkg-web/news.txt 24 Nov 2003 23:24:22 -0000 1.7528
@@ -1,3 +1,4 @@
+25-Nov-2003: Upgraded package: P<honeyd-0.7-20031125>
24-Nov-2003: Upgraded package: P<openpkg-20031124-20031124>
24-Nov-2003: Upgraded package: P<cups-1.1.20-20031124>
24-Nov-2003: Upgraded package: P<libwmf-0.2.8.1-20031124>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
