diff options
Diffstat (limited to 'security/openssh')
| -rw-r--r-- | security/openssh/Makefile | 16 | ||||
| -rw-r--r-- | security/openssh/PLIST | 7 | ||||
| -rw-r--r-- | security/openssh/distinfo | 12 | ||||
| -rw-r--r-- | security/openssh/patches/patch-aa | 21 | ||||
| -rw-r--r-- | security/openssh/patches/patch-ab | 25 | ||||
| -rw-r--r-- | security/openssh/patches/patch-ah | 12 |
6 files changed, 57 insertions, 36 deletions
diff --git a/security/openssh/Makefile b/security/openssh/Makefile index bbdce61784f..e435009365d 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.72 2002/06/15 21:20:04 cjep Exp $ +# $NetBSD: Makefile,v 1.73 2002/06/25 02:13:11 itojun Exp $ -DISTNAME= openssh-3.2.3p1 -PKGNAME= openssh-3.2.3.1 +DISTNAME= openssh-3.3p1 +PKGNAME= openssh-3.3.0.1 SVR4_PKGNAME= ossh CATEGORIES= security MASTER_SITES= ftp://gd.tuwien.ac.at/opsys/OpenBSD/OpenSSH/portable/ \ @@ -27,7 +27,6 @@ CRYPTO= yes BUILD_DEFS+= USE_INET6 #BUILD_DEFS+= KERBEROS BUILD_DEFS+= PKG_SYSCONFDIR -BUILD_DEFS+= SSH_SUID .include "../../mk/bsd.prefs.mk" @@ -48,8 +47,7 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --with-pid-dir=${SSH_PID_DIR} CONFIGURE_ARGS+= --with-ssl-dir=${BUILDLINK_DIR} CONFIGURE_ARGS+= --with-tcp-wrappers=${BUILDLINK_DIR} -# necessary until openssh distribution fixes ordering of "-lcrypt -lcrypto" -CONFIGURE_ARGS+= --with-md5-passwords +CONFIGURE_ARGS+= --with-privsep-path=/var/chroot/sshd # XXX: PAM authentication causes memory faults, and I haven't tracked down # XXX: why yet. For the moment, disable PAM authentication. @@ -72,11 +70,6 @@ CONFIGURE_ARGS+= --with-md5-passwords #CONFIGURE_ARGS+= --with-kerberos4=/usr #.endif -# Don't install "ssh" setuid -.if !defined(SSH_SUID) || ${SSH_SUID} != YES -CONFIGURE_ARGS+= --disable-suid-ssh -.endif - # The ssh-askpass program is in ${X11BASE}/bin or ${X11PREFIX}/bin depending # on if it's part of the X11 distribution, or if it's installed from pkgsrc # (security/ssh-askpass). @@ -127,6 +120,7 @@ post-install: # ${INSTALL_DATA} ${WRKSRC}/contrib/sshd.pam.freebsd ${EGDIR}/sshd.pam #.endif ${INSTALL_SCRIPT} ${WRKDIR}/sshd ${PREFIX}/etc/rc.d/sshd + ${MKDIR} /var/chroot/sshd .include "../../devel/zlib/buildlink.mk" .include "../../security/openssl/buildlink.mk" diff --git a/security/openssh/PLIST b/security/openssh/PLIST index 7068133532c..cd06143f77f 100644 --- a/security/openssh/PLIST +++ b/security/openssh/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/02/05 04:17:31 jlam Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/06/25 02:13:12 itojun Exp $ bin/scp bin/sftp bin/slogin @@ -9,6 +9,7 @@ bin/ssh-keygen bin/ssh-keyscan etc/rc.d/sshd libexec/sftp-server +libexec/ssh-keysign man/man1/scp.1 man/man1/sftp.1 man/man1/slogin.1 @@ -17,10 +18,14 @@ man/man1/ssh-agent.1 man/man1/ssh-keygen.1 man/man1/ssh-keyscan.1 man/man1/ssh.1 +man/man5/ssh_config.5 +man/man5/sshd_config.5 man/man8/sftp-server.8 +man/man8/ssh-keysign.8 man/man8/sshd.8 sbin/sshd share/examples/openssh/moduli share/examples/openssh/ssh_config share/examples/openssh/sshd_config @dirrm share/examples/openssh +@exec mkdir -p /var/chroot/sshd diff --git a/security/openssh/distinfo b/security/openssh/distinfo index 816c82163c5..37e00151910 100644 --- a/security/openssh/distinfo +++ b/security/openssh/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.17 2002/05/24 04:11:47 itojun Exp $ +$NetBSD: distinfo,v 1.18 2002/06/25 02:13:12 itojun Exp $ -SHA1 (openssh-3.2.3p1.tar.gz) = 537d8401d04e2a41fcfc7489f779cb669b1aea15 -Size (openssh-3.2.3p1.tar.gz) = 823051 bytes -SHA1 (patch-aa) = 719c2780e1f5a97e2f731feac39b8bdab4d8cf7b -SHA1 (patch-ab) = 4b7b8455ac4ce7a6fcaffb9d40aac98e8c42fedf -SHA1 (patch-ah) = e77a6b29294727c6507da10c71092e4f2bf5b71f +SHA1 (openssh-3.3p1.tar.gz) = 386212e32297acec0f0f2e84cca457be61e4ee53 +Size (openssh-3.3p1.tar.gz) = 831189 bytes +SHA1 (patch-aa) = 0287823fc0c5953996891576b4d3571e08618b3d +SHA1 (patch-ab) = 8a7c9c0802a5089ef25ae91a520772a09a2b5000 +SHA1 (patch-ah) = 9913c868bde5d318915b1dee2c05dcf454a0f506 diff --git a/security/openssh/patches/patch-aa b/security/openssh/patches/patch-aa index ebbe50ea835..abd58346255 100644 --- a/security/openssh/patches/patch-aa +++ b/security/openssh/patches/patch-aa @@ -1,8 +1,10 @@ -$NetBSD: patch-aa,v 1.23 2002/05/19 07:43:24 itojun Exp $ +$NetBSD: patch-aa,v 1.24 2002/06/25 02:13:12 itojun Exp $ ---- configure.orig Thu May 16 08:42:51 2002 -+++ configure Sun May 19 16:36:33 2002 -@@ -3941,8 +3941,6 @@ +use libcrypt before libcrypto, as crypt() in libcrypt is more than just for DES + +--- configure.orig Sat Jun 22 00:56:52 2002 ++++ configure Tue Jun 25 10:54:48 2002 +@@ -3943,8 +3943,6 @@ CFLAGS="$CFLAGS" ;; *-*-solaris*) @@ -32,7 +34,16 @@ $NetBSD: patch-aa,v 1.23 2002/05/19 07:43:24 itojun Exp $ #include <tcpd.h> int deny_severity = 0, allow_severity = 0; -@@ -17642,7 +17647,7 @@ +@@ -8051,7 +8056,7 @@ + + + fi; +-LIBS="$LIBS -lcrypto" ++LIBS="$LIBS -lcrypt -lcrypto" + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" + #include "confdefs.h" +@@ -17485,7 +17490,7 @@ echo " User binaries: $B" echo " System binaries: $C" echo " Configuration files: $D" diff --git a/security/openssh/patches/patch-ab b/security/openssh/patches/patch-ab index 2184aa45c47..9e5e6427917 100644 --- a/security/openssh/patches/patch-ab +++ b/security/openssh/patches/patch-ab @@ -1,8 +1,10 @@ -$NetBSD: patch-ab,v 1.10 2002/05/19 07:43:25 itojun Exp $ +$NetBSD: patch-ab,v 1.11 2002/06/25 02:13:13 itojun Exp $ ---- configure.ac.orig Mon May 13 14:14:08 2002 -+++ configure.ac Sun May 19 16:35:27 2002 -@@ -182,8 +182,6 @@ +use libcrypt before libcrypto, as crypt() in libcrypt is more than just for DES + +--- configure.ac.orig Fri Jun 21 09:01:19 2002 ++++ configure.ac Tue Jun 25 10:54:10 2002 +@@ -183,8 +183,6 @@ CFLAGS="$CFLAGS" ;; *-*-solaris*) @@ -11,7 +13,7 @@ $NetBSD: patch-ab,v 1.10 2002/05/19 07:43:25 itojun Exp $ need_dash_r=1 AC_DEFINE(PAM_SUN_CODEBASE) AC_DEFINE(LOGIN_NEEDS_UTMPX) -@@ -311,6 +309,9 @@ +@@ -310,6 +308,9 @@ ;; esac @@ -21,7 +23,7 @@ $NetBSD: patch-ab,v 1.10 2002/05/19 07:43:25 itojun Exp $ # Allow user to specify flags AC_ARG_WITH(cflags, [ --with-cflags Specify additional flags to pass to compiler], -@@ -544,6 +545,10 @@ +@@ -543,6 +544,10 @@ AC_MSG_CHECKING(for libwrap) AC_TRY_LINK( [ @@ -32,7 +34,16 @@ $NetBSD: patch-ab,v 1.10 2002/05/19 07:43:25 itojun Exp $ #include <tcpd.h> int deny_severity = 0, allow_severity = 0; ], -@@ -2383,7 +2388,7 @@ +@@ -725,7 +730,7 @@ + fi + ] + ) +-LIBS="$LIBS -lcrypto" ++LIBS="$LIBS -lcrypt -lcrypto" + AC_TRY_LINK_FUNC(RAND_add, AC_DEFINE(HAVE_OPENSSL), + [ + dnl Check default openssl install dir +@@ -2372,7 +2377,7 @@ echo " User binaries: $B" echo " System binaries: $C" echo " Configuration files: $D" diff --git a/security/openssh/patches/patch-ah b/security/openssh/patches/patch-ah index 35b7c7da927..2f981f210bd 100644 --- a/security/openssh/patches/patch-ah +++ b/security/openssh/patches/patch-ah @@ -1,7 +1,7 @@ -$NetBSD: patch-ah,v 1.18 2002/05/19 07:43:25 itojun Exp $ +$NetBSD: patch-ah,v 1.19 2002/06/25 02:13:13 itojun Exp $ ---- Makefile.in.orig Mon May 13 13:12:05 2002 -+++ Makefile.in Sun May 19 16:37:28 2002 +--- Makefile.in.orig Fri Jun 21 10:38:53 2002 ++++ Makefile.in Tue Jun 25 10:50:44 2002 @@ -21,7 +21,7 @@ DESTDIR= VPATH=@srcdir@ @@ -9,9 +9,9 @@ $NetBSD: patch-ah,v 1.18 2002/05/19 07:43:25 itojun Exp $ -ASKPASS_PROGRAM=$(libexecdir)/ssh-askpass +#ASKPASS_PROGRAM=$(libexecdir)/ssh-askpass SFTP_SERVER=$(libexecdir)/sftp-server - PRIVSEP_PATH=@PRIVSEP_PATH@ - -@@ -198,7 +198,7 @@ + SSH_KEYSIGN=$(libexecdir)/ssh-keysign + RAND_HELPER=$(libexecdir)/ssh-rand-helper +@@ -203,7 +203,7 @@ scard-install: (cd scard && $(MAKE) DESTDIR=$(DESTDIR) install) |