diff options
Diffstat (limited to 'net/tinyldap/files')
-rw-r--r-- | net/tinyldap/files/patch-Makefile | 9 | ||||
-rw-r--r-- | net/tinyldap/files/patch-auth.c | 18 | ||||
-rw-r--r-- | net/tinyldap/files/patch-md5password.c | 18 | ||||
-rw-r--r-- | net/tinyldap/files/patch-mstorage_add.c | 11 | ||||
-rw-r--r-- | net/tinyldap/files/patch-mstorage_add_bin.c | 11 |
5 files changed, 43 insertions, 24 deletions
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; |