Re: NEW: net/vf1
Paco Esteban wrote: > Ping. > > (zip attached again) hi the port looks fine to me but it doesn't provide any documentation. In the sources there is a README.md file which could be used. You can use the port sysutils/boar as an example for adding the README.md file to the package.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rpoin...@cvs.openbsd.org2018/12/12 23:52:46 Modified files: security/theharvester: Makefile distinfo security/theharvester/pkg: PLIST Log message: update theHarvester to 3.0.4.
Re: powerpc bulk build report
Sorry for the extra noise, but i managed to unbreak more of them. It
should do the job on other gcc4 arches as well.
> http://build-failures.rhaalovely.net//powerpc/2018-12-01/converters/lastools.log
The log explains itself the issue, i added it, it builds [1] and
runs fine. It doesn't break the build on amd64.
[1] http://ix.io/1vTp
Index: Makefile
===
RCS file: /cvs/ports/converters/lastools/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- Makefile24 Oct 2018 14:27:59 - 1.7
+++ Makefile13 Dec 2018 00:07:07 -
@@ -5,7 +5,7 @@ DISTNAME = lastools-0.20170108
GH_ACCOUNT = LAStools
GH_PROJECT = LAStools
GH_TAGNAME = f00fa125075ea984993057c5916d746cb605835c
-REVISION = 2
+REVISION = 3
CATEGORIES = converters textproc devel
@@ -14,10 +14,15 @@ PERMIT_PACKAGE_CDROM = Yes
WANTLIB += c m ${COMPILER_LIBCXX}
+#c++11
COMPILER = base-clang ports-gcc base-gcc
MAKE_FLAGS = COMPILER="${CXX}" \
LINKER="${CXX}"
+# building with ports-gcc generates the following error:
+# warning.h:32:2: error: #error This file requires compiler
+# and library support for the ISO C++ 2011 standard.
+CXXFLAGS +=-std=c++11
post-patch:
find ${WRKSRC} -name Makefile | xargs sed -i 's/-O3/${CXXFLAGS}/'
> http://build-failures.rhaalovely.net//powerpc/2018-12-01/games/late.log
It's just about missing includes, the build log is here [2],
and it runs fine [3].
[2] http://ix.io/1vTr
[3] https://bsd.network/web/statuses/101230576378175694
Index: Makefile
===
RCS file: /cvs/ports/games/late/Makefile,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 Makefile
--- Makefile24 Oct 2018 14:28:03 - 1.20
+++ Makefile12 Dec 2018 23:39:44 -
@@ -2,7 +2,7 @@
COMMENT= puzzle game resembling the arcade game Qix
DISTNAME= late-0.1.0
-REVISION= 4
+REVISION= 5
EXTRACT_SUFX= .tar.bz2
CATEGORIES=games x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=late/}
Index: patches/patch-src_ball_h
===
RCS file: patches/patch-src_ball_h
diff -N patches/patch-src_ball_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_ball_h12 Dec 2018 23:39:44 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+ball.h:113:19: error: 'NULL' was not declared in this scope
+Index: src/ball.h
+--- src/ball.h.orig
src/ball.h
+@@ -25,6 +25,7 @@
+ class ball;
+
+ #include "square.h"
++#include
+
+ class ball_base
+ {
Index: patches/patch-src_init_cpp
===
RCS file: patches/patch-src_init_cpp
diff -N patches/patch-src_init_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_init_cpp 12 Dec 2018 23:39:44 -
@@ -0,0 +1,17 @@
+$OpenBSD$
+init.cpp:139:34: error: 'strcmp' was not declared in this scope
+init.cpp:196:12: error: 'exit' was not declared in this scope
+Index: src/init.cpp
+--- src/init.cpp.orig
src/init.cpp
+@@ -26,8 +26,9 @@
+ #include "scorescreen.h"
+ #include
+ #include
++#include
++#include
+ using namespace std;
+-
+
+ int cheat = 0;
+ int zappy;
> http://build-failures.rhaalovely.net//powerpc/2018-12-01/devel/codeworker.log
There are dozens of missing includes errors here. Once they're fixed,
it builds properly [4]. I'm also attaching the diff because i'm not
sure of how DOS line endings in the source code will be dealt with.
The basic "get started" stuff from HOMEPAGE runs fine. That diff
doesn't break the build on amd64.
[4] http://ix.io/1vTH
Index: Makefile
===
RCS file: /cvs/ports/devel/codeworker/Makefile,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 Makefile
--- Makefile28 Oct 2018 09:02:40 - 1.14
+++ Makefile13 Dec 2018 02:11:11 -
@@ -4,7 +4,7 @@ COMMENT = universal parsing tool & sour
V =4.5.4
PKGNAME = codeworker-${V}
-REVISION = 5
+REVISION = 6
CATEGORIES = devel
Index: patches/patch-CGRuntime_h
===
RCS file: patches/patch-CGRuntime_h
diff -N patches/patch-CGRuntime_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-CGRuntime_h 13 Dec 2018 02:11:11 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+Fix a lot of include errors with ports-gcc
+Index: CGRuntime.h
+--- CGRuntime.h.orig
CGRuntime.h
+@@ -24,6 +24,8 @@ To contact the author: codewor...@free.fr
+
+ #include
+ #include
++#include
++#include
+
+ #include "UtlException.h"
+ #include "CppParsingTree.h"
Index: patches/patch-CppParsingTree_cpp
===
RCS file: patches/patch-CppParsingTree_cpp
diff -N
Re: [UPDATE] www/hugo 0.51 -> 0.52
Should this have `NO_TEST = Yes` in the Makefile? I checked on GitHub and there are no tests for Hugo and running `make test` results in the following: /usr/ports/www/hugo $ make test ===> Regression tests for hugo-0.52 /usr/bin/env -i GOCACHE=off GOPATH="/usr/ports/pobj/hugo-0.52/go:/usr/local/go-pkg" PATH="/usr/ports/pobj/hugo-0.52/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11R6/bin" go test -v -p 1 github.com/gohugoio/hugo ? github.com/gohugoio/hugo[no test files] Please let me know if I am missing something here. Thank you, -- Edward Lopez-Acosta
[update] security/gopass to 1.8.3
Hi,
Here is an update to gopass. I will send the patch upstream shortly.
Changes listed here:
https://github.com/gopasspw/gopass/releases/tag/v1.8.3
OK?
diff --git a/security/gopass/Makefile b/security/gopass/Makefile
index 7360ae665f0..49671847067 100644
--- a/security/gopass/Makefile
+++ b/security/gopass/Makefile
@@ -2,11 +2,8 @@
COMMENT = pass compatible password manager written in go
-GH_ACCOUNT = gopasspw
-GH_PROJECT = gopass
-GH_TAGNAME = f64cc6cb265f576b8937ed70a419ffdfb2c779da
-V =1.8.2
-DISTNAME = gopass-$Vpl1
+V =1.8.3
+DISTNAME = gopass-$V
CATEGORIES = security
@@ -18,7 +15,7 @@ PERMIT_PACKAGE_CDROM =Yes
# uses pledge()
WANTLIB += c pthread
-#MASTER_SITES =
https://github.com/gopasspw/gopass/releases/download/v${V}/
+MASTER_SITES = https://github.com/gopasspw/gopass/releases/download/v${V}/
MODULES = lang/go
MODGO_TYPE = bin
@@ -32,8 +29,4 @@ ALL_TARGET = github.com/gopasspw/gopass
# Tests require MODGO_ENV, but break in weird ways when it is set.
NO_TEST = Yes
-# XXX go SNAFU means we can't patch source files
-post-configure:
- sed -i 's,Atimespec,Atim,g'
${WRKSRC}/vendor/gopkg.in/src-d/go-git.v4/worktree_bsd.go
-
.include
diff --git a/security/gopass/distinfo b/security/gopass/distinfo
index 0f73dc2e857..0b04d08f778 100644
--- a/security/gopass/distinfo
+++ b/security/gopass/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gopass-1.8.2pl1.tar.gz) = yGW6ovrABClwkWwgd+M0H3X+cpK5viRWpf4VrhjJuZ8=
-SIZE (gopass-1.8.2pl1.tar.gz) = 6223603
+SHA256 (gopass-1.8.3.tar.gz) = GCgeB96WGya5zOfJB+gR1Wew5Zlknw2+cDqxCJhCdag=
+SIZE (gopass-1.8.3.tar.gz) = 6571006
diff --git a/security/gopass/patches/patch-pkg_protect_protect_openbsd_go
b/security/gopass/patches/patch-pkg_protect_protect_openbsd_go
new file mode 100644
index 000..588f794ac91
--- /dev/null
+++ b/security/gopass/patches/patch-pkg_protect_protect_openbsd_go
@@ -0,0 +1,12 @@
+$OpenBSD$
+
+Index: pkg/protect/protect_openbsd.go
+--- pkg/protect/protect_openbsd.go.orig
pkg/protect/protect_openbsd.go
+@@ -10,5 +10,5 @@ var ProtectEnabled = true
+ // Pledge on OpenBSD lets us "promise" to only run a subset of
+ // system calls: http://man.openbsd.org/pledge
+ func Pledge(s string) error {
+- return unix.Pledge(s, "")
++ return unix.PledgePromises(s)
+ }
--
PGP: 0x1F81112D62A9ADCE / 3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE
[update] www/kwebapp to 0.6.9
Another trivial uptade, this time for kwebapp! Changes here: https://kristaps.bsd.lv/kwebapp/archive.html OK? diff --git a/www/kwebapp/Makefile b/www/kwebapp/Makefile index 96ff553fde4..3cd828f8f1d 100644 --- a/www/kwebapp/Makefile +++ b/www/kwebapp/Makefile @@ -2,7 +2,7 @@ COMMENT = web application source generator -DISTNAME = kwebapp-0.6.4 +DISTNAME = kwebapp-0.6.9 CATEGORIES = www HOMEPAGE = https://kristaps.bsd.lv/kwebapp/ diff --git a/www/kwebapp/distinfo b/www/kwebapp/distinfo index 19814b0704a..8a18b617a3c 100644 --- a/www/kwebapp/distinfo +++ b/www/kwebapp/distinfo @@ -1,2 +1,2 @@ -SHA256 (kwebapp-0.6.4.tar.gz) = xcXl4Gnp3hAkzJ5TX0JX8jlRJ4KJN2SKqrOKd/hkn0U= -SIZE (kwebapp-0.6.4.tar.gz) = 132030 +SHA256 (kwebapp-0.6.9.tar.gz) = sr8eCj92CeU+CHfrAzyail6EdihDOus9Lh4PICvK0Y4= +SIZE (kwebapp-0.6.9.tar.gz) = 139186 -- PGP: 0x1F81112D62A9ADCE / 3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE
[update] sysutils/fzf to 0.17.5
Hi!
Here is a trivial update to fzf. Full list if changes here:
https://github.com/junegunn/fzf/compare/0.17.3...0.17.5
OK?
diff --git a/sysutils/fzf/Makefile b/sysutils/fzf/Makefile
index 6ba5c01723b..69a8dcb3e15 100644
--- a/sysutils/fzf/Makefile
+++ b/sysutils/fzf/Makefile
@@ -2,7 +2,7 @@
COMMENT = command-line fuzzy finder
-DISTNAME = fzf-0.17.3
+DISTNAME = fzf-0.17.5
CATEGORIES = sysutils
@@ -23,11 +23,11 @@ MODGO_TYPE =bin
NO_TEST = Yes
-do-build:
- cd ${WRKSRC} && ${MODGO_CMD} build -x
+ALL_TARGET = github.com/junegunn/fzf
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/fzf* ${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKDIR}/go/bin/* ${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/* ${PREFIX}/bin
${INSTALL_MAN_DIR} ${PREFIX}/man/man1
${INSTALL_MAN} ${WRKSRC}/man/man1/*.1 ${PREFIX}/man/man1
diff --git a/sysutils/fzf/distinfo b/sysutils/fzf/distinfo
index d3df952ea79..5f0ecbdddce 100644
--- a/sysutils/fzf/distinfo
+++ b/sysutils/fzf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fzf-0.17.3.tar.gz) = Upa9bOGuyuRW6KVfetKgRMxC584mZOkdFM7xumRr4+k=
-SIZE (fzf-0.17.3.tar.gz) = 22664163
+SHA256 (fzf-0.17.5.tar.gz) = HKKM5mvQ38zuoo71g5/dAS0riCu5/Rs7bQ1miui52EM=
+SIZE (fzf-0.17.5.tar.gz) = 6413887
--
PGP: 0x1F81112D62A9ADCE / 3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE
Re: UPDATE: databases/py-redis-3.0.1
ping?
Edward Lopez-Acosta
On 12/6/18 5:39 PM, Edward Lopez-Acosta wrote:
Resubmitting the diff so its easier for commit.
I replaced the py-py test depend with py-mock like it should be. py-py
is pulled is as a dependency of mock.
Edward Lopez-Acosta
On 12/6/18 4:26 AM, Stuart Henderson wrote:
On 2018/12/05 18:47, Edward Lopez-Acosta wrote:
Backwards incompatible changes in this, but checking sqlports I found
nothing that depends on this. I installed this package and ran a
series of
tests on it using some of my old scripts and didn't hit issues.
$ sqlite3 /usr/local/share/sqlports "select * from depends where
dependspath
like 'databases/py-redis' or dependspath like
'databases/py-redis,python3'"
| wc -l
btw you can do "where dependspath like 'databases/py-redis%'" to cover
both flavours.
Tests also require devel/py-mock:
===> Regression tests for py-redis-3.0.1
running test
Searching for mock
Reading https://pypi.org/simple/mock/
Download error on https://pypi.org/simple/mock/: [Errno 65] No route
to host -- Some packages may not be found!
Couldn't find index page for 'mock' (maybe misspelled?)
Scanning index of all packages (this may take a while)
Reading https://pypi.org/simple/
Download error on https://pypi.org/simple/: [Errno 65] No route to
host -- Some packages may not be found!
No local packages or working download links found for mock
error: Could not find suitable distribution for Requirement.parse('mock')
Otherwise looks good to me.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2018/12/12 16:46:18 Modified files: mail/pecl-mailparse: Makefile security/pecl-libsodium: Makefile www/pecl-memcached: Makefile www/pecl-pecl_http: Makefile www/pecl-propro: Makefile www/pecl-raphf : Makefile www/pecl-ssh2 : Makefile lang/php/pecl : pecl.port.mk Log message: garbage-collect now unused MODPECL_V
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2018/12/12 16:44:32 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: more quirks for PHP pecl ports; - obsolete_reason for 5.6-only ports, - update old "rename pecl-foo -> pecl56-foo" entries to use pecl71-foo - add new "rename pecl56/70-foo -> pecl71-foo" entries to make sure extensions that were installed standalone rather than as a dependency of another port get updated
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2018/12/12 16:36:47 Removed files: www/pecl-memcache: Makefile distinfo www/pecl-memcache/files: connect.inc www/pecl-memcache/pkg: DESCR PLIST Log message: remove already-unhooked PHP 5.6-only pecl ports
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2018/12/12 16:36:12 Removed files: www/pecl-swish : Makefile distinfo www/pecl-swish/pkg: DESCR PLIST www/pecl-uploadprogress: Makefile distinfo www/pecl-uploadprogress/pkg: DESCR PLIST Log message: remove already-unhooked PHP 5.6-only pecl ports
Re: security/wpa_supplicant: Reassoc on NWID change
Gregor, Thank you for working on this. I have one comment about your code, comments inlined in your below diff. Here is debug output of one day session, with suspend in the middle when going home, back to work and home again. # grep -E 'type=0x(15|e)' wpa_supplicant.log 1544550580.320374: XXX evnt_rcv: name=iwn0, type=0x15 1544550580.321089: XXX evnt_rcv: name=iwn0, type=0xe 1544558742.024184: XXX evnt_rcv: name=iwn0, type=0xe 1544558753.880521: XXX evnt_rcv: name=iwn0, type=0x15 1544558753.883372: XXX evnt_rcv: name=iwn0, type=0xe 1544612208.200216: XXX evnt_rcv: name=iwn0, type=0xe 1544612217.053147: XXX evnt_rcv: name=iwn0, type=0x15 1544612217.053676: XXX evnt_rcv: name=iwn0, type=0xe 1544648478.023587: XXX evnt_rcv: name=iwn0, type=0xe Above is while being sationary and not going around in the office. This means that I switched only between AP closest to my desk and to home AP with resume in between. Interestingly it seems that each RTM_80211INFO is also accompanied with RTM_IFINFO, in random order. Tomorrow I may give you example of above log when walking around the office, to compare events while switching APs. The other day I did testing by walking around and it works most of the time, however there is a race somewhere, as while I was walking around I sometimes ended up without connection and ifconfig(8) at the same time was showing: status: active ieee80211: join lighthouse chan 100 bssid dBm wpaprotos wpa2 wpaakms 802.1x wpaciphers ccmp wpagroupcipher ccmp like network should work, but it didn't and connection was totally offline. This is very empirical, but it looked to me, when I walked slower to give wpa_supplicant time to reassoc with each access point on the way it all worked. When I got bored and walked faster, passing by multiple APs on the way and with reassocs happening one after another, before previous assoc was able to finish and me finally stopping, I ended up with iwn0 card with status active, but no connectivity. Restarting slaacd(8) or dhclient(8) was not helping as problem was layer below them. All in all, I would need to test all of this more and collect more debug information. Unfortunately this is my last week with my current employer, so in practice tomorrow is my last day I can test all of this :) I think your diff makes sense and with handling of RTM_IFINFO it's good progress in correct direction. I even took your diff and tested with latest wpa_supplicant 2.7 and it works there too. However I cannot dive into this more, as I have too many changes in my personal and professional life in coming days. If you would like to see any specific info tomorrow, please let me know I will try to arrange something. After that I'll go offline for family time. See comments inline your diff below. Regards, Mikolaj On Wed, Dec 12, 2018 at 09:44:24PM +0100, Gregor Best wrote: > > Hi Edd, Raf, Mikolaj, ports@ > > I just updated my proposed patch with Mikolaj's suggestion of also > listening to RTM_IFINFO instead of just RTM_80211INFO. The patch is > attached below the signature. > > It makes reassociation over suspend/resume work (if I resume in the > same spot I suspended in, haven't checked going out of range). What's > noteworthy is that it takes a while (in the area of 10 - 15 seconds) > for wpa_supplicant to re-establish a connection. > > As for Edd's report that moving out of range with the device on doesn't > cause re-association (did I understand that correctly?), I think the > output of `route monitor` and `ifconfig $dev scan` before and after > loss of signal (and going into range of the other AP) might be > interesting to see if there's another routing message that we have to > consider. > > Maybe the attached patch also helps Edd's situation. As always, I'm > grateful for testing and feedback. > > -- > Gregor > > Index: patches/patch-src_drivers_driver_openbsd_c > === > RCS file: > /home/cvs/ports/security/wpa_supplicant/patches/patch-src_drivers_driver_openbsd_c,v > retrieving revision 1.5 > diff -u -p -r1.5 patch-src_drivers_driver_openbsd_c > --- patches/patch-src_drivers_driver_openbsd_c17 May 2016 08:29:27 > - 1.5 > +++ patches/patch-src_drivers_driver_openbsd_c12 Dec 2018 20:18:19 > - > @@ -1,24 +1,151 @@ > $OpenBSD: patch-src_drivers_driver_openbsd_c,v 1.5 2016/05/17 08:29:27 > dcoppa Exp $ > > -Fix includes > +Fix includes and react to NWID changes and suspend/resume. > > src/drivers/driver_openbsd.c.origSun Sep 27 21:02:05 2015 > -+++ src/drivers/driver_openbsd.c Mon Sep 28 09:51:53 2015 > -@@ -9,13 +9,14 @@ > +Index: src/drivers/driver_openbsd.c > +--- src/drivers/driver_openbsd.c.orig > src/drivers/driver_openbsd.c > +@@ -9,19 +9,34 @@ > #include "includes.h" > #include > - > + > +#include "common.h" > +#include "driver.h" > ++#include "eloop.h" > + > ++#include > #include > +#include >
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: d...@cvs.openbsd.org2018/12/12 16:05:35 Modified files: devel : Makefile Log message: + py-smmap,python3 In the commit revision 1.8 date: 2016/04/25 09:09:17; author: danj; state: Exp; lines: +10 -5; commitid: Q1CPa59twalxlTp4; update py-smmap to 0.9.0 ok jca@ I added a py3 flavor but didn't hook it up. It packages fine, do it now.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2018/12/12 15:58:57 Modified files: textproc/txt2man: Makefile textproc/txt2man/patches: patch-bookman Log message: Adjust txt2man's bookman script to avoid "[[ $i ]] || ...", /bin/sh doesn't like this at all. This is an alternative to a diff proposed by Charles A Daniels that moved txt2man to using bash.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: d...@cvs.openbsd.org2018/12/12 15:51:58 Modified files: net: Makefile Log message: Fix py-stem,python3 hook revision 1.1032 date: 2017/11/12 20:05:18; author: danj; state: Exp; lines: +3 -2; commitid: HlZusBvIetsYUW2x; + py-stem + py-stem - stem The commit message was accurate, I forgot the ",python3"
bison SIGILL while building re2c on alpha
I blew off the dust of my alpha, and attempted some investigations, one of the required packages to build would be devel/re2c, however, bison aborts with SIGILL: (gdb) r Starting program: /usr/local/bin/bison --output=src/ast/parser.cc --defines=src/ast/y.tab.h ./src/ast/parser.yp warning: Hit beginning of text section without finding enclosing function for address 0x3dda0484 Program received signal SIGILL, Illegal instruction. 0x3dda0484 in ?? () (gdb) bt #0 0x3dda0484 in ?? () #1 0x3de0123c in set_program_name (argv0=0x1fffe1d10 "/usr/local/bin/bison") at lib/progname.c:61 #2 0x3ddb6a38 in main (argc=4, argv=0x1fffe1bb8) at src/main.c:61 (gdb) frame 1 #1 0x3de0123c in set_program_name (argv0=0x1fffe1d10 "/usr/local/bin/bison") at lib/progname.c:61 61if (base - argv0 >= 7 && strncmp (base - 7, "/.libs/", 7) == 0) (gdb) print base $7 = 0x1fffe1d1f "bison" (gdb) print argv0 $8 = 0x1fffe1d10 "/usr/local/bin/bison" (gdb) print base -7 $9 = 0x1fffe1d18 "al/bin/bison" (gdb) info address strncmp Symbol "strncmp" is at 0xa3a53d00 in a file compiled without debugging. (gdb) print $10 = ( *) 0xa3a53d00 <*_libc_strncmp> (gdb) disassemble 0xa3a53d00 Dump of assembler code for function *_libc_strncmp: 0xa3a53d00 <+0>: lda sp,-16(sp) 0xa3a53d04 <+4>: unop 0xa3a53d08 <+8>: nop 0xa3a53d0c <+12>:unop 0xa3a53d10 <+16>:beq a2,0xa3a53d50 <*_libc_strncmp+80> 0xa3a53d14 <+20>:ldq_u t0,0(a1) 0xa3a53d18 <+24>:lda t4,1(a1) 0xa3a53d1c <+28>:ldq_u t2,0(a0) 0xa3a53d20 <+32>:lda t3,1(a0) 0xa3a53d24 <+36>:extqh t0,t4,t0 0xa3a53d28 <+40>:extqh t2,t3,t1 0xa3a53d2c <+44>:sra t0,0x38,t0 0xa3a53d30 <+48>:sra t1,0x38,t1 0xa3a53d34 <+52>:lda a2,-1(a2) 0xa3a53d38 <+56>:cmpeq t1,t0,t0 0xa3a53d3c <+60>:mov t4,a1 0xa3a53d40 <+64>:beq t0,0xa3a53d5c <*_libc_strncmp+92> 0xa3a53d44 <+68>:mov t3,a0 0xa3a53d48 <+72>:bne t1,0xa3a53d10 <*_libc_strncmp+16> 0xa3a53d4c <+76>:unop 0xa3a53d50 <+80>:clr v0 0xa3a53d54 <+84>:lda sp,16(sp) 0xa3a53d58 <+88>:ret 0xa3a53d5c <+92>:lda t3,-1(t4) 0xa3a53d60 <+96>:ldq_u t1,-1(t4) 0xa3a53d64 <+100>: extbl t2,a0,t2 0xa3a53d68 <+104>: extbl t1,t3,t0 0xa3a53d6c <+108>: sublt2,t0,v0 0xa3a53d70 <+112>: lda sp,16(sp) 0xa3a53d74 <+116>: ret End of assembler dump. (gdb) disassemble 0x3dda0484 No function contains specified address. OpenBSD 6.4-current (GENERIC) #330: Mon Dec 10 08:00:28 MST 2018 dera...@alpha.openbsd.org:/usr/src/sys/arch/alpha/compile/GENERIC COMPAQ Professional Workstation XP1000, 666MHz 8192 byte page size, 1 processor. real mem = 402653184 (384MB) rsvd mem = 1835008 (1MB) avail mem = 383852544 (366MB) mainbus0 at root cpu0 at mainbus0: ID 0 (primary), 21264A-9 (pass 2.2.3 or 2.2.5) cpu0: architecture extensions: 307 tsc0 at mainbus0: 21272 Chipset, Cchip rev 0 tsc0: 4 Dchips, 1 memory bus of 32 bytes tsc0: arrays present: 128MB (split), 256MB, 0MB, 0MB, Dchip 0 rev 1 tsp0 at tsc0 hose 0 pci0 at tsp0 bus 0 sio0 at pci0 dev 7 function 0 "Contaq Microsystems CY82C693U ISA" rev 0x00 pciide0 at pci0 dev 7 function 1 "Contaq Microsystems CY82C693U ISA" rev 0x00: DMA, channel 0 wired to compatibility atapiscsi0 at pciide0 channel 0 drive 0 scsibus0 at atapiscsi0: 2 targets cd0 at scsibus0 targ 0 lun 0: ATAPI 5/cdrom removable cd0(pciide0:0:0): using PIO mode 4, DMA mode 2 pciide1 at pci0 dev 7 function 2 "Contaq Microsystems CY82C693U ISA" rev 0x00: no DMA, channel 0 wired to compatibility pciide1: channel 0 disabled (no drives) ohci0 at pci0 dev 7 function 3 "Contaq Microsystems CY82C693U ISA" rev 0x00: isa irq 10, version 1.0, legacy support em0 at pci0 dev 11 function 0 "Intel 82544EI" rev 0x02: dec 6600 irq 40, address 00:02:b3:d4:ba:b6 vga0 at pci0 dev 13 function 0 "TI 3DLabs Permedia 2" rev 0x01 wsdisplay0 at vga0 mux 1: console (80x25, vt100 emulation) wsdisplay0: screen 1-5 added (80x25, vt100 emulation) isa0 at sio0 isadma0 at isa0 fdc0 at isa0 port 0x3f0/6 irq 6 drq 2 com0 at isa0 port 0x3f8/8 irq 4: ns16550a, 16 byte fifo com1 at isa0 port 0x2f8/8 irq 3: ns16550a, 16 byte fifo pckbc0 at isa0 port 0x60/5 irq 1 irq 12 pckbd0 at pckbc0 (kbd slot) wskbd0 at pckbd0: console keyboard,
Re: [FIX] textproc/txt2man
> bash whines too (though does accept it), I think the below diff is
> what was meant.
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/textproc/txt2man/Makefile,v
> retrieving revision 1.3
> diff -u -p -r1.3 Makefile
> --- Makefile 11 Jan 2016 11:04:22 - 1.3
> +++ Makefile 12 Dec 2018 21:24:18 -
> @@ -2,7 +2,7 @@
>
> COMMENT =convert ASCII text to man page
> DISTNAME = txt2man-1.5.6
> -REVISION = 1
> +REVISION = 2
> CATEGORIES = textproc
> HOMEPAGE = http://mvertes.free.fr/
>
> Index: patches/patch-bookman
> ===
> RCS file: /cvs/ports/textproc/txt2man/patches/patch-bookman,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-bookman
> --- patches/patch-bookman 25 Mar 2015 11:11:37 - 1.1
> +++ patches/patch-bookman 12 Dec 2018 21:24:18 -
> @@ -2,8 +2,21 @@ $OpenBSD: patch-bookman,v 1.1 2015/03/25
>
> GNUism.
>
> bookman.orig Fri Feb 18 19:12:35 2011
> -+++ bookman Wed Mar 25 10:51:04 2015
> +Index: bookman
> +--- bookman.orig
> bookman
> +@@ -83,9 +83,9 @@ done
> + shift $(($OPTIND - 1))
> + date=${date:-$(date +'%d %B %Y')}
> +
> +-[[ $1 ]] || set -- $(while read; do echo $REPLY; done)
> ++[[ -n $1 ]] || set -- $(while read; do echo $REPLY; done)
> +
> +-[[ $outfile ]] && post="$post >$outfile"
> ++[[ -n $outfile ]] && post="$post >$outfile"
> +
> + {
> + # Compute table of content from postscript output.
> @@ -127,7 +127,7 @@ date=${date:-$(date +'%d %B %Y')}
> name = $0
> }
>
I would favor this solution over mine, as it is more elegant and avoids
adding an unnecessary dependency. The diff you provided appears to work
correctly on my machine.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2018/12/12 14:42:02 Modified files: x11/libdbusmenu: Makefile Log message: BDEP on intltool
Re: [FIX] textproc/txt2man
On 2018/12/12 15:31, Charles A Daniels wrote:
> Under txt2man 1.5.6, I get this error when running the `bookman`
> command:
>
> ./bookman[86]: syntax error: `$1' missing expression operator
>
> This is because bookman is being executed via `/bin/sh`, when it in fact
> seems to be a BASH-specific script.
>
> I have updated the shebang to call /usr/bin/env bash and have added
> shells/bash to RUN_DEPENDS.
>
> ~ Charles
bash whines too (though does accept it), I think the below diff is
what was meant.
Index: Makefile
===
RCS file: /cvs/ports/textproc/txt2man/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile11 Jan 2016 11:04:22 - 1.3
+++ Makefile12 Dec 2018 21:24:18 -
@@ -2,7 +2,7 @@
COMMENT = convert ASCII text to man page
DISTNAME = txt2man-1.5.6
-REVISION = 1
+REVISION = 2
CATEGORIES = textproc
HOMEPAGE = http://mvertes.free.fr/
Index: patches/patch-bookman
===
RCS file: /cvs/ports/textproc/txt2man/patches/patch-bookman,v
retrieving revision 1.1
diff -u -p -r1.1 patch-bookman
--- patches/patch-bookman 25 Mar 2015 11:11:37 - 1.1
+++ patches/patch-bookman 12 Dec 2018 21:24:18 -
@@ -2,8 +2,21 @@ $OpenBSD: patch-bookman,v 1.1 2015/03/25
GNUism.
bookman.orig Fri Feb 18 19:12:35 2011
-+++ bookmanWed Mar 25 10:51:04 2015
+Index: bookman
+--- bookman.orig
bookman
+@@ -83,9 +83,9 @@ done
+ shift $(($OPTIND - 1))
+ date=${date:-$(date +'%d %B %Y')}
+
+-[[ $1 ]] || set -- $(while read; do echo $REPLY; done)
++[[ -n $1 ]] || set -- $(while read; do echo $REPLY; done)
+
+-[[ $outfile ]] && post="$post >$outfile"
++[[ -n $outfile ]] && post="$post >$outfile"
+
+ {
+ # Compute table of content from postscript output.
@@ -127,7 +127,7 @@ date=${date:-$(date +'%d %B %Y')}
name = $0
}
Re: powerpc bulk build report
On Wed, 12 Dec 2018 15:56:51 -0500 Brian Callahan wrote: > > I think it would be better if you kept the same comment but > > simplified the rest to: > > COMPILER = base-clang ports-gcc > > > > Since that's effectively what you're asking for (and is more > > generalizable to all archs). > > > > ~Brian > > > > Oh, and if this is C code only, > COMPILER_LANGS = c > Yes, it's C only. There was a space that should be a tab, that i've fixed by the way. Here it is. Charlène. Index: Makefile === RCS file: /cvs/ports/games/prboom-plus/Makefile,v retrieving revision 1.5 diff -u -p -u -p -r1.5 Makefile --- Makefile4 Sep 2018 12:46:13 - 1.5 +++ Makefile12 Dec 2018 21:11:22 - @@ -10,7 +10,12 @@ HOMEPAGE = http://prboom-plus.sourceforg MAINTAINER = Ryan Freeman # GPLv2+ -PERMIT_PACKAGE_CDROM = Yes +PERMIT_PACKAGE_CDROM = Yes + +# undefined reference to `__builtin_bswap32' +# requires gcc >= 4.3 for gcc4 archs. +COMPILER = base-clang ports-gcc +COMPILER_LANGS = c BUILD_DEPENDS =archivers/unzip
Re: p5-IO-Socket-SSL message
Thank you very much!
Certainly $SIG{__DIE__} = sub {warn @_} makes the difference.
Even you helped me already, if you could give me a clue to investigate
further the
interference of $SIG{__DIE__} = ...
Following two test programs. First one with SIG handler, second one,
without SIG handler.
With this program I get the reported message:
#!/usr/bin/perl -w
use strict;
use Cwd qw( abs_path );
my $CW_DIR = abs_path;
my $BASE_URL = 'https://www.openbsd.org/';
my $UA = "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:60.0)
Gecko/20100101 Firefox/60.0";
local $SIG{ __DIE__ } = sub { ## Whenever die, restore cwd
my $message = shift;
warn $message;
chdir( $CW_DIR ) or warn "Couldn't change to directory ", $CW_DIR, ": $!";
exit 1;
};
base_get();
sub base_get {
use HTTP::Tiny;
my $ua = HTTP::Tiny->new( agent => $UA );
my $response = $ua->get($BASE_URL);
die "Failed getting web page!" unless $response->{success};
print "$response->{status} $response->{reason}\n";
if ( $response->{success} and length $response->{content} ) {
print "Web page size: ", length $response->{content}, "\n";
my $content_page = $response->{content};
} else {
warn "No content!\n";
}
}
With this program everything is ok (no message):
#!/usr/bin/perl -w
use strict;
use Cwd qw( abs_path );
my $CW_DIR = abs_path;
my $BASE_URL = 'https://www.openbsd.org/';
my $UA = "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:60.0)
Gecko/20100101 Firefox/60.0";
base_get();
sub base_get {
use HTTP::Tiny;
my $ua = HTTP::Tiny->new( agent => $UA );
my $response = $ua->get($BASE_URL);
die "Failed getting web page!" unless $response->{success};
print "$response->{status} $response->{reason}\n";
if ( $response->{success} and length $response->{content} ) {
print "Web page size: ", length $response->{content}, "\n";
my $content_page = $response->{content};
} else {
warn "No content!\n";
}
}
Thanks and greetings!
Daniel
Quoting Alexander Bluhm :
On Mon, Dec 10, 2018 at 08:00:16PM +0100, d...@dandat.net wrote:
use HTTP::Tiny;
my $ua = HTTP::Tiny->new( agent => $UA );
my $response = $ua->get($BASE_URL);
Is this your complete Perl program? Or just an excerpt? Can you
provide a minimal program that triggers the bug. Obviously in your
example $UA and $BASE_URL are undefined.
I get this error:
Use of uninitialized value $url in pattern match (m//) at
/usr/libdata/perl5/HTTP/Tiny.pm line 836.
Use of uninitialized value $url in concatenation (.) or string at
/usr/libdata/perl5/HTTP/Tiny.pm line 836.
I'm getting this message:
Your vendor has not defined SSLeay macro TLS1_3_VERSION at
/usr/local/libdata/perl5/site_perl/IO/Socket/SSL.pm line 104.
Do you have code like this somewhere in your program?
$SIG{__DIE__} = sub {warn @_}
I don't think your problem is OpenBSD specific. But on systems
with OpenSSL 1.1 it cannot happen.
bluhm
Re: powerpc bulk build report
On 12/12/18 3:55 PM, Brian Callahan wrote:
On 12/12/18 3:51 PM, Charlene Wendling wrote:
On Tue, 11 Dec 2018 16:29:13 -0700 (MST)
lan...@openbsd.org wrote:
http://build-failures.rhaalovely.net//powerpc/2018-12-01/games/prboom-plus.log
Hi,
The diff says it all ;) As sparc64 has the same issue, it should fix the
build there as well. The build log is here [1].
Lightly tested [2], sadly (i have motion sickness when playing FPSes).
Charlène.
[1] http://ix.io/1vSK
[2] https://bsd.network/web/statuses/101230014606063596
Index: Makefile
===
RCS file: /cvs/ports/games/prboom-plus/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- Makefile 4 Sep 2018 12:46:13 - 1.5
+++ Makefile 12 Dec 2018 20:06:05 -
@@ -12,6 +12,12 @@ MAINTAINER = Ryan Freeman = 4.3 for gcc4 archs.
+.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc64"
+COMPILER = ports-gcc
+.endif
+
BUILD_DEPENDS = archivers/unzip
WANTLIB += SDL c m pthread GL GLU SDL_mixer SDL_net
I think it would be better if you kept the same comment but simplified
the rest to:
COMPILER = base-clang ports-gcc
Since that's effectively what you're asking for (and is more
generalizable to all archs).
~Brian
Oh, and if this is C code only,
COMPILER_LANGS = c
Re: powerpc bulk build report
On 12/12/18 3:51 PM, Charlene Wendling wrote:
On Tue, 11 Dec 2018 16:29:13 -0700 (MST)
lan...@openbsd.org wrote:
http://build-failures.rhaalovely.net//powerpc/2018-12-01/games/prboom-plus.log
Hi,
The diff says it all ;) As sparc64 has the same issue, it should fix the
build there as well. The build log is here [1].
Lightly tested [2], sadly (i have motion sickness when playing FPSes).
Charlène.
[1] http://ix.io/1vSK
[2] https://bsd.network/web/statuses/101230014606063596
Index: Makefile
===
RCS file: /cvs/ports/games/prboom-plus/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- Makefile4 Sep 2018 12:46:13 - 1.5
+++ Makefile12 Dec 2018 20:06:05 -
@@ -12,6 +12,12 @@ MAINTAINER = Ryan Freeman
+# undefined reference to `__builtin_bswap32'
+# requires gcc >= 4.3 for gcc4 archs.
+.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc64"
+COMPILER = ports-gcc
+.endif
+
BUILD_DEPENDS = archivers/unzip
WANTLIB += SDL c m pthread GL GLU SDL_mixer SDL_net
I think it would be better if you kept the same comment but simplified
the rest to:
COMPILER = base-clang ports-gcc
Since that's effectively what you're asking for (and is more
generalizable to all archs).
~Brian
Re: powerpc bulk build report
On Tue, 11 Dec 2018 16:29:13 -0700 (MST)
lan...@openbsd.org wrote:
> http://build-failures.rhaalovely.net//powerpc/2018-12-01/games/prboom-plus.log
Hi,
The diff says it all ;) As sparc64 has the same issue, it should fix the
build there as well. The build log is here [1].
Lightly tested [2], sadly (i have motion sickness when playing FPSes).
Charlène.
[1] http://ix.io/1vSK
[2] https://bsd.network/web/statuses/101230014606063596
Index: Makefile
===
RCS file: /cvs/ports/games/prboom-plus/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- Makefile4 Sep 2018 12:46:13 - 1.5
+++ Makefile12 Dec 2018 20:06:05 -
@@ -12,6 +12,12 @@ MAINTAINER = Ryan Freeman = 4.3 for gcc4 archs.
+.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc64"
+COMPILER = ports-gcc
+.endif
+
BUILD_DEPENDS =archivers/unzip
WANTLIB += SDL c m pthread GL GLU SDL_mixer SDL_net
Re: security/wpa_supplicant: Reassoc on NWID change
Hi Edd, Raf, Mikolaj, ports@
I just updated my proposed patch with Mikolaj's suggestion of also
listening to RTM_IFINFO instead of just RTM_80211INFO. The patch is
attached below the signature.
It makes reassociation over suspend/resume work (if I resume in the
same spot I suspended in, haven't checked going out of range). What's
noteworthy is that it takes a while (in the area of 10 - 15 seconds)
for wpa_supplicant to re-establish a connection.
As for Edd's report that moving out of range with the device on doesn't
cause re-association (did I understand that correctly?), I think the
output of `route monitor` and `ifconfig $dev scan` before and after
loss of signal (and going into range of the other AP) might be
interesting to see if there's another routing message that we have to
consider.
Maybe the attached patch also helps Edd's situation. As always, I'm
grateful for testing and feedback.
--
Gregor
Index: patches/patch-src_drivers_driver_openbsd_c
===
RCS file:
/home/cvs/ports/security/wpa_supplicant/patches/patch-src_drivers_driver_openbsd_c,v
retrieving revision 1.5
diff -u -p -r1.5 patch-src_drivers_driver_openbsd_c
--- patches/patch-src_drivers_driver_openbsd_c 17 May 2016 08:29:27 -
1.5
+++ patches/patch-src_drivers_driver_openbsd_c 12 Dec 2018 20:18:19 -
@@ -1,24 +1,151 @@
$OpenBSD: patch-src_drivers_driver_openbsd_c,v 1.5 2016/05/17 08:29:27 dcoppa
Exp $
-Fix includes
+Fix includes and react to NWID changes and suspend/resume.
src/drivers/driver_openbsd.c.orig Sun Sep 27 21:02:05 2015
-+++ src/drivers/driver_openbsd.c Mon Sep 28 09:51:53 2015
-@@ -9,13 +9,14 @@
+Index: src/drivers/driver_openbsd.c
+--- src/drivers/driver_openbsd.c.orig
src/drivers/driver_openbsd.c
+@@ -9,19 +9,34 @@
#include "includes.h"
#include
-
+
+#include "common.h"
+#include "driver.h"
++#include "eloop.h"
+
++#include
#include
+#include
++#include
#include
#include
#include
--
+
-#include "common.h"
-#include "driver.h"
-
++#define RTM_READSZ 2048
+
struct openbsd_driver_data {
- char ifname[IFNAMSIZ + 1];
+- char ifname[IFNAMSIZ + 1];
+ void *ctx;
+
+- int sock; /* open socket for 802.11 ioctls */
++ char ifname[IFNAMSIZ + 1];
++ int ifindex; /* Ifindex of the configured interface */
++
++ int sock; /* open socket for 802.11 ioctls */
++ int rtsock; /* routing socket for interface state messages */
++
++ /* These fields are used to track the last seen (and associated) access
point
++ to determine whether we should kick off an association event */
++ int nwid_len; /* Length of last seen SSID (as per routing message) */
++ char nwid[IEEE80211_NWID_LEN]; /* Last seen SSID (as per routing
message) */
++ char addr[IEEE80211_ADDR_LEN]; /* Last seen BSSID (as per routing
message) */
+ };
+
+
+@@ -90,6 +105,71 @@ wpa_driver_openbsd_set_key(const char *ifname, void *p
+ return 0;
+ }
+
++static void
++wpa_driver_openbsd_event_receive(int sock, void *global, void *sock_ctx)
++{
++ struct openbsd_driver_data *drv = sock_ctx;
++ struct rt_msghdr *rtm;
++ struct if_ieee80211_data *ifie;
++ char *rtmmsg;
++ ssize_t n;
++
++ rtmmsg = os_zalloc(RTM_READSZ);
++ if (rtmmsg == NULL) {
++ wpa_printf(MSG_ERROR, "Can't allocate space for routing
message");
++ return;
++ }
++
++ do {
++ n = read(sock, rtmmsg, RTM_READSZ);
++ } while (n == -1 && errno == EINTR);
++
++ if (n == -1)
++ goto done;
++
++ rtm = (struct rt_msghdr *)rtmmsg;
++
++ if ((size_t)n < sizeof(rtm->rtm_msglen) ||
++ n < rtm->rtm_msglen ||
++ rtm->rtm_version != RTM_VERSION)
++ goto done;
++
++ if (rtm->rtm_index != drv->ifindex)
++goto done;
++
++ if (rtm->rtm_type == RTM_80211INFO) {
++printf("RTM_80211INFO received\n");
++ifie = &((struct if_ieee80211_msghdr *)rtm)->ifim_ifie;
++
++if ((ifie->ifie_nwid_len != drv->nwid_len) ||
++(os_memcmp(drv->nwid, ifie->ifie_nwid, ifie->ifie_nwid_len) != 0) ||
++(os_memcmp(drv->addr, ifie->ifie_addr, IEEE80211_ADDR_LEN) != 0)) {
++ os_memcpy(drv->addr, ifie->ifie_addr, IEEE80211_ADDR_LEN);
++
++ os_memcpy(drv->nwid, ifie->ifie_nwid, ifie->ifie_nwid_len);
++ drv->nwid_len = ifie->ifie_nwid_len;
++
++ /* Emit ASSOC event */
++ wpa_supplicant_event(drv->ctx, EVENT_ASSOC, NULL);
++}
++ } else if (rtm->rtm_type == RTM_IFINFO) {
++/* This is here so we can react to suspend/resume.
++
++ This is a bit rough, sometimes there are two or more IFINFOs notifying
++ us that the device just got "up" again. It doesn't seem to hurt to
++ issue multiple EVENT_ASSOC in those cases though.
++*/
++
++if (rtm->rtm_flags & RTF_UP) {
++ /* Emit ASSOC event */
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2018/12/12 13:41:04 Modified files: net/curl : Makefile distinfo net/curl/pkg : PLIST Log message: Update to 7.63.0. No known security fixes.
[FIX] textproc/txt2man
Under txt2man 1.5.6, I get this error when running the `bookman` command: ./bookman[86]: syntax error: `$1' missing expression operator This is because bookman is being executed via `/bin/sh`, when it in fact seems to be a BASH-specific script. I have updated the shebang to call /usr/bin/env bash and have added shells/bash to RUN_DEPENDS. ~ Charles txt2man.tgz Description: application/compressed-tar
Re: NEW: devel/py-arrow-0.12.1
On Wed 12/12/2018 14:55, Jeremie Courreges-Anglas wrote: > On Fri, Dec 07 2018, Jeremie Courreges-Anglas wrote: > > On Thu, Dec 06 2018, Edward Lopez-Acosta wrote: > >> Resubmitting this for review. > >> Fixed some typos in the Makefile and PLIST, and added a conditional > >> TEST_DEPENDS on recommendation from jca (CC to make sure I didn't miss > >> something). > >> > >> I looked things over multiple times but if I missed anything please let > >> me know. > >> > >> All tests pass for both py2 and py3, all deps are in the repos. Nothing > >> currently in the tree depends on this new port. > >> > >> -- > >> Ran 328 tests in 0.509s > >> > >> OK > >> > >> Thoughts? > > > > I'd like to import this. Reviews/oks? :) > > ping (same tarball as previous) OK bket@
Re: lang/gcc/6: Install missing stdatomic.h header
Reviving this with an updated patch...
On 11/29/18 12:19 PM, Brian Callahan wrote:
On 11/29/18 8:17 AM, Pascal Stumpf wrote:
On Wed, 28 Nov 2018 12:47:21 -0500, Brian Callahan wrote:
On 11/28/18 6:54 AM, Stuart Henderson wrote:
On 2018/11/27 19:36, George Koehler wrote:
On Tue, 27 Nov 2018 16:12:08 -0500
George Koehler wrote:
NetBSD's packages of gcc5 and gcc7 do contain the headers from
float.h
to stdatomic.h (or most of them). I haven't found the reason why
NetBSD keeps those headers and OpenBSD doesn't.
Found it!
$ cat gcc-6.4.0/gcc/config/t-openbsd
# We don't need GCC's own include files.
USER_H = $(EXTRA_HEADERS)
This t-openbsd gets enabled by gcc-6.4.0/gcc/config.gcc and then
included by build-powerpc/{prev-gcc,gcc}/Makefile so it overrides
USER_H. The effect is to remove gcc's float.h, iso646.h, stdarg.h,
stdbool.h, stddef.h, varargs.h, stdfix.h, stdnoreturn.h, stdalign.h,
stdatomic.h from the compiler.
The obvious fix (though I haven't tried it) is to remove this USER_H
override, either by commenting it or by patching config.gcc to ignore
t-openbsd. Most platforms don't override USER_H. (The only other
platform to override USER_H is config/mips/t-sdemtk, but its
override looks outdated to me.)
This fix seems like the right approach in general to me, I think this
is definitely worth trying.
This causes the build to fail rather quickly. Log attached.
I took the route of commenting out the USER_H line from t-openbsd.
Another option is to keep the USER_H override and add only the 4
headers stdfix.h, stdnoreturn.h, stdalign.h, stdatomic.h. This may
become outdated if a future version of gcc adds more headers.
That sounds like it's asking for future trouble.
This allows the build to succeed, and seems to uncover some issues with
our port (like, we have been enabling SSP in configure but not actually
building or at least installing it?).
We really don't want to install GCC's own libssp and ssp headers. I
have no idea why adding stuff to USER_H would suddenly enable these, but
can you try to add --disable-libssp to CONFIGURE_ARGS?
Make sense. Yup, added that flag. Simpler diff overall that way.
Attached.
~Brian
Diff attached to do add just those headers that are not in /usr/include
and the resulting PLIST changes. Yes it is more work keeping an eye out
to sync this list every time we update gcc, so it may be worth it to
fix
the build with all headers enabled if we can.
~Brian
Another option is to add the 4 headers to base OpenBSD. If there
is some reason why /usr/include has its own float.h, iso646.h, and so
on, then the same reason might be why to add the 4 headers.
I'm not sure if it's the same for all of these headers, but
stdatomic.h
in particular seems much more tightly bound to the compiler than to
the OS.
gcc also has its own stdint.h, but doesn't use it on OpenBSD, because
config.gcc defaults to use_gcc_stdint=none and has no code to enable
it on OpenBSD.
For comparison, ports-clang (pkg_info -L llvm) seems to package its
own float.h, iso646.h, and so on, and its own stdint.h; while
base-clang seems to omit headers that exist in /usr/include.
It does for some but not others. diff -wu of iso646.h, for example,
differs only in whitespace, copyright/PD notice, and double-inclusion
protection macro..
application/gzip attachment, name=gcc6.log.gz
text/x-patch content
New diff is mostly the same, except it adds openbsd-stdint.h to the
tm_file lines in gcc/config.gcc to all archs that were missing it. This
allows the stdatomic.h header to be usable on all archs. Problem
reported and fix from George Koehler, who couldn't use stdatomic.h on
his macppc and now can.
~Brian
Index: Makefile
===
RCS file: /cvs/ports/lang/gcc/6/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile 7 Dec 2018 18:27:35 - 1.14
+++ Makefile 12 Dec 2018 20:02:47 -
@@ -6,7 +6,7 @@ ONLY_FOR_ARCHS = ${GCC49_ARCHS}
DPB_PROPERTIES = parallel
V = 6.4.0
-REVISION = 3
+REVISION = 4
FULL_VERSION = $V
FULL_PKGVERSION = $V
@@ -138,6 +138,7 @@ CONFIGURE_ARGS += \
--with-system-zlib \
--disable-libmudflap \
--disable-libgomp \
+ --disable-libssp \
--disable-tls \
--with-gnu-ld \
--with-gnu-as \
Index: patches/patch-gcc_config_gcc
===
RCS file: /cvs/ports/lang/gcc/6/patches/patch-gcc_config_gcc,v
retrieving revision 1.5
diff -u -p -r1.5 patch-gcc_config_gcc
--- patches/patch-gcc_config_gcc 1 Nov 2018 22:09:30 - 1.5
+++ patches/patch-gcc_config_gcc 12 Dec 2018 20:02:47 -
@@ -32,7 +32,7 @@ Index: gcc/config.gcc
;;
+arm-*-openbsd*)
+ tm_defines="${tm_defines} DEFAULT_FLAG_PIE=1"
-+ tm_file="dbxelf.h elfos.h arm/elf.h arm/aout.h arm/openbsd1.h arm/arm.h openbsd.h openbsd-libpthread.h arm/openbsd.h"
++ tm_file="dbxelf.h elfos.h arm/elf.h arm/aout.h arm/openbsd1.h arm/arm.h openbsd.h openbsd-stdint.h
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2018/12/12 12:54:32 Modified files: news/sabnzbd : Makefile distinfo news/sabnzbd/files: sabnzbd news/sabnzbd/pkg: PLIST sabnzbd.rc Added files: news/sabnzbd/patches: patch-sabnzbd_assembler_py Log message: Update to sabnzbd-2.3.5 Most of the work is done by Mikolaj Kucharski . Thank you! Maintainer timeout
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2018/12/12 12:52:15 ports/news/sabnzbd/patches Update of /cvs/ports/news/sabnzbd/patches In directory cvs.openbsd.org:/tmp/cvs-serv34725/patches Log Message: Directory /cvs/ports/news/sabnzbd/patches added to the repository
Re: security/wpa_supplicant: Reassoc on NWID change
Hi Mikolaj, > [...] > I'm currently testing your diff with additional condition to also > handle RTM_IFINFO, as I see it happening just after resume: > > 1544537117.597172: XXX wpa_driver_openbsd_event_receive() start > 1544537117.597197: XXX evnt_rcv: name=iwn0, type=0xe > [...] Good idea. How does it work for you? I'll add this to my patch as well and try it a bit tonight. -- Gregor signature.asc Description: PGP signature
Re: Update to py-cheetah-3.1.0
On Wed, 12 Dec 2018 13:29:03 -0500, Daniel Jakots wrote: > sabnzbd As found by bket@, the current version in tree won't work https://github.com/sabnzbd/sabnzbd/blob/1.2.1/SABnzbd.py#L45 They fixed the check before 2.3.5 so the update pending on ports should work regarding this particular problem. I'll make sure sabnzbd gets in before committing cheetah. Cheers, Daniel
Re: UPDATE: net/geomyidae 0.34
> Am 12.12.2018 um 12:14 schrieb Sascha Paunovic :
>
> Hi,
>
> here an update of net/geomyidae to 0.34:
Thanks!
ok jung@
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/geomyidae/Makefile,v
> retrieving revision 1.7
> diff -u -p -r1.7 Makefile
> --- Makefile1 Jul 2018 18:05:30 -1.7
> +++ Makefile12 Dec 2018 11:12:52 -
> @@ -2,11 +2,13 @@
>
> COMMENT =Gopher protocol daemon
>
> -DISTNAME =geomyidae-0.32.2
> +DISTNAME =geomyidae-v0.34
> +PKGNAME =${DISTNAME:S/-v/-/}
> +EXTRACT_SUFX =.tgz
>
> CATEGORIES =net
>
> -HOMEPAGE =http://git.r-36.net/geomyidae/
> +HOMEPAGE =http://git.r-36.net/scm/geomyidae
>
> MAINTAINER =Joerg Jung
>
> @@ -16,7 +18,7 @@ PERMIT_PACKAGE_CDROM =Yes
> # uses pledge()
> WANTLIB =c
>
> -MASTER_SITES =${HOMEPAGE}/snapshot/
> +MASTER_SITES =ftp://bitreich.org/releases/geomyidae/
>
> MAKE_FLAGS =CC="${CC}" CFLAGS="${CFLAGS} -Wall"
> MAKE_ENV =LDFLAGS="${LDFLAGS}"
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/geomyidae/distinfo,v
> retrieving revision 1.4
> diff -u -p -r1.4 distinfo
> --- distinfo1 Jul 2018 18:05:30 -1.4
> +++ distinfo12 Dec 2018 11:12:52 -
> @@ -1,2 +1,2 @@
> -SHA256 (geomyidae-0.32.2.tar.gz) =
> /78PayOR9wgqLyRTTfOLTUMLoBx/QlFPCJ0vdI45Yl4=
> -SIZE (geomyidae-0.32.2.tar.gz) = 20896
> +SHA256 (geomyidae-v0.34.tgz) = JYCtDyKc0/XDNJWXWnCGea6vUnbAbsjVWHHX9pshbrA=
> +SIZE (geomyidae-v0.34.tgz) = 22242
> Index: pkg/geomyidae.rc
> ===
> RCS file: /cvs/ports/net/geomyidae/pkg/geomyidae.rc,v
> retrieving revision 1.3
> diff -u -p -r1.3 geomyidae.rc
> --- pkg/geomyidae.rc11 Jan 2018 19:27:05 -1.3
> +++ pkg/geomyidae.rc12 Dec 2018 11:12:52 -
> @@ -3,7 +3,7 @@
> # $OpenBSD: geomyidae.rc,v 1.3 2018/01/11 19:27:05 rpe Exp $
>
> daemon="${TRUEPREFIX}/bin/geomyidae"
> -daemon_flags="-4 -l /var/log/geomyidae.log -u _geomyidae -g _geomyidae"
> +daemon_flags="-l /var/log/geomyidae.log -u _geomyidae -g _geomyidae"
>
> . /etc/rc.d/rc.subr
>
Re: LLVM 6.0.1p8 fails to compile on 6.4-stable/loongson
On Tue, 11 Dec 2018 23:51:43 -0800 Xiyue Deng wrote: > Well, this attempt failed with an ICE. The build log is attached. I > wonder whether it is because of "out of memory". I did have a 5G swap > besides the 1G memory though (with infinity settings in /etc/logins.conf). My powerpc machine also has 1G of RAM and also got internal compiler errors from eg++ while building devel/llvm. Sometimes, I got C++ syntax errors without an internal compiler error. The errors were not reproducible, so I built more of llvm by doing `make rebuild` multiple times, until the errors became too frequent. Other programs had problems: fvwm and xterm sometimes crashed; tmux and cc1plus sometimes got stuck like an infinite loop. I suspect that I had corrupt RAM. 1G of RAM is not enough to build devel/llvm, so my machine needed to swap. Using swap seems to cause the errors. I don't know if my hardware (an old PowerBook5,4 running OpenBSD/macppc) can handle the stress of compiling and swapping at the same time. I might try to write a program to test the hardware, and run it in both OpenBSD and Mac OS X. -- George Koehler
Update to py-cheetah-3.1.0
Hi,
Cheetah upstreams is more or less dead but it got forked and the fork
is actually maintained:
https://github.com/CheetahTemplate3/cheetah3
This update:
- switches to this upstream
- adds a py3 flavour thanks to the new upstream
- reorders the Makefile for a saner order
The test suite is 100% fine here but I'm running the py-markdown
updated (for some other reasons) so ymmv.
If you use gnuradio or sabnzbd (that's why I cc'ed you ;)) can you
please test this diff and report if it's still fine?
Comments? OK?
Cheers,
Daniel
Index: Makefile
===
RCS file: /cvs/ports/devel/py-cheetah/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- Makefile10 Feb 2017 22:35:19 - 1.28
+++ Makefile12 Dec 2018 18:28:06 -
@@ -2,9 +2,8 @@
COMMENT= Python-powered template engine and code generator
-MODPY_EGG_VERSION= 2.4.4
-REVISION= 5
-DISTNAME= Cheetah-${MODPY_EGG_VERSION}
+MODPY_EGG_VERSION= 3.1.0
+DISTNAME= Cheetah3-${MODPY_EGG_VERSION}
PKGNAME= py-cheetah-${MODPY_EGG_VERSION}
CATEGORIES=devel textproc
@@ -16,18 +15,25 @@ PERMIT_PACKAGE_CDROM= Yes
WANTLIB += ${MODPY_WANTLIB}
WANTLIB += pthread
-MODPY_PI = Yes
-
MODULES= lang/python
-TEST_DEPENDS= devel/py-cheetah
+MODPY_PI = Yes
MODPY_SETUPTOOLS= Yes
+
+RUN_DEPENDS= textproc/py-markdown${MODPY_FLAVOR}
+TEST_DEPENDS= ${FULLPKGNAME}:${BUILD_PKGPATH} \
+ textproc/py-pygments${MODPY_FLAVOR}
+
MAKE_ENV+= CHEETAH_USE_SETUPTOOLS=1
-RUN_DEPENDS= textproc/py-markdown
+FLAVORS= python3
+FLAVOR?=
+
+post-install:
+ for i in ${PREFIX}/bin/*; do \
+ mv $${i} $${i}${MODPY_BIN_SUFFIX} ;\
+ done
do-test:
- mkdir /tmp/.cheetah
- cd /tmp/.cheetah && cheetah test
- rm -fr /tmp/.cheetah
+ cd ${WRKSRC} && ${MODPY_BIN} Cheetah/Tests/Test.py
.include
Index: distinfo
===
RCS file: /cvs/ports/devel/py-cheetah/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo18 Jan 2015 03:13:41 - 1.9
+++ distinfo12 Dec 2018 18:28:06 -
@@ -1,2 +1,2 @@
-SHA256 (Cheetah-2.4.4.tar.gz) = vjCCKfDB5eWvTyfX7gbZC7GeavMFl5Tl/VNqbymptVA=
-SIZE (Cheetah-2.4.4.tar.gz) = 190989
+SHA256 (Cheetah3-3.1.0.tar.gz) = KT+HdqXep8Pf/Sb86ElcLa+RK5y0bMScQctQ2ll6CsY=
+SIZE (Cheetah3-3.1.0.tar.gz) = 872411
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-cheetah/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST
--- pkg/PLIST 2 Apr 2015 19:38:21 - 1.10
+++ pkg/PLIST 12 Dec 2018 18:28:06 -
@@ -1,129 +1,142 @@
@comment $OpenBSD: PLIST,v 1.10 2015/04/02 19:38:21 jasper Exp $
-bin/cheetah
-bin/cheetah-analyze
-bin/cheetah-compile
+bin/cheetah${MODPY_BIN_SUFFIX}
+bin/cheetah-analyze${MODPY_BIN_SUFFIX}
+bin/cheetah-compile${MODPY_BIN_SUFFIX}
lib/python${MODPY_VERSION}/site-packages/Cheetah/
-lib/python${MODPY_VERSION}/site-packages/Cheetah-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/Cheetah-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/Cheetah-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/Cheetah-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/Cheetah-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/Cheetah-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/Cheetah/CacheRegion.py
-lib/python${MODPY_VERSION}/site-packages/Cheetah/CacheRegion.pyc
lib/python${MODPY_VERSION}/site-packages/Cheetah/CacheStore.py
-lib/python${MODPY_VERSION}/site-packages/Cheetah/CacheStore.pyc
lib/python${MODPY_VERSION}/site-packages/Cheetah/CheetahWrapper.py
-lib/python${MODPY_VERSION}/site-packages/Cheetah/CheetahWrapper.pyc
lib/python${MODPY_VERSION}/site-packages/Cheetah/Compiler.py
-lib/python${MODPY_VERSION}/site-packages/Cheetah/Compiler.pyc
lib/python${MODPY_VERSION}/site-packages/Cheetah/DirectiveAnalyzer.py
-lib/python${MODPY_VERSION}/site-packages/Cheetah/DirectiveAnalyzer.pyc
lib/python${MODPY_VERSION}/site-packages/Cheetah/Django.py
-lib/python${MODPY_VERSION}/site-packages/Cheetah/Django.pyc
lib/python${MODPY_VERSION}/site-packages/Cheetah/DummyTransaction.py
-lib/python${MODPY_VERSION}/site-packages/Cheetah/DummyTransaction.pyc
lib/python${MODPY_VERSION}/site-packages/Cheetah/ErrorCatchers.py
-lib/python${MODPY_VERSION}/site-packages/Cheetah/ErrorCatchers.pyc
lib/python${MODPY_VERSION}/site-packages/Cheetah/FileUtils.py
rm news/sickbeard?
Hi, >From the Makefile: # $OpenBSD: Makefile,v 1.4 2015/11/02 11:56:54 espie Exp $ # alpha version PKGNAME = sickbeard-0.0.1 It's obviously not maintained. Upstream doesn't seem to be the most alive repo of github: https://github.com/midgetspy/Sick-Beard A friend of mine (used to?) use a fork https://github.com/SiCKRAGE/SiCKRAGE but I guess if someone wants to use it it's probably better to create a new port. Objections/arguments? Cheers, Daniel
Re: p5-IO-Socket-SSL message
On Wed, Dec 12, 2018 at 05:40:44PM +0100, d...@dandat.net wrote:
> Thank you very much!
> Certainly $SIG{__DIE__} = sub {warn @_} makes the difference.
> Even you helped me already, if you could give me a clue to investigate
> further the
> interference of $SIG{__DIE__} = ...
/usr/local/libdata/perl5/site_perl/IO/Socket/SSL.pm line 104
and my $tls13 = eval { Net::SSLeay::TLS1_3_VERSION() }
IO::Socket::SSL detects TLS 1.3 support.
Net::SSLeay::TLS1_3_VERSION() dies, but it is catched with an eval.
This does not work well together with $SIG{__DIE__}.
Either complain at IO::Socket::SSL maintainer or at whoever put the
die handler into your program. Die and eval is a common Perl idiom,
so I would blame the handler for the failure. You cannot use that
safely with generic modules. Signal handlers are global so you
have to be careful that they do not interfere with anything you
use.
This is not an OpenBSD ports bug.
bluhm
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2018/12/12 09:56:12 Modified files: math/bcal : Makefile distinfo math/bcal/patches: patch-bcal_1 patch-src_bcal_c Log message: Update to bcal-2.1 -- upstream now makes real tarballs Changelog: https://github.com/jarun/bcal/blob/master/CHANGELOG
Re: LLVM 6.0.1p8 fails to compile on 6.4-stable/loongson
On 12/12/18 2:51 AM, Xiyue Deng wrote: Jeremie Courreges-Anglas writes: On Mon, Dec 10 2018, Xiyue Deng wrote: [...] Sounds great! It will be great to have it backported to -stable as well. "will" Please keep in mind that development happens on -current. Backporting diffs from -current to -stable is not always straightforward. If you 6.4 users want a backport then why not Do It Yourself? :) Well, this attempt failed with an ICE. The build log is attached. I wonder whether it is because of "out of memory". I did have a 5G swap besides the 1G memory though (with infinity settings in /etc/logins.conf). If you're just looking to use clang and clang++ on loongson, you might be better off installing -current, which now includes /usr/bin/clang and /usr/bin/clang++ (and /usr/bin/ld.lld, though I haven't found it to be very useful atm). It'll be much faster than having to debug g++ problems and then actually build llvm. ~Brian
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2018/12/12 09:32:59 Modified files: infrastructure/bin: pkg_outdated Log message: use show-indexed
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org 2018/12/12 09:17:30
Modified files:
infrastructure/mk: bsd.port.mk
Log message:
add a "show-indexed" target that displays variables with (potential)
SUBPACKAGE variation.
Less brittle than make show=FULLPKGNAME\${SUBPACKAGE}
No Typing Sounds In FocusWriter
I am using FocusWriter in 6.4 and after I enable typing sounds, I don't hear any. The rest of my audio is fine. Is this a bug? Or I am missing something? Thank you
Re: UPDATE: jansson (2.12)
On 2018/12/12 14:45, Kirill Bychkov wrote: > On Wed, December 12, 2018 14:08, Stuart Henderson wrote: > > On 2018/12/12 14:02, Kirill Bychkov wrote: > >> On Wed, December 12, 2018 13:07, Kirill Bychkov wrote: > >> > On Tue, December 11, 2018 13:40, Stuart Henderson wrote: > >> >> On 2018/12/11 18:47, YASUOKA Masahiko wrote: > >> >>> Hi, > >> >>> > >> >>> The diff does the followings: > >> >>> > >> >>> - update to jansson-2.12 > >> >>> - include a static library > >> >>> - use configure && make, instead of cmake > >> >>> > >> >>> My motivation was to include the static library, since I'd like to use > >> >>> it within a statically linked CGI program. > >> >>> > >> >>> I had tried to modify CMakeLists.txt to build both static and shared > >> >>> library, but it was not easy for me. On the other hand, just doing > >> >>> "configure && make" does it as the default. I choiced "configure" > >> >>> rather than cmake. Is there any reason to keep using cmake? > >> >> > >> >> It needs testing with dependent ports either way, but the static > >> >> library can be added to the cmake build like this: > >> >> > >> >> Index: Makefile > >> > > >> > [...] > >> > > >> >> > >> > > >> > Hi! > >> > Thanks for the diff needed to build static libs alogside shared one. > >> > I think we could add it without updating jansson itself at this moment. > >> > Update will follow after testing dependent ports. > >> > > >> > > >> Forgot to add diff > > > > There isn't much of concern in the 2.11->2.12 update, I'm partway through > > a build test of dependent ports with my 2.12 diff at the moment. > > > > > Great. If it doesn't break anything, I'm OK with your patch. > Thanks, tests look good so I have committed.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2018/12/12 08:09:14 Modified files: devel/jansson : Makefile distinfo devel/jansson/patches: patch-CMakeLists_txt devel/jansson/pkg: PLIST Log message: update to jansson-2.12 and enable static libraries. ok kirby@ (maintainer) - inspired by a diff from yasuoka@, but rewritten to continue using cmake instead of switching to autoconf
Re: [new] devel/p5-Test-LWP-UserAgent
Ping. (port attached again). On Sat, 17 Nov 2018, Paco Esteban wrote: > Hi ports@, > > Attached is a port of the Test::LWP::UserAgent perl module available at: > https://metacpan.org/pod/Test::LWP::UserAgent > > It overrides some methods of LWP::UserAgent allowing interception of > requests to simulate responses on tests. > > Cheers, > > -- > Paco Esteban > https://onna.be/gpgkey.asc -- Paco Esteban https://onna.be/gpgkey.asc p5-Test-LWP-UserAgent.tar.gz Description: Binary data
Re: NEW: net/vf1
Ping. (zip attached again) -- Paco Esteban https://onna.be/gpgkey.asc vf1.tgz Description: Binary data
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2018/12/12 07:17:46 Modified files: geo/postgis: Makefile Log message: Add cunit to BDEP, otherwise if it's around during configure cmake detects it and make fake blows if dpb junked it in the meantime. reported by naddy@
Re: NEW: devel/py-arrow-0.12.1
On Fri, Dec 07 2018, Jeremie Courreges-Anglas wrote: > On Thu, Dec 06 2018, Edward Lopez-Acosta wrote: >> Resubmitting this for review. >> Fixed some typos in the Makefile and PLIST, and added a conditional >> TEST_DEPENDS on recommendation from jca (CC to make sure I didn't miss >> something). >> >> I looked things over multiple times but if I missed anything please let >> me know. >> >> All tests pass for both py2 and py3, all deps are in the repos. Nothing >> currently in the tree depends on this new port. >> >> -- >> Ran 328 tests in 0.509s >> >> OK >> >> Thoughts? > > I'd like to import this. Reviews/oks? :) ping (same tarball as previous) py-arrow-0.12.1.tar.gz Description: Binary data -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2018/12/12 06:34:31 Modified files: sysutils/conky : Makefile sysutils/symon : Makefile sysutils/upower: Makefile x11/dstat : Makefile x11/xdimmer: Makefile net/zabbix : Makefile sysutils/htop : Makefile x11/i3status : Makefile x11/e17/e : Makefile Log message: bump HW_SENSORS users, kernel ABI change from adding a new sensor type breakage in zabbix reported by Mark Patruck
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2018/12/12 05:04:56 Modified files: infrastructure/mk: bsd.port.mk bsd.port.subdir.mk pkgpath.mk Log message: rewrite the way 'default' target is set: - common code ends in pkgpath.mk - generic protection for recursive targets - much better detection of cases that don't work as expected, and sensible error messages. tests and ok kn@
Re: UPDATE: jansson (2.12)
On Wed, December 12, 2018 14:08, Stuart Henderson wrote: > On 2018/12/12 14:02, Kirill Bychkov wrote: >> On Wed, December 12, 2018 13:07, Kirill Bychkov wrote: >> > On Tue, December 11, 2018 13:40, Stuart Henderson wrote: >> >> On 2018/12/11 18:47, YASUOKA Masahiko wrote: >> >>> Hi, >> >>> >> >>> The diff does the followings: >> >>> >> >>> - update to jansson-2.12 >> >>> - include a static library >> >>> - use configure && make, instead of cmake >> >>> >> >>> My motivation was to include the static library, since I'd like to use >> >>> it within a statically linked CGI program. >> >>> >> >>> I had tried to modify CMakeLists.txt to build both static and shared >> >>> library, but it was not easy for me. On the other hand, just doing >> >>> "configure && make" does it as the default. I choiced "configure" >> >>> rather than cmake. Is there any reason to keep using cmake? >> >> >> >> It needs testing with dependent ports either way, but the static >> >> library can be added to the cmake build like this: >> >> >> >> Index: Makefile >> > >> > [...] >> > >> >> >> > >> > Hi! >> > Thanks for the diff needed to build static libs alogside shared one. >> > I think we could add it without updating jansson itself at this moment. >> > Update will follow after testing dependent ports. >> > >> > >> Forgot to add diff > > There isn't much of concern in the 2.11->2.12 update, I'm partway through > a build test of dependent ports with my 2.12 diff at the moment. > > Great. If it doesn't break anything, I'm OK with your patch.
UPDATE: net/geomyidae 0.34
Hi,
here an update of net/geomyidae to 0.34:
Index: Makefile
===
RCS file: /cvs/ports/net/geomyidae/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile1 Jul 2018 18:05:30 - 1.7
+++ Makefile12 Dec 2018 11:12:52 -
@@ -2,11 +2,13 @@
COMMENT = Gopher protocol daemon
-DISTNAME = geomyidae-0.32.2
+DISTNAME = geomyidae-v0.34
+PKGNAME = ${DISTNAME:S/-v/-/}
+EXTRACT_SUFX = .tgz
CATEGORIES = net
-HOMEPAGE = http://git.r-36.net/geomyidae/
+HOMEPAGE = http://git.r-36.net/scm/geomyidae
MAINTAINER = Joerg Jung
@@ -16,7 +18,7 @@ PERMIT_PACKAGE_CDROM =Yes
# uses pledge()
WANTLIB = c
-MASTER_SITES = ${HOMEPAGE}/snapshot/
+MASTER_SITES = ftp://bitreich.org/releases/geomyidae/
MAKE_FLAGS = CC="${CC}" CFLAGS="${CFLAGS} -Wall"
MAKE_ENV = LDFLAGS="${LDFLAGS}"
Index: distinfo
===
RCS file: /cvs/ports/net/geomyidae/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo1 Jul 2018 18:05:30 - 1.4
+++ distinfo12 Dec 2018 11:12:52 -
@@ -1,2 +1,2 @@
-SHA256 (geomyidae-0.32.2.tar.gz) = /78PayOR9wgqLyRTTfOLTUMLoBx/QlFPCJ0vdI45Yl4=
-SIZE (geomyidae-0.32.2.tar.gz) = 20896
+SHA256 (geomyidae-v0.34.tgz) = JYCtDyKc0/XDNJWXWnCGea6vUnbAbsjVWHHX9pshbrA=
+SIZE (geomyidae-v0.34.tgz) = 22242
Index: pkg/geomyidae.rc
===
RCS file: /cvs/ports/net/geomyidae/pkg/geomyidae.rc,v
retrieving revision 1.3
diff -u -p -r1.3 geomyidae.rc
--- pkg/geomyidae.rc11 Jan 2018 19:27:05 - 1.3
+++ pkg/geomyidae.rc12 Dec 2018 11:12:52 -
@@ -3,7 +3,7 @@
# $OpenBSD: geomyidae.rc,v 1.3 2018/01/11 19:27:05 rpe Exp $
daemon="${TRUEPREFIX}/bin/geomyidae"
-daemon_flags="-4 -l /var/log/geomyidae.log -u _geomyidae -g _geomyidae"
+daemon_flags="-l /var/log/geomyidae.log -u _geomyidae -g _geomyidae"
. /etc/rc.d/rc.subr
Re: UPDATE: jansson (2.12)
On 2018/12/12 14:02, Kirill Bychkov wrote: > On Wed, December 12, 2018 13:07, Kirill Bychkov wrote: > > On Tue, December 11, 2018 13:40, Stuart Henderson wrote: > >> On 2018/12/11 18:47, YASUOKA Masahiko wrote: > >>> Hi, > >>> > >>> The diff does the followings: > >>> > >>> - update to jansson-2.12 > >>> - include a static library > >>> - use configure && make, instead of cmake > >>> > >>> My motivation was to include the static library, since I'd like to use > >>> it within a statically linked CGI program. > >>> > >>> I had tried to modify CMakeLists.txt to build both static and shared > >>> library, but it was not easy for me. On the other hand, just doing > >>> "configure && make" does it as the default. I choiced "configure" > >>> rather than cmake. Is there any reason to keep using cmake? > >> > >> It needs testing with dependent ports either way, but the static > >> library can be added to the cmake build like this: > >> > >> Index: Makefile > > > > [...] > > > >> > > > > Hi! > > Thanks for the diff needed to build static libs alogside shared one. > > I think we could add it without updating jansson itself at this moment. > > Update will follow after testing dependent ports. > > > > > Forgot to add diff There isn't much of concern in the 2.11->2.12 update, I'm partway through a build test of dependent ports with my 2.12 diff at the moment.
Re: UPDATE: jansson (2.12)
On Wed, December 12, 2018 13:07, Kirill Bychkov wrote:
> On Tue, December 11, 2018 13:40, Stuart Henderson wrote:
>> On 2018/12/11 18:47, YASUOKA Masahiko wrote:
>>> Hi,
>>>
>>> The diff does the followings:
>>>
>>> - update to jansson-2.12
>>> - include a static library
>>> - use configure && make, instead of cmake
>>>
>>> My motivation was to include the static library, since I'd like to use
>>> it within a statically linked CGI program.
>>>
>>> I had tried to modify CMakeLists.txt to build both static and shared
>>> library, but it was not easy for me. On the other hand, just doing
>>> "configure && make" does it as the default. I choiced "configure"
>>> rather than cmake. Is there any reason to keep using cmake?
>>
>> It needs testing with dependent ports either way, but the static
>> library can be added to the cmake build like this:
>>
>> Index: Makefile
>
> [...]
>
>>
>
> Hi!
> Thanks for the diff needed to build static libs alogside shared one.
> I think we could add it without updating jansson itself at this moment.
> Update will follow after testing dependent ports.
>
>
Forgot to add diff
Index: Makefile
===
RCS file: /cvs/ports/devel/jansson/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- Makefile7 Sep 2018 11:10:30 - 1.12
+++ Makefile12 Dec 2018 11:01:26 -
@@ -3,6 +3,7 @@
COMMENT = library for manipulating JSON data
DISTNAME = jansson-2.11
+REVISION = 0
SHARED_LIBS = jansson 3.1
@@ -19,7 +20,7 @@
MODULES = devel/cmake
-CONFIGURE_ARGS += -DBUILD_SHARED_LIBS=ON \
+CONFIGURE_ARGS += -DJANSSON_BUILD_SHARED_LIBS=ON \
-DJANSSON_BUILD_DOCS=OFF \
-DJANSSON_EXAMPLES=OFF
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/devel/jansson/patches/patch-CMakeLists_txt,v
retrieving revision 1.5
diff -u -r1.5 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt7 Sep 2018 11:10:30 - 1.5
+++ patches/patch-CMakeLists_txt12 Dec 2018 11:01:26 -
@@ -1,13 +1,40 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.5 2018/09/07 11:10:30 sthen Exp $
+$OpenBSD$
+
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -640,7 +640,7 @@ file(RELATIVE_PATH
- # so that the include dirs are given relative to where the
- # config file is located.
- set(JANSSON__INCLUDE_DIRS
--"\${JANSSON_CMAKE_DIR}/${REL_INCLUDE_DIR}")
-+"${CMAKE_INSTALL_PREFIX}/include")
- configure_file(${PROJECT_SOURCE_DIR}/cmake/JanssonConfig.cmake.in
-
${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/JanssonConfig.cmake
- @ONLY)
+@@ -352,17 +352,19 @@ if(JANSSON_BUILD_SHARED_LIBS)
+ ${JANSSON_HDR_PRIVATE}
+ ${JANSSON_HDR_PUBLIC}
+ src/jansson.def)
+-
+set_target_properties(jansson PROPERTIES
+ VERSION ${JANSSON_VERSION}
+ SOVERSION ${JANSSON_SOVERSION})
+-else()
+- add_library(jansson
+- ${JANSSON_SRC}
+- ${JANSSON_HDR_PRIVATE}
+- ${JANSSON_HDR_PUBLIC})
+ endif()
+
++add_library(janssonstatic STATIC
++ ${JANSSON_SRC}
++ ${JANSSON_HDR_PRIVATE}
++ ${JANSSON_HDR_PUBLIC})
++set_target_properties(janssonstatic PROPERTIES
++ OUTPUT_NAME jansson
++ POSITION_INDEPENDENT_CODE true)
++
+ if (JANSSON_EXAMPLES)
+ add_executable(simple_parse
"${PROJECT_SOURCE_DIR}/examples/simple_parse.c")
+ target_link_libraries(simple_parse jansson)
+@@ -659,7 +661,7 @@ set_target_properties(jansson PROPERTIES PUBLIC_HEADER
+ #
+ option(JANSSON_INSTALL "Generate installation target" ON)
+ if (JANSSON_INSTALL)
+-install(TARGETS jansson
++install(TARGETS jansson janssonstatic
+ EXPORT JanssonTargets
+ LIBRARY DESTINATION "${JANSSON_INSTALL_LIB_DIR}" COMPONENT lib
+ ARCHIVE DESTINATION "${JANSSON_INSTALL_LIB_DIR}" COMPONENT lib
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/jansson/pkg/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- pkg/PLIST 20 Mar 2015 13:28:23 - 1.3
+++ pkg/PLIST 12 Dec 2018 11:01:26 -
@@ -7,5 +7,6 @@
lib/cmake/jansson/JanssonConfigVersion.cmake
lib/cmake/jansson/JanssonTargets${MODCMAKE_BUILD_SUFFIX}
lib/cmake/jansson/JanssonTargets.cmake
+lib/libjansson.a
@lib lib/libjansson.so.${LIBjansson_VERSION}
lib/pkgconfig/jansson.pc
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2018/12/12 03:52:13 Modified files: telephony/asterisk: Makefile distinfo telephony/asterisk/patches: patch-third-party_pjproject_source_pjmedia_src_pjmedia_sdp_c Removed files: telephony/asterisk/patches: patch-third-party_pjproject_source_pjlib_src_pj_ssl_sock_ossl_c Log message: update to asterisk-13.24.0
Re: multimedia/mlt using frei0r-plugins
On 12/9/18 3:17 PM, Kristaps Dzonsons wrote: A few months ago, frei0r-plugins was posted to the list. By teaching mlt to use these plugins, I can get kdenlive to do colour correction properly. Enclosed is the patch to mlt so that it can use the proper plugin values. (kdenlive needs no patch: it detects it via mlt.) This requires the graphics/frei0r-plugins as earlier posted. I think it would be better to wait for a new release before importing frei0r-plugins. The latest version has several bugs, some plugins cause segfaults and memory leaks. I've pushed many fixes upstream already..
Re: UPDATE: jansson (2.12)
On Tue, December 11, 2018 13:40, Stuart Henderson wrote: > On 2018/12/11 18:47, YASUOKA Masahiko wrote: >> Hi, >> >> The diff does the followings: >> >> - update to jansson-2.12 >> - include a static library >> - use configure && make, instead of cmake >> >> My motivation was to include the static library, since I'd like to use >> it within a statically linked CGI program. >> >> I had tried to modify CMakeLists.txt to build both static and shared >> library, but it was not easy for me. On the other hand, just doing >> "configure && make" does it as the default. I choiced "configure" >> rather than cmake. Is there any reason to keep using cmake? > > It needs testing with dependent ports either way, but the static > library can be added to the cmake build like this: > > Index: Makefile [...] > Hi! Thanks for the diff needed to build static libs alogside shared one. I think we could add it without updating jansson itself at this moment. Update will follow after testing dependent ports.
Re: UPDATE: jansson (2.12)
On Tue, 11 Dec 2018 10:40:53 + Stuart Henderson wrote: > On 2018/12/11 18:47, YASUOKA Masahiko wrote: >> Hi, >> >> The diff does the followings: >> >> - update to jansson-2.12 >> - include a static library >> - use configure && make, instead of cmake >> >> My motivation was to include the static library, since I'd like to use >> it within a statically linked CGI program. >> >> I had tried to modify CMakeLists.txt to build both static and shared >> library, but it was not easy for me. On the other hand, just doing >> "configure && make" does it as the default. I choiced "configure" >> rather than cmake. Is there any reason to keep using cmake? > > It needs testing with dependent ports either way, but the static > library can be added to the cmake build like this: Thanks, "make test" in devel/jansson passed on amd64, aarch64 and mips64. I put the logs on the URLs following: http://yasuoka.net/~yasuoka/tmp/jansson-2.12-test-amd64.txt http://yasuoka.net/~yasuoka/tmp/jansson-2.12-test-octeon.txt http://yasuoka.net/~yasuoka/tmp/jansson-2.12-test-arm64.txt --yasuoka
Re: NEW: security/ossec-hids
Hi, Here is an updated port that I would like to import. This contains many fixes, mostly permissions tweaking but also an rc script, and wrappers for the inotify fiasco. It has been tested in production since before release and all seems to be running fine. OK? Paul On Fri, Sep 21, 2018 at 12:01:55PM +0300, Paul Irofti wrote: > Hi, > > Attached is a new port for ossec-hids. > > OSSEC is a scalable, multi-platform, open source Host-based Intrusion > Detection > System (HIDS). It has a powerful correlation and analysis engine, integrating > log analysis, file integrity checking, Windows registry monitoring, > centralized > policy enforcement, rootkit detection, real-time alerting and active response. > > > Testing has shown encouraging results. The only issue that I am aware of > at this moment is that real-time file monitoring sometime stops working > without anything in the logs or any daemons crashing. I plan on testing > this further, but it might be a software defect not a porting omission > on my end. > > > Any comments? OK to import? > > Thanks, > Paul ossec-hids.tgz Description: application/tar-gz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2018/12/12 01:38:00 Modified files: lang/php/7.2 : Makefile Log message: bumps for -cgi and -dbg as well
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/12/12 01:04:25 Modified files: lang/php/7.2 : Makefile Log message: REVISION-apache needed a bump as well: +@depend security/libsodium:libsodium-*:libsodium-1.0.16p0 -@depend textproc/oniguruma:oniguruma-*:oniguruma-6.9.0 +@depend textproc/oniguruma:oniguruma-*:oniguruma-6.9.1 +@wantlib sodium.9.1
