Re: NEW: www/wslay
On Mon, Nov 12, 2018 at 1:04 AM Anthony J. Bentley wrote: > Hi, > > Wslay is a WebSocket library written in C. It implements the protocol > version 13 described in RFC 6455. This library offers 2 levels of API: > event-based API and frame-based low-level API. For event-based API, it is > suitable for non-blocking reactor pattern style. You can set callbacks in > various events. For frame-based API, you can send WebSocket frame directly. > Wslay only supports data transfer part of WebSocket protocol and does not > perform opening handshake in HTTP. > > > ok? Ping? This is a simple straightforward port. (Reattached.) -- Anthony J. Bentley wslay.tar.gz Description: application/gzip
Re: NEW: security/pecl-mcrypt
On Sun, Mar 03, 2019 at 03:37:38PM +, Stuart Henderson wrote: > For PHP 7.2+, mcrypt has moved to PECL. > > OK to import? > sure, ok giovanni@ Cheers Giovanni signature.asc Description: PGP signature
Re: WIP: net/libsignal-protocol-c
On Sun, Feb 17, 2019 at 2:57 PM Anthony J. Bentley wrote: > > Alex Holst writes: > > Hi, > > > > Thanks for your input. It should all be adopted into this port except > > for the 'test' target which I couldn't get working otherwise. > > No need for a do-test, just use: > > CONFIGURE_ARGS =-DBUILD_TESTING=ON Here's a port with that change, some minor whitespace changes, and a tweaked DESCR. Is this ready to go in? -- Anthony J. Bentley libsignal-protocol-c.tar.gz Description: application/gzip
Re: UPDATE: mail/p5-Mail-DKIM
On Sat, Mar 02, 2019 at 05:59:20PM -0700, Andrew Hewus Fresh wrote: > On Sun, Feb 24, 2019 at 04:31:36PM +0100, Giovanni Bechis wrote: > > Update to latest version and missing test depends. > > ok ? > > Cheers > >Giovanni > > p5-Net-DNS-Resolver-Mock could use a tidying of the Makefile, although > it's not terrible and I think the Makefile.template could just use some > improvements to make this generate more cleanly. > > I've also seen a few ports now where portcheck(1) complains about > executable distinfo, pkg/DESCR, and pkg/PLIST, I wonder if portgen(1) is > doing something it shouldn't. > > OK afresh1@ for both the update and new dependency > I have changed a bit comment line in Net::DNS::Resolver::Mock and committed, thanks. Giovanni signature.asc Description: PGP signature
minissdpd-1.5
Update below brings minissdpd to the latest version (1.5). Changelog can be found at http://miniupnp.free.fr/files/changelog.php?file=minissdpd-1.5.20190210.tar.gz OK? Index: Makefile === RCS file: /cvs/ports/net/miniupnp/minissdpd/Makefile,v retrieving revision 1.11 diff -u -p -r1.11 Makefile --- Makefile4 Sep 2018 12:46:17 - 1.11 +++ Makefile7 Mar 2019 05:53:45 - @@ -2,8 +2,7 @@ COMMENT= daemon keeping track of UPnP devices up -DISTNAME= minissdpd-1.4 -REVISION= 0 +DISTNAME= minissdpd-1.5 WANTLIB += c Index: distinfo === RCS file: /cvs/ports/net/miniupnp/minissdpd/distinfo,v retrieving revision 1.5 diff -u -p -r1.5 distinfo --- distinfo28 Apr 2018 14:46:44 - 1.5 +++ distinfo7 Mar 2019 05:53:45 - @@ -1,2 +1,2 @@ -SHA256 (minissdpd-1.4.tar.gz) = RqLH6dRQIemm6ZL1SgE/gbVOWQD+GdvIH/nCtAAyoBA= -SIZE (minissdpd-1.4.tar.gz) = 32017 +SHA256 (minissdpd-1.5.tar.gz) = 39Y3sYVzHhrLQSqG+qlxjrk8BMoIKAVBptItFNH7iQ8= +SIZE (minissdpd-1.5.tar.gz) = 34404 Index: pkg/PLIST === RCS file: /cvs/ports/net/miniupnp/minissdpd/pkg/PLIST,v retrieving revision 1.2 diff -u -p -r1.2 PLIST --- pkg/PLIST 4 Sep 2018 12:46:17 - 1.2 +++ pkg/PLIST 7 Mar 2019 05:53:45 - @@ -1,5 +1,5 @@ @comment $OpenBSD: PLIST,v 1.2 2018/09/04 12:46:17 espie Exp $ +@rcscript ${RCDIR}/minissdpd @man man/man1/minissdpd.1 @bin sbin/minissdpd share/doc/pkg-readmes/${PKGSTEM} -@rcscript ${RCDIR}/minissdpd
Re: [NEW/WIP] Qflow porting // [5/7] magic 8.1.224
Hi Alessandro, Thanks for sending this in; magic's been on my todo list for a while but pretty far down. Alessandro DE LAURENZIS writes: > On 07/03/2019 06:12, Alessandro DE LAURENZIS wrote: > > There are 2 branches, distribution (8.1) and development (8.2); the > > former is now reasonably stable, and should be expected to work without > > undue issues; let's stay on that. No strong opinion of that but if you push patches upstream (see below) it may be more practical to target the development branch for a while. > > Upstream configure script is a wrapper around the one actually generated > > by autoconf, so I used: > > > > CONFIGURE_STYLE = simple A very thin wrapper. I'd rather set CONFIGURE_STYLE=gnu and WRKCONF=${WRKSRC}/scripts instead. > > and patched it adding -std=c89 and -Wno-parentheses to CFLAGS, in order > > to get rid of the huge amount of Wimplicit-function-declaration and > > Wno-parentheses warnings. My memory of magic is that it has some truly ancient ifdefs and code issues that might be worth fixing and shouldn't be too difficult. > > Other patches have essentially to do with termios functions; in > > particular, txGetTermState is not defined is OpenBSD; please carefully > > review what I made in patches/patch-textio_txInput_c, since I just tried > > to adapt some code found on the Internet used for similar situations; > > neither I really understand if those functions are actually needed when > > the Tcl/Tk version is used (this is the case for our port). -#if defined(SYSV) || defined(CYGWIN) +#if defined(SYSV) || defined(CYGWIN) || defined(__OpenBSD__) This is exactly what I'm talking about. If you check FreeBSD they have similar patches. When I see ifdefs like this in a codebase this old, I wonder: what systems even hit the else? I'd consider removing the pre-termios case completely and pushing it upstream. > I forgot to say that the port installs the "magic.1" man page; this > isn't a real conflict with magic(5), but could be a bit confusing; > please let me know if it is worth to change the man page name (is > something like magic-vlsi more appropriate?) It's not a problem, that's what manpage sections are for. > post-extract: > mv ${WRKSRC}/lef/lefWrite.c.orig ${WRKSRC}/lef/lefWrite.c_orig PATCHORIG would remove the need for this. -- Anthony J. Bentley
miniupnpd-2.1
Diff below brings miniupnpd to the latest version (2.1). Changelog can be found at http://miniupnp.free.fr/files/changelog.php?file=miniupnpd-2.1.tar.gz (Lightly) tested at home by a PS4-fanatic. OK? Index: Makefile === RCS file: /cvs/ports/net/miniupnp/miniupnpd/Makefile,v retrieving revision 1.17 diff -u -p -r1.17 Makefile --- Makefile4 Sep 2018 12:46:17 - 1.17 +++ Makefile7 Mar 2019 05:53:57 - @@ -2,8 +2,7 @@ COMMENT= UPnP IGD daemon -DISTNAME= miniupnpd-1.9 -REVISION= 4 +DISTNAME= miniupnpd-2.1 WANTLIB += c crypto kvm ssl @@ -11,6 +10,9 @@ MAKE_FLAGS= INSTALLETCDIR=${PREFIX}/shar INSTALLMANDIR=${PREFIX}/man/man8 FAKE_FLAGS=PREFIX=${TRUEPREFIX} + +CONFIGURE_STYLE= simple +CONFIGURE_SCRIPT= genconfig.sh post-install: ${INSTALL_MAN_DIR} ${PREFIX}/man/man8 Index: distinfo === RCS file: /cvs/ports/net/miniupnp/miniupnpd/distinfo,v retrieving revision 1.5 diff -u -p -r1.5 distinfo --- distinfo17 Jun 2015 09:51:48 - 1.5 +++ distinfo7 Mar 2019 05:53:57 - @@ -1,2 +1,2 @@ -SHA256 (miniupnpd-1.9.tar.gz) = YXbrIaZCKn7mjvHGLMu9UAMzX6dz2MkBMijCohe7oqw= -SIZE (miniupnpd-1.9.tar.gz) = 192183 +SHA256 (miniupnpd-2.1.tar.gz) = lQiUd5ZhGX/gk4Vf2imnKPQ0tXVutPpstfe5v/f/4ME= +SIZE (miniupnpd-2.1.tar.gz) = 225458 Index: patches/patch-Makefile === RCS file: /cvs/ports/net/miniupnp/miniupnpd/patches/patch-Makefile,v retrieving revision 1.5 diff -u -p -r1.5 patch-Makefile --- patches/patch-Makefile 17 Jun 2015 09:51:48 - 1.5 +++ patches/patch-Makefile 7 Mar 2019 05:53:57 - @@ -1,9 +1,10 @@ $OpenBSD: patch-Makefile,v 1.5 2015/06/17 09:51:48 ajacoutot Exp $ Makefile.orig Mon Jun 30 14:03:05 2014 -+++ Makefile Wed Jun 17 11:06:29 2015 -@@ -173,7 +173,7 @@ clean: - testportinuse.o \ +Index: Makefile +--- Makefile.orig Makefile +@@ -176,7 +176,7 @@ clean: $(PFOBJS) $(IPFOBJS) $(IPFWOBJS) + $(RM) validateupnppermissions validategetifaddr validatessdppktgen -install: miniupnpd genuuid +install: miniupnpd Index: patches/patch-minissdp_c === RCS file: /cvs/ports/net/miniupnp/miniupnpd/patches/patch-minissdp_c,v retrieving revision 1.1 diff -u -p -r1.1 patch-minissdp_c --- patches/patch-minissdp_c10 Sep 2016 13:03:42 - 1.1 +++ patches/patch-minissdp_c7 Mar 2019 05:53:57 - @@ -1,7 +1,8 @@ $OpenBSD: patch-minissdp_c,v 1.1 2016/09/10 13:03:42 ajacoutot Exp $ minissdp.c.origSat Sep 10 12:02:27 2016 -+++ minissdp.c Sat Sep 10 12:02:37 2016 -@@ -10,6 +10,7 @@ +Index: minissdp.c +--- minissdp.c.orig minissdp.c +@@ -11,6 +11,7 @@ #include #include #include Index: patches/patch-miniupnpd_8 === RCS file: /cvs/ports/net/miniupnp/miniupnpd/patches/patch-miniupnpd_8,v retrieving revision 1.1 diff -u -p -r1.1 patch-miniupnpd_8 --- patches/patch-miniupnpd_8 17 May 2013 10:59:31 - 1.1 +++ patches/patch-miniupnpd_8 7 Mar 2019 05:53:57 - @@ -1,12 +1,13 @@ $OpenBSD: patch-miniupnpd_8,v 1.1 2013/05/17 10:59:31 dcoppa Exp $ miniupnpd.8.orig Thu May 13 11:18:12 2010 -+++ miniupnpd.8Thu May 13 11:18:31 2010 +Index: miniupnpd.8 +--- miniupnpd.8.orig miniupnpd.8 @@ -17,7 +17,7 @@ clients on the LAN to ask for port redirections. .SH OPTIONS .TP - .B \-f file + .BI \-f " config_file" -load the config from file. default is /etc/miniupnpd.conf. +load the config from file. default is ${SYSCONFDIR}/miniupnpd.conf. .TP - .B \-i interface + .BI \-i " ext_ifname" interface used to connect to the internet. Index: patches/patch-miniupnpd_conf === RCS file: /cvs/ports/net/miniupnp/miniupnpd/patches/patch-miniupnpd_conf,v retrieving revision 1.4 diff -u -p -r1.4 patch-miniupnpd_conf --- patches/patch-miniupnpd_conf17 Jun 2015 09:51:48 - 1.4 +++ patches/patch-miniupnpd_conf7 Mar 2019 05:53:57 - @@ -1,16 +1,17 @@ $OpenBSD: patch-miniupnpd_conf,v 1.4 2015/06/17 09:51:48 ajacoutot Exp $ miniupnpd.conf.origTue Oct 21 16:15:14 2014 -+++ miniupnpd.conf Wed Jun 17 11:51:03 2015 +Index: miniupnpd.conf +--- miniupnpd.conf.orig miniupnpd.conf @@ -121,7 +121,7 @@ clean_ruleset_interval=600 # active when compiled with PF_ENABLE_FILTER_RULES (see config.h file) #quickrules=no --# uuid : generate your own with "make genuuid" +-# UUID, generate your own UUID with "make genuuid" +# uuid : generate your own with uuid(1) or uuidgen(1) uuid=---- - # serial and model number the daemon will report to clients -@@ -141,9 +141,9 @@ uuid=0
Re: Split games/minetest into main, server and data subpackages
On Thu, Mar 07, 2019 at 08:02:19AM +0300, Kirill Bychkov wrote: > Hi! > What is the reason to split 15 MiB package and complicate the port? > Some games using such a split to save space on mirrors, but they > have more than 100 MiB of data. > Hi! This was suggested by Landry Breuil to run the server without having the client installed. Also I see an opportunity here because you don't have to have X.org installed to run the server. Alternatively we can split it in flavors like FreeBSD did that, this will help people which prefer to compile packages themselves, but this is more complicated, but it'll allow people to compile server only.
UPDATE miniupnpc-2.1
Diff below brings miniupnpc to the latest version (2.1). Changelog can be found at http://miniupnp.free.fr/files/changelog.php?file=miniupnpc-2.1.tar.gz Major of SHARED_LIB has been bumped as symbols have been removed. Removed python multipackage as there are no ports that depend on it. Build tested its consumers, and run tested against miniupnpd. OK? Index: Makefile === RCS file: /cvs/ports/net/miniupnp/miniupnpc/Makefile,v retrieving revision 1.10 diff -u -p -r1.10 Makefile --- Makefile8 Dec 2018 22:11:40 - 1.10 +++ Makefile7 Mar 2019 05:53:01 - @@ -1,30 +1,12 @@ # $OpenBSD: Makefile,v 1.10 2018/12/08 22:11:40 ajacoutot Exp $ -COMMENT-main= UPnP IGD client lightweight library -COMMENT-python=python module for miniupnpc +COMMENT= UPnP IGD client lightweight library -MODPY_EGG_VERSION= 1.9 +DISTNAME= miniupnpc-2.1 -DISTNAME= miniupnpc-${MODPY_EGG_VERSION} +SHARED_LIBS += miniupnpc 3.0 -PKGNAME-main= ${DISTNAME} -PKGNAME-python= py-${DISTNAME} - -REVISION-main= 3 -REVISION-python=0 - -SHARED_LIBS += miniupnpc 2.0 - -WANTLIB-main += c - -LIB_DEPENDS-python=${MODPY_LIB_DEPENDS} -WANTLIB-python += ${MODPY_WANTLIB} pthread - -MASTER_SITES= ${HOMEPAGE}files/ - -MULTI_PACKAGES=-main -python - -MODULES= lang/python +WANTLIB += c USE_GMAKE= Yes MAKE_ENV= APIVERSION=${LIBminiupnpc_VERSION} \ @@ -32,21 +14,7 @@ MAKE_ENV=APIVERSION=${LIBminiupnpc_VERS FAKE_FLAGS=DESTDIR= -# Override variables from the python module. -CONFIGURE_STYLE= simple -CONFIGURE_SCRIPT= updateminiupnpcstrings.sh -CATEGORIES-main= net -RUN_DEPENDS-main= # empty - -pre-configure: - ${SUBST_CMD} ${WRKSRC}/Makefile - -post-build: - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ - ${MAKE_PROGRAM} ${MAKE_FLAGS} pythonmodule - -post-install: - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ - ${MAKE_PROGRAM} ${MAKE_FLAGS} installpythonmodule +CONFIGURE_STYLE= simple +CONFIGURE_SCRIPT= updateminiupnpcstrings.sh .include Index: distinfo === RCS file: /cvs/ports/net/miniupnp/miniupnpc/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- distinfo3 Feb 2014 13:30:52 - 1.4 +++ distinfo7 Mar 2019 05:53:01 - @@ -1,2 +1,2 @@ -SHA256 (miniupnpc-1.9.tar.gz) = KSPkU+iAu5SePU2p+D3Ty28IlG013guGTQM5z3CTRGQ= -SIZE (miniupnpc-1.9.tar.gz) = 74230 +SHA256 (miniupnpc-2.1.tar.gz) = 4Z+14B6lpwfiqMuW9Tf72fOpE9U9gEoyZeOuqz0gZMY= +SIZE (miniupnpc-2.1.tar.gz) = 91914 Index: patches/patch-Makefile === RCS file: /cvs/ports/net/miniupnp/miniupnpc/patches/patch-Makefile,v retrieving revision 1.5 diff -u -p -r1.5 patch-Makefile --- patches/patch-Makefile 8 Dec 2018 22:11:40 - 1.5 +++ patches/patch-Makefile 7 Mar 2019 05:53:01 - @@ -1,43 +1,30 @@ -$OpenBSD: patch-Makefile,v 1.5 2018/12/08 22:11:40 ajacoutot Exp $ Makefile.orig Fri Jan 31 14:57:23 2014 -+++ Makefile Mon Feb 3 12:26:26 2014 -@@ -55,7 +55,7 @@ ifeq (SunOS, $(OS)) +$OpenBSD: patch-Makefile,v 1.5 2018/12/08 22:11:40 ajacoutot Exp $ Index: Makefile +Index: Makefile +--- Makefile.orig Makefile +@@ -69,7 +69,7 @@ ifneq (, $(findstring sun, $(OS))) endif # APIVERSION is used to build SONAME --APIVERSION = 10 -+APIVERSION ?= 10 +-APIVERSION = 17 ++APIVERSION ?= 17 SRCS = igd_desc_parse.c miniupnpc.c minixml.c minisoap.c miniwget.c \ upnpc.c upnpcommands.c upnpreplyparse.c testminixml.c \ -@@ -123,7 +123,7 @@ INSTALLPREFIX ?= $(PREFIX)/usr +@@ -149,7 +149,7 @@ endif INSTALLDIRINC = $(INSTALLPREFIX)/include/miniupnpc INSTALLDIRLIB = $(INSTALLPREFIX)/$(LIBDIR) INSTALLDIRBIN = $(INSTALLPREFIX)/bin -INSTALLDIRMAN = $(INSTALLPREFIX)/share/man +INSTALLDIRMAN = $(INSTALLPREFIX)/man + PKGCONFIGDIR = $(INSTALLDIRLIB)/pkgconfig FILESTOINSTALL = $(LIBRARY) $(EXECUTABLES) - ifneq ($(OS), AmigaOS) -@@ -144,11 +144,11 @@ check: validateminixml validateminiwget validateupnpre - everything: all $(EXECUTABLES_ADDTESTS) - - pythonmodule: $(LIBRARY) miniupnpcmodule.c setup.py -- python setup.py build -+ ${MODPY_BIN} setup.py build - touch $@ - - installpythonmodule: pythonmodule -- python setup.py install -+ ${MODPY_BIN} setup.py install --prefix=$(PREFIX) - - pythonmodule3:$(LIBRARY) miniupnpcmodule.c setup.py - python3 setup.py build -@@ -195,7 +195,6 @@ install: updateversion $(FILESTOINSTALL) +@@ -238,7 +238,6 @@ install: updateversion $(FILESTOINSTALL) $(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB) - ifneq ($(OS), AmigaOS) + ifeq (, $(findstring amiga, $(OS))) $(INSTALL) -m 644 $(SHAREDLIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/$(SONAME) - ln -fs $(SONAME) $(DESTDIR)$(INSTALLDIRLIB)/$(SHAREDLIBRARY) + $(INSTALL)
Re: [NEW/WIP] Qflow porting // [5/7] magic 8.1.224
I forgot to say that the port installs the "magic.1" man page; this isn't a real conflict with magic(5), but could be a bit confusing; please let me know if it is worth to change the man page name (is something like magic-vlsi more appropriate?) On 07/03/2019 06:12, Alessandro DE LAURENZIS wrote: Dear ports@ readers, this is a proposal for a new port: magic 8.1.224, a venerable VLSI layout tool, written in the 1980's at Berkeley by John Ousterhout (now famous primarily for Tcl), still very popular with universities and small companies, and an integral part of Qflow (not yet in the tree), where it is used as layout viewer and for parasitics extraction and DRC (but it can do a lot more). DESCR = Magic is an interactive system for creating and modifying VLSI circuit layouts. It is used to design basic cells and to combine them hierarchically into large structures. Magic understands quite a bit about the nature of circuits. It has built-in knowledge of layout rules; during editing, it continuously checks for rule violations. Magic also knows about connectivity and transistors, and contains a built-in hierarchical circuit extractor. It has a plow operation that permits to stretch or compact cells. Lastly, Magic has routing tools to make the circuit interconnections. Magic is based on the Mead-Conway style of design: it uses simplified design rules and circuit structures that make it easier layout drawing and permit Magic to provide powerful assistance, at the cost of slightly less dense circuits. There are 2 branches, distribution (8.1) and development (8.2); the former is now reasonably stable, and should be expected to work without undue issues; let's stay on that. Upstream configure script is a wrapper around the one actually generated by autoconf, so I used: CONFIGURE_STYLE = simple and patched it adding -std=c89 and -Wno-parentheses to CFLAGS, in order to get rid of the huge amount of Wimplicit-function-declaration and Wno-parentheses warnings. Upstream makefile has been patched in order to log errors and warnings to stdout. Other patches have essentially to do with termios functions; in particular, txGetTermState is not defined is OpenBSD; please carefully review what I made in patches/patch-textio_txInput_c, since I just tried to adapt some code found on the Internet used for similar situations; neither I really understand if those functions are actually needed when the Tcl/Tk version is used (this is the case for our port). Taking MAINTAINER, tarball attached. -- Alessandro DE LAURENZIS [mailto:jus...@atlantide.t28.net] Web: http://www.atlantide.t28.net LinkedIn: https://www.linkedin.com/in/delaurenzis/
[NEW/WIP] Qflow porting // [5/7] magic 8.1.224
Dear ports@ readers, this is a proposal for a new port: magic 8.1.224, a venerable VLSI layout tool, written in the 1980's at Berkeley by John Ousterhout (now famous primarily for Tcl), still very popular with universities and small companies, and an integral part of Qflow (not yet in the tree), where it is used as layout viewer and for parasitics extraction and DRC (but it can do a lot more). DESCR = Magic is an interactive system for creating and modifying VLSI circuit layouts. It is used to design basic cells and to combine them hierarchically into large structures. Magic understands quite a bit about the nature of circuits. It has built-in knowledge of layout rules; during editing, it continuously checks for rule violations. Magic also knows about connectivity and transistors, and contains a built-in hierarchical circuit extractor. It has a plow operation that permits to stretch or compact cells. Lastly, Magic has routing tools to make the circuit interconnections. Magic is based on the Mead-Conway style of design: it uses simplified design rules and circuit structures that make it easier layout drawing and permit Magic to provide powerful assistance, at the cost of slightly less dense circuits. There are 2 branches, distribution (8.1) and development (8.2); the former is now reasonably stable, and should be expected to work without undue issues; let's stay on that. Upstream configure script is a wrapper around the one actually generated by autoconf, so I used: CONFIGURE_STYLE = simple and patched it adding -std=c89 and -Wno-parentheses to CFLAGS, in order to get rid of the huge amount of Wimplicit-function-declaration and Wno-parentheses warnings. Upstream makefile has been patched in order to log errors and warnings to stdout. Other patches have essentially to do with termios functions; in particular, txGetTermState is not defined is OpenBSD; please carefully review what I made in patches/patch-textio_txInput_c, since I just tried to adapt some code found on the Internet used for similar situations; neither I really understand if those functions are actually needed when the Tcl/Tk version is used (this is the case for our port). Taking MAINTAINER, tarball attached. -- Alessandro DE LAURENZIS [mailto:jus...@atlantide.t28.net] Web: http://www.atlantide.t28.net LinkedIn: https://www.linkedin.com/in/delaurenzis/ magic.tar.gz Description: application/gzip
Re: update: shells/zsh 5.7.1
ping On Mon, Feb 4, 2019 at 5:59 PM Matthew Martin wrote: > > Bump zsh to 5.7.1 (5.7 had a bug in vcs_info). Tests pass (just the > usual failure in D07) and it's running fine here. > > Switch to CONFIGURE_STYLE=gnu since there are no autoconf patches > (reverting a change from 2004). The generated configure does indeed > match what we'd generate. > > Drop PORTHOME and TEST_FLAGS; the rationale from > shells/zsh/stable/Makefile 1.8 in 2001 was "allow target regress w/o > being root." The tests run fine without these variables now. > > Util/reporter and Util/check-tmux-state are not installed as can be > check with a quick grep against PLIST. Doc/zsh.texi isn't used to > generate docs as thankfully upstream provides generated docs. The > remainder of EXTFILES are all in Functions and intended to be > autoloaded. I think EXTFILES and pre-configure can be dropped, but the > commit message in 1.67 isn't clear on why they were added. > > I'm unable to send emails from mutt for some reason, so the diff is > attached as well in case gmail munges things. > > > diff --git Makefile Makefile > index 69b739e9334..098479dc707 100644 > --- Makefile > +++ Makefile > @@ -2,7 +2,7 @@ > > COMMENT= Z shell, Bourne shell-compatible > > -V= 5.6.2 > +V= 5.7.1 > DISTNAME= zsh-$V > CATEGORIES= shells > > @@ -23,8 +23,7 @@ WANTLIB= c curses iconv m pcre > LIB_DEPENDS= converters/libiconv \ > devel/pcre > > -AUTOCONF_VERSION=2.69 > -CONFIGURE_STYLE=autoconf > +CONFIGURE_STYLE=gnu > CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ > LDFLAGS="-L${LOCALBASE}/lib" > > @@ -39,25 +38,16 @@ CONFIGURE_ARGS= --enable-zsh-mem \ > > SUBST_VARS= V > > -# required for regression tests > -PORTHOME= ${WRKDIR} > -TEST_FLAGS= INSTALL_PROGRAM="install -c -s -m 555" \ > - INSTALL_DATA="install -c -m 444" \ > - INSTALL="install -c" \ > - TMPPREFIX=${WRKBUILD}/tmp \ > - TERM=xterm > - > -EXTFILES= Functions/Misc/checkmail Functions/Misc/run-help \ > - Functions/Misc/run-help-ip Functions/Misc/sticky-note \ > - Functions/Misc/zcalc Functions/Misc/zed Functions/Misc/zkbd \ > - Functions/Calendar/calendar_add Functions/Example/cat \ > - Functions/Example/zless Test/ztst.zsh Test/runtests.zsh \ > - Util/reporter Util/check-tmux-state Doc/zsh.texi > +EXTFILES= Calendar/calendar_add Example/cat Example/zless \ > + Misc/checkmail Misc/run-help \ > + Misc/run-help-ip \ > + Misc/sticky-note Misc/zcalc \ > + Misc/zed Misc/zkbd > > pre-configure: > .for i in ${EXTFILES} > sed -i -e "s,/bin/zsh,${TRUEPREFIX}/bin/zsh,g" \ > - ${WRKSRC}/${i} > + ${WRKSRC}/Functions/${i} > .endfor > > .include > diff --git distinfo distinfo > index 9e74544bf66..94271329f48 100644 > --- distinfo > +++ distinfo > @@ -1,2 +1,2 @@ > -SHA256 (zsh-5.6.2.tar.xz) = pQvWbAVX6OyjuPok6F0N5TPnddeiLfBC2pBIhiN1Lp4= > -SIZE (zsh-5.6.2.tar.xz) = 3077368 > +SHA256 (zsh-5.7.1.tar.xz) = cmApLCwdSDstUP6/pQVRdr1RKzKogzsRYXe/XwHnfug= > +SIZE (zsh-5.7.1.tar.xz) = 3126308 > diff --git pkg/PLIST pkg/PLIST > index c9376e94025..b8574c2abbd 100644 > --- pkg/PLIST > +++ pkg/PLIST > @@ -19,6 +19,7 @@ lib/zsh/${V}/zsh/files.so > lib/zsh/${V}/zsh/langinfo.so > lib/zsh/${V}/zsh/mapfile.so > lib/zsh/${V}/zsh/mathfunc.so > +lib/zsh/${V}/zsh/nearcolor.so > lib/zsh/${V}/zsh/net/ > lib/zsh/${V}/zsh/net/socket.so > lib/zsh/${V}/zsh/net/tcp.so > @@ -238,6 +239,7 @@ share/zsh/${V}/functions/Completion/Darwin/_scutil > share/zsh/${V}/functions/Completion/Darwin/_softwareupdate > share/zsh/${V}/functions/Completion/Darwin/_sw_vers > share/zsh/${V}/functions/Completion/Darwin/_system_profiler > +share/zsh/${V}/functions/Completion/Darwin/_xcode-select > share/zsh/${V}/functions/Completion/Debian/ > share/zsh/${V}/functions/Completion/Debian/_a2utils > share/zsh/${V}/functions/Completion/Debian/_apt > @@ -336,6 +338,7 @@ share/zsh/${V}/functions/Completion/Linux/_pkgtool > share/zsh/${V}/functions/Completion/Linux/_qdbus > share/zsh/${V}/functions/Completion/Linux/_rpmbuild > share/zsh/${V}/functions/Completion/Linux/_schedtool > +share/zsh/${V}/functions/Completion/Linux/_setsid > share/zsh/${V}/functions/Completion/Linux/_ss > share/zsh/${V}/functions/Completion/Linux/_sshfs > share/zsh/${V}/functions/Completion/Linux/_strace > @@ -399,6 +402,8 @@ share/zsh/${V}/functions/Completion/Unix/_arch_archives > share/zsh/${V}/functions/Completion/Unix/_arch_namespace > share/zsh/${V}/functions/Completion/Unix/_arp > share/zsh/${V}/functions/Completion/Unix/_arping > +share/zsh/${V}/functions/Completion/Unix/_asciidoctor > +share/zsh/${V}/functions/Completion/Unix/_asciinema > share/zsh/${V}/functions/Completion/Unix/_at > share/zsh/${V}/functions/Completion/Unix/_attr > share/zsh/${V}/functions/Completion/Unix/_augeas > @@ -439,6 +444,7 @@ share/zsh/${V}/functions/Completion/Unix/_cmdstring > share/zsh/${V}/functions/Completion/Unix/_cmp > share/zsh/${V}/functions/Completion/Unix/_column > share/zsh/${V}/functions/Completion/Unix/_comm > +share/zsh/${V}/functions/Completion/Unix/_compo
[UPDATE] devel/p5-Try-Tiny to 0.30
Looks like primarily documentation fixes, but it does run the "finally" block in more cases as well, which seems good. https://metacpan.org/changes/distribution/Try-Tiny I did switch p5-Sub-Name to a RUN_DEPENDS as it actually names things that way to improve stack traces. It would prefer Sub::Util, but we don't have that ported. I am OK leaving it out as it is an optional dependency and all my tests ran without it. No changes to reverse dependency test results, and local tests seem to pass. OK? Index: Makefile === RCS file: /cvs/ports/devel/p5-Try-Tiny/Makefile,v retrieving revision 1.13 diff -u -p -r1.13 Makefile --- Makefile20 Mar 2016 19:56:41 - 1.13 +++ Makefile7 Mar 2019 03:04:39 - @@ -4,7 +4,7 @@ COMMENT = minimal try/catch with proper MODULES = cpan PKG_ARCH = * -DISTNAME = Try-Tiny-0.22 +DISTNAME = Try-Tiny-0.30 CATEGORIES = devel MAINTAINER = Cesare Gargano @@ -12,9 +12,11 @@ MAINTAINER = Cesare Gargano =0 \ - sysutils/p5-Capture-Tiny>=0.12 +# An optional dependency, but useful +RUN_DEPENDS= devel/p5-Sub-Name + +TEST_DEPENDS = sysutils/p5-Capture-Tiny>=0.12 .include Index: distinfo === RCS file: /cvs/ports/devel/p5-Try-Tiny/distinfo,v retrieving revision 1.6 diff -u -p -r1.6 distinfo --- distinfo4 Jan 2015 22:23:11 - 1.6 +++ distinfo7 Mar 2019 03:04:39 - @@ -1,2 +1,2 @@ -SHA256 (Try-Tiny-0.22.tar.gz) = YPukb0aT0z1UU5EE+QAd8Ajau0ALaDfpYFw5pu5qGxk= -SIZE (Try-Tiny-0.22.tar.gz) = 18311 +SHA256 (Try-Tiny-0.30.tar.gz) = 2lvQ1ckDUZu/ELuboMt7ysBWOIK8/kUDruP7FD7d72s= +SIZE (Try-Tiny-0.30.tar.gz) = 34395
[UPDATE] devel/p5-Class-Accessor to 0.51
A good 8 years since the 0.34 release to this one, but it seems to be just a few patches to make things faster, plus some documentation fixes. The difference between 0.50 and 0.51 is they actually applied the speed improvement patches to 0.51. https://metacpan.org/changes/release/KASEI/Class-Accessor-0.51 OK? Index: Makefile === RCS file: /cvs/ports/devel/p5-Class-Accessor/Makefile,v retrieving revision 1.14 diff -u -p -r1.14 Makefile --- Makefile20 Mar 2016 19:56:14 - 1.14 +++ Makefile7 Mar 2019 02:47:10 - @@ -4,13 +4,13 @@ COMMENT= automated accessor generation MODULES= cpan PKG_ARCH= * -DISTNAME= Class-Accessor-0.34 -REVISION= 0 +DISTNAME= Class-Accessor-0.51 CATEGORIES=devel # perl PERMIT_PACKAGE_CDROM= Yes +# An optional dependency, but useful RUN_DEPENDS= devel/p5-Sub-Name .include Index: distinfo === RCS file: /cvs/ports/devel/p5-Class-Accessor/distinfo,v retrieving revision 1.10 diff -u -p -r1.10 distinfo --- distinfo18 Jan 2015 03:13:21 - 1.10 +++ distinfo7 Mar 2019 02:47:10 - @@ -1,2 +1,2 @@ -SHA256 (Class-Accessor-0.34.tar.gz) = zbHgzfg4D7m2O0TDPOWvwQaHNtVaxZBL8Oqh78HDzvw= -SIZE (Class-Accessor-0.34.tar.gz) = 12315 +SHA256 (Class-Accessor-0.51.tar.gz) = vxKj5d5aLG6KRHs2T09aBQv3RiTFbjFQIq55kv8vQRw= +SIZE (Class-Accessor-0.51.tar.gz) = 13013
[UPDATE] mail/p5-Email-Address to 1.912
This updates p5-Email-Address which fixes a CVE, no other changes and no apparent fallout in dependent ports. https://metacpan.org/changes/release/RJBS/Email-Address-1.912 Stuart, you're welcome to commit it if you want. The docs say: > Version 1.909 and earlier of this module had vulnerabilies > (CVE-2015-7686) and (CVE-2015-12558) which allowed specially > constructed email to cause a denial of service. The reported > vulnerabilities and some other pathalogical cases (meaning they really > shouldn't occur in normal email) have been addressed in version 1.910 > and newer. If you're running version 1.909 or older, you should > update! OK? Comments? Index: Makefile === RCS file: /cvs/ports/mail/p5-Email-Address/Makefile,v retrieving revision 1.14 diff -u -p -r1.14 Makefile --- Makefile20 Jun 2018 16:17:56 - 1.14 +++ Makefile7 Mar 2019 02:26:00 - @@ -4,7 +4,7 @@ COMMENT=RFC 2822 address parsing and cr MODULES= cpan PKG_ARCH= * -DISTNAME= Email-Address-1.909 +DISTNAME= Email-Address-1.912 CATEGORIES=mail MAINTAINER=Stuart Henderson Index: distinfo === RCS file: /cvs/ports/mail/p5-Email-Address/distinfo,v retrieving revision 1.11 diff -u -p -r1.11 distinfo --- distinfo20 Jun 2018 16:17:56 - 1.11 +++ distinfo7 Mar 2019 02:26:00 - @@ -1,2 +1,2 @@ -SHA256 (Email-Address-1.909.tar.gz) = byxTJ1FxjrXjANKV+xhpXZUldH07ufLdcy5JA6g2/VA= -SIZE (Email-Address-1.909.tar.gz) = 41490 +SHA256 (Email-Address-1.912.tar.gz) = D6N4UpjML2eA5j46X7HKgU3Lw2DOtZ7Y+oTrT/oG+e8= +SIZE (Email-Address-1.912.tar.gz) = 42390
Re: NEW security/hcxtools
Am Montag, Februar 04, 2019 22:27 CET, "Sebastian Reitenbach" schrieb: > anyone? > > Am Donnerstag, Januar 31, 2019 14:11 CET, "Sebastian Reitenbach" > schrieb: > > > Small set of tools to convert packets from captures (h = hash, c = capture, > > convert and calculate candidates, x = different hashtypes) for the use > > with latest hashcat or John the Ripper. The tools are 100% compatible to > > hashcat and John the Ripper and recommended by hashcat. > > > > Note that all the patches are already merged upstream. > > > > any comments, notes, or even OK? meanwhile update to 5.1.3, all patches merged upstream. tested and works for me on amd64 and i386. any comments, rants, tests or even OK? cheers, Sebastian > > > > cheers, > > Sebastian hcxtools.tar.gz Description: application/gzip
Re: UPDATE: productivity/calcurse 4.4.0
On 2019/03/06 20:26, Mikolaj Kucharski wrote: > Hi Frederic, > > On Wed, Mar 06, 2019 at 08:22:37PM +0100, Frederic Culot wrote: > > Hi Mikolaj, > > > > and sorry for my late reply. > > Unfortunately I do not have access to an OpenBSD box anymore, so I could > > not give you any relevant feedback on your update, sorry for that. > > I see I am still mentioned as the maitainer for calcurse, but I already > > said to one of the previous committer that I was not the good person to > > maintain this port, so it might be better to switch to a new maintainer. > > Sure, no problem. I can remove you as a maintainer in my diff. New > patch below without any maintainer. I've committed the maintainer change, wantlib sync, https HOMEPAGE parts. > My initial email with detailed information about calcurse update here: > > https://marc.info/?l=openbsd-ports&m=155136072617184&w=2 :: In terms of patches which are dropped: :: :: - KEY_ENTER patch, upstream commit 6cd67311e30c2dc3c138f339b536679ad1a8d5f4 :: - DAY_HEADING_DEFAULT patch, upstream commit 0bbe802002c660dd9d555d557ce8daa7c5d681b9 :: - calcurse-caldav already has `/usr/bin/env python3` shebang line :: - notify.c patch, upstream commit 30f411257ad3bc233184c08b846a2980a9c5d1f0 :: - utils.c, upstream migrated functions from long to time_t Now there is a mixture of long and time_t all over the place and I don't have a warm fuzzy feeling that it's correct. It's a lot easier to spot these problems now we're building with clang, and the compiler agrees with me that there are problems (some of them new since the patched 4.3.0): -- cc -DLOCALEDIR=\"/usr/local/share/locale\" -DHAVE_CONFIG_H -I. -I.. -DDOCDIR=\"/usr/local/share/doc/calcurse\" -I/usr/local/include -std=c99 -pedantic -D_POSIX_C_SOURCE=200809L -O2 -pipe -Wall -MT day.o -MD -MP -MF .deps/day.Tpo -c -o day.o day.c day.c:690:4: warning: incompatible pointer types passing 'time_t *' (aka 'long long *') to parameter of type 'long *' [-Wincompatible-pointer-types] &until) ^~ ./calcurse.h:1206:37: note: passing argument to parameter here long overflow_add(long, long, long *); ^ day.c:707:4: warning: incompatible pointer types passing 'time_t *' (aka 'long long *') to parameter of type 'long *' [-Wincompatible-pointer-types] &until) ^~ ./calcurse.h:1206:37: note: passing argument to parameter here long overflow_add(long, long, long *); ^ 2 warnings generated. -- cc -DLOCALEDIR=\"/usr/local/share/locale\" -DHAVE_CONFIG_H -I. -I.. -DDOCDIR=\"/usr/local/share/doc/calcurse\" -I/usr/local/include -std=c99 -pedantic -D_POSIX_C_SOURCE=200809L -O2 -pipe -Wall -MT utils.o -MD -MP -MF .deps/utils.Tpo -c -o utils.o utils.c utils.c:1030:30: warning: incompatible pointer types passing 'time_t *' (aka 'long long *') to parameter of type 'long *' [-Wincompatible-pointer-types] if (overflow_add(start, p, &start)) ^~ ./calcurse.h:1206:37: note: passing argument to parameter here long overflow_add(long, long, long *); ^ utils.c:1253:30: warning: incompatible pointer types passing 'time_t *' (aka 'long long *') to parameter of type 'long *' [-Wincompatible-pointer-types] if (overflow_add(*ts, dur, &sec)) ^~~~ ./calcurse.h:1206:37: note: passing argument to parameter here long overflow_add(long, long, long *); ^ 2 warnings generated. -- The portable way to fix this is to use time_t for time values everywhere and when printing with printf, use a long long format, and cast the variable to 64-bit. e.g. << printf("%lld", (long long)timevar); >> It needs testing with use of as many features as possible on a 32-bit arch with 64-bit time_t (OpenBSD and afaik NetBSD do for all arches - most other OS still use 32-bit time_t for i386 even if they have 64-bit for newer arches like arm). Here's the diff to bring back your update on top of what I already committed. Index: Makefile === RCS file: /cvs/ports/productivity/calcurse/Makefile,v retrieving revision 1.28 diff -u -p -r1.28 Makefile --- Makefile6 Mar 2019 21:24:37 - 1.28 +++ Makefile6 Mar 2019 21:29:14 - @@ -1,9 +1,8 @@ # $OpenBSD: Makefile,v 1.28 2019/03/06 21:24:37 sthen Exp $ COMMENT= text-based calendar and scheduling application -DISTNAME= calcurse-4.3.0 -REVISION= 3 +DISTNAME= calcurse-4.4.0 EPOCH= 0 CATEGORIES=productivity @@ -27,5 +26,7 @@ MODPY_VERSION=${MODPY_DEFAULT_VERSION_3 CONFIGURE_STYLE=gnu CONFIGURE_ARGS=--without-asciidoc + +USE_GMAKE= Yes .include Index: distinfo ==
Re: UPDATE: productivity/calcurse 4.4.0
Hi Frederic, On Wed, Mar 06, 2019 at 08:22:37PM +0100, Frederic Culot wrote: > Hi Mikolaj, > > and sorry for my late reply. > Unfortunately I do not have access to an OpenBSD box anymore, so I could > not give you any relevant feedback on your update, sorry for that. > I see I am still mentioned as the maitainer for calcurse, but I already > said to one of the previous committer that I was not the good person to > maintain this port, so it might be better to switch to a new maintainer. Sure, no problem. I can remove you as a maintainer in my diff. New patch below without any maintainer. My initial email with detailed information about calcurse update here: https://marc.info/?l=openbsd-ports&m=155136072617184&w=2 Index: Makefile === RCS file: /cvs/ports/productivity/calcurse/Makefile,v retrieving revision 1.27 diff -u -p -u -r1.27 Makefile --- Makefile4 Feb 2019 17:44:43 - 1.27 +++ Makefile6 Mar 2019 19:48:07 - @@ -2,20 +2,17 @@ COMMENT= text-based calendar and scheduling application -DISTNAME= calcurse-4.3.0 -REVISION= 2 +DISTNAME= calcurse-4.4.0 EPOCH= 0 CATEGORIES=productivity -MAINTAINER=Frederic Culot - -HOMEPAGE= http://calcurse.org/ +HOMEPAGE= https://calcurse.org/ # BSD PERMIT_PACKAGE_CDROM= Yes -WANTLIB += c iconv intl m ncursesw pthread +WANTLIB += c curses iconv intl m pthread MASTER_SITES= ${HOMEPAGE}files/ @@ -29,5 +26,7 @@ MODPY_VERSION=${MODPY_DEFAULT_VERSION_3 CONFIGURE_STYLE=gnu CONFIGURE_ARGS=--without-asciidoc + +USE_GMAKE= Yes .include Index: distinfo === RCS file: /cvs/ports/productivity/calcurse/distinfo,v retrieving revision 1.18 diff -u -p -u -r1.18 distinfo --- distinfo12 Nov 2017 14:01:26 - 1.18 +++ distinfo6 Mar 2019 19:48:07 - @@ -1,2 +1,2 @@ -SHA256 (calcurse-4.3.0.tar.gz) = MezD3Anh5WFQK0yU+WXtaxZ8A+lBhDjEp61brSx4X5o= -SIZE (calcurse-4.3.0.tar.gz) = 597490 +SHA256 (calcurse-4.4.0.tar.gz) = 7cvJ283+OrpDrHC41olfsP9KNk34l2LRyjBToUzsgm8= +SIZE (calcurse-4.4.0.tar.gz) = 620263 Index: patches/patch-contrib_caldav_calcurse-caldav === RCS file: patches/patch-contrib_caldav_calcurse-caldav diff -N patches/patch-contrib_caldav_calcurse-caldav --- patches/patch-contrib_caldav_calcurse-caldav12 Nov 2017 14:01:26 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,11 +0,0 @@ -$OpenBSD: patch-contrib_caldav_calcurse-caldav,v 1.1 2017/11/12 14:01:26 fcambus Exp $ - -Index: contrib/caldav/calcurse-caldav contrib/caldav/calcurse-caldav.orig -+++ contrib/caldav/calcurse-caldav -@@ -1,4 +1,4 @@ --#!/usr/bin/python3 -+#!/usr/bin/env python3 - - import argparse - import base64 Index: patches/patch-src_args_c === RCS file: /cvs/ports/productivity/calcurse/patches/patch-src_args_c,v retrieving revision 1.2 diff -u -p -u -r1.2 patch-src_args_c --- patches/patch-src_args_c28 Apr 2016 14:26:13 - 1.2 +++ patches/patch-src_args_c6 Mar 2019 19:48:07 - @@ -1,7 +1,16 @@ $OpenBSD: patch-src_args_c,v 1.2 2016/04/28 14:26:13 ajacoutot Exp $ src/args.c.origSun Mar 27 12:26:18 2016 -+++ src/args.c Thu Apr 28 16:23:45 2016 -@@ -225,10 +225,11 @@ static void next_arg(void) + +Author: sthen +Date: Wed Oct 14 10:04:16 2015 + + +Fix date output in calcurse 'one-shot' mode ('-d' or '-Q --filter-type cal +--days') on 32-bit arch following 64-bit time_t. Reported by Raf Czlonka, +ok ajacoutot@ + +Index: src/args.c +--- src/args.c.orig src/args.c +@@ -248,10 +248,11 @@ static void next_arg(void) /* * Print the date on stdout. */ Index: patches/patch-src_calcurse_h === RCS file: patches/patch-src_calcurse_h diff -N patches/patch-src_calcurse_h --- patches/patch-src_calcurse_h1 Feb 2019 22:56:46 - 1.2 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,17 +0,0 @@ -$OpenBSD: patch-src_calcurse_h,v 1.2 2019/02/01 22:56:46 sthen Exp $ - -Fix date display in calendar, the %-* format string is a GNU libc -extension which is not supported by strftime(3) on OpenBSD. - -Index: src/calcurse.h src/calcurse.h.orig -+++ src/calcurse.h -@@ -302,7 +302,7 @@ enum datefmt { - (datefmt == DATEFMT_MMDD ? _("/mm/dd") : _("-mm-dd" - - /* Day heading default format. */ --#define DAY_HEADING_DEFAULT "%B %-d, %Y" -+#define DAY_HEADING_DEFAULT "%B %d, %Y" - - struct date { - unsigned dd; Index: patches/patch-src_getstring_c === RCS file: patches/patch-src_getstring_c diff -N patches/patch-src_getstring_c --- patches/patch-src_getstring_c 19 Oct 2018 14:19:59 - 1.1 +++
Re: new: graphics/py-pygal
On Sun, 6 Jan 2019 15:09:40 +0100, Sebastien Marie wrote: > I was not able to enable the test suite on the port. It requires > several dependencies not packaged. Maybe you can add them as a comment so it's easier to know which are missing. Not a strong opinion on this though. > Any comments or OK ? I don't really like when it's not vertically aligned but since you're taking maintainership, it's up to you :) And finally, the "bin" conflicts so you need to rename it. Not sure about using the usual MODPY_BIN_SUFFIX since foo.py-3 is a bit ugly. OTOH net/py-websocket-client and textproc/py-markdown do that. I'll let you choose how you want to rename the "binary" :) ok danj@ once you're happy with it (I can review another time if you want but feel free to just go ahead).
Re: new: graphics/py-pygal
reping On Thu, Jan 24, 2019 at 12:04:05PM +0100, Sebastien Marie wrote: > ping ? > > On Sun, Jan 06, 2019 at 03:09:39PM +0100, Sebastien Marie wrote: > > Hi, > > > > Here a new python port: graphics/py-pygal > > > > http://pygal.org/en/stable/ > > > > It is an optional dependency for a tryton module (sale). > > > > pygal is a python svg graph plotting library. > > > > it provides various kinds of charts: > > - Line > > - Bar > > - Histogram > > - XY > > - Pie > > - Radar > > - Box > > - Dot > > - Funnel > > - SolidGauge > > - Gauge > > - Pyramid > > - Treemap > > - Maps > > > > I was not able to enable the test suite on the port. It requires several > > dependencies not packaged. > > > > Another thing surprised me: it seems that devel/py-test-runner is > > required to build. I dunno if it is usual or not. > > > > Any comments or OK ? > > > > Thanks. -- Sebastien Marie py-pygal.tgz Description: application/tar-gz
Re: update: weboob 1.4
reping. and diff reattached just in case... On Sun, Feb 10, 2019 at 03:26:57PM +0100, Sebastien Marie wrote: > Hi, > > Here an update for weboob to 1.4. > > While here, taking maintainership. > > Comments or OK ? > -- > Sebastien Marie Index: Makefile === RCS file: /cvs/ports/www/weboob/Makefile,v retrieving revision 1.9 diff -u -p -r1.9 Makefile --- Makefile29 Jun 2018 22:16:22 - 1.9 +++ Makefile6 Mar 2019 18:25:25 - @@ -2,16 +2,18 @@ COMMENT = web out of browsers -MODPY_EGG_VERSION =1.3 +MODPY_EGG_VERSION =1.4 DISTNAME = weboob-${MODPY_EGG_VERSION} CATEGORIES = www -HOMEPAGE = http://weboob.org +HOMEPAGE = https://weboob.org + +MAINTAINER = Sebastien Marie # AGPLv3+ PERMIT_PACKAGE_CDROM = Yes -MASTER_SITES = https://symlink.me/attachments/download/356/ +MASTER_SITES = https://git.weboob.org/weboob/weboob/-/archive/${MODPY_EGG_VERSION}/ MODULES = lang/python @@ -28,7 +30,6 @@ RUN_DEPENDS +=devel/desktop-file-utils x11/gtk+3,-guic \ converters/py-html2text${MODPY_FLAVOR} \ devel/py-dateutil${MODPY_FLAVOR} \ - devel/py-html5lib${MODPY_FLAVOR} \ devel/py-simplejson${MODPY_FLAVOR} \ devel/py-six${MODPY_FLAVOR} \ graphics/py-Pillow${MODPY_FLAVOR} \ @@ -39,6 +40,7 @@ RUN_DEPENDS +=devel/desktop-file-utils textproc/py-prettytable${MODPY_FLAVOR} \ textproc/py-yaml${MODPY_FLAVOR} \ textproc/py-cssselect${MODPY_FLAVOR} \ + textproc/py-unidecode${MODPY_FLAVOR} \ www/py-requests${MODPY_FLAVOR} \ x11/py-qt5${MODPY_FLAVOR} @@ -50,17 +52,17 @@ TEST_DEPENDS += ${RUN_DEPENDS} \ .if ${FLAVOR:Mpython3} PKGNAME = weboob${MODPY_MAJOR_VERSION}-${MODPY_EGG_VERSION} .else -RUN_DEPENDS += devel/py-futures \ - www/py-mechanize +RUN_DEPENDS += devel/py-futures .endif -REVISION = 1 MAKE_ENV +=PYUIC5_EXECUTABLE=${LOCALBASE}/bin/pyuic5${MODPY_BIN_SUFFIX} WEBOOB_BINARIES = boobank boobathon boobcoming boobill booblyrics boobmsg \ + boomoney \ boobooks boobsize boobtracker cineoob comparoob cookboob \ flatboob galleroob geolooc handjoob havedate monboob \ - parceloob pastoob qbooblyrics qboobmsg qcineoob qcookboob \ + parceloob pastoob qbooblyrics qboobmsg \ + qgalleroob qboobtracker qcineoob qcookboob \ qflatboob qhandjoob qhavedate qvideoob qwebcontentedit \ radioob shopoob suboob translaboob traveloob videoob \ webcontentedit weboob weboob-cli weboob-config \ @@ -101,6 +103,7 @@ do-test: cd ${WRKSRC} && exec ${SETENV} ${MAKE_ENV} \ LC_CTYPE=C.UTF-8 \ WEBOOB_WORKDIR="${WRKDIR}/weboob-workdir" \ - ./tools/run_tests.sh ${MODPY_BIN_SUFFIX} + PYTHON="${MODPY_BIN}" \ + ./tools/run_tests.sh --no-modules .include Index: distinfo === RCS file: /cvs/ports/www/weboob/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo20 May 2018 07:17:34 - 1.2 +++ distinfo6 Mar 2019 18:25:25 - @@ -1,2 +1,2 @@ -SHA256 (weboob-1.3.tar.gz) = yZF4XIiYd8dvGNGeNy7Urgw/i4Gf0ejaKWvTSxOBvlQ= -SIZE (weboob-1.3.tar.gz) = 2688899 +SHA256 (weboob-1.4.tar.gz) = EPsp1gnbHXJ0fQOu6Tlpkwfxu1dsiE6tOyabbUj+PXU= +SIZE (weboob-1.4.tar.gz) = 2790295 Index: patches/patch-setup_py === RCS file: /cvs/ports/www/weboob/patches/patch-setup_py,v retrieving revision 1.2 diff -u -p -r1.2 patch-setup_py --- patches/patch-setup_py 20 May 2018 07:17:34 - 1.2 +++ patches/patch-setup_py 6 Mar 2019 18:25:25 - @@ -2,12 +2,12 @@ $OpenBSD: patch-setup_py,v 1.2 2018/05/2 Index: setup.py --- setup.py.orig +++ setup.py -@@ -117,7 +117,7 @@ def install_weboob(): +@@ -133,7 +133,7 @@ def install_weboob(qt, xdg): packages = packages - qt_packages data_files = [ -('share/man/man1', glob.glob('man/*')), +('man/man1', glob.glob('man/*')), ] - if options.xdg: + if xdg: data_files.extend([ Index: patches/patch-tools_run_tests_sh === RCS file: patches/patch-tools_run_tests_sh diff -N patches/patch-tools_run_tests_sh --- patches/patch-tools_run_tests_sh20 May 2018 07:17:34 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,21 +0,0 @@ -$OpenBSD: patch-tools_run_tests_sh,v 1.1 2018/05/20 07:17:34 landry Exp $ -search bash in PATH: https://git.weboob.org/weboob/devel/commit/1fb226ada13d499751549dd05f052ddfec294ddf -mktemp wants at least 6 'X'
Re: Port versions.
On Wed, Mar 06, 2019 at 11:55:21AM -0500, Jeremy wrote: > Under 'Security Updates (-stable)' in > https://www.openbsd.org/faq/ports/ports.html > > ... it states the OpenBSD policy on ports. But the current > stable has ports which are out of date and some have know bugs. > (example: PHP 7.2.10 ). > Aside from compiling it yourself, is there a way to get more current > ports from -current ? The packages available at /packages// are -release packages, they are not -stable. The Project does not currently build -stable packages due to resource constraints. To use -stable packages (e.g.: PHP 7.2.13), you must build them yourself or obtain them from a third party such as mtier.org. Another option is to use -current. The Project builds -current packages for popular architectures.
Port versions.
Under 'Security Updates (-stable)' in https://www.openbsd.org/faq/ports/ports.html ... it states the OpenBSD policy on ports. But the current stable has ports which are out of date and some have know bugs. (example: PHP 7.2.10 ). Aside from compiling it yourself, is there a way to get more current ports from -current ? Policy from website: "When serious bugs or security flaws are discovered in third party software, they are fixed in the -stable branch of the ports tree. In contrast to the base system, the -stable ports tree only gets security backports for the latest release. This means that all you need to do is make sure you check out the correct branch of the ports tree, and build the desired software from it. You can keep your tree up to date with CVS and subscribe to the ports-changes mailing list to receive security announcements related to software in the ports tree."
Re: mail/mblaze: Update to 0.5.1
On Wed, Mar 06, 2019 at 04:08:23PM +, sunil+po...@nimmagadda.net wrote: > -VERSION =0.5 > +VERSION =0.5.1 > DISTNAME = mblaze-${VERSION} > -GH_ACCOUNT = chneukirchen > +GH_ACCOUNT = leahneukirchen > GH_PROJECT = mblaze > GH_TAGNAME = v${VERSION} > CATEGORIES = mail DISTNAME and VERSION can go, just use GH_*. With that OK kn
Re: FIX: sigsegv lftp-4.8.4p1
On Wed, Mar 06, 2019 at 04:09:23PM +0100, Jeremie Courreges-Anglas wrote: > On Wed, Mar 06 2019, Stuart Henderson wrote: > > On 2019/03/06 13:31, Mikolaj Kucharski wrote: > >> Ping. > > > > After 2 days? Really?! > > +1 Yeah, sorry. That was way to soon. I understand everyone is busy and couple of days it's not enough time to get feedback. > >> On Mon, Mar 04, 2019 at 01:09:11PM +, Mikolaj Kucharski wrote: > >> > Hi, > >> > > >> > I've put most of the details in > >> > > >> > https://github.com/lavv17/lftp/issues/511 > >> > > >> > but basically this avoids segfault which I triggered by accident. > >> > Patch is accepted by upstream and already merged. > > The commit is > > > https://github.com/lavv17/lftp/commit/66426abe60ef0f8a1be905f171b1281c6b59d138 > > which apparently fixes your problem. It does not include the hunk below... Yeah that hunk below is 1f22423244c3867fec745cf0c04cd636e10970a2 and it's commit message is a bit confusing, as it's not error handling but just a log message, to understand better that something went wrong. > >> > +--- src/Torrent.cc.orig > >> > src/Torrent.cc > >> > +@@ -3830,7 +3830,8 @@ int TorrentListener::Do() > >> > + } > >> > +bound: > >> > + if(type==SOCK_STREAM) > >> > +-listen(sock,5); > >> > ++if(listen(sock,5) < 0) > >> > ++ LogError(0,"listen failed: %s", strerror(errno)); > > ... this may be an improvement but the code that follows still looks > incorrect in the failure case, so I'm reluctant to include it in the > ports tree. Thoughts? Sure, I can drop it. That change is from upstream. I didn't consider it as a more work for future work on the port and doesn't seem risky change in terms of stability of the app, but may help to understand that something doesn't work within the app. Anyway. Updated diff below, with only change which I found helpful to me. Index: Makefile === RCS file: /cvs/ports/net/lftp/Makefile,v retrieving revision 1.123 diff -u -p -u -r1.123 Makefile --- Makefile24 Oct 2018 14:28:08 - 1.123 +++ Makefile6 Mar 2019 15:44:57 - @@ -4,7 +4,7 @@ COMMENT=shell-like command line ftp and DISTNAME= lftp-4.8.4 CATEGORIES=net -REVISION= 0 +REVISION= 1 HOMEPAGE= https://lftp.tech/ Index: patches/patch-doc_lftp_1 === RCS file: /cvs/ports/net/lftp/patches/patch-doc_lftp_1,v retrieving revision 1.3 diff -u -p -u -r1.3 patch-doc_lftp_1 --- patches/patch-doc_lftp_113 Aug 2018 14:36:41 - 1.3 +++ patches/patch-doc_lftp_16 Mar 2019 15:44:57 - @@ -1,5 +1,8 @@ $OpenBSD: patch-doc_lftp_1,v 1.3 2018/08/13 14:36:41 rsadowski Exp $ +- avoid information loss in both groff and mandoc + upstream commit 57b7098a4e0a7d3e7609ef3b2fb00b500df7a060 + Index: doc/lftp.1 --- doc/lftp.1.orig +++ doc/lftp.1 Index: patches/patch-src_Torrent_cc === RCS file: patches/patch-src_Torrent_cc diff -N patches/patch-src_Torrent_cc --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-src_Torrent_cc6 Mar 2019 15:44:57 - @@ -0,0 +1,17 @@ +$OpenBSD$ + +- In MaySendUDP() handle case when socket may not be available yet + Upstream commit 66426abe60ef0f8a1be905f171b1281c6b59d138 + +Index: src/Torrent.cc +--- src/Torrent.cc.orig src/Torrent.cc +@@ -3904,6 +3905,8 @@ bool TorrentListener::MaySendUDP() + last_sent_udp_count=0; + last_sent_udp=now; +} ++ if (sock==-1) ++ return false; +// check if output buffer is available +struct pollfd pfd; +pfd.fd=sock; -- Regards, Mikolaj
mail/mblaze: Update to 0.5.1
Hi, This is a minor update with the following changelog... * mdeliver: preserve mtime in mrefile * mdirs: add -0 to separate folders by NUL characters * Fixes for buffer-overflows, found by fuzzing. * Fixes for memleaks. PS: Upstream has renamed github account, using the new GH_ACCOUNT prevents a HTTP redirect. Ok? Index: Makefile === RCS file: /cvs/ports/mail/mblaze/Makefile,v retrieving revision 1.5 diff -u -p -r1.5 Makefile --- Makefile12 Feb 2019 14:27:35 - 1.5 +++ Makefile6 Mar 2019 14:55:07 - @@ -2,9 +2,9 @@ COMMENT = set of Maildir utilities -VERSION = 0.5 +VERSION = 0.5.1 DISTNAME = mblaze-${VERSION} -GH_ACCOUNT = chneukirchen +GH_ACCOUNT = leahneukirchen GH_PROJECT = mblaze GH_TAGNAME = v${VERSION} CATEGORIES = mail Index: distinfo === RCS file: /cvs/ports/mail/mblaze/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- distinfo12 Feb 2019 14:27:35 - 1.4 +++ distinfo6 Mar 2019 14:44:09 - @@ -1,2 +1,2 @@ -SHA256 (mblaze-0.5.tar.gz) = Myec8PRowD0y6MH44FbPFwBewwISY0FQv+DZDG5Pkm4= -SIZE (mblaze-0.5.tar.gz) = 90587 +SHA256 (mblaze-0.5.1.tar.gz) = XZ0FFQcsFZb4NLIRGncL8aDRxCpD3ySJ+OQuwx90uVM= +SIZE (mblaze-0.5.1.tar.gz) = 91134
Re: FIX: sigsegv lftp-4.8.4p1
On Wed, Mar 06 2019, Stuart Henderson wrote: > On 2019/03/06 13:31, Mikolaj Kucharski wrote: >> Ping. > > After 2 days? Really?! +1 >> On Mon, Mar 04, 2019 at 01:09:11PM +, Mikolaj Kucharski wrote: >> > Hi, >> > >> > I've put most of the details in >> > >> >https://github.com/lavv17/lftp/issues/511 >> > >> > but basically this avoids segfault which I triggered by accident. >> > Patch is accepted by upstream and already merged. The commit is https://github.com/lavv17/lftp/commit/66426abe60ef0f8a1be905f171b1281c6b59d138 which apparently fixes your problem. It does not include the hunk below... >> > Index: Makefile >> > === >> > RCS file: /cvs/ports/net/lftp/Makefile,v >> > retrieving revision 1.123 >> > diff -u -p -u -r1.123 Makefile >> > --- Makefile 24 Oct 2018 14:28:08 - 1.123 >> > +++ Makefile 4 Mar 2019 12:37:56 - >> > @@ -4,7 +4,7 @@ COMMENT= shell-like command line ftp and >> > >> > DISTNAME= lftp-4.8.4 >> > CATEGORIES= net >> > -REVISION= 0 >> > +REVISION= 1 >> > >> > HOMEPAGE= https://lftp.tech/ >> > >> > Index: patches/patch-doc_lftp_1 >> > === >> > RCS file: /cvs/ports/net/lftp/patches/patch-doc_lftp_1,v >> > retrieving revision 1.3 >> > diff -u -p -u -r1.3 patch-doc_lftp_1 >> > --- patches/patch-doc_lftp_1 13 Aug 2018 14:36:41 - 1.3 >> > +++ patches/patch-doc_lftp_1 4 Mar 2019 12:37:56 - >> > @@ -1,5 +1,8 @@ >> > $OpenBSD: patch-doc_lftp_1,v 1.3 2018/08/13 14:36:41 rsadowski Exp $ >> > >> > +- avoid information loss in both groff and mandoc >> > + upstream commit 57b7098a4e0a7d3e7609ef3b2fb00b500df7a060 >> > + >> > Index: doc/lftp.1 >> > --- doc/lftp.1.orig >> > +++ doc/lftp.1 >> > Index: patches/patch-src_Torrent_cc >> > === >> > RCS file: patches/patch-src_Torrent_cc >> > diff -N patches/patch-src_Torrent_cc >> > --- /dev/null 1 Jan 1970 00:00:00 - >> > +++ patches/patch-src_Torrent_cc 4 Mar 2019 12:37:56 - >> > @@ -0,0 +1,30 @@ >> > +$OpenBSD$ >> > + >> > +- In MaySendUDP() handle case when socket may not be available yet >> > + Upstream commit 66426abe60ef0f8a1be905f171b1281c6b59d138 >> > + >> > +- Add error handling for listen >> > + Upstream commit 1f22423244c3867fec745cf0c04cd636e10970a2 >> > + >> > +Index: src/Torrent.cc >> > +--- src/Torrent.cc.orig >> > src/Torrent.cc >> > +@@ -3830,7 +3830,8 @@ int TorrentListener::Do() >> > + } >> > +bound: >> > + if(type==SOCK_STREAM) >> > +- listen(sock,5); >> > ++ if(listen(sock,5) < 0) >> > ++ LogError(0,"listen failed: %s", strerror(errno)); ... this may be an improvement but the code that follows still looks incorrect in the failure case, so I'm reluctant to include it in the ports tree. Thoughts? >> > + >> > + // get the allocated port >> > + socklen_t addr_len=sizeof(addr); >> > +@@ -3904,6 +3905,8 @@ bool TorrentListener::MaySendUDP() >> > + last_sent_udp_count=0; >> > + last_sent_udp=now; >> > +} >> > ++ if (sock==-1) >> > ++ return false; >> > +// check if output buffer is available >> > +struct pollfd pfd; >> > +pfd.fd=sock; >> > >> >> -- >> Regards, >> Mikolaj >> > -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: FIX: sigsegv lftp-4.8.4p1
On 2019/03/06 13:31, Mikolaj Kucharski wrote: > Ping. After 2 days? Really?! > On Mon, Mar 04, 2019 at 01:09:11PM +, Mikolaj Kucharski wrote: > > Hi, > > > > I've put most of the details in > > > > https://github.com/lavv17/lftp/issues/511 > > > > but basically this avoids segfault which I triggered by accident. > > Patch is accepted by upstream and already merged. > > > > > > Index: Makefile > > === > > RCS file: /cvs/ports/net/lftp/Makefile,v > > retrieving revision 1.123 > > diff -u -p -u -r1.123 Makefile > > --- Makefile24 Oct 2018 14:28:08 - 1.123 > > +++ Makefile4 Mar 2019 12:37:56 - > > @@ -4,7 +4,7 @@ COMMENT=shell-like command line ftp and > > > > DISTNAME= lftp-4.8.4 > > CATEGORIES=net > > -REVISION= 0 > > +REVISION= 1 > > > > HOMEPAGE= https://lftp.tech/ > > > > Index: patches/patch-doc_lftp_1 > > === > > RCS file: /cvs/ports/net/lftp/patches/patch-doc_lftp_1,v > > retrieving revision 1.3 > > diff -u -p -u -r1.3 patch-doc_lftp_1 > > --- patches/patch-doc_lftp_113 Aug 2018 14:36:41 - 1.3 > > +++ patches/patch-doc_lftp_14 Mar 2019 12:37:56 - > > @@ -1,5 +1,8 @@ > > $OpenBSD: patch-doc_lftp_1,v 1.3 2018/08/13 14:36:41 rsadowski Exp $ > > > > +- avoid information loss in both groff and mandoc > > + upstream commit 57b7098a4e0a7d3e7609ef3b2fb00b500df7a060 > > + > > Index: doc/lftp.1 > > --- doc/lftp.1.orig > > +++ doc/lftp.1 > > Index: patches/patch-src_Torrent_cc > > === > > RCS file: patches/patch-src_Torrent_cc > > diff -N patches/patch-src_Torrent_cc > > --- /dev/null 1 Jan 1970 00:00:00 - > > +++ patches/patch-src_Torrent_cc4 Mar 2019 12:37:56 - > > @@ -0,0 +1,30 @@ > > +$OpenBSD$ > > + > > +- In MaySendUDP() handle case when socket may not be available yet > > + Upstream commit 66426abe60ef0f8a1be905f171b1281c6b59d138 > > + > > +- Add error handling for listen > > + Upstream commit 1f22423244c3867fec745cf0c04cd636e10970a2 > > + > > +Index: src/Torrent.cc > > +--- src/Torrent.cc.orig > > src/Torrent.cc > > +@@ -3830,7 +3830,8 @@ int TorrentListener::Do() > > + } > > +bound: > > + if(type==SOCK_STREAM) > > +- listen(sock,5); > > ++ if(listen(sock,5) < 0) > > ++ LogError(0,"listen failed: %s", strerror(errno)); > > + > > + // get the allocated port > > + socklen_t addr_len=sizeof(addr); > > +@@ -3904,6 +3905,8 @@ bool TorrentListener::MaySendUDP() > > + last_sent_udp_count=0; > > + last_sent_udp=now; > > +} > > ++ if (sock==-1) > > ++ return false; > > +// check if output buffer is available > > +struct pollfd pfd; > > +pfd.fd=sock; > > > > -- > Regards, > Mikolaj >
Re: UPDATE: productivity/calcurse 4.4.0
Hi, I didn't receive any reports so far. I would appreciate some comments. On Thu, Feb 28, 2019 at 01:30:53PM +, Mikolaj Kucharski wrote: > Hi, > > Here is update of calcurse to 4.4.0 released 2019-02-21. Changes are > listed on https://calcurse.org/files/changes.html > > I don't use it, just wanted to try it couple of weeks ago and decided to > work a bit with upstream to integrate patches which are in the ports > tree, so all except one can go away. Didn't look into the last patch > yet, so maybe that one can go too. > > As I'm not a proper calcurse user, then I would be grateful if someone > could test it more thoroughly than I can at the moment. > > Port changes as follows: > > - update to 4.4.0 > - move homepage to https > - regen wantlib > - use Gmake, otherwise text files for non-English languages are not > getting installed > - drop patches which I think are not needed any more > - regen one remaining patch > > Comments are welcome. > > In terms of patches which are dropped: > > - KEY_ENTER patch, upstream commit 6cd67311e30c2dc3c138f339b536679ad1a8d5f4 > - DAY_HEADING_DEFAULT patch, upstream commit > 0bbe802002c660dd9d555d557ce8daa7c5d681b9 > - calcurse-caldav already has `/usr/bin/env python3` shebang line > - notify.c patch, upstream commit 30f411257ad3bc233184c08b846a2980a9c5d1f0 > - utils.c, upstream migrated functions from long to time_t > > > Index: Makefile > === > RCS file: /cvs/ports/productivity/calcurse/Makefile,v > retrieving revision 1.27 > diff -u -p -u -r1.27 Makefile > --- Makefile 4 Feb 2019 17:44:43 - 1.27 > +++ Makefile 28 Feb 2019 12:28:19 - > @@ -2,20 +2,19 @@ > > COMMENT= text-based calendar and scheduling application > > -DISTNAME=calcurse-4.3.0 > -REVISION=2 > +DISTNAME=calcurse-4.4.0 > EPOCH= 0 > > CATEGORIES= productivity > > MAINTAINER= Frederic Culot > > -HOMEPAGE=http://calcurse.org/ > +HOMEPAGE=https://calcurse.org/ > > # BSD > PERMIT_PACKAGE_CDROM=Yes > > -WANTLIB += c iconv intl m ncursesw pthread > +WANTLIB += c curses iconv intl m pthread > > MASTER_SITES=${HOMEPAGE}files/ > > @@ -29,5 +28,7 @@ MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3 > > CONFIGURE_STYLE=gnu > CONFIGURE_ARGS= --without-asciidoc > + > +USE_GMAKE= Yes > > .include > Index: distinfo > === > RCS file: /cvs/ports/productivity/calcurse/distinfo,v > retrieving revision 1.18 > diff -u -p -u -r1.18 distinfo > --- distinfo 12 Nov 2017 14:01:26 - 1.18 > +++ distinfo 28 Feb 2019 12:28:19 - > @@ -1,2 +1,2 @@ > -SHA256 (calcurse-4.3.0.tar.gz) = MezD3Anh5WFQK0yU+WXtaxZ8A+lBhDjEp61brSx4X5o= > -SIZE (calcurse-4.3.0.tar.gz) = 597490 > +SHA256 (calcurse-4.4.0.tar.gz) = 7cvJ283+OrpDrHC41olfsP9KNk34l2LRyjBToUzsgm8= > +SIZE (calcurse-4.4.0.tar.gz) = 620263 > Index: patches/patch-contrib_caldav_calcurse-caldav > === > RCS file: patches/patch-contrib_caldav_calcurse-caldav > diff -N patches/patch-contrib_caldav_calcurse-caldav > --- patches/patch-contrib_caldav_calcurse-caldav 12 Nov 2017 14:01:26 > - 1.1 > +++ /dev/null 1 Jan 1970 00:00:00 - > @@ -1,11 +0,0 @@ > -$OpenBSD: patch-contrib_caldav_calcurse-caldav,v 1.1 2017/11/12 14:01:26 > fcambus Exp $ > - > -Index: contrib/caldav/calcurse-caldav > contrib/caldav/calcurse-caldav.orig > -+++ contrib/caldav/calcurse-caldav > -@@ -1,4 +1,4 @@ > --#!/usr/bin/python3 > -+#!/usr/bin/env python3 > - > - import argparse > - import base64 > Index: patches/patch-src_args_c > === > RCS file: /cvs/ports/productivity/calcurse/patches/patch-src_args_c,v > retrieving revision 1.2 > diff -u -p -u -r1.2 patch-src_args_c > --- patches/patch-src_args_c 28 Apr 2016 14:26:13 - 1.2 > +++ patches/patch-src_args_c 28 Feb 2019 12:28:19 - > @@ -1,7 +1,16 @@ > $OpenBSD: patch-src_args_c,v 1.2 2016/04/28 14:26:13 ajacoutot Exp $ > src/args.c.orig Sun Mar 27 12:26:18 2016 > -+++ src/args.c Thu Apr 28 16:23:45 2016 > -@@ -225,10 +225,11 @@ static void next_arg(void) > + > +Author: sthen > +Date: Wed Oct 14 10:04:16 2015 + > + > +Fix date output in calcurse 'one-shot' mode ('-d' or '-Q --filter-type > cal > +--days') on 32-bit arch following 64-bit time_t. Reported by Raf Czlonka, > +ok ajacoutot@ > + > +Index: src/args.c > +--- src/args.c.orig > src/args.c > +@@ -248,10 +248,11 @@ static void next_arg(void) > /* >* Print the date on stdout. >*/ > Index: patches/patch-src_calcurse_h > === > RCS file: patches/patch-src_calcurse_h > diff -N patches/patch-src_calcurse_h > --- patches/patch-src_calcurse_h 1 Feb 2019 22:56:46 - 1.2 > +++ /dev
Re: FIX: sigsegv lftp-4.8.4p1
Ping. On Mon, Mar 04, 2019 at 01:09:11PM +, Mikolaj Kucharski wrote: > Hi, > > I've put most of the details in > > https://github.com/lavv17/lftp/issues/511 > > but basically this avoids segfault which I triggered by accident. > Patch is accepted by upstream and already merged. > > > Index: Makefile > === > RCS file: /cvs/ports/net/lftp/Makefile,v > retrieving revision 1.123 > diff -u -p -u -r1.123 Makefile > --- Makefile 24 Oct 2018 14:28:08 - 1.123 > +++ Makefile 4 Mar 2019 12:37:56 - > @@ -4,7 +4,7 @@ COMMENT= shell-like command line ftp and > > DISTNAME=lftp-4.8.4 > CATEGORIES= net > -REVISION=0 > +REVISION=1 > > HOMEPAGE=https://lftp.tech/ > > Index: patches/patch-doc_lftp_1 > === > RCS file: /cvs/ports/net/lftp/patches/patch-doc_lftp_1,v > retrieving revision 1.3 > diff -u -p -u -r1.3 patch-doc_lftp_1 > --- patches/patch-doc_lftp_1 13 Aug 2018 14:36:41 - 1.3 > +++ patches/patch-doc_lftp_1 4 Mar 2019 12:37:56 - > @@ -1,5 +1,8 @@ > $OpenBSD: patch-doc_lftp_1,v 1.3 2018/08/13 14:36:41 rsadowski Exp $ > > +- avoid information loss in both groff and mandoc > + upstream commit 57b7098a4e0a7d3e7609ef3b2fb00b500df7a060 > + > Index: doc/lftp.1 > --- doc/lftp.1.orig > +++ doc/lftp.1 > Index: patches/patch-src_Torrent_cc > === > RCS file: patches/patch-src_Torrent_cc > diff -N patches/patch-src_Torrent_cc > --- /dev/null 1 Jan 1970 00:00:00 - > +++ patches/patch-src_Torrent_cc 4 Mar 2019 12:37:56 - > @@ -0,0 +1,30 @@ > +$OpenBSD$ > + > +- In MaySendUDP() handle case when socket may not be available yet > + Upstream commit 66426abe60ef0f8a1be905f171b1281c6b59d138 > + > +- Add error handling for listen > + Upstream commit 1f22423244c3867fec745cf0c04cd636e10970a2 > + > +Index: src/Torrent.cc > +--- src/Torrent.cc.orig > src/Torrent.cc > +@@ -3830,7 +3830,8 @@ int TorrentListener::Do() > + } > +bound: > + if(type==SOCK_STREAM) > +- listen(sock,5); > ++ if(listen(sock,5) < 0) > ++ LogError(0,"listen failed: %s", strerror(errno)); > + > + // get the allocated port > + socklen_t addr_len=sizeof(addr); > +@@ -3904,6 +3905,8 @@ bool TorrentListener::MaySendUDP() > + last_sent_udp_count=0; > + last_sent_udp=now; > +} > ++ if (sock==-1) > ++ return false; > +// check if output buffer is available > +struct pollfd pfd; > +pfd.fd=sock; > -- Regards, Mikolaj
Re: UPDATE: netcdf-3.6.2 -> 4.6.3
On Tue, Mar 05, 2019 at 09:57:13PM +0100, Landry Breuil wrote: > > So, comments portswise: > - no need for DIST_SUBDIR=${DISTNAME} (remember to regen distinfo) > - no need for the complicated DISTNAME/DISTFILES/WRKDIST dance > > DISTNAME = ${NAME}-c-${V} > PKGNAME = ${NAME}-${V} > > is enought and seems to work fine here > > - i think you forgot to cvs rm patch-cxx_ncvalues_cpp & > patch-ncgen_ncgen_1 in your diff :) > - all tests indeed pass, testing on non-x86 would be nice. > - major should probably be bumped as its a major version > > and what matters for me, i can build MDAL fine with this update. > let's hear what MAINTAINER thinks about it.. maybe the c++ & fortran bits > should be ported too, but if nothing needs them.. . Bugged by the failing remote tests I came up with a new diff, which also includes your comments. Tests all pass on amd64 now. -m Index: Makefile === RCS file: /cvs/ports/math/netcdf/Makefile,v retrieving revision 1.33 diff -u -p -u -p -r1.33 Makefile --- Makefile28 Oct 2018 07:31:29 - 1.33 +++ Makefile6 Mar 2019 13:00:28 - @@ -1,45 +1,52 @@ -# $OpenBSD: Makefile,v 1.33 2018/10/28 07:31:29 bentley Exp $ +# $OpenBSD: Makefile,v 1.33 2018/10/28 07:31:29 bentley Exp $ -BROKEN-powerpc=fails to build -BROKEN-hppa = fails to configure +# let's give it a chance? +#BROKEN-powerpc= fails to build +#BROKEN-hppa = fails to configure COMMENT= library for machine-independent, array-oriented data access -DISTNAME= netcdf-3.6.2 -REVISION = 7 +V= 4.6.3 +NAME= netcdf +DISTNAME= ${NAME}-c-${V} +PKGNAME= ${NAME}-${V} + CATEGORIES=math -SHARED_LIBS= netcdf 4.0 \ - netcdff 4.0 \ - netcdf_c++ 4.0 +SHARED_LIBS= netcdf 5.0 # 4.0 HOMEPAGE= http://www.unidata.ucar.edu/software/netcdf/ MAINTAINER=Tom Knienieder -MODULES = fortran -MODFORTRAN_COMPILER = g77 -BUILD_DEPENDS =${MODFORTRAN_BUILD_DEPENDS} -# BSD-like +# BSD PERMIT_PACKAGE_CDROM= Yes -WANTLIB= c m ${COMPILER_LIBCXX} +WANTLIB= c m z pthread +WANTLIB+= curl crypto nghttp2 ssl +WANTLIB+= hdf5 hdf5_hl + +LIB_DEPENDS = net/curl \ + math/hdf5 + +TEST_DEPENDS= shells/bash \ + textproc/gdiff COMPILER = base-clang ports-gcc base-gcc MASTER_SITES= ftp://ftp.unidata.ucar.edu/pub/netcdf/ CONFIGURE_STYLE= gnu -CONFIGURE_ENV= CPPFLAGS="-Df2cFortran" +CONFIGURE_ENV+=LDFLAGS="-L${LOCALBASE}/lib" \ + CPPFLAGS="-I${LOCALBASE}/include" + CONFIGURE_ARGS+= --enable-shared \ - --disable-f90 + --disable-doxygen \ + --enable-netcdf-4 \ + --enable-dap \ + --prefix=${PREFIX} USE_GMAKE= Yes SEPARATE_BUILD=Yes - -post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/netcdf - @cd ${WRKSRC}/man && ${INSTALL_DATA} *.txt *.pdf \ - ${PREFIX}/share/doc/netcdf .include Index: distinfo === RCS file: /cvs/ports/math/netcdf/distinfo,v retrieving revision 1.6 diff -u -p -u -p -r1.6 distinfo --- distinfo18 Jan 2015 03:14:28 - 1.6 +++ distinfo6 Mar 2019 13:00:28 - @@ -1,2 +1,2 @@ -SHA256 (netcdf-3.6.2.tar.gz) = /qp2c/Np5ftX/MUUJuK+aUIo3cwUH8P9IDmSaftrkxE= -SIZE (netcdf-3.6.2.tar.gz) = 5312882 +SHA256 (netcdf-c-4.6.3.tar.gz) = M1/fFtdTH0MK115zLtGpo/yDrT75H7M6cBGaVV3VQVw= +SIZE (netcdf-c-4.6.3.tar.gz) = 5961248 Index: patches/patch-cxx_ncvalues_cpp === RCS file: patches/patch-cxx_ncvalues_cpp diff -N patches/patch-cxx_ncvalues_cpp --- patches/patch-cxx_ncvalues_cpp 28 Oct 2018 07:31:29 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,13 +0,0 @@ -$OpenBSD: patch-cxx_ncvalues_cpp,v 1.1 2018/10/28 07:31:29 bentley Exp $ - -Index: cxx/ncvalues.cpp cxx/ncvalues.cpp.orig -+++ cxx/ncvalues.cpp -@@ -10,6 +10,7 @@ - #include - #include - #include -+#include - - #include "ncvalues.h" - Index: patches/patch-dap4_test_test_data_sh === RCS file: patches/patch-dap4_test_test_data_sh diff -N patches/patch-dap4_test_test_data_sh --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-dap4_test_test_data_sh6 Mar 2019 13:00:28 - @@ -0,0 +1,32 @@ +$OpenBSD$ + +Index: dap4_test/test_data.sh +--- dap4_test/test_data.sh.orig dap4_test/test_data.sh +@@ -21,8 +21,8 @@ for f in $F ; do + fi + ${NCDUMP} ./results_test_data/${f}.nc > ./results_test_data/${f}.d4d + if test "x${TEST}" = x1 ; then +- if ! d
Re: new: x11/textsuggest
On Wed, Mar 06, 2019 at 12:36:44PM +0100, Stefan Sperling wrote: > Thanks. I have applied this in the attached version. > Also removed xclip from RUN_DEPENDS because TextSuggest uses an internal > C++ library to access the clipboard -- older versions apparently forked > out to xclip for this purpose. Forgot to mention another big change: Stop using the word list shipped with the upstream tarball and use /usr/shared/dict/words instead. This way, textsuggest suggests a lot more suggestions. This will need to be extended further. The program can only handle one dictionary file per language so it cannot deal with regional differences such as those between British and American English, even though we have corresponding lists in /usr/share/dict/american and /usr/share/dict/british which could be merged into the full word list. I'll work on that later. For now, I want to get an initial working version into the ports tree and try to get some of my patches upstreamed.
Re: new: x11/textsuggest
On Sun, Mar 03, 2019 at 02:26:53PM +, Stuart Henderson wrote: > On 2019/03/03 14:53, Stefan Sperling wrote: > > This is a port of textsuggest, a software which suggests words similar > > to that which the user has just typed, and inserts the chosen corrected > > word on behalf of the user. It works with any X11 application. > > > > This port is functional but there are likely still some bugs. > > The port contains quite a few patches already to fix various issues. > > I am porting this for a friend who has great difficulty typing on a computer > > and I will keep trying to fix bugs in this program as we run into them. > > > > ok? > > Here's a diff on top to remove some boilerplate from the Makefile and > remove the "exec ${_PBUILD}" which isn't needed (it's done automatically > by _PMAKE) and breaks the build if you're using PORTS_PRIVSEP. Thanks. I have applied this in the attached version. Also removed xclip from RUN_DEPENDS because TextSuggest uses an internal C++ library to access the clipboard -- older versions apparently forked out to xclip for this purpose. > Linking fails for me though: > > clang++ -pthread -Wl,-rpath,/usr/X11R6/lib -Wl,-rpath,/usr/local/lib/qt5 -o > textsuggest EventCatcherEntry.o textsuggest-ui.o TextSugge > stApp.o moc_EventCatcherEntry.o moc_TextSuggestApp.o -ldbus-c++-1 > -L/usr/local/lib/qt5 -lQt5Widgets -L/usr/local/lib -L/usr/X11R6/lib > -lQt5Gui -lQt5Core -lGL > -L/usr/obj/ports/textsuggest-4.2.0/TextSuggest-v4.2.0/ui > ld: error: undefined symbol: > DBus::InterfaceProxy::InterfaceProxy(std::__1::basic_string std::__1::char_traits, std::__1::all > ocator > const&) As discussed off-list, this must have been a mix-up of C++ compilers. I don't see this problem. textsuggest.tar.gz Description: application/tar-gz
Re: new: x11/libdbus-c++
On Wed, Mar 06, 2019 at 11:55:17AM +0100, Stefan Sperling wrote: >In particular, fix poll(2) event mask which resulted in unhandled >POLLHUP events in the main event loop which made textsuggest-server >spin on the CPU. Sorry, this should have said "POLLOUT", not "POLLHUP".
Re: new: x11/libdbus-c++
On Sun, Mar 03, 2019 at 02:01:55PM +, Stuart Henderson wrote: > On 2019/03/03 14:45, Stefan Sperling wrote: > > Attached is a port of libdbus-c++. > > > > I need this for an upcoming port of TextSuggest, which I'll mail out > > soon, too. > > > > OK? > > > > Please start from > > SHARED_LIBS = dbus-c++-1 0.0 > > ..mostly so we can see that the version number is properly under control > of ports infrastructure. And please add > > COMPILER = base-clang ports-gcc base-gcc > > so that it's built against the same C++ standard library as other ports > (this is generally needed for all C++ ports unless there are special > circumstances, mostly things on the path to building ports-gcc). > > Otherwise OK. > Here's a new version with some changes on top of your suggestions: 1) Add more patches, and add comments to all patches. In particular, fix poll(2) event mask which resulted in unhandled POLLHUP events in the main event loop which made textsuggest-server spin on the CPU. As far as I understand, the "unlock" file descriptors are only interested in POLLIN events. They can be triggered to wake the event loop while a thread sleeps in poll(2). This feature is used by the library's teardown code. POLLOUT makes no sense here. textsuggest uses much less CPU becomes a lot more responsive with this fix. 2) Enable glib integration. This adds another shared library which is not used by textsuggest but will perhaps be useful if other consumers of libdbus-c++ show up. 3) Run regression test (there's just one, the others are just empty stubs). Still OK? libdbus-c++.tar.gz Description: application/tar-gz
UPDATE: fonts/noto
Hi, Here is a diff that updates the Google Noto fonts to the latest tags (2017, 2018). There are a number of new fonts in the main package. In the noto-emoji package, the color emoji font is now installed. The black and white emoji font is no longer actively developed upstream. CJK is the biggest change. The current port ignores the distfile and fetches the Noto Sans Super OTC instead, but due to the many new font files that we want to install I've updated it to use a normal (but large) GH_* distfile, installing the Super OTC for Noto Sans and the seven regular OTCs for Noto Serif (see README.formats). ok? Index: Makefile.inc === RCS file: /cvs/ports/fonts/noto/Makefile.inc,v retrieving revision 1.2 diff -u -p -r1.2 Makefile.inc --- Makefile.inc11 Jan 2016 11:04:21 - 1.2 +++ Makefile.inc6 Mar 2019 10:03:28 - @@ -1,7 +1,5 @@ # $OpenBSD: Makefile.inc,v 1.2 2016/01/11 11:04:21 czarkoff Exp $ -# N.B. cjk is independently versioned -V ?= 2015-09-29 DISTNAME ?=noto-${NOTO_PROJECT}-${V:S/-//g} CATEGORIES ?= fonts @@ -10,13 +8,11 @@ HOMEPAGE ?= https://www.google.com/get/ MAINTAINER ?= Dmitrij D. Czarkoff -# cjk: SIL OFL 1.1 -# fonts, emoji: Apache 2.0 (XXX post-2015-09-29 these are relicensed OFL) +# SIL OFL 1.1 PERMIT_PACKAGE_CDROM ?=Yes GH_ACCOUNT ?= googlei18n GH_PROJECT ?= noto-${NOTO_PROJECT} -GH_TAGNAME ?= v$V NO_BUILD ?=Yes NO_TEST ?= Yes Index: cjk/Makefile === RCS file: /cvs/ports/fonts/noto/cjk/Makefile,v retrieving revision 1.2 diff -u -p -r1.2 Makefile --- cjk/Makefile11 Jan 2016 11:04:21 - 1.2 +++ cjk/Makefile6 Mar 2019 10:03:28 - @@ -2,22 +2,18 @@ COMMENT = east asian fonts for the noto font family -V =1.004 -REVISION = 0 NOTO_PROJECT = cjk +V =2017-06-01 +GH_TAGNAME = v$V-serif-cjk-1-1 + HOMEPAGE = https://www.google.com/get/noto/help/cjk/ -# The CJK fonts are duplicated in upstream distfile in many redundant formats. -# Hack to save ~700 MB bandwidth when fetching distfile. -PKGNAME = noto-${NOTO_PROJECT}-$V -DIST_SUBDIR = ${PKGNAME} -MASTER_SITES = https://github.com/googlei18n/noto-cjk/raw/v$V/ -DISTNAME = NotoSansCJK.ttc -EXTRACT_SUFX = .zip +BUILD_DEPENDS =archivers/zip do-install: ${INSTALL_DATA_DIR} ${NOTO_INSTALLDIR} - ${INSTALL_DATA} ${WRKDIR}/NotoSansCJK.ttc ${NOTO_INSTALLDIR} + ${INSTALL_DATA} ${WRKDIST}/NotoSerifCJK-*.ttc ${NOTO_INSTALLDIR} + cd ${NOTO_INSTALLDIR} && unzip ${WRKDIST}/NotoSansCJK.ttc.zip .include Index: cjk/distinfo === RCS file: /cvs/ports/fonts/noto/cjk/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- cjk/distinfo22 Dec 2015 10:02:45 - 1.1.1.1 +++ cjk/distinfo6 Mar 2019 10:03:28 - @@ -1,2 +1,2 @@ -SHA256 (noto-cjk-1.004/NotoSansCJK.ttc.zip) = xrosVP7vyi+p9iR/vjlhEk+CtDmsaIPpZGhuqk3U4+0= -SIZE (noto-cjk-1.004/NotoSansCJK.ttc.zip) = 93276427 +SHA256 (noto-cjk-20170601.tar.gz) = 6i4EUxDxDrwBOJ7Sy2mSnwLRiEhzWGNWs1oeJ3iFKYs= +SIZE (noto-cjk-20170601.tar.gz) = 1667927054 Index: cjk/pkg/PLIST === RCS file: /cvs/ports/fonts/noto/cjk/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST --- cjk/pkg/PLIST 22 Dec 2015 10:02:45 - 1.1.1.1 +++ cjk/pkg/PLIST 6 Mar 2019 10:03:28 - @@ -2,3 +2,10 @@ share/fonts/ @fontdir share/fonts/noto/ share/fonts/noto/NotoSansCJK.ttc +share/fonts/noto/NotoSerifCJK-Black.ttc +share/fonts/noto/NotoSerifCJK-Bold.ttc +share/fonts/noto/NotoSerifCJK-ExtraLight.ttc +share/fonts/noto/NotoSerifCJK-Light.ttc +share/fonts/noto/NotoSerifCJK-Medium.ttc +share/fonts/noto/NotoSerifCJK-Regular.ttc +share/fonts/noto/NotoSerifCJK-SemiBold.ttc Index: emoji/Makefile === RCS file: /cvs/ports/fonts/noto/emoji/Makefile,v retrieving revision 1.2 diff -u -p -r1.2 Makefile --- emoji/Makefile 11 Jan 2016 11:04:21 - 1.2 +++ emoji/Makefile 6 Mar 2019 10:03:28 - @@ -4,12 +4,11 @@ COMMENT = emoji fonts for the noto font NOTO_PROJECT = emoji -REVISION = 0 - -GH_TAGNAME = v$V-license-apache +V =2018-08-10 +GH_TAGNAME = v$V-unicode11 do-install: ${INSTALL_DATA_DIR} ${NOTO_INSTALLDIR} - ${INSTALL_DATA} ${WRKDIST}/NotoEmoji-Regular.ttf ${NOTO_INSTALLDIR} + ${INSTALL_DATA} ${WRKDIST}/fonts/*.ttf ${NOTO_INSTALLDIR} .include Index: emoji/distinfo ==