From nobody Wed Feb 12 01:43:46 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yt1LW2Ppzz5n7rn; Wed, 12 Feb 2025 01:43:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yt1LW0GDdz3gqB; Wed, 12 Feb 2025 01:43:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739324627; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LC+hCdn+KAJwKE00AscfJaPRD8NmWbPPEmM+k91wjPQ=; b=qjUI5mKPoS4Fyzkg42WNWfIfQJbsqj2bWMCrUsc64GC+6PxrQgdr03i8O0PZlOkndo/Zem C6f7NxIkdzarcSsWMarKQ6m3IhJ5ApVhLt6uXuIshlbozvYzfwj7Y3f4ila2Q5BLLyRRxV uKa1lQbbDUMLeUbvgUpb7y6wSf+bhg3Acwqf6XdhoNdh40cNxi+V5zf9qD00OpaDEvfLWd z70eMY18qiOt+UdxBk67xvyXnkC9qkR+XipyWVZF13uDGpvORy/dk1rrGuQO5oohH1u1Bk 5Zfb9jih9TWInhVIvcMf3LX2hOdng0J0THt9RYooPfRamOaoliw8Q+1dnhcJHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739324627; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LC+hCdn+KAJwKE00AscfJaPRD8NmWbPPEmM+k91wjPQ=; b=KWViUhLU4Zau9RPYkreEQTBOctpJNSj3w0sdn3Rf1VnnL12HcP1njSJvyzImWfRernk0VD KQkuWBvthnrFqFHpXa4YHu0Tes1bJSLiudiE9OoiHXNcqMQoapzoMv84olfjTtJYx/41mv 5FwwDCkBxwsloISnblgebOAXn382uCm+XB+nHxGhEYn6lT6f5dwCcfu743zR1MgvCgpvJl uKnPvsgAFAKmfdPoXMnuFRB0h2V5EtpbVAzjDCjv5ANF41qgnTGazW44XbYoVGuSZaJauH 1U58Hh+QrCR3dCJ0AnT8iII4cZ+9SFbOTyunBiLGqrqgp5gAa4o+QeEfjGpj+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739324627; a=rsa-sha256; cv=none; b=GKY0XhaaCp9KcZVlojCl1dgAR08u9giB0W58XKr1dABYOR1XW+nbpGJ4vv2y3Eu9ay7e3M wTIqPm38yP7AVj2dbqz9neUZINymoXHypssdnEGby8OS87ohRzjtHauTg8xsEJ+dNgIaiC Bs1iSFWhNYxNYKhGpVzLm8LPQt2f5RZHwqcle3ygnHwQPpvpLDC/yyKXXXEmuTUGw/0Z4B Ulk0nxvcaixX9SesmyeNeK3S500fa4+qZIy4Eh+MZbSqv3eCLTt7ELXK9x6cUCRdGejVAb RSAbZFqfQfsUHJiP5VIK3yjYW/YlnQj3Y+OpUAi9uylHIIE6e3cTpRv8dUavFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yt1LV6qWSzfPY; Wed, 12 Feb 2025 01:43:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51C1hkAl051696; Wed, 12 Feb 2025 01:43:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51C1hkTP051693; Wed, 12 Feb 2025 01:43:46 GMT (envelope-from git) Date: Wed, 12 Feb 2025 01:43:46 GMT Message-Id: <202502120143.51C1hkTP051693@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: f9e98800af5d - stable/14 - libopencsd: Remove extra slashes List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f9e98800af5d2ea158f49b792de60bbf10233a39 Auto-Submitted: auto-generated The branch stable/14 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=f9e98800af5d2ea158f49b792de60bbf10233a39 commit f9e98800af5d2ea158f49b792de60bbf10233a39 Author: Jose Luis Duran AuthorDate: 2025-02-04 14:15:37 +0000 Commit: Jose Luis Duran CommitDate: 2025-02-12 01:33:35 +0000 libopencsd: Remove extra slashes Remove extra slashes that end up in the metalog. These double slashes can produce an invalid specification file if there are subdirectories down the hierarchy when sorted. For example, consider the following metalog excerpt: ./base/aaa type=dir ./base//aaa/bbb type=dir If sorted, would turn out: ./base//aaa/bbb type=dir ./base/aaa type=dir Apparently missing the ./base/aaa directory in the specification. Luckily here are no subdirectories. Reviewed by: imp, emaste Approved by: emaste (mentor) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D48779 (cherry picked from commit bccaf0262dcab84be49c42cc6b7a81c279c44b62) --- lib/libopencsd/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libopencsd/Makefile b/lib/libopencsd/Makefile index d6d648ef1e32..6f0edc649c64 100644 --- a/lib/libopencsd/Makefile +++ b/lib/libopencsd/Makefile @@ -122,7 +122,7 @@ APIINCS= \ ocsd_c_api_types.h \ opencsd_c_api.h -APIINCSDIR=${INCLUDEDIR}/opencsd/c_api/ +APIINCSDIR=${INCLUDEDIR}/opencsd/c_api ETEINCS= \ ete_decoder.h \ @@ -130,7 +130,7 @@ ETEINCS= \ trc_dcd_mngr_ete.h \ trc_pkt_types_ete.h -ETEINCSDIR=${INCLUDEDIR}/opencsd/ete/ +ETEINCSDIR=${INCLUDEDIR}/opencsd/ete ETMV4INCS= \ etmv4_decoder.h \ @@ -143,7 +143,7 @@ ETMV4INCS= \ trc_pkt_proc_etmv4i.h \ trc_pkt_types_etmv4.h -ETMV4INCSDIR=${INCLUDEDIR}/opencsd/etmv4/ +ETMV4INCSDIR=${INCLUDEDIR}/opencsd/etmv4 ETMV3INCS= \ etmv3_decoder.h \ @@ -154,7 +154,7 @@ ETMV3INCS= \ trc_pkt_proc_etmv3.h \ trc_pkt_types_etmv3.h -ETMV3INCSDIR=${INCLUDEDIR}/opencsd/etmv3/ +ETMV3INCSDIR=${INCLUDEDIR}/opencsd/etmv3 PTMINCS= \ ptm_decoder.h \ @@ -165,7 +165,7 @@ PTMINCS= \ trc_pkt_proc_ptm.h \ trc_pkt_types_ptm.h -PTMINCSDIR=${INCLUDEDIR}/opencsd/ptm/ +PTMINCSDIR=${INCLUDEDIR}/opencsd/ptm STMINCS= \ stm_decoder.h \ @@ -176,7 +176,7 @@ STMINCS= \ trc_pkt_proc_stm.h \ trc_pkt_types_stm.h -STMINCSDIR=${INCLUDEDIR}/opencsd/stm/ +STMINCSDIR=${INCLUDEDIR}/opencsd/stm INCSGROUPS=INCS APIINCS ETEINCS ETMV3INCS ETMV4INCS PTMINCS STMINCS