1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-23 04:23:08 +00:00

- update to 20091122 and fix GPL problems

This commit is contained in:
Dirk Meyer 2009-11-22 21:48:36 +00:00
parent 463a211c90
commit d4ea6acf86
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=244664
7 changed files with 47 additions and 31 deletions

View File

@ -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}

View File

@ -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

View File

@ -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)

View File

@ -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>

View File

@ -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"

View File

@ -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 */

View File

@ -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;