OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web openpkg$ Date: 21-Jan-2004 14:01:56
Branch: HEAD Handle: 2004012113014905
Modified files:
openpkg-re/vcheck vc.honeyd
openpkg-src/honeyd honeyd.patch honeyd.spec
openpkg-web news.txt
Log:
upgrading package: honeyd 0.7a -> 0.8
Summary:
Revision Changes Path
1.10 +1 -1 openpkg-re/vcheck/vc.honeyd
1.11 +64 -64 openpkg-src/honeyd/honeyd.patch
1.41 +2 -2 openpkg-src/honeyd/honeyd.spec
1.8155 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.honeyd
============================================================================
$ cvs diff -u -r1.9 -r1.10 vc.honeyd
--- openpkg-re/vcheck/vc.honeyd 30 Nov 2003 18:46:37 -0000 1.9
+++ openpkg-re/vcheck/vc.honeyd 21 Jan 2004 13:01:49 -0000 1.10
@@ -2,7 +2,7 @@
}
prog honeyd = {
- version = 0.7a
+ version = 0.8
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.10 -r1.11 honeyd.patch
--- openpkg-src/honeyd/honeyd.patch 24 Nov 2003 23:24:24 -0000 1.10
+++ openpkg-src/honeyd/honeyd.patch 21 Jan 2004 13:01:54 -0000 1.11
@@ -1,6 +1,19 @@
+Index: command.c
+--- command.c.orig 2004-01-21 09:31:42.000000000 +0100
++++ command.c 2004-01-21 13:58:27.000000000 +0100
+@@ -68,6 +68,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: 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
+--- compat/getopt.h.orig 2004-01-21 09:31:42.000000000 +0100
++++ compat/getopt.h 2004-01-21 13:58:27.000000000 +0100
@@ -40,7 +40,11 @@
#ifndef _GETOPT_H_
#define _GETOPT_H_
@@ -13,23 +26,10 @@
/*
* 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 @@
+--- 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 @@
/* Define if you have the `strtoul' function. */
#undef HAVE_STRTOUL
@@ -39,7 +39,7 @@
/* Define if your system defines struct sockaddr_storage */
#undef HAVE_STRUCT_SOCKADDR_STORAGE
-@@ -210,6 +213,9 @@
+@@ -216,6 +219,9 @@
/* Define if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
@@ -50,8 +50,8 @@
#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
+--- configure.orig 2004-01-21 06:57:27.000000000 +0100
++++ configure 2004-01-21 13:59:02.000000000 +0100
@@ -4143,7 +4143,7 @@
fi
@@ -65,15 +65,15 @@
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
+-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
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 @@
+--- 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"
@@ -83,37 +83,10 @@
#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_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 @@
+Index: honeyd_overload.c
+--- honeyd_overload.c.orig 2004-01-21 09:31:42.000000000 +0100
++++ honeyd_overload.c 2004-01-21 13:58:27.000000000 +0100
+@@ -252,7 +252,7 @@
struct fd *nfd;
int pair[2];
@@ -122,7 +95,7 @@
warn("%s: socketpair", __func__);
return (NULL);
}
-@@ -500,7 +500,7 @@
+@@ -530,7 +530,7 @@
}
/* Get another socketpair */
@@ -131,7 +104,7 @@
DPRINTF((stderr, "%s: socketpair failed", __func__));
errno = ETIMEDOUT; /* XXX */
return (-1);
-@@ -607,6 +607,7 @@
+@@ -637,6 +637,7 @@
}
#endif /* !__FreeBSD__ */
@@ -139,7 +112,7 @@
ssize_t
recvfrom(int sock, void *buf, size_t len, int flags, struct sockaddr *from,
socklen_t *fromlen)
-@@ -634,6 +635,7 @@
+@@ -664,6 +665,7 @@
out:
return (ret);
}
@@ -147,7 +120,7 @@
ssize_t
sendto(int sock, const void *buf, size_t len, int flags,
-@@ -658,6 +660,7 @@
+@@ -688,6 +690,7 @@
return (ret);
}
@@ -155,7 +128,7 @@
int
getsockname(int sock, struct sockaddr *to, socklen_t *tolen)
{
-@@ -683,6 +686,7 @@
+@@ -713,6 +716,7 @@
return (0);
}
@@ -163,7 +136,7 @@
ssize_t
sendmsg(int sock, const struct msghdr *msg, int flags)
-@@ -775,6 +779,7 @@
+@@ -805,6 +809,7 @@
return (ret);
}
@@ -171,8 +144,35 @@
int
accept(int sock, struct sockaddr *addr, socklen_t *addrlen)
{
-@@ -813,3 +818,4 @@
+@@ -843,3 +848,4 @@
return (fd);
}
+#endif /* !sun */
+Index: personality.c
+--- personality.c.orig 2004-01-21 09:31:42.000000000 +0100
++++ personality.c 2004-01-21 13:58:27.000000000 +0100
+@@ -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 2004-01-21 09:31:42.000000000 +0100
++++ pf_osfp.c 2004-01-21 13:58:27.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;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/honeyd/honeyd.spec
============================================================================
$ cvs diff -u -r1.40 -r1.41 honeyd.spec
--- openpkg-src/honeyd/honeyd.spec 30 Nov 2003 18:46:40 -0000 1.40
+++ openpkg-src/honeyd/honeyd.spec 21 Jan 2004 13:01:54 -0000 1.41
@@ -32,8 +32,8 @@
Distribution: OpenPKG [EVAL]
Group: Security
License: BSD
-Version: 0.7a
-Release: 20031130
+Version: 0.8
+Release: 20040121
# package options
%option with_fsl yes
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.8154 -r1.8155 news.txt
--- openpkg-web/news.txt 21 Jan 2004 12:19:08 -0000 1.8154
+++ openpkg-web/news.txt 21 Jan 2004 13:01:51 -0000 1.8155
@@ -1,3 +1,4 @@
+21-Jan-2004: Upgraded package: P<honeyd-0.8-20040121>
21-Jan-2004: Upgraded package: P<spamassassin-2.63-20040121>
21-Jan-2004: Upgraded package: P<mozilla-mplayer-1.2-20040121>
21-Jan-2004: Upgraded package: P<cdk-4.9.11.20031210-20040121>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
