Fix errno. Define O_SYNC as O_FSYNC for DragonFly.

4 files changed, 39 insertions, 7 deletions

diff --git a/net/tacacs/distinfo b/net/tacacs/distinfo
index b09a8a95996..b122f63feb3 100644
--- a/net/tacacs/distinfo
+++ b/net/tacacs/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 12:14:04 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/12/18 19:23:04 joerg Exp $
 
 SHA1 (tac_plus.F4.0.4.alpha.tar.Z) = 23ccb0b7db6909bd45dcf6762ef32917d3465dd6
 RMD160 (tac_plus.F4.0.4.alpha.tar.Z) = 733fbac017cfd2efcd7b5e80e1747bdd0c6fd60e
 Size (tac_plus.F4.0.4.alpha.tar.Z) = 193771 bytes
 SHA1 (patch-aa) = daaf8f737441d17b1339bb1c6b7f865a95f706bc
-SHA1 (patch-ab) = 394c640e01d12f44e40741baa2ddbb60495e5e22
+SHA1 (patch-ab) = 52ccf27a6a904d6e9c6dd6044784c7c4e0126000
 SHA1 (patch-ac) = 11ea986ede6d2a277747cd9abc3bdcade1bf1e7a
+SHA1 (patch-ad) = 9cfabd64567a29f825edc487ddeb2d173a3e883f
+SHA1 (patch-ae) = 67305db0c6dd64b33c00b8dc5dbb3c40fa50e094
diff --git a/net/tacacs/patches/patch-ab b/net/tacacs/patches/patch-ab
index 1c853d30f06..da17c651f83 100644
--- a/net/tacacs/patches/patch-ab
+++ b/net/tacacs/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/10/15 17:26:42 rh Exp $
+$NetBSD: patch-ab,v 1.2 2005/12/18 19:23:04 joerg Exp $
 
---- tac_plus.h.orig	Tue Oct  3 17:11:45 2000
+--- tac_plus.h.orig	2000-06-18 17:26:54.000000000 +0000
 +++ tac_plus.h
 @@ -79,6 +79,7 @@
  #define STDLIB_MALLOC
@@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/10/15 17:26:42 rh Exp $
  #define VOIDSIG
  #endif
  
-@@ -689,10 +690,12 @@
+@@ -689,12 +690,13 @@ extern void parser_init();
  extern void set_expiration_status();
  
  /* miscellaneous */
@@ -19,7 +19,9 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/10/15 17:26:42 rh Exp $
  extern const char *const sys_errlist[];
  #else
  extern char *sys_errlist[];
-+#endif
  #endif
- extern int errno;
+-extern int errno;
++#endif
  extern int sendauth_fn();
+ extern int sendpass_fn();
+ extern int enable_fn();
diff --git a/net/tacacs/patches/patch-ad b/net/tacacs/patches/patch-ad
new file mode 100644
index 00000000000..80d5077e92c
--- /dev/null
+++ b/net/tacacs/patches/patch-ad
@@ -0,0 +1,15 @@
+$NetBSD: patch-ad,v 1.1 2005/12/18 19:23:04 joerg Exp $
+
+--- do_acct.c.orig	2005-12-18 19:15:09.000000000 +0000
++++ do_acct.c
+@@ -20,6 +20,10 @@
+ 
+ #include "tac_plus.h"
+ 
++#if defined(__DragonFly__) && !defined(O_SYNC)
++#define O_SYNC O_FSYNC
++#endif
++
+ static int acctfd = 0;
+ 
+ /* Make a acct entry into the accounting file for accounting. 
diff --git a/net/tacacs/patches/patch-ae b/net/tacacs/patches/patch-ae
new file mode 100644
index 00000000000..46dc768e3ed
--- /dev/null
+++ b/net/tacacs/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2005/12/18 19:23:04 joerg Exp $
+
+--- report.c.orig	2005-12-18 19:16:18.000000000 +0000
++++ report.c
+@@ -143,8 +143,6 @@ va_dcl				/* no terminating semi-colon *
+ 
+ 
+     if (console) {
+-	extern int errno;
+-	
+ 	if (!ostream)
+ 	    ostream = fopen("/dev/console", "w");
+