From patchwork Mon Mar 18 18:43:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 7646 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 (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Tz3dr1M9Rz3wmD for ; Mon, 18 Mar 2024 18:43:28 +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 (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Tz3dl1ghpzFLs; Mon, 18 Mar 2024 18:43:23 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Tz3dk5WF5z32sv; Mon, 18 Mar 2024 18:43:22 +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 (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Tz3dh3fKkz32sc for ; Mon, 18 Mar 2024 18:43:20 +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 (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Tz3dh29xbzj1; Mon, 18 Mar 2024 18:43:20 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1710787400; 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=gaaMv2GhUAAJY1foQrp+130VPpf5a8jUHgyceta6yAc=; b=b0t/381l4PWIyMKFYgTCsePwGmkahOq8QijhtxyoBmFd+lrlP+ITRNTv0RlIxultTJRbKE 7GCCyHW0hp4y6cDA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1710787400; 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=gaaMv2GhUAAJY1foQrp+130VPpf5a8jUHgyceta6yAc=; b=CaS+0TZ6+Y/Yvq+7LQZqD9CPjqPhJfj7z/P5X9xgXfaIIRnNc7K177AYDcdPdZ0Vz3Ibfl 6/gjnjbqrNQ5EsSAmDHfTVMvQtYCdLlAvdcArxGSCX+EvdbNfaQSgPZlZt8MTW7m0x1Nq/ yqweFBdjq5lb3sqAzKhEznTokPnYkX38NJ2FAH5FohpqeLDW5exeQXhhZxxJ5qBGMlBOp6 1dx5oa3jePiIMnEpBQI/LBen8oxVNZe2LYtq5jfy2DEH7Cd5ul3ZfzFx7DUuzABSTL5gtf O9Ac4laqGDAAghch6CbQX++K9Z4MC+NNFPUz+vUT8+ScjcbTRYQRn/MTpog0Eg== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 3/4] wsdd: Update of lfs file - fixes bug#13445 Date: Mon, 18 Mar 2024 19:43:13 +0100 Message-ID: <20240318184314.3683-3-adolf.belka@ipfire.org> In-Reply-To: <20240318184314.3683-1-adolf.belka@ipfire.org> References: <20240318184314.3683-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: FP4AEYGP354THNA7ROZUHUDFCTMSSM4H X-Message-ID-Hash: FP4AEYGP354THNA7ROZUHUDFCTMSSM4H X-MailFrom: adolf.belka@ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: - Removal of services line as wsdd will now be started by the samba option in the addon services wui page - Removal of installing separate wsdd initscript as it is nowe integrated into the samba initscript. Fixes: bug#13445 Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- lfs/wsdd | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lfs/wsdd b/lfs/wsdd index aa65e47ef..bf2a1a032 100644 --- a/lfs/wsdd +++ b/lfs/wsdd @@ -33,11 +33,11 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = wsdd -PAK_VER = 1 +PAK_VER = 2 DEPS = -SERVICES = wsdd +SERVICES = ############################################################################### # Top-level Rules @@ -82,8 +82,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && cp src/wsdd.py /usr/bin/wsdd - #install initscripts - $(call INSTALL_INITSCRIPTS,$(SERVICES)) - @rm -rf $(DIR_APP) @$(POSTBUILD)