summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authoritojun <itojun>2000-11-09 09:18:23 +0000
committeritojun <itojun>2000-11-09 09:18:23 +0000
commit5f67b510fdf79fac51faaccf94d6b4c82d267bed (patch)
treec60bf9ec11b40da5c11d49fc8dc37b2721378797 /security
parent5e20b8dc5ef45d921cd322c5c8e5eb1e50a6a5a1 (diff)
downloadpkgsrc-5f67b510fdf79fac51faaccf94d6b4c82d267bed.tar.gz
upgrade to 2.3.0p1. XXX pathname for ssh-askpass?
20001106 - (djm) Use Jim's new 1.0.3 askpass in Redhat RPMs - (djm) Manually fix up missed diff hunks (mainly RCS idents) - (djm) Remove UPGRADING document in favour of a link to the better maintained FAQ on www.openssh.com - (djm) Fix multiple dependancy on gnome-libs from Pekka Savola <pekkas@netcore.fi> - (djm) Don't need X11-askpass in RPM spec file if building without it from Pekka Savola <pekkas@netcore.fi> - (djm) Release 2.3.0p1 20001105 - (bal) Sync with OpenBSD: - markus@cvs.openbsd.org 2000/10/31 9:31:58 [compat.c] handle all old openssh versions - markus@cvs.openbsd.org 2000/10/31 13:1853 [deattack.c] so that large packets do not wrap "n"; from netbsd - (bal) rijndel.c - fix up RCSID to match OpenBSD tree - (bal) auth2-skey.c - Checked in. Missing from portable tree. - (bal) Reworked NEWS-OS and NeXT ports to extract waitpid() and setsid() into more common files - (stevesk) pty.c: use __hpux to identify HP-UX. - (bal) Missed auth-skey.o in Makefile.in and minor correction to bsd-waitpid.c 20001029 - (stevesk) Fix typo in auth.c: USE_PAM not PAM - (stevesk) Create contrib/cygwin/ directory; patch from Corinna Vinschen <vinschen@redhat.com> - (bal) Resolved more $xno and $xyes issues in configure.in - (bal) next-posix.h - spelling and forgot a prototype 20001028 - (djm) fix select hack in serverloop.c from Philippe WILLEM <Philippe.WILLEM@urssaf.fr> - (djm) Fix mangled AIXAUTHENTICATE code - (djm) authctxt->pw may be NULL. Fix from Markus Friedl <markus.friedl@informatik.uni-erlangen.de> - (djm) Sync with OpenBSD: - markus@cvs.openbsd.org 2000/10/16 15:46:32 [ssh.1] fixes from pekkas@netcore.fi - markus@cvs.openbsd.org 2000/10/17 14:28:11 [atomicio.c] return number of characters processed; ok deraadt@ - markus@cvs.openbsd.org 2000/10/18 12:04:02 [atomicio.c] undo - markus@cvs.openbsd.org 2000/10/18 12:23:02 [scp.c] replace atomicio(read,...) with read(); ok deraadt@ - markus@cvs.openbsd.org 2000/10/18 12:42:00 [session.c] restore old record login behaviour - deraadt@cvs.openbsd.org 2000/10/19 10:41:13 [auth-skey.c] fmt string problem in unused code - provos@cvs.openbsd.org 2000/10/19 10:45:16 [sshconnect2.c] don't reference freed memory. okay deraadt@ - markus@cvs.openbsd.org 2000/10/21 11:04:23 [canohost.c] typo, eramore@era-t.ericsson.se; ok niels@ - markus@cvs.openbsd.org 2000/10/23 13:31:55 [cipher.c] non-alignment dependent swap_bytes(); from simonb@wasabisystems.com/netbsd - markus@cvs.openbsd.org 2000/10/26 12:38:28 [compat.c] add older vandyke products - markus@cvs.openbsd.org 2000/10/27 01:32:19 [channels.c channels.h clientloop.c serverloop.c session.c] [ssh.c util.c] enable non-blocking IO on channels, and tty's (except for the client ttys). 20001027 - (djm) Increase REKEY_BYTES to 2^24 for arc4random 20001025 - (djm) Added WARNING.RNG file and modified configure to ask users of the builtin entropy code to read it. - (djm) Prefer builtin regex to PCRE. - (bal) Added USE_PIPS defined to NeXT configure.in since scp hangs randomly. - (bal) Apply fixes to configure.in pointed out by Pavel Roskin <proski@gnu.org> 20001020 - (djm) Don't define _REENTRANT for SNI/Reliant Unix - (bal) Imported NEWS-OS waitpid() macros into NeXT. Since implementation is more correct then current version. 20001018 - (stevesk) Add initial support for setproctitle(). Current support is for the HP-UX pstat(PSTAT_SETCMD, ...) method. - (stevesk) Add egd startup scripts to contrib/hpux/ 20001017 - (djm) Add -lregex to cywin libs from Corinna Vinschen <vinschen@cygnus.com> - (djm) Don't rely on atomicio's retval to determine length of askpass supplied passphrase. Problem report from Lutz Jaenicke <Lutz.Jaenicke@aet.TU-Cottbus.DE> - (bal) Changed from GNU rx to PCRE on suggestion from djm. - (bal) Integrated Sony NEWS-OS patches from NAKAJI Hirouyuki <nakaji@tutrp.tut.ac.jp> 20001016 - (djm) Sync with OpenBSD: - markus@cvs.openbsd.org 2000/10/14 04:01:15 [cipher.c] debug3 - markus@cvs.openbsd.org 2000/10/14 04:07:23 [scp.c] remove spaces from arguments; from djm@mindrot.org - markus@cvs.openbsd.org 2000/10/14 06:09:46 [ssh.1] Cipher is for SSH-1 only - markus@cvs.openbsd.org 2000/10/14 06:12:09 [servconf.c servconf.h serverloop.c session.c sshd.8] AllowTcpForwarding; from naddy@ - markus@cvs.openbsd.org 2000/10/14 06:16:56 [auth2.c compat.c compat.h sshconnect2.c version.h] OpenSSH_2.3; note that is is not complete, but the version number needs to be changed for interoperability reasons - markus@cvs.openbsd.org 2000/10/14 06:19:45 [auth-rsa.c] do not send RSA challenge if key is not allowed by key-options; from eivind@ThinkSec.com - markus@cvs.openbsd.org 2000/10/15 08:14:01 [rijndael.c session.c] typos; from stevesk@sweden.hp.com - markus@cvs.openbsd.org 2000/10/15 08:18:31 [rijndael.c] typo - (djm) Copy manpages back over from OpenBSD - too tedious to wade through diffs - (djm) Added condrestart to Redhat init script. Patch from Pekka Savola <pekkas@netcore.fi> - (djm) Update version in Redhat spec file - (djm) Merge some of Nalin Dahyabhai <nalin@redhat.com> changes from the Redhat 7.0 spec file - (djm) Make inability to read/write PRNG seedfile non-fatal 20001015 - (djm) Fix ssh2 hang on background processes at logout. 20001014 - (bal) Add support for realpath and getcwd for platforms with broken or missing realpath implementations for sftp-server. - (bal) Corrected mistake in INSTALL in regards to GNU rx library - (bal) Add support for GNU rx library for those lacking regexp support - (djm) Don't accept PAM_PROMPT_ECHO_ON messages during initial auth - (djm) Revert SSH2 serverloop hack, will find a better way. - (djm) Add workaround for Linux 2.4's gratuitious errno change. Patch from Martin Johansson <fatbob@acc.umu.se> - (djm) Big OpenBSD sync: - markus@cvs.openbsd.org 2000/09/30 10:27:44 [log.c] allow loglevel debug - markus@cvs.openbsd.org 2000/10/03 11:59:57 [packet.c] hmac->mac - markus@cvs.openbsd.org 2000/10/03 12:03:03 [auth-krb4.c auth-passwd.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c auth1.c] move fake-auth from auth1.c to individual auth methods, disables s/key in debug-msg - markus@cvs.openbsd.org 2000/10/03 12:16:48 ssh.c do not resolve canonname, i have no idea why this was added oin ossh - markus@cvs.openbsd.org 2000/10/09 15:30:44 ssh-keygen.1 ssh-keygen.c -X now reads private ssh.com DSA keys, too. - markus@cvs.openbsd.org 2000/10/09 15:32:34 auth-options.c clear options on every call. - markus@cvs.openbsd.org 2000/10/09 15:51:00 authfd.c authfd.h interop with ssh-agent2, from <res@shore.net> - markus@cvs.openbsd.org 2000/10/10 14:20:45 compat.c use rexexp for version string matching - provos@cvs.openbsd.org 2000/10/10 22:02:18 [kex.c kex.h myproposal.h ssh.h ssh2.h sshconnect2.c sshd.c dh.c dh.h] First rough implementation of the diffie-hellman group exchange. The client can ask the server for bigger groups to perform the diffie-hellman in, thus increasing the attack complexity when using ciphers with longer keys. University of Windsor provided network, T the company. - markus@cvs.openbsd.org 2000/10/11 13:59:52 [auth-rsa.c auth2.c] clear auth options unless auth sucessfull - markus@cvs.openbsd.org 2000/10/11 14:00:27 [auth-options.h] clear auth options unless auth sucessfull - markus@cvs.openbsd.org 2000/10/11 14:03:27 [scp.1 scp.c] support 'scp -o' with help from mouring@pconline.com - markus@cvs.openbsd.org 2000/10/11 14:11:35 [dh.c] Wall - markus@cvs.openbsd.org 2000/10/11 14:14:40 [auth.h auth2.c readconf.c readconf.h readpass.c servconf.c servconf.h] [ssh.h sshconnect2.c sshd_config auth2-skey.c cli.c cli.h] add support for s/key (kbd-interactive) to ssh2, based on work by mkiernan@avantgo.com and me - markus@cvs.openbsd.org 2000/10/11 14:27:24 [auth.c auth1.c auth2.c authfile.c cipher.c cipher.h kex.c kex.h] [myproposal.h packet.c readconf.c session.c ssh.c ssh.h sshconnect1.c] [sshconnect2.c sshd.c] new cipher framework - markus@cvs.openbsd.org 2000/10/11 14:45:21 [cipher.c] remove DES - markus@cvs.openbsd.org 2000/10/12 03:59:20 [cipher.c cipher.h sshconnect1.c sshconnect2.c sshd.c] enable DES in SSH-1 clients only - markus@cvs.openbsd.org 2000/10/12 08:21:13 [kex.h packet.c] remove unused - markus@cvs.openbsd.org 2000/10/13 12:34:46 [sshd.c] Kludge for F-Secure Macintosh < 1.0.2; appro@fy.chalmers.se - markus@cvs.openbsd.org 2000/10/13 12:59:15 [cipher.c cipher.h myproposal.h rijndael.c rijndael.h] rijndael/aes support - markus@cvs.openbsd.org 2000/10/13 13:10:54 [sshd.8] more info about -V - markus@cvs.openbsd.org 2000/10/13 13:12:02 [myproposal.h] prefer no compression - (djm) Fix scp user@host handling - (djm) Don't clobber ssh_prng_cmds on install - (stevesk) Include config.h in rijndael.c so we define intXX_t and u_intXX_t types on all platforms. - (stevesk) rijndael.c: cleanup missing declaration warnings. - (stevesk) ~/.hushlogin shouldn't cause required password change to be bypassed. - (stevesk) Display correct path to ssh-askpass in configure output. Report from Lutz Jaenicke. 20001007 - (stevesk) Print PAM return value in PAM log messages to aid with debugging. - (stevesk) Fix detection of pw_class struct member in configure; patch from KAMAHARA Junzo <kamahara@cc.kshosen.ac.jp> 20001002 - (djm) Fix USER_PATH, report from Kevin Steves <stevesk@sweden.hp.com> - (djm) Add host system and CC to end-of-configure report. Suggested by Lutz Jaenicke <Lutz.Jaenicke@aet.TU-Cottbus.DE> 20000931 - (djm) Cygwin fixes from Corinna Vinschen <vinschen@cygnus.com> 20000930 - (djm) Irix ssh_prng_cmds path fix from Pekka Savola <pekkas@netcore.fi> - (djm) Support in bsd-snprintf.c for long long conversions from Ben Lindstrom <mouring@pconline.com> - (djm) Cleanup NeXT support from Ben Lindstrom <mouring@pconline.com> - (djm) Ignore SIGPIPEs from serverloop to child. Fixes crashes with very short lived X connections. Bug report from Tobias Oetiker <oetiker@ee.ethz.ch>. Fix from Markus Friedl <markus@cvs.openbsd.org> - (djm) Add recent InitScripts as a RPM dependancy for openssh-server patch from Pekka Savola <pekkas@netcore.fi> - (djm) Forgot to cvs add LICENSE file - (djm) Add LICENSE to RPM spec files - (djm) CVS OpenBSD sync: - markus@cvs.openbsd.org 2000/09/26 13:59:59 [clientloop.c] use debug2 - markus@cvs.openbsd.org 2000/09/27 15:41:34 [auth2.c sshconnect2.c] use key_type() - markus@cvs.openbsd.org 2000/09/28 12:03:18 [channels.c] debug -> debug2 cleanup - (djm) Irix strips "/dev/tty" from [uw]tmp entries (other systems only strip "/dev/"). Fix loginrec.c based on patch from Alain St-Denis <Alain.St-Denis@ec.gc.ca> - (djm) Fix 9 character passphrase failure with gnome-ssh-askpass. Problem was caused by interrupted read in ssh-add. Report from Donald J. Barry <don@astro.cornell.edu> 20000929 - (djm) Fix SSH2 not terminating until all background tasks done problem. - (djm) Another off-by-one fix from Pavel Kankovsky <peak@argo.troja.mff.cuni.cz> - (djm) Clean up. Strip some unnecessary differences with OpenBSD's code, tidy necessary differences. Use Markus' new debugN() in entropy.c - (djm) Merged big SCO portability patch from Tim Rice <tim@multitalents.net> 20000926 - (djm) Update X11-askpass to 1.0.2 in RPM spec file - (djm) Define _REENTRANT to pickup strtok_r() on HP/UX - (djm) Security: fix off-by-one buffer overrun in fake-getnameinfo.c. Report and fix from Pavel Kankovsky <peak@argo.troja.mff.cuni.cz> 20000924 - (djm) Merged cleanup patch from Mark Miller <markm@swoon.net> - (djm) A bit more cleanup - created cygwin_util.h - (djm) Include strtok_r() from OpenBSD libc. Fixes report from Mark Miller <markm@swoon.net> 20000923 - (djm) Fix address logging in utmp from Kevin Steves <stevesk@sweden.hp.com> - (djm) Redhat spec and manpage fixes from Pekka Savola <pekkas@netcore.fi> - (djm) Seperate tests for int64_t and u_int64_t types - (djm) Tweak password expiry checking at suggestion of Kevin Steves <stevesk@sweden.hp.com> - (djm) NeXT patch from Ben Lindstrom <mouring@pconline.com> - (djm) Use printf %lld instead of %qd in sftp-server.c. Fix from Michael Stone <mstone@cs.loyola.edu> - (djm) OpenBSD CVS sync: - markus@cvs.openbsd.org 2000/09/17 09:38:59 [sshconnect2.c sshd.c] fix DEBUG_KEXDH - markus@cvs.openbsd.org 2000/09/17 09:52:51 [sshconnect.c] yes no; ok niels@ - markus@cvs.openbsd.org 2000/09/21 04:55:11 [sshd.8] typo - markus@cvs.openbsd.org 2000/09/21 05:03:54 [serverloop.c] typo - markus@cvs.openbsd.org 2000/09/21 05:11:42 scp.c utime() to utimes(); mouring@pconline.com - markus@cvs.openbsd.org 2000/09/21 05:25:08 sshconnect2.c change login logic in ssh2, allows plugin of other auth methods - markus@cvs.openbsd.org 2000/09/21 05:25:35 [auth2.c channels.c channels.h clientloop.c dispatch.c dispatch.h] [serverloop.c] add context to dispatch_run - markus@cvs.openbsd.org 2000/09/21 05:07:52 authfd.c authfd.h ssh-agent.c bug compat for old ssh.com software 20000920 - (djm) Fix bad path substitution. Report from Andrew Miner <asminer@cs.iastate.edu> 20000916 - (djm) Fix SSL search order from Lutz Jaenicke <Lutz.Jaenicke@aet.TU-Cottbus.DE> - (djm) New SuSE spec from Corinna Vinschen <corinna@vinschen.de> - (djm) Update CygWin support from Corinna Vinschen <vinschen@cygnus.com> - (djm) Use a real struct sockaddr inside the fake struct sockaddr_storage. Patch from Larry Jones <larry.jones@sdrc.com> - (djm) Add Steve VanDevender's <stevev@darkwing.uoregon.edu> PAM password change patch. - (djm) Bring licenses on my stuff in line with OpenBSD's - (djm) Cleanup auth-passwd.c and unify HP/UX authentication. Patch from Kevin Steves <stevesk@sweden.hp.com> - (djm) Shadow expiry check fix from Pavel Troller <patrol@omni.sinus.cz> - (djm) Re-enable int64_t types - we need them for sftp - (djm) Use libexecdir from configure , rather than libexecdir/ssh - (djm) Update Redhat SPEC file accordingly - (djm) Add Kevin Steves <stevesk@sweden.hp.com> HP/UX contrib files - (djm) Add Charles Levert <charles@comm.polymtl.ca> getpgrp patch - (djm) Fix password auth on HP/UX 10.20. Patch from Dirk De Wachter <Dirk.DeWachter@rug.ac.be> - (djm) Fixprogs and entropy list fixes from Larry Jones <larry.jones@sdrc.com> - (djm) Fix for SuSE spec file from Takashi YOSHIDA <tyoshida@gemini.rc.kyushu-u.ac.jp> - (djm) Merge OpenBSD changes: - markus@cvs.openbsd.org 2000/09/05 02:59:57 [session.c] print hostname (not hushlogin) - markus@cvs.openbsd.org 2000/09/05 13:18:48 [authfile.c ssh-add.c] enable ssh-add -d for DSA keys - markus@cvs.openbsd.org 2000/09/05 13:20:49 [sftp-server.c] cleanup - markus@cvs.openbsd.org 2000/09/06 03:46:41 [authfile.h] prototype - deraadt@cvs.openbsd.org 2000/09/07 14:27:56 [ALL] cleanup copyright notices on all files. I have attempted to be accurate with the details. everything is now under Tatu's licence (which I copied from his readme), and/or the core-sdi bsd-ish thing for deattack, or various openbsd developers under a 2-term bsd licence. We're not changing any rules, just being accurate. - markus@cvs.openbsd.org 2000/09/07 14:40:30 [channels.c channels.h clientloop.c serverloop.c ssh.c] cleanup window and packet sizes for ssh2 flow control; ok niels - markus@cvs.openbsd.org 2000/09/07 14:53:00 [scp.c] typo - markus@cvs.openbsd.org 2000/09/07 15:13:37 [auth-options.c auth-options.h auth-rh-rsa.c auth-rsa.c auth.c] [authfile.h canohost.c channels.h compat.c hostfile.h log.c match.h] [pty.c readconf.c] some more Copyright fixes - markus@cvs.openbsd.org 2000/09/08 03:02:51 [README.openssh2] bye bye - deraadt@cvs.openbsd.org 2000/09/11 18:38:33 [LICENCE cipher.c] a few more comments about it being ARC4 not RC4 - markus@cvs.openbsd.org 2000/09/12 14:53:11 [log-client.c log-server.c log.c ssh.1 ssh.c ssh.h sshd.8 sshd.c] multiple debug levels - markus@cvs.openbsd.org 2000/09/14 14:25:15 [clientloop.c] typo - deraadt@cvs.openbsd.org 2000/09/15 01:13:51 [ssh-agent.c] check return value for setenv(3) for failure, and deal appropriately 20000913 - (djm) Fix server not exiting with jobs in background. 20000905 - (djm) Import OpenBSD CVS changes - markus@cvs.openbsd.org 2000/08/31 15:52:24 [Makefile sshd.8 sshd_config sftp-server.8 sftp-server.c] implement a SFTP server. interops with sftp2, scp2 and the windows client from ssh.com - markus@cvs.openbsd.org 2000/08/31 15:56:03 [README.openssh2] sync - markus@cvs.openbsd.org 2000/08/31 16:05:42 [session.c] Wall - markus@cvs.openbsd.org 2000/08/31 16:09:34 [authfd.c ssh-agent.c] add a flag to SSH2_AGENTC_SIGN_REQUEST for future extensions - deraadt@cvs.openbsd.org 2000/09/01 09:25:13 [scp.1 scp.c] cleanup and fix -S support; stevesk@sweden.hp.com - markus@cvs.openbsd.org 2000/09/01 16:29:32 [sftp-server.c] portability fixes - markus@cvs.openbsd.org 2000/09/01 16:32:41 [sftp-server.c] fix cast; mouring@pconline.com - itojun@cvs.openbsd.org 2000/09/03 09:23:28 [ssh-add.1 ssh.1] add missing .El against .Bl. - markus@cvs.openbsd.org 2000/09/04 13:03:41 [session.c] missing close; ok theo - markus@cvs.openbsd.org 2000/09/04 13:07:21 [session.c] fix get_last_login_time order; from andre@van-veen.de - markus@cvs.openbsd.org 2000/09/04 13:10:09 [sftp-server.c] more cast fixes; from mouring@pconline.com - markus@cvs.openbsd.org 2000/09/04 13:06:04 [session.c] set SSH_ORIGINAL_COMMAND; from Leakin@dfw.nostrum.com, bet@rahul.net - (djm) Cleanup after import. Fix sftp-server compilation, Makefile - (djm) Merge cygwin support from Corinna Vinschen <vinschen@cygnus.com> 20000903 - (djm) Fix Redhat init script 20000901 - (djm) Pick up Jim's new X11-askpass - (djm) Release 2.2.0p1
Diffstat (limited to 'security')
-rw-r--r--security/openssh/Makefile4
-rw-r--r--security/openssh/files/md54
-rw-r--r--security/openssh/files/patch-sum9
-rw-r--r--security/openssh/patches/patch-aa35
-rw-r--r--security/openssh/patches/patch-ae24
-rw-r--r--security/openssh/patches/patch-ah40
-rw-r--r--security/openssh/patches/patch-aj12
-rw-r--r--security/openssh/pkg/PLIST6
8 files changed, 73 insertions, 61 deletions
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index c8034c0a55d..af2b4cdb9b4 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2000/09/28 16:31:15 hubertf Exp $
+# $NetBSD: Makefile,v 1.31 2000/11/09 09:18:23 itojun Exp $
#
-DISTNAME= openssh-2.2.0p1
+DISTNAME= openssh-2.3.0p1
CATEGORIES= security
MASTER_SITES= http://the.wiretapped.net/security/cryptography/ssh/OpenSSH/files/ \
http://www.firedrake.org/openssh/files/ \
diff --git a/security/openssh/files/md5 b/security/openssh/files/md5
index c44456a5d87..3f902968112 100644
--- a/security/openssh/files/md5
+++ b/security/openssh/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.9 2000/09/04 00:47:50 itojun Exp $
+$NetBSD: md5,v 1.10 2000/11/09 09:18:24 itojun Exp $
-MD5 (openssh-2.2.0p1.tar.gz) = 8da6e2ad58be86e195cbdf82f7803feb
+MD5 (openssh-2.3.0p1.tar.gz) = b3d53dfb45da6e7bf88aaaf65b528aac
diff --git a/security/openssh/files/patch-sum b/security/openssh/files/patch-sum
index b2ea70f4165..6e65c44e9ed 100644
--- a/security/openssh/files/patch-sum
+++ b/security/openssh/files/patch-sum
@@ -1,7 +1,6 @@
-$NetBSD: patch-sum,v 1.20 2000/10/15 14:17:13 itojun Exp $
+$NetBSD: patch-sum,v 1.21 2000/11/09 09:18:24 itojun Exp $
-MD5 (patch-aa) = f03194df0ea8e068b57f3ea71ef2f5aa
-MD5 (patch-ae) = efdaabad2d0ac4c40c5b7d4cb833feaf
-MD5 (patch-ah) = 4259ece36472f4c21a6344ce61e6b344
-MD5 (patch-aj) = 5397d9fbfe54544fd186831cfe979329
+MD5 (patch-aa) = c56c29774b368e412e942b73d64d55a6
+MD5 (patch-ae) = 62661f8a920ea0b12a1604c1a6c0a490
+MD5 (patch-ah) = a73b90de7d5096baa1761d06c475d74e
MD5 (patch-an) = eccf8c19bcee913de49eb2b38999e609
diff --git a/security/openssh/patches/patch-aa b/security/openssh/patches/patch-aa
index 97d6fe53b6d..25699584041 100644
--- a/security/openssh/patches/patch-aa
+++ b/security/openssh/patches/patch-aa
@@ -1,12 +1,18 @@
-$NetBSD: patch-aa,v 1.12 2000/10/15 14:17:14 itojun Exp $
+$NetBSD: patch-aa,v 1.13 2000/11/09 09:18:24 itojun Exp $
---- configure.in.orig Thu Aug 31 07:20:05 2000
-+++ configure.in Thu Oct 12 09:23:08 2000
-@@ -337,2 +337,3 @@
+--- configure.in.orig Sun Nov 5 18:08:45 2000
++++ configure.in Thu Nov 9 18:03:33 2000
+@@ -389,6 +389,7 @@
+ saved_LIBS="$LIBS"
+ saved_LDFLAGS="$LDFLAGS"
saved_CFLAGS="$CFLAGS"
+crypto_LIBS=""
if test "x$prefix" != "xNONE" ; then
-@@ -353,8 +354,21 @@
+ tryssldir="$tryssldir $prefix"
+ fi
+@@ -405,12 +406,25 @@
+ LDFLAGS="$saved_LDFLAGS"
+ fi
- LIBS="$saved_LIBS -lcrypto"
-
@@ -34,7 +40,11 @@ $NetBSD: patch-aa,v 1.12 2000/10/15 14:17:14 itojun Exp $
+ AC_TRY_RUN(
+ [
#include <string.h>
-@@ -368,8 +382,10 @@
+ #include <openssl/rand.h>
+ int main(void)
+@@ -420,12 +434,14 @@
+ RAND_add(a, sizeof(a), sizeof(a));
+ return(RAND_status() <= 0);
}
- ],
- [
@@ -51,13 +61,14 @@ $NetBSD: patch-aa,v 1.12 2000/10/15 14:17:14 itojun Exp $
+ )
+ done
-@@ -403,3 +419,3 @@
+ if test ! -z "$found_crypto" ; then
+ break;
+@@ -455,7 +471,7 @@
+ blibpath="$blibpath:$ssldir:$ssldir/lib"
+ fi
fi
-LIBS="$saved_LIBS -lcrypto"
+LIBS="$saved_LIBS $crypto_LIBS"
-@@ -764,3 +780,3 @@
- ],
-- [ struct passwd p s; p.pw_class = NULL; ],
-+ [ struct passwd p; p.pw_class = NULL; ],
- [ ac_cv_have_pw_class_in_struct_passwd="yes" ],
+ # Now test RSA support
+ saved_LIBS="$LIBS"
diff --git a/security/openssh/patches/patch-ae b/security/openssh/patches/patch-ae
index 9031cf082cc..a9753b53edb 100644
--- a/security/openssh/patches/patch-ae
+++ b/security/openssh/patches/patch-ae
@@ -1,12 +1,20 @@
-$NetBSD: patch-ae,v 1.5 2000/09/04 00:47:50 itojun Exp $
+$NetBSD: patch-ae,v 1.6 2000/11/09 09:18:24 itojun Exp $
---- ssh-add.1.orig Tue Aug 29 09:33:51 2000
-+++ ssh-add.1 Mon Sep 4 09:39:21 2000
-@@ -68,2 +68,3 @@
- .Pp
+--- ssh-add.1.orig Sat Sep 16 11:29:10 2000
++++ ssh-add.1 Thu Nov 9 18:03:59 2000
+@@ -66,6 +66,7 @@
+ .Bl -tag -width Ds
+ .It Fl l
+ Lists fingerprints of all identities currently represented by the agent.
+.El
+ .It Fl L
+ Lists public key parameters of all identities currently represented by the agent.
+ .It Fl d
+@@ -91,6 +92,7 @@
+ Contains the DSA authentication identity of the user.
+ .El
.Sh ENVIRONMENT
-@@ -93,2 +94,3 @@
- to make this work.)
+.El
- .Sh AUTHOR
+ .Bl -tag -width Ds
+ .It Ev "DISPLAY" and "SSH_ASKPASS"
+ If
diff --git a/security/openssh/patches/patch-ah b/security/openssh/patches/patch-ah
index 8e23dc53de9..c098575dec5 100644
--- a/security/openssh/patches/patch-ah
+++ b/security/openssh/patches/patch-ah
@@ -1,7 +1,9 @@
-$NetBSD: patch-ah,v 1.8 2000/08/11 05:19:44 jlam Exp $
+$NetBSD: patch-ah,v 1.9 2000/11/09 09:18:24 itojun Exp $
---- Makefile.in.orig Tue Jul 11 07:34:34 2000
-+++ Makefile.in Fri Aug 11 01:10:25 2000
+ssh-askpass: assumes NetBSD 1.5 path, could be wrong
+
+--- Makefile.in.orig Mon Nov 6 06:13:45 2000
++++ Makefile.in Thu Nov 9 18:11:16 2000
@@ -6,6 +6,7 @@
mandir=@mandir@
mansubdir=@mansubdir@
@@ -14,12 +16,12 @@ $NetBSD: patch-ah,v 1.8 2000/08/11 05:19:44 jlam Exp $
VPATH=@srcdir@
SSH_PROGRAM=@bindir@/ssh
--ASKPASS_LOCATION=@libexecdir@/ssh
-+#ASKPASS_LOCATION=@libexecdir@/ssh
- ASKPASS_PROGRAM=$(ASKPASS_LOCATION)/ssh-askpass
+-ASKPASS_PROGRAM=$(libexecdir)/ssh-askpass
++ASKPASS_PROGRAM=/usr/X11R6/bin/ssh-askpass
CC=@CC@
-@@ -115,7 +116,7 @@
+ LD=@LD@
+@@ -119,7 +120,7 @@
distprep: catman-do
autoreconf
@@ -27,29 +29,31 @@ $NetBSD: patch-ah,v 1.8 2000/08/11 05:19:44 jlam Exp $
+install: manpages $(TARGETS) install-files
install-files:
- ./mkinstalldirs $(DESTDIR)$(bindir)
-@@ -139,14 +140,14 @@
- ln -s ssh $(DESTDIR)$(bindir)/slogin
+ $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
+@@ -147,15 +148,15 @@
-rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
ln -s ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
+ @FILEPRIV@ -f dev,filesys,driver $(DESTDIR)$(bindir)/ssh $(DESTDIR)$(bindir)/slogin
- if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config -a ! -f $(DESTDIR)$(sysconfdir)/sshd_config ]; then \
-- ./mkinstalldirs $(DESTDIR)$(sysconfdir); \
+- $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \
- $(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(sysconfdir)/ssh_config; \
- $(INSTALL) -m 644 sshd_config.out $(DESTDIR)$(sysconfdir)/sshd_config; \
+ if [ ! -f $(DESTDIR)$(examplesdir)/ssh_config -a ! -f $(DESTDIR)$(examplesdir)/sshd_config ]; then \
-+ ./mkinstalldirs $(DESTDIR)$(examplesdir); \
++ $(srcdir)/mkinstalldirs $(DESTDIR)$(examplesdir); \
+ $(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(examplesdir)/ssh_config; \
+ $(INSTALL) -m 644 sshd_config.out $(DESTDIR)$(examplesdir)/sshd_config; \
fi
if [ -f ssh_prng_cmds -a ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \
- $(PERL) fixprogs ssh_prng_cmds $(ENT); \
-- $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \
-+ $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(examplesdir)/ssh_prng_cmds; \
+ $(PERL) $(srcdir)/fixprogs ssh_prng_cmds $(ENT); \
+- if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds ] ; then \
+- $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \
++ if [ ! -f $(DESTDIR)$(examplesdir)/ssh_prng_cmds ] ; then \
++ $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(examplesdir)/ssh_prng_cmds; \
+ fi ; \
fi
- host-key: ssh-keygen
-@@ -168,10 +169,10 @@
- ./ssh-keygen -d -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key -N ""
+@@ -178,10 +179,10 @@
+ $(srcdir)/ssh-keygen -d -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key -N ""
uninstallall: uninstall
- -rm -f $(DESTDIR)$(sysconfdir)/ssh_config
diff --git a/security/openssh/patches/patch-aj b/security/openssh/patches/patch-aj
deleted file mode 100644
index 1111a969841..00000000000
--- a/security/openssh/patches/patch-aj
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aj,v 1.2 2000/06/15 04:56:51 itojun Exp $
-
---- ssh.1.orig Wed Jun 7 18:55:44 2000
-+++ ssh.1 Thu Jun 15 13:46:26 2000
-@@ -948,2 +948,3 @@
- .Pa /usr/X11R6/bin/xauth .
-+.El
- .Sh ENVIRONMENT
-@@ -1191,2 +1192,3 @@
- is required for proper operation.
-+.El
- .Sh AUTHOR
diff --git a/security/openssh/pkg/PLIST b/security/openssh/pkg/PLIST
index c9f27721648..d55e7143dbf 100644
--- a/security/openssh/pkg/PLIST
+++ b/security/openssh/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2000/09/20 04:49:19 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2000/11/09 09:18:25 itojun Exp $
bin/scp
bin/slogin
bin/ssh
@@ -6,12 +6,14 @@ bin/ssh-add
bin/ssh-agent
bin/ssh-keygen
etc/rc.d/sshd
-man/man1/ssh.1
+libexec/sftp-server
man/man1/scp.1
man/man1/slogin.1
man/man1/ssh-add.1
man/man1/ssh-agent.1
man/man1/ssh-keygen.1
+man/man1/ssh.1
+man/man8/sftp-server.8
man/man8/sshd.8
sbin/sshd
share/examples/ssh/ssh_config
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-02 06:47:28 +0000