Re: UPDATE: mail/p5-Mail-DMARC
On Tue, May 21, 2024 at 06:44:09PM +0200, giova...@paclan.it wrote:
> On 5/21/24 9:44 AM, Giovanni Bechis wrote:
> > Update to latest version.
> > Most regression tests have warnings like:
> > t/01.Policy.t ok
> > perl:/usr/local/libdata/perl5/site_perl/amd64-openbsd/auto/Net/IDN/Punycode/Punycode.so:
> > undefined symbol 'uvuni_to_utf8_flags'
> >
> warning happens in Net::IDN::Encode and is present at build time as well:
>
> ===> Building for p5-Net-IDN-Encode-2.500p1
> Building Net-IDN-Encode
> cc -I/usr/libdata/perl5/amd64-openbsd/CORE '-DVERSION="2.500"'
> '-DXS_VERSION="2.500"' -DPIC -fpic -c -DNO_LOCALE_NUMERIC -DNO_LOCALE_COLLATE
> -fno-strict-aliasing -fno-delete-null-pointer-checks -pipe
> -fstack-protector-strong -I/usr/local/include -O2 -pipe -O2 -o
> lib/Net/IDN/Punycode.o lib/Net/IDN/Punycode.c
> lib/Net/IDN/Punycode.xs:256:5: warning: call to undeclared function
> 'uvuni_to_utf8_flags'; ISO C99 and later do not support implicit function
> declarations [-Wimplicit-function-declaration]
>uvuni_to_utf8_flags((U8*)skip_p, n, UNICODE_ALLOW_ANY);
>^
> 1 warning generated.
> ExtUtils::Mkbootstrap::Mkbootstrap('blib/arch/auto/Net/IDN/Punycode/Punycode.bs')
> cc -shared -fpic -fstack-protector-strong -L/usr/local/lib -o
> blib/arch/auto/Net/IDN/Punycode/Punycode.so lib/Net/IDN/Punycode.o
>
> Attached diff fixes the issue.
> ok ?
I wonder if we really need the define. uvuni_to_utf8_flags was
deprecated synonym for uvoffuni_to_utf8_flags, and now Perl has
removed it.
Maybe if you want to merge this upstream, it makes sense to define
backwards compatibiliy.
anyway OK bluhm@
> Index: Makefile
> ===
> RCS file: /cvs/ports/converters/p5-Net-IDN-Encode/Makefile,v
> diff -u -p -r1.26 Makefile
> --- Makefile 11 Mar 2022 18:27:15 - 1.26
> +++ Makefile 21 May 2024 16:42:45 -
> @@ -1,7 +1,7 @@
> COMMENT =Internationalizing Domain Names in Applications
>
> DISTNAME = Net-IDN-Encode-2.500
> -REVISION = 1
> +REVISION = 2
>
> CATEGORIES = net converters
>
> Index: patches/patch-lib_Net_IDN_Punycode_xs
> ===
> RCS file: patches/patch-lib_Net_IDN_Punycode_xs
> diff -N patches/patch-lib_Net_IDN_Punycode_xs
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-lib_Net_IDN_Punycode_xs 21 May 2024 16:42:45 -
> @@ -0,0 +1,25 @@
> +use uvchr_to_utf8_flags instead of uvuni_to_utf8_flags which is removed in
> Perl 5.38
> +https://github.com/cfaerber/Net-IDN-Encode/pull/11
> +Index: lib/Net/IDN/Punycode.xs
> +--- lib/Net/IDN/Punycode.xs.orig
> lib/Net/IDN/Punycode.xs
> +@@ -24,6 +24,10 @@
> + #define utf8_to_uvchr_buf(in_p,in_e,u8) utf8_to_uvchr(in_p,u8);
> + #endif
> +
> ++#ifndef uvchr_to_utf8_flags
> ++#define uvchr_to_utf8_flags(d, uv, flags) uvuni_to_utf8_flags(d, uv, flags);
> ++#endif
> ++
> + static char enc_digit[BASE] = {
> + 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
> + 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
> +@@ -253,7 +257,7 @@ decode_punycode(input)
> + if(skip_p < re_p) /* move
> succeeding chars */
> + Move(skip_p, skip_p + u8, re_p - skip_p, char);
> + re_p += u8;
> +- uvuni_to_utf8_flags((U8*)skip_p, n, UNICODE_ALLOW_ANY);
> ++ uvchr_to_utf8_flags((U8*)skip_p, n, UNICODE_ALLOW_ANY);
> + }
> +
> + if(!first) SvUTF8_on(RETVAL); /* UTF-8 chars
> have been inserted */
Re: remove net/p5-Net-XMPP and net/p5-Net-Jabber
On Tue, Feb 27, 2024 at 10:31:32PM +0100, Sol?ne Rapenne wrote: > Le mardi 27 f?vrier 2024, 18:46:18 CET Alexander Bluhm a ?crit : > > On Tue, Feb 27, 2024 at 05:58:59PM +0100, Solene Rapenne wrote: > > > I removed net/sendxmpp which had net/p5-Net-XMPP as a run dependency, > > > however p5-Net-XMPP is used by p5-Net-Jabber but the latter doesn't > > > have any reverse dep. > > > > > > I suggest to remove both as we have no programs using them in ports. > > > > Having Perl modules in the ports tree without program using them > > is common. I maintain a lot to such ports that I use for my own > > projects. > > > > Personally I have no need for p5-Net-XMPP or p5-Net-Jabber. But > > as long as they work and are not completely outdated, why remove > > them? > > > > bluhm > > I get your point, from my perspective p5-Net-Jabber 2.0 was released in 2004 > and p5-Net-XMPP in 2014, and only one has a maintainer. Their old age doesn't > mean they can't be used, but for sure they are not maintained and not up to > date with XMPP protocol. > > We have no consumers to know if these libs are still working fine, given > sendxmpp wasn't working with TLS servers, I suppose p5-Net-XMPP is not > reliable. > > I don't really care if we remove them or not to be honest, I thought we had > to > clean libs that didn't had consumers like in this case. Abandoned upstream, security issues, TLS incompatibilities, incompatible with the current protocol are arguments to remove. If that is the case, feel free. Just old and not used within ports tree is not an argument to remove. Being useless is. bluhm
Re: remove net/p5-Net-XMPP and net/p5-Net-Jabber
On Tue, Feb 27, 2024 at 05:58:59PM +0100, Solene Rapenne wrote: > I removed net/sendxmpp which had net/p5-Net-XMPP as a run dependency, > however p5-Net-XMPP is used by p5-Net-Jabber but the latter doesn't > have any reverse dep. > > I suggest to remove both as we have no programs using them in ports. Having Perl modules in the ports tree without program using them is common. I maintain a lot to such ports that I use for my own projects. Personally I have no need for p5-Net-XMPP or p5-Net-Jabber. But as long as they work and are not completely outdated, why remove them? bluhm
Re: devel/p5-IPC-Shareable?? Update to 1.13
On Fri, Dec 08, 2023 at 06:30:44AM +, wen heping wrote:
> Hi, ports@:
>
> Here is a patch for devel/p5-IPC-Shareable to update to 1.13 and
> add missing RUN_D and TEST_D.
> It build well and pass all tests on amd64-current system.
You should set MAKE_ENV = CI_TESTING=1
Otherwise nothing is tested.
> One port depends on devel/p5-IPC-Shareable, net/inetsim
> build well and run well(should adjust kern.seminfo.semmni=20)
> with this patch, no test defined.
The tests in p5-IPC-Shareable also require sysctl kern.seminfo.semmni=20
I wonder if we could add this in some make target. Or at least as
comment.
And with this, one test still fails:
IPC-Shareable-1.13$ CI_TESTING=1 perl -I blib/lib/ t/99-end.t
ok 1 - use IPC::Shareable;
ERROR: Could not acquire shared memory segment... 'create' option is not set,
and the segment hasn't been created yet:
No such file or directory at blib/lib/IPC/Shareable.pm line 751.
IPC::Shareable::_tie("HASH", "IPC::Shareable", HASH(0xae1dca1a190))
called at blib/lib/IPC/Shareable.pm line 124
IPC::Shareable::TIEHASH("IPC::Shareable", HASH(0xae1dca1a190)) called
at t/99-end.t line 17
# Tests were run but no plan was declared and done_testing() was not seen.
# Looks like your test exited with 2 just after 1.
bluhm
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/p5-IPC-Shareable/Makefile,v
> retrieving revision 1.10
> diff -u -p -r1.10 Makefile
> --- Makefile 11 Mar 2022 18:51:37 - 1.10
> +++ Makefile 8 Dec 2023 06:25:16 -
> @@ -2,11 +2,17 @@ COMMENT = share Perl variables between p
>
> MODULES =cpan
> PKG_ARCH = *
> -DISTNAME = IPC-Shareable-0.61
> +DISTNAME = IPC-Shareable-1.13
> CATEGORIES = devel
> -REVISION = 1
>
> # GPLv2
> PERMIT_PACKAGE = Yes
> +
> +RUN_DEPENDS =converters/p5-JSON \
> + devel/p5-String-CRC32
> +TEST_DEPENDS = devel/p5-Mock-Sub \
> + devel/p5-Test-SharedFork
> +
> +MAKE_ENV += TEST_POD=1 RELEASE_TESTING=1
>
> .include
> Index: distinfo
> ===
> RCS file: /cvs/ports/devel/p5-IPC-Shareable/distinfo,v
> retrieving revision 1.2
> diff -u -p -r1.2 distinfo
> --- distinfo 14 Apr 2014 14:02:43 - 1.2
> +++ distinfo 8 Dec 2023 06:25:16 -
> @@ -1,2 +1,2 @@
> -SHA256 (IPC-Shareable-0.61.tar.gz) =
> wv+lu9oHas2fwbfZ2rHOZwfzRcWoM0MbWo7g+HRHIMQ=
> -SIZE (IPC-Shareable-0.61.tar.gz) = 29730
> +SHA256 (IPC-Shareable-1.13.tar.gz) =
> RW5mX3Kj+3ulqOcOMhz8nIJZ3vsxEbUZQK0IyrnADms=
> +SIZE (IPC-Shareable-1.13.tar.gz) = 51682
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/devel/p5-IPC-Shareable/pkg/PLIST,v
> retrieving revision 1.2
> diff -u -p -r1.2 PLIST
> --- pkg/PLIST 11 Mar 2022 18:51:37 - 1.2
> +++ pkg/PLIST 8 Dec 2023 06:25:16 -
> @@ -2,5 +2,6 @@ ${P5SITE}/IPC/
> ${P5SITE}/IPC/Shareable/
> ${P5SITE}/IPC/Shareable.pm
> ${P5SITE}/IPC/Shareable/SharedMem.pm
> +${P5SITE}/IPC/ipc.pl
> @man man/man3p/IPC::Shareable.3p
> @man man/man3p/IPC::Shareable::SharedMem.3p
Re: [NEW]devel/p5-Mock-Sub
On Fri, Dec 08, 2023 at 02:52:44AM +, wen heping wrote: > Here is a patch to create new port devel/p5-Mock-Sub, > which is required by the update of devel/p5-IPC-Shareable. > It build well and pass tests on amd64-current system. > # Lines below not in the template > CPAN_AUTHOR = STEVEB This comment does not make sense in commited port. Usually I move CPAN_AUTHOR direclty below DISTNAME. OK bluhm@
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: net/pfresolved rc startup
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?
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
+
+ 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/PLIST24 Nov 2023 19:45:58 - 1.1.1.1
+++ net/pfresolved/pkg/PLIST26 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.rc26 Nov 2023 22:17:05 -
@@ -0,0 +1,14 @@
+#!/bin/ksh
+
+daemon="${TRUEPREFIX}/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 usergroup 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
net/pfresolved rc startup
Hi,
I forgot startup framework for my pfresolved port.
- Better install daemon in sbin.
Did I get the TRUEPREFIX and LOCALBASE correct?
- Provide rc script, mostly copied from iked.
- Add user and group.
Can I recycle one of the list?
ok?
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 20:45:06 -
@@ -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 20:45:06 -
@@ -0,0 +1,28 @@
+Index: Makefile
+--- Makefile.orig
Makefile
+@@ -3,20 +3,20 @@ 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
+-MANDIR?= /usr/local/man/man
++BINDIR?= ${TRUEPREFIX}/sbin
++MANDIR?= ${TRUEPREFIX}/man/man
+
+ LDADD+= -lutil -levent -lexecinfo -lunbound
+ DPADD+= ${LIBUTIL} ${LIBEVENT} ${LIBEXECINFO} ${LIBUNBOUND}
+
+-CFLAGS+= -I${.CURDIR} -I/usr/local/include
++CFLAGS+= -I${.CURDIR} -I${LOCALBASE}/include
+ CFLAGS+= -Wall
+ CFLAGS+= -Wstrict-prototypes -Wmissing-prototypes
+ CFLAGS+= -Wmissing-declarations
+ CFLAGS+= -Wshadow -Wpointer-arith -Wcast-qual
+ CFLAGS+= -Wsign-compare
+
+-LDFLAGS+= -L/usr/local/lib
++LDFLAGS+= -L${LOCALBASE}/lib
+
+ VERSION= 1.00
+ CLEANFILES= pfresolved-${VERSION}.tar.gz*
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/PLIST24 Nov 2023 19:45:58 - 1.1.1.1
+++ net/pfresolved/pkg/PLIST26 Nov 2023 20:45:06 -
@@ -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.rc26 Nov 2023 20:45:06 -
@@ -0,0 +1,14 @@
+#!/bin/ksh
+
+daemon="${TRUEPREFIX}/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 20:45:06 -
@@ -109,7 +109,7 @@ id usergroup 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
new net/pfresolved
Hi, ok to import pfresolved 1.00 ? Comment: pf table DNS update daemon Description: Convert files with FQDN into IP addreses and write them into pf tables. The daemon pfresolved allows to consume lists of hostnames that can be used in pf rules. Thses lists are updated dynamically using DNS. bluhm pfresolved.tar.gz Description: application/tar-gz
Re: update databases/p5-DBD-Pg to 3.17.0
On Thu, Nov 23, 2023 at 12:02:55PM +0100, Omar Polo wrote: > noticed that we're behind a few versions. Tests are all passing and > works for me, but I don't use its consumers in ports. Looking at the > changes for the various versions between 3.15 and 3.17 I wouldn't expect > breakage. > > ok? OK bluhm@ > Index: Makefile > === > RCS file: /home/cvs/ports/databases/p5-DBD-Pg/Makefile,v > diff -u -p -r1.77 Makefile > --- Makefile 11 Mar 2022 18:31:27 - 1.77 > +++ Makefile 23 Nov 2023 10:49:31 - > @@ -1,7 +1,7 @@ > COMMENT= access to PostgreSQL databases through the DBI > > MODULES= cpan databases/postgresql > -DISTNAME=DBD-Pg-3.15.0 > +DISTNAME=DBD-Pg-3.17.0 > CATEGORIES= databases > > LIB_DEPENDS= databases/postgresql > Index: distinfo > === > RCS file: /home/cvs/ports/databases/p5-DBD-Pg/distinfo,v > diff -u -p -r1.26 distinfo > --- distinfo 11 Aug 2021 13:27:12 - 1.26 > +++ distinfo 23 Nov 2023 10:51:49 - > @@ -1,2 +1,2 @@ > -SHA256 (DBD-Pg-3.15.0.tar.gz) = acwZhw+dk18WUwvjnQ7WCvrcXlYOKcOhevRJjn4wgtk= > -SIZE (DBD-Pg-3.15.0.tar.gz) = 284379 > +SHA256 (DBD-Pg-3.17.0.tar.gz) = jZANTA50nzchh1KmZh+w01V6sfzMjeo4TLWHw4LeIZs= > +SIZE (DBD-Pg-3.17.0.tar.gz) = 288633
new www/p5-URI-Query
Hi, ok to import p5-URI-Query 0.16 ? Comment: class providing URI query string manipulation Description: URI::Query provides simple URI query string manipulation, allowing you to create and manipulate URI query strings from GET and POST requests in web applications. This is primarily useful for creating links where you wish to preserve some subset of the parameters to the current request, and potentially add or replace others. Given a query string this is doable with regexes, of course, but making sure you get the anchoring and escaping right is tedious and error-prone - this module is simpler. bluhm p5-URI-Query.tar.gz Description: application/tar-gz
Re: [update, add pledge/unveil] net/iperf3 3.14 -> 3.15
This breaks iperf3 in my setup. root@ot50:.../~# iperf3 -sD Abort trap (core dumped) iperf3[72726]: pledge "proc", syscall 2 Program terminated with signal SIGABRT, Aborted. #0 _thread_sys_fork () at /tmp/-:2 2 /tmp/-: No such file or directory. (gdb) bt #0 _thread_sys_fork () at /tmp/-:2 #1 0x6b01f3ff9bf18acf in ?? () #2 0x04b673981f86 in daemon (nochdir=0, noclose=0) at /usr/src/lib/libc/gen/daemon.c:41 #3 0x04b3c8078629 in ?? () #4 0x04b3c8078423 in ?? () #5 0x04b3c8078131 in ?? () #6 0x in ?? () Pledge should be done after initialization, but before running phase. Call it after daemon(3). bluhm On Sat, Oct 21, 2023 at 07:28:06PM +0100, Stuart Henderson wrote: > ...also as was as syscalls, socket options could do with checking over too. > > If everything is in order then there's not much point adding a configure > flag really, just check for pledge > > -- > Sent from a phone, apologies for poor formatting. > > On 21 October 2023 19:01:33 Stuart Henderson wrote: > > > It hasn't been properly reviewed to check if there are any syscalls which > > aren't covered by the pledge. I found the diskfile one which you missed, > > but haven't checked over nm output to look for more. > > > > -- > > Sent from a phone, apologies for poor formatting. > > > > On 21 October 2023 18:57:55 Mikhail wrote: > > > >> On Sat, Oct 21, 2023 at 06:38:57PM +0100, Stuart Henderson wrote: > >>> Err, sending that upstream is a bit premature. > >> > >> Reasons? It works fine in my testing, also it's enabled only with > >> --enable-openbsd-sandbox, so if something arise it's very easy for the > >> users to check without this code. And during review the devs can point > >> to improvements. > >> > >> I can close the PR, it's not a problem.
Re: [new] devel/p5-File-FcntlLock 0.22
On Fri, Nov 10, 2023 at 08:28:16AM +0100, Renaud Allard wrote: > Hello, > > On 11/9/23 23:13, Alexander Bluhm wrote: > > On Mon, Nov 06, 2023 at 10:05:38AM +0100, Renaud Allard wrote: > >> Here is a new port for p5-File-FcntlLock which will be needed in order > >> to update mail/exim to the next version. > > > > COMMENT = file locking with fcntl(2) > > has to start with lower case letter > > > > WANTLIB = c perl > > as FcntlLock.xs calls fnctl(2) from libc > > > > pkg/DESCR should be more than the comment line. Probably text from > > the readme: > > File::FcntlLock is a module to do file locking in an object oriented > > fashion using the fcntl(2) system call. This allows locks on parts of > > a file as well as on the whole file and overcomes some known problems > > with flock(2), on which Perls flock() function is based per default. > > > > otherwise OK bluhm@ > > Thank you for checking. > Here is a corrected version. OK bluhm@ > > Best Regards
Re: [new] devel/p5-File-FcntlLock 0.22
On Mon, Nov 06, 2023 at 10:05:38AM +0100, Renaud Allard wrote: > Here is a new port for p5-File-FcntlLock which will be needed in order > to update mail/exim to the next version. COMMENT = file locking with fcntl(2) has to start with lower case letter WANTLIB = c perl as FcntlLock.xs calls fnctl(2) from libc pkg/DESCR should be more than the comment line. Probably text from the readme: File::FcntlLock is a module to do file locking in an object oriented fashion using the fcntl(2) system call. This allows locks on parts of a file as well as on the whole file and overcomes some known problems with flock(2), on which Perls flock() function is based per default. otherwise OK bluhm@
Re: [NEW]mail/p5-Mail-Message
On Mon, Sep 25, 2023 at 08:48:51AM +, wen heping wrote:
> Hi, ports@:
>
>Here is a patch to create new port mail/p5-Mail-Message.
>It build and run well on amd64-current system, pass all tests.
>It is required by the update of p5-Mail-Box.
>
>Before commit this patch, the patch to update misc/p5-User-Identity
> should be committed.
There are some hidden dependencies in tests and Makefile.PL. Look
at BEGIN blocks in *.t files. I think they should be added as test
depends if the module exists in ports tree. Then tests always run
with the same environment.
${P5SITE}/Mail/Message.pm is in both mail/p5-Mail-Box and
mail/p5-Mail-Message. This conflict has to be resolved by updating
both modules, @conflict markers and quirks. Not sure how to do
that exactly.
But this cannot happen before release builds. Please ping after
ports unlock.
bluhm
new graphics/py-pyqtgraph
Hi, ok to import py3-pyqtgraph 0.13.3 ? I am not a python expert. Did I get the python3 flavor and py3- prefix correctly? Some tests fail with "No module named 'OpenGL'", but the other features work well. Comment: pure-python graphics and GUI library Description: PyQtGraph is a pure-python graphics and GUI library built on PyQt / PySide and numpy. It is intended for use in mathematics / scientific / engineering applications. Despite being written entirely in python, the library is very fast due to its heavy leverage of NumPy for number crunching and Qt's GraphicsView framework for fast display. PyQtGraph is distributed under the MIT open-source license. bluhm py-pyqtgraph.tgz Description: application/tar-gz
Re: new textproc/p5-List-Util-WeightedChoice
Now with attachment. On Mon, Sep 04, 2023 at 01:35:22AM +0200, Alexander Bluhm wrote: > Hi, > > List::Util::WeightedChoice is needed for another port update. > ok to import p5-List-Util-WeightedChoice-0.06 ? > > Comment: > extension to allow for nonnormalized weighted choices > > Required by: > p5-Data-RandomPerson-0.60 > > Description: > Perl extension to allow for nonnormalized weighted choices. Just > one function, a simple means of making a weighted random choice. > > bluhm p5-List-Util-WeightedChoice.tgz Description: application/tar-gz
new textproc/p5-List-Util-WeightedChoice
Hi, List::Util::WeightedChoice is needed for another port update. ok to import p5-List-Util-WeightedChoice-0.06 ? Comment: extension to allow for nonnormalized weighted choices Required by: p5-Data-RandomPerson-0.60 Description: Perl extension to allow for nonnormalized weighted choices. Just one function, a simple means of making a weighted random choice. bluhm
Re: [NEW]textproc/p5-PPIx-Utils
On Wed, Jul 12, 2023 at 07:23:13AM +, wen heping wrote: > Hi, ports@: > > Here is a patch to create new port textproc/p5-PPIx-Utils. OK bluhm@ > It is required by the update of devel/p5-Perl-Critic. > It build and run well on amd64-current system, all tests passed. > > > Cheers ! > wen
Re: Remove: devel/monotone and security/botan
On Wed, Aug 30, 2023 at 02:37:22AM +0200, Theo Buehler wrote: > On Tue, Aug 29, 2023 at 05:10:47PM +0200, Jeremie Courreges-Anglas wrote: > > On Tue, Aug 29 2023, Rafael Sadowski wrote: > > > I would like remove security/botan. The only consumer use it is > > > devel/monotone. > > > > > > Does we need a distributed version control system like "monotone" in the > > > tree? The last release is from 2014. FreeBSD and Debian already dropped > > > it. > > > > > > Ok? > > > > ok jca@ to drop both. If anyone uses monotone they should have stepped > > up as MAINTAINER by now. > > bluhm is maintainer for botan. As I recall, when I had to touch it about > two years ago, there was a reason to keep it. botan2 is used, botan is end of life since ages. The only reason to keep security/botan were dependencies. I you remove them all, feel free to delete security/botan. bluhm
Re: update amd microcode to 20230809
On Wed, Aug 09, 2023 at 10:26:44PM +1000, Jonathan Gray wrote:
> Genoa and Bergamo (4th gen epyc) patches for
> https://www.amd.com/en/resources/product-security/bulletin/amd-sb-7005.html
>
> Family=0x19 Model=0x11 Stepping=0x01: Patch=0x0a10113e Length=5568 bytes
> Family=0x19 Model=0x11 Stepping=0x02: Patch=0x0a10123e Length=5568 bytes
> Family=0x19 Model=0xa0 Stepping=0x02: Patch=0x0aa00212 Length=5568 bytes
> Family=0x19 Model=0xa0 Stepping=0x01: Patch=0x0aa00116 Length=5568 bytes
I have none of these.
> the previous patches covered Milan (3rd gen epyc)
I can confirm that this microcode gets my CPU to the same patch
level as the previous firmware package.
cpu0: AMD EPYC 73F3 16-Core Processor, 3500.01 MHz, 19-01-01, patch 0a0011d1
OK bluhm@
> Index: Makefile
> ===
> RCS file: /cvs/ports/sysutils/firmware/amd/Makefile,v
> retrieving revision 1.4
> diff -u -p -r1.4 Makefile
> --- Makefile 7 Aug 2023 03:45:05 - 1.4
> +++ Makefile 9 Aug 2023 12:14:55 -
> @@ -1,14 +1,16 @@
> COMMENT= microcode update binaries for AMD CPUs
> FW_DRIVER= amd
> -FW_VER= 20230804
> -DISTNAME=linux-firmware-${FW_VER}
> -EXTRACT_SUFX=.tar.xz
> +FW_VER= 20230809
> +DISTNAME=linux-firmware-f2eb058afc57348cde66852272d6bf11da1eef8f
> +#DISTNAME= linux-firmware-${FW_VER}
> +#EXTRACT_SUFX= .tar.xz
> EXTRACT_FILES= ${DISTNAME}/{LICENSE.\*,amd-ucode}
>
> MAINTAINER= Jonathan Gray
>
> HOMEPAGE=
> https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/tree/amd-ucode
> -MASTER_SITES=https://cdn.kernel.org/pub/linux/kernel/firmware/
> +MASTER_SITES=
> https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/
> +#MASTER_SITES= https://cdn.kernel.org/pub/linux/kernel/firmware/
>
> do-install:
> ${INSTALL_DATA_DIR} ${PREFIX}/firmware/amd
> Index: distinfo
> ===
> RCS file: /cvs/ports/sysutils/firmware/amd/distinfo,v
> retrieving revision 1.3
> diff -u -p -r1.3 distinfo
> --- distinfo 7 Aug 2023 03:45:05 - 1.3
> +++ distinfo 9 Aug 2023 12:17:00 -
> @@ -1,2 +1,2 @@
> -SHA256 (firmware/linux-firmware-20230804.tar.xz) =
> iNRsVDhH7jsDQE1JQdkckpdGkO4fb9y+6c7z5fl9tog=
> -SIZE (firmware/linux-firmware-20230804.tar.xz) = 295170972
> +SHA256
> (firmware/linux-firmware-f2eb058afc57348cde66852272d6bf11da1eef8f.tar.gz) =
> /NVwuLJZBJ3YSgMm8XoxMnGWL4Bsoy29nkDN2QeYV9A=
> +SIZE
> (firmware/linux-firmware-f2eb058afc57348cde66852272d6bf11da1eef8f.tar.gz) =
> 457911356
Re: new intel code for fw_update
I created the same diff and and booted a machine with it. cpu_ucode_intel_apply: microcode updated cpu 0 rev 0xca->0xf4 (2232023) cpu0: Intel(R) Xeon(R) E-2236 CPU @ 3.40GHz, 3392.10 MHz, 06-9e-0a OK bluhm@ On Tue, Aug 08, 2023 at 07:52:41PM +0100, Stuart Henderson wrote: > Index: Makefile > === > RCS file: /cvs/ports/sysutils/firmware/intel/Makefile,v > retrieving revision 1.35 > diff -u -p -r1.35 Makefile > --- Makefile 15 May 2023 14:39:50 - 1.35 > +++ Makefile 8 Aug 2023 18:51:31 - > @@ -1,7 +1,7 @@ > COMMENT= microcode update binaries for Intel CPUs > FW_DRIVER= intel > > -FW_VER= 20230512 > +FW_VER= 20230808 > EPOCH= 0 > GH_ACCOUNT= intel > GH_PROJECT= Intel-Linux-Processor-Microcode-Data-Files > Index: distinfo > === > RCS file: /cvs/ports/sysutils/firmware/intel/distinfo,v > retrieving revision 1.27 > diff -u -p -r1.27 distinfo > --- distinfo 15 May 2023 14:39:50 - 1.27 > +++ distinfo 8 Aug 2023 18:51:31 - > @@ -1,2 +1,2 @@ > -SHA256 (firmware/intel-20230512.tar.gz) = > WPMyHc+QAXXYfVs5RVE4wqJOad9LqZf7ROPg0Z5TGtE= > -SIZE (firmware/intel-20230512.tar.gz) = 12654272 > +SHA256 (firmware/intel-20230808.tar.gz) = > /km7cZRB8gM17WAECQqzjNw3QTTTbU9dML5+2TuCAxM= > +SIZE (firmware/intel-20230808.tar.gz) = 13011561 > Index: pkg/PLIST > === > RCS file: /cvs/ports/sysutils/firmware/intel/pkg/PLIST,v > retrieving revision 1.22 > diff -u -p -r1.22 PLIST > --- pkg/PLIST 15 May 2023 14:39:50 - 1.22 > +++ pkg/PLIST 8 Aug 2023 18:51:31 - > @@ -123,8 +123,11 @@ firmware/intel/06-a6-01 > firmware/intel/06-a7-01 > firmware/intel/06-b7-01 > firmware/intel/06-ba-02 > +@comment firmware/intel/06-ba-02_DUPLICATE > firmware/intel/06-ba-03 > +@comment firmware/intel/06-ba-03_DUPLICATE > firmware/intel/06-be-00 > +@comment firmware/intel/06-be-00_DUPLICATE > firmware/intel/06-bf-02 > firmware/intel/06-bf-05 > firmware/intel/0f-00-07
Re: distfiles signature checking (was: Re: new benchmarks/splicebench)
On Fri, Jul 07, 2023 at 01:01:06PM +0100, Stuart Henderson wrote: > On 2023/07/07 11:17, Marc Espie wrote: > > On Thu, Jul 06, 2023 at 05:49:04PM +0200, Jeremie Courreges-Anglas wrote: > > > On Thu, Jul 06 2023, Stuart Henderson wrote: > > > > On 2023/07/05 21:21, Jeremie Courreges-Anglas wrote: > > > >> On Wed, Jul 05 2023, Alexander Bluhm wrote: > > > >> > On Wed, Jul 05, 2023 at 05:35:01PM +0200, Jeremie Courreges-Anglas > > > >> > wrote: > > > >> >> On Tue, Jul 04 2023, Alexander Bluhm > > > >> >> wrote: > > > >> >> > Hi, > > > >> >> > > > > >> >> > ok to import splicebench-1.02 ? > > > >> >> > > > >> >> At first I got puzzled by SUPDISTFILES but gofor it if you find it > > > >> >> useful. > > > >> > > > > >> > If upstream provides a gpg signature, I download it and check it. > > > >> > Although it is not perfect to prevent backdoors, I would feel very > > > >> > bad, if I would commit a tampered port that could be detected by a > > > >> > signature. > > > >> > > > > >> > Downloading the detached signature as SUPDISTFILES makes it easy > > > >> > to verify manually. > > > >> > > > > >> > Any better idea to prevent supply chain attacks? > > > >> > > > >> I'm not objecting to the rationale, I also check signatures whenever > > > >> I can. This reminds me of a proposal from Stuart which I liked a lot > > > >> but I haven't pushed for... until now: > > > >> > > > >> https://marc.info/?l=openbsd-ports&m=157687699320320&w=2 > > > > > > > > I lost interest when it turned into a load mkre complication and a new > > > > tool to verify pgp signatures that would only run on certain archs > > > > and reverted to my previous method, "stick a shell script in the port > > > > directory that will download and check the signature when run by hand". > > > > > > Your original approach looked good to me. Was the additional > > > complexity warranted by security or usability concerns? > > > > > > You mention a "new tool", I would prefer if we kept using security/gnupg > > > instead of some go/rust program, precisely for portability reasons. > > > > > > -- > > > jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 > > > E7EE > > > > > > > > Looking at sthen's patch. How verbose is gnu-gpg ? > > Specifically, is the "signature failed message" enough to identify > > which file failed. > > > > I'm not too sure about the BUILD_DEPENDS: gnupg has got a lot of > > dependencies. > > > > I see the distinct possibility of build loops if CHECK_PGPSIG was set > > indiscriminately in mk.conf. > > hmm - perhaps it would be better in a different make target (or not > handling verification from make at all; just provide a way to list/fetch > ignature files so they can be handled externally, say via a script that > uses "make show=SIGFILES"). > > I wasn't intending for this to be used indiscriminately - in particular > I didn't want to have this extend into key management, just use what > your normal user account has specifically added and trusted - so given > that, it's unlikely that it would even be able to verify files for > ports other than ones that you're particularly interested in. My usecase would be that I can do 'make verify' when I update a port. The author's key is in my personal key ring, ~bluhm/.gnupg/pubring.gpg . Maybe it should be done automatically when I run 'make makesum'. My current workflow is that I add *.asc to SUPDISTFILES. During 'make makesum' I see that a signature is downloaded and I verify it manually. bluhm > > Is there any kind of minimal build of gnupg that could be useful without > > the gazillion dependencies ?
Re: [new]: devel/p5-Software-License (need it for RUN_DEPENDS)
On Sun, Jun 18, 2023 at 01:46:58PM -0600, Ashlen wrote: > Hi, I'm looking to update devel/p5-Module-Starter from 1.54 to 1.77. > In order to do this, I need devel/p5-Software-License imported into > the ports tree so I can add it as a RUN_DEPENDS. Without it, the > new version of `module-starter` fails during runtime. > > I couldn't find a decent description upstream, so this is what I > wrote for pkg/DESCR (I'm open to changing it): > > "Software::License provides templated software licenses. It also > includes Software::LicenseUtils, which contains useful bits of code > for guessing licenses and creating Software::License objects." > > I don't think I want MAINTAINER. > > OK? The tgz of a new port must not contain CVS directories. Instead of starting from some random p5- port, use /usr/ports/infrastructure/bin/portgen to create one from scratch. It automatically detects and creates dependencies. Disabling all tests due to non ported modules is not good. With all that fixed, we end with these ports: Information for inst:p5-Software-License-0.104004 Comment: packages that provide templated software licenses Description: Software::License provides templated software licenses. It also includes Software::LicenseUtils, which contains useful bits of code for guessing licenses and creating Software::License objects. Information for inst:p5-Data-Section-0.28 Comment: read multiple hunks of data out of your DATA section Required by: p5-Software-License-0.104004 Description: Data::Section provides an easy way to access multiple named chunks of line-oriented data in your module's DATA section. It was written to allow modules to store their own templates, but probably has other uses. ok to import? bluhm p5-Data-Section.tgz Description: application/tar-gz p5-Software-License.tgz Description: application/tar-gz
Re: new benchmarks/splicebench
On Wed, Jul 05, 2023 at 09:21:35PM +0200, Jeremie Courreges-Anglas wrote: > On Wed, Jul 05 2023, Alexander Bluhm wrote: > > On Wed, Jul 05, 2023 at 05:35:01PM +0200, Jeremie Courreges-Anglas wrote: > >> On Tue, Jul 04 2023, Alexander Bluhm wrote: > >> > Hi, > >> > > >> > ok to import splicebench-1.02 ? > >> > >> At first I got puzzled by SUPDISTFILES but gofor it if you find it useful. > > > > If upstream provides a gpg signature, I download it and check it. > > Although it is not perfect to prevent backdoors, I would feel very > > bad, if I would commit a tampered port that could be detected by a > > signature. > > > > Downloading the detached signature as SUPDISTFILES makes it easy > > to verify manually. > > > > Any better idea to prevent supply chain attacks? > > I'm not objecting to the rationale, I also check signatures whenever > I can. This reminds me of a proposal from Stuart which I liked a lot > but I haven't pushed for... until now: > > https://marc.info/?l=openbsd-ports&m=157687699320320&w=2 I like SIGFILES diff. It automates what I do manually. bluhm
Re: new benchmarks/splicebench
On Wed, Jul 05, 2023 at 05:35:01PM +0200, Jeremie Courreges-Anglas wrote: > On Tue, Jul 04 2023, Alexander Bluhm wrote: > > Hi, > > > > ok to import splicebench-1.02 ? > > At first I got puzzled by SUPDISTFILES but gofor it if you find it useful. If upstream provides a gpg signature, I download it and check it. Although it is not perfect to prevent backdoors, I would feel very bad, if I would commit a tampered port that could be detected by a signature. Downloading the detached signature as SUPDISTFILES makes it easy to verify manually. Any better idea to prevent supply chain attacks? > ok jca@ thanks > > Comment: > > socket splicing network benchmarking tool > > > > Description: > > Splicebench implements a relay for OpenBSD socket splicing. Goal > > it to have a minimal setup for performance and reliability testing. > > > > bluhm > > -- > jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
new benchmarks/splicebench
Hi, ok to import splicebench-1.02 ? Comment: socket splicing network benchmarking tool Description: Splicebench implements a relay for OpenBSD socket splicing. Goal it to have a minimal setup for performance and reliability testing. bluhm splicebench-1.02.tgz Description: application/tar-gz
new devel/p5-Test-MockTime-HiRes
Hi, ok to import p5-Test-MockTime-HiRes? I need it as test dependnecy for devel/p5-Date-Extract. bluhm Comment: replaces actual time with simulated high resolution time Description: Test::MockTime::HiRes is a Time::HiRes compatible version of Test::MockTime. You can wait milliseconds in simulated time. p5-Test-MockTime-HiRes.tgz Description: application/tar-gz
Re: [new] math/p5-graph-easy{-svg}
On Mon, May 08, 2023 at 03:31:34PM +0200, Johannes Thyssen Tishman wrote:
> > I followed your advice and compared p5-Graph-Easy with the output of
> > portgen as well. The follwing was still missing:
> >
> > BUILD_DEPENDS = devel/p5-Module-Build>=0.36
> > CONFIGURE_STYLE = modbuild
CONFIGURE_STYLE modbuild automatically adds a BUILD_DEPENDS =
devel/p5-Module-Build. But having an explicit devel/p5-Module-Build>=0.36
does not hurt.
> > > RUN_DEPENDS = math/p5-Graph-Easy>=0.63 \
The directories already in RUN_DEPENDS are not necessary in PLIST.
So make update-plist removes ${P5SITE}/Graph/ ${P5SITE}/Graph/Easy/
from p5-Graph-Easy-As_svg/pkg/PLIST. Always run make update-plist
after changing RUN_DEPENDS.
> > Added. Is there an easier way to check for test deps than with 'make
> > test-depends'?
I just run pkggen and do a manual check in the distrib source code
on top of that.
> > Thanks for the feedback. Updated ports attached.
With PLIST fixed, OK bluhm@
Re: [new] math/p5-graph-easy{-svg}
On Tue, Apr 11, 2023 at 12:27:14PM +0200, Johannes Thyssen Tishman wrote: > now that 7.3 has been released I'd like to revive this thread and see if > anyone is interested in this port. I'd appreciate any feedback in case > the port need more work. OK bluhm@ for p5-Graph-Easy p5-Graph-Easy-As_svg needs: RUN_DEPENDS = math/p5-Graph-Easy>=0.63 \ graphics/p5-Image-Info>=1.28 TEST_DEPENDS = devel/p5-Test-Pod \ devel/p5-Test-Pod-Coverage>=1.00 CONFIGURE_STYLE = modbuild Usually the cpan module fills the HOMEPAGE automatically. For ports I run "portgen p5 Graph::Easy::As_svg". Then I compare the output to detect some of the things. bluhm
new converters/p5-Sereal
Hi, ok to import p5-Sereal-5.004 ? bluhm Comment: fast, compact, powerful binary (de-)serialization Description: Sereal is an efficient, compact-output, binary and feature-rich serialization protocol. The Perl encoder is implemented as the Sereal::Encoder module, the Perl decoder correspondingly as Sereal::Decoder. They are distributed separately to allow for safe upgrading without downtime. (Hint: Upgrade the decoder everywhere first, then the encoder.) This "Sereal" module is a very thin wrapper around both "Sereal::Encoder" and "Sereal::Decoder". It depends on both and loads both. So if you have a user of both encoder and decoder, it is enough to depend on a particular version of "Sereal" and you'll get the most recent released versions of "Sereal::Encoder" and "Sereal::Decoder" whose version is smaller than or equal to the version of "Sereal" you depend on. p5-Sereal.tgz Description: application/tar-gz
remove p5-Test-Group p5-Apache-Session-Generate-UUID
Hi, devel/p5-Test-Group does not work with modern Perl. Tests fail and say You have loaded versions of test modules known to have problems with Test2. This could explain some test failures. * Module 'Test::Group' is known to be broken in version 0.20 and below, newer versions have not been tested. You have: 0.20 Test::Group version 0.20 is the most recent and got its last update at Jan 03, 2016. So I would like to remove it. Only user is www/p5-Apache-Session-Generate-UUID which was imported in 2007 and never got any updates upstream. It is not used as dependency. I can remove it or patch it to not us p5-Test-Group as test dependency. ok to remove devel/p5-Test-Group? ok to patch or remove www/p5-Apache-Session-Generate-UUID? bluhm
Re: [update] net/scapy 2.5.0
On Fri, Apr 21, 2023 at 08:05:29AM +, Laurent Cheylus wrote:
> Hi,
>
> a simple update for net/scapy version 2.5.0 : update Makefile and
> pkg/PLIST for this version.
The previous time when an update to scapy 2.4.5 was tried, it broke
a bunch of OpenBSD regress tests.
https://marc.info/?l=openbsd-ports&m=164581830726000&w=2
Could you test if /usr/src/regress/sbin/slaacd/ still works with
2.5.0? Then I could help with the more complicated regress tests.
bluhm
> Changelog https://github.com/secdev/scapy/releases/tag/v2.5.0
>
> Build and tests OK on current/amd64.
>
> Comments welcome and please commit if OK.
>
> Laurent
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/scapy/Makefile,v
> retrieving revision 1.46
> diff -u -p -r1.46 Makefile
> --- Makefile 13 Nov 2022 19:37:45 - 1.46
> +++ Makefile 21 Apr 2023 07:54:12 -
> @@ -1,7 +1,6 @@
> COMMENT =powerful interactive packet manipulation in python
>
> -MODPY_EGG_VERSION = 2.4.4
> -REVISION = 4
> +MODPY_EGG_VERSION = 2.5.0
>
> DISTNAME = scapy-${MODPY_EGG_VERSION}
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/scapy/distinfo,v
> retrieving revision 1.12
> diff -u -p -r1.12 distinfo
> --- distinfo 5 Nov 2020 14:49:02 - 1.12
> +++ distinfo 21 Apr 2023 07:54:12 -
> @@ -1,4 +1,4 @@
> SHA256 (ethertypes-20120703) = 7Tj51kS+/IfrQahknDEAcyQNmozXWy+cEVtdnX5dAzw=
> -SHA256 (scapy-2.4.4.tar.gz) = 7P16FM2cPvDrCNKNW7cdlyGe3/FFTMvf8in2drJ5AO4=
> +SHA256 (scapy-2.5.0.tar.gz) = WyYMK3VP2NQJuoPueu4pTs27LCNfn3j+kLwRy25d68I=
> SIZE (ethertypes-20120703) = 1362
> -SIZE (scapy-2.4.4.tar.gz) = 1039342
> +SIZE (scapy-2.5.0.tar.gz) = 1279162
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/net/scapy/pkg/PLIST,v
> retrieving revision 1.15
> diff -u -p -r1.15 PLIST
> --- pkg/PLIST 13 Nov 2022 19:37:46 - 1.15
> +++ pkg/PLIST 21 Apr 2023 07:54:13 -
> @@ -2,7 +2,6 @@
> @conflict scapy6-*
> @pkgpath net/scapy,python3
> @pkgpath net/scapy6
> -bin/UTscapy
> bin/scapy
> lib/python${MODPY_VERSION}/site-packages/scapy/
>
> lib/python${MODPY_VERSION}/site-packages/scapy-${MODPY_EGG_VERSION}.dist-info/
> @@ -48,10 +47,10 @@ lib/python${MODPY_VERSION}/site-packages
>
> lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}data.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}error.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
>
> lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}error.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}extlib.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> -lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}extlib.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}fields.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
>
> lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}fields.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}interfaces.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}interfaces.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
>
> lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/scapy/${MODPY_PYCACHE}packet.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> @@ -91,10 +90,10 @@ lib/python${MODPY_VERSION}/site-packages
>
> lib/python${MODPY_VERSION}/site-packages/scapy/arch/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/scapy/arch/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
>
> lib/python${MODPY_VERSION}/site-packages/scapy/arch/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/scapy/arch/${MODPY_PYCACHE}libpcap.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/python${MODPY_VERSION}/site-packages/scapy/arch/${MODPY_PYCACHE}libpcap.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/scapy/arch/${MODPY_PYCACHE}linux.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
>
> lib/python${MODPY_VERSION}/site-packages/scapy/arch/${MODPY_PYCACHE}linux.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/scapy/arch/${MODPY_PYCACHE}pcapdnet.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> -lib/python${MODPY_VERSION}/site-packages/scapy/arch/${MODPY_PYCACHE}pcapdnet.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/scapy/arch/${MODPY_PYCACHE}solaris.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
>
> lib/python${MODPY_VERSION}/site-packages/scapy/arc
Re: Minor issue regarding dependancies in devel/p5-DateTime-Cron-Simple
On Wed, Apr 12, 2023 at 10:48:32AM -0400, Sven F. wrote: > Hello, > > p5-DateTime-Cron-Simple depends on p5-DateTime Except the missing revision bump, your fix is correct. But when looking at the Perl module, I found no license file. I see this line, which means it is not free software. Copyright (c) 2004 - Brendan Fagan I have no idea how the Artistic license marker came into our Makefile. It was there from the beginning. Do we have to delete the port? bluhm > # pkg_info -L p5-DateTime-Cron-Simple | grep Simple.pm > /usr/local/libdata/perl5/site_perl/DateTime/Cron/Simple.pm > > here it includes > > grep 'use DateTime;' > /usr/local/libdata/perl5/site_perl/DateTime/Cron/Simple.pm > > so > > Index: Makefile > === > RCS file: /cvs/ports/devel/p5-DateTime-Cron-Simple/Makefile,v > retrieving revision 1.11 > diff -u -p -r1.11 Makefile > --- Makefile11 Mar 2022 18:51:16 - 1.11 > +++ Makefile12 Apr 2023 14:46:02 - > @@ -9,4 +9,6 @@ CATEGORIES= devel > # Artistic > PERMIT_PACKAGE=Yes > > +RUN_DEPENDS= devel/p5-DateTime > + > .include > cvs server: Diffing pkg > > Best.
Re: New port: devel/p5-DateTime-Format-Oracle and converters/p5-Convert-NLS_DATE_FORMAT
On Fri, Mar 31, 2023 at 10:09:38AM +0100, Stuart Henderson wrote: > On 2023/03/30 21:03, Alexander Bluhm wrote: > > On Fri, Mar 10, 2023 at 12:08:52AM +0100, Alexander Bluhm wrote: > > > On Wed, Mar 08, 2023 at 02:21:45AM +, wen heping wrote: > > > >Here is a patch to create 2 new > > > > ports:devel/p5-DateTime-Format-Oracle > > > > and converters/p5-Convert-NLS_DATE_FORMAT. Both are required by the > > > > update of databases/p5-Rose-DB. > > > >Both new port build well and pass all tests on amd64-current system. > > > > Attached is a fixed version of the port. > > > > ok? > > What do you have for converters/p5-Convert-NLS_DATE_FORMAT now? Sorry, I have completly forgotten that I had it in mystuff. p5-Convert-NLS_DATE_FORMAT.tgz Description: application/tar-gz
Re: New port: devel/p5-DateTime-Format-Oracle and converters/p5-Convert-NLS_DATE_FORMAT
On Fri, Mar 10, 2023 at 12:08:52AM +0100, Alexander Bluhm wrote:
> On Wed, Mar 08, 2023 at 02:21:45AM +, wen heping wrote:
> >Here is a patch to create 2 new ports:devel/p5-DateTime-Format-Oracle
> > and converters/p5-Convert-NLS_DATE_FORMAT. Both are required by the
> > update of databases/p5-Rose-DB.
> >Both new port build well and pass all tests on amd64-current system.
Attached is a fixed version of the port.
ok?
bluhm
> The files in your tgz have no read permissions for group or others.
> This breaks PORTS_PRIVSEP = yes and should be fixed before commit.
> chmod -R go+rX
>
> COMMENT = Convert Oracle NLS_DATE_FORMAT <-> strftime Format Strings
> comment should start with lower case
> I would not use funky charakters like < and > in comment
>
> COMMENT = Parse and format Oracle dates and timestamps
> comment should start with lower case
>
> RUN_DEPENDS = converters/p5-Convert-NLS_DATE_FORMAT \
> use converters/p5-Convert-NLS_DATE_FORMAT>=0.03 like in Makefile.PL
>
> p5-DateTime-Format-Oracle PLIST
> remove ${P5SITE}/DateTime/ and ${P5SITE}/DateTime/Format/, they are
> already included by run dependency.
>
> apart from that OK bluhm@
p5-DateTime-Format-Oracle.tgz
Description: application/tar-gz
Re: New port: devel/p5-DateTime-Format-Oracle and converters/p5-Convert-NLS_DATE_FORMAT
On Wed, Mar 08, 2023 at 02:21:45AM +, wen heping wrote:
>Here is a patch to create 2 new ports:devel/p5-DateTime-Format-Oracle
> and converters/p5-Convert-NLS_DATE_FORMAT. Both are required by the
> update of databases/p5-Rose-DB.
>Both new port build well and pass all tests on amd64-current system.
The files in your tgz have no read permissions for group or others.
This breaks PORTS_PRIVSEP = yes and should be fixed before commit.
chmod -R go+rX
COMMENT = Convert Oracle NLS_DATE_FORMAT <-> strftime Format Strings
comment should start with lower case
I would not use funky charakters like < and > in comment
COMMENT = Parse and format Oracle dates and timestamps
comment should start with lower case
RUN_DEPENDS = converters/p5-Convert-NLS_DATE_FORMAT \
use converters/p5-Convert-NLS_DATE_FORMAT>=0.03 like in Makefile.PL
p5-DateTime-Format-Oracle PLIST
remove ${P5SITE}/DateTime/ and ${P5SITE}/DateTime/Format/, they are
already included by run dependency.
apart from that OK bluhm@
Re: [Maintainer Update]devel/p5-CPAN-Perl-Releases: Update to 5.20230220.
On Tue, Feb 21, 2023 at 07:08:14AM +, wen heping wrote: > Hi, ports@: > > Here is a simple patch for devel/p5-CPAN-Perl-Releases to > update to 5.20230220. > It build well and pass all tests on amd64-current system. > No other ports depend on it. > > Cheers ! > wen Everything commited. Thanks! > Index: Makefile > === > RCS file: /cvs/ports/devel/p5-CPAN-Perl-Releases/Makefile,v > retrieving revision 1.3 > diff -u -p -r1.3 Makefile > --- Makefile 14 Feb 2023 09:24:39 - 1.3 > +++ Makefile 21 Feb 2023 06:34:18 - > @@ -1,6 +1,6 @@ > COMMENT =mapping Perl releases to the location of the tarballs > > -DISTNAME = CPAN-Perl-Releases-5.20230120 > +DISTNAME = CPAN-Perl-Releases-5.20230220 > > CATEGORIES = devel > > Index: distinfo > === > RCS file: /cvs/ports/devel/p5-CPAN-Perl-Releases/distinfo,v > retrieving revision 1.2 > diff -u -p -r1.2 distinfo > --- distinfo 14 Feb 2023 09:24:39 - 1.2 > +++ distinfo 21 Feb 2023 06:34:18 - > @@ -1,2 +1,2 @@ > -SHA256 (CPAN-Perl-Releases-5.20230120.tar.gz) = > j6LL2nok4YqhvCDyykZo5hWhK8lZghjHGM4Bpv+GUoQ= > -SIZE (CPAN-Perl-Releases-5.20230120.tar.gz) = 22526 > +SHA256 (CPAN-Perl-Releases-5.20230220.tar.gz) = > XdMNV2+FkzdqiV/UiHEIFhF3jTpsWega0ZGvnPlCuks= > +SIZE (CPAN-Perl-Releases-5.20230220.tar.gz) = 22538
Re: [UPDATE] net/p5-POE-Component-IRC to 6.93
On Tue, Feb 14, 2023 at 05:49:18PM -0800, Andrew Hewus Fresh wrote: > It turns out there is something that needs updating for perl 5.36, > or more specifically the updated Socket module. I didn't look up the > details, but: > > https://metacpan.org/dist/POE-Component-IRC/changes > - Fix issue with DCC on OpenBSD with newer Socket >= 2.031 > > OK? OK bluhm@ > Index: Makefile > === > RCS file: /cvs/ports/net/p5-POE-Component-IRC/Makefile,v > retrieving revision 1.41 > diff -u -p -r1.41 Makefile > --- Makefile 11 Mar 2022 19:46:50 - 1.41 > +++ Makefile 15 Feb 2023 01:16:05 - > @@ -1,8 +1,7 @@ > COMMENT= event-driven IRC-client module > > -DISTNAME=POE-Component-IRC-6.90 > +DISTNAME=POE-Component-IRC-6.93 > CATEGORIES= net > -REVISION=0 > > # perl > PERMIT_PACKAGE= Yes > Index: distinfo > === > RCS file: /cvs/ports/net/p5-POE-Component-IRC/distinfo,v > retrieving revision 1.26 > diff -u -p -r1.26 distinfo > --- distinfo 3 Dec 2018 21:29:15 - 1.26 > +++ distinfo 15 Feb 2023 01:16:05 - > @@ -1,2 +1,2 @@ > -SHA256 (POE-Component-IRC-6.90.tar.gz) = > hLn6E+lS2w9TYFpXyfCf1EadPSwNrSVJECqgvDv5I9M= > -SIZE (POE-Component-IRC-6.90.tar.gz) = 375501 > +SHA256 (POE-Component-IRC-6.93.tar.gz) = > 6tRHeia4esvT7NIYQs5bnW4UIw3cRWX+6MaM9n5h3J4= > +SIZE (POE-Component-IRC-6.93.tar.gz) = 377897
Re: UPDATE: p5-Image-ExifTool-12.55
On Tue, Feb 07, 2023 at 09:59:53PM +0100, Rafael Sadowski wrote:
> > Could you just update it from 12.40 to 12.50? That should work
> > with cpan master site.
> >
> > bluhm
>
> Sure, quite simple:
OK bluhm@
> Index: Makefile
> ===
> RCS file: /cvs/ports/graphics/p5-Image-ExifTool/Makefile,v
> retrieving revision 1.54
> diff -u -p -u -p -r1.54 Makefile
> --- Makefile 22 Mar 2022 21:56:54 - 1.54
> +++ Makefile 7 Feb 2023 20:58:24 -
> @@ -1,6 +1,6 @@
> COMMENT= read and write meta information in image/audio/video files
>
> -DISTNAME=Image-ExifTool-12.40
> +DISTNAME=Image-ExifTool-12.50
> CATEGORIES= graphics
>
> HOMEPAGE=https://exiftool.org/
> Index: distinfo
> ===
> RCS file: /cvs/ports/graphics/p5-Image-ExifTool/distinfo,v
> retrieving revision 1.46
> diff -u -p -u -p -r1.46 distinfo
> --- distinfo 22 Mar 2022 21:56:54 - 1.46
> +++ distinfo 7 Feb 2023 20:58:24 -
> @@ -1,2 +1,2 @@
> -SHA256 (Image-ExifTool-12.40.tar.gz) =
> euP24Rg5Jq/4oEQOuAcbtbKjNfwVIll/EJeAqxZhf18=
> -SIZE (Image-ExifTool-12.40.tar.gz) = 5033132
> +SHA256 (Image-ExifTool-12.50.tar.gz) =
> vOhB/FwQMC8PPvdnjDvxRpU6jAZcC6GMQfc0AH4uwKg=
> +SIZE (Image-ExifTool-12.50.tar.gz) = 5088286
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/graphics/p5-Image-ExifTool/pkg/PLIST,v
> retrieving revision 1.39
> diff -u -p -u -p -r1.39 PLIST
> --- pkg/PLIST 22 Mar 2022 21:56:54 - 1.39
> +++ pkg/PLIST 7 Feb 2023 20:58:24 -
> @@ -92,6 +92,7 @@ ${P5SITE}/Image/ExifTool/HP.pm
> ${P5SITE}/Image/ExifTool/HTML.pm
> ${P5SITE}/Image/ExifTool/HtmlDump.pm
> ${P5SITE}/Image/ExifTool/ICC_Profile.pm
> +${P5SITE}/Image/ExifTool/ICO.pm
> ${P5SITE}/Image/ExifTool/ID3.pm
> ${P5SITE}/Image/ExifTool/IPTC.pm
> ${P5SITE}/Image/ExifTool/ISO.pm
> @@ -131,6 +132,7 @@ ${P5SITE}/Image/ExifTool/M2TS.pm
> ${P5SITE}/Image/ExifTool/MIE.pm
> ${P5SITE}/Image/ExifTool/MIEUnits.pod
> ${P5SITE}/Image/ExifTool/MIFF.pm
> +${P5SITE}/Image/ExifTool/MISB.pm
> ${P5SITE}/Image/ExifTool/MNG.pm
> ${P5SITE}/Image/ExifTool/MOI.pm
> ${P5SITE}/Image/ExifTool/MPC.pm
> @@ -219,6 +221,7 @@ ${P5SITE}/Image/ExifTool/WritePNG.pl
> ${P5SITE}/Image/ExifTool/WritePhotoshop.pl
> ${P5SITE}/Image/ExifTool/WritePostScript.pl
> ${P5SITE}/Image/ExifTool/WriteQuickTime.pl
> +${P5SITE}/Image/ExifTool/WriteRIFF.pl
> ${P5SITE}/Image/ExifTool/WriteXMP.pl
> ${P5SITE}/Image/ExifTool/Writer.pl
> ${P5SITE}/Image/ExifTool/XMP.pm
> @@ -282,6 +285,7 @@ ${P5SITE}/Image/ExifTool/iWork.pm
> @man man/man3p/Image::ExifTool::HTML.3p
> @man man/man3p/Image::ExifTool::HtmlDump.3p
> @man man/man3p/Image::ExifTool::ICC_Profile.3p
> +@man man/man3p/Image::ExifTool::ICO.3p
> @man man/man3p/Image::ExifTool::ID3.3p
> @man man/man3p/Image::ExifTool::IPTC.3p
> @man man/man3p/Image::ExifTool::ISO.3p
> @@ -320,6 +324,7 @@ ${P5SITE}/Image/ExifTool/iWork.pm
> @man man/man3p/Image::ExifTool::MIE.3p
> @man man/man3p/Image::ExifTool::MIEUnits.3p
> @man man/man3p/Image::ExifTool::MIFF.3p
> +@man man/man3p/Image::ExifTool::MISB.3p
> @man man/man3p/Image::ExifTool::MNG.3p
> @man man/man3p/Image::ExifTool::MOI.3p
> @man man/man3p/Image::ExifTool::MPC.3p
> @@ -407,6 +412,7 @@ ${P5SITE}/Image/ExifTool/iWork.pm
> @man man/man3p/Image::ExifTool::WritePhotoshop.3p
> @man man/man3p/Image::ExifTool::WritePostScript.3p
> @man man/man3p/Image::ExifTool::WriteQuickTime.3p
> +@man man/man3p/Image::ExifTool::WriteRIFF.3p
> @man man/man3p/Image::ExifTool::WriteXMP.3p
> @man man/man3p/Image::ExifTool::Writer.3p
> @man man/man3p/Image::ExifTool::XMP.3p
Re: UPDATE: p5-Image-ExifTool-12.55
On Tue, Feb 07, 2023 at 09:42:24PM +0100, Rafael Sadowski wrote:
> On Mon Feb 06, 2023 at 05:58:16PM +0100, Alexander Bluhm wrote:
> > On Sun, Feb 05, 2023 at 09:09:54PM +0100, Rafael Sadowski wrote:
> > > Simple update p5-Image-ExifTool-12.55. OK?
> > >
> > > ${MASTER_SITE_PERL_CPAN:=Image/ does not provide a tarball.
> >
> > In Chages it says:
> >
> > Note: The most recent production release is Version 12.50. (Other versions
> > are
> > considered development releases, and are not uploaded to MetaCPAN.)
>
> Good point, thanks.
>
> >
> > Do you have a reason to use a development version?
> >
>
> No I started to work on graphics/darktable and notice p5-Image-ExifTool
> stuck during download so I thought is was outdated. Anyway I think
> fixing MASTER_SITE should fix it for now.
Could you just update it from 12.40 to 12.50? That should work
with cpan master site.
bluhm
Re: UPDATE: Suricata-6.0.10
On Mon, Feb 06, 2023 at 08:10:45PM +0100, Gonzalo L. Rodriguez wrote:
> Update for Suricata to 6.0.10:
> OK? Comments?
> SHARED_LIBS += htp 0.0 # 2.0
New library has new symbols, we need at least a minor bump.
$ /usr/src/lib/check_sym /usr/local/lib/libhtp.so.0.0
fake-amd64/usr/local/lib/libhtp.so.0.0
/usr/local/lib/libhtp.so.0.0 --> fake-amd64/usr/local/lib/libhtp.so.0.0
Dynamic export changes:
added:
htp_gzip_decompressor_decompress
htp_gzip_decompressor_destroy
PLT added:
htp_gzip_decompressor_decompress
htp_gzip_decompressor_destroy
> -lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/version.py
> +lib/suricata/python/suricata/update/version.py
I see that upstream has changed that. But our portcheck complains
that python files should be in version directory.
Python module without compiled version, consider using ${MODPY_BIN}
${MODPY_LIBDIR}/compileall.py: lib/suricata/python/suricata/update/version.py
Should we generate the .pyc files?
I found some '#! /usr/bin/env python' scripts in the code.
We have not python, but this link:
/usr/local/bin/python3 -> python3.10
Should we patch ot to ''#! /usr/bin/env python3' ?
Or /usr/local/bin/python3 ?
I am not a python expert, just wondering.
bluhm
Re: UPDATE: p5-Image-ExifTool-12.55
On Sun, Feb 05, 2023 at 09:09:54PM +0100, Rafael Sadowski wrote:
> Simple update p5-Image-ExifTool-12.55. OK?
>
> ${MASTER_SITE_PERL_CPAN:=Image/ does not provide a tarball.
In Chages it says:
Note: The most recent production release is Version 12.50. (Other versions are
considered development releases, and are not uploaded to MetaCPAN.)
Do you have a reason to use a development version?
bluhm
> Index: Makefile
> ===
> RCS file: /cvs/ports/graphics/p5-Image-ExifTool/Makefile,v
> retrieving revision 1.54
> diff -u -p -u -p -r1.54 Makefile
> --- Makefile 22 Mar 2022 21:56:54 - 1.54
> +++ Makefile 5 Feb 2023 20:08:56 -
> @@ -1,6 +1,6 @@
> COMMENT= read and write meta information in image/audio/video files
>
> -DISTNAME=Image-ExifTool-12.40
> +DISTNAME=Image-ExifTool-12.55
> CATEGORIES= graphics
>
> HOMEPAGE=https://exiftool.org/
> @@ -10,8 +10,7 @@ MAINTAINER= Remi Pointel # perl
> PERMIT_PACKAGE= Yes
>
> -MASTER_SITES=${MASTER_SITE_PERL_CPAN:=Image/} \
> - ${HOMEPAGE}
> +MASTER_SITES=https://exiftool.org/
>
> MODULES= cpan
> PKG_ARCH=*
> Index: distinfo
> ===
> RCS file: /cvs/ports/graphics/p5-Image-ExifTool/distinfo,v
> retrieving revision 1.46
> diff -u -p -u -p -r1.46 distinfo
> --- distinfo 22 Mar 2022 21:56:54 - 1.46
> +++ distinfo 5 Feb 2023 20:08:56 -
> @@ -1,2 +1,2 @@
> -SHA256 (Image-ExifTool-12.40.tar.gz) =
> euP24Rg5Jq/4oEQOuAcbtbKjNfwVIll/EJeAqxZhf18=
> -SIZE (Image-ExifTool-12.40.tar.gz) = 5033132
> +SHA256 (Image-ExifTool-12.55.tar.gz) =
> CFgb16GnYPIKG0PLbTiSfm7FRdWZBtroXH32c5Ru6gg=
> +SIZE (Image-ExifTool-12.55.tar.gz) = 5174111
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/graphics/p5-Image-ExifTool/pkg/PLIST,v
> retrieving revision 1.39
> diff -u -p -u -p -r1.39 PLIST
> --- pkg/PLIST 22 Mar 2022 21:56:54 - 1.39
> +++ pkg/PLIST 5 Feb 2023 20:08:56 -
> @@ -92,6 +92,7 @@ ${P5SITE}/Image/ExifTool/HP.pm
> ${P5SITE}/Image/ExifTool/HTML.pm
> ${P5SITE}/Image/ExifTool/HtmlDump.pm
> ${P5SITE}/Image/ExifTool/ICC_Profile.pm
> +${P5SITE}/Image/ExifTool/ICO.pm
> ${P5SITE}/Image/ExifTool/ID3.pm
> ${P5SITE}/Image/ExifTool/IPTC.pm
> ${P5SITE}/Image/ExifTool/ISO.pm
> @@ -121,6 +122,7 @@ ${P5SITE}/Image/ExifTool/Lang/ko.pm
> ${P5SITE}/Image/ExifTool/Lang/nl.pm
> ${P5SITE}/Image/ExifTool/Lang/pl.pm
> ${P5SITE}/Image/ExifTool/Lang/ru.pm
> +${P5SITE}/Image/ExifTool/Lang/sk.pm
> ${P5SITE}/Image/ExifTool/Lang/sv.pm
> ${P5SITE}/Image/ExifTool/Lang/tr.pm
> ${P5SITE}/Image/ExifTool/Lang/zh_cn.pm
> @@ -131,6 +133,7 @@ ${P5SITE}/Image/ExifTool/M2TS.pm
> ${P5SITE}/Image/ExifTool/MIE.pm
> ${P5SITE}/Image/ExifTool/MIEUnits.pod
> ${P5SITE}/Image/ExifTool/MIFF.pm
> +${P5SITE}/Image/ExifTool/MISB.pm
> ${P5SITE}/Image/ExifTool/MNG.pm
> ${P5SITE}/Image/ExifTool/MOI.pm
> ${P5SITE}/Image/ExifTool/MPC.pm
> @@ -219,6 +222,7 @@ ${P5SITE}/Image/ExifTool/WritePNG.pl
> ${P5SITE}/Image/ExifTool/WritePhotoshop.pl
> ${P5SITE}/Image/ExifTool/WritePostScript.pl
> ${P5SITE}/Image/ExifTool/WriteQuickTime.pl
> +${P5SITE}/Image/ExifTool/WriteRIFF.pl
> ${P5SITE}/Image/ExifTool/WriteXMP.pl
> ${P5SITE}/Image/ExifTool/Writer.pl
> ${P5SITE}/Image/ExifTool/XMP.pm
> @@ -282,6 +286,7 @@ ${P5SITE}/Image/ExifTool/iWork.pm
> @man man/man3p/Image::ExifTool::HTML.3p
> @man man/man3p/Image::ExifTool::HtmlDump.3p
> @man man/man3p/Image::ExifTool::ICC_Profile.3p
> +@man man/man3p/Image::ExifTool::ICO.3p
> @man man/man3p/Image::ExifTool::ID3.3p
> @man man/man3p/Image::ExifTool::IPTC.3p
> @man man/man3p/Image::ExifTool::ISO.3p
> @@ -310,6 +315,7 @@ ${P5SITE}/Image/ExifTool/iWork.pm
> @man man/man3p/Image::ExifTool::Lang::nl.3p
> @man man/man3p/Image::ExifTool::Lang::pl.3p
> @man man/man3p/Image::ExifTool::Lang::ru.3p
> +@man man/man3p/Image::ExifTool::Lang::sk.3p
> @man man/man3p/Image::ExifTool::Lang::sv.3p
> @man man/man3p/Image::ExifTool::Lang::tr.3p
> @man man/man3p/Image::ExifTool::Lang::zh_cn.3p
> @@ -320,6 +326,7 @@ ${P5SITE}/Image/ExifTool/iWork.pm
> @man man/man3p/Image::ExifTool::MIE.3p
> @man man/man3p/Image::ExifTool::MIEUnits.3p
> @man man/man3p/Image::ExifTool::MIFF.3p
> +@man man/man3p/Image::ExifTool::MISB.3p
> @man man/man3p/Image::ExifTool::MNG.3p
> @man man/man3p/Image::ExifTool::MOI.3p
> @man man/man3p/Image::ExifTool::MPC.3p
> @@ -407,6 +414,7 @@ ${P5SITE}/Image/ExifTool/iWork.pm
> @man man/man3p/Image::ExifTool::WritePhotoshop.3p
> @man man/man3p/Image::ExifTool::WritePostScript.3p
> @man man/man3p/Image::ExifTool::WriteQuickTime.3p
> +@man man/man3p/Image::ExifTool::WriteRIFF.3p
> @man man/man3p/Image::ExifTool::WriteXMP.3p
> @man man/man3p/Image::ExifTool::Writer.3p
> @man man/man3p/Image::ExifTool::XMP.3p
new devel/p5-Devel-MAT
Hi, Here is the final port that imports p5-Devel-MAT to dump and analyse the memory of a Perl process. ok to import p5-Devel-MAT 0.49 ? Comment: perl memory analysis tool Description: A Devel::MAT instance loads a heapdump file, and provides a container to store analysis tools to work on it. Tools may be provided that conform to the Devel::MAT::Tool API, which can help analyse the data and interact with the explorer user interface by using the methods in the Devel::MAT::UI package. bluhm p5-Devel-MAT.tgz Description: application/tar-gz
new devel/p5-Feature-Compat-Try
Hi, ok to import p5-Feature-Compat-Try 0.05 ? Comment: make try/catch syntax available Description: This module makes syntax support for try/catch control flow easily available. bluhm p5-Feature-Compat-Try.tgz Description: application/tar-gz
Re: new devel/p5-Syntax-Keyword-Defer and p5-Syntax-Keyword-Try
Sorry for all my Perl ports@ spam. To get p5-Devel-MAT commited, I need four more modules in total. These two were missed by potential reviewers. anyone? bluhm On Thu, Nov 10, 2022 at 07:23:55PM +0100, Alexander Bluhm wrote: > Hi, > > Tests of both modules depend on each other, so I want to add them > together. > > ok to import p5-Syntax-Keyword-Defer 0.07 > > Comment: > execute code when leaving a block > > Description: > This module provides a syntax plugin that implements a block which > executes when the containing scope has finished. > > ok to import p5-Syntax-Keyword-Try 0.27 > > Comment: > try/catch/finally syntax for perl > > Description: > This module provides a syntax plugin that implements exception-handling > semantics in a form familiar to users of other languages, being built > on a block labeled with the try keyword, followed by at least one of a > catch or finally block. > > bluhm p5-Syntax-Keyword-Defer.tgz Description: application/tar-gz p5-Syntax-Keyword-Try.tgz Description: application/tar-gz
Re: new devel/p5-Commandable
On Sun, Nov 13, 2022 at 11:05:19PM +, Klemens Nanni wrote: > make configure complains about the test deps not being there, but make > build runs fine and make test passes (after installing them, of course). > > Not sure if you want to but those deps into BUILD_DEPENDS as well to > silence the warning or not. That is an old discussion about Perl ports. There are arguments for both sides. Building packages is faster without pulling all run dependencies. So in my ports I only include build dependencies that are really needed. make test will fix things and show mistakes. bluhm
new devel/p5-Commandable
Hi, ok to import p5-Commandable 0.08 ? Comment: utilities for commandline-based programs Description: This distribution contains a collection of utilities extracted from various commandline-based programs Paul Evans has written, in the hope of trying to find a standard base to build these from in future. bluhm p5-Commandable.tgz Description: application/tar-gz
Re: new devel/p5-Devel-MAT-Dumper
On Sun, Nov 13, 2022 at 06:50:02PM +, Klemens Nanni wrote:
> $ cd `make show=WRKSRC`
> $ perl -I blib/lib -I blib/arch t/01header.t
> Cannot open test.pmat for writing - Permission denied at t/01header.t
> line 13.
Does this patch help?
OpenBSD pobj permissions may not allow creating temp file in curdir.
Index: t/01header.t
--- t/01header.t.orig
+++ t/01header.t
@@ -6,9 +6,11 @@ use warnings;
use Test::More;
use Config;
+use File::Temp 'tempfile';
use Devel::MAT::Dumper;
-my $DUMPFILE = "test.pmat";
+my ($DUMPFH, $DUMPFILE) = tempfile("testXX",
+SUFFIX => ".pmat", TMPDIR => 1);
Devel::MAT::Dumper::dump( $DUMPFILE );
END { unlink $DUMPFILE; }
p5-Devel-MAT-Dumper.tgz
Description: application/tar-gz
Re: new devel/p5-Devel-MAT-Dumper
On Sun, Nov 13, 2022 at 06:28:41PM +, Klemens Nanni wrote: > On Sun, Nov 13, 2022 at 07:22:13PM +0100, Alexander Bluhm wrote: > > Hi, > > > > ok to import p5-Devel-MAT-Dumper 0.46 > > > > Comment: > > write a heap dump file for later analysis > > > > Description: > > This module provides the memory-dumping function that creates a heap > > dump file which can later be read by Devel::MAT::Dumpfile. It provides > > a single function which is not exported, which writes a file to the > > given path. > > > > bluhm > > Is this expected (amd64 here)? > > $ make test > ===> Regression tests for p5-Devel-MAT-Dumper-0.46 > t/00use.t . ok > t/01header.t .. > No subtests run > t/99pod.t . ok > > Test Summary Report > --- > t/01header.t (Wstat: 139 Tests: 0 Failed: 0) > Non-zero wait status: 139 > Parse errors: No plan found in TAP output > Files=3, Tests=4, 1 wallclock secs ( 0.03 usr 0.14 sys + 0.52 cusr > 0.32 csys = 1.01 CPU) > Result: FAIL > Failed 1/3 test programs. 0/4 subtests failed. For me it works. ===> Regression tests for p5-Devel-MAT-Dumper-0.46 t/00use.t . ok t/01header.t .. ok t/99pod.t . ok All tests successful. Files=3, Tests=11, 1 wallclock secs ( 0.03 usr 0.06 sys + 0.43 cusr 0.13 csys = 0.65 CPU) Result: PASS I run with PORTS_PRIVSEP = yes. To debug, I run the test manually, then I see this error. Maybe you hit that. I will try to work around this with a patch. .../Devel-MAT-Dumper-0.46$ perl -I blib/lib -I blib/arch t/01header.t Cannot open test.pmat for writing - Permission denied at t/01header.t line 13. bluhm
new devel/p5-Devel-MAT-Dumper
Hi, ok to import p5-Devel-MAT-Dumper 0.46 Comment: write a heap dump file for later analysis Description: This module provides the memory-dumping function that creates a heap dump file which can later be read by Devel::MAT::Dumpfile. It provides a single function which is not exported, which writes a file to the given path. bluhm p5-Devel-MAT-Dumper.tgz Description: application/tar-gz
new devel/p5-String-Tagged-Terminal
Hi, ok to import p5-String-Tagged-Terminal 0.05 ? Comment: format terminal output using String::Tagged Description: This subclass of String::Tagged provides a method, build_terminal, for outputting the formatting tags embedded in the string as terminal escape sequences, to render the the output in the appropriate style. bluhm p5-String-Tagged-Terminal.tgz Description: application/tar-gz
new converters/p5-Convert-Color-XTerm
Hi, ok to import p5-Convert-Color-XTerm 0.06 ? Comment: indexed colors used by XTerm Description: This subclass of Convert::Color::RGB8 provides lookup of the colors that xterm uses by default. Note that the module is not intelligent enough to actually parse the XTerm configuration on a machine, nor to query a running terminal for its actual colors. It simply implements the colors that are present as defaults in the XTerm source code. bluhm p5-Convert-Color-XTerm.tgz Description: application/tar-gz
new devel/p5-String-Tagged
Hi, ok to import p5-String-Tagged 0.18 ? Comment: string buffers with value tags on extents Description: This module implements an object class, instances of which store a (mutable) string buffer that supports tags. A tag is a name/value pair that applies to some extent of the underlying string. bluhm p5-String-Tagged.tgz Description: application/tar-gz
new devel/p5-Test-Identity
Hi, ok to import p5-Test-Identity 0.01 ? Comment: assert the referential identity of a reference Description: This module provides a single testing function, "identical". It asserts that a given reference is as expected; that is, it either refers to the same object or is "undef". It is similar to "Test::More::is" except that it uses "refaddr", ensuring that it behaves correctly even if the references under test are objects that overload stringification or numification. bluhm p5-Test-Identity.tgz Description: application/tar-gz
new devel/p5-Syntax-Keyword-Defer and p5-Syntax-Keyword-Try
Hi, Tests of both modules depend on each other, so I want to add them together. ok to import p5-Syntax-Keyword-Defer 0.07 Comment: execute code when leaving a block Description: This module provides a syntax plugin that implements a block which executes when the containing scope has finished. ok to import p5-Syntax-Keyword-Try 0.27 Comment: try/catch/finally syntax for perl Description: This module provides a syntax plugin that implements exception-handling semantics in a form familiar to users of other languages, being built on a block labeled with the try keyword, followed by at least one of a catch or finally block. bluhm p5-Syntax-Keyword-Defer.tgz Description: application/tar-gz p5-Syntax-Keyword-Try.tgz Description: application/tar-gz
new devel/p5-Syntax-Keyword-Match
Hi, ok to import p5-Syntax-Keyword-Match 0.09 ? Comment: match/case syntax for perl Description: This module provides a syntax plugin that implements a control-flow block called match/case, which executes at most one of a choice of different blocks depending on the value of its controlling expression. bluhm p5-Syntax-Keyword-Match.tgz Description: application/tar-gz
new devel/p5-XS-Parse-Keyword
Hi, ok to import p5-XS-Parse-Keyword 0.27 ? Needed as dependency for a bunch of other Perl modules. Comment: XS functions to assist in parsing keyword syntax Description: This module provides some XS functions to assist in writing syntax modules that provide new perl-visible syntax, primarily for authors of keyword plugins using the PL_keyword_plugin hook mechanism. It is unlikely to be of much use to anyone else; and highly unlikely to be any use when writing perl code using these. Unless you are writing a keyword plugin using XS, this module is not for you. bluhm p5-XS-Parse-Keyword.tgz Description: application/tar-gz
Re: [new] databases/p5-Mojo-SQLite, databases/p5-SQL-Abstract-Pg, devel/p5-URI-Nested and devel/p5-URI-db
On Wed, Nov 02, 2022 at 07:35:00AM -0600, Aaron Bieber wrote: > Hi! > > Here are some new ports that I used for making https://openbsd.app > > They are basically `portgen`d with some "now you live in the tree" > tweaks. > > Cluesticks? OKs? Download Mojo-SQLite-3.009.tar.gz failed, you need a CPAN_AUTHOR = DBOOK Please add a bit more text to pkg/DESCR of p5-SQL-Abstract-Pg, p5-URI-Nested, and p5-URI-db. Usually I take the fist sentence of man page DESCRIPTION section. COMMENT should start with a lower case letter in p5-URI-db and p5-URI-Nested. With that fixed, OK bluhm@
Re: devel/p5-DateTime-TimeZone: Update to 2.55
On Wed, Oct 12, 2022 at 02:54:09AM +, wen heping wrote:
> Hi, all:
>
> Here is a patch for devel/p5-DateTime-TimeZone to update to 2.55.
> It build well and pass all tests on amd64-current system.
>
> I did not test the ports depend on it, since it only update the Olson
> database.
OK bluhm@
> Index: devel/p5-DateTime-TimeZone/Makefile
> ===
> RCS file: /cvs/ports/devel/p5-DateTime-TimeZone/Makefile,v
> retrieving revision 1.25
> diff -u -p -r1.25 Makefile
> --- devel/p5-DateTime-TimeZone/Makefile 11 Mar 2022 18:51:18 -
> 1.25
> +++ devel/p5-DateTime-TimeZone/Makefile 12 Oct 2022 02:41:23 -
> @@ -2,7 +2,7 @@ COMMENT = DateTime submodule for TZ
>
> MODULES =cpan
> PKG_ARCH = *
> -DISTNAME = DateTime-TimeZone-2.51
> +DISTNAME = DateTime-TimeZone-2.55
> CATEGORIES = devel
>
> MAINTAINER = Andrew Hewus Fresh
> Index: devel/p5-DateTime-TimeZone/distinfo
> ===
> RCS file: /cvs/ports/devel/p5-DateTime-TimeZone/distinfo,v
> retrieving revision 1.16
> diff -u -p -r1.16 distinfo
> --- devel/p5-DateTime-TimeZone/distinfo 27 Oct 2021 03:49:10 -
> 1.16
> +++ devel/p5-DateTime-TimeZone/distinfo 12 Oct 2022 02:41:23 -
> @@ -1,2 +1,2 @@
> -SHA256 (DateTime-TimeZone-2.51.tar.gz) =
> 43aw+jSjGXikB+e8pPjPif6GED4Y1nxvb2znKl8ebGo=
> -SIZE (DateTime-TimeZone-2.51.tar.gz) = 996675
> +SHA256 (DateTime-TimeZone-2.55.tar.gz) =
> /GPzxuudvmdvgMergpSuIZv1TUW1GSHWH1jMW6J+5To=
> +SIZE (DateTime-TimeZone-2.55.tar.gz) = 961535
> Index: devel/p5-DateTime-TimeZone/pkg/PLIST
> ===
> RCS file: /cvs/ports/devel/p5-DateTime-TimeZone/pkg/PLIST,v
> retrieving revision 1.12
> diff -u -p -r1.12 PLIST
> --- devel/p5-DateTime-TimeZone/pkg/PLIST 11 Mar 2022 18:51:18 -
> 1.12
> +++ devel/p5-DateTime-TimeZone/pkg/PLIST 12 Oct 2022 02:41:23 -
> @@ -158,7 +158,6 @@ ${P5SITE}/DateTime/TimeZone/Antarctica/M
> ${P5SITE}/DateTime/TimeZone/Antarctica/Palmer.pm
> ${P5SITE}/DateTime/TimeZone/Antarctica/Rothera.pm
> ${P5SITE}/DateTime/TimeZone/Antarctica/Troll.pm
> -${P5SITE}/DateTime/TimeZone/Antarctica/Vostok.pm
> ${P5SITE}/DateTime/TimeZone/Asia/
> ${P5SITE}/DateTime/TimeZone/Asia/Almaty.pm
> ${P5SITE}/DateTime/TimeZone/Asia/Amman.pm
> @@ -173,7 +172,6 @@ ${P5SITE}/DateTime/TimeZone/Asia/Bangkok
> ${P5SITE}/DateTime/TimeZone/Asia/Barnaul.pm
> ${P5SITE}/DateTime/TimeZone/Asia/Beirut.pm
> ${P5SITE}/DateTime/TimeZone/Asia/Bishkek.pm
> -${P5SITE}/DateTime/TimeZone/Asia/Brunei.pm
> ${P5SITE}/DateTime/TimeZone/Asia/Chita.pm
> ${P5SITE}/DateTime/TimeZone/Asia/Choibalsan.pm
> ${P5SITE}/DateTime/TimeZone/Asia/Colombo.pm
> @@ -199,7 +197,6 @@ ${P5SITE}/DateTime/TimeZone/Asia/Kathman
> ${P5SITE}/DateTime/TimeZone/Asia/Khandyga.pm
> ${P5SITE}/DateTime/TimeZone/Asia/Kolkata.pm
> ${P5SITE}/DateTime/TimeZone/Asia/Krasnoyarsk.pm
> -${P5SITE}/DateTime/TimeZone/Asia/Kuala_Lumpur.pm
> ${P5SITE}/DateTime/TimeZone/Asia/Kuching.pm
> ${P5SITE}/DateTime/TimeZone/Asia/Macau.pm
> ${P5SITE}/DateTime/TimeZone/Asia/Magadan.pm
> @@ -244,7 +241,6 @@ ${P5SITE}/DateTime/TimeZone/Atlantic/Can
> ${P5SITE}/DateTime/TimeZone/Atlantic/Cape_Verde.pm
> ${P5SITE}/DateTime/TimeZone/Atlantic/Faroe.pm
> ${P5SITE}/DateTime/TimeZone/Atlantic/Madeira.pm
> -${P5SITE}/DateTime/TimeZone/Atlantic/Reykjavik.pm
> ${P5SITE}/DateTime/TimeZone/Atlantic/South_Georgia.pm
> ${P5SITE}/DateTime/TimeZone/Atlantic/Stanley.pm
> ${P5SITE}/DateTime/TimeZone/Australia/
> @@ -266,7 +262,6 @@ ${P5SITE}/DateTime/TimeZone/EET.pm
> ${P5SITE}/DateTime/TimeZone/EST.pm
> ${P5SITE}/DateTime/TimeZone/EST5EDT.pm
> ${P5SITE}/DateTime/TimeZone/Europe/
> -${P5SITE}/DateTime/TimeZone/Europe/Amsterdam.pm
> ${P5SITE}/DateTime/TimeZone/Europe/Andorra.pm
> ${P5SITE}/DateTime/TimeZone/Europe/Astrakhan.pm
> ${P5SITE}/DateTime/TimeZone/Europe/Athens.pm
> @@ -276,23 +271,19 @@ ${P5SITE}/DateTime/TimeZone/Europe/Bruss
> ${P5SITE}/DateTime/TimeZone/Europe/Bucharest.pm
> ${P5SITE}/DateTime/TimeZone/Europe/Budapest.pm
> ${P5SITE}/DateTime/TimeZone/Europe/Chisinau.pm
> -${P5SITE}/DateTime/TimeZone/Europe/Copenhagen.pm
> ${P5SITE}/DateTime/TimeZone/Europe/Dublin.pm
> ${P5SITE}/DateTime/TimeZone/Europe/Gibraltar.pm
> ${P5SITE}/DateTime/TimeZone/Europe/Helsinki.pm
> ${P5SITE}/DateTime/TimeZone/Europe/Istanbul.pm
> ${P5SITE}/DateTime/TimeZone/Europe/Kaliningrad.pm
> -${P5SITE}/DateTime/TimeZone/Europe/Kiev.pm
> ${P5SITE}/DateTime/TimeZone/Europe/Kirov.pm
> +${P5SITE}/DateTime/TimeZone/Europe/Kyiv.pm
> ${P5SITE}/DateTime/TimeZone/Europe/Lisbon.pm
> ${P5SITE}/DateTime/TimeZone/Europe/London.pm
> -${P5SITE}/DateTime/TimeZone/Europe/Luxembourg.pm
> ${P5SITE}/DateTime/TimeZone/Europe/Madrid.pm
> ${P5SITE}/DateTime/TimeZone/Europe/Malta.pm
> ${P5SITE}/DateTime/TimeZone/Europe/Minsk.pm
> -${P5SITE}/DateTime/Time
remove p5-Crypt-Serpent
Hi, security/p5-Crypt-Serpent make test crashes the Perl process on 64 bit platforms. Only i386 test passes. This is not what you want in a crypto library. Last update was in 2002, upstream CPAN testers also crash. It has no dependencies in ports tree. ok to remove? bluhm
Re: [new] p5-File-KDBX (+deps)
On Tue, Sep 06, 2022 at 02:29:41PM +0200, Landry Breuil wrote:
> tarball contains textproc/p5-File-KDBX, devel/p5-Iterator-Simple and
> security/p5-Crypt-Argon2.
devel/p5-Iterator-Simple
- use lower case letter in COMMENT = Simple iterator and utilities
- Use our p5-Module-Install package instead of some version
included in the package. Add CONFIGURE_STYLE = modinst
security/p5-Crypt-Argon2
- license is # CC0 1.0
- missing WANTLIB = c perl pthread
textproc/p5-File-KDBX
- license is # Perl
- Perl ports don't need BUILD_DEPENDS = ${RUN_DEPENDS}
- no Rijndael required, remove RUN_DEPENDS = security/p5-Crypt-Rijndael
> oks welcome
with that fixed, OK bluhm@
Re: new benchmarks/udpbench
Forgot attach tgz :-( On Fri, Jul 29, 2022 at 02:24:02PM +0200, Alexander Bluhm wrote: > Hi, > > I have written a little tool to send and receive UDP packets and > measure thoughput. With existing programs like iperf3 it is unclear > what happens at syscall layer. My udpbench can generate twice as > much UDP throughput due to strange effects in iperf3. > > Can we add benchmarks/udpbench as port? > > Comment: > udp network benchmarking tool > > Description: > Measure UDP send and receive performance. Be very careful that the > data is reliable. Avoid unnecessary system calls that may affect > the result. > > ok? > > bluhm udpbench-1.01.tgz Description: application/tar-gz
new benchmarks/udpbench
Hi, I have written a little tool to send and receive UDP packets and measure thoughput. With existing programs like iperf3 it is unclear what happens at syscall layer. My udpbench can generate twice as much UDP throughput due to strange effects in iperf3. Can we add benchmarks/udpbench as port? Comment: udp network benchmarking tool Description: Measure UDP send and receive performance. Be very careful that the data is reliable. Avoid unnecessary system calls that may affect the result. ok? bluhm
Re: new converters/p5-CBOR-XS
Attachment forgotten. On Thu, Jun 09, 2022 at 02:33:03PM +0200, Alexander Bluhm wrote: > Hi ports@, > > After playing with p5-CBOR-Free, p5-CBOR-XS better fits our needs. > As usual in Perl, there is more than one way to screw it up. > > ok to import p5-CBOR-XS 1.86 ? > > bluhm > > Comment: > concise binary object representation > > Description: > This module converts Perl data structures to the Concise Binary > Object Representation (CBOR) and vice versa. CBOR is a fast binary > serialisation format that aims to use an (almost) superset of the > JSON data model, i.e. when you can represent something useful in > JSON, you should be able to represent it in CBOR. p5-CBOR-XS.tgz Description: application/tar-gz
new converters/p5-CBOR-XS
Hi ports@, After playing with p5-CBOR-Free, p5-CBOR-XS better fits our needs. As usual in Perl, there is more than one way to screw it up. ok to import p5-CBOR-XS 1.86 ? bluhm Comment: concise binary object representation Description: This module converts Perl data structures to the Concise Binary Object Representation (CBOR) and vice versa. CBOR is a fast binary serialisation format that aims to use an (almost) superset of the JSON data model, i.e. when you can represent something useful in JSON, you should be able to represent it in CBOR.
update misc/open62541
Hi ports@
I would like to update misc/open62541 library. That is not easy
as it is not API compatible. The depending port misc/p5-OPCUA-Open62541
compiles, but fails in make test.
So I have to fix open62541 library bugs and add p5-OPCUA-Open62541
compatiblity layer. As the latter is my module and I doubt that
anyone else uses it, I think it is acceptable that tests fail.
Updating open62541 now would allow to work in tree.
I have removed all the patches in misc/open62541 that have been
commited upstream. New patches prevent fatal compiler warnings.
Upstream has moved include/aa_tree.h, include/ms_stdint.h,
include/ziptree.h outside of the include/open62541/ directory. This
pollutes the namespace. Fortunately two of them are only used
internally and are not needed in the package. I rmeoved them from
PLIST.
But include/aa_tree.h is included in include/open62541/ header
file. What should I do?
- ignore the namespace problem
- move include/aa_tree.h to include/open62541/aa_tree.h
- paste include/aa_tree.h content into the single header file
include/open62541/plugin/nodestore.h that needs it.
- something else
ok?
bluhm
Index: Makefile
===
RCS file: /data/mirror/openbsd/cvs/ports/misc/open62541/Makefile,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 Makefile
--- Makefile11 Mar 2022 19:38:13 - 1.14
+++ Makefile8 Jun 2022 14:45:16 -
@@ -1,11 +1,10 @@
COMMENT = library implementation of OPC UA
-VERSION = 1.0.6
-REVISION = 0
+VERSION = 1.3.1
DISTNAME = open62541-${VERSION}
PKGNAME = open62541-${VERSION}
-SHARED_LIBS = open62541 1.0
+SHARED_LIBS = open62541 2.0
CATEGORIES = misc
@@ -21,7 +20,7 @@ WANTLIB = c m mbedcrypto mbedtls mbedx5
MASTER_SITES = https://github.com/open62541/open62541/
MASTER_SITES0 =
https://github.com/OPCFoundation/UA-Nodeset/archive/
DISTFILES =open62541-{archive/refs/tags/v}${VERSION}.tar.gz \
- UA-1.04.5-2020-03-06.tar.gz:0
+ UA-1.04.10-2021-09-15.tar.gz:0
MODULES = devel/cmake
@@ -53,8 +52,7 @@ FLAVORS = ns0_full
FLAVOR ?=
.if ${FLAVOR:Mns0_full}
-CONFIGURE_ARGS += -DUA_NAMESPACE_ZERO=FULL \
- -DUA_ENABLE_MICRO_EMB_DEV_PROFILE=ON
+CONFIGURE_ARGS += -DUA_NAMESPACE_ZERO=FULL
.else
CONFIGURE_ARGS += -DUA_NAMESPACE_ZERO=REDUCED
.endif
Index: distinfo
===
RCS file: /data/mirror/openbsd/cvs/ports/misc/open62541/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- distinfo9 Aug 2021 21:23:25 - 1.5
+++ distinfo8 Jun 2022 14:45:36 -
@@ -1,4 +1,4 @@
-SHA256 (UA-1.04.5-2020-03-06.tar.gz) =
KIty/GA+zomK1fXUBLBP7+EN5Puzx1apbXzINCtRgFM=
-SHA256 (open62541-1.0.6.tar.gz) = KZlAAlwUkpUzBkq+AETVgF6lDVKzLQWtm8DmmWVpwqY=
-SIZE (UA-1.04.5-2020-03-06.tar.gz) = 4053334
-SIZE (open62541-1.0.6.tar.gz) = 2691627
+SHA256 (UA-1.04.10-2021-09-15.tar.gz) =
TaoMRz1MU01hSqnlSqhrcb7CREZnO550yF5a3SYkw5M=
+SHA256 (open62541-1.3.1.tar.gz) = 9U0QMl/Qj8FQWuo32D2qCFkSomlSHm0Bi/xBp0S6V6o=
+SIZE (UA-1.04.10-2021-09-15.tar.gz) = 5720040
+SIZE (open62541-1.3.1.tar.gz) = 3886706
Index: patches/patch-CMakeLists_txt
===
RCS file:
/data/mirror/openbsd/cvs/ports/misc/open62541/patches/patch-CMakeLists_txt,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt11 Mar 2022 19:38:13 - 1.4
+++ patches/patch-CMakeLists_txt8 Jun 2022 15:01:01 -
@@ -1,20 +1,9 @@
-GCC 4.2.1 doesn't understand "-Wpedantic".
-
Move examples to the right place.
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -389,7 +389,7 @@ include(CompilerFlags)
- if(NOT UA_COMPILE_AS_CXX AND (CMAKE_COMPILER_IS_GNUCC OR
"x${CMAKE_C_COMPILER_ID}" STREQUAL "xClang"))
- # Compiler
- add_definitions(-std=c99 -pipe
---Wall -Wextra -Wpedantic
-+-Wall -Wextra
- -Wno-static-in-inline # clang doesn't like the use of
static inline methods inside static inline methods
- -Wno-overlength-strings # may happen in the nodeset
compiler when complex values are directly encoded
- -Wno-unused-parameter # some methods may require unused
arguments to cast to a method pointer
-@@ -1239,7 +1239,7 @@ if (UA_PACK_DEBIAN)
+@@ -1695,7 +1695,7 @@ if(UA_PACK_DEBIAN)
"examples/nodeset"
"examples/pubsub")
Index: patches/patch-arch_network_tcp_c
===
RCS file: patches/patch-arch_network_tcp_c
diff -N patches/patch-arch_network_tcp_c
--- patches/patch-arch_network_tcp_c11 Mar 2022 19:38:13 - 1.4
+++ /dev/null
new converters/p5-CBOR-Free
Hi ports@ ok to import p5-CBOR-Free 0.32 ? This is my final step that uses the 3 ports I have just imported. bluhm Comment: fast CBOR for everyone Description: This library implements CBOR via XS under a license that permits commercial usage with no "strings attached". p5-CBOR-Free.tgz Description: application/tar-gz
new devel/p5-Text-Control
Hi ports@ ok to import p5-Text-Control 0.5 ? bluhm Comment: transforms of control characters Description: These are transforms of control characters useful for debugging. This module considers byte numbers 32 - 126 to be "printable"; i.e., they represent actual ASCII characters. Anything outside this range is thus "nonprintable". p5-Text-Control.tgz Description: application/tar-gz
new devel/p5-Test-Class-Tiny
Hi ports@, ok to import p5-Test-Class-Tiny 0.03 ? bluhm Comment: xUnit in Perl, simplified Description: Test::Class has served Perl's xUnit needs for a long time but is incompatible with the Test2 framework. This module allows for a similar workflow but in a way that works with both Test2 and the older, Test::Builder-based modules. p5-Test-Class-Tiny.tgz Description: application/tar-gz
new devel/p5-X-Tiny
Hi ports@, ok to import p5-X-Tiny 0.21 ? bluhm Comment: super-lightweight exception framework Description: This stripped-down exception framework provides a baseline of functionality for distributions that want to expose exception hierarchies with minimal fuss. p5-X-Tiny.tgz Description: application/tar-gz
Re: mail/p5-Mail-DMARC: Update to 1.20211209
On Sun, Apr 03, 2022 at 10:31:54AM +, wen heping wrote:
> Hi,
>
> Here is a patch to update mail/p5-Mail-DMARC:
> i) Update to 1.20211209
> ii) Add p5-Email-Sender as RUN_DEPENDS
> It build well, 1 of all 20 tests failed on my amd64-7.1 system.
>
>
> One port depends on p5-Mail-DMARC: mail/p5-Mail-Milter-Authentication.
> It build well and pass all the tests with this patch.
>
> Cheers !
> wen
You have to make update-plist, new files are missing.
+${P5SITE}/Mail/DMARC/Report/Sender.pm
+${P5SITE}/Mail/DMARC/Test/
+${P5SITE}/Mail/DMARC/Test/Transport.pm
otherwise OK bluhm@
> Index: Makefile
> ===
> RCS file: /cvs/ports/mail/p5-Mail-DMARC/Makefile,v
> retrieving revision 1.16
> diff -u -p -r1.16 Makefile
> --- Makefile 11 Mar 2022 19:34:48 - 1.16
> +++ Makefile 3 Apr 2022 10:28:02 -
> @@ -1,8 +1,7 @@
> COMMENT= Perl implementation of DMARC
>
> -DISTNAME=Mail-DMARC-1.20200214
> +DISTNAME=Mail-DMARC-1.20211209
> MAINTAINER= Giovanni Bechis
> -REVISION=1
>
> CATEGORIES= mail
>
> @@ -23,6 +22,7 @@ RUN_DEPENDS=converters/p5-JSON \
> devel/p5-Net-Server \
> devel/p5-Test-File-ShareDir \
> mail/p5-Email-MIME \
> + mail/p5-Email-Sender \
> mail/p5-Email-Simple \
> mail/p5-Mail-DKIM \
> net/p5-Net-DNS \
> Index: distinfo
> ===
> RCS file: /cvs/ports/mail/p5-Mail-DMARC/distinfo,v
> retrieving revision 1.9
> diff -u -p -r1.9 distinfo
> --- distinfo 15 Apr 2020 09:32:57 - 1.9
> +++ distinfo 3 Apr 2022 10:28:02 -
> @@ -1,2 +1,2 @@
> -SHA256 (Mail-DMARC-1.20200214.tar.gz) =
> dpxXxpPp1hLblpJkJkX4x0bL1fWmhaPJ7GNWQC/inHs=
> -SIZE (Mail-DMARC-1.20200214.tar.gz) = 786782
> +SHA256 (Mail-DMARC-1.20211209.tar.gz) =
> 9RnTO7zeg60nqOtFaACfYp6Dde+0tshCYct6Ll2/fyQ=
> +SIZE (Mail-DMARC-1.20211209.tar.gz) = 794986
Re: perl ppport.h -Wcompound-token-split-by-macro
On Fri, Mar 11, 2022 at 12:20:31PM +, Stuart Henderson wrote: > On 2022/03/11 11:28, Alexander Bluhm wrote: > > On Fri, Mar 11, 2022 at 07:54:55AM +, Stuart Henderson wrote: > > > On 2022/03/10 19:38, Andrew Hewus Fresh wrote: > > > > > > > > The only other thing is that I wish it would compare > > > > `perl ppport.h --version` to > > > > `perl -MDevel::PPPort -E 'say Devel::PPPort->VERSION'` > > > > and only update if ours is newer, since I don't watch that closely. > > > > I suppose it's fairly unlikely that it will invisibly break something > > > > though. > > > > > > The ppport.h in a distribution may have been stripped, in which case > > > --version is unavailable. > > > > > > This might be simpler if Devel::PPPort itself could check the version. > > > > I have no strong opinion on that. Do what is feasible. > > I think we can ignore that for now and look into it later if we need to. > > > > > With those things considered, > > > > OK afresh1@ > > > > > > I would like it to not be invisible, and to have a way to disable it. > > > How about this? > > > > If something breaks the porter can set the variable. As it is most > > likely during update, this forkflow is fine for me. > > Exactly. > > > OK bluhm@ > > > > > Did it go through a bulk build already? > > > > I guess not. My question was hidden deep in a mail thread. > > > > The ports I am testing passed a while ago. > > http://bluhm.genua.de/portstest/results/latest.html > > It found two offenders that have ppport.h in a different directory. > > The still display warnings. They can be fixed later. > > I am running a bulk with it now, if there are no problems I'll commit > it at the weekend. Thanks. I just did a ports test run, no problems. And the logfile is readable again. http://bluhm.genua.de/portstest/results/2022-03-11T10%3A30%3A04Z/test.log
Re: perl ppport.h -Wcompound-token-split-by-macro
On Fri, Mar 11, 2022 at 07:54:55AM +, Stuart Henderson wrote:
> On 2022/03/10 19:38, Andrew Hewus Fresh wrote:
> > On Fri, Mar 11, 2022 at 01:02:04AM +0100, Alexander Bluhm wrote:
> > > Hi,
> > >
> > > Can we commit espie@'s diff to fix the -Wcompound-token-split-by-macro
> > > compiler warnings? It reduces the size of my logfiles a lot and
> > > allows to look at the build output of XS Perl ports.
> >
> > I'm not opposed, but defer to sthen@ on whether any bumping needs to
> > happen and therefore if it's better to one-off it in the offenders with
> > a patch file.
> >
> > The only other thing is that I wish it would compare
> > `perl ppport.h --version` to
> > `perl -MDevel::PPPort -E 'say Devel::PPPort->VERSION'`
> > and only update if ours is newer, since I don't watch that closely.
> > I suppose it's fairly unlikely that it will invisibly break something
> > though.
>
> The ppport.h in a distribution may have been stripped, in which case
> --version is unavailable.
>
> This might be simpler if Devel::PPPort itself could check the version.
I have no strong opinion on that. Do what is feasible.
> > With those things considered,
> > OK afresh1@
>
> I would like it to not be invisible, and to have a way to disable it.
> How about this?
If something breaks the porter can set the variable. As it is most
likely during update, this forkflow is fine for me.
OK bluhm@
> Did it go through a bulk build already?
I guess not. My question was hidden deep in a mail thread.
The ports I am testing passed a while ago.
http://bluhm.genua.de/portstest/results/latest.html
It found two offenders that have ppport.h in a different directory.
The still display warnings. They can be fixed later.
bluhm
> Index: perl.port.mk
> ===
> RCS file: /cvs/ports/infrastructure/mk/perl.port.mk,v
> retrieving revision 1.32
> diff -u -p -r1.32 perl.port.mk
> --- perl.port.mk 12 Dec 2021 19:25:39 - 1.32
> +++ perl.port.mk 11 Mar 2022 07:38:10 -
> @@ -44,6 +44,8 @@ PERL_MB_OPT = --install_path=lib=${LOCAL
> CONFIGURE_ENV += PERL_MB_OPT="${PERL_MB_OPT}"
> #MAKE_ENV += PERL_MB_OPT="${PERL_MB_OPT}"
>
> +MODPERL_REGEN_PPPORT ?= Yes
> +
> # set /usr/bin/perl for executable scripts
> MODPERL_BIN_ADJ =perl -pi \
> -e '$$. == 1 && s|^.*env
> perl([0-9.]*)([\s].*)?$$|\#!/usr/bin/perl$$2|;' \
> @@ -54,6 +56,15 @@ MODPERL_ADJ_FILES ?=
> .if !empty(MODPERL_ADJ_FILES)
> MODPERL_pre-configure = for f in ${MODPERL_ADJ_FILES}; do \
> ${MODPERL_BIN_ADJ} ${WRKSRC}/$${f}; done
> +.endif
> +
> +.if ${MODPERL_REGEN_PPPORT:L:Myes}
> +MODPERL_gen = cd ${WRKDIST} && \
> + if test -f ppport.h; then \
> + echo "Regenerating ppport.h"; \
> + cp ppport.h ppport.h.orig.ppport; \
> + perl -MDevel::PPPort -e'Devel::PPPort::WriteFile'; \
> + fi
> .endif
>
> .if ${CONFIGURE_STYLE:L:Mmodbuild}
perl ppport.h -Wcompound-token-split-by-macro
Hi,
Can we commit espie@'s diff to fix the -Wcompound-token-split-by-macro
compiler warnings? It reduces the size of my logfiles a lot and
allows to look at the build output of XS Perl ports.
bluhm
Index: infrastructure/mk/perl.port.mk
===
RCS file: /cvs/ports/infrastructure/mk/perl.port.mk,v
retrieving revision 1.32
diff -u -p -r1.32 perl.port.mk
--- infrastructure/mk/perl.port.mk 12 Dec 2021 19:25:39 - 1.32
+++ infrastructure/mk/perl.port.mk 10 Mar 2022 09:04:18 -
@@ -56,6 +56,11 @@ MODPERL_pre-configure = for f in ${MODPE
${MODPERL_BIN_ADJ} ${WRKSRC}/$${f}; done
.endif
+MODPERL_gen = cd ${WRKDIST} && \
+ if test -f ppport.h; then \
+ perl -MDevel::PPPort -e'Devel::PPPort::WriteFile'; \
+ fi
+
.if ${CONFIGURE_STYLE:L:Mmodbuild}
MODPERL_configure = \
cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} \
Re: UPDATE: net/scapy
On Fri, Feb 25, 2022 at 09:41:45AM +, Ricardo wrote: > Attached is an update to net/scapy (changes: > https://github.com/secdev/scapy/releases/tag/v2.4.5). I have the same diff in my home for a while. But I never commited it as it breaks regress tests. I did not find time to look into it. sys/net/pf_forward sys/net/pf_fragment sys/kern/sosplice/scapy sys/net/pf_state sys/netinet/arp sys/netinet/frag sys/netinet/pmtu sys/netinet6/frag6 sys/netinet6/nd6 sys/netinet6/rh0 sys/netinet6/rip6cksum sbin/slaacd I think the easiest one to run on a single machine is /usr/src/regress/sbin/slaacd. Please figure out what is wrong, the we can integrate the update. The tabs in the Makefile are according to /usr/ports/infrastructure/templates/Makefile.template . I order and align all my ports that way to keep them consistent. bluhm
Re: update intel microcode to 20220207
On Thu, Feb 10, 2022 at 05:21:55PM -0700, Theo de Raadt wrote: > We curate a singular choice of each firmware. We supply that. > End of story. I was unaware of the new behavior. > and those experts can stop running fw_update and do it by hand. I was testing new firmware package that is not released yet. That's an expert job. Now I know what to do. bluhm
Re: update intel microcode to 20220207
On Thu, Feb 10, 2022 at 03:51:44PM -0800, Andrew Hewus Fresh wrote: > On Thu, Feb 10, 2022 at 12:40:43PM +0100, Alexander Bluhm wrote: > > Does the new fw_update not check the version number of the file? Does > > it always overwrite with the tgz from firmware.openbsd.org? > > It only checks whether the versions match, one of the caveats I > explained early in the process was that it would not be able to check > for "newer" or "older", just "different". So my observed behavior matches the intended design. I am fine with this. Just good to know. > If someone wants to supply a patch that supports comparing version > numbers in the shell the way the package tools do, > I will run away screaming :-) I can resist to hack on this shell script and test install and upgrade on all architectures. bluhm
Re: update intel microcode to 20220207
On Thu, Feb 10, 2022 at 01:31:11AM +1100, Jonathan Gray wrote:
> release notes and list of updated platforms
> https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases/tag/microcode-20220207
>
> tests welcome
Running on the following machines:
with i386
cpu0: Intel(R) Xeon(R) CPU E5-2620 v3 @ 2.40GHz ("GenuineIntel" 686-class) 2.81
GHz, 06-3f-02
cpu0: Intel(R) Xeon(R) CPU E31230 @ 3.20GHz ("GenuineIntel" 686-class) 3.21
GHz, 06-2a-07
cpu0: Intel(R) Xeon(TM) CPU 3.06GHz ("GenuineIntel" 686-class) 3.07 GHz,
0f-02-05
cpu0: Intel(R) Xeon(R) CPU X5690 @ 3.47GHz ("GenuineIntel" 686-class) 3.54 GHz,
06-2c-02
with amd64
cpu0: Intel(R) Xeon(R) E-2236 CPU @ 3.40GHz, 3392.10 MHz, 06-9e-0a
OK bluhm@
Running the nightly regress tests with it did not happen, as the
old firmware got reinstalled during automatic upgrade. Does the
new fw_update not check the version number of the file? Does it
always overwrite with the tgz from firmware.openbsd.org?
> Index: Makefile
> ===
> RCS file: /cvs/ports/sysutils/firmware/intel/Makefile,v
> retrieving revision 1.27
> diff -u -p -r1.27 Makefile
> --- Makefile 9 Jun 2021 13:58:59 - 1.27
> +++ Makefile 9 Feb 2022 14:21:22 -
> @@ -3,7 +3,7 @@
> COMMENT= microcode update binaries for Intel CPUs
> FW_DRIVER= intel
>
> -FW_VER= 20210608
> +FW_VER= 20220207
> EPOCH= 0
> GH_ACCOUNT= intel
> GH_PROJECT= Intel-Linux-Processor-Microcode-Data-Files
> Index: distinfo
> ===
> RCS file: /cvs/ports/sysutils/firmware/intel/distinfo,v
> retrieving revision 1.20
> diff -u -p -r1.20 distinfo
> --- distinfo 9 Jun 2021 13:58:59 - 1.20
> +++ distinfo 9 Feb 2022 14:21:28 -
> @@ -1,2 +1,2 @@
> -SHA256 (firmware/intel-20210608.tar.gz) =
> /YW2t2nv0CnexqLAcQb9GPtNy1SLe8TN4JKVqDRO9tc=
> -SIZE (firmware/intel-20210608.tar.gz) = 4782451
> +SHA256 (firmware/intel-20220207.tar.gz) =
> UyUnvRfz6mZkRStTZpmBijv4luSs5omkOnNiRxG3ySE=
> +SIZE (firmware/intel-20220207.tar.gz) = 4590237
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/sysutils/firmware/intel/pkg/PLIST,v
> retrieving revision 1.16
> diff -u -p -r1.16 PLIST
> --- pkg/PLIST 9 Jun 2021 13:58:59 - 1.16
> +++ pkg/PLIST 9 Feb 2022 14:21:40 -
> @@ -89,8 +89,6 @@ firmware/intel/06-6a-06
> firmware/intel/06-7a-01
> firmware/intel/06-7a-08
> firmware/intel/06-7e-05
> -firmware/intel/06-86-04
> -firmware/intel/06-86-05
> firmware/intel/06-8a-01
> firmware/intel/06-8c-01
> firmware/intel/06-8c-02
Re: fix misc/posixtestsuite
On Tue, Jan 11, 2022 at 07:25:58PM +0100, Jeremie Courreges-Anglas wrote:
> On Mon, Jan 10 2022, Alexander Bluhm wrote:
> > On Mon, Jan 10, 2022 at 10:55:54PM +0100, Jeremie Courreges-Anglas wrote:
> >> On Mon, Jan 10 2022, Alexander Bluhm wrote:
> >> > On Sat, Jan 01, 2022 at 10:52:37AM +0100, Jeremie Courreges-Anglas wrote:
> >> >> On Sat, Jan 01 2022, Jeremie Courreges-Anglas wrote:
> >> >> > On Fri, Dec 31 2021, Stefan Hagen
> >> >> > wrote:
> >> >> >> Christian Weisgerber wrote:
> >> >> >>> Here's a reminder that these ports still fail to build since the
> >> >> >>> LLVM 13 update:
> >> >> >>>
> >> >> >>> devel/qbs
> >> >> >>> lang/libv8
> >> >> >>> misc/posixtestsuite
> >> >> >>
> >> >> >> Here -Werror is set and some variables now throw an -Wunused-but-set
> >> >> >> error.
> >> >> >> This happens frequently in this testsuite.
> >> >> >>
> >> >> >> Shall we switch it off?
> >> >> >
> >> >> > This is a clang-only flag, you can't use it with base-gcc. Here's a
> >> >> > way
> >> >> > to handle this.
> >> >>
> >> >> That would work if CFLAGS was respected, but it isn't...
> >> >
> >> > Who needs this -Werror anyway? Without it, it manages to compile
> >> > more tests.
> >> >
> >> > ok?
> >>
> >> Yep.
> >>
> >> But still it would be better to address the "does not respect CFLAGS" part.
> >> Can be done in a subsequent commit.
> >
> > Seems to work as my patch contains a CFLAGS +=
>
> The devil is in the details. With CFLAGS += -O2 -g in the Makefile,
> it's not possible to override those on the command line, eg
>
> make clean repackage reinstall DEBUG='-g -O0'
>
> If upstream's Makefile doesn't provide any easy way you can just use
> more patching, for example the diff below.
>
> ok?
OK bluhm@
> PS: I think (but I didn't check) that patch-Makefile contains hunks that
> are not strictly needed now that you removed -Werror. You may or may
> not want to revert them.
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/misc/posixtestsuite/Makefile,v
> retrieving revision 1.7
> diff -u -p -r1.7 Makefile
> --- Makefile 10 Jan 2022 22:10:15 - 1.7
> +++ Makefile 11 Jan 2022 18:03:43 -
> @@ -3,7 +3,7 @@
> COMMENT =open POSIX test suite
>
> DISTNAME = posixtestsuite-1.5.2
> -REVISION = 4
> +REVISION = 5
>
> CATEGORIES = misc
>
> @@ -21,6 +21,7 @@ MASTER_SITES = ${MASTER_SITE_SOURCEFORG
> BUILD_DEPENDS = textproc/gsed
>
> USE_GMAKE = Yes
> +MAKE_FLAGS = PORTS_CFLAGS="${CFLAGS}"
>
> WRKDIST =${WRKDIR}/posixtestsuite
>
> Index: patches/patch-Makefile
> ===
> RCS file: /cvs/ports/misc/posixtestsuite/patches/patch-Makefile,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-Makefile
> --- patches/patch-Makefile10 Jan 2022 22:10:15 - 1.3
> +++ patches/patch-Makefile11 Jan 2022 18:03:43 -
> @@ -22,7 +22,7 @@ Index: Makefile
> $(MAKE) all | column -t -s:
>
> -CFLAGS = -g -O2 -Wall -Werror -D_POSIX_C_SOURCE=200112L
> -+CFLAGS += -g -O2 -Wall -D_POSIX_C_SOURCE=200112L -D_XOPEN_SOURCE=600
> ++CFLAGS = -Wall -D_POSIX_C_SOURCE=200112L -D_XOPEN_SOURCE=600 ${PORTS_CFLAGS}
>
> # add -std=c99, -std=gnu99 if compiler supports it (gcc-2.95.3 does not).
> check_gcc = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null
> 2>&1; then echo "$(1)"; else echo "$(2)"; fi)
>
>
> --
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: www/p5-CGI-Simple: Update to 1.26
On Tue, Jan 04, 2022 at 08:32:50AM +, Stuart Henderson wrote: > > MODULES = cpan > > PKG_ARCH = * > > -DISTNAME = CGI-Simple-1.115 > > +DISTNAME = CGI-Simple-1.26 > > this results in the version number (as understood by ports) going > backwards so will need an EPOCH bump Some Perl modules have crazy ideas about version numbers. Instead of increasing EPOCH each time something stupid happens, some 0 can be inserted into package name. This makes it more likely that the numbers increase monotonically. Look at http://matrix.cpantesters.org/?dist=CGI-Simple "Other versions" how they jump around. I think p5-CGI-Simple-1.260 package name should be used in this case. wen heping: Please speak with upstream and try to convince them to use continous three digit version numbers like 1.270 in the future. It is not only the OpenBSD package manager which has trouble with inconsistent numbers. bluhm
Re: fix misc/posixtestsuite
On Mon, Jan 10, 2022 at 10:55:54PM +0100, Jeremie Courreges-Anglas wrote: > On Mon, Jan 10 2022, Alexander Bluhm wrote: > > On Sat, Jan 01, 2022 at 10:52:37AM +0100, Jeremie Courreges-Anglas wrote: > >> On Sat, Jan 01 2022, Jeremie Courreges-Anglas wrote: > >> > On Fri, Dec 31 2021, Stefan Hagen wrote: > >> >> Christian Weisgerber wrote: > >> >>> Here's a reminder that these ports still fail to build since the > >> >>> LLVM 13 update: > >> >>> > >> >>> devel/qbs > >> >>> lang/libv8 > >> >>> misc/posixtestsuite > >> >> > >> >> Here -Werror is set and some variables now throw an -Wunused-but-set > >> >> error. > >> >> This happens frequently in this testsuite. > >> >> > >> >> Shall we switch it off? > >> > > >> > This is a clang-only flag, you can't use it with base-gcc. Here's a way > >> > to handle this. > >> > >> That would work if CFLAGS was respected, but it isn't... > > > > Who needs this -Werror anyway? Without it, it manages to compile > > more tests. > > > > ok? > > Yep. > > But still it would be better to address the "does not respect CFLAGS" part. > Can be done in a subsequent commit. Seems to work as my patch contains a CFLAGS += bluhm
Re: fix misc/posixtestsuite
On Sat, Jan 01, 2022 at 10:52:37AM +0100, Jeremie Courreges-Anglas wrote: > On Sat, Jan 01 2022, Jeremie Courreges-Anglas wrote: > > On Fri, Dec 31 2021, Stefan Hagen wrote: > >> Christian Weisgerber wrote: > >>> Here's a reminder that these ports still fail to build since the > >>> LLVM 13 update: > >>> > >>> devel/qbs > >>> lang/libv8 > >>> misc/posixtestsuite > >> > >> Here -Werror is set and some variables now throw an -Wunused-but-set error. > >> This happens frequently in this testsuite. > >> > >> Shall we switch it off? > > > > This is a clang-only flag, you can't use it with base-gcc. Here's a way > > to handle this. > > That would work if CFLAGS was respected, but it isn't... Who needs this -Werror anyway? Without it, it manages to compile more tests. ok? bluhm Index: misc/posixtestsuite/Makefile === RCS file: /data/mirror/openbsd/cvs/ports/misc/posixtestsuite/Makefile,v retrieving revision 1.6 diff -u -p -r1.6 Makefile --- misc/posixtestsuite/Makefile12 Jul 2019 20:47:53 - 1.6 +++ misc/posixtestsuite/Makefile10 Jan 2022 20:36:09 - @@ -3,7 +3,7 @@ COMMENT = open POSIX test suite DISTNAME = posixtestsuite-1.5.2 -REVISION = 3 +REVISION = 4 CATEGORIES = misc Index: misc/posixtestsuite/patches/patch-Makefile === RCS file: /data/mirror/openbsd/cvs/ports/misc/posixtestsuite/patches/patch-Makefile,v retrieving revision 1.2 diff -u -p -r1.2 patch-Makefile --- misc/posixtestsuite/patches/patch-Makefile 8 May 2018 22:14:19 - 1.2 +++ misc/posixtestsuite/patches/patch-Makefile 10 Jan 2022 17:27:38 - @@ -22,7 +22,7 @@ Index: Makefile $(MAKE) all | column -t -s: -CFLAGS = -g -O2 -Wall -Werror -D_POSIX_C_SOURCE=200112L -+CFLAGS = -g -O2 -Wall -Werror -D_POSIX_C_SOURCE=200112L -D_XOPEN_SOURCE=600 ++CFLAGS += -g -O2 -Wall -D_POSIX_C_SOURCE=200112L -D_XOPEN_SOURCE=600 # add -std=c99, -std=gnu99 if compiler supports it (gcc-2.95.3 does not). check_gcc = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi) Index: misc/posixtestsuite/pkg/PLIST === RCS file: /data/mirror/openbsd/cvs/ports/misc/posixtestsuite/pkg/PLIST,v retrieving revision 1.5 diff -u -p -r1.5 PLIST --- misc/posixtestsuite/pkg/PLIST 23 May 2018 20:28:34 - 1.5 +++ misc/posixtestsuite/pkg/PLIST 10 Jan 2022 20:05:34 - @@ -4371,6 +4371,8 @@ libexec/posixtestsuite/conformance/behav @bin libexec/posixtestsuite/conformance/behavior/WIFEXITED/1-1.test @bin libexec/posixtestsuite/conformance/behavior/WIFEXITED/1-2.test @bin libexec/posixtestsuite/conformance/behavior/WIFEXITED/1-3.test +libexec/posixtestsuite/conformance/behavior/timers/ +@bin libexec/posixtestsuite/conformance/behavior/timers/1-1.test libexec/posixtestsuite/conformance/interfaces/ libexec/posixtestsuite/conformance/interfaces/asctime/ @bin libexec/posixtestsuite/conformance/interfaces/asctime/1-1.test @@ -4395,6 +4397,8 @@ libexec/posixtestsuite/conformance/inter @bin libexec/posixtestsuite/conformance/interfaces/clock_gettime/1-1.test @bin libexec/posixtestsuite/conformance/interfaces/clock_gettime/1-2.test @bin libexec/posixtestsuite/conformance/interfaces/clock_gettime/2-1.test +@bin libexec/posixtestsuite/conformance/interfaces/clock_gettime/3-1.test +@bin libexec/posixtestsuite/conformance/interfaces/clock_gettime/4-1.test libexec/posixtestsuite/conformance/interfaces/clock_gettime/6-1.test @bin libexec/posixtestsuite/conformance/interfaces/clock_gettime/7-1.test @bin libexec/posixtestsuite/conformance/interfaces/clock_gettime/8-1.test @@ -4489,6 +4493,8 @@ libexec/posixtestsuite/conformance/inter @bin libexec/posixtestsuite/conformance/interfaces/mmap/1-2.test @bin libexec/posixtestsuite/conformance/interfaces/mmap/10-1.test @bin libexec/posixtestsuite/conformance/interfaces/mmap/11-1.test +@bin libexec/posixtestsuite/conformance/interfaces/mmap/11-2.test +@bin libexec/posixtestsuite/conformance/interfaces/mmap/11-3.test @bin libexec/posixtestsuite/conformance/interfaces/mmap/11-4.test @bin libexec/posixtestsuite/conformance/interfaces/mmap/11-5.test @bin libexec/posixtestsuite/conformance/interfaces/mmap/12-1.test @@ -4566,6 +4572,8 @@ libexec/posixtestsuite/conformance/inter @bin libexec/posixtestsuite/conformance/interfaces/munlockall/5-1.test libexec/posixtestsuite/conformance/interfaces/munlockall/6-1.test libexec/posixtestsuite/conformance/interfaces/munmap/ +@bin libexec/posixtestsuite/conformance/interfaces/munmap/1-1.test +@bin libexec/posixtestsuite/conformance/interfaces/munmap/1-2.test libexec/posixtestsuite/conformance/interfaces/munmap/10-1.test @bin libexec/posixtestsuite/conformance/interfaces/munmap/2-1.test @bin libexec/posixtestsuite/conformance/interfaces/munmap/3-
Re: [NEW] devel/p5-B-Debug
On Tue, Oct 19, 2021 at 01:22:24PM +, wen heping wrote: > Here is a patch to create new port devel/p5-B-Debug, > it is required by the update of devel/p5-Decel-Cover. > It build well and pass all tests on amd64-7.0 system. > > Comments ? OK bluhm@
Re: powerpc bulk build report
On Thu, Sep 09, 2021 at 08:56:52AM -0600, c...@openbsd.org wrote: > http://build-failures.rhaalovely.net/powerpc/2021-08-21/misc/open62541,ns0_full.log /usr/obj/ports/open62541-1.0.6-ns0_full/bin/cc ... namespace0_generated.c Segmentation fault (core dumped) ninja: build stopped: subcommand failed. The compiler needs a lot of stack memory. The ulimit -s should be raised to 8 GB. Feel free to skip the ns0_full flavor on small memory architectures. bluhm
new devel/p5-File-TreeCreate
Hi ok to import p5-File-TreeCreate 0.0.1 ? recursively create a directory tree Needed to update some modules. bluhm p5-File-TreeCreate.tgz Description: application/tar-gz
open62541 ns0 flavor
Hi,
The open62541 library may be compiled with full namespace zero.
This is neccessary for my use case.
For that I need an additional external package from the OPC UA
foundation. To build the full library, the compiler needs 8 MB
stack limit. And the package size grows from 4 to 10 MB.
So I created a ns0_full flavor that is not built by default.
Is this the correct approach?
bluhm
Index: misc/open62541/Makefile
===
RCS file: /data/mirror/openbsd/cvs/ports/misc/open62541/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- misc/open62541/Makefile 29 Jul 2021 15:05:43 - 1.10
+++ misc/open62541/Makefile 29 Jul 2021 17:48:59 -
@@ -3,6 +3,7 @@
COMMENT = library implementation of OPC UA
VERSION = 1.0.3
+REVISION = 0
DISTNAME = open62541-${VERSION}
PKGNAME = open62541-${VERSION}
@@ -20,7 +21,9 @@ PERMIT_PACKAGE = Yes
WANTLIB = c m mbedcrypto mbedtls mbedx509 pthread
MASTER_SITES = https://github.com/open62541/open62541/
-DISTFILES =open62541-{archive/refs/tags/v}${VERSION}.tar.gz
+MASTER_SITES0 =
https://github.com/OPCFoundation/UA-Nodeset/archive/
+DISTFILES =open62541-{archive/refs/tags/v}${VERSION}.tar.gz \
+ UA-1.04.5-2020-03-06.tar.gz:0
MODULES = devel/cmake
@@ -39,7 +42,6 @@ CONFIGURE_ARGS = -DCMAKE_BUILD_TYPE=RelW
-DOPEN62541_VERSION=v${VERSION} \
-DBUILD_SHARED_LIBS=ON \
-DUA_ENABLE_ENCRYPTION=ON \
- -DUA_NAMESPACE_ZERO=REDUCED \
-DUA_ENABLE_AMALGAMATION=OFF \
-DUA_PACK_DEBIAN=ON \
-DUA_BUILD_TOOLS=ON \
@@ -48,5 +50,21 @@ CONFIGURE_ARGS = -DCMAKE_BUILD_TYPE=RelW
DEBUG_PACKAGES = ${BUILD_PACKAGES}
ALL_TARGET = all doc_pdf
+
+FLAVORS = ns0_full
+FLAVOR ?=
+
+.if ${FLAVOR:Mns0_full}
+CONFIGURE_ARGS += -DUA_NAMESPACE_ZERO=FULL \
+ -DUA_ENABLE_MICRO_EMB_DEV_PROFILE=ON
+.else
+CONFIGURE_ARGS += -DUA_NAMESPACE_ZERO=REDUCED
+.endif
+
+.if ${FLAVOR:Mns0_full}
+post-extract:
+ rmdir ${WRKSRC}/deps/ua-nodeset/
+ mv ${WRKDIR}/UA-Nodeset-UA-*/ ${WRKSRC}/deps/ua-nodeset/
+.endif
.include
Index: misc/open62541/distinfo
===
RCS file: /data/mirror/openbsd/cvs/ports/misc/open62541/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- misc/open62541/distinfo 29 Jul 2021 15:05:43 - 1.3
+++ misc/open62541/distinfo 29 Jul 2021 15:46:41 -
@@ -1,2 +1,4 @@
+SHA256 (UA-1.04.5-2020-03-06.tar.gz) =
KIty/GA+zomK1fXUBLBP7+EN5Puzx1apbXzINCtRgFM=
SHA256 (open62541-1.0.3.tar.gz) = PkyTnXAtBtifMqHK/iuZLH89gcj4V54JOpctS8T7PVA=
+SIZE (UA-1.04.5-2020-03-06.tar.gz) = 4053334
SIZE (open62541-1.0.3.tar.gz) = 2691597
Index: misc/open62541/pkg/PFRAG.ns0_full
===
RCS file: misc/open62541/pkg/PFRAG.ns0_full
diff -N misc/open62541/pkg/PFRAG.ns0_full
--- /dev/null 1 Jan 1970 00:00:00 -
+++ misc/open62541/pkg/PFRAG.ns0_full 29 Jul 2021 17:43:52 -
@@ -0,0 +1,220 @@
+@comment $OpenBSD: PFRAG.ns0_full,v$
+share/open62541/tools/ua-nodeset/ADI/
+share/open62541/tools/ua-nodeset/ADI/Opc.Ua.Adi.Classes.cs
+share/open62541/tools/ua-nodeset/ADI/Opc.Ua.Adi.Constants.cs
+share/open62541/tools/ua-nodeset/ADI/Opc.Ua.Adi.DataTypes.cs
+share/open62541/tools/ua-nodeset/ADI/Opc.Ua.Adi.NodeSet2.xml
+share/open62541/tools/ua-nodeset/ADI/Opc.Ua.Adi.PredefinedNodes.uanodes
+share/open62541/tools/ua-nodeset/ADI/Opc.Ua.Adi.PredefinedNodes.xml
+share/open62541/tools/ua-nodeset/ADI/Opc.Ua.Adi.Types.bsd
+share/open62541/tools/ua-nodeset/ADI/Opc.Ua.Adi.Types.xsd
+share/open62541/tools/ua-nodeset/ADI/OpcUaAdiModel.csv
+share/open62541/tools/ua-nodeset/ADI/OpcUaAdiModel.xml
+share/open62541/tools/ua-nodeset/AML/
+share/open62541/tools/ua-nodeset/AML/Opc.Ua.AMLBaseTypes.NodeSet2.xml
+share/open62541/tools/ua-nodeset/AML/Opc.Ua.AMLLibraries.NodeSet2.xml
+share/open62541/tools/ua-nodeset/AML/Topology.aml
+share/open62541/tools/ua-nodeset/AML/Topology.xml
+share/open62541/tools/ua-nodeset/AnsiC/
+share/open62541/tools/ua-nodeset/AnsiC/Opc.Ua.Endpoints.wsdl
+share/open62541/tools/ua-nodeset/AnsiC/Opc.Ua.Services.wsdl
+share/open62541/tools/ua-nodeset/AnsiC/opcua_attributes.h
+share/open62541/tools/ua-nodeset/AnsiC/opcua_browsenames.h
+share/open62541/tools/ua-nodeset/AnsiC/opcua_clientapi.c
+share/open62541/tools/ua-nodeset/AnsiC/opcua_clientapi.h
+share/open62541/tools/ua-nodeset/AnsiC/opcua_exclusions.h
+share/open62541/tools/ua-nodeset/AnsiC/opcua_identifiers.h
+share/open62541/tools/ua-nodeset/AnsiC/opcua_serverapi.c
+share/open62541/tools/ua-nodeset/AnsiC/opcua_serverapi.h
+share/open62541/tools/ua-nodeset/AnsiC/op
Re: Build security/botan on riscv64
On Mon, Jul 26, 2021 at 12:54:06PM +0100, Stuart Henderson wrote:
> On 2021/07/26 11:38, Alexander Bluhm wrote:
> > On Sat, Jul 24, 2021 at 03:28:00PM +0200, Jeremie Courreges-Anglas wrote:
> > >
> > > The following patch lets security/botan build on riscv64.
> > > I wrote a minimal description file, since I couldn't find one in the
> > > latest 1.11 (.34) release available upstream. Configure extract:
> >
> > Botan 1 is end of life. But I think we still need it for some
> > ports. Do whatever is helpful.
>
> only monotone, really. there is softhsm 1.x but it's end-of-life and can
> probably be removed by now, softhsm2 is in ports.
>
> > OK bluhm@
>
> ok for this too? build/test are still ok.
sure, OK bluhm@
> Index: Makefile
> ===
> RCS file: /cvs/ports/security/botan/Makefile,v
> retrieving revision 1.32
> diff -u -p -r1.32 Makefile
> --- Makefile 23 Feb 2021 19:39:37 - 1.32
> +++ Makefile 26 Jul 2021 11:48:18 -
> @@ -29,7 +29,6 @@ SUPDISTFILES = ${DISTFILES}.asc
> EXTRACT_SUFX = .tgz
>
> MODULES =lang/python
> -MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2}
> MODPY_RUNDEP = No
> LIB_DEPENDS =archivers/bzip2 \
> devel/gmp
Re: Build security/botan on riscv64
On Sat, Jul 24, 2021 at 03:28:00PM +0200, Jeremie Courreges-Anglas wrote:
>
> The following patch lets security/botan build on riscv64.
> I wrote a minimal description file, since I couldn't find one in the
> latest 1.11 (.34) release available upstream. Configure extract:
Botan 1 is end of life. But I think we still need it for some
ports. Do whatever is helpful.
OK bluhm@
> --8<--
> [...]
> >>> Running configure in security/botan at 1626992720.48
> ===> security/botan
> ===> Generating configure for botan-1.10.17p2
> ===> Configuring for botan-1.10.17p2
> ln -sf /usr/local/bin/python2.7 /usr/ports/pobj/botan-1.10.17/bin/python
> cp /usr/ports/security/botan/files/riscv64.txt
> /usr/ports/pobj/botan-1.10.17/Botan-1.10.17/src/build-data/arch
>INFO: Guessing to use compiler gcc (use --cc to set)
>INFO: Guessing target OS is openbsd (use --os to set)
>INFO: Canonicalizized --cpu=riscv64 to riscv64/riscv64
>INFO: Target is gcc-openbsd-riscv64-riscv64
> WARNING: Could not execute g++ for version check
>INFO: Skipping, by request only - cms cvc
>INFO: Skipping, incompatible CPU - aes_ni aes_ssse3 asm_x86_32 asm_x86_64
> idea_sse2 md4_x86_32 md5_x86_32 mp_asm64 mp_x86_32 mp_x86_64 rdrand
> serpent_x86_32 sha1_sse2 sha1_x86_32 sha1_x86_64 simd_altivec simd_sse2
>INFO: Skipping, incompatible OS - beos_stats cryptoapi_rng unix_procs
> win32_crit_section win32_stats
>INFO: Skipping, incompatible compiler - mp_msvc64 mp_x86_32_msvc
>INFO: Skipping, loaded only if needed by dependency - aes_isa_eng
> asm_engine
>INFO: Using MP module mp_generic
>INFO: Using SIMD module simd_scalar
>INFO: ssl: If you are using TLS in your application definitely consider
> using the version in 1.11 instead
>INFO: Assuming CPU is little endian
>INFO: Using symlink to link files into build directory
>INFO: Botan 1.10.17 build setup is complete
> >>> Running build in security/botan at 1626992728.48
> ===> security/botan
> ===> Building for botan-1.10.17p2
> [...]
> -->8--
>
> No REVISION bump needed since botan never built on riscv64 and the
> change shouldn't affect other archs. ok?
>
> (I can run the tests if you're interested.)
>
>
> Index: Makefile
> ===
> RCS file: /d/cvs/ports/security/botan/Makefile,v
> retrieving revision 1.32
> diff -u -p -r1.32 Makefile
> --- Makefile 23 Feb 2021 19:39:37 - 1.32
> +++ Makefile 22 Jul 2021 22:10:10 -
> @@ -64,6 +64,7 @@ PKG_ARGS += -Damd64=0
>
> pre-configure:
> ln -sf ${MODPY_BIN} ${WRKDIR}/bin/python
> + cp ${FILESDIR}/riscv64.txt ${WRKSRC}/src/build-data/arch
>
> do-test:
> cd ${WRKBUILD} && \
> Index: files/riscv64.txt
> ===
> RCS file: files/riscv64.txt
> diff -N files/riscv64.txt
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ files/riscv64.txt 23 Jul 2021 08:42:35 -
> @@ -0,0 +1,3 @@
> +endian little
> +
> +family riscv
>
>
> --
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: www/p5-Dancer2: Update to 0.301004
On Fri, Jun 11, 2021 at 11:38:09AM +, Charlene Wendling wrote: > >Here is a patch for www/p5-Dancer2: > >i) Update to 0.301004 > >ii) Add sysutils/p5-File-Which as RUN_DEPENDS > >It build well and pass all tests on amd64-6.9 system. > >4 ports depends on it and all build and pass tests too. > > OK cwen@ with 2 tweaks: > > - sysutils/p5-Capture-Tiny is missing as TEST_DEPENDS > - we don't need gitignore and docker files I commited with this and sorting the dependencies. Some dependencies are out of date. I regenerated with portgen, checked manually, and added everything that is rcommended. So the correct list should be below. I think we should not run author tests. It makes trcking the dependendcies even harder. And there is no sense in checking the pod and style again as the author did before. While there, sort the Makefile according to template. ok? bluhm Index: www/p5-Dancer2/Makefile === RCS file: /data/mirror/openbsd/cvs/ports/www/p5-Dancer2/Makefile,v retrieving revision 1.14 diff -u -p -r1.14 Makefile --- www/p5-Dancer2/Makefile 11 Jun 2021 16:51:21 - 1.14 +++ www/p5-Dancer2/Makefile 12 Jun 2021 00:08:44 - @@ -2,55 +2,61 @@ COMMENT = lightweight yet powerful web application framework -MODULES = cpan -PKG_ARCH = * DISTNAME = Dancer2-0.301004 +REVISION = 0 + CATEGORIES = www # Perl PERMIT_PACKAGE = Yes +MODULES = cpan + BUILD_DEPENDS =devel/p5-File-ShareDir-Install>=0.06 -RUN_DEPENDS = converters/p5-JSON \ - converters/p5-JSON-XS \ +RUN_DEPENDS = converters/p5-Cpanel-JSON-XS \ + converters/p5-JSON-MaybeXS \ devel/p5-CLI-Osprey \ - devel/p5-Class-Load \ + devel/p5-Class-XSAccessor \ + devel/p5-Clone \ devel/p5-Config-Any \ + devel/p5-Exporter-Tiny \ devel/p5-File-Share \ devel/p5-Hash-Merge-Simple \ + devel/p5-Hash-MultiValue \ devel/p5-Import-Into \ - devel/p5-Moo>=2.00 \ - devel/p5-MooX-Types-MooseLike \ + devel/p5-Module-Runtime \ + devel/p5-Moo>=2.0 \ + devel/p5-MooX-TypeTiny \ + devel/p5-Path-Tiny \ devel/p5-Ref-Util \ - devel/p5-Return-MultiLevel \ + devel/p5-Role-Tiny>=2.0 \ devel/p5-Safe-Isa \ devel/p5-Scope-Upper \ - devel/p5-Type-Tiny \ - devel/p5-YAML \ + devel/p5-Sub-Quote \ + devel/p5-Type-Tiny>=1.06 \ + devel/p5-YAML>=0.86 \ + devel/p5-YAML-XS \ mail/p5-MIME-Types \ - security/p5-Digest-SHA1 \ sysutils/p5-File-Which \ textproc/p5-Template \ textproc/p5-Template-Tiny \ - www/p5-HTTP-Body \ - www/p5-HTTP-Cookies \ www/p5-HTTP-Date \ - www/p5-HTTP-Headers-Fast \ + www/p5-HTTP-Headers-Fast>=0.21 \ + www/p5-Plack>=1.0040 \ www/p5-Plack-Middleware-FixMissingBodyInRedirect \ www/p5-Plack-Middleware-RemoveRedundantBody \ - www/p5-Plack>=1.0040 + www/p5-URI TEST_DEPENDS = devel/p5-AnyEvent \ - devel/p5-Test-CPAN-Meta \ devel/p5-Test-EOL \ devel/p5-Test-Fatal \ - devel/p5-Test-Memory-Cycle>=1.04 \ + devel/p5-Test-Memory-Cycle \ devel/p5-Test-MockTime \ - devel/p5-Test-NoTabs \ - devel/p5-Test-Perl-Critic \ - sysutils/p5-Capture-Tiny + sysutils/p5-Capture-Tiny>=0.12 \ + www/p5-HTTP-Cookies \ + www/p5-HTTP-Message -MAKE_ENV +=TEST_POD=yes AUTHOR_TESTING=Yes +PKG_ARCH = * .include
Re: [update] textproc/libxml
On Mon, May 31, 2021 at 12:34:54AM -0700, Nam Nguyen wrote:
> > Here is a fresh diff with some additions:
> > - move to gnome's gitlab to avoid using ftp (as suggested by tj@)
> > - CONFIGURE_STYLE autoreconf
> > - translate patches from Makefile.in --> Makefile.am
This is not correct. The gnome gitlab package has different content.
libxml2-v2.9.12.tar.gz is not the official release. E.g. file
customfo.xsl is an addition.
http://www.xmlsoft.org/ provides an official download link to
ftp://xmlsoft.org/libxml2/ . That is where the releases live as
announced by the upstream project. Instead of using some unknown
HTTPS certificate one should verify the PGP signature provided by
the maintainers.
Usually I add it to SUPDISTFILES so it is downloaded when updating.
It reminds me to check it when I update a port.
ok?
bluhm
Index: textproc/libxml/Makefile
===
RCS file: /data/mirror/openbsd/cvs/ports/textproc/libxml/Makefile,v
retrieving revision 1.188
diff -u -p -r1.188 Makefile
--- textproc/libxml/Makefile12 May 2021 11:22:35 - 1.188
+++ textproc/libxml/Makefile11 Jun 2021 14:30:46 -
@@ -3,15 +3,14 @@
COMMENT-main= XML parsing library
COMMENT-python=Python bindings for libxml
-VERSION= 2.9.10
-REVISION-main= 4
-REVISION-python= 5
+VERSION= 2.9.12
DISTNAME= libxml2-${VERSION}
PKGNAME-main= libxml-${VERSION}
PKGNAME-python=py3-libxml-${VERSION}
-SHARED_LIBS += xml2 16.1 # 11.9
+SHARED_LIBS += xml2 17.0 # 11.9
CATEGORIES=textproc
MASTER_SITES= ftp://xmlsoft.org/libxml/
+SUPDISTFILES = ${DISTFILES}.asc
HOMEPAGE= http://xmlsoft.org/
Index: textproc/libxml/distinfo
===
RCS file: /data/mirror/openbsd/cvs/ports/textproc/libxml/distinfo,v
retrieving revision 1.57
diff -u -p -r1.57 distinfo
--- textproc/libxml/distinfo1 Nov 2019 15:37:45 - 1.57
+++ textproc/libxml/distinfo11 Jun 2021 14:31:10 -
@@ -1,2 +1,4 @@
-SHA256 (libxml2-2.9.10.tar.gz) = qv7hk/+4/gyC1K/vbvkZcsuvX+6hAO3C8mJ1BhG0vh8=
-SIZE (libxml2-2.9.10.tar.gz) = 5624761
+SHA256 (libxml2-2.9.12.tar.gz) = yNZoHjjFbxcokshd3AhS4f1LU7Qgnn9Ovxf34urnHZI=
+SHA256 (libxml2-2.9.12.tar.gz.asc) =
RIeC1nGhqdxq52Ew84xYoMmpWeeZQnQSzG+JdEPGoJg=
+SIZE (libxml2-2.9.12.tar.gz) = 5681632
+SIZE (libxml2-2.9.12.tar.gz.asc) = 488
Index: textproc/libxml/patches/patch-Makefile_in
===
RCS file:
/data/mirror/openbsd/cvs/ports/textproc/libxml/patches/patch-Makefile_in,v
retrieving revision 1.11
diff -u -p -r1.11 patch-Makefile_in
--- textproc/libxml/patches/patch-Makefile_in 1 Nov 2019 15:37:45 -
1.11
+++ textproc/libxml/patches/patch-Makefile_in 11 Jun 2021 14:35:32 -
@@ -15,7 +15,7 @@ Index: Makefile.in
LDADDS = $(STATIC_BINARIES) $(top_builddir)/libxml2.la $(THREAD_LIBS)
$(Z_LIBS) $(LZMA_LIBS) $(ICONV_LIBS) $(M_LIBS) $(WIN32_EXTRA_LIBADD)
man_MANS = xml2-config.1 libxml.3
m4datadir = $(datadir)/aclocal
-@@ -880,7 +880,7 @@ cmake_DATA = libxml2-config.cmake
+@@ -881,7 +881,7 @@ cmake_DATA = libxml2-config.cmake
# Install the tests program sources as examples
#
BASE_DIR = $(datadir)/doc
@@ -24,7 +24,7 @@ Index: Makefile.in
EXAMPLES_DIR = $(BASE_DIR)/$(DOC_MODULE)/examples
#
-@@ -2089,7 +2089,7 @@ runtests: runtest$(EXEEXT) testrecurse$(EXEEXT) testap
+@@ -2090,7 +2090,7 @@ runtests: runtest$(EXEEXT) testrecurse$(EXEEXT) testap
testchar$(EXEEXT) testdict$(EXEEXT) runxmlconf$(EXEEXT)
[ -d test ] || $(LN_S) $(srcdir)/test .
[ -d result ] || $(LN_S) $(srcdir)/result .
@@ -33,7 +33,7 @@ Index: Makefile.in
$(CHECKER) ./testrecurse$(EXEEXT) && \
ASAN_OPTIONS="$$ASAN_OPTIONS:detect_leaks=0" $(CHECKER)
./testapi$(EXEEXT) && \
$(CHECKER) ./testchar$(EXEEXT) && \
-@@ -2616,6 +2616,7 @@ SVGtests : xmllint$(EXEEXT)
+@@ -2618,6 +2618,7 @@ SVGtests : xmllint$(EXEEXT)
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\
else \
echo Testing $$name ; \
Index: textproc/libxml/patches/patch-configure_ac
===
RCS file:
/data/mirror/openbsd/cvs/ports/textproc/libxml/patches/patch-configure_ac,v
retrieving revision 1.4
diff -u -p -r1.4 patch-configure_ac
--- textproc/libxml/patches/patch-configure_ac 14 Mar 2018 08:20:49 -
1.4
+++ textproc/libxml/patches/patch-configure_ac 11 Jun 2021 14:35:35 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-configure_ac,v 1.4 2018/
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
-@@ -539,7 +539,7 @@ dnl Checks for library functions.
+@@ -544,7 +544,7 @@ dnl Checks for library functions.
AC_FUNC_STRFTIME
AC_C
Re: update sysutils/p5-Rex
On Sun, May 30, 2021 at 07:43:47PM +0200, Solene Rapenne wrote: > This updates sysutils/p5-Rex to latest version > > The changelog is small: > This is a new patch release containing documentation updates, and > a fix for debconf parsing. Behind the scenes, CI was migrated over > to GitHub Actions as well. > > works for me?? Patching file lib/Rex/Interface/Shell.pm using Plan A... Hunk #1 succeeded at 18 (offset 1 line). You should make update-patches to fix the offset. -@@ -17,7 +17,8 @@ my %SHELL_PROVIDER = ( +@@ -18,7 +18,8 @@ my %SHELL_PROVIDER = ( OK bluhm@ > Index: Makefile > === > RCS file: /home/reposync/ports/sysutils/p5-Rex/Makefile,v > retrieving revision 1.7 > diff -u -p -r1.7 Makefile > --- Makefile 7 Feb 2021 14:24:02 - 1.7 > +++ Makefile 30 May 2021 12:33:17 - > @@ -3,7 +3,7 @@ > COMMENT= perl-based deployment and configuration management > > CPAN_AUTHOR= FERKI > -DISTNAME=Rex-1.13.2 > +DISTNAME=Rex-1.13.3 > > CATEGORIES= sysutils > > Index: distinfo > === > RCS file: /home/reposync/ports/sysutils/p5-Rex/distinfo,v > retrieving revision 1.4 > diff -u -p -r1.4 distinfo > --- distinfo 7 Feb 2021 14:24:02 - 1.4 > +++ distinfo 30 May 2021 12:33:24 - > @@ -1,2 +1,2 @@ > -SHA256 (Rex-1.13.2.tar.gz) = DplKEzdClbmsCAN5WzxylrcwCfIukhDOjCRxZTW2kLs= > -SIZE (Rex-1.13.2.tar.gz) = 349355 > +SHA256 (Rex-1.13.3.tar.gz) = FkgMhqoKJkE6+MMHOjoxvYV9lJbrMdoTkQKquc0x364= > +SIZE (Rex-1.13.3.tar.gz) = 349550 >
Re: New: sysutils/find2perl
On Sat, May 15, 2021 at 11:26:06PM +0200, Christian Weisgerber wrote: > Alexander Bluhm: > > > A test dependecy to devel/p5-Devel-FindPerl is missing. > > > > I think @comment the dummy module out. > > Incorporated. > OK to import? OK bluhm@
Re: new productivity/p5-iCal-Parser
On Fri, Apr 23, 2021 at 11:41:42PM +0200, Alexander Bluhm wrote: > ok to import p5-iCal-Parser 1.21 ? ping? > Comment: > parse iCalendar files into a data structure > > Description: > This module processes iCalendar (vCalendar 2.0) files as specified > in RFC 2445 into a data structure. It handles recurrences (`RRULE's), > exclusions (`EXDATE's), event updates (events with a `RECURRENCE-ID'), > and nested data structures (`ATTENDEES' and `VALARM's). It currently > ignores the `VTIMEZONE', `VJOURNAL' and `VFREEBUSY' entry types. > > bluhm p5-iCal-Parser.tgz Description: application/tar-gz
Re: New: sysutils/find2perl
On Fri, May 14, 2021 at 11:12:37PM +0200, Christian Weisgerber wrote: > Randal Schwartz mentioned find2perl on comp.unix.shell, which made > me realize that it isn't any longer shipped as part of Perl. > > So here's a port for App-find2perl from CPAN. > > find2perl is a little translator to convert find(1) command lines to > equivalent Perl code. The resulting code is typically faster than > running find(1) itself. > > Anything missing in the port? A test dependecy to devel/p5-Devel-FindPerl is missing. I have attached this new port. > Should I @comment out the dummy App::find2perl parts? We really only > need > bin/find2perl > @man man/man1/find2perl.1 I think @comment the dummy module out. If the package would be p5-App-find2perl, I would keep it. But find2perl contains only a script. bluhm p5-Devel-FindPerl.tgz Description: application/tar-gz
Re: [NEW] devel/p5-CLI-Osprey
On Sun, May 02, 2021 at 07:36:48AM +, wen heping wrote:
>Here is a patch to create new port devel/p5-CLI-Osprey,
> which is required by the update of www/p5-Dancer2.
>It build and run well on amd64-6.9 system, 1 test(all
> 15 tests) failed because Test::lib module had not been
> imported into portstree.
Then we should import p5-Test-Lib or patch not to use it.
Both variants are trivial and attached.
anyway OK bluhm@ for p5-CLI-Osprey
p5-Test-Lib.tgz
Description: application/tar-gz
$OpenBSD$
Index: t/basic.t
--- t/basic.t.orig
+++ t/basic.t
@@ -3,7 +3,7 @@
use Test::More;
use Capture::Tiny qw( capture );
-use Test::Lib;
+use lib 't/lib';
use MyTest::Class::Basic;
subtest 'command' => sub {
Re: [NEW] security/p5-Crypt-PBKDF2
On Sun, May 02, 2021 at 09:14:16AM +, wen heping wrote: > Here is a patch to create new port security/p5-Crypt-PBKDF2, which is > required > by the update of security/p5-Crypt-CBC. > It build well and pass all tests on amd64-6.9 system. Comment starts with upper case, just remove 'The' OK bluhm@
Re: [NEW] security/p5-Digest-SHA3
On Sun, May 02, 2021 at 09:02:46AM +, wen heping wrote: >Here is a patch to create new port security/p5-Digest-SHA3, which > is required by the update of security/p5-Crypt-CBC. >It build well and pass all tests on amd64-6.9 system. You should put c to WANTLIB as XS calls libc functions. WANTLIB = c perl OK bluhm@
Re: libxml + python3.9
On Thu, May 13, 2021 at 08:32:43AM -0400, Daniel Dickman wrote:
> Diff below backports a commit so libxml can be built under python 3.9.
>
> ok?
OK bluhm@
Could you put this link into the patch file? Then it is easier to
find upstream for comparison.
https://gitlab.gnome.org/GNOME/libxml2/-/commit/e4fb36841800038c289997432ca547c9bfef9db1
> Index: Makefile
> ===
> RCS file: /cvs/ports/textproc/libxml/Makefile,v
> retrieving revision 1.188
> diff -u -p -u -r1.188 Makefile
> --- Makefile 12 May 2021 11:22:35 - 1.188
> +++ Makefile 13 May 2021 12:30:47 -
> @@ -5,7 +5,7 @@ COMMENT-python= Python bindings for lib
>
> VERSION= 2.9.10
> REVISION-main= 4
> -REVISION-python= 5
> +REVISION-python= 6
> DISTNAME=libxml2-${VERSION}
> PKGNAME-main=libxml-${VERSION}
> PKGNAME-python= py3-libxml-${VERSION}
> Index: patches/patch-python_libxml_c
> ===
> RCS file: /cvs/ports/textproc/libxml/patches/patch-python_libxml_c,v
> retrieving revision 1.1
> diff -u -p -u -r1.1 patch-python_libxml_c
> --- patches/patch-python_libxml_c 10 Jun 2020 22:54:58 - 1.1
> +++ patches/patch-python_libxml_c 13 May 2021 12:30:47 -
> @@ -2,9 +2,29 @@ $OpenBSD: patch-python_libxml_c,v 1.1 20
>
> https://gitlab.gnome.org/GNOME/libxml2/-/issues/64
>
> +Backport commit e4fb3684 for python 3.9 support
> +
> Index: python/libxml.c
> --- python/libxml.c.orig
> +++ python/libxml.c
> +@@ -294,7 +294,7 @@ xmlPythonFileReadRaw (void * context, char * buffer, i
> + lenread = PyBytes_Size(ret);
> + data = PyBytes_AsString(ret);
> + #ifdef PyUnicode_Check
> +-} else if PyUnicode_Check (ret) {
> ++} else if (PyUnicode_Check (ret)) {
> + #if PY_VERSION_HEX >= 0x0303
> + Py_ssize_t size;
> + const char *tmp;
> +@@ -359,7 +359,7 @@ xmlPythonFileRead (void * context, char * buffer, int
> + lenread = PyBytes_Size(ret);
> + data = PyBytes_AsString(ret);
> + #ifdef PyUnicode_Check
> +-} else if PyUnicode_Check (ret) {
> ++} else if (PyUnicode_Check (ret)) {
> + #if PY_VERSION_HEX >= 0x0303
> + Py_ssize_t size;
> + const char *tmp;
> @@ -1620,6 +1620,7 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNUSED void *ctx,
> PyObject *message;
> PyObject *result;
> Index: patches/patch-python_types_c
> ===
> RCS file: patches/patch-python_types_c
> diff -N patches/patch-python_types_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-python_types_c 13 May 2021 12:30:47 -
> @@ -0,0 +1,53 @@
> +$OpenBSD$
> +
> +Backport commit e4fb3684 for python 3.9 support
> +
> +Index: python/types.c
> +--- python/types.c.orig
> python/types.c
> +@@ -602,16 +602,16 @@ libxml_xmlXPathObjectPtrConvert(PyObject *obj)
> + if (obj == NULL) {
> + return (NULL);
> + }
> +-if PyFloat_Check (obj) {
> ++if (PyFloat_Check (obj)) {
> + ret = xmlXPathNewFloat((double) PyFloat_AS_DOUBLE(obj));
> +-} else if PyLong_Check(obj) {
> ++} else if (PyLong_Check(obj)) {
> + #ifdef PyLong_AS_LONG
> + ret = xmlXPathNewFloat((double) PyLong_AS_LONG(obj));
> + #else
> + ret = xmlXPathNewFloat((double) PyInt_AS_LONG(obj));
> + #endif
> + #ifdef PyBool_Check
> +-} else if PyBool_Check (obj) {
> ++} else if (PyBool_Check (obj)) {
> +
> + if (obj == Py_True) {
> + ret = xmlXPathNewBoolean(1);
> +@@ -620,14 +620,14 @@ libxml_xmlXPathObjectPtrConvert(PyObject *obj)
> + ret = xmlXPathNewBoolean(0);
> + }
> + #endif
> +-} else if PyBytes_Check (obj) {
> ++} else if (PyBytes_Check (obj)) {
> + xmlChar *str;
> +
> + str = xmlStrndup((const xmlChar *) PyBytes_AS_STRING(obj),
> + PyBytes_GET_SIZE(obj));
> + ret = xmlXPathWrapString(str);
> + #ifdef PyUnicode_Check
> +-} else if PyUnicode_Check (obj) {
> ++} else if (PyUnicode_Check (obj)) {
> + #if PY_VERSION_HEX >= 0x0303
> + xmlChar *str;
> + const char *tmp;
> +@@ -650,7 +650,7 @@ libxml_xmlXPathObjectPtrConvert(PyObject *obj)
> + ret = xmlXPathWrapString(str);
> + #endif
> + #endif
> +-} else if PyList_Check (obj) {
> ++} else if (PyList_Check (obj)) {
> + int i;
> + PyObject *node;
> + xmlNodePtr cur;
textproc/libxml CVE-2021-3537
Hi,
ok to fix CVE-2021-3537 ?
Unfortunately libxml2 does not make security releases so we have
to pick the patches from their repository.
bluhm
Index: textproc/libxml/Makefile
===
RCS file: /data/mirror/openbsd/cvs/ports/textproc/libxml/Makefile,v
retrieving revision 1.186
diff -u -p -r1.186 Makefile
--- textproc/libxml/Makefile27 Apr 2021 11:16:48 - 1.186
+++ textproc/libxml/Makefile7 May 2021 17:39:34 -
@@ -4,8 +4,8 @@ COMMENT-main= XML parsing library
COMMENT-python=Python bindings for libxml
VERSION= 2.9.10
-REVISION-main= 3
-REVISION-python= 3
+REVISION-main= 4
+REVISION-python= 4
DISTNAME= libxml2-${VERSION}
PKGNAME-main= libxml-${VERSION}
PKGNAME-python=py3-libxml-${VERSION}
Index: textproc/libxml/patches/patch-parser_c
===
RCS file:
/data/mirror/openbsd/cvs/ports/textproc/libxml/patches/patch-parser_c,v
retrieving revision 1.20
diff -u -p -r1.20 patch-parser_c
--- textproc/libxml/patches/patch-parser_c 1 Feb 2020 20:35:32 -
1.20
+++ textproc/libxml/patches/patch-parser_c 7 May 2021 17:31:33 -
@@ -3,6 +3,10 @@ $OpenBSD: patch-parser_c,v 1.20 2020/02/
https://gitlab.gnome.org/GNOME/libxml2/commit/0e1a49c89076
CVE-2020-7595
+https://bugzilla.redhat.com/show_bug.cgi?id=1956522
+https://gitlab.gnome.org/GNOME/libxml2/commit/babe75030c7f64a37826bb3342317134568bef61
+CVE-2021-3537
+
Index: parser.c
--- parser.c.orig
+++ parser.c
@@ -16,3 +20,24 @@ Index: parser.c
if (c == 0) break;
if ((c == '&') && (str[1] == '#')) {
+@@ -6194,6 +6195,8 @@ xmlParseElementChildrenContentDeclPriv(xmlParserCtxtPt
+ SKIP_BLANKS;
+ cur = ret = xmlParseElementChildrenContentDeclPriv(ctxt, inputid,
+depth + 1);
++if (cur == NULL)
++return(NULL);
+ SKIP_BLANKS;
+ GROW;
+ } else {
+@@ -6327,6 +6330,11 @@ xmlParseElementChildrenContentDeclPriv(xmlParserCtxtPt
+ SKIP_BLANKS;
+ last = xmlParseElementChildrenContentDeclPriv(ctxt, inputid,
+ depth + 1);
++if (last == NULL) {
++ if (ret != NULL)
++ xmlFreeDocElementContent(ctxt->myDoc, ret);
++ return(NULL);
++}
+ SKIP_BLANKS;
+ } else {
+ elem = xmlParseName(ctxt);
