From patchwork Tue Mar 5 16:38:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Lautrbach X-Patchwork-Id: 10839677 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 93241922 for ; Tue, 5 Mar 2019 16:39:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7487C2C65C for ; Tue, 5 Mar 2019 16:39:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 638C82C78E; Tue, 5 Mar 2019 16:39:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EF1762C65C for ; Tue, 5 Mar 2019 16:39:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726772AbfCEQjB (ORCPT ); Tue, 5 Mar 2019 11:39:01 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40444 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726069AbfCEQjB (ORCPT ); Tue, 5 Mar 2019 11:39:01 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2C74A308125E for ; Tue, 5 Mar 2019 16:39:01 +0000 (UTC) Received: from workstation.redhat.com (ovpn-204-204.brq.redhat.com [10.40.204.204]) by smtp.corp.redhat.com (Postfix) with ESMTP id 694905D783; Tue, 5 Mar 2019 16:39:00 +0000 (UTC) From: Petr Lautrbach To: selinux@vger.kernel.org Cc: Petr Lautrbach Subject: [PATCH 1/2] gui: Install polgengui.py to /usr/bin/selinux-polgengui Date: Tue, 5 Mar 2019 17:38:55 +0100 Message-Id: <20190305163856.395-1-plautrba@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Tue, 05 Mar 2019 16:39:01 +0000 (UTC) Sender: selinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP polgengui.py is a standalone gui tool which should be in /usr/bin with other tools. Signed-off-by: Petr Lautrbach --- gui/Makefile | 2 +- gui/modulesPage.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gui/Makefile b/gui/Makefile index c2f982de..b2375fbf 100644 --- a/gui/Makefile +++ b/gui/Makefile @@ -31,7 +31,7 @@ install: all -mkdir -p $(DESTDIR)$(DATADIR)/polkit-1/actions/ install -m 755 system-config-selinux.py $(DESTDIR)$(SHAREDIR) install -m 755 system-config-selinux $(DESTDIR)$(BINDIR) - install -m 755 polgengui.py $(DESTDIR)$(SHAREDIR) + install -m 755 polgengui.py $(DESTDIR)$(BINDIR)/selinux-polgengui install -m 644 $(TARGETS) $(DESTDIR)$(SHAREDIR) install -m 644 system-config-selinux.8 $(DESTDIR)$(MANDIR)/man8 install -m 644 selinux-polgengui.8 $(DESTDIR)$(MANDIR)/man8 diff --git a/gui/modulesPage.py b/gui/modulesPage.py index 34c5d9e3..cb856b2d 100644 --- a/gui/modulesPage.py +++ b/gui/modulesPage.py @@ -118,7 +118,7 @@ class modulesPage(semanagePage): def new_module(self, args): try: - Popen(["/usr/share/system-config-selinux/polgengui.py"]) + Popen(["selinux-polgengui"]) except ValueError as e: self.error(e.args[0]) From patchwork Tue Mar 5 16:38:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Lautrbach X-Patchwork-Id: 10839679 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DD4A5922 for ; Tue, 5 Mar 2019 16:39:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8351A2C7A3 for ; Tue, 5 Mar 2019 16:39:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 766682C7AB; Tue, 5 Mar 2019 16:39:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 13F722C7A3 for ; Tue, 5 Mar 2019 16:39:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726847AbfCEQjW (ORCPT ); Tue, 5 Mar 2019 11:39:22 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43090 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726813AbfCEQjW (ORCPT ); Tue, 5 Mar 2019 11:39:22 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 96ADEC04FFF9 for ; Tue, 5 Mar 2019 16:39:22 +0000 (UTC) Received: from workstation.redhat.com (ovpn-204-204.brq.redhat.com [10.40.204.204]) by smtp.corp.redhat.com (Postfix) with ESMTP id D15615D732; Tue, 5 Mar 2019 16:39:21 +0000 (UTC) From: Petr Lautrbach To: selinux@vger.kernel.org Cc: Petr Lautrbach Subject: [PATCH 2/2] gui: Install .desktop files to /usr/share/applications by default Date: Tue, 5 Mar 2019 17:38:57 +0100 Message-Id: <20190305163856.395-2-plautrba@redhat.com> In-Reply-To: <20190305163856.395-1-plautrba@redhat.com> References: <20190305163856.395-1-plautrba@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 05 Mar 2019 16:39:22 +0000 (UTC) Sender: selinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP /usr/share/applications is a standard directory for .desktop files. Installation path can be changed using DESKTOPDIR variable in installation phase, e.g. make DESKTOPDIR=/usr/local/share/applications install Signed-off-by: Petr Lautrbach --- gui/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gui/Makefile b/gui/Makefile index b2375fbf..5e64c3a1 100644 --- a/gui/Makefile +++ b/gui/Makefile @@ -5,6 +5,7 @@ BINDIR ?= $(PREFIX)/bin SHAREDIR ?= $(PREFIX)/share/system-config-selinux DATADIR ?= $(PREFIX)/share MANDIR ?= $(PREFIX)/share/man +DESKTOPDIR ?= $(PREFIX)/share/applications TARGETS= \ booleansPage.py \ @@ -44,7 +45,7 @@ install: all install -m 644 system-config-selinux.png $(DESTDIR)$(DATADIR)/pixmaps install -m 644 system-config-selinux.png $(DESTDIR)$(DATADIR)/icons/hicolor/24x24/apps install -m 644 system-config-selinux.png $(DESTDIR)$(DATADIR)/system-config-selinux - install -m 644 *.desktop $(DESTDIR)$(DATADIR)/system-config-selinux + install -m 644 *.desktop $(DESTDIR)$(DESKTOPDIR) -mkdir -p $(DESTDIR)$(DATADIR)/pixmaps install -m 644 sepolicy_256.png $(DESTDIR)$(DATADIR)/pixmaps/sepolicy.png for i in 16 22 32 48 256; do \