From patchwork Sun Feb 17 21:36:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Iooss X-Patchwork-Id: 10817205 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 5A3976C2 for ; Sun, 17 Feb 2019 21:37:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 43E842A0EC for ; Sun, 17 Feb 2019 21:37:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 382042A0EE; Sun, 17 Feb 2019 21:37:14 +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 B750C2A0EC for ; Sun, 17 Feb 2019 21:37:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726244AbfBQVhN (ORCPT ); Sun, 17 Feb 2019 16:37:13 -0500 Received: from mx1.polytechnique.org ([129.104.30.34]:54671 "EHLO mx1.polytechnique.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726124AbfBQVhN (ORCPT ); Sun, 17 Feb 2019 16:37:13 -0500 Received: from localhost.localdomain (89-156-252-9.rev.numericable.fr [89.156.252.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ssl.polytechnique.org (Postfix) with ESMTPSA id 21EF5564714 for ; Sun, 17 Feb 2019 22:37:10 +0100 (CET) From: Nicolas Iooss To: selinux@vger.kernel.org Subject: [PATCH 1/2] python/sepolicy: drop python shebang from the module Date: Sun, 17 Feb 2019 22:36:49 +0100 Message-Id: <20190217213650.25974-1-nicolas.iooss@m4x.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-AV-Checked: ClamAV using ClamSMTP at svoboda.polytechnique.org (Sun Feb 17 22:37:10 2019 +0100 (CET)) X-Org-Mail: nicolas.iooss.2010@polytechnique.org Sender: selinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The files in sepolicy's module directory are not supposed to used as executable files. The shebang line is therefore not needed. Signed-off-by: Nicolas Iooss Acked-by: Petr Lautrbach Acked-by: Jason Zaman --- python/sepolicy/sepolicy/__init__.py | 2 -- python/sepolicy/sepolicy/booleans.py | 1 - python/sepolicy/sepolicy/communicate.py | 1 - python/sepolicy/sepolicy/generate.py | 2 -- python/sepolicy/sepolicy/gui.py | 2 -- python/sepolicy/sepolicy/interface.py | 2 -- python/sepolicy/sepolicy/manpage.py | 1 - python/sepolicy/sepolicy/network.py | 1 - python/sepolicy/sepolicy/transition.py | 1 - 9 files changed, 13 deletions(-) diff --git a/python/sepolicy/sepolicy/__init__.py b/python/sepolicy/sepolicy/__init__.py index 6f7294726be4..6aed31bddf1e 100644 --- a/python/sepolicy/sepolicy/__init__.py +++ b/python/sepolicy/sepolicy/__init__.py @@ -1,5 +1,3 @@ -#!/usr/bin/python - # Author: Dan Walsh # Author: Ryan Hallisey # Author: Jason Zaman diff --git a/python/sepolicy/sepolicy/booleans.py b/python/sepolicy/sepolicy/booleans.py index cf5f1ffc6469..ad07ab045d3e 100644 --- a/python/sepolicy/sepolicy/booleans.py +++ b/python/sepolicy/sepolicy/booleans.py @@ -1,4 +1,3 @@ -#! /usr/bin/python -Es # Copyright (C) 2012 Red Hat # see file 'COPYING' for use and warranty information # diff --git a/python/sepolicy/sepolicy/communicate.py b/python/sepolicy/sepolicy/communicate.py index 299316e0bf27..374002204f84 100755 --- a/python/sepolicy/sepolicy/communicate.py +++ b/python/sepolicy/sepolicy/communicate.py @@ -1,4 +1,3 @@ -#! /usr/bin/python -Es # Copyright (C) 2012 Red Hat # see file 'COPYING' for use and warranty information # diff --git a/python/sepolicy/sepolicy/generate.py b/python/sepolicy/sepolicy/generate.py index 5a2195b8033f..019e7836c597 100644 --- a/python/sepolicy/sepolicy/generate.py +++ b/python/sepolicy/sepolicy/generate.py @@ -1,5 +1,3 @@ -#!/usr/bin/python -Es -# # Copyright (C) 2007-2012 Red Hat # see file 'COPYING' for use and warranty information # diff --git a/python/sepolicy/sepolicy/gui.py b/python/sepolicy/sepolicy/gui.py index d4bf3b48e629..00fd7a11dab8 100644 --- a/python/sepolicy/sepolicy/gui.py +++ b/python/sepolicy/sepolicy/gui.py @@ -1,5 +1,3 @@ -#!/usr/bin/python -Es -# # Copyright (C) 2013 Red Hat # see file 'COPYING' for use and warranty information # diff --git a/python/sepolicy/sepolicy/interface.py b/python/sepolicy/sepolicy/interface.py index 27c37bb8e1f8..583091ae18aa 100644 --- a/python/sepolicy/sepolicy/interface.py +++ b/python/sepolicy/sepolicy/interface.py @@ -1,5 +1,3 @@ -#!/usr/bin/python -Es -# # Copyright (C) 2012 Red Hat # see file 'COPYING' for use and warranty information # diff --git a/python/sepolicy/sepolicy/manpage.py b/python/sepolicy/sepolicy/manpage.py index af18b6ffc12f..1d367962365a 100755 --- a/python/sepolicy/sepolicy/manpage.py +++ b/python/sepolicy/sepolicy/manpage.py @@ -1,4 +1,3 @@ -#! /usr/bin/python -Es # Copyright (C) 2012-2013 Red Hat # AUTHOR: Dan Walsh # AUTHOR: Miroslav Grepl diff --git a/python/sepolicy/sepolicy/network.py b/python/sepolicy/sepolicy/network.py index 115f6b8778d5..34267d929b0d 100755 --- a/python/sepolicy/sepolicy/network.py +++ b/python/sepolicy/sepolicy/network.py @@ -1,4 +1,3 @@ -#! /usr/bin/python -Es # Copyright (C) 2012 Red Hat # see file 'COPYING' for use and warranty information # diff --git a/python/sepolicy/sepolicy/transition.py b/python/sepolicy/sepolicy/transition.py index 7dea80597dc1..6414a765d0fa 100755 --- a/python/sepolicy/sepolicy/transition.py +++ b/python/sepolicy/sepolicy/transition.py @@ -1,4 +1,3 @@ -#! /usr/bin/python -Es # Copyright (C) 2011 Red Hat # see file 'COPYING' for use and warranty information # From patchwork Sun Feb 17 21:36:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Iooss X-Patchwork-Id: 10817207 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 162AA14E1 for ; Sun, 17 Feb 2019 21:37:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 05F9F2A0EC for ; Sun, 17 Feb 2019 21:37:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EDFE02A0EE; Sun, 17 Feb 2019 21:37:15 +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 56C8F2A0EC for ; Sun, 17 Feb 2019 21:37:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726304AbfBQVhP (ORCPT ); Sun, 17 Feb 2019 16:37:15 -0500 Received: from mx1.polytechnique.org ([129.104.30.34]:41560 "EHLO mx1.polytechnique.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726124AbfBQVhO (ORCPT ); Sun, 17 Feb 2019 16:37:14 -0500 Received: from localhost.localdomain (89-156-252-9.rev.numericable.fr [89.156.252.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ssl.polytechnique.org (Postfix) with ESMTPSA id 81D4D564714 for ; Sun, 17 Feb 2019 22:37:12 +0100 (CET) From: Nicolas Iooss To: selinux@vger.kernel.org Subject: [PATCH 2/2] python: always use python3 in the shebang of programs using setools Date: Sun, 17 Feb 2019 22:36:50 +0100 Message-Id: <20190217213650.25974-2-nicolas.iooss@m4x.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190217213650.25974-1-nicolas.iooss@m4x.org> References: <20190217213650.25974-1-nicolas.iooss@m4x.org> MIME-Version: 1.0 X-AV-Checked: ClamAV using ClamSMTP at svoboda.polytechnique.org (Sun Feb 17 22:37:12 2019 +0100 (CET)) X-Org-Mail: nicolas.iooss.2010@polytechnique.org Sender: selinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP setools 4.2.0 dropped support for Python 2. On systems where /usr/bin/python is Python 2, several tools are now broken because of this. Update the shebang of these tools to /usr/bin/python3. For future reference, as semanage/seobject.py, sepolicy and sepolgen import setools, every program that uses one of these modules need to be run with Python 3. The following programs do not use any of these modules so their shebangs have not been modified: dbus/selinux_server.py libsemanage/utils/semanage_migrate_store mcstrans/share/util/mlscolor-test mcstrans/share/util/mlstrans-test sandbox/start Signed-off-by: Nicolas Iooss Acked-by: Petr Lautrbach --- gui/polgengui.py | 2 +- gui/system-config-selinux.py | 2 +- python/audit2allow/audit2allow | 2 +- python/audit2allow/sepolgen-ifgen | 2 +- python/chcat/chcat | 2 +- python/sepolicy/sepolicy.py | 2 +- sandbox/sandbox | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gui/polgengui.py b/gui/polgengui.py index 1601dbef0e8d..b1cc99372434 100644 --- a/gui/polgengui.py +++ b/gui/polgengui.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -Es +#!/usr/bin/python3 -Es # # polgengui.py - GUI for SELinux Config tool in system-config-selinux # diff --git a/gui/system-config-selinux.py b/gui/system-config-selinux.py index ce7c74b1333c..c42301b626fc 100644 --- a/gui/system-config-selinux.py +++ b/gui/system-config-selinux.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -Es +#!/usr/bin/python3 -Es # # system-config-selinux.py - GUI for SELinux Config tool in system-config-selinux # diff --git a/python/audit2allow/audit2allow b/python/audit2allow/audit2allow index 18fe0a531d02..09b06f664bc4 100644 --- a/python/audit2allow/audit2allow +++ b/python/audit2allow/audit2allow @@ -1,4 +1,4 @@ -#! /usr/bin/python -Es +#!/usr/bin/python3 -Es # Authors: Karl MacMillan # Authors: Dan Walsh # diff --git a/python/audit2allow/sepolgen-ifgen b/python/audit2allow/sepolgen-ifgen index c482f227193f..be2d093be597 100644 --- a/python/audit2allow/sepolgen-ifgen +++ b/python/audit2allow/sepolgen-ifgen @@ -1,4 +1,4 @@ -#! /usr/bin/python -Es +#!/usr/bin/python3 -Es # # Authors: Karl MacMillan # diff --git a/python/chcat/chcat b/python/chcat/chcat index 5bef0073b7a4..ba398684376d 100755 --- a/python/chcat/chcat +++ b/python/chcat/chcat @@ -1,4 +1,4 @@ -#! /usr/bin/python -Es +#!/usr/bin/python3 -Es # Copyright (C) 2005 Red Hat # see file 'COPYING' for use and warranty information # diff --git a/python/sepolicy/sepolicy.py b/python/sepolicy/sepolicy.py index 8cc7e8cc5c1c..1934cd8620b0 100755 --- a/python/sepolicy/sepolicy.py +++ b/python/sepolicy/sepolicy.py @@ -1,4 +1,4 @@ -#! /usr/bin/python -Es +#!/usr/bin/python3 -Es # Copyright (C) 2012 Red Hat # AUTHOR: Dan Walsh # see file 'COPYING' for use and warranty information diff --git a/sandbox/sandbox b/sandbox/sandbox index c07a1d812a13..1dec07acdcb8 100644 --- a/sandbox/sandbox +++ b/sandbox/sandbox @@ -1,4 +1,4 @@ -#! /usr/bin/python -Es +#!/usr/bin/python3 -Es # Authors: Dan Walsh # Authors: Thomas Liu # Authors: Josh Cogliati