--- ctrlproxy-3.0.8.orig/configure.ac	2008-12-06 12:36:33.000000000 -0500

+++ ctrlproxy-3.0.8/configure.ac	2009-10-05 20:49:25.066375043 -0400

@@ -9,9 +9,7 @@

 AC_SUBST(BZR_CHECKOUT)

 BZR_CHECKOUT=no

 AC_MSG_CHECKING([whether this is a bzr checkout])

-if ! which bzr >/dev/null 2>/dev/null; then

-	AC_MSG_RESULT(no)

-else 

+if which bzr >/dev/null 2>/dev/null; then

 	BZR_CHECKOUT=yes

 	REVISION="`bzr revno .`"

 	if test -n "$REVISION"; then

@@ -20,6 +18,8 @@

 	else

 		AC_MSG_RESULT(no)

 	fi

+else 

+	AC_MSG_RESULT(no)

 fi

 AC_DEFINE_UNQUOTED(VERSION,"$VERSION$BZRVERSION", [ Package version])

@@ -59,7 +59,9 @@

 AC_FUNC_REALLOC

 AC_TYPE_SIGNAL

-AC_CHECK_FUNCS([gethostbyname gethostname memset strchr strerror strstr uname backtrace_symbols gettimeofday strrchr daemon])

+AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, gethostbyname))

+AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt))

+AC_CHECK_FUNCS([gethostname memset strchr strerror strstr uname backtrace_symbols gettimeofday strrchr daemon])

 PKG_PROG_PKG_CONFIG

 PKG_CHECK_MODULES(COMMON, glib-2.0 >= 2.6.0 gmodule-2.0)

@@ -77,6 +77,10 @@

 # GNUTLS support

 ###############################################################################

 PKG_CHECK_MODULES(GNUTLS, gnutls, [

+		ac_save_LIBS="$LIBS"

+		LIBS="$GNUTLS_LIBS"

+		AC_CHECK_FUNC(gcry_control, , AC_CHECK_LIB(gcrypt, gcry_control, GNUTLS_LIBS="$GNUTLS_LIBS -lgcrypt"))

+		LIBS="$ac_save_LIBS"

 		AC_DEFINE(HAVE_GNUTLS, 1, [Whether GNUTLS is available])

 		SSL_OBJS="src/gnutls.o src/tlscert.o"

 		AC_SUBST(SSL_OBJS)

@@ -84,13 +90,17 @@

 # GSSAPI support

 ###############################################################################

 AC_PATH_PROG(KRB5_CONFIG, krb5-config, no)

-if test $KRB5_CONFIG != no; then

+if test $KRB5_CONFIG != no && $KRB5_CONFIG --libs gssapi >/dev/null 2>&1; then

 	LIBS="$LIBS `$KRB5_CONFIG --libs gssapi`"

 	CFLAGS="$CFLAGS `$KRB5_CONFIG --cflags gssapi`"

-	AC_DEFINE(HAVE_GSSAPI, 1, [have GSSAPI])

-	AC_CHECK_FUNC(gsskrb5_register_acceptor_identity, 

-			AC_DEFINE(HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY, 1, [Whether gsskrb5_register_acceptor_identity is provided by the GSSAPI library]))

 fi

+AC_CHECK_FUNC(gss_display_status,

+		AC_DEFINE(HAVE_GSSAPI, 1, [have GSSAPI]),

+		AC_CHECK_LIB(gss, gss_display_status,

+				LIBS="$LIBS -lgss"; AC_DEFINE(HAVE_GSSAPI, 1, [have GSSAPI])))

+AC_CHECK_FUNC(gsskrb5_register_acceptor_identity, 

+		AC_DEFINE(HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY, 1, [Whether gsskrb5_register_acceptor_identity is provided by the GSSAPI library]))

+AC_CHECK_HEADERS([gssapi.h gssapi/gssapi.h])

 ###############################################################################

 # SWIG support

--- ctrlproxy-3.0.8.orig/lib/listener.h	2008-12-06 12:36:33.000000000 -0500

+++ ctrlproxy-3.0.8/lib/listener.h	2009-10-05 20:57:08.476692037 -0400

@@ -5,8 +5,12 @@

 #include "ctrlproxy.h"

 #ifdef HAVE_GSSAPI

+#ifdef HAVE_GSSAPI_GSSAPI_H

+#include <gssapi/gssapi.h>

+#else

 #include <gssapi.h>

 #endif

+#endif

 #ifndef G_MODULE_EXPORT

 #define G_MODULE_EXPORT

--- ctrlproxy-3.0.8.orig/lib/connection.c	2008-12-06 12:36:33.000000000 -0500

+++ ctrlproxy-3.0.8/lib/connection.c	2009-10-07 13:09:32.806701689 -0400

@@ -671,12 +671,19 @@

 	return TRUE;

 }

+#ifndef AF_LOCAL

+  #define AF_LOCAL AF_UNIX

+#endif

+#ifndef PF_LOCAL

+  #define PF_LOCAL PF_UNIX

+#endif

+

 static pid_t piped_child(struct irc_network *s, char* const command[], int *f_in)

 {

 	pid_t pid;

 	int sock[2];

-	if (socketpair(PF_UNIX, SOCK_STREAM, AF_LOCAL, sock) == -1) {

+	if (socketpair(PF_LOCAL, SOCK_STREAM, AF_LOCAL, sock) == -1) {

 		network_log(LOG_ERROR, s, "socketpair: %s", strerror(errno));

 		return -1;

 	}

--- ctrlproxy-3.0.8.orig/lib/state.c	Sat Dec  6 12:36:33 2008

+++ ctrlproxy-3.0.8/lib/state.c	Wed Oct  7 14:46:54 2009

@@ -74,7 +74,7 @@

 	n->nick = g_strdup(nick);

 	g_free(n->hostmask);

-	n->hostmask = g_strdup_printf("%s!%s@%s", nick, n->username, n->hostname);

+	n->hostmask = g_strdup_printf("%s!%s@%s", nick, n->username ? n->username : "*", n->hostname ? n->hostname : "*");

 	return TRUE;

 }