From 796b5386cc3d322405938fe7a38daae20a13288c Mon Sep 17 00:00:00 2001
From: cube <cube@pkgsrc.org>
Date: Thu, 15 Jan 2004 14:10:51 +0000
Subject: No patches are needed for that package, except for -current between
 Sept., 16th 2003 and Jan., 6th 2004 when <sys/siginfo.h> included
 <sys/queue.h> unconditionally.

Rework the patches so that they're used only in that case.
---
 security/fragroute/distinfo         |  6 +++---
 security/fragroute/patches/patch-aa | 10 +++++-----
 security/fragroute/patches/patch-ac | 17 +++++++++++++++++
 3 files changed, 25 insertions(+), 8 deletions(-)
 create mode 100644 security/fragroute/patches/patch-ac

(limited to 'security/fragroute')

diff --git a/security/fragroute/distinfo b/security/fragroute/distinfo
index 819a8bc9de0..9a54e3ee13b 100644
--- a/security/fragroute/distinfo
+++ b/security/fragroute/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/01/08 17:55:15 agc Exp $
+$NetBSD: distinfo,v 1.2 2004/01/15 14:10:51 cube Exp $
 
 SHA1 (fragroute-1.2.tar.gz) = 0e85daf40f4910d56d75e6cdee163305a1cb9004
 Size (fragroute-1.2.tar.gz) = 85247 bytes
-SHA1 (patch-aa) = 7cc6a7b7b20cd7e63f1afde0caf89f339537d376
-SHA1 (patch-ab) = 36bb985c8c06fa245c5a489c7158ec780dc9b42a
+SHA1 (patch-aa) = f763eb5f9feeff570b2394ed4091b80c6195e173
+SHA1 (patch-ac) = 644ed8d4652b9e959e96fce47c90c96d77a43134
diff --git a/security/fragroute/patches/patch-aa b/security/fragroute/patches/patch-aa
index c7f2293746d..7c5c08fb99b 100644
--- a/security/fragroute/patches/patch-aa
+++ b/security/fragroute/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/01/08 17:55:15 agc Exp $
+$NetBSD: patch-aa,v 1.2 2004/01/15 14:10:51 cube Exp $
 
---- mod.c	2004/01/08 17:33:51	1.1
-+++ mod.c	2004/01/08 17:41:16
-@@ -151,10 +151,19 @@
+--- mod.c.orig	2002-04-08 00:55:20.000000000 +0200
++++ mod.c
+@@ -151,10 +151,19 @@ mod_close(void)
  {
  	struct rule *rule;
  	
-+#ifdef __NetBSD__
++#if defined(FRAGROUTE_SYSTEM_SYS_QUEUE) && defined(__NetBSD__)
 +	TAILQ_FOREACH_REVERSE(rule, &rules, head, next) {
 +		if (rule->mod->close != NULL)
 +			rule->data = rule->mod->close(rule->data);
diff --git a/security/fragroute/patches/patch-ac b/security/fragroute/patches/patch-ac
new file mode 100644
index 00000000000..a56e6db0023
--- /dev/null
+++ b/security/fragroute/patches/patch-ac
@@ -0,0 +1,17 @@
+$NetBSD: patch-ac,v 1.1 2004/01/15 14:10:51 cube Exp $
+
+--- queue.h.orig	2002-04-07 23:12:52.000000000 +0200
++++ queue.h
+@@ -500,4 +500,12 @@ struct {								\
+ 		(elm2)->field.cqe_prev->field.cqe_next = (elm2);	\
+ } while (0)
+ 
++#else
++
++#define FRAGROUTE_SYSTEM_SYS_QUEUE
++
++#ifndef TAILQ_END
++#define TAILQ_END(head)	NULL
++#endif
++
+ #endif	/* !_SYS_QUEUE_H_ */
-- 
cgit v1.2.3