pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/devel/got
Module Name: pkgsrc
Committed By: ryoon
Date: Fri Jan 29 20:35:11 UTC 2021
Added Files:
pkgsrc/devel/got: DESCR Makefile PLIST distinfo
pkgsrc/devel/got/files/openbsd-compat: Makefile endian.h freezero.c
getdtablecount.c imsg-buffer.c imsg.c imsg.h open.c
openbsd-compat.h recallocarray.c sha1.h util.h
pkgsrc/devel/got/patches: patch-Makefile patch-Makefile.inc
patch-got_Makefile patch-libexec_Makefile.inc
patch-regress_Makefile patch-regress_cmdline_Makefile
patch-regress_cmdline_common.sh patch-regress_cmdline_histedit.sh
patch-regress_delta_Makefile patch-regress_fetch_Makefile
patch-regress_idset_Makefile patch-regress_path_Makefile
patch-tog_Makefile patch-tog_tog.c
Log Message:
devel/got: import got-0.48
Game of Trees (Got) is a version control system which prioritizes ease
of use and simplicity over flexibility.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/got/DESCR pkgsrc/devel/got/Makefile \
pkgsrc/devel/got/PLIST pkgsrc/devel/got/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/got/files/openbsd-compat/Makefile \
pkgsrc/devel/got/files/openbsd-compat/endian.h \
pkgsrc/devel/got/files/openbsd-compat/freezero.c \
pkgsrc/devel/got/files/openbsd-compat/getdtablecount.c \
pkgsrc/devel/got/files/openbsd-compat/imsg-buffer.c \
pkgsrc/devel/got/files/openbsd-compat/imsg.c \
pkgsrc/devel/got/files/openbsd-compat/imsg.h \
pkgsrc/devel/got/files/openbsd-compat/open.c \
pkgsrc/devel/got/files/openbsd-compat/openbsd-compat.h \
pkgsrc/devel/got/files/openbsd-compat/recallocarray.c \
pkgsrc/devel/got/files/openbsd-compat/sha1.h \
pkgsrc/devel/got/files/openbsd-compat/util.h
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/got/patches/patch-Makefile \
pkgsrc/devel/got/patches/patch-Makefile.inc \
pkgsrc/devel/got/patches/patch-got_Makefile \
pkgsrc/devel/got/patches/patch-libexec_Makefile.inc \
pkgsrc/devel/got/patches/patch-regress_Makefile \
pkgsrc/devel/got/patches/patch-regress_cmdline_Makefile \
pkgsrc/devel/got/patches/patch-regress_cmdline_common.sh \
pkgsrc/devel/got/patches/patch-regress_cmdline_histedit.sh \
pkgsrc/devel/got/patches/patch-regress_delta_Makefile \
pkgsrc/devel/got/patches/patch-regress_fetch_Makefile \
pkgsrc/devel/got/patches/patch-regress_idset_Makefile \
pkgsrc/devel/got/patches/patch-regress_path_Makefile \
pkgsrc/devel/got/patches/patch-tog_Makefile \
pkgsrc/devel/got/patches/patch-tog_tog.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: pkgsrc/devel/got/DESCR
diff -u /dev/null pkgsrc/devel/got/DESCR:1.1
--- /dev/null Fri Jan 29 20:35:11 2021
+++ pkgsrc/devel/got/DESCR Fri Jan 29 20:35:11 2021
@@ -0,0 +1,2 @@
+Game of Trees (Got) is a version control system which prioritizes ease
+of use and simplicity over flexibility.
Index: pkgsrc/devel/got/Makefile
diff -u /dev/null pkgsrc/devel/got/Makefile:1.1
--- /dev/null Fri Jan 29 20:35:11 2021
+++ pkgsrc/devel/got/Makefile Fri Jan 29 20:35:11 2021
@@ -0,0 +1,44 @@
+# $NetBSD: Makefile,v 1.1 2021/01/29 20:35:11 ryoon Exp $
+
+DISTNAME= got-0.48
+CATEGORIES= devel
+MASTER_SITES= https://gameoftrees.org/releases/
+
+MAINTAINER= ryoon%NetBSD.org@localhost
+HOMEPAGE= https://gameoftrees.org/
+COMMENT= Game of Trees version control system manipurating Git repo
+LICENSE= isc
+
+USE_TOOLS+= awk find
+
+INSTALLATION_DIRS= bin libexec ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
+
+MAKE_FLAGS+= BINOWN=${BINOWN}
+MAKE_FLAGS+= BINGRP=${BINGRP}
+MAKE_FLAGS+= MANOWN=${MANOWN}
+MAKE_FLAGS+= MANGRP=${MANGRP}
+MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR}
+MAKE_FLAGS+= MKHTML=no
+
+.include "../../mk/bsd.prefs.mk"
+
+post-patch:
+ ${FIND} ${WRKSRC} -name '*.[cy]' -exec \
+ ${AWK} '/^#include /{c += 1;} \
+ c == 1 { \
+ gsub("(^#include )", "#include \"openbsd-compat.h\"\n&", $$0) \
+ } \
+ {print $$0 > "{}.back"} \
+ ' \
+ {} \;
+ ${FIND} ${WRKSRC} -name '*.[cy]' -exec \
+ cp {}.back {} \;
+ ${CP} -r ${FILESDIR}/openbsd-compat ${WRKSRC}/
+.if ${OPSYS} == "NetBSD"
+ # NetBSD has sha1.h.
+ ${RM} -f ${WRKSRC}/openbsd-compat/sha1.h
+.endif
+
+# For set_panel_userptr(3)'s second argument and waddwstr(3).
+.include "../../devel/ncursesw/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/got/PLIST
diff -u /dev/null pkgsrc/devel/got/PLIST:1.1
--- /dev/null Fri Jan 29 20:35:11 2021
+++ pkgsrc/devel/got/PLIST Fri Jan 29 20:35:11 2021
@@ -0,0 +1,18 @@
+@comment $NetBSD: PLIST,v 1.1 2021/01/29 20:35:11 ryoon Exp $
+bin/got
+bin/tog
+libexec/got-fetch-pack
+libexec/got-index-pack
+libexec/got-read-blob
+libexec/got-read-commit
+libexec/got-read-gitconfig
+libexec/got-read-gotconfig
+libexec/got-read-object
+libexec/got-read-pack
+libexec/got-read-tag
+libexec/got-read-tree
+man/man1/got.1
+man/man1/tog.1
+man/man5/git-repository.5
+man/man5/got-worktree.5
+man/man5/got.conf.5
Index: pkgsrc/devel/got/distinfo
diff -u /dev/null pkgsrc/devel/got/distinfo:1.1
--- /dev/null Fri Jan 29 20:35:11 2021
+++ pkgsrc/devel/got/distinfo Fri Jan 29 20:35:11 2021
@@ -0,0 +1,20 @@
+$NetBSD: distinfo,v 1.1 2021/01/29 20:35:11 ryoon Exp $
+
+SHA1 (got-0.48.tar.gz) = a5524ef970650c749e85dca15e755edec06494df
+RMD160 (got-0.48.tar.gz) = 798c0e6d6c40c9ff90bfd30d11880387adc16fee
+SHA512 (got-0.48.tar.gz) = 55ea20ee6f7c34610ef37c8f93b2ed3c71547711358bb7d88e187fd5e5d820e6ce352bfe54d35342d6e5eb1bd4c7e741bf232b1c3405d5dbcc99ca9a87226984
+Size (got-0.48.tar.gz) = 483588 bytes
+SHA1 (patch-Makefile) = b6787de1a7b505b44f29cbc697201511f521cd78
+SHA1 (patch-Makefile.inc) = 28ab688bf6ddfaf51bcf92a933864f8e89c548ff
+SHA1 (patch-got_Makefile) = e61bc61a1cbe9055e755ec42ac04d3246190da7d
+SHA1 (patch-libexec_Makefile.inc) = c56eb1aea447f65f42682a07225e81d187dc2072
+SHA1 (patch-regress_Makefile) = bc19146d5b4bb56baf849a0b38313c13c843675b
+SHA1 (patch-regress_cmdline_Makefile) = 79a6727cb0963b6ac12f1efe7c0873436f291bbc
+SHA1 (patch-regress_cmdline_common.sh) = df6011b7811e70600ad03701f4304f4b8978a077
+SHA1 (patch-regress_cmdline_histedit.sh) = 7fd4f2cdd13456fd14a2ec19630bb0db693d2616
+SHA1 (patch-regress_delta_Makefile) = 7b71d20428468de65313dda4fcfe1dba44cbbbff
+SHA1 (patch-regress_fetch_Makefile) = 33dafea0b53ce9fc096b57acb10541ae95c48561
+SHA1 (patch-regress_idset_Makefile) = 18639cc0c3a59a0da1775ea84cc7e47b1ee5b464
+SHA1 (patch-regress_path_Makefile) = 958100601458203cef4b387f63035826d9a449e8
+SHA1 (patch-tog_Makefile) = ca149a6c1d92e0ea9960e035eb761098e6e8255f
+SHA1 (patch-tog_tog.c) = f3b4d76b9fa0f706584575f96d90ead4439ba669
Index: pkgsrc/devel/got/files/openbsd-compat/Makefile
diff -u /dev/null pkgsrc/devel/got/files/openbsd-compat/Makefile:1.1
--- /dev/null Fri Jan 29 20:35:11 2021
+++ pkgsrc/devel/got/files/openbsd-compat/Makefile Fri Jan 29 20:35:11 2021
@@ -0,0 +1,14 @@
+LIB= openbsd-compat
+INTERNALLIB=
+LIBISPRIVATE= yes
+
+SRCS= freezero.c \
+ getdtablecount.c \
+ imsg.c \
+ imsg-buffer.c \
+ open.c \
+ recallocarray.c
+
+CFLAGS+= -I${.CURDIR}
+
+.include <bsd.lib.mk>
Index: pkgsrc/devel/got/files/openbsd-compat/endian.h
diff -u /dev/null pkgsrc/devel/got/files/openbsd-compat/endian.h:1.1
--- /dev/null Fri Jan 29 20:35:11 2021
+++ pkgsrc/devel/got/files/openbsd-compat/endian.h Fri Jan 29 20:35:11 2021
@@ -0,0 +1,6 @@
+#ifndef _OPENBSD_COMPAT_ENDIAN_H_
+#define _OPENBSD_COMPAT_ENDIAN_H_
+
+#include <sys/endian.h>
+
+#endif
Index: pkgsrc/devel/got/files/openbsd-compat/freezero.c
diff -u /dev/null pkgsrc/devel/got/files/openbsd-compat/freezero.c:1.1
--- /dev/null Fri Jan 29 20:35:11 2021
+++ pkgsrc/devel/got/files/openbsd-compat/freezero.c Fri Jan 29 20:35:11 2021
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2008, 2010, 2011, 2016 Otto Moerbeek <otto%drijf.net@localhost>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+void
+freezero(void *ptr, size_t sz)
+{
+#if defined(__FreeBSD__)
+ explicit_bzero(ptr, sz);
+#else /* NetBSD case */
+ bzero(ptr, sz);
+#endif
+ free(ptr);
+}
Index: pkgsrc/devel/got/files/openbsd-compat/getdtablecount.c
diff -u /dev/null pkgsrc/devel/got/files/openbsd-compat/getdtablecount.c:1.1
--- /dev/null Fri Jan 29 20:35:11 2021
+++ pkgsrc/devel/got/files/openbsd-compat/getdtablecount.c Fri Jan 29 20:35:11 2021
@@ -0,0 +1,68 @@
+/*-
+ * Copyright (c) 2015 Craig Rodrigues
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+/*
+__FBSDID("$FreeBSD: head/devel/got/files/openbsd-compat/getdtablecount.c 548853 2020-09-17 19:36:47Z naddy $");
+*/
+
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#include <stddef.h>
+
+int getdtablecount(void);
+
+#if defined(KERN_PROC_NFDS)
+/*
+ * Return the count of open file descriptors for this process.
+ *
+ */
+int
+getdtablecount(void)
+{
+ int mib[4];
+ int error;
+ int nfds;
+ size_t len;
+
+ len = sizeof(nfds);
+ mib[0] = CTL_KERN;
+ mib[1] = KERN_PROC;
+ mib[2] = KERN_PROC_NFDS;
+ mib[3] = 0;
+
+ error = sysctl(mib, 4, &nfds, &len, NULL, 0);
+ if (error)
+ return (-1);
+ return (nfds);
+}
+#else
+int
+getdtablecount(void)
+{
+ return 0;
+}
+#endif
Index: pkgsrc/devel/got/files/openbsd-compat/imsg-buffer.c
diff -u /dev/null pkgsrc/devel/got/files/openbsd-compat/imsg-buffer.c:1.1
--- /dev/null Fri Jan 29 20:35:11 2021
+++ pkgsrc/devel/got/files/openbsd-compat/imsg-buffer.c Fri Jan 29 20:35:11 2021
@@ -0,0 +1,311 @@
+/* $OpenBSD: imsg-buffer.c,v 1.12 2019/01/20 02:50:03 bcook Exp $ */
+
+/*
+ * Copyright (c) 2003, 2004 Henning Brauer <henning%openbsd.org@localhost>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <sys/types.h>
+#include <sys/queue.h>
+#include <sys/socket.h>
+#include <sys/uio.h>
+
+#include <limits.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <openbsd-compat.h>
+
+#include "imsg.h"
+
+static int ibuf_realloc(struct ibuf *, size_t);
+static void ibuf_enqueue(struct msgbuf *, struct ibuf *);
+static void ibuf_dequeue(struct msgbuf *, struct ibuf *);
+
+struct ibuf *
+ibuf_open(size_t len)
+{
+ struct ibuf *buf;
+
+ if ((buf = calloc(1, sizeof(struct ibuf))) == NULL)
+ return (NULL);
+ if ((buf->buf = malloc(len)) == NULL) {
+ free(buf);
+ return (NULL);
+ }
+ buf->size = buf->max = len;
+ buf->fd = -1;
+
+ return (buf);
+}
+
+struct ibuf *
+ibuf_dynamic(size_t len, size_t max)
+{
+ struct ibuf *buf;
+
+ if (max < len)
+ return (NULL);
+
+ if ((buf = ibuf_open(len)) == NULL)
+ return (NULL);
+
+ if (max > 0)
+ buf->max = max;
+
+ return (buf);
+}
+
+static int
+ibuf_realloc(struct ibuf *buf, size_t len)
+{
+ unsigned char *b;
+
+ /* on static buffers max is eq size and so the following fails */
+ if (buf->wpos + len > buf->max) {
+ errno = ERANGE;
+ return (-1);
+ }
+
+ b = recallocarray(buf->buf, buf->size, buf->wpos + len, 1);
+ if (b == NULL)
+ return (-1);
+ buf->buf = b;
+ buf->size = buf->wpos + len;
+
+ return (0);
+}
+
+int
+ibuf_add(struct ibuf *buf, const void *data, size_t len)
+{
+ if (buf->wpos + len > buf->size)
+ if (ibuf_realloc(buf, len) == -1)
+ return (-1);
+
+ memcpy(buf->buf + buf->wpos, data, len);
+ buf->wpos += len;
+ return (0);
+}
+
+void *
+ibuf_reserve(struct ibuf *buf, size_t len)
+{
+ void *b;
+
+ if (buf->wpos + len > buf->size)
+ if (ibuf_realloc(buf, len) == -1)
+ return (NULL);
+
+ b = buf->buf + buf->wpos;
+ buf->wpos += len;
+ return (b);
+}
+
+void *
+ibuf_seek(struct ibuf *buf, size_t pos, size_t len)
+{
+ /* only allowed to seek in already written parts */
+ if (pos + len > buf->wpos)
+ return (NULL);
+
+ return (buf->buf + pos);
+}
+
+size_t
+ibuf_size(struct ibuf *buf)
+{
+ return (buf->wpos);
+}
+
+size_t
+ibuf_left(struct ibuf *buf)
+{
+ return (buf->max - buf->wpos);
+}
+
+void
+ibuf_close(struct msgbuf *msgbuf, struct ibuf *buf)
+{
+ ibuf_enqueue(msgbuf, buf);
+}
+
+int
+ibuf_write(struct msgbuf *msgbuf)
+{
+ struct iovec iov[IOV_MAX];
+ struct ibuf *buf;
+ unsigned int i = 0;
+ ssize_t n;
+
+ memset(&iov, 0, sizeof(iov));
+ TAILQ_FOREACH(buf, &msgbuf->bufs, entry) {
+ if (i >= IOV_MAX)
+ break;
+ iov[i].iov_base = buf->buf + buf->rpos;
+ iov[i].iov_len = buf->wpos - buf->rpos;
+ i++;
+ }
+
+again:
+ if ((n = writev(msgbuf->fd, iov, i)) == -1) {
+ if (errno == EINTR)
+ goto again;
+ if (errno == ENOBUFS)
+ errno = EAGAIN;
+ return (-1);
+ }
+
+ if (n == 0) { /* connection closed */
+ errno = 0;
+ return (0);
+ }
+
+ msgbuf_drain(msgbuf, n);
+
+ return (1);
+}
+
+void
+ibuf_free(struct ibuf *buf)
+{
+ if (buf == NULL)
+ return;
+ freezero(buf->buf, buf->size);
+ free(buf);
+}
+
+void
+msgbuf_init(struct msgbuf *msgbuf)
+{
+ msgbuf->queued = 0;
+ msgbuf->fd = -1;
+ TAILQ_INIT(&msgbuf->bufs);
+}
+
+void
+msgbuf_drain(struct msgbuf *msgbuf, size_t n)
+{
+ struct ibuf *buf, *next;
+
+ for (buf = TAILQ_FIRST(&msgbuf->bufs); buf != NULL && n > 0;
+ buf = next) {
+ next = TAILQ_NEXT(buf, entry);
+ if (buf->rpos + n >= buf->wpos) {
+ n -= buf->wpos - buf->rpos;
+ ibuf_dequeue(msgbuf, buf);
+ } else {
+ buf->rpos += n;
+ n = 0;
+ }
+ }
+}
+
+void
+msgbuf_clear(struct msgbuf *msgbuf)
+{
+ struct ibuf *buf;
+
+ while ((buf = TAILQ_FIRST(&msgbuf->bufs)) != NULL)
+ ibuf_dequeue(msgbuf, buf);
+}
+
+int
+msgbuf_write(struct msgbuf *msgbuf)
+{
+ struct iovec iov[IOV_MAX];
+ struct ibuf *buf;
+ unsigned int i = 0;
+ ssize_t n;
+ struct msghdr msg;
+ struct cmsghdr *cmsg;
+ union {
+ struct cmsghdr hdr;
+ char buf[CMSG_SPACE(sizeof(int))];
+ } cmsgbuf;
+
+ memset(&iov, 0, sizeof(iov));
+ memset(&msg, 0, sizeof(msg));
+ memset(&cmsgbuf, 0, sizeof(cmsgbuf));
+ TAILQ_FOREACH(buf, &msgbuf->bufs, entry) {
+ if (i >= IOV_MAX)
+ break;
+ iov[i].iov_base = buf->buf + buf->rpos;
+ iov[i].iov_len = buf->wpos - buf->rpos;
+ i++;
+ if (buf->fd != -1)
+ break;
+ }
+
+ msg.msg_iov = iov;
+ msg.msg_iovlen = i;
+
+ if (buf != NULL && buf->fd != -1) {
+ msg.msg_control = (caddr_t)&cmsgbuf.buf;
+ msg.msg_controllen = sizeof(cmsgbuf.buf);
+ cmsg = CMSG_FIRSTHDR(&msg);
+ cmsg->cmsg_len = CMSG_LEN(sizeof(int));
+ cmsg->cmsg_level = SOL_SOCKET;
+ cmsg->cmsg_type = SCM_RIGHTS;
+ *(int *)CMSG_DATA(cmsg) = buf->fd;
+ }
+
+again:
+ if ((n = sendmsg(msgbuf->fd, &msg, 0)) == -1) {
+ if (errno == EINTR)
+ goto again;
+ if (errno == ENOBUFS)
+ errno = EAGAIN;
+ return (-1);
+ }
+
+ if (n == 0) { /* connection closed */
+ errno = 0;
+ return (0);
+ }
+
+ /*
+ * assumption: fd got sent if sendmsg sent anything
+ * this works because fds are passed one at a time
+ */
+ if (buf != NULL && buf->fd != -1) {
+ close(buf->fd);
+ buf->fd = -1;
+ }
+
+ msgbuf_drain(msgbuf, n);
+
+ return (1);
+}
+
+static void
+ibuf_enqueue(struct msgbuf *msgbuf, struct ibuf *buf)
+{
+ TAILQ_INSERT_TAIL(&msgbuf->bufs, buf, entry);
+ msgbuf->queued++;
+}
+
+static void
+ibuf_dequeue(struct msgbuf *msgbuf, struct ibuf *buf)
+{
+ TAILQ_REMOVE(&msgbuf->bufs, buf, entry);
+
+ if (buf->fd != -1)
+ close(buf->fd);
+
+ msgbuf->queued--;
+ ibuf_free(buf);
+}
Index: pkgsrc/devel/got/files/openbsd-compat/imsg.c
diff -u /dev/null pkgsrc/devel/got/files/openbsd-compat/imsg.c:1.1
--- /dev/null Fri Jan 29 20:35:11 2021
+++ pkgsrc/devel/got/files/openbsd-compat/imsg.c Fri Jan 29 20:35:11 2021
@@ -0,0 +1,304 @@
+/* $OpenBSD: imsg.c,v 1.16 2017/12/14 09:27:44 kettenis Exp $ */
+
+/*
+ * Copyright (c) 2003, 2004 Henning Brauer <henning%openbsd.org@localhost>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <sys/types.h>
+#include <sys/queue.h>
+#include <sys/socket.h>
+#include <sys/uio.h>
+
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <openbsd-compat.h>
+
+#include "imsg.h"
+
+int imsg_fd_overhead = 0;
+
+static int imsg_get_fd(struct imsgbuf *);
+
+void
+imsg_init(struct imsgbuf *ibuf, int fd)
+{
+ msgbuf_init(&ibuf->w);
+ memset(&ibuf->r, 0, sizeof(ibuf->r));
+ ibuf->fd = fd;
+ ibuf->w.fd = fd;
+ ibuf->pid = getpid();
+ TAILQ_INIT(&ibuf->fds);
+}
+
+ssize_t
+imsg_read(struct imsgbuf *ibuf)
+{
+ struct msghdr msg;
+ struct cmsghdr *cmsg;
+ union {
+ struct cmsghdr hdr;
+ char buf[CMSG_SPACE(sizeof(int) * 1)];
+ } cmsgbuf;
+ struct iovec iov;
+ ssize_t n = -1;
+ int fd;
+ struct imsg_fd *ifd;
+
+ memset(&msg, 0, sizeof(msg));
+ memset(&cmsgbuf, 0, sizeof(cmsgbuf));
+
+ iov.iov_base = ibuf->r.buf + ibuf->r.wpos;
+ iov.iov_len = sizeof(ibuf->r.buf) - ibuf->r.wpos;
+ msg.msg_iov = &iov;
+ msg.msg_iovlen = 1;
+ msg.msg_control = &cmsgbuf.buf;
+ msg.msg_controllen = sizeof(cmsgbuf.buf);
+
+ if ((ifd = calloc(1, sizeof(struct imsg_fd))) == NULL)
+ return (-1);
+
+again:
+ if (getdtablecount() + imsg_fd_overhead +
+ (int)((CMSG_SPACE(sizeof(int))-CMSG_SPACE(0))/sizeof(int))
+ >= getdtablesize()) {
+ errno = EAGAIN;
+ free(ifd);
+ return (-1);
+ }
+
+ if ((n = recvmsg(ibuf->fd, &msg, 0)) == -1) {
+ if (errno == EINTR)
+ goto again;
+ goto fail;
+ }
+
+ ibuf->r.wpos += n;
+
+ for (cmsg = CMSG_FIRSTHDR(&msg); cmsg != NULL;
+ cmsg = CMSG_NXTHDR(&msg, cmsg)) {
+ if (cmsg->cmsg_level == SOL_SOCKET &&
+ cmsg->cmsg_type == SCM_RIGHTS) {
+ int i;
+ int j;
+
+ /*
+ * We only accept one file descriptor. Due to C
+ * padding rules, our control buffer might contain
+ * more than one fd, and we must close them.
+ */
+ j = ((char *)cmsg + cmsg->cmsg_len -
+ (char *)CMSG_DATA(cmsg)) / sizeof(int);
+ for (i = 0; i < j; i++) {
+ fd = ((int *)CMSG_DATA(cmsg))[i];
+ if (ifd != NULL) {
+ ifd->fd = fd;
+ TAILQ_INSERT_TAIL(&ibuf->fds, ifd,
+ entry);
+ ifd = NULL;
+ } else
+ close(fd);
+ }
+ }
+ /* we do not handle other ctl data level */
+ }
+
+fail:
+ free(ifd);
+ return (n);
+}
+
+ssize_t
+imsg_get(struct imsgbuf *ibuf, struct imsg *imsg)
+{
+ size_t av, left, datalen;
+
+ av = ibuf->r.wpos;
+
+ if (IMSG_HEADER_SIZE > av)
+ return (0);
+
+ memcpy(&imsg->hdr, ibuf->r.buf, sizeof(imsg->hdr));
+ if (imsg->hdr.len < IMSG_HEADER_SIZE ||
+ imsg->hdr.len > MAX_IMSGSIZE) {
+ errno = ERANGE;
+ return (-1);
+ }
+ if (imsg->hdr.len > av)
+ return (0);
+ datalen = imsg->hdr.len - IMSG_HEADER_SIZE;
+ ibuf->r.rptr = ibuf->r.buf + IMSG_HEADER_SIZE;
+ if (datalen == 0)
+ imsg->data = NULL;
+ else if ((imsg->data = malloc(datalen)) == NULL)
+ return (-1);
+
+ if (imsg->hdr.flags & IMSGF_HASFD)
+ imsg->fd = imsg_get_fd(ibuf);
+ else
+ imsg->fd = -1;
+
+ memcpy(imsg->data, ibuf->r.rptr, datalen);
+
+ if (imsg->hdr.len < av) {
+ left = av - imsg->hdr.len;
+ memmove(&ibuf->r.buf, ibuf->r.buf + imsg->hdr.len, left);
+ ibuf->r.wpos = left;
+ } else
+ ibuf->r.wpos = 0;
+
+ return (datalen + IMSG_HEADER_SIZE);
+}
+
+int
+imsg_compose(struct imsgbuf *ibuf, uint32_t type, uint32_t peerid, pid_t pid,
+ int fd, const void *data, uint16_t datalen)
+{
+ struct ibuf *wbuf;
+
+ if ((wbuf = imsg_create(ibuf, type, peerid, pid, datalen)) == NULL)
+ return (-1);
+
+ if (imsg_add(wbuf, data, datalen) == -1)
+ return (-1);
+
+ wbuf->fd = fd;
+
+ imsg_close(ibuf, wbuf);
+
+ return (1);
+}
+
+int
+imsg_composev(struct imsgbuf *ibuf, uint32_t type, uint32_t peerid, pid_t pid,
+ int fd, const struct iovec *iov, int iovcnt)
+{
+ struct ibuf *wbuf;
+ int i, datalen = 0;
+
+ for (i = 0; i < iovcnt; i++)
+ datalen += iov[i].iov_len;
+
+ if ((wbuf = imsg_create(ibuf, type, peerid, pid, datalen)) == NULL)
+ return (-1);
+
+ for (i = 0; i < iovcnt; i++)
+ if (imsg_add(wbuf, iov[i].iov_base, iov[i].iov_len) == -1)
+ return (-1);
+
+ wbuf->fd = fd;
+
+ imsg_close(ibuf, wbuf);
+
+ return (1);
+}
+
+/* ARGSUSED */
+struct ibuf *
+imsg_create(struct imsgbuf *ibuf, uint32_t type, uint32_t peerid, pid_t pid,
+ uint16_t datalen)
+{
+ struct ibuf *wbuf;
+ struct imsg_hdr hdr;
+
+ datalen += IMSG_HEADER_SIZE;
+ if (datalen > MAX_IMSGSIZE) {
+ errno = ERANGE;
+ return (NULL);
+ }
+
+ hdr.type = type;
+ hdr.flags = 0;
+ hdr.peerid = peerid;
+ if ((hdr.pid = pid) == 0)
+ hdr.pid = ibuf->pid;
+ if ((wbuf = ibuf_dynamic(datalen, MAX_IMSGSIZE)) == NULL) {
+ return (NULL);
+ }
+ if (imsg_add(wbuf, &hdr, sizeof(hdr)) == -1)
+ return (NULL);
+
+ return (wbuf);
+}
+
+int
+imsg_add(struct ibuf *msg, const void *data, uint16_t datalen)
+{
+ if (datalen)
+ if (ibuf_add(msg, data, datalen) == -1) {
+ ibuf_free(msg);
+ return (-1);
+ }
+ return (datalen);
+}
+
+void
+imsg_close(struct imsgbuf *ibuf, struct ibuf *msg)
+{
+ struct imsg_hdr *hdr;
+
+ hdr = (struct imsg_hdr *)msg->buf;
+
+ hdr->flags &= ~IMSGF_HASFD;
+ if (msg->fd != -1)
+ hdr->flags |= IMSGF_HASFD;
+
+ hdr->len = (uint16_t)msg->wpos;
+
+ ibuf_close(&ibuf->w, msg);
+}
+
+void
+imsg_free(struct imsg *imsg)
+{
+ freezero(imsg->data, imsg->hdr.len - IMSG_HEADER_SIZE);
+}
+
+static int
+imsg_get_fd(struct imsgbuf *ibuf)
+{
+ int fd;
+ struct imsg_fd *ifd;
+
+ if ((ifd = TAILQ_FIRST(&ibuf->fds)) == NULL)
+ return (-1);
+
+ fd = ifd->fd;
+ TAILQ_REMOVE(&ibuf->fds, ifd, entry);
+ free(ifd);
+
+ return (fd);
+}
+
+int
+imsg_flush(struct imsgbuf *ibuf)
+{
+ while (ibuf->w.queued)
+ if (msgbuf_write(&ibuf->w) <= 0)
+ return (-1);
+ return (0);
+}
+
+void
+imsg_clear(struct imsgbuf *ibuf)
+{
+ int fd;
+
+ msgbuf_clear(&ibuf->w);
+ while ((fd = imsg_get_fd(ibuf)) != -1)
+ close(fd);
+}
Index: pkgsrc/devel/got/files/openbsd-compat/imsg.h
diff -u /dev/null pkgsrc/devel/got/files/openbsd-compat/imsg.h:1.1
--- /dev/null Fri Jan 29 20:35:11 2021
+++ pkgsrc/devel/got/files/openbsd-compat/imsg.h Fri Jan 29 20:35:11 2021
@@ -0,0 +1,113 @@
+/* $OpenBSD: imsg.h,v 1.5 2019/01/20 02:50:03 bcook Exp $ */
+
+/*
+ * Copyright (c) 2006, 2007 Pierre-Yves Ritschard <pyr%openbsd.org@localhost>
+ * Copyright (c) 2006, 2007, 2008 Reyk Floeter <reyk%openbsd.org@localhost>
+ * Copyright (c) 2003, 2004 Henning Brauer <henning%openbsd.org@localhost>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef _IMSG_H_
+#define _IMSG_H_
+
+#include <stdint.h>
+
+#define IBUF_READ_SIZE 65535
+#define IMSG_HEADER_SIZE sizeof(struct imsg_hdr)
+#define MAX_IMSGSIZE 16384
+
+struct ibuf {
+ TAILQ_ENTRY(ibuf) entry;
+ unsigned char *buf;
+ size_t size;
+ size_t max;
+ size_t wpos;
+ size_t rpos;
+ int fd;
+};
+
+struct msgbuf {
+ TAILQ_HEAD(, ibuf) bufs;
+ uint32_t queued;
+ int fd;
+};
+
+struct ibuf_read {
+ unsigned char buf[IBUF_READ_SIZE];
+ unsigned char *rptr;
+ size_t wpos;
+};
+
+struct imsg_fd {
+ TAILQ_ENTRY(imsg_fd) entry;
+ int fd;
+};
+
+struct imsgbuf {
+ TAILQ_HEAD(, imsg_fd) fds;
+ struct ibuf_read r;
+ struct msgbuf w;
+ int fd;
+ pid_t pid;
+};
+
+#define IMSGF_HASFD 1
+
+struct imsg_hdr {
+ uint32_t type;
+ uint16_t len;
+ uint16_t flags;
+ uint32_t peerid;
+ uint32_t pid;
+};
+
+struct imsg {
+ struct imsg_hdr hdr;
+ int fd;
+ void *data;
+};
+
+
+/* buffer.c */
+struct ibuf *ibuf_open(size_t);
+struct ibuf *ibuf_dynamic(size_t, size_t);
+int ibuf_add(struct ibuf *, const void *, size_t);
+void *ibuf_reserve(struct ibuf *, size_t);
+void *ibuf_seek(struct ibuf *, size_t, size_t);
+size_t ibuf_size(struct ibuf *);
+size_t ibuf_left(struct ibuf *);
+void ibuf_close(struct msgbuf *, struct ibuf *);
+int ibuf_write(struct msgbuf *);
+void ibuf_free(struct ibuf *);
+void msgbuf_init(struct msgbuf *);
+void msgbuf_clear(struct msgbuf *);
+int msgbuf_write(struct msgbuf *);
+void msgbuf_drain(struct msgbuf *, size_t);
+
+/* imsg.c */
+void imsg_init(struct imsgbuf *, int);
+ssize_t imsg_read(struct imsgbuf *);
+ssize_t imsg_get(struct imsgbuf *, struct imsg *);
+int imsg_compose(struct imsgbuf *, uint32_t, uint32_t, pid_t, int,
+ const void *, uint16_t);
+int imsg_composev(struct imsgbuf *, uint32_t, uint32_t, pid_t, int,
+ const struct iovec *, int);
+struct ibuf *imsg_create(struct imsgbuf *, uint32_t, uint32_t, pid_t, uint16_t);
+int imsg_add(struct ibuf *, const void *, uint16_t);
+void imsg_close(struct imsgbuf *, struct ibuf *);
+void imsg_free(struct imsg *);
+int imsg_flush(struct imsgbuf *);
+void imsg_clear(struct imsgbuf *);
+
+#endif
Index: pkgsrc/devel/got/files/openbsd-compat/open.c
diff -u /dev/null pkgsrc/devel/got/files/openbsd-compat/open.c:1.1
--- /dev/null Fri Jan 29 20:35:11 2021
+++ pkgsrc/devel/got/files/openbsd-compat/open.c Fri Jan 29 20:35:11 2021
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2020 Christian Weisgerber <naddy%FreeBSD.org@localhost>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <errno.h>
+#include <fcntl.h>
+#include <stdarg.h>
+
+/*
+ * POSIX mandates that open(symlink, O_NOFOLLOW) fail with errno == ELOOP.
+ * FreeBSD chooses to deviate from this, but Got depends on it.
+ */
+int
+open_posix(const char *path, int flags, ...)
+{
+ va_list ap;
+ mode_t mode;
+ int ret;
+
+ if (flags & O_CREAT) {
+ va_start(ap, flags);
+ mode = va_arg(ap, int);
+ va_end(ap);
+ ret = open(path, flags, mode);
+ } else
+ ret = open(path, flags);
+
+ if (ret == -1 && (flags & O_NOFOLLOW) && errno == EMLINK)
+ errno = ELOOP;
+
+ return (ret);
+}
+
+int
+openat_posix(int fd, const char *path, int flags, ...)
+{
+ va_list ap;
+ mode_t mode;
+ int ret;
+
+ if (flags & O_CREAT) {
+ va_start(ap, flags);
+ mode = va_arg(ap, int);
+ va_end(ap);
+ ret = openat(fd, path, flags, mode);
+ } else
+ ret = openat(fd, path, flags);
+
+ if (ret == -1 && (flags & O_NOFOLLOW) && errno == EMLINK)
+ errno = ELOOP;
+
+ return (ret);
+}
Index: pkgsrc/devel/got/files/openbsd-compat/openbsd-compat.h
diff -u /dev/null pkgsrc/devel/got/files/openbsd-compat/openbsd-compat.h:1.1
--- /dev/null Fri Jan 29 20:35:11 2021
+++ pkgsrc/devel/got/files/openbsd-compat/openbsd-compat.h Fri Jan 29 20:35:11 2021
@@ -0,0 +1,89 @@
+/*
+ * Compatibility mappings for system headers and
+ * prototypes for functions in libopenbsd-compat.
+ */
+
+#ifndef _OPENBSD_COMPAT_H_
+#define _OPENBSD_COMPAT_H_
+
+#if defined(__NetBSD__)
+/* for reallocarray(3) */
+#define _OPENBSD_SOURCE
+#endif
+
+#include <stddef.h>
+
+/*
+ * <sys/cdefs.h>
+ */
+#if defined(__FreeBSD__)
+#define __dead __dead2
+#endif
+
+/*
+ * <sys/queue.h>
+ */
+#if !defined(SIMPLEQ_HEAD)
+#define SIMPLEQ_HEAD(name, type) \
+ STAILQ_HEAD(name, type)
+#define SIMPLEQ_HEAD_INITIALIZER(head) \
+ STAILQ_HEAD_INITIALIZER(head)
+#define SIMPLEQ_ENTRY(type) \
+ STAILQ_ENTRY(type)
+#define SIMPLEQ_FIRST(head) \
+ STAILQ_FIRST(head)
+#define SIMPLEQ_END(head) \
+ NULL
+#define SIMPLEQ_EMPTY(head) \
+ STAILQ_EMPTY(head)
+#define SIMPLEQ_NEXT(elm, field) \
+ STAILQ_NEXT(elm, field)
+#define SIMPLEQ_FOREACH(var, head, field) \
+ STAILQ_FOREACH(var, head, field)
+#define SIMPLEQ_FOREACH_SAFE(var, head, field, tvar) \
+ STAILQ_FOREACH_SAFE(var, head, field, tvar)
+#define SIMPLEQ_INIT(head) \
+ STAILQ_INIT(head)
+#define SIMPLEQ_INSERT_HEAD(head, elm, field) \
+ STAILQ_INSERT_HEAD(head, elm, field)
+#define SIMPLEQ_INSERT_TAIL(head, elm, field) \
+ STAILQ_INSERT_TAIL(head, elm, field)
+#define SIMPLEQ_INSERT_AFTER(head, listelm, elm, field) \
+ STAILQ_INSERT_AFTER(head, listelm, elm, field)
+#define SIMPLEQ_REMOVE_HEAD(head, field) \
+ STAILQ_REMOVE_HEAD(head, field)
+#define SIMPLEQ_REMOVE_AFTER(head, elm, field) \
+ STAILQ_REMOVE_AFTER(head, elm, field)
+#define SIMPLEQ_CONCAT(head1, head2) \
+ STAILQ_CONCAT(head1, head2)
+#endif
+
+/*
+ * <fcntl.h>
+ */
+#define open(...) open_posix(__VA_ARGS__)
+#define openat(...) openat_posix(__VA_ARGS__)
+
+int open_posix(const char *path, int flags, ...);
+int openat_posix(int fd, const char *path, int flags, ...);
+
+/*
+ * <stdlib.h>
+ */
+void freezero(void *, size_t);
+void *recallocarray(void *, size_t, size_t, size_t);
+
+/*
+ * <unistd.h>
+ */
+int getdtablecount(void);
+
+/* void -> int */
+#if defined(__FreeBSD__)
+#define closefrom(fd) (closefrom(fd), 0)
+#endif
+
+#define pledge(promises, execpromises) 0
+#define unveil(path, permissions) 0
+
+#endif /* _OPENBSD_COMPAT_H_ */
Index: pkgsrc/devel/got/files/openbsd-compat/recallocarray.c
diff -u /dev/null pkgsrc/devel/got/files/openbsd-compat/recallocarray.c:1.1
--- /dev/null Fri Jan 29 20:35:11 2021
+++ pkgsrc/devel/got/files/openbsd-compat/recallocarray.c Fri Jan 29 20:35:11 2021
@@ -0,0 +1,84 @@
+/* $OpenBSD: recallocarray.c,v 1.1 2017/03/06 18:44:21 otto Exp $ */
+/*
+ * Copyright (c) 2008, 2017 Otto Moerbeek <otto%drijf.net@localhost>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <errno.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <unistd.h>
+
+/*
+ * This is sqrt(SIZE_MAX+1), as s1*s2 <= SIZE_MAX
+ * if both s1 < MUL_NO_OVERFLOW and s2 < MUL_NO_OVERFLOW
+ */
+#define MUL_NO_OVERFLOW ((size_t)1 << (sizeof(size_t) * 4))
+
+void *
+recallocarray(void *ptr, size_t oldnmemb, size_t newnmemb, size_t size)
+{
+ size_t oldsize, newsize;
+ void *newptr;
+
+ if (ptr == NULL)
+ return calloc(newnmemb, size);
+
+ if ((newnmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) &&
+ newnmemb > 0 && SIZE_MAX / newnmemb < size) {
+ errno = ENOMEM;
+ return NULL;
+ }
+ newsize = newnmemb * size;
+
+ if ((oldnmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) &&
+ oldnmemb > 0 && SIZE_MAX / oldnmemb < size) {
+ errno = EINVAL;
+ return NULL;
+ }
+ oldsize = oldnmemb * size;
+
+ /*
+ * Don't bother too much if we're shrinking just a bit,
+ * we do not shrink for series of small steps, oh well.
+ */
+ if (newsize <= oldsize) {
+ size_t d = oldsize - newsize;
+
+ if (d < oldsize / 2 && d < getpagesize()) {
+ memset((char *)ptr + newsize, 0, d);
+ return ptr;
+ }
+ }
+
+ newptr = malloc(newsize);
+ if (newptr == NULL)
+ return NULL;
+
+ if (newsize > oldsize) {
+ memcpy(newptr, ptr, oldsize);
+ memset((char *)newptr + oldsize, 0, newsize - oldsize);
+ } else
+ memcpy(newptr, ptr, newsize);
+
+#if defined(__FreeBSD__)
+ explicit_bzero(ptr, oldsize);
+#else /* NetBSD case */
+ bzero(ptr, oldsize);
+#endif
+ free(ptr);
+
+ return newptr;
+}
Index: pkgsrc/devel/got/files/openbsd-compat/sha1.h
diff -u /dev/null pkgsrc/devel/got/files/openbsd-compat/sha1.h:1.1
--- /dev/null Fri Jan 29 20:35:11 2021
+++ pkgsrc/devel/got/files/openbsd-compat/sha1.h Fri Jan 29 20:35:11 2021
@@ -0,0 +1,14 @@
+#ifndef _OPENBSD_COMPAT_SHA1_H_
+#define _OPENBSD_COMPAT_SHA1_H_
+
+#include <sha.h>
+
+#define SHA1_DIGEST_LENGTH SHA_DIGEST_LENGTH
+#define SHA1_DIGEST_STRING_LENGTH (SHA1_DIGEST_LENGTH * 2 + 1)
+
+#define SHA1_CTX SHA_CTX
+#define SHA1Init SHA1_Init
+#define SHA1Update SHA1_Update
+#define SHA1Final SHA1_Final
+
+#endif
Index: pkgsrc/devel/got/files/openbsd-compat/util.h
diff -u /dev/null pkgsrc/devel/got/files/openbsd-compat/util.h:1.1
--- /dev/null Fri Jan 29 20:35:11 2021
+++ pkgsrc/devel/got/files/openbsd-compat/util.h Fri Jan 29 20:35:11 2021
@@ -0,0 +1,21 @@
+#ifndef _OPENBSD_COMPAT_UTIL_H_
+#define _OPENBSD_COMPAT_UTIL_H_
+
+#if defined(__FreeBSD__)
+#include <libutil.h>
+#endif
+
+/*
+ * fmt_scaled(3) specific flags.
+ */
+#define FMT_SCALED_STRSIZE 7 /* minus sign, 4 digits, suffix, null byte */
+
+#define fmt_scaled(number, result) ({ \
+ int64_t num = number; \
+ int r = humanize_number(result, \
+ FMT_SCALED_STRSIZE - (num < 0 ? 0 : 1), \
+ num, "", HN_AUTOSCALE, HN_NOSPACE | HN_B); \
+ r == -1 ? -1 : 0; \
+})
+
+#endif
Index: pkgsrc/devel/got/patches/patch-Makefile
diff -u /dev/null pkgsrc/devel/got/patches/patch-Makefile:1.1
--- /dev/null Fri Jan 29 20:35:11 2021
+++ pkgsrc/devel/got/patches/patch-Makefile Fri Jan 29 20:35:11 2021
@@ -0,0 +1,10 @@
+$NetBSD: patch-Makefile,v 1.1 2021/01/29 20:35:11 ryoon Exp $
+
+--- Makefile.orig 2020-09-09 15:30:46 UTC
++++ Makefile
+@@ -1,4 +1,4 @@
+-SUBDIR = libexec got tog
++SUBDIR = openbsd-compat libexec got tog
+
+ .PHONY: release dist
+
Index: pkgsrc/devel/got/patches/patch-Makefile.inc
diff -u /dev/null pkgsrc/devel/got/patches/patch-Makefile.inc:1.1
--- /dev/null Fri Jan 29 20:35:11 2021
+++ pkgsrc/devel/got/patches/patch-Makefile.inc Fri Jan 29 20:35:11 2021
@@ -0,0 +1,24 @@
+$NetBSD: patch-Makefile.inc,v 1.1 2021/01/29 20:35:11 ryoon Exp $
+
+--- Makefile.inc.orig 2020-12-19 00:55:45.000000000 +0000
++++ Makefile.inc
+@@ -4,6 +4,19 @@ CPPFLAGS += -DGOT_LIBEXECDIR=${LIBEXECDI
+ #CFLAGS += -DGOT_OBJ_CACHE_DEBUG
+ #CFLAGS += -DGOT_DIFF_NO_MMAP
+
++# work around https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63567
++#.include <bsd.compiler.mk>
++#.if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} < 50000
++#CSTD = gnu89
++#.endif
++
++OPENBSD_COMPAT := ${.PARSEDIR}/openbsd-compat
++CFLAGS += ${CPPFLAGS} -I${OPENBSD_COMPAT}
++CFLAGS += -Wno-pointer-sign
++
++LDFLAGS += -L${OPENBSD_COMPAT}
++LDADD += -lopenbsd-compat #-lmd
++
+ .if "${GOT_RELEASE}" == "Yes"
+ PREFIX ?= /usr/local
+ BINDIR ?= ${PREFIX}/bin
Index: pkgsrc/devel/got/patches/patch-got_Makefile
diff -u /dev/null pkgsrc/devel/got/patches/patch-got_Makefile:1.1
--- /dev/null Fri Jan 29 20:35:11 2021
+++ pkgsrc/devel/got/patches/patch-got_Makefile Fri Jan 29 20:35:11 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-got_Makefile,v 1.1 2021/01/29 20:35:11 ryoon Exp $
+
+--- got/Makefile.orig 2020-11-10 22:54:37 UTC
++++ got/Makefile
+@@ -29,10 +29,6 @@ DPADD = ${LIBZ} ${LIBUTIL}
+ NOMAN = Yes
+ .endif
+
+-realinstall:
+- ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} \
+- -m ${BINMODE} ${PROG} ${BINDIR}/${PROG}
+-
+ dist:
+ mkdir ../got-${GOT_VERSION}/got
+ cp ${SRCS} ${MAN} ../got-${GOT_VERSION}/got
Index: pkgsrc/devel/got/patches/patch-libexec_Makefile.inc
diff -u /dev/null pkgsrc/devel/got/patches/patch-libexec_Makefile.inc:1.1
--- /dev/null Fri Jan 29 20:35:11 2021
+++ pkgsrc/devel/got/patches/patch-libexec_Makefile.inc Fri Jan 29 20:35:11 2021
@@ -0,0 +1,14 @@
+$NetBSD: patch-libexec_Makefile.inc,v 1.1 2021/01/29 20:35:11 ryoon Exp $
+
+--- libexec/Makefile.inc.orig 2020-09-10 19:02:02 UTC
++++ libexec/Makefile.inc
+@@ -1,7 +1,5 @@
+ .include "../Makefile.inc"
+
+-realinstall:
+- ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} \
+- -m ${BINMODE} ${PROG} ${LIBEXECDIR}/${PROG}
++BINDIR = ${PREFIX}/libexec
+
+-NOMAN = Yes
++MAN =
Index: pkgsrc/devel/got/patches/patch-regress_Makefile
diff -u /dev/null pkgsrc/devel/got/patches/patch-regress_Makefile:1.1
--- /dev/null Fri Jan 29 20:35:11 2021
+++ pkgsrc/devel/got/patches/patch-regress_Makefile Fri Jan 29 20:35:11 2021
@@ -0,0 +1,10 @@
+$NetBSD: patch-regress_Makefile,v 1.1 2021/01/29 20:35:11 ryoon Exp $
+
+--- regress/Makefile.orig 2020-09-13 22:58:33 UTC
++++ regress/Makefile
+@@ -1,3 +1,5 @@
+ SUBDIR = cmdline delta idset path fetch
+
++SUBDIR_TARGETS+= regress
++
+ .include <bsd.subdir.mk>
Index: pkgsrc/devel/got/patches/patch-regress_cmdline_Makefile
diff -u /dev/null pkgsrc/devel/got/patches/patch-regress_cmdline_Makefile:1.1
--- /dev/null Fri Jan 29 20:35:11 2021
+++ pkgsrc/devel/got/patches/patch-regress_cmdline_Makefile Fri Jan 29 20:35:11 2021
@@ -0,0 +1,12 @@
+$NetBSD: patch-regress_cmdline_Makefile,v 1.1 2021/01/29 20:35:11 ryoon Exp $
+
+--- regress/cmdline/Makefile.orig 2020-10-21 11:24:20 UTC
++++ regress/cmdline/Makefile
+@@ -80,4 +80,6 @@ fetch:
+ tree:
+ ./tree.sh -q -r "$(GOT_TEST_ROOT)"
+
+-.include <bsd.regress.mk>
++regress: ${REGRESS_TARGETS} .PHONY .SILENT
++
++.include <bsd.prog.mk>
Index: pkgsrc/devel/got/patches/patch-regress_cmdline_common.sh
diff -u /dev/null pkgsrc/devel/got/patches/patch-regress_cmdline_common.sh:1.1
--- /dev/null Fri Jan 29 20:35:11 2021
+++ pkgsrc/devel/got/patches/patch-regress_cmdline_common.sh Fri Jan 29 20:35:11 2021
@@ -0,0 +1,25 @@
+$NetBSD: patch-regress_cmdline_common.sh,v 1.1 2021/01/29 20:35:11 ryoon Exp $
+
+--- regress/cmdline/common.sh.orig 2020-10-13 22:33:10 UTC
++++ regress/cmdline/common.sh
+@@ -25,6 +25,20 @@ export GOT_TEST_ROOT="/tmp"
+
+ export MALLOC_OPTIONS=S
+
++# compat wrapper
++sed()
++(
++ for i; do
++ arg=$1
++ shift
++ case $arg in
++ -i) set - "$@" "$arg" '' ;;
++ *) set - "$@" "$arg" ;;
++ esac
++ done
++ exec sed "$@"
++)
++
+ git_init()
+ {
+ git init -q "$1"
Index: pkgsrc/devel/got/patches/patch-regress_cmdline_histedit.sh
diff -u /dev/null pkgsrc/devel/got/patches/patch-regress_cmdline_histedit.sh:1.1
--- /dev/null Fri Jan 29 20:35:11 2021
+++ pkgsrc/devel/got/patches/patch-regress_cmdline_histedit.sh Fri Jan 29 20:35:11 2021
@@ -0,0 +1,22 @@
+$NetBSD: patch-regress_cmdline_histedit.sh,v 1.1 2021/01/29 20:35:11 ryoon Exp $
+
+--- regress/cmdline/histedit.sh.orig 2020-12-13 15:08:45 UTC
++++ regress/cmdline/histedit.sh
+@@ -1468,7 +1468,7 @@ test_histedit_fold_only() {
+
+ cat > $testroot/editor.sh <<EOF
+ #!/bin/sh
+-sed -i 's/.*/committing folded changes/' "\$1"
++sed -i '' 's/.*/committing folded changes/' "\$1"
+ EOF
+ chmod +x $testroot/editor.sh
+
+@@ -1584,7 +1584,7 @@ test_histedit_fold_only_empty_logmsg() {
+
+ cat > $testroot/editor.sh <<EOF
+ #!/bin/sh
+-sed -i 'd' "\$1"
++sed -i '' 'd' "\$1"
+ EOF
+ chmod +x $testroot/editor.sh
+
Index: pkgsrc/devel/got/patches/patch-regress_delta_Makefile
diff -u /dev/null pkgsrc/devel/got/patches/patch-regress_delta_Makefile:1.1
--- /dev/null Fri Jan 29 20:35:11 2021
+++ pkgsrc/devel/got/patches/patch-regress_delta_Makefile Fri Jan 29 20:35:11 2021
@@ -0,0 +1,14 @@
+$NetBSD: patch-regress_delta_Makefile,v 1.1 2021/01/29 20:35:11 ryoon Exp $
+
+--- regress/delta/Makefile.orig 2020-08-09 09:17:05 UTC
++++ regress/delta/Makefile
+@@ -8,7 +8,7 @@ LDADD = -lz
+
+ NOMAN = yes
+
+-run-regress-delta_test:
++regress: ${PROG} .PHONY
+ ${.OBJDIR}/delta_test -q
+
+-.include <bsd.regress.mk>
++.include <bsd.prog.mk>
Index: pkgsrc/devel/got/patches/patch-regress_fetch_Makefile
diff -u /dev/null pkgsrc/devel/got/patches/patch-regress_fetch_Makefile:1.1
--- /dev/null Fri Jan 29 20:35:11 2021
+++ pkgsrc/devel/got/patches/patch-regress_fetch_Makefile Fri Jan 29 20:35:11 2021
@@ -0,0 +1,14 @@
+$NetBSD: patch-regress_fetch_Makefile,v 1.1 2021/01/29 20:35:11 ryoon Exp $
+
+--- regress/fetch/Makefile.orig 2020-09-11 17:05:16 UTC
++++ regress/fetch/Makefile
+@@ -11,7 +11,7 @@ LDADD = -lutil -lz
+
+ NOMAN = yes
+
+-run-regress-fetch_test:
++regress: ${PROG} .PHONY
+ ${.OBJDIR}/fetch_test -q
+
+-.include <bsd.regress.mk>
++.include <bsd.prog.mk>
Index: pkgsrc/devel/got/patches/patch-regress_idset_Makefile
diff -u /dev/null pkgsrc/devel/got/patches/patch-regress_idset_Makefile:1.1
--- /dev/null Fri Jan 29 20:35:11 2021
+++ pkgsrc/devel/got/patches/patch-regress_idset_Makefile Fri Jan 29 20:35:11 2021
@@ -0,0 +1,14 @@
+$NetBSD: patch-regress_idset_Makefile,v 1.1 2021/01/29 20:35:11 ryoon Exp $
+
+--- regress/idset/Makefile.orig 2020-08-09 09:17:05 UTC
++++ regress/idset/Makefile
+@@ -9,7 +9,7 @@ LDADD = -lutil -lz
+
+ NOMAN = yes
+
+-run-regress-idset_test:
++regress: ${PROG} .PHONY
+ ${.OBJDIR}/idset_test -q
+
+-.include <bsd.regress.mk>
++.include <bsd.prog.mk>
Index: pkgsrc/devel/got/patches/patch-regress_path_Makefile
diff -u /dev/null pkgsrc/devel/got/patches/patch-regress_path_Makefile:1.1
--- /dev/null Fri Jan 29 20:35:11 2021
+++ pkgsrc/devel/got/patches/patch-regress_path_Makefile Fri Jan 29 20:35:11 2021
@@ -0,0 +1,14 @@
+$NetBSD: patch-regress_path_Makefile,v 1.1 2021/01/29 20:35:11 ryoon Exp $
+
+--- regress/path/Makefile.orig 2020-08-09 09:17:05 UTC
++++ regress/path/Makefile
+@@ -8,7 +8,7 @@ LDADD = -lutil -lz
+
+ NOMAN = yes
+
+-run-regress-path_test:
++regress: ${PROG} .PHONY
+ ${.OBJDIR}/path_test -q
+
+-.include <bsd.regress.mk>
++.include <bsd.prog.mk>
Index: pkgsrc/devel/got/patches/patch-tog_Makefile
diff -u /dev/null pkgsrc/devel/got/patches/patch-tog_Makefile:1.1
--- /dev/null Fri Jan 29 20:35:11 2021
+++ pkgsrc/devel/got/patches/patch-tog_Makefile Fri Jan 29 20:35:11 2021
@@ -0,0 +1,13 @@
+$NetBSD: patch-tog_Makefile,v 1.1 2021/01/29 20:35:11 ryoon Exp $
+
+--- tog/Makefile.orig 2020-11-10 22:54:37 UTC
++++ tog/Makefile
+@@ -28,8 +28,4 @@ DPADD = ${LIBZ} ${LIBUTIL}
+ NOMAN = Yes
+ .endif
+
+-realinstall:
+- ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} \
+- -m ${BINMODE} ${PROG} ${BINDIR}/${PROG}
+-
+ .include <bsd.prog.mk>
Index: pkgsrc/devel/got/patches/patch-tog_tog.c
diff -u /dev/null pkgsrc/devel/got/patches/patch-tog_tog.c:1.1
--- /dev/null Fri Jan 29 20:35:11 2021
+++ pkgsrc/devel/got/patches/patch-tog_tog.c Fri Jan 29 20:35:11 2021
@@ -0,0 +1,30 @@
+$NetBSD: patch-tog_tog.c,v 1.1 2021/01/29 20:35:11 ryoon Exp $
+
+--- tog/tog.c.orig 2020-12-27 09:14:30.000000000 +0000
++++ tog/tog.c
+@@ -20,9 +20,13 @@
+
+ #include <ctype.h>
+ #include <errno.h>
++#if !defined(_XOPEN_SOURCE_EXTENDED)
+ #define _XOPEN_SOURCE_EXTENDED
++#endif
+ #include <curses.h>
++#if !defined(_XOPEN_SOURCE_EXTENDED)
+ #undef _XOPEN_SOURCE_EXTENDED
++#endif
+ #include <panel.h>
+ #include <locale.h>
+ #include <signal.h>
+@@ -838,7 +842,11 @@ view_input(struct tog_view **new, int *d
+ if (errcode)
+ return got_error_set_errno(errcode,
+ "pthread_mutex_unlock");
++#if defined(__NetBSD__)
++ sched_yield();
++#else
+ pthread_yield();
++#endif
+ errcode = pthread_mutex_lock(&tog_mutex);
+ if (errcode)
+ return got_error_set_errno(errcode,
Home |
Main Index |
Thread Index |
Old Index