From nobody Thu Feb 5 03:59:33 2026 X-Original-To: dev-commits-src-main@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 4f63Px4gjkz6R83p for ; Thu, 05 Feb 2026 03:59:33 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f63Px3qnHz43Lt for ; Thu, 05 Feb 2026 03:59:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770263973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M1mCsCBtDvCXoCo5baLlm2hx5L3Va8dKZn7VhrRPzrI=; b=fnnNa7jWApuAbH0KHGVbEXrQRApo6edIScaSNfLsgQJeuq6suQVWw8EzgkPl5mdW3fAwke ivu3KWAWMczdjI5CuwIxKUKgh80it/Dtmj3SqLWsnNyDTiP4sGmu26UnHCXgZLchsD4NXe A0jAminZDN8GWyI26yhMuWhK4whUFNJ/gAJZFqkGfKsT+GsDaX4bE1aH9xey8o9hSt1rT0 DQv6kSgCJn2DF7ZSFncoB4yhLgvmiYRF2SS4NeNZPGKSyZqdezYdb9ehCLATmOkKpe/crr MwAqDstwlOYsu+j5gYIPPrYyQ0VbYAw4CZicBDFn0nEcUnDGAQypSjjvznDveA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770263973; a=rsa-sha256; cv=none; b=mu3Y77IcXdhAeR36A15HavtgIQx4aQ42ec2N3tj1fKIFmgKg4tceqmDIS4M49pCyPxNczK iCAvuedLr2eQehTiiCV6DOkms4iZbGFDdHHu7mCs6xtxZ0ZQf2ah/GFNkHxDq/dGRzu+Fd fiE8XA6RdE9txx+oD4fL4zUE9kAH0lVMfp0bq5qPVmAhA07GiauKtLqg8aL0XZHlvIiIEW j2nKQdQmuqJ8GGY1PnA1ruiTKVZuHubVXgKGo9OoitM2N2rQGNIZVdU8q2Uffi82mw8Xaz aHD0uzADPUS5aKZ6xwBkr7A4Vts09WfNPX/58PqW3Y2RYQEAR5m8qbJXh1Ty0Q== 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=1770263973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M1mCsCBtDvCXoCo5baLlm2hx5L3Va8dKZn7VhrRPzrI=; b=ZM3lXcKQakgT6z5CFomwwX2GeojQlbIClyCmkXiF6IQgL1XT0NSLXy5g91EWM8Nf72iCSy VKovJBmcGufsAEQVs6mzWAovwf1GLRggrKqQzJ+KN007j4XGfSTruqQL395yDArVMFTBYB jOFt8VVOyCfpxkQwnqeSBFPOWSTv2vrfc6uzJsaPtMku7nWQbSSUhon0BHQBsEn+uGYAIr jjTQl11iJlws4O6u+p6Z1wIUHA5JJjt1UM/bmIvFpvVPHHVHwA2DfuErBHu/xiNO2qHoCR 9HP2dwuu1EzuCAIPwsBkdi8QMbRqZerUDhy0QnDTR8QFT+50xDvsJfO9doC+eQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f63Px3Jn0z1RcV for ; Thu, 05 Feb 2026 03:59:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45a4e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 03:59:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Pavel Knoblokh From: Kyle Evans Subject: git: abf911af2272 - main - pkg: Fix mirror type parsing and service discovery List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: abf911af22729858cc876231e7970eff6aefbb9d Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 03:59:33 +0000 Message-Id: <698415a5.45a4e.721a5f80@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=abf911af22729858cc876231e7970eff6aefbb9d commit abf911af22729858cc876231e7970eff6aefbb9d Author: Pavel Knoblokh AuthorDate: 2026-02-05 03:59:21 +0000 Commit: Kyle Evans CommitDate: 2026-02-05 03:59:21 +0000 pkg: Fix mirror type parsing and service discovery Signed-off-by: Pavel Knoblokh Reviewed by: emaste, imp, kevans Fixes: dc4581589a3 ("pkg: clean support for repositories") Closes: https://github.com/freebsd/freebsd-src/pull/1989 --- usr.sbin/pkg/config.c | 3 ++- usr.sbin/pkg/pkg.c | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/usr.sbin/pkg/config.c b/usr.sbin/pkg/config.c index 6649e75b7f6b..8405a4c658fb 100644 --- a/usr.sbin/pkg/config.c +++ b/usr.sbin/pkg/config.c @@ -328,7 +328,8 @@ parse_mirror_type(struct repository *r, const char *mt) { if (strcasecmp(mt, "srv") == 0) r->mirror_type = MIRROR_SRV; - r->mirror_type = MIRROR_NONE; + else + r->mirror_type = MIRROR_NONE; } static void diff --git a/usr.sbin/pkg/pkg.c b/usr.sbin/pkg/pkg.c index 7b0a67e69a4c..33a404474cf2 100644 --- a/usr.sbin/pkg/pkg.c +++ b/usr.sbin/pkg/pkg.c @@ -334,6 +334,12 @@ fetchfail: } cleanup: + fetchFreeURL(u); + while (mirrors != NULL) { + current = mirrors; + mirrors = mirrors->next; + free(current); + } if (remote != NULL) fclose(remote);