Attachment 88644 Details for Bug 71230 – [2/4] Remove what's left of Nokia's "Aegis" API

[patch] [2/4] Remove what's left of Nokia's "Aegis" API

0002-Remove-what-s-left-of-Nokia-s-Aegis-API.patch (text/plain), 4.83 KB, created by Simon McVittie on 2013-11-04 18:52:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2013-11-04 18:52:05 UTC

Size: 4.83 KB

patch

obsolete

>From 6fdc88b01f6818d6e9e188d0702dd7367372282e Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Mon, 4 Nov 2013 18:40:11 +0000
>Subject: [PATCH 2/5] Remove what's left of Nokia's "Aegis" API
>
>We already deleted the actual plugin.
>---
> configure.ac                 | 24 ------------------------
> plugins/mcp-dbus-aegis-acl.h | 34 ----------------------------------
> src/Makefile.am              |  4 ----
> src/plugin-loader.c          | 16 ----------------
> 4 files changed, 78 deletions(-)
> delete mode 100644 plugins/mcp-dbus-aegis-acl.h
>
>diff --git a/configure.ac b/configure.ac
>index 1c8cc11..36452b7 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -150,29 +150,6 @@ fi
> AC_SUBST(ACCOUNTS_CACHE_DIR)
> AC_DEFINE_UNQUOTED(ACCOUNTS_CACHE_DIR,"$ACCOUNTS_CACHE_DIR", [Directory for account/connection mapping for crash recovery])
> 
>-aegis_enabled="no"
>-AC_MSG_CHECKING([whether to build with Aegis (libcreds) support])
>-AC_ARG_ENABLE(aegis,
>-              AC_HELP_STRING([--enable-aegis],
>-                             [Aegis security framework support]),
>-              [
>-                AC_CHECK_LIB(creds, creds_init,
>-                             [
>-                               AC_DEFINE([ENABLE_AEGIS], [1],
>-                                         [Define if Aegis is supported])
>-                               AC_SUBST([AEGIS_LIBS], [-lcreds])
>-                             ],
>-                             [ AC_MSG_ERROR([Aegis: libcreds not found]) ])
>-                aegis_enabled="yes"
>-              ],
>-              [
>-                aegis_enabled="no"
>-                AC_MSG_RESULT(no)
>-                AC_DEFINE([ENABLE_AEGIS], [0], [Define if Aegis is supported])
>-              ])
>-
>-AM_CONDITIONAL(ENABLE_AEGIS, [test x$aegis_enabled = xyes])
>-
> PKG_PROG_PKG_CONFIG()
> 
> PKG_CHECK_MODULES(DBUS, [dbus-1 >= 0.95, dbus-glib-1 >= 0.82])
>@@ -304,6 +281,5 @@ Configure summary:
>         Network Manager integration..:  ${have_nm}
>         ConnMan integration..........:  ${have_connman}
>         Connectivity GSetting........:  ${enable_conn_setting}
>-        Aegis........................:  ${aegis_enabled}
>         Nokia Mode Control Entity....:  ${HAVE_MCE}
> "
>diff --git a/plugins/mcp-dbus-aegis-acl.h b/plugins/mcp-dbus-aegis-acl.h
>deleted file mode 100644
>index 96baaf4..0000000
>--- a/plugins/mcp-dbus-aegis-acl.h
>+++ /dev/null
>@@ -1,34 +0,0 @@
>-/*
>- * A pseudo-plugin that checks the caller's Aegis permission tokens
>- *
>- * Copyright Â© 2010-2011 Nokia Corporation
>- * Copyright Â© 2010-2011 Collabora Ltd.
>- *
>- * This library is free software; you can redistribute it and/or
>- * modify it under the terms of the GNU Lesser General Public
>- * License as published by the Free Software Foundation; either
>- * version 2.1 of the License, or (at your option) any later version.
>- *
>- * This library is distributed in the hope that it will be useful,
>- * but WITHOUT ANY WARRANTY; without even the implied warranty of
>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>- * Lesser General Public License for more details.
>- *
>- * You should have received a copy of the GNU Lesser General Public
>- * License along with this library; if not, write to the Free Software
>- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>- */
>-
>-#ifndef AEGIS_ACL_H
>-#define AEGIS_ACL_H
>-
>-#include <mission-control-plugins/mission-control-plugins.h>
>-#include <glib-object.h>
>-
>-G_BEGIN_DECLS
>-
>-GObject *aegis_acl_new (void);
>-
>-G_END_DECLS
>-
>-#endif
>diff --git a/src/Makefile.am b/src/Makefile.am
>index 72d1ab3..3c19b00 100644
>--- a/src/Makefile.am
>+++ b/src/Makefile.am
>@@ -68,10 +68,6 @@ libmcd_convenience_la_LIBADD = \
> 	$(CONNMAN_LIBS) \
> 	$(NULL)
> 
>-if ENABLE_AEGIS
>-libmcd_convenience_la_LIBADD += $(top_builddir)/plugins/libmcp-aegis.la
>-endif
>-
> noinst_LTLIBRARIES = libmcd-convenience.la
> 
> libmcd_convenience_la_SOURCES = \
>diff --git a/src/plugin-loader.c b/src/plugin-loader.c
>index 7062c3a..d6beefd 100644
>--- a/src/plugin-loader.c
>+++ b/src/plugin-loader.c
>@@ -27,10 +27,6 @@
> 
> #include "mcd-debug.h"
> 
>-#if ENABLE_AEGIS
>-#include "plugins/mcp-dbus-aegis-acl.h"
>-#endif
>-
> static gsize ready = 0;
> 
> void
>@@ -38,9 +34,6 @@ _mcd_plugin_loader_init (void)
> {
>   if (g_once_init_enter (&ready))
>     {
>-#if ENABLE_AEGIS
>-      GObject *pseudo_plugin;
>-#endif
>       const gchar *dir = g_getenv ("MC_FILTER_PLUGIN_DIR");
> 
>       if (dir == NULL)
>@@ -48,15 +41,6 @@ _mcd_plugin_loader_init (void)
> 
>       mcp_read_dir (dir);
> 
>-#if ENABLE_AEGIS
>-      /* The last object added by mcp_add_object() will be treated as highest
>-       * priority, at least for the interfaces used here */
>-      DEBUG ("Initialising built-in Aegis ACL plugin");
>-      pseudo_plugin = G_OBJECT (aegis_acl_new ());
>-      mcp_add_object (pseudo_plugin);
>-      g_object_unref (pseudo_plugin);
>-#endif
>-
>       g_once_init_leave (&ready, 1);
>     }
> }
>-- 
>1.8.4.2
>

Actions: View | Splinter Review

Attachments on bug 71230: 88643 | 88644 | 88645 | 88646 | 88696

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.