CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/10/02 23:56:33 Modified files: devel/jenkins/devel: Makefile distinfo Log message: Update jenkins to 2.259
Re: profanity segfaults and dumps core in recent snapshots
On Fri Sep 25, 2020 at 10:07:24AM +0100, Raf Czlonka wrote: > Hi all, > > As soon as I authenticate against Google's XMPP server - talk.google.com > - profanity segfaults and dumps core: > > $ egdb profanity profanity.core > [...] > Core was generated by `profanity'. > Program terminated with signal SIGSEGV, Segmentation fault. > #0 0x0e6f67fba14f in xmpp_conn_tlscert_fingerprint () from > /usr/local/lib/libmesode.so.0.0 > (gdb) bt > #0 0x0e6f67fba14f in xmpp_conn_tlscert_fingerprint () from > /usr/local/lib/libmesode.so.0.0 > #1 0x0e6cccde9466 in _xmppcert_to_profcert () > #2 0x0e6cccde907e in ?? () > #3 0x0e6f67fc6959 in verify_callback () from > /usr/local/lib/libmesode.so.0.0 > #4 0x0e6f58058313 in check_id_error (ctx=0x7f7f6fd0, > errcode=) at > /usr/src/lib/libcrypto/x509/x509_vfy.c:183 > #5 check_id (ctx=0x7f7f6fd0) at > /usr/src/lib/libcrypto/x509/x509_vfy.c:213 > #6 0x0e6f5801ec31 in x509_verify_cert_hostname (ctx=0xe6f1f627d80, > cert=0xe6fb3bc6d00, name=0x0) at /usr/src/lib/libcrypto/x509/x509_verify.c:462 > #7 x509_verify (ctx=0xe6f1f627d80, leaf=0xe6fb3bc6d00, name=0x0) at > /usr/src/lib/libcrypto/x509/x509_verify.c:870 > #8 0x0e6f58058de1 in X509_verify_cert (ctx=0x7f7f6fd0) at > /usr/src/lib/libcrypto/x509/x509_vfy.c:682 > #9 0x0e6f355991ed in ssl_verify_cert_chain (s=0xe6f4ca9c300, > sk=0xe6ee1db3840) at /usr/src/lib/libssl/ssl_cert.c:447 > #10 0x0e6f355b79a5 in tls13_server_certificate_recv > (ctx=0xe6f4ca9c400, cbs=) at > /usr/src/lib/libssl/tls13_client.c:613 > #11 0x0e6f355b777c in tls13_server_certificate_request_recv > (ctx=0xe6f4ca9c400, cbs=0x7f7f7218) at > /usr/src/lib/libssl/tls13_client.c:534 > #12 0x0e6f355c6511 in tls13_handshake_recv_action > (ctx=0xe6f4ca9c400, action=) at > /usr/src/lib/libssl/tls13_handshake.c:500 > #13 tls13_handshake_perform (ctx=0xe6f4ca9c400) at > /usr/src/lib/libssl/tls13_handshake.c:375 > #14 0x0e6f355c57d7 in tls13_legacy_connect (ssl=0xe6f4ca9c300) at > /usr/src/lib/libssl/tls13_legacy.c:442 > #15 0x0e6f67fc6aa5 in tls_start () from > /usr/local/lib/libmesode.so.0.0 > #16 0x0e6f67fb9542 in conn_tls_start () from > /usr/local/lib/libmesode.so.0.0 > #17 0x0e6f67fb7274 in _handle_proceedtls_default () from > /usr/local/lib/libmesode.so.0.0 > #18 0x0e6f67fbbb01 in handler_fire_stanza () from > /usr/local/lib/libmesode.so.0.0 > #19 0x0e6f67fb8835 in _handle_stream_stanza () from > /usr/local/lib/libmesode.so.0.0 > #20 0x0e6f67fc76f5 in _end_element () from > /usr/local/lib/libmesode.so.0.0 > #21 0x0e6f48109821 in doContent (parser=0xe6ee1dbf800, > startTagLevel=, enc=, s=, > end=0xe6f1a4511ad '\337' , .. > haveMore=1 '\001') at /usr/src/lib/libexpat/lib/xmlparse.c:2600 > #22 0x0e6f48106f07 in contentProcessor (parser=0xe6ee1dbf800, > start=0x7f7f60f0 "ERROR: error number 62", end=0x7 memory at address 0x7>, endPtr=0x0) at /usr/src/lib/libexpat/ > #23 0x0e6f48102191 in XML_ParseBuffer (parser=0xe6ee1dbf800, > len=50, isFinal=0) at /usr/src/lib/libexpat/lib/xmlparse.c:1704 > #24 0x0e6f48101ca3 in XML_Parse (parser=0xe6ee1dbf800, > s=0x7f7f7620 " xmlns=\"urn:ietf:params:xml:ns:xmpp-tls\"/>xml:ns:xmpp-tls\"> > xmlns=\"urn:ietf:params:xml:ns:xmpp-sasl\">X-OAUTH2 len=50, isFinal=0) at /usr/src/lib/libexpat/lib/xmlparse.c:1668 > #25 0x0e6f67fbb67e in xmpp_run_once () from > /usr/local/lib/libmesode.so.0.0 > #26 0x0e6cccde8ada in connection_check_events () > #27 0x0e6cccde1e3b in prof_run () > #28 0x0e6ccce5d3de in main () > > This started happening a week or so ago. > > Around the same time - most likely the same snapshot - lastpass-cli > stopped working during authentication step, with an "SSL connect > error" message. > > Bjorn (bket@) found that lastpass-cli behaviour was related to a > change in lib/libcrypto/x509/x509_vpm.c (r1.22). This has been > subsequently fixed[0] by jsing@ and lastpass-cli works again. > > This may or may not be related but, given X.509 and TLS appearing > all over the place in the backtrace, I thought I'd mention it. > > FWIW, profanity does *not* segfault when I authenticate to an XMPP > server at work. > > [0] https://marc.info/?l=openbsd-cvs=160088523031157=2 > > Please CC me in any replies as I am not subscribed to this mailing list. > > Cheers, > > Raf > Could you test your use-case with the following libmesode update, please? Upstream committed some "LibreSSL support" changes. ? libmesode-0.10.0-libmesode.so.0.0 Index: Makefile === RCS file: /cvs/ports/net/libmesode/Makefile,v retrieving revision 1.4 diff -u -p -u -p -r1.4 Makefile ---
Re: Remove textproc/glimpse?
Hi Klemens,
Klemens Nanni wrote on Sat, Oct 03, 2020 at 02:21:42AM +0200:
> On Sun, Sep 20, 2020 at 02:48:26PM +0200, Ingo Schwarze wrote:
>> Judging from patch-Makefile, it ought to be trivial to remove the
>> dependency on glimpse.
> True, so let's do that and keep the port as you outlined potential use
> for it.
> Feedback? OK?
OK schwarze@, this is already a clear improvement.
After this, more work should be done:
* Remove the hidden dependency on textproc/groff and use mandoc(1)
instead. Fixing patch-Makefile is probably sufficient to achieve
that.
So far, i did not investigate how the following can be achieved,
but they are clearly needed and i'd be surprised if they were hard:
* Remove the requirement to set MANPATH.
Use the default instead.
Or even better, use /etc/man.conf if feasible.
* Remove the warning that the "whatis" file is missing
* Remove warning about stray cats
* And probably more.
Also, there *are* formatting problem with the output the program
produces, for example with respect to line breaks.
So there is still a lot of work to do, but even without all that,
the port is already partially useable.
Yours,
Ingo
> Index: Makefile
> ===
> RCS file: /cvs/ports/misc/tkman/Makefile,v
> retrieving revision 1.26
> diff -u -p -r1.26 Makefile
> --- Makefile 12 Jul 2019 20:47:54 - 1.26
> +++ Makefile 3 Oct 2020 00:14:57 -
> @@ -3,7 +3,7 @@
> COMMENT =Tcl/Tk-based manual browser
>
> DISTNAME = tkman-2.2
> -REVISION = 0
> +REVISION = 1
> CATEGORIES = misc
> HOMEPAGE = http://www.sourceforge.net/projects/tkman
> MAINTAINER = Stuart Cassoff
> @@ -15,8 +15,7 @@ MASTER_SITES = ${MASTER_SITE_SOURCEFORGE
> MODULES =x11/tk
>
> RUN_DEPENDS =${MODTK_RUN_DEPENDS} \
> - textproc/rman \
> - textproc/glimpse
> + textproc/rman
>
> NO_TEST =Yes
>
> Index: patches/patch-Makefile
> ===
> RCS file: /cvs/ports/misc/tkman/patches/patch-Makefile,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-Makefile
> --- patches/patch-Makefile5 Jan 2011 17:34:17 - 1.4
> +++ patches/patch-Makefile3 Oct 2020 00:19:14 -
> @@ -1,6 +1,7 @@
> $OpenBSD: patch-Makefile,v 1.4 2011/01/05 17:34:17 stu Exp $
> Makefile.origFri Dec 10 19:26:34 2010
> -+++ Makefile Fri Dec 10 19:35:54 2010
> +Index: Makefile
> +--- Makefile.orig
> Makefile
> @@ -25,7 +25,7 @@ mintk = 8.4
>
> ### you need to localize the paths on these lines
> @@ -57,25 +58,16 @@ $OpenBSD: patch-Makefile,v 1.4 2011/01/0
> # printing string for preformatted pages without [tn]roff source
> #catprint = lpr
> #catprint = "lpr -h"
> -@@ -201,14 +201,15 @@ shortnames = 0
> - # the right-topmost menu's Rebuild Database/Glimpse Index menu choice.
> -
> +@@ -203,7 +203,7 @@ shortnames = 0
> # BY DEFAULT OFF
> --glimpse = ""
> -+#glimpse = ""
> + glimpse = ""
> # Glimpse on, with Boolean scope set to entire file
> -glimpse = "glimpse -W"
> +#glimpse = "glimpse -W"
> # give the full path, if you'd like
> #glimpse = /usr/sww/bin/glimpse
> # variations (refer to the Glimpse manual page)
> - # no characters treated as meta characters:
> - #glimpse = "glimpse -Wk"
> -+glimpse = "glimpse -z"
> - # compressed manual pages are handled automatically; don't add -z to above
> -
> - # glimpseindex indexes the manual pages, for each component of one's
> MANPATH,
> -@@ -460,7 +461,7 @@ install: tkman retkman
> +@@ -460,7 +460,7 @@ install: tkman retkman
> chmod +rx $(BINDIR)/tkman
> $(CP) retkman $(BINDIR)
> chmod +rx $(BINDIR)/retkman
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/10/02 23:38:02 Modified files: fonts/font-awesome: Makefile distinfo Log message: Update font-awesome to 5.15.0
Re: mysql_waitpid: broken symbolic link to '/usr/local/bin/mariadb-waitpid'
On Fri, Oct 02, 2020 at 10:54:05PM +, Mikolaj Kucharski wrote:
> On Thu, Oct 01, 2020 at 09:09:16PM -0400, Brad Smith wrote:
> >
> > It should go the other way around. Try something like this.
> >
>
> I see thanks. Your diff also has the issue which I hit with my diff:
>
>Can't install mariadb-server-10.5.5p0v1 because of conflicts
> (mariadb-client-10.5.5p0v1)
>
> I think it needs to be like sthen@ mentioned:
>
> @conflict mariadb-server-<10.5.5p0v1
>
> It's interesting that three people didn't notice that problem, when
> preparing the diff or when reviwing it.
>
> I'm really curious about rationale of this unexpected behaviour of
> conflict marker. I find it confusing.
>
> I'm testing Brad's diff with conflict marker fix. Will reply when I'm
> done with final diff.
>
Below diff works as intended. This is Brad's diff with conflict fix.
Index: Makefile
===
RCS file: /cvs/ports/databases/mariadb/Makefile,v
retrieving revision 1.96
diff -u -p -u -r1.96 Makefile
--- Makefile12 Aug 2020 14:43:54 - 1.96
+++ Makefile3 Oct 2020 00:48:12 -
@@ -9,8 +9,9 @@ DISTNAME= mariadb-${VERSION}
PKGNAME-main= mariadb-client-${VERSION}
PKGNAME-server=mariadb-server-${VERSION}
PKGNAME-tests= mariadb-tests-${VERSION}
+REVISION-main= 0
+REVISION-server= 0
EPOCH= 1
-
CATEGORIES=databases
MASTER_SITES= https://downloads.mariadb.com/MariaDB/${DISTNAME}/source/ \
https://ftp.osuosl.org/pub/mariadb/${DISTNAME}/source/
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/databases/mariadb/pkg/PLIST-main,v
retrieving revision 1.21
diff -u -p -u -r1.21 PLIST-main
--- pkg/PLIST-main 26 Jun 2020 08:46:42 - 1.21
+++ pkg/PLIST-main 3 Oct 2020 00:48:12 -
@@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST-main,v 1.21 2020/06/26 08:46:42 sthen Exp $
-@conflict mariadb-server-<=10.4.12v1
+@conflict mariadb-server-<10.5.5p0v1
@conflict mytop-*
@pkgpath databases/mytop
@bin bin/mariadb
@@ -18,6 +18,7 @@ bin/mariadb-hotcopy
bin/mariadb-setpermission
@bin bin/mariadb-show
@bin bin/mariadb-slap
+@bin bin/mariadb-waitpid
@bin bin/mariadb_config
bin/msql2mysql
bin/mysql
@@ -88,6 +89,7 @@ lib/pkgconfig/mariadb.pc
@man man/man1/mariadb-setpermission.1
@man man/man1/mariadb-show.1
@man man/man1/mariadb-slap.1
+@man man/man1/mariadb-waitpid.1
@man man/man1/mariadb.1
@man man/man1/mariadb_config.1
@man man/man1/mbstream.1
Index: pkg/PLIST-server
===
RCS file: /cvs/ports/databases/mariadb/pkg/PLIST-server,v
retrieving revision 1.35
diff -u -p -u -r1.35 PLIST-server
--- pkg/PLIST-server12 Aug 2020 14:43:54 - 1.35
+++ pkg/PLIST-server3 Oct 2020 00:48:12 -
@@ -18,7 +18,6 @@ bin/mariadb-install-db
bin/mariadb-secure-installation
@bin bin/mariadb-tzinfo-to-sql
@bin bin/mariadb-upgrade
-@bin bin/mariadb-waitpid
bin/mariadbd-multi
bin/mariadbd-safe
@bin bin/mariadbd-safe-helper
@@ -522,7 +521,6 @@ libexec/mysqld
@man man/man1/mariadb-secure-installation.1
@man man/man1/mariadb-tzinfo-to-sql.1
@man man/man1/mariadb-upgrade.1
-@man man/man1/mariadb-waitpid.1
@man man/man1/mariadbd-multi.1
@man man/man1/mariadbd-safe-helper.1
@man man/man1/mariadbd-safe.1
--
Regards,
Mikolaj
Re: Remove textproc/glimpse?
On Sun, Sep 20, 2020 at 02:48:26PM +0200, Ingo Schwarze wrote:
> Judging from patch-Makefile, it ought to be trivial to remove the
> dependency on glimpse.
True, so let's do that and keep the port as you outlined potential use
for it.
Feedback? OK?
Index: Makefile
===
RCS file: /cvs/ports/misc/tkman/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- Makefile12 Jul 2019 20:47:54 - 1.26
+++ Makefile3 Oct 2020 00:14:57 -
@@ -3,7 +3,7 @@
COMMENT = Tcl/Tk-based manual browser
DISTNAME = tkman-2.2
-REVISION = 0
+REVISION = 1
CATEGORIES = misc
HOMEPAGE = http://www.sourceforge.net/projects/tkman
MAINTAINER = Stuart Cassoff
@@ -15,8 +15,7 @@ MASTER_SITES =${MASTER_SITE_SOURCEFORGE
MODULES = x11/tk
RUN_DEPENDS = ${MODTK_RUN_DEPENDS} \
- textproc/rman \
- textproc/glimpse
+ textproc/rman
NO_TEST = Yes
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/misc/tkman/patches/patch-Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 patch-Makefile
--- patches/patch-Makefile 5 Jan 2011 17:34:17 - 1.4
+++ patches/patch-Makefile 3 Oct 2020 00:19:14 -
@@ -1,6 +1,7 @@
$OpenBSD: patch-Makefile,v 1.4 2011/01/05 17:34:17 stu Exp $
Makefile.orig Fri Dec 10 19:26:34 2010
-+++ Makefile Fri Dec 10 19:35:54 2010
+Index: Makefile
+--- Makefile.orig
Makefile
@@ -25,7 +25,7 @@ mintk = 8.4
### you need to localize the paths on these lines
@@ -57,25 +58,16 @@ $OpenBSD: patch-Makefile,v 1.4 2011/01/0
# printing string for preformatted pages without [tn]roff source
#catprint = lpr
#catprint = "lpr -h"
-@@ -201,14 +201,15 @@ shortnames = 0
- # the right-topmost menu's Rebuild Database/Glimpse Index menu choice.
-
+@@ -203,7 +203,7 @@ shortnames = 0
# BY DEFAULT OFF
--glimpse = ""
-+#glimpse = ""
+ glimpse = ""
# Glimpse on, with Boolean scope set to entire file
-glimpse = "glimpse -W"
+#glimpse = "glimpse -W"
# give the full path, if you'd like
#glimpse = /usr/sww/bin/glimpse
# variations (refer to the Glimpse manual page)
- # no characters treated as meta characters:
- #glimpse = "glimpse -Wk"
-+glimpse = "glimpse -z"
- # compressed manual pages are handled automatically; don't add -z to above
-
- # glimpseindex indexes the manual pages, for each component of one's MANPATH,
-@@ -460,7 +461,7 @@ install: tkman retkman
+@@ -460,7 +460,7 @@ install: tkman retkman
chmod +rx $(BINDIR)/tkman
$(CP) retkman $(BINDIR)
chmod +rx $(BINDIR)/retkman
Re: NEW: jpeginfo-1.6.1
Kind reminder. On Wed, Aug 19, 2020 at 09:08:06AM +, Mikolaj Kucharski wrote: > Hi, > > Simple new port attached. I wanted something to check JPEG files > integrity (-c option to the tool). > > $ jpeginfo -c DSC00470.JPG > DSC00470.JPG 6000 x 4000 24bit Exif N 10715136 [OK] > > Comment: > prints information and tests integrity of JPEG files > > Description: > Jpeginfo is an utility to generate informative listings from JPEG files, > and to check JPEG files for errors. Program also supports automagic > deletion of broken JPEGs. > > WWW: https://www.kokkonen.net/tjko/projects.html > > Comments? > -- Regards, Mikolaj jpeginfo-1.6.1-port-v1.tgz Description: application/tar-gz
Re: [MAINTAINER UPDATE] net/xl2tpd (1.3.14 -> 1.3.15)
Here is the xl2tpd-1.3.15 Changelog: https://github.com/xelerance/xl2tpd/blob/master/CHANGES v1.3.15 (October 13, 2019) * Fix spacing of CONTRIBUTION.md [Samir Hussain] * Add CONTRIBUTION.md [Samir Hussain] * Specify missing log arguments [Patch by github user: 川島和津実] * Use matrix for .travis.yaml to test for multiple Linux distro [Samir Hussain] * Fixing .travis.yaml spacing warning [Samir Hussain] * Sockopt bug fix for multiple IP's [JDTX] * Add Clang as compiler test for travis [Samir Hussain] * Add info on building and installing xl2tpd [Samir Hussain] On Sat, Oct 3, 2020 at 1:35 AM Alex Naumov wrote: > This patch updates xl2tpd to version 1.3.15. > > What was done: > - make makesum > - make test > - /usr/ports/infrastructure/bin/portcheck > - make port-lib-depends-check > - make update-plist > > 'portcheck' reports some problems for 1.3.14 version: > * trailing whitespace in pkg/README > * 2 line(s) longer than 80 chars in pkg/README > It's fixed now. > > Package was built/tested/installed on x86_64 and aarch64 (SoftIron 1000) > machines. > > Like before > $ echo c l2tp > /var/run/xl2tpd/l2tp-control > lets communicate with peer npppd(8) via l2tp (7001/udp). > > There is no maintainer for xl2tpd. > I can take responsibilities for this port. > > Cheers, > Alex >
[MAINTAINER UPDATE] net/xl2tpd (1.3.14 -> 1.3.15)
This patch updates xl2tpd to version 1.3.15. What was done: - make makesum - make test - /usr/ports/infrastructure/bin/portcheck - make port-lib-depends-check - make update-plist 'portcheck' reports some problems for 1.3.14 version: * trailing whitespace in pkg/README * 2 line(s) longer than 80 chars in pkg/README It's fixed now. Package was built/tested/installed on x86_64 and aarch64 (SoftIron 1000) machines. Like before $ echo c l2tp > /var/run/xl2tpd/l2tp-control lets communicate with peer npppd(8) via l2tp (7001/udp). There is no maintainer for xl2tpd. I can take responsibilities for this port. Cheers, Alex Index: Makefile === RCS file: /cvs/ports/net/xl2tpd/Makefile,v retrieving revision 1.20 diff -u -p -u -p -r1.20 Makefile --- Makefile 12 Jul 2019 20:48:52 - 1.20 +++ Makefile 1 Oct 2020 20:03:33 - @@ -4,11 +4,13 @@ COMMENT= l2tp client/server GH_ACCOUNT= xelerance GH_PROJECT= xl2tpd -GH_TAGNAME= v1.3.14 +GH_TAGNAME= v1.3.15 CATEGORIES= net -HOMEPAGE= http://www.xelerance.com/services/software/xl2tpd/ +HOMEPAGE= https://github.com/xelerance/xl2tpd + +MAINTAINER= Alexander Naumov # GPLv2 PERMIT_PACKAGE= Yes Index: distinfo === RCS file: /cvs/ports/net/xl2tpd/distinfo,v retrieving revision 1.8 diff -u -p -u -p -r1.8 distinfo --- distinfo 18 Apr 2019 17:30:45 - 1.8 +++ distinfo 1 Oct 2020 20:03:33 - @@ -1,2 +1,2 @@ -SHA256 (xl2tpd-1.3.14.tar.gz) = /1oIBv7MWMe5y8YlEXpFIcBUZSKl9ZUf+27r2rmYYQ8= -SIZE (xl2tpd-1.3.14.tar.gz) = 523992 +SHA256 (xl2tpd-1.3.15.tar.gz) = DRSb+dL32DiAbmo2/XpnbQO/JG0reGnhbJRTMOE7ki4= +SIZE (xl2tpd-1.3.15.tar.gz) = 524960 Index: pkg/README === RCS file: /cvs/ports/net/xl2tpd/pkg/README,v retrieving revision 1.8 diff -u -p -u -p -r1.8 README --- pkg/README 4 Sep 2018 12:46:19 - 1.8 +++ pkg/README 1 Oct 2020 20:03:33 - @@ -26,7 +26,7 @@ Control mechanisms == When xl2tpd is started, it does not automatically connect. Instead it is controlled by writing simple commands to a fifo (you may be familiar with -this style from isakmpd), e.g.: +this style from isakmpd), e.g.: echo '[command] [config_name]' > /var/run/xl2tpd/l2tp-control @@ -100,8 +100,10 @@ And confirm that the tunnel does actuall # ipsecctl -sa FLOWS: -flow esp in proto udp from $server port l2tp to $me peer $server srcid $myhostname dstid $server/32 type use -flow esp out proto udp from $me to $server port l2tp peer $server srcid $myhostname dstid $server/32 type require +flow esp in proto udp from $server port l2tp to $me peer $server \ +srcid $myhostname dstid $server/32 type use +flow esp out proto udp from $me to $server port l2tp peer $server \ +srcid $myhostname dstid $server/32 type require SAD: esp transport from $me to $server spi 0x1037c0f2 auth hmac-sha1 enc aes
Ruby 2.5 Removal
Per our standard Ruby support policy, I am planning to remove Ruby 2.5
from the ports tree, as it will be completely unsupported before the
release of OpenBSD 6.9. Nothing currently depends on it, so
this should cause no problems.
Here's the diff for ruby.port.mk. I also have diffs prepared for
ruby-module.5 and quirks.
Thanks,
Jeremy
Index: ruby.port.mk
===
RCS file: /cvs/ports/lang/ruby/ruby.port.mk,v
retrieving revision 1.100
diff -u -p -r1.100 ruby.port.mk
--- ruby.port.mk20 Mar 2020 16:44:24 - 1.100
+++ ruby.port.mk2 Oct 2020 23:09:55 -
@@ -24,7 +24,7 @@ MODRUBY_HANDLE_FLAVORS ?= No
# If ruby.pork.mk should handle FLAVORs, define a separate FLAVOR
# for each ruby interpreter
.if !defined(FLAVORS)
-FLAVORS= ruby25 ruby26 ruby27
+FLAVORS= ruby26 ruby27
. if !${CONFIGURE_STYLE:L:Mext}
FLAVORS+= jruby
. endif
@@ -52,11 +52,10 @@ FLAVOR =ruby26
# Check for conflicting FLAVORs and set MODRUBY_REV appropriately based
# on the FLAVOR.
-.for i in ruby25 ruby26 ruby27 jruby
+.for i in ruby26 ruby27 jruby
. if ${FLAVOR:M$i}
MODRUBY_REV = ${i:C/ruby([0-9])/\1./}
-.if ${FLAVOR:N$i:Mruby25} || \
-${FLAVOR:N$i:Mruby26} || \
+.if ${FLAVOR:N$i:Mruby26} || \
${FLAVOR:N$i:Mruby27} || \
${FLAVOR:N$i:Mjruby}
ERRORS += "Fatal: Conflicting flavors used: ${FLAVOR}"
Re: UPDATE: youtube-dl 2020.09.20
On Wed, 30 Sep 2020 20:01:52 +
Mikolaj Kucharski :
> Hi,
>
> I actually didn't have any issues with youtube-dl. I think this can wait
> after unlock.
>
> ChangeLog at:
>
> https://github.com/ytdl-org/youtube-dl/compare/2020.07.28...2020.09.20#diff-02f0b547c2779d25cff89672135f20e3
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/www/youtube-dl/Makefile,v
> retrieving revision 1.211
> diff -u -p -u -r1.211 Makefile
> --- Makefile 28 Jul 2020 15:14:33 - 1.211
> +++ Makefile 30 Sep 2020 19:59:12 -
> @@ -2,7 +2,7 @@
>
> COMMENT =CLI program to download videos from YouTube and other sites
>
> -VERSION =2020.07.28
> +VERSION =2020.09.20
> MODPY_EGG_VERSION = ${VERSION:S/.0/./g}
>
> DISTNAME = youtube-dl-${VERSION}
> Index: distinfo
> ===
> RCS file: /cvs/ports/www/youtube-dl/distinfo,v
> retrieving revision 1.192
> diff -u -p -u -r1.192 distinfo
> --- distinfo 28 Jul 2020 15:14:33 - 1.192
> +++ distinfo 30 Sep 2020 19:59:12 -
> @@ -1,2 +1,2 @@
> -SHA256 (youtube-dl-2020.07.28.tar.gz) =
> H7PjTYBABGTlWu62ElbDZGgRatnv6CVDtDend6Lvx8U=
> -SIZE (youtube-dl-2020.07.28.tar.gz) = 3179686
> +SHA256 (youtube-dl-2020.09.20.tar.gz) =
> rBp5nPloNFvykIntLlxdT0oyAxYl2Ag2nmG2Ni0cfN4=
> +SIZE (youtube-dl-2020.09.20.tar.gz) = 3188480
>
tested, works fine on amd64
ok solene@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2020/10/02 16:58:20 Modified files: audio/ruby-vorbis_comment: Makefile distinfo Log message: Update to vorbis_comment 1.0.3
Re: mysql_waitpid: broken symbolic link to '/usr/local/bin/mariadb-waitpid'
On Thu, Oct 01, 2020 at 09:09:16PM -0400, Brad Smith wrote:
>
> It should go the other way around. Try something like this.
>
I see thanks. Your diff also has the issue which I hit with my diff:
Can't install mariadb-server-10.5.5p0v1 because of conflicts
(mariadb-client-10.5.5p0v1)
I think it needs to be like sthen@ mentioned:
@conflict mariadb-server-<10.5.5p0v1
It's interesting that three people didn't notice that problem, when
preparing the diff or when reviwing it.
I'm really curious about rationale of this unexpected behaviour of
conflict marker. I find it confusing.
I'm testing Brad's diff with conflict marker fix. Will reply when I'm
done with final diff.
> Index: Makefile
> ===
> RCS file: /home/cvs/ports/databases/mariadb/Makefile,v
> retrieving revision 1.96
> diff -u -p -u -p -r1.96 Makefile
> --- Makefile 12 Aug 2020 14:43:54 - 1.96
> +++ Makefile 30 Sep 2020 20:21:27 -
> @@ -9,8 +9,9 @@ DISTNAME= mariadb-${VERSION}
> PKGNAME-main=mariadb-client-${VERSION}
> PKGNAME-server= mariadb-server-${VERSION}
> PKGNAME-tests= mariadb-tests-${VERSION}
> +REVISION-main= 0
> +REVISION-server= 0
> EPOCH= 1
> -
> CATEGORIES= databases
> MASTER_SITES=
> https://downloads.mariadb.com/MariaDB/${DISTNAME}/source/ \
> https://ftp.osuosl.org/pub/mariadb/${DISTNAME}/source/
> Index: pkg/PLIST-main
> ===
> RCS file: /home/cvs/ports/databases/mariadb/pkg/PLIST-main,v
> retrieving revision 1.21
> diff -u -p -u -p -r1.21 PLIST-main
> --- pkg/PLIST-main26 Jun 2020 08:46:42 - 1.21
> +++ pkg/PLIST-main30 Sep 2020 21:02:22 -
> @@ -1,5 +1,6 @@
> @comment $OpenBSD: PLIST-main,v 1.21 2020/06/26 08:46:42 sthen Exp $
> @conflict mariadb-server-<=10.4.12v1
> +@conflict mariadb-server-<=10.5.5v1
> @conflict mytop-*
> @pkgpath databases/mytop
> @bin bin/mariadb
> @@ -18,6 +19,7 @@ bin/mariadb-hotcopy
> bin/mariadb-setpermission
> @bin bin/mariadb-show
> @bin bin/mariadb-slap
> +@bin bin/mariadb-waitpid
> @bin bin/mariadb_config
> bin/msql2mysql
> bin/mysql
> @@ -88,6 +90,7 @@ lib/pkgconfig/mariadb.pc
> @man man/man1/mariadb-setpermission.1
> @man man/man1/mariadb-show.1
> @man man/man1/mariadb-slap.1
> +@man man/man1/mariadb-waitpid.1
> @man man/man1/mariadb.1
> @man man/man1/mariadb_config.1
> @man man/man1/mbstream.1
> Index: pkg/PLIST-server
> ===
> RCS file: /home/cvs/ports/databases/mariadb/pkg/PLIST-server,v
> retrieving revision 1.35
> diff -u -p -u -p -r1.35 PLIST-server
> --- pkg/PLIST-server 12 Aug 2020 14:43:54 - 1.35
> +++ pkg/PLIST-server 30 Sep 2020 20:19:23 -
> @@ -18,7 +18,6 @@ bin/mariadb-install-db
> bin/mariadb-secure-installation
> @bin bin/mariadb-tzinfo-to-sql
> @bin bin/mariadb-upgrade
> -@bin bin/mariadb-waitpid
> bin/mariadbd-multi
> bin/mariadbd-safe
> @bin bin/mariadbd-safe-helper
> @@ -522,7 +521,6 @@ libexec/mysqld
> @man man/man1/mariadb-secure-installation.1
> @man man/man1/mariadb-tzinfo-to-sql.1
> @man man/man1/mariadb-upgrade.1
> -@man man/man1/mariadb-waitpid.1
> @man man/man1/mariadbd-multi.1
> @man man/man1/mariadbd-safe-helper.1
> @man man/man1/mariadbd-safe.1
--
Regards,
Mikolaj
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2020/10/02 16:05:15 Modified files: graphics/gimp : Makefile Log message: +resynthesizer
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2020/10/02 16:04:17 Log message: gimp-resynthesizer-plugin is a popular gimp plugin that can recreate missing content and complete patterns so that they are tileable. it is actually completely different from liquid-rescale and has lots of other applications, such as quickly removing selections from images. okay solene@ Status: Vendor Tag: espie Release Tags: ports N ports/graphics/gimp/resynthesizer/Makefile N ports/graphics/gimp/resynthesizer/distinfo N ports/graphics/gimp/resynthesizer/pkg/PLIST N ports/graphics/gimp/resynthesizer/pkg/DESCR No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/10/02 15:40:35 Modified files: geo/qgis : Makefile Log message: bump, py-qscintilla pkgpath changed
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/10/02 15:40:25 Modified files: editors: Makefile devel/quirks : Makefile devel/quirks/files: Quirks.pm editors/py-qscintilla: Makefile Added files: editors/py-qscintilla/pkg: DESCR PLIST Removed files: editors/py-qscintilla/pkg: DESCR-common DESCR-main PLIST-common PLIST-main Log message: move py-qscintilla to py3-only, from kn@ merge old py-qscintilla-common into py3-scintilla, from me, ok kn@
Re: removal of devel/py-gobject3 (!python3)
On Fri, Oct 02, 2020 at 09:33:04PM +0100, Stuart Henderson wrote: > On 2020/10/02 22:08, Klemens Nanni wrote: > > On Fri, Oct 02, 2020 at 08:44:51PM +0100, Stuart Henderson wrote: > > > On 2020/10/02 21:25, Klemens Nanni wrote: > > > > Updated diff after quirks churn. > > > > > > -common should get merged back in too, I think this is the way: > > As noted in my other (older) mail the -common subpackage also hardcodes > > "py-" instead of "py3-" as prefix, but I wanted to fix this in a > > separate diff. > > > > Yours looks better of course, are you fine with doing these as separate > > commits? If so, OK kn for yours after I removed the Python 2 flavour. > > I guess, it is a pain with cvs though. Then just go ahead with your diff and my OK, you already have it :)
Re: removal of devel/py-gobject3 (!python3)
On 2020/10/02 22:08, Klemens Nanni wrote:
> On Fri, Oct 02, 2020 at 08:44:51PM +0100, Stuart Henderson wrote:
> > On 2020/10/02 21:25, Klemens Nanni wrote:
> > > Updated diff after quirks churn.
> >
> > -common should get merged back in too, I think this is the way:
> As noted in my other (older) mail the -common subpackage also hardcodes
> "py-" instead of "py3-" as prefix, but I wanted to fix this in a
> separate diff.
>
> Yours looks better of course, are you fine with doing these as separate
> commits? If so, OK kn for yours after I removed the Python 2 flavour.
I guess, it is a pain with cvs though.
> > Index: geo/qgis/Makefile
> > ===
> > RCS file: /cvs/ports/geo/qgis/Makefile,v
> > retrieving revision 1.134
> > diff -u -p -r1.134 Makefile
> > --- geo/qgis/Makefile 14 Sep 2020 07:25:27 - 1.134
> > +++ geo/qgis/Makefile 2 Oct 2020 19:44:45 -
> > @@ -8,6 +8,7 @@ COMMENT = desktop geographical informati
> > DPB_PROPERTIES = parallel
> >
> > DISTNAME = qgis-3.14.16
> > +REVISION = 0
> > EXTRACT_SUFX = .tar.bz2
> > CATEGORIES = geo x11
> > DEBUG_PACKAGES =${BUILD_PACKAGES}
>
> Is this bump required?
It is, the pkgpath of the dependency changes
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: schwa...@cvs.openbsd.org2020/10/02 14:18:32 Modified files: textproc/igor : Makefile textproc/igor/patches: patch-igor_1 Log message: 1. update a .Lk, patch from Alan ; upstream agrees 2. fix a wrong .Xr; i shall also report this upstream OK sthen@ tb@ kn@
Re: removal of devel/py-gobject3 (!python3)
On Fri, Oct 02, 2020 at 08:44:51PM +0100, Stuart Henderson wrote:
> On 2020/10/02 21:25, Klemens Nanni wrote:
> > Updated diff after quirks churn.
>
> -common should get merged back in too, I think this is the way:
As noted in my other (older) mail the -common subpackage also hardcodes
"py-" instead of "py3-" as prefix, but I wanted to fix this in a
separate diff.
Yours looks better of course, are you fine with doing these as separate
commits? If so, OK kn for yours after I removed the Python 2 flavour.
> Index: geo/qgis/Makefile
> ===
> RCS file: /cvs/ports/geo/qgis/Makefile,v
> retrieving revision 1.134
> diff -u -p -r1.134 Makefile
> --- geo/qgis/Makefile 14 Sep 2020 07:25:27 - 1.134
> +++ geo/qgis/Makefile 2 Oct 2020 19:44:45 -
> @@ -8,6 +8,7 @@ COMMENT = desktop geographical informati
> DPB_PROPERTIES = parallel
>
> DISTNAME = qgis-3.14.16
> +REVISION = 0
> EXTRACT_SUFX = .tar.bz2
> CATEGORIES = geo x11
> DEBUG_PACKAGES =${BUILD_PACKAGES}
Is this bump required?
Re: local polishing of textproc/igor
On Fri, Oct 02, 2020 at 09:38:28PM +0200, Ingo Schwarze wrote: > we rarely patch manual pages of ports, but the port textproc/igor > that i maintain is in a somewhat awkward situation right now > so i'd like to fix it locally. That's absoloutely fine with me. > 1. I noticed a cross reference that is completely wrong > and quite likely to confuse users. > > 2. A web link given in the manual page went 404, and a replacement > is readily available but not especially easy to find. > This issue was reported by Alan . > > I talked to upstream and Warren Block does not plan to roll a new > release in the forseeable future, so waiting for that is not helping > our users. OK kn
Re: removal of devel/py-gobject3 (!python3)
On 2020/10/02 21:25, Klemens Nanni wrote:
> Updated diff after quirks churn.
-common should get merged back in too, I think this is the way:
Index: editors/Makefile
===
RCS file: /cvs/ports/editors/Makefile,v
retrieving revision 1.141
diff -u -p -r1.141 Makefile
--- editors/Makefile28 Jun 2020 21:25:18 - 1.141
+++ editors/Makefile2 Oct 2020 19:44:45 -
@@ -51,7 +51,6 @@
SUBDIR += nvi,iconv
SUBDIR += py-neovim
SUBDIR += py-neovim,python3
- SUBDIR += py-qscintilla
SUBDIR += py-qscintilla,python3
SUBDIR += qscintilla
SUBDIR += scintilla
Index: devel/quirks/Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.1047
diff -u -p -r1.1047 Makefile
--- devel/quirks/Makefile 25 Sep 2020 21:40:55 - 1.1047
+++ devel/quirks/Makefile 2 Oct 2020 19:44:45 -
@@ -5,7 +5,7 @@ CATEGORIES =devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-3.439
+PKGNAME = quirks-3.440
PKG_ARCH = *
MAINTAINER = Marc Espie
Index: devel/quirks/files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.1065
diff -u -p -r1.1065 Quirks.pm
--- devel/quirks/files/Quirks.pm25 Sep 2020 21:40:55 - 1.1065
+++ devel/quirks/files/Quirks.pm2 Oct 2020 19:44:45 -
@@ -479,6 +479,8 @@ my $stem_extensions = {
'py-urwid' => 'py3-urwid',
'py-ply' => 'py3-ply',
'py-dtfabric' => 'py3-dtfabric',
+# 6.9
+ 'py-qscintilla' => 'py3-qscintilla',
};
my $obsolete_reason = {
Index: geo/qgis/Makefile
===
RCS file: /cvs/ports/geo/qgis/Makefile,v
retrieving revision 1.134
diff -u -p -r1.134 Makefile
--- geo/qgis/Makefile 14 Sep 2020 07:25:27 - 1.134
+++ geo/qgis/Makefile 2 Oct 2020 19:44:45 -
@@ -8,6 +8,7 @@ COMMENT = desktop geographical informati
DPB_PROPERTIES = parallel
DISTNAME = qgis-3.14.16
+REVISION = 0
EXTRACT_SUFX = .tar.bz2
CATEGORIES = geo x11
DEBUG_PACKAGES =${BUILD_PACKAGES}
Index: editors/py-qscintilla/Makefile
===
RCS file: /cvs/ports/editors/py-qscintilla/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- editors/py-qscintilla/Makefile 3 Jul 2020 21:12:53 - 1.25
+++ editors/py-qscintilla/Makefile 2 Oct 2020 19:44:45 -
@@ -1,16 +1,12 @@
# $OpenBSD: Makefile,v 1.25 2020/07/03 21:12:53 sthen Exp $
-COMMENT-main = Python binding for the Scintilla source code editor
-COMMENT-common = common files for py-qscintilla
+COMMENT = Python binding for the Scintilla source code editor
VERSION = 2.11.4
-REVISION = 2
+REVISION = 3
MODPY_EGG_VERSION =${VERSION}
DISTNAME = QScintilla-${VERSION}
-
-PKGNAME-main = py-qscintilla-${VERSION}
-FULLPKGNAME-common = py-qscintilla-common-${VERSION}
-FULLPKGPATH-common = editors/py-qscintilla,-common
+PKGNAME = py-qscintilla-${VERSION}
CATEGORIES = editors x11 devel
@@ -21,12 +17,8 @@ PERMIT_PACKAGE = Yes
MASTER_SITES =
https://www.riverbankcomputing.com/static/Downloads/QScintilla/${VERSION}/
-WANTLIB-main += ${COMPILER_LIBCXX} GL m Qt5Core Qt5Gui Qt5PrintSupport
-WANTLIB-main += Qt5Widgets qscintilla2_qt5
-
-WANTLIB-common +=
-
-MULTI_PACKAGES = -main -common
+WANTLIB += ${COMPILER_LIBCXX} GL m Qt5Core Qt5Gui Qt5PrintSupport
+WANTLIB += Qt5Widgets qscintilla2_qt5
MODULES = lang/python \
x11/qt5
@@ -35,23 +27,13 @@ PYQTVER = PyQt5
SIPDIR = share/sip/PyQt5${MODPY_BIN_SUFFIX}
FLAVORS = python3
-FLAVOR ?=
-
-.if ${FLAVOR:Mpython3}
-FULLPKGNAME-main = ${PKGNAME-main:S/^py-/py3-/}
-FULLPKGPATH-main = editors/py-qscintilla,-main${MODPY_FLAVOR}
-.endif
+FLAVOR = python3
BUILD_DEPENDS =${RUN_DEPENDS}
RUN_DEPENDS = devel/py-sip${MODPY_FLAVOR} \
x11/dbus-python${MODPY_FLAVOR} \
x11/py-qt5${MODPY_FLAVOR}
-RUN_DEPENDS-main = ${RUN_DEPENDS} \
- editors/py-qscintilla,-common
-LIB_DEPENDS-main = editors/qscintilla=${VERSION}
-
-RUN_DEPENDS-common =
-LIB_DEPENDS-common =
+LIB_DEPENDS = editors/qscintilla=${VERSION}
COMPILER = base-clang ports-gcc base-gcc
Index: editors/py-qscintilla/pkg/DESCR
===
RCS file: editors/py-qscintilla/pkg/DESCR
diff -N editors/py-qscintilla/pkg/DESCR
--- /dev/null 1 Jan 1970 00:00:00 -
+++ editors/py-qscintilla/pkg/DESCR 2 Oct 2020
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2020/10/02 13:44:42 Modified files: www/youtube-dl : Makefile distinfo Log message: Update to youtube-dl-2020.09.20 Diff from Mikolaj Kucharski
local polishing of textproc/igor
Hi,
we rarely patch manual pages of ports, but the port textproc/igor
that i maintain is in a somewhat awkward situation right now
so i'd like to fix it locally.
1. I noticed a cross reference that is completely wrong
and quite likely to confuse users.
2. A web link given in the manual page went 404, and a replacement
is readily available but not especially easy to find.
This issue was reported by Alan .
I talked to upstream and Warren Block does not plan to roll a new
release in the forseeable future, so waiting for that is not helping
our users.
OK?
Ingo
Index: Makefile
===
RCS file: /cvs/ports/textproc/igor/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile12 Jul 2019 20:49:59 - 1.7
+++ Makefile2 Oct 2020 19:27:41 -
@@ -2,7 +2,7 @@
COMMENT = FreeBSD Documentation Project sanity check script
VERSION = 1.595
-REVISION = 0
+REVISION = 1
DISTNAME = igor-${VERSION}
CATEGORIES = textproc
HOMEPAGE = http://www.wonkity.com/~wblock/igor/
Index: patches/patch-igor_1
===
RCS file: /cvs/ports/textproc/igor/patches/patch-igor_1,v
retrieving revision 1.3
diff -u -p -r1.3 patch-igor_1
--- patches/patch-igor_129 Nov 2017 13:26:36 - 1.3
+++ patches/patch-igor_12 Oct 2020 19:27:41 -
@@ -1,11 +1,22 @@
$OpenBSD: patch-igor_1,v 1.3 2017/11/29 13:26:36 schwarze Exp $
-Chunks 1+3: Do not report contractions by default (local change).
-Chunks 2+4: Do not use /usr/local/etc/ (local change).
+Chunk 1: Correct wrong cross reference (also submitted upstream).
+Chunks 2 and 3(3): Do not report contractions by default (local change).
+Chunks 3(1) and 4: Do not use /usr/local/etc/ (local change).
+Chunk 3(2): Correct link to Debian wordlist (agreed with upstream).
Index: igor.1
--- igor.1.orig
+++ igor.1
+@@ -30,7 +30,7 @@ to detect a file's type and only runs the applicable t
+ Files compressed with
+ .Xr gzip 1
+ or
+-.Xr bzip 2
++.Xr bzip2 1
+ are automatically decompressed.
+ If multiple files are specified, filenames are displayed before each
+ is analyzed.
@@ -104,7 +104,7 @@ When ready for the actual commit, run
.Nm
without this option to check the date.
@@ -15,7 +26,7 @@ Index: igor.1
.It Fl z
Run all applicable non-whitespace
.Pq content
-@@ -154,7 +154,7 @@ documents.
+@@ -154,15 +154,21 @@ documents.
Additional files of misspelled words may be added with the
.Ev IGORSPELLFILES
environment variable, or placed in the
@@ -24,8 +35,10 @@ Index: igor.1
directory.
The first word on each line, including apostrophes, will be included in the
list of known misspellings to be checked.
-@@ -163,6 +163,12 @@ The Debian project has a list of words at
- .Li
http://anonscm.debian.org/gitweb/?p=lintian/lintian.git;a=blob_plain;f=vendors/debian/ftp-master-auto-reject/data/spelling/corrections;hb=HEAD
+ Blank lines and lines starting with a # character are ignored.
+ The Debian project has a list of words at
+-.Li
http://anonscm.debian.org/gitweb/?p=lintian/lintian.git;a=blob_plain;f=vendors/debian/ftp-master-auto-reject/data/spelling/corrections;hb=HEAD
++.Lk
https://salsa.debian.org/lintian/lintian/-/raw/master/data/spelling/corrections
.It Fl u
Identify contractions, which make translation more difficult.
+This test is off by default on
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/10/02 13:29:32 Modified files: net/dhcpcd : Makefile distinfo Added files: net/dhcpcd/patches: patch-src_if-bsd_c patch-src_if_c patch-src_if_h Log message: Update to 9.2.0 again with cherry-picked pppoe(4) fix Reverting to 9.1.4 fixed it for naddy but left it broken for me; this time apply the following commit "mak[ing] pppoe(4) interfaces more reliable on FreeBSD and OpenBSD", fixing dhcpcd in my setup as well. https://roy.marples.name/cgit/dhcpcd.git/commit/?id=e675d4dde0d865b6ffc7de733623a52852d284ff Feedback OK sthen
Re: removal of devel/py-gobject3 (!python3)
On Sun, Sep 20, 2020 at 07:09:43PM +0200, Klemens Nanni wrote:
> On Sun, Sep 20, 2020 at 12:09:24PM +0200, Antoine Jacoutot wrote:
> > Hi.
> >
> > Next version of devel/py-gobject3 will loose python2 support.
> > Direct dependencies involve:
> >
> > audio/exaile
> > misc/gpsd
> > x11/dbus-python
> >
> > Out of these 3, x11/dbus-python is the most problematic because these are
> > dependending on the non python3 FLAVOR of it:
> >
> > audio/exaile
> > editors/py-qscintilla
> > net/pidgin
> > x11/py-qt4
> > x11/py-qt5
> > x11/compiz/ccsm
> >
> > We could use some help moving these to x11/dbus-python,python3 :-)
> > Thanks.
> I looked at x11/py-qt5 as user of the Python 2 flavour and came up with
> editors/py-qscintilla as user of py-qt5's Python 2 flavour.
>
> `show-reverse-deps editors/py-qscintilla' lists geo/qgis as only user
> and qgis is Python 3 only, so we can make py-qscintilla Python 3 only
> as well - first step towards py-qt5 becoming Python 3 only.
>
> I tested the following diff with
>
> $ cd /usr/ports
> $ make -C devel/quirks package
> ...
> $ make -C editors/py-qscintilla package
> ...
> $ doas pkg_add py-qscintilla
> py-qscintilla-2.11.4p2: ok
> $ doas pkg_add -Dunsigned ./packages/`arch -s`/all/quirks-3.437.tgz
> quirks-3.435->3.437: ok
> $ doas pkg_add -Dunsigned ./packages/`arch
> -s`/all/py3-qscintilla-2.11.4p3.tgz
> py-qscintilla-2.11.4p2->py3-qscintilla-2.11.4p3: ok
> Read shared items: ok
>
>
> Feedback? OK?
Ping.
Updated diff after quirks churn.
Index: editors/Makefile
===
RCS file: /cvs/ports/editors/Makefile,v
retrieving revision 1.141
diff -u -p -r1.141 Makefile
--- editors/Makefile28 Jun 2020 21:25:18 - 1.141
+++ editors/Makefile20 Sep 2020 16:31:07 -
@@ -51,7 +51,6 @@
SUBDIR += nvi,iconv
SUBDIR += py-neovim
SUBDIR += py-neovim,python3
- SUBDIR += py-qscintilla
SUBDIR += py-qscintilla,python3
SUBDIR += qscintilla
SUBDIR += scintilla
Index: editors/py-qscintilla/Makefile
===
RCS file: /cvs/ports/editors/py-qscintilla/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- editors/py-qscintilla/Makefile 3 Jul 2020 21:12:53 - 1.25
+++ editors/py-qscintilla/Makefile 20 Sep 2020 16:30:52 -
@@ -4,7 +4,7 @@ COMMENT-main = Python binding for the S
COMMENT-common = common files for py-qscintilla
VERSION = 2.11.4
-REVISION = 2
+REVISION = 3
MODPY_EGG_VERSION =${VERSION}
DISTNAME = QScintilla-${VERSION}
@@ -35,12 +35,10 @@ PYQTVER = PyQt5
SIPDIR = share/sip/PyQt5${MODPY_BIN_SUFFIX}
FLAVORS = python3
-FLAVOR ?=
+FLAVOR = python3
-.if ${FLAVOR:Mpython3}
FULLPKGNAME-main = ${PKGNAME-main:S/^py-/py3-/}
FULLPKGPATH-main = editors/py-qscintilla,-main${MODPY_FLAVOR}
-.endif
BUILD_DEPENDS =${RUN_DEPENDS}
RUN_DEPENDS = devel/py-sip${MODPY_FLAVOR} \
Index: editors/py-qscintilla/pkg/PLIST-common
===
RCS file: /cvs/ports/editors/py-qscintilla/pkg/PLIST-common,v
retrieving revision 1.1
diff -u -p -r1.1 PLIST-common
--- editors/py-qscintilla/pkg/PLIST-common 19 Feb 2020 17:35:36 -
1.1
+++ editors/py-qscintilla/pkg/PLIST-common 20 Sep 2020 16:52:01 -
@@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST-common,v 1.1 2020/02/19 17:35:36 juanfra Exp $
-@conflict py3-qscintilla-${QTVER}-*
+@conflict ${MODPY_PY_PREFIX}qscintilla-${QTVER}-*
@pkgpath editors/py-qscintilla,${QTVER}
lib/${QTVER}/qsci/
lib/${QTVER}/qsci/api/
Index: editors/py-qscintilla/pkg/PLIST-main
===
RCS file: /cvs/ports/editors/py-qscintilla/pkg/PLIST-main,v
retrieving revision 1.1
diff -u -p -r1.1 PLIST-main
--- editors/py-qscintilla/pkg/PLIST-main19 Feb 2020 17:35:36 -
1.1
+++ editors/py-qscintilla/pkg/PLIST-main20 Sep 2020 16:28:56 -
@@ -1,7 +1,9 @@
@comment $OpenBSD: PLIST-main,v 1.1 2020/02/19 17:35:36 juanfra Exp $
@conflict ${MODPY_PY_PREFIX}qscintilla-${QTVER}-*
+@conflict py-qscintilla-*
@pkgpath editors/py-qscintilla,${QTVER}
@pkgpath editors/py-qscintilla
+@pkgpath editors/py-qscintilla,-main
lib/python${MODPY_VERSION}/site-packages/${PYQTVER}/Qsci.pyi
@so lib/python${MODPY_VERSION}/site-packages/${PYQTVER}/Qsci.so
lib/python${MODPY_VERSION}/site-packages/QScintilla-${MODPY_EGG_VERSION}.dist-info/
Index: devel/quirks/Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.1047
diff -u -p -r1.1047 Makefile
--- devel/quirks/Makefile 25 Sep 2020 21:40:55 - 1.1047
+++
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2020/10/02 13:22:09 Modified files: telephony/siproxd: Makefile distinfo telephony/siproxd/patches: patch-doc_siproxd_conf_example patch-src_Makefile_in patch-src_siproxd_c telephony/siproxd/pkg: PLIST Log message: Update to 0.8.3 and take maintainer. Changes: - mostly bugfixes and performance improvements New plugins: - plugin_stats: write some statistics about currently active calls - plugin_blacklist: new plugin to block UACs that cause excessive failures during REGISTER attempts
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2020/10/02 13:19:16 Modified files: databases/py-minidb: Makefile distinfo Log message: Update to py-minidb-2.0.4 Diff from wen heping
Re: dhcpcd: update to 9.2.0 with cherry-picked pppoe(4) fix
On Fri, Oct 02, 2020 at 11:16:38AM +0100, Stuart Henderson wrote:
> Please use standard ports-tree patches for the individual files rather
> than a handrolled jumbo patch. (no need for linux/sun parts I think).
Sure, like that?
> The code in git head ("BSD: struct if_data->ifi_link_state is the single
> source of truth") looks better but this is an easier patch until a new
> release is made.
Yes and yes, but the commit I used was the first one I tried after going
through all of them since 9.2.0 releaes and it immediately worked, so
I sticked with it.
Hopefully 9.2.1 is around the corner anyway.
Index: Makefile
===
RCS file: /cvs/ports/net/dhcpcd/Makefile,v
retrieving revision 1.80
diff -u -p -r1.80 Makefile
--- Makefile8 Sep 2020 15:02:32 - 1.80
+++ Makefile1 Oct 2020 23:04:41 -
@@ -2,7 +2,7 @@
COMMENT= DHCPv4/IPv4LL/IPv6RS/DHCPv6 quad stack client
-DISTNAME= dhcpcd-9.1.4
+DISTNAME= dhcpcd-9.2.0
EPOCH= 0
CATEGORIES=net
Index: distinfo
===
RCS file: /cvs/ports/net/dhcpcd/distinfo,v
retrieving revision 1.48
diff -u -p -r1.48 distinfo
--- distinfo8 Sep 2020 15:02:32 - 1.48
+++ distinfo1 Oct 2020 23:04:46 -
@@ -1,2 +1,2 @@
-SHA256 (dhcpcd-9.1.4.tar.xz) = X+Ez5Ul9ivbSa9bmuN1IqxLRJNbMTO/m3mU2/5f3aCA=
-SIZE (dhcpcd-9.1.4.tar.xz) = 249648
+SHA256 (dhcpcd-9.2.0.tar.xz) = /LLRlnLURbv9OGeP3uT1Vu+Wej6mvYEJLRBUXfLLlmY=
+SIZE (dhcpcd-9.2.0.tar.xz) = 250584
Index: patches/patch-src_if-bsd_c
===
RCS file: patches/patch-src_if-bsd_c
diff -N patches/patch-src_if-bsd_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_if-bsd_c 2 Oct 2020 19:13:24 -
@@ -0,0 +1,43 @@
+$OpenBSD$
+
+22.09.2020 e675d4dde0 "BSD: Detect initial link state in ifa_data"
+fixes dhcpcd on pppoe(4), remove with next release.
+
+Index: src/if-bsd.c
+--- src/if-bsd.c.orig
src/if-bsd.c
+@@ -363,11 +363,32 @@ if_carrier(struct interface *ifp)
+ return LINK_UNKNOWN;
+
+ strlcpy(ifmr.ifm_name, ifp->name, sizeof(ifmr.ifm_name));
+- if (ioctl(ifp->ctx->pf_inet_fd, SIOCGIFMEDIA, ) == -1 ||
+- !(ifmr.ifm_status & IFM_AVALID))
++ if (ioctl(ifp->ctx->pf_inet_fd, SIOCGIFMEDIA, ) == -1)
+ return LINK_UNKNOWN;
+
++ if (!(ifmr.ifm_status & IFM_AVALID))
++ return LINK_UNKNOWN;
++
+ return (ifmr.ifm_status & IFM_ACTIVE) ? LINK_UP : LINK_DOWN;
++}
++
++int
++if_carrier_ifadata(struct interface *ifp, void *ifadata)
++{
++ int carrier = if_carrier(ifp);
++ struct if_data *ifdata;
++
++ if (carrier != LINK_UNKNOWN || ifadata == NULL)
++ return carrier;
++
++ ifdata = ifadata;
++ switch (ifdata->ifi_link_state) {
++ case LINK_STATE_DOWN:
++ return LINK_DOWN;
++ case LINK_STATE_UP:
++ return LINK_UP;
++ }
++ return LINK_UNKNOWN;
+ }
+
+ static void
Index: patches/patch-src_if_c
===
RCS file: patches/patch-src_if_c
diff -N patches/patch-src_if_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_if_c 2 Oct 2020 19:13:22 -
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+22.09.2020 e675d4dde0 "BSD: Detect initial link state in ifa_data"
+fixes dhcpcd on pppoe(4), remove with next release.
+
+Index: src/if.c
+--- src/if.c.orig
src/if.c
+@@ -682,7 +682,7 @@ if_discover(struct dhcpcd_ctx *ctx, struct ifaddrs **i
+
+ ifp->active = active;
+ if (ifp->active)
+- ifp->carrier = if_carrier(ifp);
++ ifp->carrier = if_carrier_ifadata(ifp, ifa->ifa_data);
+ else
+ ifp->carrier = LINK_UNKNOWN;
+ TAILQ_INSERT_TAIL(ifs, ifp, next);
Index: patches/patch-src_if_h
===
RCS file: patches/patch-src_if_h
diff -N patches/patch-src_if_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_if_h 2 Oct 2020 19:13:21 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+22.09.2020 e675d4dde0 "BSD: Detect initial link state in ifa_data"
+fixes dhcpcd on pppoe(4), remove with next release.
+
+Index: src/if.h
+--- src/if.h.orig
src/if.h
+@@ -160,6 +160,7 @@ int if_domtu(const struct interface *, short int);
+ #define if_getmtu(ifp) if_domtu((ifp), 0)
+ #define if_setmtu(ifp, mtu) if_domtu((ifp), (mtu))
+ int if_carrier(struct interface *);
++int if_carrier_ifadata(struct interface *, void *);
+ int if_pollinit(struct interface *ifp);
+
+ #ifdef ALIAS_ADDR
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2020/10/02 13:16:53 Modified files: lang/abcl : Makefile distinfo Log message: Update to abcl-1.7.1 >From maintainer Timo Myyrä
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2020/10/02 13:14:58 Modified files: productivity/ledger: Makefile distinfo productivity/ledger/pkg: PLIST Log message: Update to ledger-3.2.1 Diff from Martin Ziemer
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2020/10/02 13:13:07 Modified files: mail/claws-mail: Makefile distinfo Removed files: mail/claws-mail/patches: patch-src_plugins_spamassassin_spamassassin_gtk_c Log message: Update to claws-mail-3.17.7
Update: Ruby 2.7.2
This updates Ruby 2.7 to the latest version, which was released today.
Release notes:
https://www.ruby-lang.org/en/news/2020/10/02/ruby-2-7-2-released/
Tested on amd64. Will be committing in a couple days unless I hear
objections.
Thanks,
Jeremy
Index: Makefile
===
RCS file: /cvs/ports/lang/ruby/2.7/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile18 Aug 2020 23:40:13 - 1.4
+++ Makefile2 Oct 2020 14:44:02 -
@@ -1,12 +1,10 @@
# $OpenBSD: Makefile,v 1.4 2020/08/18 23:40:13 abieber Exp $
-VERSION = 2.7.1
+VERSION = 2.7.2
DISTNAME = ruby-${VERSION}
SHARED_LIBS = ruby27 0.0
NEXTVER = 2.8
PKGSPEC-main ?= ruby->=2.7.0,<${NEXTVER}
-
-REVISION-main =1
PSEUDO_FLAVORS=no_ri_docs bootstrap
# Do not build the RI docs on slow arches
Index: distinfo
===
RCS file: /cvs/ports/lang/ruby/2.7/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo3 Apr 2020 01:47:41 - 1.2
+++ distinfo2 Oct 2020 14:44:10 -
@@ -1,2 +1,2 @@
-SHA256 (ruby-2.7.1.tar.gz) = 1BhIO90AAFdsE3BXESGm6yRYIRbbC3uyAF6Q4lDq5Bg=
-SIZE (ruby-2.7.1.tar.gz) = 16816471
+SHA256 (ruby-2.7.2.tar.gz) = blcG0NTuTh4viD2512hYa00GVn3r6jU8eW7EXoMhw9Q=
+SIZE (ruby-2.7.2.tar.gz) = 16836767
Index: patches/patch-configure
===
RCS file: /cvs/ports/lang/ruby/2.7/patches/patch-configure,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-configure
--- patches/patch-configure 2 Jan 2020 21:19:57 - 1.1.1.1
+++ patches/patch-configure 2 Oct 2020 14:45:03 -
@@ -8,7 +8,7 @@ so ports don't have to be bumped when Op
Index: configure
--- configure.orig
+++ configure
-@@ -28712,7 +28712,7 @@ fi
+@@ -28719,7 +28719,7 @@ fi
;; #(
openbsd*|mirbsd*) :
@@ -17,7 +17,7 @@ Index: configure
;; #(
solaris*) :
-@@ -30273,7 +30273,7 @@ _ACEOF
+@@ -30280,7 +30280,7 @@ _ACEOF
else
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/lang/ruby/2.7/pkg/PLIST-main,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-main
--- pkg/PLIST-main 3 Apr 2020 01:47:41 - 1.2
+++ pkg/PLIST-main 2 Oct 2020 14:55:50 -
@@ -45,7 +45,7 @@ include/ruby-${REV}/ruby/util.h
include/ruby-${REV}/ruby/version.h
include/ruby-${REV}/ruby/vm.h
include/ruby-${REV}/${SUB}/
-include/ruby-${REV}/${SUB}/rb_mjit_min_header-2.7.1.h
+include/ruby-${REV}/${SUB}/rb_mjit_min_header-2.7.2.h
include/ruby-${REV}/${SUB}/ruby/
include/ruby-${REV}/${SUB}/ruby/config.h
@so lib/libruby27.so
@@ -453,6 +453,7 @@ lib/ruby/${REV}/irb/cmd/
lib/ruby/${REV}/irb/cmd/chws.rb
lib/ruby/${REV}/irb/cmd/fork.rb
lib/ruby/${REV}/irb/cmd/help.rb
+lib/ruby/${REV}/irb/cmd/info.rb
lib/ruby/${REV}/irb/cmd/load.rb
lib/ruby/${REV}/irb/cmd/nop.rb
lib/ruby/${REV}/irb/cmd/pushws.rb
@@ -1414,9 +1415,9 @@ lib/ruby/gems/${REV}/gems/gdbm-2.1.0/
lib/ruby/gems/${REV}/gems/getoptlong-0.1.0/
lib/ruby/gems/${REV}/gems/io-console-0.5.6/
lib/ruby/gems/${REV}/gems/ipaddr-1.2.2/
-lib/ruby/gems/${REV}/gems/irb-1.2.3/
-lib/ruby/gems/${REV}/gems/irb-1.2.3/exe/
-lib/ruby/gems/${REV}/gems/irb-1.2.3/exe/irb
+lib/ruby/gems/${REV}/gems/irb-1.2.6/
+lib/ruby/gems/${REV}/gems/irb-1.2.6/exe/
+lib/ruby/gems/${REV}/gems/irb-1.2.6/exe/irb
lib/ruby/gems/${REV}/gems/json-2.3.0/
lib/ruby/gems/${REV}/gems/logger-1.4.2/
lib/ruby/gems/${REV}/gems/matrix-0.2.0/
@@ -1598,7 +1599,7 @@ lib/ruby/gems/${REV}/gems/rdoc-6.2.1/exe
lib/ruby/gems/${REV}/gems/rdoc-6.2.1/exe/ri
lib/ruby/gems/${REV}/gems/readline-0.0.2/
lib/ruby/gems/${REV}/gems/readline-ext-0.1.0/
-lib/ruby/gems/${REV}/gems/reline-0.1.3/
+lib/ruby/gems/${REV}/gems/reline-0.1.5/
lib/ruby/gems/${REV}/gems/rexml-3.2.3/
lib/ruby/gems/${REV}/gems/rss-0.2.8/
lib/ruby/gems/${REV}/gems/sdbm-1.0.0/
@@ -1776,7 +1777,7 @@ lib/ruby/gems/${REV}/specifications/defa
lib/ruby/gems/${REV}/specifications/default/getoptlong-0.1.0.gemspec
lib/ruby/gems/${REV}/specifications/default/io-console-0.5.6.gemspec
lib/ruby/gems/${REV}/specifications/default/ipaddr-1.2.2.gemspec
-lib/ruby/gems/${REV}/specifications/default/irb-1.2.3.gemspec
+lib/ruby/gems/${REV}/specifications/default/irb-1.2.6.gemspec
lib/ruby/gems/${REV}/specifications/default/json-2.3.0.gemspec
lib/ruby/gems/${REV}/specifications/default/logger-1.4.2.gemspec
lib/ruby/gems/${REV}/specifications/default/matrix-0.2.0.gemspec
@@ -1794,7 +1795,7 @@ lib/ruby/gems/${REV}/specifications/defa
lib/ruby/gems/${REV}/specifications/default/rdoc-6.2.1.gemspec
lib/ruby/gems/${REV}/specifications/default/readline-0.0.2.gemspec
lib/ruby/gems/${REV}/specifications/default/readline-ext-0.1.0.gemspec
-lib/ruby/gems/${REV}/specifications/default/reline-0.1.3.gemspec
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/10/02 12:51:13 Modified files: mail/rspamd: Makefile distinfo mail/rspamd/patches: patch-CMakeLists_txt patch-cmake_Toolset_cmake mail/rspamd/pkg: PLIST Log message: update to rspamd-2.6
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/10/02 12:50:59 Modified files: mail/neomutt : Makefile distinfo mail/neomutt/patches: patch-auto_def Log message: update to neomutt-20200925
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/10/02 12:47:15 Modified files: net/ntopng : Makefile distinfo net/ntopng/patches: patch-Makefile_in patch-autogen_sh patch-configure_seed patch-include_ntop_defines_h patch-include_ntop_includes_h patch-nDPI_Makefile_am patch-nDPI_src_lib_Makefile_in patch-src_DummyInterface_cpp patch-src_HTTPserver_cpp patch-src_LuaEngine_cpp patch-src_NetworkInterface_cpp patch-src_TimeseriesExporter_cpp net/ntopng/pkg : PLIST Added files: net/ntopng/patches: patch-nDPI_autogen_sh patch-nDPI_src_lib_ndpi_community_id_c patch-src_InfluxDBTimeseriesExporter_cpp patch-src_Ntop_cpp patch-src_PcapInterface_cpp patch-src_SyslogCollectorInterface_cpp Removed files: net/ntopng/patches: patch-src_CommunityIdFlowHash_cpp Log message: update ntopng to commits from the 4.0-stable (ntopng) and 3.2-stable (ndpi) branches
WIP - Python 3.9.0rc2
I took a stab at Python 3.9.0rc2. I don't think it is worth importing before the final release of 3.9.0, but figured if anyone wants to do some testing that this could be useful. (tarball starts with a 3.9 directory to be placed under lang/python) --Kurt python3.9rc2.tgz Description: application/tar-gz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/10/02 12:45:24 Modified files: mail/roundcubemail: Makefile distinfo Log message: update to roundcubemail-1.4.9
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/10/02 12:46:03 Modified files: net/unifi/testing: Makefile distinfo net/unifi/testing/pkg: PLIST Log message: update unifi/testing to 6.0.24
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/10/02 12:45:24 Modified files: net/librenms : Makefile distinfo net/librenms/patches: patch-LibreNMS_Config_php patch-misc_config_definitions_json net/librenms/pkg: PLIST Log message: update to librenms-1.68
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/10/02 12:45:00 Modified files: devel/ccache : Makefile distinfo Log message: update to ccache-3.7.12
Re: dhcpcd: update to 9.2.0 with cherry-picked pppoe(4) fix
On 2020/10/02 01:35, Klemens Nanni wrote:
> A single commit from Roy Marples in current HEAD fixes dhcpcd when used
> on pppoe(4) interfaces; naddy saw this breakage as well which caused
> sthen to revert to 9.1.4 which apparently works fine for naddy.
>
> I've been experiencing these with 9.1.4 already, neither the 9.2.0
> update (nor the revert obviously) fixed it for me, so I here's the same
> update but with upstream's fix included.
>
> Latest HEAD works for me as well, what's left to debug now is why 9.1.4
> works for naddy but not for me - I'd move this discussion over on
> dhcpcd's list, though.
>
> The commit fails to apply as is due to the src/if.c hunk which I fixed
> manually, otherwise I'd probably have used PATCHFILES instead.
>
> naddy, does this work for you?
> Feedback? OK?
>
Please use standard ports-tree patches for the individual files rather
than a handrolled jumbo patch. (no need for linux/sun parts I think).
The code in git head ("BSD: struct if_data->ifi_link_state is the single
source of truth") looks better but this is an easier patch until a new
release is made.
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/dhcpcd/Makefile,v
> retrieving revision 1.80
> diff -u -p -r1.80 Makefile
> --- Makefile 8 Sep 2020 15:02:32 - 1.80
> +++ Makefile 1 Oct 2020 23:04:41 -
> @@ -2,7 +2,7 @@
>
> COMMENT= DHCPv4/IPv4LL/IPv6RS/DHCPv6 quad stack client
>
> -DISTNAME=dhcpcd-9.1.4
> +DISTNAME=dhcpcd-9.2.0
> EPOCH= 0
>
> CATEGORIES= net
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/dhcpcd/distinfo,v
> retrieving revision 1.48
> diff -u -p -r1.48 distinfo
> --- distinfo 8 Sep 2020 15:02:32 - 1.48
> +++ distinfo 1 Oct 2020 23:04:46 -
> @@ -1,2 +1,2 @@
> -SHA256 (dhcpcd-9.1.4.tar.xz) = X+Ez5Ul9ivbSa9bmuN1IqxLRJNbMTO/m3mU2/5f3aCA=
> -SIZE (dhcpcd-9.1.4.tar.xz) = 249648
> +SHA256 (dhcpcd-9.2.0.tar.xz) = /LLRlnLURbv9OGeP3uT1Vu+Wej6mvYEJLRBUXfLLlmY=
> +SIZE (dhcpcd-9.2.0.tar.xz) = 250584
> Index: patches/patch-pppoe_fix
> ===
> RCS file: patches/patch-pppoe_fix
> diff -N patches/patch-pppoe_fix
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-pppoe_fix 1 Oct 2020 23:26:21 -
> @@ -0,0 +1,113 @@
> +$OpenBSD$
> +
> +Cherry-picked (and manually fixed src/if.c hunk), remove with next release:
> +
> +From e675d4dde0d865b6ffc7de733623a52852d284ff Mon Sep 17 00:00:00 2001
> +From: Roy Marples
> +Date: Tue, 22 Sep 2020 13:09:03 +0100
> +Subject: BSD: Detect initial link state in ifa_data
> +
> +Not all interfaces report media state to get the link state.
> +However, link state is available from getifaddrs(3) ifa_data
> +for AF_LINK addresses.
> +
> +Testing shows that link state is also sent correctly via
> +route(4) messages for the same interface.
> +
> +This makes pppoe(4) interfaces more reliable on FreeBSD and OpenBSD.
> +
> +Index: src/if-bsd.c
> +--- src/if-bsd.c.orig
> src/if-bsd.c
> +@@ -363,11 +363,32 @@ if_carrier(struct interface *ifp)
> + return LINK_UNKNOWN;
> +
> + strlcpy(ifmr.ifm_name, ifp->name, sizeof(ifmr.ifm_name));
> +-if (ioctl(ifp->ctx->pf_inet_fd, SIOCGIFMEDIA, ) == -1 ||
> +-!(ifmr.ifm_status & IFM_AVALID))
> ++if (ioctl(ifp->ctx->pf_inet_fd, SIOCGIFMEDIA, ) == -1)
> + return LINK_UNKNOWN;
> +
> ++if (!(ifmr.ifm_status & IFM_AVALID))
> ++return LINK_UNKNOWN;
> ++
> + return (ifmr.ifm_status & IFM_ACTIVE) ? LINK_UP : LINK_DOWN;
> ++}
> ++
> ++int
> ++if_carrier_ifadata(struct interface *ifp, void *ifadata)
> ++{
> ++int carrier = if_carrier(ifp);
> ++struct if_data *ifdata;
> ++
> ++if (carrier != LINK_UNKNOWN || ifadata == NULL)
> ++return carrier;
> ++
> ++ifdata = ifadata;
> ++switch (ifdata->ifi_link_state) {
> ++case LINK_STATE_DOWN:
> ++return LINK_DOWN;
> ++case LINK_STATE_UP:
> ++return LINK_UP;
> ++}
> ++return LINK_UNKNOWN;
> + }
> +
> + static void
> +Index: src/if-linux.c
> +--- src/if-linux.c.orig
> src/if-linux.c
> +@@ -475,6 +475,13 @@ if_carrier(struct interface *ifp)
> + }
> +
> + int
> ++if_carrier_ifadata(struct interface *ifp, __unused void *ifadata)
> ++{
> ++
> ++return if_carrier(ifp);
> ++}
> ++
> ++int
> + if_getnetlink(struct dhcpcd_ctx *ctx, struct iovec *iov, int fd, int flags,
> + int (*cb)(struct dhcpcd_ctx *, void *, struct nlmsghdr *), void *cbarg)
> + {
> +Index: src/if-sun.c
> +--- src/if-sun.c.orig
> src/if-sun.c
> +@@ -240,6 +240,13 @@ err:
> + }
> +
> + int
> ++if_carrier_ifadata(struct interface *ifp, __unused void *ifadata)
> ++{
> ++
> ++return if_carrier(ifp);
> ++}
> ++
> ++int
> + if_mtu_os(const struct interface *ifp)
> + {
> + dlpi_handle_t dh;
> +Index: src/if.c
> +---
icinga2 crashes on mutex different owner
I'm currently trying to set up a couple of icinga2 satalites on OpenBSD,
but they keep crashing after
/var/lib/icinga2/api/zones-stage/pub//_etc/generated_dbconfig_hosts.conf
has been copied to
/var/lib/icinga2/api/zones/pub//_etc/generated_dbconfig_hosts.conf.
I managed to get the following backtrace:
#1 0x0a94dd2ce2ae in _libc_abort () at /usr/src/lib/libc/stdlib/abort.c:61
#2 0x0a94dd231e9c in _libc_pthread_mutex_unlock (mutexp=)
at /usr/src/lib/libc/thread/rthread_mutex.c:265
#3 0x0a9272acc510 in boost::posix::pthread_mutex_unlock (m=0xa927306f488
) at
/usr/local/include/boost/thread/pthread/mutex.hpp:71
#4 boost::mutex::unlock (this=0xa927306f488
) at
/usr/local/include/boost/thread/pthread/mutex.hpp:125
#5 boost::unique_lock::~unique_lock (this=) at
/usr/local/include/boost/thread/lock_types.hpp:331
#6 icinga::intrusive_ptr_release >
(object=0xa952e854d60) at
/usr/ports/pobj/icinga2-2.11.5/icinga2-2.11.5/lib/base/shared.hpp:27
#7 boost::intrusive_ptr >
>::~intrusive_ptr (this=) at
/usr/local/include/boost/smart_ptr/intrusive_ptr.hpp:98
#8
icinga::ApiListener::AsyncTryActivateZonesStage(std::__1::vector > const&,
boost::intrusive_ptr
> > const&)::$_34::~$_34() (this=0xa949f7244c8)
at
/usr/ports/pobj/icinga2-2.11.5/icinga2-2.11.5/lib/remote/apilistener-filesync.cpp:648
#9
std::__1::__compressed_pair_elem > const&,
boost::intrusive_ptr > >
const&)::$_34, 0, false>::~__compressed_pair_elem() (this=0xa949f7244c8)
at /usr/include/c++/v1/memory:2134
#10 0x0a9272acc423 in
std::__1::__function::__alloc_func > const&,
boost::intrusive_ptr > >
const&)::$_34,
std::__1::allocator > const&,
boost::intrusive_ptr > >
const&)::$_34>, void (icinga::ProcessResult const&)>::destroy() (this=) at /usr/include/c++/v1/functional:1546
#11
std::__1::__function::__func > const&,
boost::intrusive_ptr > >
const&)::$_34,
std::__1::allocator > const&,
boost::intrusive_ptr > >
const&)::$_34>, void (icinga::ProcessResult const&)>::destroy_deallocate()
(this=0xa949f7244c0) at /usr/include/c++/v1/functional:1643
#12 0x0a92729bad13 in std::__1::__function::__value_func::~__value_func() (this=) at
/usr/include/c++/v1/functional:1758
#13 std::__1::function::~function()
(this=) at /usr/include/c++/v1/functional:2334
#14 std::__1::__bind&,
icinga::ProcessResult&>::~__bind() (this=) at
/usr/include/c++/v1/functional:2648
#15 std::__1::__compressed_pair_elem&, icinga::ProcessResult&>, 0,
false>::~__compressed_pair_elem() (this=) at
/usr/include/c++/v1/memory:2134
#16 std::__1::__function::__alloc_func&, icinga::ProcessResult&>,
std::__1::allocator&, icinga::ProcessResult&> >, void
()>::destroy() (this=)
at /usr/include/c++/v1/functional:1546
#17 std::__1::__function::__func&, icinga::ProcessResult&>,
std::__1::allocator&, icinga::ProcessResult&> >, void
()>::destroy_deallocate() (this=0xa94b97a1000)
at /usr/include/c++/v1/functional:1643
#18 0x0a92729d438d in std::__1::__function::__value_func::~__value_func() (this=) at
/usr/include/c++/v1/functional:1758
#19 std::__1::function::~function() (this=) at
/usr/include/c++/v1/functional:2334
#20 bool icinga::ThreadPool::Post
>(std::__1::function,
icinga::SchedulerPolicy)::{lambda()#1}::~SchedulerPolicy() (this=) at
/usr/ports/pobj/icinga2-2.11.5/icinga2-2.11.5/lib/base/threadpool.hpp:59
#21 boost::asio::system_executor::dispatch >(std::__1::function, icinga::SchedulerPolicy)::{lambda()#1}, std::__1::allocator
>(bool icinga::ThreadPool::Post
>>(std::__1::function, icinga::SchedulerPolicy)::{lambda()#1}&&,
>std::__1::allocator const&) const (this=,
f=) at /usr/local/include/boost/asio/impl/system_executor.hpp:40
#22 0x0a92729d420c in boost::asio::detail::work_dispatcher >(std::__1::function,
icinga::SchedulerPolicy)::{lambda()#1}>::operator()() (this=) at
/usr/local/include/boost/asio/detail/work_dispatcher.hpp:58
#23 boost::asio::asio_handler_invoke >(std::__1::function,
icinga::SchedulerPolicy)::{lambda()#1}>
>(boost::asio::detail::work_dispatcher >(std::__1::function,
icinga::SchedulerPolicy)::{lambda()#1}>&, ...) (function=...) at
/usr/local/include/boost/asio/handler_invoke_hook.hpp:69
#24
boost_asio_handler_invoke_helpers::invoke >(std::__1::function,
icinga::SchedulerPolicy)::{lambda()#1}>, bool
icinga::ThreadPool::Post >(std::__1::function,
icinga::SchedulerPolicy)::{lambda()#1}>(boost::asio::detail::work_dispatcher >(std::__1::function,
icinga::SchedulerPolicy)::{lambda()#1}>&, bool
icinga::ThreadPool::Post >(std::__1::function, icinga::SchedulerPolicy)::{lambda()#1}&) (function=..., context=...)
at /usr/local/include/boost/asio/detail/handler_invoke_helpers.hpp:37
#25 boost::asio::detail::executor_op >(std::__1::function,
icinga::SchedulerPolicy)::{lambda()#1}>, std::__1::allocator,
boost::asio::detail::scheduler_operation>::do_complete(void*,
std::__1::allocator*, boost::system::error_code const&, unsigned
long) (owner=0xa94be39e300, base=0xa94b97a1e00) at
Re: NEW PORT: resynthesizer (gimp plugin)
The homepage did show some outdated links elsewhere... Long story short, somebody else took over, it was on the gimp registry which is dead... but the github project lives, and they even have decent new versions. Changes: - autogen gooey which seems to do the job - converted to C, so no need for special compiler - a few tweaks to the UI which is "nicer" - script-fu have been replaced by python scripts - some actual documentation resynthesizer-2.0.3.tgz Description: resynthesizer-2.0.3.tgz
