From patchwork Mon Jul 15 14:45:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Bigonville X-Patchwork-Id: 11044429 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 6A7F3912 for ; Mon, 15 Jul 2019 14:54:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5A7982852C for ; Mon, 15 Jul 2019 14:54:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4EDB52854F; Mon, 15 Jul 2019 14:54:09 +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,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,UNPARSEABLE_RELAY 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 DDE072852C for ; Mon, 15 Jul 2019 14:54:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392258AbfGOOyI (ORCPT ); Mon, 15 Jul 2019 10:54:08 -0400 Received: from ithil.bigon.be ([163.172.57.153]:37762 "EHLO ithil.bigon.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391549AbfGOOyG (ORCPT ); Mon, 15 Jul 2019 10:54:06 -0400 X-Greylist: delayed 540 seconds by postgrey-1.27 at vger.kernel.org; Mon, 15 Jul 2019 10:54:06 EDT Received: from localhost (localhost [IPv6:::1]) by ithil.bigon.be (Postfix) with ESMTP id 48E271FEA6 for ; Mon, 15 Jul 2019 16:45:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=bigon.be; h= content-transfer-encoding:mime-version:x-mailer:message-id:date :date:subject:subject:from:from:received:received:received; s= key2; t=1563201904; x=1565016305; bh=SrZJpFyPHLUeP3/PUKTCtQdnCS5 5fohHoRFw590mTDQ=; b=MlxqdElUltZC6glN3wo9FMWiUlORPbNDiuu8/fGK7Iw Hig2/OTs6ALhntltJohQ5+vYDYHr1Rp6xqUGSZ/ugsMcepZrAZptRBk4uS0Ov0Qv 8bYeb9oLeJLSy3i0GwEXj+Zvk56D5Woqxd301RlMcsZAYUetDCzo+zQ81HaMukOE = Received: from ithil.bigon.be ([IPv6:::1]) by localhost (ithil.bigon.be [IPv6:::1]) (amavisd-new, port 10026) with ESMTP id MJLHU3FX5xpf for ; Mon, 15 Jul 2019 16:45:04 +0200 (CEST) Received: from edoras.bigon.be (mail2.vdab.be [193.53.238.200]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: bigon@bigon.be) by ithil.bigon.be (Postfix) with ESMTPSA for ; Mon, 15 Jul 2019 16:45:04 +0200 (CEST) Received: from bigon (uid 1000) (envelope-from bigon@bigon.be) id 61208 by edoras.bigon.be (DragonFly Mail Agent v0.11); Mon, 15 Jul 2019 16:45:02 +0200 From: Laurent Bigonville To: selinux@vger.kernel.org Subject: [PATCH 1/3] Add documentation key in systemd .service files Date: Mon, 15 Jul 2019 16:45:00 +0200 Message-Id: <20190715144502.30547-1-bigon@debian.org> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 Sender: selinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Laurent Bigonville Signed-off-by: Laurent Bigonville --- mcstrans/src/mcstrans.service | 1 + restorecond/restorecond.service | 1 + 2 files changed, 2 insertions(+) diff --git a/mcstrans/src/mcstrans.service b/mcstrans/src/mcstrans.service index 8976b970..09529432 100644 --- a/mcstrans/src/mcstrans.service +++ b/mcstrans/src/mcstrans.service @@ -1,5 +1,6 @@ [Unit] Description=Translates SELinux MCS/MLS labels to human readable form +Documentation=man:mcstransd(8) ConditionSecurity=selinux [Service] diff --git a/restorecond/restorecond.service b/restorecond/restorecond.service index 6bce99d3..0e4ea72d 100644 --- a/restorecond/restorecond.service +++ b/restorecond/restorecond.service @@ -1,5 +1,6 @@ [Unit] Description=Restorecon maintaining path file context +Documentation=man:restorecond(8) ConditionPathExists=/etc/selinux/restorecond.conf ConditionSecurity=selinux From patchwork Mon Jul 15 14:45:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Bigonville X-Patchwork-Id: 11044433 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 254FE6C5 for ; Mon, 15 Jul 2019 14:54:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 169662018E for ; Mon, 15 Jul 2019 14:54:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0B0792853C; Mon, 15 Jul 2019 14:54:10 +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,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,UNPARSEABLE_RELAY 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 9060F2852C for ; Mon, 15 Jul 2019 14:54:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403938AbfGOOyI (ORCPT ); Mon, 15 Jul 2019 10:54:08 -0400 Received: from ithil.bigon.be ([163.172.57.153]:37766 "EHLO ithil.bigon.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392257AbfGOOyI (ORCPT ); Mon, 15 Jul 2019 10:54:08 -0400 Received: from localhost (localhost [IPv6:::1]) by ithil.bigon.be (Postfix) with ESMTP id 4B5D51FED2 for ; Mon, 15 Jul 2019 16:45:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=bigon.be; h= content-transfer-encoding:content-type:content-type:mime-version :references:in-reply-to:x-mailer:message-id:date:date:subject :subject:from:from:received:received:received; s=key2; t= 1563201904; x=1565016305; bh=H8IX/WYTBKONYXNdPiADyQrZDwm5JC8MszW 21VA2XrI=; b=UNamyArAm6QBtA3WGJnzzTQg1md2QJik/zaH73/zUw6UeglKCnn KT8XLujGGGAGGF2fXvnYsv3+bAvyOg4DGrAAnWg6y+uHSbWthUgI5aCLAo+SxpFM KL8hybCfqBcGNftMw3dFsPgCOOL9L+Cuqlbk08JDaH4dOX4Fyno82L/0= Received: from ithil.bigon.be ([IPv6:::1]) by localhost (ithil.bigon.be [IPv6:::1]) (amavisd-new, port 10026) with ESMTP id OrnkPCeQnXAA for ; Mon, 15 Jul 2019 16:45:04 +0200 (CEST) Received: from edoras.bigon.be (mail2.vdab.be [193.53.238.200]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: bigon@bigon.be) by ithil.bigon.be (Postfix) with ESMTPSA for ; Mon, 15 Jul 2019 16:45:04 +0200 (CEST) Received: from bigon (uid 1000) (envelope-from bigon@bigon.be) id 640db by edoras.bigon.be (DragonFly Mail Agent v0.11); Mon, 15 Jul 2019 16:45:02 +0200 From: Laurent Bigonville To: selinux@vger.kernel.org Subject: [PATCH 2/3] mcstrans: Move setrans.conf manpage to section 5 Date: Mon, 15 Jul 2019 16:45:01 +0200 Message-Id: <20190715144502.30547-2-bigon@debian.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190715144502.30547-1-bigon@debian.org> References: <20190715144502.30547-1-bigon@debian.org> MIME-Version: 1.0 Sender: selinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Laurent Bigonville Move setrans.conf manpage to section 5 as it describes the documentation for "File formats and conventions" Signed-off-by: Laurent Bigonville --- mcstrans/man/Makefile | 9 +++++++++ .../man/{man8/setrans.conf.8 => man5/setrans.conf.5} | 2 +- .../man/ru/{man8/setrans.conf.8 => man5/setrans.conf.5} | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) rename mcstrans/man/{man8/setrans.conf.8 => man5/setrans.conf.5} (98%) rename mcstrans/man/ru/{man8/setrans.conf.8 => man5/setrans.conf.5} (98%) diff --git a/mcstrans/man/Makefile b/mcstrans/man/Makefile index 0f8d34fd..71713818 100644 --- a/mcstrans/man/Makefile +++ b/mcstrans/man/Makefile @@ -2,15 +2,23 @@ LINGUAS ?= ru PREFIX ?= /usr MANDIR ?= $(PREFIX)/share/man +MAN5SUBDIR ?= man5 +MAN5DIR ?= $(MANDIR)/$(MAN5SUBDIR) MAN8SUBDIR ?= man8 MAN8DIR ?= $(MANDIR)/$(MAN8SUBDIR) all: install: all + mkdir -p $(DESTDIR)$(MAN5DIR) mkdir -p $(DESTDIR)$(MAN8DIR) + install -m 644 man5/*.5 $(DESTDIR)$(MAN5DIR) install -m 644 man8/*.8 $(DESTDIR)$(MAN8DIR) for lang in $(LINGUAS) ; do \ + if [ -e $${lang}/man5 ] ; then \ + mkdir -p $(DESTDIR)$(MANDIR)/$${lang}/$(MAN5SUBDIR) ; \ + install -m 644 $${lang}/man5/*.5 $(DESTDIR)$(MANDIR)/$${lang}/$(MAN5SUBDIR) ; \ + fi ; \ if [ -e $${lang}/man8 ] ; then \ mkdir -p $(DESTDIR)$(MANDIR)/$${lang}/$(MAN8SUBDIR) ; \ install -m 644 $${lang}/man8/*.8 $(DESTDIR)$(MANDIR)/$${lang}/$(MAN8SUBDIR) ; \ @@ -19,4 +27,5 @@ install: all clean: -rm -f *~ \#* + -rm -f man5/*~ man5/\#* -rm -f man8/*~ man8/\#* diff --git a/mcstrans/man/man8/setrans.conf.8 b/mcstrans/man/man5/setrans.conf.5 similarity index 98% rename from mcstrans/man/man8/setrans.conf.8 rename to mcstrans/man/man5/setrans.conf.5 index b7609921..4949a502 100644 --- a/mcstrans/man/man8/setrans.conf.8 +++ b/mcstrans/man/man5/setrans.conf.5 @@ -1,4 +1,4 @@ -.TH "setrans.conf" "8" "13 July 2010" "txtoth@gmail.com" "setrans.conf documentation" +.TH "setrans.conf" "5" "13 July 2010" "txtoth@gmail.com" "setrans.conf documentation" .SH "NAME" setrans.conf \- translation configuration file for MCS/MLS SELinux systems diff --git a/mcstrans/man/ru/man8/setrans.conf.8 b/mcstrans/man/ru/man5/setrans.conf.5 similarity index 98% rename from mcstrans/man/ru/man8/setrans.conf.8 rename to mcstrans/man/ru/man5/setrans.conf.5 index 9141defe..724b206b 100644 --- a/mcstrans/man/ru/man8/setrans.conf.8 +++ b/mcstrans/man/ru/man5/setrans.conf.5 @@ -1,4 +1,4 @@ -.TH "setrans.conf" "8" "13 июля 2010" "txtoth@gmail.com" "Документация по setrans.conf" +.TH "setrans.conf" "5" "13 июля 2010" "txtoth@gmail.com" "Документация по setrans.conf" .SH "ИМЯ" setrans.conf \- файл конфигурации преобразования для систем MCS/MLS SELinux From patchwork Mon Jul 15 14:45:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Bigonville X-Patchwork-Id: 11044431 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 03A1B1510 for ; Mon, 15 Jul 2019 14:54:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E644F28541 for ; Mon, 15 Jul 2019 14:54:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CFD5F2853C; Mon, 15 Jul 2019 14:54:09 +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,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,UNPARSEABLE_RELAY 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 BD99D2852A for ; Mon, 15 Jul 2019 14:54:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392260AbfGOOyH (ORCPT ); Mon, 15 Jul 2019 10:54:07 -0400 Received: from ithil.bigon.be ([163.172.57.153]:37764 "EHLO ithil.bigon.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392258AbfGOOyH (ORCPT ); Mon, 15 Jul 2019 10:54:07 -0400 Received: from localhost (localhost [IPv6:::1]) by ithil.bigon.be (Postfix) with ESMTP id 4D3CE1FED5 for ; Mon, 15 Jul 2019 16:45:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=bigon.be; h= content-transfer-encoding:content-type:content-type:mime-version :references:in-reply-to:x-mailer:message-id:date:date:subject :subject:from:from:received:received:received; s=key2; t= 1563201904; x=1565016305; bh=Vd4GG41nuM6CvzdnQKQyHYGgtF8mNrRC5Cw YjJVmFBQ=; b=ViNLypGe17qEtlS1RIfuLYPxGFSeAkTZnE97mSEiwZ1NsODbHcf 76KCw/AM6MKpA13rrUUsdCuOkmtLaYTdAnMrC3jGi6KTZisZPXKT+rYu49CB/SQ0 V9m3Qr0Va2LxS/slIJIRRqOs0s15A69UwLGjmmjtJQTEWacM4P/arpRY= Received: from ithil.bigon.be ([IPv6:::1]) by localhost (ithil.bigon.be [IPv6:::1]) (amavisd-new, port 10026) with ESMTP id Wr6lLYC9A-fa for ; Mon, 15 Jul 2019 16:45:04 +0200 (CEST) Received: from edoras.bigon.be (mail2.vdab.be [193.53.238.200]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: bigon@bigon.be) by ithil.bigon.be (Postfix) with ESMTPSA for ; Mon, 15 Jul 2019 16:45:04 +0200 (CEST) Received: from bigon (uid 1000) (envelope-from bigon@bigon.be) id 640dd by edoras.bigon.be (DragonFly Mail Agent v0.11); Mon, 15 Jul 2019 16:45:02 +0200 From: Laurent Bigonville To: selinux@vger.kernel.org Subject: [PATCH 3/3] mcstrans: Add reference to setools.conf man page in the daemon one Date: Mon, 15 Jul 2019 16:45:02 +0200 Message-Id: <20190715144502.30547-3-bigon@debian.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190715144502.30547-1-bigon@debian.org> References: <20190715144502.30547-1-bigon@debian.org> MIME-Version: 1.0 Sender: selinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Laurent Bigonville Signed-off-by: Laurent Bigonville --- mcstrans/man/man8/mcstransd.8 | 2 +- mcstrans/man/ru/man8/mcstransd.8 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mcstrans/man/man8/mcstransd.8 b/mcstrans/man/man8/mcstransd.8 index 64774a52..9a5922ba 100644 --- a/mcstrans/man/man8/mcstransd.8 +++ b/mcstrans/man/man8/mcstransd.8 @@ -29,4 +29,4 @@ The program was enhanced/rewritten by Joe Nall . /etc/selinux/{SELINUXTYPE}/setrans.conf .SH "SEE ALSO" -.BR mcs (8), +.BR setrans.conf (5), mcs (8) diff --git a/mcstrans/man/ru/man8/mcstransd.8 b/mcstrans/man/ru/man8/mcstransd.8 index 90247c32..4cd68c17 100644 --- a/mcstrans/man/ru/man8/mcstransd.8 +++ b/mcstrans/man/ru/man8/mcstransd.8 @@ -23,7 +23,7 @@ mcstransd \- внутренняя служба MCS (мультикатегори /etc/selinux/{SELINUXTYPE}/setrans.conf .SH "СМОТРИТЕ ТАКЖЕ" -.BR mcs (8) +.BR setrans.conf (5), mcs (8) .SH "АВТОРЫ" Эта man-страница написана Dan Walsh .