CVS commit: pkgsrc/security/openssh

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Jul 23 06:37:01 UTC 2024

Modified Files:
        pkgsrc/security/openssh: Makefile PLIST

Log Message:
openssh: finish removal of macports changes


To generate a diff of this commit:
cvs rdiff -u -r1.284 -r1.285 pkgsrc/security/openssh/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/security/openssh/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/openssh/Makefile
diff -u pkgsrc/security/openssh/Makefile:1.284 pkgsrc/security/openssh/Makefile:1.285
--- pkgsrc/security/openssh/Makefile:1.284      Tue Jul 23 05:56:16 2024
+++ pkgsrc/security/openssh/Makefile    Tue Jul 23 06:37:00 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.284 2024/07/23 05:56:16 wiz Exp $
+# $NetBSD: Makefile,v 1.285 2024/07/23 06:37:00 wiz Exp $
 
 DISTNAME=              openssh-9.8p1
 PKGREVISION=           1
@@ -109,17 +109,8 @@ CONFIGURE_ARGS+=   --with-xauth=${PREFIX}/
 
 CONFS=                 ssh_config sshd_config moduli
 
-PLIST_VARS+=           darwin
-
 EGDIR=                 ${PREFIX}/share/examples/${PKGBASE}
 
-# enable privsep patches
-.if ${OPSYS} == "Darwin"
-CONF_FILES+=           ${EGDIR}/org.openssh.sshd.sb ${PKG_SYSCONFDIR}/org.openssh.sshd.sb
-CPPFLAGS+=             -D__APPLE_SANDBOX_NAMED_EXTERNAL__
-PLIST.darwin=          yes
-.endif
-
 .for f in ${CONFS}
 CONF_FILES+=           ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
@@ -131,12 +122,6 @@ SMF_METHODS=               sshd
 
 FILES_SUBST+=          SSH_PID_DIR=${SSH_PID_DIR}
 
-SUBST_CLASSES+=                patch
-SUBST_STAGE.patch=     pre-configure
-SUBST_FILES.patch=     sandbox-darwin.c
-SUBST_SED.patch=       -e '/channel_input_port_forward_request/s/0/ROOTUID/'
-SUBST_VARS.patch=      PKG_SYSCONFDIR
-
 .include "../../devel/zlib/buildlink3.mk"
 
 #
@@ -154,9 +139,6 @@ post-configure:
                ${SED} -e '/HAVE_ECDSA_START/,/HAVE_ECDSA_STOP/d' \
                        ${FILESDIR}/sshd.sh > ${WRKDIR}/sshd.sh; \
        fi
-       ${SED} -e 's,@VARBASE@,${VARBASE},g' \
-               < ${FILESDIR}/org.openssh.sshd.sb.in \
-               > ${WRKDIR}/org.openssh.sshd.sb
 
 post-install:
        ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
@@ -167,9 +149,5 @@ post-install:
        ${INSTALL_DATA} ${WRKSRC}/contrib/sshd.pam.generic \
          ${DESTDIR}${EGDIR}/sshd.pam
 .endif
-.if ${OPSYS} == "Darwin"
-       ${INSTALL_DATA} ${WRKDIR}/org.openssh.sshd.sb \
-               ${DESTDIR}${EGDIR}/org.openssh.sshd.sb
-.endif
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/openssh/PLIST
diff -u pkgsrc/security/openssh/PLIST:1.21 pkgsrc/security/openssh/PLIST:1.22
--- pkgsrc/security/openssh/PLIST:1.21  Mon Jul  1 09:19:40 2024
+++ pkgsrc/security/openssh/PLIST       Tue Jul 23 06:37:00 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2024/07/01 09:19:40 wiz Exp $
+@comment $NetBSD: PLIST,v 1.22 2024/07/23 06:37:00 wiz Exp $
 bin/scp
 bin/sftp
 bin/ssh
@@ -28,7 +28,6 @@ man/man8/ssh-sk-helper.8
 man/man8/sshd.8
 sbin/sshd
 share/examples/openssh/moduli
-${PLIST.darwin}share/examples/openssh/org.openssh.sshd.sb
 share/examples/openssh/ssh_config
 ${PLIST.pam}share/examples/openssh/sshd.pam
 share/examples/openssh/sshd_config