commit 4e80a172c62f9b329f0f876405c8d391358e5e6a from: Thomas Adam date: Sun Oct 23 14:54:03 2022 UTC portable: support infrastructure for gotd/gotsh Provide the ability for -portable to continue to compile, until such time that gotd and gotsh have been enabled in -portable. commit - 65ca77c98cd3e9c7ce41b7d5eb01c9e72fb4be52 commit + 4e80a172c62f9b329f0f876405c8d391358e5e6a blob - c3a6639cb23f279ff3461e866788f54731df4a75 blob + b1ff29cbfba069de4f12cd8a9c9f07e52dd41e65 --- Makefile.am +++ Makefile.am @@ -1,4 +1,5 @@ SUBDIRS = compat libexec got tog gotadmin gotwebd +# TODO: gotd gotsh include $(top_builddir)/Makefile.common @@ -78,11 +79,13 @@ regress-delta: $(top_srcdir)/lib/pack_create.c \ $(top_srcdir)/lib/pack_create_privsep.c \ $(top_srcdir)/lib/path.c \ + $(top_srcdir)/lib/pollfd.c \ $(top_srcdir)/lib/privsep.c \ $(top_srcdir)/lib/ratelimit.c \ $(top_srcdir)/lib/read_gitconfig_privsep.c \ $(top_srcdir)/lib/read_gotconfig_privsep.c \ $(top_srcdir)/lib/reference.c \ + $(top_srcdir)/lib/reference_parse.c \ $(top_srcdir)/lib/repository.c \ $(top_srcdir)/lib/sha1.c \ $(top_srcdir)/lib/sigs.c \ @@ -116,11 +119,13 @@ regress-deltify: $(top_srcdir)/lib/pack_create.c \ $(top_srcdir)/lib/pack_create_privsep.c \ $(top_srcdir)/lib/path.c \ + $(top_srcdir)/lib/pollfd.c \ $(top_srcdir)/lib/privsep.c \ $(top_srcdir)/lib/ratelimit.c \ $(top_srcdir)/lib/read_gitconfig_privsep.c \ $(top_srcdir)/lib/read_gotconfig_privsep.c \ $(top_srcdir)/lib/reference.c \ + $(top_srcdir)/lib/reference_parse.c \ $(top_srcdir)/lib/repository.c \ $(top_srcdir)/lib/sha1.c \ $(top_srcdir)/lib/sigs.c \ @@ -156,11 +161,13 @@ regress-fetch: $(top_srcdir)/lib/pack_create.c \ $(top_srcdir)/lib/pack_create_privsep.c \ $(top_srcdir)/lib/path.c \ + $(top_srcdir)/lib/pollfd.c \ $(top_srcdir)/lib/privsep.c \ $(top_srcdir)/lib/ratelimit.c \ $(top_srcdir)/lib/read_gitconfig_privsep.c \ $(top_srcdir)/lib/read_gotconfig_privsep.c \ $(top_srcdir)/lib/reference.c \ + $(top_srcdir)/lib/reference_parse.c \ $(top_srcdir)/lib/repository.c \ $(top_srcdir)/lib/sha1.c \ $(top_srcdir)/lib/sigs.c \ @@ -196,11 +203,13 @@ regress-idset: $(top_srcdir)/lib/pack_create.c \ $(top_srcdir)/lib/pack_create_privsep.c \ $(top_srcdir)/lib/path.c \ + $(top_srcdir)/lib/pollfd.c \ $(top_srcdir)/lib/privsep.c \ $(top_srcdir)/lib/ratelimit.c \ $(top_srcdir)/lib/read_gitconfig_privsep.c \ $(top_srcdir)/lib/read_gotconfig_privsep.c \ $(top_srcdir)/lib/reference.c \ + $(top_srcdir)/lib/reference_parse.c \ $(top_srcdir)/lib/repository.c \ $(top_srcdir)/lib/sha1.c \ $(top_srcdir)/lib/sigs.c \ @@ -236,11 +245,13 @@ regress-path: $(top_srcdir)/lib/pack_create.c \ $(top_srcdir)/lib/pack_create_privsep.c \ $(top_srcdir)/lib/path.c \ + $(top_srcdir)/lib/pollfd.c \ $(top_srcdir)/lib/privsep.c \ $(top_srcdir)/lib/ratelimit.c \ $(top_srcdir)/lib/read_gitconfig_privsep.c \ $(top_srcdir)/lib/read_gotconfig_privsep.c \ $(top_srcdir)/lib/reference.c \ + $(top_srcdir)/lib/reference_parse.c \ $(top_srcdir)/lib/repository.c \ $(top_srcdir)/lib/sha1.c \ $(top_srcdir)/lib/sigs.c \ blob - 900be37b853c4d23226b0bce3b3397fd7371be33 blob + fd5676f97920ee3b04d42ce7768a4e21a251f4ad --- got/Makefile.am +++ got/Makefile.am @@ -43,12 +43,14 @@ got_SOURCES = got.c \ $(top_srcdir)/lib/pack_create_privsep.c \ $(top_srcdir)/lib/patch.c \ $(top_srcdir)/lib/path.c \ + $(top_srcdir)/lib/pollfd.c \ $(top_srcdir)/lib/privsep.c \ $(top_srcdir)/lib/ratelimit.c \ $(top_srcdir)/lib/rcsutil.c \ $(top_srcdir)/lib/read_gitconfig_privsep.c \ $(top_srcdir)/lib/read_gotconfig_privsep.c \ $(top_srcdir)/lib/reference.c \ + $(top_srcdir)/lib/reference_parse.c \ $(top_srcdir)/lib/repository.c \ $(top_srcdir)/lib/send.c \ $(top_srcdir)/lib/sha1.c \ blob - b66e12a433c19abd7d0013e4d84db728cefd56f2 blob + 565729d2ac35a70bea11c6639f054205ddea5461 --- gotadmin/Makefile.am +++ gotadmin/Makefile.am @@ -26,11 +26,13 @@ gotadmin_SOURCES = gotadmin.c \ $(top_srcdir)/lib/pack_create.c \ $(top_srcdir)/lib/pack_create_privsep.c \ $(top_srcdir)/lib/path.c \ + $(top_srcdir)/lib/pollfd.c \ $(top_srcdir)/lib/privsep.c \ $(top_srcdir)/lib/ratelimit.c \ $(top_srcdir)/lib/read_gitconfig_privsep.c \ $(top_srcdir)/lib/read_gotconfig_privsep.c \ $(top_srcdir)/lib/reference.c \ + $(top_srcdir)/lib/reference_parse.c \ $(top_srcdir)/lib/repository.c \ $(top_srcdir)/lib/repository_admin.c \ $(top_srcdir)/lib/sha1.c \ blob - c813bc0f64e33b56bf28fb34610cf22e72a9e806 blob + 10509966db2d55117a8aa60d968ee5fb6660789b --- gotwebd/Makefile.am +++ gotwebd/Makefile.am @@ -38,11 +38,13 @@ gotwebd_SOURCES = config.c \ $(top_srcdir)/lib/pack.c \ $(top_srcdir)/lib/patch.c \ $(top_srcdir)/lib/path.c \ + $(top_srcdir)/lib/pollfd.c \ $(top_srcdir)/lib/privsep.c \ $(top_srcdir)/lib/rcsutil.c \ $(top_srcdir)/lib/read_gitconfig_privsep.c \ $(top_srcdir)/lib/read_gotconfig_privsep.c \ $(top_srcdir)/lib/reference.c \ + $(top_srcdir)/lib/reference_parse.c \ $(top_srcdir)/lib/repository.c \ $(top_srcdir)/lib/sha1.c \ $(top_srcdir)/lib/sigs.c \ blob - 806b5542c5fcee17a27336702f83c72c94a50070 blob + 13f61a15fdd51b06f2a21329608ca238fff9f7c8 --- lib/inflate.c +++ lib/inflate.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include blob - d46762d0f8fd908e9beebe23dd87ff3740db4068 blob + 74f445bb30a4f803f490084045cdd29467e82779 --- lib/read_gitconfig.c +++ lib/read_gitconfig.c @@ -15,13 +15,11 @@ */ #include -#include #include #include #include #include -#include #include #include #include blob - e2b657e682ee11381fb43d2db10ba0f1f44f2964 blob + bcd8e6b39a7cf10ea69b741af27b4045fffb9c93 --- libexec/got-fetch-pack/Makefile.am +++ libexec/got-fetch-pack/Makefile.am @@ -5,14 +5,15 @@ include $(top_builddir)/Makefile.common got_fetch_pack_SOURCES = \ got-fetch-pack.c \ $(top_srcdir)/lib/error.c \ + $(top_srcdir)/lib/gitproto.c \ $(top_srcdir)/lib/inflate.c \ $(top_srcdir)/lib/object_parse.c \ $(top_srcdir)/lib/path.c \ - $(top_srcdir)/lib/privsep.c \ - $(top_srcdir)/lib/sha1.c \ $(top_srcdir)/lib/pkt.c \ - $(top_srcdir)/lib/gitproto.c \ - $(top_srcdir)/lib/ratelimit.c + $(top_srcdir)/lib/pollfd.c \ + $(top_srcdir)/lib/privsep.c \ + $(top_srcdir)/lib/ratelimit.c \ + $(top_srcdir)/lib/sha1.c got_fetch_pack_DEPENDENCIES = $(top_builddir)/compat/libopenbsd-compat.a blob - 2904feccba8301f1ebfce4e1a919e9d8586a9de9 blob + 9d012875f9db7bef25c2440aef5d5cc81ef2856b --- libexec/got-index-pack/Makefile.am +++ libexec/got-index-pack/Makefile.am @@ -3,18 +3,19 @@ libexec_PROGRAMS = got-index-pack include $(top_builddir)/Makefile.common got_index_pack_SOURCES = got-index-pack.c \ + $(top_srcdir)/lib/delta.c \ + $(top_srcdir)/lib/delta_cache.c \ $(top_srcdir)/lib/error.c \ $(top_srcdir)/lib/inflate.c \ - $(top_srcdir)/lib/object_parse.c \ $(top_srcdir)/lib/object_idset.c \ - $(top_srcdir)/lib/delta_cache.c \ - $(top_srcdir)/lib/delta.c \ + $(top_srcdir)/lib/object_parse.c \ $(top_srcdir)/lib/pack.c \ $(top_srcdir)/lib/pack_index.c \ $(top_srcdir)/lib/path.c \ + $(top_srcdir)/lib/pollfd.c \ $(top_srcdir)/lib/privsep.c \ - $(top_srcdir)/lib/sha1.c \ - $(top_srcdir)/lib/ratelimit.c + $(top_srcdir)/lib/ratelimit.c \ + $(top_srcdir)/lib/sha1.c got_index_pack_DEPENDENCIES = $(top_builddir)/compat/libopenbsd-compat.a blob - fe1e85bd32592cac6f44d8ad36ad5f2c189e40c9 blob + 7dc3b405d8c05c36fd2abca0fcef4fbce3e9559d --- libexec/got-read-blob/Makefile.am +++ libexec/got-read-blob/Makefile.am @@ -7,6 +7,7 @@ got_read_blob_SOURCES = got-read-blob.c \ $(top_srcdir)/lib/inflate.c \ $(top_srcdir)/lib/object_parse.c \ $(top_srcdir)/lib/path.c \ + $(top_srcdir)/lib/pollfd.c \ $(top_srcdir)/lib/privsep.c \ $(top_srcdir)/lib/sha1.c blob - a57f5ee816d1b72bd729aa6bf408844cfe50d03c blob + 1b05de6c34ae9567d3221a7928ccbc61bc9f2e28 --- libexec/got-read-commit/Makefile.am +++ libexec/got-read-commit/Makefile.am @@ -7,6 +7,7 @@ got_read_commit_SOURCES = got-read-commit.c \ $(top_srcdir)/lib/inflate.c \ $(top_srcdir)/lib/object_parse.c \ $(top_srcdir)/lib/path.c \ + $(top_srcdir)/lib/pollfd.c \ $(top_srcdir)/lib/privsep.c \ $(top_srcdir)/lib/sha1.c blob - de089287b3dd54d447997fe6790315faf8f58615 blob + 8e5051ffaee72fe0e5c854408a1652a53aaa30d3 --- libexec/got-read-gitconfig/Makefile.am +++ libexec/got-read-gitconfig/Makefile.am @@ -4,12 +4,13 @@ include $(top_builddir)/Makefile.common got_read_gitconfig_SOURCES = got-read-gitconfig.c \ $(top_srcdir)/lib/error.c \ + $(top_srcdir)/lib/gitconfig.c \ $(top_srcdir)/lib/inflate.c \ $(top_srcdir)/lib/object_parse.c \ $(top_srcdir)/lib/path.c \ + $(top_srcdir)/lib/pollfd.c \ $(top_srcdir)/lib/privsep.c \ - $(top_srcdir)/lib/sha1.c \ - $(top_srcdir)/lib/gitconfig.c + $(top_srcdir)/lib/sha1.c got_read_gitconfig_DEPENDENCIES = $(top_builddir)/compat/libopenbsd-compat.a blob - 58eb65bdd20b1edb5e5246f762cda1cb23c1248b blob + 02737618dcdff78602a7cbb55fe6775ba24373ec --- libexec/got-read-gotconfig/Makefile.am +++ libexec/got-read-gotconfig/Makefile.am @@ -4,13 +4,14 @@ include $(top_builddir)/Makefile.common got_read_gotconfig_SOURCES = \ got-read-gotconfig.c \ - gotconfig.h \ $(top_srcdir)/lib/error.c \ $(top_srcdir)/lib/inflate.c \ $(top_srcdir)/lib/object_parse.c \ $(top_srcdir)/lib/path.c \ + $(top_srcdir)/lib/pollfd.c \ $(top_srcdir)/lib/privsep.c \ $(top_srcdir)/lib/sha1.c \ + gotconfig.h \ parse.y got_read_gotconfig_DEPENDENCIES = $(top_builddir)/compat/libopenbsd-compat.a blob - 89fab35d568498f3240f57b08d05b25bbbd15205 blob + ee4dac75ae9275882d9de0e0cbc498d67a46ee5d --- libexec/got-read-object/Makefile.am +++ libexec/got-read-object/Makefile.am @@ -7,6 +7,7 @@ got_read_object_SOURCES = got-read-object.c \ $(top_srcdir)/lib/inflate.c \ $(top_srcdir)/lib/object_parse.c \ $(top_srcdir)/lib/path.c \ + $(top_srcdir)/lib/pollfd.c \ $(top_srcdir)/lib/privsep.c \ $(top_srcdir)/lib/sha1.c blob - e42644c2288b0376c58274c1b19ba3030e65749b blob + b1862d8c252d9a32662d88a60e158f7cfe81f713 --- libexec/got-read-pack/Makefile.am +++ libexec/got-read-pack/Makefile.am @@ -7,12 +7,13 @@ got_read_pack_SOURCES = got-read-pack.c \ $(top_srcdir)/lib/delta_cache.c \ $(top_srcdir)/lib/error.c \ $(top_srcdir)/lib/inflate.c \ - $(top_srcdir)/lib/object_parse.c \ $(top_srcdir)/lib/object_cache.c \ $(top_srcdir)/lib/object_idset.c \ + $(top_srcdir)/lib/object_parse.c \ $(top_srcdir)/lib/opentemp.c \ $(top_srcdir)/lib/pack.c \ $(top_srcdir)/lib/path.c \ + $(top_srcdir)/lib/pollfd.c \ $(top_srcdir)/lib/privsep.c \ $(top_srcdir)/lib/sha1.c blob - f6fdb7c5329475c7beee119cfaa7e8162dc252a4 blob + 410d7ea26845aa572d57a00d2968d2fbdc2f9ce0 --- libexec/got-read-patch/Makefile.am +++ libexec/got-read-patch/Makefile.am @@ -7,6 +7,7 @@ got_read_patch_SOURCES = got-read-patch.c \ $(top_srcdir)/lib/inflate.c \ $(top_srcdir)/lib/object_parse.c \ $(top_srcdir)/lib/path.c \ + $(top_srcdir)/lib/pollfd.c \ $(top_srcdir)/lib/privsep.c \ $(top_srcdir)/lib/sha1.c blob - f21b5534c55e0f56bb07bf07e6aca05a67aeed8b blob + 34d65ce26ff8646fac779c6c9801bb42e2a8dad8 --- libexec/got-read-tag/Makefile.am +++ libexec/got-read-tag/Makefile.am @@ -7,6 +7,7 @@ got_read_tag_SOURCES = got-read-tag.c \ $(top_srcdir)/lib/inflate.c \ $(top_srcdir)/lib/object_parse.c \ $(top_srcdir)/lib/path.c \ + $(top_srcdir)/lib/pollfd.c \ $(top_srcdir)/lib/privsep.c \ $(top_srcdir)/lib/sha1.c blob - 6c2dc784c89dca2cef6b99452a9d23136e1ddeae blob + c89ca903ed212c5bf4535f3ccc666cc2df74c01c --- libexec/got-read-tree/Makefile.am +++ libexec/got-read-tree/Makefile.am @@ -7,6 +7,7 @@ got_read_tree_SOURCES = got-read-tree.c \ $(top_srcdir)/lib/inflate.c \ $(top_srcdir)/lib/object_parse.c \ $(top_srcdir)/lib/path.c \ + $(top_srcdir)/lib/pollfd.c \ $(top_srcdir)/lib/privsep.c \ $(top_srcdir)/lib/sha1.c blob - 6f79360e26a9ee5a07eb4719eb5a7c79da6ed2d6 blob + 682ec5878b08bf9c0055637d16e1632c0e571dba --- libexec/got-send-pack/Makefile.am +++ libexec/got-send-pack/Makefile.am @@ -5,14 +5,15 @@ include $(top_builddir)/Makefile.common got_send_pack_SOURCES = \ got-send-pack.c \ $(top_srcdir)/lib/error.c \ + $(top_srcdir)/lib/gitproto.c \ $(top_srcdir)/lib/inflate.c \ $(top_srcdir)/lib/object_parse.c \ $(top_srcdir)/lib/path.c \ - $(top_srcdir)/lib/privsep.c \ - $(top_srcdir)/lib/sha1.c \ $(top_srcdir)/lib/pkt.c \ - $(top_srcdir)/lib/gitproto.c \ - $(top_srcdir)/lib/ratelimit.c + $(top_srcdir)/lib/pollfd.c \ + $(top_srcdir)/lib/privsep.c \ + $(top_srcdir)/lib/ratelimit.c \ + $(top_srcdir)/lib/sha1.c got_send_pack_DEPENDENCIES = $(top_builddir)/compat/libopenbsd-compat.a blob - 182343dfed5fc093b43c735e021f77431a0fcc6d blob + b76d64416f647ccc1e7ed346d3ba52c9c2adf0ea --- tog/Makefile.am +++ tog/Makefile.am @@ -4,52 +4,54 @@ include $(top_builddir)/Makefile.common tog_SOURCES = tog.c \ $(top_srcdir)/lib/blame.c \ + $(top_srcdir)/lib/bloom.c \ + $(top_srcdir)/lib/buf.c \ $(top_srcdir)/lib/commit_graph.c \ + $(top_srcdir)/lib/date.c \ + $(top_srcdir)/lib/deflate.c \ $(top_srcdir)/lib/delta.c \ + $(top_srcdir)/lib/delta_cache.c \ + $(top_srcdir)/lib/dial.c \ $(top_srcdir)/lib/diff.c \ + $(top_srcdir)/lib/diff3.c \ + $(top_srcdir)/lib/diff_atomize_text.c \ + $(top_srcdir)/lib/diff_main.c \ + $(top_srcdir)/lib/diff_myers.c \ + $(top_srcdir)/lib/diff_output.c \ + $(top_srcdir)/lib/diff_output_edscript.c \ + $(top_srcdir)/lib/diff_output_plain.c \ + $(top_srcdir)/lib/diff_output_unidiff.c \ + $(top_srcdir)/lib/diff_patience.c \ $(top_srcdir)/lib/diffreg.c \ $(top_srcdir)/lib/error.c \ + $(top_srcdir)/lib/fetch.c \ $(top_srcdir)/lib/fileindex.c \ + $(top_srcdir)/lib/gotconfig.c \ + $(top_srcdir)/lib/inflate.c \ + $(top_srcdir)/lib/lockfile.c \ + $(top_srcdir)/lib/murmurhash2.c \ $(top_srcdir)/lib/object.c \ $(top_srcdir)/lib/object_cache.c \ + $(top_srcdir)/lib/object_create.c \ $(top_srcdir)/lib/object_idset.c \ $(top_srcdir)/lib/object_open_privsep.c \ $(top_srcdir)/lib/object_parse.c \ $(top_srcdir)/lib/opentemp.c \ - $(top_srcdir)/lib/path.c \ $(top_srcdir)/lib/pack.c \ + $(top_srcdir)/lib/path.c \ + $(top_srcdir)/lib/pollfd.c \ $(top_srcdir)/lib/privsep.c \ + $(top_srcdir)/lib/rcsutil.c \ + $(top_srcdir)/lib/read_gitconfig_privsep.c \ + $(top_srcdir)/lib/read_gotconfig_privsep.c \ $(top_srcdir)/lib/reference.c \ + $(top_srcdir)/lib/reference_parse.c \ $(top_srcdir)/lib/repository.c \ $(top_srcdir)/lib/sha1.c \ - $(top_srcdir)/lib/worktree.c \ - $(top_srcdir)/lib/worktree_open.c \ - $(top_srcdir)/lib/inflate.c \ - $(top_srcdir)/lib/buf.c \ - $(top_srcdir)/lib/rcsutil.c \ - $(top_srcdir)/lib/diff3.c \ - $(top_srcdir)/lib/lockfile.c \ - $(top_srcdir)/lib/deflate.c \ - $(top_srcdir)/lib/object_create.c \ - $(top_srcdir)/lib/delta_cache.c \ - $(top_srcdir)/lib/fetch.c \ - $(top_srcdir)/lib/gotconfig.c \ - $(top_srcdir)/lib/diff_main.c \ - $(top_srcdir)/lib/diff_atomize_text.c \ - $(top_srcdir)/lib/diff_myers.c \ - $(top_srcdir)/lib/diff_output.c \ - $(top_srcdir)/lib/diff_output_plain.c \ - $(top_srcdir)/lib/diff_output_unidiff.c \ - $(top_srcdir)/lib/diff_output_edscript.c \ - $(top_srcdir)/lib/diff_patience.c \ + $(top_srcdir)/lib/sigs.c \ $(top_srcdir)/lib/utf8.c \ - $(top_srcdir)/lib/dial.c \ - $(top_srcdir)/lib/bloom.c \ - $(top_srcdir)/lib/murmurhash2.c \ - $(top_srcdir)/lib/date.c \ - $(top_srcdir)/lib/read_gitconfig_privsep.c \ - $(top_srcdir)/lib/read_gotconfig_privsep.c \ - $(top_srcdir)/lib/sigs.c + $(top_srcdir)/lib/worktree.c \ + $(top_srcdir)/lib/worktree_open.c tog_DEPENDENCIES = $(top_builddir)/compat/libopenbsd-compat.a