Signed-off-by: Robert Schwebel <[email protected]> --- .../0001-compiling-without-pam-doesn-t-work.patch | 33 ++++++++++++++++++++ .../0002-we-don-t-have-_pk_debug-any-more.patch | 27 ++++++++++++++++ .../PolicyKit-0.9/PolicyKit-0.9-no-pk-debug.diff | 23 -------------- .../PolicyKit-0.9-pam-when-disabled.diff | 29 ----------------- patches/PolicyKit-0.9/series | 2 - 5 files changed, 60 insertions(+), 54 deletions(-) create mode 100644 patches/PolicyKit-0.9/0001-compiling-without-pam-doesn-t-work.patch create mode 100644 patches/PolicyKit-0.9/0002-we-don-t-have-_pk_debug-any-more.patch delete mode 100644 patches/PolicyKit-0.9/PolicyKit-0.9-no-pk-debug.diff delete mode 100644 patches/PolicyKit-0.9/PolicyKit-0.9-pam-when-disabled.diff delete mode 100644 patches/PolicyKit-0.9/series
diff --git a/patches/PolicyKit-0.9/0001-compiling-without-pam-doesn-t-work.patch b/patches/PolicyKit-0.9/0001-compiling-without-pam-doesn-t-work.patch new file mode 100644 index 0000000..857c43b --- /dev/null +++ b/patches/PolicyKit-0.9/0001-compiling-without-pam-doesn-t-work.patch @@ -0,0 +1,33 @@ +From b179c018f738fd8802fdef91cdcc5c3c9476f49f Mon Sep 17 00:00:00 2001 +From: Robert Schwebel <[email protected]> +Date: Sat, 29 Oct 2011 18:46:37 +0200 +Subject: [PATCH 1/2] compiling without pam doesn't work + +When compiled with --with-authfw=none, I get + +polkit-resolve-exe-helper.c:46:31: error: security/pam_appl.h: No such file or directory + +The patch below fixes it. + +Signed-off-by: Robert Schwebel <[email protected]> +--- + src/polkit-dbus/polkit-resolve-exe-helper.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/src/polkit-dbus/polkit-resolve-exe-helper.c b/src/polkit-dbus/polkit-resolve-exe-helper.c +index c56b2f5..cf696a9 100644 +--- a/src/polkit-dbus/polkit-resolve-exe-helper.c ++++ b/src/polkit-dbus/polkit-resolve-exe-helper.c +@@ -43,7 +43,9 @@ + #ifdef HAVE_FREEBSD + #include <sys/param.h> + #endif ++#ifdef HAVE_PAM + #include <security/pam_appl.h> ++#endif + #include <grp.h> + #include <pwd.h> + #include <syslog.h> +-- +1.7.7 + diff --git a/patches/PolicyKit-0.9/0002-we-don-t-have-_pk_debug-any-more.patch b/patches/PolicyKit-0.9/0002-we-don-t-have-_pk_debug-any-more.patch new file mode 100644 index 0000000..7c524ca --- /dev/null +++ b/patches/PolicyKit-0.9/0002-we-don-t-have-_pk_debug-any-more.patch @@ -0,0 +1,27 @@ +From 2e711baa8a34ffd36955db4e59ad1449468f4ed2 Mon Sep 17 00:00:00 2001 +From: Robert Schwebel <[email protected]> +Date: Sat, 29 Oct 2011 18:46:37 +0200 +Subject: [PATCH 2/2] we don't have _pk_debug any more + +../../src/polkit/.libs/libpolkit.so: undefined reference to `_pk_debug' + +Signed-off-by: Robert Schwebel <[email protected]> +--- + src/polkit/polkit-authorization-db-dummy.c | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +diff --git a/src/polkit/polkit-authorization-db-dummy.c b/src/polkit/polkit-authorization-db-dummy.c +index 0b4c848..9615619 100644 +--- a/src/polkit/polkit-authorization-db-dummy.c ++++ b/src/polkit/polkit-authorization-db-dummy.c +@@ -105,7 +105,6 @@ void + polkit_authorization_db_debug (PolKitAuthorizationDB *authdb) + { + kit_return_if_fail (authdb != NULL); +- _pk_debug ("PolKitAuthorizationDB: refcount=%d", authdb->refcount); + } + + polkit_bool_t +-- +1.7.7 + diff --git a/patches/PolicyKit-0.9/PolicyKit-0.9-no-pk-debug.diff b/patches/PolicyKit-0.9/PolicyKit-0.9-no-pk-debug.diff deleted file mode 100644 index 53b0131..0000000 --- a/patches/PolicyKit-0.9/PolicyKit-0.9-no-pk-debug.diff +++ /dev/null @@ -1,23 +0,0 @@ -From: Robert Schwebel <[email protected]> -Subject: [patch] we don't have _pk_debug any more - -../../src/polkit/.libs/libpolkit.so: undefined reference to `_pk_debug' - -Signed-off-by: Robert Schwebel <[email protected]> - ---- - src/polkit/polkit-authorization-db-dummy.c | 1 - - 1 file changed, 1 deletion(-) - -Index: PolicyKit-0.9/src/polkit/polkit-authorization-db-dummy.c -=================================================================== ---- PolicyKit-0.9.orig/src/polkit/polkit-authorization-db-dummy.c -+++ PolicyKit-0.9/src/polkit/polkit-authorization-db-dummy.c -@@ -105,7 +105,6 @@ void - polkit_authorization_db_debug (PolKitAuthorizationDB *authdb) - { - kit_return_if_fail (authdb != NULL); -- _pk_debug ("PolKitAuthorizationDB: refcount=%d", authdb->refcount); - } - - polkit_bool_t diff --git a/patches/PolicyKit-0.9/PolicyKit-0.9-pam-when-disabled.diff b/patches/PolicyKit-0.9/PolicyKit-0.9-pam-when-disabled.diff deleted file mode 100644 index 912dbd6..0000000 --- a/patches/PolicyKit-0.9/PolicyKit-0.9-pam-when-disabled.diff +++ /dev/null @@ -1,29 +0,0 @@ -From: Robert Schwebel <[email protected]> -Subject: [patch] compiling without pam doesn't work - -When compiled with --with-authfw=none, I get - -polkit-resolve-exe-helper.c:46:31: error: security/pam_appl.h: No such file or directory - -The patch below fixes it. - -Signed-off-by: Robert Schwebel <[email protected]> - ---- - src/polkit-dbus/polkit-resolve-exe-helper.c | 2 ++ - 1 file changed, 2 insertions(+) - -Index: PolicyKit-0.9/src/polkit-dbus/polkit-resolve-exe-helper.c -=================================================================== ---- PolicyKit-0.9.orig/src/polkit-dbus/polkit-resolve-exe-helper.c -+++ PolicyKit-0.9/src/polkit-dbus/polkit-resolve-exe-helper.c -@@ -43,7 +43,9 @@ - #ifdef HAVE_FREEBSD - #include <sys/param.h> - #endif -+#ifdef HAVE_PAM - #include <security/pam_appl.h> -+#endif - #include <grp.h> - #include <pwd.h> - #include <syslog.h> diff --git a/patches/PolicyKit-0.9/series b/patches/PolicyKit-0.9/series deleted file mode 100644 index ba8135f..0000000 --- a/patches/PolicyKit-0.9/series +++ /dev/null @@ -1,2 +0,0 @@ -PolicyKit-0.9-pam-when-disabled.diff -PolicyKit-0.9-no-pk-debug.diff -- 1.7.7 -- ptxdist mailing list [email protected]
