From patchwork Mon Mar 30 17:24:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 2864 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 48rfV82nlDz3yBY for ; Mon, 30 Mar 2020 17:25:04 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 48rfV641DHz1s0; Mon, 30 Mar 2020 17:25:02 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 48rfV62sbRz2ybd; Mon, 30 Mar 2020 17:25:02 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 48rfV35K3wz2xlt for ; Mon, 30 Mar 2020 17:24:59 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 48rfV26MLhz1s0; Mon, 30 Mar 2020 17:24:58 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1585589098; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=Hsuw/K+WGTR/PfIeWh5jkoFkqC0VtgLYk3Exgk2l8eE=; b=ybIjAPDD1JlPnF3EzAAlWX6X1EzYOQW9enD+8gvbt1BCeRQkhJznLfhFQH0GS+KnlGEuFR R+KrqQqFv+5Km6Bw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1585589098; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=Hsuw/K+WGTR/PfIeWh5jkoFkqC0VtgLYk3Exgk2l8eE=; b=POkQtMLsJ/8jEP9gug7Gnh/gwPgJVeVFuUWR1UwwcUOA0lpkMLVa1J3FkTRA4PrHw8nduh fFL+XdVmLGWLM3qqWwDC0CrlNwmtV79tX4IGtTaiQ87MZY4AfhUZct734bRYpN3P3Nvf6G eOrNDcL2FtZZANuuIqZOQseUhuA+ekEnDVMNHZJHJd4ZaOZgVJ/XJ5hNZuLcKOA7oFJuGK W/e9baeQu6+0OUoJ+BWzjqzS1DlH1aaAe33ql90ebENBqrwMvBYXCaNKUk9RMmG99YWWAb x1aNsCyNDRcnD790wMUgI7uIzMjgLKNobGS5ND19jU2e9l4Jh+HNJ/oVD8bAVg== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 1/2] amazon-ssm-agent: Update to 2.3.930.0 Date: Mon, 30 Mar 2020 17:24:41 +0000 Message-Id: <20200330172442.11391-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- lfs/amazon-ssm-agent | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lfs/amazon-ssm-agent b/lfs/amazon-ssm-agent index 44a91f4ac..d4aa3fa90 100644 --- a/lfs/amazon-ssm-agent +++ b/lfs/amazon-ssm-agent @@ -24,7 +24,7 @@ include Config -VER = 2.3.786.0 +VER = 2.3.930.0 SUP_ARCH = x86_64 THISAPP = amazon-ssm-agent-$(VER) @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = amazon-ssm-agent -PAK_VER = 1 +PAK_VER = 2 DEPS = @@ -47,7 +47,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = a2887445875d335b021c5044eab955dc +$(DL_FILE)_MD5 = cf7c50976e2853764d308581f94cbdd1 install : $(TARGET) @@ -88,6 +88,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # Disable style check cd $(DIR_BUILD) && sed -e "/checkstyle.sh/d" -i makefile + # agent/plugins/inventory/gatherers/application/dataProvider.go:10:78: error: imported and not used: localpackages + cd $(DIR_BUILD) && sed -e "/localpackages/d" \ + -i agent/plugins/inventory/gatherers/application/dataProvider.go + # Build cd $(DIR_BUILD) && make build-linux From patchwork Mon Mar 30 17:24:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 2865 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 48rfV84jYwz3yBr for ; Mon, 30 Mar 2020 17:25:04 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 48rfV71bZxz2PM; Mon, 30 Mar 2020 17:25:03 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 48rfV64rFBz30D2; Mon, 30 Mar 2020 17:25:02 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 48rfV369DPz2yC3 for ; Mon, 30 Mar 2020 17:24:59 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 48rfV34V2Gz1vX; Mon, 30 Mar 2020 17:24:59 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1585589099; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wTmFllORQbe5XM4qZoupfZQpaBtjwunZc6SIdJ9YQJw=; b=wKhOO/Iv7juctlrd6hVWMO2aMPuSSAlG7YcBzwEF9iSI4hNyf11w1X0DdApg+vJq8ToWOq xQn0VnqT9ZLdzgCQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1585589099; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wTmFllORQbe5XM4qZoupfZQpaBtjwunZc6SIdJ9YQJw=; b=ArJnKFe94J3pG85gtJTG8VRBz2JECVOrWt2yEr3CYZphpdJ6eyZhZeUk+datA1fLj/zlG7 sZ6sItncffDT5eLzq1VIPNW/K093FXKhOsj3MUUdk30GD8En9EP0Tc+rkCEBcm900Q110+ Ei6pxbLIfwWZ556rz7FPX9ZXljLNCKTv4GPGeHsdMvxUFtCpHaZpk2R35wxjwbv3vz1R57 M4ByEsQbpq8jPnYnHLPQ6QwrsrehdbLdOnn6cHvUl0CnqFqpM2TNY46K+UjGll/HI0qkIV ln/GWL0KAg5UscO3IklgOO4Ae2PtCT/sMpMcBmz9eDn3Gt+T7a9Ymkt9sBGf5A== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 2/2] amazon-ssm-agent: Allow to overcommit memory Date: Mon, 30 Mar 2020 17:24:42 +0000 Message-Id: <20200330172442.11391-2-michael.tremer@ipfire.org> In-Reply-To: <20200330172442.11391-1-michael.tremer@ipfire.org> References: <20200330172442.11391-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- lfs/amazon-ssm-agent | 2 +- src/initscripts/packages/amazon-ssm-agent | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lfs/amazon-ssm-agent b/lfs/amazon-ssm-agent index d4aa3fa90..4b08bd41d 100644 --- a/lfs/amazon-ssm-agent +++ b/lfs/amazon-ssm-agent @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = amazon-ssm-agent -PAK_VER = 2 +PAK_VER = 3 DEPS = diff --git a/src/initscripts/packages/amazon-ssm-agent b/src/initscripts/packages/amazon-ssm-agent index c385d890c..eeaa7b7e5 100644 --- a/src/initscripts/packages/amazon-ssm-agent +++ b/src/initscripts/packages/amazon-ssm-agent @@ -13,6 +13,12 @@ case "${1}" in exit 0 fi + # Allow the kernel to overcommit memory. + # The SSM agent fails to clone() itself when there is + # "not enough memory" available. This simply seems to + # fail no matter how much free memory is available. + echo 1 > /proc/sys/vm/overcommit_memory + boot_mesg "Starting Amazon SSM Agent..." /usr/bin/amazon-ssm-agent &>/dev/null & evaluate_retval