From nobody Thu Mar 6 15:40:01 2025 X-Original-To: dev-commits-src-all@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 4Z7tsG1D8Bz5pnVL; Thu, 06 Mar 2025 15:40:02 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z7tsF5gXMz3lCQ; Thu, 06 Mar 2025 15:40:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741275601; 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=uXIXTJ2wuQX6J+niJT4tGUc8ccw2yTPyAPJZLzfRZas=; b=tltB73p0yOgRka6w755jKxbfu5WMNVHIk0dBJWSVXi7CSha9eUYXHcGXuHBhipLlke/XzX 9A0VjPW46uNBKSDXwOwRHs3ENSEOLQw0hO9qzqPeFJwub++cr6jP3xEGIe7+t5o1oajAj4 VseUkYw9hFDQlPjGfdcIW7MGdcSoY3tv3vCT68BE3TbCsvRgj+FHSIOKqI1o67kFM1UPDu Cf8ZQUeaB/ngZ5CfhlIW4pLtnLuQuu6/T5ytt/kLORv3d/bLXgS0Jewg1TtwpI1M+Dtg0U 4LuXuA+6b2RfkWKlKwDGJzg+/UE7nbaDkPuKvr9BAss3deEnOb2U96D8E669yA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741275601; a=rsa-sha256; cv=none; b=CBjRSZNF+PLxqaFETdGJA6oGjr+I6fOH0/1WKnRhwtnpm18UEVYfe5C2HWieDICsMm9wqs MngVOxAM2fAjlHzueeeVshBlkiEqkGdVTKGYbiQDoOx+6nd8dhGvqGfowkmkpgD698M2Js hKzno68NFraZgzOTZ0P4xvp/AQqx2YlYYyl7DTjNJ3P4a00rjdxwMffLyB8Cn561LipNxf dMuZiIFJ+6T6t7Cjwvl3LP944k7ZtyJ82sZS9Ccp1Ym/vnyoxJPSA8tCUSXd5h1uaw11Ii rOLZOBMm25+7TYXSJbDkImUZbX/kAQ5jOIdomMCCRT3M7sL0NtyRy7e2zO20Uw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741275601; 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=uXIXTJ2wuQX6J+niJT4tGUc8ccw2yTPyAPJZLzfRZas=; b=sDEclcvf6S9P/zACbGuBaqk1F8qx0ufnjmCxqsuO/EIFujGIInrkrqAYkFVSRo4lRtyUUz RyguqLTu8PW4MQvYo3Aqw/EUqWyJrd/IPvN+1e5PNSHwBFVWwDVdyrFPlUQQfdt+lHBGg4 5atA2JlZhniRx6uASG+SYHa8/OE44Pa4KnVut8dxLUAOq+PyeX5vlUg6yLvpv5AhhVDQo/ TKzceYcsnuImRFSXggg/qa3ns93xSFSosp5WcPZbHMM7h0rhGxGEFXbCWxt3mhS6tjWxT2 e2j/SJ2aUEx5sXkvkIRhTIroAykPHfh17beUCIdNdc2aEp/WwSukdoOn/ouR4A== 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 4Z7tsF5CsPzww6; Thu, 06 Mar 2025 15:40:01 +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 526Fe1XO030786; Thu, 6 Mar 2025 15:40:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 526Fe1ju030782; Thu, 6 Mar 2025 15:40:01 GMT (envelope-from git) Date: Thu, 6 Mar 2025 15:40:01 GMT Message-Id: <202503061540.526Fe1ju030782@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 0bd3f757f9cf - stable/14 - pkg(7): expand VERSION_MAJOR, VERSION_MINOR, RELEASE and OSNAME List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0bd3f757f9cff089e07688f598d70531f5ee32e3 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=0bd3f757f9cff089e07688f598d70531f5ee32e3 commit 0bd3f757f9cff089e07688f598d70531f5ee32e3 Author: Baptiste Daroussin AuthorDate: 2025-01-16 13:50:42 +0000 Commit: Baptiste Daroussin CommitDate: 2025-03-06 15:39:14 +0000 pkg(7): expand VERSION_MAJOR, VERSION_MINOR, RELEASE and OSNAME Catchup with pkg(8) by expanding more variable when parsing repositories The only missing variable now is ARCH, this will have to wait for pkg 2.0 to be the lowest supported version. (cherry picked from commit e3b4a51580fcd4a1ddf0d61feb5f325ff1de5420) --- usr.sbin/pkg/config.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/usr.sbin/pkg/config.c b/usr.sbin/pkg/config.c index e02da1461294..16f7598fc745 100644 --- a/usr.sbin/pkg/config.c +++ b/usr.sbin/pkg/config.c @@ -478,11 +478,26 @@ read_conf_file(const char *confpath, const char *requested_repo, struct ucl_parser *p; ucl_object_t *obj = NULL; const char *abi = pkg_get_myabi(); + char *major, *minor; + struct utsname uts; + + if (uname(&uts)) + err(EXIT_FAILURE, "uname"); if (abi == NULL) errx(EXIT_FAILURE, "Fail do determine ABI"); p = ucl_parser_new(0); + asprintf(&major, "%d", __FreeBSD_version/100000); + if (major == NULL) + err(EXIT_FAILURE, "asprintf"); + asprintf(&minor, "%d", (__FreeBSD_version / 1000) % 100); + if (minor == NULL) + err(EXIT_FAILURE, "asprintf"); ucl_parser_register_variable(p, "ABI", abi); + ucl_parser_register_variable(p, "OSNAME", uts.sysname); + ucl_parser_register_variable(p, "RELEASE", major); + ucl_parser_register_variable(p, "VERSION_MAJOR", major); + ucl_parser_register_variable(p, "VERSION_MINOR", minor); if (!ucl_parser_add_file(p, confpath)) { if (errno != ENOENT) @@ -506,6 +521,8 @@ read_conf_file(const char *confpath, const char *requested_repo, ucl_object_unref(obj); ucl_parser_free(p); + free(major); + free(minor); return (0); }