diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-06-02 15:40:43 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-06-02 17:41:15 +0200 |
commit | 876e0d82f580daef243894596aa1c2f5545e899c (patch) | |
tree | 07d317472cf16bd342d7d1bf200044f87ed9c2a2 | |
parent | 7e3cd4d1d83c24ff5070fea5b6789936351a880a (diff) | |
download | ptxdist-876e0d82f580daef243894596aa1c2f5545e899c.tar.gz ptxdist-876e0d82f580daef243894596aa1c2f5545e899c.tar.xz |
policykit: remove after one year in staging
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r-- | patches/PolicyKit-0.9/0001-compiling-without-pam-doesn-t-work.patch | 29 | ||||
-rw-r--r-- | patches/PolicyKit-0.9/0002-we-don-t-have-_pk_debug-any-more.patch | 23 | ||||
-rw-r--r-- | patches/PolicyKit-0.9/series | 5 | ||||
-rw-r--r-- | rules/policykit.in | 18 | ||||
-rw-r--r-- | rules/policykit.make | 114 |
5 files changed, 0 insertions, 189 deletions
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 deleted file mode 100644 index 26fcc215a..000000000 --- a/patches/PolicyKit-0.9/0001-compiling-without-pam-doesn-t-work.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Robert Schwebel <r.schwebel@pengutronix.de> -Date: Sat, 29 Oct 2011 18:46:37 +0200 -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 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> 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 deleted file mode 100644 index bae0fe863..000000000 --- a/patches/PolicyKit-0.9/0002-we-don-t-have-_pk_debug-any-more.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Robert Schwebel <r.schwebel@pengutronix.de> -Date: Sat, 29 Oct 2011 18:46:37 +0200 -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 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 diff --git a/patches/PolicyKit-0.9/series b/patches/PolicyKit-0.9/series deleted file mode 100644 index c3c6ba9c1..000000000 --- a/patches/PolicyKit-0.9/series +++ /dev/null @@ -1,5 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-compiling-without-pam-doesn-t-work.patch -0002-we-don-t-have-_pk_debug-any-more.patch -# a80f910b6af26639731bbea9afc2af67 - git-ptx-patches magic diff --git a/rules/policykit.in b/rules/policykit.in deleted file mode 100644 index 65fe4f787..000000000 --- a/rules/policykit.in +++ /dev/null @@ -1,18 +0,0 @@ -## SECTION=staging -## old section: -### SECTION=system_libraries - -config POLICYKIT - tristate - prompt "policykit" - select HOST_INTLTOOL - select GLIB - select DBUS_GLIB - help - Policy kit offers an infrastructure for security policies for - dbus applications. - - STAGING: remove in ptxdist-2015.05.0 - - This is the old version of the polkit packages. Is is only still - here for packages that use the old API. diff --git a/rules/policykit.make b/rules/policykit.make deleted file mode 100644 index 658e2db94..000000000 --- a/rules/policykit.make +++ /dev/null @@ -1,114 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2009 by Robert Schwebel <r.schwebel@pengutronix.de> -# -# See CREDITS for details about who has contributed to this project. -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_POLICYKIT) += policykit - -# -# Paths and names -# -POLICYKIT_VERSION := 0.9 -POLICYKIT_MD5 := 802fd13ae41f73d79359e5ecb0a98716 -POLICYKIT := PolicyKit-$(POLICYKIT_VERSION) -POLICYKIT_SUFFIX := tar.gz -POLICYKIT_URL := http://hal.freedesktop.org/releases/$(POLICYKIT).$(POLICYKIT_SUFFIX) -POLICYKIT_SOURCE := $(SRCDIR)/$(POLICYKIT).$(POLICYKIT_SUFFIX) -POLICYKIT_DIR := $(BUILDDIR)/$(POLICYKIT) - -# ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - -POLICYKIT_PATH := PATH=$(CROSS_PATH) -POLICYKIT_ENV := $(CROSS_ENV) - -# -# autoconf -# -POLICYKIT_AUTOCONF := \ - $(CROSS_AUTOCONF_USR) \ - --enable-shared \ - --enable-static \ - --disable-ansi \ - --disable-verbose-mode \ - --disable-tests \ - --disable-gcov \ - --disable-man-pages \ - --disable-gtk-doc \ - --disable-selinux \ - --with-gnu-ld \ - --with-authfw=none \ - --with-authdb=dummy \ - --with-os-type=redhat - -# TODO: -# - add switches for --with-authfw=none/pam/shadow -# - add --with-authdb=default -# - --with-os-type=<os> doesn't know debian - -# --with-tags[=TAGS] include additional configurations [automatic] -# --with-html-dir=PATH path to installed docs -# --with-expat=<dir> Use expat from here -# --with-polkit-user=<user> user for PolicyKit -# --with-polkit-group=<grp> group for PolicyKit -# --with-pam-prefix=<prefix> specify where pam files go -# --with-pam-module-dir=dirname directory to install PAM security module -# --with-pam-include=<file> pam file to include - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/policykit.targetinstall: - @$(call targetinfo) - - @$(call install_init, policykit) - @$(call install_fixup, policykit,PRIORITY,optional) - @$(call install_fixup, policykit,SECTION,base) - @$(call install_fixup, policykit,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>") - @$(call install_fixup, policykit,DESCRIPTION,missing) - - # libs - @$(call install_lib, policykit, 0, 0, 0644, libpolkit-dbus) - @$(call install_lib, policykit, 0, 0, 0644, libpolkit-grant) - @$(call install_lib, policykit, 0, 0, 0644, libpolkit) - - # configs - for i in \ - /etc/dbus-1/system.d/org.freedesktop.PolicyKit.conf \ - /etc/PolicyKit/PolicyKit.conf \ - /usr/share/dbus-1/interfaces/org.freedesktop.PolicyKit.AuthenticationAgent.xml \ - /usr/share/dbus-1/system-services/org.freedesktop.PolicyKit.service \ - /usr/share/PolicyKit/config.dtd \ - /usr/share/PolicyKit/policy/org.freedesktop.policykit.policy \ - /etc/profile.d/polkit-bash-completion.sh \ - ; \ - do $(call install_copy, policykit, 0, 0, 0644, -, $$i); done - - # binaries - for i in \ - /usr/bin/polkit-action \ - /usr/bin/polkit-auth \ - /usr/bin/polkit-config-file-validate \ - /usr/bin/polkit-policy-file-validate \ - /usr/libexec/polkitd \ - ; \ - do $(call install_copy, policykit, 0, 0, 0755, -, $$i); done - - # binaries with suid - @$(call install_copy, policykit, 0, 0, 4755, -, /usr/libexec/polkit-resolve-exe-helper) - - @$(call install_finish, policykit) - - @$(call touch) - -# vim: syntax=make |