ports/159830: Update port: net/isc-dhcp41-server Fix LDAP patches that were broken by previus upgrade

[Douglas William Thrift]

>Number:         159830
>Category:       ports
>Synopsis:       Update port: net/isc-dhcp41-server Fix LDAP patches that were broken by previus upgrade
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 17 05:40:07 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Douglas William Thrift
>Release:        FreeBSD 8.0-RELEASE-p4-jc2 amd64
>Organization:
>Environment:
System: FreeBSD slowhand.douglasthrift.net 8.0-RELEASE-p4-jc2 FreeBSD 8.0-RELEASE-p4-jc2 #1: Tue Jul 20 15:11:39 PDT 2010 user at jail8.johncompanies.com:/usr/obj/usr/src/sys/jail8 amd64
>Description:
The latest version of net/isc-dhcp41-server had some code changes which caused
the LDAP patches used when the LDAP knobs are enabled for the port are enabled
to not apply cleanly. I fixed this by patching the patches to apply cleanly
again.
>How-To-Repeat:
>Fix:
--- isc-dhcp41-server.patch begins here ---
diff -Nrux .svn -x work /usr/ports/net/isc-dhcp41-server/Makefile isc-dhcp41-server/Makefile
--- /usr/ports/net/isc-dhcp41-server/Makefile	2011-08-13 18:45:25.000000000 -0700
+++ isc-dhcp41-server/Makefile	2011-08-16 22:08:43.000000000 -0700
@@ -150,6 +150,7 @@
 
 pre-patch:
 .if ${SUBSYS} == server && defined(WITH_DHCP_LDAP)
+	@${PATCH} ${WRKDIR}/${LDAPPATCHDIST}/${LDAPPATCHFILE} ${FILESDIR}/extra-patch-${LDAPPATCHFILE}
 	@cd ${WRKSRC} && ${PATCH} -p1 < ${WRKDIR}/${LDAPPATCHDIST}/${LDAPPATCHFILE}
 .endif
 
diff -Nrux .svn -x work /usr/ports/net/isc-dhcp41-server/files/extra-patch-dhcp-4.1.1-ldap.patch isc-dhcp41-server/files/extra-patch-dhcp-4.1.1-ldap.patch
--- /usr/ports/net/isc-dhcp41-server/files/extra-patch-dhcp-4.1.1-ldap.patch	1969-12-31 16:00:00.000000000 -0800
+++ isc-dhcp41-server/files/extra-patch-dhcp-4.1.1-ldap.patch	2011-08-16 21:47:39.000000000 -0700
@@ -0,0 +1,32 @@
+--- dhcp-4.1.1-ldap.patch.orig	2010-02-16 09:15:45.000000000 -0800
++++ dhcp-4.1.1-ldap.patch	2011-08-16 21:45:26.000000000 -0700
+@@ -2,10 +2,10 @@
+ --- dhcp-4.1.1/common/conflex.c.ldap	2009-07-23 09:02:09.000000000 -1000
+ +++ dhcp-4.1.1/common/conflex.c	2010-02-16 07:14:11.000000000 -1000
+ @@ -43,6 +43,7 @@ static enum dhcp_token read_string PROTO
+- static enum dhcp_token read_number PROTO ((int, struct parse *));
+- static enum dhcp_token read_num_or_name PROTO ((int, struct parse *));
+- static enum dhcp_token intern PROTO ((char *, enum dhcp_token));
+-+static int read_function PROTO ((struct parse *));
++ static enum dhcp_token read_number (int, struct parse *);
++ static enum dhcp_token read_num_or_name (int, struct parse *);
++ static enum dhcp_token intern (char *, enum dhcp_token);
+++static int read_function (struct parse *);
+  
+  isc_result_t new_parse (cfile, file, inbuf, buflen, name, eolp)
+  	struct parse **cfile;
+@@ -243,10 +243,10 @@
+  char *quotify_string (const char *, const char *, int);
+  char *quotify_buf (const unsigned char *, unsigned, const char *, int);
+  char *print_base64 (const unsigned char *, unsigned, const char *, int);
+--char *print_hw_addr PROTO ((int, int, unsigned char *));
+-+char *print_hw_addr PROTO ((const int, const int, const unsigned char *));
+- void print_lease PROTO ((struct lease *));
+- void dump_raw PROTO ((const unsigned char *, unsigned));
++-char *print_hw_addr (int, int, unsigned char *);
+++char *print_hw_addr (const int, const int, const unsigned char *);
++ void print_lease (struct lease *);
++ void dump_raw (const unsigned char *, unsigned);
+  void dump_packet_option (struct option_cache *, struct packet *,
+ @@ -3234,6 +3290,20 @@ OMAPI_OBJECT_ALLOC_DECL (dhcp_failover_l
+  
--- isc-dhcp41-server.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted: