- update to 20091122 and fix GPL problems

7 files changed, 47 insertions, 31 deletions

diff --git a/net/tinyldap/Makefile b/net/tinyldap/Makefile
index c8291e8d7a7a..622716364d5d 100644
--- a/net/tinyldap/Makefile
+++ b/net/tinyldap/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	tinyldap
 PORTVERSION=	0.0.${SNAPSHOT}
-PORTREVISION=	1
 CATEGORIES=	net ipv6
 MASTER_SITES=	ftp://ftp.dinoex.de/pub/tinyldap/
 DISTNAME=	${PORTNAME}-${SNAPSHOT}
@@ -17,9 +16,7 @@ COMMENT=	A small LDAP implementation
 
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libowfat.a:${PORTSDIR}/${LIBOWFAT_PORT}
 
-NO_PACKAGE=	GPL forbids distribution when linked with openssl
-
-SNAPSHOT=	20080425
+SNAPSHOT=	20091122
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/net/tinyldap/distinfo b/net/tinyldap/distinfo
index f6ab50912a19..c732b48f9ffd 100644
--- a/net/tinyldap/distinfo
+++ b/net/tinyldap/distinfo
@@ -1,3 +1,3 @@
-MD5 (tinyldap-20080425.tar.bz2) = d6f93d93fb2db25d2681db3beb9d4e7c
-SHA256 (tinyldap-20080425.tar.bz2) = 1511d1e940fb32cc0f06e25a63841e6954d153fb1539c17e690b0dc2408d4a79
-SIZE (tinyldap-20080425.tar.bz2) = 53652
+MD5 (tinyldap-20091122.tar.bz2) = 467a1baaf4946ffce45b06bbce306ea2
+SHA256 (tinyldap-20091122.tar.bz2) = a369db5678aa828e629dd98b546eb031adfffa641fd85bfe6d59c1c30851a996
+SIZE (tinyldap-20091122.tar.bz2) = 54088
diff --git a/net/tinyldap/files/patch-Makefile b/net/tinyldap/files/patch-Makefile
index 87a6db679420..dfee68d63f23 100644
--- a/net/tinyldap/files/patch-Makefile
+++ b/net/tinyldap/files/patch-Makefile
@@ -1,6 +1,6 @@
 --- Makefile.orig	2008-04-25 13:09:33.000000000 +0200
-+++ Makefile	2008-04-25 21:51:06.000000000 +0200
-@@ -35,18 +35,22 @@
++++ Makefile	2009-11-22 22:24:42.000000000 +0100
+@@ -35,22 +35,26 @@
  
  auth.a: auth.o
  
@@ -28,6 +28,11 @@
  ifneq ($(DIET),)
  LIBS+=-llatin1
  else
+-LIBS+=-lcrypto -lcrypt
++LIBS+=-lcrypt
+ endif
+ 
+ %.o: %.c
 @@ -79,7 +83,7 @@
  	$(DIET) $(CC) $(CFLAGS) -DSTANDALONE -DDEBUG -o $@ $^ $(LDFLAGS) -lowfat $(LIBS)
  
diff --git a/net/tinyldap/files/patch-auth.c b/net/tinyldap/files/patch-auth.c
new file mode 100644
index 000000000000..3160404e6d48
--- /dev/null
+++ b/net/tinyldap/files/patch-auth.c
@@ -0,0 +1,18 @@
+--- auth.c.orig	2008-04-25 13:09:34.000000000 +0200
++++ auth.c	2009-11-22 22:28:37.000000000 +0100
+@@ -2,11 +2,15 @@
+ #ifdef __dietlibc__
+ #include <md5.h>
+ #else
++#ifdef __FreeBSD__
++#include <md5.h>
++#else
+ #include <openssl/md5.h>
+ #define MD5Init MD5_Init
+ #define MD5Update MD5_Update
+ #define MD5Final MD5_Final
+ #endif
++#endif
+ #define _XOPEN_SOURCE
+ #include <unistd.h>
+ #include <stdlib.h>
diff --git a/net/tinyldap/files/patch-md5password.c b/net/tinyldap/files/patch-md5password.c
new file mode 100644
index 000000000000..fde33fb00610
--- /dev/null
+++ b/net/tinyldap/files/patch-md5password.c
@@ -0,0 +1,18 @@
+--- md5password.c.orig	2008-04-25 13:09:34.000000000 +0200
++++ md5password.c	2009-11-22 22:28:50.000000000 +0100
+@@ -2,11 +2,15 @@
+ #ifdef __dietlibc__
+ #include <md5.h>
+ #else
++#ifdef __FreeBSD__
++#include <md5.h>
++#else
+ #include <openssl/md5.h>
+ #define MD5Init MD5_Init
+ #define MD5Update MD5_Update
+ #define MD5Final MD5_Final
+ #endif
++#endif
+ #include <string.h>
+ #include "buffer.h"
+ #include "str.h"
diff --git a/net/tinyldap/files/patch-mstorage_add.c b/net/tinyldap/files/patch-mstorage_add.c
deleted file mode 100644
index ea5e3fd5e3ac..000000000000
--- a/net/tinyldap/files/patch-mstorage_add.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- mstorage_add.c.orig	2008-04-25 13:09:34.000000000 +0200
-+++ mstorage_add.c	2008-04-25 21:46:42.000000000 +0200
-@@ -19,7 +19,7 @@
- /* Sadly, mremap is only available on Linux */
- /* Please petition your congressman^Woperating system vendor to include it! */
- 
--long mstorage_add(mstorage_t* p,const char* s,unsigned long n) {
-+long mstorage_add(mstorage_t* p,const char* s,size_t n) {
-   if (p->mapped-p->used<n) {
-     if (!p->root) {
-       /* nothing allocated.  mmap /dev/zero */
diff --git a/net/tinyldap/files/patch-mstorage_add_bin.c b/net/tinyldap/files/patch-mstorage_add_bin.c
deleted file mode 100644
index 0c73d05107ad..000000000000
--- a/net/tinyldap/files/patch-mstorage_add_bin.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- mstorage_add_bin.c.orig	2008-04-25 13:09:34.000000000 +0200
-+++ mstorage_add_bin.c	2008-04-25 21:47:27.000000000 +0200
-@@ -6,7 +6,7 @@
-  *   char 0;
-  *   uint32 len;
-  *   char data[len] */
--long mstorage_add_bin(mstorage_t* p,const char* s,unsigned long n) {
-+long mstorage_add_bin(mstorage_t* p,const char* s,size_t n) {
-   unsigned int i;
-   static char zero;
-   long x;