From: Robert Schwebel <r.schwebel@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Robert Schwebel <r.schwebel@pengutronix.de>
Subject: [ptxdist] [PATCH 04/28] policykit: clean up patches
Date: Sun, 30 Oct 2011 23:00:35 +0100 [thread overview]
Message-ID: <1320012059-24971-4-git-send-email-r.schwebel@pengutronix.de> (raw)
In-Reply-To: <1320012059-24971-1-git-send-email-r.schwebel@pengutronix.de>
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
.../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 <r.schwebel@pengutronix.de>
+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 <r.schwebel@pengutronix.de>
+---
+ 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 <r.schwebel@pengutronix.de>
+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 <r.schwebel@pengutronix.de>
+---
+ 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 <r.schwebel@pengutronix.de>
-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 <r.schwebel@pengutronix.de>
-
----
- 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 <r.schwebel@pengutronix.de>
-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 <r.schwebel@pengutronix.de>
-
----
- 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
ptxdist@pengutronix.de
next prev parent reply other threads:[~2011-10-30 22:00 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-30 22:00 [ptxdist] Patch cleanup Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 01/28] canfestival: clean up patches Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 02/28] devicekit-disks: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 03/28] mplayer: " Robert Schwebel
2011-10-30 22:00 ` Robert Schwebel [this message]
2011-10-30 22:00 ` [ptxdist] [PATCH 05/28] sdl: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 06/28] sdl-mixer: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 07/28] atop: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 08/28] bing: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 09/28] bridge-utils: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 10/28] bzip2: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 11/28] cbmbasic: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 12/28] cpufrequtils: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 13/28] cvs: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 14/28] daemonize: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 15/28] dibbler: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 16/28] e2fsprogs: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 17/28] efax: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 18/28] eggdbus: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 19/28] elektra: remove orphaned package Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 20/28] etherwake: clean up patches Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 21/28] fakeroot: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 22/28] fbtest: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 23/28] font-alias: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 24/28] freetype: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 25/28] glademm: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 26/28] gpsd: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 27/28] gst-plugins-gl: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 28/28] gtk: " Robert Schwebel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1320012059-24971-4-git-send-email-r.schwebel@pengutronix.de \
--to=r.schwebel@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox