From patchwork Fri Apr 24 21:40:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1276711 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.136; helo=silver.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=jMrXZ8wb; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4986zm6ZR0z9sPF for ; Sat, 25 Apr 2020 07:40:52 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 78B82227C4; Fri, 24 Apr 2020 21:40:49 +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 0VpnN1Lf6VYG; Fri, 24 Apr 2020 21:40:46 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id B1A61207EF; Fri, 24 Apr 2020 21:40:46 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 746521BF9C6 for ; Fri, 24 Apr 2020 21:40:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 70C4087F44 for ; Fri, 24 Apr 2020 21:40:45 +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 JrWYNyzSmgmx for ; Fri, 24 Apr 2020 21:40:43 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by whitealder.osuosl.org (Postfix) with ESMTPS id 3484687F94 for ; Fri, 24 Apr 2020 21:40:43 +0000 (UTC) Received: by mail-wr1-f45.google.com with SMTP id j1so12913771wrt.1 for ; Fri, 24 Apr 2020 14:40:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=kjPHktlkzD3eB0KtdQWwcBa1ErSxFPpoSIALOKXb3/8=; b=jMrXZ8wbyo4OggbDT6AFtzgHZXD45I+A7TTAGRbvG4VKAGty9jIvjsNpjmx3yomF4X YDbZP4tjD9PWslh1LRnU5/Nztmy157pPMnKXSRkImrq8wb2mn+ngtDo0P6cwB2f8el8U 3oJPu2UjZ1ep5ou6p0khMgUTex/Il9XI1ZQx0TSVoCgwlUWNayHBgSdsT3r6jrBkkpXr JeIkd1ERdvEux2Z2nuQIj4avOBA5CHyEzXy6R4hcoPjhyqy50tOsxxJvK2EfDKipz6tA UtBbdE4CfG4qzh2jntdr55wMCIefPh3fnKwPCCGa0lTziJkggI7zV8BWIKlE7+OdKe+E Dkqg== 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; bh=kjPHktlkzD3eB0KtdQWwcBa1ErSxFPpoSIALOKXb3/8=; b=ASmLEIbYXhdPowdJr8udkXQfDmog7ckMOAesBvkr3CdYV0cfv6iEin0GJ7s4zhZ1zg j6vaIXKOVkQ7bZkSvRIxkJAjwTJWNiFP5LZsHg5F6/g0WHDiLxKPNghwOMiMhq3Sjz9o /eBoZqV/HkxATFeMi782LOGwbQcQaiSZOSB6GSPP1RPLR0Ey/F1w9eBk7pdCr6QpPvLK GEbWuDfcemvbs9LO1PMc+ULY6nJhWNkyH/l4KD7OgrdBsmbOsgLSIv3iYy27I5/4oh7w w4e+qYwS38GLsLx8YWHRM5HldmK4WzQwICSWmTOFbLk3Kg8+sMD1x42SeCumVhV+ctIU 0QUg== X-Gm-Message-State: AGi0PuYUZTa62PrGc1uIDlwhuhscdpckPNVfTsL2jpMtNx9SG6dxbLhq SRtkpCB2GD4qhPntx+zY5tX1GvdWpIA= X-Google-Smtp-Source: APiQypKDfnN9bariFpQzIc9YDI4LVIvpRtoP8w96MAh0QqxdrnwnHdcTjLiHx9O51Nf1nzTknhgXkA== X-Received: by 2002:a5d:4092:: with SMTP id o18mr13301009wrp.227.1587764441453; Fri, 24 Apr 2020 14:40:41 -0700 (PDT) Received: from localhost.localdomain (host185036129193.static.fidoka.tech. [185.36.129.193]) by smtp.gmail.com with ESMTPSA id 185sm5304180wmc.32.2020.04.24.14.40.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Apr 2020 14:40:41 -0700 (PDT) From: Angelo Compagnucci X-Google-Original-From: Angelo Compagnucci To: buildroot@buildroot.org Date: Fri, 24 Apr 2020 23:40:38 +0200 Message-Id: <20200424214038.382827-1-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.17.1 Subject: [Buildroot] [PATCH] package/apparmor: bump to version 2.13.4 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: Angelo Compagnucci MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This patch bumps apparmor/libapparmor to version 2.13.4. Signed-off-by: Angelo Compagnucci --- package/apparmor/apparmor.hash | 2 +- package/apparmor/apparmor.mk | 2 +- ...el-fixing-for-crosscompiling-environ.patch | 21 +++++++------------ package/libapparmor/libapparmor.hash | 2 +- package/libapparmor/libapparmor.mk | 2 +- 5 files changed, 12 insertions(+), 17 deletions(-) diff --git a/package/apparmor/apparmor.hash b/package/apparmor/apparmor.hash index 91ab51f6ab..c7caef7beb 100644 --- a/package/apparmor/apparmor.hash +++ b/package/apparmor/apparmor.hash @@ -1,4 +1,4 @@ # locally computed -sha256 267053234c68cdb122c5294d7c276b6e2f5fa7e75c6c2d23e3ce69f95d9a7639 apparmor-2.13.3.tar.gz +sha256 90bf86c07ffbe2c22be46d75c7345fad12d5911653c59750a37d59c63ad5d10e apparmor-2.13.4.tar.gz sha256 a7e0cdcbea5c14927cedfc600d46526bdcbb1eb0a4d951e2ea53c2a6de159cb4 LICENSE sha256 dd54950fa69a3096fe907a466a454d217ccca9bca77398d5232704766d5a0040 parser/COPYING.GPL diff --git a/package/apparmor/apparmor.mk b/package/apparmor/apparmor.mk index c3b9d9fab9..5c67e15106 100644 --- a/package/apparmor/apparmor.mk +++ b/package/apparmor/apparmor.mk @@ -6,7 +6,7 @@ # When updating the version here, please also update the libapparmor package APPARMOR_VERSION_MAJOR = 2.13 -APPARMOR_VERSION = $(APPARMOR_VERSION_MAJOR).3 +APPARMOR_VERSION = $(APPARMOR_VERSION_MAJOR).4 APPARMOR_SITE = https://launchpad.net/apparmor/$(APPARMOR_VERSION_MAJOR)/$(APPARMOR_VERSION)/+download APPARMOR_DL_SUBDIR = libapparmor APPARMOR_LICENSE = GPL-2.0 diff --git a/package/libapparmor/0001-m4-ac_python_devel-fixing-for-crosscompiling-environ.patch b/package/libapparmor/0001-m4-ac_python_devel-fixing-for-crosscompiling-environ.patch index 7b902d5970..ecd8d6c163 100644 --- a/package/libapparmor/0001-m4-ac_python_devel-fixing-for-crosscompiling-environ.patch +++ b/package/libapparmor/0001-m4-ac_python_devel-fixing-for-crosscompiling-environ.patch @@ -1,4 +1,4 @@ -From 235ce271f3fee53b918317ebb73a47b3c6a7ae03 Mon Sep 17 00:00:00 2001 +From 64e5c6b23de9c147881680f3daccb995263c34a3 Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Tue, 24 Mar 2020 22:53:37 +0100 Subject: [PATCH] m4: ac_python_devel: fixing for crosscompiling environments @@ -14,11 +14,11 @@ python-config and fixes the rest of the m4 accordingly. Signed-off-by: Angelo Compagnucci --- - libraries/libapparmor/m4/ac_python_devel.m4 | 25 ++++++++++++++++----- - 1 file changed, 19 insertions(+), 6 deletions(-) + libraries/libapparmor/m4/ac_python_devel.m4 | 23 ++++++++++++++++----- + 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/libraries/libapparmor/m4/ac_python_devel.m4 b/libraries/libapparmor/m4/ac_python_devel.m4 -index 2ea7dc77..6454e2d8 100644 +index 29cf090d..6454e2d8 100644 --- a/libraries/libapparmor/m4/ac_python_devel.m4 +++ b/libraries/libapparmor/m4/ac_python_devel.m4 @@ -13,6 +13,11 @@ AC_DEFUN([AC_PYTHON_DEVEL],[ @@ -55,7 +55,7 @@ index 2ea7dc77..6454e2d8 100644 fi if test -z "$PYTHON_LDFLAGS"; then # (makes two attempts to ensure we've got a version number -@@ -136,10 +141,14 @@ sys.stdout.write('%s\n' % distutils.sysconfig.get_python_lib(0,0));"` +@@ -136,6 +141,10 @@ sys.stdout.write('%s\n' % distutils.sysconfig.get_python_lib(0,0));"` # libraries which must be linked in when embedding # AC_MSG_CHECKING(python extra libraries) @@ -66,12 +66,7 @@ index 2ea7dc77..6454e2d8 100644 if test -z "$PYTHON_EXTRA_LIBS"; then PYTHON_EXTRA_LIBS=`$PYTHON -c "import sys; import distutils.sysconfig; \ conf = distutils.sysconfig.get_config_var; \ --sys.stdout.write('%s %s\n' % (conf('LOCALMODLIBS'), conf('LIBS')))"` -+sys.stdout.write('%s %s %s\n' % (conf('BLDLIBRARY'), conf('LOCALMODLIBS'), conf('LIBS')))"` - fi - AC_MSG_RESULT([$PYTHON_EXTRA_LIBS]) - AC_SUBST(PYTHON_EXTRA_LIBS) -@@ -148,6 +157,10 @@ sys.stdout.write('%s %s\n' % (conf('LOCALMODLIBS'), conf('LIBS')))"` +@@ -148,6 +157,10 @@ sys.stdout.write('%s %s %s\n' % (conf('BLDLIBRARY'), conf('LOCALMODLIBS'), conf( # linking flags needed when embedding # AC_MSG_CHECKING(python extra linking flags) @@ -86,11 +81,11 @@ index 2ea7dc77..6454e2d8 100644 # save current global flags ac_save_LIBS="$LIBS" ac_save_CPPFLAGS="$CPPFLAGS" -- LIBS="$ac_save_LIBS $PYTHON_LDFLAGS" +- LIBS="$ac_save_LIBS $PYTHON_LDFLAGS $PYTHON_EXTRA_LIBS" + LIBS="$ac_save_LIBS $PYTHON_EXTRA_LIBS $PYTHON_LDFLAGS" CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS" AC_TRY_LINK([ #include -- -2.17.1 +2.25.1 diff --git a/package/libapparmor/libapparmor.hash b/package/libapparmor/libapparmor.hash index 3bff2bc853..a0ff221914 100644 --- a/package/libapparmor/libapparmor.hash +++ b/package/libapparmor/libapparmor.hash @@ -1,4 +1,4 @@ # locally computed -sha256 267053234c68cdb122c5294d7c276b6e2f5fa7e75c6c2d23e3ce69f95d9a7639 apparmor-2.13.3.tar.gz +sha256 90bf86c07ffbe2c22be46d75c7345fad12d5911653c59750a37d59c63ad5d10e apparmor-2.13.4.tar.gz sha256 a7e0cdcbea5c14927cedfc600d46526bdcbb1eb0a4d951e2ea53c2a6de159cb4 LICENSE sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 libraries/libapparmor/COPYING.LGPL diff --git a/package/libapparmor/libapparmor.mk b/package/libapparmor/libapparmor.mk index 98037c64a6..db5839b07c 100644 --- a/package/libapparmor/libapparmor.mk +++ b/package/libapparmor/libapparmor.mk @@ -6,7 +6,7 @@ # When updating the version here, please also update the apparmor package LIBAPPARMOR_VERSION_MAJOR = 2.13 -LIBAPPARMOR_VERSION = $(LIBAPPARMOR_VERSION_MAJOR).3 +LIBAPPARMOR_VERSION = $(LIBAPPARMOR_VERSION_MAJOR).4 LIBAPPARMOR_SOURCE = apparmor-$(LIBAPPARMOR_VERSION).tar.gz LIBAPPARMOR_SITE = https://launchpad.net/apparmor/$(LIBAPPARMOR_VERSION_MAJOR)/$(LIBAPPARMOR_VERSION)/+download LIBAPPARMOR_LICENSE = LGPL-2.1