From patchwork Mon Oct 22 06:35:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Schantl X-Patchwork-Id: 1961 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 8ED4A61E88 for ; Sun, 21 Oct 2018 21:35:40 +0200 (CEST) Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id ED1C2216DA15; Sun, 21 Oct 2018 20:35:39 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1540150540; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references:list-id: list-unsubscribe:list-subscribe:list-post; bh=AIygKFHgX8LdUui49cRU+KZDYxH0A2QSzpCEbFK5TXQ=; b=ZIWnVKmXr5oBM185nDgChC6UpyBgv1odP25iSkU3meVEeT89PQW+cSNrm5XtoGIqMmq8Ij 1OG3ft8c6J6u/gibIWI68NdfmDL9Gr9Pqh6WaK4GXlf/7AGreezADMpAEZOwY4MNA7VJ2I v0mlcrKZrapDectttdxUsORzVG7og+XicK+QACHZMx7aTtaeucJDZSPRpK6luC8RavFFpe FHMMXDVt0LmGtsCUL1gkctpqNz43UqSRWNY3/xTPoApv9jjRJo1cNQAjmn70Syt2ii6eVD tT8UzuA3kmSADHtswrkEyfFa04dmkTh2uvTpClC6bwVqngrwReD6OC+w4rBhtQ== Received: from tuxedo.stevee (078132056097.public.t-mobile.at [78.132.56.97]) (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 912F321A13CF; Sun, 21 Oct 2018 20:35:37 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1540150537; 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=AIygKFHgX8LdUui49cRU+KZDYxH0A2QSzpCEbFK5TXQ=; b=PxjMvoF3/grCVA6SNFvrTnhpDwvxyF3hH7SRNeYb64Bn55lkCBBnvmzhBkm9yB9FmtHJuM /YeQ33ZNnBZoFgaNhFGrrS7x8KGaR0vuc4e5iZ8ChzcG4xxHLYGDWcHSGlHisHi1q1eFU9 FtvZpGjW3/SDW0tPEzFs6J+iEmI7pwKOVBMj6z3xRf8UCdcJIjU5XzH4I/MQNnRJSDH727 VTR05CcnXepuy9Doz0FwlqT/LUnJVEm56ewbKlhsymVUqRZsyrqrj3qlmBNc0qy0o1wuSV b6TYkwwhcLGfjivZVUZPZ2RB0TQLhE9N6LXNADo7vSLEV/CgnmZHfqolicKEjw== From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH 1/5] python-setuputils: Update to 40.4.3 Date: Sun, 21 Oct 2018 21:35:30 +0200 Message-Id: <20181021193534.31718-1-stefan.schantl@ipfire.org> X-Mailer: git-send-email 2.17.1 Authentication-Results: mail01.ipfire.org; auth=pass smtp.auth=stevee smtp.mailfrom=stefan.schantl@ipfire.org X-Spamd-Result: default: False [-2.10 / 11.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DKIM_SIGNED(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; MID_CONTAINS_FROM(1.00)[]; RCVD_COUNT_ZERO(0.00)[0]; FROM_EQ_ENVFROM(0.00)[]; ASN(0.00)[asn:8412, ipnet:78.132.0.0/17, country:AT]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-3.00)[100.00%] X-Spam-Status: No, score=-2.10 X-Rspamd-Server: mail01.i.ipfire.org 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: Stefan Schantl --- python-setuptools/python-setuptools.nm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/python-setuptools/python-setuptools.nm b/python-setuptools/python-setuptools.nm index 8f1823aea..ffef974cf 100644 --- a/python-setuptools/python-setuptools.nm +++ b/python-setuptools/python-setuptools.nm @@ -4,7 +4,7 @@ ############################################################################### name = python-setuptools -version = 28.2.0 +version = 40.4.3 release = 1 arch = noarch thisapp = setuptools-%{version} @@ -21,6 +21,8 @@ description especially ones that have dependencies on other packages. end +source_dl = https://github.com/pypa/setuptools/archive/v%{version}.tar.gz#/ + build requires pakfire-builder >= 0.9.23-2 @@ -36,9 +38,11 @@ build build pushd %{DIR_APP3} + %{python3} bootstrap.py CFLAGS="%{CFLAGS}" %{python3} setup.py build popd + %{python} bootstrap.py CFLAGS="%{CFLAGS}" %{python} setup.py build end From patchwork Mon Oct 22 06:35:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Schantl X-Patchwork-Id: 1962 Return-Path: Received: from mail01.ipfire.org (mail01.i.ipfire.org [172.28.1.200]) by web02.i.ipfire.org (Postfix) with ESMTP id 8CCA361E88 for ; Sun, 21 Oct 2018 21:35:47 +0200 (CEST) Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 4E085216DA21; Sun, 21 Oct 2018 20:35:47 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1540150547; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=0GJhcRL3AJGai2+yO7OmSJNom3mJxm53/TBVtIVcLps=; b=eZaJcdTB415pwE0RtLCCd01E8R7K0Ux7Fhv5gwODCJQk2Tdfn2ri900YyH/mOLWNV4vh/F 94aYmVSBShA5yFi8/zDRXDKCWlhXDGIGQzqHK/QK0ZVAp5UehHz2ir7ie97ZV6CI7FnZfL +NPHnSM7GTlRoE5V0cFfkfICEdN9GP78CeTDj4Uf8W3hi3an+OxYA4HGnTcp7hncLkyiFG rfaV8OsC6wZXgmpSNnaSofTFPLQPoNEmc7/SWDq84pDj25vw+0/VNPDiv4nV+ijYggef/Z V6549QdfcKGN1WfIJg9GP8+4O7Y2W/RzHdh2QTY74uSJta2gsoR7ote4noIfnw== Received: from tuxedo.stevee (078132056097.public.t-mobile.at [78.132.56.97]) (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 AB896216DA12; Sun, 21 Oct 2018 20:35:38 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1540150538; 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=0GJhcRL3AJGai2+yO7OmSJNom3mJxm53/TBVtIVcLps=; b=qp0IY0ualH2/eRNy+02+q93yVBpQ63CYxxFGyHT4QE0Lnx4R5AchkudszCGIV+S2Up5nUC C3inVLI46lZgqxxbVmTmDsgyPF8I6TTgF+BMUYl5N+RbXe0N8KBjd1sLQ+8oHuOh6xsh23 1Ef2H6Q0Qus79HaUJcEqVAw1Y8CuLMNV8p2v2+Y6ARor4f3W0O/s22BF7exPQy39xdDMBX fnXOKi02pwiWzpONEgZW6CDnEE/SChTdCNkT2DV+Gy0aJstI1QDGWyzmUGJyhL4sJV5jQz YN2xaEtSlpZHnuO/3uBN9bQBHXVESXINFSlHxZMyxK0tm5KFoa33SltUOy49Cg== From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH 2/5] python-lxml: Update to 4.2.5 Date: Sun, 21 Oct 2018 21:35:31 +0200 Message-Id: <20181021193534.31718-2-stefan.schantl@ipfire.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181021193534.31718-1-stefan.schantl@ipfire.org> References: <20181021193534.31718-1-stefan.schantl@ipfire.org> Authentication-Results: mail01.ipfire.org; auth=pass smtp.auth=stevee smtp.mailfrom=stefan.schantl@ipfire.org X-Spamd-Result: default: False [-6.10 / 11.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; REPLY(-4.00)[]; DKIM_SIGNED(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; MID_CONTAINS_FROM(1.00)[]; RCVD_COUNT_ZERO(0.00)[0]; FROM_EQ_ENVFROM(0.00)[]; ASN(0.00)[asn:8412, ipnet:78.132.0.0/17, country:AT]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-3.00)[100.00%] X-Spam-Status: No, score=-6.10 X-Rspamd-Server: mail01.i.ipfire.org 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: Stefan Schantl --- python-lxml/python-lxml.nm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/python-lxml/python-lxml.nm b/python-lxml/python-lxml.nm index 82c07c57a..94938c027 100644 --- a/python-lxml/python-lxml.nm +++ b/python-lxml/python-lxml.nm @@ -4,7 +4,7 @@ ############################################################################### name = python-lxml -version = 3.4.4 +version = 4.2.5 release = 1 thisapp = lxml-%{version} @@ -43,11 +43,6 @@ build # Run tests. %{python3} test.py -p -v - - # Launch more tests. - export PYTHONPATH=src - %{python3} selftest.py - %{python3} selftest2.py end install From patchwork Mon Oct 22 06:35:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Schantl X-Patchwork-Id: 1963 Return-Path: Received: from mail01.ipfire.org (mail01.i.ipfire.org [172.28.1.200]) by web02.i.ipfire.org (Postfix) with ESMTP id CD51B61E88 for ; Sun, 21 Oct 2018 21:35:49 +0200 (CEST) Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 891BC216DA18; Sun, 21 Oct 2018 20:35:49 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1540150549; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=GkAREvqs7CCfcsiLOCTXe82Y5UaFsDMwRgE4x1BBORs=; b=fdZe3/Fb2EuKlIgpeIm365aOrgXXprOJVd9B+RKEJUq+2qv6sR60CUdqkGWr51wS27hwO+ Q7pUY1Dl/btfDrTQNzMYPe9T2RVlWU+KyEn/I1ZL/uU6IV5ffam9Y4+k8pB4Ub5k8cf5/a dxZteYtW3eH/GhYM5nbhAzwaC6blEG96WuFScvadiZpOvOfmnCxEOm2/VJJlNcw+JlQEjv 5uK+8k5lU2VLuy289KWEKtP8NpPuku8kwaJo0b9GaCSkptqANT001ixACjmPC+xkhbQbUj Po7zVFyRFzrY6Cn85vEc2h/2w0b+ECa9DC3HqCMP8avonbuSNpqk9qJsN4icLg== Received: from tuxedo.stevee (078132056097.public.t-mobile.at [78.132.56.97]) (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 64B8E21A13CF; Sun, 21 Oct 2018 20:35:39 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1540150539; 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=GkAREvqs7CCfcsiLOCTXe82Y5UaFsDMwRgE4x1BBORs=; b=qP1dVXZAnruH+xt3KOL+mj5GzLvzWJx4va5617J4o7QUr8szaozILZyPZV4XgqI+zHFkf2 02TtGSB2ve/o1x3ySp3k7Frqa7KQmsJRAldylP+fZXqxstFErvThTxn+5fyhaDCTq0XLbe fwesFEeJeYTCtqkFjUfxEH9p9xATEvk5jvN4scC8T3cJLGYjBVIvdbEWNDPrbpBdWrb65x SOPGu1HRHYC5z+m3bzxZn5igJ0uLuKzi26JYewv2qZqAhxMsRahcjb1HGaQpsul5somPv9 KCx9df89Wp4ieu7Rn67iVysOPKILrCg6mE3S8zlVxgJqLMiL3QaLURKL/n+f5Q== From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH 3/5] ninja: New package Date: Sun, 21 Oct 2018 21:35:32 +0200 Message-Id: <20181021193534.31718-3-stefan.schantl@ipfire.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181021193534.31718-1-stefan.schantl@ipfire.org> References: <20181021193534.31718-1-stefan.schantl@ipfire.org> Authentication-Results: mail01.ipfire.org; auth=pass smtp.auth=stevee smtp.mailfrom=stefan.schantl@ipfire.org X-Spamd-Result: default: False [-6.10 / 11.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; REPLY(-4.00)[]; DKIM_SIGNED(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; MID_CONTAINS_FROM(1.00)[]; RCVD_COUNT_ZERO(0.00)[0]; FROM_EQ_ENVFROM(0.00)[]; ASN(0.00)[asn:8412, ipnet:78.132.0.0/17, country:AT]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-3.00)[100.00%] X-Spam-Status: No, score=-6.10 X-Rspamd-Server: mail01.i.ipfire.org 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" --- ninja/ninja.nm | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 ninja/ninja.nm diff --git a/ninja/ninja.nm b/ninja/ninja.nm new file mode 100644 index 000000000..e0793d8a0 --- /dev/null +++ b/ninja/ninja.nm @@ -0,0 +1,69 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team # +############################################################################### + +name = ninja +version = 1.8.2 +release = 1 + +groups = Applications/System +url = http://martine.github.com/ninja/ +license = ASL 2.0 +summary = A small build system with a focus on speed + +description + Ninja is a small build system with a focus on speed. It differs from other + build systems in two major respects: it is designed to have its input files + generated by a higher-level build system, and it is designed to run builds as + fast as possible. +end + +source_dl = https://github.com/martine/ninja/archive/v%{version}/ + +build + requires + asciidoc + python3-devel + end + + build + # Configure and bootstrap the build environment. + %{python3} configure.py --bootstrap --verbose + + # Build ninja. + ./ninja -v all + + # Build manual. + ./ninja -v manual + end + + check + # Run testsuite - filter SubprocessTest + ./ninja_test --gtest_filter=-SubprocessTest.SetWithLots + end + + install + # Install ninja. + install -Dpm0755 ninja -t %{BUILDROOT}%{bindir}/ + + # Create compatibliy symlink. + ln -s ninja %{BUILDROOT}%{bindir}/ninja-build + + # Install bash-comletion. + install -Dpm0644 misc/bash-completion %{BUILDROOT}%{datadir}/bash-completion/completions/ninja + + # Install ninja syntax highlighting for vim. + install -Dpm0644 misc/ninja.vim %{BUILDROOT}%{datadir}/vim/vimfiles/syntax/ninja.vim + end +end + +packages + package %{name} + provides += ninja-build + end + + package %{name}-debuginfo + template DEBUGINFO + end +end From patchwork Mon Oct 22 06:35:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Schantl X-Patchwork-Id: 1964 Return-Path: Received: from mail01.ipfire.org (mail01.i.ipfire.org [172.28.1.200]) by web02.i.ipfire.org (Postfix) with ESMTP id 3EE6D61E88 for ; Sun, 21 Oct 2018 21:35:52 +0200 (CEST) Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id F1FAC216DA30; Sun, 21 Oct 2018 20:35:51 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1540150552; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=62m6WnGp8GWTxX44AoOz3FyflWdQjRGhBGHq/lW5ZpM=; b=h057CqxBqxD6cqfuM7H9eJcTyZsocdEhVFxOBaOmbW9VBRFvJWhCrWZwtZiD283fSiq940 GZRX1IlAlAnqbP+qxe02gZylr4fyJSqR7WVn6/9G43w0oa235fOi9W9eVK2Vo7IW1dii5R 5j5tPY+GB6M3vkW3eaJjf0zSguxDQJYsw9TPsGWjCm5mCcV+0e5d36Zmwnul6PXaA9WJIN E76SGlVKJh/PrQbH529IYH5un7IirZowy7BuEVbCBsMfpWoIhriFyZf6kg6+z8tdoXrCwW nSK09FsqzLdqOiFg3ZITw69cJx0UnR8Ll25z7aahqkPO6+x2d4aDNEFM7O790A== Received: from tuxedo.stevee (078132056097.public.t-mobile.at [78.132.56.97]) (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 26842216DA12; Sun, 21 Oct 2018 20:35:40 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1540150540; 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=62m6WnGp8GWTxX44AoOz3FyflWdQjRGhBGHq/lW5ZpM=; b=KDLdYaM2z32xnCQ6g95U8ojZsOZ8xKHCIA40uVfJBq/5NmPOwSxOOwmfqtG6+10RYr8wyE /hseae255t09C24CThDruX63RKgluh4eNnynZSLZYeB/EHOfYKmJlwy1nZj2noHBMsC70p XPtrU6rJvAIOi2XCukV6PqdO9fi9PKbseX21Zmaw96iferPY+TimyRaL1puRQSMGazrRDO 3SKmKgTzndV1cZNE9E2sAFkiwj0HTDAtl4kE7cNVHQ2/4Fm8H8TwCC4tKuB4Ru9VX+yAGU sDjiAUzZb7fFWq98DmH9YPbuMI3rPHKs1pjkgM6dAk/Rw1otURAk7D/sy6gn0w== From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH 4/5] meson: New package Date: Sun, 21 Oct 2018 21:35:33 +0200 Message-Id: <20181021193534.31718-4-stefan.schantl@ipfire.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181021193534.31718-1-stefan.schantl@ipfire.org> References: <20181021193534.31718-1-stefan.schantl@ipfire.org> Authentication-Results: mail01.ipfire.org; auth=pass smtp.auth=stevee smtp.mailfrom=stefan.schantl@ipfire.org X-Spamd-Result: default: False [-6.10 / 11.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; REPLY(-4.00)[]; DKIM_SIGNED(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; MID_CONTAINS_FROM(1.00)[]; RCVD_COUNT_ZERO(0.00)[0]; FROM_EQ_ENVFROM(0.00)[]; ASN(0.00)[asn:8412, ipnet:78.132.0.0/17, country:AT]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-3.00)[100.00%] X-Spam-Status: No, score=-6.10 X-Rspamd-Server: mail01.i.ipfire.org 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: Stefan Schantl --- meson/meson.nm | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 meson/meson.nm diff --git a/meson/meson.nm b/meson/meson.nm new file mode 100644 index 000000000..208966a79 --- /dev/null +++ b/meson/meson.nm @@ -0,0 +1,52 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team # +############################################################################### + +name = meson +version = 0.48.1 +release = 1 +arch = noarch + +groups = Applications/System +url = http://mesonbuild.com/ +license = ASL 2.0 +summary = High productivity build system + +description + Meson is a build system designed to optimize programmer + productivity. It aims to do this by providing simple, out-of-the-box + support for modern software development tools and practices, such as + unit tests, coverage reports, Valgrind, CCache and the like. +end + +source_dl = https://github.com/mesonbuild/meson/archive/%{version}/ + +build + requires + bison + boost-devel + flex + gcc-c++ + gettext + ninja-build >= 1.5 + python3-devel >= 3.5 + python3-setuptools + end + + build + %{python3} setup.py build + end + + install + %{python3} setup.py install -O1 --skip-build --root %{BUILDROOT} + end +end + +packages + package %{name} + requires + python3-setuptools + end + end +end From patchwork Mon Oct 22 06:35:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Schantl X-Patchwork-Id: 1965 Return-Path: Received: from mail01.ipfire.org (mail01.i.ipfire.org [172.28.1.200]) by web02.i.ipfire.org (Postfix) with ESMTP id 86DB761E88 for ; Sun, 21 Oct 2018 21:35:54 +0200 (CEST) Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 49316216DA31; Sun, 21 Oct 2018 20:35:54 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1540150554; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id: list-unsubscribe:list-subscribe:list-post; bh=eYlTJUhbQ5sEWwbB/rDyNn6yeK/uChDmF0mMSexuimg=; b=Itns6Obsjrh9lwjLUghrx+myJjo0VM4XAtQv0yrjqSFbdmjBFf4Ey20tzDSgsimeWKB2W2 K01+JRPEODCfB39RRcvEynmR3wMR+YLA7bEwRJBmmdIJ+8lnd7YSlU4yojnXQM5eH53AbH 96qMfNl086d14wYPEdL+Q4BL74loN2lrYaz+V5oEIKUs72tdSSXcIBUIQVQB5qdp1iab1R fGYnZwnqP2ZQypUl0x0jPp9aFTv3ryelY3ZemuMHcNYw+uuQ3Rr04wxiD5f7+Enq9k/cM4 pJM7HMUo8PuRcA0HCwHy9DZU0tkM+3DrPYLEberMQHIh1i8RUI8DTgdUpUvXIw== Received: from tuxedo.stevee (078132056097.public.t-mobile.at [78.132.56.97]) (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 A8BF9216DA19; Sun, 21 Oct 2018 20:35:40 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1540150540; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eYlTJUhbQ5sEWwbB/rDyNn6yeK/uChDmF0mMSexuimg=; b=oR/KFvshT+e6aj1kCq7X1yA4nB23nFJaaNtyD572OOirANvQg7qgtyW5eU06hPIpUBLA8X RurrU/sB6bhv6Ky15N6L+5oRnJ1sHUDoAvdXg9lJzSVo7UX85G8HHIMpM38/0s/7k/51yO 8qbEzMJAOULUxYVEpCgxy85XC8eKyAPd+BBTlGQMXAoDgab92JDoBcGg1JGm9sf9qePMgG TbTSVMG4P6YbUJE1sat2hqIVmLsc9ALdzfdwZH0cRMMLwv8ZBL5Z9zbQnsevru/1AetTf+ 2yN1dQ8NO7QzwsxztGNoOiyS8Rj4p8K4WzQVCEvQAwUsq64E1QAYIg31Mr4M5A== From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH 5/5] systemd: Update to version 239 Date: Sun, 21 Oct 2018 21:35:34 +0200 Message-Id: <20181021193534.31718-5-stefan.schantl@ipfire.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181021193534.31718-1-stefan.schantl@ipfire.org> References: <20181021193534.31718-1-stefan.schantl@ipfire.org> MIME-Version: 1.0 Authentication-Results: mail01.ipfire.org; auth=pass smtp.auth=stevee smtp.mailfrom=stefan.schantl@ipfire.org X-Spamd-Result: default: False [-6.10 / 11.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; REPLY(-4.00)[]; DKIM_SIGNED(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; MID_CONTAINS_FROM(1.00)[]; RCVD_COUNT_ZERO(0.00)[0]; FROM_EQ_ENVFROM(0.00)[]; ASN(0.00)[asn:8412, ipnet:78.132.0.0/17, country:AT]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-3.00)[100.00%] X-Spam-Status: No, score=-6.10 X-Rspamd-Server: mail01.i.ipfire.org 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: Stefan Schantl --- ...-whether-struct-statx-is-defined-in-.patch | 105 ++++++++++++++++++ ...-meson-rename-Ddebug-to-Ddebug-extra.patch | 43 +++++++ ...ine_begins-to-accept-word-matching-f.patch | 48 ++++++++ .../systemd-231-ipfire-disable-tests.patch | 58 ---------- systemd/systemd.nm | 65 ++++++----- 5 files changed, 234 insertions(+), 85 deletions(-) create mode 100644 systemd/patches/0001-build-sys-Detect-whether-struct-statx-is-defined-in-.patch create mode 100644 systemd/patches/0002-meson-rename-Ddebug-to-Ddebug-extra.patch create mode 100644 systemd/patches/0003-bus-socket-Fix-line_begins-to-accept-word-matching-f.patch delete mode 100644 systemd/patches/systemd-231-ipfire-disable-tests.patch diff --git a/systemd/patches/0001-build-sys-Detect-whether-struct-statx-is-defined-in-.patch b/systemd/patches/0001-build-sys-Detect-whether-struct-statx-is-defined-in-.patch new file mode 100644 index 000000000..5a2cf2372 --- /dev/null +++ b/systemd/patches/0001-build-sys-Detect-whether-struct-statx-is-defined-in-.patch @@ -0,0 +1,105 @@ +From 75720bff62a84896e9a0654afc7cf9408cf89a38 Mon Sep 17 00:00:00 2001 +From: Filipe Brandenburger +Date: Sun, 15 Jul 2018 22:43:35 -0700 +Subject: [PATCH] build-sys: Detect whether struct statx is defined in + sys/stat.h +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Starting with glibc 2.27.9000-36.fc29, include file sys/stat.h will have a +definition for struct statx, in which case include file linux/stat.h should be +avoided, in order to prevent a duplicate definition. + + In file included from ../src/basic/missing.h:18, + from ../src/basic/util.h:28, + from ../src/basic/hashmap.h:10, + from ../src/shared/bus-util.h:12, + from ../src/libsystemd/sd-bus/bus-creds.c:11: + /usr/include/linux/stat.h:99:8: error: redefinition of ‘struct statx’ + struct statx { + ^~~~~ + In file included from /usr/include/sys/stat.h:446, + from ../src/basic/util.h:19, + from ../src/basic/hashmap.h:10, + from ../src/shared/bus-util.h:12, + from ../src/libsystemd/sd-bus/bus-creds.c:11: + /usr/include/bits/statx.h:36:8: note: originally defined here + struct statx + ^~~~~ + +Extend our meson.build to look for struct statx when only sys/stat.h is +included and, in that case, do not include linux/stat.h anymore. + +Tested that systemd builds correctly when using a glibc version that includes a +definition for struct statx. + +glibc Fedora RPM update: +https://src.fedoraproject.org/rpms/glibc/c/28cb5d31fc1e5887912283c889689c47076278ae + +glibc upstream commit: +https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=fd70af45528d59a00eb3190ef6706cb299488fcd +--- + meson.build | 5 +++++ + src/basic/missing.h | 5 ++++- + src/basic/xattr-util.c | 1 - + 3 files changed, 9 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index dd904c7148..68423bdfa5 100644 +--- a/meson.build ++++ b/meson.build +@@ -425,6 +425,7 @@ decl_headers = ''' + #include + ''' + # FIXME: key_serial_t is only defined in keyutils.h, this is bound to fail ++# FIXME: these should use -D_GNU_SOURCE, since that is defined at build time + + foreach decl : ['char16_t', + 'char32_t', +@@ -439,6 +440,10 @@ foreach decl : ['char16_t', + conf.set10('HAVE_' + decl.underscorify().to_upper(), have) + endforeach + ++conf.set10('HAVE_STRUCT_STATX_IN_SYS_STAT_H', cc.sizeof('struct statx', prefix : ''' ++#include ++''', args : '-D_GNU_SOURCE') > 0) ++ + foreach decl : [['IFLA_INET6_ADDR_GEN_MODE', 'linux/if_link.h'], + ['IN6_ADDR_GEN_MODE_STABLE_PRIVACY', 'linux/if_link.h'], + ['IFLA_VRF_TABLE', 'linux/if_link.h'], +diff --git a/src/basic/missing.h b/src/basic/missing.h +index 71a07d0574..14ad3d4914 100644 +--- a/src/basic/missing.h ++++ b/src/basic/missing.h +@@ -15,7 +15,6 @@ + #include + #include + #include +-#include + #include + #include + #include +@@ -25,6 +24,10 @@ + #include + #include + ++#if !HAVE_STRUCT_STATX_IN_SYS_STAT_H ++#include ++#endif ++ + #if HAVE_AUDIT + #include + #endif +diff --git a/src/basic/xattr-util.c b/src/basic/xattr-util.c +index c5c55ea846..0ee0979837 100644 +--- a/src/basic/xattr-util.c ++++ b/src/basic/xattr-util.c +@@ -2,7 +2,6 @@ + + #include + #include +-#include + #include + #include + #include diff --git a/systemd/patches/0002-meson-rename-Ddebug-to-Ddebug-extra.patch b/systemd/patches/0002-meson-rename-Ddebug-to-Ddebug-extra.patch new file mode 100644 index 000000000..81402af55 --- /dev/null +++ b/systemd/patches/0002-meson-rename-Ddebug-to-Ddebug-extra.patch @@ -0,0 +1,43 @@ +From 8f6b442a78d0b485f044742ad90b2e8271b4e68e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Sun, 19 Aug 2018 19:11:30 +0200 +Subject: [PATCH] meson: rename -Ddebug to -Ddebug-extra + +Meson added -Doptimization and -Ddebug options, which obviously causes +a conflict with our -Ddebug options. Let's rename it. + +Fixes #9883. +--- + meson.build | 2 +- + meson_options.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index f79ac4b12..2209c935a 100644 +--- a/meson.build ++++ b/meson.build +@@ -763,7 +763,7 @@ substs.set('DEBUGTTY', get_option('debug-tty')) + + enable_debug_hashmap = false + enable_debug_mmap_cache = false +-foreach name : get_option('debug') ++foreach name : get_option('debug-extra') + if name == 'hashmap' + enable_debug_hashmap = true + elif name == 'mmap-cache' +diff --git a/meson_options.txt b/meson_options.txt +index e3140c8c1..7b1f61bf4 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -45,7 +45,7 @@ option('debug-shell', type : 'string', value : '/bin/sh', + description : 'path to debug shell binary') + option('debug-tty', type : 'string', value : '/dev/tty9', + description : 'specify the tty device for debug shell') +-option('debug', type : 'array', choices : ['hashmap', 'mmap-cache'], value : [], ++option('debug-extra', type : 'array', choices : ['hashmap', 'mmap-cache'], value : [], + description : 'enable extra debugging') + option('memory-accounting-default', type : 'boolean', + description : 'enable MemoryAccounting= by default') +-- +2.14.4 + diff --git a/systemd/patches/0003-bus-socket-Fix-line_begins-to-accept-word-matching-f.patch b/systemd/patches/0003-bus-socket-Fix-line_begins-to-accept-word-matching-f.patch new file mode 100644 index 000000000..1b9df6dfc --- /dev/null +++ b/systemd/patches/0003-bus-socket-Fix-line_begins-to-accept-word-matching-f.patch @@ -0,0 +1,48 @@ +From 3f10c66270b74530339b3f466c43874bb40c210f Mon Sep 17 00:00:00 2001 +From: Filipe Brandenburger +Date: Tue, 17 Jul 2018 11:32:40 -0700 +Subject: [PATCH] bus-socket: Fix line_begins() to accept word matching full + string + +The switch to memory_startswith() changed the logic to only look for a space or +NUL byte after the matched word, but matching the full size should also be +acceptable. + +This changed the behavior of parsing of "AUTH\r\n", where m will be set to 4, +since even though the word will match, the check for it being followed by ' ' +or NUL will make line_begins() return false. + +Tested: + +- Using netcat to connect to the private socket directly: + $ echo -ne '\0AUTH\r\n' | sudo nc -U /run/systemd/private + REJECTED EXTERNAL ANONYMOUS + +- Running the Ignition blackbox test: + $ sudo sh -c 'PATH=$PWD/bin/amd64:$PATH ./tests.test' + PASS + +Fixes: d27b725abf64a19a6b2f99332b663f17ad046771 +--- + src/libsystemd/sd-bus/bus-socket.c | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c +index be491c957..a785a247c 100644 +--- a/src/libsystemd/sd-bus/bus-socket.c ++++ b/src/libsystemd/sd-bus/bus-socket.c +@@ -246,10 +246,7 @@ static bool line_begins(const char *s, size_t m, const char *word) { + const char *p; + + p = memory_startswith(s, m, word); +- if (!p) +- return false; +- +- return IN_SET(*p, 0, ' '); ++ return p && (p == (s + m) || *p == ' '); + } + + static int verify_anonymous_token(sd_bus *b, const char *p, size_t l) { +-- +2.14.4 + diff --git a/systemd/patches/systemd-231-ipfire-disable-tests.patch b/systemd/patches/systemd-231-ipfire-disable-tests.patch deleted file mode 100644 index cd4bbe928..000000000 --- a/systemd/patches/systemd-231-ipfire-disable-tests.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -Nur a/Makefile.am b/Makefile.am ---- a/Makefile.am 2016-07-25 21:49:47.000000000 +0200 -+++ b/Makefile.am 2016-09-23 08:34:47.924257243 +0200 -@@ -1480,9 +1480,7 @@ - test-job-type \ - test-env-util \ - test-strbuf \ -- test-strv \ - test-path \ -- test-path-util \ - test-strxcpyx \ - test-siphash24 \ - test-unit-name \ -@@ -1541,7 +1539,6 @@ - test-capability \ - test-async \ - test-ratelimit \ -- test-condition \ - test-uid-range \ - test-locale-util \ - test-execute \ -@@ -3586,11 +3583,9 @@ - - tests += \ - test-dhcp-option \ -- test-dhcp-client \ - test-dhcp-server \ - test-ipv4ll \ - test-ndisc-rs \ -- test-dhcp6-client \ - test-lldp - - # ------------------------------------------------------------------------------ -@@ -4298,16 +4293,11 @@ - catalog-remove-hook - - tests += \ -- test-journal \ - test-journal-enum \ - test-journal-send \ - test-journal-syslog \ - test-journal-match \ -- test-journal-stream \ - test-journal-init \ -- test-journal-verify \ -- test-journal-interleaving \ -- test-journal-flush \ - test-mmap-cache \ - test-catalog \ - test-audit-type -@@ -6518,7 +6508,6 @@ - test-libudev-sym.c - - tests += \ -- test-libsystemd-sym \ - test-libudev-sym - - .PHONY: cppcheck diff --git a/systemd/systemd.nm b/systemd/systemd.nm index a95228f15..368ecdf0e 100644 --- a/systemd/systemd.nm +++ b/systemd/systemd.nm @@ -4,8 +4,8 @@ ############################################################################### name = systemd -version = 233 -release = 3 +version = 239 +release = 1 maintainer = Stefan Schantl groups = System/Base @@ -35,8 +35,6 @@ build /usr/bin/tree /usr/bin/umount - autoconf - automake attr-devel cryptsetup-luks-devel >= 1.4.2 dbus-devel @@ -55,9 +53,10 @@ build libcap-devel libgcrypt-devel libmount-devel - libtool libuuid-devel m4 + meson + ninja >= 1.5 pam-devel pciutils-devel python3-devel @@ -70,30 +69,36 @@ build export LD_LIBRARY_PATH = %{DIR_APP}/.libs - configure_options += \ - PYTHON=%{python3} \ - --with-sysvinit-path= \ - --with-sysvrcnd-path= \ - --enable-zlib \ - --disable-smack \ - --disable-backlight \ - --disable-firstboot \ - --disable-hibernate \ - --disable-importd \ - --disable-libiptc \ - --disable-machined \ - --disable-networkd \ - --disable-resolved \ - --disable-sysusers \ - --disable-timesyncd \ - --disable-timedated \ - --disable-polkit \ - --disable-static + configure_options = \ + -Dsysvinit-path= \ + -Dsysvrcnd-path= \ + -Dzlib=true \ + -Dsmack=false \ + -Dbacklight=false \ + -Dfirstboot=false \ + -Dhibernate=false \ + -Dimportd=false \ + -Dlibiptc=false \ + -Dmachined=false \ + -Dnetworkd=false \ + -Dresolve=false \ + -Dportabled=false \ + -Dsysusers=false \ + -Dtimesyncd=false \ + -Dtimedated=false \ + -Dpolkit=false \ + -Dstatic=false prepare_cmds %{create_groups} + end + + build + # Call meson and pass configure options. + meson --buildtype=plain %{configure_options} . build - ./autogen.sh + # Call ninja to start build + ninja -v %{PARALLELISMFLAGS} -C build end test @@ -104,10 +109,16 @@ build systemd-machine-id-setup # Run the testsuite. - make check || true + ninja test -v %{PARALLELISMFLAGS} -C build || true end - install_cmds + install + # Export destdir. + export DESTDIR=%{BUILDROOT} + + # Call ninja to perform installation + ninja install -v %{PARALLELISMFLAGS} -C build + # Create folder in log to store the journal. mkdir -pv %{BUILDROOT}/var/log/journal