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 Date: 22-Feb-2003 11:34:19
Branch: HEAD Handle: 2003022210341701
Modified files:
openpkg-src/honeyd honeyd.patch honeyd.spec
openpkg-web news.txt
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.
Summary:
Revision Changes Path
1.4 +0 -30 openpkg-src/honeyd/honeyd.patch
1.7 +4 -2 openpkg-src/honeyd/honeyd.spec
1.3406 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/honeyd/honeyd.patch
============================================================================
$ cvs diff -u -r1.3 -r1.4 honeyd.patch
--- openpkg-src/honeyd/honeyd.patch 21 Feb 2003 10:44:42 -0000 1.3
+++ openpkg-src/honeyd/honeyd.patch 22 Feb 2003 10:34:18 -0000 1.4
@@ -63,33 +63,3 @@
# 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.6 -r1.7 honeyd.spec
--- openpkg-src/honeyd/honeyd.spec 21 Feb 2003 11:48:07 -0000 1.6
+++ openpkg-src/honeyd/honeyd.spec 22 Feb 2003 10:34:18 -0000 1.7
@@ -33,13 +33,14 @@
Group: Language
License: BSD License
Version: 0.5
-Release: 20030221
+Release: 20030222
# list of sources
Source0: http://www.citi.umich.edu/u/provos/honeyd/honeyd-%{version}.tar.gz
Source1: rc.honeyd
Source2: honeyd.conf
Patch0: honeyd.patch
+Patch1:
http://www.citi.umich.edu/u/provos/honeyd/patches/%{version}/001-ipfrag.patch
# build information
Prefix: %{l_prefix}
@@ -62,7 +63,8 @@
%prep
%setup -q
- %patch -p0
+ %patch0 -p0
+ %patch1 -p0
%build
%{l_shtool} subst \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.3405 -r1.3406 news.txt
--- openpkg-web/news.txt 22 Feb 2003 10:22:59 -0000 1.3405
+++ openpkg-web/news.txt 22 Feb 2003 10:34:17 -0000 1.3406
@@ -1,3 +1,4 @@
+22-Feb-2003: Upgraded package: P<honeyd-0.5-20030222>
22-Feb-2003: Upgraded package: P<vim-6.1.351-20030222>
22-Feb-2003: Upgraded package: P<tidy-20030221-20030222>
22-Feb-2003: New package: P<imagemagick-5.5.5.0-20030222>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
