GSI-OpenSSH/CVS Tags
From Globus
Contents |
[edit]
OPENSSH_PORTABLE_DIST
This is the vendor branch for OpenSSH. Import new OpenSSH releases to this branch.
- OPENSSH_5_0P1
OpenSSH 5.0p1 imported to vendor branch. - OPENSSH_4_9P1
OpenSSH 4.9p1 imported to vendor branch. - OPENSSH_4_7P1
OpenSSH 4.7p1 imported to vendor branch. - OPENSSH_4_6P1_SIMON_20070312_HPN12v17
This tag, off OPENSSH_4_6P1_SIMON_20070312_HPN12v16, adds changes in the hpn12v17 patch. - OPENSSH_4_6P1_SIMON_20070312_HPN12v16
This branch, off OPENSSH_4_6P1_SIMON_20070312, adds http://www.psc.edu/networking/projects/hpn-ssh/openssh-4.6p1-hpn12v16.diff.gz - OPENSSH_4_6P1_SIMON_20070312
This branch, off OPENSSH_PORTABLE_DIST, contains Simon's http://www.sxw.org.uk/computing/patches/openssh-4.6p1-gsskex-20070312.patch - OPENSSH_4_6P1
OpenSSH 4.6p1 imported to vendor branch. - OPENSSH_4_5P1_SIMON_20061220_HPN12V14
This branch, off OPENSSH_4_5P1_SIMON_20061220, contains http://www.psc.edu/networking/projects/hpn-ssh/openssh-4.5p1-hpn12v14.diff.gz - OPENSSH_4_5P1_SIMON_20061220
This branch, off OPENSSH_PORTABLE_DIST, contains Simon's http://www.sxw.org.uk/computing/patches/openssh-4.5p1-gsskex-20061220.patch - OPENSSH_4_5P1
OpenSSH 4.5p1 imported to vendor branch. - OPENSSH_4_4P1_SIMON_20061002_HPN
This branch, off OPENSSH_4_4P1_SIMON_20061002, adds http://www.psc.edu/networking/projects/hpn-ssh/openssh-4.4p1-hpn12v13.diff.gz. - OPENSSH_4_4P1_SIMON_20061002
This branch, off OPENSSH_PORTABLE_DIST, contains Simon's http://www.sxw.org.uk/computing/patches/openssh-4.4p1-gsskex-20061002.patch. - OPENSSH_4_4P1
OpenSSH 4.4p1 imported to vendor branch. - OPENSSH_4_3P2_SIMON-20060223
This branch, off OPENSSH_PORTABLE_DIST, contains Simon's http://www.sxw.org.uk/computing/patches/openssh-4.3p2-gsskex-20060223.patch. - OPENSSH_4_3P2_HPN12
This tag, on the OPENSSH_4_3P2_HPN branch, contains OpenSSH 4.3p2 patched with openssh-4.2p1-hpn12.diff. - OPENSSH_4_3P2_HPN11
This tag, on the OPENSSH_4_3P2_HPN branch, contains OpenSSH 4.3p2 patched with openssh-4.2p1-hpn11-none.diff. - OPENSSH_4_3P2_HPN
This branch, off OPENSSH_PORTABLE_DIST, contains an HPN patched version of OpenSSH 4.3p2. - OPENSSH_4_3P2
OpenSSH 4.3p2 imported to vendor branch. - OPENSSH_4_3P1
OpenSSH 4.3p1 imported to vendor branch. - OPENSSH_4_3P1_HPN
This branch, off OPENSSH_PORTABLE_DIST, contains an HPN patched version of OpenSSH 4.3p1. - OPENSSH_4_2P1
OpenSSH 4.2p1 imported to vendor branch. - OPENSSH_4_2P1_SIMON-20050926-2
Simon's openssh-4.2p1-gsskex-20050926-2.patch, implementing gssapi-keyex. - OPENSSH_4_2P1_SIMON-branch
This branch, off OPENSSH_PORTABLE_DIST, contains Simon's GSSAPI patched version of OpenSSH 4.2p1. - OPENSSH_4_1P1
OpenSSH 4.1p1 imported to vendor branch. - OPENSSH_4_0P1
OpenSSH 4.0p1 imported to vendor branch. - OPENSSH_3_9P1
OpenSSH 3.9p1 imported to vendor branch. - OPENSSH_3_8_1P1
OpenSSH 3.8.1p1 imported to vendor branch. - OPENSSH_3_8P1
OpenSSH 3.8p1 imported to vendor branch. - OPENSSH_3_7_1P2
OpenSSH 3.7.1p2 imported to vendor branch. - OPENSSH_3_7_1P1
OpenSSH 3.7.1p1 imported to vendor branch. - OPENSSH_3_7P1
OpenSSH 3.7p1 imported to vendor branch. - OPENSSH_3_6_1P2
OpenSSH 3.6.1p2 imported to vendor branch - OPENSSH_3_6_1P2_SIMON-branch
This branch, off OPENSSH_PORTABLE_DIST, contains Simon's GSSAPI patched version of OpenSSH 3.6.1p2.- OPENSSH_3_6_1P2_SIMON_20030430
Simon's openssh-3.6.1p2-gssapi-20030430.diff patch.
- OPENSSH_3_6_1P2_SIMON_20030430
- OPENSSH_3_6_1P1_SIMON
This branch, off OPENSSH_PORTABLE_DIST, contains Simon's GSSAPI patched version of OpenSSH 3.6.1p1.- OPENSSH_3_6_1P1_SIMON_20030417
Patch from Simon on Apr 17 2003 (not released?). - OPENSSH_3_6_1P1_SIMON_20030411
Patch from Simon on Apr 11 2003 (not released).
- OPENSSH_3_6_1P1_SIMON_20030417
- OPENSSH_3_6_1P1
OpenSSH 3.6.1p1 imported to vendor branch - OPENSSH_3_5P1
OpenSSH 3.5p1 imported to vendor branch - OPENSSH_3_4P1_GSSAPI-branch
This branch, off OPENSSH_PORTABLE_DIST, contains Simon's GSSAPI patched version of OpenSSH 3.4p1.- OPENSSH_3_4P1_GSSAPI_20020627
Simon's openssh-3.4p1-gssapi-20020627.diff patch.
- OPENSSH_3_4P1_GSSAPI_20020627
- OPENSSH_3_4P1
OpenSSH 3.4p1 imported to vendor branch - OPENSSH_3_3P1
OpenSSH 3.3p1 imported to vendor branch - OPENSSH_3_2_3P1_MSGHDR_FIX
Patch to configure.ac and monitor_fdpass.c to fix Irix build problem in OpenSSH 3.2.3p1, from OpenSSH mailing list. - OpenSSH_GSSAPI-branch
This branch, off OPENSSH_PORTABLE_DIST, contains Simon's GSSAPI patched version of OpenSSH 3.2.3p1. - OPENSSH_3_2_3P1
OpenSSH 3.2.3p1 imported to vendor branch - OPENSSH_3_2_2P1
OpenSSH 3.2.2p1 imported to vendor branch - OPENSSH_3_1P1
OpenSSH 3.1p1 imported to vendor branch - OPENSSH_3_0_2P1
OpenSSH 3.0.2p1 imported to vendor branch
[edit]
Trunk
The trunk contains GSSAPI-enabled OpenSSH.
- OPENSSH_5_0P1_GSSAPI_20080701
Add server-side GSSAPIDelegateCredentials option (Bug 376). - OPENSSH_5_0P1_GSSAPI_20080403
Update to OpenSSH 5.0p1. - OPENSSH_4_9P1_GSSAPI_20080401
Update to OpenSSH 4.9p1. - OPENSSH_4_7P1_GSSAPI_20080313
Update to http://www.psc.edu/networking/projects/hpn-ssh/openssh-4.7p1-hpn13v1.diff.gz - OPENSSH_4_7P1_GSSAPI_20071204
Updated from hpn12v18 to hpn12v20. - OPENSSH_4_7P1_GSSAPI_20071004
Fix configure.ac typo. http://bugzilla.ncsa.uiuc.edu/show_bug.cgi?id=374 - OPENSSH_4_7P1_GSSAPI_20070912
Updated to openssh-4.7p1 and hpn12v18. - OPENSSH_4_6P1_GSSAPI_20070328
Fixed <a href="http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=5142">Bug 5142</a>. Updated to hpn12v17. - OPENSSH_4_6P1_GSSAPI_20070314
Updated to openssh-4.6p1, hpn12v16, and gsskex-20070312. - OPENSSH_4_5P1_20070218
Update to match empty username patch in <a href="http://bugzilla.mindrot.org/show_bug.cgi?id=1100">Bug 1100</a>, fixing problem with accepting empty usernames for gssapi-with-mic method. Fix some AIX build problems. - OPENSSH_4_5P1_20070215
Updated to hpn12v14. Applied Simon's openssh-4.5p1-gsskex-20061220.patch. Added sshd_config GssapiCredentialsPath option as requested in <a href="http://bugzilla.ncsa.uiuc.edu/show_bug.cgi?id=348">Bug 348</a>. - OPENSSH_4_5P1_20061110
Ported to OpenSSH 4.5p1. - OPENSSH_4_4P1_20061110
Updates from OPENSSH_4_4P1_SIMON_20061002_HPN branch. - OPENSSH_4_4P1_20060928
Ported to OpenSSH 4.4p1. - OPENSSH_4_3P2_20060726
Updated with HPN12 patch. Updated to use globus_gss_assist_map_and_authorize() if available. - OPENSSH_4_3P2_20060510
Updated with Simon's openssh-4.3p2-gsskex-20060223.patch. Added support for GsiAllowLimitedProxy sshd_config option. Replace erroneous #elsif with #elif. - OPENSSH_4_3P2_20060213
Ported to OpenSSH 4.3p2. - OPENSSH_4_2P1_GSSAPI_20051220
Adds Simon's openssh-4.2p1-gsskex-20050926-2.patch, implementing gssapi-keyex, from tag OPENSSH_4_2P1_SIMON-20050926-2. Also adds openssh-4.2p1-hpn11-none.diff, High Performance Enabled SSH, from <a href="http://www.psc.edu/networking/projects/hpn-ssh/">http://www.psc.edu/networking/projects/hpn-ssh/</a>. - OPENSSH_4_2P1_GSSAPI_20050905
GSSAPI patch ported to OpenSSH 4.2p1. Check for gethostbyname() NULL return value in resolve_localhost(). Fixed a few compiler warnings on type signedness and uninitialized pointer variables. - OPENSSH_4_1P1_GSSAPI_20050607
Fix a bug in OPENSSH_4_1P1_GSSAPI_20050526 where SSH2_MSG_KEXGSS_COMPLETE was no longer being sent. - OPENSSH_4_1P1_GSSAPI_20050526
GSSAPI patch ported to OpenSSH 4.1p1. Fix gss_accept_sec_context() return value check to match Internet Draft and give us better error handling. - OPENSSH_4_0P1_GSSAPI_20050312
GSSAPI patch ported to OpenSSH 4.0p1. Dropped GSSAPI backward compatibility support for OpenSSH 3.6.1 and earlier. - OPENSSH_3_9P1_GSSAPI_20040818
GSSAPI patch ported to OpenSSH 3.9p1. Fix server segmentation fault triggered by old clients when GSSAPI authentication fails (<a href="https://bugzilla.ncsa.uiuc.edu/show_bug.cgi?id=244">Bug 244</a>). If client or server don't have valid GSSAPI credentials, then don't attempt GSSAPI user authentication methods. - OPENSSH_3_8_1P1_GSSAPI_20040713
Security fix for <a href="http://grid.ncsa.uiuc.edu/ssh/implicitlogin.adv">implicitlogin.adv</a>. Fix hostname resolution for GSSAPI userauthentication, to always use fully-qualified hostnames. - OPENSSH_3_8_1P1_GSSAPI_20040629
Fix GSSAPI key exchange to not abort when given a limited GSI proxy but to complete successfully and simply not accept the limited GSI proxy for user authentication, falling back to non-GSI user authentication methods (<a href="https://bugzilla.ncsa.uiuc.edu/show_bug.cgi?id=236">Bug 236</a>). Pass variants on LD_LIBRARY_PATH (LIBPATH, SHLIB_PATH, LD_LIBRARYN32_PATH, LD_LIBRARY64_PATH) to child processes (<a href="https://bugzilla.ncsa.uiuc.edu/show_bug.cgi?id=238">Bug 238</a>). - OPENSSH_3_8_1P1_GSSAPI_20040505
GSSAPI patch ported to OpenSSH 3.8p1. Added configure.ac fix for Darwin build. - OPENSSH_3_8P1_GSSAPI_20040423
Added several mechglue fixes. - OPENSSH_3_8P1_GSSAPI_20040422
Added work-around for OpenSSH xlc compilation problem on AIX 5.2. - OPENSSH_3_8P1_GSSAPI_20040305
Wrap environment clearning code in #ifndef GSI because GSI gets configuration information from the environment. Fixes bug in sftp subsystem introduced with new environment clearning code in OpenSSH 3.8p1. - OPENSSH_3_8P1_GSSAPI_20040304
Some minor cleanup (remove unneeded #includes, etc.). Fix bug in GSI code triggered when PAM support compiled in but UsePam no in sshd_config. - OPENSSH_3_8P1_GSSAPI_20040224
GSSAPI patch ported to OpenSSH 3.8p1. Support added for gssapi-with-mic userauth method with compat support for old gssapi method. - OPENSSH_3_7_1P2_GSSAPI_20040224
Fixed bug in implicit username handling when only gssapi authentication is attempted. Replaced '==' with '=' in configure.ac (bad /bin/sh syntax). - OPENSSH_3_7_1P2_GSSAPI_20040123
Fixed bug in GSSAPI localhost handling. - OPENSSH_3_7_1P2_GSSAPI_20040119
Removed GSSAPI support for protocol 1. Fixed bug where client would attempt external-keyx even when GSSAPI key exchange was not performed, causing compatibility problems between GSSAPI mechanisms. Added NCSA_GSSAPI comment in version string for debugging purposes. Added gsisftp install target. Added --with-globus-static configure option to link statically with Globus GSI libraries. Fixed misleading "Protocol error: didn't expect packet type 34" message. - OPENSSH_3_7_1P2_GSSAPI_20031111
GSSAPI patch ported to OpenSSH 3.7.1p2. - OPENSSH_3_7_1P1_GSSAPI_20030916
GSSAPI patch ported to OpenSSH 3.7.1p1. - OPENSSH_3_7P1_GSSAPI_20030916
GSSAPI patch ported to OpenSSH 3.7p1. Significant reformatting to match with GSSAPI code in OpenSSH 3.7p1 release. Implemented GssapiAuthentication client-side config option. - OPENSSH_3_6_1P2_GSSAPI_20030806
Same as OPENSSH_3_6_1P2_GSSAPI_20030721. Link dynamically with Globus libraries. Export LD_LIBRARY_PATH in child environment so sftp-server and scp will work when dynamically linked with Globus libraries. Path from Olle Mulmo for session hook bugfix. - OPENSSH_3_6_1P2_GSSAPI_20030505
Merged with OpenSSH 3.6.1p2 and Simon's openssh-3.6.1p2-gssapi-20030430.diff patch. - OPENSSH_3_6_1P1_GSSAPI_20030425
Merged <a href="http://www-unix.globus.org/mail_archive/gsi-openssh/2003/04/msg00003.html">Session hook patch from Olle Mulmo</a>. - OPENSSH_3_6_1P1_GSSAPI_20030421
Merged with Simon's Apr 17 2003 patch. - OPENSSH_3_6_1P1_GSSAPI_20030408
Merged with OpenSSH 3.6.1p1. - OPENSSH_3_5P1_GSI_20030317
Use getpeername() instead of gethostbyname() to work with round-robin DNS. - OPENSSH_3_5P1_GSI_20030227
Put gethostbyname() on target hostname back in for compatibility with GSI. - OPENSSH_3_5P1_GSI_20030203
Fix for GT 2.2 GSS Assist module activation. - OPENSSH_3_5P1_GSI_20021108
Fix for compatibility with 4/17/01 GSI distribution. - OPENSSH_3_5P1_GSI_20021029
Adds Jim Barlow's AFS Kerberos aklog patch. - OPENSSH_3_5P1_GSI_20021018
First GSI patch based on OpenSSH 3.5p1. - OPENSSH_3_4P1_GSI_20021008
Fix mechglue OID bug. - OPENSSH_3_4P1_GSI_20021002
Add support for GssapiKeyExchange option on client side. Initialize mechglue on sshd startup before switching to privsep mode. - OPENSSH_3_4P1_GSI_20020930
Make multiple attempts in userauth_gssapi(); one for each mechanism. - OPENSSH_3_4P1_GSI_20020926
Bugfix for GSI proxy delegation: X509_USER_DELEG_PROXY was being exported instead of X509_USER_PROXY. - OPENSSH_3_4P1_GSI_20020924
Bugfix for buffer overflow on new hostname code from OPENSSH_3_4P1_GSI_20020923. - OPENSSH_3_4P1_GSI_20020923
Initial mechglue support. IA64 bugfix. localhost bugfix. remove insecure DNS queries. implicit username on gssapi auth bugfix. cleanup cred file on exit. - OPENSSH_3_4P1_GSI_20020701
First GSI patch based on OpenSSH 3.4p1. Works with privilege separation. - OPENSSH_3_3P1_GSI_20020621
First GSI patch based on OpenSSH 3.3p1 - OPENSSH_3_2_3P1_GSI_3
GSI OpenSSH patch based on OpenSSH 3.2.3p1 (version 3): installs gsissh/gsiscp, also includes fixes for some memory management errors in empty username code - OPENSSH_3_2_3P1_GSI_2
GSI OpenSSH patch based on OpenSSH 3.2.3p1 (version 2): includes MSGHDR_FIX and feature-specific user config files. - OPENSSH_3_1P1_GSSAPI
GSI OpenSSH patch released based on OpenSSH 3.1p1 - OPENSSH_3_0_2P1_GSSAPI
GSI OpenSSH patch released based on OpenSSH 3.0.2p1
[edit]
GPT-branch
This is the branch for the GSI OpenSSH GPT package. It is a branch off of OPENSSH_3_1P1_GSSAPI_GPT-branch for historical reasons.
2008/04/03
----------
Action: Merge
- orig base: OPENSSH_4_7P1_GSSAPI_20070912
- new base: OPENSSH_5_0P1_GSSAPI_20080403
Conflicts:
- configure.ac: globus-makefile-header updates on trunk
- version.h: NCSA_VERSION constant updated on trunk
2007/09/12
----------
Action: Merge
- occurred on: GPT branch
- orig base: OPENSSH_4_6P1_GSSAPI_20070328
- new base: OPENSSH_4_7P1_GSSAPI_20070912
Conflicts:
- Makefile.in: kexgssc.o moved to its own line to make future merging easier
- sshd_config: OpenSSH 4.7p1 sets "Protocol 2" by default now
- version.h: NCSA_VERSION constant updated on trunk
2007/05/02
----------
Action: Merge
- occurred on: GPT branch
- orig base: OPENSSH_4_5P1_20070218
- new base: OPENSSH_4_6P1_GSSAPI_20070328
Conflicts:
- ssh-keygen.c: change near init_pathnames()
- version.h: NCSA_VERSION constant updated on trunk
2007/02/18
----------
Action: Merge
- occurred on: GPT branch
- orig base: OPENSSH_4_5P1_20070215
- new base: OPENSSH_4_5P1_20070218
Conflicts: None.
2007/02/15
----------
Action: Merge
- occurred on: GPT branch
- orig base: OPENSSH_4_3P2_20060726
- new base: OPENSSH_4_5P1_20070215
Conflicts:
- Makefile.in
new file bufbn.o
- configure.ac
PAM checks moved and updated. Merged by hand.
- sftp-server.c
Comment moved.
- sshd_config
UsePam description changed, and we default to yes.
- version.h
NCSA_VERSION constant added on trunk.
2006/07/26
----------
Action: Merge
- occurred on: GPT branch
- orig base: OPENSSH_4_2P1_GSSAPI_20051220
- new base: OPENSSH_4_3P2_20060726
Conflicts:
- configure.ac
OpenSSH change was near GSI change. No real conflict.
- servconf.c
New sGsiAllowLimitedProxy config option.
- sftp.c
OpenSSH change near init_pathnames().
- ssh-keysign.c
OpenSSH change near init_pathnames().
- ssh_config
OpenSSH change near ForwardX11 yes
- version.h
Update to new package version information.
2005/12/20
----------
Action: Merge
- occurred on: GPT branch
- orig base: OPENSSH_3_9P1_GSSAPI_20040818
- new base: OPENSSH_4_2P1_GSSAPI_20051220
Conflicts: 4
- Makefile.in
kexgssc.o moved in Simon's patch
new install-sysconf target from OpenSSH release
- configure.ac
new --with-pid-dir section from OpenSSH release
- ssh-keyscan.c
#include "hostfile.h" added from OpenSSH release
- version.h
Update to new package version information.
2004/08/19
----------
Action: Merge
- occurred on: GPT branch
- orig base: OPENSSH_3_8_1P1_GSSAPI_20040713
- new base: OPENSSH_3_9P1_GSSAPI_20040818
Conflicts: 3
- Makefile.in
Include pathnames.o in LIBSSH_OBJS.
- pathnames.h
Set _PATH_SSH_KEY_SIGN to be an extern char pointer (instead of #defined).
- ssh-agent.c
Include pathnames.h.
- version.h
Update to new package version information.
2004/06/29
----------
Action: Merge
- occurred on: GPT branch
- orig base: OPENSSH_3_8_1P1_GSSAPI_20040629
- new base: OPENSSH_3_8_1P1_GSSAPI_20040713
Conflicts: 0
2004/06/29
----------
Action: Merge
- occurred on: GPT branch
- orig base: OPENSSH_3_8P1_GSSAPI_20040422
- new base: OPENSSH_3_8_1P1_GSSAPI_20040629
Conflicts: 4
- ChangeLog
Old log entries were trimmed in the 3.8.1p1 release.
Not sure why this generated a conflict.
- configure.ac
Copyright statement added to head of configure.ac, which
generated a conflict due to nearby $Id$ evil.
- session.c
We do child_set_env("GLOBUS_LOCATION") on the branch, and
this conflicted with the child_set_env("LIBPATH") changes
on the trunk. Merged in child_set_env("GLOBUS_LOCATION")
with the new code.
- version.h
Should always get a conflict here on version changes.
Bumped version to OpenSSH_3.8.1P1 NCSA_GSSAPI_GPT_3.3.
2004/04/22
----------
Action: Merge
- occurred on: GPT branch
- orig base: OPENSSH_3_8P1_GSSAPI_20040305
- new base: OPENSSH_3_8P1_GSSAPI_20040422
Conflicts: 0
2004/03/05
----------
Action: Merge
- occurred on: GPT branch
- orig base: OPENSSH_3_8P1_GSSAPI_20040304
- new base: OPENSSH_3_8P1_GSSAPI_20040305
Conflicts: 0
2004/03/04
----------
Action: Merge
- occurred on: GPT branch
- orig base: OPENSSH_3_7_1P2_GSSAPI_20040123
- new base: OPENSSH_3_8P1_GSSAPI_20040304
Conflicts: 3
- Makefile.in
acss.o added to LIBSSH_OBJS in OpenSSH release.
conflicted because of nearby comment about LIBSSH_OBJS on
gpt-branch.
- configure.ac
bugfix on trunk ('==' should be '=') in globus-static
section conflicted because earlier line differs between
trunk and gpt-branch.
code to add -lcrypto to $LIBS conflicted because base
OpenSSH change moved -lcrypto before $LIBS and trunk and
gpt-branch differed on whitespace. accepted trunk version
with same whitespace to avoid future conflicts.
OpenSSH base pid-dir code changed, causing conflict
because we drop this code on gpt-branch, as we want
pid-dir set at run-time based on $GL, not configure time.
- version.h
OpenSSH base version changed and patch version spec
conflicts with GPT version spec. accepted OpenSSH base
version change and incremented GPT version spec to 3.1.
this will probably conflict every time from now on.
2004/01/23
----------
Action: Merge
- occurred on: GPT branch
- orig base: OPENSSH_3_7_1P2_GSSAPI_20040119
- new base: OPENSSH_3_7_1P2_GSSAPI_20040123
Conflicts: 0
2004/01/19
----------
Action: Merge
- occurred on: GPT branch
- orig base: OPENSSH_3_6_1P2_GSSAPI_20030721
- new base: OPENSSH_3_7_1P2_GSSAPI_20040119
Conflicts: many
2003/07/25
----------
Action: Merge
- occurred on: GPT branch
- orig base: OPENSSH_3_6_1P2_GSSAPI_20030505
- new base: OPENSSH_3_6_1P2_GSSAPI_20030721
Conflicts: 0
2003/05/05
----------
Action: Merge
- occurred on: GPT branch
- orig base: OPENSSH_3_6_1P1_GSSAPI_20030425
- new base: OPENSSH_3_6_1P2_GSSAPI_20030505
Conflicts: 0
2003/05/05
----------
Action: Merge
- occurred on: GPT branch
- orig base: OPENSSH_3_6_1P1_GSSAPI_20030408
- new base: OPENSSH_3_6_1P1_GSSAPI_20030425
Conflicts: 2
- Makefile.in, configure.ac
caused by base changes to file
2003/04/10
----------
Action: Merge
- occurred on: GPT branch
- orig base: OPENSSH_3_5P1_GSI_20030317
- new base: OPENSSH_3_6_1P1_GSSAPI_20030408
Conflicts: 2
- Makefile.in
caused by base changes to file
- ssh-agent.c
pathname changes on this branch
2003/03/17
----------
Action: Merge
- occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
- original base: OPENSSH_3_5P1_GSI_20030227
- new base: OPENSSH_3_5P1_GSI_20030317
Conflicts: 0
2003/03/07
----------
Action: Merge
- occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
- original base: OPENSSH_3_5P1_GSI_20021018
- new base: OPENSSH_3_5P1_GSI_20030227
Conflicts: 1
- configure.ac
cvs choked on my changes to the globus additions. wasn't a "real" conflict.
2003/02/06
----------
Action: Tag GPT branch as new release
- occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
2002/10/18
----------
Action: Merge
- occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
- original base: OPENSSH_3_4P1_GSI_20021008
- new base: OPENSSH_3_5P1_GSI_20021018
Conflicts: 1
- Makefile.in
resolved by removing check-user and adding check-config.
2002/10/08
----------
Action: Merge
- occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
- original base: OPENSSH_3_4P1_GSI_20020926
- new base: OPENSSH_3_4P1_GSI_20021008
Conflicts: 0
2002/09/26
----------
Action: Merge
- occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
- original base: OPENSSH_3_4P1_GSI_20020924
- new base: OPENSSH_3_4P1_GSI_20020926
Conflicts: 0
2002/09/24
----------
Action: Merge
- occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
- original base: OPENSSH_3_4P1_GSI_20020923
- new base: OPENSSH_3_4P1_GSI_20020924
Conflicts: 0
2002/09/23
----------
Action: Merge
- occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
- original base: OPENSSH_3_4P1_GSI_20020701
- new base: OPENSSH_3_4P1_GSI_20020923
Conflicts: 1
- configure.ac
resolved by ignoring mainline changes and keeping the text that was
originally in the file on this branch. (We require a specified flavor type
where the trunk can compensate in that case.)
[edit]
Inactive branches
- OPENSSH_AFS_KRB5-branch
- This is Jim Barlow's branch for NCSA AFS Kerberos patches. It is abandoned. Jim's patches are now included in the trunk.
- OPENSSH_GSSAPI_MULTI-branch
- This branch contains Bin's work on Kerberos+GSI GSSAPI support. It was abandoned.
- OPENSSH_GSSAPI_Protocol1-branch
- This branch contains Bin's work for adding GSSAPI support for SSH protocol 1. It has been merged to the trunk and abandoned.
