commit e19a8793edf7bd79135e1bd3e90eb8c36dc951b5
from: Thomas Adam <thomas.adam22@gmail.com>
date: Thu Apr 25 18:11:01 2024 UTC

portable: enable got-fetch-http

commit - af6256df15e4f3959ece92fd75c012442161c45f
commit + e19a8793edf7bd79135e1bd3e90eb8c36dc951b5
blob - 055c7f00a6fe4fb9cb88a4bedb1f8beb0e3ec875
blob + 70154bb37964ee3202de5bb276067b535ca5e4fd
--- configure.ac
+++ configure.ac
@@ -911,6 +911,7 @@ AC_CONFIG_FILES([Makefile
 		 compat/Makefile
 		 libexec/Makefile
 		 libexec/got-read-tree/Makefile
+		 libexec/got-fetch-http/Makefile
 		 libexec/got-fetch-pack/Makefile
 		 libexec/got-index-pack/Makefile
 		 libexec/got-read-blob/Makefile
blob - 3576551fba26e3f3f4903526dc43d69f90c88f9d
blob + 647563ddc6808fc8ad61deea77b5186968db7af3
--- libexec/Makefile.am
+++ libexec/Makefile.am
@@ -1,4 +1,5 @@
-SUBDIRS = got-fetch-pack \
+SUBDIRS = got-fetch-http \
+	  got-fetch-pack \
 	  got-index-pack \
 	  got-read-blob \
 	  got-read-commit \
blob - e6d3950b1c2fa7616f6a5e4df7e81874347259fe (mode 644)
blob + /dev/null
--- libexec/got-fetch-http/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-.PATH:${.CURDIR}/../../lib
-
-.include "../../got-version.mk"
-
-PROG=		got-fetch-http
-SRCS=		got-fetch-http.c bufio.c hash.c error.c inflate.c pkt.c pollfd.c
-
-CPPFLAGS= -I${.CURDIR}/../../include -I${.CURDIR}/../../lib
-
-.if defined(PROFILE)
-LDADD=	-lutil_p -lz_p -ltls_p
-.else
-LDADD=	-lutil -lz -ltls
-.endif
-
-DPADD=	${LIBZ} ${LIBUTIL} ${LIBTLS}
-
-.include <bsd.prog.mk>
blob - /dev/null
blob + 65311c88d9aad779d8466977cc63c096f2755620 (mode 644)
--- /dev/null
+++ libexec/got-fetch-http/Makefile.am
@@ -0,0 +1,25 @@
+libexec_PROGRAMS = got-fetch-http
+
+include $(top_builddir)/Makefile.common
+
+got_fetch_http_SOURCES = got-fetch-http.c \
+	$(top_srcdir)/lib/bufio.c \
+	$(top_srcdir)/lib/error.c \
+	$(top_srcdir)/lib/hash.c \
+	$(top_srcdir)/lib/inflate.c \
+	$(top_srcdir)/lib/path.c \
+	$(top_srcdir)/lib/pkt.c \
+	$(top_srcdir)/lib/pollfd.c \
+	$(top_srcdir)/lib/privsep.c \
+	$(top_srcdir)/lib/object_qid.c \
+	$(top_srcdir)/lib/object_parse.c
+
+got_fetch_http_DEPENDENCIES = $(top_builddir)/compat/libopenbsd-compat.a
+
+LDADD = -L$(top_builddir)/compat -lopenbsd-compat
+LDADD += $(zlib_LIBS) $(libbsd_LIBS) $(libutil_LIBS) $(libmd_LIBS) $(libtls_LIBS)
+if HOST_FREEBSD
+LDADD += -lmd
+endif
+
+AM_CPPFLAGS += $(zlib_CFLAGS) $(libbsd_CFLAGS) $(libmd_CFLAGS) $(libtls_CFLAGS)
blob - b9e126395c419d439c968c0b1b113ab6e1a26b37
blob + edb421692ffb577d98757f503dd42c68c7717128
--- libexec/got-fetch-http/got-fetch-http.c
+++ libexec/got-fetch-http/got-fetch-http.c
@@ -14,6 +14,8 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+
+#include "got_compat.h"
 
 #include <sys/types.h>
 #include <sys/socket.h>
blob - /dev/null
blob + 9bc804c1b698af5ec73ad18c4049f0befeda717d (mode 755)
Binary files /dev/null and libexec/got-fetch-http/got-fetch-http differ