CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2023/01/24 23:46:31 Modified files: net/filezilla : Makefile distinfo Log message: Update to filezilla-3.63.0 Changes: https://filezilla-project.org/versions.php
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2023/01/24 23:46:16 Modified files: net/libfilezilla: Makefile distinfo net/libfilezilla/pkg: PLIST Log message: Update to libfilezilla-0.41.0 Bump major of SHLIB because of symbol removal.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2023/01/24 23:26:29 Modified files: www/gitea : Makefile distinfo Log message: Update gitea 1.18.2 -> 1.18.3 Changelog: https://github.com/go-gitea/gitea/releases/tag/v1.18.3
Re: Shrink Haskell binaries size via link time deduplication
Christian Weisgerber writes:
> Greg Steuck:
>
>> Yes, it does rely on us shipping lld on amd64 which is the only platform
>> with lang/ghc.
>
> lld is the default linker on amd64! You don't even need -fuse-ld=lld.
Indeed, so the patch below is even better. I rebuilt a few more
binaries. Looks like a uniform improvement from:
-rwxr-xr-x 1 root bin 40.7M Jan 14 13:10 /usr/local/bin/darcs
-rwxr-xr-x 1 root bin 84.6M Jan 14 09:37 /usr/local/bin/git-annex
-rwxr-xr-x 1 root bin 37.1M Jan 14 13:49 /usr/local/bin/hledger
-rwxr-xr-x 1 root bin 23.5M Jan 14 15:26 /usr/local/bin/shellcheck
-rwxr-xr-x 1 root bin 36.2M Jan 14 12:38 /usr/local/bin/xmobar
-rwxr-xr-x 1 root bin 3.4M Jan 13 15:24 /usr/local/bin/xmonad
to:
-rwxr-xr-x 1 _pbuild _pbuild 21.9M Jan 24 22:03
/usr/ports/pobj/darcs-2.16.5/darcs-2.16.5/dist-newstyle/build/x86_64-openbsd/ghc-9.2.5/darcs-2.16.5/build/darcs/darcs
-rwxr-xr-x 1 _pbuild _pbuild 46.8M Jan 24 21:56
/usr/ports/pobj/git-annex-10.20221103/git-annex-10.20221103/dist-newstyle/build/x86_64-openbsd/ghc-9.2.5/git-annex-10.20221103/build/git-annex/git-annex
-rwxr-xr-x 1 _pbuild _pbuild 21.0M Jan 24 21:24
/usr/ports/pobj/hledger-1.27.1/hledger-1.27.1/dist-newstyle/build/x86_64-openbsd/ghc-9.2.5/hledger-1.27.1/x/hledger/build/hledger/hledger
-rwxr-xr-x 1 _pbuild _pbuild 9.3M Jan 24 21:31
/usr/ports/pobj/shellcheck-0.9.0/ShellCheck-0.9.0/dist-newstyle/build/x86_64-openbsd/ghc-9.2.5/ShellCheck-0.9.0/x/shellcheck/build/shellcheck/shellcheck
-rwxr-xr-x 1 _pbuild _pbuild 13.3M Jan 24 21:16
/usr/ports/pobj/xmobar-0.43/xmobar-0.43/dist-newstyle/build/x86_64-openbsd/ghc-9.2.5/xmobar-0.43/x/xmobar/build/xmobar/xmobar
-rwxr-xr-x 1 _pbuild _pbuild 3.9M Jan 24 21:09
/usr/ports/pobj/xmonad-0.17.0/xmonad-0.17.0/dist-newstyle/build/x86_64-openbsd/ghc-9.2.5/xmonad-0.17.0/x/xmonad/build/xmonad/xmonad
Should I crank up revision for them all so we can easily tell which side
people are on should things go wrong?
Thanks
Greg
>From 6449280dd7829fe70efe9607a1acc983fb37550a Mon Sep 17 00:00:00 2001
From: Greg Steuck
Date: Mon, 23 Jan 2023 09:11:17 -0800
Subject: [PATCH] Shrink Haskell binaries size via link time deduplication
http://brandon.si/code/linking-smaller-haskell-binaries/
---
devel/cabal/cabal.port.mk | 4
1 file changed, 4 insertions(+)
diff --git a/devel/cabal/cabal.port.mk b/devel/cabal/cabal.port.mk
index 8e0ed30d9e8..f90e6ce59cf 100644
--- a/devel/cabal/cabal.port.mk
+++ b/devel/cabal/cabal.port.mk
@@ -85,6 +85,10 @@ MODCABAL_post-extract += \
&& echo "packages: ${WRKDIR}/${_package}-${_version}/${_package}.cabal"
>> ${WRKSRC}/cabal.project.local
.endfor # MODCABAL_MANIFEST
+MODCABAL_post-extract += \
+ && echo "package *\n ghc-options: -split-sections\n" >>
${WRKSRC}/cabal.project.local \
+ && echo "package ${MODCABAL_STEM}\n ld-options:
-Wl,--gc-sections,--build-id" >> ${WRKSRC}/cabal.project.local
+
# Automatically copies the cabal.project file if any.
MODCABAL_post-extract += \
&& (test -f ${FILESDIR}/cabal.project \
--
2.39.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2023/01/24 23:25:53 Modified files: sysutils/py-vmomi: Makefile distinfo Log message: Update py-vmomi 8.0.0.1.1 -> 8.0.0.1.2 Release notes: https://github.com/vmware/pyvmomi/releases/tag/v8.0.0.1.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/01/24 21:39:15 Modified files: games/py-minecraft-launcher-lib: Makefile distinfo games/py-minecraft-launcher-lib/patches: patch-minecraft_launcher_lib_runtime_py Log message: Update to 5.3 and note new home page for project
games/dMagnetic 0.34 -> 0.35
Hello!
So, my project "dMagnetic" is at version 0.35 now, and with this mail, I
would
like to offer you the patch to the ports tree for your consideration.
Please find the changelog (Which I stole from my Debian release) below.
Thomas
dmagnetic (0.35-1) unstable; urgency=medium
* Minor bugfixes
* Reduced memory consumption
* New default format for savegames
* Better looking ANSI and ASCII output
* Much cleaner sourcecode
-- Thomas Dettbarn Tue, 24 Jan 2023 21:34:56 +0200
diff --git a/games/dmagnetic/Makefile b/games/dmagnetic/Makefile
index aa0e339bd17..e347b5f6fa9 100644
--- a/games/dmagnetic/Makefile
+++ b/games/dmagnetic/Makefile
@@ -1,29 +1,30 @@
-V = 0.34
-COMMENT = interpreter for Magnetic Scrolls games
-DISTNAME = dMagnetic_${V}
-PKGNAME = dmagnetic-${V}
-EXTRACT_SUFX = .tar.bz2
-CATEGORIES = games
+COMMENT= interpreter for Magnetic Scrolls games
-HOMEPAGE = https://www.dettus.net/dMagnetic/
-MAINTAINER = Thomas Dettbarn
+V= 0.35
+DISTNAME= dMagnetic_${V}
+PKGNAME= dmagnetic-${V}
+EXTRACT_SUFX= .tar.bz2
+CATEGORIES= games
+
+HOMEPAGE= https://www.dettus.net/dMagnetic/
+MAINTAINER= Thomas Dettbarn
# BSD
-PERMIT_PACKAGE = Yes
+PERMIT_PACKAGE= Yes
WANTLIB += c
-MASTER_SITES = https://www.dettus.net/dMagnetic/
+MASTER_SITES= https://www.dettus.net/dMagnetic/
-MAKE_FLAGS = CC="${CC}" CFLAGS="${CFLAGS}"
+MAKE_FLAGS= CC="${CC}" CFLAGS="${CFLAGS}"
-TEST_ENV = SHA256_CMD=sha256
-TEST_TARGET = check
+TEST_ENV= SHA256_CMD=sha256
+TEST_TARGET= check
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/dMagnetic ${PREFIX}/bin/dMagnetic
- ${INSTALL_MAN} ${WRKSRC}/dMagnetic.6 ${PREFIX}/man/man6
${INSTALL_MAN} ${WRKSRC}/dMagneticini.5 ${PREFIX}/man/man5
+ ${INSTALL_MAN} ${WRKSRC}/dMagnetic.6 ${PREFIX}/man/man6
${INSTALL_DATA_DIR} ${PREFIX}/share/dMagnetic
${INSTALL_DATA} ${WRKSRC}/dMagnetic.ini ${PREFIX}/share/dMagnetic
${INSTALL_DATA} ${WRKSRC}/LICENSE.txt ${PREFIX}/share/dMagnetic
diff --git a/games/dmagnetic/distinfo b/games/dmagnetic/distinfo
index 863d971fe55..b08dc0fda07 100644
--- a/games/dmagnetic/distinfo
+++ b/games/dmagnetic/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dMagnetic_0.34.tar.bz2) = Vwsb63ERh0z7tU/HGGjczHMrwyNbnl31htk6T/K46Jc=
-SIZE (dMagnetic_0.34.tar.bz2) = 90775
+SHA256 (dMagnetic_0.35.tar.bz2) = bq4hQ5q6B97tG9scKL7OraFpx7zzLPnN2GDHUbO0p58=
+SIZE (dMagnetic_0.35.tar.bz2) = 92233
Re: subversion ruby bindings and clang 15 (was: Re: amd64-clang bulk build report (llvm 15))
On Tue, Jan 24, 2023 at 12:15 PM Stefan Sperling wrote:
> 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.
>
OK jeremy@ for disabling the SVN ruby bindings as well.
If devel/swig + ruby is an issue with clang 15, audio/ruby-taglib may also
be worth testing.
Thanks,
Jeremy
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: ki...@cvs.openbsd.org 2023/01/24 13:04:04 Modified files: games/wesnoth : Makefile distinfo Log message: update to wesnoth-1.16.8
x11/py-gtk2 and clang 15 (was: Re: amd64-clang bulk build report (llvm 15))
On Sun, Jan 08 2023, Jeremie Courreges-Anglas wrote:
>> https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/x11/py-gtk2.txt
> pango.c:3986:16: error: incompatible integer to pointer conversion returning
> 'int' from a function with result type 'PangoFontMetrics *' (aka 'struct
> _PangoFontMetrics *') [-Wint-conversion]
> return pango_font_metrics_new();
>^~~~
Here's a nasty one, py-gtk2 shows its old age. There are two errors due
to functions not exported any more. For
pango_font_map_get_shape_engine_type() is was easy to decide what to do:
it's only called in a single place, its binding. But
pango_font_metrics_new() is used in a bunch of places. So I went for
a hack and provided a declaration for it in pango.override. If you can
think of a prettier approach, please share it!
ok?
Index: x11/py-gtk2/Makefile
===
RCS file: /home/cvs/ports/x11/py-gtk2/Makefile,v
retrieving revision 1.76
diff -u -p -r1.76 Makefile
--- x11/py-gtk2/Makefile5 Nov 2022 17:07:33 - 1.76
+++ x11/py-gtk2/Makefile24 Jan 2023 17:54:06 -
@@ -5,7 +5,7 @@ COMMENT=GTK+2 Python bindings
GNOME_PROJECT= pygtk
GNOME_VERSION= 2.24.0
PKGNAME= py-gtk2-${VERSION}
-REVISION= 12
+REVISION= 13
CATEGORIES=x11
Index: x11/py-gtk2/patches/patch-pango_defs
===
RCS file: /home/cvs/ports/x11/py-gtk2/patches/patch-pango_defs,v
retrieving revision 1.2
diff -u -p -r1.2 patch-pango_defs
--- x11/py-gtk2/patches/patch-pango_defs11 Mar 2022 20:16:56 -
1.2
+++ x11/py-gtk2/patches/patch-pango_defs14 Jan 2023 22:06:41 -
@@ -3,6 +3,8 @@ From: Jordan Petridis
+ #include
+
++PangoFontMetrics *pango_font_metrics_new(void);
++
+ typedef struct {
+ PyObject *func, *data;
+ } PyGtkCustomNotify;
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
signature.asc
Description: PGP signature
libgtop2 and clang 15 (was: Re: amd64-clang bulk build report (llvm 15))
On Sun, Jan 08 2023, Jeremie Courreges-Anglas wrote:
> On Sun, Jan 08 2023, Jérémie Courrèges-Anglas wrote:
[...]
>> https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/devel/libgtop2.txt
> main.c:226:35: error: incompatible pointer to integer conversion passing
> 'char[1024]' to parameter of type 'pid_t' (aka 'int') [-Wint-conversion]
> (server, >u.data.proc_io, parameter);
> ^
Easy one. ok?
Index: Makefile
===
RCS file: /home/cvs/ports/devel/libgtop2/Makefile,v
retrieving revision 1.150
diff -u -p -r1.150 Makefile
--- Makefile5 Nov 2022 17:06:25 - 1.150
+++ Makefile11 Jan 2023 22:54:48 -
@@ -6,7 +6,7 @@ COMMENT=portable library for obtaining
GNOME_VERSION= 2.40.0
GNOME_PROJECT= libgtop
PKGNAME= libgtop2-${VERSION}
-REVISION= 4
+REVISION= 5
SHARED_LIBS= gtop-2.010.0# .10.0
Index: patches/patch-src_daemon_main_c
===
RCS file: patches/patch-src_daemon_main_c
diff -N patches/patch-src_daemon_main_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_daemon_main_c 11 Jan 2023 22:54:42 -
@@ -0,0 +1,17 @@
+Pass correct parameter
+https://gitlab.gnome.org/GNOME/libgtop/-/commit/df6393ac0cd785727329a97f731a4067334c0ace
+
+Index: src/daemon/main.c
+--- src/daemon/main.c.orig
src/daemon/main.c
+@@ -222,8 +222,9 @@ handle_parent_connection (int s)
+ 0, NULL);
+ break;
+ case GLIBTOP_CMND_PROC_IO:
++ memcpy (, parameter, sizeof (pid_t));
+ glibtop_get_proc_io_l
+- (server, >u.data.proc_io, parameter);
++ (server, >u.data.proc_io, pid);
+ do_output (s, resp, _offset_data (proc_io),
+ 0, NULL);
+ break;
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
signature.asc
Description: PGP signature
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2023/01/24 12:37:25 Modified files: textproc : Makefile Log message: +grepcidr3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2023/01/24 12:25:37 Log message: Import textproc/grepcidr3 OK sthen@ op@ Status: Vendor Tag: job Release Tags: job_2023014 N ports/textproc/grepcidr3/Makefile N ports/textproc/grepcidr3/distinfo N ports/textproc/grepcidr3/patches/patch-grepcidr_1 N ports/textproc/grepcidr3/patches/patch-grepcidr_c N ports/textproc/grepcidr3/pkg/DESCR N ports/textproc/grepcidr3/pkg/PLIST No conflicts created by this import
subversion ruby bindings and clang 15 (was: Re: amd64-clang bulk build report (llvm 15))
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?
Index: Makefile
===
RCS file: /home/cvs/ports/devel/subversion/Makefile,v
retrieving revision 1.197
diff -u -p -r1.197 Makefile
--- Makefile13 Nov 2022 15:28:25 - 1.197
+++ Makefile15 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
signature.asc
Description: PGP signature
Re: [new] textproc/grepcidr3 3.0
On 2023/01/24 20:08, Omar Polo wrote:
> On 2023/01/24 18:37:55 +, Job Snijders wrote:
> > Hi all,
> >
> > Attached is a port of textproc/grepcidr3, this fork of grepcidr has a
> > few command line options that the original lacks, such as -D:
> >
> > $ echo 10.1.1.0/24 | grepcidr3 -D 10.1.1.1
> > 10.1.1.0/24
> >
> > I added 2 patches:
> >* rename the utility to 'grepcidr3' (in order to avoid naming collisions)
> >* add pledge("stdio rpath", NULL) in main().
> >
> > OK?
>
> there's a CVS directory still left in pkg/
>
> needs a little tweak to respect CFLAGS and it's also custom to add a
> comment marker for stuff using pledge.
>
> --- Makefile.orig Tue Jan 24 19:55:47 2023
> +++ Makefile Tue Jan 24 19:56:16 2023
> @@ -11,7 +11,10 @@
> # BSD 2-Clause and GPLv2+
> PERMIT_PACKAGE= Yes
>
> +# uses pledge()
> WANTLIB += c
> +
> +MAKE_FLAGS +=CFLAGS="${CFLAGS}"
>
> NO_TEST= Yes
>
>
> could also set the version to something like 0.0pl20230107 since
> upstream hasn't tagged any version, even if it says 'grepcidr 3.0'
> with -V. would avoid setting EPOCH if upstream starts tagging with
> something lower than 3.0.
>
> otherwise the port looks OK for me.
+1 from me
> Don't know much about the history of the tool, there's any specific
> reason to not just upgrade the existing textproc/grepcidr to this
> fork instead?
This does some things that grepcidr doesn't do, and grepcidr does some
things that this doesn't do.
openvpn-auth-ldap, -export-dynamic and ld.lld -e (was: Re: amd64-clang bulk build report (llvm 15))
On Sun, Jan 08 2023, Jeremie Courreges-Anglas wrote: [...] >> https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/net/openvpn-auth-ldap.txt > [patch] > Incorrect LDFLAGS > ===> making all in src > gmake[1]: Entering directory > '/usr/ports/pobj/openvpn-auth-ldap-2.0.4/build-amd64/src' > ../tools/lemon > -T/usr/ports/pobj/openvpn-auth-ldap-2.0.4/openvpn-auth-ldap-auth-ldap-2.0.4/tools/lempar.c > -m -q > /usr/ports/pobj/openvpn-auth-ldap-2.0.4/openvpn-auth-ldap-auth-ldap-2.0.4/src/TRConfigParser.lemon > -OTRConfigParser.m > gmake[1]: *** [../Mk/compile.mk:12: TRConfigParser.m] Segmentation fault > (core dumped) This one is funny. There is a behavior difference between lld 13: shannon /tmp$ cc -export-dynamic main.c ld: warning: cannot find entry symbol xport-dynamic; defaulting to 0x1660 shannon /tmp$ ./a.out hello, world! and lld 15: pbuild-amd64 /tmp$ cc -export-dynamic main.c ld: warning: cannot find entry symbol xport-dynamic; not setting start address pbuild-amd64 /tmp$ ./a.out Segmentation fault (core dumped) Why "cannot find entry symbol xport-dynamic"? Because ld.lld(1) interprets this as -e xport-dynamic, and -e (--entry) sets the entry point. Now in the example above, 0x1660 is the start of the .text section. It somehow works with a trivial hello world example, openvpn-auth-ldap seems to rely on it and it's quite possible that other ports rely on this behavior. I have committed the fix for openvpn-auth-ldap. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE signature.asc Description: PGP signature
Re: [new] textproc/grepcidr3 3.0
On 2023/01/24 18:37:55 +, Job Snijders wrote:
> Hi all,
>
> Attached is a port of textproc/grepcidr3, this fork of grepcidr has a
> few command line options that the original lacks, such as -D:
>
> $ echo 10.1.1.0/24 | grepcidr3 -D 10.1.1.1
> 10.1.1.0/24
>
> I added 2 patches:
>* rename the utility to 'grepcidr3' (in order to avoid naming collisions)
>* add pledge("stdio rpath", NULL) in main().
>
> OK?
there's a CVS directory still left in pkg/
needs a little tweak to respect CFLAGS and it's also custom to add a
comment marker for stuff using pledge.
--- Makefile.orig Tue Jan 24 19:55:47 2023
+++ MakefileTue Jan 24 19:56:16 2023
@@ -11,7 +11,10 @@
# BSD 2-Clause and GPLv2+
PERMIT_PACKAGE=Yes
+# uses pledge()
WANTLIB += c
+
+MAKE_FLAGS += CFLAGS="${CFLAGS}"
NO_TEST= Yes
could also set the version to something like 0.0pl20230107 since
upstream hasn't tagged any version, even if it says 'grepcidr 3.0'
with -V. would avoid setting EPOCH if upstream starts tagging with
something lower than 3.0.
otherwise the port looks OK for me.
Don't know much about the history of the tool, there's any specific
reason to not just upgrade the existing textproc/grepcidr to this
fork instead?
[new] textproc/grepcidr3 3.0
Hi all,
Attached is a port of textproc/grepcidr3, this fork of grepcidr has a
few command line options that the original lacks, such as -D:
$ echo 10.1.1.0/24 | grepcidr3 -D 10.1.1.1
10.1.1.0/24
I added 2 patches:
* rename the utility to 'grepcidr3' (in order to avoid naming collisions)
* add pledge("stdio rpath", NULL) in main().
OK?
Kind regards,
Job
grepcidr3.tar.gz
Description: application/tar-gz
Re: Shrink Haskell binaries size via link time deduplication
Greg Steuck: > Yes, it does rely on us shipping lld on amd64 which is the only platform > with lang/ghc. lld is the default linker on amd64! You don't even need -fuse-ld=lld. $ ld -V LLD 13.0.0 (compatible with GNU linkers) -- Christian "naddy" Weisgerber na...@mips.inka.de
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2023/01/24 11:17:00 Modified files: audio/ladspa : Makefile distinfo audio/ladspa/pkg: PLIST Log message: ladspa: regen distinfo/plist. >From one machine at home I get a short fetch from ftp(1) (which is the file I generated distinfo for, but it untarred sufficiently ok that I didn't notice...) From another machine I get the full file, and from the original machine with curl I get the full file(!) Mirror the distfile as well, since there's something weird going on somewhere. Fetch issue reported by phessler.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2023/01/24 11:16:32 Modified files: audio/p5-Ogg-Vorbis-Header: Makefile audio/p5-Ogg-Vorbis-Header/patches: patch-lib_Ogg_Vorbis_Header_pm Log message: Fix return value of write_vorbis() to unbreak with clang 15
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2023/01/24 11:12:41 Modified files: audio/libworkman: Makefile audio/libworkman/patches: patch-Imakefile patch-cddb_c patch-cdinfo_c patch-cdrom_c patch-database_c patch-index_c patch-plat_openbsd_c patch-scsi_c patch-wm_helpers_c Log message: Fix build with clang 15 Refresh patches while here
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2023/01/24 11:09:35 Modified files: net/openvpn-auth-ldap: Makefile net/openvpn-auth-ldap/patches: patch-platform_m4 Log message: Properly pass -export-dynamic to the linker, fixes the build with lld 15
update devel/go-tools to v0.5.0
go-tools needs some love :)
Diff below updates it to the latest tag which is... 0.5.0, hence
EPOCH. I don't see any tag 1.12 tag in the repo, only 0.1.12.
Haven't digged in the history to see if they changed/retired tags.
go-tools doesn't have any other ports depending on it so nothing else
need to be done, right?
I've switched the port to use MODGO_MODNAME and fetch the modules
needed, dropping the build depends on net/go-net (which can be
removed, but this is for another thread once this gets in)
godoc doesn't need hacks now, but gopls is not bundled anymore. Not a
big deal, there's another tread in ports@ with a tarball for a new
devel/gopls port.
I had to roll my own do-build because the default one would build
every cmd. Not a big deal but there a few that doesn't make sense to
ship IMHO.
While here I've also synced DESCR with reality: some tools are not
distributed anymore (not even in the current version) and I've folded
some long lines. and updated HOMEPAGE. MODGO_TYPE was also
redundant, dropped.
Comments/Thoughts/OK?
Index: Makefile
===
RCS file: /home/cvs/ports/devel/go-tools/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- Makefile11 Mar 2022 18:50:08 - 1.27
+++ Makefile24 Jan 2023 18:00:16 -
@@ -1,11 +1,13 @@
COMMENT = various tools for the Go programming language
-GH_ACCOUNT = golang
-GH_PROJECT = tools
-GH_COMMIT =f727befe758c04ce68d52abc6e69ad111e2c6797
-DISTNAME = go-tools-1.12.20190226
+
+MODGO_MODNAME =golang.org/x/tools
+MODGO_VERSION =v0.5.0
+
+DISTNAME = go-tools-${MODGO_VERSION}
+EPOCH =0
+
CATEGORIES = devel
-HOMEPAGE = https://godoc.org/golang.org/x/tools
-REVISION = 2
+HOMEPAGE = https://pkg.go.dev/golang.org/x/tools
# 3-clause BSD
PERMIT_PACKAGE = Yes
@@ -13,14 +15,9 @@ PERMIT_PACKAGE = Yes
WANTLIB += c pthread
MODULES = lang/go
-MODGO_TYPE = bin
-BUILD_DEPENDS =net/go-net
RUN_DEPENDS = ${MODGO_RUN_DEPENDS}
-GODOC_TARGET = golang.org/x/tools/cmd/godoc
-
-_MAIN =golang.org/x/tools
_SUBPKGS = benchcmp \
bundle \
callgraph \
@@ -30,9 +27,9 @@ _SUBPKGS =benchcmp \
fiximports \
go-contrib-init \
godex \
+ godoc \
goimports \
gomvpkg \
- gopls \
gorename \
gotype \
goyacc \
@@ -44,18 +41,13 @@ _SUBPKGS = benchcmp \
stringer \
toolstash
-ALL_TARGET = ${_SUBPKGS:%=${_MAIN}/cmd/%}
-WRKSRC = ${MODGO_WORKSPACE}/src/${_MAIN}
-
-post-extract:
- mkdir -p ${MODGO_WORKSPACE}/pkg
+ALL_TARGET = ${_SUBPKGS:%=golang.org/x/tools/cmd/%}
+WRKDIST = ${WRKSRC}
-# godoc needs special handling - prior to Go 1.2, godoc was part of the base
-# distribution and there is a remaining mapping that causes 'go install' to
-# install godoc in $GOROOT/bin instead of $GOPATH/bin (golang.org/issue/6654).
+# default do-build set by go.port.mk would build everything under
+# cmd/... regardless of ALL_TARGET.
do-build:
- ${MODGO_BUILD_TARGET}
- ${MODGO_CMD} build ${MODGO_FLAGS} -o ${MODGO_WORKSPACE}/bin/godoc \
- ${GODOC_TARGET}
+ cd ${WRKSRC} && ${MODGO_BUILD_TARGET}
+.include "modules.inc"
.include
Index: distinfo
===
RCS file: /home/cvs/ports/devel/go-tools/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo16 Mar 2019 13:42:06 - 1.10
+++ distinfo24 Jan 2023 16:17:27 -
@@ -1,2 +1,32 @@
-SHA256 (go-tools-1.12.20190226-f727befe.tar.gz) =
zF8/BaUh7sY45AxfoyMYjGcS/bMv3aCdrd1qUwAcXM8=
-SIZE (go-tools-1.12.20190226-f727befe.tar.gz) = 2643081
+SHA256 (go-tools-v0.5.0.zip) = +Iunkk24qtwqk8kWE2tS9/zUZx5234cWqgLeWGqdGHE=
+SHA256 (go_modules/github.com/yuin/goldmark/@v/v1.4.13.mod) =
7n/kRmIDoB06wZrcE0zeyZvG3nGZLCjz3Zp0SAv/BgM=
+SHA256 (go_modules/github.com/yuin/goldmark/@v/v1.4.13.zip) =
u0GmArF0NF/aOSyK2D/MkyF8KFx2NplndjC+kP63peM=
+SHA256 (go_modules/golang.org/x/mod/@v/v0.7.0.mod) =
YkVnRZxumUesSr3gtwNO5h3Ltqk3P1lwCUwLs+gSGWQ=
+SHA256 (go_modules/golang.org/x/mod/@v/v0.7.0.zip) =
JKvR2xMymHPXIDTcJ++tCcvDfTnPKLj/e7PCrcju3vc=
+SHA256 (go_modules/golang.org/x/net/@v/v0.5.0.mod) =
XDe+Zi2TeArML0PMnG6heErvFMEaDyJ971zm23u4pwQ=
+SHA256 (go_modules/golang.org/x/net/@v/v0.5.0.zip) =
DmBoge6y9XKz1hrSpjnnnK0AIGQJDHXIOKovT+ymHI4=
+SHA256
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2023/01/24 11:05:35 Modified files: x11/fvwm2 : Makefile x11/fvwm3 : Makefile Log message: Use -Wno-error=int-conversion to unbreak configure step with clang 15
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2023/01/24 11:02:13 Modified files: devel/distcc : Makefile Log message: Drop -Werror to let this build with clang 15
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2023/01/24 10:53:35 Modified files: graphics/gimp/stable: Makefile Added files: graphics/gimp/stable/patches: patch-plug-ins_common_file-dicom_c Log message: Fix bogus return value and let this build with clang 15
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2023/01/24 10:48:32 Modified files: x11/mplayer: Makefile Added files: x11/mplayer/patches: patch-libmpcodecs_ve_lavc_c Log message: Fix ffmpeg API usage, lets this build with clang 15 Maintainer timeout
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2023/01/24 10:44:18 Modified files: cad/magic : Makefile Added files: cad/magic/patches: patch-database_DBpaint_c patch-drc_DRCtech_c Log message: One fix and one explicit cast needed to build this with clang 15 -Wint-conversion Maintainer timeout
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: kette...@cvs.openbsd.org2023/01/24 09:17:29 Modified files: multimedia/x265: Makefile Added files: multimedia/x265/patches: patch-source_common_x86_h-ipfilter8_asm Log message: Move a bit of data that sneaked into .text into .rodata. Makes the tests run (and pass) on amd64 with PKU (x-only) enabled. ok robert@
Re: [new] devel/gopls version 0.11.0
On 2023/01/24 15:36:22 +0100, Laurent Cheylus wrote:
> Hi,
>
> proposal to import devel/gopls for gopls version 0.11.0
>
> gopls is the official Go language server developed by the Go team
> https://pkg.go.dev/golang.org/x/tools/gopls
>
> Changelog for version 0.11.0
> https://github.com/golang/tools/releases/tag/gopls%2Fv0.11.0
>
> Build and tests OK on amd64 using Neovim editor + configuration with
> nvim-lsp plugin.
>
> Comments welcome and please commit if OK.
gopls is already included in go-tools, so it would conflict.
% pkglocate bin/gopls
go-tools-1.12.20190226p2:devel/go-tools:/usr/local/bin/gopls
However the latter hasn't receved much love recently. (I for one
forgot its existance, i have a locally installed gopls in ~/go/bin.)
I would agree with splitting gopls as standalone port. It would make
go-tools easier to update and even upstream seems to consider gopls
separate from the other go-tools (gopls has its own tags in the repo.)
Otherwise your port looks ok to me, just consider this semplification
for post-install:
--- Makefile.orig Tue Jan 24 16:43:28 2023
+++ MakefileTue Jan 24 16:43:50 2023
@@ -21,13 +21,9 @@
DOCDIR =${PREFIX}/share/doc/gopls
post-install:
- ${INSTALL_DATA_DIR} ${DOCDIR}
+ ${INSTALL_DATA_DIR} ${DOCDIR}/doc/design
${INSTALL_DATA} ${WRKSRC}/README.md ${DOCDIR}
-
- ${INSTALL_DATA_DIR} ${DOCDIR}/doc
${INSTALL_DATA} ${WRKSRC}/doc/*.md ${DOCDIR}/doc
-
- ${INSTALL_DATA_DIR} ${DOCDIR}/doc/design
${INSTALL_DATA} ${WRKSRC}/doc/design/*.md ${DOCDIR}/doc/design
.include "modules.inc"
it would also need a @conflict marker in pkg/PLIST... but let me take
a look at updating go-tools first.
Thanks,
Omar Polo
x265 x-only fix
Found one file that had a little bit of data in .text. With this fix
the tests pass.
ok?
Index: multimedia/x265/Makefile
===
RCS file: /cvs/ports/multimedia/x265/Makefile,v
retrieving revision 1.54
diff -u -p -r1.54 Makefile
--- multimedia/x265/Makefile11 Mar 2022 19:39:29 - 1.54
+++ multimedia/x265/Makefile24 Jan 2023 15:41:10 -
@@ -3,7 +3,7 @@ COMMENT=free H.265/HEVC encoder
VER= 3.5
DISTNAME= x265_${VER}
PKGNAME= x265-${VER}
-REVISION= 0
+REVISION= 1
CATEGORIES=multimedia
MASTER_SITES= https://bitbucket.org/multicoreware/x265_git/downloads/
Index: multimedia/x265/patches/patch-source_common_x86_h-ipfilter8_asm
===
RCS file: multimedia/x265/patches/patch-source_common_x86_h-ipfilter8_asm
diff -N multimedia/x265/patches/patch-source_common_x86_h-ipfilter8_asm
--- /dev/null 1 Jan 1970 00:00:00 -
+++ multimedia/x265/patches/patch-source_common_x86_h-ipfilter8_asm 24 Jan
2023 15:41:10 -
@@ -0,0 +1,23 @@
+Index: source/common/x86/h-ipfilter8.asm
+--- source/common/x86/h-ipfilter8.asm.orig
source/common/x86/h-ipfilter8.asm
+@@ -125,6 +125,9 @@ const pb_8tap_hps_0, times 2 db 0, 1, 1, 2, 2, 3, 3, 4
+ ALIGN 32
+ interp4_hps_shuf: times 2 db 0, 1, 2, 3, 1, 2, 3, 4, 8, 9, 10, 11, 9, 10, 11,
12
+
++ALIGN 32
++const interp_4tap_8x8_horiz_shuf, dd 0, 4, 1, 5, 2, 6, 3, 7
++
+ SECTION .text
+
+ cextern pw_1
+@@ -1458,9 +1461,6 @@ cglobal interp_4tap_horiz_pp_4x32, 4, 6, 5, src, srcst
+ jnz .loop
+
+ RET
+-
+-ALIGN 32
+-const interp_4tap_8x8_horiz_shuf, dd 0, 4, 1, 5, 2, 6, 3, 7
+
+ %macro FILTER_H4_w6 3
+ movu%1, [srcq - 1]
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: phess...@cvs.openbsd.org2023/01/24 08:37:10 Modified files: graphics/opencv/patches: patch-modules_core_src_system_cpp Log message: fix build by removing an outdated patch doesn't build on the only arch affected, so no bump
Re: amd64: data value inside .text warning results
Christian Weisgerber: > editors/neovim ? luajit, requires build > games/tome4 ? luajit, requires build > lang/luajit ? required build Those are false positivies. The luajit build produces a 2700-line file lj_vm.s, which contains function definitions like this: .globl lj_BC_ISLT .hidden lj_BC_ISLT .type lj_BC_ISLT, @function .size lj_BC_ISLT, 72 lj_BC_ISLT: .byte 129,124,202,4,255,255,254,255,15,131,11,29,0,0,129,124 .byte 194,4,255,255,254,255,15,131,253,28,0,0,242,15,16,4 .byte 194,131,195,4,102,15,46,4,202,118,11,15,183,67,254,141 .byte 156,131,0,0,254,255,139,3,15,182,204,15,182,232,131,195 .byte 4,193,232,16,65,255,36,238 I've skimmed over the whole file and I don't see anything in there that looks like a data table. -- Christian "naddy" Weisgerber na...@mips.inka.de
[update] sysutils/fzf 0.37.0
Hi,
a simple update for sysutils/fzf latest version 0.37.0
Changelog for this version
https://github.com/junegunn/fzf/releases/tag/0.37.0
Please commit if OK.
Laurent
Index: Makefile
===
RCS file: /cvs/ports/sysutils/fzf/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile 18 Jan 2023 14:30:45 - 1.16
+++ Makefile 24 Jan 2023 15:19:36 -
@@ -1,9 +1,9 @@
COMMENT = command-line fuzzy finder
MODGO_MODNAME = github.com/junegunn/fzf
-MODGO_VERSION = v0.0.0-20230116163305-20230117636c
+MODGO_VERSION = v0.0.0-20230124131114-2023012408ff
-V = 0.36.0
+V = 0.37.0
DISTNAME = fzf-${V}
CATEGORIES = sysutils
Index: distinfo
===
RCS file: /cvs/ports/sysutils/fzf/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo 18 Jan 2023 14:30:45 - 1.9
+++ distinfo 24 Jan 2023 15:19:36 -
@@ -1,4 +1,4 @@
-SHA256 (fzf-0.36.0.zip) = 1di721pXU8VB9ixKPQq+0cyrk8DMxHgHHRRQopQ6OHc=
+SHA256 (fzf-0.37.0.zip) = M05y9OzI4yaWaUKxcb1D+bihHo6CuTLq2gIAsmnunpA=
SHA256 (go_modules/github.com/gdamore/encoding/@v/v1.0.0.mod) = pJgRJVFfDy3yU8LeOjrBlwx0Q+W2adlH6HTnezaBtuU=
SHA256 (go_modules/github.com/gdamore/encoding/@v/v1.0.0.zip) = Y4qYMuL2LRGNfFEdhr2uFiKlHzMd5IoB2Sn9JOvmoqY=
SHA256 (go_modules/github.com/gdamore/tcell/v2/@v/v2.5.4.mod) = 4zhutrVn0oD6CGHqAr93IkVDVuXmzBVThvjmX/RGQ5E=
@@ -52,7 +52,7 @@ SHA256 (go_modules/golang.org/x/tools/@v
SHA256 (go_modules/golang.org/x/tools/@v/v0.1.12.zip) = SxIuDkcDvEAUyxz4wBT8+T6n1y8B2nlJk2U0b1TLuFE=
SHA256 (go_modules/golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod) = ql4+ybt7n2gWCe+sAZ2d4ae6dxkkj/Hqon54iC2z1/U=
SHA256 (go_modules/golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.zip) = xOnwY8/tVGyQ8AqWV96sT5FaiZT4y+bb0/GOeeuDAs8=
-SIZE (fzf-0.36.0.zip) = 272092
+SIZE (fzf-0.37.0.zip) = 273480
SIZE (go_modules/github.com/gdamore/encoding/@v/v1.0.0.mod) = 77
SIZE (go_modules/github.com/gdamore/encoding/@v/v1.0.0.zip) = 19867
SIZE (go_modules/github.com/gdamore/tcell/v2/@v/v2.5.4.mod) = 308
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2023/01/24 07:54:45 Modified files: lang/mono : Makefile Added files: lang/mono/patches: patch-external_boringssl_crypto_aes_asm_aes-x86_64_pl patch-external_boringssl_crypto_aes_asm_aesni-x86_64_pl patch-external_boringssl_crypto_aes_asm_aesv8-armx_pl patch-external_boringssl_crypto_aes_asm_bsaes-x86_64_pl patch-external_boringssl_crypto_aes_asm_vpaes-x86_64_pl patch-external_boringssl_crypto_bn_asm_armv8-mont_pl patch-external_boringssl_crypto_bn_asm_rsaz-x86_64_pl patch-external_boringssl_crypto_bn_asm_x86_64-mont5_pl patch-external_boringssl_crypto_chacha_asm_chacha-armv8_pl patch-external_boringssl_crypto_chacha_asm_chacha-x86_64_pl patch-external_boringssl_crypto_ec_asm_p256-x86_64-asm_pl patch-external_boringssl_crypto_modes_asm_aesni-gcm-x86_64_pl patch-external_boringssl_crypto_modes_asm_ghash-x86_64_pl patch-external_boringssl_crypto_modes_asm_ghashv8-armx_pl patch-external_boringssl_crypto_poly1305_asm_poly1305-armv8_pl patch-external_boringssl_crypto_poly1305_asm_poly1305-x86_64_pl patch-external_boringssl_crypto_sha_asm_sha1-armv8_pl patch-external_boringssl_crypto_sha_asm_sha1-x86_64_pl patch-external_boringssl_crypto_sha_asm_sha512-armv8_pl patch-external_boringssl_crypto_sha_asm_sha512-x86_64_pl Log message: port most of the perlasm x-only fixes over to mono to unreak ok tb@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2023/01/24 07:52:01 Modified files: audio/ladspa : Makefile distinfo audio/ladspa/patches: patch-src_Makefile audio/ladspa/pkg: PLIST Log message: update to ladspa-1.17, while there use the correct default plugin search path so that tools work without setting LADSPA_PATH
[new] devel/gopls version 0.11.0
Hi, proposal to import devel/gopls for gopls version 0.11.0 gopls is the official Go language server developed by the Go team https://pkg.go.dev/golang.org/x/tools/gopls Changelog for version 0.11.0 https://github.com/golang/tools/releases/tag/gopls%2Fv0.11.0 Build and tests OK on amd64 using Neovim editor + configuration with nvim-lsp plugin. Comments welcome and please commit if OK. Laurent gopls-0.11.0.tar.gz Description: GNU Zip compressed data
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2023/01/24 07:37:21 Modified files: www/chromium : Makefile www/iridium: Makefile www/ungoogled-chromium: Makefile Added files: www/chromium/patches: patch-third_party_ffmpeg_libavcodec_x86_fft_asm www/iridium/patches: patch-third_party_ffmpeg_libavcodec_x86_fft_asm www/ungoogled-chromium/patches: patch-third_party_ffmpeg_libavcodec_x86_fft_asm Log message: backport x-only amd64 ffmpeg asm patch from kettenis@: The x86 assembly FFT implementation uses dispatch tables in .text. This is incompatible with x-only so move them into .data.rel.ro where we can have relocations. But since they are in the RELRO segment they will be made read-only by ld.so after relocations have been processed.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: o...@cvs.openbsd.org2023/01/24 07:20:29 Modified files: security/john-jumbo: Makefile Added files: security/john-jumbo/patches: patch-src_nsec3_fmt_plug_c Log message: Add patch for https://github.com/openwall/john/pull/5185, already merged in upstream, allowing for empty NSEC3 salt ok sebastia@
Re: [new] devel/lua-argparse version 0.7.1
Le 2023-01-24 11:20, Omar Polo a écrit :
On 2023/01/24 10:00:10 +0100, Laurent Cheylus wrote:
I would like to import a new port for devel/lua-argparse, a simple Lua
module for command line parser inspired by argparse for Python.
nitpick: needs NO_TEST=Yes since we don't have busted and could use
PKG_ARCH=*
Thanks Omar for your review of my new port.
Attached a diff to add PKG_ARCH and NO_TEST variables in Makefile
Laurent
diff --git a/devel/lua-argparse/Makefile b/devel/lua-argparse/Makefile
index e028324be..4a260c738 100644
--- a/devel/lua-argparse/Makefile
+++ b/devel/lua-argparse/Makefile
@@ -1,3 +1,5 @@
+PKG_ARCH = *
+
COMMENT = command line parser for Lua
GH_ACCOUNT = luarocks
@@ -19,6 +21,7 @@ FLAVORS = lua52 lua53 lua54
FLAVOR? =
NO_BUILD = Yes
+NO_TEST = Yes
do-install:
${INSTALL_DATA_DIR} ${MODLUA_DATADIR}
Puppet master status [was: Re: CVS: cvs.openbsd.org: ports]
On Fri, Jan 20, 2023 at 08:59:35PM +, Sebastian Reitenbach wrote: > CVSROOT: /cvs > Module name: ports > Changes by: sebas...@cvs.openbsd.org2023/01/20 13:59:35 > > Removed files: > sysutils/ruby-puppet/5: Makefile distinfo > sysutils/ruby-puppet/5/patches: patch-ext_rack_config_ru > patch-install_rb > patch-lib_puppet_defaults_rb > > patch-lib_puppet_file_system_file_impl_rb > patch-lib_puppet_gettext_config_rb > > patch-lib_puppet_provider_package_gem_rb > > patch-lib_puppet_provider_package_openbsd_rb > > patch-lib_puppet_provider_package_pip3_rb > > patch-lib_puppet_provider_package_pip_rb > > patch-lib_puppet_provider_service_openbsd_rb > > patch-lib_puppet_reference_configuration_rb > patch-lib_puppet_util_run_mode_rb > sysutils/ruby-puppet/5/pkg: PLIST > > Log message: > bye bye puppet 5 > > OK jeremy@ is puppetmaster definitely gone ? this will need an upgrade.html entry at least. Cheers Giovanni signature.asc Description: PGP signature
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: kette...@cvs.openbsd.org2023/01/24 07:13:12 Modified files: graphics/ffmpeg: Makefile Added files: graphics/ffmpeg/patches: patch-libavcodec_x86_fft_asm Log message: The x86 assembly FFT implementation uses dispatch tables in .text. This is incompatible with x-only so move them into .data.rel.ro where we can have relocations. But since they are in the RELRO segment they will be made read-only by ld.so after relocations have been processed. ok robert@ (who tested i386)
Re: ffmpeg x-only fix
works on i386 as well, so ok
On 24/01/23 14:36 +0100, Mark Kettenis wrote:
> This makes all the tests pass on an amd64 machine with PKU. The trick
> is to put the dispatch tables in .data.rel.ro. That means we can have
> relocations there but that the tables become read-only after the
> relocations have been processed. Since the table now contains the
> actual addresses of the functions the extra PIC code isn't needed
> anymore. Bumped REVISION to make sure folks get an updated version.
>
> According to robert@ it builds on i386, but the tests fail because the
> -Wl,-znotext isn't passed down to the tests for some reason. But that
> isn't a new problem as far as I can tell.
>
> Upstream probably cares about platforms without relro (which is fairly
> specific to ELF), so this is probably not upstreamable without some
> further abstractions/changes.
>
> ok?
>
>
> Index: graphics/ffmpeg/Makefile
> ===
> RCS file: /cvs/ports/graphics/ffmpeg/Makefile,v
> retrieving revision 1.230
> diff -u -p -r1.230 Makefile
> --- graphics/ffmpeg/Makefile 24 Jan 2023 12:08:40 - 1.230
> +++ graphics/ffmpeg/Makefile 24 Jan 2023 13:27:45 -
> @@ -2,7 +2,7 @@ COMMENT= audio/video converter and strea
>
> V= 4.4.3
> DISTNAME=ffmpeg-${V}
> -REVISION=2
> +REVISION=3
> EPOCH= 1
> CATEGORIES= graphics multimedia
> MASTER_SITES=https://ffmpeg.org/releases/
> Index: graphics/ffmpeg/patches/patch-libavcodec_x86_fft_asm
> ===
> RCS file: graphics/ffmpeg/patches/patch-libavcodec_x86_fft_asm
> diff -N graphics/ffmpeg/patches/patch-libavcodec_x86_fft_asm
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ graphics/ffmpeg/patches/patch-libavcodec_x86_fft_asm 24 Jan 2023
> 13:27:45 -
> @@ -0,0 +1,37 @@
> +Index: libavcodec/x86/fft.asm
> +--- libavcodec/x86/fft.asm.orig
> libavcodec/x86/fft.asm
> +@@ -548,10 +548,6 @@ DEFINE_ARGS zc, w, n, o1, o3
> + %macro FFT_DISPATCH 2; clobbers 5 GPRs, 8 XMMs
> + lea r2, [dispatch_tab%1]
> + mov r2, [r2 + (%2q-2)*gprsize]
> +-%ifdef PIC
> +-lea r3, [$$]
> +-add r2, r3
> +-%endif
> + call r2
> + %endmacro ; FFT_DISPATCH
> +
> +@@ -731,11 +727,7 @@ DECL_PASS pass_interleave_3dnow, PASS_BIG 0
> + %define pass_interleave_3dnowext pass_interleave_3dnow
> + %endif
> +
> +-%ifdef PIC
> +-%define SECTION_REL - $$
> +-%else
> + %define SECTION_REL
> +-%endif
> +
> + %macro DECL_FFT 1-2 ; nbits, suffix
> + %ifidn %0, 1
> +@@ -773,8 +765,10 @@ fft %+ n %+ fullsuffix:
> + %endrep
> + %undef n
> +
> ++[SECTION .data.rel.ro write]
> + align 8
> + dispatch_tab %+ fullsuffix: pointer list_of_fft
> ++__?SECT?__
> + %endmacro ; DECL_FFT
> +
> + %if HAVE_AVX_EXTERNAL
--
Regards,
Robert Nagy
Re: [Update] devel/dune 3.6.2
Thanks a lot Volker and Christopher!
Do we need to handle the upgrade path for the -private sub package since it is
going away?
> On Jan 22, 2023, at 11:12 AM, Christopher Zimmermann
> wrote:
>
> On Sun, Jan 22, 2023 at 04:45:38PM +0100, Volker Schlecht wrote:
>>> If you don't have access to a bytecode-only arch (like me), you can
>>> simulate it:
>>
>> Thanks - I did, and with the attached patch that worked out nicely!
>
> Then ok chrisz@
>
> Thanks a lot for your effort :)
>
> Christopher
>
>> Index: Makefile
>> ===
>> RCS file: /cvs/ports/devel/dune/Makefile,v
>> retrieving revision 1.16
>> diff -u -p -r1.16 Makefile
>> --- Makefile11 Mar 2022 18:49:59 -1.16
>> +++ Makefile22 Jan 2023 15:00:45 -
>> @@ -1,13 +1,9 @@
>> -MULTI_PACKAGES =-main -private -configurator
>> +MULTI_PACKAGES =-main -configurator
>> COMMENT-main =OCaml build system
>> -COMMENT-private =private libraries of the dune build system
>> COMMENT-configurator =OCaml library for gathering system configuration
>> -REVISION-configurator =2
>> -REVISION-main =1
>> -REVISION-private =2
>> -VERSION =2.7.0
>> +VERSION =3.6.2
>> CATEGORIES =devel
>> @@ -26,31 +22,38 @@ WANTLIB-main =c m pthread
>> MODULES =lang/ocaml
>> -RUN_DEPENDS-configurator = devel/dune,-private
>> +RUN_DEPENDS-configurator = devel/dune
>> CONFIGURE_STYLE =simple
>> -CONFIGURE_ARGS =--libdir ${PREFIX}/lib/ocaml/
>> +
>> +# Set default installation directories
>> +# These affect runtime behavior later!
>> +CONFIGURE_ARGS =--bindir ${TRUEPREFIX}/bin \
>> +--sbindir ${TRUEPREFIX}/sbin \
>> +--datadir ${TRUEPREFIX}/share \
>> +--etcdir ${SYSCONFDIR} \
>> +--libdir ${TRUEPREFIX}/lib/ocaml \
>> +--libexecdir ${TRUEPREFIX}/lib/ocaml \
>> +--mandir ${TRUEPREFIX}/man \
>> +--docdir ${TRUEPREFIX}/share/doc
>> +
>> +MAKE_ENV +=JOBS=${MAKE_JOBS}
>> USE_GMAKE =Yes
>> ALL_TARGET =release
>> -#FAKE_FLAGS =PREFIX=${PREFIX} LIBDIR=lib/ocaml
>> -INSTALL_TARGET =install
>> +FAKE_FLAGS =PREFIX=${TRUEPREFIX} LIBDIR=${PREFIX}/lib/ocaml
>> +INSTALL_TARGET =doc install
>> -#./dune.exe build --display=short
>> post-build:
>>cd ${WRKSRC} && env -i ${MAKE_ENV} \
>> -./dune.exe build --display=short \
>> -dune-private-libs.install dune-configurator.install
>> +./dune.exe build -j${MAKE_JOBS} --display=short \
>> +stdune.install dune-configurator.install
>> do-install:
>>cd ${WRKSRC} && env -i ${MAKE_ENV} ${FAKE_SETUP} \
>> -./dune.exe install --display=short \
>> -dune dune-private-libs dune-configurator
>> -
>> -post-install:
>> -mv ${PREFIX}/doc/* ${PREFIX}/share/doc/
>> -rmdir ${PREFIX}/doc
>> +./dune.exe install -j${MAKE_JOBS} --display=short \
>> +dune stdune dune-configurator
>> .include
>> Index: distinfo
>> ===
>> RCS file: /cvs/ports/devel/dune/distinfo,v
>> retrieving revision 1.5
>> diff -u -p -r1.5 distinfo
>> --- distinfo4 Dec 2021 03:05:30 -1.5
>> +++ distinfo22 Jan 2023 15:00:45 -
>> @@ -1,2 +1,2 @@
>> -SHA256 (dune-2.7.0.tar.gz) = 2R9VSUrWHvpYQ97cCE2qZKaXUfCM7xPd6IPvp49+eL4=
>> -SIZE (dune-2.7.0.tar.gz) = 1284969
>> +SHA256 (dune-3.6.2.tar.gz) = hMKdXR1BdRipwz6HQJ3YZf7UzVugabQ/+OAwYDR06Bs=
>> +SIZE (dune-3.6.2.tar.gz) = 1906553
>> Index: patches/patch-Makefile
>> ===
>> RCS file: patches/patch-Makefile
>> diff -N patches/patch-Makefile
>> --- /dev/null1 Jan 1970 00:00:00 -
>> +++ patches/patch-Makefile22 Jan 2023 15:00:45 -
>> @@ -0,0 +1,13 @@
>> +Respect MAKE_JOBS during bootstrap phase
>> +Index: Makefile
>> +--- Makefile.orig
>> Makefile
>> +@@ -47,7 +47,7 @@ release: $(BIN)
>> +@$(BIN) build @install -p dune --profile dune-bootstrap
>> + + $(BIN):
>> +-@ocaml boot/bootstrap.ml
>> ++@ocaml boot/bootstrap.ml -j $(JOBS)
>> + + dev: $(BIN)
>> +$(BIN) build @install
>> Index: patches/patch-src_dune_cram_exec_ml
>> ===
>> RCS file: patches/patch-src_dune_cram_exec_ml
>> diff -N patches/patch-src_dune_cram_exec_ml
>> --- patches/patch-src_dune_cram_exec_ml11 Mar 2022 18:49:59 -1.2
>> +++ /dev/null1 Jan 1970 00:00:00 -
>> @@ -1,15 +0,0 @@
>> -Backport commit for ocaml 4.13 support. see:
>> -https://github.com/ocaml/dune/commit/c1e82f94aa2883feda752df450130ee204855c09
>> -
>> -Index: src/dune/cram_exec.ml
>> src/dune/cram_exec.ml.orig
>> -+++ src/dune/cram_exec.ml
>> -@@ -283,7 +283,7 @@ let rewrite_paths build_path_prefix_map ~parent_script
>> - - let sanitize ~parent_script cram_to_output :
>> - (block_result * metadata_entry * string) Cram_lexer.block
ffmpeg x-only fix
This makes all the tests pass on an amd64 machine with PKU. The trick
is to put the dispatch tables in .data.rel.ro. That means we can have
relocations there but that the tables become read-only after the
relocations have been processed. Since the table now contains the
actual addresses of the functions the extra PIC code isn't needed
anymore. Bumped REVISION to make sure folks get an updated version.
According to robert@ it builds on i386, but the tests fail because the
-Wl,-znotext isn't passed down to the tests for some reason. But that
isn't a new problem as far as I can tell.
Upstream probably cares about platforms without relro (which is fairly
specific to ELF), so this is probably not upstreamable without some
further abstractions/changes.
ok?
Index: graphics/ffmpeg/Makefile
===
RCS file: /cvs/ports/graphics/ffmpeg/Makefile,v
retrieving revision 1.230
diff -u -p -r1.230 Makefile
--- graphics/ffmpeg/Makefile24 Jan 2023 12:08:40 - 1.230
+++ graphics/ffmpeg/Makefile24 Jan 2023 13:27:45 -
@@ -2,7 +2,7 @@ COMMENT=audio/video converter and strea
V= 4.4.3
DISTNAME= ffmpeg-${V}
-REVISION= 2
+REVISION= 3
EPOCH= 1
CATEGORIES=graphics multimedia
MASTER_SITES= https://ffmpeg.org/releases/
Index: graphics/ffmpeg/patches/patch-libavcodec_x86_fft_asm
===
RCS file: graphics/ffmpeg/patches/patch-libavcodec_x86_fft_asm
diff -N graphics/ffmpeg/patches/patch-libavcodec_x86_fft_asm
--- /dev/null 1 Jan 1970 00:00:00 -
+++ graphics/ffmpeg/patches/patch-libavcodec_x86_fft_asm24 Jan 2023
13:27:45 -
@@ -0,0 +1,37 @@
+Index: libavcodec/x86/fft.asm
+--- libavcodec/x86/fft.asm.orig
libavcodec/x86/fft.asm
+@@ -548,10 +548,6 @@ DEFINE_ARGS zc, w, n, o1, o3
+ %macro FFT_DISPATCH 2; clobbers 5 GPRs, 8 XMMs
+ lea r2, [dispatch_tab%1]
+ mov r2, [r2 + (%2q-2)*gprsize]
+-%ifdef PIC
+-lea r3, [$$]
+-add r2, r3
+-%endif
+ call r2
+ %endmacro ; FFT_DISPATCH
+
+@@ -731,11 +727,7 @@ DECL_PASS pass_interleave_3dnow, PASS_BIG 0
+ %define pass_interleave_3dnowext pass_interleave_3dnow
+ %endif
+
+-%ifdef PIC
+-%define SECTION_REL - $$
+-%else
+ %define SECTION_REL
+-%endif
+
+ %macro DECL_FFT 1-2 ; nbits, suffix
+ %ifidn %0, 1
+@@ -773,8 +765,10 @@ fft %+ n %+ fullsuffix:
+ %endrep
+ %undef n
+
++[SECTION .data.rel.ro write]
+ align 8
+ dispatch_tab %+ fullsuffix: pointer list_of_fft
++__?SECT?__
+ %endmacro ; DECL_FFT
+
+ %if HAVE_AVX_EXTERNAL
Re: [m8r update] x11/copyq
On 2023/01/24 13:48, Robert Bagdan wrote: > Maintainer, sorry :) Ah right. Thanks, committed. > Stuart Henderson ezt írta (időpont: 2023. jan. 24., K > 13:46): > > > On 2023/01/24 10:37, Robert Bagdan wrote: > > > I updated copyq, built without problem, works fine for me. > > > > Looks alright and nothing concerning in the changelog. > > > > What's "m8r"? > > > >
Re: CVS: cvs.openbsd.org: ports
On 2023/01/24 06:14, Stuart Henderson wrote: > CVSROOT: /cvs > Module name: ports > Changes by: st...@cvs.openbsd.org 2023/01/24 06:14:15 > > Modified files: > x11/copyq : Makefile distinfo > > Log message: > update to copyq-6.4.0 > (from Robert Bagdan, maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2023/01/24 06:14:15 Modified files: x11/copyq : Makefile distinfo Log message: update to copyq-6.4.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/01/24 05:53:43 Modified files: archivers/pigz : Makefile archivers/pigz/patches: patch-pigz_c Log message: Tighten pledge pigz starts with "stdio rpath wpath cpath fattr chown" like base gzip(1). For `g.pipeout' aka. -c --stdout and `g.decode == 2' aka. -t --test, pigz drops to "stdio rpath cpath" while gzip uses "stdio rpath". The original pledge diff added "cpath" for the case where pigz's signal handler unlink(2)s output files, but this is actually not needed since -c and -t never open any file for output/writing. Drop "cpath" to match gzip behaviour. Do the same for `g.list' aka. -l --list.
Re: [m8r update] x11/copyq
Maintainer, sorry :) Stuart Henderson ezt írta (időpont: 2023. jan. 24., K 13:46): > On 2023/01/24 10:37, Robert Bagdan wrote: > > I updated copyq, built without problem, works fine for me. > > Looks alright and nothing concerning in the changelog. > > What's "m8r"? > >
Re: [m8r update] x11/copyq
On 2023/01/24 10:37, Robert Bagdan wrote: > I updated copyq, built without problem, works fine for me. Looks alright and nothing concerning in the changelog. What's "m8r"?
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2023/01/24 05:24:35 Modified files: x11/gnome/librsvg/patches: patch-vendor_cfg-expr_src_targets_builtins_rs Log message: Fix rust targets list sorting and unbreak on riscv64 Since the riscv64 target name changed its position in the sorted list needs to be adapted, else the target can't be found. No bump needed since it didn't build, fix present in the riscv64 bulk build started on Jan 7.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2023/01/24 05:08:41 Modified files: graphics/ffmpeg: Makefile Log message: make sure to use the libraries inside the build directory for regression tests
[m8r update] x11/copyq
I updated copyq, built without problem, works fine for me.
--
kikadf
Index: x11/copyq/Makefile
===
RCS file: /cvs/ports/x11/copyq/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- x11/copyq/Makefile 14 Oct 2022 13:39:34 - 1.1.1.1
+++ x11/copyq/Makefile 24 Jan 2023 09:32:13 -
@@ -1,7 +1,7 @@
COMMENT = Qt5 based clipboard manager
GH_ACCOUNT = hluk
GH_PROJECT = CopyQ
-GH_TAGNAME = v6.3.2
+GH_TAGNAME = v6.4.0
PKGNAME = ${DISTNAME:L}
CATEGORIES = x11
Index: x11/copyq/distinfo
===
RCS file: /cvs/ports/x11/copyq/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- x11/copyq/distinfo 14 Oct 2022 13:39:34 - 1.1.1.1
+++ x11/copyq/distinfo 24 Jan 2023 09:32:13 -
@@ -1,2 +1,2 @@
-SHA256 (CopyQ-6.3.2.tar.gz) = zhIu1/jj4jCxxtzOjx7G1xfu+MWYKTkMrhdQw1s0LEo=
-SIZE (CopyQ-6.3.2.tar.gz) = 3325217
+SHA256 (CopyQ-6.4.0.tar.gz) = rGdXoQ7S1inemsu2Rs27pc9RGX6d/jnT2y/zQGn8SDE=
+SIZE (CopyQ-6.4.0.tar.gz) = 3316278
[m8r update] x11/copyq
I updated copyq, built without problem, works fine for me.
--
kikadf
Index: x11/copyq/Makefile
===
RCS file: /cvs/ports/x11/copyq/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- x11/copyq/Makefile 14 Oct 2022 13:39:34 - 1.1.1.1
+++ x11/copyq/Makefile 24 Jan 2023 09:32:13 -
@@ -1,7 +1,7 @@
COMMENT = Qt5 based clipboard manager
GH_ACCOUNT = hluk
GH_PROJECT = CopyQ
-GH_TAGNAME = v6.3.2
+GH_TAGNAME = v6.4.0
PKGNAME = ${DISTNAME:L}
CATEGORIES = x11
Index: x11/copyq/distinfo
===
RCS file: /cvs/ports/x11/copyq/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- x11/copyq/distinfo 14 Oct 2022 13:39:34 - 1.1.1.1
+++ x11/copyq/distinfo 24 Jan 2023 09:32:13 -
@@ -1,2 +1,2 @@
-SHA256 (CopyQ-6.3.2.tar.gz) = zhIu1/jj4jCxxtzOjx7G1xfu+MWYKTkMrhdQw1s0LEo=
-SIZE (CopyQ-6.3.2.tar.gz) = 3325217
+SHA256 (CopyQ-6.4.0.tar.gz) = rGdXoQ7S1inemsu2Rs27pc9RGX6d/jnT2y/zQGn8SDE=
+SIZE (CopyQ-6.4.0.tar.gz) = 3316278
Re: [new] sysutils/tiramisu: print dbus notifications to stdout
friendly ping, tarball reattached with fixed MAINTAINER (thanks Mattia! :-) On 2023/01/18 11:00:44 +0100, Omar Polo wrote: > Hi, > > please find attached a port for tiramisu, a simple utility that > connects to dbus and prints the notifications to stdout. I've been > using it for the last days with xnotify and works quite well. > > it's almost identical to a tarball Mattia sent me offlist, with the > major difference being the patch to call pledge. > Mattia: do you want to take the maintainership? > > There are some warnings when compilig, but they don't seem too grave > (some checks for a NULL pointer that are always false and loosing the > `const'/`volatile' qualifier when calling other functions.) (just to clarify, these comes from the vala code, and I don't feel confident to touch it.) > ok to import? tiramisu.tar.gz Description: GNU Zip compressed data
Re: [new] devel/lua-argparse version 0.7.1
Hello, On 2023/01/24 10:00:10 +0100, Laurent Cheylus wrote: > Hi, > > I would like to import a new port for devel/lua-argparse, a simple Lua > module for command line parser inspired by argparse for Python. > > GH repository https://github.com/luarocks/argparse > > I need this Lua module to update devel/luacheck and after discussions > with jsg@, he advised me to create this new port. > > This port supports FLAVORS for Lua 5.1, 5.2, 5.3 and 5.4. > > Install and tests OK on amd64. > > Comments welcome and please commit if OK. > > Laurent nitpick: needs NO_TEST=Yes since we don't have busted and could use PKG_ARCH=* otherwise it looks fine to me, ok op@ to import. Thanks, Omar Polo
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2023/01/24 02:55:07 Removed files: net/icinga/core2/patches: patch-lib_base_tlsutility_cpp Log message: remove obsolete #ifdef patch (no change, the macro is defined anyway now)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: mar...@cvs.openbsd.org 2023/01/24 02:20:46 Modified files: math/py-bottleneck: Makefile distinfo Log message: Update py-bottleneck to 1.3.6.
[new] devel/lua-argparse version 0.7.1
Hi, I would like to import a new port for devel/lua-argparse, a simple Lua module for command line parser inspired by argparse for Python. GH repository https://github.com/luarocks/argparse I need this Lua module to update devel/luacheck and after discussions with jsg@, he advised me to create this new port. This port supports FLAVORS for Lua 5.1, 5.2, 5.3 and 5.4. Install and tests OK on amd64. Comments welcome and please commit if OK. Laurent lua-argparse-0.7.1.tar.gz Description: GNU Zip compressed data
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2023/01/24 01:48:24 Modified files: mail/roundcubemail: Makefile distinfo mail/roundcubemail/patches: patch-config_defaults_inc_php mail/roundcubemail/pkg: PLIST-main Removed files: mail/roundcubemail/patches: patch-bin_update_sh Log message: update to roundcubemail-1.6.1 (db schema change, remember to run update.sh)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: o...@cvs.openbsd.org2023/01/24 01:46:50 Modified files: net/tut: Makefile distinfo modules.inc net/tut/pkg: PLIST Log message: update net/tut to 2.0.0 The configuration format changed! Existing configurations and themes must be rewritten, although most parts are the same. Other interesting changes: - support for multiple accounts - added a built-in editor full changelog: https://github.com/RasmusLindroth/tut/releases
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2023/01/24 01:41:55 Modified files: www/seamonkey : Makefile distinfo www/seamonkey/patches: patch-build_moz_configure_init_configure www/seamonkey-i18n: Makefile.inc distinfo Log message: www/seamonkey: update to 2.53.15. see https://www.seamonkey-project.org/releases/seamonkey2.53.15/#new
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: mar...@cvs.openbsd.org 2023/01/24 01:29:52 Modified files: math/py-affine : Makefile distinfo math/py-affine/pkg: PLIST Log message: Update py-affine to 2.4.0.
Re: UPDATE: games/choria
On Tue, December 20, 2022 00:47, Sebastian Reitenbach wrote:
> On Monday, December 19, 2022 15:13 CET, Stuart Henderson
>
> wrote:
>
>> You can add tars to a github repo and fetch from there, see mail/greyscanner
>>
> thanks for that pointer.
>
>> But first check to see if upstream have made a tar release which includes
>> all the necessary files. Did you try the src-tar.gz link under Other at
>> https://gitlab.com/choria/code/-/releases ?
>>
> indeed the src-tar.gz contains the two submodules, hadn't noticed it before.
>
> Updated version with less patches below and attached.
ok kirby@
>
> cheers,
> Sebastian
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/choria/Makefile,v
> retrieving revision 1.14
> diff -u -r1.14 Makefile
> --- Makefile 28 May 2022 06:19:59 - 1.14
> +++ Makefile 19 Dec 2022 21:42:44 -
> @@ -1,38 +1,52 @@
> -BROKEN-mips64el =Bus error on startup, no core file left
> -
> -V = 0.4.1
> -REVISION = 5
> COMMENT =2D MMORPG focused on grinding
> -DISTNAME = choria-${V}-src
> +
> +V = 1.0.1
> +COMMIT = d3de66a6
> +DISTNAME = choria-${V}-${COMMIT}-src
> PKGNAME =choria-${V}
> CATEGORIES = games x11
> +MAINTAINER = Sebastian Reitenbach
> +
> +HOMEPAGE = https://choria.gitlab.io/
>
> -HOMEPAGE = https://github.com/jazztickets/choria
>
> # GPLv3+
> PERMIT_PACKAGE = Yes
>
> -WANTLIB += Irrlicht c m pthread sqlite3 ${COMPILER_LIBCXX}
> +WANTLIB += c m pthread SDL2_image sqlite3 ${COMPILER_LIBCXX}
> +WANTLIB += GL GLU SDL2 freetype jsoncpp ogg tinyxml2 vorbis vorbisfile
> +WANTLIB += z openal ${MODLUA_WANTLIB}
>
> COMPILER = base-clang ports-gcc base-gcc
>
> MODCMAKE_LDFLAGS = -L${LOCALBASE}/lib
> +MODLUA_VERSION = 5.3
>
> -MASTER_SITES = ${MASTER_SITE_GOOGLECODE:=choria/}
> +MASTER_SITES = https://gitlab.com/jazztickets/uploads/-/raw/main/
>
> -MODULES =devel/cmake
> +MODULES =devel/cmake lang/lua
>
> -LIB_DEPENDS =x11/irrlicht \
> - databases/sqlite3
> +BUILD_DEPENDS = graphics/glm \
> + shells/bash
> +LIB_DEPENDS =audio/libogg \
> + audio/libvorbis \
> + audio/openal \
> + devel/jsoncpp \
> + devel/sdl2 \
> + devel/sdl2-image \
> + databases/sqlite3 \
> + textproc/tinyxml2
>
> RUN_DEPENDS =devel/desktop-file-utils
>
> NO_TEST =Yes
>
> +WRKDIST =${WRKDIR}/choria-${V}-${COMMIT}
> +
> post-patch:
> perl -pi -e "s,games/,,g" ${WRKSRC}/CMakeLists.txt \
> ${WRKSRC}/deployment/choria
> perl -pi -e "s,games,bin,g" ${WRKSRC}/CMakeLists.txt
> - cp ${FILESDIR}/FindSqlite.cmake ${WRKSRC}/
> -
> + ${SUBST_CMD} ${WRKSRC}/CMakeLists.txt
> +
> .include
> Index: distinfo
> ===
> RCS file: /cvs/ports/games/choria/distinfo,v
> retrieving revision 1.2
> diff -u -r1.2 distinfo
> --- distinfo 23 Jun 2013 22:38:57 - 1.2
> +++ distinfo 19 Dec 2022 21:42:44 -
> @@ -1,2 +1,2 @@
> -SHA256 (choria-0.4.1-src.tar.gz) =
> bR5WjMrxZ4o76aukAAES0BwqbxMg9ylorWuhcEMHdxM=
> -SIZE (choria-0.4.1-src.tar.gz) = 564637
> +SHA256 (choria-1.0.1-d3de66a6-src.tar.gz) =
> uJw9spEHASB23AsBdv1VibqRNFUGm01u/o1sTs2/GXk=
> +SIZE (choria-1.0.1-d3de66a6-src.tar.gz) = 18072921
> Index: files/FindSqlite.cmake
> ===
> RCS file: files/FindSqlite.cmake
> diff -N files/FindSqlite.cmake
> --- files/FindSqlite.cmake23 Sep 2016 09:16:54 - 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,50 +0,0 @@
> -# - Try to find Sqlite
> -# Once done this will define
> -#
> -# SQLITE_FOUND - system has Sqlite
> -# SQLITE_INCLUDE_DIR - the Sqlite include directory
> -# SQLITE_LIBRARIES - Link these to use Sqlite
> -# SQLITE_DEFINITIONS - Compiler switches required for using Sqlite
> -# Redistribution and use is allowed according to the terms of the BSD
> license.
> -# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
> -#
> -
> -
> -# Copyright (c) 2008, Gilles Caulier,
> -#
> -# Redistribution and use is allowed according to the terms of the BSD
> license.
> -# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
> -
> -if ( SQLITE_INCLUDE_DIR AND SQLITE_LIBRARIES )
> - # in cache already
> - SET(Sqlite_FIND_QUIETLY TRUE)
> -endif ( SQLITE_INCLUDE_DIR AND SQLITE_LIBRARIES )
> -
> -# use pkg-config to get the directories and then use these values
> -# in the FIND_PATH() and FIND_LIBRARY() calls
> -if( NOT WIN32 )
> - find_package(PkgConfig)
> -
> - pkg_check_modules(PC_SQLITE QUIET sqlite3)
> -
> - set(SQLITE_DEFINITIONS ${PC_SQLITE_CFLAGS_OTHER})
> -endif( NOT WIN32 )
> -
> -find_path(SQLITE_INCLUDE_DIR NAMES sqlite3.h
> - PATHS
> - ${PC_SQLITE_INCLUDEDIR}
> - ${PC_SQLITE_INCLUDE_DIRS}
>
