* Make it compile in DragonFly

* Fix permissions of suid/sgid binaries
* Bump PKGREVISION

8 files changed, 88 insertions, 13 deletions

diff --git a/security/policykit/Makefile b/security/policykit/Makefile
index 70d17103d34..bf16de0f29b 100644
--- a/security/policykit/Makefile
+++ b/security/policykit/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2008/11/23 02:00:48 jmcneill Exp $
+# $NetBSD: Makefile,v 1.3 2008/11/23 21:21:43 hasso Exp $
 #
 
 POLICYKIT_VER=		0.9
 DISTNAME=		PolicyKit-${POLICYKIT_VER}
 PKGNAME=		policykit-${POLICYKIT_VER}
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		security
 MASTER_SITES=		http://hal.freedesktop.org/releases/
 
diff --git a/security/policykit/distinfo b/security/policykit/distinfo
index 6d78dd01b8c..fc880d7ebc4 100644
--- a/security/policykit/distinfo
+++ b/security/policykit/distinfo
@@ -1,11 +1,14 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/11/22 03:33:38 jmcneill Exp $
+$NetBSD: distinfo,v 1.2 2008/11/23 21:21:43 hasso Exp $
 
 SHA1 (PolicyKit-0.9.tar.gz) = ac99c580eff72f6d5df261c155fb047306439f85
 RMD160 (PolicyKit-0.9.tar.gz) = 197262d1c48e55558dd4bd57d7bbd8734666129c
 Size (PolicyKit-0.9.tar.gz) = 1254318 bytes
-SHA1 (patch-aa) = e282bf87a44e22181a61d1a5a29dd79a9f17afef
-SHA1 (patch-ab) = f869ed7f6298e4a88761782dada27984dbea0481
+SHA1 (patch-aa) = aa47d66e3d514c56766f363ae08f222d65ad7c79
+SHA1 (patch-ab) = 32d9ecafd84ebf1329b17d4f5df9845591865772
 SHA1 (patch-ac) = cf4b1fcfec1f079c015672235996c5331801fb48
 SHA1 (patch-ad) = 7d34235b9672680a146fe676d84ccaa09432f52c
 SHA1 (patch-ae) = b6a8c945de5cd7e605494d8575075e74c58da6a1
-SHA1 (patch-af) = 3363521088d151015fb5670d7f100d15b42a1d54
+SHA1 (patch-af) = c15988b60a99443469a0399935bc51f99da4b454
+SHA1 (patch-ag) = bfa1a32a26d80a3cbc90144ae137d4ad06832e61
+SHA1 (patch-ah) = a1ae419a77bb3c8be02706bb67476af9443af92a
+SHA1 (patch-ai) = 9ec3744b394b0f6181a8a3367f0ce93e32b7fc4f
diff --git a/security/policykit/patches/patch-aa b/security/policykit/patches/patch-aa
index 1c72223a357..8f8d7b1bff4 100644
--- a/security/policykit/patches/patch-aa
+++ b/security/policykit/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/11/22 03:33:38 jmcneill Exp $
+$NetBSD: patch-aa,v 1.2 2008/11/23 21:21:43 hasso Exp $
 
 --- src/polkit-dbus/polkit-resolve-exe-helper.c.orig	2008-05-30 17:24:44.000000000 -0400
 +++ src/polkit-dbus/polkit-resolve-exe-helper.c
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2008/11/22 03:33:38 jmcneill Exp $
  #include <sys/types.h>
  #include <sys/stat.h>
 -#ifdef HAVE_FREEBSD
-+#if defined(HAVE_FREEBSD) || defined(__NetBSD__)
++#if defined(HAVE_FREEBSD) || defined(__NetBSD__) || defined(__DragonFly__)
  #include <sys/param.h>
  #endif
  #include <security/pam_appl.h>
diff --git a/security/policykit/patches/patch-ab b/security/policykit/patches/patch-ab
index cc209ab3b99..fd6a8c43320 100644
--- a/security/policykit/patches/patch-ab
+++ b/security/policykit/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2008/11/22 03:33:38 jmcneill Exp $
+$NetBSD: patch-ab,v 1.2 2008/11/23 21:21:43 hasso Exp $
 
 --- tools/polkit-auth.c.orig	2008-05-30 17:24:44.000000000 -0400
 +++ tools/polkit-auth.c
@@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2008/11/22 03:33:38 jmcneill Exp $
  #include <string.h>
  #include <sys/types.h>
 -#if defined(HAVE_SOLARIS) || defined(HAVE_FREEBSD)
-+#if defined(HAVE_SOLARIS) || defined(HAVE_FREEBSD) || defined(__NetBSD__)
++#if defined(HAVE_SOLARIS) || defined(HAVE_FREEBSD) || defined(__NetBSD__) || defined(__DragonFly__)
  #include <sys/wait.h>
  #endif
  #include <pwd.h>
diff --git a/security/policykit/patches/patch-af b/security/policykit/patches/patch-af
index 58224e00002..e0de72c766c 100644
--- a/security/policykit/patches/patch-af
+++ b/security/policykit/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1.1.1 2008/11/22 03:33:38 jmcneill Exp $
+$NetBSD: patch-af,v 1.2 2008/11/23 21:21:43 hasso Exp $
 
 --- src/polkit/polkit-sysdeps.c.orig	2008-11-21 22:17:08.000000000 -0500
 +++ src/polkit/polkit-sysdeps.c
@@ -7,7 +7,7 @@ $NetBSD: patch-af,v 1.1.1.1 2008/11/22 03:33:38 jmcneill Exp $
          start_time = (unsigned long long) (info.pr_start.tv_sec);
  #else
 -#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
  	filename = kit_strdup_printf ("/proc/%d/status", pid);
  #else
          filename = kit_strdup_printf ("/proc/%d/stat", pid);
@@ -16,7 +16,7 @@ $NetBSD: patch-af,v 1.1.1.1 2008/11/22 03:33:38 jmcneill Exp $
          }
  
 -#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
          tokens = kit_strsplit (contents, ' ', &num_tokens);
          if (tokens == NULL)
                  goto out;
diff --git a/security/policykit/patches/patch-ag b/security/policykit/patches/patch-ag
new file mode 100644
index 00000000000..e3abac857a2
--- /dev/null
+++ b/security/policykit/patches/patch-ag
@@ -0,0 +1,26 @@
+$NetBSD: patch-ag,v 1.1 2008/11/23 21:21:43 hasso Exp $
+
+--- src/polkit/polkit-config.c.orig	2008-11-23 22:37:33 +0200
++++ src/polkit/polkit-config.c	2008-11-23 22:44:41 +0200
+@@ -556,6 +556,7 @@ config_node_match (ConfigNode *node, 
+                 
+                 str1 = kit_strdup_printf ("%d", uid);
+                 {
++#ifndef __DragonFly__
+                         struct passwd pd;
+                         struct passwd* pwdptr=&pd;
+                         struct passwd* tempPwdPtr;
+@@ -565,6 +566,13 @@ config_node_match (ConfigNode *node, 
+                         if ((getpwuid_r (uid, pwdptr, pwdbuffer, pwdlinelen, &tempPwdPtr)) !=0 )
+                                 goto out;
+                         str2 = kit_strdup (pd.pw_name);
++#else
++                        struct passwd *pd;
++
++                        pd = getpwuid (uid);
++                        if (pd != NULL)
++                                str2 = kit_strdup (pd->pw_name);
++#endif
+                 }
+                 break;
+         }
diff --git a/security/policykit/patches/patch-ah b/security/policykit/patches/patch-ah
new file mode 100644
index 00000000000..a4d76f4aeac
--- /dev/null
+++ b/security/policykit/patches/patch-ah
@@ -0,0 +1,25 @@
+$NetBSD: patch-ah,v 1.1 2008/11/23 21:21:43 hasso Exp $
+
+--- src/polkit-grant/Makefile.in.orig	2008-11-23 18:17:57 +0200
++++ src/polkit-grant/Makefile.in	2008-11-23 18:18:56 +0200
+@@ -879,15 +879,15 @@ uninstall-am: uninstall-libLTLIBRARIES u
+ #
+ @POLKIT_AUTHDB_DEFAULT_TRUE@install-exec-hook:
+ @POLKIT_AUTHDB_DEFAULT_TRUE@	-chgrp $(POLKIT_GROUP) $(DESTDIR)$(libexecdir)/polkit-grant-helper
+-@POLKIT_AUTHDB_DEFAULT_TRUE@	-chmod 2755 $(DESTDIR)$(libexecdir)/polkit-grant-helper
++@POLKIT_AUTHDB_DEFAULT_TRUE@	-chmod 2555 $(DESTDIR)$(libexecdir)/polkit-grant-helper
+ @POLKIT_AUTHDB_DEFAULT_TRUE@@POLKIT_AUTHFW_PAM_TRUE@	-chgrp $(POLKIT_GROUP) $(DESTDIR)$(libexecdir)/polkit-grant-helper-pam
+-@POLKIT_AUTHDB_DEFAULT_TRUE@@POLKIT_AUTHFW_PAM_TRUE@	-chmod 4754 $(DESTDIR)$(libexecdir)/polkit-grant-helper-pam
++@POLKIT_AUTHDB_DEFAULT_TRUE@@POLKIT_AUTHFW_PAM_TRUE@	-chmod 4554 $(DESTDIR)$(libexecdir)/polkit-grant-helper-pam
+ @POLKIT_AUTHDB_DEFAULT_TRUE@@POLKIT_AUTHFW_SHADOW_TRUE@	-chgrp $(POLKIT_GROUP) $(DESTDIR)$(libexecdir)/polkit-grant-helper-shadow
+-@POLKIT_AUTHDB_DEFAULT_TRUE@@POLKIT_AUTHFW_SHADOW_TRUE@	-chmod 4750 $(DESTDIR)$(libexecdir)/polkit-grant-helper-shadow
++@POLKIT_AUTHDB_DEFAULT_TRUE@@POLKIT_AUTHFW_SHADOW_TRUE@	-chmod 4550 $(DESTDIR)$(libexecdir)/polkit-grant-helper-shadow
+ @POLKIT_AUTHDB_DEFAULT_TRUE@	-chgrp $(POLKIT_GROUP) $(DESTDIR)$(libexecdir)/polkit-explicit-grant-helper
+-@POLKIT_AUTHDB_DEFAULT_TRUE@	-chmod 2755 $(DESTDIR)$(libexecdir)/polkit-explicit-grant-helper
++@POLKIT_AUTHDB_DEFAULT_TRUE@	-chmod 2555 $(DESTDIR)$(libexecdir)/polkit-explicit-grant-helper
+ @POLKIT_AUTHDB_DEFAULT_TRUE@	-chgrp $(POLKIT_GROUP) $(DESTDIR)$(libexecdir)/polkit-revoke-helper
+-@POLKIT_AUTHDB_DEFAULT_TRUE@	-chmod 2755 $(DESTDIR)$(libexecdir)/polkit-revoke-helper
++@POLKIT_AUTHDB_DEFAULT_TRUE@	-chmod 2555 $(DESTDIR)$(libexecdir)/polkit-revoke-helper
+ 
+ @KIT_BUILD_TESTS_TRUE@@KIT_GCOV_ENABLED_TRUE@clean-gcov:
+ @KIT_BUILD_TESTS_TRUE@@KIT_GCOV_ENABLED_TRUE@	rm -f *.gcov .libs/*.gcda
diff --git a/security/policykit/patches/patch-ai b/security/policykit/patches/patch-ai
new file mode 100644
index 00000000000..a1ffaf15469
--- /dev/null
+++ b/security/policykit/patches/patch-ai
@@ -0,0 +1,21 @@
+$NetBSD: patch-ai,v 1.1 2008/11/23 21:21:43 hasso Exp $
+
+--- src/polkit-dbus/Makefile.in.orig	2008-11-23 18:23:10 +0200
++++ src/polkit-dbus/Makefile.in	2008-11-23 18:24:55 +0200
+@@ -850,12 +850,12 @@ uninstall-am: uninstall-libLTLIBRARIES u
+ #
+ @POLKIT_AUTHDB_DEFAULT_TRUE@install-exec-hook:
+ @POLKIT_AUTHDB_DEFAULT_TRUE@	-chgrp $(POLKIT_GROUP) $(DESTDIR)$(libexecdir)/polkit-read-auth-helper
+-@POLKIT_AUTHDB_DEFAULT_TRUE@	-chmod 2755 $(DESTDIR)$(libexecdir)/polkit-read-auth-helper
++@POLKIT_AUTHDB_DEFAULT_TRUE@	-chmod 2555 $(DESTDIR)$(libexecdir)/polkit-read-auth-helper
+ @POLKIT_AUTHDB_DEFAULT_TRUE@	-chown $(POLKIT_USER) $(DESTDIR)$(libexecdir)/polkit-set-default-helper
+-@POLKIT_AUTHDB_DEFAULT_TRUE@	-chmod 4755 $(DESTDIR)$(libexecdir)/polkit-set-default-helper
+-@POLKIT_AUTHDB_DEFAULT_TRUE@	-chmod 4755 $(DESTDIR)$(libexecdir)/polkit-resolve-exe-helper
++@POLKIT_AUTHDB_DEFAULT_TRUE@	-chmod 4555 $(DESTDIR)$(libexecdir)/polkit-set-default-helper
++@POLKIT_AUTHDB_DEFAULT_TRUE@	-chmod 4555 $(DESTDIR)$(libexecdir)/polkit-resolve-exe-helper
+ @POLKIT_AUTHDB_DEFAULT_FALSE@install-exec-hook:
+-@POLKIT_AUTHDB_DEFAULT_FALSE@	-chmod 4755 $(DESTDIR)$(libexecdir)/polkit-resolve-exe-helper
++@POLKIT_AUTHDB_DEFAULT_FALSE@	-chmod 4555 $(DESTDIR)$(libexecdir)/polkit-resolve-exe-helper
+ 
+ @KIT_BUILD_TESTS_TRUE@@KIT_GCOV_ENABLED_TRUE@clean-gcov:
+ @KIT_BUILD_TESTS_TRUE@@KIT_GCOV_ENABLED_TRUE@	rm -f *.gcov .libs/*.gcda *.gcda