Fix build with non-i386 architectures, and fix the installation path for

the headers.

Most of this was adapted from the RedHat src RPMs.

Approved by:	maintainer timeout

4 files changed, 120 insertions, 0 deletions

diff --git a/net/howl/files/patch-include_salt_vtypes.h b/net/howl/files/patch-include_salt_vtypes.h
new file mode 100644
index 000000000000..6118fd7e2f37
--- /dev/null
+++ b/net/howl/files/patch-include_salt_vtypes.h
@@ -0,0 +1,24 @@
+--- include/salt/vtypes.h.orig	Fri Jul  2 00:42:34 2004
++++ include/salt/vtypes.h	Fri Jul  2 00:50:40 2004
+@@ -56,7 +56,7 @@
+ typedef short					sw_short;
+ typedef unsigned short		sw_ushort;
+ typedef long					sw_long;
+-typedef unsigned long		sw_ulong;
++typedef unsigned int		sw_ulong;
+ typedef unsigned char	*	sw_octets;
+ typedef char				*	sw_string;
+ #if !defined(__VXWORKS__) || defined(__cplusplus)
+@@ -139,8 +139,11 @@
+ 
+ #elif defined(__FreeBSD__) || defined(__NetBSD__)
+ 
+-#	if defined(i386)
++#include <machine/endian.h>
++#if BYTE_ORDER == LITTLE_ENDIAN
+ #		define SW_ENDIAN		1
++#elif BYTE_ORDER == BIG_ENDIAN
++#		define SW_ENDIAN		0
+ #	else
+ #		error "CPU unknown"
+ #	endif
diff --git a/net/howl/files/patch-src_lib_howl_NotOSX_DNSServices.h b/net/howl/files/patch-src_lib_howl_NotOSX_DNSServices.h
new file mode 100644
index 000000000000..b30530bf401e
--- /dev/null
+++ b/net/howl/files/patch-src_lib_howl_NotOSX_DNSServices.h
@@ -0,0 +1,61 @@
+--- src/lib/howl/NotOSX/DNSServices.h.orig	Fri Jul  2 00:53:26 2004
++++ src/lib/howl/NotOSX/DNSServices.h	Fri Jul  2 00:56:58 2004
+@@ -98,6 +98,10 @@
+ #include	<stddef.h>
+ #include <salt/salt.h>
+ 
++#ifdef HAVE_STDINT_H
++#include <stdint.h>
++#endif
++
+ #ifdef	__cplusplus
+ 	extern "C" {
+ #endif
+@@ -224,7 +228,11 @@
+ 	@abstract	8-bit unsigned data type.
+ */
+ 
++#ifdef HAVE_STDINT_H
++typedef uint8_t			DNSUInt8;
++#else
+ typedef unsigned char		DNSUInt8;
++#endif
+ 
+ dns_check_compile_time( sizeof( DNSUInt8 ) == 1 );
+ 
+@@ -234,7 +242,11 @@
+ 	@abstract	16-bit unsigned data type.
+ */
+ 
++#ifdef HAVE_STDINT_H
++typedef uint16_t		DNSUInt16;
++#else
+ typedef unsigned short		DNSUInt16;
++#endif
+ 
+ dns_check_compile_time( sizeof( DNSUInt16 ) == 2 );
+ 
+@@ -244,7 +256,11 @@
+ 	@abstract	32-bit unsigned data type.
+ */
+ 
++#ifdef HAVE_STDINT_H
++typedef uint32_t		DNSUInt32;
++#else
+ typedef unsigned long		DNSUInt32;
++#endif
+ 
+ dns_check_compile_time( sizeof( DNSUInt32 ) == 4 );
+ 
+@@ -254,7 +270,11 @@
+ 	@abstract	32-bit signed data type.
+ */
+ 
++#ifdef HAVE_STDINT_H
++typedef int32_t			DNSSInt32;
++#else
+ typedef signed long		DNSSInt32;
++#endif
+ 
+ dns_check_compile_time( sizeof( DNSSInt32 ) == 4 );
+ 
diff --git a/net/howl/files/patch-src_lib_howl_Posix_posix_salt.c b/net/howl/files/patch-src_lib_howl_Posix_posix_salt.c
new file mode 100644
index 000000000000..23c49f596b44
--- /dev/null
+++ b/net/howl/files/patch-src_lib_howl_Posix_posix_salt.c
@@ -0,0 +1,25 @@
+--- src/lib/howl/Posix/posix_salt.c.orig	Fri Jul  2 00:46:53 2004
++++ src/lib/howl/Posix/posix_salt.c	Fri Jul  2 00:47:30 2004
+@@ -450,12 +450,14 @@
+ 				sw_debug("sw_salt_run() : fd %d is readable\n", psocket->m_super.m_fd);
+ 				events |= SW_SOCKET_READ;
+ 				num--;
++				FD_CLR(psocket->m_super.m_fd, &readfds);
+ 			}
+ 		
+ 			if (FD_ISSET(psocket->m_super.m_fd, &writefds))
+ 			{
+ 				sw_debug("sw_salt_run() : fd %d is writable\n", psocket->m_super.m_fd);
+ 				events |= SW_SOCKET_WRITE;
++				FD_CLR(psocket->m_super.m_fd, &writefds);
+ 				num--;
+ 			}
+ 		
+@@ -463,6 +465,7 @@
+ 			{
+ 				sw_debug("sw_salt_run() : fd %d is oobable\n", psocket->m_super.m_fd);
+ 				events |= SW_SOCKET_OOB;
++				FD_CLR(psocket->m_super.m_fd, &oobfds);
+ 				num--;
+ 			}
+ 
diff --git a/net/howl/files/patch-src_mDNSResponder_Posix_posix_main.c b/net/howl/files/patch-src_mDNSResponder_Posix_posix_main.c
new file mode 100644
index 000000000000..9cac018d2a12
--- /dev/null
+++ b/net/howl/files/patch-src_mDNSResponder_Posix_posix_main.c
@@ -0,0 +1,10 @@
+--- src/mDNSResponder/Posix/posix_main.c.orig	Fri Jul  2 00:49:18 2004
++++ src/mDNSResponder/Posix/posix_main.c	Fri Jul  2 00:49:32 2004
+@@ -239,6 +239,7 @@
+ 	signal(SIGHUP, sw_mdnsd_signal_handler);
+ 	signal(SIGUSR1, sw_mdnsd_signal_handler);
+ 	signal(SIGUSR2, sw_mdnsd_signal_handler);
++	signal(SIGPIPE, SIG_IGN);
+ 
+ 	sigfillset(&signalSet);
+