13 files changed, 59 insertions, 117 deletions

diff --git a/security/pam_smb/Makefile b/security/pam_smb/Makefile
index 23c5b16a6676..f857746eb11c 100644
--- a/security/pam_smb/Makefile
+++ b/security/pam_smb/Makefile
@@ -5,35 +5,38 @@
 # $FreeBSD$
 
 PORTNAME=	pam_smb
-PORTVERSION=	1.1.6
+PORTVERSION=	1.9.9
 CATEGORIES=	security
-MASTER_SITES=   ftp://ftp.samba.org/pub/samba/%SUBDIR%/ \
-		ftp://ring.asahi-net.or.jp/pub/net/samba/%SUBDIR%/ \
-		ftp://samba.anu.edu.au/pub/samba/%SUBDIR%/ \
-		ftp://de.samba.org/pub/mirror/samba/%SUBDIR%/ \
-		ftp://se.samba.org/pub/samba/%SUBDIR%/ \
-		ftp://ftp.sunet.se/pub/unix/utilities/samba/%SUBDIR%/
-MASTER_SITE_SUBDIR=pam_smb
+MASTER_SITES=   http://www.csn.ul.ie/~airlied/pam_smb/devel/
 
 MAINTAINER=	nsayer@FreeBSD.org
 
 USE_AUTOCONF=	yes
 USE_GMAKE=	yes
-MAKE_ENV+=	PREFIX=${PREFIX}
+STARTUP_SCRIPT=	pam_smbd.sh.sample
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 .include <bsd.port.pre.mk>
 
 post-patch:
-	${PERL} -pi -e s%CONFDIR%\"${PREFIX}/etc\"% ${WRKSRC}/pam_read_conf.c
-	${PERL} -pi -e s%CONFDIR%\"${PREFIX}/etc\"% ${WRKSRC}/pam_smb_auth.c
+	${PERL} -pi -e s,%%PREFIX%%,${PREFIX}, ${WRKSRC}/pamsmbd/pam_read_conf.c
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/pam_smb_auth.so ${PREFIX}/lib
-	${INSTALL_DATA} ${FILESDIR}/pam_smb.conf.sample ${PREFIX}/etc
+	${INSTALL_PROGRAM} ${WRKSRC}/pamsmbd/pamsmbd ${PREFIX}/sbin/
+	${INSTALL_DATA} ${WRKSRC}/pamsmbm/pam_smb_auth.so ${PREFIX}/lib/
+	${MKDIR} ${PREFIX}/share/doc/pam_smb/
+	${INSTALL_DATA} ${WRKSRC}/BUGS ${PREFIX}/share/doc/pam_smb/
+	${INSTALL_DATA} ${WRKSRC}/CHANGES ${PREFIX}/share/doc/pam_smb/
+	${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/pam_smb/
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/pam_smb/
+	${INSTALL_DATA} ${WRKSRC}/TODO ${PREFIX}/share/doc/pam_smb/
+	${INSTALL_DATA} ${WRKSRC}/pam_smb.conf.example ${PREFIX}/etc/
+	${INSTALL_DATA} ${WRKSRC}/pam_smb.conf.example2 ${PREFIX}/etc/
+	${INSTALL_SCRIPT} ${FILESDIR}/${STARTUP_SCRIPT} ${PREFIX}/etc/rc.d/
+	${PERL} -pi -e s,%%PREFIX%%,${PREFIX}, ${PREFIX}/etc/rc.d/${STARTUP_SCRIPT}
 
 post-install:
-	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' ${PKGMESSAGE}
+	@${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/security/pam_smb/distinfo b/security/pam_smb/distinfo
index 7091cfef503c..1d3a9281771e 100644
--- a/security/pam_smb/distinfo
+++ b/security/pam_smb/distinfo
@@ -1 +1 @@
-MD5 (pam_smb-1.1.6.tar.gz) = 7d18363b7ab932f852f670b4aeed1283
+MD5 (pam_smb-1.9.9.tar.gz) = 571ea74593c80a723331e207cbd09cb4
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;
diff --git a/security/pam_smb/pkg-comment b/security/pam_smb/pkg-comment
index dd7847bd0aa7..a136a6b1345a 100644
--- a/security/pam_smb/pkg-comment
+++ b/security/pam_smb/pkg-comment
@@ -1 +1 @@
-Samba NetBIOS domain logon PAM module
+NetBIOS domain logon PAM module
diff --git a/security/pam_smb/pkg-descr b/security/pam_smb/pkg-descr
index e8a4aee9fa20..7624a2ebcf02 100644
--- a/security/pam_smb/pkg-descr
+++ b/security/pam_smb/pkg-descr
@@ -1,3 +1,3 @@
 This PAM module performs NT Domain authentication.
 
-WWW: http://www.samba.org/
+WWW: http://www.skynet.ie/~airlied/pam_smb/
diff --git a/security/pam_smb/pkg-message b/security/pam_smb/pkg-message
index a0864f32887f..54ee866b4a7d 100644
--- a/security/pam_smb/pkg-message
+++ b/security/pam_smb/pkg-message
@@ -1,8 +1,12 @@
 
-After copying %%PREFIX%%/etc/pam_smb.conf.sample to
+After copying %%PREFIX%%/etc/pam_smb.conf.example to
 %%PREFIX%%/etc/pam_smb.conf and editing it to taste,
 add something like this to your /etc/pam.conf file to use
 this module:
 
 login    auth    sufficient    %%PREFIX%%/lib/pam_smb_auth.so
 
+Then be sure and rename %%PREFIX%%/etc/rc.d/pam_smbd.sh.sample
+so that the daemon starts at boot time.
+
+See %%PREFIX%%/share/doc/pam_smb for more information.
diff --git a/security/pam_smb/pkg-plist b/security/pam_smb/pkg-plist
index a981a5e5271c..25c0b2e3a198 100644
--- a/security/pam_smb/pkg-plist
+++ b/security/pam_smb/pkg-plist
@@ -1,2 +1,11 @@
+sbin/pamsmbd
 lib/pam_smb_auth.so
-etc/pam_smb.conf.sample
+etc/pam_smb.conf.example
+etc/pam_smb.conf.example2
+etc/rc.d/pam_smbd.sh.sample
+share/doc/pam_smb/README
+share/doc/pam_smb/INSTALL
+share/doc/pam_smb/TODO
+share/doc/pam_smb/BUGS
+share/doc/pam_smb/CHANGES
+@dirrm share/doc/pam_smb