CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2024/04/23 05:34:33 Modified files: devel/got : Makefile distinfo devel/got/pkg : PLIST-main PLIST-server Log message: update to got 0.98 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
Re: update emulators/mednafen
On Sun, Apr 21, 2024 at 01:41:59PM +0200, Solene Rapenne wrote:
> A newer version is available, changelogs since our version:
>
> - https://forum.fobby.net/index.php?t=msg=2181=0;
> - https://forum.fobby.net/index.php?t=msg=2191=0;
>
> tested on amd64, build and works fine, I tried a few games on super
> nes and megadrive
ok stsp@
The changelogs read like small incremental changes and fixes.
Should be a safe update.
> diff --git a/emulators/mednafen/Makefile b/emulators/mednafen/Makefile
> index cb08d15a0b8..f500b6896bf 100644
> --- a/emulators/mednafen/Makefile
> +++ b/emulators/mednafen/Makefile
> @@ -1,10 +1,9 @@
> BROKEN-hppa =../../include/mednafen/state.h:21:7: error:
> 'exception_ptr' in namespace 'std' does not name a type
> COMMENT =emulates numerous game consoles
>
> -VERSION =1.31.0-UNSTABLE
> +VERSION =1.32.1
> DISTNAME = mednafen-${VERSION}
> PKGNAME =mednafen-${VERSION:C/-UNSTABLE//}
> -REVISION = 2
>
> CATEGORIES = emulators games
> HOMEPAGE = https://mednafen.github.io
> diff --git a/emulators/mednafen/distinfo b/emulators/mednafen/distinfo
> index 4c9b4d330ba..fed5bcfad85 100644
> --- a/emulators/mednafen/distinfo
> +++ b/emulators/mednafen/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (mednafen-1.31.0-UNSTABLE.tar.xz) =
> v8/3LjcOCeEro3kWAHghh/v14syda1/k+fNHFkIEY2c=
> -SIZE (mednafen-1.31.0-UNSTABLE.tar.xz) = 3528532
> +SHA256 (mednafen-1.32.1.tar.xz) =
> 3n65SrZiEq53WDdlJDaKirIII0szeWYlymMFR9vIODI=
> +SIZE (mednafen-1.32.1.tar.xz) = 3571236
>
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2024/04/17 15:55:32 Modified files: games/zelda3 : Makefile distinfo games/zelda3/patches: patch-zelda3_ini games/zelda3/pkg: PLIST games/zelda3-data: Makefile distinfo Added files: games/zelda3/patches: patch-src_main_c Removed files: games/zelda3/patches: patch-main_c Log message: Update to games/zelda3 version 0.3. This version supports game assets of non-US releases but our zelda3-data port is not yet set up to handle them. Help would be welcome from people who own the game in supported non-English languages. While here, strip CR from files which get patched to avoid CRLF in patch-*. ok bentley@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2024/04/13 10:24:46 Modified files: emulators/citra: Makefile distinfo emulators/citra/patches: patch-CMakeLists_txt emulators/citra/pkg: PLIST Added files: emulators/citra/patches: patch-src_common_dynamic_library_dynamic_library_cpp Removed files: emulators/citra/patches: patch-externals_CMakeLists_txt patch-externals_dynarmic_src_dynarmic_backend_exception_handler_posix_cpp emulators/citra/pkg: PFRAG.x86 Log message: Update citra to the most recent available snapshot (2104). ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2024/03/11 02:22:32 Modified files: devel/got : Makefile distinfo Log message: update to got 0.97 see git repository history for per-change authorship information - improve error messages shown upon execv failure - fix 'gotadmin pack' crash upon Ctrl-C due to invalid imsg_free() - significantly speed up deltification of large files - improve error handling in got_privsep_recv_imsg()
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2024/02/24 05:46:33 Modified files: games/chiaki : Makefile Log message: games/chiaki requires devel/py-setuptools at build-time Fixes ModuleNotFoundError: No module named 'pkg_resources' during build. hint from landry@, thanks!
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2024/02/24 01:04:52 Modified files: games/chiaki : Makefile distinfo Log message: Update to Chiaki 2.2.0. Fixes the non-working PS4 controller touchpad button issue. Pressing T on the keyboard to send a touchpad press event is longer required. Tested over qwx(4) against a PS4 on the same wifi network.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2024/02/23 22:07:53 Modified files: games/chiaki : Makefile Log message: fix 'make update-patches' target in games/chiaki Set WRKDIST instead of WRKSRC to avoid this error from update-patches: WRKDIST=/usr/ports/pobj/chiaki-2.1.1/chiaki-v2.1.1-src does not exist Hint from thfr@, thanks!
Re: NEW: emulators/es-de
On Mon, Feb 19, 2024 at 05:19:27PM +0100, Stefan Sperling wrote: > I would suggest a RUN_DEPENDS on emulators/retroarch. If it is not > installed then es-ds prints errors asking for retroarch I now see that we're lacking quite a few libretro cores in ports. In my particular case it actually wouldn't help to add this dependency since neither snes or gba cores are present. Perhaps it makes more sense to make es-de run mednafen for a few things? Generally, do you think it would make sense to pre-configure de-cs, and add appropriate run-depends, such that it will spawn a working emulator for a given system out of the box? Or should we leave this for users to figure out?
Re: NEW: emulators/es-de
On Mon, Feb 19, 2024 at 06:07:20AM -0700, Anthony J. Bentley wrote: > Hi, > > EmulationStation Desktop Edition is a frontend for browsing and launching > games from your multi-platform game collection. > > > Note: this is a fork of emulators/emulationstation, which has not been > updated upstream in ten years. > > ok? > > -- > Anthony J. Bentley This is a very pretty interface and works out-of-the box for me. I would suggest a RUN_DEPENDS on emulators/retroarch. If it is not installed then es-ds prints errors asking for retroarch when I try to run a game (tested my zelda 3 SNES cartridge and Zelda Minish Cap GBA cartridge dumps). In any case, ok by me.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs
Module name:ports
Changes by: s...@cvs.openbsd.org2024/02/13 13:58:43
Modified files:
devel/got : Makefile distinfo
Log message:
update to got 0.96
see git repository history for per-change authorship information
- gotwebd: add foldable commit briefs
- gotwebd: fix (again) the styling for the next/prev buttons
- gotwebd: add knob for the number of tags and commits in the summary page
- gotwebd: remove PAGE handling
- gotwebd: retire max_repos setting
- gotwebd: guard against missig folder and file parameter in BLOB and BLAME
- gotwebd: improve copy-paste from BLOB pages
- gotwebd: fix colour of target lines in dark mode CSS
- gotwebd.conf.5: show defaults, improve EXAMPLES
- gotwebd.8: improve EXAMPLES sections
- fix logging during gotwebd shutdown
- plug several memory leaks in tog
- plug object id queue leak when iterating pack index files
- ensure tmp file is closed and fix UB in diff error path
- do not crash when a meta-data file in the .got directory is empty
- make the gotd auth process provide the user's account name for later use
- avoid opening objects in the gotd session process for no reason
- use imsg_get_fd() instead of imsg->fd everywhere
- tolerate remotes without urls in git config file for interop with git-annex
- plug some fd leaks in the fdopen{,dir} error paths
- log -b: handle merge commits unrelated to requested changed path history
- fix use of uninitialized variable in update_blob()
- plug memory leak in got_pack_dump_delta_chain_to_file()
- never write accum_buf on error in got_pack_dump_delta_chain_to_file()
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2024/02/13 13:58:12 Modified files: devel/got : Tag: OPENBSD_7_4 Makefile distinfo Log message: keep the 7.4 branch at got-0.95; got-0.96 only compiles on -current
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs
Module name:ports
Changes by: s...@cvs.openbsd.org2024/02/13 13:46:37
Modified files:
devel/got : Tag: OPENBSD_7_4 Makefile distinfo
Log message:
update to got 0.96
see git repository history for per-change authorship information
- gotwebd: add foldable commit briefs
- gotwebd: fix (again) the styling for the next/prev buttons
- gotwebd: add knob for the number of tags and commits in the summary page
- gotwebd: remove PAGE handling
- gotwebd: retire max_repos setting
- gotwebd: guard against missig folder and file parameter in BLOB and BLAME
- gotwebd: improve copy-paste from BLOB pages
- gotwebd: fix colour of target lines in dark mode CSS
- gotwebd.conf.5: show defaults, improve EXAMPLES
- gotwebd.8: improve EXAMPLES sections
- fix logging during gotwebd shutdown
- plug several memory leaks in tog
- plug object id queue leak when iterating pack index files
- ensure tmp file is closed and fix UB in diff error path
- do not crash when a meta-data file in the .got directory is empty
- make the gotd auth process provide the user's account name for later use
- avoid opening objects in the gotd session process for no reason
- use imsg_get_fd() instead of imsg->fd everywhere
- tolerate remotes without urls in git config file for interop with git-annex
- plug some fd leaks in the fdopen{,dir} error paths
- log -b: handle merge commits unrelated to requested changed path history
- fix use of uninitialized variable in update_blob()
- plug memory leak in got_pack_dump_delta_chain_to_file()
- never write accum_buf on error in got_pack_dump_delta_chain_to_file()
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/12/29 06:47:27 Modified files: devel/subversion: Makefile distinfo Removed files: devel/subversion/patches: patch-subversion_bindings_swig_include_proxy_swg Log message: Update to Subversion 1.14.3 Also remove the BDB-backend test-run from our port's regress target. The BDB backend has been deprecated for years and has become irrelevant. ok kn@
update: devel/subversion 1.14.3
This release contains small bug fixes and compatibility fixes for
swig bindings. See here for details:
https://svn.apache.org/repos/asf/subversion/tags/1.14.3/CHANGES
I am removing the BDB backend test run from our regress target.
The BDB backend has been deprecated for years and has become irrelevant.
ok?
---
update to svn 1.14.3
diff 28964c785d9d85c4d1521679ab2214f19b479be6
54af9e9d817ef8dce8e29c54dd988ed9a0751cf9
commit - 28964c785d9d85c4d1521679ab2214f19b479be6
commit + 54af9e9d817ef8dce8e29c54dd988ed9a0751cf9
blob - 292129b999c7d5d3f86aeab5d7c86d8236248426
blob + 6494a93245472dcfc2cb287e0dce2fe405409f71
--- devel/subversion/Makefile
+++ devel/subversion/Makefile
@@ -5,11 +5,7 @@ COMMENT-ruby= ruby interface to subversion
COMMENT-ap2= apache2 subversion modules
COMMENT-gnome-keyring= GNOME keyring support for subversion
-VERSION= 1.14.2
-REVISION-main= 0
-REVISION-ruby= 0
-REVISION-python= 1
-REVISION-gnome-keyring=1
+VERSION= 1.14.3
DISTNAME= subversion-${VERSION:S/rc/-rc/}
PKGNAME-main= subversion-${VERSION}
PKGNAME-perl= p5-SVN-${VERSION}
@@ -233,8 +229,6 @@ post-build:
do-test:
@cd ${WRKBUILD} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} \
- ${ALL_TEST_FLAGS} check FS_TYPE=bdb CLEANUP=1
- @cd ${WRKBUILD} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} \
${ALL_TEST_FLAGS} check FS_TYPE=fsfs CLEANUP=1
.if ${BUILD_PACKAGES:M-perl}
@cd ${WRKBUILD} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} \
blob - 0883cea2c9ba2ac0ad1e629cc43ea5f3e080940a
blob + d8226f13291ed916a8af065352be39cd1dd0f8cb
--- devel/subversion/distinfo
+++ devel/subversion/distinfo
@@ -1,2 +1,2 @@
-SHA256 (subversion-1.14.2.tar.bz2) =
yRMOjQt1copm8OcDj8dwUuZxgw14W1YWqtU7SBDTzCg=
-SIZE (subversion-1.14.2.tar.bz2) = 8606570
+SHA256 (subversion-1.14.3.tar.bz2) =
lJ79RRoJQ19+hXNXTHHHtxsZTYRIkPpJzWHSJi6hpEA=
+SIZE (subversion-1.14.3.tar.bz2) = 8569985
blob - 0d9c73b6ac6e8ab1ea1d0fb19a0c671349a3c44f (mode 644)
blob + /dev/null
--- devel/subversion/patches/patch-subversion_bindings_swig_include_proxy_swg
+++ /dev/null
@@ -1,34 +0,0 @@
-From 8ff4cfd06ce554e9df31a088c9d09f45278c6de4 Mon Sep 17 00:00:00 2001
-From: Yasuhito Futatsuki
-Date: Tue, 20 Sep 2022 12:57:06 +
-Subject: [PATCH] swig-py: Fix conditionals by SWIG version and by Python
- version for proxy code.
-
-Index: subversion/bindings/swig/include/proxy.swg
subversion/bindings/swig/include/proxy.swg.orig
-+++ subversion/bindings/swig/include/proxy.swg
-@@ -66,7 +66,6 @@
- fn()
-
- %}
--#if defined(SWIGPYTHON_PY3)
- #if SWIG_VERSION >= 0x04
- %pythoncode %{
- # -classic and -modern options have been dropped and this variable
-@@ -76,7 +75,7 @@
- _set_instance_attr =
_swig_setattr_nondynamic_instance_variable(object.__setattr__)
-
- %}
--#else
-+#elif defined(SWIGPYTHON_PY3)
- %pythoncode %{
- # SWIG classes generated with -modern do not define this variable
- try:
-@@ -90,7 +89,6 @@
- _set_instance_attr = _swig_setattr_nondynamic_method(object.__setattr__)
-
- %}
--#endif
- #else
- %pythoncode %{
- # SWIG classes generated with -classic do not define this variable,
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/12/08 06:03:22 Modified files: devel/got : Tag: OPENBSD_7_4 Makefile distinfo Log message: 7.4-stable: update to got 0.95 Fixes a regression from the 0.94 update where the 'chroot' option in gotwebd.conf was broken. Also adds more gotwebd features.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/12/08 06:00:22 Modified files: devel/got : Makefile distinfo Log message: update to got 0.95 see git repository history for per-change authorship information - plug memory leaks in checkout, update, and status commands - gotwebd: repair the "chroot" option in /etc/gotwebd.conf; regression from 0.94 - gotwebd: add breadcumbs to navigate paths in tree/blob/commits/blame views - gotwebd: add a dark mode, enabled based on web-browser preferences - gotwebd: add History/Blob/Raw-File links to blob and blame views - gotwebd: adjust blob line numbers for text-mode browsers - gotwebd: make the blame view work in text-mode browsers - gotwebd: add a Patch action to serve diffs in plain text - gotwebd: add Patch and Tree links to the diff view - gotwebd: display README files in tree views - gotwebd: display a tree-listing and README files in the summary view - gotwebd: render less tags in the summary page to make space for other content - gotwebd: swap order of tags and branch listings on the summary page - gotwebd: display 'More' link instead of 'prev/next' links in the tag listing
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/12/06 14:41:22 Modified files: devel/got : Tag: OPENBSD_7_4 Makefile distinfo Removed files: devel/got/patches: Tag: OPENBSD_7_4 patch-lib_repository_c Log message: update devel/got to 0.94 in 7.4-stable In particular, this brings in several important gotwebd fixes. There are two backwards-incompatible syntax changes in gotwebd.conf: - gotwebd.conf: drop support for inferring listen addresses via interface names - gotwebd.conf: use listen * instead of listen "" to listen on any address This file is entirely optional, and the bug fixes we get are worth the potential inconvenience during upgrades.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/11/29 08:18:14 Modified files: devel/got : Makefile distinfo Removed files: devel/got/patches: patch-lib_repository_c Log message: update to got 0.94 see git repository history for per-change authorship information - in diff error message, say what was being diffed - gotwebd.css: vertically align briefs age and author - honor fetch_all_branches configuration again - tog: switch back to patience diff algorithm by default for pretty diffs - gotwebd: render all the datetimes in a time tag - slightly reword 'got merge' documentation to hopefully be more clear - make 'tog diff' release the work-tree lock earlier - got patch: handle embedded NULs in lines of patch files with binary data - simplify usage of the 'mesg' histedit script command - fix some fd leaks in error paths and avoid some double-close() - use ibuf_fd_set() instead of reaching into the ibuf struct - gotwebd: remove dead ipproto handling in host() and host_if() - allow setting variables in gotd.conf syntax - fix gotwebd unveil permissions; gotwebd now runs entirely read-only - reduce gotwebd pledges to the minimum currently required - gotwebd.conf: drop support for inferring listen addresses via interface names - gotwebd.conf: use listen * instead of listen "" to listen on any address - gotwebd: get rid of got_sockaddr.[ch] usage to help -portable - allow gotd repo read/write processes to max out data-size resource limits - gotwebd: replace proc.c with much simpler code - gotwebd: don't chdir to / before spawning the child processes - remove the quite ineffective gotwebd repository cache to fix stability issues - fix memory leak on error in got_privsep_recv_painted_commits() - gotwebd: fix broken signal catching - detect concurrent changes to the set of pack files while matching object IDs
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/11/13 04:03:19 Modified files: www/kcaldav: Tag: OPENBSD_7_4 Makefile distinfo www/kcaldav/pkg: Tag: OPENBSD_7_4 PLIST README Added files: www/kcaldav/patches: Tag: OPENBSD_7_4 patch-kcaldav_c Removed files: www/kcaldav/patches: Tag: OPENBSD_7_4 patch-Makefile Log message: 7.4-stable: update to kcaldav 0.2.4 Fixes interop issues with Thunderbird lightning. Logging is now configurable at run-time. ok landry@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/11/13 04:00:32 Modified files: www/kcaldav: Makefile distinfo www/kcaldav/pkg: PLIST README Added files: www/kcaldav/patches: patch-kcaldav_c Removed files: www/kcaldav/patches: patch-Makefile Log message: update to kcaldav 0.2.4 Fixes interop issues with Thunderbird lightning. Logging is now configurable at run-time. ok landry@
update www/kcaldav to 0.2.4
This version restores interop with Thunderbird lightning, which is
currently unable to create new events in calendars managed by kcaldav.
And logging is now configurable at run-time which should make sending
bug reports to upstream much easier.
I am talking to kristaps about the local patches applied here to
fix startup issues I saw when trying to run the new version.
Hopefully these patches can be dropped again with future releases.
Ok?
---
commit 0c7c35f4caf4e52286099accc0188ce6a351a29a (kcaldav)
from: Stefan Sperling
date: Mon Nov 13 09:53:54 2023 UTC
update kcaldav to 0.2.4
diff 0bbcf3a7ba0d1aae957b279ffa92c4372f1b3e28
0c7c35f4caf4e52286099accc0188ce6a351a29a
commit - 0bbcf3a7ba0d1aae957b279ffa92c4372f1b3e28
commit + 0c7c35f4caf4e52286099accc0188ce6a351a29a
blob - 31ab63f4165a760bb10ec5ef0e6f967d9a898ce3
blob + 696d8d0c0c2380c9cc1d6841617b28688a5421e3
--- www/kcaldav/Makefile
+++ www/kcaldav/Makefile
@@ -1,7 +1,6 @@
COMMENT = a simple, safe, and minimal CalDAV server
-DISTNAME = kcaldav-0.2.0
-REVISION = 0
+DISTNAME = kcaldav-0.2.4
CATEGORIES = www
HOMEPAGE = https://kristaps.bsd.lv/kcaldav/
blob - f81557a9316972839dbd736b7798614e87b8e6ba
blob + c2516fdb03f4b0a60d9255416cdc62a11a2ff75c
--- www/kcaldav/distinfo
+++ www/kcaldav/distinfo
@@ -1,2 +1,2 @@
-SHA256 (kcaldav-0.2.0.tgz) = ajCsg1iuhu33r7YG1dXXKFzVsQYxTbtz8zqLmChTyvQ=
-SIZE (kcaldav-0.2.0.tgz) = 291932
+SHA256 (kcaldav-0.2.4.tgz) = zuP4UsBT5zk03Q7z04eZKVEjpcvsst0EygkRVNhjRN0=
+SIZE (kcaldav-0.2.4.tgz) = 300373
blob - 9bd5fc048ca8edcbcec8901dc1fc6e53fec831b9 (mode 644)
blob + /dev/null
--- www/kcaldav/patches/patch-Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: Makefile
Makefile.orig
-+++ Makefile
-@@ -144,7 +144,7 @@ VERSION = 0.2.0
- CFLAGS+= -DCALDIR=\"$(CALDIR)\"
- CFLAGS+= -DCALPREFIX=\"$(CALPREFIX)\"
- CFLAGS+= -DVERSION=\"$(VERSION)\"
--CFLAGS+= -DLOGFILE=\"$(LOGFILE)\"
-+#CFLAGS += -DLOGFILE=\"$(LOGFILE)\"
- BHTMLS = collection.html \
- home.html
-
blob - /dev/null
blob + 3b175d553fcd9d896bed83c936ba71dea9ede0a8 (mode 644)
--- /dev/null
+++ www/kcaldav/patches/patch-kcaldav_c
@@ -0,0 +1,52 @@
+Fix NULL-pointer deref on startup with bad config file.
+Ignore unveil ENOENT errors from optional directories in chroot.
+Index: kcaldav.c
+--- kcaldav.c.orig
kcaldav.c
+@@ -19,6 +19,7 @@
+
+ #include
+ #include
++#include
+ #include
+ #if HAVE_MD5
+ # include
+@@ -422,7 +423,7 @@ main(void)
+ { kvalid_hash, valids[VALID_PASS] },
+ { kvalid_path, valids[VALID_PATH] } };
+ struct state*st = NULL;
+- char*np, *logfile = NULL;
++ char*np;
+ struct conf conf;
+ const char *cfgfile = NULL;
+ size_t i, sz;
+@@ -460,7 +461,7 @@ main(void)
+ verbose = conf.verbose;
+ if (conf.logfile != NULL && *conf.logfile != '\0')
+ if (!kutil_openlog(conf.logfile))
+- kutil_err(NULL, NULL, "%s", logfile);
++ kutil_err(NULL, NULL, "%s", conf.logfile);
+
+ free(conf.logfile);
+ memset(, 0, sizeof(struct conf));
+@@ -494,13 +495,13 @@ main(void)
+* Directories required by sqlite3.
+*/
+ if (unveil(CALDIR, "rwxc") == -1)
+- kutil_err(NULL, NULL, "unveil");
+- if (unveil("/tmp", "rwxc") == -1)
+- kutil_err(NULL, NULL, "unveil");
+- if (unveil("/var/tmp", "rwxc") == -1)
+- kutil_err(NULL, NULL, "unveil");
+- if (unveil("/dev", "rwx") == -1)
+- kutil_err(NULL, NULL, "unveil");
++ kutil_err(NULL, NULL, "unveil " CALDIR);
++ if (unveil("/tmp", "rwxc") == -1 && errno != ENOENT)
++ kutil_err(NULL, NULL, "unveil /tmp");
++ if (unveil("/var/tmp", "rwxc") == -1 && errno != ENOENT)
++ kutil_err(NULL, NULL, "unveil /var/tmp");
++ if (unveil("/dev", "rwx") == -1 && errno != ENOENT)
++ kutil_err(NULL, NULL, "unveil /dev");
+ if (pledge("stdio rpath cpath wpath flock fattr", NULL) == -1)
+ kutil_err(NULL, NULL, "pledge");
+ #endif
blob - 613439adcb12c8d000bf796b4298b7e79942099e
blob + c4e6e1cd5c3f7e25ed280f197ca69f3accd96c2c
--- www/kcaldav/pkg/PLIST
+++ www/kcaldav/pkg/PLIST
@@ -7,8 +7,11 @@ include/libkcaldav.h
@man man/man3/ical_free.3
@man man/man3/ical_parse.3
@man man/man3/ical_print.3
+@man man/man5/kcaldav.conf.5
@man m
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/09/29 06:17:08 Modified files: shells/nsh : Makefile distinfo shells/nsh/pkg : PLIST Log message: update to nsh 1.2 ok sthen, Tom Smyth (MAINTAINER)
update: nsh 1.2
Update NSH to version 1.2.
This release ships about 6 months worth of fixes and enhancements.
I hope there will be smaller releases on a more regular schedule in
the future, timed less close to ports-lock.
The main benefit of this upgrade is that nsh will now work fine as
a login shell, making it worth being listed in /etc/shells.
The 'enable' command will now re-exec to the root user, with authentication
via /etc/doas.conf or the root password. There is no more need for wrapper
scripts involving doas or sudo starting nsh as root.
Thanks to claudio@ for suggesting this design change.
New features:
the "enable" command switches to the root user via doas.conf or root password
add bgpnsh(8), a minimal version of nsh for use as a BGP looking-glass shell
add umb(4) support
allow nsh commands to be piped to standard input from another process
allow empty configuration files to be filled with data from /etc/examples
add "show pf" commands to display pf firewall status
add "show crontab", "crontab edit", "crontab install" commands
add "show environment", "setenv", "unsetenv", and 'saveenv' commands
ok?
---
diff ee7c68ff49b85bd3287aafeb87a37caf249dc14d
1a6361e5c0dfbb57d2717a0b887bb9f794c0d721
commit - ee7c68ff49b85bd3287aafeb87a37caf249dc14d
commit + 1a6361e5c0dfbb57d2717a0b887bb9f794c0d721
blob - 0aaceefc96346a2389b06c8bfd669198766ad537
blob + a04db8534b2234268a982f7b2a262d54834a9188
--- shells/nsh/Makefile
+++ shells/nsh/Makefile
@@ -1,42 +1,47 @@
COMMENT = network switch style shell
-
-GH_ACCOUNT = yellowman
-GH_PROJECT = nsh
-GH_TAGNAME = v1.1
CATEGORIES = shells net
HOMEPAGE = https://www.nmedia.net/nsh/
+V =1.2
+DISTNAME = nsh-${V}
+SITES =
https://github.com/yellowman/nsh/releases/download/v${V}/
MAINTAINER = Tom Smyth
# BSD
PERMIT_PACKAGE = Yes
+# uses pledge()
WANTLIB += c curses edit sqlite3
FLAVORS = static
FLAVOR ?=
-MAKE_FLAGS = CC="${CC}" \
- CPPFLAGS="-I${LOCALBASE}/include" \
+CPPFLAGS = -I${LOCALBASE}/include \
+ -DNSH_REXEC_PATH=${LOCALBASE}/bin/nsh
+
+MAKE_ENV = CC="${CC}" \
+ CPPFLAGS="${CPPFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib"
LIB_DEPENDS = databases/sqlite3
+FAKE_FLAGS = PREFIX=${TRUEPREFIX}
+
.if ${FLAVOR:Mstatic}
-MAKE_FLAGS += LDADD="-ledit -ltermcap -lsqlite3 -lm -lpthread -static"
+MAKE_FLAGS += LDFLAGS="-L${LOCALBASE}/lib -ledit -ltermcap -lsqlite3 -lm
-lpthread -static"
.endif
NO_TEST= Yes
-do-install:
- ${INSTALL_PROGRAM} ${WRKDIST}/nsh ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKDIST}/nsh.8 ${PREFIX}/man/man8/
+post-configure:
+ ${MAKE} -C ${WRKDIST} obj
+
+post-install:
.for i in save-ro.sh save-rw.sh
${INSTALL_SCRIPT} ${WRKDIST}/${i} ${PREFIX}/bin
.endfor
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nsh
- sed -i s,/usr/local,${LOCALBASE},g ${WRKDIST}/MANUAL
-.for i in MANUAL README TODO COPYRIGHT
+.for i in README.md COPYRIGHT
${INSTALL_DATA} ${WRKDIST}/${i} ${PREFIX}/share/doc/nsh/
.endfor
blob - 2492a4efdcc68c8b34cb856649bd213dd17527ae
blob + 66553f4bfd591f6ca681c2ffd6208f44ff935571
--- shells/nsh/distinfo
+++ shells/nsh/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nsh-1.1.tar.gz) = v0sHzQ2zEoAzbsaZVeVuhp2R0R37cZvNy/RvJ0Df2Pc=
-SIZE (nsh-1.1.tar.gz) = 185700
+SHA256 (nsh-1.2.tar.gz) = XFfUOMhVUCyn+5PhCoXafNIhXxi/GCPXYw2AskzoR/4=
+SIZE (nsh-1.2.tar.gz) = 218922
blob - 247187103b8ceb212dd73ae979309741337c333e
blob + e0707c1e344d5c8f62297f52c1e9d651fd5ec15e
--- shells/nsh/pkg/PLIST
+++ shells/nsh/pkg/PLIST
@@ -1,3 +1,4 @@
+@shell bin/bgpnsh
@shell bin/nsh
bin/save-ro.sh
bin/save-rw.sh
@@ -8,9 +9,11 @@ bin/save-rw.sh
@mode
@owner
@group
+@mode 04555
+@bin libexec/nshdoas
+@mode
+@man man/man8/bgpnsh.8
@man man/man8/nsh.8
share/doc/nsh/
share/doc/nsh/COPYRIGHT
-share/doc/nsh/MANUAL
-share/doc/nsh/README
-share/doc/nsh/TODO
+share/doc/nsh/README.md
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/09/18 06:50:21 Modified files: devel/got : Makefile distinfo Log message: update to got 0.93 see git repository history for per-change authorship information - show out-of-memory errors from zlib inflate() and deflate() calls - make 'got fetch' and 'got send' release the work tree lock earlier - tog: add basic regress for log limit and log search - fix "no git repository found" on locked work trees; regression from 0.91 - gotwebd: CSS improvements, looks much better in text-based browsers - gotwebd: don't lose track of the current file during commit log pagination - gotwebd: move buffering from the fastcgi layer to the template layer - got diff: fix "No newline at end of file" showing up where not expected - make 'got send' detect connections unexpectedly closed by server - fix detection of modified files in fresh work trees created with checkout -E - gotd: fix bogus "gotsh: operation timed out" errors; regression from 0.92
Re: NEW: emulators/mednaffe
On Thu, Sep 14, 2023 at 02:25:52AM -0600, Anthony J. Bentley wrote: > Hi, > > Mednaffe is a front-end (GUI) for the mednafen emulator, depending > only on GTK 3. > > > Pretty simple port. ok? Works fine here. ok.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/09/05 07:36:20 Modified files: emulators/mednafen: Makefile Added files: emulators/mednafen/patches: patch-src_snes_src_lib_libco_amd64_c patch-src_snes_src_lib_libco_settings_h Log message: Port a recent bug fix from emulators/higan to emulators/mednafen. This fixes a segmentation fault in the snes core on startup. This fix is amd64-only. Similar fixes may be needed in other arch-specific files in mednafen's snes/src/lib/libco directory. Original higan fix by mlarkin@ and bentley@ ok mlarkin@
emulators/mednafen: fix snes core segv
Port a recent bug fix from emulators/higan to emulators/mednafen.
This fixes a segmentation fault in the snes core on startup.
This fix is amd64-only. Similar fixes may be needed in other
arch-specific files in mednafen's snes/src/lib/libco directory.
Original higan fix by mlarkin@ and bentley@
ok?
diff /usr/ports
commit - a3c1bca9cedf88b8cc5cd1e86bc92b63e7abbdff
path + /usr/ports
blob - 3c0adce2c52bbf8483221ff1c66acbb47b558145
file + emulators/mednafen/Makefile
--- emulators/mednafen/Makefile
+++ emulators/mednafen/Makefile
@@ -4,7 +4,7 @@ COMMENT = emulates numerous game consoles
VERSION = 1.31.0-UNSTABLE
DISTNAME = mednafen-${VERSION}
PKGNAME = mednafen-${VERSION:C/-UNSTABLE//}
-REVISION = 0
+REVISION = 1
CATEGORIES = emulators games
HOMEPAGE = https://mednafen.github.io
blob - /dev/null
file + emulators/mednafen/patches/patch-src_snes_src_lib_libco_amd64_c (mode
644)
--- /dev/null
+++ emulators/mednafen/patches/patch-src_snes_src_lib_libco_amd64_c
@@ -0,0 +1,53 @@
+Index: src/snes/src/lib/libco/amd64.c
+--- src/snes/src/lib/libco/amd64.c.orig
src/snes/src/lib/libco/amd64.c
+@@ -2,6 +2,9 @@
+ #include "libco.h"
+ #include "settings.h"
+
++#include
++#include
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+@@ -76,7 +79,7 @@ static void (*co_swap)(cothread_t, cothread_t) = 0;
+ }
+ #else
+ /* ABI: SystemV */
+- static const unsigned char co_swap_function[4096] = {
++ static const unsigned char co_swap_function_[4096] = {
+ 0x48, 0x89, 0x26,/* mov [rsi],rsp*/
+ 0x48, 0x8b, 0x27,/* mov rsp,[rdi]*/
+ 0x58,/* pop rax */
+@@ -94,6 +97,7 @@ static void (*co_swap)(cothread_t, cothread_t) = 0;
+ 0x4c, 0x8b, 0x7f, 0x30, /* mov r15,[rdi+48] */
+ 0xff, 0xe0, /* jmp rax */
+ };
++ void *co_swap_function;
+
+ #ifdef LIBCO_MPROTECT
+ #include
+@@ -101,11 +105,18 @@ static void (*co_swap)(cothread_t, cothread_t) = 0;
+ #endif
+
+ static void co_init() {
++int protect;
+ #ifdef LIBCO_MPROTECT
+-unsigned long long addr = (unsigned long long)co_swap_function;
+-unsigned long long base = addr - (addr % sysconf(_SC_PAGESIZE));
+-unsigned long long size = (addr - base) + sizeof co_swap_function;
+-mprotect((void*)base, size, PROT_READ | PROT_EXEC);
++long pagesize = sysconf(_SC_PAGESIZE);
++if (pagesize == -1)
++ err(1, "sysconf failed");
++co_swap_function = mmap(NULL, pagesize, PROT_READ|PROT_WRITE, MAP_ANON,
-1, 0);
++if (co_swap_function == MAP_FAILED)
++ err(1, "mmap failed");
++memcpy(co_swap_function, co_swap_function_, pagesize);
++protect = mprotect(co_swap_function, pagesize, PROT_READ|PROT_EXEC);
++if (protect == -1)
++ err(1, "mprotect failed");
+ #endif
+ }
+ #endif
blob - /dev/null
file + emulators/mednafen/patches/patch-src_snes_src_lib_libco_settings_h (mode
644)
--- /dev/null
+++ emulators/mednafen/patches/patch-src_snes_src_lib_libco_settings_h
@@ -0,0 +1,12 @@
+Index: src/snes/src/lib/libco/settings.h
+--- src/snes/src/lib/libco/settings.h.orig
src/snes/src/lib/libco/settings.h
+@@ -3,7 +3,7 @@
+ /*[amd64, arm, ppc, x86]:
+by default, co_swap_function is marked as a text (code) section
+if not supported, uncomment the below line to use mprotect instead */
+-/* #define LIBCO_MPROTECT */
++#define LIBCO_MPROTECT
+
+ /*[amd64]:
+Win64 only: provides a substantial speed-up, but will thrash XMM regs
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/09/02 02:45:34 Modified files: sysutils/firmware/iwx: Makefile distinfo Log message: update iwx firmware to 2023-06-29 These should be safe drop-in updates. Let us know if anything breaks. prelimenary testing by gsoares and myself on AX200/AX201 ok sthen
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/08/29 07:35:54 Modified files: devel/got : Makefile distinfo Log message: update to got 0.92 - allow modified files to be deleted during merges if content exists in repo - disallow overlapping repo and work tree in 'got checkout' - speed up opening of the work tree's file-index - speed up deltification by resizing block hash tables less often - add support for commit keywords to 'got log -x' - fix 'got log -dPp' diffstat duplication bug - improve out-of-date reporting accuracy in 'got branch -l' output - document that the log -d option implies log -P - prevent file-index corruption via deletion of missing locally-added files - prevent a double-free in got_worktree_commit - fix regression from 0.76: 'got diff' output matches /usr/bin/diff -p again - gotsh: do not set POLLOUT flag if there is no data to send, for portability - gotd: stop logging "unexpected end of file" when client decides to disconnect - make gotd flush pending messages before disconnecting the client upon success - gotwebd: fix bogus modification times displayed when show_repo_age is off - tog: show work tree base commit marker in the log view - tog: fix an infinite loop that could be triggered via log view search - plug a memory leak in tog's blame view - tog regress: prevent crash in ncurses when Ctrl-C is used to cancel test runs - tog regress: fix occasional failures due to commit timestamp mismatch - regress: nix 'set -A' kshism from tests for portability
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/07/19 08:18:14 Modified files: devel/got : Makefile distinfo Log message: update to got 0.91 see git repository history for per-change authorship information - use _POSIX_HOST_NAME_MAX from for portability - add merge -M option which tells 'got merge' not to fast-forward a reference - make gitwrapper ignore "permission denied" errors for repository paths - add cvg(1), a CVS-like Git client; still WIP and not installed by default yet - add initial implementation of 'gotadmin dump' which creates Git bundle files - add initial implementation of 'gotadmin load' which loads Git bundle files - gotadmin cleanup: consider object reachability while cleaning packfiles - gotadmin cleanup: don't delete pack files that are too young - prevent useless EEXIST errors filling up the global custom error array - abort histedit if the user quits the editor without saving the script - fix double-free in tog blame view error path - add support for keywords as arguments to got and tog
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/06/23 09:01:50 Modified files: devel/got : Makefile distinfo Log message: update to got 0.90 see git repository history for per-change authorship information - fix segfault in 'got diff' when a root commit is passed to -c - make 'got status' error out as intended when invoked in a repository - make 'got tree /' succeed in a work tree - make 'got add *' more forgiving about versioned paths on the command line - make 'got merge' forward branches if there are no changes to merge - prevent 'got merge' from creating commits on branches outside "refs/heads/" - got, tog: show reference names that begin with the prefix "HEAD" as intended - gotd: unveil repositories read-only in session process while serving fetches - gotd: avoid a "failed to push some refs" error from no-op 'git push' - gotd: avoid re-writing existing ref files when a ref-update is a no-op - gotd: show relevant commit hashes in error message if incoming pushes collide - gotd: wait asynchronously for child process termination - gotwebd: avoid the slowness of needlessly traversing full commit history - gotwebd.conf: disallow 1 for max_commits_display and report range errors - gotwebd.conf: disallow yes/no for booleans to avoid accidental "on" vs. "no" - gotwebd: avoid "gotweb_render_index: repo.git: unexpected end of file" error - gotwebd: simplify the matching of requests against servers in gotwebd.conf - ignore files with invalid reference names while reading references from disk - teach 'gotadmin cleanup' to remove redundant pack files - grab gc.pid.lock file during cleanup operation to block 'git gc' from running
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/06/22 06:01:41 Modified files: sysutils/firmware/iwm: Makefile distinfo Log message: Update iwm(4) firmware images to release 2023-03-30 (affects 9k devices only). test + ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/06/22 06:00:18 Modified files: sysutils/firmware/iwx: Makefile distinfo Log message: Update iwx(4) -77 firmware images to release 2023-03-30. Tested: ax200: jmc, stsp ax210: kevlo, mlarkin, lraab ax211: kn ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/06/05 05:21:11 Modified files: devel/got : Makefile distinfo Removed files: devel/got/patches: patch-gotd_gotd_c Log message: update to got 0.89 see git repository history for per-change authorship information - gotd: return early after disconnect on auth event error instead of crashing - make 'got patch' display statistics about files with conflicts and rejects - make 'got diff' not treat \r\n line endings as special - fix test failures in test_blame_lines_shifted_skip on certain times of day - show reference labels next to commit messages in tog log view - some gotwebd refactoring related to handling of file descriptors - gotwebd: lower log priority of unexpected disconnections - gotwebd: avoid needless double fseek() - fix the size of gotwebd's tempfiles array; exposed by errors from ftruncate() - simplify ancestry checks in checkout, update, rebase, and merge commands - make gitwrapper not fail if programs it wants to run do not exist on disk - stop showing backup references in the tog log and diff views - consistently use ten Xs in mkstemp(3) templates - only delete empty directories which appear in arguments to 'got rm' - simplify parsing of host names and IP addresses in gotwebd's parse.y - make 'got merge' refuse to run if a merge is in progress - make 'got merge -c' fail even if new changes only affect unrelated paths
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/06/01 01:31:08 Modified files: net/serf : Makefile distinfo Removed files: net/serf/patches: patch-SConstruct patch-build_check_py Log message: Update to Serf 1.3.10. Two backported upstream patches can now go away. ok sthen@
update: net/serf
This patch updates net/serf to 1.3.10. This is a bug fix release.
The Subversion regression test suite is still passing for me on OpenBSD
with this release. Two patches can be dropped from the port.
Upstream changelog:
Changes in version 1.3.10:
- Support for OpenSSL 3
- Fix issue #171: Win32: Running tests fails with "no OPENSSL_Applink" error
- Fix issue #194: Win32: Linking error when building against OpenSSL 1.1+
- Fix issue #198: OpenSSL BIO control method incorrectly handles
unknown requests
- Fix issue #202: SSL tests are not passing with OpenSSL 3
- Fix error handling when reading the outgoing request body
- Fix handling of invalid chunk lengths in the dechunk bucket
- Fix an endless loop in the deflate bucket with truncated input
- Fix BIO control handlers to support BIO_CTRL_EOF
- Fix a CRT mismatch issue caused by using certain OpenSSL functions
- Build changes to support VS2017, VS2019 and VS2022
- Build changes to support Python 3
ok?
diff /usr/ports
commit - 578d62534f167e4cebe7e11ab2e6cb042c678454
path + /usr/ports
blob - a153994ff81451346b919bc236e1d6c430fe9990
file + net/serf/Makefile
--- net/serf/Makefile
+++ net/serf/Makefile
@@ -1,6 +1,5 @@
COMMENT = high performance HTTP client library
-DISTNAME = serf-1.3.9
-REVISION = 0
+DISTNAME = serf-1.3.10
SHARED_LIBS = serf-11.0 # 1.3.0
CATEGORIES = net
HOMEPAGE = https://serf.apache.org/
blob - 81de8b41324ab7882f45acfbe9667f3b2f63f5ac
file + net/serf/distinfo
--- net/serf/distinfo
+++ net/serf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (serf-1.3.9.tar.bz2) = VJwtIcV3qKnARQ+stcyoCfJlkfBI5GZVIkCUe996h8w=
-SIZE (serf-1.3.9.tar.bz2) = 145132
+SHA256 (serf-1.3.10.tar.bz2) = voHvCLqiUW7Np2p3rffe97wyJ+61eLmjO0X3tB3AZOY=
+SIZE (serf-1.3.10.tar.bz2) = 147744
blob - 469c70877ee0877981ddbff5cba96a515b5fda2b
file + /dev/null
--- net/serf/patches/patch-SConstruct
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: SConstruct
SConstruct.orig
-+++ SConstruct
-@@ -166,7 +166,7 @@ env.Append(BUILDERS = {
- match = re.search('SERF_MAJOR_VERSION ([0-9]+).*'
- 'SERF_MINOR_VERSION ([0-9]+).*'
- 'SERF_PATCH_VERSION ([0-9]+)',
-- env.File('serf.h').get_contents(),
-+ env.File('serf.h').get_contents().decode('utf-8'),
- re.DOTALL)
- MAJOR, MINOR, PATCH = [int(x) for x in match.groups()]
- env.Append(MAJOR=str(MAJOR))
-@@ -183,7 +183,7 @@ CALLOUT_OKAY = not (env.GetOption('clean') or env.GetO
-
- unknown = opts.UnknownVariables()
- if unknown:
-- print 'Warning: Used unknown variables:', ', '.join(unknown.keys())
-+ print('Warning: Used unknown variables:', ', '.join(unknown.keys()))
-
- apr = str(env['APR'])
- apu = str(env['APU'])
blob - c49cf4ab8a80e53a5a74f7500026c5eb3d117f05
file + /dev/null
--- net/serf/patches/patch-build_check_py
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: build/check.py
build/check.py.orig
-+++ build/check.py
-@@ -52,16 +52,16 @@ if __name__ == '__main__':
-
- # Find test responses and run them one by one
- for case in glob.glob(testdir + "/testcases/*.response"):
--print "== Testing %s ==" % (case)
-+print("== Testing %s ==" % (case))
- try:
- subprocess.check_call([SERF_RESPONSE_EXE, case])
--except subprocess.CalledProcessError:
-- print "ERROR: test case %s failed" % (case)
-+except subprocess.CalledProcessError as x:
-+ print("ERROR: test failed in '%s', exit code=%d" % (x.cmd,
x.returncode))
- sys.exit(1)
-
-- print "== Running the unit tests =="
-+ print("== Running the unit tests ==")
- try:
- subprocess.check_call(TEST_ALL_EXE)
-- except subprocess.CalledProcessError:
--print "ERROR: test(s) failed in test_all"
-+ except subprocess.CalledProcessError as x:
-+print("ERROR: test(s) failed in '%s', exit code=%d" % (x.cmd,
x.returncode))
- sys.exit(1)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/05/01 07:33:04 Modified files: devel/got : Makefile Added files: devel/got/patches: patch-gotd_gotd_c Log message: Pull in a gotd segfault fix committed upstream by Mark Jamsek. gotd: return early after disconnect on auth event error This fixes a segv reported by Mikhail.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/04/29 06:30:07 Modified files: devel/got : Makefile distinfo Log message: update to got 0.88 - tog: always use alternate charset for vertical/horizontal line - several tog regression test suite improvements - run the tog tests as part of the default regress set - tog: resize log view if toggling fullscreen from child view - when finding changed paths iterate tree entries in on-disk order for speed - cache fulltext data in delta cache to improve speed with long delta chains - gotwebd: fix logic error in gotweb_render_index
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/04/20 08:51:46 Modified files: devel/git : Makefile devel/git/pkg : PLIST-main Log message: make devel/git,-main depend on gitwrapper provided by devel/got gitwrapper resolves path namespace conflicts when both gotd and git are installed. The commands git-upload-pack and git-receive-pack are redirected either to stock Git tooling in /usr/local/libexec/git/ or to gotsh(1) if the repository is listed in /etc/gotd.conf. ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/04/20 08:51:10 Modified files: devel/got : Makefile distinfo Added files: devel/got/pkg : DESCR-gitwrapper PLIST-gitwrapper Log message: update to got-0.87 see git repository history for per-change authorship information - add gitwrapper(1) - tog: resume blame and diff search from the first line - fix crash in got log due to NULL-deref in got_object_blob_close - add support for protecting references against 'got send -f' to gotd - fix spurious empty packfile error from gotd when rewinding a branch - tog: implement automated test harness - update the base commit ID of unmodified files if the blob ID matches - fix rebase/histedit -a leaving some files on the temporary branch - make 'got revert' and 'got rm' work on non-existent directories - got: flush stdout before printing the error in main() - when aborting rebase/histedit/merge, unlink files added by merged changes - fix 'got commit' using a bad parent commit ID when worktree is out-of-date - allow no-op merge commits to be created - fix sending merge commits - show how to fetch a pull request in got.1 pull request example section ok sthen@
Re: update: devel/got + gitwrapper run-dep for devel/git
On Thu, Apr 20, 2023 at 02:25:35PM +0200, Landry Breuil wrote:
> yes it is but for complicated cases "make update" cant work iirc. You
> need to update both packages (gitwrapper and git) altogether for it to
> work.
>
> have you tried pointing pkg_add -u at /usr/ports/packages/amd64/all via
> TRUSTED_PKG_PATH (dont remember the exact magic)
sthen@ helped me solve the remaining issue. The fix is to use
@conflict git-<2.40.0p0 instead of @conflict git-<=2.40.0 (which
seems to match any pX revision marker).
This version upgrades fine: git-2.40.0->git-2.40.0p0+gitwrapper-0.87: ok
Quick test, without having gotd running:
$ git init foo.git
Initialized empty Git repository in /tmp/foo.git/.git/
$ git clone ssh://localhost//tmp/foo.git foo2
Cloning into 'foo2'...
warning: You appear to have cloned an empty repository.
$ cat /etc/gotd.conf
user stsp
repository "test" {
path "/tmp/test.git"
permit rw stsp
}
$ gotadmin init /tmp/test.git
gotadmin: directory exists and is not empty
$ git clone ssh://localhost/test test1
Cloning into 'test1'...
git-upload-pack: connect: /var/run/gotd.sock: Connection refused
fatal: Could not read from remote repository.
Please make sure you have the correct access rights
and the repository exists.
$
Second clone fails as expected since gotd is not running. The point is
that gitwrapper (started as git-upload-pack) ends up launching gotsh(1) for
/tmp/test.git. Whereas the real git-upload-pack, which is still present in
the directory /usr/local/libexec/git/, was launched for /tmp/foo.git.
ok?
diff /usr/ports
commit - 6e3c62131849d4c5d8f47e7e4e2d5d95fb0a263f
path + /usr/ports
blob - ddabef359f8634fd9bbf1bb3b9ca610794cad214
file + devel/git/Makefile
--- devel/git/Makefile
+++ devel/git/Makefile
@@ -3,6 +3,7 @@ DISTNAME = git-${V}
COMMENT-x11 = graphical tools
V =2.40.0
+REVISION = 0
DISTNAME = git-${V}
CATEGORIES = devel
@@ -41,8 +42,10 @@ RUN_DEPENDS-main = devel/cvsps \
RUN_DEPENDS-main = devel/cvsps \
+ devel/got,-gitwrapper \
devel/p5-Error \
mail/p5-Mail-Tools
+
LIB_DEPENDS-main = devel/gettext,-runtime \
net/curl
@@ -137,5 +140,7 @@ post-install:
perl -pi -e "s|${WRKINST}||g" ${PREFIX}/share/gitweb/gitweb.cgi
${INSTALL_DATA} ${WRKBUILD}/gitweb/README ${PREFIX}/share/gitweb
${MODTCL_WISH_ADJ} ${PREFIX}/libexec/git/git-gui--askpass
+ rm ${PREFIX}/bin/git-receive-pack # handled by gitwrapper
+ rm ${PREFIX}/bin/git-upload-pack# handled by gitwrapper
.include
blob - ae0a7f1539223a157f78d388e6c358f9f4c8107b
file + devel/git/pkg/PLIST-main
--- devel/git/pkg/PLIST-main
+++ devel/git/pkg/PLIST-main
@@ -5,10 +5,8 @@ bin/git-cvsserver
@rcscript ${RCDIR}/gitdaemon
@bin bin/git
bin/git-cvsserver
-@bin bin/git-receive-pack
@shell bin/git-shell
@bin bin/git-upload-archive
-@bin bin/git-upload-pack
@bin bin/scalar
@static-lib lib/libgit.a
${P5SITE}/Git/
blob - 84f229d487bb8f3fbf6d1b3a1f04693f75daaa3b
file + devel/got/Makefile
--- devel/got/Makefile
+++ devel/got/Makefile
@@ -1,11 +1,13 @@
COMMENT-main = game of trees version control system
COMMENT-server = game of trees repository server
COMMENT-webd = game of trees repository fast-cgi server
+COMMENT-gitwrapper = invoke an appropriate Git repository server
-V =0.86
+V =0.87
DISTNAME = got-${V}
PKGNAME-server = gotd-${V}
PKGNAME-webd = gotwebd-${V}
+PKGNAME-gitwrapper = gitwrapper-${V}
CATEGORIES = devel
HOMEPAGE = https://gameoftrees.org
MAINTAINER = Stefan Sperling
@@ -13,12 +15,15 @@ MULTI_PACKAGES =-main -server -webd
# ISC
PERMIT_PACKAGE = Yes
-MULTI_PACKAGES = -main -server -webd
+RUN_DEPENDS-server = devel/got,-gitwrapper
+MULTI_PACKAGES = -main -server -webd -gitwrapper
+
# uses pledge()
WANTLIB-main = c curses m panel pthread util z
WANTLIB-server = c event m util z
WANTLIB-webd = c event m util z
+WANTLIB-gitwrapper = c
MAKE_FLAGS = CC="${CC}"
ALL_TARGET = all server webd
@@ -38,4 +43,8 @@ FAKE_FLAGS = MANDIR=${PREFIX}/man/man CHROOT_DIR=${VA
TEST_TARGET = regress
FAKE_FLAGS = MANDIR=${PREFIX}/man/man CHROOT_DIR=${VARBASE}/www
+post-install:
+ @ln -s gitwrapper ${PREFIX}/bin/git-upload-pack
+ @ln -s gitwrapper ${PREFIX}/bin/git-receive-pack
+
.include
blob - e5e69b24f97535a28a03dea6989f19bd9fdd61f6
file + devel/got/distinfo
--- devel/got/distinfo
+++ devel/got/distinfo
@@ -1,2 +1,2 @@
-SHA256 (got-0.86.tar.gz) = JHOjr8U1bRmZ74/qf/P3PqZJGUYq34cQVCSw+jurh+w=
-SIZE (got-0.86.tar.gz) = 806708
+SHA256 (got-0.87.tar.gz) = dPi14M4RWMh3Yo4NlaQrjhzh/gr8L8AZEbpOpHGXhgU=
+SIZE (got
Re: update: devel/got + gitwrapper run-dep for devel/git
On Thu, Apr 20, 2023 at 07:14:39AM +0200, Landry Breuil wrote:
> Le Wed, Apr 19, 2023 at 11:56:21PM +0200, Stefan Sperling a écrit :
> > A new release of got introduces gitwrapper which makes it much
> > easier to run gotd side-by-side with regular Git binaries.
> > Essentially, clients fetching repositories over ssh will be talking to
> > gotd if the repository is listed in /etc/gotd.conf. Otherwise they
> > will be talking to regular Git. (Unless the user account has gotsh
> > set as login shell, which will always talk to gotd.)
> >
> > For this to work, gitwrapper must replace two specific binaries in
> > the git package with symlinks to itself. I am trying to make this
> > work seemlessly during upgrades from got-0.86 and git-2.40.0.
> >
> > When I install the git package from the ports tree with:
> > make install SUDO=doas
> > this does not install the gitwrapper package from devel/got and the
> > files end up missing from disk. Can anyone tell what am I doing wrong?
> > I would hope the RUN_DEPENDS I've added would take care of this?
>
> I think the RDEP should be devel/got,-gitwrapper to install the
> -gitwrapper subpackage, devel/got,gitwrapper asks for the gitwrapper
> FLAVOR of the got port (which doesnt exist)
Ah, thanks! I missed that difference.
And I need to add gitwrapper to RUN_DEPENDS-main instead of RUN_DEPENDS.
I am now adding gitwrapper as a run-dep for gotd as well.
This gets me further but 'make install' and 'make upgrade' fail,
even though gitwrapper is built as a package locally.
Is this supposed to work?
$ pwd
/usr/ports/devel/git
$ make install SUDO=doas
===> git-2.40.0p0 depends on: gitwrapper-* - not found
===> Verifying install for gitwrapper-* in devel/got
===> Cleaning for gitwrapper-0.87
===> gitwrapper-0.87 depends on: dwz-* -> dwz-0.14
===> Verifying specs: c
===> found c.97.0
===> Installing gitwrapper-0.87 from /usr/ports/packages/amd64/all/
Can't install gitwrapper-0.87 because of conflicts (git-2.40.0)
--- gitwrapper-0.87 ---
Can't install gitwrapper-0.87: conflicts
Couldn't install gitwrapper-0.87
*** Error 1 in /usr/ports/devel/got
(/usr/ports/infrastructure/mk/bsd.port.mk:2157
'/var/db/pkg/gitwrapper-0.87/+CONTENTS': @/usr/bin/env -i...)
*** Error 2 in /usr/ports/devel/got
(/usr/ports/infrastructure/mk/bsd.port.mk:2600 'install': @lock=got-0.87;
export _LOCKS_HELD=" git-2.40...)
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2282
'/usr/ports/pobj/git-2.40.0/.dep-devel-got,-gitwrapper': @unset _DEPENDS_TAR...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2155
'/var/db/pkg/git-2.40.0p0/+CONTENTS': @cd /usr/ports/devel/git && SUBPACKAGE...)
*** Error 2 in /usr/ports/devel/git
(/usr/ports/infrastructure/mk/bsd.port.mk:2600 'install': @lock=git-2.40.0;
export _LOCKS_HELD=" git-2)
$ make update SUDO=doas
===> Updating for git-2.40.0p0
===> git-2.40.0p0 depends on: gitwrapper-* - not found
===> Verifying package for gitwrapper-* in devel/got
`/usr/ports/bulk/amd64/got-0.87' is up to date.
===> Returning to build of git-2.40.0p0
Upgrading from git-2.40.0
git-2.40.0->gitwrapper-0.87 forward dependencies:
| Dependency of thunar-vcs-0.2.0p4 on git-* doesn't match
NOT MERGING: can't find update for thunar-vcs-0.2.0p4-> (ok)
Can't install git-2.40.0->2.40.0p0: can't resolve gitwrapper-0.87
Couldn't find updates for git-2.40.0 thunar-vcs-0.2.0p4
Couldn't install git-2.40.0p0 gitwrapper-0.87
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2169
'/usr/ports/update/amd64/git-2.40.0p0': @b=$(cd /usr/ports/devel/git && SUBP...)
*** Error 2 in /usr/ports/devel/git
(/usr/ports/infrastructure/mk/bsd.port.mk:2600 'update': @lock=git-2.40.0;
export _LOCKS_HELD=" git-2.4...)
$
diff /usr/ports
commit - 6e3c62131849d4c5d8f47e7e4e2d5d95fb0a263f
path + /usr/ports
blob - ddabef359f8634fd9bbf1bb3b9ca610794cad214
file + devel/git/Makefile
--- devel/git/Makefile
+++ devel/git/Makefile
@@ -3,6 +3,7 @@ DISTNAME = git-${V}
COMMENT-x11 = graphical tools
V =2.40.0
+REVISION = 0
DISTNAME = git-${V}
CATEGORIES = devel
@@ -41,8 +42,10 @@ RUN_DEPENDS-main = devel/cvsps \
RUN_DEPENDS-main = devel/cvsps \
+ devel/got,-gitwrapper \
devel/p5-Error \
mail/p5-Mail-Tools
+
LIB_DEPENDS-main = devel/gettext,-runtime \
net/curl
@@ -137,5 +140,7 @@ post-install:
perl -pi -e "s|${WRKINST}||g" ${PREFIX}/share/gitweb/gitweb.cgi
${INSTALL_DATA} ${WRKBUILD}/gitweb/README ${PREFIX}/share/gitweb
${MODTCL_WISH_ADJ} ${PREFIX}/libexec/git/git-gui--askpass
+ rm ${PREFIX}/bin/git-receive-pack # handled by gitwrapper
+ rm ${PREFIX}/bin/git-upload-pack
update: devel/got + gitwrapper run-dep for devel/git
A new release of got introduces gitwrapper which makes it much
easier to run gotd side-by-side with regular Git binaries.
Essentially, clients fetching repositories over ssh will be talking to
gotd if the repository is listed in /etc/gotd.conf. Otherwise they
will be talking to regular Git. (Unless the user account has gotsh
set as login shell, which will always talk to gotd.)
For this to work, gitwrapper must replace two specific binaries in
the git package with symlinks to itself. I am trying to make this
work seemlessly during upgrades from got-0.86 and git-2.40.0.
When I install the git package from the ports tree with:
make install SUDO=doas
this does not install the gitwrapper package from devel/got and the
files end up missing from disk. Can anyone tell what am I doing wrong?
I would hope the RUN_DEPENDS I've added would take care of this?
diff /usr/ports
commit - 6e3c62131849d4c5d8f47e7e4e2d5d95fb0a263f
path + /usr/ports
blob - ddabef359f8634fd9bbf1bb3b9ca610794cad214
file + devel/git/Makefile
--- devel/git/Makefile
+++ devel/git/Makefile
@@ -3,6 +3,7 @@ DISTNAME = git-${V}
COMMENT-x11 = graphical tools
V =2.40.0
+REVISION = 0
DISTNAME = git-${V}
CATEGORIES = devel
@@ -33,6 +34,8 @@ MULTI_PACKAGES = -main -svn -x11
textproc/asciidoc \
textproc/xmlto
+RUN_DEPENDS = devel/got,gitwrapper
+
MULTI_PACKAGES = -main -svn -x11
WANTLIB-main = c crypto curl expat iconv intl pthread ssl z
@@ -137,5 +140,7 @@ post-install:
perl -pi -e "s|${WRKINST}||g" ${PREFIX}/share/gitweb/gitweb.cgi
${INSTALL_DATA} ${WRKBUILD}/gitweb/README ${PREFIX}/share/gitweb
${MODTCL_WISH_ADJ} ${PREFIX}/libexec/git/git-gui--askpass
+ rm ${PREFIX}/bin/git-receive-pack # handled by gitwrapper
+ rm ${PREFIX}/bin/git-upload-pack# handled by gitwrapper
.include
blob - ae0a7f1539223a157f78d388e6c358f9f4c8107b
file + devel/git/pkg/PLIST-main
--- devel/git/pkg/PLIST-main
+++ devel/git/pkg/PLIST-main
@@ -5,10 +5,8 @@ bin/git-cvsserver
@rcscript ${RCDIR}/gitdaemon
@bin bin/git
bin/git-cvsserver
-@bin bin/git-receive-pack
@shell bin/git-shell
@bin bin/git-upload-archive
-@bin bin/git-upload-pack
@bin bin/scalar
@static-lib lib/libgit.a
${P5SITE}/Git/
blob - 84f229d487bb8f3fbf6d1b3a1f04693f75daaa3b
file + devel/got/Makefile
--- devel/got/Makefile
+++ devel/got/Makefile
@@ -1,11 +1,13 @@
COMMENT-main = game of trees version control system
COMMENT-server = game of trees repository server
COMMENT-webd = game of trees repository fast-cgi server
+COMMENT-gitwrapper = invoke an appropriate Git repository server
-V =0.86
+V =0.87
DISTNAME = got-${V}
PKGNAME-server = gotd-${V}
PKGNAME-webd = gotwebd-${V}
+PKGNAME-gitwrapper = gitwrapper-${V}
CATEGORIES = devel
HOMEPAGE = https://gameoftrees.org
MAINTAINER = Stefan Sperling
@@ -13,12 +15,13 @@ MULTI_PACKAGES =-main -server -webd
# ISC
PERMIT_PACKAGE = Yes
-MULTI_PACKAGES = -main -server -webd
+MULTI_PACKAGES = -main -server -webd -gitwrapper
# uses pledge()
WANTLIB-main = c curses m panel pthread util z
WANTLIB-server = c event m util z
WANTLIB-webd = c event m util z
+WANTLIB-gitwrapper = c
MAKE_FLAGS = CC="${CC}"
ALL_TARGET = all server webd
@@ -38,4 +41,8 @@ FAKE_FLAGS = MANDIR=${PREFIX}/man/man CHROOT_DIR=${VA
TEST_TARGET = regress
FAKE_FLAGS = MANDIR=${PREFIX}/man/man CHROOT_DIR=${VARBASE}/www
+post-install:
+ @ln -s gitwrapper ${PREFIX}/bin/git-upload-pack
+ @ln -s gitwrapper ${PREFIX}/bin/git-receive-pack
+
.include
blob - e5e69b24f97535a28a03dea6989f19bd9fdd61f6
file + devel/got/distinfo
--- devel/got/distinfo
+++ devel/got/distinfo
@@ -1,2 +1,2 @@
-SHA256 (got-0.86.tar.gz) = JHOjr8U1bRmZ74/qf/P3PqZJGUYq34cQVCSw+jurh+w=
-SIZE (got-0.86.tar.gz) = 806708
+SHA256 (got-0.87.tar.gz) = dPi14M4RWMh3Yo4NlaQrjhzh/gr8L8AZEbpOpHGXhgU=
+SIZE (got-0.87.tar.gz) = 822791
blob - /dev/null
file + devel/got/pkg/DESCR-gitwrapper (mode 644)
--- /dev/null
+++ devel/got/pkg/DESCR-gitwrapper
@@ -0,0 +1,8 @@
+The gitwrapper program is designed to replace git-upload-pack(1) and
+git-receive-pack(1) and to invoke an appropriate Git server based on
+configuration information placed in gotd.conf(5). This permits the
+administrator to configure which Git server is to be invoked on the
+system at run-time. Git repositories which are listed in gotd.conf(5)
+and exist on the filesystem will be served by gotsh(1). Any other Git
+repositories will be served by git-upload-pack(1) and
+git-receive-pack(1).
blob - /dev/null
file + devel/got/pkg/PLIST-gitwrapper (mode 644)
--- /dev/null
+++ devel/got/pkg/PLIST-gitwrapper
@@ -0,0 +1,5 @@
+@conflict git-<=2.40.0
+bi
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/03/14 08:22:56 Modified files: games/zelda3 : Makefile distinfo games/zelda3-data: Makefile distinfo Removed files: games/zelda3/patches: patch-types_h Log message: update games/zelda3 to new upstream tag "0.2-beta" Compared to our previous snapshot this fixes known gameplay glitches and bugs.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/03/12 09:09:38 Modified files: devel/got : Makefile distinfo Log message: update to got 0.86 see git repository history for per-change authorship information - fix race condition on NFS where log-message file's modify time may change - fix gotd sending too large pack files in some cases - support histedit fold operations which delete a file and then add it again - make diffing files which changed into dirs and vice-versa possible - handle files changing into directories during 'got update' - add quoting to repository path sent to server for git-shell compatibility - gotwebd: handle short reads and timeouts - gotwebd: provide gotweb_render_page() entrypoint for all pages - gotwebd: reply with non-200 HTTP status code on error
update: games/zelda3 from snapshot to 0.2-beta
Two days ago the snesrev project tagged a new release of zelda3, fixing
several gameplay glitches and crashes. This diff updates our port.
Quick playtesting suggests that this version is working fine Given the
nature of the changes made upstream it is unlikely that this update would
introduce any major problems.
Our build fix has been merged so a local patch can be dropped.
Upstream calls this "0.2-beta" and I have followed their naming.
ok?
diff /usr/ports
commit - 4783614d8e624d89a1b6f60755ca79ea91c630fe
path + /usr/ports
blob - 46f7e5df7b0132900a3b9bc921e6cb0d50dd7c0f
file + games/zelda3/Makefile
--- games/zelda3/Makefile
+++ games/zelda3/Makefile
@@ -1,11 +1,11 @@
COMMENT = reimplementation of Zelda - A Link to the Past
-DISTNAME = zelda3-0.1pre20221101
+V =0.2-beta
+PKGNAME = zelda3-${V:S/-//g}
-# use a commit hash, for now; the latest tag (v0.1-beta) is quite outdated
GH_ACCOUNT = snesrev
GH_PROJECT = zelda3
-GH_COMMIT =91d771ecc4532e4e40995b133edd9d82a39d61ac
+GH_TAGNAME = v${V}
CATEGORIES = games
blob - 8aad0c00a804349edb6222698a454cbbf2d149e5
file + games/zelda3/distinfo
--- games/zelda3/distinfo
+++ games/zelda3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zelda3-0.1pre20221101-91d771ec.tar.gz) =
nQ8+nFZQ+PW9nAzYSRuXVVOp+fewoYsbt37ympzqcwc=
-SIZE (zelda3-0.1pre20221101-91d771ec.tar.gz) = 3907372
+SHA256 (zelda3-0.2-beta.tar.gz) = igF8TPOKc4vFi7xBAcko6Y9TcFY4GXEn2+rcFujOWuw=
+SIZE (zelda3-0.2-beta.tar.gz) = 3908488
blob - 7e8835702bf3496cb17ad0a038d86d8cf561a83b
file + /dev/null
--- games/zelda3/patches/patch-types_h
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: types.h
types.h.orig
-+++ types.h
-@@ -63,7 +63,9 @@ static FORCEINLINE uint UintMax(uint a, uint b) { retu
- #define DWORD(x) (*(uint32*)&(x))
- #define XY(x, y) ((y)*64+(x))
-
-+#ifndef swap16
- static inline uint16 swap16(uint16 v) { return (v << 8) | (v >> 8); }
-+#endif
-
- typedef struct Point16U {
- uint16 x, y;
blob - 9afb2bbcfafdfa3f2cbcecbafbb6ef7458f94fab
file + games/zelda3-data/Makefile
--- games/zelda3-data/Makefile
+++ games/zelda3-data/Makefile
@@ -1,13 +1,11 @@
COMMENT = game data files for zelda3
-DISTNAME = zelda3-0.1pre20221101
-PKGNAME = zelda3-data-0.1pre20221101
-REVISION = 0
+V =0.2-beta
+PKGNAME = zelda3-data-${V:S/-//g}
-# use a commit hash, for now; the latest tag (v0.1-beta) is quite outdated
GH_ACCOUNT = snesrev
GH_PROJECT = zelda3
-GH_COMMIT =91d771ecc4532e4e40995b133edd9d82a39d61ac
+GH_TAGNAME = v${V}
CATEGORIES = games
blob - 8aad0c00a804349edb6222698a454cbbf2d149e5
file + games/zelda3-data/distinfo
--- games/zelda3-data/distinfo
+++ games/zelda3-data/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zelda3-0.1pre20221101-91d771ec.tar.gz) =
nQ8+nFZQ+PW9nAzYSRuXVVOp+fewoYsbt37ympzqcwc=
-SIZE (zelda3-0.1pre20221101-91d771ec.tar.gz) = 3907372
+SHA256 (zelda3-0.2-beta.tar.gz) = igF8TPOKc4vFi7xBAcko6Y9TcFY4GXEn2+rcFujOWuw=
+SIZE (zelda3-0.2-beta.tar.gz) = 3908488
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/03/08 15:20:25 Modified files: sysutils/firmware/iwm: Makefile distinfo sysutils/firmware/iwx: Makefile distinfo Log message: Update firmware for iwm(4) 9k and all iwx(4) devices to new images published in the iwlwifi linux-firmware Git repository on March 6. The -67 iwx images we were using are no longer part of the latest iwlwifi linux-firmware snapshots. Keep them for now by fetching the distfile we have been using separately and extracing the old images from it. with help from and ok kn@ sthen@ Tested: 9260: stsp 9560: gnezdo ax200: stsp ax201: stsp ax210: ian, stsp
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/03/07 11:57:25 Modified files: devel/got : Makefile distinfo Log message: update to got 0.85 see git repository history for per-change authorship information - gotwebd: add missing colon in diff view (patch by Josiah Frentsos) - more preparation for eventual sha256 object ID support - add test coverage for more tree conflict cases during merges - fall back to vi(1) instead of ed(1) if neither EDITOR nor VISUAL are set - in got.1, clarify what users are expected to do during 'histedit -e' - gotd requires a config file; don't fail silently when it cannot be read - regress: replace unportable ln -h option with rm && ln - regress: make cmdline tests POSIX /bin/sh compatible - gotd: remove more (all?) double process names in log - don't pass -d to yacc during the build (patch by Josiah Frentsos) - regress: override locale settings to force the "C" locale - regress: replace "sed -i" with ed(1) for portable in-place editing - fix gotd sometimes reading reused deltas from wrong pack file
iwm/iwx firmware updates
There are new intel wifi firmware files from yesterday(!) which we
might want to sneak into the 7.3 release, provided we can still get
sufficient testing beforehand. I don't know if these contain security
fixes but perhaps an announcement is still pending, given how recently
these updates were committed?
There is an issue with the new iwx tag in the linux-firmware repository.
It lacks the -64 images we've been using. Is there a trivial way to pick
those files from the previous tag where they still existed, 2023-01-04?
I would rather not lose the old images yet in order to help people who
might be bisecting kernel problems back across my recent -77 firmware
support commits to iwx. Hints welcome, or please fix my diff if you have
the time and know-how.
These tempfile diffs show binaries that have changed, disregarding the
lack of iwx -64 images.
All iwm 9k devices have an update:
--- /tmp/old Tue Mar 7 12:10:17 2023
+++ /tmp/new Tue Mar 7 12:10:05 2023
@@ -5,6 +5,6 @@
SHA1 (iwm-7265D-29) = 8e74fddc4c0bfb943a935be8ef4c8bd46a3447fd
SHA1 (iwm-8000C-36) = a6a01d48822dac433f8fcddf0eaa43fb9c45314f
SHA1 (iwm-8265-36) = ed24ea69d3d2d1e0c6bff066fa9cb2ac6ac0834d
-SHA1 (iwm-9000-46) = 3e023f4ff74ebbe1d9b9c3bcb6cb00324637ef2b
-SHA1 (iwm-9260-46) = 6eb280ce1e3fe041071725f01d126de1e118f5ad
+SHA1 (iwm-9000-46) = 0f23887baf0b92060088dcb1192cbcf6b77b85df
+SHA1 (iwm-9260-46) = 73f5087e9357525020977b32f355b62d576a31c4
SHA1 (iwm-license) = c741b86b49cc3527ec3cdf413a2a18b3afb2a0be
Most iwx devices could switch to new -77 firmware and PNVM images:
--- /tmp/old Tue Mar 7 12:08:21 2023
+++ /tmp/new Tue Mar 7 12:07:46 2023
@@ -1,16 +1,16 @@
-SHA1 (iwx-Qu-b0-hr-b0-77) = a2621d55b5f4852e45e8e1f0fa4baf2aa12363c2
-SHA1 (iwx-Qu-b0-jf-b0-77) = aeac6cd6e5cf1f28341a9cc06846ff073b586313
-SHA1 (iwx-Qu-c0-hr-b0-77) = 0c40ab5ffc0b96eb02b37fe739cf22dabc9e57be
-SHA1 (iwx-Qu-c0-jf-b0-77) = 00811531339c23cc8143f90fc9a0f747c2bb86cf
-SHA1 (iwx-QuZ-a0-hr-b0-77) = 1e6bf64f3a0d62c48835f54ef2ed12cc619fdc36
+SHA1 (iwx-Qu-b0-hr-b0-77) = 2cbfa492c5b09107aae2fdeb8c6777e1f397090d
+SHA1 (iwx-Qu-b0-jf-b0-77) = 1c3938cd85d552646faffe65bc3ee284bb776302
+SHA1 (iwx-Qu-c0-hr-b0-77) = 56a55a7b4edd3d51cde42a3e6da81bb98f41527c
+SHA1 (iwx-Qu-c0-jf-b0-77) = 366b61d2f15167d9b74a91604a659a908a730bcd
+SHA1 (iwx-QuZ-a0-hr-b0-77) = 1fd35887574b32b6b75e4e2734ad57988e22cf5b
SHA1 (iwx-QuZ-a0-jf-b0-77) = 760f97370afd804879db0f4ee1c17b44a73cf6df
-SHA1 (iwx-cc-a0-77) = 63b11c1dee09740ba1f96fae7e12dab91b837736
+SHA1 (iwx-cc-a0-77) = cf8e3a255ea7a072afb51336bccb0cf12a3620bb
SHA1 (iwx-license) = c741b86b49cc3527ec3cdf413a2a18b3afb2a0be
SHA1 (iwx-so-a0-gf-a0-77) = 55eea4749a5d4105f3e6d441033f8065b1417c0f
-SHA1 (iwx-so-a0-gf-a0.pnvm) = aaeea779feed02bffa5699bdcd6a9ecb489617c5
+SHA1 (iwx-so-a0-gf-a0.pnvm) = 35bd8e33b88ad124843755bc955c5da1fc6b51bf
SHA1 (iwx-so-a0-gf4-a0-77) = 9873880ee388d0fbe7961da511fc939bee3c38b8
-SHA1 (iwx-so-a0-gf4-a0.pnvm) = 83f5d8e17e8a0e321b8c8f0f9a94eb0d45c9ff21
+SHA1 (iwx-so-a0-gf4-a0.pnvm) = e646bef68e30d5c30b4da6c376eebb5f438019c5
SHA1 (iwx-so-a0-hr-b0-77) = 750995f17eb1eec3ebfb00ab7436f7115493fb2d
SHA1 (iwx-so-a0-jf-b0-77) = 80f4520e8913c76919e24c9c7a5b8926b6220a5b
SHA1 (iwx-ty-a0-gf-a0-77) = 7436da8659a26f4790831a67b38d6e597fa36098
-SHA1 (iwx-ty-a0-gf-a0.pnvm) = 0d4d14e051d33aa2f81900fb466ac8a60a02c306
+SHA1 (iwx-ty-a0-gf-a0.pnvm) = a2025b414354516fce7ad87ec4bb1e096b6a88e7
diff /usr/ports
commit - 4783614d8e624d89a1b6f60755ca79ea91c630fe
path + /usr/ports
blob - 9c35ce942d2c41b3e60feec8ed3905cb2b9b8f6c
file + sysutils/firmware/iwm/Makefile
--- sysutils/firmware/iwm/Makefile
+++ sysutils/firmware/iwm/Makefile
@@ -1,4 +1,4 @@
-V= 2022-11-08
+V= 2023-03-06
FW_DRIVER= iwm
FW_VER=${V:S/-//g}
DISTNAME= linux-firmware-iwlwifi-fw-$V
blob - 0d27405f4459c768c2e9490d1b336f4b0f72b459
file + sysutils/firmware/iwm/distinfo
--- sysutils/firmware/iwm/distinfo
+++ sysutils/firmware/iwm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (firmware/linux-firmware-iwlwifi-fw-2022-11-08.tar.gz) =
kJAhLLBr0g7/Q/Z0PiBEotjj4HBcIW7RjXmNa6lbkMA=
-SIZE (firmware/linux-firmware-iwlwifi-fw-2022-11-08.tar.gz) = 447396905
+SHA256 (firmware/linux-firmware-iwlwifi-fw-2023-03-06.tar.gz) =
kAIvfRY0VaD4iv86qyvCMHfwPzNONe3BQMSsdixCxMs=
+SIZE (firmware/linux-firmware-iwlwifi-fw-2023-03-06.tar.gz) = 424827780
blob - a2a2986cac24905f005bb01a0c97628680bf7f82
file + sysutils/firmware/iwx/Makefile
--- sysutils/firmware/iwx/Makefile
+++ sysutils/firmware/iwx/Makefile
@@ -1,4 +1,4 @@
-V= 2022-11-08
+V= 2023-03-06
FW_DRIVER= iwx
FW_VER=${V:S/-//g}
DISTNAME= linux-firmware-iwlwifi-fw-$V
@@ -12,29 +12,17 @@ FW= cc-a0 67 \
EXTRACT_FILES= ${DISTNAME}/{LICENCE.\*,iwlwifi-\*-\*.ucode,iwlwifi-*.pnvm}
-FW=cc-a0 67 \
- cc-a0 77 \
- so-a0-gf-a0 67 \
+FW=cc-a0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/02/22 15:33:32 Modified files: devel/got : Makefile distinfo Log message: update to got 0.84 too many changes to list all here; see git repository history for more; and see git repository history for per-change authorship information - add 'got histedit -d' flag to drop all commits - show worktree UUID in backout/cherrypick -l output - several changes in preparation for eventual SHA256 object ID support - make 'got rebase' work when the to-be-rebased branch has no parent commit - fix bad line-wrapping in tog ref and tree views - add horizontal scrolling support to tog ref and tree views - create .pack and .idx files with filemode 0444, like Git does - make 'got fetch' fetch the work tree's current branch as an implicit fallback - improve 'got fetch' behaviour when work tree's branch is not on server - gotwebd: fix briefs/tags navigation overlap - drop double process name from some gotd logs - tog: fix high CPU usage issue after starting search (reported by Mikhail) - fix gotd exiting with abnormal error during client connection teardown - fix gotd segfault in libevent while disconnecting clients - tweak 'got commit' log-message validation: now checks timestamp and size > 0 - gotwebd: abort blame if the client disconnects midway through - make 'got fetch -b branch' only fetch the named branch - got/tog/gotadmin: call pledge(2) earlier where possible - no longer error out if redundant "got commit -A $GOT_AUTHOR" option is used - add 'gotadmin pack' -D flag to force generation of ref-deltas in pack files - make 'got fetch' update cached HEAD symref if it has changed in remote repo - add commit/histedit/merge/rebase -C option to commit unresolved conflicts - make 'got status' check for merge conflict markers on newly added lines only - fix read/write out of bounds in gitconfig file parser (reported by James Cook) - fix "got fetch" hanging if remote repo is out-of-date (reported by James Cook) - ignore patterns with trailing "/" now match directories (suggested by Lucas) - make 'got merge' honour author setting in gitconfig (reported by James Cook) - sync default values shown in gotwebd.conf(5) EXAMPLES section - fix parsing of indented comments in gitconfig file (reported by James Cook) - fix tog diff between arbitrary commits; regression from 0.80
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/01/30 02:21:44 Modified files: devel/got : Makefile distinfo Log message: update to got 0.83 - fix usage display error in got merge command (patch by Mikhail) - fix missing commits in pack files created with packed object enumeration - avoid traversing enumerated commits more than once in got-read-pack - fix ulimit-related test failures on sparc64 (tracey) - got commit editor now shows log messages from backout and cherrypick (jamsek) - new cherrypick/backout -l option to show recorded log messages (jamsek) - new cherrypick/backout -X option to discard recorded log messages (jamsek) - gotd: implement the delete-refs capability (op) - fix histedit -m on a commit which only changes filemode bits - gotsh.1: show how to set up anonymous public read-only repository access
Re: subversion ruby bindings and clang 15 (was: Re: amd64-clang bulk build report (llvm 15))
On Tue, Jan 24, 2023 at 07:22:24PM +0100, Jeremie Courreges-Anglas wrote:
> On Sun, Jan 08 2023, Jeremie Courreges-Anglas wrote:
>
> [...]
>
> >> https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/devel/subversion.txt
> > subversion/bindings/swig/ruby/svn_client.c:6473:17: error: incompatible
> > pointer to integer conversion passing 'apr_hash_t *' (aka 'struct
> > apr_hash_t *') to parameter of type 'VALUE' (aka 'unsigned long')
> > [-Wint-conversion]
> > if (NIL_P(arg2)) {
> > ^~~~
>
> Lots of similar failures in here. I didn't try to fix it, but an
> alternate way to handle it would be to drop the ruby bindings for the
> time being (they're not used elsewhere in the tree). Something like the
> diff below. Thoughts?
This error is in generated code. I guess this means any port that
depends on devel/swig to generate code is potentially failing with
clang 15?
Anyway, fine with me to disable SVN ruby bindings by default if it helps.
> Index: Makefile
> ===
> RCS file: /home/cvs/ports/devel/subversion/Makefile,v
> retrieving revision 1.197
> diff -u -p -r1.197 Makefile
> --- Makefile 13 Nov 2022 15:28:25 - 1.197
> +++ Makefile 15 Jan 2023 00:27:27 -
> @@ -45,7 +45,7 @@ EXTRACT_SUFX= .tar.bz2
>
> PSEUDO_FLAVORS= no_bindings no_ap2 no_perl no_python no_ruby
> no_gnome-keyring
> FLAVORS= maintainer_mode
> -FLAVOR?=
> +FLAVOR?= no_ruby
> .if ${FLAVOR:Mno_bindings}
> FLAVOR += no_perl no_python no_ruby
> .endif
> @@ -163,6 +163,8 @@ CONFIGURE_ARGS+=--without-swig
> .if ${BUILD_PACKAGES:M-ruby}
> MODULES+=lang/ruby
> CONFIGURE_ENV+= RUBY=ruby${MODRUBY_BINREV} RDOC=rdoc${MODRUBY_BINREV}
> +.else
> +CONFIGURE_ENV+= RUBY=false RDOC=false
> .endif
>
> .if ${BUILD_PACKAGES:M-ap2}
> @@ -191,9 +193,11 @@ pre-patch:
> post-patch:
> @${SUBST_CMD} ${WRKSRC}/Makefile.in \
> ${WRKSRC}/subversion/libsvn_subr/auth.c
> +.if ${BUILD_PACKAGES:M-ruby}
> mv
> ${WRKSRC}/subversion/bindings/swig/ruby/libsvn_swig_ruby{,${MODRUBY_BINREV}}
> sed -i 's/libsvn_swig_ruby/libsvn_swig_ruby${MODRUBY_BINREV}/g' \
> `fgrep -lr libsvn_swig_ruby ${WRKSRC}`
> +.endif
>
> .if ${BUILD_PACKAGES:M-python}
> TEST_DEPENDS+= ${FULLPKGNAME-python}:${BUILD_PKGPATH},-python
>
> --
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/01/23 02:50:13 Modified files: devel/got : Makefile distinfo Log message: update to got 0.82 - fix comparison in tree object parser always evaluating to false (jamsek) - add missing bounds-check in gitproto ref-line tokenizer - gotd.8 and gotwebd.8 man page improvements (patch by Josiah Frentsos) - make gotd session process accept just one flush packet at a time - sort ENVIRONMENT entries in got.1 and tog.1 (op) - only forward implicit flush packets from gotsh if they are expected - return GOT_ERR_EOF from pkt.c if a read attempt indicates EOF - treat read errors from client socket in gotsh as fatal errors - gotwebd: refactor gotweb_render_content_type/_file (op) - gotwebd: turn gotweb_get_time_str into gotweb_render_age (op) - gotwebd: don't list references per-commit in got_get_repo_commits (op) - gotwebd: avoid history traversal in briefs/commits, kill "prev" button (op) - gotd: disconnect on client EOF error to avoid stale connections (op) - gotsh: validate with parse_command before connecting (op) - add a test for ssh connections to gotsh without a repo path argument (op) - gotsh: avoid a temporary buffer for the socket path (op) - gotsh: move apply_unveil right after the first pledge (op) - fix tog refreshing the screen more often than intended (jamsek) - tog: show action report on user-toggleable event (patch by Mikhail, jamsek) - don't print empty line when exiting tog (jamsek) - got: don't leak pathlist in commit and revert commands (jamsek) - gotd: fix wrong PIDs for parent and child processes shown in logs
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/01/18 16:07:23 Modified files: devel/got : Makefile distinfo Log message: update to got 0.81 - gotd: print configuration errors without -d (op) - gotd: move nrepos check to parse_config (op) - gotd: move socket path check to parse.y and error from the main process (op) - fix an issue where multiple ref-updates are rejected by gotd - fix an issue where gotd fails to accept multiple have-lines from clients - regress: replace typeset with printf for shell portability (naddy) - fix spurious "gotsh: unexpected flush packet" error when client is up-to-date - gotd: fix "bad packfile with zero objects" error while creating branches - document the gotd -n option
Re: update: devel/got to 0.80
On Wed, Jan 18, 2023 at 11:36:31AM +, Stuart Henderson wrote: > I guess that's alright though it doesn't really tell the user what to do > - normally for packages when an update requires the user to make changes > we'd add a section to faq/current.html with some quick notes on what to > do (which then could be moved to upgrade notes for the next release). We could add a short paragraph to current.html suggesting a switch to gotwebd. All relevant information about setting things up is available in man pages installed by the gotwebd package. > I'd still prefer not to leave the old no-longer-updatable binaries lying > around though - especially in this case as they're in /var/www. Outright removing them would immediately break the website served by gotweb during pkg_add -u, which could be a bit awkward and unexpected.
Re: update: devel/got to 0.80
On Tue, Jan 17, 2023 at 11:40:24PM +, Stuart Henderson wrote: > I think the @pkgpath is needed for the quirks rename to work. Test with > pkg_add -u with PKG_PATH pointed at a dir with the packages to be sure. (If > it's not meant to be a replacement then the quirks rename isn't wanted > either) It should be possible to install gotweb and gotwebd side-by-side and access each using different URL locations served from the same instance of httpd. All we want is show a hint that gotweb is now obsolete and gotwebd should be installed and configured instead. If someone is still using gotweb now they didn't get the message months ago when we made gotwebd avaiable in packages and asked people to switch over and report any issues. Installing gotwebd automatically when gotweb gets deleted doesn't really help. The admin must also create a gotwebd.conf file and adjust httpd.conf. Given this, I hope I've done the right thing in quirks?
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/01/17 09:01:28 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: Add a quirks entry to handle gotweb removal. ok kn@ op@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/01/17 08:59:42 Modified files: devel/got : Makefile distinfo devel/got/pkg : gotwebd.rc Added files: devel/got/pkg : DESCR-server PLIST-server gotd.rc Removed files: devel/got/pkg : DESCR-web PLIST-web Log message: update to got 0.80 There are some port-specific changes: - gotd is now packaged for wider testing - gotweb has been removed and is superseded by gotwebd - set rc_reload=NO in gotwebd.rc - fix wantlib See https://gameoftrees.org/releases/CHANGES for lots of changelog. ok kn@ op@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/01/17 08:52:14 Modified files: infrastructure/db: user.list Log message: reserve a UID/GID for _gotd helpful hints from landry, tweak + ok kn
Re: update: devel/got to 0.80
On Tue, Jan 17, 2023 at 02:36:53PM +0100, Stefan Sperling wrote:
> This update requires significant packaging changes. I would like
> to get feedback before commit, in case I made a mistake somewhere.
>
> Changes specific to the devel/got port:
> - gotd is ready for wider testing and can be packaged
> - gotweb has been replaced by gotwebd; adjust devel/quirks accordingly
> - gotwebd.rc: reload on SIGHUP is not actually supported, set reload=NO
> - fix wantlib (missing libevent and libm)
>
> Full changelog and diff for the port follow:
In the previous version of this diff I forgot to allocate a UID/GID
for the _gotd user. Fixed here (Thanks Landry for the hints).
diff /usr/ports
commit - 6802ac417459dc67578bf97fc6c33b1d861c5817
path + /usr/ports
blob - 7053c69213780c2ffa77fc1e066f63991082f3f0
file + devel/got/Makefile
--- devel/got/Makefile
+++ devel/got/Makefile
@@ -1,10 +1,10 @@
COMMENT-main = game of trees version control system
-COMMENT-web = game of trees repository cgi script
+COMMENT-server = game of trees repository server
COMMENT-webd = game of trees repository fast-cgi server
-V =0.79
+V =0.80
DISTNAME = got-${V}
-PKGNAME-web = gotweb-${V}
+PKGNAME-server = gotd-${V}
PKGNAME-webd = gotwebd-${V}
CATEGORIES = devel
HOMEPAGE = https://gameoftrees.org
@@ -13,30 +13,27 @@ MULTI_PACKAGES =-main -web -webd
# ISC
PERMIT_PACKAGE = Yes
-MULTI_PACKAGES = -main -web -webd
+MULTI_PACKAGES = -main -server -webd
# uses pledge()
WANTLIB-main = c curses m panel pthread util z
-WANTLIB-web = c util z
-WANTLIB-webd = c util z
+WANTLIB-server = c event m util z
+WANTLIB-webd = c event m util z
MAKE_FLAGS = CC="${CC}"
-ALL_TARGET = all web webd
-INSTALL_TARGET = install web-install webd-install
+ALL_TARGET = all server webd
+INSTALL_TARGET = install server-install webd-install
MASTER_SITES = https://gameoftrees.org/releases/
DEBUG_PACKAGES = ${BUILD_PACKAGES}
-BUILD_DEPENDS =www/kcgi>=0.12.0
-
# some tests will fail without working non-interactive 'ssh 127.0.0.1'
TEST_IS_INTERACTIVE = Yes
TEST_ENV = $${SSH_AUTH_SOCK:+SSH_AUTH_SOCK="$$SSH_AUTH_SOCK"}
TEST_DEPENDS = devel/git \
${PKGPATH}=${V}
-PREFIX-web = ${VARBASE}/www
PREFIX-webd = ${VARBASE}/www
TEST_TARGET = regress
FAKE_FLAGS = MANDIR=${PREFIX}/man/man CHROOT_DIR=${VARBASE}/www
blob - 6d7d971e03d237cb2dc33964d36132631df06a31
file + devel/got/distinfo
--- devel/got/distinfo
+++ devel/got/distinfo
@@ -1,2 +1,2 @@
-SHA256 (got-0.79.tar.gz) = GuME42pJyO0Onf7q8+YQ0UI8vHR+wIqYnUK/QwROPvA=
-SIZE (got-0.79.tar.gz) = 843921
+SHA256 (got-0.80.tar.gz) = 6SfQ67bRDN8XDPLd56G+IFUc1ErDXPASJIJgqAkiK60=
+SIZE (got-0.80.tar.gz) = 784764
blob - /dev/null
file + devel/got/pkg/DESCR-server (mode 644)
--- /dev/null
+++ devel/got/pkg/DESCR-server
@@ -0,0 +1,8 @@
+gotd(8) is the Game of Trees Git repository server.
+
+gotd(8) makes Git repositories reachable over the network via ssh(1).
+The plaintext git:// and HTTP/HTTPS protocols are intentionally not
+supported.
+
+Documentation is provided in manual pages installed by this package:
+gotsh(1), gotd.conf(5), gotd(8), gotctl(8)
blob - 83e00c07fd57bb571d46cebe7bda981dd5157413
file + /dev/null
--- devel/got/pkg/DESCR-web
+++ /dev/null
@@ -1,2 +0,0 @@
-Game of Trees Web (Gotweb) is a CGI program which displays repository data
-and is designed to work with httpd(8) and slowcgi(8).
blob - /dev/null
file + devel/got/pkg/PLIST-server (mode 644)
--- /dev/null
+++ devel/got/pkg/PLIST-server
@@ -0,0 +1,10 @@
+@newgroup _gotd:501
+@newuser _gotd:501:_gotd::Game of Trees Daemon:/nonexistent:/sbin/nologin
+@rcscript ${RCDIR}/gotd
+@bin bin/gotsh
+@man man/man1/gotsh.1
+@man man/man5/gotd.conf.5
+@man man/man8/gotctl.8
+@man man/man8/gotd.8
+@bin sbin/gotctl
+@bin sbin/gotd
blob - 874cb69374a878114e04634163ef700f0ea746b9
file + /dev/null
--- devel/got/pkg/PLIST-web
+++ /dev/null
@@ -1,43 +0,0 @@
-cgi-bin/gotweb/
-@bin cgi-bin/gotweb/gotweb
-cgi-bin/gotweb/gw_tmpl/
-cgi-bin/gotweb/gw_tmpl/blame.tmpl
-cgi-bin/gotweb/gw_tmpl/briefs.tmpl
-cgi-bin/gotweb/gw_tmpl/commit.tmpl
-cgi-bin/gotweb/gw_tmpl/diff.tmpl
-cgi-bin/gotweb/gw_tmpl/err.tmpl
-cgi-bin/gotweb/gw_tmpl/index.tmpl
-cgi-bin/gotweb/gw_tmpl/summry.tmpl
-cgi-bin/gotweb/gw_tmpl/tag.tmpl
-cgi-bin/gotweb/gw_tmpl/tags.tmpl
-cgi-bin/gotweb/gw_tmpl/tree.tmpl
-cgi-bin/gotweb/libexec/
-@bin cgi-bin/gotweb/libexec/got-read-blob
-@bin cgi-bin/gotweb/libexec/got-read-commit
-@bin cgi-bin/gotweb/libexec/got-read-gitconfig
-@bin cgi-bin/gotweb/libexec/got-read-gotconfig
-@bin cgi-bin/gotweb/libexec/got-read-object
-@bin cgi-bin/gotweb/libexec/got-read-pack
-@bin cgi-bin/gotweb/
Re: update: devel/got to 0.80
On Tue, Jan 17, 2023 at 03:02:51PM +0100, Omar Polo wrote: > this seems a bit weak, but at the moment I don't think we can do > better: > > % pgrep -lf gotd > 46576 gotd: listen > 4424 gotd: parent > > (actually don't know if it's really 'weak', usually pexp matches the > full path to the executable, this pexp allow for any user on the > machine to run a process matching it.) Not with the binary installed from the package. You need to be root to start gotd, unless you have modified the source code to allow otherwise. I agree that it might be better to show the absolute path in argv/pgrep. However, /etc/rc.d/sshd also uses a non-abspath pexp so I doubt this problem is specific to this port.
update: devel/got to 0.80
This update requires significant packaging changes. I would like
to get feedback before commit, in case I made a mistake somewhere.
Changes specific to the devel/got port:
- gotd is ready for wider testing and can be packaged
- gotweb has been replaced by gotwebd; adjust devel/quirks accordingly
- gotwebd.rc: reload on SIGHUP is not actually supported, set reload=NO
- fix wantlib (missing libevent and libm)
Full changelog and diff for the port follow:
* got 0.80; 2023-01-17
too many changes to list all here; see git repository history for more
- implement per-repository read/write authorization rules in gotd
- add a gotd "listen" process which watches the unix socket
- add a gotd "session" process, split off from the parent process
- switch gotd from chroot(2) to unveil(2)
- run gotd authentication in a separate child process
- enforce a per-uid connection limit in the gotd listen process
- introduce connection options to gotd.conf
- gotd: allow to express timeouts using minutes/hours (op)
- switch gotd.conf syntax from 'unix_socket' to 'listen on'
- remove the gotsh group requirement from gotd; any user can now connect
- expose 'gotctl info' output only to the root user
- remove support for showing client capabilities in 'gotctl info'
- farewell, gotweb. you served us well. rm gotweb (tracey)
- lots of gotwebd refactoring (op)
- gotwebd: use a templating system to render HTML (op)
- gotwebd: add an RSS feed for the tags
- gotwebd: remove erratic horizontal scrolling (op)
- gotwebd.conf: use `listen on socket' syntax for UNIX sockets too (op)
- gotwebd: render BLOB inline, add BLOBRAW for serving raw blobs (op)
- gotwebd: css: fix horizontal overflow in blob and blame pages (op)
- gotwebd: urlencode also the double quote character (op)
- gotwebd: make commit page more like `got log' / tog (op)
- cope with deleted references when reloading the tog log view
- tog: fix typo that breaks log search when in hsplit (jamsek)
- tog: always echo input prompt to bottom left of screen (jamsek)
- make 'tog log' display the committer handle by default, '@' switches to author
- tog: add mutt-like =/* keymaps as home/end aliases (patch by Mikhail)
- implement diffstat display for got log, got diff, and tog diff (jamsek)
- show from: and via: headers on consecutive lines in 'got log' and 'tog log'
- show full URL during got clone/fetch/send (op)
- make 'got send' print errors reported by the server (op)
- fix 'got rebase' not detecting an out-of-date work tree in some cases
- reduce max amount of tags stored in object cache to avoid high memory usage
- avoid copying reused deltas to delta cache file; copy from pack file instead
- got patch: handle the removal of binary files (op)
- fix uninitialised fildes variables in libexec helpers (jamsek)
- got: minor refactor of got_pathlist_free() API (jamsek)
- fix indexing of pack files which contain ref-deltas
diff /usr/ports
commit - 6802ac417459dc67578bf97fc6c33b1d861c5817
path + /usr/ports
blob - 7053c69213780c2ffa77fc1e066f63991082f3f0
file + devel/got/Makefile
--- devel/got/Makefile
+++ devel/got/Makefile
@@ -1,10 +1,10 @@
COMMENT-main = game of trees version control system
-COMMENT-web = game of trees repository cgi script
+COMMENT-server = game of trees repository server
COMMENT-webd = game of trees repository fast-cgi server
-V =0.79
+V =0.80
DISTNAME = got-${V}
-PKGNAME-web = gotweb-${V}
+PKGNAME-server = gotd-${V}
PKGNAME-webd = gotwebd-${V}
CATEGORIES = devel
HOMEPAGE = https://gameoftrees.org
@@ -13,30 +13,27 @@ MULTI_PACKAGES =-main -web -webd
# ISC
PERMIT_PACKAGE = Yes
-MULTI_PACKAGES = -main -web -webd
+MULTI_PACKAGES = -main -server -webd
# uses pledge()
WANTLIB-main = c curses m panel pthread util z
-WANTLIB-web = c util z
-WANTLIB-webd = c util z
+WANTLIB-server = c event m util z
+WANTLIB-webd = c event m util z
MAKE_FLAGS = CC="${CC}"
-ALL_TARGET = all web webd
-INSTALL_TARGET = install web-install webd-install
+ALL_TARGET = all server webd
+INSTALL_TARGET = install server-install webd-install
MASTER_SITES = https://gameoftrees.org/releases/
DEBUG_PACKAGES = ${BUILD_PACKAGES}
-BUILD_DEPENDS =www/kcgi>=0.12.0
-
# some tests will fail without working non-interactive 'ssh 127.0.0.1'
TEST_IS_INTERACTIVE = Yes
TEST_ENV = $${SSH_AUTH_SOCK:+SSH_AUTH_SOCK="$$SSH_AUTH_SOCK"}
TEST_DEPENDS = devel/git \
${PKGPATH}=${V}
-PREFIX-web = ${VARBASE}/www
PREFIX-webd = ${VARBASE}/www
TEST_TARGET = regress
FAKE_FLAGS = MANDIR=${PREFIX}/man/man CHROOT_DIR=${VARBASE}/www
blob - 6d7d971e03d237cb2dc33964d36132631df06a31
file + devel/got/distinfo
--- devel/got/distinfo
+++ devel/got/distinfo
@@ -1,2 +1,2
Re: UPDATE: emulators/citra
On Sat, Jan 14, 2023 at 12:14:41PM +0100, Rafael Sadowski wrote: > It looks like 1827 fixes this issue. Stefan, could you verify this for me? > Before I tested 1827 I removed my config in .config/citra-emu I won't be able to test this until at least a week from now. So please proceed. I will check it again when possible and let you know. No point in staying on our old version if you already got some fixes. Tee new version is overall clearly much better in terms of features and compatibility.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/12/22 07:57:22 Modified files: sysutils/firmware/iwx: Makefile distinfo sysutils/firmware/iwx/pkg: PLIST Log message: Add new -77 iwx(4) firmware images and remove unused -63 images. Driver-side changes will be required for making use of the new firmware images. The existing images we currently use do not change, and no change in behaviour is expected for now. The .pnvm files do change. They are still being parsed the same way in Linux, which implies that these new files should just work. I have verified that my AX210 device is still happy with new pnvm. ok sthen@
Re: UPDATE: emulators/citra
On Wed, Dec 14, 2022 at 10:53:09AM +0100, Stefan Sperling wrote:
> On Tue, Dec 13, 2022 at 11:16:59PM +0100, Stefan Sperling wrote:
> > On Sun, Dec 04, 2022 at 05:19:01PM +0100, Rafael Sadowski wrote:
> > > Hi Thomas, Hi ports@,
> > >
> > >
> > > Update citra-nightly to 1816. This update results form the devel/catch2
> > > update and depends on it. There a some exciting port changes:
> > >
> > > - Switch to the github repository.
> > > - 1816 depends on C++20 so I add COMPILER and point to clang only.
> > > - CXXFLAGS deleted as it no longer needed
> > > - Use fmt, boost, sdl and robin-map from system
> > > - Remove {catch2,fmt,boost} before configure to ensure it is not picked
> > > up
> > > - This update needs devel/catch2>=3.2.0 (see ports@)
> > >
> > > I am not a user of citra so please test and send feedback.
> > >
> > > Rafael
> > >
> >
> > The 'citra' SDL binary seems to work fine.
> >
> > But citra-qt is broken by this update. No image is being displayed in
> > the window during emulation. citra-qt works in citra-0.0.0.729p5.
>
> In case a reproducer is useful, download this .3dsx file:
> https://archive.org/download/thc-3ds-physics-sandbox/3DSPhysicsSandbox_v0.3.7z/3ds%2Fphysicssandbox%2Fphysicssandbox.3dsx
> This game is BSD-licensed homebrew, see here for source code:
> https://github.com/pieface-/3dsphysicssandbox
>
> With citra-0.0.0.729p5 it runs well in both citra and citra-qt (use the
> mouse to move the squares on the "touchscreen" and watch them bounce).
>
> With updated citra, the graphics only show up in citra (the SDL version),
> but not in citra-qt.
Another problem:
With a game controller plugged in, this message appears over and over on
stderr of the SDL citra program, and the controller does not work.
The only way I found to get the process to quit in this state is kill -9.
[ 62.956917] Input
input_common/sdl/sdl_impl.cpp:InitGameController:508: opened joystick 0 as
controller
[ 62.995382] Input
input_common/sdl/sdl_impl.cpp:InitGameController:508: opened joystick 0 as
controller
[ 63.032273] Input
input_common/sdl/sdl_impl.cpp:InitGameController:508: opened joystick 0 as
controller
[ 63.069881] Input
input_common/sdl/sdl_impl.cpp:InitGameController:508: opened joystick 0 as
controller
[ 63.108039] Input
input_common/sdl/sdl_impl.cpp:InitGameController:508: opened joystick 0 as
controller
[ 63.145670] Input
input_common/sdl/sdl_impl.cpp:InitGameController:508: opened joystick 0 as
controller
[ 63.183113] Input
input_common/sdl/sdl_impl.cpp:InitGameController:508: opened joystick 0 as
controller
Controllers do work in citra-qt of citra-0.0.0.729p5. But in the SDL citra
of 0.0.0.729p5 controllers don't seem to work at all (at least after copying
over the button config generated by citra-qt from qt-config.ini to the
sdl2-config.ini file, not sure if that is expected to work).
I'll stop playig around for now.
Perhaps I will find time to look into fixing some of these issues, but it is
not very likely :-/
Re: UPDATE: emulators/citra
On Tue, Dec 13, 2022 at 11:16:59PM +0100, Stefan Sperling wrote:
> On Sun, Dec 04, 2022 at 05:19:01PM +0100, Rafael Sadowski wrote:
> > Hi Thomas, Hi ports@,
> >
> >
> > Update citra-nightly to 1816. This update results form the devel/catch2
> > update and depends on it. There a some exciting port changes:
> >
> > - Switch to the github repository.
> > - 1816 depends on C++20 so I add COMPILER and point to clang only.
> > - CXXFLAGS deleted as it no longer needed
> > - Use fmt, boost, sdl and robin-map from system
> > - Remove {catch2,fmt,boost} before configure to ensure it is not picked
> > up
> > - This update needs devel/catch2>=3.2.0 (see ports@)
> >
> > I am not a user of citra so please test and send feedback.
> >
> > Rafael
> >
>
> The 'citra' SDL binary seems to work fine.
>
> But citra-qt is broken by this update. No image is being displayed in
> the window during emulation. citra-qt works in citra-0.0.0.729p5.
In case a reproducer is useful, download this .3dsx file:
https://archive.org/download/thc-3ds-physics-sandbox/3DSPhysicsSandbox_v0.3.7z/3ds%2Fphysicssandbox%2Fphysicssandbox.3dsx
This game is BSD-licensed homebrew, see here for source code:
https://github.com/pieface-/3dsphysicssandbox
With citra-0.0.0.729p5 it runs well in both citra and citra-qt (use the
mouse to move the squares on the "touchscreen" and watch them bounce).
With updated citra, the graphics only show up in citra (the SDL version),
but not in citra-qt.
Re: UPDATE: emulators/citra
On Sun, Dec 04, 2022 at 05:19:01PM +0100, Rafael Sadowski wrote:
> Hi Thomas, Hi ports@,
>
>
> Update citra-nightly to 1816. This update results form the devel/catch2
> update and depends on it. There a some exciting port changes:
>
> - Switch to the github repository.
> - 1816 depends on C++20 so I add COMPILER and point to clang only.
> - CXXFLAGS deleted as it no longer needed
> - Use fmt, boost, sdl and robin-map from system
> - Remove {catch2,fmt,boost} before configure to ensure it is not picked
> up
> - This update needs devel/catch2>=3.2.0 (see ports@)
>
> I am not a user of citra so please test and send feedback.
>
> Rafael
>
The 'citra' SDL binary seems to work fine.
But citra-qt is broken by this update. No image is being displayed in
the window during emulation. citra-qt works in citra-0.0.0.729p5.
Re: desmume, any special reqs to run it?
On Thu, Dec 08, 2022 at 06:42:51PM -0800, Nam Nguyen wrote: > Here is a diff unbreaking desmume. I am attaching it because it contains > ^M being removed from an existing patch. > > I came across this same issue with my WIP-port of flycast. It has to be > adapted for immutable userland mappings in 7.2 -current. Ohh! I would be interested in a flycast port :) > This unbreaks the emulator with my testing of Chrono Trigger. Final Fantasy III and DSLinux are working fine, too. > Feedback and tests are welcome. OK? ok stsp@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/11/22 05:52:41 Modified files: games : Makefile Log message: += zelda3-rom
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/11/22 05:48:05 Modified files: games/zelda3-data: Makefile distinfo games/zelda3-data/pkg: DESCR Log message: make zelda3-data fetch the ROM image via the new zelda3-rom port based on an initial patch by espie@ ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/11/22 05:40:59 Log message: split zelda3-data ROM file fetching into a separate zelda3-rom port based on an intial patch by espie@ ok sthen@ Status: Vendor Tag: stsp Release Tags: stsp_20221122 N ports/games/zelda3-rom/Makefile N ports/games/zelda3-rom/distinfo N ports/games/zelda3-rom/pkg/DESCR N ports/games/zelda3-rom/pkg/PLIST No conflicts created by this import
Re: games/zelda3-data ROM fetching as a separate port
ping
On Mon, Nov 14, 2022 at 01:23:19PM +0100, Stefan Sperling wrote:
> On Mon, Nov 14, 2022 at 12:40:19PM +0100, Stefan Sperling wrote:
> > espie@ suggested that the FETCH_MANUALLY distfile should be isolated
> > into a separate port. This should make things easier for bulk builders,
> > and avoids hacks around GH_DISTFILE.
> >
> > ok?
>
> Updated patch which adds a pseudo do-install target and DESCR and PLIST
> to the zelda3-rom port, to make it less weird.
> The -rom package is not installed when building zelda3-data, since -data
> depends on the :patch stage of -rom.
>
> diff refs/heads/master refs/heads/zelda3-rom
> commit - f2ea66a16674d866fb6e818ad75e4e519e7728bd
> commit + bc6407c16e7c7e7018301833f9273e4d2b65d6d7
> blob - 1a80c28c114a3c8b36b855d1596be2641044d1b9
> blob + 228e407ca8d76ee862a8d69f7e201f841a15d33e
> --- games/zelda3-data/Makefile
> +++ games/zelda3-data/Makefile
> @@ -2,9 +2,6 @@ PKGNAME = zelda3-data-0.1pre20221101
>
> DISTNAME = zelda3-0.1pre20221101
> PKGNAME =zelda3-data-0.1pre20221101
> -# GH_DISTFILE contains curly braces { } which won't work here
> -ZELDA3_DISTFILE = ${DISTNAME}-${GH_COMMIT:C/().*/\1/}${EXTRACT_SUFX}
> -DISTFILES = zelda3.sfc ${ZELDA3_DISTFILE}
>
> # use a commit hash, for now; the latest tag (v0.1-beta) is quite outdated
> GH_ACCOUNT = snesrev
> @@ -22,26 +19,18 @@ BUILD_DEPENDS = graphics/py-Pillow${MODPY_FLAVOR} \
> USE_GMAKE = Yes
>
> BUILD_DEPENDS = graphics/py-Pillow${MODPY_FLAVOR} \
> - textproc/py-yaml${MODPY_FLAVOR}
> + textproc/py-yaml${MODPY_FLAVOR} \
> + games/zelda3-rom:patch
>
> -FETCH_MANUALLY += "zelda3.sfc has sha256 checksum"
> -FETCH_MANUALLY +=
> "66871d66be19ad2c34c927d6b14cd8eb6fc3181965b6e517cb361f7316009cfb"
> -FETCH_MANUALLY += "and must be placed into ${DISTDIR}."
> -FETCH_MANUALLY += "It can be extracted from a retail SNES cartridge using"
> -FETCH_MANUALLY += "tools such as https://github.com/sanni/cartreader;
> -
> PERMIT_PACKAGE = proprietary ROM image
> PERMIT_DISTFILES = ${PERMIT_PACKAGE}
>
> -# do not attempt to extract zelda3.sfc
> -EXTRACT_CASES = *.sfc) ;;
> -
> CONFIGURE_STYLE =none
> # the game program is compiled by games/zelda3; we just build the assets
> ALL_TARGET = tables/zelda3_assets.dat
>
> pre-build:
> - ${INSTALL_DATA} ${DISTDIR}/zelda3.sfc ${WRKSRC}/tables/zelda3.sfc
> + ln -sf ${WRKDIR}/games/zelda3-rom/zelda3.sfc ${WRKSRC}/tables/zelda3.sfc
>
> do-install:
> ${INSTALL_DATA_DIR} ${PREFIX}/share/zelda3
> blob - 0e3952cc28d06092f7485a00198f9a520c61f0e4
> blob + 8aad0c00a804349edb6222698a454cbbf2d149e5
> --- games/zelda3-data/distinfo
> +++ games/zelda3-data/distinfo
> @@ -1,4 +1,2 @@
> SHA256 (zelda3-0.1pre20221101-91d771ec.tar.gz) =
> nQ8+nFZQ+PW9nAzYSRuXVVOp+fewoYsbt37ympzqcwc=
> -SHA256 (zelda3.sfc) = ZocdZr4ZrSw0ySfWsUzY62/DGBlltuUXyzYfcxYAnPs=
> SIZE (zelda3-0.1pre20221101-91d771ec.tar.gz) = 3907372
> -SIZE (zelda3.sfc) = 1048576
> blob - d923b6760bfe6054a57653e906069a58fb521827
> blob + a4dc2ea1bd7763689d3a7a5b098d943498eb45ac
> --- games/zelda3-data/pkg/DESCR
> +++ games/zelda3-data/pkg/DESCR
> @@ -1,3 +1,3 @@
> -Zelda 3 - A Link to the Past (US) ROM image.
> +Zelda 3 - A Link to the Past game assets.
>
> Copyright 1991, 1992 Nintendo.
> blob - /dev/null
> blob + 9ac39d5e085609a96ed5d8c6b0d5d849338729a2 (mode 644)
> --- /dev/null
> +++ games/zelda3-rom/Makefile
> @@ -0,0 +1,34 @@
> +COMMENT =zelda3 ROM image
> +
> +DISTNAME = zelda3-rom-0.0
> +
> +DISTFILES = zelda3.sfc
> +
> +CATEGORIES = games
> +
> +HOMEPAGE = https://www.nintendo.com
> +
> +FETCH_MANUALLY += "zelda3.sfc has sha256 checksum"
> +FETCH_MANUALLY +=
> "66871d66be19ad2c34c927d6b14cd8eb6fc3181965b6e517cb361f7316009cfb"
> +FETCH_MANUALLY += "and must be placed into ${DISTDIR}."
> +FETCH_MANUALLY += "It can be extracted from a retail SNES cartridge using"
> +FETCH_MANUALLY += "tools such as https://github.com/sanni/cartreader;
> +
> +PERMIT_PACKAGE = proprietary ROM image
> +PERMIT_DISTFILES = ${PERMIT_PACKAGE}
> +
> +EXTRACT_ONLY =
> +
> +WRKDIST = ${WRKDIR}
> +
> +NO_BUILD = Yes
> +NO_TEST = Yes
> +
> +post-extract:
> + ln -sf ${DISTDIR}/zelda3.sfc ${WRKDIR}
> +
> +do-install:
> + ${INSTALL_DATA_DIR} ${PREFIX}/share/zelda3
> + ${INSTALL_DATA} ${WRKDIR}/zelda3.sfc ${PREFIX}/share/zelda3/zelda3.sfc
> +
> +.include
> blob - /dev/null
> blob + 71f5f624d21060ef88b7f39ddc49244860a9b71a (mode 644)
> --- /
Re: [new] net/tut -- tui mastodon client
On Fri, Nov 18, 2022 at 10:33:34PM +0100, Omar Polo wrote: > Hello ports, > > I've been using this for a bit and i'm starting to really like it, I > just need to define a bright color scheme :) > > % pkg_info tut > Information for inst:tut-1.0.18 > > Comment: > TUI for Mastodon with vim inspired keys > > Description: > tut is a keyboard-driven TUI for Mastodon with vim-inspired keys. It > allows to compose new toots in your preferred $EDITOR and view media in > your preferite programs. > > Maintainer: Omar Polo > > WWW: https://tut.anv.nu/ > > > I'm unsure about packaging the two template files but I thought it > could be handy to have a copy that matches the installed version. No > man page so I'm shipping the README, even though there's a built-in > help. > > the only issue i've found so far it's that the ui often hangs when > waiting for the server to reply. ok stsp@ Briefly tested against bsd.network, and it seems to work fine. This should be useful on low-end machines that cannot comfortable run a web browser. I like its interface better than that of net/toot.
Re: games/zelda3-data ROM fetching as a separate port
On Mon, Nov 14, 2022 at 12:40:19PM +0100, Stefan Sperling wrote:
> espie@ suggested that the FETCH_MANUALLY distfile should be isolated
> into a separate port. This should make things easier for bulk builders,
> and avoids hacks around GH_DISTFILE.
>
> ok?
Updated patch which adds a pseudo do-install target and DESCR and PLIST
to the zelda3-rom port, to make it less weird.
The -rom package is not installed when building zelda3-data, since -data
depends on the :patch stage of -rom.
diff refs/heads/master refs/heads/zelda3-rom
commit - f2ea66a16674d866fb6e818ad75e4e519e7728bd
commit + bc6407c16e7c7e7018301833f9273e4d2b65d6d7
blob - 1a80c28c114a3c8b36b855d1596be2641044d1b9
blob + 228e407ca8d76ee862a8d69f7e201f841a15d33e
--- games/zelda3-data/Makefile
+++ games/zelda3-data/Makefile
@@ -2,9 +2,6 @@ PKGNAME = zelda3-data-0.1pre20221101
DISTNAME = zelda3-0.1pre20221101
PKGNAME = zelda3-data-0.1pre20221101
-# GH_DISTFILE contains curly braces { } which won't work here
-ZELDA3_DISTFILE = ${DISTNAME}-${GH_COMMIT:C/().*/\1/}${EXTRACT_SUFX}
-DISTFILES =zelda3.sfc ${ZELDA3_DISTFILE}
# use a commit hash, for now; the latest tag (v0.1-beta) is quite outdated
GH_ACCOUNT = snesrev
@@ -22,26 +19,18 @@ BUILD_DEPENDS = graphics/py-Pillow${MODPY_FLAVOR} \
USE_GMAKE =Yes
BUILD_DEPENDS =graphics/py-Pillow${MODPY_FLAVOR} \
- textproc/py-yaml${MODPY_FLAVOR}
+ textproc/py-yaml${MODPY_FLAVOR} \
+ games/zelda3-rom:patch
-FETCH_MANUALLY += "zelda3.sfc has sha256 checksum"
-FETCH_MANUALLY +=
"66871d66be19ad2c34c927d6b14cd8eb6fc3181965b6e517cb361f7316009cfb"
-FETCH_MANUALLY += "and must be placed into ${DISTDIR}."
-FETCH_MANUALLY += "It can be extracted from a retail SNES cartridge using"
-FETCH_MANUALLY += "tools such as https://github.com/sanni/cartreader;
-
PERMIT_PACKAGE = proprietary ROM image
PERMIT_DISTFILES = ${PERMIT_PACKAGE}
-# do not attempt to extract zelda3.sfc
-EXTRACT_CASES =*.sfc) ;;
-
CONFIGURE_STYLE = none
# the game program is compiled by games/zelda3; we just build the assets
ALL_TARGET = tables/zelda3_assets.dat
pre-build:
- ${INSTALL_DATA} ${DISTDIR}/zelda3.sfc ${WRKSRC}/tables/zelda3.sfc
+ ln -sf ${WRKDIR}/games/zelda3-rom/zelda3.sfc ${WRKSRC}/tables/zelda3.sfc
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/zelda3
blob - 0e3952cc28d06092f7485a00198f9a520c61f0e4
blob + 8aad0c00a804349edb6222698a454cbbf2d149e5
--- games/zelda3-data/distinfo
+++ games/zelda3-data/distinfo
@@ -1,4 +1,2 @@
SHA256 (zelda3-0.1pre20221101-91d771ec.tar.gz) =
nQ8+nFZQ+PW9nAzYSRuXVVOp+fewoYsbt37ympzqcwc=
-SHA256 (zelda3.sfc) = ZocdZr4ZrSw0ySfWsUzY62/DGBlltuUXyzYfcxYAnPs=
SIZE (zelda3-0.1pre20221101-91d771ec.tar.gz) = 3907372
-SIZE (zelda3.sfc) = 1048576
blob - d923b6760bfe6054a57653e906069a58fb521827
blob + a4dc2ea1bd7763689d3a7a5b098d943498eb45ac
--- games/zelda3-data/pkg/DESCR
+++ games/zelda3-data/pkg/DESCR
@@ -1,3 +1,3 @@
-Zelda 3 - A Link to the Past (US) ROM image.
+Zelda 3 - A Link to the Past game assets.
Copyright 1991, 1992 Nintendo.
blob - /dev/null
blob + 9ac39d5e085609a96ed5d8c6b0d5d849338729a2 (mode 644)
--- /dev/null
+++ games/zelda3-rom/Makefile
@@ -0,0 +1,34 @@
+COMMENT = zelda3 ROM image
+
+DISTNAME = zelda3-rom-0.0
+
+DISTFILES =zelda3.sfc
+
+CATEGORIES = games
+
+HOMEPAGE = https://www.nintendo.com
+
+FETCH_MANUALLY += "zelda3.sfc has sha256 checksum"
+FETCH_MANUALLY +=
"66871d66be19ad2c34c927d6b14cd8eb6fc3181965b6e517cb361f7316009cfb"
+FETCH_MANUALLY += "and must be placed into ${DISTDIR}."
+FETCH_MANUALLY += "It can be extracted from a retail SNES cartridge using"
+FETCH_MANUALLY += "tools such as https://github.com/sanni/cartreader;
+
+PERMIT_PACKAGE = proprietary ROM image
+PERMIT_DISTFILES = ${PERMIT_PACKAGE}
+
+EXTRACT_ONLY =
+
+WRKDIST = ${WRKDIR}
+
+NO_BUILD = Yes
+NO_TEST = Yes
+
+post-extract:
+ ln -sf ${DISTDIR}/zelda3.sfc ${WRKDIR}
+
+do-install:
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/zelda3
+ ${INSTALL_DATA} ${WRKDIR}/zelda3.sfc ${PREFIX}/share/zelda3/zelda3.sfc
+
+.include
blob - /dev/null
blob + 71f5f624d21060ef88b7f39ddc49244860a9b71a (mode 644)
--- /dev/null
+++ games/zelda3-rom/distinfo
@@ -0,0 +1,2 @@
+SHA256 (zelda3.sfc) = ZocdZr4ZrSw0ySfWsUzY62/DGBlltuUXyzYfcxYAnPs=
+SIZE (zelda3.sfc) = 1048576
blob - /dev/null
blob + d923b6760bfe6054a57653e906069a58fb521827 (mode 644)
--- /dev/null
+++ games/zelda3-rom/pkg/DESCR
@@ -0,0 +1,3 @@
+Zelda 3 - A Link to the Past (US) ROM image.
+
+Copyright 1991, 1992 Nintendo.
blob - /dev/null
blob + 5ba88283b0bf888128cdcc16f7b2a722a5dece0c (mode 644)
--- /dev/null
+++ games/zelda3-rom/pkg/PLIST
@@ -0,0 +1,2 @@
+share/zelda3/
+share/zelda3/zelda3.sfc
games/zelda3-data ROM fetching as a separate port
espie@ suggested that the FETCH_MANUALLY distfile should be isolated
into a separate port. This should make things easier for bulk builders,
and avoids hacks around GH_DISTFILE.
ok?
split zelda3-data ROM file fetching into a separate zelda3-rom port
based on initial patch by espie@
diff f2ea66a16674d866fb6e818ad75e4e519e7728bd
e6471f9ecef1b92f4d979b2689c7e8419b43f7ba
commit - f2ea66a16674d866fb6e818ad75e4e519e7728bd
commit + e6471f9ecef1b92f4d979b2689c7e8419b43f7ba
blob - 1a80c28c114a3c8b36b855d1596be2641044d1b9
blob + 228e407ca8d76ee862a8d69f7e201f841a15d33e
--- games/zelda3-data/Makefile
+++ games/zelda3-data/Makefile
@@ -2,9 +2,6 @@ PKGNAME = zelda3-data-0.1pre20221101
DISTNAME = zelda3-0.1pre20221101
PKGNAME = zelda3-data-0.1pre20221101
-# GH_DISTFILE contains curly braces { } which won't work here
-ZELDA3_DISTFILE = ${DISTNAME}-${GH_COMMIT:C/().*/\1/}${EXTRACT_SUFX}
-DISTFILES =zelda3.sfc ${ZELDA3_DISTFILE}
# use a commit hash, for now; the latest tag (v0.1-beta) is quite outdated
GH_ACCOUNT = snesrev
@@ -22,26 +19,18 @@ BUILD_DEPENDS = graphics/py-Pillow${MODPY_FLAVOR} \
USE_GMAKE =Yes
BUILD_DEPENDS =graphics/py-Pillow${MODPY_FLAVOR} \
- textproc/py-yaml${MODPY_FLAVOR}
+ textproc/py-yaml${MODPY_FLAVOR} \
+ games/zelda3-rom:patch
-FETCH_MANUALLY += "zelda3.sfc has sha256 checksum"
-FETCH_MANUALLY +=
"66871d66be19ad2c34c927d6b14cd8eb6fc3181965b6e517cb361f7316009cfb"
-FETCH_MANUALLY += "and must be placed into ${DISTDIR}."
-FETCH_MANUALLY += "It can be extracted from a retail SNES cartridge using"
-FETCH_MANUALLY += "tools such as https://github.com/sanni/cartreader;
-
PERMIT_PACKAGE = proprietary ROM image
PERMIT_DISTFILES = ${PERMIT_PACKAGE}
-# do not attempt to extract zelda3.sfc
-EXTRACT_CASES =*.sfc) ;;
-
CONFIGURE_STYLE = none
# the game program is compiled by games/zelda3; we just build the assets
ALL_TARGET = tables/zelda3_assets.dat
pre-build:
- ${INSTALL_DATA} ${DISTDIR}/zelda3.sfc ${WRKSRC}/tables/zelda3.sfc
+ ln -sf ${WRKDIR}/games/zelda3-rom/zelda3.sfc ${WRKSRC}/tables/zelda3.sfc
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/zelda3
blob - 0e3952cc28d06092f7485a00198f9a520c61f0e4
blob + 8aad0c00a804349edb6222698a454cbbf2d149e5
--- games/zelda3-data/distinfo
+++ games/zelda3-data/distinfo
@@ -1,4 +1,2 @@
SHA256 (zelda3-0.1pre20221101-91d771ec.tar.gz) =
nQ8+nFZQ+PW9nAzYSRuXVVOp+fewoYsbt37ympzqcwc=
-SHA256 (zelda3.sfc) = ZocdZr4ZrSw0ySfWsUzY62/DGBlltuUXyzYfcxYAnPs=
SIZE (zelda3-0.1pre20221101-91d771ec.tar.gz) = 3907372
-SIZE (zelda3.sfc) = 1048576
blob - d923b6760bfe6054a57653e906069a58fb521827
blob + a4dc2ea1bd7763689d3a7a5b098d943498eb45ac
--- games/zelda3-data/pkg/DESCR
+++ games/zelda3-data/pkg/DESCR
@@ -1,3 +1,3 @@
-Zelda 3 - A Link to the Past (US) ROM image.
+Zelda 3 - A Link to the Past game assets.
Copyright 1991, 1992 Nintendo.
blob - /dev/null
blob + 10880b3b1ef21893d0af63ae47feb61f683c78c2 (mode 644)
--- /dev/null
+++ games/zelda3-rom/Makefile
@@ -0,0 +1,30 @@
+COMMENT = zelda3 ROM image
+
+DISTNAME = zelda3-rom-0.0
+
+DISTFILES =zelda3.sfc
+
+CATEGORIES = games
+
+HOMEPAGE = https://www.nintendo.com
+
+FETCH_MANUALLY += "zelda3.sfc has sha256 checksum"
+FETCH_MANUALLY +=
"66871d66be19ad2c34c927d6b14cd8eb6fc3181965b6e517cb361f7316009cfb"
+FETCH_MANUALLY += "and must be placed into ${DISTDIR}."
+FETCH_MANUALLY += "It can be extracted from a retail SNES cartridge using"
+FETCH_MANUALLY += "tools such as https://github.com/sanni/cartreader;
+
+PERMIT_PACKAGE = proprietary ROM image
+PERMIT_DISTFILES = ${PERMIT_PACKAGE}
+
+EXTRACT_ONLY =
+
+WRKDIST = ${WRKDIR}
+
+NO_BUILD = Yes
+NO_TEST = Yes
+
+post-extract:
+ ln -sf ${DISTDIR}/zelda3.sfc ${WRKDIR}
+
+.include
blob - /dev/null
blob + 71f5f624d21060ef88b7f39ddc49244860a9b71a (mode 644)
--- /dev/null
+++ games/zelda3-rom/distinfo
@@ -0,0 +1,2 @@
+SHA256 (zelda3.sfc) = ZocdZr4ZrSw0ySfWsUzY62/DGBlltuUXyzYfcxYAnPs=
+SIZE (zelda3.sfc) = 1048576
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/11/12 07:58:32 Modified files: games : Makefile Log message: += zelda3-data and zelda3-sprites sthen@ points out that such ports should be linked regardless of their non-packaging status
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/11/12 03:03:45 Modified files: games : Makefile Log message: += zelda3 Not adding zelda3-data and zelda3-sprites because they cannot be packaged.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/11/12 03:01:08 Log message: import games/zelda3-sprites This port can be used to install additional sprites for games/zelda3. ok op@ Status: Vendor Tag: stsp Release Tags: stsp_20221112 N ports/games/zelda3-sprites/Makefile N ports/games/zelda3-sprites/distinfo N ports/games/zelda3-sprites/pkg/PLIST N ports/games/zelda3-sprites/pkg/DESCR No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/11/12 03:00:17 Log message: import games/zelda3-data This port can be used to install assets required to run games/zelda3. ok op@ Status: Vendor Tag: stsp Release Tags: stsp_20221112 N ports/games/zelda3-data/Makefile N ports/games/zelda3-data/distinfo N ports/games/zelda3-data/pkg/DESCR N ports/games/zelda3-data/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/11/12 02:58:29 Log message: import games/zelda3 This is a reverse-engineered clone of Zelda 3 - A Link to the Past. It's around 70-80kLOC of C code, and reimplements all parts of the original game. The game is playable from start to end. ok op@ Status: Vendor Tag: stsp Release Tags: stsp_20221112 N ports/games/zelda3/Makefile N ports/games/zelda3/distinfo N ports/games/zelda3/patches/patch-main_c N ports/games/zelda3/patches/patch-types_h N ports/games/zelda3/patches/patch-zelda3_ini N ports/games/zelda3/pkg/DESCR N ports/games/zelda3/pkg/PLIST N ports/games/zelda3/pkg/README No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/11/08 13:55:44 Modified files: devel/got : Makefile distinfo Removed files: devel/got/patches: patch-lib_diff_main_c Log message: update to got 0.79 - repair build on OpenBSD/sparc64 (patch by Ted Bullock) - fix crash in gotd if client gets disconnected on error (reported by Mikhail) - fix crash in got-send-pack when server does not announce any capabilities - make gotd work as intended on an empty repository - prevent freeing of bogus pointers in got_inflate_end() and got_deflate_end() - reduce delta cache size to avoid running out of memory on large pack files - add missing free of delta buffers in several error paths - make 'got clone -b' work for repositories which lack a valid HEAD reference - use sub-second precision when checking for objects/pack/ modification - fix capabilities announced by gotsh when no references exist in repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/11/07 14:45:15 Modified files: devel/sdl2 : Makefile devel/sdl2/patches: patch-src_joystick_SDL_gamecontrollerdb_h Log message: Add a patch from SDL upstream to support a SNES/NES-mini controller USB adapter I use. ok thfr@
devel/sdl2 game controller addition
This adds support for a NES-mini/SNES-mini gamepad USB adapter I use.
Otherwise, games which use the SDL_GameController API rather than the
SDL_Joystick API (such as zelda3) are unable to detect my controllers.
Patch has already been merged upstream:
https://github.com/libsdl-org/SDL/pull/6485
ok?
diff /usr/ports
commit - 100ace77a1718374d9902d15acc70fc9950d34d7
path + /usr/ports
blob - 50b23376fffe0524496dbb7cc1a76e5bb4a0cdee
file + devel/sdl2/Makefile
--- devel/sdl2/Makefile
+++ devel/sdl2/Makefile
@@ -1,6 +1,7 @@
COMMENT= cross-platform multimedia library
V= 2.24.1
+REVISION= 0
DISTNAME= SDL2-${V}
PKGNAME= sdl2-${V}
CATEGORIES=devel
blob - faa28ab4480a4f6d6660bc70c82e061d2a3c79aa
file + devel/sdl2/patches/patch-src_joystick_SDL_gamecontrollerdb_h
--- devel/sdl2/patches/patch-src_joystick_SDL_gamecontrollerdb_h
+++ devel/sdl2/patches/patch-src_joystick_SDL_gamecontrollerdb_h
@@ -1,5 +1,6 @@
- Enable controller detection by GUID on OpenBSD
- Use both Linux and macOS GUIDs to match both XInput and DInput devices
+- Recognize raphnet USB adapter for SNES/NES-mini gamepads (from upstream)
Index: src/joystick/SDL_gamecontrollerdb.h
--- src/joystick/SDL_gamecontrollerdb.h.orig
@@ -22,3 +23,11 @@ Index: src/joystick/SDL_gamecontrollerdb.h
"xinput,*,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,",
"0300c82d00901101,8BitDo FC30
Pro,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a5,rightx:a2,righty:a3,start:b11,x:b3,y:b4,hint:SDL_GAMECONTROLLER_USE_BUTTON_LABELS:=1,",
"0300c82d00901101,8BitDo FC30
Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a5,rightx:a2,righty:a3,start:b11,x:b4,y:b3,hint:!SDL_GAMECONTROLLER_USE_BUTTON_LABELS:=1,",
+@@ -846,6 +846,7 @@ static const char *s_ControllerMappings [] =
+
"05006964726f69643a636f6e,idroid:con,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,",
+
"0300b50715031001,impact,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b0,y:b1,",
+ "03009b2803000101,raphnet.net 4nes4snes
v1.5,a:b0,b:b4,back:b2,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b3,x:b1,y:b5,",
++"03009b2880002002,raphnet technologies 1-player WUSBMote
v2.2,a:b1,b:b4,x:b0,y:b5,back:b2,start:b3,leftshoulder:b6,rightshoulder:b7,dpup:b12,dpdown:b13,dpleft:b14,dpright:b15,",
+ #endif
+ #if defined(__ANDROID__)
+ "0500c82d06503f00,8BitDo M30
Gamepad,a:b0,b:b1,back:b4,guide:b17,leftshoulder:b9,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b10,righttrigger:a4,start:b6,x:b2,y:b3,hint:SDL_GAMECONTROLLER_USE_BUTTON_LABELS:=1,",
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/11/03 15:57:18 Modified files: devel/got : Makefile Added files: devel/got/patches: patch-lib_diff_main_c Log message: remove C99-ism that broke the build on sparc64; patch from Ted Bullock
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/11/03 15:53:28 ports/devel/got/patches Update of /cvs/ports/devel/got/patches In directory cvs.openbsd.org:/cvs.d/hack/stsp/got/patches Log Message: Directory /cvs/ports/devel/got/patches added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/11/03 08:11:06 Modified files: devel/got : Makefile distinfo Log message: update to got 0.78 (powered by lots of miod cheese) - gotsh.1: Use Sx for referencing EXAMPLES (patch by Josiah Frentsos) - change got_pack_parse_offset_delta tslen argument to size_t (op) - fix regression test failures with Git 2.30.5 / 2.38.1 or later installed - fix gotd(8) usage() string (patch by Josiah Frentsos) - regress/rebase.sh: remove accidentally included absolute path to "got" (naddy) - fix off_t type mismatches in printf format string arguments (naddy, op) - fix spelling of "FastCGI" (patch by Josiah Frentsos) - add missing `goto done;' on error path of read_raw_delta_data() (op) - add bounds check when reading a delta offset from a packed object (op) - check size before calling mmap(2) (op) - sort getopt() option lists and switch statements (patch by Josiah Frentsos) - make got.conf(5) warn about remotes configured in locally-shared repositories - add missing check for errors from got_gotconfig_read() in open_worktree() - plug a memory leak on error in got_gotconfig_read() - convert pack filesize variables to off_t for large packs on 32-bit arch (op) - remove sendfd pledge promise from gotd repo_read and repo_write processes - add gotctl(8); initially supported commands are 'info' and 'stop' - respect umask when creating or changing files and directories (op) - fix typo which caused a double-free in gotd repo_write_shutdown() - got-fetch-pack: fix wrong memmove length leading to dubious checksum failures - avoid incomplete writes of pack file data in gotsh and got-send-pack - add a test suite for gotd(8); check basic clone and send functionality - require space between commit author name and email, for Git compatibility - gotwebd: avoid 500 error code if erroring out in plaintext mode (landry) - gotwebd: add respect_exportok flag, defaulting to off (landry) - respect open files resource limit when sizing pack cache; regression from 0.71 - provide a diff of changes in a temp file while editing a commit log message - fix memory and file descriptor leak for raw objects (regression from 0.77) - remove casts which made older gcc versions unhappy - fix free of wrong address on error in gotweb's parse.y
Re: new: games/zelda3
On Tue, Nov 01, 2022 at 10:03:40PM +0300, Mikhail wrote: > Works fine for me on current/amd64, one remark is that in README, in > this paragraph: > > The game reads the configuration file zelda3.ini, which must be placed > in the current working directory where the game is started. > An example can be found at /usr/local/share/examples/zelda3.ini. > > Path should be changed to /usr/local/share/examples/zelda3/zelda3.ini Thanks, fixed in this updated version. Additional changes: - Clarify usage in README. - Change version suffix from 'pl' to 'pre'. There has not been an 0.1 release upstream yet, so 'pre' is more appropriate; 'pl' would prevent an update to an eventual 0.1 release. (This project has been in development only since last August, which might explain why there is no release yet. But it is surprisingly stable and playable already. The code compiled cleanly with a trivial patch, and I've seen zero crashes while testing.) - The games/zeldea3 port longer needs the assets to build, which allows us to distribute a binary package. It downloads and builds MIT-licensed code only. - Ship pre-compiled assets in the -data package, rather than the ROM file. The ROM file is now only used as a data source while building this port. - Tweak the example config to make default button assignment work. For some reason the Right Shift key is not working (checked in gnome and in fwvm). Until this issue is understood, make our example config assign another key instead. - Add a zelda3-sprites port which provides additional sprites for Link. There is no explicit licence provided for sprites, which means we cannot distribute a -sprites package. I will try to clarify with upstream. ok? zelda3.tgz Description: application/tar-gz
new: games/zelda3
This is a reverse engineered clone of Zelda 3 - A Link to the Past. It's around 70-80kLOC of C code, and reimplements all parts of the original game. The game is playable from start to end. A bunch of features have been added that are not supported by the original game. Some of them are: - Support for pixel shaders. - Support for enhanced aspect ratios of 16:9 or 16:10. - Higher quality world map. - Support for MSU audio tracks. - Secondary item slot on button X (Hold X in inventory to select). - Switching current item with L/R keys. A proprietary ROM file of the original game is required to compile. This file is handled by the zelda3-data port to keep things simple, thanks to espie@ for suggesting this. ok? zelda3.tgz Description: application/tar-gz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/10/24 05:48:13 Modified files: devel/got : Makefile distinfo Log message: update to got 0.77 - disallow integrating into references outside refs/heads/ (jrick) - gotwebd.conf: add syntax for defining macros and document them (op) - simplify the way 'got patch' opens a tempfile when reading from stdin - lots of refactoring to allow gotd(8) code to run without libexec helpers - more refactoring to allow gotd(8) to stream packfile data on network sockets - add missing error checking around some unlink(2) syscalls - don't crash if delta cache is missing while combining deltas; for dev builds - allow got_object_parse_tree() to reuse entries buffer allocations for speed - show a more useful error if the size of a packed object won't fit in 64 bits - switch integers used for counting objects while indexing packs to unsigned - refresh cached list of pack index paths while searching a packed object - introduce gotd(8) and gotsh(1); WIP and not yet provided in binary packages - close parent's end of imsg pipe before waiting for a child process to exit - fix detection of SIGTERM in tog; this signal was accidentally being ignored - avoid printing harmless errors that can occur when tog exits due to Ctrl-C
Re: valgrind: mark broken
On Fri, Oct 07, 2022 at 02:37:15PM +0900, Masato Asou wrote:
> Hi tb and ports,
>
> I have adapted the system call number definition to the new syscall.h
>
> comments, ok?
Thank you!
I have tried running devel/got in valgrind and it fails because
the __realpath syscall is missing. Could this be fixed?
--59025-- WARNING: unhandled syscall: 115
--59025-- You may be able to write your own handler.
--59025-- Read the file README_MISSING_SYSCALL_OR_IOCTL.
In sys/kern/syscalls.master:
115 STD { int sys___realpath(const char *pathname, \
char *resolved); }
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/09/23 08:51:28 Modified files: devel/got : Makefile distinfo Log message: update to got 0.76 - gotwebd documentation fixes - tog: extend log view author highlight colour to full field width (jamsek) - tog: make headline highlight extend the full view width (jamsek) - make got_commit_graph_iter_next use caller-provided storage for the id (op) - tog: add new log view limit feature to filter commits (patch by Mikhail + op) - tog: respect current cursor position during log search (patch by Mikhail) - tog: implement runtime help accessible via H,F1 keymaps (jamsek) - add gotadmin init -b to specify repo head ref (jamsek) - ensure got patch respects x-bit perms for new files (jamsek) - gotwebd: drop needless NULL check (op) - show file mode for new added files in work tree diffs (jamsek) - fix wrong function prototypes shown in diff hunk headers (thj@freebsd, jamsek)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/09/21 07:48:23 Modified files: devel/got : Makefile Log message: enable gotwebd debug package; thanks to espie@ for fixing build-debug-info
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs
Module name:ports
Changes by: s...@cvs.openbsd.org2022/09/08 02:44:11
Modified files:
devel/got : Makefile distinfo
Added files:
devel/got/pkg : DESCR-webd PLIST-webd gotwebd.rc
Log message:
update to got 0.75
ok tracey@
too many changes to list all here; see git repository history for more
- unlink temporary files created during ssh signature verification
- add gotwebd, a fast-cgi server and successor of gotweb (tracey)
- lots of release-preparation work on gotwebd (naddy, op, tracey, stsp)
- cast argument of type rlim_t to unsigned long long to match the %llu (naddy)
- tog: add key to toggle author/committer in log view (op)
- make our email address parsing closer to Git's parsing rules (op)
- got commit: add -A flag to specify the author of a patch (op)
- tog: alias J and K to > and < keybindings for diff view (patch by Mikhail)
- fix 'got cat' printing commit author instead of committer (op)
- tog: add 'L' key to blame view; opens log view for the annotated line (jamsek)
- don't chug along if repo format version is unsupported (florian)
- fix dead stores to variables, found with LLVM's scan-build (florian)
- fix unitialized error return (florian)
- make sure got_repo_pack_fds_close() frees a malloc'ed pointer (florian)
- prevent memory leak when asprintf fails (florian)
- prevent use-after-free of packed_refs_path in error path (florian)
- got_repo_pack_fds_close: don't close(0) (patch by Lucas)
- reset committer's name+email during rebase and histedit
- tog: fix unintentional move of cursor after closing child views (jamsek)
- tog: uppercase all the key maps which open new views (jamsek)
- make 'got histedit' fetch author info from Git configuration as a fallback
- fix 'got patch -R' when using diff3 merge (op)
- add GOT_IGNORE_GITCONFIG env var to force ignoring of Git config files
- fix off_t type mismatches (naddy)
- got patch: error if patchfile isn't a regular file (op)
- make 'got patch' apply pledge(2) earlier (op)
- got/tog diff: fix accounting for line-endings in files containing CRLF (op)
- got patch: add -c flag to apply at a specified commit (op)
- fix two missing error checks in tog (found by florian with scan-build)
- remove pointless repo_close + leaked error (found by florian with scan-build)
- tog: add n{G,g} key map to jump to line n like less(1) (jamsek)
- diff: re-alloc arrays in larger chunks for up to 3x more performance (jamsek)
- fix whitespace-related issues when 'got patch' is matching a hunk (op)
- tog: add keymaps to jump to next/prev file/hunk in the diff view (jamsek)
- fix 'got tag' not tagging the work tree's current branch by default
- tog log: don't block while loading commits after 'G' key was pressed (jamsek)
- man pages: group options in accordance to style(9) (patch by Josiah Frentsos)
- man pages: Replace 'Ar sign' with 'Cm sign' (patch by Josiah Frentsos)
- don't add trailing \0 to signed tag objects; fixes interop with Github (jrick)
- use Xo/Xc in the man pages (patch by Josiah Frentsos)
- fix diffing two blobs by object ID with 'got diff' (jamsek)
- refresh pack-index path list if mtime of the objects/pack directory changed
- diff3: switch diff output mode from "edscript" to "plain" (patch by Tom Jones)
- use the faster plain-diff headers-only mode for diff3
- do not segfault while verifying "lightweight" tags (jrick)
- don't search through ignored paths and files on commit (sdk)
- plug a lot of memory leaks (op)
- forbid rebase of references outside the "refs/heads/" namespace
- fflush(stdout) after asking questions; improves got-portable behaviour (op)
- fix bug where 'got branch -lt' produced duplicate listings of a branch
- tog: ensure stdin is a tty to guard against 'tog < /dev/null' etc. (jamsek)
update devel/got to 0.75 (adds gotwebd)
This patch updates the devel/got port to the 0.75 release.
There is a new tool in the toolbox. I have created a new sub-package for it.
Does this look alright?
diff refs/heads/master refs/heads/got-0.75
commit - 28fc07ba2a1c1154c08027ca1e362374bed4099f
commit + 2293189381871254dc551702f28fe2a94c32d63c
blob - 1db4736f3a451e90c155b8f0a16191aa283444f1
blob + f19c2b6b85e0244fb7f81507c4ae0be91f5bac9a
--- devel/got/Makefile
+++ devel/got/Makefile
@@ -1,9 +1,11 @@
COMMENT-main = game of trees version control system
-COMMENT-web = game of trees repository server for web browsers
+COMMENT-web = game of trees repository cgi script
+COMMENT-webd = game of trees repository fast-cgi server
-V =0.74
+V =0.75
DISTNAME = got-${V}
PKGNAME-web = gotweb-${V}
+PKGNAME-webd = gotwebd-${V}
CATEGORIES = devel
HOMEPAGE = https://gameoftrees.org
MAINTAINER = Stefan Sperling
@@ -11,19 +13,21 @@ MAINTAINER =Stefan Sperling
# ISC
PERMIT_PACKAGE = Yes
-MULTI_PACKAGES = -main -web
+MULTI_PACKAGES = -main -web -webd
# uses pledge()
WANTLIB-main = c curses m panel pthread util z
WANTLIB-web = c util z
+WANTLIB-webd = c util z
MAKE_FLAGS = CC="${CC}"
-ALL_TARGET = all web
-INSTALL_TARGET = install web-install
+ALL_TARGET = all web webd
+INSTALL_TARGET = install web-install webd-install
MASTER_SITES = https://gameoftrees.org/releases/
-DEBUG_PACKAGES = ${BUILD_PACKAGES}
+# no debug package for -webd because build-debug-info does not work with it
+DEBUG_PACKAGES = -main -web
BUILD_DEPENDS =www/kcgi>=0.12.0
@@ -33,6 +37,7 @@ TEST_DEPENDS =devel/git \
${PKGPATH}=${V}
PREFIX-web = ${VARBASE}/www
+PREFIX-webd = ${VARBASE}/www
TEST_TARGET = regress
FAKE_FLAGS = MANDIR=${PREFIX}/man/man CHROOT_DIR=${VARBASE}/www
blob - 061981f6990a21566af1dd22ec3f1912e4b2df80
blob + 547f16ee1ac3a077df470a34f5481622a2b06cc4
--- devel/got/distinfo
+++ devel/got/distinfo
@@ -1,2 +1,2 @@
-SHA256 (got-0.74.tar.gz) = /+uCigt5hk4WzvLsqY9exPLeisWI2CBT30kWp5tRfa0=
-SIZE (got-0.74.tar.gz) = 648237
+SHA256 (got-0.75.tar.gz) = quONg9omCkpQPQmOc3phbFm6O6ebksinHaBmjD31NrI=
+SIZE (got-0.75.tar.gz) = 768451
blob - /dev/null
blob + 493f25d853b0d667ec338a839d5d4549da046637 (mode 644)
--- /dev/null
+++ devel/got/pkg/DESCR-webd
@@ -0,0 +1,2 @@
+Game of Trees Web Daemon (gotwebd) is a Fast-CGI server which displays
+Git repository data and is designed to work with httpd(8).
blob - /dev/null
blob + f9e3ea03e9c5bcfba07a9936ff6615e13a8f36e9 (mode 644)
--- /dev/null
+++ devel/got/pkg/PLIST-webd
@@ -0,0 +1,29 @@
+@rcscript ${RCDIR}/gotwebd
+bin/gotwebd/
+bin/gotwebd/libexec/
+@bin bin/gotwebd/libexec/got-read-blob
+@bin bin/gotwebd/libexec/got-read-commit
+@bin bin/gotwebd/libexec/got-read-gitconfig
+@bin bin/gotwebd/libexec/got-read-gotconfig
+@bin bin/gotwebd/libexec/got-read-object
+@bin bin/gotwebd/libexec/got-read-pack
+@bin bin/gotwebd/libexec/got-read-tag
+@bin bin/gotwebd/libexec/got-read-tree
+htdocs/gotwebd/
+htdocs/gotwebd/android-chrome-192x192.png
+htdocs/gotwebd/android-chrome-384x384.png
+htdocs/gotwebd/apple-touch-icon.png
+htdocs/gotwebd/browserconfig.xml
+htdocs/gotwebd/favicon-16x16.png
+htdocs/gotwebd/favicon-32x32.png
+htdocs/gotwebd/favicon.ico
+htdocs/gotwebd/got.png
+htdocs/gotwebd/got_large.png
+htdocs/gotwebd/gotweb.css
+htdocs/gotwebd/mstile-150x150.png
+htdocs/gotwebd/safari-pinned-tab.svg
+htdocs/gotwebd/site.webmanifest
+@cwd ${LOCALBASE}
+@man man/man5/gotwebd.conf.5
+@man man/man8/gotwebd.8
+@bin sbin/gotwebd
blob - /dev/null
blob + 31f52acd176a8cbee77152ac748b26817231b660 (mode 644)
--- /dev/null
+++ devel/got/pkg/gotwebd.rc
@@ -0,0 +1,7 @@
+#!/bin/ksh
+
+daemon="${TRUEPREFIX}/sbin/gotwebd"
+
+. /etc/rc.d/rc.subr
+
+rc_cmd $1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/07/25 02:23:26 Modified files: sysutils/xdelta: Makefile Added files: sysutils/xdelta/patches: patch-xdelta3_configure_ac Log message: Enable LZMA as a secondary compression algorithm in sysutils/xdelta. liblzma could already have been picked up as a hidden dependency. Make this dependency explicit and enable the feature. Get rid of a commented CONFIGURE_STYLE while here, by Kurt's request. ok kmos@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/07/14 05:05:26 Modified files: devel/got : Makefile distinfo Log message: update to got 0.74 - cast printf argument of type time_t to long long to match the %lld (naddy) - add missing revoked_signers grammar to got.conf(5) (jrick) - move 'got init' command to 'gotadmin init' - regress test SSH key revocations (jrick) - long overdue update of AUTHORS lists in man pages - add signer_id option to got.conf(5) (jrick) - delta_cache.c needs to include ; unbreaks -portable build on ubuntu - regress: use bs=1M for dd, not bs=1m; fixes -portable test failure on ubuntu - fix buf_alloca error handling (op) - some privsep.c refactoring and cleanup (op) - tog: implement global 'S' key map to switch split mode (jamsek) - tog: implement +/- keymaps to resize the focussed split (jamsek) - make 'tog log' error out in shallow Git repositories instead of hanging - tog: enable moving to prev/next blame line in diff view (jamsek) - improve documentation of the histedit 'mesg' command - histedit script: allow mesg command only after pick or edit commands (op) - for linux, fix usage of pipe(2) during SSH signing and verification (jrick)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/07/04 07:36:49 Modified files: devel/got : Makefile distinfo Log message: update to got 0.73 - got patch: use diff3 to merge changes if possible (op) - tog: alias C-b/C-f to scroll page back/forward with b/f (jamsek) - tog: make SPACE page down in all views (naddy) - tog: allow prefixing movement keys with count modifier (jamsek) - always show commit or tree IDs in diff header, in order to help 'got patch' - build non-release builds with -Wwrite-strings (op) - got patch: handle git-style diffs for the 3-way merge too (op) - implement support for commit coloring in got-read-pack for speed - move got_opentemp out of open_blob and blame.c for future gotwebd (tracey) - move got_opentemp out of diff.c and diffreg.c for future gotwebd - tog: refactor log cursor movement in preparation for horizontal split (jamsek) - tog: implement support for horizontal splitscreens (jamsek) - switch 'tog diff' and 'tog blame' to Myers diff by default for speed - make the diff algorithm used by 'tog diff' and 'tog blame' configurable - make the patch parser look for the next "diff" header for robustness (op) - got patch: don't loose the x bit when merging with diff3 (op) - got patch: handle mangled whitespace (op) - fix "imsg_add TREE_ENTRY: Result too large" error on i386 (semarie, op) - create and verify tags signed by SSH keys (jrick) - tog: add C-g/backspace key map to abort compound commands (jamsek) - rename got.conf(5) fetch-all-branches to fetch_all_branches for consistency - rename got.conf(5) mirror-references to mirror_references for consistency - use pipe() which is a more portable syscall than pipe2() (jrick) - got patch: check for specific chars instead of using isspace(3) (op)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2022/06/18 11:10:42 Modified files: devel/got : Makefile distinfo Log message: update to got 0.72 - fix "bad offset in pack file" error due to uninitialized variable (op) - initialize all variables used for sending privsep messages to zero (op) - tog: reset search state after Ctrl-L to fix a use-after-free (op) - fix unexpected imsg error after incomplete enumeration in got-read-pack - tog: heed selection cursor position while searching (patch by Mikhail)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs
Module name:ports
Changes by: s...@cvs.openbsd.org2022/06/17 07:03:04
Modified files:
devel/got : Makefile distinfo
Log message:
update to got 0.71
- got patch: fail when reading empty hunks (op)
- got patch: switch from fseek() to fseeko(), use unary minus (naddy)
- got patch: avoid open/sync/close of the fileindex over and over again (op)
- make got_privsep_recv_tree() reject trees with less than zero entries
- plug memory leak in an error path of got_privsep_recv_tree()
- prevent an out-of-bounds access in got_privsep_recv_tree()
- parse tree entries into an array instead of a pathlist for speed
- batch up tree entries in imsg instead of sending one imsg per tree entry
- imsg_add() frees its msg argument on error; avoid double-free in error paths
- avoid malloc/free for duplicate check in got_pathlists_insert()
- plug a small memleak on error in got_pack_create()
- fix paths stored in pack meta data, improving file deltification
- store a path hash instead of a verbatim path in pack meta data
- reduce the amount of memory used for caching deltas during deltification
- shrink struct got_pack_meta a bit by removing the have_reused_delta flag
- use random seeds for murmurhash2 (op)
- fix bug in findwixt() which caused pack files with missing parent commits
- avoid looping over deltas twice in dump_delta_chain_to_{file,mem}()
- open tempfiles needed for delta application upfront, for future gotwebd
- reduce GOT_PACK_CACHE_SIZE to 32 to accomodate for previous tempfile change
- tog: override SIGTERM and SIGINT handlers to avoid ncurses cleanup() handler
- move creation of tempfiles outside of lib/diff.c
- tests: don't pass $ret to test_done on failure when it's known to be zero (op)
- tests: set `ret' in a few places where it was forgotten (op)
- convert delta cache to a hash table
- implicitly unstage changes when staging the reverse of a staged diff (op)
- implement object enumeration support in got-read-pack for speed
- add one-line output mode to got log with -s flag (patch by Evan Silberman)
- rename the former got log -s (search) flag to got log -S
- make it possible to match committed patches with got log -p -S pattern
- tog: add key bindings for half-page scroll (patch by Mikhail, Mark Jamsek)
- make got log -S match author name and commit ID, like tog search does (op)
- got patch: ensure new and old paths are NUL-terminated (op)
- got patch: guard against invalid (negative) line offsets (op)
- got patch: use ints for line offsets instead of longs (op)
- remove redundant datalen checks before calling recv_imsg_error (op)
- use strndup instead of malloc+memcpy in privsep.c (op)
- do stricter validation of data received from libexec helpers (op)
- move got_opentempfd() out of got_repo_open(), for future gotwebd (tracey)
- fix D_GOTWWW default path; gotweb can now run without a config file again
- add horizontal scrolling to tog diff, blame, and log views (Mark Jamsek)
- show last-modified date in the "tog ref" view if 'm' is pressed (Mark Jamsek)
- make tog horizontal scrolling work with unicode (with op@)
