From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,T_SCC_BODY_TEXT_LINE,URI_NOVOWEL autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 16639 invoked from network); 23 Jun 2023 13:42:24 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 23 Jun 2023 13:42:24 -0000 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20210803; t=1687527744; b=d2lCJtmP7Ohg06EXPGQwku4ez5h2thQpkNEw6jIhCy2bMDOCt2U+wUSWRezgHnQVrCt01aSsyC GIAwRdafC23OyvY8OZSVACqLA1eGjDbxvs43AS5TKUcneVeFemCwp3GgkDjbO063U5T9TYrkA0 xzbIzmI6WvfnoFxr47kDAjmI8Km1JZ3DuBnMiU56b7+mI2D8RdkWTUXtyfFAtDFWeiJhce9Bst UPl5xLlzgo8ImLbhYuOUthFIsXj+0LHY3jk3P6x3Fu6lfrDuvYy7bWM4dj4xoJFP9NlHi4Lpl+ tK8l7qSaz+/pX7QRM9QKy2WUJZeyRL5hpAj1NNROovWUJQ==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (snd00012-bg.im.kddi.ne.jp) smtp.remote-ip=27.86.113.12; dmarc=none header.from=kba.biglobe.ne.jp; arc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed; d=zsh.org; s=rsa-20210803; t=1687527744; bh=++3InVKm69TvP6P2V5LBKEPxHTt/f9ug1BCo6kxx3Zk=; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help: List-Id:Sender:Message-ID:In-Reply-To:To:References:Date:Subject: MIME-Version:Content-Transfer-Encoding:Content-Type:From:DKIM-Signature; b=i1VH9jTCJ81v1tXOcn/KNs2xv+PufYZE2272BIQFTWXnPTwzEAIQTEW7Yj6gw0NvNE09UXJxsM DwPTEmN7t3U34Wi3nm1QD6XG0zj7W3/4kOYQ3rChO+Dimm7mVQ/iE+XeSZrEsxGdF5xEkx29aN AyxLFlasB57tas80a4bk26K0n/ACwpu6GxEHpFt2PMyMdayUl1L41foF7Iejp+Mgq3q3/JTyH/ 8v1N+wnDnJ85+behMsGa49ZI39AThmOJFbRcnjXJQvtgHNP23oFymM5cbpt/Yu6F71kiK/fK2a nazZZ22ruK1Gz3ePNiEFpAaSWFGyMiryj54TLZB33KNkAw==; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=zsh.org; s=rsa-20210803; h=List-Archive:List-Owner:List-Post:List-Unsubscribe: List-Subscribe:List-Help:List-Id:Sender:Message-Id:In-Reply-To:To:References: Date:Subject:Mime-Version:Content-Transfer-Encoding:Content-Type:From: Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID; bh=UOOtVY+TuogWBBIZLoH5ApqNLDoRit+Ne/ET0jAXJFU=; b=L3gHND8pcAUVFAynjolLNOYDPT XR9rFs2ssA/fso1uBtjntzIqP2bZBaDgvnMR2wCmZqHYXL9T3nbFRe/Ubk28rSiSgWRWnQf1jU5FI JqGMaR/EgJdsLn7pcQNhUrrmurSgDoVaJQQRsxEBX2lzUaOrNFph+Yp1KimlZc8AFyYo97W88fG17 3GQTK+YVo05qZyST+TI+G3xZQ2rfTxJYcv7iQ5Apxm17RVLf+4/+D2RWFLrjDvXa3/GS5oBcrwgiO ylGJzbTFIU8pzf5+Uq3xIfXWltKVMTAgbqgGKAg8kkK8cNfOiUaPMRgIk5/TAwmCRYzIq7gAwCDhC IE3EoT+A==; Received: by zero.zsh.org with local id 1qCh3O-0007h7-1f; Fri, 23 Jun 2023 13:42:22 +0000 Authentication-Results: zsh.org; iprev=pass (snd00012-bg.im.kddi.ne.jp) smtp.remote-ip=27.86.113.12; dmarc=none header.from=kba.biglobe.ne.jp; arc=none Received: from snd00012-bg.im.kddi.ne.jp ([27.86.113.12]:21793 helo=dfmta0013.biglobe.ne.jp) by zero.zsh.org with esmtps (TLS1.3:TLS_AES_256_GCM_SHA384:256) id 1qCh2p-0007Nj-3P; Fri, 23 Jun 2023 13:41:51 +0000 Received: from mail.biglobe.ne.jp by omta0013.biglobe.ne.jp with ESMTP id <20230623134140693.OTDQ.55819.mail.biglobe.ne.jp@biglobe.ne.jp> for ; Fri, 23 Jun 2023 22:41:40 +0900 From: "Jun. T" Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.3\)) Subject: Re: [Bug] modules zsh/tcp, zsh/zftp unloadable, probably affecting most modern Linuxes Date: Fri, 23 Jun 2023 22:41:39 +0900 References: <027f2a491b638e2ffaf7766fe4adf29537c11fdf.camel@fifi.org> <227fe72b-7441-935c-55a7-421945da54b3@hostalia.de> <1604572963.1688389.1686042332603@mail.virginmedia.com> <9B5553E5-9CBD-4E6A-88E4-2ABFA1305552@kba.biglobe.ne.jp> <890683328.5067391.1686063668614@mail.virginmedia.com> <9d6e40041e3786987f54adf1080d201085b08625.camel@fifi.org> <3DE27489-7BD6-478C-95AC-9E35C4B3C944@kba.biglobe.ne.jp> <5E054934-C1FA-490E-9D4E-64E73907B280@kba.biglobe.ne.jp> To: zsh-workers@zsh.org In-Reply-To: <5E054934-C1FA-490E-9D4E-64E73907B280@kba.biglobe.ne.jp> Message-Id: X-Mailer: Apple Mail (2.3696.120.41.1.3) X-Biglobe-Sender: takimoto-j@kba.biglobe.ne.jp X-Seq: 51889 Archived-At: X-Loop: zsh-workers@zsh.org Errors-To: zsh-workers-owner@zsh.org Precedence: list Precedence: bulk Sender: zsh-workers-request@zsh.org X-no-archive: yes List-Id: List-Help: , List-Subscribe: , List-Unsubscribe: , List-Post: List-Owner: List-Archive: load_module("zsh/zftp", ...) is so designed that if add_dep("zsh/zftp", "zsh/net/tcp") is called before calling it (for example in init.c) then tcp module is loaded before loading zftp (module.c, line 2268). The patch below modifies mkbltnmlst.sh so that it outputs the add_dep() in bltinmods.list. Please test on Linux with LDFLAGS='-Wl,-z,relro -Wl,-z,now'. diff --git a/Src/Modules/zftp.c b/Src/Modules/zftp.c index 49b3ffa89..47a5e9de9 100644 --- a/Src/Modules/zftp.c +++ b/Src/Modules/zftp.c @@ -3172,7 +3172,7 @@ static struct features module_features = { int setup_(UNUSED(Module m)) { - return (require_module("zsh/net/tcp", NULL, 0) == 1); + return 0; } /**/ diff --git a/Src/mkbltnmlst.sh b/Src/mkbltnmlst.sh index c4611d8b3..ea7d5ac3d 100644 --- a/Src/mkbltnmlst.sh +++ b/Src/mkbltnmlst.sh @@ -76,6 +76,30 @@ for x_mod in $x_mods; do test "x$linked" = xno && echo "#endif" done +# if dynamic module 'mod' with load=no has moddeps in its .mdd, +# then output add_dep(mod, dep) for each 'mod' in moddeps. +dyn_mods="`grep ' link=dynamic .* load=no ' $CFMOD | \ + sed -e '/^#/d' -e 's/ .*/ /' -e 's/^name=/ /'`" + +for mod in $dyn_mods; do + modfile="`grep '^name='$mod' ' $CFMOD | \ + sed -e 's/^.* modfile=//' -e 's/ .*//'`" + if test "x$modfile" = x; then + echo >&2 "WARNING: no name for \`$mod' in $CFMOD (ignored)" + continue + fi + unset moddeps + . $srcdir/../$modfile + if test -n "$moddeps"; then + echo '#ifdef DYNAMIC' + echo "/* non-linked-in known module \`$mod' */" + for dep in $moddeps; do + echo " add_dep(\"$mod\", \"$dep\");" + done + echo '#endif' + fi +done + echo done_mods=" " for bin_mod in $bin_mods; do