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.

honeyd/honeyd.patch

@@ -63,33 +63,3 @@
  # Contributed by grunby grunby@hades.ss.purchase.edu
  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);
- }

honeyd/honeyd.spec

@@ -33,13 +33,14 @@ Distribution: OpenPKG [EVAL]
 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 @@ AutoReqProv:  no
 
 %prep
     %setup -q
-    %patch -p0
+    %patch0 -p0
+    %patch1 -p0
 
 %build
     %{l_shtool} subst \