From patchwork Fri May 11 22:30:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 1763 Return-Path: Received: from mail01.ipfire.org (unknown [172.28.1.200]) by web02.i.ipfire.org (Postfix) with ESMTP id 5067960993 for ; Fri, 11 May 2018 14:30:33 +0200 (CEST) Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id C00A81108E17; Fri, 11 May 2018 13:30:32 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1526041833; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references:list-id: list-unsubscribe:list-subscribe:list-post; bh=g1t9aZGJKUR1OEXzhMHuNkxJ3njSGVVP6E9eWgMZlB8=; b=nxDIOeJMz3IpU2WB3E1zo6p/yRW/t7eXCqSAEHtiTtDdelo+awKH3jOE6VCGRvucwxrRhn /YwYnq4VNe/+v7TPx2L1AX7H6bIkHX7LKK4Mjgm7JarOI+s8+PjXUlsa8TXy97YCNANBav 3vWjQVmJU61BcxXbNScSCtFQoQAqv1JtqKyB9RH9tCQEQHgxuMihhzP19dJAxZNEXxwR62 YbhM3KzXJvLYmG6amWOQuVfSbB0Jhm0zGmX5jwXK/LgKmsJAKWRv8E4yzsC3GSPwxx9/Mz vhhfbsdnQuiAl4KXUICzxYlDvIzHVc7e4P2e17oLGWPQPj1jdKsil1crDQUnbQ== Authentication-Results: mail01.i.ipfire.org; auth=pass smtp.auth=ms smtp.mailfrom=michael.tremer@ipfire.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1526041829; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=g1t9aZGJKUR1OEXzhMHuNkxJ3njSGVVP6E9eWgMZlB8=; b=MbiKnJ58JTmaGtMNZaafFkoxZnP2do+vw/ByBL1ZD9zL8m01HLVzFhrwygMNAEM6dOR9nR 3kPSgsVflmMkzMk2tTHHBaBJ4q06FfHU9AfnHYu/N+GxzchexUAluC5A/O1FSLmFMxxn9m 6oC1KbnntEF0ls/PuBiAkLptExb0uCYMlax9s6cxQKHRdPrfwqhoM0qI7PrXxcW6zd3hze mYr66m8alcL3Rc/4RIajyyBd8R/kEuWl5/xA1ZjXl0XqgUvju1r0FWKb0Fp6X4W5jPuqMq ZAuTD17yi2H2d4dmbDLH6yxDHTu9Nf1VsjtYaT0LKy+AhZfjgOrrreFoyB86yQ== Received: from rice-oxley.tremer.co.uk (unknown [88.98.219.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id A1FD210F5ABF; Fri, 11 May 2018 13:30:29 +0100 (BST) From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 1/5] Makefile: Remove any excessive whitespace Date: Fri, 11 May 2018 13:30:08 +0100 Message-Id: <20180511123012.2138575-1-michael.tremer@ipfire.org> X-Mailer: git-send-email 2.17.0 X-Spamd-Result: default: False [-2.10 / 11.00]; ASN(0.00)[asn:56478, ipnet:88.98.216.0/22, country:GB]; DKIM_SIGNED(0.00)[]; TO_DN_SOME(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; FROM_HAS_DN(0.00)[]; BAYES_HAM(-3.00)[100.00%]; ARC_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_ALL(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MID_CONTAINS_FROM(1.00)[]; RCVD_COUNT_ZERO(0.00)[0]; MIME_GOOD(-0.10)[text/plain] X-Spam-Status: No, score=-2.10 X-Rspamd-Server: mail01.i.ipfire.org Cc: Michael Tremer X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- Makefile.am | 3 --- 1 file changed, 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 689b61e39ffd..4370355c34b8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,7 +16,6 @@ EXTRA_DIST = INSTALL_DIRS = noinst_DATA = - AM_V_XSLT = $(AM_V_XSLT_$(V)) AM_V_XSLT_ = $(AM_V_XSLT_$(AM_DEFAULT_VERBOSITY)) AM_V_XSLT_0 = @echo " XSLT " $@; @@ -38,7 +37,6 @@ nitsi_PYTHON = \ src/nitsi/test.py \ src/nitsi/virtual_environ.py - nitsidir = $(pythondir)/nitsi # ------------------------------------------------------------------------------ @@ -90,7 +88,6 @@ man/%.5: man/%.xml man/%.html: man/%.xml man/custom-html.xsl $(XSLTPROC_COMMAND_HTML) - endif # ------------------------------------------------------------------------------ From patchwork Fri May 11 22:30:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 1764 Return-Path: Received: from mail01.ipfire.org (unknown [172.28.1.200]) by web02.i.ipfire.org (Postfix) with ESMTP id 0FE1760993 for ; Fri, 11 May 2018 14:30:40 +0200 (CEST) Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id C59411109F49; Fri, 11 May 2018 13:30:39 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1526041839; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:in-reply-to: references:references:list-id:list-unsubscribe:list-subscribe:list-post; bh=iMr4wCo4pjdIdCTFyoPX9tt80Fmm24ihvzH2Yz42iR4=; b=K7PpsrtUXkkCWA6ZYaldBztL8cgQ8PyvL6NevrntBtvazlitjQBg/0Ss2zPFbSeQ7FVkAg D9wzq8xZvjjdvihhihSA6JQPVnAgFxV8VsSP+su9Rr6g4OYXhhzn1IsTZo8whtgMGyAB+T 3Xr05QgN/5gsAf49NoGwN/eUaom7v7/uw/8tmpUecCsPwdTV417h8i/9GNQTRLDap/qLt7 nwN18oLfuiFjY3niA4orxAV5Sy2JB1jHZ0i4BqOvKY7ORGghj8o83GHk2v+cTqyNDg+vm0 yUFIkp/OkOxsrHUtg4b5Zee/djezIh6srFCF0lndJ2wDUV0xiCudOme6Phdsbw== Authentication-Results: mail01.i.ipfire.org; auth=pass smtp.auth=ms smtp.mailfrom=michael.tremer@ipfire.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1526041830; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:in-reply-to: references:references; bh=iMr4wCo4pjdIdCTFyoPX9tt80Fmm24ihvzH2Yz42iR4=; b=D1rKPuGvgc7CoyLlp+uMLBg9I9HY1IoaAwguEtuY39um2ipUnuYy8OcjnD7XSNtBeNgUFR PzlCKGJZkbZy6r/j2P0TufvuhaamUjPKDvbKNibRUpXgXSWtV9vDyyMuupZRjTvdnmS9jn 9KCyhV0l6IRohyxZQdRMOWVE9WBW3OXNaFo5pVwJ+qIRau9+FUVy0TZS3fm7fOht/D7q7C U3x3YtQPjNKhdtxXSG1Xb8QKIGKf7hupQFmoqPJUHqkAL2/K3P1ZuAkv0ut0M4aL2gjbKs QA06gEubRFB9pP4mq7vfWSwhA70lz8DROJovti6hl98rWwpP1pNx49eROR5cSQ== Received: from rice-oxley.tremer.co.uk (unknown [88.98.219.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id E8BD710F5E9A; Fri, 11 May 2018 13:30:29 +0100 (BST) From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 2/5] m4: Ship AX_PYTHON_MODULE Date: Fri, 11 May 2018 13:30:09 +0100 Message-Id: <20180511123012.2138575-2-michael.tremer@ipfire.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180511123012.2138575-1-michael.tremer@ipfire.org> References: <20180511123012.2138575-1-michael.tremer@ipfire.org> X-Spamd-Result: default: False [-4.10 / 11.00]; ASN(0.00)[asn:56478, ipnet:88.98.216.0/22, country:GB]; DKIM_SIGNED(0.00)[]; TO_DN_SOME(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; FROM_HAS_DN(0.00)[]; BAYES_HAM(-3.00)[100.00%]; ARC_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_ALL(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MID_CONTAINS_FROM(1.00)[]; RCVD_COUNT_ZERO(0.00)[0]; MIME_GOOD(-0.10)[text/plain]; REPLY(-2.00)[] X-Spam-Status: No, score=-4.10 X-Rspamd-Server: mail01.i.ipfire.org Cc: Michael Tremer X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- .gitignore | 3 +-- m4/ax_python_module.m4 | 56 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 m4/ax_python_module.m4 diff --git a/.gitignore b/.gitignore index 9c34c9d6de67..8b229665e586 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -/m4 /Makefile /build-aux /libtool @@ -29,4 +28,4 @@ config.log config.status configure install-sh -stamp-* \ No newline at end of file +stamp-* diff --git a/m4/ax_python_module.m4 b/m4/ax_python_module.m4 new file mode 100644 index 000000000000..f0f873d199d5 --- /dev/null +++ b/m4/ax_python_module.m4 @@ -0,0 +1,56 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_python_module.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PYTHON_MODULE(modname[, fatal, python]) +# +# DESCRIPTION +# +# Checks for Python module. +# +# If fatal is non-empty then absence of a module will trigger an error. +# The third parameter can either be "python" for Python 2 or "python3" for +# Python 3; defaults to Python 3. +# +# LICENSE +# +# Copyright (c) 2008 Andrew Collier +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AU_ALIAS([AC_PYTHON_MODULE], [AX_PYTHON_MODULE]) +AC_DEFUN([AX_PYTHON_MODULE],[ + if test -z $PYTHON; + then + if test -z "$3"; + then + PYTHON="python3" + else + PYTHON="$3" + fi + fi + PYTHON_NAME=`basename $PYTHON` + AC_MSG_CHECKING($PYTHON_NAME module: $1) + $PYTHON -c "import $1" 2>/dev/null + if test $? -eq 0; + then + AC_MSG_RESULT(yes) + eval AS_TR_CPP(HAVE_PYMOD_$1)=yes + else + AC_MSG_RESULT(no) + eval AS_TR_CPP(HAVE_PYMOD_$1)=no + # + if test -n "$2" + then + AC_MSG_ERROR(failed to find required module $1) + exit 1 + fi + fi +]) From patchwork Fri May 11 22:30:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 1765 Return-Path: Received: from mail01.ipfire.org (mail01.ipfire.org [IPv6:2001:470:7183:25::1]) by web02.i.ipfire.org (Postfix) with ESMTP id 4F48D60993 for ; Fri, 11 May 2018 14:30:42 +0200 (CEST) Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id EE9C01108E16; Fri, 11 May 2018 13:30:41 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1526041842; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:in-reply-to: references:references:list-id:list-unsubscribe:list-subscribe:list-post; bh=B0UAf4IRirBwpuou+pb0ngf5PWJXykDrZFiNDlMB2G0=; b=r434OZbb3XcKJDwsJtfn1Dgr7nVOt4ec1otq0OeJMIQWqA8TmFUoSCTBiZUvFOyTei3Wzx Ri+z3SuefIxiEsc10Ai2AJtRbPnuZNY0JkdtPUGdw3PFlVnsF3hN8gLbGAocUvK3lQrruq UR/yp8yS/yL6ijF0UDAFd3ECc9n1n/dhc4wS4Y/5nU3ZA1IqGi6mIyCPgXmtdUDZ/kD6Al t/jTG1rcylwn4ZbLP489CcN6bUrosyI+KKOuyq9sQ+i0T9tIZqqql/U1f46dBdsnz/gF8u P2fW/2B+ozi4hdmUs3/K4OFnHT34vWicUk+YwSJSJKnXrg9RjxaOYiEXrfSIEg== Authentication-Results: mail01.i.ipfire.org; auth=pass smtp.auth=ms smtp.mailfrom=michael.tremer@ipfire.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1526041831; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:in-reply-to: references:references; bh=B0UAf4IRirBwpuou+pb0ngf5PWJXykDrZFiNDlMB2G0=; b=CZkJBjiEheenVN37y7pJMhDOeVQq94k46xfgb7Vkj0WKXhbVRkgcoh1kqpcLN5wbu1QLXE gHALIkbQhvsw4PhFQF75hkkeNDv+yH+W4JN0rwsMRDkZ8Tlj1EAC8ILzjj+cYWQjZ3GK3p mOSg2oNGvZKH/fgWTv2rlWsJp4emXzLQFiUq14wxKkdSKtS3Ktw2317eXNkhj6bUCVGDnb hv7FNd4E0XCepoLsTVNtHqjEOFLU8OkbmHYUgM+Q9mTTMzVXRyQOuPSk82N7CWhtQIRj+g yx1+sVeYEiJSuQNdDkRPiQI9BHUjuo6mMQYSQVzT3tCghhB5rRkVc2QmRauMOQ== Received: from rice-oxley.tremer.co.uk (unknown [88.98.219.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 980441108DE7; Fri, 11 May 2018 13:30:31 +0100 (BST) From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 3/5] configure: Fix spelling of man-pages Date: Fri, 11 May 2018 13:30:10 +0100 Message-Id: <20180511123012.2138575-3-michael.tremer@ipfire.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180511123012.2138575-1-michael.tremer@ipfire.org> References: <20180511123012.2138575-1-michael.tremer@ipfire.org> X-Spamd-Result: default: False [-4.04 / 11.00]; ASN(0.00)[asn:56478, ipnet:88.98.216.0/22, country:GB]; DKIM_SIGNED(0.00)[]; TO_DN_SOME(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; FROM_HAS_DN(0.00)[]; BAYES_HAM(-2.94)[99.76%]; ARC_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_ALL(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MID_CONTAINS_FROM(1.00)[]; RCVD_COUNT_ZERO(0.00)[0]; MIME_GOOD(-0.10)[text/plain]; REPLY(-2.00)[] X-Spam-Status: No, score=-4.04 X-Rspamd-Server: mail01.i.ipfire.org Cc: Michael Tremer X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" It was impossible to disable the man pages generation before this patch. Signed-off-by: Michael Tremer --- Makefile.am | 20 ++++++++++---------- configure.ac | 12 ++++++------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Makefile.am b/Makefile.am index 4370355c34b8..dadb50941269 100644 --- a/Makefile.am +++ b/Makefile.am @@ -42,27 +42,27 @@ nitsidir = $(pythondir)/nitsi # ------------------------------------------------------------------------------ .PHONY: man -man: $(MANPAGES) $(MANPAGES_HTML) +man: $(MAN_PAGES) $(MAN_PAGES_HTML) -if ENABLE_MANPAGES -MANPAGES = \ +if ENABLE_MAN_PAGES +MAN_PAGES = \ man/nitsi.1 -MANPAGES_XML = $(patsubst %.1,%.xml,$(patsubst %.5,%.xml,$(MANPAGES))) -MANPAGES_HTML = $(patsubst %.xml,%.html,$(MANPAGES_XML)) +MAN_PAGES_XML = $(patsubst %.1,%.xml,$(patsubst %.5,%.xml,$(MAN_PAGES))) +MAN_PAGES_HTML = $(patsubst %.xml,%.html,$(MAN_PAGES_XML)) man_MANS = \ - $(MANPAGES) + $(MAN_PAGES) noinst_DATA += \ - $(MANPAGES_HTML) + $(MAN_PAGES_HTML) CLEANFILES += \ $(man_MANS) \ - $(MANPAGES_HTML) + $(MAN_PAGES_HTML) EXTRA_DIST += \ - $(MANPAGES_XML) \ + $(MAN_PAGES_XML) \ man/custom-html.xsl XSLTPROC_FLAGS = \ @@ -102,4 +102,4 @@ SED_PROCESS = \ < $< > $@ nitsi: nitsi.in Makefile - $(SED_PROCESS) \ No newline at end of file + $(SED_PROCESS) diff --git a/configure.ac b/configure.ac index 279309bf538d..23b69d5ed886 100644 --- a/configure.ac +++ b/configure.ac @@ -43,11 +43,11 @@ PKG_PROG_PKG_CONFIG m4_pattern_forbid([^_?PKG_[A-Z_]+$],[*** pkg.m4 missing, please install pkg-config]) # ------------------------------------------------------------------------------ -have_manpages=no -AC_ARG_ENABLE(manpages, AS_HELP_STRING([--disable-man-pages], +have_man_pages=no +AC_ARG_ENABLE(man-pages, AS_HELP_STRING([--disable-man-pages], [do not install man pages])) -AS_IF([test "x$enable_manpages" != xno], [have_manpages=yes]) -AM_CONDITIONAL(ENABLE_MANPAGES, [test "x$have_manpages" = "xyes"]) +AS_IF([test "x$enable_man_pages" != xno], [have_man_pages=yes]) +AM_CONDITIONAL(ENABLE_MAN_PAGES, [test "x$have_man_pages" = "xyes"]) # ------------------------------------------------------------------------------ @@ -62,5 +62,5 @@ AC_MSG_RESULT([ prefix: ${prefix} sysconfdir: ${sysconfdir} - Generate man-pages: ${have_manpages} -]) \ No newline at end of file + Generate man-pages: ${have_man_pages} +]) From patchwork Fri May 11 22:30:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 1766 Return-Path: Received: from mail01.ipfire.org (unknown [172.28.1.200]) by web02.i.ipfire.org (Postfix) with ESMTP id 50B0960993 for ; Fri, 11 May 2018 14:30:44 +0200 (CEST) Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 15A841109F48; Fri, 11 May 2018 13:30:44 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1526041844; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:in-reply-to: references:references:list-id:list-unsubscribe:list-subscribe:list-post; bh=+AGYYv2B6UefEXcSq/dwT6XBiTLdTLp/LTR3pDQSnG8=; b=M6Oz97EYmpBXm6Tcv4j+04W7PLcb3S/NVYiJQ0mBkcvtsH/ISQUowg9b5iT5oDqAfXnMVD ekbfoTAKqi77231NAU6IASwCjPgK3gacXbrCvhKv7C/HMDC61jn3+XOLxZRw5vznwn57U5 tN9Kd8SOg8uP0EVhW21Cc6S1VP6hdl03OON9hTMHjlk99eBnkuLv9/UhnuUAqHTL9DYCej +PkVjlR6c9atPXjLbtZNa4sdQKGl/5uG28yQxg4Jc829dTZlPgcitGi9Mw2jyvqncYRkxC wJ2sLHVE82C2I7m8lNMpnHG5lo++r31QWIeaeJM565FAAD5c4XBzymxANRtmtA== Authentication-Results: mail01.i.ipfire.org; auth=pass smtp.auth=ms smtp.mailfrom=michael.tremer@ipfire.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1526041833; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:in-reply-to: references:references; bh=+AGYYv2B6UefEXcSq/dwT6XBiTLdTLp/LTR3pDQSnG8=; b=s/sZt+clHkk6Q40pStgqU3U+kAbCTyY1j2H5EPLQ8uAZikif99pZLzxy0MVjw/Z70m5wgW N4e0n8IaRFJWdou+lnMVvYge0cdRY8q1MBL0FoZsYTL3HKkZPJlrPn/Qk6nmGvaUY6sqMy 8rNTEYNfpxbRGPiIp2sTGRzL+nqJtKoYNztWPTY5TUggKzTuZrjKX4Sa9xikUoWDbzQ7/5 mApMAY6PhOKmcGeR7ss0UHAUqE8sXim/uJ3gc5c4/tSW/ayvsaJl8Q3VEAKva1Dz30XCn2 5JQ0CpziamJjHk5VmN+tjMOn/rSsmxXp+gE+K33Rtg1CbCJV6T7I2npO8Al2TA== Received: from rice-oxley.tremer.co.uk (unknown [88.98.219.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 548E21108E18; Fri, 11 May 2018 13:30:33 +0100 (BST) From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 4/5] Makefile: Ship nitsi.in in tarball Date: Fri, 11 May 2018 13:30:11 +0100 Message-Id: <20180511123012.2138575-4-michael.tremer@ipfire.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180511123012.2138575-1-michael.tremer@ipfire.org> References: <20180511123012.2138575-1-michael.tremer@ipfire.org> X-Spamd-Result: default: False [-4.09 / 11.00]; ASN(0.00)[asn:56478, ipnet:88.98.216.0/22, country:GB]; DKIM_SIGNED(0.00)[]; TO_DN_SOME(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; FROM_HAS_DN(0.00)[]; BAYES_HAM(-2.99)[99.95%]; ARC_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_ALL(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MID_CONTAINS_FROM(1.00)[]; RCVD_COUNT_ZERO(0.00)[0]; MIME_GOOD(-0.10)[text/plain]; REPLY(-2.00)[] X-Spam-Status: No, score=-4.09 X-Rspamd-Server: mail01.i.ipfire.org Cc: Michael Tremer X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- Makefile.am | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile.am b/Makefile.am index dadb50941269..b36d6ae3ff4e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,6 +26,9 @@ bin_SCRIPTS = \ CLEANFILES += \ nitsi +EXTRA_DIST += \ + nitsi.in + nitsi_PYTHON = \ src/nitsi/__init__.py \ src/nitsi/disk.py \ From patchwork Fri May 11 22:30:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 1767 Return-Path: Received: from mail01.ipfire.org (mail01.ipfire.org [IPv6:2001:470:7183:25::1]) by web02.i.ipfire.org (Postfix) with ESMTP id 5944D60993 for ; Fri, 11 May 2018 14:30:46 +0200 (CEST) Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 24B941109F57; Fri, 11 May 2018 13:30:46 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1526041846; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:in-reply-to: references:references:list-id:list-unsubscribe:list-subscribe:list-post; bh=wH0hKnRw/4y6p3tUag6S3dQQdZpmmGy8JZj5hezBx8k=; b=1anNpUmjjd4rRgE79iKrfXTqjh9RV52dWCg2/epiTAnPp4VszOnvcTXh9KYCG+sX2on3aS vWfXLjMzf+ZBvvJnanv8j11XOcv2986jqBBHcbZ/i+iq5a6K7to9qRbdC+s6UCx6Mycgyc nGyeLW//fS0qbmoFWIFY2Ekt2H8bDghkB4/PS6V2g1FGRgD9C4p9vgbrZMi51d7j0d91zF b7/BLqBwQXxJVSeDEIERtcgfjLK83dMsffpgHrJ/jhykEETVbFDM0xBGmU6jfhOhOkmvMH SNHgmc1rbTn0FBBgCdwsacHSL7FAgt87OFB94TXlPqvuI8sga0Zf41GEZHwJ+w== Authentication-Results: mail01.i.ipfire.org; auth=pass smtp.auth=ms smtp.mailfrom=michael.tremer@ipfire.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1526041833; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:in-reply-to: references:references; bh=wH0hKnRw/4y6p3tUag6S3dQQdZpmmGy8JZj5hezBx8k=; b=YCIQIXokKDUto6Vo1eJsr4KpovD42CqSlwBNPvv42HD+Ez/ry6cVEIuppvsEQNJJnr3vuC 8JHa9FSgKQTKJhhBPYspG/a90bbahlxGohDKSrUgIQtyBAFG6wr2Y7z49g66gIGD8FnalI kaPcK7HYwms7PKBOGj3MDLI3EHR9IE+YR9XZHUTQd1vHNzN6UWOalE+XJTBbdUa597DIwM qMq8xwsxrPZkuSN0PKtPwYUuHYlLcxoj8SBJkf2tHnoLqLFtkxOPLZnZXUdM+7bNTZivPq //2IgwHBezFdq9hyvBDsloCEYSVZz8AvmEe4DVf2RjntvhWg47n+yEqp2m8WFA== Received: from rice-oxley.tremer.co.uk (unknown [88.98.219.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 8F6A01108E1A; Fri, 11 May 2018 13:30:33 +0100 (BST) From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 5/5] Disable man page generation when running "make distcheck" Date: Fri, 11 May 2018 13:30:12 +0100 Message-Id: <20180511123012.2138575-5-michael.tremer@ipfire.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180511123012.2138575-1-michael.tremer@ipfire.org> References: <20180511123012.2138575-1-michael.tremer@ipfire.org> X-Spamd-Result: default: False [-4.10 / 11.00]; ASN(0.00)[asn:56478, ipnet:88.98.216.0/22, country:GB]; DKIM_SIGNED(0.00)[]; TO_DN_SOME(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; FROM_HAS_DN(0.00)[]; BAYES_HAM(-3.00)[100.00%]; ARC_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_ALL(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MID_CONTAINS_FROM(1.00)[]; RCVD_COUNT_ZERO(0.00)[0]; MIME_GOOD(-0.10)[text/plain]; REPLY(-2.00)[] X-Spam-Status: No, score=-4.10 X-Rspamd-Server: mail01.i.ipfire.org Cc: Michael Tremer X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Man pages don't exist yet, so make distcheck fails. This patch has to be reverted as soon as man pages are available. Signed-off-by: Michael Tremer --- Makefile.am | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile.am b/Makefile.am index b36d6ae3ff4e..5fc9df645a04 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,6 +16,9 @@ EXTRA_DIST = INSTALL_DIRS = noinst_DATA = +DISTCHECK_CONFIGURE_FLAGS = \ + --disable-man-pages + AM_V_XSLT = $(AM_V_XSLT_$(V)) AM_V_XSLT_ = $(AM_V_XSLT_$(AM_DEFAULT_VERBOSITY)) AM_V_XSLT_0 = @echo " XSLT " $@;