Re: git: dd2c7a1e797f - main - misc/compat10x: remove pam_ssh.so.5 and add a dep on compat13x
- Reply: Baptiste Daroussin : "Re: git: dd2c7a1e797f - main - misc/compat10x: remove pam_ssh.so.5 and add a dep on compat13x"
- In reply to: Baptiste Daroussin : "git: dd2c7a1e797f - main - misc/compat10x: remove pam_ssh.so.5 and add a dep on compat13x"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 23 Apr 2025 09:46:32 UTC
Baptiste Daroussin <bapt@FreeBSD.org> writes: > The branch main has been updated by bapt: > > URL: https://cgit.FreeBSD.org/ports/commit/?id=dd2c7a1e797fda40b1f9a31079275c022a2f8018 > > commit dd2c7a1e797fda40b1f9a31079275c022a2f8018 > Author: Baptiste Daroussin <bapt@FreeBSD.org> > AuthorDate: 2025-03-18 16:20:58 +0000 > Commit: Baptiste Daroussin <bapt@FreeBSD.org> > CommitDate: 2025-03-18 16:56:33 +0000 > > misc/compat10x: remove pam_ssh.so.5 and add a dep on compat13x > > 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. > > Remove pam_ssh.so.5 which drops the dependency on libssh > > 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= compat10x > PORTVERSION= 10.4.1004000.20181014 > +PORTREVISION= 1 > CATEGORIES= misc > MASTER_SITES= LOCAL/des > PKGNAMESUFFIX= -${ARCH} > @@ -22,6 +23,10 @@ USE_LDCONFIG= ${TARGET_DIR} > USE_LDCONFIG32= ${TARGET32_DIR} > .endif > > +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1300000 > +RUN_DEPENDS+= compat12x-${ARCH}>=0: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 -- Dag-Erling Smørgrav - des@FreeBSD.org