commit b347007e1696cb5f0120c14ee455103efa7d8144
from: Thomas Adam <thomas@xteddy.org>
date: Fri Oct 15 19:57:06 2021 UTC

portable: update to handle bloom, etc

Update portable to support changes for bloom, etc.

commit - 8c2924d74a7af654f823d4c32c74ab7e4cf5651c
commit + b347007e1696cb5f0120c14ee455103efa7d8144
blob - 5ce2fefb817223e866a42709aabddf2711dbd24e
blob + d878ee08dc667666c7e42e36ba07cfd766a160e2
--- got/Makefile.am
+++ got/Makefile.am
@@ -43,7 +43,9 @@ got_SOURCES = got.c \
 	$(top_srcdir)/lib/send.c \
 	$(top_srcdir)/lib/deltify.c \
 	$(top_srcdir)/lib/pack_create.c \
-	$(top_srcdir)/lib/dial.c
+	$(top_srcdir)/lib/dial.c \
+	$(top_srcdir)/lib/bloom.c \
+	$(top_srcdir)/lib/murmurhash2.c
 
 EXTRA_DIST = $(top_srcdir)/compat/*.[ch] \
 	     $(top_srcdir)/lib/*.[ch] \
@@ -55,7 +57,7 @@ got_DEPENDENCIES = $(top_builddir)/compat/libopenbsd-c
 man1_MANS = got.1
 man5_MANS = got.conf.5 git-repository.5 got-worktree.5
 
-LDADD = -L$(top_builddir)/compat -lopenbsd-compat
+LDADD = -L$(top_builddir)/compat -lopenbsd-compat -lm
 if HOST_FREEBSD
 LDADD += -lmd
 endif
blob - 4aad9cd5d6c576036cc655ba32603edb65a6bdbd
blob + e4630f41c05a4cf3f423eb25cd08513a73f78667
--- gotadmin/Makefile.am
+++ gotadmin/Makefile.am
@@ -24,14 +24,16 @@ gotadmin_SOURCES = gotadmin.c \
        $(top_srcdir)/lib/reference.c \
        $(top_srcdir)/lib/repository.c \
        $(top_srcdir)/lib/repository_admin.c \
-       $(top_srcdir)/lib/sha1.c
+       $(top_srcdir)/lib/sha1.c \
+       $(top_srcdir)/lib/bloom.c \
+       $(top_srcdir)/lib/murmurhash2.c
 
 gotadmin_DEPENDENCIES = $(top_builddir)/compat/libopenbsd-compat.a
 EXTRA_DIST = gotadmin.1
 
 man1_MANS = gotadmin.1
 
-LDADD = -L$(top_builddir)/compat -lopenbsd-compat
+LDADD = -L$(top_builddir)/compat -lopenbsd-compat -lm
 if HOST_FREEBSD
 LDADD += -lmd
 endif
blob - 2b173017176381035ce051fd5a542a032ce7ece7
blob + 14f895c1ec910a384eec39f6e8d68c60ffa65538
--- lib/fetch.c
+++ lib/fetch.c
@@ -16,8 +16,6 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
 #include <sys/uio.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
blob - 29ea30e10bd9622eac9d105e0f8999912a726c9d
blob + f997c6e8b0b6ca0e1730e6d4660cfef42b2e8ea9
--- lib/object.c
+++ lib/object.c
@@ -16,8 +16,6 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
 #include <sys/uio.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
blob - e3bb199653594105098b9b1a03c6e5a58bed641d
blob + 39e9558bbc6cd4d7e28daadb2d034a781f141463
--- lib/object_cache.c
+++ lib/object_cache.c
@@ -15,7 +15,6 @@
  */
 
 #include <sys/time.h>
-#include <sys/queue.h>
 #include <sys/resource.h>
 
 #include <stdio.h>
blob - b78b7ba3c8fbd3036ee95c115be0ea37323e9496
blob + 7c6038283aab7c45804ce6b4b6da1f9794b3ec2a
--- lib/object_parse.c
+++ lib/object_parse.c
@@ -16,8 +16,6 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
 #include <sys/uio.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
blob - f85a08d455eca9c1c8e1f0b9cca76e7ea5cf2c1a
blob + b181dec766f418a030c0b719f55ab0b3e491b0e0
--- lib/pack_create.c
+++ lib/pack_create.c
@@ -16,8 +16,6 @@
  */
 
 #include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
 #include <sys/uio.h>
 #include <sys/stat.h>
 
@@ -27,6 +25,10 @@
 #include <string.h>
 #include <limits.h>
 #include <zlib.h>
+
+#if defined(__FreeBSD__)
+#include <unistd.h>
+#endif
 
 #include "got_error.h"
 #include "got_cancel.h"
blob - 39a26086156c2074eb1982a44d103fcf5424f1e1
blob + a5d6593a9f5cdcacb01699ad5efa1bbfc2aa78f8
--- lib/repository.c
+++ lib/repository.c
@@ -15,8 +15,6 @@
  */
 
 #include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
 #include <sys/uio.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
blob - 12174bd21c15a9ea4fa8bd42b3382c936afccd77
blob + f73c38388a2637a76122e000a939cc43c4314c89
--- lib/repository_admin.c
+++ lib/repository_admin.c
@@ -15,8 +15,6 @@
  */
 
 #include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
 #include <sys/uio.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
blob - d983e298afbf41bdaf8560eb6a46db4c9148df0c
blob + 9082a982b2d18cfec0e4a2b47e43d39474a99fa2
--- lib/send.c
+++ lib/send.c
@@ -17,8 +17,6 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
 #include <sys/uio.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
blob - 3503b0a3ee2a09bab034c51681f03d5e7094219f
blob + 7f2be8e0144c36a53f19b93799c70e24ab782b19
--- tog/Makefile.am
+++ tog/Makefile.am
@@ -41,7 +41,9 @@ tog_SOURCES = tog.c \
 	$(top_srcdir)/lib/diff_output_edscript.c \
 	$(top_srcdir)/lib/diff_patience.c \
 	$(top_srcdir)/lib/utf8.c \
-	$(top_srcdir)/lib/dial.c
+	$(top_srcdir)/lib/dial.c \
+	$(top_srcdir)/lib/bloom.c \
+	$(top_srcdir)/lib/murmurhash2.c
 
 tog_DEPENDENCIES = $(top_builddir)/compat/libopenbsd-compat.a
 
@@ -49,7 +51,7 @@ man1_MANS = tog.1
 
 EXTRA_DIST = tog.1
 
-LDADD = -L$(top_builddir)/compat -lopenbsd-compat -lpthread
+LDADD = -L$(top_builddir)/compat -lopenbsd-compat -lpthread -lm
 if HOST_FREEBSD
 LDADD += -lmd
 endif