Re: [update, add pledge/unveil] net/iperf3 3.14 -> 3.15
On 2023/10/18 22:19, Mikhail wrote:
> [cc'ing maintainer]
>
> Inlined patch updates iperf3 to 3.15 (3 bug fixes, details here -
> https://github.com/esnet/iperf/releases/tag/3.15).
>
> I run iperf on public server with unfirewalled ports, so I'd like it to
> be pledged/unveiled, -I and --logfile options are working fine.
>
> Probably we could drop privs more granularly, but for I'd like to keep
> things simple.
>
Diff below for a few things I noticed. There may be others.
Since you only unveil /dev/urandom (plus the extra paths allowed
by tmppath and for dns access) you can add a small patch to use
arc4random and drop rpath and /dev/urandom access in most cases.
You don't handle --file. This needs cpath wpath for server, or
rpath for client. I just added to the existing needwr mechanism
rather than separating the two. This could possibly be more
granular but there are probably complications with --bidir and
--reverse.
Rather than locking unveil for the needwr case, I called pledge
again with unveil removed, I think this makes it a little more
clear what the final pledges are for the two cases. (We could
also drop the early pledge before parsing options, I don't think
it adds much in this case, and pledges are often done like that,
though I've left it for now).
Couple of other minor tweaks (error message fixes, don't mix
definitions and code,
I've tested various options including --tos without problems,
but not exhaustively.
Index: Makefile
===
RCS file: /cvs/ports/net/iperf3/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile27 Sep 2023 14:18:10 - 1.14
+++ Makefile18 Oct 2023 21:03:42 -
@@ -1,6 +1,6 @@
COMMENT= tool to measure maximum achievable bandwidth on IP networks
-V= 3.14
+V= 3.15
PKGNAME= iperf3-${V}
DISTNAME= iperf-${V}
@@ -15,6 +15,7 @@ MAINTAINER= Lawrence Teo https://downloads.es.net/pub/iperf/
Index: distinfo
===
RCS file: /cvs/ports/net/iperf3/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo3 Aug 2023 14:32:28 - 1.9
+++ distinfo18 Oct 2023 21:03:42 -
@@ -1,2 +1,2 @@
-SHA256 (iperf-3.14.tar.gz) = cj/MQwoCe8aVJij6KjrHdYSh0L0ygnXlc/ybIGwVUAQ=
-SIZE (iperf-3.14.tar.gz) = 647944
+SHA256 (iperf-3.15.tar.gz) = vbd8EfcrzpAhSIMVlXf6JEEgE+YrIIPPX1Q5HXmx2P8=
+SIZE (iperf-3.15.tar.gz) = 649330
Index: patches/patch-src_iperf_api_c
===
RCS file: /cvs/ports/net/iperf3/patches/patch-src_iperf_api_c,v
retrieving revision 1.8
diff -u -p -r1.8 patch-src_iperf_api_c
--- patches/patch-src_iperf_api_c 3 Aug 2023 14:32:28 - 1.8
+++ patches/patch-src_iperf_api_c 18 Oct 2023 21:03:42 -
@@ -3,7 +3,7 @@ Default to IPv4.
Index: src/iperf_api.c
--- src/iperf_api.c.orig
+++ src/iperf_api.c
-@@ -2860,7 +2860,7 @@ iperf_defaults(struct iperf_test *testp)
+@@ -2884,7 +2884,7 @@ iperf_defaults(struct iperf_test *testp)
testp->stats_interval = testp->reporter_interval = 1;
testp->num_streams = 1;
Index: patches/patch-src_iperf_util_c
===
RCS file: patches/patch-src_iperf_util_c
diff -N patches/patch-src_iperf_util_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_iperf_util_c 18 Oct 2023 21:03:42 -
@@ -0,0 +1,21 @@
+Index: src/iperf_util.c
+--- src/iperf_util.c.orig
src/iperf_util.c
+@@ -57,6 +57,9 @@
+ */
+ int readentropy(void *out, size_t outsize)
+ {
++#if defined(__OpenBSD__)
++arc4random_buf(out, outsize);
++#else
+ static FILE *frandom;
+ static const char rndfile[] = "/dev/urandom";
+
+@@ -75,6 +78,7 @@ int readentropy(void *out, size_t outsize)
+ rndfile,
+ feof(frandom) ? "EOF" : strerror(errno));
+ }
++#endif
+ return 0;
+ }
+
Index: patches/patch-src_main_c
===
RCS file: patches/patch-src_main_c
diff -N patches/patch-src_main_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_main_c18 Oct 2023 21:03:42 -
@@ -0,0 +1,67 @@
+Add pledge and unveil
+
+Index: src/main.c
+--- src/main.c.orig
src/main.c
+@@ -59,6 +59,15 @@ main(int argc, char **argv)
+ {
+ struct iperf_test *test;
+
++#if defined(__OpenBSD__)
++int needwr = 0;
++
++if (pledge("stdio tmppath rpath cpath wpath inet dns unveil", NULL) ==
-1) {
++ fprintf(stderr, "pledge: %s\n", strerror(errno));
++ exit(1);
++}
++#endif
++
+ // XXX: Setting the process affinity requires root on most systems.
+ // Is this a feature we really need?
+ #ifdef TEST_PROC_AFFINITY
+@@ -104,6 +113,45 @@ main(int argc, char **argv)
+ usage();
+ exit(1);
+ }
++
++#if defined(__OpenBSD__)
++/
Update: JRuby 9.4.4.0
This updates JRuby to the latest release. Release notes at:
https://www.jruby.org/2023/10/18/jruby-9-4-4-0.html
Tested on amd64, the only supported arch. Will be committing in a few
days unless I hear objections.
Thanks,
Jeremy
Index: Makefile
===
RCS file: /cvs/ports/lang/jruby/Makefile,v
retrieving revision 1.109
diff -u -p -r1.109 Makefile
--- Makefile10 Jun 2023 17:30:29 - 1.109
+++ Makefile18 Oct 2023 19:10:50 -
@@ -3,7 +3,7 @@ ONLY_FOR_ARCHS = amd64
COMMENT = pure-Java implementation of the Ruby language
-V =9.4.3.0
+V =9.4.4.0
DISTNAME = jruby-dist-${V}-bin
PKGNAME = jruby-${V}
CATEGORIES = lang lang/ruby
Index: distinfo
===
RCS file: /cvs/ports/lang/jruby/distinfo,v
retrieving revision 1.75
diff -u -p -r1.75 distinfo
--- distinfo10 Jun 2023 17:30:29 - 1.75
+++ distinfo18 Oct 2023 19:10:55 -
@@ -1,6 +1,6 @@
SHA256 (jffi-1.3.10.tar.gz) = QZWOTjjcxTOTidj4/JjERqcokJJ5SOiQualLs/ivHsw=
-SHA256 (jruby-dist-9.4.3.0-bin.tar.gz) =
sJfgjFZp6KGIKI4RORHRK0rSvWeiwgnW36hEXWOk2Mk=
+SHA256 (jruby-dist-9.4.4.0-bin.tar.gz) =
arEmcK/Y5ciskwX6vkIFV5XF3fn46PGh5g4mDy1yTMA=
SHA256 (jruby-launcher-1.1.19-java.gem) =
LPGrpNcsdLNq7MSjCxiSXh4h+vcPVuC0ykUyUYquGJo=
SIZE (jffi-1.3.10.tar.gz) = 3304571
-SIZE (jruby-dist-9.4.3.0-bin.tar.gz) = 29462176
+SIZE (jruby-dist-9.4.4.0-bin.tar.gz) = 31660522
SIZE (jruby-launcher-1.1.19-java.gem) = 64000
Index: patches/patch-lib_ruby_stdlib_ffi_library_rb
===
RCS file: /cvs/ports/lang/jruby/patches/patch-lib_ruby_stdlib_ffi_library_rb,v
retrieving revision 1.3
diff -u -p -r1.3 patch-lib_ruby_stdlib_ffi_library_rb
--- patches/patch-lib_ruby_stdlib_ffi_library_rb11 Mar 2022 19:29:04
- 1.3
+++ patches/patch-lib_ruby_stdlib_ffi_library_rb18 Oct 2023 19:28:32
-
@@ -1,20 +1,17 @@
Index: lib/ruby/stdlib/ffi/library.rb
--- lib/ruby/stdlib/ffi/library.rb.orig
+++ lib/ruby/stdlib/ffi/library.rb
-@@ -96,6 +96,7 @@ module FFI
+@@ -90,10 +90,13 @@ module FFI
raise LoadError.new("library names list must not be empty") if
names.empty?
- lib_flags = defined?(@ffi_lib_flags) ? @ffi_lib_flags :
FFI::DynamicLibrary::RTLD_LAZY | FFI::DynamicLibrary::RTLD_LOCAL
+ lib_flags = defined?(@ffi_lib_flags) && @ffi_lib_flags
+ libc = FFI::DynamicLibrary.open('libc.so',
FFI::DynamicLibrary::RTLD_LAZY | FFI::DynamicLibrary::RTLD_GLOBAL)
- ffi_libs = names.map do |name|
- if name == FFI::CURRENT_PROCESS
-@@ -149,7 +150,7 @@ module FFI
- lib
- end
+ @ffi_libs = names.map do |name|
+ FFI::DynamicLibrary.send(:load_library, name, lib_flags)
end
--
-+ ffi_libs.unshift(libc)
- @ffi_libs = ffi_libs
++ @ffi_libs.unshift(libc)
++ @ffi_libs
end
+ # Set the calling convention for {#attach_function} and {#callback}
Index: pkg/PLIST
===
RCS file: /cvs/ports/lang/jruby/pkg/PLIST,v
retrieving revision 1.66
diff -u -p -r1.66 PLIST
--- pkg/PLIST 10 Jun 2023 17:30:29 - 1.66
+++ pkg/PLIST 18 Oct 2023 19:30:03 -
@@ -529,6 +529,7 @@ jruby/lib/ruby/gems/1.8/specifications/d
jruby/lib/ruby/gems/1.8/specifications/default/abbrev-0.1.0.gemspec
jruby/lib/ruby/gems/1.8/specifications/default/base64-0.1.1.gemspec
jruby/lib/ruby/gems/1.8/specifications/default/benchmark-0.2.0.gemspec
+jruby/lib/ruby/gems/1.8/specifications/default/bigdecimal-3.1.4-java.gemspec
jruby/lib/ruby/gems/1.8/specifications/default/bundler-2.3.26.gemspec
jruby/lib/ruby/gems/1.8/specifications/default/cgi-0.3.6-java.gemspec
jruby/lib/ruby/gems/1.8/specifications/default/csv-3.2.5.gemspec
@@ -541,7 +542,7 @@ jruby/lib/ruby/gems/1.8/specifications/d
jruby/lib/ruby/gems/1.8/specifications/default/english-0.7.1.gemspec
jruby/lib/ruby/gems/1.8/specifications/default/erb-2.2.3.gemspec
jruby/lib/ruby/gems/1.8/specifications/default/error_highlight-0.3.0.gemspec
-jruby/lib/ruby/gems/1.8/specifications/default/ffi-1.15.5-java.gemspec
+jruby/lib/ruby/gems/1.8/specifications/default/ffi-1.16.3-java.gemspec
jruby/lib/ruby/gems/1.8/specifications/default/ffi-binary-libfixposix-0.5.1.1-java.gemspec
jruby/lib/ruby/gems/1.8/specifications/default/ffi-bindings-libfixposix-0.5.1.0.gemspec
jruby/lib/ruby/gems/1.8/specifications/default/fileutils-1.6.0.gemspec
@@ -553,7 +554,7 @@ jruby/lib/ruby/gems/1.8/specifications/d
jruby/lib/ruby/gems/1.8/specifications/default/ipaddr-1.2.4.gemspec
jruby/lib/ruby/gems/1.8/specifications/default/irb-1.4.2.gemspec
jruby/lib/ruby/gems/1.8/specifications/default/jar-dependencies-0.4.1.gemspec
-jruby/lib/ruby/gems/1.8/specifications/default/jruby-openssl-0.14.1-java.gemspec
+jruby/lib/ruby/gems/1.8/specifications/default/jr
Re: [UPDATE] devel/objfw to 1.0.4
Ping?
Re: Weird $TERM based curses behaviour
Theo Buehler wrote:
> > I recently upgraded my system to the latest snapshot and started
> > having issues with curses based applications on xterm. The problem
> > seems to be related to using a terminal name other than the default
> > 'xterm'. Some examples below with 'XTerm.termName' set to
> > xterm{,-16color,-256color} on my ~/.Xresources:
>
> Most of these problems should go away once you update to packages
> linking against the new libraries. These should hit the mirrors in
> the coming days.
>
> In the meantime rebuild and reinstall ('make repackage' and
> 'make reinstall') the ports you can't live without.
>
> In general, when following current watch out for big library commits
> (especially those changing shlib_version files) and hold off on
> updating for a couple days unless you are sure you know what you
> are doing.
Understood. Thank you Theo!
Re: Weird $TERM based curses behaviour
> I recently upgraded my system to the latest snapshot and started
> having issues with curses based applications on xterm. The problem
> seems to be related to using a terminal name other than the default
> 'xterm'. Some examples below with 'XTerm.termName' set to
> xterm{,-16color,-256color} on my ~/.Xresources:
Most of these problems should go away once you update to packages
linking against the new libraries. These should hit the mirrors in
the coming days.
In the meantime rebuild and reinstall ('make repackage' and
'make reinstall') the ports you can't live without.
In general, when following current watch out for big library commits
(especially those changing shlib_version files) and hold off on
updating for a couple days unless you are sure you know what you
are doing.
[update, add pledge/unveil] net/iperf3 3.14 -> 3.15
[cc'ing maintainer]
Inlined patch updates iperf3 to 3.15 (3 bug fixes, details here -
https://github.com/esnet/iperf/releases/tag/3.15).
I run iperf on public server with unfirewalled ports, so I'd like it to
be pledged/unveiled, -I and --logfile options are working fine.
Probably we could drop privs more granularly, but for I'd like to keep
things simple.
diff refs/heads/master refs/heads/iperf3
commit - de754ab24f5686d70c44225d7fe12704063ff1de
commit + 5bdda7a75b52879eba6e0f671c5f3c95701254f7
blob - 1c29e29d94370a9345b58f34cdd29525f0fb9e53
blob + 1693ea4aab9e9051e306c4069736b501aa811193
--- net/iperf3/Makefile
+++ net/iperf3/Makefile
@@ -1,6 +1,6 @@
COMMENT= tool to measure maximum achievable bandwidth on IP networks
-V= 3.14
+V= 3.15
PKGNAME= iperf3-${V}
DISTNAME= iperf-${V}
@@ -15,6 +15,7 @@ MAINTAINER= Lawrence Teo
# BSD 3-clause
PERMIT_PACKAGE=Yes
+# uses pledge unveil
WANTLIB += c m
SITES= https://downloads.es.net/pub/iperf/
blob - aee4720c9e7a7c01d458ad75fa6ffacc4f3c5bcc
blob + 5e78d43fb08210550fb72de43ea73eb845202b01
--- net/iperf3/distinfo
+++ net/iperf3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (iperf-3.14.tar.gz) = cj/MQwoCe8aVJij6KjrHdYSh0L0ygnXlc/ybIGwVUAQ=
-SIZE (iperf-3.14.tar.gz) = 647944
+SHA256 (iperf-3.15.tar.gz) = vbd8EfcrzpAhSIMVlXf6JEEgE+YrIIPPX1Q5HXmx2P8=
+SIZE (iperf-3.15.tar.gz) = 649330
blob - b14f7a1e19110d400b65c7d78c413e1d1136b36d
blob + ed586e35ac74ce8929882aac0e6c4c619fbebca9
--- net/iperf3/patches/patch-src_iperf_api_c
+++ net/iperf3/patches/patch-src_iperf_api_c
@@ -3,7 +3,7 @@ Default to IPv4.
Index: src/iperf_api.c
--- src/iperf_api.c.orig
+++ src/iperf_api.c
-@@ -2860,7 +2860,7 @@ iperf_defaults(struct iperf_test *testp)
+@@ -2884,7 +2884,7 @@ iperf_defaults(struct iperf_test *testp)
testp->stats_interval = testp->reporter_interval = 1;
testp->num_streams = 1;
blob - /dev/null
blob + 0596ef57b03120c490a2cac6fafbd8e529f03807 (mode 644)
--- /dev/null
+++ net/iperf3/patches/patch-src_main_c
@@ -0,0 +1,65 @@
+Add pledge and unveil
+
+Index: src/main.c
+--- src/main.c.orig
src/main.c
+@@ -59,6 +59,18 @@ main(int argc, char **argv)
+ {
+ struct iperf_test *test;
+
++#if defined(__OpenBSD__)
++if (pledge("stdio tmppath rpath cpath wpath inet unveil", NULL) == -1) {
++ fprintf(stderr, "pledge: %s\n", strerror(errno));
++ exit(1);
++}
++
++if (unveil("/dev/urandom", "r") == -1) {
++ fprintf(stderr, "unveil urandom: %s\n", strerror(errno));
++ exit(1);
++}
++#endif
++
+ // XXX: Setting the process affinity requires root on most systems.
+ // Is this a feature we really need?
+ #ifdef TEST_PROC_AFFINITY
+@@ -104,6 +116,40 @@ main(int argc, char **argv)
+ usage();
+ exit(1);
+ }
++
++#if defined(__OpenBSD__)
++int needwr = 0;
++
++/* Check for the features which require wpath and cpath */
++if (test->pidfile) {
++ if (unveil(test->pidfile, "cw") == -1) {
++ fprintf(stderr, "uneveil pidfile: %s\n", strerror(errno));
++ exit(1);
++ } else
++ needwr = 1;
++}
++
++if (test->logfile) {
++ if (unveil(test->logfile, "cwr") == -1) {
++ fprintf(stderr, "uneveil logfile: %s\n", strerror(errno));
++ exit(1);
++ } else
++ needwr = 1;
++}
++
++/* Drop wpath and cpath if we can */
++if (needwr == 0) {
++ if (pledge("stdio tmppath rpath inet unveil", NULL) == -1) {
++ fprintf(stderr, "pledge needwr: %s\n", strerror(errno));
++ exit(1);
++ }
++}
++
++if (unveil(NULL, NULL) == -1) {
++ fprintf(stderr, "unveil NULL: %s\n", strerror(errno));
++ exit(1);
++}
++#endif
+
+ if (run(test) < 0)
+ iperf_errexit(test, "error - %s", iperf_strerror(i_errno));
Weird $TERM based curses behaviour
Hi all,
I recently upgraded my system to the latest snapshot and started
having issues with curses based applications on xterm. The problem
seems to be related to using a terminal name other than the default
'xterm'. Some examples below with 'XTerm.termName' set to
xterm{,-16color,-256color} on my ~/.Xresources:
pinentry-curses (plass cat password/entry):
xterm-16color and xterm-256color:
gpg: public key decryption failed: Screen or window too small
gpg: decryption failed: Screen or window too small
xterm:
pinentry-curses works as expected
vis(e):
xterm-16color:
Starts fine but I get the following warning in the statusbar:
Warning: unknown term `xterm-16color'
xterm-256color:
Failed to start curses interface: No such file or directory
xterm:
vis(e) works as expected
tog (Game of Trees):
xterm-16color and xterm-256color:
Error opening terminal: xterm-16color.
Error opening terminal: xterm-256color.
xterm:
tog works as expected
I noticed that ncurses was recently updated[1], so I'm guessing
that this issue could have been fixed already and I just need to
wait until next snapshot?
Thanks.
Johannes
[1]
https://github.com/openbsd/src/commit/c7ef0cfc17afcba97172c25e1e3a943e893bc632
Re: NEW: x11/qt6/qtspeech
On Wed, Oct 18, 2023 at 06:41:12AM +0200, Rafael Sadowski wrote: > Please find attached new Qt6 module qt6-qtspeech-6.5.2. The only consumer I encountered so far is acting up elsewhere, but qt6-qtspeech made it configure and build and your port looks good. OK kn
Re: update net/dictd, new devel/libmaa
On Fri, Oct 13, 2023 at 12:39:11PM +, Klemens Nanni wrote:
> The current port is quite dusty and the update works just fine for me on
> amd64, no longer requiring any patches.
>
> dict(1) works against dict.org and my own dictd(8), /etc/dictd.conf and
> local .dict.dz/.index files, as expected.
>
> Poking at .dz and .dict files with dictzip(1) also works, otherwise I'm
> still new to RFC 2229 A Dictionary Server Protocol.
>
> More tests in existing setups?
> Feedback? Objection? OK?
>
> Update diff below, one new library from the same HOMEPAGE/SITE attached:
Ping after education/freedict/ landed.
> Information for inst:libmaa-1.4.7
>
> Comment:
> library for low-level data structures
>
> Required by:
> dictd-client-1.13.1
> dictd-server-1.13.1
>
> Description:
> The libmaa library provides many low-level data structures which are
> helpful for writing compilers, including hash tables, sets, lists,
> debugging support, and memory management. Although libmaa was designed
> and implemented as a foundation for the Khepera Transformation System,
> the data structures are generally applicable to a wide range of
> programming
> problems.
>
> The memory management routines are especially helpful for improving the
> performance of memory-intensive applications.
>
> Maintainer: The OpenBSD ports mailing-list
>
> WWW: https://www.dict.org
Index: Makefile
===
RCS file: /cvs/ports/net/dictd/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile27 Sep 2023 14:18:04 - 1.16
+++ Makefile13 Oct 2023 12:11:35 -
@@ -1,41 +1,40 @@
COMMENT-main= Dictionary Server Protocol client
COMMENT-server=Dictionary Server Protocol server
-V= 1.9.15
+V= 1.13.1
DISTNAME= dictd-$V
PKGNAME-main= dictd-client-$V
PKGNAME-server=dictd-server-$V
-REVISION-main= 3
-REVISION-server=1
CATEGORIES=net education
-HOMEPAGE= http://www.dict.org
+HOMEPAGE= https://www.dict.org
# GPL v2
PERMIT_PACKAGE=Yes
-WANTLIB= c z
+WANTLIB= c maa z
SITES= ${SITE_SOURCEFORGE:=dict/}
+LIB_DEPENDS= devel/libmaa
+
USE_GMAKE= Yes
+SEPARATE_BUILD=Yes
CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=--without-local-zlib \
- --enable-dictorg
+CONFIGURE_ENV= LDFLAGS=${LDFLAGS:Q}
MULTI_PACKAGES=-main -server
NO_TEST= Yes
-pre-build:
- @sed -i -e "s,/etc,${SYSCONFDIR},g;" \
- -e "s,/usr/sbin,${LOCALBASE}/sbin,g;" \
- -e "s,/usr/share,${LOCALBASE}/share,g" ${WRKSRC}/*.[18]
+EXAMPLEDIR=${PREFIX}/share/examples/dictd
+
+CFLAGS += -I/usr/local/include
+LDFLAGS += -L/usr/local/lib
post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/dictd/
- ${INSTALL_DATA} ${WRKSRC}/example* \
- ${PREFIX}/share/examples/dictd
+ ${INSTALL_DATA_DIR} ${EXAMPLEDIR}
+ ${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLEDIR}/
.include
Index: distinfo
===
RCS file: /cvs/ports/net/dictd/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo18 Jan 2015 03:14:38 - 1.3
+++ distinfo13 Oct 2023 12:11:35 -
@@ -1,2 +1,2 @@
-SHA256 (dictd-1.9.15.tar.gz) = TFnsBmBE83elkGnZvAEwRfxQKhy+b/Ohri8CKo7zgVw=
-SIZE (dictd-1.9.15.tar.gz) = 741597
+SHA256 (dictd-1.13.1.tar.gz) = 5PGmfRaJTYSUVp19yUQsFcw4wBHyuWMcfxzGInZlKhs=
+SIZE (dictd-1.13.1.tar.gz) = 395619
Index: patches/patch-Makefile_in
===
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- patches/patch-Makefile_in 11 Mar 2022 19:45:53 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,10 +0,0 @@
Makefile.in.orig Mon Dec 13 20:12:55 2004
-+++ Makefile.inSat May 22 13:49:16 2010
-@@ -300,6 +300,7 @@ install.dictfmt: dictfmt dictfmt_index2word dictfmt_in
- $(INSTALL_DATA) dictfmt_index2word.1 $(DESTDIR)$(man1_prefix); \
- $(INSTALL_DATA) dictfmt_index2suffix.1 $(DESTDIR)$(man1_prefix); \
- $(INSTALL_DATA) dictunformat.1 $(DESTDIR)$(man1_prefix); \
-+ $(INSTALL_DATA) dictfmt_virtual.1 $(DESTDIR)$(man1_prefix); \
- test _$(USE_PLUGIN) != _ && \
- $(INSTALL_SCRIPT) dictfmt_plugin $(DESTDIR)$(bindir) || true
-
Index: patches/patch-configure
===
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 11 Mar 2022 19:45:53 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,19 +0,0 @@
configure.orig Sat Apr 15 12:30:38 2006
-+++ configure Sat Apr 15 12:30:41 2006
-@@ -2484,7 +2484,6 @@ fi
-
- REALCC="$CC"
- if t
xmobar build failure
The relevant bit seems to be this. Full log below. Warning: No remote package servers have been specified. Usually you would have one specified in the config file. Resolving dependencies... Error: cabal: Could not resolve dependencies: [__0] next goal: X11-xft (user goal) [__0] rejecting: X11-xft-0.3.4 (conflict: pkg-config package xft-any, not found in the pkg-config database) [__0] fail (backjumping, conflict set: X11-xft) After searching the rest of the dependency tree exhaustively, these were the goals I've had most trouble fulfilling: X11-xft >>> Building on localhost under x11/xmobar BDEPENDS = [devel/libffi;devel/pango;devel/libinotify;devel/cabal-install;lang/ghc;graphics/cairo;converters/libiconv;devel/gmp] DIST = [productivity/hledger:hackage/vector-algorithms-0.9.0.1_2.cabal;devel/git-annex:hackage/void-0.7.3.tar.gz;devel/cabal-install:hackage/zlib-0.6.3.0_1.cabal;productivity/hledger:hackage/vector-algorithms-0.9.0.1.tar.gz;x11/xmobar:hackage/parsec-numbers-0.1.0.tar.gz;x11/xmobar:hackage/http-client-0.7.13.1_1.cabal;devel/darcs:hackage/socks-0.6.1.tar.gz;productivity/hledger:hackage/uuid-types-1.0.5.tar.gz;productivity/hledger:hackage/base-compat-0.13.0.tar.gz;productivity/hledger:hackage/network-uri-2.6.4.2.tar.gz;devel/cabal-install:hackage/th-compat-0.1.4_2.cabal;devel/cabal-bundler:hackage/vector-0.13.0.0_3.cabal;productivity/hledger:hackage/resourcet-1.3.0.tar.gz;devel/cabal-bundler:hackage/attoparsec-0.14.4_3.cabal;productivity/hledger:hackage/mono-traversable-1.0.15.3.tar.gz;x11/xmobar:hackage/cookie-0.4.6.tar.gz;x11/xmobar:hackage/dbus-1.2.28.tar.gz;devel/git-annex:hackage/x509-1.7.7.tar.gz;devel/git-annex:hackage/basement-0.0.15.tar.gz;devel/cabal-install:hackage/regex-posix-0.96.0.1_1.cabal;devel/darcs:hackage/http-client-tls-0.3.6.1.tar.gz;devel/darcs:hackage/appar-0.1.8.tar.gz;productivity/hledger:hackage/unliftio-core-0.2.1.0.tar.gz;productivity/hledger:hackage/data-array-byte-0.1.0.1.tar.gz;x11/xmobar:hackage/foldable1-classes-compat-0.1_2.cabal;productivity/hledger:hackage/OneTuple-0.4.1.1.tar.gz;x11/xmobar:hackage/kan-extensions-5.2.5_1.cabal;productivity/hledger:hackage/vector-stream-0.1.0.0.tar.gz;productivity/hledger:hackage/profunctors-5.6.2.tar.gz;devel/darcs:hackage/extensible-exceptions-0.1.1.4.tar.gz;x11/xmobar:hackage/free-5.2.tar.gz;devel/cabal-bundler:hackage/vector-stream-0.1.0.0_2.cabal;x11/xmobar:hackage/bitvec-1.1.4.0.tar.gz;x11/xmobar:hackage/gtk2hs-buildtools-0.13.8.3.tar.gz;productivity/hledger:hackage/split-0.2.3.5.tar.gz;productivity/hledger:hackage/zlib-0.6.3.0.tar.gz;productivity/hledger:hackage/cabal-doctest-1.0.9_3.cabal;devel/darcs:hackage/regex-posix-0.96.0.1.tar.gz;productivity/hledger:hackage/blaze-html-0.9.1.2.tar.gz;devel/git-annex:hackage/memory-0.18.0.tar.gz;devel/darcs:hackage/x509-system-1.6.7.tar.gz;productivity/hledger:hackage/data-array-byte-0.1.0.1_1.cabal;devel/git-annex:hackage/safe-exceptions-0.1.7.3.tar.gz;x11/xmobar:hackage/aeson-2.1.2.1_3.cabal;productivity/hledger:hackage/generically-0.1.1.tar.gz;productivity/hledger:hackage/async-2.2.4_3.cabal;devel/darcs:hackage/http-types-0.12.3.tar.gz;productivity/hledger:hackage/streaming-commons-0.2.2.6.tar.gz;devel/git-annex:hackage/adjunctions-4.4.2.tar.gz;productivity/hledger:hackage/data-default-class-0.1.2.0.tar.gz;productivity/hledger:hackage/th-abstraction-0.5.0.0.tar.gz;devel/cabal-bundler:hackage/tagged-0.8.7.tar.gz;productivity/hledger:hackage/unordered-containers-0.2.19.1.tar.gz;productivity/hledger:hackage/scientific-0.3.7.0_5.cabal;productivity/hledger:hackage/primitive-0.8.0.0.tar.gz;devel/cabal-bundler:hackage/semigroups-0.20.tar.gz;productivity/hledger:hackage/call-stack-0.4.0.tar.gz;productivity/hledger:hackage/semigroupoids-6.0.0.1.tar.gz;devel/darcs:hackage/blaze-builder-0.4.2.2_1.cabal;devel/cabal-bundler:hackage/hashable-1.4.2.0.tar.gz;productivity/hledger:hackage/strict-0.5.tar.gz;productivity/hledger:hackage/StateVar-1.2.2.tar.gz;devel/darcs:hackage/asn1-encoding-0.9.6.tar.gz;productivity/hledger:hackage/data-fix-0.3.2_4.cabal;devel/git-annex:hackage/blaze-html-0.9.1.2_2.cabal;productivity/hledger:hackage/vector-0.13.0.0.tar.gz;productivity/hledger:hackage/these-1.2.tar.gz;devel/darcs:hackage/x509-validation-1.6.12.tar.gz;productivity/hledger:hackage/semialign-1.3.tar.gz;productivity/hledger:hackage/regex-base-0.94.0.2.tar.gz;x11/xmobar:hackage/base-compat-batteries-0.13.0.tar.gz;devel/darcs:hackage/asn1-parse-0.9.5.tar.gz;x11/xmobar:hackage/xmobar-0.46.tar.gz;x11/xmobar:hackage/hinotify-0.4.1.tar.gz;x11/xmobar:hackage/reflection-2.1.7.tar.gz;productivity/hledger:hackage/th-compat-0.1.4.tar.gz;productivity/hledger:hackage/comonad-5.0.8_1.cabal;productivity/hledger:hackage/typed-process-0.2.11.0.tar.gz;productivity/hledger:hackage/contravariant-1.5.5.tar.gz;x11/xmobar:hackage/lens-5.2.2.tar.gz;devel/darcs:hackage/connection-0.3.1.tar.gz;productivity/hledger:hackage/conduit-extra-1.3.6.tar.gz;devel/darcs:hackage/asn1-types-0.3.4.tar.gz;productivity/hled
Re: patch: fix audacity mp3 export on startup
ok
On Wed, Oct 18, 2023 at 03:55:55PM +0200, Marc Espie wrote:
> On first run, audacity will look for "libmp3lame.so.0" which doesn't
> exist on OpenBSD, then prompting the user to find the library.
>
> This is doubly absurd, because it doesn't match our naming
> scheme, and also because we run depend on lame.
>
> This patch appears to do the trick: we can load a library
> without looking at the major number, especially when
> it doesn't match what the program expects.
>
> I assume the rest would help the file requester as well.
>
> (note that in order to test, you need to move
> ~/.config/audacity out of the way)
>
> Okay ?
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/audio/audacity/Makefile,v
> retrieving revision 1.92
> diff -u -p -r1.92 Makefile
> --- Makefile 10 Sep 2023 21:12:43 - 1.92
> +++ Makefile 18 Oct 2023 13:52:34 -
> @@ -6,7 +6,7 @@ GH_ACCOUNT= audacity
> GH_PROJECT= audacity
> GH_TAGNAME= Audacity-3.3.3
> DISTNAME=${GH_TAGNAME:L}
> -REVISION=0
> +REVISION=1
>
> CATEGORIES= audio
>
> Index: patches/patch-src_export_ExportMP3_cpp
> ===
> RCS file: patches/patch-src_export_ExportMP3_cpp
> diff -N patches/patch-src_export_ExportMP3_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_export_ExportMP3_cpp18 Oct 2023 13:52:34 -
> @@ -0,0 +1,19 @@
> +Index: src/export/ExportMP3.cpp
> +--- src/export/ExportMP3.cpp.orig
> src/export/ExportMP3.cpp
> +@@ -1582,13 +1582,13 @@ wxString MP3Exporter::GetLibraryPath()
> +
> + wxString MP3Exporter::GetLibraryName()
> + {
> +- return wxT("libmp3lame.so.0");
> ++ return wxT("libmp3lame.so");
> + }
> +
> + FileNames::FileTypes MP3Exporter::GetLibraryTypes()
> + {
> +return {
> +- { XO("Only libmp3lame.so.0"), { wxT("libmp3lame.so.0") } },
> ++ { XO("Only libmp3lame.so"), { wxT("libmp3lame.so*") } },
> + { XO("Primary shared object files"), { wxT("so") }, true },
> + { XO("Extended libraries"), { wxT("so*") }, true },
> + FileNames::AllFiles
>
--
Antoine
UPDATE: Suricata-7.0.1
Hello,
Update for Suricata to 7.0.1:
https://github.com/OISF/suricata/releases/tag/suricata-7.0.1
OK? Comments?
Cheers.-
Index: Makefile
===
RCS file: /cvs/ports/security/suricata/Makefile,v
retrieving revision 1.60
diff -u -p -r1.60 Makefile
--- Makefile27 Sep 2023 16:34:37 - 1.60
+++ Makefile18 Oct 2023 14:14:00 -
@@ -3,7 +3,7 @@ NOT_FOR_ARCHS = powerpc64 riscv64
COMMENT = high performance network IDS, IPS and security monitoring
-SURICATA_V = 6.0.12
+SURICATA_V = 7.0.1
SUPDATE_V =1.2.7
DISTNAME = suricata-${SURICATA_V}
@@ -20,9 +20,8 @@ PERMIT_PACKAGE= Yes
SITES =https://www.openinfosecfoundation.org/download/
# uses pledge()
-WANTLIB += ${COMPILER_LIBCXX} c iconv jansson lz4 lzma m magic
-WANTLIB += maxminddb net nspr4 nss3 nssutil3 pcap pcre plc4 plds4
-WANTLIB += smime3 ssl3 yaml-0 z
+WANTLIB += ${COMPILER_LIBCXX} c elf iconv m pcap yaml-0 z
+WANTLIB += jansson lz4 magic maxminddb net pcre2-8
MODULES = lang/python
@@ -40,7 +39,7 @@ LIB_DEPENDS = archivers/lz4 \
devel/nspr \
devel/libyaml \
devel/libmagic \
- devel/pcre \
+ devel/pcre2 \
net/libnet/1.1 \
net/libmaxminddb \
security/nss
@@ -49,7 +48,7 @@ COMPILER =base-clang ports-gcc
DEBUG_PACKAGES = ${BUILD_PACKAGES}
CONFIGURE_STYLE = autoconf
-AUTOCONF_VERSION = 2.69
+AUTOCONF_VERSION = 2.71
AUTOMAKE_VERSION = 1.15
CONFIGURE_ENV =ac_cv_path_HAVE_PDFLATEX= \
Index: distinfo
===
RCS file: /cvs/ports/security/suricata/distinfo,v
retrieving revision 1.20
diff -u -p -r1.20 distinfo
--- distinfo3 Jul 2023 08:22:31 - 1.20
+++ distinfo18 Oct 2023 14:14:00 -
@@ -1,2 +1,2 @@
-SHA256 (suricata-6.0.12.tar.gz) = BLIxYJNbAxl7CFwszJ2Ah1oz8RVYMFTRRgqw+2bYNLM=
-SIZE (suricata-6.0.12.tar.gz) = 27388535
+SHA256 (suricata-7.0.1.tar.gz) = YEfHX555qbDMbWx2MgJKQSaBK8IS9SrPXTyBPMfJ+ws=
+SIZE (suricata-7.0.1.tar.gz) = 23439262
Index: patches/patch-configure_ac
===
RCS file: /cvs/ports/security/suricata/patches/patch-configure_ac,v
retrieving revision 1.11
diff -u -p -r1.11 patch-configure_ac
--- patches/patch-configure_ac 3 Jul 2023 08:22:31 - 1.11
+++ patches/patch-configure_ac 18 Oct 2023 14:14:00 -
@@ -3,7 +3,7 @@ To remove the pid file, its directory mu
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
-@@ -2764,7 +2764,7 @@ if test "$WINDOWS_PATH" = "yes"; then
+@@ -2559,7 +2559,7 @@ if test "$WINDOWS_PATH" = "yes"; then
fi
else
EXPAND_VARIABLE(localstatedir, e_logdir, "/log/suricata/")
Index: patches/patch-doc_userguide_Makefile_in
===
RCS file: /cvs/ports/security/suricata/patches/patch-doc_userguide_Makefile_in,v
retrieving revision 1.6
diff -u -p -r1.6 patch-doc_userguide_Makefile_in
--- patches/patch-doc_userguide_Makefile_in 3 Jul 2023 08:22:31 -
1.6
+++ patches/patch-doc_userguide_Makefile_in 18 Oct 2023 14:14:00 -
@@ -3,32 +3,6 @@ Index: doc/userguide/Makefile.in
+++ doc/userguide/Makefile.in
@@ -1,3 +1,4 @@
+
- # Makefile.in generated by automake 1.16.1 from Makefile.am.
+ # Makefile.in generated by automake 1.16.5 from Makefile.am.
# @configure_input@
-
-@@ -623,14 +624,14 @@ uninstall-man: uninstall-man1
- @HAVE_SPHINXBUILD_TRUE@ sysconfdir=$(sysconfdir) \
- @HAVE_SPHINXBUILD_TRUE@ localstatedir=$(localstatedir) \
- @HAVE_SPHINXBUILD_TRUE@ version=$(PACKAGE_VERSION) \
--@HAVE_SPHINXBUILD_TRUE@ $(SPHINX_BUILD) -W -b html -d
_build/doctrees \
-+@HAVE_SPHINXBUILD_TRUE@ $(SPHINX_BUILD) -b html -d
_build/doctrees \
- @HAVE_SPHINXBUILD_TRUE@ $(top_srcdir)/doc/userguide _build/html
-
- @HAVE_SPHINXBUILD_TRUE@_build/latex/Suricata.pdf:
- @HAVE_SPHINXBUILD_TRUE@ sysconfdir=$(sysconfdir) \
- @HAVE_SPHINXBUILD_TRUE@ localstatedir=$(localstatedir) \
- @HAVE_SPHINXBUILD_TRUE@ version=$(PACKAGE_VERSION) \
--@HAVE_SPHINXBUILD_TRUE@ $(SPHINX_BUILD) -W -b latex -d
_build/doctrees \
-+@HAVE_SPHINXBUILD_TRUE@ $(SPHINX_BUILD) -b latex -d
_build/doctrees \
- @HAVE_SPHINXBUILD_TRUE@ $(top_srcdir)/doc/userguide _build/latex
- # The Sphinx generated Makefile is GNU Make specific, so just do what
- # it does here - yes, multiple passes of pdflatex is required.
-@@ -650,7 +651,7 @@ uninstall-man: uninstall-man1
- @HAVE_SPHINXBUILD_TRUE@ sysconfdir=$(sysconfdir) \
- @HAVE_SPHINXBUILD_TRUE@ localstatedir=$(localstatedir) \
- @HAVE_SPHINXBUILD_TRUE@ version=$(PACKAGE_VERSION) \
--@HAVE_SPHINXBUILD_TRUE@ $(SPHINX_BUILD) -W -b man -d
_
Re: [new] devel/lua-argparse version 0.7.1
On 2023/10/18 12:46:15 +0200, Laurent Cheylus wrote:
> Hi,
>
> resubmit my proposal to import 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 a new port instead of including it as
> patch.
>
> This port supports FLAVORS for Lua 5.1, 5.2, 5.3 and 5.4.
>
> Build and tests OK on current/amd64.
>
> op@ has already reviewed this port (01/2023), see
> https://marc.info/?t=16745509462&r=1&w=2
>
> Tests/comments welcome and please commit if OK.
OK op@ to import. I'd use DIST_TUPLE now however and move PKG_ARCH
below a bit.
--- Makefile.orig Wed Oct 18 16:16:04 2023
+++ MakefileWed Oct 18 16:18:13 2023
@@ -1,11 +1,6 @@
-PKG_ARCH = *
-
COMMENT = command line parser for Lua
-GH_ACCOUNT = luarocks
-GH_PROJECT = argparse
-GH_TAGNAME = 0.7.1
-
+DIST_TUPLE = github luarocks argparse 0.7.1 .
PKGNAME = lua-${DISTNAME}
CATEGORIES = devel
@@ -20,6 +15,7 @@
NO_BUILD = Yes
NO_TEST = Yes
+PKG_ARCH = *
do-install:
${INSTALL_DATA_DIR} ${MODLUA_DATADIR}
[update] devel/difftastic 0.52.0
Hi, cc volker@ as maintainer a simple update for devel/difftastic version 0.52.0 Changelog: https://github.com/Wilfred/difftastic/releases/tag/0.52.0 Update Makefile, distinfo, crates.inc and regenerate patches for this version. Build and tests OK on current/amd64 with Rust 1.73.0. Please commit if OK. Laurent Index: Makefile === RCS file: /cvs/ports/devel/difftastic/Makefile,v retrieving revision 1.11 diff -u -p -r1.11 Makefile --- Makefile 1 Sep 2023 16:23:38 - 1.11 +++ Makefile 18 Oct 2023 14:14:06 - @@ -2,7 +2,7 @@ COMMENT = diff tool that compares files GH_ACCOUNT = Wilfred GH_PROJECT = difftastic -GH_TAGNAME = 0.51.1 +GH_TAGNAME = 0.52.0 HOMEPAGE = https://difftastic.wilfred.me.uk/ Index: crates.inc === RCS file: /cvs/ports/devel/difftastic/crates.inc,v retrieving revision 1.8 diff -u -p -r1.8 crates.inc --- crates.inc 1 Sep 2023 16:23:38 - 1.8 +++ crates.inc 18 Oct 2023 14:14:06 - @@ -44,6 +44,7 @@ MODCARGO_CRATES += lazy_static 1.4.0 # M MODCARGO_CRATES += libc 0.2.139 # MIT OR Apache-2.0 MODCARGO_CRATES += libm 0.2.7 # MIT OR Apache-2.0 MODCARGO_CRATES += libmimalloc-sys 0.1.24 # MIT +MODCARGO_CRATES += line-numbers 0.2.2 # MIT MODCARGO_CRATES += lock_api 0.4.9 # MIT OR Apache-2.0 MODCARGO_CRATES += log 0.4.17 # MIT OR Apache-2.0 MODCARGO_CRATES += memchr 2.5.0 # Unlicense/MIT Index: distinfo === RCS file: /cvs/ports/devel/difftastic/distinfo,v retrieving revision 1.9 diff -u -p -r1.9 distinfo --- distinfo 1 Sep 2023 16:23:38 - 1.9 +++ distinfo 18 Oct 2023 14:14:06 - @@ -44,6 +44,7 @@ SHA256 (cargo/lazy_static-1.4.0.tar.gz) SHA256 (cargo/libc-0.2.139.tar.gz) = IB3jJ1IN8Ad1fB8K3OboJ/6FYvvCi/2cFVccZsofX3k= SHA256 (cargo/libm-0.2.7.tar.gz) = 9wErG7sHGeEJfEdhHTiYVoxUbVl8LnTWb2CH7dUjP/Q= SHA256 (cargo/libmimalloc-sys-0.1.24.tar.gz) = dwX8QPbtST9zWEq7syTnT5azWP9g3+Vlmg+PwSxZCmk= +SHA256 (cargo/line-numbers-0.2.2.tar.gz) = eTp1MV62O4aZFYglveqF1j7rhQ51Q8uDSr7zx7W1N4A= SHA256 (cargo/lock_api-0.4.9.tar.gz) = Q1ARNm/lZYOxbPlW+d8AlbQFuC12QlvImBwOIuYOxN8= SHA256 (cargo/log-0.4.17.tar.gz) = q7EuaHz7RKpA9B/Dl473ZEj5tgOMrWrvQlnTwJWiOC4= SHA256 (cargo/memchr-2.5.0.tar.gz) = Lf/lLs8ndy5gGQW3Uiy073kNLMIDSIu9Di/oX8t0Vm0= @@ -122,7 +123,7 @@ SHA256 (cargo/windows_x86_64_gnullvm-0.4 SHA256 (cargo/windows_x86_64_msvc-0.42.1.tar.gz) = RHZgrTahMoix201CSOhXtRDow6IlyCK6T7dIwKr+z/0= SHA256 (cargo/wu-diff-0.1.2.tar.gz) = jj5nNfzeBkMocNuNydfjqxuTcnwU6u8ymWlCYpnyiJM= SHA256 (cargo/yansi-0.5.1.tar.gz) = CQQc2Qz4X3+LLfYMZG+FO39TXOaPhSROtnMc+J+kmOw= -SHA256 (difftastic-0.51.1.tar.gz) = kOEvieyZLHHJKIAD3ktBkUGGtk8c+lFme5SWr7ma4II= +SHA256 (difftastic-0.52.0.tar.gz) = bXE2vkFy73scTZr1ClSmIL6uV2cKcWIv6R5VCQvpcGU= SIZE (cargo/ahash-0.7.6.tar.gz) = 38030 SIZE (cargo/aho-corasick-0.7.20.tar.gz) = 111440 SIZE (cargo/assert_cmd-2.0.5.tar.gz) = 22683 @@ -169,6 +170,7 @@ SIZE (cargo/lazy_static-1.4.0.tar.gz) = SIZE (cargo/libc-0.2.139.tar.gz) = 638983 SIZE (cargo/libm-0.2.7.tar.gz) = 115688 SIZE (cargo/libmimalloc-sys-0.1.24.tar.gz) = 1119801 +SIZE (cargo/line-numbers-0.2.2.tar.gz) = 5106 SIZE (cargo/lock_api-0.4.9.tar.gz) = 25685 SIZE (cargo/log-0.4.17.tar.gz) = 38028 SIZE (cargo/memchr-2.5.0.tar.gz) = 65812 @@ -247,4 +249,4 @@ SIZE (cargo/windows_x86_64_gnullvm-0.42. SIZE (cargo/windows_x86_64_msvc-0.42.1.tar.gz) = 664606 SIZE (cargo/wu-diff-0.1.2.tar.gz) = 33439 SIZE (cargo/yansi-0.5.1.tar.gz) = 16525 -SIZE (difftastic-0.51.1.tar.gz) = 57440531 +SIZE (difftastic-0.52.0.tar.gz) = 57517066 Index: patches/patch-Cargo_lock === RCS file: /cvs/ports/devel/difftastic/patches/patch-Cargo_lock,v retrieving revision 1.7 diff -u -p -r1.7 patch-Cargo_lock --- patches/patch-Cargo_lock 1 Sep 2023 16:23:40 - 1.7 +++ patches/patch-Cargo_lock 18 Oct 2023 14:14:06 - @@ -3,7 +3,7 @@ https://github.com/Wilfred/difftastic/co Index: Cargo.lock --- Cargo.lock.orig +++ Cargo.lock -@@ -935,8 +935,9 @@ dependencies = [ +@@ -942,8 +942,9 @@ dependencies = [ [[package]] name = "tree_magic_mini" Index: patches/patch-Cargo_toml === RCS file: /cvs/ports/devel/difftastic/patches/patch-Cargo_toml,v retrieving revision 1.7 diff -u -p -r1.7 patch-Cargo_toml --- patches/patch-Cargo_toml 1 Sep 2023 16:23:40 - 1.7 +++ patches/patch-Cargo_toml 18 Oct 2023 14:14:06 - @@ -12,7 +12,7 @@ Index: Cargo.toml # bumpalo 3.12 requires rust 1.60 bumpalo = "3.11.1" unicode-width = "0.1.9" -@@ -89,6 +89,3 @@ path = "src/main.rs" +@@ -92,6 +92,3 @@ path = "src/main.rs" [features]
mips64 bulk build report
bulk build on octeon.ports.openbsd.org started on Sun Oct 8 15:13:16 UTC 2023 finished at Tue Oct 17 16:26:28 UTC 2023 lasted 10D01h13m done with kern.version=OpenBSD 7.4 (GENERIC.MP) #1380: Thu Oct 5 19:23:38 MDT 2023 built packages:9074 Oct 8:1692 Oct 9:923 Oct 10:776 Oct 11:455 Oct 12:404 Oct 13:538 Oct 14:915 Oct 15:587 Oct 16:367 Oct 17:2416 build failures: 100 http://build-failures.rhaalovely.net/mips64/2023-10-08/databases/postgresql-pllua.log http://build-failures.rhaalovely.net/mips64/2023-10-08/devel/arm-none-eabi/gcc,aarch64.log http://build-failures.rhaalovely.net/mips64/2023-10-08/devel/clang-tools-extra.log http://build-failures.rhaalovely.net/mips64/2023-10-08/devel/llvm/16,-lldb.log http://build-failures.rhaalovely.net/mips64/2023-10-08/devel/objfw.log http://build-failures.rhaalovely.net/mips64/2023-10-08/devel/py-thrift,python3.log http://build-failures.rhaalovely.net/mips64/2023-10-08/devel/py-unicorn,python3.log http://build-failures.rhaalovely.net/mips64/2023-10-08/devel/sdcc.log http://build-failures.rhaalovely.net/mips64/2023-10-08/emulators/desmume.log http://build-failures.rhaalovely.net/mips64/2023-10-08/emulators/openmsx.log http://build-failures.rhaalovely.net/mips64/2023-10-08/emulators/spike.log http://build-failures.rhaalovely.net/mips64/2023-10-08/games/astromenace.log http://build-failures.rhaalovely.net/mips64/2023-10-08/games/cataclysm-dda,no_x11.log http://build-failures.rhaalovely.net/mips64/2023-10-08/games/gnukem.log http://build-failures.rhaalovely.net/mips64/2023-10-08/games/goldberg_emulator.log http://build-failures.rhaalovely.net/mips64/2023-10-08/games/hyperrogue.log http://build-failures.rhaalovely.net/mips64/2023-10-08/games/wesnoth.log http://build-failures.rhaalovely.net/mips64/2023-10-08/games/witchblast.log http://build-failures.rhaalovely.net/mips64/2023-10-08/geo/gpstk.log http://build-failures.rhaalovely.net/mips64/2023-10-08/graphics/openvdb.log http://build-failures.rhaalovely.net/mips64/2023-10-08/inputmethods/ibus.log http://build-failures.rhaalovely.net/mips64/2023-10-08/lang/STk.log http://build-failures.rhaalovely.net/mips64/2023-10-08/lang/gambit.log http://build-failures.rhaalovely.net/mips64/2023-10-08/lang/gforth.log http://build-failures.rhaalovely.net/mips64/2023-10-08/lang/librep.log http://build-failures.rhaalovely.net/mips64/2023-10-08/lang/pfe.log http://build-failures.rhaalovely.net/mips64/2023-10-08/mail/opensmtpd-filters/rspamd.log http://build-failures.rhaalovely.net/mips64/2023-10-08/math/gbc.log http://build-failures.rhaalovely.net/mips64/2023-10-08/math/lean.log http://build-failures.rhaalovely.net/mips64/2023-10-08/math/lrs.log http://build-failures.rhaalovely.net/mips64/2023-10-08/math/mlpack,-main.log http://build-failures.rhaalovely.net/mips64/2023-10-08/math/ntl.log http://build-failures.rhaalovely.net/mips64/2023-10-08/misc/remind.log http://build-failures.rhaalovely.net/mips64/2023-10-08/multimedia/assimp.log http://build-failures.rhaalovely.net/mips64/2023-10-08/net/eduvpn/vpn-daemon.log http://build-failures.rhaalovely.net/mips64/2023-10-08/net/gtk-gnutella.log http://build-failures.rhaalovely.net/mips64/2023-10-08/net/icinga/core2.log http://build-failures.rhaalovely.net/mips64/2023-10-08/net/minio/client.log http://build-failures.rhaalovely.net/mips64/2023-10-08/net/minio/server.log http://build-failures.rhaalovely.net/mips64/2023-10-08/net/powerdns_recursor.log http://build-failures.rhaalovely.net/mips64/2023-10-08/net/syncthing.log http://build-failures.rhaalovely.net/mips64/2023-10-08/net/utox.log http://build-failures.rhaalovely.net/mips64/2023-10-08/plan9/drawterm.log http://build-failures.rhaalovely.net/mips64/2023-10-08/productivity/tryton/5.0/account_de_skr03.log http://build-failures.rhaalovely.net/mips64/2023-10-08/productivity/tryton/5.0/account_deposit.log http://build-failures.rhaalovely.net/mips64/2023-10-08/productivity/tryton/5.0/account_dunning_letter.log http://build-failures.rhaalovely.net/mips64/2023-10-08/productivity/tryton/5.0/account_fr.log http://build-failures.rhaalovely.net/mips64/2023-10-08/productivity/tryton/5.0/account_fr_chorus.log http://build-failures.rhaalovely.net/mips64/2023-10-08/productivity/tryton/5.0/account_invoice_stock.log http://build-failures.rhaalovely.net/mips64/2023-10-08/productivity/tryton/5.0/account_payment_sepa.log http://build-failures.rhaalovely.net/mips64/2023-10-08/productivity/tryton/5.0/analytic_invoice.log http://build-failures.rhaalovely.net/mips64/2023-10-08/productivity/tryton/5.0/analytic_purchase.log http://build-failures.rhaalovely.net/mips64/2023-10-08/productivity/tryton/5.0/customs.log http://build-failures.rhaalovely.net/mips64/2023-10-08/productivity/tryton/5.0/edocument_unece.log http://build-failures.rhaalovely.net/mips64/2023-10-08/productivity/tryton/5.0/product_measurements.log http://build-failures.rhaalovely.net/mips64/2023-10-08/productivity/tryton/5.0/production.log http://build-failures.rhaalovely.net/mips64/2023-10-08/productivity/
Re: patch: fix audacity mp3 export on startup
On 2023/10/18 15:55, Marc Espie wrote: > On first run, audacity will look for "libmp3lame.so.0" which doesn't > exist on OpenBSD, then prompting the user to find the library. > > This is doubly absurd, because it doesn't match our naming > scheme, and also because we run depend on lame. > > This patch appears to do the trick: we can load a library > without looking at the major number, especially when > it doesn't match what the program expects. > > I assume the rest would help the file requester as well. > > (note that in order to test, you need to move > ~/.config/audacity out of the way) > > Okay ? Yep. This reinstates a patch lost in the 2.2.2 update.
patch: fix audacity mp3 export on startup
On first run, audacity will look for "libmp3lame.so.0" which doesn't
exist on OpenBSD, then prompting the user to find the library.
This is doubly absurd, because it doesn't match our naming
scheme, and also because we run depend on lame.
This patch appears to do the trick: we can load a library
without looking at the major number, especially when
it doesn't match what the program expects.
I assume the rest would help the file requester as well.
(note that in order to test, you need to move
~/.config/audacity out of the way)
Okay ?
Index: Makefile
===
RCS file: /cvs/ports/audio/audacity/Makefile,v
retrieving revision 1.92
diff -u -p -r1.92 Makefile
--- Makefile10 Sep 2023 21:12:43 - 1.92
+++ Makefile18 Oct 2023 13:52:34 -
@@ -6,7 +6,7 @@ GH_ACCOUNT= audacity
GH_PROJECT=audacity
GH_TAGNAME=Audacity-3.3.3
DISTNAME= ${GH_TAGNAME:L}
-REVISION= 0
+REVISION= 1
CATEGORIES=audio
Index: patches/patch-src_export_ExportMP3_cpp
===
RCS file: patches/patch-src_export_ExportMP3_cpp
diff -N patches/patch-src_export_ExportMP3_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_export_ExportMP3_cpp 18 Oct 2023 13:52:34 -
@@ -0,0 +1,19 @@
+Index: src/export/ExportMP3.cpp
+--- src/export/ExportMP3.cpp.orig
src/export/ExportMP3.cpp
+@@ -1582,13 +1582,13 @@ wxString MP3Exporter::GetLibraryPath()
+
+ wxString MP3Exporter::GetLibraryName()
+ {
+- return wxT("libmp3lame.so.0");
++ return wxT("libmp3lame.so");
+ }
+
+ FileNames::FileTypes MP3Exporter::GetLibraryTypes()
+ {
+return {
+- { XO("Only libmp3lame.so.0"), { wxT("libmp3lame.so.0") } },
++ { XO("Only libmp3lame.so"), { wxT("libmp3lame.so*") } },
+ { XO("Primary shared object files"), { wxT("so") }, true },
+ { XO("Extended libraries"), { wxT("so*") }, true },
+ FileNames::AllFiles
[new] devel/py-pdm-backend 2.1.7 - Python build backend used by PDM
Hi, proposal to import devel/py-pdm-backend, a Python build backend used by PDM (Python Dependency Manager https://pdm.fming.dev). - Main site: https://pdm-backend.fming.dev/ - GH repository: https://github.com/pdm-project/pdm-backend I need this Python build backend to update/import other Python modules that use it, so I create this initial port. - Create initial port for version 2.1.7 according to python-module. - Build and tests OK on current/amd64 with Python 3.10.13 Tests/comments welcome and please commit if OK. Laurent py-pdm-backend-2.1.7.tar.gz Description: application/compressed-tar
Re: [new] textproc/vgrep
On Sat, 2023-09-09 at 17:38 +, Omar Polo wrote: > On 2023/09/09 23:51:20 +0800, lux wrote: > > Github: https://github.com/vrothberg/vgrep > > > > The built-in grep command in OpenBSD is currently not supported, but it > > works well with git-grep and ripgrep. I have tested it on AMD64 7.3 and > > it works fine for me. > > Haven't tried the port, but have you tried if removing --color from > the grep invocation (using a custom patch) works? Looking at the code > they use --color=auto which our grep (rightly IMHO) doesn't support, > but quickly looking at the code they don't seem to care about the > escapes being there. > > If you go this route you may also consider changing -Z with --null. > They seem to assume that -Z is to NUL terminate the file names, while > in our and other grep(1) implementations is to force grep to behave as > zgrep, we have --null for that. IIUC --null is more portable than -Z. > > > Hi, vgrep now has OpenBSD support[1], I'm repost the port file. Thanks. [1]: https://github.com/vrothberg/vgrep/releases vgrep.tar.gz Description: application/compressed-tar
Re: [new] textproc/urlscan 1.0.1 - a better urlview replacement
On 2023/10/18 14:14, Stefan Hagen wrote:
> Hi all,
>
> attached is a new port, which is bascially urlview, but better.
>
MODPY_PYBUILD = hatchling
BUILD_DEPENDS = devel/py-hatchling${MODPY_FLAVOR} \
devel/py-hatch-vcs${MODPY_FLAVOR}
please replace the above MODPY_PYBUILD + BUILD_DEPENDS lines with
MODPY_PYBUILD = hatch-vcs
> Most notably, it shows context parts from the email, so it's easier to
> know which link belongs to which reference text.
>
> cat pkg/DESCR:
> Urlscan is a small program that is designed to integrate with the
> "mutt" mailreader to allow you to easily launch a Web browser for URLs
> contained in email messages. It is a replacement for the "urlview"
> program.
When I test, it lists the collected URLs and allows me to select.
When I press enter on one of these, it then opens in links (as
identified by pstree) but the screen doesn't change from urlscan's
display. The only way to exit seems to be blindly typing commands
from the browser, or ^C.
Re: [new] textproc/urlscan 1.0.1 - a better urlview replacement
Hi Stefan, > attached is a new port, which is bascially urlview, but better. > > I started the port and will take MAINTAINER. Laurent polished it, > thank you! > > Tested and in use for two weeks here on amd64. > > OK to import? Build OK with Python 3.10.13 on current/amd64. Minimal tests with my mails => URLs correctly extracted with urlscan :) You forgot to remove UPDATE file in your archive (imported from your openbsd-wip tree). Laurent
[new] devel/stylua 0.18.2
Hi, proposal to import devel/stylua version 0.18.2 StyLua is an opinionated Lua code formatter written in Rust => https://github.com/JohnnyMorganz/StyLua I'm using this tool to format my Lua code, particulary my Neovim configuration/plugins. - Create initial port devel/stylua with module devel/cargo for v0.18.2 Build and tests OK on current/amd64 with Rust 1.73.0 Tests/comments welcome and please commit if OK. Laurent stylua-0.18.2.tar.gz Description: application/compressed-tar
[new] textproc/urlscan 1.0.1 - a better urlview replacement
Hi all, attached is a new port, which is bascially urlview, but better. Most notably, it shows context parts from the email, so it's easier to know which link belongs to which reference text. cat pkg/DESCR: Urlscan is a small program that is designed to integrate with the "mutt" mailreader to allow you to easily launch a Web browser for URLs contained in email messages. It is a replacement for the "urlview" program. Relative to urlview, urlscan has the following additional features: * Support for emails in quoted-printable and base64 encodings. No more stripping out =40D from URLs by hand! * The context of each URL is provided along with the URL. For HTML mails, a crude parser is used to render the HTML into text. Context view can be toggled on/off with c. * URLs are shortened by default to fit on one line. Viewing full URL (for one or all) is toggled with s or S. * Jump to a URL by typing the number. * Incremental case-insensitive search with /. * Execute an arbitrary function (for example, copy URL to clipboard) instead of opening URL in a browser. * Use l to cycle through whether URLs are opened using the Python webbrowser module (default), xdg-open (if installed) or opened by a function passed on the command line with --run or --run-safe. * Configure colors and keybindings via ~/.config/urlscan/config.json. Generate default config file for editing by running urlscan -g. Cycle through available palettes with p. Set display width with --width. * Copy URL to clipboard with C or to primary selection with P. Requires xsel or xclip. * Run a command with the selected URL as the argument or pipe the selected URL to a command. * Show complete help menu with F1. Hide header on startup with --nohelp. * Use a custom regular expression with -E for matching urls or any other pattern. In junction with -r, this effectively turns urlscan into a general purpose CLI selector-type utility. * Scan certain email headers for URLs. Currently Link, Archived-At and List-* are scanned when --headers is passed. * Queue multiple URLs for opening and open them all at once with a and o. I started the port and will take MAINTAINER. Laurent polished it, thank you! Tested and in use for two weeks here on amd64. OK to import? - Stefan urlscan.tgz Description: application/tar-gz
Re: x11/openbox broken with 7.4 upgrade
On Wed, 18 Oct 2023, Stuart Henderson wrote:
> CC'ing maintainer.
>
> Not tested yet but I think this should do the trick.
> If it works it would make sense to commit to 7.4-stable too.
Hi Stuart, hi all
I'm an Openbox user myself.
The fix for this specific problem is ok, but here's a patch incorporating
all the relevant bugfixes from the Debian package:
Index: x11/openbox/Makefile
===
RCS file: /cvs/ports/x11/openbox/Makefile,v
retrieving revision 1.91
diff -u -p -u -p -r1.91 Makefile
--- x11/openbox/Makefile27 Sep 2023 20:37:19 - 1.91
+++ x11/openbox/Makefile18 Oct 2023 08:54:58 -
@@ -1,7 +1,7 @@
COMMENT = small, fast & usable window manager
V =3.6.1
-REVISION = 11
+REVISION = 12
DISTNAME = openbox-${V}
SHARED_LIBS += obrender12.0# 32.0
SHARED_LIBS += obt 1.1 # 2.2
@@ -15,7 +15,7 @@ MAINTAINER = Benoit Lecocq https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=719620
+
+Index: configure
+--- configure.orig
configure
+@@ -14647,12 +14647,12 @@ if test -n "$LIBSN_CFLAGS"; then
+ pkg_cv_LIBSN_CFLAGS="$LIBSN_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+-{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"libstartup-notification-1.0 >= 0.8\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "libstartup-notification-1.0 >= 0.8")
2>&5
++{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"libstartup-notification-1.0 >= 0.8 xi\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "libstartup-notification-1.0 >= 0.8
xi") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_LIBSN_CFLAGS=`$PKG_CONFIG --cflags "libstartup-notification-1.0 >=
0.8" 2>/dev/null`
++ pkg_cv_LIBSN_CFLAGS=`$PKG_CONFIG --cflags "libstartup-notification-1.0 >=
0.8 xi" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+@@ -14664,12 +14664,12 @@ if test -n "$LIBSN_LIBS"; then
+ pkg_cv_LIBSN_LIBS="$LIBSN_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+-{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"libstartup-notification-1.0 >= 0.8\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "libstartup-notification-1.0 >= 0.8")
2>&5
++{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"libstartup-notification-1.0 >= 0.8 xi\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "libstartup-notification-1.0 >= 0.8
xi") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_LIBSN_LIBS=`$PKG_CONFIG --libs "libstartup-notification-1.0 >= 0.8"
2>/dev/null`
++ pkg_cv_LIBSN_LIBS=`$PKG_CONFIG --libs "libstartup-notification-1.0 >= 0.8
xi" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+@@ -14690,9 +14690,9 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- LIBSN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "libstartup-notification-1.0 >= 0.8" 2>&1`
++ LIBSN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "libstartup-notification-1.0 >= 0.8 xi" 2>&1`
+ else
+- LIBSN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"libstartup-notification-1.0 >= 0.8" 2>&1`
++ LIBSN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"libstartup-notification-1.0 >= 0.8 xi" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBSN_PKG_ERRORS" >&5
Index: x11/openbox/patches/patch-obrender_theme_c
===
RCS file: x11/openbox/patches/patch-obrender_theme_c
diff -N x11/openbox/patches/patch-obrender_theme_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ x11/openbox/patches/patch-obrender_theme_c 18 Oct 2023 08:54:58 -
@@ -0,0 +1,33 @@
+Fix for toggled hover and pressed images masks not loaded.
+Toggled hover and pressed images masks in Openbox themes are not loaded
+which broke many existing themes.
+Debian bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=887908
+
+Index: obrender/theme.c
+--- obrender/theme.c.orig
obrender/theme.c
+@@ -1494,8 +1494,10 @@ static void read_button_styles(XrmDatabase db, const R
+ READ_BUTTON_MASK_COPY(disabled, btn->unpressed_mask);
+ READ_BUTTON_MASK_COPY(hover, btn->unpressed_mask);
+ if (toggled_mask) {
+-READ_BUTTON_MASK_COPY(pressed_toggled, btn->unpressed_toggled_mask);
+-READ_BUTTON_MASK_COPY(hover_toggled, btn->unpressed_toggled_mask);
++g_snprintf(name, 128, "%s_toggled_press
[new] devel/lua-argparse version 0.7.1
Hi, resubmit my proposal to import 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 a new port instead of including it as patch. This port supports FLAVORS for Lua 5.1, 5.2, 5.3 and 5.4. Build and tests OK on current/amd64. op@ has already reviewed this port (01/2023), see https://marc.info/?t=16745509462&r=1&w=2 Tests/comments welcome and please commit if OK. Laurent lua-argparse-0.7.1.tar.gz Description: application/compressed-tar
Re: x11/openbox broken with 7.4 upgrade
On 2023/10/17 23:07, Ghislain Mercier wrote:
> Hello,
>
> With yesterday's upgrade from 7.3 to 7.4, and more specifically with
> glib2 upgrading from 2.74.6 to 2.76.6, Openbox crashes when switching
> out of a fullscreen window (tested on 7.4 GENERIC.MP#1397 amd64).
>
> It appears to be a known bug, see
> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1033385
>
> I quote :
> > This bug has been reported upstream at
> > https://bugzilla.icculus.org/show_bug.cgi?id=6669.
> >
> > The following patch is provided to fix the bug, and has been accepted
> > into a developer's work branch here:
> > http://git.openbox.org/?p=mikachu/openbox.git;a=commit;h=d41128e5a1002af41c976c8860f8299cfcd3cd72
>
> I would be happy to provide a diff for the port but I have absolutely no
> idea of how to do that... Of course, if one of the kind developers had
> time to provide some guidance I could learn and try.
>
> Thanks in advance !
>
> GM.
>
CC'ing maintainer.
Not tested yet but I think this should do the trick.
If it works it would make sense to commit to 7.4-stable too.
Index: Makefile
===
RCS file: /cvs/ports/x11/openbox/Makefile,v
retrieving revision 1.91
diff -u -p -r1.91 Makefile
--- Makefile27 Sep 2023 20:37:19 - 1.91
+++ Makefile18 Oct 2023 08:54:50 -
@@ -1,7 +1,7 @@
COMMENT = small, fast & usable window manager
V =3.6.1
-REVISION = 11
+REVISION = 12
DISTNAME = openbox-${V}
SHARED_LIBS += obrender12.0# 32.0
SHARED_LIBS += obt 1.1 # 2.2
Index: patches/patch-openbox_client_c
===
RCS file: /cvs/ports/x11/openbox/patches/patch-openbox_client_c,v
retrieving revision 1.4
diff -u -p -r1.4 patch-openbox_client_c
--- patches/patch-openbox_client_c 11 Mar 2022 20:16:51 - 1.4
+++ patches/patch-openbox_client_c 18 Oct 2023 08:54:50 -
@@ -1,8 +1,25 @@
+First hunk, in client_get_settings_state():
+
Fix a NULL pointer dereference that was causing a crash when launching
Java GUI applications.
From https://bugzilla.icculus.org/show_bug.cgi?id=5277 via Arch
Linux.
+
+Others, in client_calc_layer():
+
+From d41128e5a1002af41c976c8860f8299cfcd3cd72 Mon Sep 17 00:00:00 2001
+From: pldubouilh
+Date: Fri, 17 Mar 2023 18:23:47 +0100
+Subject: [PATCH] Fix list traversal issue in client_calc_layer
+
+The calls to client_calc_layer_internal can modify stacking_list, which
+can cause us to follow dangling ->next pointers (either by the pointer
+itself already being freed, or it pointing to a freed area). Avoid this
+by copying the list first, the goal is to visit every client in the list
+once so this should be fine.
+
+
Index: openbox/client.c
--- openbox/client.c.orig
+++ openbox/client.c
@@ -15,3 +32,35 @@ Index: openbox/client.c
!g_pattern_match(app->title,
strlen(self->title), self->title, NULL))
match = FALSE;
+@@ -2702,9 +2702,12 @@ static void client_calc_layer_internal(ObClient *self)
+ void client_calc_layer(ObClient *self)
+ {
+ GList *it;
++/* the client_calc_layer_internal calls below modify stacking_list,
++ so we have to make a copy to iterate over */
++GList *list = g_list_copy(stacking_list);
+
+ /* skip over stuff above fullscreen layer */
+-for (it = stacking_list; it; it = g_list_next(it))
++for (it = list; it; it = g_list_next(it))
+ if (window_layer(it->data) <= OB_STACKING_LAYER_FULLSCREEN) break;
+
+ /* find the windows in the fullscreen layer, and mark them not-visited */
+@@ -2717,7 +2720,7 @@ void client_calc_layer(ObClient *self)
+ client_calc_layer_internal(self);
+
+ /* skip over stuff above fullscreen layer */
+-for (it = stacking_list; it; it = g_list_next(it))
++for (it = list; it; it = g_list_next(it))
+ if (window_layer(it->data) <= OB_STACKING_LAYER_FULLSCREEN) break;
+
+ /* now recalc any windows in the fullscreen layer which have not
+@@ -2728,6 +2731,8 @@ void client_calc_layer(ObClient *self)
+ !WINDOW_AS_CLIENT(it->data)->visited)
+ client_calc_layer_internal(it->data);
+ }
++
++g_list_free(it);
+ }
+
+ gboolean client_should_show(ObClient *self)
maintainer update. net/miniflux --> 2.0.49
Hi ports@,
This is an update for net/miniflux to its latest version 2.0.49
Here you can find the changelog:
https://github.com/miniflux/v2/releases/tag/2.0.49
Builds and works for me on amd64.
Ok to commit ?
diff /usr/ports
commit - c0f1d1012a8c7385da266b3000fdaa6e9fd52073
path + /usr/ports
blob - ac0361511f21d9de6741ce9ba4cf41df1dbbfd13
file + net/miniflux/Makefile
--- net/miniflux/Makefile
+++ net/miniflux/Makefile
@@ -1,6 +1,6 @@
COMMENT = minimalist and opinionated feed reader
-V =2.0.47
+V =2.0.49
MODGO_MODNAME =miniflux.app/v2
MODGO_VERSION =v${V}
blob - dc80c873c46d2d246576b20ecddd03acf7e40c66
file + net/miniflux/distinfo
--- net/miniflux/distinfo
+++ net/miniflux/distinfo
@@ -4,15 +4,16 @@ SHA256 (go_modules/cloud.google.com/go/compute/metadat
SHA256 (go_modules/cloud.google.com/go/compute/metadata/@v/v0.2.3.zip) =
KShk29Cx3jepaOKF6UmIXlczhIN9gc02lb5c4uI5GIc=
SHA256 (go_modules/github.com/!puerkito!bio/goquery/@v/v1.8.1.mod) =
PdJrWoVK5qjme4hGGMZqgUbSeLV9376VsbWDWV5lIfo=
SHA256 (go_modules/github.com/!puerkito!bio/goquery/@v/v1.8.1.zip) =
mHy89bC7F4vWBNfgA2iLfRttK0QgiWu3Kx+RGMxtu1c=
-SHA256 (go_modules/github.com/alecthomas/kingpin/v2/@v/v2.3.1.mod) =
FSS1kPj2LKNeHWx/Txq1lsIYVkQ9I4Vt+4CyKDzbuZA=
-SHA256 (go_modules/github.com/alecthomas/kingpin/v2/@v/v2.3.1.zip) =
KjImgdeUYd15PB6KmK3wYvbvVUq806sGmB7vlNecE2s=
+SHA256 (go_modules/github.com/abadojack/whatlanggo/@v/v1.0.1.mod) =
jHniF4Hvg4kbhyMbZLrpnNEw3q3ZdMXkreYvyoea+bk=
+SHA256 (go_modules/github.com/abadojack/whatlanggo/@v/v1.0.1.zip) =
L3RTvhuh+PD/XUbq+xVEjSXEetcS20FNdxqIiKl9uJo=
+SHA256 (go_modules/github.com/alecthomas/kingpin/v2/@v/v2.3.2.mod) =
17OszAg8LYhxB+e5mY0rfap993NS0WnmnW+75plfuL0=
+SHA256 (go_modules/github.com/alecthomas/kingpin/v2/@v/v2.3.2.zip) =
jzMPNcpCm2acOXzy5rWLjNaJT7bWQ39wmZMdLRQAuQk=
SHA256
(go_modules/github.com/alecthomas/units/@v/v0.0.0-20211218093645-b94a6e3cc137.mod)
= ftH6kO7vq7UGWGCrf2fdM/5ysTVwVCejb0515qgQBls=
SHA256
(go_modules/github.com/alecthomas/units/@v/v0.0.0-20211218093645-b94a6e3cc137.zip)
= tiQ310pSMImvRroBFezhzhG8peMh/h4dTJduzKbueKo=
SHA256 (go_modules/github.com/andybalholm/cascadia/@v/v1.3.1.mod) =
Nz9xoR93/QzAdAw9khO/1momaUfm/DV5vjOC9m0aFBc=
SHA256 (go_modules/github.com/andybalholm/cascadia/@v/v1.3.1.zip) =
c15xY/d3QlTNT5atOAteqMz3AtrFOZ2+MN0DhxcsWlE=
SHA256 (go_modules/github.com/beorn7/perks/@v/v1.0.1.mod) =
yHCz/lC2lE+rCVsGII2ciJh2PpFzyx7tMljD1YMJumY=
SHA256 (go_modules/github.com/beorn7/perks/@v/v1.0.1.zip) =
Jb2eLZSsp3Dm28H1NyX4T2r0Qy9jHTXdLEb5bvBRLxo=
-SHA256 (go_modules/github.com/cespare/xxhash/v2/@v/v2.1.2.mod) =
oJD46q9ZzCrfFjKZ6+/nl+Hco/at0sjoimo7kLpTiwI=
SHA256 (go_modules/github.com/cespare/xxhash/v2/@v/v2.2.0.mod) =
oJD46q9ZzCrfFjKZ6+/nl+Hco/at0sjoimo7kLpTiwI=
SHA256 (go_modules/github.com/cespare/xxhash/v2/@v/v2.2.0.zip) =
/BgM2wwA+/+9Obd0pyzbXwwyrOJTcNUTUZWRiow/vSU=
SHA256
(go_modules/github.com/cheekybits/is/@v/v0.0.0-20150225183255-68e9c0620927.mod)
= wo1aGMOmDgJ++Tmy/juUYTaa7qDjgoEuKX1jE40yIGM=
@@ -34,11 +35,8 @@ SHA256 (go_modules/github.com/go-kit/log/@v/v0.2.1.mod
SHA256 (go_modules/github.com/go-kit/log/@v/v0.2.1.zip) =
UmNLUCudCqlFgz2TWCz/wb3Zv6OYEOfHDQaI4zC3UZg=
SHA256 (go_modules/github.com/go-logfmt/logfmt/@v/v0.5.1.mod) =
pjttroy/srYD56wCM4IMuYObhlVV3Nj7oid7j9coaaA=
SHA256 (go_modules/github.com/go-logfmt/logfmt/@v/v0.5.1.zip) =
ngMM0JtYTlmi9bqqJM9gBSB1fXMq8PiZPMQS3TCGcDo=
-SHA256
(go_modules/github.com/go-telegram-bot-api/telegram-bot-api/@v/v4.6.4+incompatible.mod)
= BqnGTTFLx/rYnBZvy2UMTuCVuT+YdngInFagTjxLEPA=
-SHA256
(go_modules/github.com/go-telegram-bot-api/telegram-bot-api/@v/v4.6.4+incompatible.zip)
= oNJUngfGfgZjN8xurdi+KpYdE7ST1DJWAwENTjXlGd8=
SHA256 (go_modules/github.com/golang/protobuf/@v/v1.2.0.mod) =
wKIDG/J3CHdJ2MzEMkSfaxN1eH6shkHdL5MAdCMar7Q=
SHA256 (go_modules/github.com/golang/protobuf/@v/v1.3.1.mod) =
wKIDG/J3CHdJ2MzEMkSfaxN1eH6shkHdL5MAdCMar7Q=
-SHA256 (go_modules/github.com/golang/protobuf/@v/v1.3.5.mod) =
s6wk4gSR2Eb+rulQiL3gkmzl4kU4UCUPUkdEFuZhKUQ=
SHA256 (go_modules/github.com/golang/protobuf/@v/v1.5.0.mod) =
c4y7HelrZ6YjisO4CBzYsb+w2uvPbJu+jL221zuuzRk=
SHA256 (go_modules/github.com/golang/protobuf/@v/v1.5.2.mod) =
fI52EFJ6/Xckx+i36EPxMrDbYejJ3UncWJ1DDokpvMQ=
SHA256 (go_modules/github.com/golang/protobuf/@v/v1.5.3.mod) =
fI52EFJ6/Xckx+i36EPxMrDbYejJ3UncWJ1DDokpvMQ=
@@ -59,14 +57,12 @@ SHA256 (go_modules/github.com/kr/pretty/@v/v0.3.1.mod)
SHA256 (go_modules/github.com/kr/pretty/@v/v0.3.1.zip) =
7PWkrySCbDrXWM4GQQygji1Y5NlQU747nd4uFIUsDNw=
SHA256 (go_modules/github.com/lib/pq/@v/v1.10.9.mod) =
lMFIhoiyuYIqluE3XjIAKmUswa7nFSD2v6h77I63nAY=
SHA256 (go_modules/github.com/lib/pq/@v/v1.10.9.zip) =
Z5Gnr2f4RqhjNTUAEsTvrdCFAJbr8iNQt7IOAeIW5vI=
-SHA256
(go_modules/github.com/matrix-org/gomatrix/@v/v0.0.0-20220926102614-ceba4d9f7530.mod)
= 1jlp+m4HwQyxqSeOd5w4KNEtAzhpQ/1q0cQ9gKpaz7I=
-SHA256
(go_modules/github.com/matrix-org/gomatrix/@v/v0.0.
