Commit Diff


commit - ce1bfad9f1f7c6b1599e0bfed0a1b169d4a30781
commit + b2ce1dae7426855da5636b9762b278f2d89651de
blob - 89d8dc5258d8437b13d49541c32962a505aaf967
blob + ac27927d0a3da092a1f2bc5da1d9bb169b96e203
--- .gitignore
+++ .gitignore
@@ -33,6 +33,7 @@ got/got
 gotadmin/gotadmin
 gotctl/gotctl
 gotd/gotd
+gotd/libexec/got-notify-email/got-notify-email
 gotd/parse.c
 gotsh/gotsh
 gotwebd/gotwebd
blob - db4e4bcd4b07aadf08d5b4b5f933fafcb8d341f4
blob + bc3d2f13790b924866926153ccfd13d9c7bf3718
--- configure.ac
+++ configure.ac
@@ -923,6 +923,8 @@ AC_CONFIG_FILES([Makefile
 if test "x$enable_gotd" = "xyes"; then
 	AC_CONFIG_FILES([gitwrapper/Makefile])
 	AC_CONFIG_FILES([gotd/Makefile])
+	AC_CONFIG_FILES([gotd/libexec/Makefile])
+	AC_CONFIG_FILES([gotd/libexec/got-notify-email/Makefile])
 	AC_CONFIG_FILES([gotsh/Makefile])
 	AC_CONFIG_FILES([gotctl/Makefile])
 fi
blob - e0108d23a1f6d0de371ab035f87e4e97f47b2728
blob + f611423017fb01f12fd2332f9eb5cdbe67a090f7
--- gotd/Makefile.am
+++ gotd/Makefile.am
@@ -1,27 +1,29 @@
 sbin_PROGRAMS = gotd
 
+SUBDIRS=libexec
+
 include $(top_builddir)/Makefile.common
 
 AM_CPPFLAGS += -DGOTD_EMPTY_PATH='"@GOTD_EMPTY_PATHC@"'
 
 gotd_SOURCES = gotd.c \
-	auth.c \
-	imsg.c \
-	listen.c \
-	log.c \
-	parse.y \
-	privsep_stub.c \
-	repo_imsg.c \
-	repo_read.c \
-	repo_write.c \
-	session.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/deltify.c \
+	$(top_srcdir)/lib/diff.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_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/gitconfig.c \
 	$(top_srcdir)/lib/gotconfig.c \
@@ -49,7 +51,18 @@ gotd_SOURCES = gotd.c \
 	$(top_srcdir)/lib/reference.c \
 	$(top_srcdir)/lib/reference_parse.c \
 	$(top_srcdir)/lib/repository.c \
-	$(top_srcdir)/lib/sigs.c
+	$(top_srcdir)/lib/sigs.c \
+	auth.c \
+	imsg.c \
+	listen.c \
+	log.c \
+	notify.c \
+	parse.y \
+	privsep_stub.c \
+	repo_imsg.c \
+	repo_read.c \
+	repo_write.c \
+	session.c
 
 if !HOST_OPENBSD
 gotd_SOURCES += chroot-notobsd.c
blob - 8ba95cce4988f25eb3c716683e8c3e1952f930e6
blob + 756938c467d7079aa27e255734cf520a38679349
--- gotd/gotd.c
+++ gotd/gotd.c
@@ -1519,11 +1519,15 @@ connect_notifier_and_session(struct gotd_client *clien
 	const struct got_error *err = NULL;
 	struct gotd_imsgev *session_iev = &client->session->iev;
 	int pipe[2];
+	int sock_flags = SOCK_STREAM|SOCK_NONBLOCK;
 
 	if (gotd.notify_proc == NULL)
 		return NULL;
 
-	if (socketpair(AF_UNIX, SOCK_STREAM|SOCK_CLOEXEC|SOCK_NONBLOCK,
+#ifdef SOCK_CLOEXEC
+	sock_flags |= SOCK_CLOEXEC;
+#endif
+	if (socketpair(AF_UNIX, sock_flags,
 	    PF_UNSPEC, pipe) == -1)
 		return got_error_from_errno("socketpair");
 
@@ -1757,7 +1761,9 @@ static void
 start_notifier(char *argv0, const char *confpath, int daemonize, int verbosity)
 {
 	struct gotd_child_proc *proc;
+	int sock_flags = SOCK_STREAM | SOCK_NONBLOCK;
 
+
 	proc = calloc(1, sizeof(*proc));
 	if (proc == NULL)
 		fatal("calloc");
@@ -1768,7 +1774,10 @@ start_notifier(char *argv0, const char *confpath, int 
 
 	proc->type = PROC_NOTIFY;
 
-	if (socketpair(AF_UNIX, SOCK_STREAM|SOCK_CLOEXEC|SOCK_NONBLOCK,
+#ifdef SOCK_CLOEXEC
+	sock_flags |= SOCK_CLOEXEC;
+#endif
+	if (socketpair(AF_UNIX, sock_flags,
 	    PF_UNSPEC, proc->pipe) == -1)
 		fatal("socketpair");
 
@@ -2055,7 +2064,7 @@ main(int argc, char **argv)
 	int *pack_fds = NULL, *temp_fds = NULL;
 	struct gotd_repo *repo = NULL;
 	char *default_sender = NULL;
-	char hostname[HOST_NAME_MAX + 1];
+	char hostname[_POSIX_HOST_NAME_MAX + 1];
 	FILE *diff_f1 = NULL, *diff_f2 = NULL;
 	int diff_fd1 = -1, diff_fd2 = -1;
 
blob - 5d41c4eb56cc8a5acf41912a51075953aa9f3e79
blob + 608ed1cd441c475c8a0d2bc1c4abed54442d8c7e
--- gotd/gotd.h
+++ gotd/gotd.h
@@ -527,6 +527,7 @@ struct gotd_imsg_notify {
 	char subject_line[64];
 };
 
+int enter_chroot(const char *);
 int parse_config(const char *, enum gotd_procid, struct gotd *);
 struct gotd_repo *gotd_find_repo_by_name(const char *, struct gotd_repolist *);
 struct gotd_repo *gotd_find_repo_by_path(const char *, struct gotd *);
blob - 59c09c35e0b26fb30a138fc1dd52d8f994826c32
blob + 7b7976993486091a9a6aba1d5a8d8aff5b886466
--- gotd/libexec/Makefile
+++ gotd/libexec/Makefile
@@ -1,3 +1,634 @@
-SUBDIR = got-notify-email
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# gotd/libexec/Makefile.  Generated from Makefile.in by configure.
 
-.include <bsd.subdir.mk>
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/got-portable
+pkgincludedir = $(includedir)/got-portable
+pkglibdir = $(libdir)/got-portable
+pkglibexecdir = $(libexecdir)/got-portable
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-pc-linux-gnu
+host_triplet = x86_64-pc-linux-gnu
+subdir = gotd/libexec
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/include/got_compat.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_$(V))
+am__v_P_ = $(am__v_P_$(AM_DEFAULT_VERBOSITY))
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	distdir distdir-am
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+ACLOCAL = ${SHELL} '/home/n6tadam/p/got/got-portable/etc/missing' aclocal-1.16
+AMTAR = $${TAR-tar}
+AM_CFLAGS = 
+AM_CPPFLAGS = 
+AM_DEFAULT_VERBOSITY = 1
+AM_LDFLAGS = 
+AR = ar
+AUTOCONF = ${SHELL} '/home/n6tadam/p/got/got-portable/etc/missing' autoconf
+AUTOHEADER = ${SHELL} '/home/n6tadam/p/got/got-portable/etc/missing' autoheader
+AUTOMAKE = ${SHELL} '/home/n6tadam/p/got/got-portable/etc/missing' automake-1.16
+AWK = gawk
+CC = gcc
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2
+CPP = gcc -E
+CPPFLAGS = 
+CSCOPE = cscope
+CTAGS = ctags
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+ECHO_C = 
+ECHO_N = -n
+ECHO_T = 
+ETAGS = etags
+EXEEXT = 
+GITWRAPPER_LIBEXEC_PATHC = 
+GOTD_EMPTY_PATHC = 
+GOT_RELEASE = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+LDFLAGS = 
+LIBBSD_CFLAGS = -isystem /usr/include/bsd -DLIBBSD_OVERLAY
+LIBBSD_LIBS = -lbsd
+LIBEVENT_CFLAGS = 
+LIBEVENT_CORE_CFLAGS = 
+LIBEVENT_CORE_LIBS = -levent_core
+LIBEVENT_LIBS = 
+LIBMD_CFLAGS = 
+LIBMD_LIBS = -lmd
+LIBNCURSES_CFLAGS = -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600
+LIBNCURSES_LIBS = -lncursesw
+LIBOBJS =  ${LIBOBJDIR}fmt_scaled$U.o ${LIBOBJDIR}freezero$U.o ${LIBOBJDIR}getdtablecount$U.o ${LIBOBJDIR}getprogname$U.o ${LIBOBJDIR}recallocarray$U.o ${LIBOBJDIR}strtonum$U.o ${LIBOBJDIR}getopt$U.o
+LIBPANELW_CFLAGS = -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600
+LIBPANELW_LIBS = -lpanelw
+LIBS = 
+LIBUUID_CFLAGS = -I/usr/include/uuid
+LIBUUID_LIBS = -luuid
+LN_S = ln -s
+LTLIBOBJS =  ${LIBOBJDIR}fmt_scaled$U.lo ${LIBOBJDIR}freezero$U.lo ${LIBOBJDIR}getdtablecount$U.lo ${LIBOBJDIR}getprogname$U.lo ${LIBOBJDIR}recallocarray$U.lo ${LIBOBJDIR}strtonum$U.lo ${LIBOBJDIR}getopt$U.lo
+MAKEINFO = ${SHELL} '/home/n6tadam/p/got/got-portable/etc/missing' makeinfo
+MKDIR_P = /usr/bin/mkdir -p
+OBJEXT = o
+PACKAGE = got-portable
+PACKAGE_BUGREPORT = thomas@xteddy.org
+PACKAGE_NAME = got-portable
+PACKAGE_STRING = got-portable 0.97
+PACKAGE_TARNAME = got-portable
+PACKAGE_URL = 
+PACKAGE_VERSION = 0.97
+PATH_SEPARATOR = :
+PKG_CONFIG = /usr/bin/pkg-config
+PKG_CONFIG_LIBDIR = 
+PKG_CONFIG_PATH = 
+PLATFORM = linux
+RANLIB = ranlib
+SET_MAKE = 
+SHELL = /bin/sh
+STRIP = 
+VERSION = 0.97
+YACC = bison -y
+YFLAGS = 
+ZLIB_CFLAGS = 
+ZLIB_LIBS = -lz
+abs_builddir = /home/n6tadam/p/got/got-portable/gotd/libexec
+abs_srcdir = /home/n6tadam/p/got/got-portable/gotd/libexec
+abs_top_builddir = /home/n6tadam/p/got/got-portable
+abs_top_srcdir = /home/n6tadam/p/got/got-portable
+ac_ct_AR = ar
+ac_ct_CC = gcc
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = $${TAR-tar} chof - "$$tardir"
+am__untar = $${TAR-tar} xf -
+bindir = ${exec_prefix}/bin
+build = x86_64-pc-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = pc
+builddir = .
+datadir = ${datarootdir}
+datarootdir = ${prefix}/share
+docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
+dvidir = ${docdir}
+exec_prefix = ${prefix}
+host = x86_64-pc-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = pc
+htmldir = ${docdir}
+includedir = ${prefix}/include
+infodir = ${datarootdir}/info
+install_sh = ${SHELL} /home/n6tadam/p/got/got-portable/etc/install-sh
+libbsd_CFLAGS = -isystem /usr/include/bsd -DLIBBSD_OVERLAY
+libbsd_LIBS = -lbsd
+libdir = ${exec_prefix}/lib
+libevent_CFLAGS = 
+libevent_LIBS = -levent_core
+libexecdir = ${exec_prefix}/libexec
+libmd_CFLAGS = 
+libmd_LIBS = -lmd
+libncurses_CFLAGS = -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600  -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600
+libncurses_LIBS = -lncursesw  -lpanelw
+libresolv_LIBS = -lresolv
+libutil_LIBS = 
+libuuid_CFLAGS = -I/usr/include/uuid
+libuuid_LIBS = -luuid
+localedir = ${datarootdir}/locale
+localstatedir = ${prefix}/var
+mandir = ${datarootdir}/man
+mkdir_p = $(MKDIR_P)
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+prefix = /usr/local
+program_transform_name = s,x,x,
+psdir = ${docdir}
+runstatedir = ${localstatedir}/run
+sbindir = ${exec_prefix}/sbin
+sharedstatedir = ${prefix}/com
+srcdir = .
+subdirs =  template
+sysconfdir = ${prefix}/etc
+target_alias = 
+top_build_prefix = ../../
+top_builddir = ../..
+top_srcdir = ../..
+zlib_CFLAGS = 
+zlib_LIBS = -lz
+SUBDIRS = got-notify-email
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign gotd/libexec/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign gotd/libexec/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic cscopelist-am ctags ctags-am \
+	distclean distclean-generic distclean-tags distdir dvi dvi-am \
+	html html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
blob - /dev/null
blob + fcf76dcce0b056df30725f3bfaac9532cb9320f9 (mode 644)
--- /dev/null
+++ gotd/libexec/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = got-notify-email
blob - bc6f702e1ea25327f3545179d493446d81da8948 (mode 644)
blob + /dev/null
--- gotd/libexec/got-notify-email/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-.PATH:${.CURDIR}/../..
-.PATH:${.CURDIR}/../../../lib
-
-.include "../../../got-version.mk"
-
-PROG=		got-notify-email
-SRCS=		got-notify-email.c pollfd.c error.c hash.c
-
-
-CPPFLAGS = -I${.CURDIR}/../../../include -I${.CURDIR}/../../../lib
-
-.if defined(PROFILE)
-LDADD = -lutil_p -lz_p -lm_p
-.else
-LDADD = -lutil -lz -lm
-.endif
-
-DPADD = ${LIBZ} ${LIBUTIL}
-
-.include <bsd.prog.mk>
blob - /dev/null
blob + 628c802e94ca4851c9856f1eed8ce4eb844345f0 (mode 644)
--- /dev/null
+++ gotd/libexec/got-notify-email/Makefile.am
@@ -0,0 +1,18 @@
+libexec_PROGRAMS = got-notify-email
+
+include $(top_builddir)/Makefile.common
+
+got_notify_email_SOURCES = got-notify-email.c \
+	$(top_srcdir)/lib/error.c \
+	$(top_srcdir)/lib/hash.c \
+	$(top_srcdir)/lib/pollfd.c
+
+got_notify_email_DEPENDENCIES = $(top_builddir)/compat/libopenbsd-compat.a
+
+LDADD = -L$(top_builddir)/compat -lopenbsd-compat
+LDADD += $(zlib_LIBS) $(libbsd_LIBS) $(libutil_LIBS) $(libmd_LIBS)
+if HOST_FREEBSD
+LDADD += -lmd
+endif
+
+AM_CPPFLAGS += $(zlib_CFLAGS) $(libbsd_CFLAGS) $(libmd_CFLAGS)
blob - 44ccd53effeef92d860796c2bea93b56f5aa539a
blob + c32083f16caec50085ee749be251c2abe675ea2e
--- gotd/libexec/got-notify-email/got-notify-email.c
+++ gotd/libexec/got-notify-email/got-notify-email.c
@@ -14,6 +14,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include "got_compat.h"
+
 #include <sys/types.h>
 #include <sys/socket.h>
 
@@ -21,7 +23,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
-#include <getopt.h>
 #include <err.h>
 #include <pwd.h>
 #include <netdb.h>
blob - 8b7babf0b8bfda73dde136e6486c27085a6c14f4
blob + 336417845c5542b2de71a0960f8fde794c33b137
--- gotd/notify.c
+++ gotd/notify.c
@@ -14,18 +14,16 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include "got_compat.h"
+
 #include <sys/types.h>
 #include <sys/queue.h>
-#include <sys/tree.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
 
 #include <errno.h>
 #include <event.h>
-#include <siphash.h>
 #include <limits.h>
-#include <sha1.h>
-#include <sha2.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
blob - 3bea8ee5472c8db2fa99bd3af427db014e7a0df1
blob + 637c06d4d3ac3d8802c1e03ece3bb210e4708ae0
--- gotd/repo_read.c
+++ gotd/repo_read.c
@@ -26,7 +26,6 @@
 #include <stdlib.h>
 #include <limits.h>
 #include <poll.h>
-#include <siphash.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>