openssh/.skipped-commit-ids

321065a95a7ccebdd5fd08482a1e19afbf524e35	Update DH groups
d4f699a421504df35254cf1c6f1a7c304fb907ca	Remove 1k bit groups
aafe246655b53b52bc32c8a24002bc262f4230f7	Remove intermediate moduli
8fa9cd1dee3c3339ae329cf20fb591db6d605120	put back SSH1 for 6.9
f31327a48dd4103333cc53315ec53fe65ed8a17a	Generate new moduli
edbfde98c40007b7752a4ac106095e060c25c1ef	Regen moduli
052fd565e3ff2d8cec3bc957d1788f50c827f8e2	Switch to tame-based sandbox
7cf73737f357492776223da1c09179fa6ba74660	Remove moduli <2k
180d84674be1344e45a63990d60349988187c1ae	Update moduli
f6ae971186ba68d066cd102e57d5b0b2c211a5ee	systrace is dead.
96c5054e3e1f170c6276902d5bc65bb3b87a2603	remove DEBUGLIBS from Makefile
6da9a37f74aef9f9cc639004345ad893cad582d8	Update moduli file
77bcb50e47b68c7209c7f0a5a020d73761e5143b	unset REGRESS_FAIL_EARLY
38c2133817cbcae75c88c63599ac54228f0fa384	Change COMPILER_VERSION tests
30c20180c87cbc99fa1020489fe7fd8245b6420c	resync integrity.sh shell
1e6b51ddf767cbad0a4e63eb08026c127e654308	integrity.sh reliability
fe5b31f69a60d47171836911f144acff77810217	Makefile.inc bits
5781670c0578fe89663c9085ed3ba477cf7e7913	Delete sshconnect1.c
ea80f445e819719ccdcb237022cacfac990fdc5c	Makefile.inc warning flags
b92c93266d8234d493857bb822260dacf4366157	moduli-gen.sh tweak
b25bf747544265b39af74fe0716dc8d9f5b63b95	Updated moduli
1bd41cba06a7752de4df304305a8153ebfb6b0ac	rsa.[ch] already removed
Track skipped upstream commit IDs. There are a small number of "upstream" commits that do not correspond to a file in -portable. This file tracks those so that we can reconcile OpenBSD and Portable to ensure that no commits are accidentally missed. If you add something to .skipped-commit-ids please also add an upstream ID line in the following format when you commit it. Upstream-ID: 321065a95a7ccebdd5fd08482a1e19afbf524e35 Upstream-ID: d4f699a421504df35254cf1c6f1a7c304fb907ca Upstream-ID: aafe246655b53b52bc32c8a24002bc262f4230f7 Upstream-ID: 8fa9cd1dee3c3339ae329cf20fb591db6d605120 Upstream-ID: f31327a48dd4103333cc53315ec53fe65ed8a17a Upstream-ID: edbfde98c40007b7752a4ac106095e060c25c1ef Upstream-ID: 052fd565e3ff2d8cec3bc957d1788f50c827f8e2 Upstream-ID: 7cf73737f357492776223da1c09179fa6ba74660 Upstream-ID: 180d84674be1344e45a63990d60349988187c1ae Upstream-ID: f6ae971186ba68d066cd102e57d5b0b2c211a5ee 2016-06-14 03:55:12 +00:00			`321065a95a7ccebdd5fd08482a1e19afbf524e35 Update DH groups`
			`d4f699a421504df35254cf1c6f1a7c304fb907ca Remove 1k bit groups`
			`aafe246655b53b52bc32c8a24002bc262f4230f7 Remove intermediate moduli`
			`8fa9cd1dee3c3339ae329cf20fb591db6d605120 put back SSH1 for 6.9`
			`f31327a48dd4103333cc53315ec53fe65ed8a17a Generate new moduli`
			`edbfde98c40007b7752a4ac106095e060c25c1ef Regen moduli`
			`052fd565e3ff2d8cec3bc957d1788f50c827f8e2 Switch to tame-based sandbox`
			`7cf73737f357492776223da1c09179fa6ba74660 Remove moduli <2k`
			`180d84674be1344e45a63990d60349988187c1ae Update moduli`
			`f6ae971186ba68d066cd102e57d5b0b2c211a5ee systrace is dead.`
upstream commit DEBUGLIBS has been broken since the gcc4 switch, so delete it. CFLAGS contains -g by default anyway problem noted by Edgar Pettijohn (edgar (at) pettijohn-web.com) ok millert@ kettenis@ deraadt@ Upstream-ID: 96c5054e3e1f170c6276902d5bc65bb3b87a2603 2016-07-04 18:01:44 +00:00			`96c5054e3e1f170c6276902d5bc65bb3b87a2603 remove DEBUGLIBS from Makefile`
upstream commit Update moduli file. Upstream-ID: 6da9a37f74aef9f9cc639004345ad893cad582d8 2016-08-11 01:42:11 +00:00			`6da9a37f74aef9f9cc639004345ad893cad582d8 Update moduli file`
upstream commit In ssh tests set REGRESS_FAIL_EARLY with ?= so that the environment can change it. OK djm@ Upstream-Regress-ID: 77bcb50e47b68c7209c7f0a5a020d73761e5143b 2016-09-30 11:55:20 +00:00			`77bcb50e47b68c7209c7f0a5a020d73761e5143b unset REGRESS_FAIL_EARLY`
upstream commit Change COMPILER_VERSION tests which limited additional warnings to gcc4 to instead skip them on gcc3 as clang can handle -Wpointer-sign and -Wold-style-definition. Upstream-ID: 5cbe348aa76dc1adf55be6c0e388fafaa945439a 2017-04-17 11:02:31 +00:00			`38c2133817cbcae75c88c63599ac54228f0fa384 Change COMPILER_VERSION tests`
Add 2 regress commits I applied by hand. Upstream-Regress-ID: 30c20180c87cbc99fa1020489fe7fd8245b6420c Upstream-Regress-ID: 1e6b51ddf767cbad0a4e63eb08026c127e654308 2017-04-28 04:41:17 +00:00			`30c20180c87cbc99fa1020489fe7fd8245b6420c resync integrity.sh shell`
Typo. Upstream-Regress-ID: 1e6b51ddf767cbad0a4e63eb08026c127e654308 2017-04-28 04:44:28 +00:00			`1e6b51ddf767cbad0a4e63eb08026c127e654308 integrity.sh reliability`
upstream commit undo some local debugging stuff that I committed by accident Upstream-ID: fe5b31f69a60d47171836911f144acff77810217 2017-04-30 23:25:03 +00:00			`fe5b31f69a60d47171836911f144acff77810217 Makefile.inc bits`
upstream commit this one I did forget to "cvs rm" Upstream-ID: 5781670c0578fe89663c9085ed3ba477cf7e7913 2017-05-01 14:08:26 +00:00			`5781670c0578fe89663c9085ed3ba477cf7e7913 Delete sshconnect1.c`
upstream commit rationalise the long list of manual CDIAGFLAGS that we add; most of these were redundant to -Wall -Wextra Upstream-ID: ea80f445e819719ccdcb237022cacfac990fdc5c 2017-06-02 06:06:10 +00:00			`ea80f445e819719ccdcb237022cacfac990fdc5c Makefile.inc warning flags`
upstream commit Run the screen twice so we end up with more candidate groups. ok djm@ Upstream-ID: b92c93266d8234d493857bb822260dacf4366157 2017-06-23 03:25:53 +00:00			`b92c93266d8234d493857bb822260dacf4366157 moduli-gen.sh tweak`
upstream commit Import regenerated moduli. Upstream-ID: b25bf747544265b39af74fe0716dc8d9f5b63b95 2017-06-23 03:30:42 +00:00			`b25bf747544265b39af74fe0716dc8d9f5b63b95 Updated moduli`
upstream commit actually remove these files Upstream-ID: 1bd41cba06a7752de4df304305a8153ebfb6b0ac 2017-07-01 22:55:44 +00:00			`1bd41cba06a7752de4df304305a8153ebfb6b0ac rsa.[ch] already removed`