9 files changed, 125 insertions, 0 deletions
diff --git a/www/ap2-auth-ntlm/DESCR b/www/ap2-auth-ntlm/DESCR
new file mode 100644
index 00000000000..caf744bde0a
--- /dev/null
+++ b/www/ap2-auth-ntlm/DESCR
@@ -0,0 +1,8 @@
+NTLM is an authentication protocol used by Microsoft Internet Informations
+Server(tm) and Microsoft Internet Explorer(tm). While it is not really
+secure, it offers background authentication (the workstation logon
+credentials of users are passed through to the web server). This feature is
+widely used in intranets based on these Microsoft products.
+
+This module is implementing NTLM authentication for Apache on Unix
+platforms. It is available free of charges under the BSD License.
diff --git a/www/ap2-auth-ntlm/MESSAGE b/www/ap2-auth-ntlm/MESSAGE
new file mode 100644
index 00000000000..4837f7aab0b
--- /dev/null
+++ b/www/ap2-auth-ntlm/MESSAGE
@@ -0,0 +1,13 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1.1.1 2008/10/17 19:24:10 sborrill Exp $
+
+In order to use this module in your Apache installation, you need to
+add the following to your httpd.conf file:
+
+  LoadModule ${MODULE_NAME} lib/httpd/mod_ntlm.so
+
+An example httpd.conf fragment can be found in:
+
+  ${EGDIR}/ntlm.conf
+
+===========================================================================
diff --git a/www/ap2-auth-ntlm/Makefile b/www/ap2-auth-ntlm/Makefile
new file mode 100644
index 00000000000..3add9814b72
--- /dev/null
+++ b/www/ap2-auth-ntlm/Makefile
@@ -0,0 +1,34 @@
+# $NetBSD: Makefile,v 1.1.1.1 2008/10/17 19:24:10 sborrill Exp $
+#
+
+DISTNAME=	ntlm2
+PKGNAME=	${APACHE_PKG_PREFIX}-auth-ntlm-${DISTVERS}
+CATEGORIES=	www
+MASTER_SITES=	http://www.jamiekerwick.co.uk/modntlm/
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://modntlm.sourceforge.com/
+COMMENT=	Apache module for NTLM authentication
+
+PKG_APACHE_ACCEPTED=	apache2 apache22
+
+.include "../../mk/apache.mk"
+
+APACHE_MODULE_NAME=	mod_ntlm.${MODULE_EXT}
+
+WRKSRC=		${WRKDIR}
+
+DISTVERS=	0.2
+MODULE_EXT=	la
+
+MESSAGE_SUBST+=	MODULE_NAME=ntlm_module
+MESSAGE_SUBST+=	EGDIR=${EGDIR}
+
+EGDIR=		${PREFIX}/share/examples/mod_ntlm
+
+post-install:
+	${INSTALL_DATA_DIR} ${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/ntlm.conf ${EGDIR}
+
+.include "../../www/apache/module.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/www/ap2-auth-ntlm/PLIST b/www/ap2-auth-ntlm/PLIST
new file mode 100644
index 00000000000..60ee7fa1459
--- /dev/null
+++ b/www/ap2-auth-ntlm/PLIST
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2008/10/17 19:24:10 sborrill Exp $
+lib/httpd/mod_ntlm.so
+share/examples/mod_ntlm/ntlm.conf
+@dirrm share/examples/mod_ntlm
diff --git a/www/ap2-auth-ntlm/distinfo b/www/ap2-auth-ntlm/distinfo
new file mode 100644
index 00000000000..1746738e77a
--- /dev/null
+++ b/www/ap2-auth-ntlm/distinfo
@@ -0,0 +1,9 @@
+$NetBSD: distinfo,v 1.1.1.1 2008/10/17 19:24:10 sborrill Exp $
+
+SHA1 (ntlm2.tar.gz) = 02deae9b83a73410bab989245335d684f1288f5e
+RMD160 (ntlm2.tar.gz) = 5607b2e2b6420aa7534af0bb38fbf7a877ca616d
+Size (ntlm2.tar.gz) = 39380 bytes
+SHA1 (patch-mod_ntlm.c) = a5503e6bbcdaf9fe40522f44f78c20fd4160b60c
+SHA1 (patch-ntlmssp.inc.c) = f69298ef354a07f50e941ce63ab656e05a148e6b
+SHA1 (patch-smbencrypt.inc.c) = 55c74559a05f9d7dfab6df006dea74fdcb1fe49a
+SHA1 (patch-smblib.inc.c) = 90c4c795a7d4619650e565d3055cf2a0447b7d70
diff --git a/www/ap2-auth-ntlm/patches/patch-mod_ntlm.c b/www/ap2-auth-ntlm/patches/patch-mod_ntlm.c
new file mode 100644
index 00000000000..f549027937f
--- /dev/null
+++ b/www/ap2-auth-ntlm/patches/patch-mod_ntlm.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-mod_ntlm.c,v 1.1.1.1 2008/10/17 19:24:10 sborrill Exp $
+Add Apache 2.2 compatibility
+--- mod_ntlm.c.orig	2008-10-17 20:18:13.000000000 +0100
++++ mod_ntlm.c	2008-10-17 20:18:13.000000000 +0100
+@@ -671,7 +671,7 @@
+         return NULL;
+     }
+ 
+-    apr_pool_sub_make(&sp,p,NULL);
++    apr_pool_create_ex(&sp,p,NULL,NULL);
+ 
+     while (!(ap_cfg_getline(l, MAX_STRING_LEN, f))) {
+         if ((l[0] == '#') || (!l[0]))
diff --git a/www/ap2-auth-ntlm/patches/patch-ntlmssp.inc.c b/www/ap2-auth-ntlm/patches/patch-ntlmssp.inc.c
new file mode 100644
index 00000000000..ecc166b228c
--- /dev/null
+++ b/www/ap2-auth-ntlm/patches/patch-ntlmssp.inc.c
@@ -0,0 +1,8 @@
+$NetBSD: patch-ntlmssp.inc.c,v 1.1.1.1 2008/10/17 19:24:10 sborrill Exp $
+--- ntlmssp.inc.c.orig	2004-02-19 15:21:06.000000000 +0000
++++ ntlmssp.inc.c	2008-10-17 19:33:51.000000000 +0100
+@@ -1,3 +1,4 @@
++#include "httpd/httpd.h"
+ /*
+  * $Id: patch-ntlmssp.inc.c,v 1.1.1.1 2008/10/17 19:24:10 sborrill Exp $
+  *
diff --git a/www/ap2-auth-ntlm/patches/patch-smbencrypt.inc.c b/www/ap2-auth-ntlm/patches/patch-smbencrypt.inc.c
new file mode 100644
index 00000000000..e3a36545dc5
--- /dev/null
+++ b/www/ap2-auth-ntlm/patches/patch-smbencrypt.inc.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-smbencrypt.inc.c,v 1.1.1.1 2008/10/17 19:24:10 sborrill Exp $
+--- smbval/smbencrypt.inc.c.orig	2003-06-05 20:21:26.000000000 +0100
++++ smbval/smbencrypt.inc.c	2008-10-17 17:47:37.000000000 +0100
+@@ -19,7 +19,9 @@
+ #include <arpa/inet.h>
+ #include <dirent.h>
+ #include <string.h>
++#ifndef __NetBSD__
+ #include <sys/vfs.h>
++#endif
+ #include <netinet/in.h>
+ 
+ #include "smblib-priv.h"
diff --git a/www/ap2-auth-ntlm/patches/patch-smblib.inc.c b/www/ap2-auth-ntlm/patches/patch-smblib.inc.c
new file mode 100644
index 00000000000..f1e7b389a1b
--- /dev/null
+++ b/www/ap2-auth-ntlm/patches/patch-smblib.inc.c
@@ -0,0 +1,23 @@
+$NetBSD: patch-smblib.inc.c,v 1.1.1.1 2008/10/17 19:24:10 sborrill Exp $
+--- smbval/smblib.inc.c.orig	2004-02-19 15:24:46.000000000 +0000
++++ smbval/smblib.inc.c	2008-10-17 17:50:39.000000000 +0100
+@@ -22,8 +22,8 @@
+ #include <stdio.h>
+ #include <malloc.h>
+ 
+-static int SMBlib_errno;
+-static int SMBlib_SMB_Error;
++int SMBlib_errno;
++int SMBlib_SMB_Error;
+ #define SMBLIB_ERRNO
+ #define uchar unsigned char
+ #include "smblib-priv.h"
+@@ -33,7 +33,7 @@
+ 
+ #include <signal.h>
+ 
+-static SMB_State_Types SMBlib_State;
++SMB_State_Types SMBlib_State;
+ 
+ /* Initialize the SMBlib package     */
+ static int