PERFORCE change 29571 for review
Peter Wemm
peter at FreeBSD.org
Wed Apr 23 17:19:42 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=29571
Change 29571 by peter at peter_overcee on 2003/04/23 17:19:17
IFC @29567
Affected files ...
.. //depot/projects/hammer/UPDATING#7 integrate
.. //depot/projects/hammer/crypto/openssh/ChangeLog#3 integrate
.. //depot/projects/hammer/crypto/openssh/FREEBSD-tricks#2 integrate
.. //depot/projects/hammer/crypto/openssh/FREEBSD-upgrade#4 integrate
.. //depot/projects/hammer/crypto/openssh/Makefile.in#3 integrate
.. //depot/projects/hammer/crypto/openssh/README#2 integrate
.. //depot/projects/hammer/crypto/openssh/README.privsep#2 integrate
.. //depot/projects/hammer/crypto/openssh/TODO#3 integrate
.. //depot/projects/hammer/crypto/openssh/acconfig.h#4 integrate
.. //depot/projects/hammer/crypto/openssh/auth-krb4.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/auth-krb5.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/auth-pam.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/auth-passwd.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/auth-sia.c#2 integrate
.. //depot/projects/hammer/crypto/openssh/auth-sia.h#2 integrate
.. //depot/projects/hammer/crypto/openssh/auth.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/auth1.c#4 integrate
.. //depot/projects/hammer/crypto/openssh/auth2-pam.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/auth2.c#4 integrate
.. //depot/projects/hammer/crypto/openssh/authfd.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/authfd.h#3 integrate
.. //depot/projects/hammer/crypto/openssh/authfile.c#2 integrate
.. //depot/projects/hammer/crypto/openssh/bufaux.c#2 integrate
.. //depot/projects/hammer/crypto/openssh/canohost.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/channels.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/cipher.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/clientloop.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/compat.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/compat.h#3 integrate
.. //depot/projects/hammer/crypto/openssh/config.guess#3 integrate
.. //depot/projects/hammer/crypto/openssh/config.h#3 integrate
.. //depot/projects/hammer/crypto/openssh/config.sub#3 integrate
.. //depot/projects/hammer/crypto/openssh/configure.ac#3 integrate
.. //depot/projects/hammer/crypto/openssh/crc32.c#2 integrate
.. //depot/projects/hammer/crypto/openssh/crc32.h#2 integrate
.. //depot/projects/hammer/crypto/openssh/defines.h#3 integrate
.. //depot/projects/hammer/crypto/openssh/dh.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/fixpaths#2 integrate
.. //depot/projects/hammer/crypto/openssh/hostfile.h#3 integrate
.. //depot/projects/hammer/crypto/openssh/includes.h#3 integrate
.. //depot/projects/hammer/crypto/openssh/kex.c#2 integrate
.. //depot/projects/hammer/crypto/openssh/kex.h#3 integrate
.. //depot/projects/hammer/crypto/openssh/kexdh.c#2 integrate
.. //depot/projects/hammer/crypto/openssh/kexdhc.c#1 branch
.. //depot/projects/hammer/crypto/openssh/kexdhs.c#1 branch
.. //depot/projects/hammer/crypto/openssh/kexgex.c#2 integrate
.. //depot/projects/hammer/crypto/openssh/kexgexc.c#1 branch
.. //depot/projects/hammer/crypto/openssh/kexgexs.c#1 branch
.. //depot/projects/hammer/crypto/openssh/key.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/key.h#2 integrate
.. //depot/projects/hammer/crypto/openssh/log.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/loginrec.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/misc.c#2 integrate
.. //depot/projects/hammer/crypto/openssh/monitor.c#5 integrate
.. //depot/projects/hammer/crypto/openssh/monitor_wrap.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/msg.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/msg.h#3 integrate
.. //depot/projects/hammer/crypto/openssh/openbsd-compat/Makefile.in#3 integrate
.. //depot/projects/hammer/crypto/openssh/openbsd-compat/base64.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/openbsd-compat/base64.h#2 integrate
.. //depot/projects/hammer/crypto/openssh/openbsd-compat/basename.c#1 branch
.. //depot/projects/hammer/crypto/openssh/openbsd-compat/basename.h#1 branch
.. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-arc4random.c#2 integrate
.. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-cray.h#3 integrate
.. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#2 integrate
.. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-getpeereid.c#2 integrate
.. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-misc.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-misc.h#2 integrate
.. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-snprintf.c#2 integrate
.. //depot/projects/hammer/crypto/openssh/openbsd-compat/fake-getaddrinfo.c#2 integrate
.. //depot/projects/hammer/crypto/openssh/openbsd-compat/fake-getaddrinfo.h#2 integrate
.. //depot/projects/hammer/crypto/openssh/openbsd-compat/getcwd.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/openbsd-compat/getopt.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/openbsd-compat/mktemp.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/openbsd-compat/mktemp.h#2 integrate
.. //depot/projects/hammer/crypto/openssh/openbsd-compat/openbsd-compat.h#3 integrate
.. //depot/projects/hammer/crypto/openssh/openbsd-compat/port-aix.h#3 integrate
.. //depot/projects/hammer/crypto/openssh/openbsd-compat/setenv.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/openbsd-compat/setproctitle.c#2 integrate
.. //depot/projects/hammer/crypto/openssh/openbsd-compat/setproctitle.h#2 integrate
.. //depot/projects/hammer/crypto/openssh/openbsd-compat/sys-tree.h#2 integrate
.. //depot/projects/hammer/crypto/openssh/openbsd-compat/vis.c#1 branch
.. //depot/projects/hammer/crypto/openssh/openbsd-compat/vis.h#1 branch
.. //depot/projects/hammer/crypto/openssh/packet.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/packet.h#2 integrate
.. //depot/projects/hammer/crypto/openssh/progressmeter.c#1 branch
.. //depot/projects/hammer/crypto/openssh/progressmeter.h#1 branch
.. //depot/projects/hammer/crypto/openssh/readconf.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/readconf.h#2 integrate
.. //depot/projects/hammer/crypto/openssh/readpass.c#2 integrate
.. //depot/projects/hammer/crypto/openssh/regress/Makefile#2 integrate
.. //depot/projects/hammer/crypto/openssh/regress/agent-getpeereid.sh#1 branch
.. //depot/projects/hammer/crypto/openssh/regress/agent-ptrace.sh#1 branch
.. //depot/projects/hammer/crypto/openssh/regress/agent-timeout.sh#1 branch
.. //depot/projects/hammer/crypto/openssh/regress/keygen-change.sh#1 branch
.. //depot/projects/hammer/crypto/openssh/regress/proxy-connect.sh#2 integrate
.. //depot/projects/hammer/crypto/openssh/regress/sftp-batch.sh#1 branch
.. //depot/projects/hammer/crypto/openssh/regress/sftp-cmds.sh#1 branch
.. //depot/projects/hammer/crypto/openssh/regress/ssh-com-client.sh#2 integrate
.. //depot/projects/hammer/crypto/openssh/regress/ssh-com-keygen.sh#2 integrate
.. //depot/projects/hammer/crypto/openssh/regress/ssh-com-sftp.sh#2 integrate
.. //depot/projects/hammer/crypto/openssh/regress/ssh-com.sh#2 integrate
.. //depot/projects/hammer/crypto/openssh/scp.1#2 integrate
.. //depot/projects/hammer/crypto/openssh/scp.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/servconf.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/serverloop.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/session.c#5 integrate
.. //depot/projects/hammer/crypto/openssh/sftp-client.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/sftp-common.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/sftp-int.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/sftp-int.h#2 integrate
.. //depot/projects/hammer/crypto/openssh/sftp-server.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/sftp.1#3 integrate
.. //depot/projects/hammer/crypto/openssh/sftp.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/ssh-add.1#2 integrate
.. //depot/projects/hammer/crypto/openssh/ssh-add.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/ssh-agent.1#2 integrate
.. //depot/projects/hammer/crypto/openssh/ssh-agent.c#4 integrate
.. //depot/projects/hammer/crypto/openssh/ssh-dss.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/ssh-dss.h#2 integrate
.. //depot/projects/hammer/crypto/openssh/ssh-keygen.1#2 integrate
.. //depot/projects/hammer/crypto/openssh/ssh-keygen.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/ssh-keyscan.1#2 integrate
.. //depot/projects/hammer/crypto/openssh/ssh-keyscan.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/ssh-keysign.8#3 integrate
.. //depot/projects/hammer/crypto/openssh/ssh-keysign.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/ssh-rand-helper.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/ssh-rsa.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/ssh-rsa.h#2 integrate
.. //depot/projects/hammer/crypto/openssh/ssh.1#3 integrate
.. //depot/projects/hammer/crypto/openssh/ssh.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/ssh_config#4 integrate
.. //depot/projects/hammer/crypto/openssh/ssh_config.5#4 integrate
.. //depot/projects/hammer/crypto/openssh/sshconnect.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/sshconnect2.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/sshd.8#4 integrate
.. //depot/projects/hammer/crypto/openssh/sshd.c#4 integrate
.. //depot/projects/hammer/crypto/openssh/sshd_config#4 integrate
.. //depot/projects/hammer/crypto/openssh/sshd_config.5#4 integrate
.. //depot/projects/hammer/crypto/openssh/sshpty.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/version.h#4 integrate
.. //depot/projects/hammer/etc/rc#8 integrate
.. //depot/projects/hammer/etc/rc.d/bgfsck#3 integrate
.. //depot/projects/hammer/etc/syslog.conf#6 integrate
.. //depot/projects/hammer/lib/libc/gen/getgrent.c#5 integrate
.. //depot/projects/hammer/lib/libdisk/rules.c#8 integrate
.. //depot/projects/hammer/lib/libpthread/Makefile#5 integrate
.. //depot/projects/hammer/lib/libpthread/arch/i386/include/ksd.h#2 integrate
.. //depot/projects/hammer/lib/libpthread/sys/thr_error.c#4 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_kern.c#6 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_private.h#5 integrate
.. //depot/projects/hammer/release/Makefile#13 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#12 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#14 integrate
.. //depot/projects/hammer/release/ia64/doFS.sh#3 integrate
.. //depot/projects/hammer/release/scripts/doFS.sh#6 integrate
.. //depot/projects/hammer/sbin/kldconfig/Makefile#2 integrate
.. //depot/projects/hammer/sbin/kldconfig/kldconfig.c#2 integrate
.. //depot/projects/hammer/sbin/kldload/Makefile#2 integrate
.. //depot/projects/hammer/sbin/kldstat/Makefile#2 integrate
.. //depot/projects/hammer/sbin/kldstat/kldstat.c#2 integrate
.. //depot/projects/hammer/sbin/kldunload/Makefile#2 integrate
.. //depot/projects/hammer/sbin/kldunload/kldunload.c#2 integrate
.. //depot/projects/hammer/sbin/sunlabel/Makefile#3 integrate
.. //depot/projects/hammer/sbin/sunlabel/runtest.sh#2 integrate
.. //depot/projects/hammer/sbin/sunlabel/sunlabel.c#3 integrate
.. //depot/projects/hammer/secure/lib/Makefile#3 integrate
.. //depot/projects/hammer/secure/lib/libssh/Makefile#4 integrate
.. //depot/projects/hammer/secure/libexec/Makefile#2 integrate
.. //depot/projects/hammer/secure/libexec/sftp-server/Makefile#2 integrate
.. //depot/projects/hammer/secure/usr.bin/Makefile#2 integrate
.. //depot/projects/hammer/secure/usr.bin/ssh/Makefile#3 integrate
.. //depot/projects/hammer/secure/usr.sbin/sshd/Makefile#3 integrate
.. //depot/projects/hammer/sys/alpha/include/_limits.h#2 integrate
.. //depot/projects/hammer/sys/arm/include/_limits.h#2 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_file.c#5 integrate
.. //depot/projects/hammer/sys/dev/ar/if_ar.c#5 integrate
.. //depot/projects/hammer/sys/dev/ar/if_ar_isa.c#4 integrate
.. //depot/projects/hammer/sys/dev/ar/if_ar_pci.c#3 integrate
.. //depot/projects/hammer/sys/dev/ar/if_arregs.h#3 integrate
.. //depot/projects/hammer/sys/dev/pccard/pccardvar.h#5 integrate
.. //depot/projects/hammer/sys/dev/pci/pcireg.h#2 integrate
.. //depot/projects/hammer/sys/dev/sound/pcm/ac97.c#6 integrate
.. //depot/projects/hammer/sys/dev/sr/if_sr.c#6 integrate
.. //depot/projects/hammer/sys/dev/sr/if_sr_isa.c#3 integrate
.. //depot/projects/hammer/sys/dev/sr/if_sr_pci.c#3 integrate
.. //depot/projects/hammer/sys/dev/sr/if_srregs.h#3 integrate
.. //depot/projects/hammer/sys/geom/geom.h#12 integrate
.. //depot/projects/hammer/sys/geom/geom_bsd.c#12 integrate
.. //depot/projects/hammer/sys/geom/geom_ctl.c#7 integrate
.. //depot/projects/hammer/sys/geom/geom_ctl.h#3 integrate
.. //depot/projects/hammer/sys/geom/geom_disk.c#9 integrate
.. //depot/projects/hammer/sys/geom/geom_dump.c#12 integrate
.. //depot/projects/hammer/sys/geom/geom_event.c#8 integrate
.. //depot/projects/hammer/sys/geom/geom_int.h#8 integrate
.. //depot/projects/hammer/sys/geom/geom_kern.c#9 integrate
.. //depot/projects/hammer/sys/geom/geom_mbr.c#10 integrate
.. //depot/projects/hammer/sys/geom/geom_pc98.c#11 integrate
.. //depot/projects/hammer/sys/geom/geom_slice.c#10 integrate
.. //depot/projects/hammer/sys/geom/geom_slice.h#6 integrate
.. //depot/projects/hammer/sys/geom/geom_subr.c#10 integrate
.. //depot/projects/hammer/sys/geom/geom_sunlabel.c#9 integrate
.. //depot/projects/hammer/sys/i386/include/_limits.h#2 integrate
.. //depot/projects/hammer/sys/ia64/include/_limits.h#2 integrate
.. //depot/projects/hammer/sys/kern/kern_clock.c#7 integrate
.. //depot/projects/hammer/sys/kern/kern_exit.c#12 integrate
.. //depot/projects/hammer/sys/kern/kern_fork.c#11 integrate
.. //depot/projects/hammer/sys/kern/kern_resource.c#9 integrate
.. //depot/projects/hammer/sys/kern/kern_sig.c#9 integrate
.. //depot/projects/hammer/sys/kern/kern_synch.c#11 integrate
.. //depot/projects/hammer/sys/kern/kern_thread.c#19 integrate
.. //depot/projects/hammer/sys/kern/sched_4bsd.c#5 integrate
.. //depot/projects/hammer/sys/kern/sched_ule.c#4 integrate
.. //depot/projects/hammer/sys/kern/subr_prof.c#4 integrate
.. //depot/projects/hammer/sys/kern/subr_trap.c#11 integrate
.. //depot/projects/hammer/sys/kern/vfs_mount.c#9 integrate
.. //depot/projects/hammer/sys/net/if_ethersubr.c#12 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#7 integrate
.. //depot/projects/hammer/sys/pccard/cardinfo.h#2 integrate
.. //depot/projects/hammer/sys/pccard/pccard.c#5 integrate
.. //depot/projects/hammer/sys/pccard/pccard_nbk.c#2 integrate
.. //depot/projects/hammer/sys/pccard/slot.h#2 integrate
.. //depot/projects/hammer/sys/powerpc/include/_limits.h#2 integrate
.. //depot/projects/hammer/sys/sparc64/include/_limits.h#2 integrate
.. //depot/projects/hammer/sys/sys/limits.h#1 branch
.. //depot/projects/hammer/sys/sys/proc.h#16 integrate
.. //depot/projects/hammer/sys/sys/sun_disklabel.h#5 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#10 integrate
.. //depot/projects/hammer/sys/vm/vm_glue.c#12 integrate
.. //depot/projects/hammer/sys/x86_64/include/_limits.h#2 integrate
.. //depot/projects/hammer/usr.bin/m4/m4.1#3 integrate
.. //depot/projects/hammer/usr.sbin/crunch/crunchgen/crunchgen.c#3 integrate
.. //depot/projects/hammer/usr.sbin/newsyslog/newsyslog.8#4 integrate
Differences ...
==== //depot/projects/hammer/UPDATING#7 (text+ko) ====
@@ -62,7 +62,7 @@
20021216:
A name change in /etc/netconfig has been reverted to stay
- compatible with with suns TIRPC and also with NetBSD. You need
+ compatible with suns TIRPC and also with NetBSD. You need
to run mergemaster after make world. A new libc does still work
with an outdated /etc/netconfig for some time, but you'll get
a warning. This warning will be removed in 20030301.
@@ -1234,4 +1234,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.244 2003/03/31 12:46:18 ru Exp $
+$FreeBSD: src/UPDATING,v 1.245 2003/04/23 14:28:13 schweikh Exp $
==== //depot/projects/hammer/crypto/openssh/ChangeLog#3 (text+ko) ====
@@ -1,3 +1,541 @@
+20030401
+ - (djm) OpenBSD CVS Sync
+ - jmc at cvs.openbsd.org 2003/03/28 10:11:43
+ [scp.1 sftp.1 ssh.1 ssh-add.1 ssh-agent.1 ssh_config.5 sshd_config.5]
+ [ssh-keygen.1 ssh-keyscan.1 ssh-keysign.8]
+ - killed whitespace
+ - new sentence new line
+ - .Bk for arguments
+ ok markus@
+ - markus at cvs.openbsd.org 2003/04/01 10:10:23
+ [clientloop.c monitor.c monitor_wrap.c packet.c packet.h readconf.c]
+ [readconf.h serverloop.c sshconnect2.c]
+ rekeying bugfixes and automatic rekeying:
+ * both client and server rekey _automatically_
+ (a) after 2^31 packets, because after 2^32 packets
+ the sequence number for packets wraps
+ (b) after 2^(blocksize_in_bits/4) blocks
+ (see: draft-ietf-secsh-newmodes-00.txt)
+ (a) and (b) are _enabled_ by default, and only disabled for known
+ openssh versions, that don't support rekeying properly.
+ * client option 'RekeyLimit'
+ * do not reply to requests during rekeying
+ - markus at cvs.openbsd.org 2003/04/01 10:22:21
+ [clientloop.c monitor.c monitor_wrap.c packet.c packet.h readconf.c]
+ [readconf.h serverloop.c sshconnect2.c]
+ backout rekeying changes (for 3.6.1)
+ - markus at cvs.openbsd.org 2003/04/01 10:31:26
+ [compat.c compat.h kex.c]
+ bugfix causes stalled connections for ssh.com < 3.0; noticed by ho@;
+ tested by ho@ and myself
+ - markus at cvs.openbsd.org 2003/04/01 10:56:46
+ [version.h]
+ 3.6.1
+ - (djm) Crank spec file versions
+ - (djm) Release 3.6.1p1
+
+20030326
+ - (djm) OpenBSD CVS Sync
+ - deraadt at cvs.openbsd.org 2003/03/26 04:02:51
+ [sftp-server.c]
+ one last fix to the tree: race fix broke stuff; pr 3169;
+ srp at srparish.net, help from djm
+
+20030325
+ - (djm) Fix getpeerid support for 64 bit BE systems. From
+ Arnd Bergmann <arndb at de.ibm.com>
+
+20030324
+ - (djm) OpenBSD CVS Sync
+ - markus at cvs.openbsd.org 2003/03/23 19:02:00
+ [monitor.c]
+ unbreak rekeying for privsep; ok millert@
+ - Release 3.6p1
+ - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
+ Report from murple at murple.net, diagnosis from dtucker at zip.com.au
+
+20030320
+ - (djm) OpenBSD CVS Sync
+ - markus at cvs.openbsd.org 2003/03/17 10:38:38
+ [progressmeter.c]
+ don't print \n if backgrounded; from ho@
+ - markus at cvs.openbsd.org 2003/03/17 11:43:47
+ [version.h]
+ enter 3.6
+ - (bal) The days of lack of int64_t support are over. Sorry kids.
+ - (bal) scp.c 'limit' conflicts with Cray. Rename to 'limitbw'
+ - (bal) Collection of Cray patches (bsd-cray.h fix for CRAYT3E and improved
+ guessing rules)
+ - (bal) Disable Privsep for Tru64 after pre-authentication due to issues
+ with SIA. Also, clean up of tru64 support patch by Chris Adams
+ <cmadams at hiwaay.net>
+ - (tim) [contrib/caldera/openssh.spec] workaround RPM quirk. Fix %files
+
+20030318
+ - (tim) [configure.ac openbsd-compat/bsd-misc.c openbsd-compat/bsd-misc.h]
+ add nanosleep(). testing/corrections by Darren Tucker <dtucker at zip.com.au>
+
+20030317
+ - (djm) Fix return value checks for RAND_bytes. Report from
+ Steve G <linux_4ever at yahoo.com>
+
+20030315
+ - (djm) OpenBSD CVS Sync
+ - markus at cvs.openbsd.org 2003/03/13 11:42:19
+ [authfile.c ssh-keysign.c]
+ move RSA_blinding_on to generic key load method
+ - markus at cvs.openbsd.org 2003/03/13 11:44:50
+ [ssh-agent.c]
+ ssh-agent is similar to ssh-keysign (allows other processes to use
+ private rsa keys). however, it gets key over socket and not from
+ a file, so we have to do blinding here as well.
+
+20030310
+- (djm) OpenBSD CVS Sync
+ - markus at cvs.openbsd.org 2003/03/05 22:33:43
+ [channels.c monitor.c scp.c session.c sftp-client.c sftp-int.c]
+ [sftp-server.c ssh-add.c sshconnect2.c]
+ fix memory leaks; from dlheine at suif.Stanford.EDU/CLOUSEAU; ok djm@
+ - (djm) One more portable-specific one from dlheine at suif.Stanford.EDU/
+ CLOUSEAU
+ - (djm) Bug #245: TTY problems on Solaris. Fix by stevesk@ and
+ dtucker at zip.com.au
+ - (djm) AIX package builder update from dtucker at zip.com.au
+
+20030225
+ - (djm) Fix some compile errors spotted by dtucker and his fabulous
+ tinderbox
+
+20030224
+ - (djm) Tweak gnome-ssh-askpass2:
+ - Retry kb and mouse grab a couple of times, so passphrase dialog doesn't
+ immediately fail if you are doing something else when it appears (e.g.
+ dragging a window)
+ - Perform server grab after we have the keyboard and/or pointer to avoid
+ races.
+ - (djm) OpenBSD CVS Sync
+ - markus at cvs.openbsd.org 2003/01/27 17:06:31
+ [sshd.c]
+ more specific error message when /var/empty has wrong permissions;
+ bug #46, map at appgate.com; ok henning@, provos@, stevesk@
+ - markus at cvs.openbsd.org 2003/01/28 16:11:52
+ [scp.1]
+ document -l; pekkas at netcore.fi
+ - stevesk at cvs.openbsd.org 2003/01/28 17:24:51
+ [scp.1]
+ remove example not pertinent with -1 addition; ok markus@
+ - jmc at cvs.openbsd.org 2003/01/31 21:54:40
+ [sshd.8]
+ typos; sshd(8): help and ok markus@
+ help and ok millert@
+ - markus at cvs.openbsd.org 2003/02/02 10:51:13
+ [scp.c]
+ call okname() only when using system(3) for remote-remote copy;
+ fixes bugs #483, #472; ok deraadt@, mouring@
+ - markus at cvs.openbsd.org 2003/02/02 10:56:08
+ [kex.c]
+ add support for key exchange guesses; based on work by
+ avraham.fraenkel at commatch.com; fixes bug #148; ok deraadt@
+ - markus at cvs.openbsd.org 2003/02/03 08:56:16
+ [sshpty.c]
+ don't call error() for readonly /dev; from soekris list; ok mcbride,
+ henning, deraadt.
+ - markus at cvs.openbsd.org 2003/02/04 09:32:08
+ [key.c]
+ better debug3 message
+ - markus at cvs.openbsd.org 2003/02/04 09:33:22
+ [monitor.c monitor_wrap.c]
+ skey/bsdauth: use 0 to indicate failure instead of -1, because
+ the buffer API only supports unsigned ints.
+ - markus at cvs.openbsd.org 2003/02/05 09:02:28
+ [readconf.c]
+ simplify ProxyCommand parsing, remove strcat/xrealloc; ok henning@, djm@
+ - markus at cvs.openbsd.org 2003/02/06 09:26:23
+ [session.c]
+ missing call to setproctitle() after authentication; ok provos@
+ - markus at cvs.openbsd.org 2003/02/06 09:27:29
+ [ssh.c ssh_config.5]
+ support 'ProxyCommand none'; bugzilla #433; binder at arago.de; ok djm@
+ - markus at cvs.openbsd.org 2003/02/06 09:29:18
+ [sftp-server.c]
+ fix races in rename/symlink; from Tony Finch; ok djm@
+ - markus at cvs.openbsd.org 2003/02/06 21:22:43
+ [auth1.c auth2.c]
+ undo broken fix for #387, fixes #486
+ - markus at cvs.openbsd.org 2003/02/10 11:51:47
+ [ssh-add.1]
+ xref sshd_config.5 (not sshd.8); mark at summersault.com; bug #490
+ - markus at cvs.openbsd.org 2003/02/12 09:33:04
+ [key.c key.h ssh-dss.c ssh-rsa.c]
+ merge ssh-dss.h ssh-rsa.h into key.h; ok deraadt@
+ - markus at cvs.openbsd.org 2003/02/12 21:39:50
+ [crc32.c crc32.h]
+ replace crc32.c with a BSD licensed version; noted by David Turner
+ - markus at cvs.openbsd.org 2003/02/16 17:09:57
+ [kex.c kexdh.c kexgex.c kex.h sshconnect2.c sshd.c ssh-keyscan.c]
+ split kex into client and server code, no need to link
+ server code into the client; ok provos@
+ - markus at cvs.openbsd.org 2003/02/16 17:30:33
+ [monitor.c monitor_wrap.c]
+ fix permitrootlogin forced-commands-only for privsep; bux #387;
+ ok provos@
+ - markus at cvs.openbsd.org 2003/02/21 09:05:53
+ [servconf.c]
+ print sshd_config filename in debug2 mode.
+ - mpech at cvs.openbsd.org 2003/02/21 10:34:48
+ [auth-krb4.c]
+ ...sizeof(&adat.session) is not good here.
+ henning@, deraadt@, millert@
+ - (djm) Add new object files to Makefile and reorder
+ - (djm) Bug #501: gai_strerror should return char*;
+ fix from dtucker at zip.com.au
+ - (djm) Most of Bug #499: Cygwin compile fixes for new progressmeter;
+ From vinschen at redhat.com
+ - (djm) Rest of Bug #499: Import a basename() function from OpenBSD libc
+ - (djm) Bug #494: Allow multiple accounts on Windows 9x/Me;
+ From vinschen at redhat.com
+ - (djm) Bug #456: Support for NEC SX6 with Unicos; from wendyp at cray.com
+
+20030211
+ - (djm) Cygwin needs libcrypt too. Patch from vinschen at redhat.com
+
+20030206
+ - (djm) Teach fake-getaddrinfo to use getservbyname() when provided a
+ string service name. Suggested by markus@, review by itojun@
+
+20030131
+ - (bal) AIX 4.2.1 lacks nanosleep(). Patch to use nsleep() provided by
+ dtucker at zip.com.au
+
+20030130
+ - (djm) Unbreak root password auth. Spotted by dtucker at zip.com.au
+
+200301028
+ - (djm) Search libposix4 and librt for nanosleep. From dtucker at zip.com.au
+ and openssh-unix-dev at thewrittenword.com
+
+200301027
+ - (bal) Bugzilla 477 patch by wendyp at cray.com. Define TIOCGPGRP for
+ cray. Also removed test for tcgetpgrp in configure.ac since it
+ is no longer used.
+
+20030124
+ - (djm) OpenBSD CVS Sync
+ - jmc at cvs.openbsd.org 2003/01/23 08:58:47
+ [sshd_config.5]
+ typos; ok millert@
+ - markus at cvs.openbsd.org 2003/01/23 13:50:27
+ [authfd.c authfd.h readpass.c ssh-add.1 ssh-add.c ssh-agent.c]
+ ssh-add -c, prompt user for confirmation (using ssh-askpass) when
+ private agent key is used; with djm@; test by dugsong@, djm@;
+ ok deraadt@
+ - markus at cvs.openbsd.org 2003/01/23 14:01:53
+ [scp.c]
+ bandwidth limitation patch (scp -l) from niels@; ok todd@, deraadt@
+ - markus at cvs.openbsd.org 2003/01/23 14:06:15
+ [scp.1 scp.c]
+ scp -12; Sam Smith and others; ok provos@, deraadt@
+ - (djm) Add TIMEVAL_TO_TIMESPEC macros
+
+20030123
+ - (djm) OpenBSD CVS Sync
+ - djm at cvs.openbsd.org 2003/01/23 00:03:00
+ [auth1.c]
+ Don't log TIS auth response; "get rid of it" - markus@
+
+20030122
+ - (djm) OpenBSD CVS Sync
+ - marc at cvs.openbsd.org 2003/01/21 18:14:36
+ [ssh-agent.1 ssh-agent.c]
+ Add a -t life option to ssh-agent that set the default lifetime.
+ The default can still be overriden by using -t in ssh-add.
+ OK markus@
+ - (djm) Reorganise PAM & SIA password handling to eliminate some common code
+ - (djm) Sync regress with OpenBSD -current
+
+20030120
+ - (djm) Fix compilation for NetBSD from dtucker at zip.com.au
+ - (tim) [progressmeter.c] make compilers without long long happy.
+ - (tim) [configure.ac] Add -belf to build ELF binaries on OpenServer 5 when
+ using cc. (gcc already did)
+
+20030118
+ - (djm) Revert fix for Bug #442 for now.
+
+20030117
+ - (djm) Bug #470: Detect strnvis, not strvis in configure.
+ From d_wllms at lanl.gov
+
+20030116
+ - (djm) OpenBSD CVS Sync
+ - djm at cvs.openbsd.org 2003/01/16 03:41:55
+ [sftp-int.c]
+ explicitly use first glob result
+
+20030114
+ - (djm) OpenBSD CVS Sync
+ - fgsch at cvs.openbsd.org 2003/01/10 23:23:24
+ [sftp-int.c]
+ typo; from Nils Nordman <nino at nforced dot com>.
+ - markus at cvs.openbsd.org 2003/01/11 18:29:43
+ [log.c]
+ set fatal_cleanups to NULL in fatal_remove_all_cleanups();
+ dtucker at zip.com.au
+ - markus at cvs.openbsd.org 2003/01/12 16:57:02
+ [progressmeter.c]
+ allow WARNINGS=yes; ok djm@
+ - djm at cvs.openbsd.org 2003/01/13 11:04:04
+ [sftp-int.c]
+ make cmds[] array static to avoid conflict with BSDI libc.
+ mindrot bug #466. Fix from mdev at idg.nl; ok markus@
+ - djm at cvs.openbsd.org 2003/01/14 10:58:00
+ [sftp-client.c sftp-int.c]
+ Don't try to upload or download non-regular files. Report from
+ apoloval at pantuflo.escet.urjc.es; ok markus@
+
+20030113
+ - (djm) Rework openbsd-compat/setproctitle.c a bit: move emulation type
+ detection to configure.ac. Prompted by stevesk@
+ - (djm) Bug #467: Add a --disable-strip option to turn off stripping of
+ installed binaries. From mdev at idg.nl
+
+20030110
+ - (djm) Enable new setproctitle emulation for Linux, AIX and HP/UX. More
+ systems may be added later.
+ - (djm) OpenBSD CVS Sync
+ - djm at cvs.openbsd.org 2003/01/08 23:53:26
+ [sftp.1 sftp.c sftp-int.c sftp-int.h]
+ Cleanup error handling for batchmode
+ Allow blank lines and comments in input
+ Ability to suppress abort on error in batchmode ("-put blah")
+ Fixes mindrot bug #452; markus@ ok
+ - fgsch at cvs.openbsd.org 2003/01/10 08:19:07
+ [scp.c sftp.1 sftp.c sftp-client.c sftp-int.c progressmeter.c]
+ [progressmeter.h]
+ sftp progress meter support.
+ original diffs by Nils Nordman <nino at nforced dot com> via
+ markus@, merged to -current by me, djm@ ok.
+ - djm at cvs.openbsd.org 2003/01/10 08:48:15
+ [sftp-client.c]
+ Simplify and avoid redundancy in packet send and receive
+ functions; ok fgs@
+ - djm at cvs.openbsd.org 2003/01/10 10:29:35
+ [scp.c]
+ Don't ftruncate after write error, creating sparse files of
+ incorrect length
+ mindrot bug #403, reported by rusr at cup.hp.com; ok markus@
+ - djm at cvs.openbsd.org 2003/01/10 10:32:54
+ [channels.c]
+ hush socket() errors, except last. Fixes mindrot bug #408; ok markus@
+
+20030108
+ - (djm) Sync openbsd-compat/ with OpenBSD -current
+ - (djm) Avoid redundant xstrdup/xfree in auth2-pam.c. From Solar via markus@
+ - (djm) OpenBSD CVS Sync
+ - markus at cvs.openbsd.org 2003/01/01 18:08:52
+ [channels.c]
+ move big output buffer messages to debug2
+ - djm at cvs.openbsd.org 2003/01/06 23:51:22
+ [sftp-client.c]
+ Fix "get -p" download to not add user-write perm. mindrot bug #426
+ reported by gfernandez at livevault.com; ok markus@
+ - fgsch at cvs.openbsd.org 2003/01/07 23:42:54
+ [sftp.1]
+ add version; from Nils Nordman <nino at nforced dot com> via markus at .
+ markus@ ok
+ - (djm) Update README to reflect AIX's status as a well supported platform.
+ From dtucker at zip.com.au
+ - (tim) [Makefile.in configure.ac] replace fixpath with sed script. Patch
+ by Mo DeJong.
+ - (tim) [auth.c] declare today at top of allowed_user() to keep
+ older compilers happy.
+ - (tim) [scp.c] make compilers without long long happy.
+
+20030107
+ - (djm) Bug #401: Work around Linux breakage with IPv6 mapped addresses.
+ Based on fix from yoshfuji at linux-ipv6.org
+ - (djm) Bug #442: Check for and deny access to accounts with locked
+ passwords. Patch from dtucker at zip.com.au
+ - (djm) Bug #44: Use local mkstemp() rather than glibc's silly one. Fixes
+ Can't pass KRB4 TGT passing. Fix from: jan.iven at cern.ch
+ - (djm) Fix Bug #442 for PAM case
+ - (djm) Bug #110: bogus error messages in lastlog_get_entry(). Fix based
+ on one by peak at argo.troja.mff.cuni.cz
+ - (djm) Bug #111: Run syslog and stderr logging through strnvis to eliminate
+ nasties. Report from peak at argo.troja.mff.cuni.cz
+ - (djm) Bug #178: On AIX /etc/nologin wasnt't shown to users. Fix from
+ Ralf.Wenk at fh-karlsruhe.de and dtucker at zip.com.au
+ - (djm) Fix my fix of the fix for the Bug #442 for PAM case. Spotted by
+ dtucker at zip.com.au. Reorder for clarity too.
+
+20030103
+ - (djm) Bug #461: ssh-copy-id fails with no arguments. Patch from
+ cjwatson at debian.org
+ - (djm) Bug #460: Filling utmp[x]->ut_addr_v6 if present. Patch from
+ cjwatson at debian.org
+ - (djm) Bug #446: Set LOGIN env var to pw_name on AIX. Patch from
+ mii at ornl.gov
+
+20030101
+ - (stevesk) [session.c sshlogin.c sshlogin.h] complete portable
+ parts of pass addrlen with sockaddr * fix.
+ from Hajimu UMEMOTO <ume at FreeBSD.org>
+
+20021222
+ - (bal) OpenBSD CVS Sync
+ - fgsch at cvs.openbsd.org 2002/11/15 10:03:09
+ [authfile.c]
+ lseek(2) may return -1 when getting the public/private key lenght.
+ Simplify the code and check for errors using fstat(2).
+
+ Problem reported by Mauricio Sanchez, markus@ ok.
+ - markus at cvs.openbsd.org 2002/11/18 16:43:44
+ [clientloop.c]
+ don't overwrite SIG{INT,QUIT,TERM} handler if set to SIG_IGN;
+ e.g. if ssh is used for backup; report Joerg Schilling; ok millert@
+ - markus at cvs.openbsd.org 2002/11/21 22:22:50
+ [dh.c]
+ debug->debug2
+ - markus at cvs.openbsd.org 2002/11/21 22:45:31
+ [cipher.c kex.c packet.c sshconnect.c sshconnect2.c]
+ debug->debug2, unify debug messages
+ - deraadt at cvs.openbsd.org 2002/11/21 23:03:51
+ [auth-krb5.c auth1.c hostfile.h monitor_wrap.c sftp-client.c sftp-int.c ssh-add.c ssh-rsa.c
+ sshconnect.c]
+ KNF
+ - markus at cvs.openbsd.org 2002/11/21 23:04:33
+ [ssh.c]
+ debug->debug2
+ - stevesk at cvs.openbsd.org 2002/11/24 21:46:24
+ [ssh-keysign.8]
+ typo: "the the"
+ - wcobb at cvs.openbsd.org 2002/11/26 00:45:03
+ [scp.c ssh-keygen.c]
+ Remove unnecessary fflush(stderr) calls, stderr is unbuffered by default.
+ ok markus@
+ - stevesk at cvs.openbsd.org 2002/11/26 02:35:30
+ [ssh-keygen.1]
+ remove outdated statement; ok markus@ deraadt@
+ - stevesk at cvs.openbsd.org 2002/11/26 02:38:54
+ [canohost.c]
+ KNF, comment and error message repair; ok markus@
+ - markus at cvs.openbsd.org 2002/11/27 17:53:35
+ [scp.c sftp.c ssh.c]
+ allow usernames with embedded '@', e.g. scp user at vhost@realhost:file /tmp;
+ http://bugzilla.mindrot.org/show_bug.cgi?id=447; ok mouring@, millert@
+ - stevesk at cvs.openbsd.org 2002/12/04 04:36:47
+ [session.c]
+ remove xauth entries before add; PR 2994 from janjaap at stack.nl.
+ ok markus@
+ - markus at cvs.openbsd.org 2002/12/05 11:08:35
+ [scp.c]
+ use roundup() similar to rcp/util.c and avoid problems with strange
+ filesystem block sizes, noted by tjr at freebsd.org; ok djm@
+ - djm at cvs.openbsd.org 2002/12/06 05:20:02
+ [sftp.1]
+ Fix cut'n'paste error, spotted by matthias.riese at b-novative.de; ok deraadt@
+ - millert at cvs.openbsd.org 2002/12/09 16:50:30
+ [ssh.c]
+ Avoid setting optind to 0 as GNU getopt treats that like we do optreset.
+ markus@ OK
+ - markus at cvs.openbsd.org 2002/12/10 08:56:00
+ [session.c]
+ Make sure $SHELL points to the shell from the password file, even if shell
+ is overridden from login.conf; bug#453; semen at online.sinor.ru; ok millert@
+ - markus at cvs.openbsd.org 2002/12/10 19:26:50
+ [packet.c]
+ move tos handling to packet_set_tos; ok provos/henning/deraadt
+ - markus at cvs.openbsd.org 2002/12/10 19:47:14
+ [packet.c]
+ static
+ - markus at cvs.openbsd.org 2002/12/13 10:03:15
+ [channels.c misc.c sshconnect2.c]
+ cleanup debug messages, more useful information for the client user.
+ - markus at cvs.openbsd.org 2002/12/13 15:20:52
+ [scp.c]
+ 1) include stalling time in total time
+ 2) truncate filenames to 45 instead of 20 characters
+ 3) print rate instead of progress bar, no more stars
+ 4) scale output to tty width
+ based on a patch from Niels; ok fries@ lebel@ fgs@ millert@
+ - (bal) [msg.c msg.h scp.c ssh-keysign.c sshconnect2.c] Resync CVS IDs since
+ we already did s/msg_send/ssh_msg_send/
+
+20021205
+ - (djm) PERL-free fixpaths from stuge-openssh-unix-dev at cdy.org
+
+20021122
+ - (tim) [configure.ac] fix STDPATH test for IRIX. First reported by
+ advax at triumf.ca. This type of solution tested by <herb at sgi.com>
+
+20021113
+ - (tim) [configure.ac] remove unused variables no_libsocket and no_libnsl
+
+20021111
+ - (tim) [contrib/solaris/opensshd.in] add umask 022 so sshd.pid is
+ not world writable.
+
+20021109
+ - (bal) OpenBSD CVS Sync
+ - itojun at cvs.openbsd.org 2002/10/16 14:31:48
+ [sftp-common.c]
+ 64bit pedant. %llu is "unsigned long long". markus ok
+ - markus at cvs.openbsd.org 2002/10/23 10:32:13
+ [packet.c]
+ use %u for u_int
+ - markus at cvs.openbsd.org 2002/10/23 10:40:16
+ [bufaux.c]
+ %u for u_int
+ - markus at cvs.openbsd.org 2002/11/04 10:07:53
+ [auth.c]
+ don't compare against pw_home if realpath fails for pw_home (seen
+ on AFS); ok djm@
+ - markus at cvs.openbsd.org 2002/11/04 10:09:51
+ [packet.c]
+ log before send disconnect; ok djm@
+ - markus at cvs.openbsd.org 2002/11/05 19:45:20
+ [monitor.c]
+ handle overflows for size_t larger than u_int; siw at goneko.de, bug #425
+ - markus at cvs.openbsd.org 2002/11/05 20:10:37
+ [sftp-client.c]
+ typo; GaryF at livevault.com
+ - markus at cvs.openbsd.org 2002/11/07 16:28:47
+ [sshd.c]
+ log to stderr if -ie is given, bug #414, prj at po.cwru.edu
+ - markus at cvs.openbsd.org 2002/11/07 22:08:07
+ [readconf.c readconf.h ssh-keysign.8 ssh-keysign.c]
+ we cannot use HostbasedAuthentication for enabling ssh-keysign(8),
+ because HostbasedAuthentication might be enabled based on the
+ target host and ssh-keysign(8) does not know the remote hostname
+ and not trust ssh(1) about the hostname, so we add a new option
+ EnableSSHKeysign; ok djm@, report from zierke at informatik.uni-hamburg.de
+ - markus at cvs.openbsd.org 2002/11/07 22:35:38
+ [scp.c]
+ check exit status from ssh, and exit(1) if ssh fails; bug#369;
+ binder at arago.de
+ - (bal) Update ssh-host-config and minor rewrite of bsd-cygwin_util.c
+ ntsec now default if cygwin version beginning w/ version 56. Patch
+ by Corinna Vinschen <vinschen at redhat.com>
+ - (bal) AIX does not log login attempts for unknown users (bug #432).
+ patch by dtucker at zip.com.au
+
+20021021
+ - (djm) Bug #400: Kill ssh-rand-helper children on timeout, patch from
+ dtucker at zip.com.au
+ - (djm) Bug #317: FreeBSD needs libutil.h for openpty() Report from
+ dirk.meyer at dinoex.sub.org
+
+20021015
+ - (bal) Fix bug id 383 and only call loginrestrict for AIX if not root.
+ - (bal) More advanced strsep test by Darren Tucker <dtucker at zip.com.au>
+
+20021015
+ - (tim) [contrib/caldera/openssh.spec] make ssh-agent setgid nobody
+
+20021004
+ - (bal) Disable post-authentication Privsep for OSF/1. It conflicts with
+ SIA.
+
20021003
- (djm) OpenBSD CVS Sync
- markus at cvs.openbsd.org 2002/10/01 20:34:12
@@ -7,7 +545,7 @@
[version.h]
OpenSSH 3.5
- (djm) Bump RPM spec version numbers
- - (djm) Bug #406 s/msg_send/ssh_msh_send/ for Mac OS X 1.2
+ - (djm) Bug #406: s/msg_send/ssh_msg_send/ for Mac OS X 1.2
20020930
- (djm) Tidy contrib/, add Makefile for GNOME passphrase dialogs,
@@ -757,4 +1295,4 @@
save auth method before monitor_reset_key_state(); bugzilla bug #284;
ok provos@
-$Id: ChangeLog,v 1.2491.2.1 2002/10/03 05:45:53 djm Exp $
+$Id: ChangeLog,v 1.2648 2003/04/01 11:47:16 djm Exp $
==== //depot/projects/hammer/crypto/openssh/FREEBSD-tricks#2 (text+ko) ====
@@ -1,20 +1,19 @@
-# $FreeBSD: src/crypto/openssh/FREEBSD-tricks,v 1.2 2002/10/29 10:12:51 des Exp $
+# $FreeBSD: src/crypto/openssh/FREEBSD-tricks,v 1.3 2003/04/23 17:21:55 des Exp $
# Shell code to remove FreeBSD tags before merging
-grep -rl '\$Fre.BSD:' . |
-while read f ; do
+grep -rl '\$Fre.BSD:' . >tags
+while read f < tags ; do
sed -i.orig -e '/\$Fre.BSD:/d' $f
done
# Shell + Perl code to add FreeBSD tags wherever an OpenBSD or Id tag occurs
-egrep -rl '\$(Id|OpenBSD):' . |
+cat tags |
xargs perl -n -i.orig -e 'print; s/\$(Id|OpenBSD): [^\$]*\$/\$FreeBSD\$/ && print'
# Shell code to reexpand FreeBSD tags
-grep -rl '\$FreeBSD\$' . |
-while read f ; do
+while read f < tags ; do
id=$(cvs diff $f | grep '\$Fre.BSD:' | sed 's/.*\(\$Fre.BSD:.*\$\).*/\1/') ;
- if [ -n "$id" ] ; then
+ if [ -n "$id" ] ; then
sed -i.orig -e "s@\\\$Fre.BSD\\\$@$id@" $f ;
- fi ;
+ fi ;
done
==== //depot/projects/hammer/crypto/openssh/FREEBSD-upgrade#4 (text+ko) ====
@@ -14,7 +14,7 @@
3) Remove trash:
- $ eval "rm -rf $(tr '[:space:]' ' ' </usr/src/crypto/openssh/FREEBSD-Xlist)"
+ $ eval "rm -rvf $(tr '[:space:]' ' ' </usr/src/crypto/openssh/FREEBSD-Xlist)"
Make sure that took care of everything, and if it didn't, make sure
to update FREEBSD-Xlist so you won't miss it the next time.
@@ -127,4 +127,4 @@
-- des at FreeBSD.org
-$FreeBSD: src/crypto/openssh/FREEBSD-upgrade,v 1.4 2002/10/29 09:55:28 des Exp $
+$FreeBSD: src/crypto/openssh/FREEBSD-upgrade,v 1.5 2003/04/23 17:23:06 des Exp $
==== //depot/projects/hammer/crypto/openssh/Makefile.in#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.222 2002/07/14 17:02:21 tim Exp $
+# $Id: Makefile.in,v 1.228 2003/03/21 00:34:34 mouring Exp $
# uncomment if you run a non bourne compatable shell. Ie. csh
#SHELL = @SH@
@@ -27,6 +27,7 @@
RAND_HELPER=$(libexecdir)/ssh-rand-helper
PRIVSEP_PATH=@PRIVSEP_PATH@
SSH_PRIVSEP_USER=@SSH_PRIVSEP_USER@
+STRIP_OPT=@STRIP_OPT@
PATHS= -DSSHDIR=\"$(sysconfdir)\" \
-D_PATH_SSH_PROGRAM=\"$(SSH_PROGRAM)\" \
@@ -48,6 +49,7 @@
RANLIB=@RANLIB@
INSTALL=@INSTALL@
PERL=@PERL@
+SED=@SED@
ENT=@ENT@
XAUTH_PATH=@XAUTH_PATH@
LDFLAGS=-L. -Lopenbsd-compat/ @LDFLAGS@
@@ -56,15 +58,30 @@
INSTALL_SSH_PRNG_CMDS=@INSTALL_SSH_PRNG_CMDS@
INSTALL_SSH_RAND_HELPER=@INSTALL_SSH_RAND_HELPER@
- at NO_SFTP@SFTP_PROGS=sftp-server$(EXEEXT) sftp$(EXEEXT)
+TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-agent$(EXEEXT) scp$(EXEEXT) ssh-rand-helper${EXEEXT} sftp-server$(EXEEXT) sftp$(EXEEXT)
-TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-agent$(EXEEXT) scp$(EXEEXT) ssh-rand-helper${EXEEXT} $(SFTP_PROGS)
+LIBSSH_OBJS=authfd.o authfile.o bufaux.o buffer.o canohost.o channels.o \
+ cipher.o compat.o compress.o crc32.o deattack.o fatal.o \
+ hostfile.o log.o match.o mpaux.o nchan.o packet.o readpass.o \
+ rsa.o tildexpand.o ttymodes.o xmalloc.o atomicio.o \
+ key.o dispatch.o kex.o mac.o uuencode.o misc.o \
+ rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o kexgex.o \
+ kexdhc.o kexgexc.o scard.o msg.o progressmeter.o \
+ entropy.o
-LIBSSH_OBJS=atomicio.o authfd.o authfile.o bufaux.o buffer.o canohost.o channels.o cipher.o compat.o compress.o crc32.o deattack.o dh.o dispatch.o fatal.o mac.o msg.o hostfile.o key.o kex.o kexdh.o kexgex.o log.o match.o misc.o mpaux.o nchan.o packet.o radix.o rijndael.o entropy.o readpass.o rsa.o scard.o scard-opensc.o ssh-dss.o ssh-rsa.o tildexpand.o ttymodes.o uidswap.o uuencode.o xmalloc.o monitor_wrap.o monitor_fdpass.o
+SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \
+ sshconnect.o sshconnect1.o sshconnect2.o
-SSHOBJS= ssh.o sshconnect.o sshconnect1.o sshconnect2.o sshtty.o readconf.o clientloop.o
-
-SSHDOBJS= sshd.o auth.o auth1.o auth2.o auth2-hostbased.o auth2-kbdint.o auth2-none.o auth2-passwd.o auth2-pubkey.o auth-chall.o auth2-chall.o auth-rhosts.o auth-options.o auth-krb4.o auth-krb5.o auth-pam.o auth2-pam.o auth-passwd.o auth-rsa.o auth-rh-rsa.o auth-sia.o sshpty.o sshlogin.o loginrec.o servconf.o serverloop.o md5crypt.o session.o groupaccess.o auth-skey.o auth-bsdauth.o monitor_mm.o monitor.o
+SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \
+ sshpty.o sshlogin.o servconf.o serverloop.o uidswap.o \
+ auth.o auth1.o auth2.o auth-options.o session.o \
+ auth-chall.o auth2-chall.o groupaccess.o \
+ auth-skey.o auth-bsdauth.o auth2-hostbased.o auth2-kbdint.o \
+ auth2-none.o auth2-passwd.o auth2-pubkey.o \
+ monitor_mm.o monitor.o monitor_wrap.o monitor_fdpass.o \
+ kexdhs.o kexgexs.o \
+ auth-krb5.o auth-krb4.o \
+ loginrec.o auth-pam.o auth2-pam.o auth-sia.o md5crypt.o
MANPAGES = scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out ssh-rand-helper.8.out ssh-keysign.8.out sshd_config.5.out ssh_config.5.out
MANPAGES_IN = scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-rand-helper.8 ssh-keysign.8 sshd_config.5 ssh_config.5
@@ -74,23 +91,23 @@
CONFIGFILES_IN=sshd_config ssh_config moduli
PATHSUBS = \
- -D/etc/ssh/ssh_prng_cmds=$(sysconfdir)/ssh_prng_cmds \
- -D/etc/ssh/ssh_config=$(sysconfdir)/ssh_config \
- -D/etc/ssh/ssh_known_hosts=$(sysconfdir)/ssh_known_hosts \
- -D/etc/ssh/sshd_config=$(sysconfdir)/sshd_config \
- -D/usr/libexec=$(libexecdir) \
- -D/etc/shosts.equiv=$(sysconfdir)/shosts.equiv \
- -D/etc/ssh/ssh_host_key=$(sysconfdir)/ssh_host_key \
- -D/etc/ssh/ssh_host_dsa_key=$(sysconfdir)/ssh_host_dsa_key \
- -D/etc/ssh/ssh_host_rsa_key=$(sysconfdir)/ssh_host_rsa_key \
- -D/var/run/sshd.pid=$(piddir)/sshd.pid \
- -D/etc/ssh/moduli=$(sysconfdir)/moduli \
- -D/etc/ssh/sshrc=$(sysconfdir)/sshrc \
- -D/usr/X11R6/bin/xauth=$(XAUTH_PATH) \
- -D/var/empty=$(PRIVSEP_PATH) \
- -D/usr/bin:/bin:/usr/sbin:/sbin=@user_path@
+ -e 's|/etc/ssh/ssh_prng_cmds|$(sysconfdir)/ssh_prng_cmds|g' \
+ -e 's|/etc/ssh/ssh_config|$(sysconfdir)/ssh_config|g' \
+ -e 's|/etc/ssh/ssh_known_hosts|$(sysconfdir)/ssh_known_hosts|g' \
+ -e 's|/etc/ssh/sshd_config|$(sysconfdir)/sshd_config|g' \
+ -e 's|/usr/libexec|$(libexecdir)|g' \
+ -e 's|/etc/shosts.equiv|$(sysconfdir)/shosts.equiv|g' \
+ -e 's|/etc/ssh/ssh_host_key|$(sysconfdir)/ssh_host_key|g' \
+ -e 's|/etc/ssh/ssh_host_dsa_key|$(sysconfdir)/ssh_host_dsa_key|g' \
+ -e 's|/etc/ssh/ssh_host_rsa_key|$(sysconfdir)/ssh_host_rsa_key|g' \
+ -e 's|/var/run/sshd.pid|$(piddir)/sshd.pid|g' \
+ -e 's|/etc/ssh/moduli|$(sysconfdir)/moduli|g' \
+ -e 's|/etc/sshrc|$(sysconfdir)/sshrc|g' \
+ -e 's|/usr/X11R6/bin/xauth|$(XAUTH_PATH)|g' \
+ -e 's|/var/empty|$(PRIVSEP_PATH)|g' \
+ -e 's|/usr/bin:/bin:/usr/sbin:/sbin|@user_path@|g'
-FIXPATHSCMD = $(PERL) $(srcdir)/fixpaths $(PATHSUBS)
+FIXPATHSCMD = $(SED) $(PATHSUBS)
all: $(CONFIGFILES) $(MANPAGES) $(TARGETS)
@@ -116,8 +133,8 @@
sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS)
$(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBWRAP) $(LIBPAM) $(LIBS)
-scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o
- $(LD) -o $@ scp.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
+scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o progressmeter.o
+ $(LD) -o $@ scp.o progressmeter.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
ssh-add$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-add.o
$(LD) -o $@ ssh-add.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
@@ -137,8 +154,8 @@
sftp-server$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-common.o sftp-server.o
$(LD) -o $@ sftp-server.o sftp-common.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
-sftp$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-client.o sftp-int.o sftp-common.o sftp-glob.o
- $(LD) -o $@ sftp.o sftp-client.o sftp-common.o sftp-int.o sftp-glob.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
+sftp$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-client.o sftp-int.o sftp-common.o sftp-glob.o progressmeter.o
+ $(LD) -o $@ progressmeter.o sftp.o sftp-client.o sftp-common.o sftp-int.o sftp-glob.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
ssh-rand-helper${EXEEXT}: $(LIBCOMPAT) libssh.a ssh-rand-helper.o
$(LD) -o $@ ssh-rand-helper.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
@@ -217,19 +234,19 @@
$(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)8
$(srcdir)/mkinstalldirs $(DESTDIR)$(libexecdir)
(umask 022 ; $(srcdir)/mkinstalldirs $(DESTDIR)$(PRIVSEP_PATH))
- $(INSTALL) -m 0755 -s ssh $(DESTDIR)$(bindir)/ssh
- $(INSTALL) -m 0755 -s scp $(DESTDIR)$(bindir)/scp
- $(INSTALL) -m 0755 -s ssh-add $(DESTDIR)$(bindir)/ssh-add
- $(INSTALL) -m 0755 -s ssh-agent $(DESTDIR)$(bindir)/ssh-agent
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list