The Solaris support in this package only works on OpenSolaris. Allow it to

build (although likely not work) on Solaris too.

5 files changed, 81 insertions, 18 deletions

diff --git a/security/policykit/Makefile b/security/policykit/Makefile
index cc0b3494bd0..832f9bbbfa0 100644
--- a/security/policykit/Makefile
+++ b/security/policykit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/12/21 13:57:29 jmcneill Exp $
+# $NetBSD: Makefile,v 1.8 2009/01/20 10:08:17 sketch Exp $
 #
 
 POLICYKIT_VER=		0.9
@@ -33,6 +33,8 @@ USE_PKGLOCALEDIR=	YES
 USE_TOOLS+=		gmake intltool msgfmt perl pkg-config autoconf
 USE_LIBTOOL=		YES
 
+USE_LANGUAGES=		c99
+
 AUTOCONF_REQD=		2.59
 
 POLICYKIT_USER?=	polkit
diff --git a/security/policykit/distinfo b/security/policykit/distinfo
index 59a0aec71fe..ba4c4005d42 100644
--- a/security/policykit/distinfo
+++ b/security/policykit/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2008/12/21 13:57:29 jmcneill Exp $
+$NetBSD: distinfo,v 1.7 2009/01/20 10:08:17 sketch Exp $
 
 SHA1 (PolicyKit-0.9.tar.gz) = ac99c580eff72f6d5df261c155fb047306439f85
 RMD160 (PolicyKit-0.9.tar.gz) = 197262d1c48e55558dd4bd57d7bbd8734666129c
@@ -15,6 +15,7 @@ SHA1 (patch-ai) = 9ec3744b394b0f6181a8a3367f0ce93e32b7fc4f
 SHA1 (patch-aj) = 596b9eb54173e25176ba0f363e4b2c4c137dd89f
 SHA1 (patch-ak) = d31933a6bb836311837c62a2fcf43b105d5464cf
 SHA1 (patch-al) = cd87d1c39bb38c70b8fa3170e90c641cc0029dc3
-SHA1 (patch-am) = e04337c969f14a8ef223888ef09f55087629684a
-SHA1 (patch-an) = b0c9b5a2905f8de4c428e4910914fb92fc906cfd
+SHA1 (patch-am) = ace4c1f393d2ced75024af147f50def686ddf4e2
+SHA1 (patch-an) = a0a54235fc72a52ace72a0d04df6c1383f7c583c
+SHA1 (patch-ao) = 0f9a87653f4902285c7420f6269e302eca896a1b
 SHA1 (patch-authdb) = 449b8ac50f81cc0234e17e64bc9892ade7119028
diff --git a/security/policykit/patches/patch-am b/security/policykit/patches/patch-am
index 3f43f728911..2c197cf3925 100644
--- a/security/policykit/patches/patch-am
+++ b/security/policykit/patches/patch-am
@@ -1,10 +1,20 @@
-$NetBSD: patch-am,v 1.1 2008/12/21 13:57:29 jmcneill Exp $
+$NetBSD: patch-am,v 1.2 2009/01/20 10:08:17 sketch Exp $
 
-PR# pkg/40146: security/policykit fails to build on Linux
-
---- configure.in.orig	2008-06-30 22:40:59.000000000 +0300
-+++ configure.in
-@@ -528,7 +528,7 @@ case "$host_os" in
+--- configure.in.orig	Mon Jun 30 20:40:59 2008
++++ configure.in	Tue Jan 20 09:42:26 2009
+@@ -521,6 +521,11 @@
+ 	;;
+   *solaris*)
+ 	AC_DEFINE([HAVE_SOLARIS], 1, [Is this a Solaris system?])
++	case "`uname -s`" in
++	  5.11)
++		AC_DEFINE([HAVE_OPENSOLARIS], 1, [Is this an OpenSolaris system?])
++		;;
++	esac
+ 	;;
+   *freebsd*)
+   	AC_DEFINE([HAVE_FREEBSD], 1, [Is this a FreeBSD system?])
+@@ -528,7 +533,7 @@
  esac
  
  have_inotify=no
diff --git a/security/policykit/patches/patch-an b/security/policykit/patches/patch-an
index 9a14d0d8df5..f867573bc32 100644
--- a/security/policykit/patches/patch-an
+++ b/security/policykit/patches/patch-an
@@ -1,10 +1,26 @@
-$NetBSD: patch-an,v 1.1 2008/12/21 13:57:29 jmcneill Exp $
+$NetBSD: patch-an,v 1.2 2009/01/20 10:08:17 sketch Exp $
 
-PR# pkg/40146: security/policykit fails to build on Linux
-
---- src/polkit/polkit-context.c.orig	2008-05-31 00:24:44.000000000 +0300
-+++ src/polkit/polkit-context.c
-@@ -310,6 +310,7 @@ polkit_context_init (PolKitContext *pk_c
+--- src/polkit/polkit-context.c.orig	Fri May 30 22:24:44 2008
++++ src/polkit/polkit-context.c	Tue Jan 20 09:45:55 2009
+@@ -39,7 +39,7 @@
+ #include <grp.h>
+ #include <unistd.h>
+ #include <errno.h>
+-#ifdef HAVE_SOLARIS
++#ifdef HAVE_OPENSOLARIS
+ #include <port.h>
+ #include <sys/stat.h>
+ #else
+@@ -176,7 +176,7 @@
+ 
+         /* NOTE: we don't load the configuration file until it's needed */
+ 
+-#ifdef HAVE_SOLARIS
++#ifdef HAVE_OPENSOLARIS
+         if (pk_context->io_add_watch_func != NULL) {
+                 pk_context->inotify_fd = port_create ();
+                 if (pk_context->inotify_fd < 0) {
+@@ -310,6 +310,7 @@
  	}
  #else
          if (pk_context->io_add_watch_func != NULL) {
@@ -12,7 +28,7 @@ PR# pkg/40146: security/policykit fails to build on Linux
                  pk_context->inotify_fd = inotify_init ();
                  if (pk_context->inotify_fd < 0) {
                          polkit_debug ("failed to initialize inotify: %s", strerror (errno));
-@@ -358,6 +359,7 @@ polkit_context_init (PolKitContext *pk_c
+@@ -358,6 +359,7 @@
                          /* TODO: set error */
                          goto error;
                  }
@@ -20,7 +36,25 @@ PR# pkg/40146: security/policykit fails to build on Linux
          }
  #endif
  
-@@ -571,7 +573,7 @@ polkit_context_io_func (PolKitContext *p
+@@ -366,7 +368,7 @@
+         return FALSE;
+ }
+ 
+-#ifdef HAVE_SOLARIS
++#ifdef HAVE_OPENSOLARIS
+ 
+ struct fileportinfo {
+         struct file_obj fobj;
+@@ -518,7 +520,7 @@
+ 
+         config_changed = FALSE;
+ 
+-#ifdef HAVE_SOLARIS
++#ifdef HAVE_OPENSOLARIS
+         if (fd == pk_context->inotify_fd) {
+                 port_event_t pe;
+                 struct file_obj *fobjp;
+@@ -571,7 +573,7 @@
  			polkit_debug ("failed to read kqueue event: %s", strerror (errno));
  		}
  	}
diff --git a/security/policykit/patches/patch-ao b/security/policykit/patches/patch-ao
new file mode 100644
index 00000000000..b2fc9c0f604
--- /dev/null
+++ b/security/policykit/patches/patch-ao
@@ -0,0 +1,16 @@
+$NetBSD: patch-ao,v 1.1 2009/01/20 10:08:17 sketch Exp $
+
+--- src/polkit-dbus/polkit-read-auth-helper.c.orig	Tue Jan 20 09:52:20 2009
++++ src/polkit-dbus/polkit-read-auth-helper.c	Tue Jan 20 09:53:15 2009
+@@ -175,7 +175,11 @@
+                 goto out;
+         }
+ 
++#ifdef HAVE_SOLARIS
++	dfd = dir->dd_fd;
++#else
+         dfd = dirfd (dir);
++#endif
+         if (dfd == -1) {
+                 fprintf (stderr, "polkit-read-auth-helper: error calling dirfd(): %m\n");
+                 goto out;