[70642] trunk/dports/security/policykit

devans at macports.org devans at macports.org
Sun Aug 15 22:34:56 PDT 2010


Revision: 70642
          http://trac.macports.org/changeset/70642
Author:   devans at macports.org
Date:     2010-08-15 22:34:55 -0700 (Sun, 15 Aug 2010)
Log Message:
-----------
policykit: update to version 0.96, fix livecheck.

Modified Paths:
--------------
    trunk/dports/security/policykit/Portfile
    trunk/dports/security/policykit/files/patch-configure.diff

Added Paths:
-----------
    trunk/dports/security/policykit/files/patch-src-programs-pkexec.c.diff

Removed Paths:
-------------
    trunk/dports/security/policykit/files/patch-src-kit-kit-lib.c.diff
    trunk/dports/security/policykit/files/patch-src-polkit-dbus-polkit-resolve-exe-helper.c.diff
    trunk/dports/security/policykit/files/patch-src-polkit-dbus-polkit-simple.c.diff
    trunk/dports/security/policykit/files/patch-src-polkit-grant-polkit-grant-helper-pam.c.diff
    trunk/dports/security/policykit/files/patch-src-polkit-grant-polkit-grant-helper.c.diff

Modified: trunk/dports/security/policykit/Portfile
===================================================================
--- trunk/dports/security/policykit/Portfile	2010-08-16 03:27:24 UTC (rev 70641)
+++ trunk/dports/security/policykit/Portfile	2010-08-16 05:34:55 UTC (rev 70642)
@@ -4,7 +4,7 @@
 PortSystem 1.0
 
 name            policykit
-version         0.9
+version         0.96
 description     PolicyKit is an application-level toolkit for defining and \
                 handling the policy that allows unprivileged processes to \
                 speak to privileged processes
@@ -16,25 +16,31 @@
 homepage        http://www.freedesktop.org/wiki/Software/PolicyKit
 master_sites    http://hal.freedesktop.org/releases/
 
-distname        PolicyKit-${version}
+distname        polkit-${version}
 
-checksums       md5     802fd13ae41f73d79359e5ecb0a98716 \
-                sha1    ac99c580eff72f6d5df261c155fb047306439f85 \
-                rmd160  197262d1c48e55558dd4bd57d7bbd8734666129c
+checksums       md5     e0a06da501b04ed3bab986a9df5b5aa2 \
+                sha1    0815b2ee2ffc2ebf2b6fc73491018a898fc73930 \
+                rmd160  19847f0835a3041446523066e6db58dfb60d3aae
 
 patchfiles      patch-configure.diff \
-                patch-src-kit-kit-lib.c.diff \
-                patch-src-polkit-dbus-polkit-simple.c.diff \
-                patch-src-polkit-dbus-polkit-resolve-exe-helper.c.diff \
-                patch-src-polkit-grant-polkit-grant-helper.c.diff \
-                patch-src-polkit-grant-polkit-grant-helper-pam.c.diff
+                patch-src-programs-pkexec.c.diff
 
+post-patch      {
+                    if {${os.major} < "10"} {
+                        reinplace "s|security/pam|pam/pam|" ${worksrcpath}/configure \
+                            ${worksrcpath}/src/polkitagent/polkitagenthelper.c \
+                            ${worksrcpath}/src/programs/pkexec.c
+                    }
+                }
+
+configure.cflags-append -I/usr/include
 configure.ldflags-append -L/usr/lib
 
 configure.args  --with-authfw=pam \
                 --with-pam-prefix=/etc/pam.d \
                 --with-pam-module-dir=/usr/lib/pam \
-                --disable-selinux \
+                --disable-introspection \
+                --disable-silent-rules \
                 --enable-man-pages \
                 --disable-gtk-doc
 
@@ -43,7 +49,7 @@
                 port:p5-xml-parser \
                 port:gnome-doc-utils
 
-depends_lib     port:dbus-glib
+depends_lib     port:eggdbus
 
 variant docs description {Build API docs using gtk-doc} {
         configure.args-delete --disable-gtk-doc
@@ -57,4 +63,4 @@
 
 livecheck.type  regex
 livecheck.url   ${master_sites}
-livecheck.regex "PolicyKit-(\\d+(?:\\.\\d+)*)${extract.suffix}"
+livecheck.regex "polkit-(\\d+(?:\\.\\d+)*)${extract.suffix}"

Modified: trunk/dports/security/policykit/files/patch-configure.diff
===================================================================
--- trunk/dports/security/policykit/files/patch-configure.diff	2010-08-16 03:27:24 UTC (rev 70641)
+++ trunk/dports/security/policykit/files/patch-configure.diff	2010-08-16 05:34:55 UTC (rev 70642)
@@ -1,14 +1,14 @@
---- configure.orig	2008-07-22 09:15:10.000000000 -0700
-+++ configure	2009-05-04 09:11:54.000000000 -0700
-@@ -23509,11 +23509,6 @@
+--- configure.orig	2010-01-15 10:51:15.000000000 -0800
++++ configure	2010-08-09 16:00:30.000000000 -0700
+@@ -13127,11 +13127,6 @@
+ done
  
  
- 
 -if test "x$GCC" = "xyes"; then
 -  LDFLAGS="-Wl,--as-needed $LDFLAGS"
 -fi
 -
 -
  
- # Check whether --with-polkit_user was given.
- if test "${with_polkit_user+set}" = set; then
+ # Check whether --with-authfw was given.
+ if test "${with_authfw+set}" = set; then :

Deleted: trunk/dports/security/policykit/files/patch-src-kit-kit-lib.c.diff
===================================================================
--- trunk/dports/security/policykit/files/patch-src-kit-kit-lib.c.diff	2010-08-16 03:27:24 UTC (rev 70641)
+++ trunk/dports/security/policykit/files/patch-src-kit-kit-lib.c.diff	2010-08-16 05:34:55 UTC (rev 70642)
@@ -1,32 +0,0 @@
---- src/kit/kit-lib.c.orig	2009-05-04 09:53:52.000000000 -0700
-+++ src/kit/kit-lib.c	2009-05-04 10:02:30.000000000 -0700
-@@ -40,6 +40,10 @@
- #include <kit/kit.h>
- #include "kit-test.h"
- 
-+#ifdef __APPLE__
-+#include <crt_externs.h>
-+#endif
-+
- #ifndef HAVE_GETLINE
- ssize_t
- kit_getline (char **lineptr, size_t *n, FILE *stream)
-@@ -118,11 +122,18 @@
- #endif
- 
- #ifndef HAVE_CLEARENV
-+#ifdef __APPLE__
-+static char **environ;
-+#else
- extern char **environ;
-+#endif
- 
- int
- kit_clearenv (void)
- {
-+#ifdef __APPLE__
-+        environ = _NSGetEnviron();
-+#endif
-         if (environ != NULL)
-                 environ[0] = NULL;
-         return 0;

Deleted: trunk/dports/security/policykit/files/patch-src-polkit-dbus-polkit-resolve-exe-helper.c.diff
===================================================================
--- trunk/dports/security/policykit/files/patch-src-polkit-dbus-polkit-resolve-exe-helper.c.diff	2010-08-16 03:27:24 UTC (rev 70641)
+++ trunk/dports/security/policykit/files/patch-src-polkit-dbus-polkit-resolve-exe-helper.c.diff	2010-08-16 05:34:55 UTC (rev 70642)
@@ -1,25 +0,0 @@
---- src/polkit-dbus/polkit-resolve-exe-helper.c.orig	2009-05-04 10:27:47.000000000 -0700
-+++ src/polkit-dbus/polkit-resolve-exe-helper.c	2009-05-04 10:37:07.000000000 -0700
-@@ -43,7 +43,11 @@
- #ifdef HAVE_FREEBSD
- #include <sys/param.h>
- #endif
-+#if defined(__APPLE__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1060
-+#include <pam/pam_appl.h>
-+#else
- #include <security/pam_appl.h>
-+#endif
- #include <grp.h>
- #include <pwd.h>
- #include <syslog.h>
-@@ -53,6 +57,10 @@
- #include <fcntl.h>
- #include <dirent.h>
- 
-+#ifdef __APPLE__
-+#include <sys/syslimits.h>
-+#endif
-+
- #include <polkit-dbus/polkit-dbus.h>
- #include <polkit/polkit-private.h>
- 

Deleted: trunk/dports/security/policykit/files/patch-src-polkit-dbus-polkit-simple.c.diff
===================================================================
--- trunk/dports/security/policykit/files/patch-src-polkit-dbus-polkit-simple.c.diff	2010-08-16 03:27:24 UTC (rev 70641)
+++ trunk/dports/security/policykit/files/patch-src-polkit-dbus-polkit-simple.c.diff	2010-08-16 05:34:55 UTC (rev 70642)
@@ -1,35 +0,0 @@
---- src/polkit-dbus/polkit-simple.c.orig	2009-05-04 10:03:24.000000000 -0700
-+++ src/polkit-dbus/polkit-simple.c	2009-05-04 10:10:06.000000000 -0700
-@@ -55,6 +55,9 @@
- #include "polkit-simple.h"
- #include "polkit-dbus.h"
- 
-+#ifdef __APPLE__
-+#include <crt_externs.h>
-+#endif
- 
- /**
-  * polkit_check_auth:
-@@ -253,7 +256,11 @@
-         return ret;
- }
- 
-+#ifdef __APPLE__
-+static char **environ;
-+#else
- extern char **environ;
-+#endif
- 
- static polkit_bool_t
- _auth_show_dialog_text (const char *action_id, pid_t pid, DBusError *error)
-@@ -275,6 +282,10 @@
-                 goto out;
-         }
- 
-+#ifdef __APPLE__
-+        environ = _NSGetEnviron();
-+#endif
-+
-         envsize = kit_strv_length (environ);
-         envp = kit_new0 (char *, envsize + 3);
-         if (envp == NULL)

Deleted: trunk/dports/security/policykit/files/patch-src-polkit-grant-polkit-grant-helper-pam.c.diff
===================================================================
--- trunk/dports/security/policykit/files/patch-src-polkit-grant-polkit-grant-helper-pam.c.diff	2010-08-16 03:27:24 UTC (rev 70641)
+++ trunk/dports/security/policykit/files/patch-src-polkit-grant-polkit-grant-helper-pam.c.diff	2010-08-16 05:34:55 UTC (rev 70642)
@@ -1,15 +0,0 @@
---- src/polkit-grant/polkit-grant-helper-pam.c.orig	2009-05-04 11:01:10.000000000 -0700
-+++ src/polkit-grant/polkit-grant-helper-pam.c	2009-05-04 11:02:07.000000000 -0700
-@@ -39,8 +39,11 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <syslog.h>
-+#if defined(__APPLE__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1060
-+#include <pam/pam_appl.h>
-+#else
- #include <security/pam_appl.h>
--
-+#endif
- #include <kit/kit.h>
- 
- #ifdef HAVE_SOLARIS

Deleted: trunk/dports/security/policykit/files/patch-src-polkit-grant-polkit-grant-helper.c.diff
===================================================================
--- trunk/dports/security/policykit/files/patch-src-polkit-grant-polkit-grant-helper.c.diff	2010-08-16 03:27:24 UTC (rev 70641)
+++ trunk/dports/security/policykit/files/patch-src-polkit-grant-polkit-grant-helper.c.diff	2010-08-16 05:34:55 UTC (rev 70642)
@@ -1,15 +0,0 @@
---- src/polkit-grant/polkit-grant-helper.c.orig	2008-05-30 14:24:44.000000000 -0700
-+++ src/polkit-grant/polkit-grant-helper.c	2009-05-04 10:59:07.000000000 -0700
-@@ -41,8 +41,12 @@
- #include <sys/stat.h>
- 
- #ifdef POLKIT_AUTHFW_PAM
-+#if defined(__APPLE__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1060
-+#include <pam/pam_appl.h>
-+#else
- #include <security/pam_appl.h>
- #endif
-+#endif
- 
- #ifdef POLKIT_AUTHFW_SHADOW
- #include <shadow.h>

Added: trunk/dports/security/policykit/files/patch-src-programs-pkexec.c.diff
===================================================================
--- trunk/dports/security/policykit/files/patch-src-programs-pkexec.c.diff	                        (rev 0)
+++ trunk/dports/security/policykit/files/patch-src-programs-pkexec.c.diff	2010-08-16 05:34:55 UTC (rev 70642)
@@ -0,0 +1,11 @@
+--- src/programs/pkexec.c.orig	2010-08-14 13:24:32.000000000 -0700
++++ src/programs/pkexec.c	2010-08-14 13:30:52.000000000 -0700
+@@ -438,7 +438,7 @@
+       goto out;
+     }
+ 
+-  original_cwd = g_strdup (get_current_dir_name ());
++  original_cwd = g_strdup (getcwd(NULL, 0));
+   if (original_cwd == NULL)
+     {
+       g_printerr ("Error getting cwd.\n");
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100815/c87c1a7e/attachment.html>


More information about the macports-changes mailing list