From patchwork Sun Feb 2 20:53:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1232478 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=a9OAXZB+; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 489jnb6mkrz9sPK for ; Mon, 3 Feb 2020 07:52:18 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7671086018; Sun, 2 Feb 2020 20:52:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ibY+MKuqX9UE; Sun, 2 Feb 2020 20:52:14 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 9A08F85B8A; Sun, 2 Feb 2020 20:52:14 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 18E051BF298 for ; Sun, 2 Feb 2020 20:52:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 1378D203F4 for ; Sun, 2 Feb 2020 20:52:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id SZ6VpsUCQdih for ; Sun, 2 Feb 2020 20:52:12 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by silver.osuosl.org (Postfix) with ESMTPS id EEF54203BB for ; Sun, 2 Feb 2020 20:52:11 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id f129so14716637wmf.2 for ; Sun, 02 Feb 2020 12:52:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=OmrQUEJO6dFe8CidmkxnEEB53S6N40T6H4ZCwVHeCp0=; b=a9OAXZB+ospxHEU2Br1UWahx0kOnd5NS+qmOVSLvpzk63Np0eNDzdZ7lbf3PB7neWO q1dgCPonHLWZXzEwjgDTT/n7RZtiTp+20MORpHmNqYtOzdJXJvBYu8TrGARWbZTyZP6j yvzspMEuA0Sgw1d13+ljJ/MsVnM8K+4ft5sEalFI0aK4zjmTvV3S5gu9WL4Sc2JHCnYI /dVcqPsGZzirQDJvZtXSBBgq/7B7HzX73gBNLOF/+RJApRG6EltiCeL6iiFPtc45KiZJ UNRoC3o3vu9NJdhqVjDNdymOI5SM1GH4MsU/b0DVJ5/U9B3xKp6c9dnQxyT3ktjvtDuK avpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=OmrQUEJO6dFe8CidmkxnEEB53S6N40T6H4ZCwVHeCp0=; b=K/4VVm4lbkR76Jb+LKR+hxkNH8xq8fcSEILKB+SMzY9xUXLuTrKcGs6flzE1aTEBPh rs+NoBdZjqppY6ZxZ/HJyqyDxzfvBmLJxMzsnChWae1a+yLXt4jaj/nQZTH3/wxTudro +JdW6JLhPX7JnL/ol7JJnV/ocoA33GRq57hzWQ69zHM40GYjqAWHg/jxTSehK0X6UBaQ crSxQlwe9/dPWsQZ9vEfjQYcL/V5nokuOsKZIyD/OhQ07zLLubAROLriXo2g0fprahPi +hxgzB3Bv8CkXFXVbdTTIie9yuNzZ8NWi78gBSIjF2BuqQieMvwGE8qBhQba+pAzcRCC t3Ig== X-Gm-Message-State: APjAAAUhBg1lKfxUItPPh8t3yY2+MfO89qHOWwjIahW7Ggo3ZdB0PJZ2 ph9qx1Mm0fbp6RPwTbQv+eSr0YCMw5g= X-Google-Smtp-Source: APXvYqznWkFoX/xROvjfOaK3oEBc8ZxA21EcIjzvldr4EmvAnCpJXxNUDEu4lZ6ZX/wXWT4lbhIy8w== X-Received: by 2002:a1c:740b:: with SMTP id p11mr26021001wmc.78.1580676729993; Sun, 02 Feb 2020 12:52:09 -0800 (PST) Received: from kali.home (lfbn-ren-1-602-70.w81-53.abo.wanadoo.fr. [81.53.179.70]) by smtp.gmail.com with ESMTPSA id z6sm20840504wrw.36.2020.02.02.12.52.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Feb 2020 12:52:09 -0800 (PST) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sun, 2 Feb 2020 21:53:05 +0100 Message-Id: <20200202205306.1785085-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/2] package/python3: fix initconfig.h include X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Asaf Kahlon , Adam Duskett , Thomas Petazzoni , Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This fix is needed to enable cracklib with python3 Signed-off-by: Fabrice Fontaine --- ...n-pystate.h-fix-initconfig.h-include.patch | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 package/python3/0034-Include-cpython-pystate.h-fix-initconfig.h-include.patch diff --git a/package/python3/0034-Include-cpython-pystate.h-fix-initconfig.h-include.patch b/package/python3/0034-Include-cpython-pystate.h-fix-initconfig.h-include.patch new file mode 100644 index 0000000000..aa7835e0a4 --- /dev/null +++ b/package/python3/0034-Include-cpython-pystate.h-fix-initconfig.h-include.patch @@ -0,0 +1,30 @@ +From ce8731443896e7513239c2d831733b0d87417e42 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 2 Feb 2020 18:52:56 +0100 +Subject: [PATCH] Include/cpython/pystate.h: fix initconfig.h include + +This fix is needed to fix detection of python3.8/Python.h with cracklib + +See https://bugs.python.org/issue39026 + +Signed-off-by: Fabrice Fontaine +--- + Include/cpython/pystate.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Include/cpython/pystate.h b/Include/cpython/pystate.h +index d1792575c9..0a141b6e67 100644 +--- a/Include/cpython/pystate.h ++++ b/Include/cpython/pystate.h +@@ -6,7 +6,7 @@ + extern "C" { + #endif + +-#include "cpython/initconfig.h" ++#include "initconfig.h" + + PyAPI_FUNC(int) _PyInterpreterState_RequiresIDRef(PyInterpreterState *); + PyAPI_FUNC(void) _PyInterpreterState_RequireIDRef(PyInterpreterState *, int); +-- +2.24.1 + From patchwork Sun Feb 2 20:53:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1232479 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=rPQZmrp9; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 489jnd2Ympz9sPK for ; Mon, 3 Feb 2020 07:52:20 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 04CE5854A7; Sun, 2 Feb 2020 20:52:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id R7zT41Vwol18; Sun, 2 Feb 2020 20:52:17 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 7B228854AD; Sun, 2 Feb 2020 20:52:17 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 0028F1BF298 for ; Sun, 2 Feb 2020 20:52:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id F0ACA203F4 for ; Sun, 2 Feb 2020 20:52:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5Tq8kh0KtUbO for ; Sun, 2 Feb 2020 20:52:15 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by silver.osuosl.org (Postfix) with ESMTPS id 213A2203BB for ; Sun, 2 Feb 2020 20:52:15 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id p9so13702173wmc.2 for ; Sun, 02 Feb 2020 12:52:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sULrBVdiaCT+uJrrJ1paCoxHsvneriygtxUpcnphvVo=; b=rPQZmrp9RP0q47/mEanq41BOJcLqhe7nXICdDrA5AYgzDMTz9ypwqHjoaHzF3N52Cl nIhMCBxripH5mtvNqCkVnM8a4rux85fDcG20BmmZEz86B81FlnYEn1jvvwSXHA/JrpxS xobOrISS08cwNXnotQLDAcUFzCX+S6NkNOlMlzBzUK27XmZo28shSysp5aKUXg1r+N1a lJohwQQ5E6oLaScDq1mrbvdBNaRxjM7O5/E6c0G8ewOmNB8o6waakPGsNw2/2IKYbAMz /F6+Hl4hV4Pvl/WYx9E9X+OknRyKkABj2dA1NEPqWmnPZqTPksWpFONo/Z6D9ukIjq+k /a2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sULrBVdiaCT+uJrrJ1paCoxHsvneriygtxUpcnphvVo=; b=QBsXN+B4lmRUlpLjuPPd4zdZ8sMRKEVF/8RLS2v6N4ksBPOahRqGFmIbQKefY9oe9I o49FAnch7jJVdk6irb9q8Mrldq20LdBYPuGdlwfZYAVQpCHWkBR07M9ST1NKC5lQomeX sl+afE6aeE0e0ETOxvZEMtCOWxUZmX2EdaegXToXUKNRAGfvhumRCo9O3Cz6viPQz+JL sgTBsnZPNIXrthIyLuzpS6fjQYggFTpdROFZ5mdPazrvIBEcUPOpuqKU9h/eYLfB5pfw FQA7lU8xndXIeu/OfLbjW4Fw7sJaPzDnqWunh+PVcn8yH+FIdOThg9Io6juCMkBiIiV8 DIpw== X-Gm-Message-State: APjAAAV7cEHQHSTEvL38cTKT4N7g7U92WaaXZnk+HAiTWtvdgDJljsF6 6rqAeZ9E3z5UglqTpgy2SrZMlMBAf44= X-Google-Smtp-Source: APXvYqx6Ef5wE5AkgH2JhWpTo5OglUK0ardjMtEsVg+4xHbv+74Y4mNeQsV3aOjq7Cp3E5PBYz5vKQ== X-Received: by 2002:a05:600c:10d2:: with SMTP id l18mr24714694wmd.122.1580676733465; Sun, 02 Feb 2020 12:52:13 -0800 (PST) Received: from kali.home (lfbn-ren-1-602-70.w81-53.abo.wanadoo.fr. [81.53.179.70]) by smtp.gmail.com with ESMTPSA id z6sm20840504wrw.36.2020.02.02.12.52.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Feb 2020 12:52:12 -0800 (PST) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sun, 2 Feb 2020 21:53:06 +0100 Message-Id: <20200202205306.1785085-2-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200202205306.1785085-1-fontaine.fabrice@gmail.com> References: <20200202205306.1785085-1-fontaine.fabrice@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/2] package/cracklib: add python3 support X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Asaf Kahlon , Adam Duskett , Thomas Petazzoni , Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" python bindings supports python3 since version 2.8.19 and https://github.com/cracklib/cracklib/commit/219de98766b9f1e4c8c5b174de770158ffda3a93 Signed-off-by: Fabrice Fontaine --- package/cracklib/cracklib.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cracklib/cracklib.mk b/package/cracklib/cracklib.mk index 91d510ff34..be1b50f138 100644 --- a/package/cracklib/cracklib.mk +++ b/package/cracklib/cracklib.mk @@ -19,9 +19,9 @@ else CRACKLIB_CONF_OPTS += --without-zlib endif -ifeq ($(BR2_PACKAGE_PYTHON),y) +ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) CRACKLIB_CONF_OPTS += --with-python -CRACKLIB_DEPENDENCIES += python +CRACKLIB_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,python3) else CRACKLIB_CONF_OPTS += --without-python endif