ports/155743: [PATCH] net/openldap24-server: fix compilation with gcc 4.4+

Martin Matuska mm at FreeBSD.org
Mon Mar 21 09:40:01 UTC 2011


>Number:         155743
>Category:       ports
>Synopsis:       [PATCH] net/openldap24-server: fix compilation with gcc 4.4+
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 21 09:40:01 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Martin Matuska
>Release:        FreeBSD 8.2-STABLE amd64
>Organization:
>Environment:
System: FreeBSD neo.vx.sk 8.2-STABLE FreeBSD 8.2-STABLE #0 r219122M: Wed Mar  2 00:08:08
>Description:
Add patch from upstream (ITS 6832) fixing compilation with gcc 4.4 and above.

Added file(s):
- files/patch-its-6832

Port maintainer (delphij at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- openldap-server-2.4.24.patch begins here ---
Index: files/patch-its-6832
===================================================================
RCS file: files/patch-its-6832
diff -N files/patch-its-6832
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-its-6832	21 Mar 2011 09:21:43 -0000
@@ -0,0 +1,68 @@
+Index: libraries/liblber/nt_err.c
+===================================================================
+RCS file: /repo/OpenLDAP/pkg/ldap/libraries/liblber/nt_err.c,v
+retrieving revision 1.20
+retrieving revision 1.21
+diff -u -r1.20 -r1.21
+--- libraries/liblber/nt_err.c	4 Jan 2011 23:43:01 -0000	1.20
++++ libraries/liblber/nt_err.c	16 Feb 2011 23:36:30 -0000	1.21
+@@ -17,7 +17,7 @@
+ 
+ #ifdef HAVE_WINSOCK2
+ #include <winsock2.h>
+-#elif HAVE_WINSOCK
++#elif defined(HAVE_WINSOCK)
+ #include <winsock.h>
+ #endif /* HAVE_WINSOCK(2) */
+
+Index: libraries/libldap/init.c
+===================================================================
+RCS file: /repo/OpenLDAP/pkg/ldap/libraries/libldap/init.c,v
+retrieving revision 1.128
+retrieving revision 1.129
+diff -u -r1.128 -r1.129
+--- libraries/libldap/init.c	11 Jan 2011 20:34:55 -0000	1.128
++++ libraries/libldap/init.c	16 Feb 2011 23:36:30 -0000	1.129
+@@ -626,7 +626,7 @@
+ 	    return; 
+ 	}
+ }	/* The WinSock DLL is acceptable. Proceed. */
+-#elif HAVE_WINSOCK
++#elif defined(HAVE_WINSOCK)
+ {	WSADATA wsaData;
+ 	if ( WSAStartup( 0x0101, &wsaData ) != 0 ) {
+ 	    return;
+Index: libraries/liblutil/detach.c
+===================================================================
+RCS file: /repo/OpenLDAP/pkg/ldap/libraries/liblutil/detach.c,v
+retrieving revision 1.24
+retrieving revision 1.25
+diff -u -r1.24 -r1.25
+--- libraries/liblutil/detach.c	4 Jan 2011 23:43:09 -0000	1.24
++++ libraries/liblutil/detach.c	16 Feb 2011 23:36:31 -0000	1.25
+@@ -128,7 +128,7 @@
+ 
+ #ifdef HAVE_SETSID
+ 		(void) setsid();
+-#elif TIOCNOTTY
++#elif defined(TIOCNOTTY)
+ 		if ( (sd = open( "/dev/tty", O_RDWR )) != -1 ) {
+ 			(void) ioctl( sd, TIOCNOTTY, NULL );
+ 			(void) close( sd );
+Index: libraries/liblutil/entropy.c
+===================================================================
+RCS file: /repo/OpenLDAP/pkg/ldap/libraries/liblutil/entropy.c,v
+retrieving revision 1.34
+retrieving revision 1.35
+diff -u -r1.34 -r1.35
+--- libraries/liblutil/entropy.c	4 Jan 2011 23:43:09 -0000	1.34
++++ libraries/liblutil/entropy.c	16 Feb 2011 23:36:31 -0000	1.35
+@@ -73,7 +73,7 @@
+ 		close(fd);
+ 		return nbytes > 0 ? -1 : 0;
+ 	}
+-#elif PROV_RSA_FULL
++#elif defined(PROV_RSA_FULL)
+ 	{
+ 		/* Not used since _WIN32_WINNT not set... */
+ 		HCRYPTPROV hProv = 0;
--- openldap-server-2.4.24.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list