Index: head/net/tinyldap/Makefile =================================================================== --- head/net/tinyldap/Makefile (revision 436488) +++ head/net/tinyldap/Makefile (revision 436489) @@ -1,54 +1,53 @@ # $FreeBSD$ PORTNAME= tinyldap PORTVERSION= 0.0.${SNAPSHOT} -PORTREVISION= 1 CATEGORIES= net ipv6 MASTER_SITES= ftp://ftp.dinoex.de/pub/tinyldap/ DISTNAME= ${PORTNAME}-${SNAPSHOT} MAINTAINER= dinoex@FreeBSD.org COMMENT= Small LDAP implementation -BUILD_DEPENDS+= ${LOCALBASE}/lib/libowfat.a:${LIBOWFAT_PORT} - LICENSE= GPLv2 -SNAPSHOT= 20091122 -USES= tar:bzip2 gmake +BUILD_DEPENDS+= ${LOCALBASE}/lib/libowfat.a:${LIBOWFAT_PORT} + +SNAPSHOT= 20170319 +USES= tar:bzip2 gmake ssl WRKSRC= ${WRKDIR}/${PORTNAME} CFLAGS+= -DATTRIBS=512 SBINFILES= acl addindex bindrequest dumpacls dumpidx idx2ldif parse \ tinyldap_debug tinyldap_standalone BINFILES= ldapclient ldapclient_str md5password mysql2ldif \ tinyldapdelete DOCFILES= ACL FORMAT GETTING.STARTED README README.security RFCs \ THANKS TODO LIBOWFAT_PORT?= devel/libowfat TINYLDAP_DATA?= ${PREFIX}/tinyldap/data OPTIONS_DEFINE= DOCS post-patch: ${TOUCH} ${WRKSRC}/alloca.h ${REINPLACE_CMD} -e "s|\"data\"|\"${TINYLDAP_DATA}\"|" \ ${WRKSRC}/tinyldap.c do-install: ${INSTALL_PROGRAM} ${WRKSRC}/tinyldap ${STAGEDIR}${PREFIX}/libexec/ ${CP} -p ${WRKSRC}/ldapdelete ${WRKSRC}/tinyldapdelete .for i in ${BINFILES} ${INSTALL_PROGRAM} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/bin/ .endfor .for i in ${SBINFILES} ${INSTALL_PROGRAM} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/sbin/ .endfor do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${DOCFILES} ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/ .endfor .include Index: head/net/tinyldap/distinfo =================================================================== --- head/net/tinyldap/distinfo (revision 436488) +++ head/net/tinyldap/distinfo (revision 436489) @@ -1,2 +1,3 @@ -SHA256 (tinyldap-20091122.tar.bz2) = a369db5678aa828e629dd98b546eb031adfffa641fd85bfe6d59c1c30851a996 -SIZE (tinyldap-20091122.tar.bz2) = 54088 +TIMESTAMP = 1489925452 +SHA256 (tinyldap-20170319.tar.bz2) = 99ab02728c4a8940d7e696cd46a26f6b4cda7df3c4ace2633b68356f893e2113 +SIZE (tinyldap-20170319.tar.bz2) = 74096 Index: head/net/tinyldap/files/patch-md5password.c =================================================================== --- head/net/tinyldap/files/patch-md5password.c (revision 436488) +++ head/net/tinyldap/files/patch-md5password.c (nonexistent) @@ -1,18 +0,0 @@ ---- 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 - #else -+#ifdef __FreeBSD__ -+#include -+#else - #include - #define MD5Init MD5_Init - #define MD5Update MD5_Update - #define MD5Final MD5_Final - #endif -+#endif - #include - #include "buffer.h" - #include "str.h" Property changes on: head/net/tinyldap/files/patch-md5password.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/tinyldap/files/patch-auth.c =================================================================== --- head/net/tinyldap/files/patch-auth.c (revision 436488) +++ head/net/tinyldap/files/patch-auth.c (nonexistent) @@ -1,18 +0,0 @@ ---- 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 - #else -+#ifdef __FreeBSD__ -+#include -+#else - #include - #define MD5Init MD5_Init - #define MD5Update MD5_Update - #define MD5Final MD5_Final - #endif -+#endif - #define _XOPEN_SOURCE - #include - #include Property changes on: head/net/tinyldap/files/patch-auth.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/tinyldap/files/patch-Makefile =================================================================== --- head/net/tinyldap/files/patch-Makefile (revision 436488) +++ head/net/tinyldap/files/patch-Makefile (revision 436489) @@ -1,44 +1,41 @@ ---- Makefile.orig 2008-04-25 13:09:33.000000000 +0200 -+++ Makefile 2009-11-22 22:24:42.000000000 +0100 -@@ -35,22 +35,26 @@ +--- Makefile.orig 2017-03-19 11:47:19 UTC ++++ Makefile +@@ -43,20 +43,23 @@ tls_cipherprio.o fmt_tls_alert_pkt.o fmt + fmt_tls_handshake_certs_header.o fmt_tls_serverhellodone.o \ + tls_accept.o tls_connect.o tls_doread.o tls_dowrite.o - auth.a: auth.o - -DIET=/opt/diet/bin/diet -Os --CC=gcc +DIET= -+CC?=gcc - CFLAGS=-pipe -I. -Wall -W -Wextra + CROSS= + #CROSS=i686-mingw32- +-CC=$(CROSS)gcc +-CFLAGS=-pipe -I. -Wall -W -Wextra ++CC?=$(CROSS)gcc ++CFLAGS?=-pipe -I. -Wall -W -Wextra ifneq ($(DEBUG),) -DIET=/opt/diet/bin/diet --CFLAGS=-pipe -I. -Wall -W -g -fstack-protector +-CFLAGS=-pipe -I. -Wall -W -Wextra -g -fstack-protector +DIET= -+CFLAGS?=-pipe -I. -Wall -W -g -fstack-protector ++CFLAGS?=-pipe -I. -Wall -W -Wextra -g -fstack-protector endif ifeq ($(COVERAGE),1) DIET= -CFLAGS=-pipe -I. -g -fprofile-arcs -ftest-coverage +CFLAGS?=-pipe -I. -g -fprofile-arcs -ftest-coverage endif +CFLAGS+=-I. -I${LOCALBASE}/include/libowfat -Os +LDFLAGS+=-L${LOCALBASE}/lib -+LIBS+=-lmd + ifneq ($(DIET),) LIBS+=-llatin1 else --LIBS+=-lcrypto -lcrypt -+LIBS+=-lcrypt - endif - - %.o: %.c -@@ -79,7 +83,7 @@ +@@ -97,7 +100,7 @@ tinyldap_debug: tinyldap.c $(DIET) $(CC) $(CFLAGS) -DSTANDALONE -DDEBUG -o $@ $^ $(LDFLAGS) -lowfat $(LIBS) acl: acl.c ldap.a asn1.a - $(DIET) $(CC) $(CFLAGS) -o acl acl.c -I. ldap.a asn1.a -lowfat $(LIBS) + $(DIET) $(CC) $(CFLAGS) -o acl acl.c -I. ldap.a asn1.a $(LDFLAGS) -lowfat $(LIBS) - - .PHONY: clean tar + .PHONY: test + test: test/bind test/ebind Index: head/net/tinyldap/files/patch-ldif.h =================================================================== --- head/net/tinyldap/files/patch-ldif.h (revision 436488) +++ head/net/tinyldap/files/patch-ldif.h (revision 436489) @@ -1,12 +1,12 @@ ---- ldif.h.orig 2008-04-25 13:09:34.000000000 +0200 -+++ ldif.h 2008-04-25 21:36:30.000000000 +0200 -@@ -4,7 +4,9 @@ - #include +--- ldif.h.orig 2017-03-19 11:47:19 UTC ++++ ldif.h +@@ -5,7 +5,9 @@ + #include "ldap.h" /* how many attributes do we allow per record? */ +#ifndef ATTRIBS #define ATTRIBS 100 +#endif struct attribute { uint32_t name, value;