Changes 1.2:

* Fix build error when cross-compiling to MinGW.

Changes 1.1:
* Update gnulib files.
* The core library is now compiled with many warning flags.
  Some warnings have been fixed too.

Changes 1.0:
* Update gnulib files.

Changes 0.4.2:
* Fix endian related bug in self test.
* Add a note in README about NTLM being a insecure protocol.
* Cleaned up internal endianness handling.
* Update of gnulib files.

Changes 0.4.1:
* Update of gnulib files.

Changes 0.4.0:
* Only public API functions are exported in shared library.
  Using libtool's -export-symbols-regex.
* Update of gnulib files.

6 files changed, 13 insertions, 82 deletions

diff --git a/devel/libntlm/Makefile b/devel/libntlm/Makefile
index a04211dcd4d..68cb400942e 100644
--- a/devel/libntlm/Makefile
+++ b/devel/libntlm/Makefile
@@ -1,19 +1,19 @@
-# $NetBSD: Makefile,v 1.16 2008/07/14 12:56:02 joerg Exp $
-#
+# $NetBSD: Makefile,v 1.17 2011/01/28 07:44:25 adam Exp $
 
-DISTNAME=		libntlm-0.3.12
-CATEGORIES=		security
-MASTER_SITES=		http://josefsson.org/libntlm/releases/
+DISTNAME=	libntlm-1.2
+CATEGORIES=	security
+MASTER_SITES=	http://josefsson.org/libntlm/releases/
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://josefsson.org/libntlm/
-COMMENT=		Library that implement Microsoft's NTLM authentication
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://josefsson.org/libntlm/
+COMMENT=	Library that implement Microsoft's NTLM authentication
+LICENSE=	gnu-lgpl-v2.1
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+USE_LIBTOOL=		yes
 USE_TOOLS+=		pkg-config
 GNU_CONFIGURE=		yes
-USE_LIBTOOL=		yes
 TEST_TARGET=		check
 
 PKGCONFIG_OVERRIDE+=	libntlm.pc.in
diff --git a/devel/libntlm/distinfo b/devel/libntlm/distinfo
index 863e02bd360..97466ea32fe 100644
--- a/devel/libntlm/distinfo
+++ b/devel/libntlm/distinfo
@@ -1,9 +1,5 @@
-$NetBSD: distinfo,v 1.7 2006/12/09 13:57:29 obache Exp $
+$NetBSD: distinfo,v 1.8 2011/01/28 07:44:25 adam Exp $
 
-SHA1 (libntlm-0.3.12.tar.gz) = 9817766086915304d307ed0a6bd644661bb76437
-RMD160 (libntlm-0.3.12.tar.gz) = 55a9c9f7a6414360439f5c3087076f7c00966c75
-Size (libntlm-0.3.12.tar.gz) = 393196 bytes
-SHA1 (patch-aa) = 74091394db44717ded27fa77a92261f6e01523c6
-SHA1 (patch-ab) = a483cc8d22392e52c5aebbcf34fffa39462463c5
-SHA1 (patch-ac) = df45a385645029752a92ef3751a972f30161580f
-SHA1 (patch-ad) = f1becbe91bb7aa990d78121d3307da7595b80546
+SHA1 (libntlm-1.2.tar.gz) = 27538a3375690a37574fa991fbd327d150d8b505
+RMD160 (libntlm-1.2.tar.gz) = b7344213f2510c93e30583fc567961a4e6aedd13
+Size (libntlm-1.2.tar.gz) = 439103 bytes
diff --git a/devel/libntlm/patches/patch-aa b/devel/libntlm/patches/patch-aa
deleted file mode 100644
index 4ad7952c891..00000000000
--- a/devel/libntlm/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/12/09 13:57:29 obache Exp $
-
---- lib/des.c.orig	2006-05-16 14:05:25.000000000 +0000
-+++ lib/des.c
-@@ -532,7 +532,7 @@ des_key_schedule (const char * _rawkey, 
- }
- 
- void
--des_setkey (des_ctx *ctx, const char * key)
-+ntlm_des_setkey (des_ctx *ctx, const char * key)
- {
-   int i;
- 
-@@ -551,7 +551,7 @@ des_makekey (des_ctx *ctx, const char * 
-   if (keylen != 8)
-     return false;
- 
--  des_setkey (ctx, key);
-+  ntlm_des_setkey (ctx, key);
- 
-   return !des_is_weak_key (key);
- }
diff --git a/devel/libntlm/patches/patch-ab b/devel/libntlm/patches/patch-ab
deleted file mode 100644
index 732a4875482..00000000000
--- a/devel/libntlm/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/12/09 13:57:29 obache Exp $
-
---- lib/des.h.orig	2005-10-18 13:37:39.000000000 +0000
-+++ lib/des.h
-@@ -59,7 +59,7 @@ des_is_weak_key (const char * key);
-  * Does not check parity bits, but simply ignore them.  Does not check
-  * for weak keys. */
- extern void
--des_setkey (des_ctx *ctx, const char * key);
-+ntlm_des_setkey (des_ctx *ctx, const char * key);
- 
- /* Fill a DES context CTX with subkeys calculated from 64bit KEY, with
-  * weak key checking.  Does not check parity bits, but simply ignore
diff --git a/devel/libntlm/patches/patch-ac b/devel/libntlm/patches/patch-ac
deleted file mode 100644
index 5bf187a9c04..00000000000
--- a/devel/libntlm/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/12/09 13:57:29 obache Exp $
-
---- smbencrypt.c.orig	2006-03-24 09:04:05.000000000 +0000
-+++ smbencrypt.c
-@@ -145,7 +145,7 @@ ntlm_convert_key (char *key_56, des_ctx 
-   key[6] = ((to_uchar (key_56[5]) << 2) & 0xFF) | (to_uchar (key_56[6]) >> 6);
-   key[7] = (to_uchar (key_56[6]) << 1) & 0xFF;
- 
--  des_setkey (ks, key);
-+  ntlm_des_setkey (ks, key);
- 
-   memset (&key, 0, sizeof (key));
- }
diff --git a/devel/libntlm/patches/patch-ad b/devel/libntlm/patches/patch-ad
deleted file mode 100644
index fd3ae00508b..00000000000
--- a/devel/libntlm/patches/patch-ad
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2006/12/09 13:57:29 obache Exp $
-
---- tests/test-des.c.orig	2005-10-23 16:03:36.000000000 +0000
-+++ tests/test-des.c
-@@ -44,10 +44,10 @@ main (int argc, char *argv[])
- 
-     for (i = 0; i < 64; ++i)
-       {
--	des_setkey (&des, key);
-+	ntlm_des_setkey (&des, key);
- 	des_ecb_encrypt (&des, input, temp1);
- 	des_ecb_encrypt (&des, temp1, temp2);
--	des_setkey (&des, temp2);
-+	ntlm_des_setkey (&des, temp2);
- 	des_ecb_decrypt (&des, temp1, temp3);
- 	memcpy (key, temp3, 8);
- 	memcpy (input, temp1, 8);