[pkgsrc/trunk]: pkgsrc/security/fragroute Fix build by avoiding conflicts bet...

[jmmv <jmmv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1da40130226a
branches:  trunk
changeset: 490803:1da40130226a
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Sun Mar 20 16:38:10 2005 +0000

description:
Fix build by avoiding conflicts between the included tun files and the ones
provided by libdnet.  This was broken during the last update of libdnet to
0.10, as the previous versions did not include the tun stuff.

diffstat:

 security/fragroute/distinfo         |   3 ++-
 security/fragroute/patches/patch-ab |  21 +++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletions(-)

diffs (38 lines):

diff -r 62de0d08026c -r 1da40130226a security/fragroute/distinfo
--- a/security/fragroute/distinfo       Sun Mar 20 16:37:04 2005 +0000
+++ b/security/fragroute/distinfo       Sun Mar 20 16:38:10 2005 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 13:10:06 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/03/20 16:38:10 jmmv Exp $
 
 SHA1 (fragroute-1.2.tar.gz) = 0e85daf40f4910d56d75e6cdee163305a1cb9004
 RMD160 (fragroute-1.2.tar.gz) = 1d39287a35ea7dca5096ee938727c403a31064c5
 Size (fragroute-1.2.tar.gz) = 85247 bytes
 SHA1 (patch-aa) = f763eb5f9feeff570b2394ed4091b80c6195e173
+SHA1 (patch-ab) = 626aa844a267e6dff0e1d9aaa3e55cd1f2cb0443
 SHA1 (patch-ac) = 644ed8d4652b9e959e96fce47c90c96d77a43134
diff -r 62de0d08026c -r 1da40130226a security/fragroute/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/fragroute/patches/patch-ab       Sun Mar 20 16:38:10 2005 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-ab,v 1.3 2005/03/20 16:38:10 jmmv Exp $
+
+--- tun.h.orig 2002-01-22 21:59:02.000000000 +0100
++++ tun.h
+@@ -9,10 +9,16 @@
+ #ifndef TUN_H
+ #define TUN_H
+ 
++#define tun fragroute_tun
++#define tun_t fragroute_tun_t
+ typedef struct tun tun_t;
+ 
++#define tun_handler fragroute_tun_handler
+ typedef void (*tun_handler)(void *buf, size_t len, void *arg);
+ 
++#define tun_open fragroute_tun_open
++#define tun_register fragroute_tun_register
++#define tun_close fragroute_tun_close
+ tun_t *tun_open(struct addr *src, struct addr *dst, int mtu);
+ int    tun_register(tun_t *tun, tun_handler callback, void *arg);
+ tun_t *tun_close(tun_t *tun);