Thu Dec 27 21:04:11 2012 UTC ()
Add #ifdef __OpenBSD__ to some of the patches, to fix compilation on
OpenBSD and MirBSD.

Freeze exception granted by wiz.


(bsiegert)
diff -r1.7 -r1.8 pkgsrc/security/policykit/distinfo
diff -r1.3 -r1.4 pkgsrc/security/policykit/patches/patch-aa
diff -r1.2 -r1.3 pkgsrc/security/policykit/patches/patch-ab
diff -r1.2 -r1.3 pkgsrc/security/policykit/patches/patch-af
diff -r1.1 -r1.2 pkgsrc/security/policykit/patches/patch-ag
cvs diff -r1.7 -r1.8 pkgsrc/security/policykit/distinfo (expand / switch to unified diff)

--- pkgsrc/security/policykit/distinfo 2009/01/20 10:08:17 1.7
+++ pkgsrc/security/policykit/distinfo 2012/12/27 21:04:11 1.8
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1$NetBSD: distinfo,v 1.7 2009/01/20 10:08:17 sketch Exp $ 1$NetBSD: distinfo,v 1.8 2012/12/27 21:04:11 bsiegert Exp $
2 2
3SHA1 (PolicyKit-0.9.tar.gz) = ac99c580eff72f6d5df261c155fb047306439f85 3SHA1 (PolicyKit-0.9.tar.gz) = ac99c580eff72f6d5df261c155fb047306439f85
4RMD160 (PolicyKit-0.9.tar.gz) = 197262d1c48e55558dd4bd57d7bbd8734666129c 4RMD160 (PolicyKit-0.9.tar.gz) = 197262d1c48e55558dd4bd57d7bbd8734666129c
5Size (PolicyKit-0.9.tar.gz) = 1254318 bytes 5Size (PolicyKit-0.9.tar.gz) = 1254318 bytes
6SHA1 (patch-aa) = 31f10985b2b9105aa260fd79a684468ca345ed7d 6SHA1 (patch-aa) = ca43b0c66a2b4370b25aeed8c8ce19f2df6fd1cb
7SHA1 (patch-ab) = 32d9ecafd84ebf1329b17d4f5df9845591865772 7SHA1 (patch-ab) = f79b7d55e8b414d0bd04680dceb7d5b0b6ab074c
8SHA1 (patch-ac) = cf4b1fcfec1f079c015672235996c5331801fb48 8SHA1 (patch-ac) = cf4b1fcfec1f079c015672235996c5331801fb48
9SHA1 (patch-ad) = 7d34235b9672680a146fe676d84ccaa09432f52c 9SHA1 (patch-ad) = 7d34235b9672680a146fe676d84ccaa09432f52c
10SHA1 (patch-ae) = b6a8c945de5cd7e605494d8575075e74c58da6a1 10SHA1 (patch-ae) = b6a8c945de5cd7e605494d8575075e74c58da6a1
11SHA1 (patch-af) = c15988b60a99443469a0399935bc51f99da4b454 11SHA1 (patch-af) = 93c5cc1ca06a2fc4b1b21ee743978e972dd57594
12SHA1 (patch-ag) = bfa1a32a26d80a3cbc90144ae137d4ad06832e61 12SHA1 (patch-ag) = 763d1c93986a19b04fbd84f19e22a3095db7f834
13SHA1 (patch-ah) = a1ae419a77bb3c8be02706bb67476af9443af92a 13SHA1 (patch-ah) = a1ae419a77bb3c8be02706bb67476af9443af92a
14SHA1 (patch-ai) = 9ec3744b394b0f6181a8a3367f0ce93e32b7fc4f 14SHA1 (patch-ai) = 9ec3744b394b0f6181a8a3367f0ce93e32b7fc4f
15SHA1 (patch-aj) = 596b9eb54173e25176ba0f363e4b2c4c137dd89f 15SHA1 (patch-aj) = 596b9eb54173e25176ba0f363e4b2c4c137dd89f
16SHA1 (patch-ak) = d31933a6bb836311837c62a2fcf43b105d5464cf 16SHA1 (patch-ak) = d31933a6bb836311837c62a2fcf43b105d5464cf
17SHA1 (patch-al) = cd87d1c39bb38c70b8fa3170e90c641cc0029dc3 17SHA1 (patch-al) = cd87d1c39bb38c70b8fa3170e90c641cc0029dc3
18SHA1 (patch-am) = ace4c1f393d2ced75024af147f50def686ddf4e2 18SHA1 (patch-am) = ace4c1f393d2ced75024af147f50def686ddf4e2
19SHA1 (patch-an) = a0a54235fc72a52ace72a0d04df6c1383f7c583c 19SHA1 (patch-an) = a0a54235fc72a52ace72a0d04df6c1383f7c583c
20SHA1 (patch-ao) = 0f9a87653f4902285c7420f6269e302eca896a1b 20SHA1 (patch-ao) = 0f9a87653f4902285c7420f6269e302eca896a1b
21SHA1 (patch-authdb) = 449b8ac50f81cc0234e17e64bc9892ade7119028 21SHA1 (patch-authdb) = 449b8ac50f81cc0234e17e64bc9892ade7119028
cvs diff -r1.3 -r1.4 pkgsrc/security/policykit/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/security/policykit/patches/patch-aa 2008/12/20 19:44:00 1.3
+++ pkgsrc/security/policykit/patches/patch-aa 2012/12/27 21:04:11 1.4
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-aa,v 1.3 2008/12/20 19:44:00 jmcneill Exp $ 1$NetBSD: patch-aa,v 1.4 2012/12/27 21:04:11 bsiegert Exp $
2 2
3--- src/polkit-dbus/polkit-resolve-exe-helper.c.orig 2008-05-30 17:24:44.000000000 -0400 3--- src/polkit-dbus/polkit-resolve-exe-helper.c.orig 2008-05-30 17:24:44.000000000 -0400
4+++ src/polkit-dbus/polkit-resolve-exe-helper.c 4+++ src/polkit-dbus/polkit-resolve-exe-helper.c
5@@ -40,7 +40,7 @@ 5@@ -40,7 +40,7 @@
6 #include <unistd.h> 6 #include <unistd.h>
7 #include <sys/types.h> 7 #include <sys/types.h>
8 #include <sys/stat.h> 8 #include <sys/stat.h>
9-#ifdef HAVE_FREEBSD 9-#ifdef HAVE_FREEBSD
10+#if defined(HAVE_FREEBSD) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__APPLE__) 10+#if defined(HAVE_FREEBSD) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__APPLE__) || defined(__OpenBSD__)
11 #include <sys/param.h> 11 #include <sys/param.h>
12 #endif 12 #endif
13 #include <security/pam_appl.h> 13 #include <security/pam_appl.h>
cvs diff -r1.2 -r1.3 pkgsrc/security/policykit/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/security/policykit/patches/patch-ab 2008/11/23 21:21:43 1.2
+++ pkgsrc/security/policykit/patches/patch-ab 2012/12/27 21:04:11 1.3
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ab,v 1.2 2008/11/23 21:21:43 hasso Exp $ 1$NetBSD: patch-ab,v 1.3 2012/12/27 21:04:11 bsiegert Exp $
2 2
3--- tools/polkit-auth.c.orig 2008-05-30 17:24:44.000000000 -0400 3--- tools/polkit-auth.c.orig 2008-05-30 17:24:44.000000000 -0400
4+++ tools/polkit-auth.c 4+++ tools/polkit-auth.c
5@@ -37,7 +37,7 @@ 5@@ -37,7 +37,7 @@
6 #include <stdlib.h> 6 #include <stdlib.h>
7 #include <string.h> 7 #include <string.h>
8 #include <sys/types.h> 8 #include <sys/types.h>
9-#if defined(HAVE_SOLARIS) || defined(HAVE_FREEBSD) 9-#if defined(HAVE_SOLARIS) || defined(HAVE_FREEBSD)
10+#if defined(HAVE_SOLARIS) || defined(HAVE_FREEBSD) || defined(__NetBSD__) || defined(__DragonFly__) 10+#if defined(HAVE_SOLARIS) || defined(HAVE_FREEBSD) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
11 #include <sys/wait.h> 11 #include <sys/wait.h>
12 #endif 12 #endif
13 #include <pwd.h> 13 #include <pwd.h>
cvs diff -r1.2 -r1.3 pkgsrc/security/policykit/patches/patch-af (expand / switch to unified diff)

--- pkgsrc/security/policykit/patches/patch-af 2008/11/23 21:21:43 1.2
+++ pkgsrc/security/policykit/patches/patch-af 2012/12/27 21:04:11 1.3
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1$NetBSD: patch-af,v 1.2 2008/11/23 21:21:43 hasso Exp $ 1$NetBSD: patch-af,v 1.3 2012/12/27 21:04:11 bsiegert Exp $
2 2
3--- src/polkit/polkit-sysdeps.c.orig 2008-11-21 22:17:08.000000000 -0500 3--- src/polkit/polkit-sysdeps.c.orig 2008-11-21 22:17:08.000000000 -0500
4+++ src/polkit/polkit-sysdeps.c 4+++ src/polkit/polkit-sysdeps.c
5@@ -106,7 +106,7 @@ polkit_sysdeps_get_start_time_for_pid (p 5@@ -106,7 +106,7 @@ polkit_sysdeps_get_start_time_for_pid (p
6 } 6 }
7 start_time = (unsigned long long) (info.pr_start.tv_sec); 7 start_time = (unsigned long long) (info.pr_start.tv_sec);
8 #else 8 #else
9-#ifdef __FreeBSD__ 9-#ifdef __FreeBSD__
10+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) 10+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
11 filename = kit_strdup_printf ("/proc/%d/status", pid); 11 filename = kit_strdup_printf ("/proc/%d/status", pid);
12 #else 12 #else
13 filename = kit_strdup_printf ("/proc/%d/stat", pid); 13 filename = kit_strdup_printf ("/proc/%d/stat", pid);
14@@ -121,7 +121,7 @@ polkit_sysdeps_get_start_time_for_pid (p 14@@ -121,7 +121,7 @@ polkit_sysdeps_get_start_time_for_pid (p
15 goto out; 15 goto out;
16 } 16 }
17  17
18-#ifdef __FreeBSD__ 18-#ifdef __FreeBSD__
19+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) 19+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
20 tokens = kit_strsplit (contents, ' ', &num_tokens); 20 tokens = kit_strsplit (contents, ' ', &num_tokens);
21 if (tokens == NULL) 21 if (tokens == NULL)
22 goto out; 22 goto out;
cvs diff -r1.1 -r1.2 pkgsrc/security/policykit/patches/patch-ag (expand / switch to unified diff)

--- pkgsrc/security/policykit/patches/patch-ag 2008/11/23 21:21:43 1.1
+++ pkgsrc/security/policykit/patches/patch-ag 2012/12/27 21:04:11 1.2
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1$NetBSD: patch-ag,v 1.1 2008/11/23 21:21:43 hasso Exp $ 1$NetBSD: patch-ag,v 1.2 2012/12/27 21:04:11 bsiegert Exp $
2 2
3--- src/polkit/polkit-config.c.orig 2008-11-23 22:37:33 +0200 3--- src/polkit/polkit-config.c.orig 2008-11-23 22:37:33 +0200
4+++ src/polkit/polkit-config.c 2008-11-23 22:44:41 +0200 4+++ src/polkit/polkit-config.c 2008-11-23 22:44:41 +0200
5@@ -556,6 +556,7 @@ config_node_match (ConfigNode *node,  5@@ -556,6 +556,7 @@ config_node_match (ConfigNode *node,
6  6
7 str1 = kit_strdup_printf ("%d", uid); 7 str1 = kit_strdup_printf ("%d", uid);
8 { 8 {
9+#ifndef __DragonFly__ 9+#if !defined(__DragonFly__) && !defined(__OpenBSD__)
10 struct passwd pd; 10 struct passwd pd;
11 struct passwd* pwdptr=&pd; 11 struct passwd* pwdptr=&pd;
12 struct passwd* tempPwdPtr; 12 struct passwd* tempPwdPtr;
13@@ -565,6 +566,13 @@ config_node_match (ConfigNode *node,  13@@ -565,6 +566,13 @@ config_node_match (ConfigNode *node,
14 if ((getpwuid_r (uid, pwdptr, pwdbuffer, pwdlinelen, &tempPwdPtr)) !=0 ) 14 if ((getpwuid_r (uid, pwdptr, pwdbuffer, pwdlinelen, &tempPwdPtr)) !=0 )
15 goto out; 15 goto out;
16 str2 = kit_strdup (pd.pw_name); 16 str2 = kit_strdup (pd.pw_name);
17+#else 17+#else
18+ struct passwd *pd; 18+ struct passwd *pd;
19+ 19+
20+ pd = getpwuid (uid); 20+ pd = getpwuid (uid);
21+ if (pd != NULL) 21+ if (pd != NULL)
22+ str2 = kit_strdup (pd->pw_name); 22+ str2 = kit_strdup (pd->pw_name);