From patchwork Mon Mar 4 21:42:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 1907894 X-Patchwork-Delegate: ansuelsmth@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=3cs/wRoj; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=Xbo6cV+t; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=patchwork.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TpXKs06DRz1yX3 for ; Tue, 5 Mar 2024 08:45:04 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=4IltHmfTtOYfyMQiSc5ZFY9AB6BDE3+wY0g4vqb1c8M=; b=3cs/wRoj2Jukkb lyRXxyua+kPavAif5Fb49+A+dNKs4DU1mZiJg8K1FvO0So4GgFhwaGbVh53kmdO6mxNBsX9Uqc4wS yUC95sxnWPUKfB4KwXovImfiI1vk092MqnTXv3ltUAX9EAcYph8Hm+F/CTx/1pI4t5wK5ouIo07q/ 4Bc+FxE/hwomfefPVCmuyh/cCS+SfYDynPhLYH4oinDKCSvg16GerOIQeL+TYmBbvc0Qxpsr5SGz2 7tiLkx/PRcwAADKNtPXXK4jDy47iWNLwsyBpRv2tYdXP64MLhpEW0ZC5bAUmtZsVTcqfV4gscFB0A kpbfalgd+KtbWsRU5pUQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rhG5W-0000000AoZi-0O1z; Mon, 04 Mar 2024 21:43:10 +0000 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rhG5M-0000000AoXU-0Pu6 for openwrt-devel@lists.openwrt.org; Mon, 04 Mar 2024 21:43:02 +0000 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-33e17fc5aceso2376212f8f.0 for ; Mon, 04 Mar 2024 13:42:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709588578; x=1710193378; darn=lists.openwrt.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/2C2W0YjM4exuK0GeyoBLoB5K5WmE+4RhMG9E8ul3N8=; b=Xbo6cV+tOXbLm6W4+nFEdURCzK0hGnC/4SYBLQn0O4PvivI9spIinZKuFLkwJnCRgw kVwCZD6jClBUIVI5aCEMzYN0EWirY495+Tkil+ko0Wp5+xIXeRtc6mjXGGF0NjJ6fH25 I6tmPrjC6DzvCZA4DKigG5p+Thm7pt6XUzwebLJMT9bXuKSHOODeSWG2ItBo4Yd1W8x6 yEK1bqQCxleJVNVbK3f4muuviMDl1a3DNYiw8l4WchCqyJONsUrdz6XBYgaQ7bKYB69F QazzsRj4Uikn4WU+ZaNycHgQnudNerKuxcd3/OAUf8pjwUFtIKUOVgYk5nkyRPF6Sf+W B85Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709588578; x=1710193378; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/2C2W0YjM4exuK0GeyoBLoB5K5WmE+4RhMG9E8ul3N8=; b=cY/GSQz570cXgSuZ3RfuFIvcVQToYKS68DtEjVC2NBZDnrxa/YUBphCZ3Ccmbu0S04 qlUjbnt4n18md/tfN9/L++sjtmx5fPPlHumBz1tWi2FEyOTEDjyAUCbB8TaY5kAVi+gK B0OKYpht4/15Qo+YuHbStg4YqI6yHrnjArYsYOcBm/uF9feo5w0uXFlA4jxgSP+x1b4z Tf1yYBztqYRUhUKcHdkUiS0OywTC3O3w/zozPrUipbl56a2SA3sUjR/o+enzXrx/5tZ7 3EIQ+ALW2Mf8geoNrpbwGlNkPxD8UU3fJyGaOEqCILvUMZXgF4f3KQ4KYwj9zaC1NIyT FFQw== X-Gm-Message-State: AOJu0Yy4Q7it19VjxlULSgsfzO5hdHXNqZnXp0Xm0jLZwtpkimcK2I0V xviuR46zwn3ES7/Sj7TKVzxO2Mz8yfI9pbnEvEbORT+oDnthaTrz4jzh/UK7J7k= X-Google-Smtp-Source: AGHT+IE7iUCs/fjz6RkLlgIJkzsek1fHpxMmU6r1j8Xl0pqnecFdkHl4n/H0C4uhkVQzVoQHas0gsQ== X-Received: by 2002:adf:8902:0:b0:33d:69c1:e7af with SMTP id s2-20020adf8902000000b0033d69c1e7afmr517459wrs.9.1709588577811; Mon, 04 Mar 2024 13:42:57 -0800 (PST) Received: from localhost.localdomain (93-34-89-13.ip49.fastwebnet.it. [93.34.89.13]) by smtp.googlemail.com with ESMTPSA id bo16-20020a056000069000b0033e422d0963sm2611565wrb.41.2024.03.04.13.42.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 13:42:57 -0800 (PST) From: Christian Marangi To: OpenWrt Development List Cc: Christian Marangi Subject: [PATCH 3/3] hostapd: restore /etc/hostapd directory on sysupgrade Date: Mon, 4 Mar 2024 22:42:18 +0100 Message-ID: <20240304214243.3677-4-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240304214243.3677-1-ansuelsmth@gmail.com> References: <20240304214243.3677-1-ansuelsmth@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240304_134300_839719_43FF2402 X-CRM114-Status: UNSURE ( 9.58 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Restore /etc/hostapd directory on sysupgrade since it does contain per-device PSK handled by hostapd for WPS usage. Signed-off-by: Christian Marangi --- package/network/services/hostapd/Makefile | 40 ++++++++++++++++------- 1 file changed, 28 insertions(+), 12 deletions(-) Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:435 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [ansuelsmth(at)gmail.com] -0.0 T_SCC_BODY_TEXT_LINE No description available. X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Restore /etc/hostapd directory on sysupgrade since it does contain per-device PSK handled by hostapd for WPS usage. Signed-off-by: Christian Marangi --- package/network/services/hostapd/Makefile | 40 ++++++++++++++++------- 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile index c8f476f7b8..a1cd2416fb 100644 --- a/package/network/services/hostapd/Makefile +++ b/package/network/services/hostapd/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=hostapd -PKG_RELEASE:=6 +PKG_RELEASE:=7 PKG_SOURCE_URL:=http://w1.fi/hostap.git PKG_SOURCE_PROTO:=git @@ -679,23 +679,39 @@ define Install/hostapd/full $(INSTALL_DATA) ./files/radius.users $(1)/etc/radius/users endef +define Package/hostapd/conffiles +/etc/hostapd +endef + +Package/wpad-mesh-openssl/conffiles = $(Package/hostapd/conffiles) +Package/wpad-mesh-wolfssl/conffiles = $(Package/hostapd/conffiles) +Package/wpad-mesh-mbedtls/conffiles = $(Package/hostapd/conffiles) +Package/wpad/conffiles = $(Package/hostapd/conffiles) +Package/wpad-openssl/conffiles = $(Package/hostapd/conffiles) +Package/wpad-wolfssl/conffiles = $(Package/hostapd/conffiles) +Package/wpad-mbedtls/conffiles = $(Package/hostapd/conffiles) +Package/hostapd-openssl/conffiles = $(Package/hostapd/conffiles) +Package/hostapd-wolfssl/conffiles = $(Package/hostapd/conffiles) +Package/hostapd-mbedtls/conffiles = $(Package/hostapd/conffiles) + define Package/hostapd-full/conffiles +$(Package/hostapd/conffiles) /etc/config/radius /etc/radius endef ifeq ($(CONFIG_VARIANT),full) -Package/wpad-mesh-openssl/conffiles = $(Package/hostapd-full/conffiles) -Package/wpad-mesh-wolfssl/conffiles = $(Package/hostapd-full/conffiles) -Package/wpad-mesh-mbedtls/conffiles = $(Package/hostapd-full/conffiles) -Package/wpad/conffiles = $(Package/hostapd-full/conffiles) -Package/wpad-openssl/conffiles = $(Package/hostapd-full/conffiles) -Package/wpad-wolfssl/conffiles = $(Package/hostapd-full/conffiles) -Package/wpad-mbedtls/conffiles = $(Package/hostapd-full/conffiles) -Package/hostapd/conffiles = $(Package/hostapd-full/conffiles) -Package/hostapd-openssl/conffiles = $(Package/hostapd-full/conffiles) -Package/hostapd-wolfssl/conffiles = $(Package/hostapd-full/conffiles) -Package/hostapd-mbedtls/conffiles = $(Package/hostapd-full/conffiles) +Package/wpad-mesh-openssl/conffiles += $(Package/hostapd-full/conffiles) +Package/wpad-mesh-wolfssl/conffiles += $(Package/hostapd-full/conffiles) +Package/wpad-mesh-mbedtls/conffiles += $(Package/hostapd-full/conffiles) +Package/wpad/conffiles += $(Package/hostapd-full/conffiles) +Package/wpad-openssl/conffiles += $(Package/hostapd-full/conffiles) +Package/wpad-wolfssl/conffiles += $(Package/hostapd-full/conffiles) +Package/wpad-mbedtls/conffiles += $(Package/hostapd-full/conffiles) +Package/hostapd/conffiles += $(Package/hostapd-full/conffiles) +Package/hostapd-openssl/conffiles += $(Package/hostapd-full/conffiles) +Package/hostapd-wolfssl/conffiles += $(Package/hostapd-full/conffiles) +Package/hostapd-mbedtls/conffiles += $(Package/hostapd-full/conffiles) endif define Install/hostapd