head	1.8;
access;
symbols
	RELENG_8_4:1.8.0.2
	RELENG_9_1_0_RELEASE:1.7.4.1.4.2
	RELENG_9_1:1.7.4.1.0.4
	RELENG_9_1_BP:1.7.4.1
	RELENG_8_3_0_RELEASE:1.7.2.1.8.1
	RELENG_8_3:1.7.2.1.0.8
	RELENG_8_3_BP:1.7.2.1
	RELENG_9_0_0_RELEASE:1.7.4.1.2.1
	RELENG_9_0:1.7.4.1.0.2
	RELENG_9_0_BP:1.7.4.1
	RELENG_9:1.7.0.4
	RELENG_9_BP:1.7
	RELENG_7_4_0_RELEASE:1.6.2.1.8.1
	RELENG_8_2_0_RELEASE:1.7.2.1.6.1
	RELENG_7_4:1.6.2.1.0.8
	RELENG_7_4_BP:1.6.2.1
	RELENG_8_2:1.7.2.1.0.6
	RELENG_8_2_BP:1.7.2.1
	RELENG_8_1_0_RELEASE:1.7.2.1.4.1
	RELENG_8_1:1.7.2.1.0.4
	RELENG_8_1_BP:1.7.2.1
	RELENG_7_3_0_RELEASE:1.6.2.1.6.1
	RELENG_7_3:1.6.2.1.0.6
	RELENG_7_3_BP:1.6.2.1
	RELENG_8_0_0_RELEASE:1.7.2.1.2.1
	RELENG_8_0:1.7.2.1.0.2
	RELENG_8_0_BP:1.7.2.1
	RELENG_8:1.7.0.2
	RELENG_8_BP:1.7
	RELENG_7_2_0_RELEASE:1.6.2.1.4.1
	RELENG_7_2:1.6.2.1.0.4
	RELENG_7_2_BP:1.6.2.1
	RELENG_7_1_0_RELEASE:1.6.2.1.2.1
	RELENG_6_4_0_RELEASE:1.5.2.2.6.1
	RELENG_7_1:1.6.2.1.0.2
	RELENG_7_1_BP:1.6.2.1
	RELENG_6_4:1.5.2.2.0.6
	RELENG_6_4_BP:1.5.2.2
	RELENG_7_0_0_RELEASE:1.6
	RELENG_6_3_0_RELEASE:1.5.2.2
	RELENG_7_0:1.6.0.4
	RELENG_7_0_BP:1.6
	RELENG_6_3:1.5.2.2.0.4
	RELENG_6_3_BP:1.5.2.2
	RELENG_7:1.6.0.2
	RELENG_7_BP:1.6
	RELENG_6_2_0_RELEASE:1.5.2.2
	RELENG_6_2:1.5.2.2.0.2
	RELENG_6_2_BP:1.5.2.2
	RELENG_5_5_0_RELEASE:1.4
	RELENG_5_5:1.4.0.10
	RELENG_5_5_BP:1.4
	RELENG_6_1_0_RELEASE:1.5.2.1
	RELENG_6_1:1.5.2.1.0.4
	RELENG_6_1_BP:1.5.2.1
	RELENG_6_0_0_RELEASE:1.5.2.1
	RELENG_6_0:1.5.2.1.0.2
	RELENG_6_0_BP:1.5.2.1
	RELENG_6:1.5.0.2
	RELENG_6_BP:1.5
	RELENG_5_4_0_RELEASE:1.4
	RELENG_5_4:1.4.0.8
	RELENG_5_4_BP:1.4
	RELENG_4_11_0_RELEASE:1.2.4.1
	RELENG_4_11:1.2.4.1.0.8
	RELENG_4_11_BP:1.2.4.1
	RELENG_5_3_0_RELEASE:1.4
	RELENG_5_3:1.4.0.6
	RELENG_5_3_BP:1.4
	RELENG_5:1.4.0.4
	RELENG_5_BP:1.4
	RELENG_4_10_0_RELEASE:1.2.4.1
	RELENG_4_10:1.2.4.1.0.6
	RELENG_4_10_BP:1.2.4.1
	RELENG_5_2_1_RELEASE:1.4
	RELENG_5_2_0_RELEASE:1.4
	RELENG_5_2:1.4.0.2
	RELENG_5_2_BP:1.4
	RELENG_4_9_0_RELEASE:1.2.4.1
	RELENG_4_9:1.2.4.1.0.4
	RELENG_4_9_BP:1.2.4.1
	RELENG_5_1_0_RELEASE:1.3
	RELENG_5_1:1.3.0.2
	RELENG_5_1_BP:1.3
	RELENG_4_8_0_RELEASE:1.2.4.1
	RELENG_4_8:1.2.4.1.0.2
	RELENG_4_8_BP:1.2.4.1
	RELENG_4:1.2.0.4
	RELENG_5_0_0_RELEASE:1.2
	RELENG_5_0:1.2.0.2
	RELENG_5_0_BP:1.2;
locks; strict;
comment	@# @;


1.8
date	2012.11.17.01.49.00;	author svnexp;	state Exp;
branches
	1.8.2.1;
next	1.7;

1.7
date	2008.08.01.01.05.27;	author des;	state Exp;
branches
	1.7.2.1
	1.7.4.1;
next	1.6;

1.6
date	2005.09.03.06.42.11;	author des;	state Exp;
branches
	1.6.2.1;
next	1.5;

1.5
date	2005.06.04.23.18.33;	author des;	state Exp;
branches
	1.5.2.1;
next	1.4;

1.4
date	2003.09.19.11.29.51;	author des;	state Exp;
branches;
next	1.3;

1.3
date	2003.04.23.17.21.55;	author des;	state Exp;
branches;
next	1.2;

1.2
date	2002.10.29.10.12.51;	author des;	state Exp;
branches
	1.2.4.1;
next	1.1;

1.1
date	2002.10.29.09.56.16;	author des;	state Exp;
branches;
next	;

1.8.2.1
date	2012.11.17.01.49.00;	author svnexp;	state dead;
branches;
next	1.8.2.2;

1.8.2.2
date	2013.03.28.13.02.24;	author svnexp;	state Exp;
branches;
next	;

1.7.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.7.2.1.2.1
	1.7.2.1.4.1
	1.7.2.1.6.1
	1.7.2.1.8.1;
next	1.7.2.2;

1.7.2.2
date	2012.11.17.10.35.55;	author svnexp;	state Exp;
branches;
next	;

1.7.2.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.7.2.1.4.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.7.2.1.6.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.7.2.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.7.2.1.8.2;

1.7.2.1.8.2
date	2012.11.17.08.24.37;	author svnexp;	state Exp;
branches;
next	;

1.7.4.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.7.4.1.2.1
	1.7.4.1.4.1;
next	1.7.4.2;

1.7.4.2
date	2012.11.17.11.36.10;	author svnexp;	state Exp;
branches;
next	1.7.4.3;

1.7.4.3
date	2014.03.31.15.01.50;	author svnexp;	state dead;
branches;
next	;

1.7.4.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.7.4.1.2.2;

1.7.4.1.2.2
date	2012.11.17.08.36.10;	author svnexp;	state Exp;
branches;
next	;

1.7.4.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.7.4.1.4.2;

1.7.4.1.4.2
date	2012.11.17.08.47.00;	author svnexp;	state Exp;
branches;
next	;

1.6.2.1
date	2008.09.01.20.03.13;	author des;	state Exp;
branches
	1.6.2.1.2.1
	1.6.2.1.4.1
	1.6.2.1.6.1
	1.6.2.1.8.1;
next	1.6.2.2;

1.6.2.2
date	2012.11.17.08.01.13;	author svnexp;	state Exp;
branches;
next	;

1.6.2.1.2.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.6.2.1.4.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.6.2.1.6.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.6.2.1.8.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.6.2.1.8.2;

1.6.2.1.8.2
date	2012.11.17.08.16.36;	author svnexp;	state Exp;
branches;
next	;

1.5.2.1
date	2005.09.11.16.50.33;	author des;	state Exp;
branches;
next	1.5.2.2;

1.5.2.2
date	2006.10.06.14.07.11;	author des;	state Exp;
branches
	1.5.2.2.6.1;
next	1.5.2.3;

1.5.2.3
date	2012.11.17.07.38.59;	author svnexp;	state Exp;
branches;
next	;

1.5.2.2.6.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;

1.2.4.1
date	2003.02.03.17.31.06;	author des;	state Exp;
branches;
next	1.2.4.2;

1.2.4.2
date	2012.11.17.07.22.31;	author svnexp;	state Exp;
branches;
next	;


desc
@@


1.8
log
@Switching exporter and resync
@
text
@# $FreeBSD: head/crypto/openssh/FREEBSD-tricks 181097 2008-08-01 01:13:41Z des $

# Shell code to remove FreeBSD tags before merging
grep -rl '\$Fre[e]BSD:' . | grep -v FREEBSD >tags
cat tags | while read f ; do
    sed -i.orig -e '/\$Fre[e]BSD:/d' $f
done

# Shell + Perl code to add FreeBSD tags wherever an OpenBSD or Id tag occurs
cat tags |
xargs perl -n -i.orig -e 'print; s/\$(Id|OpenBSD): [^\$]*/\$FreeBSD/ && print'

# Diff against vendor branch
svn diff --no-diff-deleted --old=$FSVN/vendor-crypto/openssh/dist/ --new=.
@


1.8.2.1
log
@file FREEBSD-tricks was added on branch RELENG_8_4 on 2013-03-28 13:02:24 +0000
@
text
@d1 14
@


1.8.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 14
# $FreeBSD: releng/8.4/crypto/openssh/FREEBSD-tricks 181097 2008-08-01 01:13:41Z des $

# Shell code to remove FreeBSD tags before merging
grep -rl '\$Fre[e]BSD:' . | grep -v FREEBSD >tags
cat tags | while read f ; do
    sed -i.orig -e '/\$Fre[e]BSD:/d' $f
done

# Shell + Perl code to add FreeBSD tags wherever an OpenBSD or Id tag occurs
cat tags |
xargs perl -n -i.orig -e 'print; s/\$(Id|OpenBSD): [^\$]*/\$FreeBSD/ && print'

# Diff against vendor branch
svn diff --no-diff-deleted --old=$FSVN/vendor-crypto/openssh/dist/ --new=.
@


1.7
log
@SVN rev 181096 on 2008-08-01 01:05:27Z by des

Tag expansion is no longer needed (svn handles them correctly).
Add svn command to diff against vendor branch.
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.7.4.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.7.4.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/crypto/openssh/FREEBSD-tricks 181097 2008-08-01 01:13:41Z des $
@


1.7.4.3
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/263970
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@@


1.7.4.1.4.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.7.4.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/crypto/openssh/FREEBSD-tricks 181097 2008-08-01 01:13:41Z des $
@


1.7.4.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.7.4.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/crypto/openssh/FREEBSD-tricks 181097 2008-08-01 01:13:41Z des $
@


1.7.2.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.7.2.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/8/crypto/openssh/FREEBSD-tricks 181097 2008-08-01 01:13:41Z des $
@


1.7.2.1.8.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.7.2.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/crypto/openssh/FREEBSD-tricks 181097 2008-08-01 01:13:41Z des $
@


1.7.2.1.6.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.7.2.1.4.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.7.2.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.6
log
@fine-tune.
@
text
@d1 1
a1 1
# $FreeBSD: src/crypto/openssh/FREEBSD-tricks,v 1.5 2005/06/04 23:18:33 des Exp $
d13 2
a14 8
# Shell code to reexpand FreeBSD tags
cat tags | while read f ; do
    id=$(cvs diff $f | grep '\$Fre[e]BSD:' |
    sed 's/.*\(\$Fre[e]BSD:.*\$\).*/\1/') ;
    if [ -n "$id" ] ; then
        sed -i.orig -e "s@@\\\$Fre[e]BSD\\\$@@$id@@" $f ;
    fi ;
done
@


1.6.2.1
log
@SVN rev 182634 on 2008-09-01 20:03:13Z by des

MFH OpenSSH 5.1p1
@
text
@d1 1
a1 1
# $FreeBSD$
d13 8
a20 2
# Diff against vendor branch
svn diff --no-diff-deleted --old=$FSVN/vendor-crypto/openssh/dist/ --new=.
@


1.6.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/crypto/openssh/FREEBSD-tricks 182634 2008-09-01 20:03:13Z des $
@


1.6.2.1.8.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.6.2.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/crypto/openssh/FREEBSD-tricks 182634 2008-09-01 20:03:13Z des $
@


1.6.2.1.6.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.6.2.1.4.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.6.2.1.2.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.5
log
@Rewrite some of the regexps so they don't match themselves.
@
text
@d1 1
a1 1
# $FreeBSD: src/crypto/openssh/FREEBSD-tricks,v 1.4 2003/09/19 11:29:51 des Exp $
d4 1
a4 1
grep -rl '\$Fre[e]BSD:' . >tags
d11 1
a11 1
xargs perl -n -i.orig -e 'print; s/\$(Id|OpenBSD): [^\$]*\$/\$Fre[e]BSD\$/ && print'
@


1.5.2.1
log
@Upgrade to 4.2p1.

Approved by:	re (kensmith)
@
text
@d1 1
a1 1
# $FreeBSD: src/crypto/openssh/FREEBSD-tricks,v 1.5 2005/06/04 23:18:33 des Exp $
d4 1
a4 1
grep -rl '\$Fre[e]BSD:' . | grep -v FREEBSD >tags
d11 1
a11 1
xargs perl -n -i.orig -e 'print; s/\$(Id|OpenBSD): [^\$]*/\$FreeBSD/ && print'
@


1.5.2.2
log
@MFC: OpenSSH 4.4p1.

Approved by:	re (kensmith)
@
text
@d1 1
a1 1
# $FreeBSD: src/crypto/openssh/FREEBSD-tricks,v 1.6 2005/09/03 06:42:11 des Exp $
@


1.5.2.3
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/crypto/openssh/FREEBSD-tricks 163052 2006-10-06 14:07:23Z des $
@


1.5.2.2.6.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.4
log
@Fix broken shell code.
@
text
@d1 1
a1 1
# $FreeBSD: src/crypto/openssh/FREEBSD-tricks,v 1.3 2003/04/23 17:21:55 des Exp $
d4 1
a4 1
grep -rl '\$Fre.BSD:' . >tags
d6 1
a6 1
    sed -i.orig -e '/\$Fre.BSD:/d' $f
d11 1
a11 1
xargs perl -n -i.orig -e 'print; s/\$(Id|OpenBSD): [^\$]*\$/\$FreeBSD\$/ && print'
d15 2
a16 1
    id=$(cvs diff $f | grep '\$Fre.BSD:' | sed 's/.*\(\$Fre.BSD:.*\$\).*/\1/') ;
d18 1
a18 1
        sed -i.orig -e "s@@\\\$Fre.BSD\\\$@@$id@@" $f ;
@


1.3
log
@Improvements to the proposed shell code.
@
text
@d1 1
a1 1
# $FreeBSD: src/crypto/openssh/FREEBSD-tricks,v 1.2 2002/10/29 10:12:51 des Exp $
d5 1
a5 1
while read f < tags ; do
d14 1
a14 1
while read f < tags ; do
@


1.2
log
@Protect against tag expansion + fix some brainos.
@
text
@d1 1
a1 1
# $FreeBSD$
d4 2
a5 2
grep -rl '\$Fre.BSD:' . |
while read f ; do
d10 1
a10 1
egrep -rl '\$(Id|OpenBSD):' . |
d14 1
a14 2
grep -rl '\$FreeBSD\$' . |
while read f ; do 
d16 1
a16 1
    if [ -n "$id" ] ; then 
d18 1
a18 1
    fi ; 
@


1.2.4.1
log
@MFC: OpenSSH 3.5p1, with all FreeBSD patches.
@
text
@@


1.2.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/4/crypto/openssh/FREEBSD-tricks 110292 2003-02-03 17:31:12Z des $
@


1.1
log
@Some tricks I use when I upgrade.
@
text
@d4 1
a4 1
grep -rl '\$FreeBSD:' |
d6 1
a6 1
    sed -i.orig -e '/\$FreeBSD:/d'
d10 1
a10 1
egrep -rl '\$(Id|OpenBSD):' |
d14 1
a14 1
grep -rl '\$FreeBSD\$' |
d16 1
a16 1
    id=$(cvs diff $f | grep '\$FreeBSD$FreeBSD:.*\$\).*/\1/') ;
d18 1
a18 1
        sed -i.orig -e "s@@\\\$FreeBSD\\\$@@$id@@" $f ;
@

