After much delay, I am finally able to test pam_smb again, which means

we can update to the latest version. Hooray!

PR:		ports/26913
Submitted by:	dwcjr

7 files changed, 24 insertions, 98 deletions

diff --git a/security/pam_smb/files/pam_smb.conf.sample b/security/pam_smb/files/pam_smb.conf.sample
deleted file mode 100644
index 2e1c1d3fec3b..000000000000
--- a/security/pam_smb/files/pam_smb.conf.sample
+++ /dev/null
@@ -1,3 +0,0 @@
-my_NT_domain
-my_domain_PDC
-my_domain_BDC
diff --git a/security/pam_smb/files/pam_smbd.sh.sample b/security/pam_smb/files/pam_smbd.sh.sample
new file mode 100644
index 000000000000..f40ebe13d3b2
--- /dev/null
+++ b/security/pam_smb/files/pam_smbd.sh.sample
@@ -0,0 +1,14 @@
+#!/bin/sh
+pidfiledir=/var/run
+pamsmbd=%%PREFIX%%/sbin/pamsmbd
+
+# start
+if [ "x$1" = "x" -o "x$1" = "xstart" ]; then
+        echo -n ' pamsmbd'
+        $pamsmbd
+fi
+
+# stop
+elif [ "x$1" = "xstop" ]; then
+        kill `cat $pidfiledir/pamsmbd.pid`
+fi
diff --git a/security/pam_smb/files/patch-aa b/security/pam_smb/files/patch-aa
index 001679985543..83b7dc0e1983 100644
--- a/security/pam_smb/files/patch-aa
+++ b/security/pam_smb/files/patch-aa
@@ -1,13 +1,11 @@
---- smbval/smbencrypt.c.orig	Wed Jun 20 05:43:48 2001
-+++ smbval/smbencrypt.c	Wed Jun 20 05:44:20 2001
-@@ -24,7 +24,10 @@
- #include <arpa/inet.h>
- #include <dirent.h>
- #include <string.h>
-+#include <sys/param.h>
-+#ifndef BSD
- #include <sys/vfs.h>
-+#endif
- #include <netinet/in.h>
+--- pamsmbd/pam_read_conf.c.orig	Mon Dec 17 10:15:16 2001
++++ pamsmbd/pam_read_conf.c	Mon Dec 17 10:15:40 2001
+@@ -25,7 +25,7 @@
+ #include "constants.h"
+ #include "cache.h"
+ 
+-#define CONFFILE "/etc/pam_smb.conf"
++#define CONFFILE "%%PREFIX%%/etc/pam_smb.conf"
+ 
+ int smb_readpamconf(domain_list *);
  
- #include "smblib-priv.h"
diff --git a/security/pam_smb/files/patch-ab b/security/pam_smb/files/patch-ab
deleted file mode 100644
index 061642f99a7e..000000000000
--- a/security/pam_smb/files/patch-ab
+++ /dev/null
@@ -1,17 +0,0 @@
---- configure.in.orig	Wed Jun 20 05:49:59 2001
-+++ configure.in	Wed Jun 20 05:51:27 2001
-@@ -138,6 +138,14 @@
-         LD_FLAGS=""
-         LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
-         ;;                                         
-+    FreeBSD*)
-+	SHLIB_CFLAGS="-fPIC -DPIC"
-+	SHLIB_LD="gcc -shared"
-+	SHLIB_LD_LIBS="-lpam"
-+	SHLIB_SUFFIX=".so"
-+	LD_FLAGS=""
-+	LD_SEARCH_FLAGS=""
-+	;;
- esac
- 
- if test "$CC" = "gcc" -o `$CC -v 2>&1 | grep -c gcc` != "0" ; then
diff --git a/security/pam_smb/files/patch-ac b/security/pam_smb/files/patch-ac
deleted file mode 100644
index 5d6c4c2b45cc..000000000000
--- a/security/pam_smb/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- pam_read_conf.c.orig	Wed Jun 20 06:02:31 2001
-+++ pam_read_conf.c	Wed Jun 20 06:02:42 2001
-@@ -1,7 +1,7 @@
- #include <stdio.h>
- #include <string.h>
- 
--#define CONFFILE "/etc/pam_smb.conf"
-+#define CONFFILE CONFDIR"/pam_smb.conf"
- 
- /***********************************************************************
- 	This file is (C) Dave Airlie 1997 ( David.Airlie@ul.ie ) 
diff --git a/security/pam_smb/files/patch-ad b/security/pam_smb/files/patch-ad
deleted file mode 100644
index 9b0a7b49c011..000000000000
--- a/security/pam_smb/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- pam_smb_auth.c.orig	Wed Jun 20 06:33:23 2001
-+++ pam_smb_auth.c	Wed Jun 20 06:33:45 2001
-@@ -251,7 +251,7 @@
- 	w=smb_readpamconf(server,server2,domain);
- 	if (w!=0) 
- 	  {
--	    syslog(LOG_AUTHPRIV | LOG_ALERT, "pam_smb: Missing Configuration file : /etc/pam_smb.conf");
-+	    syslog(LOG_AUTHPRIV | LOG_ALERT, "pam_smb: Missing Configuration file : "CONFDIR"/pam_smb.conf");
- 	    return PAM_AUTHINFO_UNAVAIL;
- 	  }
- 	
diff --git a/security/pam_smb/files/patch-malloc b/security/pam_smb/files/patch-malloc
deleted file mode 100644
index 5ffc3f378704..000000000000
--- a/security/pam_smb/files/patch-malloc
+++ /dev/null
@@ -1,44 +0,0 @@
---- smbval/smblib.c.orig	Thu Nov 29 08:58:05 2001
-+++ smbval/smblib.c	Thu Nov 29 08:58:33 2001
-@@ -24,7 +24,7 @@
- */
- 
- #include "../config.h"
--#include <malloc.h>
-+#include <unistd.h>
- 
- int SMBlib_errno;
- int SMBlib_SMB_Error;
---- smbval/smblib-util.c.orig	Thu Nov 29 08:58:15 2001
-+++ smbval/smblib-util.c	Thu Nov 29 08:58:31 2001
-@@ -24,7 +24,7 @@
- */
- 
- #include "smblib-priv.h"
--#include <malloc.h>
-+#include <unistd.h>
- 
- #include "rfcnb.h"
- 
---- smbval/rfcnb-util.c.orig	Thu Nov 29 08:57:54 2001
-+++ smbval/rfcnb-util.c	Thu Nov 29 08:58:39 2001
-@@ -24,7 +24,7 @@
- */
- 
- #include <string.h>
--#include <malloc.h>
-+#include <unistd.h>
- 
- #include "std-includes.h"
- #include "rfcnb-priv.h"
---- smbval/session.c.orig	Thu Nov 29 08:58:00 2001
-+++ smbval/session.c	Thu Nov 29 08:58:36 2001
-@@ -23,7 +23,7 @@
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
- 
--#include <malloc.h>
-+#include <unistd.h>
- #include <string.h>
- 
- int RFCNB_errno = 0;