From nobody Wed Apr 23 09:46:32 2025 X-Original-To: dev-commits-ports-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 4ZjDlG6hVlz5t7vl; Wed, 23 Apr 2025 09:46:34 +0000 (UTC) (envelope-from des@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZjDlG0xKDz3mj8; Wed, 23 Apr 2025 09:46:34 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745401594; 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: in-reply-to:in-reply-to:references:references; bh=yv7ER8dgQooC8tgdgJ5kIG+f0YLNeiR/4qoRiXWWtgo=; b=DV4BWQEpl+0tAqxWXIkkegEsSH2XZ36TC3tf/Gh3ow5rsf504Z1cv41URby/IVX3PbU7wo sF9VjuVJ0aZBSOoXtz+psd0gFJ2Ji8FgsD5Ok2Sldb/1+kwTflA9VmX0O5IxcDzh8sK5fa 3lbHEHjOySKsMvjWgX6PEBhZqTF87qWxDW+Dlqo44Y/7AgxhHt1tQf0CSII8ja/0cDel4K And8EM1AClOoFjxr9wh2EsxDc0NRL2x++gLBmyeF9zDdVZHi7kbuDyFeoLUHsaCwagZRDa kV2VjK5STJrpGoTU5U7b5MtE5OR5nSqBZv2G415buggQF09DULIvT57r30S3+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745401594; a=rsa-sha256; cv=none; b=wj4uxHAwmcTziRLSzM33cf6sGdgQFuEp4kCLQSqhMPt9qA/MrzNNaT1eMp9DgZ/hpUbhU6 tKwC382vgMDFoVmoVRzJy2pVpIv9sc/wucKIsNeMR9AJlmtyamiFqkye2DuBJ/UgFajIxK QuSYL2vsV7IcbJMryAm0ncqok3Rq9YoZvRWNLe+DXMhOIw3Xp0ZkwMp1OR1UuTQCBPneda lHclwinuiyMwEHRSgnqyPTmOZAJ4AdeWi2PjUEKOzYCZD4K+Fn2ZXnGuBkHhPw8W872cgF Ulc5eHX9kQNlxajc1ON8mP02S36dRIUW/gL8P0viH93Kik2yhzW3EtPb+I7KsQ== 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=1745401594; 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: in-reply-to:in-reply-to:references:references; bh=yv7ER8dgQooC8tgdgJ5kIG+f0YLNeiR/4qoRiXWWtgo=; b=SPAoJNr0ueplzLQUd7EmoAncY3pw1CUNjFaD+ScdER1HMJJqOTDMwGzatWoj/r06Nz/gHY RzmCOo0MnV1p+94Fm4WnkFXtUAWNJScXB0S0dPFpfBVBRFkyqFuYu2qvijuDqpaaJfVOrF pFlf7cuRYTHpNwTBYZSUOoxGHjtEti/klsx8wGV4VFyOLpIJ0/DFZeckqoeeWft1iTqCR0 UcDNClBH/OPffNAukWnr99qipZDdkCM/dZLK5ijQtYHI13Ur+FRJLWWJ0Esmy87rTSh8DP F35SKGQZYvtEc5wnYg39bTWg4IDp8szeVSSEp8qAuTfZbqarYi/ee3/gE2lieQ== Received: from ltc.des.dev (unknown [IPv6:2a01:e0a:c54:bed0:922e:16ff:fef1:acef]) (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) (Authenticated sender: des) by smtp.freebsd.org (Postfix) with ESMTPSA id 4ZjDlF6gWRzJkQ; Wed, 23 Apr 2025 09:46:33 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id 0A329F8DBC; Wed, 23 Apr 2025 11:46:32 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Baptiste Daroussin Cc: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: Re: git: dd2c7a1e797f - main - misc/compat10x: remove pam_ssh.so.5 and add a dep on compat13x In-Reply-To: <202503181656.52IGubi0021658@gitrepo.freebsd.org> (Baptiste Daroussin's message of "Tue, 18 Mar 2025 16:56:37 GMT") References: <202503181656.52IGubi0021658@gitrepo.freebsd.org> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Wed, 23 Apr 2025 11:46:32 +0200 Message-ID: <86y0vrus5j.fsf@ltc.des.dev> List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Baptiste Daroussin writes: > The branch main has been updated by bapt: > > URL: https://cgit.FreeBSD.org/ports/commit/?id=3Ddd2c7a1e797fda40b1f9a310= 79275c022a2f8018 > > commit dd2c7a1e797fda40b1f9a31079275c022a2f8018 > Author: Baptiste Daroussin > AuthorDate: 2025-03-18 16:20:58 +0000 > Commit: Baptiste Daroussin > CommitDate: 2025-03-18 16:56:33 +0000 > > misc/compat10x: remove pam_ssh.so.5 and add a dep on compat13x >=20=20=20=20=20 > It depends on libssh.so.5 which was never added to the package, which > means hasn't been functional as is. as libssh.so.5 was a private lib = in > FreeBSD 10 un usr/lib/private, and also depends on other private libs > it's complicated to decide how to package it. >=20=20=20=20=20 > Remove pam_ssh.so.5 which drops the dependency on libssh >=20=20=20=20=20 > While here add a dependency on compat13x for libncurses. > --- > misc/compat10x/Makefile | 5 +++++ > misc/compat10x/pkg-plist.amd64 | 4 ++-- > 2 files changed, 7 insertions(+), 2 deletions(-) > > diff --git a/misc/compat10x/Makefile b/misc/compat10x/Makefile > index 95f41994f837..6354b9fb0188 100644 > --- a/misc/compat10x/Makefile > +++ b/misc/compat10x/Makefile > @@ -1,5 +1,6 @@ > PORTNAME=3D compat10x > PORTVERSION=3D 10.4.1004000.20181014 > +PORTREVISION=3D 1 > CATEGORIES=3D misc > MASTER_SITES=3D LOCAL/des > PKGNAMESUFFIX=3D -${ARCH} > @@ -22,6 +23,10 @@ USE_LDCONFIG=3D ${TARGET_DIR} > USE_LDCONFIG32=3D ${TARGET32_DIR} > .endif >=20=20 > +.if ${OPSYS} =3D=3D FreeBSD && ${OSVERSION} >=3D 1300000 > +RUN_DEPENDS+=3D compat12x-${ARCH}>=3D0:misc/compat12x > +.endif > + First of all, the OSVERSION check should trigger on 1200000, not 1300000. As a rule, compatNx should be available on N so you can preinstall it before upgrading from N to N+1. Second, compat10x worked (and should still work) just fine since libssh.so.5 is still available. Third, it does not make sense to me for compat10x to depend on compat13x. What would make sense would be to systematically add a RUN_DEPEND on compat(N+1)x to compatNx, so compat10x depends on compat11x, which depends on compat12x, etc. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org