Some patches for DragonFly.

* need to include sys/socket.h, PR#44313.
* same signature as Linux and NetBSD for PAM related functions.

4 files changed, 87 insertions, 1 deletions

diff --git a/security/pam-tacplus/distinfo b/security/pam-tacplus/distinfo
index 286a569cb15..e15737274b1 100644
--- a/security/pam-tacplus/distinfo
+++ b/security/pam-tacplus/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/03/12 22:15:27 pettai Exp $
+$NetBSD: distinfo,v 1.2 2011/01/03 02:39:32 obache Exp $
 
 SHA1 (pam_tacplus-1.2.11.tar.gz) = 74b33dde8aa80b49cc59e587eb254fd66d3e104a
 RMD160 (pam_tacplus-1.2.11.tar.gz) = 841038262f0320a5b3a39e7337294e6807a29ada
 Size (pam_tacplus-1.2.11.tar.gz) = 30736 bytes
+SHA1 (patch-aa) = 73e6cd039c81dd43ceaab048c0c289e158809d1b
+SHA1 (patch-ab) = 1b33eb64beb95e176dec67fab1c3a2fa8219fda6
+SHA1 (patch-ac) = 456209bee40e2847726faea804cdd593666cf7df
diff --git a/security/pam-tacplus/patches/patch-aa b/security/pam-tacplus/patches/patch-aa
new file mode 100644
index 00000000000..b16126b5d51
--- /dev/null
+++ b/security/pam-tacplus/patches/patch-aa
@@ -0,0 +1,17 @@
+$NetBSD: patch-aa,v 1.1 2011/01/03 02:39:33 obache Exp $
+
+* no reason to include sys/socket.h conditionally.
+  https://sourceforge.net/tracker/?func=detail&aid=3150034&group_id=228898&atid=1075707
+
+--- libtac/lib/connect.c.orig	2009-03-30 17:50:05.000000000 +0000
++++ libtac/lib/connect.c
+@@ -18,9 +18,7 @@
+ #include <fcntl.h>
+ #include <errno.h>
+ 
+-#ifdef _AIX
+   #include <sys/socket.h>
+-#endif
+ 
+ #ifndef __linux__
+   #include <strings.h>
diff --git a/security/pam-tacplus/patches/patch-ab b/security/pam-tacplus/patches/patch-ab
new file mode 100644
index 00000000000..a734bd3df9d
--- /dev/null
+++ b/security/pam-tacplus/patches/patch-ab
@@ -0,0 +1,51 @@
+$NetBSD: patch-ab,v 1.1 2011/01/03 02:39:33 obache Exp $
+
+* DragonFly have same signature as Linux and NetBSD.
+
+--- pam_tacplus.c.orig	2009-03-30 19:48:29.000000000 +0000
++++ pam_tacplus.c
+@@ -127,7 +127,7 @@ int _pam_account(pam_handle_t *pamh, int
+ {
+   int retval;
+   static int ctrl;
+-#if (defined(__linux__) || defined(__NetBSD__))
++#if (defined(__linux__) || defined(__NetBSD__) || defined(__DragonFly__))
+   char *user = NULL;
+ #else
+   const char *user = NULL;
+@@ -152,7 +152,7 @@ int _pam_account(pam_handle_t *pamh, int
+   if (ctrl & PAM_TAC_DEBUG)
+ 	  syslog(LOG_DEBUG, "%s: tac_srv_no=%d", __FUNCTION__, tac_srv_no);
+   
+-#if (defined(__linux__) || defined(__NetBSD__))
++#if (defined(__linux__) || defined(__NetBSD__) || defined(__DragonFly__))
+   retval = pam_get_item(pamh, PAM_USER, (const void **) (const void*) &user);
+ #else
+   retval = pam_get_item(pamh, PAM_USER, (void **) (void*) &user);
+@@ -290,7 +290,7 @@ int pam_sm_authenticate (pam_handle_t * 
+ 		     int argc, const char **argv)
+ {
+   int ctrl, retval;
+-#if (defined(__linux__) || defined(__NetBSD__))
++#if (defined(__linux__) || defined(__NetBSD__) || defined(__DragonFly__))
+   const char *user;
+ #else
+   char *user;
+@@ -425,7 +425,7 @@ int pam_sm_acct_mgmt (pam_handle_t * pam
+ 		  int argc, const char **argv)
+ {
+   int retval, ctrl, status=PAM_AUTH_ERR;
+-#if (defined(__linux__) || defined(__NetBSD__))
++#if (defined(__linux__) || defined(__NetBSD__) || defined(__DragonFly__))
+   const char *user;
+ #else
+   char *user;
+@@ -457,7 +457,7 @@ int pam_sm_acct_mgmt (pam_handle_t * pam
+ 		    inet_ntoa(addr));
+   }
+   
+-#if (defined(__linux__) || defined(__NetBSD__))
++#if (defined(__linux__) || defined(__NetBSD__) || defined(__DragonFly__))
+   retval = pam_get_item(pamh, PAM_USER, (const void **) (const void*) &user);
+ #else
+   retval = pam_get_item(pamh, PAM_USER, (void **) (void*) &user);
diff --git a/security/pam-tacplus/patches/patch-ac b/security/pam-tacplus/patches/patch-ac
new file mode 100644
index 00000000000..832d049a93c
--- /dev/null
+++ b/security/pam-tacplus/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.1 2011/01/03 02:39:33 obache Exp $
+
+* DragonFly have same signature as Linux and NetBSD.
+
+--- support.c.orig	2009-03-30 19:23:26.000000000 +0000
++++ support.c
+@@ -101,7 +101,7 @@ int converse (pam_handle_t * pamh, int n
+   if ((retval = pam_get_item (pamh, PAM_CONV, (void *)&conv))
+       == PAM_SUCCESS)
+     {
+-#if (defined(__linux__) || defined(__NetBSD__))
++#if (defined(__linux__) || defined(__NetBSD__) || defined(__DragonFly__))
+       retval = conv->conv (nargs, (const struct pam_message **) message
+ #else
+       retval = conv->conv (nargs, (struct pam_message **) message