devel/p5-Log-Dispatch: Update to 2.71
Hi, ports@:
Here is a patch for devel/p5-Log-Dispatch:
i) Update to 2.71
ii) Add missing DEPENDS
It build well and pass all tests on amd64-current system.
10 ports depend on devel/p5-Log-Dispatch, 9 ports
build well and pass tests with this patch. But I did not test www/rt.
Regards,
wenIndex: Makefile
===
RCS file: /cvs/ports/devel/p5-Log-Dispatch/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile11 Mar 2022 18:51:40 - 1.22
+++ Makefile28 Nov 2023 02:42:06 -
@@ -2,18 +2,22 @@ COMMENT = dispatches messages to one or
MODULES = cpan
PKG_ARCH = *
-DISTNAME = Log-Dispatch-2.51
+DISTNAME = Log-Dispatch-2.71
CATEGORIES = devel
-REVISION = 0
# perl
PERMIT_PACKAGE = Yes
RUN_DEPENDS = devel/p5-Module-Runtime \
+ devel/p5-Devel-GlobalDestruction \
devel/p5-Dist-CheckConflicts \
- devel/p5-Params-Validate
+ devel/p5-Params-Validate \
+ devel/p5-Specio>=0.32 \
+ devel/p5-Try-Tiny \
+ devel/p5-namespace-autoclean
TEST_DEPENDS = devel/p5-File-Find-Rule \
+ devel/p5-Test-Needs \
devel/p5-Test-Requires \
devel/p5-Test-Fatal
Index: distinfo
===
RCS file: /cvs/ports/devel/p5-Log-Dispatch/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo21 Sep 2015 06:43:26 - 1.9
+++ distinfo28 Nov 2023 02:42:06 -
@@ -1,2 +1,2 @@
-SHA256 (Log-Dispatch-2.51.tar.gz) =
x9rYzbfyQvVmP9Se6EjENF3TX8YJ7ZiiwAx10jym+sg=
-SIZE (Log-Dispatch-2.51.tar.gz) = 56576
+SHA256 (Log-Dispatch-2.71.tar.gz) =
nWDZZIw1zidUcx603rfwWAns4b1jO3TXR5Wu2exzJXA=
+SIZE (Log-Dispatch-2.71.tar.gz) = 72470
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/p5-Log-Dispatch/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST 11 Mar 2022 18:51:40 - 1.5
+++ pkg/PLIST 28 Nov 2023 02:42:06 -
@@ -19,6 +19,8 @@ ${P5SITE}/Log/Dispatch/Null.pm
${P5SITE}/Log/Dispatch/Output.pm
${P5SITE}/Log/Dispatch/Screen.pm
${P5SITE}/Log/Dispatch/Syslog.pm
+${P5SITE}/Log/Dispatch/Types.pm
+${P5SITE}/Log/Dispatch/Vars.pm
@man man/man3p/Log::Dispatch.3p
@man man/man3p/Log::Dispatch::ApacheLog.3p
@man man/man3p/Log::Dispatch::Base.3p
@@ -35,3 +37,5 @@ ${P5SITE}/Log/Dispatch/Syslog.pm
@man man/man3p/Log::Dispatch::Output.3p
@man man/man3p/Log::Dispatch::Screen.3p
@man man/man3p/Log::Dispatch::Syslog.3p
+@man man/man3p/Log::Dispatch::Types.3p
+@man man/man3p/Log::Dispatch::Vars.3p
sysutils/truncate: drop "cpath" under -c
Promise not creating files.
Add usual Makefile comment.
Could also defer initial pledge after getopt handling to have a single
if (no_create)
pledge("stdio rpath wpath cpath")
else
pledge("stdio rpath wpath")
Feedback? OK?
Index: Makefile
===
RCS file: /cvs/ports/sysutils/truncate/Makefile,v
diff -u -p -r1.4 Makefile
--- Makefile27 Sep 2023 17:16:35 - 1.4
+++ Makefile28 Nov 2023 02:02:08 -
@@ -1,6 +1,7 @@
COMMENT = truncate or extend the length of files
DISTNAME = truncate-5.2.1
CATEGORIES = sysutils
+REVISION = 0
HOMEPAGE = https://www.dragonflybsd.org/
MAINTAINER = Brian Callahan
@@ -8,6 +9,7 @@ MAINTAINER =Brian Callahan https://mirrors.nycbug.org/pub/distfiles/
Index: patches/patch-truncate_c
===
RCS file: patches/patch-truncate_c
diff -N patches/patch-truncate_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-truncate_c28 Nov 2023 02:07:14 -
@@ -0,0 +1,16 @@
+Drop "cpath" under -c (no file creation)
+
+Index: truncate.c
+--- truncate.c.orig
truncate.c
+@@ -84,6 +84,10 @@ main(int argc, char **argv)
+ argv += optind;
+ argc -= optind;
+
++ if (no_create)
++ if (pledge("stdio rpath wpath", NULL) == -1)
++ err(1, "pledge");
++
+ /*
+* Exactly one of do_refer or got_size must be specified. Since
+* do_relative implies got_size, do_relative and do_refer are
devel/p5-Locale-Codes: Update to 3.76
Hi, ports@: Here is a simple patch for devel/p5-Locale-Codes to update to 3.76. It build well and pass all tests on amd64-current system. The changelog is: 3.76 2023-09-05 sbeck - Fixed problem in distro Accidentally created a distribution (3.75) that is broken. GitHub #18 3.75 2023-09-01 sbeck - NEW CODE(s) 3.74 2023-06-07 sbeck - NEW CODE(s) Regards, wenIndex: Makefile === RCS file: /cvs/ports/devel/p5-Locale-Codes/Makefile,v retrieving revision 1.11 diff -u -p -r1.11 Makefile --- Makefile28 Apr 2023 14:07:57 - 1.11 +++ Makefile28 Nov 2023 01:20:38 - @@ -1,6 +1,6 @@ COMMENT = distribution of modules to handle locale codes -DISTNAME = Locale-Codes-3.73 +DISTNAME = Locale-Codes-3.76 CATEGORIES = devel Index: distinfo === RCS file: /cvs/ports/devel/p5-Locale-Codes/distinfo,v retrieving revision 1.9 diff -u -p -r1.9 distinfo --- distinfo28 Apr 2023 14:07:57 - 1.9 +++ distinfo28 Nov 2023 01:20:38 - @@ -1,2 +1,2 @@ -SHA256 (Locale-Codes-3.73.tar.gz) = mm244rCEPrqKIod4XJt9BR3uaMc/HldXgKCX83Xo5oI= -SIZE (Locale-Codes-3.73.tar.gz) = 868121 +SHA256 (Locale-Codes-3.76.tar.gz) = Qo00GFUJ7fbaYoYoAJcohrsCwySTRU/L4Y+Zmk9DXzk= +SIZE (Locale-Codes-3.76.tar.gz) = 870255
spyder 5.x: import pytoolconfig
py-rope is missing an RDEP on pytoolconfig. pytoolconfig has a BDEP on pdm-backend. These should be the final 2 new ports needed for spyder 5.x. ok? py-pdm-backend.tgz Description: Binary data py-pytoolconfig.tgz Description: Binary data
[update] devel/mercurial to 6
Hi ports@
Here is a trivial update of devel/mercurial to 6.6.
Built and tested on arm64.
diff /usr/ports
commit - 6c3190bbbde3468e01e104d266fa997be5d523f5
path + /usr/ports
blob - 46882faecdab5f25363b449a5069dc963555b78a
file + devel/mercurial/Makefile
--- devel/mercurial/Makefile
+++ devel/mercurial/Makefile
@@ -1,7 +1,7 @@
COMMENT-main = fast, lightweight source control management
COMMENT-x11 = graphical tooling for mercurial
-MODPY_EGG_VERSION =6.4.4
+MODPY_EGG_VERSION =6.6
DISTNAME = mercurial-${MODPY_EGG_VERSION}
CATEGORIES = devel
blob - ec3fef7c8bdb10f023565aa861bc1238579d6de8
file + devel/mercurial/distinfo
--- devel/mercurial/distinfo
+++ devel/mercurial/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mercurial-6.4.4.tar.gz) = u5hTl8t0cO4BWL7iNwl+L93/rTJ+ZFpJSXozRx54qRA=
-SIZE (mercurial-6.4.4.tar.gz) = 8182450
+SHA256 (mercurial-6.6.tar.gz) = a/1xy6DfOxjeQkIWsw4qVBzKbgEEhT0zNL6AoqsJpK0=
+SIZE (mercurial-6.6.tar.gz) = 8250065
blob - 26d8d95118ccf660cc0145e7213fd9a1b49ffed2
file + devel/mercurial/pkg/PLIST-main
--- devel/mercurial/pkg/PLIST-main
+++ devel/mercurial/pkg/PLIST-main
@@ -193,22 +193,6 @@ lib/python${MODPY_VERSION}/site-packages/hgext/hooklib
lib/python${MODPY_VERSION}/site-packages/hgext/hooklib/enforce_draft_commits.py
lib/python${MODPY_VERSION}/site-packages/hgext/hooklib/reject_merge_commits.py
lib/python${MODPY_VERSION}/site-packages/hgext/hooklib/reject_new_heads.py
-lib/python${MODPY_VERSION}/site-packages/hgext/infinitepush/
-lib/python${MODPY_VERSION}/site-packages/hgext/infinitepush/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/hgext/infinitepush/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/hgext/infinitepush/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/hgext/infinitepush/${MODPY_PYCACHE}bundleparts.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/hgext/infinitepush/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/hgext/infinitepush/${MODPY_PYCACHE}fileindexapi.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/hgext/infinitepush/${MODPY_PYCACHE}indexapi.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/hgext/infinitepush/${MODPY_PYCACHE}sqlindexapi.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/hgext/infinitepush/${MODPY_PYCACHE}store.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/hgext/infinitepush/bundleparts.py
-lib/python${MODPY_VERSION}/site-packages/hgext/infinitepush/common.py
-lib/python${MODPY_VERSION}/site-packages/hgext/infinitepush/fileindexapi.py
-lib/python${MODPY_VERSION}/site-packages/hgext/infinitepush/indexapi.py
-lib/python${MODPY_VERSION}/site-packages/hgext/infinitepush/sqlindexapi.py
-lib/python${MODPY_VERSION}/site-packages/hgext/infinitepush/store.py
lib/python${MODPY_VERSION}/site-packages/hgext/journal.py
lib/python${MODPY_VERSION}/site-packages/hgext/keyword.py
lib/python${MODPY_VERSION}/site-packages/hgext/largefiles/
@@ -341,11 +325,14 @@ lib/python${MODPY_VERSION}/site-packages/hgext3rd/${MO
lib/python${MODPY_VERSION}/site-packages/mercurial/
lib/python${MODPY_VERSION}/site-packages/mercurial-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
lib/python${MODPY_VERSION}/site-packages/mercurial/__init__.py
+lib/python${MODPY_VERSION}/site-packages/mercurial/__main__.py
lib/python${MODPY_VERSION}/site-packages/mercurial/__modulepolicy__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}__modulepolicy__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}__version__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}admin_commands.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}ancestor.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}archival.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}bookmarks.${MODPY_PYC_MAGIC_TAG}pyc
@@ -491,6 +478,13 @@ lib/python${MODPY_VERSION}/site-packages/mercurial/${M
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}wireprotov1server.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}worker.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/__version__.py
+lib/python${MODPY_VERSION}/site-packages/mercurial/admin/
+lib/python${MODPY_VERSION}/site-packages/mercurial/admin/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION
HEADS-UP: ports current follows source current
I did some small changes to pkg_add to detect the "updatedb" (cache for package updates) in a way that's independent from quirks. Soon, quirks will gain an @option updatedb entry. If you have old pkg_add (e.g., you don't update to a snapshot of base before a package snapshot) this will break as a syntax error. Soon afterwards, you will lose caching entirely... Please update. (the idea is to move the updatedb to a separate package, so "being quirks" is not enough to identify the db, and it's cleaner to do it as a unique-option. I'm committing this in stages, so people who follow the rules should not be impacted at all... :-> )
Re: Early Look: PostgreSQL 16.0
On 09/16 09:56, Theo Buehler wrote:
> On Thu, Sep 14, 2023 at 06:06:37PM +, Jeremy Evans wrote:
> > PostgreSQL 16.0 was released today:
> > https://www.postgresql.org/about/news/postgresql-16-released-2715/
> >
> > As usual, we don't plan to change the default version in ports until
> > 16.1, and after we have prepared updates all software that depends on
> > PostgreSQL to support the new version. However, for early testing,
> > here's a diff to test with.
>
> As mentioned elsewhwere, the diff needs an installed icu4c to configure
> as it is now. I ran a bulk with '--without-icu' added to CONFIGURE_ARGS.
>
> There are a few version checks that break some ports, as usual.
> There is at least one .so in the server that had changes amounting to a
> major bump, but for some reasone they aren't versioned. Should they be?
Patch below makes the ports tree ready for PostgreSQL 16.1:
databases/citus version
Citus since upgraded to 12.1.0, which works with PostgreSQL 16.
databases/pg_sqlite_fdw version
pg_sqlite_fdw since upgraded to 2.4.0, which works with PostgreSQL 16.
databases/postgresql-odbc ?
Needed stdarg.h include added to a header. Patch below also updates it
to 16.00., the most current version.
databases/postgresql-pllua version
Patch below updates to 2.0.12, which works with PostgreSQL 16.
databases/timescaledb version
PostgreSQL 16 support not yet ready, planned for future version. I
marked it BROKEN, same as in the last 2 PostgreSQL major upgrades.
geo/pgpointcloudAPI break in -server
Patch below updates to 1.2.5, which works with PostgreSQL 16 (might have
already worked with patch I removed).
Can someone test this in a bulk? Also, OKs to apply this if no fallout
from the bulk?
After updating -current, I'll update -stable to 15.5.
Thanks,
Jeremy
Index: databases/postgresql/Makefile
===
RCS file: /cvs/ports/databases/postgresql/Makefile,v
diff -u -p -r1.299 Makefile
--- databases/postgresql/Makefile 17 Nov 2023 17:46:55 - 1.299
+++ databases/postgresql/Makefile 19 Nov 2023 21:46:39 -
@@ -5,11 +5,10 @@ COMMENT-contrib=PostgreSQL RDBMS contrib
COMMENT-plpython=Python procedural language for PostgreSQL
COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous version
-VERSION= 15.4
-PREV_MAJOR=14
+VERSION= 16.1
+PREV_MAJOR=15
DISTNAME= postgresql-${VERSION}
PKGNAME-main= postgresql-client-${VERSION}
-REVISION= 1
DPB_PROPERTIES=parallel
@@ -17,7 +16,7 @@ CATEGORIES= databases
SHARED_LIBS= ecpg7.10 \
ecpg_compat 4.10 \
pgtypes 4.9 \
- pq 6.14
+ pq 6.15
HOMEPAGE= https://www.postgresql.org/
@@ -84,8 +83,9 @@ LIB_DEPENDS-main= textproc/libxml
WANTLIB-main= ${WANTLIB} execinfo xml2
LIB_DEPENDS-server=databases/postgresql=${VERSION} \
+ textproc/icu4c \
${LIB_DEPENDS-main}
-WANTLIB-server=${WANTLIB-main} perl pq
+WANTLIB-server=${WANTLIB-main} icudata icui18n icuuc perl pq
RUN_DEPENDS-contrib= databases/postgresql,-server=${VERSION}
LIB_DEPENDS-contrib= databases/postgresql=${VERSION} \
Index: databases/postgresql/distinfo
===
RCS file: /cvs/ports/databases/postgresql/distinfo,v
diff -u -p -r1.98 distinfo
--- databases/postgresql/distinfo 13 Aug 2023 20:23:27 - 1.98
+++ databases/postgresql/distinfo 11 Nov 2023 04:30:27 -
@@ -1,2 +1,2 @@
-SHA256 (postgresql-15.4.tar.gz) = DhHu5yPdflmmNAUrwb/JvmBeVcHMo/Zun8JdOjlPsDA=
-SIZE (postgresql-15.4.tar.gz) = 29978353
+SHA256 (postgresql-16.1.tar.gz) = vwVkclYT98V/HD6/XJCbPsWLnPs9gbS7EgnYh2cGWoc=
+SIZE (postgresql-16.1.tar.gz) = 32433767
Index: databases/postgresql/patches/patch-src_backend_libpq_ip_c
===
RCS file: /cvs/ports/databases/postgresql/patches/patch-src_backend_libpq_ip_c,v
diff -u -p -r1.4 patch-src_backend_libpq_ip_c
--- databases/postgresql/patches/patch-src_backend_libpq_ip_c 11 Mar 2022
18:31:37 - 1.4
+++ databases/postgresql/patches/patch-src_backend_libpq_ip_c 25 May 2023
15:08:40 -
@@ -4,12 +4,11 @@ since the latter is unreliable. Fixes "s
Index: src/backend/libpq/ifaddr.c
--- src/backend/libpq/ifaddr.c.orig
+++ src/backend/libpq/ifaddr.c
-@@ -200,17 +200,16 @@ run_ifaddr_callback(PgIfAddrCallback callback, void *c
+@@ -189,16 +189,14 @@ run_ifaddr_callback(PgIfAddrCallback callback, void *c
/* Check that the mask is valid */
if (mask)
{
- if (mask->sa_family != addr->sa_family)
-+
+ /* mask->sa_family can be different from addr->sa_family. */
+
+
Re: [new] net/soju
2023-11-22T17:49:18Z "Johannes Thyssen Tishman" : > please find attached a port for soju, an IRC bouncer. > > from pkg/DESCR: > > soju is a user-friendly IRC bouncer. soju connects to upstream IRC > > servers on behalf of the user to provide extra functionality. soju > > supports many features such as multiple users, numerous IRCv3 > > extensions, chat history playback and detached channels. It is > > well-suited for both small and large deployments. > > soju is the IRC bouncer behind chat.sr.ht and AFAIK it is also > developed by the SourceHut project. It is really easy to configure > and I've been running it for a couple of days without any issues. > > Feedback, OKs? > > Kind regards, > Johannes A new release was made today. Please find the updated port attached. soju-0.7.0.tar.gz Description: application/gzip Index: infrastructure/db/user.list === RCS file: /cvs/ports/infrastructure/db/user.list,v retrieving revision 1.433 diff -u -p -r1.433 user.list --- infrastructure/db/user.list 27 Nov 2023 18:07:58 - 1.433 +++ infrastructure/db/user.list 27 Nov 2023 19:33:30 - @@ -402,3 +402,4 @@ id user group port 891 _kiwix-serve _kiwix-serve www/kiwix/kiwix-tools 892 _shiori _shiori www/shiori 893 _azorius _azorius www/azorius +894 _soju _soju net/soju
[update] sysutils/parallel to 20231122
Hi, trivial update of parallel to v20231122. Built and tested on arm64. diff /usr/ports commit - 6c3190bbbde3468e01e104d266fa997be5d523f5 path + /usr/ports blob - 238c1dc196e06b91c56170ad67f36ff649715a16 file + sysutils/parallel/Makefile --- sysutils/parallel/Makefile +++ sysutils/parallel/Makefile @@ -1,6 +1,6 @@ COMMENT = execute jobs in parallel -DISTNAME = parallel-20221122 +DISTNAME = parallel-20231122 CATEGORIES = sysutils blob - d8b966ebb1a6ac2759e630fc9dd0f10b45d39760 file + sysutils/parallel/distinfo --- sysutils/parallel/distinfo +++ sysutils/parallel/distinfo @@ -1,2 +1,2 @@ -SHA256 (parallel-20221122.tar.bz2) = qj2dIkNN8UjWk/GmIyMxoSZym2oi0vcmGxf7qa2ZU50= -SIZE (parallel-20221122.tar.bz2) = 2415514 +SHA256 (parallel-20231122.tar.bz2) = giyc+KoXFSCthn2xPvE0Jmab0WTIG5AKPby1VmEb6uI= +SIZE (parallel-20231122.tar.bz2) = 2526069 blob - 4233e0b35cdf865617386bd546167f289cc52f05 file + sysutils/parallel/patches/patch-src_Makefile_in --- sysutils/parallel/patches/patch-src_Makefile_in +++ sysutils/parallel/patches/patch-src_Makefile_in @@ -1,7 +1,7 @@ Index: src/Makefile.in --- src/Makefile.in.orig +++ src/Makefile.in -@@ -516,7 +516,7 @@ distdir-am: $(DISTFILES) +@@ -499,7 +499,7 @@ distdir-am: $(DISTFILES) done check-am: all-am check: check-am @@ -10,7 +10,7 @@ Index: src/Makefile.in installdirs: for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man7dir)" "$(DESTDIR)$(docdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -@@ -572,7 +572,7 @@ info: info-am +@@ -555,7 +555,7 @@ info: info-am info-am: -- ~Justin
Re: net/pfresolved rc startup
On Mon, Nov 27, 2023 at 09:29:02AM +, Klemens Nanni wrote:
> Just pass it from the ports Makefile, no patch needed:
>
> FAKE_FLAGS = BINDIR=/usr/local/sbin
Portcheck does not like this:
hardcoded paths detected in Makefile, consider using SUBST_VARS and TRUEPREFIX/L
OCALBASE/LOCALSTATEDIR/VARBASE
> > +daemon="${TRUEPREFIX}/sbin/pfresolved"
>
> Works, but should match what's used for BINDIR:
>
> daemon="/usr/local/sbin/pfresolved"
I dropped the LOCALBASE patch, but keep TRUEPREFIX in Makefile and
rc script.
Now everything is consistent. Thanks for feedback.
Re: vaultwarden 1.30.0 breaks autofilling
On 11/24/23 01:58, Bjorn Ketelaars wrote: > On Thu 23/11/2023 23:44, A Tammy wrote: >> >> On 11/20/23 14:12, Bjorn Ketelaars wrote: >>> On Mon 20/11/2023 15:00, Oliver Schweger wrote: Hello, please consider updating vaultwarden to version 1.30.1 asap, as version 1.30.0 breaks autofilling on nearly all websites. https://github.com/dani-garcia/vaultwarden/discussions/4052 https://github.com/dani-garcia/vaultwarden/pull/4056 https://github.com/dani-garcia/vaultwarden/releases/tag/1.30.1 Thank you. >>> Thank you Oliver for the heads up. It would have helped if you also >>> provided a diff for updating vaultwarden. Do you think this is possible >>> for the next time? >>> >>> In the mean time: the diff below updates vaultwarden to 1.30.1. Lightly >>> run tested on amd64. >>> >>> Once again, this update uses the same version of Rocket-* as the version >>> we have in ports. As such, the same vendored tarball can be used. A more >>> pretty solution is to provide vaultwarden-deps-1.30.1.tgz, which is a >>> copy of vaultwarden-deps-1.30.0.tgz, and slightly adapt the diff below. >>> >>> Test reports are welcome. >>> >> >> I will test it out over the weekend but the diff looks OK to me! >> >> I've also copied the deps tarball, so we can remove that line from the diff. > New diff below, which takes into account the copied deps tarball. > Thanks for the reminder!! Tested it out, OK aisha@ > diff --git Makefile Makefile > index f60121b2188..81270d5dc93 100644 > --- Makefile > +++ Makefile > @@ -7,7 +7,7 @@ COMMENT = unofficial bitwarden compatible server > > GH_ACCOUNT = dani-garcia > GH_PROJECT = vaultwarden > -GH_TAGNAME = 1.30.0 > +GH_TAGNAME = 1.30.1 > > CATEGORIES = security > > diff --git crates.inc crates.inc > index e49a3bb9038..f1bca2a4e4f 100644 > --- crates.inc > +++ crates.inc > @@ -1,7 +1,6 @@ > MODCARGO_CRATES += addr2line 0.21.0 # Apache-2.0 OR MIT > MODCARGO_CRATES += adler 1.0.2 # 0BSD OR MIT OR Apache-2.0 > -MODCARGO_CRATES += ahash 0.7.6 # MIT OR Apache-2.0 > -MODCARGO_CRATES += ahash 0.8.3 # MIT OR Apache-2.0 > +MODCARGO_CRATES += ahash 0.8.6 # MIT OR Apache-2.0 > MODCARGO_CRATES += aho-corasick1.1.2 # Unlicense OR MIT > MODCARGO_CRATES += alloc-no-stdlib 2.0.4 # BSD-3-Clause > MODCARGO_CRATES += alloc-stdlib0.2.2 # BSD-3-Clause > @@ -10,13 +9,16 @@ MODCARGO_CRATES += android-tzdata 0.1.1 # MIT OR > Apache-2.0 > MODCARGO_CRATES += android_system_properties 0.1.5 # MIT/Apache-2.0 > MODCARGO_CRATES += argon2 0.5.2 # MIT OR Apache-2.0 > MODCARGO_CRATES += async-channel 1.9.0 # Apache-2.0 OR MIT > +MODCARGO_CRATES += async-channel 2.1.0 # Apache-2.0 OR MIT > MODCARGO_CRATES += async-compression 0.4.4 # MIT OR Apache-2.0 > MODCARGO_CRATES += async-executor 1.6.0 # Apache-2.0 OR MIT > MODCARGO_CRATES += async-global-executor 2.3.1 # Apache-2.0 OR MIT > MODCARGO_CRATES += async-io1.13.0 # Apache-2.0 OR MIT > +MODCARGO_CRATES += async-io2.2.0 # Apache-2.0 OR MIT > MODCARGO_CRATES += async-lock 2.8.0 # Apache-2.0 OR MIT > +MODCARGO_CRATES += async-lock 3.1.0 # Apache-2.0 OR MIT > MODCARGO_CRATES += async-process 1.8.1 # Apache-2.0 OR MIT > -MODCARGO_CRATES += async-signal0.2.4 # Apache-2.0 OR MIT > +MODCARGO_CRATES += async-signal0.2.5 # Apache-2.0 OR MIT > MODCARGO_CRATES += async-std 1.12.0 # Apache-2.0/MIT > MODCARGO_CRATES += async-stream0.3.5 # MIT > MODCARGO_CRATES += async-stream-impl 0.3.5 # MIT > @@ -28,37 +30,37 @@ MODCARGO_CRATES +=atomic-waker1.1.2 # > Apache-2.0 OR MIT > MODCARGO_CRATES += autocfg 1.1.0 # Apache-2.0 OR MIT > MODCARGO_CRATES += backtrace 0.3.69 # MIT OR Apache-2.0 > MODCARGO_CRATES += base64 0.13.1 # MIT/Apache-2.0 > -MODCARGO_CRATES += base64 0.21.4 # MIT OR Apache-2.0 > +MODCARGO_CRATES += base64 0.21.5 # MIT OR Apache-2.0 > MODCARGO_CRATES += base64ct1.6.0 # Apache-2.0 OR MIT > MODCARGO_CRATES += binascii0.1.4 # MIT > MODCARGO_CRATES += bitflags1.3.2 # MIT/Apache-2.0 > MODCARGO_CRATES += bitflags2.4.1 # MIT OR Apache-2.0 > MODCARGO_CRATES += blake2 0.10.6 # MIT OR Apache-2.0 > MODCARGO_CRATES += block-buffer0.10.4 # MIT OR Apache-2.0 > -MODCARGO_CRATES += blocking1.4.1 # Apache-2.0 OR MIT > +MODCARGO_CRATES += blocking1.5.1 # Apache-2.0 OR MIT > MODCARGO_CRATES += brotli 3.4.0 # BSD-3-Clause/MIT > -MODCARGO_CRATES += brotli-decompressor 2.5.0 # BSD-3-Clause/MIT > +MODCARGO_CRATES += brotli-decompressor 2.5.1 # BSD-3-Clause/MIT > MODCARGO_CRATES += bumpalo 3.14.0 # MIT OR Apache-2.0 > MODCARGO_CRATES += bytemuck1.14.0 # Zlib OR Apache-2.0 OR MIT > MODCARGO_CRATES += byteorder 1.5.0 # U
[WIP/Import] x11/py-qt6 at 6.5.2
Hi, wanted to share my work in progress to bring py-qt6 for OpenBSD. It is attached with two new ports: - x11/py-qt6 - x11/py-sip-qt6 Built on arm64, testing in progress. For now I think I managed to get most of it the right way. One thing that bothers me is the result of `make port-lib-depends-check` for py-qt6: Extra: Qt6QtPositioning.2 What does it mean ? Testing and feedbacks welcome. cc rsadowsky@ -- ~Justin py-sip-qt6.tgz Description: application/tar-gz py-qt6.tgz Description: application/tar-gz
Re: spyder 5.x: import lsp-server, lsp-black, qstylizer
Hi Daniel, On Sun, 26 Nov 2023 14:54:57 -0500 (EST), Daniel Dickman wrote: > 3 new ports needed by spyder 5.x. > > python-lsp-server is an RDEP for python-lsp-black. I'm also working on a OpenBSD port for python-lsp-server but never submit it => https://github.com/jasperla/openbsd-wip/tree/master/devel/py-python- lsp-server Your port and mine are almost identical :) Build and tests of your python-lsp-server port OK on current/amd64. Build and tests also OK for python-lsp-black. => OK to import Laurent
[update] misc/py-yfinance
Attached is a diff which updates misc/py-yfinance to the most current
version.
Thanks.
Index: Makefile
===
RCS file: /cvs/ports/misc/py-yfinance/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile25 Nov 2022 16:14:22 - 1.8
+++ Makefile27 Nov 2023 14:05:32 -
@@ -1,9 +1,8 @@
COMMENT= fetching finanical market data with Python
-MODPY_EGG_VERSION= 0.1.72
+MODPY_EGG_VERSION= 0.2.32
DISTNAME= yfinance-${MODPY_EGG_VERSION}
PKGNAME= py-yfinance-${MODPY_EGG_VERSION}
-REVISION= 1
CATEGORIES=misc
Index: distinfo
===
RCS file: /cvs/ports/misc/py-yfinance/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo20 Jun 2022 22:58:31 - 1.5
+++ distinfo27 Nov 2023 14:05:32 -
@@ -1,2 +1,2 @@
-SHA256 (yfinance-0.1.72.tar.gz) = KPmk4pv9ZKRn87n857rriHm915P8qIqA8qUEj8CNOBo=
-SIZE (yfinance-0.1.72.tar.gz) = 26400
+SHA256 (yfinance-0.2.32.tar.gz) = /tbjdwKvdabAfIwuHFalMxpNTzQWNJlevHNfHfBupUM=
+SIZE (yfinance-0.2.32.tar.gz) = 66497
Index: pkg/PLIST
===
RCS file: /cvs/ports/misc/py-yfinance/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 25 Nov 2022 16:14:22 - 1.3
+++ pkg/PLIST 27 Nov 2023 14:05:32 -
@@ -13,6 +13,14 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/yfinance/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/yfinance/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/yfinance/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yfinance/${MODPY_PYCACHE}cache.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/yfinance/${MODPY_PYCACHE}cache.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yfinance/${MODPY_PYCACHE}const.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/yfinance/${MODPY_PYCACHE}const.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yfinance/${MODPY_PYCACHE}data.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/yfinance/${MODPY_PYCACHE}data.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yfinance/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/yfinance/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/yfinance/${MODPY_PYCACHE}multi.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/yfinance/${MODPY_PYCACHE}multi.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/yfinance/${MODPY_PYCACHE}shared.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -26,7 +34,28 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/yfinance/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/yfinance/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/yfinance/base.py
+lib/python${MODPY_VERSION}/site-packages/yfinance/cache.py
+lib/python${MODPY_VERSION}/site-packages/yfinance/const.py
+lib/python${MODPY_VERSION}/site-packages/yfinance/data.py
+lib/python${MODPY_VERSION}/site-packages/yfinance/exceptions.py
lib/python${MODPY_VERSION}/site-packages/yfinance/multi.py
+lib/python${MODPY_VERSION}/site-packages/yfinance/scrapers/
+lib/python${MODPY_VERSION}/site-packages/yfinance/scrapers/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/yfinance/scrapers/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/yfinance/scrapers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/yfinance/scrapers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yfinance/scrapers/${MODPY_PYCACHE}analysis.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/yfinance/scrapers/${MODPY_PYCACHE}analysis.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yfinance/scrapers/${MODPY_PYCACHE}fundamentals.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/yfinance/scrapers/${MODPY_PYCACHE}fundamentals.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yfinance/scrapers/${MODPY_PYCACHE}holders.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/yfinance/scrapers/${MODPY_PYCACHE}holders.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yfinance/scrapers/${MODPY_PYCACHE}quo
[new] math/py-quantities
Attached is a new port, math/py-quantities, which is required to activate the regression tests of print/py-pylatex. Thanks. py-quantities.tgz Description: application/compressed-tar
Re: [update] nextcloud 27.1.4 / 26.0.8
On 11/27/23 15:17, Landry Breuil wrote: hi, as every month.. 27.1.4 wfm. Landry You are way too fast :) OK, I have the same. Thanks
[update] nextcloud 27.1.4 / 26.0.8
hi, as every month.. 27.1.4 wfm. Landry Index: 26/Makefile === RCS file: /cvs/ports/www/nextcloud/26/Makefile,v retrieving revision 1.9 diff -u -r1.9 Makefile --- 26/Makefile 5 Oct 2023 14:18:07 - 1.9 +++ 26/Makefile 27 Nov 2023 10:51:38 - @@ -1,4 +1,3 @@ -NC_VERSION=26.0.7 -REVISION= 0 +NC_VERSION=26.0.8 .include Index: 26/distinfo === RCS file: /cvs/ports/www/nextcloud/26/distinfo,v retrieving revision 1.8 diff -u -r1.8 distinfo --- 26/distinfo 28 Sep 2023 09:09:39 - 1.8 +++ 26/distinfo 27 Nov 2023 10:51:38 - @@ -1,2 +1,2 @@ -SHA256 (nextcloud-26.0.7.tar.bz2) = vtJEqLlNE7YWqSdAUhZwwdZ9Q8SAR3I/sTGAv/bUjpI= -SIZE (nextcloud-26.0.7.tar.bz2) = 158561582 +SHA256 (nextcloud-26.0.8.tar.bz2) = ydCay0RuM2AZYIKRM/jzdutvJ5pN73CCF/xxWBiSiH8= +SIZE (nextcloud-26.0.8.tar.bz2) = 158787833 Index: 26/pkg/PLIST === RCS file: /cvs/ports/www/nextcloud/26/pkg/PLIST,v retrieving revision 1.7 diff -u -r1.7 PLIST --- 26/pkg/PLIST17 Sep 2023 10:27:13 - 1.7 +++ 26/pkg/PLIST27 Nov 2023 10:51:38 - @@ -9608,6 +9608,8 @@ nextcloud/apps/admin_audit/l10n/ca.json nextcloud/apps/admin_audit/l10n/cs.js nextcloud/apps/admin_audit/l10n/cs.json +nextcloud/apps/admin_audit/l10n/cy_GB.js +nextcloud/apps/admin_audit/l10n/cy_GB.json nextcloud/apps/admin_audit/l10n/da.js nextcloud/apps/admin_audit/l10n/da.json nextcloud/apps/admin_audit/l10n/de.js @@ -9698,6 +9700,8 @@ nextcloud/apps/admin_audit/l10n/sr.json nextcloud/apps/admin_audit/l10n/sv.js nextcloud/apps/admin_audit/l10n/sv.json +nextcloud/apps/admin_audit/l10n/th.js +nextcloud/apps/admin_audit/l10n/th.json nextcloud/apps/admin_audit/l10n/tr.js nextcloud/apps/admin_audit/l10n/tr.json nextcloud/apps/admin_audit/l10n/uk.js @@ -10658,6 +10662,8 @@ nextcloud/apps/cloud_federation_api/l10n/ nextcloud/apps/cloud_federation_api/l10n/ar.js nextcloud/apps/cloud_federation_api/l10n/ar.json +nextcloud/apps/cloud_federation_api/l10n/ast.js +nextcloud/apps/cloud_federation_api/l10n/ast.json nextcloud/apps/cloud_federation_api/l10n/bg.js nextcloud/apps/cloud_federation_api/l10n/bg.json nextcloud/apps/cloud_federation_api/l10n/ca.js @@ -10994,6 +11000,8 @@ nextcloud/apps/contactsinteraction/l10n/ nextcloud/apps/contactsinteraction/l10n/ar.js nextcloud/apps/contactsinteraction/l10n/ar.json +nextcloud/apps/contactsinteraction/l10n/ast.js +nextcloud/apps/contactsinteraction/l10n/ast.json nextcloud/apps/contactsinteraction/l10n/bg.js nextcloud/apps/contactsinteraction/l10n/bg.json nextcloud/apps/contactsinteraction/l10n/ca.js @@ -12733,7 +12741,10 @@ nextcloud/apps/files/lib/Collaboration/Resources/Listener.php nextcloud/apps/files/lib/Collaboration/Resources/ResourceProvider.php nextcloud/apps/files/lib/Command/ +nextcloud/apps/files/lib/Command/Delete.php nextcloud/apps/files/lib/Command/DeleteOrphanedFiles.php +nextcloud/apps/files/lib/Command/Get.php +nextcloud/apps/files/lib/Command/Put.php nextcloud/apps/files/lib/Command/RepairTree.php nextcloud/apps/files/lib/Command/Scan.php nextcloud/apps/files/lib/Command/ScanAppData.php @@ -14844,6 +14855,8 @@ nextcloud/apps/firstrunwizard/l10n/ca.json nextcloud/apps/firstrunwizard/l10n/cs.js nextcloud/apps/firstrunwizard/l10n/cs.json +nextcloud/apps/firstrunwizard/l10n/cy_GB.js +nextcloud/apps/firstrunwizard/l10n/cy_GB.json nextcloud/apps/firstrunwizard/l10n/cy_GB.php nextcloud/apps/firstrunwizard/l10n/da.js nextcloud/apps/firstrunwizard/l10n/da.json @@ -15270,6 +15283,8 @@ nextcloud/apps/lookup_server_connector/l10n/ nextcloud/apps/lookup_server_connector/l10n/ar.js nextcloud/apps/lookup_server_connector/l10n/ar.json +nextcloud/apps/lookup_server_connector/l10n/ast.js +nextcloud/apps/lookup_server_connector/l10n/ast.json nextcloud/apps/lookup_server_connector/l10n/bg.js nextcloud/apps/lookup_server_connector/l10n/bg.json nextcloud/apps/lookup_server_connector/l10n/ca.js @@ -16001,6 +16016,8 @@ nextcloud/apps/password_policy/l10n/af.json nextcloud/apps/password_policy/l10n/ar.js nextcloud/apps/password_policy/l10n/ar.json +nextcloud/apps/password_policy/l10n/ast.js +nextcloud/apps/password_policy/l10n/ast.json nextcloud/apps/password_policy/l10n/az.js nextcloud/apps/password_policy/l10n/az.json nextcloud/apps/password_policy/l10n/bg.js @@ -16786,6 +16803,8 @@ nextcloud/apps/provisioning_api/l10n/ nextcloud/apps/provisioning_api/l10n/ar.js nextcloud/apps/provisioning_api/l10n/ar.json +nextcloud/apps/provisioning_api/l10n/ast.js +nextcloud/apps/provisioning_api/l10n/ast.json nextcloud/apps/provisioning_api/l10n/bg.js nextcloud/apps/provisioning_api/l10n/bg.json nextcloud/apps/provisioning_api/l10n/ca.js @@ -17356,6 +17375,8 @@ nextcloud/apps/serverinfo/l10n/ca.json nextcloud/apps/serverinfo/l10n/cs.js nextcloud/apps/serverinfo/l10n/cs.json +nex
Re: www/aria2: Update to 1.37.0
On 11/27/23 11:41, wen heping wrote: Hi, ports@: Here is a simple patch for www/aria2 to update to 1.37.0. It build and run well on amd64-current system. 3 tests failed in all 1k tests. Any comments ? Regards, wen Thanks I will take a look and commit it.
Re: spyder 5.x: import lsp-server, lsp-black, qstylizer
ok On 2023/11/26 14:54, Daniel Dickman wrote: > 3 new ports needed by spyder 5.x. > > python-lsp-server is an RDEP for python-lsp-black. > > ok to import these?
Re: spyder 5.x: import cookiecutter
On 2023/11/25 16:46, Daniel Dickman wrote:
> Following the previous message about re-importing binaryornot:
>https://marc.info/?l=openbsd-ports&m=170094343724652&w=2
>
> ...we can now import cookiecutter.
>
> Cookiecutter needs 2 new RDEPs on top of binaryornot:
> - python-slugify
> - jinja2-time
>
> All 3 ports are attached.
>
> ok for importing these?
>
> (note that I ended up going with the newest version of cookiecutter that
> doesn't end up needing whichcraft or poyo which may have been needed in
> older versions of cookiecutter)
typo - ${WRKDRIR} - otherwise ok
Re: spyder 5.x: revive whichcraft and binaryornot
ok (you'll need to merge conflicts in quirks)
On 2023/11/25 15:16, Daniel Dickman wrote:
> As part of the spyder 5.x we need cookiecutter (which was never imported).
>
> An attempt was made to import cookiecutter a few years ago, but then some
> of required ports were removed when the cookiecutter efforts stalled.
>
> Now spyder 5.5.0 requires cookiecutter.
>
> In this first step I'd like to revive 2 cookiecutter dependencies first:
> - binaryornot
> - whichcraft
>
> Now, these were both python2 and python3 before they were retired up, so
> the new ports also make them python3 only, while trying to make sure we
> don't go backwards from the old versions that were in ports.
>
> In theory, someone who still has the old ports installed should be able to
> update to the new ports. The diff to devel/quirks is shown below.
>
> ok to re-import these and update devel/quirks?
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/quirks/Makefile,v
> diff -u -p -u -r1.1582 Makefile
> --- Makefile 20 Nov 2023 11:53:55 - 1.1582
> +++ Makefile 25 Nov 2023 20:11:09 -
> @@ -3,7 +3,7 @@ CATEGORIES = devel databases
> DISTFILES =
>
> # API.rev
> -PKGNAME =quirks-6.198
> +PKGNAME =quirks-6.199
> PKG_ARCH = *
> MAINTAINER = Marc Espie
>
> Index: files/Quirks.pm
> ===
> RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
> diff -u -p -u -r1.1594 Quirks.pm
> --- files/Quirks.pm 20 Nov 2023 11:53:55 - 1.1594
> +++ files/Quirks.pm 25 Nov 2023 20:11:09 -
> @@ -803,6 +803,8 @@ my $stem_extensions = {
> 'py-future' => 'py3-future',
> 'py-capstone' => 'py3-capstone',
> 'iosevka-fixed-slab' => 'iosevka-slab',
> + 'py-binaryornot' => 'py3-binaryornot',
> + 'py-whichcraft' => 'py3-whichcraft',
> };
>
> my $obsolete_reason = {};
> @@ -1187,10 +1189,6 @@ setup_obsolete_reason(
> 5 => 'qucs',
> 1 => 'py-chai',
> 1 => 'py3-chai',
> - 1 => 'py-binaryornot',
> - 1 => 'py3-binaryornot',
> - 1 => 'py-whichcraft',
> - 1 => 'py3-whichcraft',
> 20 => 'celt07',
> 1 => qr{^terraform-provider-},
> 6 => 'radare2-bindings',
Re: import py-debugpy (needed for spyder 5.5.0)
On 2023/11/23 13:14, Daniel Dickman wrote: > Here's a port for debugpy. > > debugpy is needed in order to update ipykernel (which is needed for spyder > 5.5.0). > > debugpy needs 2 new TDEPs: > - untangle > - trio > > Most of the ports are used by trio (outcome and sniffio are RDEPs, astor > is a TDEP and curio is a TDEP for sniffio). > > ok to import these? py-curio/pkg/DESCR is empty. Otherwise OK
Re: textproc/ripgrep: update to 14.0.1
On Mon, Nov 27, 2023 at 11:19:39AM +, Klemens Nanni wrote:
> https://github.com/BurntSushi/ripgrep/releases
>
> Manpage and shell completions are now generated by rg.
>
> amd64:
> test result: ok. 297 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out;
> finished in 6.38s
>
> Feedback? OK?
Looks like Laurent was a little bit faster:
https://marc.info/?l=openbsd-ports&m=170108184208404&w=2
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/textproc/ripgrep/Makefile,v
> diff -u -p -r1.27 Makefile
> --- Makefile 6 Mar 2023 18:45:42 - 1.27
> +++ Makefile 27 Nov 2023 11:09:03 -
> @@ -2,8 +2,7 @@ COMMENT = line oriented search tool usi
>
> GH_ACCOUNT = BurntSushi
> GH_PROJECT = ripgrep
> -GH_TAGNAME = 13.0.0
> -REVISION = 3
> +GH_TAGNAME = 14.0.1
>
> CATEGORIES = textproc sysutils
>
> @@ -13,7 +12,6 @@ PERMIT_PACKAGE =Yes
> WANTLIB += c c++abi pthread
>
> MODULES =devel/cargo
> -BUILD_DEPENDS = textproc/asciidoctor
>
> CONFIGURE_STYLE =cargo
>
> @@ -26,6 +24,11 @@ MODCARGO_RUSTFLAGS = -C debuginfo=0
> RELEASE_DIR =${MODCARGO_TARGET_DIR}/release
> OUT_DIR =${RELEASE_DIR}/build/ripgrep-*/out
>
> +post-build:
> + cd ${OUT_DIR} && ${RELEASE_DIR}/rg --generate man > ./rg.1
> + cd ${OUT_DIR} && ${RELEASE_DIR}/rg --generate complete-bash > ./rg.bash
> + cd ${OUT_DIR} && ${RELEASE_DIR}/rg --generate complete-zsh > ./_rg
> +
> # fish completion excluded as it is shipped with shells/fish
> do-install:
> ${INSTALL_PROGRAM} ${RELEASE_DIR}/rg ${PREFIX}/bin/
> @@ -34,7 +37,7 @@ do-install:
> ${PREFIX}/share/zsh/site-functions
> ${INSTALL_DATA} ${OUT_DIR}/rg.bash \
> ${PREFIX}/share/bash-completion/completions/rg
> - ${INSTALL_DATA} ${WRKSRC}/complete/_rg \
> + ${INSTALL_DATA} ${OUT_DIR}/_rg \
> ${PREFIX}/share/zsh/site-functions/_rg
>
> .include "crates.inc"
> Index: crates.inc
> ===
> RCS file: /cvs/ports/textproc/ripgrep/crates.inc,v
> diff -u -p -r1.3 crates.inc
> --- crates.inc24 Aug 2022 21:43:09 - 1.3
> +++ crates.inc27 Nov 2023 11:10:10 -
> @@ -1,56 +1,49 @@
> -MODCARGO_CRATES += aho-corasick0.7.18 # Unlicense/MIT
> -MODCARGO_CRATES += atty0.2.14 # MIT
> -MODCARGO_CRATES += base64 0.13.0 # MIT/Apache-2.0
> -MODCARGO_CRATES += bitflags1.2.1 # MIT/Apache-2.0
> -MODCARGO_CRATES += bstr0.2.16 # MIT OR Apache-2.0
> -MODCARGO_CRATES += bytecount 0.6.2 # Apache-2.0/MIT
> -MODCARGO_CRATES += cc 1.0.73 # MIT/Apache-2.0
> -MODCARGO_CRATES += cfg-if 0.1.10 # MIT/Apache-2.0
> +MODCARGO_CRATES += aho-corasick1.1.2 # Unlicense OR MIT
> +MODCARGO_CRATES += anyhow 1.0.75 # MIT OR Apache-2.0
> +MODCARGO_CRATES += autocfg 1.1.0 # Apache-2.0 OR MIT
> +MODCARGO_CRATES += bstr1.8.0 # MIT OR Apache-2.0
> +MODCARGO_CRATES += cc 1.0.83 # MIT OR Apache-2.0
> MODCARGO_CRATES += cfg-if 1.0.0 # MIT/Apache-2.0
> -MODCARGO_CRATES += clap2.33.3 # MIT
> -MODCARGO_CRATES += crossbeam-channel 0.5.1 # MIT OR Apache-2.0
> -MODCARGO_CRATES += crossbeam-utils 0.8.5 # MIT OR Apache-2.0
> -MODCARGO_CRATES += encoding_rs 0.8.28 # Apache-2.0 OR MIT
> +MODCARGO_CRATES += crossbeam-channel 0.5.8 # MIT OR Apache-2.0
> +MODCARGO_CRATES += crossbeam-deque 0.8.3 # MIT OR Apache-2.0
> +MODCARGO_CRATES += crossbeam-epoch 0.9.15 # MIT OR Apache-2.0
> +MODCARGO_CRATES += crossbeam-utils 0.8.16 # MIT OR Apache-2.0
> +MODCARGO_CRATES += encoding_rs 0.8.33 # (Apache-2.0 OR MIT) AND
> BSD-3-Clause
> MODCARGO_CRATES += encoding_rs_io 0.1.7 # MIT OR Apache-2.0
> -MODCARGO_CRATES += fnv 1.0.7 # Apache-2.0 / MIT
> -MODCARGO_CRATES += fs_extra1.2.0 # MIT
> -MODCARGO_CRATES += glob0.3.0 # MIT/Apache-2.0
> -MODCARGO_CRATES += hermit-abi 0.1.18 # MIT/Apache-2.0
> -MODCARGO_CRATES += itoa0.4.7 # MIT OR Apache-2.0
> -MODCARGO_CRATES += jemalloc-sys0.3.2 # MIT/Apache-2.0
> -MODCARGO_CRATES += jemallocator0.3.2 # MIT/Apache-2.0
> -MODCARGO_CRATES += jobserver 0.1.22 # MIT/Apache-2.0
> -MODCARGO_CRATES += lazy_static 1.4.0 # MIT/Apache-2.0
> -MODCARGO_CRATES += libc0.2.132 # MIT OR Apache-2.0
> -MODCARGO_CRATES += libm0.1.4 # MIT OR Apache-2.0
> -MODCARGO_CRATES += log 0.4.14 # MIT OR Apache-2.0
> -MODCARGO_CRATES += memchr 2.4.0 # Unlicense/MIT
> -MODCARGO_CRATES += memmap2 0.3.0 # MIT/Apache-2.0
> -MODCARGO_CRATES += num_cpus1.13.0 # MIT/Apache-2.0
> -MODCARGO_CRATES += once_cell 1.7.2 # MIT OR Apache-2.0
> -MODCARGO_CRATES += packed_simd_2 0.3.5 # MIT/Apache-2.0
> -MODCARGO_CRATES += pcr
Re: [update] textproc/ripgrep 14.0.1
Thanks. I tested this on amd64, arm64 and sparc64. I added this tweak
-WANTLIB += c c++abi pthread
+WANTLIB += ${MODCARGO_WANTLIB}
to ensure the WANTLIB are also correct on sparc64.
textproc/ripgrep: update to 14.0.1
https://github.com/BurntSushi/ripgrep/releases
Manpage and shell completions are now generated by rg.
amd64:
test result: ok. 297 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out;
finished in 6.38s
Feedback? OK?
Index: Makefile
===
RCS file: /cvs/ports/textproc/ripgrep/Makefile,v
diff -u -p -r1.27 Makefile
--- Makefile6 Mar 2023 18:45:42 - 1.27
+++ Makefile27 Nov 2023 11:09:03 -
@@ -2,8 +2,7 @@ COMMENT = line oriented search tool usi
GH_ACCOUNT = BurntSushi
GH_PROJECT = ripgrep
-GH_TAGNAME = 13.0.0
-REVISION = 3
+GH_TAGNAME = 14.0.1
CATEGORIES = textproc sysutils
@@ -13,7 +12,6 @@ PERMIT_PACKAGE = Yes
WANTLIB += c c++abi pthread
MODULES = devel/cargo
-BUILD_DEPENDS =textproc/asciidoctor
CONFIGURE_STYLE = cargo
@@ -26,6 +24,11 @@ MODCARGO_RUSTFLAGS = -C debuginfo=0
RELEASE_DIR = ${MODCARGO_TARGET_DIR}/release
OUT_DIR = ${RELEASE_DIR}/build/ripgrep-*/out
+post-build:
+ cd ${OUT_DIR} && ${RELEASE_DIR}/rg --generate man > ./rg.1
+ cd ${OUT_DIR} && ${RELEASE_DIR}/rg --generate complete-bash > ./rg.bash
+ cd ${OUT_DIR} && ${RELEASE_DIR}/rg --generate complete-zsh > ./_rg
+
# fish completion excluded as it is shipped with shells/fish
do-install:
${INSTALL_PROGRAM} ${RELEASE_DIR}/rg ${PREFIX}/bin/
@@ -34,7 +37,7 @@ do-install:
${PREFIX}/share/zsh/site-functions
${INSTALL_DATA} ${OUT_DIR}/rg.bash \
${PREFIX}/share/bash-completion/completions/rg
- ${INSTALL_DATA} ${WRKSRC}/complete/_rg \
+ ${INSTALL_DATA} ${OUT_DIR}/_rg \
${PREFIX}/share/zsh/site-functions/_rg
.include "crates.inc"
Index: crates.inc
===
RCS file: /cvs/ports/textproc/ripgrep/crates.inc,v
diff -u -p -r1.3 crates.inc
--- crates.inc 24 Aug 2022 21:43:09 - 1.3
+++ crates.inc 27 Nov 2023 11:10:10 -
@@ -1,56 +1,49 @@
-MODCARGO_CRATES += aho-corasick0.7.18 # Unlicense/MIT
-MODCARGO_CRATES += atty0.2.14 # MIT
-MODCARGO_CRATES += base64 0.13.0 # MIT/Apache-2.0
-MODCARGO_CRATES += bitflags1.2.1 # MIT/Apache-2.0
-MODCARGO_CRATES += bstr0.2.16 # MIT OR Apache-2.0
-MODCARGO_CRATES += bytecount 0.6.2 # Apache-2.0/MIT
-MODCARGO_CRATES += cc 1.0.73 # MIT/Apache-2.0
-MODCARGO_CRATES += cfg-if 0.1.10 # MIT/Apache-2.0
+MODCARGO_CRATES += aho-corasick1.1.2 # Unlicense OR MIT
+MODCARGO_CRATES += anyhow 1.0.75 # MIT OR Apache-2.0
+MODCARGO_CRATES += autocfg 1.1.0 # Apache-2.0 OR MIT
+MODCARGO_CRATES += bstr1.8.0 # MIT OR Apache-2.0
+MODCARGO_CRATES += cc 1.0.83 # MIT OR Apache-2.0
MODCARGO_CRATES += cfg-if 1.0.0 # MIT/Apache-2.0
-MODCARGO_CRATES += clap2.33.3 # MIT
-MODCARGO_CRATES += crossbeam-channel 0.5.1 # MIT OR Apache-2.0
-MODCARGO_CRATES += crossbeam-utils 0.8.5 # MIT OR Apache-2.0
-MODCARGO_CRATES += encoding_rs 0.8.28 # Apache-2.0 OR MIT
+MODCARGO_CRATES += crossbeam-channel 0.5.8 # MIT OR Apache-2.0
+MODCARGO_CRATES += crossbeam-deque 0.8.3 # MIT OR Apache-2.0
+MODCARGO_CRATES += crossbeam-epoch 0.9.15 # MIT OR Apache-2.0
+MODCARGO_CRATES += crossbeam-utils 0.8.16 # MIT OR Apache-2.0
+MODCARGO_CRATES += encoding_rs 0.8.33 # (Apache-2.0 OR MIT) AND
BSD-3-Clause
MODCARGO_CRATES += encoding_rs_io 0.1.7 # MIT OR Apache-2.0
-MODCARGO_CRATES += fnv 1.0.7 # Apache-2.0 / MIT
-MODCARGO_CRATES += fs_extra1.2.0 # MIT
-MODCARGO_CRATES += glob0.3.0 # MIT/Apache-2.0
-MODCARGO_CRATES += hermit-abi 0.1.18 # MIT/Apache-2.0
-MODCARGO_CRATES += itoa0.4.7 # MIT OR Apache-2.0
-MODCARGO_CRATES += jemalloc-sys0.3.2 # MIT/Apache-2.0
-MODCARGO_CRATES += jemallocator0.3.2 # MIT/Apache-2.0
-MODCARGO_CRATES += jobserver 0.1.22 # MIT/Apache-2.0
-MODCARGO_CRATES += lazy_static 1.4.0 # MIT/Apache-2.0
-MODCARGO_CRATES += libc0.2.132 # MIT OR Apache-2.0
-MODCARGO_CRATES += libm0.1.4 # MIT OR Apache-2.0
-MODCARGO_CRATES += log 0.4.14 # MIT OR Apache-2.0
-MODCARGO_CRATES += memchr 2.4.0 # Unlicense/MIT
-MODCARGO_CRATES += memmap2 0.3.0 # MIT/Apache-2.0
-MODCARGO_CRATES += num_cpus1.13.0 # MIT/Apache-2.0
-MODCARGO_CRATES += once_cell 1.7.2 # MIT OR Apache-2.0
-MODCARGO_CRATES += packed_simd_2 0.3.5 # MIT/Apache-2.0
-MODCARGO_CRATES += pcre2 0.2.3 # Unlicense/MIT
-MODCARGO_CRATES += pcre2-sys 0.2.5 # Unlicense/MIT
-MODCARGO_CRATES += pkg-config 0.3.19 # MIT/Apache-2.0
-MODCARGO_CRATES += proc-macro2 1.0.27 # MIT OR Apache-2.0
-MODCARGO_CRATES += quote 1.0.9
devel/py-buildbot/www lacks run dependency devel/py3-setuptools
Hi! I just was setting up a fresh buildbot master with web UI and authentication. Thereby I noticed that buildbot won't start as it cannot load the pkg_resources module from py3-setuptools. I think, devel/py-buildbot/www RUN_DEPENDS should be extended by devel/py3-setuptools. Thanks a lot! Greetings, Matthias
[update] textproc/ripgrep 14.0.1
Hi,
update for textproc/ripgrep version 14.0.1 (grep on steroids developed in Rust)
Changelog for major release 14.0.0:
https://github.com/BurntSushi/ripgrep/releases/tag/14.0.0
- update crates.inc and distinfo
- Makefile:
* remove MODCARGO_CRATES_UPDATE => cc and libc crates version updated to
support riscv64 and powerpc64
* add post-build section to generate manpage and shell completions (Bash,
ZSH) via rg binary
* install manpage and shell completions generated in post-build
Tests/comments welcome and please commit if OK.
Laurent
Index: Makefile
===
RCS file: /cvs/ports/textproc/ripgrep/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- Makefile 6 Mar 2023 18:45:42 - 1.27
+++ Makefile 27 Nov 2023 10:25:11 -
@@ -2,8 +2,7 @@ COMMENT = line oriented search tool usi
GH_ACCOUNT = BurntSushi
GH_PROJECT = ripgrep
-GH_TAGNAME = 13.0.0
-REVISION = 3
+GH_TAGNAME = 14.0.1
CATEGORIES = textproc sysutils
@@ -19,22 +18,25 @@ CONFIGURE_STYLE = cargo
SEPARATE_BUILD = Yes
-# for riscv64 and powerpc64, please keep: cc >= 1.0.73 and libc >= 0.2.113
-MODCARGO_CRATES_UPDATE = cc libc
MODCARGO_RUSTFLAGS = -C debuginfo=0
RELEASE_DIR = ${MODCARGO_TARGET_DIR}/release
-OUT_DIR = ${RELEASE_DIR}/build/ripgrep-*/out
+# generate manpage ans shell completions
# fish completion excluded as it is shipped with shells/fish
+post-build:
+ ${RELEASE_DIR}/rg --generate man > ${WRKBUILD}/rg.1
+ ${RELEASE_DIR}/rg --generate complete-bash > ${WRKBUILD}/rg.bash
+ ${RELEASE_DIR}/rg --generate complete-zsh > ${WRKBUILD}/rg.zsh
+
do-install:
${INSTALL_PROGRAM} ${RELEASE_DIR}/rg ${PREFIX}/bin/
- ${INSTALL_MAN} ${OUT_DIR}/rg.1 ${PREFIX}/man/man1/
+ ${INSTALL_MAN} ${WRKBUILD}/rg.1 ${PREFIX}/man/man1/
${INSTALL_DATA_DIR} ${PREFIX}/share/bash-completion/completions \
${PREFIX}/share/zsh/site-functions
- ${INSTALL_DATA} ${OUT_DIR}/rg.bash \
+ ${INSTALL_DATA} ${WRKBUILD}/rg.bash \
${PREFIX}/share/bash-completion/completions/rg
- ${INSTALL_DATA} ${WRKSRC}/complete/_rg \
+ ${INSTALL_DATA} ${WRKBUILD}/rg.zsh \
${PREFIX}/share/zsh/site-functions/_rg
.include "crates.inc"
Index: crates.inc
===
RCS file: /cvs/ports/textproc/ripgrep/crates.inc,v
retrieving revision 1.3
diff -u -p -r1.3 crates.inc
--- crates.inc 24 Aug 2022 21:43:09 - 1.3
+++ crates.inc 27 Nov 2023 10:25:11 -
@@ -1,56 +1,49 @@
-MODCARGO_CRATES += aho-corasick 0.7.18 # Unlicense/MIT
-MODCARGO_CRATES += atty 0.2.14 # MIT
-MODCARGO_CRATES += base64 0.13.0 # MIT/Apache-2.0
-MODCARGO_CRATES += bitflags 1.2.1 # MIT/Apache-2.0
-MODCARGO_CRATES += bstr 0.2.16 # MIT OR Apache-2.0
-MODCARGO_CRATES += bytecount 0.6.2 # Apache-2.0/MIT
-MODCARGO_CRATES += cc 1.0.73 # MIT/Apache-2.0
-MODCARGO_CRATES += cfg-if 0.1.10 # MIT/Apache-2.0
+MODCARGO_CRATES += aho-corasick 1.1.2 # Unlicense OR MIT
+MODCARGO_CRATES += anyhow 1.0.75 # MIT OR Apache-2.0
+MODCARGO_CRATES += autocfg 1.1.0 # Apache-2.0 OR MIT
+MODCARGO_CRATES += bstr 1.8.0 # MIT OR Apache-2.0
+MODCARGO_CRATES += cc 1.0.83 # MIT OR Apache-2.0
MODCARGO_CRATES += cfg-if 1.0.0 # MIT/Apache-2.0
-MODCARGO_CRATES += clap 2.33.3 # MIT
-MODCARGO_CRATES += crossbeam-channel 0.5.1 # MIT OR Apache-2.0
-MODCARGO_CRATES += crossbeam-utils 0.8.5 # MIT OR Apache-2.0
-MODCARGO_CRATES += encoding_rs 0.8.28 # Apache-2.0 OR MIT
+MODCARGO_CRATES += crossbeam-channel 0.5.8 # MIT OR Apache-2.0
+MODCARGO_CRATES += crossbeam-deque 0.8.3 # MIT OR Apache-2.0
+MODCARGO_CRATES += crossbeam-epoch 0.9.15 # MIT OR Apache-2.0
+MODCARGO_CRATES += crossbeam-utils 0.8.16 # MIT OR Apache-2.0
+MODCARGO_CRATES += encoding_rs 0.8.33 # (Apache-2.0 OR MIT) AND BSD-3-Clause
MODCARGO_CRATES += encoding_rs_io 0.1.7 # MIT OR Apache-2.0
-MODCARGO_CRATES += fnv 1.0.7 # Apache-2.0 / MIT
-MODCARGO_CRATES += fs_extra 1.2.0 # MIT
-MODCARGO_CRATES += glob 0.3.0 # MIT/Apache-2.0
-MODCARGO_CRATES += hermit-abi 0.1.18 # MIT/Apache-2.0
-MODCARGO_CRATES += itoa 0.4.7 # MIT OR Apache-2.0
-MODCARGO_CRATES += jemalloc-sys 0.3.2 # MIT/Apache-2.0
-MODCARGO_CRATES += jemallocator 0.3.2 # MIT/Apache-2.0
-MODCARGO_CRATES += jobserver 0.1.22 # MIT/Apache-2.0
-MODCARGO_CRATES += lazy_static 1.4.0 # MIT/Apache-2.0
-MODCARGO_CRATES += libc 0.2.132 # MIT OR Apache-2.0
-MODCARGO_CRATES += libm 0.1.4 # MIT OR Apache-2.0
-MODCARGO_CRATES += log 0.4.14 # MIT OR Apache-2.0
-MODCARGO_CRATES += memchr 2.4.0 # Unlicense/MIT
-MODCARGO_CRATES += memmap2 0.3.0 # MIT/Apache-2.0
-MODCARGO_CRATES += num_cpus 1.13.0 # MIT/Apache-2.0
-MODCARGO_CRATES += once_cell 1.7.2 # MIT OR Apache-2.0
-MODCARGO_CRATES += packed_simd_2 0.3.5 # MIT/Apache-2.0
-MODCARGO_CRATES += pcre2 0.2.3 # Unlicense/MIT
-MODCARGO_CRATES += pcre2-sys 0.2.5 # Unlicense/MIT
-MODCARGO_CRATES += pkg-config 0.3.19 # MIT/Apache-2.0
-MODCARGO_CRATES += proc-macro2 1.0.27 # MIT OR Apache-2.0
-MODCARGO_CRATES += quote 1.0.9 # MIT OR Apache-2.0
-MODCAR
www/aria2: Update to 1.37.0
Hi, ports@:
Here is a simple patch for www/aria2 to update to 1.37.0.
It build and run well on amd64-current system. 3 tests failed
in all 1k tests.
Any comments ?
Regards,
wenIndex: Makefile
===
RCS file: /cvs/ports/www/aria2/Makefile,v
retrieving revision 1.64
diff -u -p -r1.64 Makefile
--- Makefile27 Sep 2023 19:13:00 - 1.64
+++ Makefile27 Nov 2023 10:37:22 -
@@ -1,7 +1,7 @@
BROKEN-alpha = MetalinkParserStateV4Impl.cc:219:1: internal compiler error:
Segmentation fault
COMMENT = lightweight multi-protocol & multi-source download
utility
-V =1.36.0
+V =1.37.0
DISTNAME = aria2-${V}
CATEGORIES = www
HOMEPAGE = https://aria2.github.io/
Index: distinfo
===
RCS file: /cvs/ports/www/aria2/distinfo,v
retrieving revision 1.35
diff -u -p -r1.35 distinfo
--- distinfo9 Dec 2021 15:16:40 - 1.35
+++ distinfo27 Nov 2023 10:37:22 -
@@ -1,2 +1,2 @@
-SHA256 (aria2-1.36.0.tar.gz) = tZOy/TgkiZCclsYsbhgAVMMzK5UL49c+DLDSHqivs8U=
-SIZE (aria2-1.36.0.tar.gz) = 3805824
+SHA256 (aria2-1.37.0.tar.gz) = jnAhxtXo+CQMnMGUguDIWJVAg2dHdEck2Gv4r1oh8Og=
+SIZE (aria2-1.37.0.tar.gz) = 3904613
Re: llvm: arm64 bti lld fix
ok
On 26/11/23 15:15 +0100, Tobias Heider wrote:
> Here's the same lld fix I sent to tech earlier.
> This is needed to make chromium work on arm64 machines with bti.
>
> Previous mail:
> https://marc.info/?l=openbsd-tech&m=170099852707132&w=2
>
> Upstream fix:
> https://github.com/llvm/llvm-project/commit/60827df765156cee6cca3dc5049388dde9dac1c0
>
> ok?
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/llvm/16/Makefile,v
> diff -u -p -r1.20 Makefile
> --- Makefile 13 Nov 2023 13:57:37 - 1.20
> +++ Makefile 26 Nov 2023 14:11:32 -
> @@ -2,7 +2,7 @@ LLVM_MAJOR = 16
> LLVM_VERSION = ${LLVM_MAJOR}.0.6
> LLVM_PKGSPEC = >=16,<17
>
> -REVISION-main = 18
> +REVISION-main = 19
> REVISION-lldb = 3
> REVISION-python =1
>
> Index: patches/patch-lld_ELF_Arch_AArch64_cpp
> ===
> RCS file: /cvs/ports/devel/llvm/16/patches/patch-lld_ELF_Arch_AArch64_cpp,v
> diff -u -p -r1.1.1.1 patch-lld_ELF_Arch_AArch64_cpp
> --- patches/patch-lld_ELF_Arch_AArch64_cpp3 Sep 2023 16:00:03 -
> 1.1.1.1
> +++ patches/patch-lld_ELF_Arch_AArch64_cpp26 Nov 2023 14:11:32 -
> @@ -13,7 +13,17 @@ Index: lld/ELF/Arch/AArch64.cpp
> // A BTI (Branch Target Indicator) Plt Entry is only required if the
> // address of the PLT entry can be taken by the program, which permits an
> // indirect jump to the PLT entry. This can happen when the address
> -@@ -936,6 +940,10 @@ void AArch64BtiPac::writePlt(uint8_t *buf, const Symbo
> +@@ -912,7 +916,8 @@ void AArch64BtiPac::writePlt(uint8_t *buf, const Symbo
> + // escape to shared objects. isInIplt indicates a non-preemptible ifunc.
> Its
> + // address may escape if referenced by a direct relocation. The condition
> is
> + // conservative.
> +- bool hasBti = btiHeader && (sym.hasFlag(NEEDS_COPY) || sym.isInIplt);
> ++ bool hasBti = btiHeader &&
> ++(sym.hasFlag(NEEDS_COPY) || sym.isInIplt ||
> sym.thunkAccessed);
> + if (hasBti) {
> + memcpy(buf, btiData, sizeof(btiData));
> + buf += sizeof(btiData);
> +@@ -936,6 +941,10 @@ void AArch64BtiPac::writePlt(uint8_t *buf, const Symbo
> }
>
> static TargetInfo *getTargetInfo() {
> @@ -24,7 +34,7 @@ Index: lld/ELF/Arch/AArch64.cpp
> if ((config->andFeatures & GNU_PROPERTY_AARCH64_FEATURE_1_BTI) ||
> config->zPacPlt) {
> static AArch64BtiPac t;
> -@@ -943,6 +951,7 @@ static TargetInfo *getTargetInfo() {
> +@@ -943,6 +952,7 @@ static TargetInfo *getTargetInfo() {
> }
> static AArch64 t;
> return &t;
> Index: patches/patch-lld_ELF_Symbols_cpp
> ===
> RCS file: /cvs/ports/devel/llvm/16/patches/patch-lld_ELF_Symbols_cpp,v
> diff -u -p -r1.1.1.1 patch-lld_ELF_Symbols_cpp
> --- patches/patch-lld_ELF_Symbols_cpp 3 Sep 2023 16:00:03 - 1.1.1.1
> +++ patches/patch-lld_ELF_Symbols_cpp 26 Nov 2023 14:11:32 -
> @@ -1,6 +1,15 @@
> Index: lld/ELF/Symbols.cpp
> --- lld/ELF/Symbols.cpp.orig
> +++ lld/ELF/Symbols.cpp
> +@@ -25,7 +25,7 @@ using namespace llvm::ELF;
> + using namespace lld;
> + using namespace lld::elf;
> +
> +-static_assert(sizeof(SymbolUnion) <= 64, "SymbolUnion too large");
> ++static_assert(sizeof(SymbolUnion) <= 72, "SymbolUnion too large");
> +
> + template struct AssertSymbol {
> + static_assert(std::is_trivially_destructible(),
> @@ -61,6 +61,7 @@ std::string lld::toString(const elf::Symbol &sym) {
> }
>
> Index: patches/patch-lld_ELF_Symbols_h
> ===
> RCS file: /cvs/ports/devel/llvm/16/patches/patch-lld_ELF_Symbols_h,v
> diff -u -p -r1.1.1.1 patch-lld_ELF_Symbols_h
> --- patches/patch-lld_ELF_Symbols_h 3 Sep 2023 16:00:03 - 1.1.1.1
> +++ patches/patch-lld_ELF_Symbols_h 26 Nov 2023 14:11:32 -
> @@ -20,7 +20,17 @@ Index: lld/ELF/Symbols.h
>
> void overwrite(Symbol &sym, Kind k) const {
> if (sym.traced)
> -@@ -490,6 +493,9 @@ struct ElfSym {
> +@@ -292,6 +295,9 @@ class Symbol { (public)
> + // True if defined in a DSO as protected visibility.
> + uint8_t dsoProtected : 1;
> +
> ++ // True if targeted by a range extension thunk.
> ++ uint8_t thunkAccessed : 1;
> ++
> + // Temporary flags used to communicate which symbol entries need PLT and
> GOT
> + // entries during postScanRelocations();
> + std::atomic flags;
> +@@ -490,6 +496,9 @@ struct ElfSym {
> // __bss_start
> static Defined *bss;
>
> @@ -30,7 +40,7 @@ Index: lld/ELF/Symbols.h
> // etext and _etext
> static Defined *etext1;
> static Defined *etext2;
> -@@ -546,6 +552,8 @@ void reportDuplicate(const Symbol &sym, const InputFil
> +@@ -546,6 +555,8 @@ void reportDuplicate(const Symbol &sym, const InputFil
>InputSectionBase *errSec, uint64_t errOff
Re: net/pfresolved rc startup
On Sun, Nov 26, 2023 at 11:18:43PM +0100, Alexander Bluhm wrote:
> On Sun, Nov 26, 2023 at 09:21:44PM +, Klemens Nanni wrote:
> > On Sun, Nov 26, 2023 at 09:52:57PM +0100, Alexander Bluhm wrote:
> > > Did I get the TRUEPREFIX and LOCALBASE correct?
> >
> > I wouldn't bother, really, and just hard-code /usr/local these days.
> > Lots of churn and patching for something practically noone does.
>
> This makes patch much smaller.
>
> ok?
OK kn, see inline
> bluhm
>
> Index: net/pfresolved/Makefile
> ===
> RCS file: /cvs/ports/net/pfresolved/Makefile,v
> diff -u -p -r1.2 Makefile
> --- net/pfresolved/Makefile 26 Nov 2023 19:06:46 - 1.2
> +++ net/pfresolved/Makefile 26 Nov 2023 22:17:05 -
> @@ -1,6 +1,7 @@
> COMMENT =pf table DNS update daemon
>
> VERSION =1.00
> +REVISION = 0
> DISTNAME = pfresolved-${VERSION}
> SUPDISTFILES = ${DISTFILES}.asc
>
> Index: net/pfresolved/patches/patch-Makefile
> ===
> RCS file: net/pfresolved/patches/patch-Makefile
> diff -N net/pfresolved/patches/patch-Makefile
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ net/pfresolved/patches/patch-Makefile 26 Nov 2023 22:17:05 -
> @@ -0,0 +1,12 @@
> +Index: Makefile
> +--- Makefile.orig
> Makefile
> +@@ -3,7 +3,7 @@ SRCS=pfresolved.c
> + SRCS+= forwarder.c log.c pftable.c proc.c timer.c util.c
> + SRCS+= parse.y
> + MAN=pfresolved.8 pfresolved.conf.5
> +-BINDIR?=/usr/local/bin
> ++BINDIR?=/usr/local/sbin
> + MANDIR?=/usr/local/man/man
Just pass it from the ports Makefile, no patch needed:
FAKE_FLAGS =BINDIR=/usr/local/sbin
> +
> + LDADD+= -lutil -levent -lexecinfo -lunbound
> Index: net/pfresolved/pkg/PLIST
> ===
> RCS file: /cvs/ports/net/pfresolved/pkg/PLIST,v
> diff -u -p -r1.1.1.1 PLIST
> --- net/pfresolved/pkg/PLIST 24 Nov 2023 19:45:58 - 1.1.1.1
> +++ net/pfresolved/pkg/PLIST 26 Nov 2023 22:17:05 -
> @@ -1,3 +1,6 @@
> -@bin bin/pfresolved
> +@newgroup _pfresolved:601
> +@newuser _pfresolved:601:_pfresolved::pf DNS daemon:/var/empty:/sbin/nologin
> +@rcscript ${RCDIR}/pfresolved
> @man man/man5/pfresolved.conf.5
> @man man/man8/pfresolved.8
> +@bin sbin/pfresolved
> Index: net/pfresolved/pkg/pfresolved.rc
> ===
> RCS file: net/pfresolved/pkg/pfresolved.rc
> diff -N net/pfresolved/pkg/pfresolved.rc
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ net/pfresolved/pkg/pfresolved.rc 26 Nov 2023 22:17:05 -
> @@ -0,0 +1,14 @@
> +#!/bin/ksh
> +
> +daemon="${TRUEPREFIX}/sbin/pfresolved"
Works, but should match what's used for BINDIR:
daemon="/usr/local/sbin/pfresolved"
> +
> +. /etc/rc.d/rc.subr
> +
> +pexp="pfresolved: parent.*"
> +
> +rc_configtest() {
> + # use rc_exec here since daemon_flags may contain arguments with spaces
> + rc_exec "${daemon} -n ${daemon_flags}"
> +}
> +
> +rc_cmd $1
> Index: infrastructure/db/user.list
> ===
> RCS file: /cvs/ports/infrastructure/db/user.list,v
> diff -u -p -r1.432 user.list
> --- infrastructure/db/user.list 18 Nov 2023 13:28:43 - 1.432
> +++ infrastructure/db/user.list 26 Nov 2023 22:17:05 -
> @@ -109,7 +109,7 @@ id user group port
> 598 _iodine _iodine net/iodine
> 599 _bacula-sd sysutils/bacula
> #600 _ntlmaps_ntlmapswww/ntlmaps
> -#601 _unbound_unboundnet/unbound
> +601 _pfresolved _pfresolved net/pfresolved
> 602 _havp_havp www/havp
> 603 _argus _argus net/argus
> 604 _haproxy _haproxynet/haproxy
>
Re: [update] print/py-pylatex
On Sun, 2023-11-26 at 16:51 -0500, Daniel Dickman wrote:
> Could TEST_DEPENDS be set for the tests? What do you think?
I tried, and this would require at least one new port for the
quantities package https://pypi.org/project/quantities/. I will port
this as soon as my time permits. For now, I disabled tests by setting
NO_TEST to Yes. Attached is a new diff.
Is there any easy way to install all dependencies of a port by means of
pkg_add instead of building them, e.g., when doing make fake?
Index: Makefile
===
RCS file: /cvs/ports/print/py-pylatex/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile13 Nov 2022 20:31:00 - 1.4
+++ Makefile27 Nov 2023 08:35:04 -
@@ -1,9 +1,8 @@
COMMENT= Python interface for LaTeX
-MODPY_EGG_VERSION= 1.4.1
+MODPY_EGG_VERSION= 1.4.2
DISTNAME= PyLaTeX-${MODPY_EGG_VERSION}
PKGNAME= py-pylatex-${MODPY_EGG_VERSION}
-REVISION= 1
CATEGORIES=print
@@ -24,5 +23,10 @@ MODPY_PI=Yes
RUN_DEPENDS= devel/py-ordered-set${MODPY_FLAVOR} \
print/texlive/texmf,-full
+
+# would require quantities package
+NO_TEST= Yes
+
+#TEST_DEPENDS= graphics/py-matplotlib${MODPY_FLAVOR}
.include
Index: distinfo
===
RCS file: /cvs/ports/print/py-pylatex/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo20 Nov 2021 08:20:05 - 1.1.1.1
+++ distinfo27 Nov 2023 08:35:04 -
@@ -1,2 +1,2 @@
-SHA256 (PyLaTeX-1.4.1.tar.gz) = 08Eu+4smB3EmBEPc540ekInAn50LkuYnPfygv15zAvs=
-SIZE (PyLaTeX-1.4.1.tar.gz) = 84976
+SHA256 (PyLaTeX-1.4.2.tar.gz) = u3shvsV+zbo/b0TIVuvr32VJ/W6AZhvUT9UJQjZykkI=
+SIZE (PyLaTeX-1.4.2.tar.gz) = 59710
Index: pkg/PLIST
===
RCS file: /cvs/ports/print/py-pylatex/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 13 Nov 2022 20:31:00 - 1.3
+++ pkg/PLIST 27 Nov 2023 08:35:04 -
@@ -1,4 +1,5 @@
lib/python${MODPY_VERSION}/site-packages/PyLaTeX-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/PyLaTeX-${MODPY_EGG_VERSION}.dist-info/LICENSE
lib/python${MODPY_VERSION}/site-packages/PyLaTeX-${MODPY_EGG_VERSION}.dist-info/METADATA
lib/python${MODPY_VERSION}/site-packages/PyLaTeX-${MODPY_EGG_VERSION}.dist-info/RECORD
lib/python${MODPY_VERSION}/site-packages/PyLaTeX-${MODPY_EGG_VERSION}.dist-info/WHEEL
> > On Nov 21, 2023, at 2:14 PM, Clemens Gößnitzer
> > wrote:
> >
> > The diff below updates print/py-pylatex to the latest version.
> > Changelog:
> >
> > - Add `.Chapter` in ``__init__.py``
> > - Fix installation on Python 3.12
> > - Update tooling (use black and isort and remove custom flake8
> > stuff)
> >
> > I get a warning that description-file in setup.cfg should be named
> > description_file. I don't know if that would be something to patch
> > away.
> >
> > Thanks.
> >
> >
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/print/py-pylatex/Makefile,v
> > retrieving revision 1.4
> > diff -u -p -r1.4 Makefile
> > --- Makefile 13 Nov 2022 20:31:00 - 1.4
> > +++ Makefile 21 Nov 2023 18:40:42 -
> > @@ -1,9 +1,8 @@
> > COMMENT= Python interface for LaTeX
> >
> > -MODPY_EGG_VERSION= 1.4.1
> > +MODPY_EGG_VERSION= 1.4.2
> > DISTNAME= PyLaTeX-${MODPY_EGG_VERSION}
> > PKGNAME= py-pylatex-${MODPY_EGG_VERSION}
> > -REVISION= 1
> >
> > CATEGORIES= print
> >
> > Index: distinfo
> > ===
> > RCS file: /cvs/ports/print/py-pylatex/distinfo,v
> > retrieving revision 1.1.1.1
> > diff -u -p -r1.1.1.1 distinfo
> > --- distinfo 20 Nov 2021 08:20:05 - 1.1.1.1
> > +++ distinfo 21 Nov 2023 18:40:42 -
> > @@ -1,2 +1,2 @@
> > -SHA256 (PyLaTeX-1.4.1.tar.gz) =
> > 08Eu+4smB3EmBEPc540ekInAn50LkuYnPfygv15zAvs=
> > -SIZE (PyLaTeX-1.4.1.tar.gz) = 84976
> > +SHA256 (PyLaTeX-1.4.2.tar.gz) =
> > u3shvsV+zbo/b0TIVuvr32VJ/W6AZhvUT9UJQjZykkI=
> > +SIZE (PyLaTeX-1.4.2.tar.gz) = 59710
> > Index: pkg/PLIST
> > ===
> > RCS file: /cvs/ports/print/py-pylatex/pkg/PLIST,v
> > retrieving revision 1.3
> > diff -u -p -r1.3 PLIST
> > --- pkg/PLIST 13 Nov 2022 20:31:00 - 1.3
> > +++ pkg/PLIST 21 Nov 2023 18:40:42 -
> > @@ -1,4 +1,5 @@
> > lib/python${MODPY_VERSION}/site-packages/PyLaTeX-
> > ${MODPY_EGG_VERSION}.dist-info/
> > +lib/python${MODPY_VERSION}/site-packages/PyLaTeX-
> > ${MODPY_EGG_VERSION}.dist-info/LICENSE
> > lib/python${MODPY_VERSION}/site-packages/PyLaTeX-
> > ${MODPY_EGG_VERSION}.dist-info/METADATA
> > lib/python${MODPY_VERSION}/site-packages
