CVS commit: pkgsrc/devel/got

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Wed May 29 17:28:30 UTC 2024

Modified Files:
        pkgsrc/devel/got: Makefile PLIST distinfo
        pkgsrc/devel/got/patches: patch-compat_sha2.h

Log Message:
devel/got: update to got 0.99

# local changes
* Fix build following devel/ncursesw removal
* Package now requires LibreTLS
* Add required tools and dependencies for tests
* Regression tests are interactive

# upstream changes (since version  0.97)

* got 0.99; 2024-05-05
  see git repository history for per-change authorship information
- make 'got fetch' work with URLs which refer to $HOME via a tilde: ~user
- replace strftime %G-%m-%d with %F to prevent 2024-12-30 -> 2025-12-30
- fix spurious errors from got-fetch-http when server has no more data to send
- prevent gotd notification process from exiting due to EPIPE
- fix I/O hangs with TLS in got-notify-http
- document http and https protocol support in got.conf(5), too
- fix an fd leak in gotd's notify process causing endless CPU spin
- back out got stage -R option addition; deemed too inconvenient in practice
- fix got-fetch-http GET request URL; add leading slash and avoid double slashes
- allow custom GOT_TEST_HTTP_PORT when running regression tests
- gotwebd: add magic ".git" handling; try foo.git if repository foo is not found
- expose authenticated gotd user account in HTTP notifications
- gotd.conf(5) HTTP/JSON documentation fixes
- fix endless loop upon Ctrl-D (EOF) input during got stage/unstage/revert -p
- make gotd notifications work when 'git push' is used instead of 'got send'
- make got stage -p behave the same way in interactive and -F modes for 'q'
- fix lingering gotd processes from clients closing connections early
- regress: prevent spurious failure of gotd test_clone_basic_access_denied
- fix an issue where 'git fetch' would error or hang against gotd
- use polling read in got_pkt_readn() to avoid endless hangs in gotsh

* got 0.98; 2024-04-23
  see git repository history for per-change authorship information
- speed up got tag -l by caching timestamps in got_ref_cmp_tags()
- provide a macro for vi(1) path for use by -portable at compile time
- avoid a rename/stat race when gotd installs a new pack and then uses it
- make 'got ref -l' output consistent when packed references exist
- make 'got ref -l' work consistently when a reference argument is given
- add initial support for notifications to gotd(8), via email and http/json
- display process title in syslog when a gotd child process exits
- hide a pointless end-of-file error on imsg pipe in libexec helpers
- plug a memory leak in 'got blame'
- add support for topological sorting to the commit graph
- add log -t option which enables topological sorting of commits
- make 'got rebase' find a merge base with topological sorting if needed
- call unveil(2) earlier during import, commit, histedit, and tag commands
- make 'got status' display interrupted rebase, histedit, and merge operations
- got.1: escape Eq since it's a GNU roff macro, to fix rendering in -portable
- regress: use seq instead of jot, for portability reasons
- get rid of unnecessary "dns inet" pledge promises while fetching via git://
- add http clone/fetch support using a new got-fetch-http helper
- drop git+ssh protocol name from documentation; Git has done the same
- require -R option for staging or unstaging directory contents
- got patch: fix applying on empty files


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/got/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/got/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/got/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/got/patches/patch-compat_sha2.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/got/Makefile
diff -u pkgsrc/devel/got/Makefile:1.7 pkgsrc/devel/got/Makefile:1.8
--- pkgsrc/devel/got/Makefile:1.7       Mon May  6 08:40:23 2024
+++ pkgsrc/devel/got/Makefile   Wed May 29 17:28:29 2024
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2024/05/06 08:40:23 jperkin Exp $
+# $NetBSD: Makefile,v 1.8 2024/05/29 17:28:29 vins Exp $
 
-DISTNAME=      got-portable-0.97
+DISTNAME=      got-portable-0.99
 PKGNAME=       ${DISTNAME:S/-portable//}
-PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  https://gameoftrees.org/releases/portable/
 
@@ -17,7 +16,7 @@ PREV_PKGPATH= devel/got-portable
 
 BUILD_DEFS+=   VARBASE
 
-USE_TOOLS+=    pkg-config yacc
+USE_TOOLS+=    pkg-config yacc ksh:test perl:test
 
 PKG_GROUPS=            _gotd
 PKG_USERS=             _gotd:_gotd
@@ -49,7 +48,14 @@ INSTALLATION_DIRS+=  share/doc/got share/
 RCD_SCRIPTS=   gotd
 PKG_SHELL=     bin/gotsh
 
-TEST_TARGET=   tests
+# Tests for HTTP protocol support rely on the HTTP::Daemon Perl module.
+TEST_DEPENDS+=         p5-HTTP-Daemon-[0-9]*:../../www/p5-HTTP-Daemon
+TEST_DEPENDS+=         git-[0-9]*:../../devel/git
+INTERACTIVE_STAGE+=    test
+TEST_TARGET=           tests
+
+REPLACE_KSH+=  regress/gotd/repo_write_protected.sh
+REPLACE_KSH+=  regress/tog/log.sh
 
 SUBST_CLASSES+=                pkgsrc
 SUBST_STAGE.pkgsrc=    pre-configure
@@ -64,6 +70,12 @@ SUBST_FILES.conf+=   gitwrapper/gitwrapper
                        gotd/gotd.h gotd/gotd.8
 SUBST_SED.conf+=       -e "s:/etc/gotd.conf:${PKG_SYSCONFDIR}/gotd.conf:g"
 
+SUBST_CLASSES+=                ncursesw
+SUBST_STAGE.ncursesw=  pre-configure
+SUBST_MESSAGE.ncursesw=        Do not check for ncursesw on NetBSD
+SUBST_FILES.ncursesw=  configure
+SUBST_SED.ncursesw+=   -e "s:gnupanelw:gnupanel:g"
+
 MESSAGE_SUBST+=                DOCDIR=${DOCDIR:Q}
 
 .include "../../mk/bsd.prefs.mk"
@@ -81,11 +93,11 @@ post-install:
        ${INSTALL_DATA} ${FILESDIR}/gotd.conf ${DESTDIR}${EGDIR}
        ${INSTALL_DATA} ${PKG_DOCS:S|^|${WRKSRC}/|} ${DESTDIR}${DOCDIR}
 
-# need libcrypto.so.1.1
-BUILDLINK_API_DEPENDS.openssl+=   openssl>=1.1.1d
-.include "../../security/openssl/buildlink3.mk"
+# needs libtls
+.include "../../security/libretls/buildlink3.mk"
 
 # required for set_panel_userptr(3) and waddwstr(3).
+BUILDLINK_API_DEPENDS.ncurses+=   ncurses>=6.5
 .include "../../devel/ncurses/buildlink3.mk"
 
 # compatibility macros and functions for Linux.

Index: pkgsrc/devel/got/PLIST
diff -u pkgsrc/devel/got/PLIST:1.2 pkgsrc/devel/got/PLIST:1.3
--- pkgsrc/devel/got/PLIST:1.2  Sun Feb 11 14:47:06 2024
+++ pkgsrc/devel/got/PLIST      Wed May 29 17:28:29 2024
@@ -1,12 +1,15 @@
-@comment $NetBSD: PLIST,v 1.2 2024/02/11 14:47:06 vins Exp $
+@comment $NetBSD: PLIST,v 1.3 2024/05/29 17:28:29 vins Exp $
 bin/gitwrapper
 bin/got
 bin/gotadmin
 bin/gotctl
 bin/gotsh
 bin/tog
+libexec/got-fetch-http
 libexec/got-fetch-pack
 libexec/got-index-pack
+libexec/got-notify-email
+libexec/got-notify-http
 libexec/got-read-blob
 libexec/got-read-commit
 libexec/got-read-gitconfig

Index: pkgsrc/devel/got/distinfo
diff -u pkgsrc/devel/got/distinfo:1.5 pkgsrc/devel/got/distinfo:1.6
--- pkgsrc/devel/got/distinfo:1.5       Sun Mar 17 11:38:48 2024
+++ pkgsrc/devel/got/distinfo   Wed May 29 17:28:29 2024
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2024/03/17 11:38:48 vins Exp $
+$NetBSD: distinfo,v 1.6 2024/05/29 17:28:29 vins Exp $
 
-BLAKE2s (got-portable-0.97.tar.gz) = 9caf0bcc51a36bc90af1bd33e2e65ee556e6e435ec73a6f9d6b5cc458b8eeb0c
-SHA512 (got-portable-0.97.tar.gz) = 7d1b47b9dfbde7bce60fd7448e1cd81d19c0d576238642f17bb735a6183a31a590d573cbe329e7ab4b67f29ead1b62a67c173d7e57a0282d89f9cac70f60bdd0
-Size (got-portable-0.97.tar.gz) = 1269488 bytes
-SHA1 (patch-compat_sha2.h) = 56c722110049bbbc6ccbbf0418717d2430788459
+BLAKE2s (got-portable-0.99.tar.gz) = 3b54f7cb8e457aad9dabc7170a763dfb915ffe931e030de2e0fad7e7cf72339d
+SHA512 (got-portable-0.99.tar.gz) = 59504e9d0fe507f255a51aa0e565f69b190d7e94147c0848066919a932f44ff0724d841ba872c3ad34383e65adc1bffd30927a13add9314975bb613d2aa6b5f1
+Size (got-portable-0.99.tar.gz) = 1481387 bytes
+SHA1 (patch-compat_sha2.h) = 3fff2c05e0347d4bbcbe5866d5cb13ed1487de69
 SHA1 (patch-gotd_log.h) = eb0890789c1fe7a490ea01d02e48fd71cddc2891

Index: pkgsrc/devel/got/patches/patch-compat_sha2.h
diff -u pkgsrc/devel/got/patches/patch-compat_sha2.h:1.1 pkgsrc/devel/got/patches/patch-compat_sha2.h:1.2
--- pkgsrc/devel/got/patches/patch-compat_sha2.h:1.1    Sun Feb 11 14:47:07 2024
+++ pkgsrc/devel/got/patches/patch-compat_sha2.h        Wed May 29 17:28:29 2024
@@ -1,17 +1,17 @@
-$NetBSD: patch-compat_sha2.h,v 1.1 2024/02/11 14:47:07 vins Exp $
+$NetBSD: patch-compat_sha2.h,v 1.2 2024/05/29 17:28:29 vins Exp $
 
 attribute __bounded__ is only defined in OpenBSD's GCC.
 
---- compat/sha2.h.orig 2023-03-13 14:37:38.000000000 +0000
+--- compat/sha2.h.orig 2024-05-29 15:52:53.668746638 +0000
 +++ compat/sha2.h
 @@ -39,6 +39,10 @@
  #ifndef _SSHSHA2_H
  #define _SSHSHA2_H
-
+ 
 +#if !defined(HAVE_ATTRIBUTE__BOUNDED__) && !defined(__OpenBSD__)
 +#define __bounded__(x, y, z)
 +#endif
 +
- #if !defined(HAVE_SHA256UPDATE) || !defined(HAVE_SHA384UPDATE) || \
-     !defined(HAVE_SHA512UPDATE)
+ #if !defined(HAVE_SHA256UPDATE)
  
+ /*** SHA-256/384/512 Various Length Definitions ***********************/