OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Peter Smej
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 21-Feb-2003 11:44:43
Branch: HEAD Handle: 2003022110444200
Modified files:
openpkg-src/honeyd honeyd.conf honeyd.patch honeyd.spec rc.honeyd
Log:
Appending an updated version of honey package
Summary:
Revision Changes Path
1.2 +2 -2 openpkg-src/honeyd/honeyd.conf
1.3 +30 -0 openpkg-src/honeyd/honeyd.patch
1.5 +7 -4 openpkg-src/honeyd/honeyd.spec
1.2 +4 -4 openpkg-src/honeyd/rc.honeyd
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/honeyd/honeyd.conf
============================================================================
$ cvs diff -u -r1.1 -r1.2 honeyd.conf
--- openpkg-src/honeyd/honeyd.conf 20 Feb 2003 14:50:42 -0000 1.1
+++ openpkg-src/honeyd/honeyd.conf 21 Feb 2003 10:44:42 -0000 1.2
@@ -1,8 +1,8 @@
# Example of a simple host template and its binding
create testbox
set testbox personality "FreeBSD 3.2-4.0"
-add testbox tcp port 80 "sh scripts/web.sh"
-add testbox tcp port 22 "sh scripts/test.sh $ipsrc $dport"
+add testbox tcp port 80 "sh @l_prefix@/share/honeyd/scripts/web.sh"
+add testbox tcp port 22 "sh @l_prefix@/share/honeyd/scripts/test.sh $ipsrc $dport"
add testbox tcp port 23 proxy $ipsrc:23
set testbox default tcp action reset
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/honeyd/honeyd.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 honeyd.patch
--- openpkg-src/honeyd/honeyd.patch 20 Feb 2003 14:50:42 -0000 1.2
+++ openpkg-src/honeyd/honeyd.patch 21 Feb 2003 10:44:42 -0000 1.3
@@ -63,3 +63,33 @@
# Contributed by grunby [EMAIL PROTECTED]
Fingerprint Microsoft NT 4.0 SP5-SP6
TSeq(Class=RI%gcd=<6%SI=<DA16&>21A)
+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);
+ }
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/honeyd/honeyd.spec
============================================================================
$ cvs diff -u -r1.4 -r1.5 honeyd.spec
--- openpkg-src/honeyd/honeyd.spec 20 Feb 2003 14:50:42 -0000 1.4
+++ openpkg-src/honeyd/honeyd.spec 21 Feb 2003 10:44:42 -0000 1.5
@@ -23,7 +23,7 @@
## SUCH DAMAGE.
##
-# FIXME: Test routing
+# FIXME: honeyd do not write a pid file
# package information
Name: honeyd
@@ -31,11 +31,11 @@
URL: http://www.citi.umich.edu/u/provos/honeyd/
Vendor: Niels Provos
Packager: The OpenPKG Project
-Distribution: OpenPKG [JUNK]
+Distribution: OpenPKG [EVAL]
Group: Language
License: BSD License
Version: 0.5
-Release: 20030220
+Release: 20030221
# list of sources
Source0: http://www.citi.umich.edu/u/provos/honeyd/honeyd-%{version}.tar.gz
@@ -86,7 +86,9 @@
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
$RPM_BUILD_ROOT%{l_prefix}/sbin \
$RPM_BUILD_ROOT%{l_prefix}/man/man8 \
- $RPM_BUILD_ROOT%{l_prefix}/share/honeyd/scripts
+ $RPM_BUILD_ROOT%{l_prefix}/share/honeyd/scripts \
+ $RPM_BUILD_ROOT%{l_prefix}/share/honeyd/base \
+ $RPM_BUILD_ROOT%{l_prefix}/var/honeyd
# install files
%{l_shtool} install -c -s -m 755 \
@@ -113,6 +115,7 @@
scripts/web.sh $RPM_BUILD_ROOT%{l_prefix}/share/honeyd/scripts
%{l_shtool} install -c -m 755 \
+ -e 's;@l_prefix@;%{l_prefix};g' \
%{SOURCE honeyd.conf} $RPM_BUILD_ROOT%{l_prefix}/etc/honeyd/
%{l_shtool} install -c -m 755 \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/honeyd/rc.honeyd
============================================================================
$ cvs diff -u -r1.1 -r1.2 rc.honeyd
--- openpkg-src/honeyd/rc.honeyd 20 Feb 2003 14:50:42 -0000 1.1
+++ openpkg-src/honeyd/rc.honeyd 21 Feb 2003 10:44:42 -0000 1.2
@@ -8,11 +8,11 @@
%start -p 200 -u @l_susr@
opServiceEnabled honeyd || exit 0
- @l_prefix@/sbin/honeyd -f @l_prefix@/etc/honeyd/honeyd.conf -p
@l_prefix@/share/honeyd/nmap.prints -x @l_prefix@/share/honeyd/xprobe2.conf -a
-@l_prefix@/share/honeyd/nmap.assoc >/dev/null 2>&1
+ cd @l_prefix@/share/honeyd/base/
+ @l_prefix@/sbin/honeyd -f @l_prefix@/etc/honeyd/honeyd.conf -p
@l_prefix@/share/honeyd/nmap.prints -x @l_prefix@/share/honeyd/xprobe2.conf -a
@l_prefix@/share/honeyd/nmap.assoc >/dev/null 2>&1
%stop -p 200 -u @l_susr@
- opServiceEnabled honey || exit 0
+ opServiceEnabled honeyd || exit 0
if [ -f @l_prefix@/var/honeyd/honeyd.pid ]; then
kill -TERM `cat @l_prefix@/var/honeyd/honeyd.pid`
fi
@@ -26,7 +26,7 @@
@l_prefix@/sbin/honeyd -F @l_prefix@/etc/honeyd/honeyd.conf >/dev/null 2>&1
%reload -u @l_susr@
- opServiceEnabled amd || exit 0
+ opServiceEnabled honeyd || exit 0
if [ -f @l_prefix@/var/honeyd/honeyd.pid ]; then
kill -HUP `cat @l_prefix@/var/honeyd/honeyd.pid`
fi
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
