commit 54bac5ec34cd08d8ecedaab13def1cfce4e4dae2 from: Thomas Adam date: Thu Feb 23 16:46:18 2023 UTC portable: update Makefiles sha1.c -> hash.c commit - c8ae092d079ca1c9f5f2a7e44c73948cd55454e7 commit + 54bac5ec34cd08d8ecedaab13def1cfce4e4dae2 blob - 7215f7f2467e57bd13c5b7ddc7860e96fb842a9b blob + e8de32c015bb2db97e95e8b7a2cbfcbaecad34aa --- Makefile.am +++ Makefile.am @@ -65,6 +65,7 @@ regress-delta: $(top_srcdir)/lib/deltify.c \ $(top_srcdir)/lib/error.c \ $(top_srcdir)/lib/gotconfig.c \ + $(top_srcdir)/lib/hash.c \ $(top_srcdir)/lib/inflate.c \ $(top_srcdir)/lib/lockfile.c \ $(top_srcdir)/lib/murmurhash2.c \ @@ -87,7 +88,6 @@ regress-delta: $(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 \ $(top_srcdir)/regress/delta/delta_test.c \ -L$(top_builddir)/compat -lopenbsd-compat $(LIBS) && \ @@ -105,6 +105,7 @@ regress-deltify: $(top_srcdir)/lib/deltify.c \ $(top_srcdir)/lib/error.c \ $(top_srcdir)/lib/gotconfig.c \ + $(top_srcdir)/lib/hash.c \ $(top_srcdir)/lib/inflate.c \ $(top_srcdir)/lib/lockfile.c \ $(top_srcdir)/lib/murmurhash2.c \ @@ -127,7 +128,6 @@ regress-deltify: $(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 \ $(top_srcdir)/regress/deltify/deltify_test.c \ -L$(top_builddir)/compat -lopenbsd-compat $(LIBS) && \ @@ -147,6 +147,7 @@ regress-fetch: $(top_srcdir)/lib/error.c \ $(top_srcdir)/lib/fetch.c \ $(top_srcdir)/lib/gotconfig.c \ + $(top_srcdir)/lib/hash.c \ $(top_srcdir)/lib/inflate.c \ $(top_srcdir)/lib/lockfile.c \ $(top_srcdir)/lib/murmurhash2.c \ @@ -169,7 +170,6 @@ regress-fetch: $(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 \ $(top_srcdir)/regress/fetch/fetch_test.c \ -L$(top_builddir)/compat -lopenbsd-compat $(LIBS) -lm && \ @@ -189,6 +189,7 @@ regress-idset: $(top_srcdir)/lib/error.c \ $(top_srcdir)/lib/fetch.c \ $(top_srcdir)/lib/gotconfig.c \ + $(top_srcdir)/lib/hash.c \ $(top_srcdir)/lib/inflate.c \ $(top_srcdir)/lib/lockfile.c \ $(top_srcdir)/lib/murmurhash2.c \ @@ -211,7 +212,6 @@ regress-idset: $(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 \ $(top_srcdir)/regress/idset/idset_test.c \ -L$(top_builddir)/compat -lopenbsd-compat $(LIBS) && \ @@ -231,6 +231,7 @@ regress-path: $(top_srcdir)/lib/error.c \ $(top_srcdir)/lib/fetch.c \ $(top_srcdir)/lib/gotconfig.c \ + $(top_srcdir)/lib/hash.c \ $(top_srcdir)/lib/inflate.c \ $(top_srcdir)/lib/lockfile.c \ $(top_srcdir)/lib/murmurhash2.c \ @@ -253,7 +254,6 @@ regress-path: $(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 \ $(top_srcdir)/regress/path/path_test.c \ -L$(top_builddir)/compat -lopenbsd-compat $(LIBS) && \ blob - fd5676f97920ee3b04d42ce7768a4e21a251f4ad blob + ae872a4b3c5ffb787354c7dc39d7ae9624f9238d --- got/Makefile.am +++ got/Makefile.am @@ -28,6 +28,7 @@ got_SOURCES = got.c \ $(top_srcdir)/lib/fetch.c \ $(top_srcdir)/lib/fileindex.c \ $(top_srcdir)/lib/gotconfig.c \ + $(top_srcdir)/lib/hash.c \ $(top_srcdir)/lib/inflate.c \ $(top_srcdir)/lib/lockfile.c \ $(top_srcdir)/lib/murmurhash2.c \ @@ -53,7 +54,6 @@ got_SOURCES = got.c \ $(top_srcdir)/lib/reference_parse.c \ $(top_srcdir)/lib/repository.c \ $(top_srcdir)/lib/send.c \ - $(top_srcdir)/lib/sha1.c \ $(top_srcdir)/lib/sigs.c \ $(top_srcdir)/lib/worktree.c \ $(top_srcdir)/lib/worktree_open.c blob - 565729d2ac35a70bea11c6639f054205ddea5461 blob + 7d9b5b5aa0ad80248907cfa93941fba4888f2398 --- gotadmin/Makefile.am +++ gotadmin/Makefile.am @@ -12,6 +12,7 @@ gotadmin_SOURCES = gotadmin.c \ $(top_srcdir)/lib/deltify.c \ $(top_srcdir)/lib/error.c \ $(top_srcdir)/lib/gotconfig.c \ + $(top_srcdir)/lib/hash.c \ $(top_srcdir)/lib/inflate.c \ $(top_srcdir)/lib/lockfile.c \ $(top_srcdir)/lib/murmurhash2.c \ @@ -35,7 +36,6 @@ gotadmin_SOURCES = gotadmin.c \ $(top_srcdir)/lib/reference_parse.c \ $(top_srcdir)/lib/repository.c \ $(top_srcdir)/lib/repository_admin.c \ - $(top_srcdir)/lib/sha1.c \ $(top_srcdir)/lib/sigs.c \ $(top_srcdir)/lib/worktree_open.c blob - 0b1f4fd498d8e9790799c6cec645ec55b420fc5e blob + 921167c2d746e713f84f96ae2fa4594d6ca0851c --- gotwebd/Makefile.am +++ gotwebd/Makefile.am @@ -34,6 +34,7 @@ gotwebd_SOURCES = config.c \ $(top_srcdir)/lib/error.c \ $(top_srcdir)/lib/fileindex.c \ $(top_srcdir)/lib/gotconfig.c \ + $(top_srcdir)/lib/hash.c \ $(top_srcdir)/lib/inflate.c \ $(top_srcdir)/lib/lockfile.c \ $(top_srcdir)/lib/murmurhash2.c \ @@ -55,7 +56,6 @@ gotwebd_SOURCES = config.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 \ $(top_srcdir)/lib/utf8.c \ $(top_srcdir)/lib/worktree.c \ blob - bcd8e6b39a7cf10ea69b741af27b4045fffb9c93 blob + 6a2be18da50c95a41fe1f11c8dfd17abefb21b70 --- libexec/got-fetch-pack/Makefile.am +++ libexec/got-fetch-pack/Makefile.am @@ -6,14 +6,14 @@ got_fetch_pack_SOURCES = \ got-fetch-pack.c \ $(top_srcdir)/lib/error.c \ $(top_srcdir)/lib/gitproto.c \ + $(top_srcdir)/lib/hash.c \ $(top_srcdir)/lib/inflate.c \ $(top_srcdir)/lib/object_parse.c \ $(top_srcdir)/lib/path.c \ $(top_srcdir)/lib/pkt.c \ $(top_srcdir)/lib/pollfd.c \ $(top_srcdir)/lib/privsep.c \ - $(top_srcdir)/lib/ratelimit.c \ - $(top_srcdir)/lib/sha1.c + $(top_srcdir)/lib/ratelimit.c got_fetch_pack_DEPENDENCIES = $(top_builddir)/compat/libopenbsd-compat.a blob - 9d012875f9db7bef25c2440aef5d5cc81ef2856b blob + d852e112633cdbfe94352f5847d90ec6709be8b3 --- libexec/got-index-pack/Makefile.am +++ libexec/got-index-pack/Makefile.am @@ -15,7 +15,7 @@ got_index_pack_SOURCES = got-index-pack.c \ $(top_srcdir)/lib/pollfd.c \ $(top_srcdir)/lib/privsep.c \ $(top_srcdir)/lib/ratelimit.c \ - $(top_srcdir)/lib/sha1.c + $(top_srcdir)/lib/hash.c got_index_pack_DEPENDENCIES = $(top_builddir)/compat/libopenbsd-compat.a blob - 7dc3b405d8c05c36fd2abca0fcef4fbce3e9559d blob + 9ab6c6a286c3fa240c495a586a5ee561bbf7e2a0 --- libexec/got-read-blob/Makefile.am +++ libexec/got-read-blob/Makefile.am @@ -4,12 +4,12 @@ include $(top_builddir)/Makefile.common got_read_blob_SOURCES = got-read-blob.c \ $(top_srcdir)/lib/error.c \ + $(top_srcdir)/lib/hash.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/privsep.c got_read_blob_DEPENDENCIES = $(top_builddir)/compat/libopenbsd-compat.a blob - 1b05de6c34ae9567d3221a7928ccbc61bc9f2e28 blob + bd1c4bd26e47dc7f60a0ebd3b31f6bb47d359882 --- libexec/got-read-commit/Makefile.am +++ libexec/got-read-commit/Makefile.am @@ -4,12 +4,12 @@ include $(top_builddir)/Makefile.common got_read_commit_SOURCES = got-read-commit.c \ $(top_srcdir)/lib/error.c \ + $(top_srcdir)/lib/hash.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/privsep.c got_read_commit_DEPENDENCIES = $(top_builddir)/compat/libopenbsd-compat.a blob - 8e5051ffaee72fe0e5c854408a1652a53aaa30d3 blob + 6f4bc67b67cb1ca9ebb0a43838b974d77126840f --- libexec/got-read-gitconfig/Makefile.am +++ libexec/got-read-gitconfig/Makefile.am @@ -5,12 +5,12 @@ 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/hash.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/privsep.c got_read_gitconfig_DEPENDENCIES = $(top_builddir)/compat/libopenbsd-compat.a blob - 02737618dcdff78602a7cbb55fe6775ba24373ec blob + 86ea9e12ca0b24ed15206cf2445968d6c6478b6b --- libexec/got-read-gotconfig/Makefile.am +++ libexec/got-read-gotconfig/Makefile.am @@ -3,14 +3,14 @@ libexec_PROGRAMS = got-read-gotconfig include $(top_builddir)/Makefile.common got_read_gotconfig_SOURCES = \ - got-read-gotconfig.c \ $(top_srcdir)/lib/error.c \ + $(top_srcdir)/lib/hash.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 \ + got-read-gotconfig.c \ gotconfig.h \ parse.y blob - ee4dac75ae9275882d9de0e0cbc498d67a46ee5d blob + 46d2a7c56d65fa37dcc62a462f84a92a70b65e0a --- libexec/got-read-object/Makefile.am +++ libexec/got-read-object/Makefile.am @@ -4,12 +4,12 @@ include $(top_builddir)/Makefile.common got_read_object_SOURCES = got-read-object.c \ $(top_srcdir)/lib/error.c \ + $(top_srcdir)/lib/hash.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/privsep.c got_read_object_DEPENDENCIES = $(top_builddir)/compat/libopenbsd-compat.a blob - b1862d8c252d9a32662d88a60e158f7cfe81f713 blob + 05974a29a421a297f80ef43a9dc63821d4c79360 --- libexec/got-read-pack/Makefile.am +++ libexec/got-read-pack/Makefile.am @@ -6,6 +6,7 @@ got_read_pack_SOURCES = got-read-pack.c \ $(top_srcdir)/lib/delta.c \ $(top_srcdir)/lib/delta_cache.c \ $(top_srcdir)/lib/error.c \ + $(top_srcdir)/lib/hash.c \ $(top_srcdir)/lib/inflate.c \ $(top_srcdir)/lib/object_cache.c \ $(top_srcdir)/lib/object_idset.c \ @@ -14,8 +15,7 @@ got_read_pack_SOURCES = got-read-pack.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 + $(top_srcdir)/lib/privsep.c got_read_pack_DEPENDENCIES = $(top_builddir)/compat/libopenbsd-compat.a blob - 410d7ea26845aa572d57a00d2968d2fbdc2f9ce0 blob + 9ed6fe35804911506385cd1c2746e3a1e98067dc --- libexec/got-read-patch/Makefile.am +++ libexec/got-read-patch/Makefile.am @@ -4,12 +4,12 @@ include $(top_builddir)/Makefile.common got_read_patch_SOURCES = got-read-patch.c \ $(top_srcdir)/lib/error.c \ + $(top_srcdir)/lib/hash.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/privsep.c got_read_patch_DEPENDENCIES = $(top_builddir)/compat/libopenbsd-compat.a blob - 34d65ce26ff8646fac779c6c9801bb42e2a8dad8 blob + c13b228359922b649e53fcfdc3c2a69e2b7f7ebd --- libexec/got-read-tag/Makefile.am +++ libexec/got-read-tag/Makefile.am @@ -4,12 +4,12 @@ include $(top_builddir)/Makefile.common got_read_tag_SOURCES = got-read-tag.c \ $(top_srcdir)/lib/error.c \ + $(top_srcdir)/lib/hash.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/privsep.c got_read_tag_DEPENDENCIES = $(top_builddir)/compat/libopenbsd-compat.a blob - c89ca903ed212c5bf4535f3ccc666cc2df74c01c blob + 33c3af015b63b520d339d28d77f2ac2a810e3476 --- libexec/got-read-tree/Makefile.am +++ libexec/got-read-tree/Makefile.am @@ -4,12 +4,12 @@ include $(top_builddir)/Makefile.common got_read_tree_SOURCES = got-read-tree.c \ $(top_srcdir)/lib/error.c \ + $(top_srcdir)/lib/hash.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/privsep.c got_read_tree_DEPENDENCIES = $(top_builddir)/compat/libopenbsd-compat.a blob - 31db7e93d8ae424ad316ae71f8214ded01e60478 blob + f8f9345baade6c8e051dd05ab8d63a204e5f9cef --- libexec/got-send-pack/Makefile.am +++ libexec/got-send-pack/Makefile.am @@ -6,6 +6,7 @@ got_send_pack_SOURCES = \ got-send-pack.c \ $(top_srcdir)/lib/error.c \ $(top_srcdir)/lib/gitproto.c \ + $(top_srcdir)/lib/hash.c \ $(top_srcdir)/lib/inflate.c \ $(top_srcdir)/lib/object_parse.c \ $(top_srcdir)/lib/path.c \ @@ -13,8 +14,7 @@ got_send_pack_SOURCES = \ $(top_srcdir)/lib/pollfd.c \ $(top_srcdir)/lib/privsep.c \ $(top_srcdir)/lib/ratelimit.c \ - $(top_srcdir)/lib/reference_parse.c \ - $(top_srcdir)/lib/sha1.c + $(top_srcdir)/lib/reference_parse.c got_send_pack_DEPENDENCIES = $(top_builddir)/compat/libopenbsd-compat.a blob - b76d64416f647ccc1e7ed346d3ba52c9c2adf0ea blob + a217b4ba7e1b2c2eb6b606300599ec14ee4221ae --- tog/Makefile.am +++ tog/Makefile.am @@ -27,6 +27,7 @@ tog_SOURCES = tog.c \ $(top_srcdir)/lib/fetch.c \ $(top_srcdir)/lib/fileindex.c \ $(top_srcdir)/lib/gotconfig.c \ + $(top_srcdir)/lib/hash.c \ $(top_srcdir)/lib/inflate.c \ $(top_srcdir)/lib/lockfile.c \ $(top_srcdir)/lib/murmurhash2.c \ @@ -47,7 +48,6 @@ tog_SOURCES = tog.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 \ $(top_srcdir)/lib/utf8.c \ $(top_srcdir)/lib/worktree.c \