Re: ansible: openbsd_pkg fails to run when just specifying the package name

2016-10-17 Thread Patrik Lundin 
On Tue, Oct 18, 2016 at 06:30:41AM +0200, Jasper Lievisse Adriaanse wrote:
>
> I was hoping that 2.2.0.0 would be released soon, but it seems upstream enjoys
> many a rc over a lengthy period of time. So perhaps syncing the openbsd_pkg
> provider with master would be the way to go.
> 

This would be my personal preference. This also means the local addition
of -z comes into question as the upstream changes replace "pkg_info -e"
with "pkg_info -Iq" for looking up package state, which does not handle
name lookups in the same way.

I believe landry@ should be involved in this decision because from what I
recall he is one of the people who wanted the addition (and might be depending
on it).

I'll repeat my original thoughts about this from when I added the branch
support:
===
I should add that I think the -z addition may actually work worse on the
latest code, because i switched the usage of "pkg_info -e" to "pkg_info
-Iq inst:name" for finding out the state of a requested package. While
-e manages to find a package without the patchlevel version attached
(which i believe was a benefit that -z added), this does not
seem to be true for "-Iq inst:".

This could mean that the module will always think that the package
needs to be installed because it can't tell there is a package with the
supplied name (plus patchlevel) already installed.
===

-- 
Patrik Lundin

Re: ansible: openbsd_pkg fails to run when just specifying the package name

2016-10-17 Thread Jasper Lievisse Adriaanse 
On Mon, Oct 17, 2016 at 08:55:38PM +0200, Patrik Lundin wrote:
> On Mon, Oct 17, 2016 at 06:58:26PM +0200, Jasper Lievisse Adriaanse wrote:
> > On Mon, Oct 17, 2016 at 02:59:43PM +0200, Sebastien Marie wrote:
> > > Hi,
> > > 
> > > With the latest update of ansible (ansible-2.1.2.0->2.1.2.0p3), I
> > > experiment failure in the use of `openbsd_pkg' module.
> > > 
> > > The exception occurs when specifying a package name without version or
> > > branch (like juste "sysclean"). The code will assume branch syntax and
> > > will fail at extracting branch information after '%'.
> > > 
> > 
> > Does this also happen when you remove the two '-z' parts of the local patch 
> > we
> > carry for ansible? I don't have a CVS tree around right now to provide you 
> > with
> > a patch to apply.
> > 
> 
> Removing -z will not be enough. The openbsd_pkg.py file from the
> extracted tar ball is missing a lot of branch related changes from
> upstream.
> 
> This particular problem is a result of adding the last iteration of
> branch-syntax fixes without the previous plumbing.
> 
> Doing a diff -u between a "make extract" version of openbsd_pkg.py and
> an upstream version from git shows quite a bit of changes that are
> missing.
> 
> -- 
> Patrik Lundin
I was hoping that 2.2.0.0 would be released soon, but it seems upstream enjoys
many a rc over a lengthy period of time. So perhaps syncing the openbsd_pkg
provider with master would be the way to go. 

-- 
jasper

Re: luajit,lua52 uses the wrong lua abi

2016-10-17 Thread Jonathan Gray 
On Tue, Oct 18, 2016 at 09:16:22AM +1100, Jonathan Gray wrote:
> On Tue, Apr 26, 2016 at 03:15:53PM +1000, Jonathan Gray wrote:
> > If the bit32 compat lua module is built against lua 5.2 and used with
> > luajit52 it fails with:
> > 
> > $ luajit52  
> > LuaJIT 2.0.4 -- Copyright (C) 2005-2015 Mike Pall. http://luajit.org/
> > JIT: ON CMOV SSE2 SSE3 SSE4.1 fold cse dce fwd dse narrow loop abc sink fuse
> > > bit32 = require "bit32"
> > luajit52:/usr/local/lib/lua/5.2/bit32.so: undefined symbol 
> > 'luaL_checkunsigned'
> > luajit52:/usr/local/lib/lua/5.2/bit32.so: undefined symbol 
> > 'lua_pushunsigned'
> > luajit52:/usr/local/lib/lua/5.2/bit32.so: undefined symbol 'luaL_setfuncs'
> > error loading module 'bit32' from file '/usr/local/lib/lua/5.2/bit32.so':
> > Cannot load specified object
> > stack traceback:
> > [C]: at 0x160e11850290
> > [C]: in function 'require'
> > stdin:1: in main chunk
> > [C]: at 0x160e11807d90
> > 
> > Building against the luajit headers instead of the lua 5.2 headers seems
> > to fix this.
> > 
> > Building against lua 5.1 headers and using luajit51 seems to work.
> > 
> > But the real problem seems to be that luajit with the minimal 5.2 compat
> > flag enabled is abi compatible with lua 5.1 not lua 5.2.  The port
> > incorrectly changes this so it can use lua.port.mk with the FLAVOR.
> > 
> > http://luajit.org/extensions.html
> > 
> > "Note: this provides only partial compatibility with Lua 5.2 at the
> > language and Lua library level. LuaJIT is API+ABI-compatible with
> > Lua 5.1, which prevents implementing features that would otherwise break
> > the Lua/C API and ABI (e.g. _ENV)."
> > 
> 
> with lua52 flavour of luaposix
> 
> $ luajit52
>  
> LuaJIT 2.0.4 -- Copyright (C) 2005-2015 Mike Pall. http://luajit.org/
> JIT: ON CMOV SSE2 SSE3 SSE4.1 fold cse dce fwd dse narrow loop abc sink fuse
> > errno = require "posix.errno"
> luajit52:/usr/local/lib/lua/5.2/posix.so: undefined symbol 'lua_pcallk'
> luajit52:/usr/local/lib/lua/5.2/posix.so: undefined symbol 'lua_tointegerx'
> luajit52:/usr/local/lib/lua/5.2/posix.so: undefined symbol 'lua_tonumberx'
> luajit52:/usr/local/lib/lua/5.2/posix.so: undefined symbol 'lua_rawlen'
> luajit52:/usr/local/lib/lua/5.2/posix.so: undefined symbol 'luaL_setfuncs'
> error loading module 'posix.errno' from file 
> '/usr/local/lib/lua/5.2/posix.so':
> Cannot load specified object
> stack traceback:
> [C]: at 0x0795feb501c0
> [C]: in function 'require'
> stdin:1: in main chunk
> [C]: at 0x0795feb07d90
> >
> 
> $ lua52   
>  
> Lua 5.2.4  Copyright (C) 1994-2015 Lua.org, PUC-Rio
> > errno = require "posix.errno"
> >
> 
> with luaposix without a flavour
> 
> $ luajit51
>  
> LuaJIT 2.0.4 -- Copyright (C) 2005-2015 Mike Pall. http://luajit.org/
> JIT: ON CMOV SSE2 SSE3 SSE4.1 fold cse dce fwd dse narrow loop abc sink fuse
> > errno = require "posix.errno"
> >
> 

Here is an attempt to fix it, likely needs more work:

Index: Makefile
===
RCS file: /cvs/ports/lang/luajit/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- Makefile18 Mar 2016 23:12:18 -  1.19
+++ Makefile17 Oct 2016 22:57:09 -
@@ -3,10 +3,11 @@
 ONLY_FOR_ARCHS = powerpc i386 amd64
 # arm needs EABI/aapcs
 
-SHARED_LIBS += luajit-${MODLUA_VERSION} 0.0 # 2.0.4
+SHARED_LIBS += luajit-5.1 0.0 # 2.0.4
 
 COMMENT =  just-in-time compiler for Lua
 V =2.0.4
+REVISION = 0
 DISTNAME = LuaJIT-${V}
 PKGNAME =  ${DISTNAME:L}
 
@@ -34,9 +35,9 @@ MAKE_FLAGS += \
CC="${CC}" \
CCOPT="${CFLAGS}" \
CCOPT_x86="" \
-   INSTALL_LJLIBD="${DESTDIR}${MODLUA_DATADIR}" \
+   INSTALL_LJLIBD="${DESTDIR}${PREFIX}/share/lua/5.1/" \
INSTALL_MAN="${DESTDIR}${PREFIX}/man/man1" \
-   
INSTALL_SONAME=libluajit-${MODLUA_VERSION}.so.${LIBluajit-${MODLUA_VERSION}_VERSION}
 \
+   INSTALL_SONAME=libluajit-5.1.so.${LIBluajit-5.1_VERSION} \
PREFIX="${PREFIX}"
 
 USE_GMAKE =Yes
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/lang/luajit/patches/patch-Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 patch-Makefile
--- patches/patch-Makefile  6 Jun 2015 09:03:16 -   1.5
+++ patches/patch-Makefile  17 Oct 2016 22:27:32 -
@@ -1,15 +1,6 @@
 $OpenBSD: patch-Makefile,v 1.5 2015/06/06 09:03:16 dcoppa Exp $
 Makefile.orig  Thu May 14 20:30:00 2015
-+++ Makefile   Thu Jun  4 19:20:59 2015
-@@ -17,7 +17,7 @@ MAJVER=  2
- MINVER=  0
- RELVER=  4
- VERSION= $(MAJVER).$(MINVER).$(RELVER)
--ABIVER=  5.1
-+ABIVER=  ${MODLUA_VERSION}
- 
-

Re: lua ports: versions/flavors handling

2016-10-17 Thread Jeremie Courreges-Anglas 
j...@wxcvbn.org (Jeremie Courreges-Anglas) writes:

> Some time ago I took a look at hooking lua53 flavors in the ports that
> support it.  It turned out that some ports were already broken with
> particular versions of lua (the most common errors are missing functions
> at dlopen time, and module() errors), yet they were hooked up.
>
> So it's not just about adding lua53 flavors, but about having
> a consistent ports tree.  In the end, I think that lua.port.mk should
> stop populating FLAVORS automatically, so that people hacking on lua
> have to explicitely enable the lua versions they tested.  Just like for
> python.port.mk.
>
> The diff to explicitely add FLAVORS / hook them up is not ripe yet,
> but first I'd like to know if people object to the proposal above.

afaik we can stop automatically adding FLAVORS in lua.port.mk; it would
be nice if someone could put this in a bulk to confirm.


Index: lua.port.mk
===
RCS file: /d/cvs/ports/lang/lua/lua.port.mk,v
retrieving revision 1.34
diff -u -p -p -u -r1.34 lua.port.mk
--- lua.port.mk 7 Jun 2016 11:51:52 -   1.34
+++ lua.port.mk 17 Oct 2016 13:34:49 -
@@ -10,18 +10,6 @@ CATEGORIES +=lang/lua
 # Define the default version and use that if MODLUA_VERSION is not set.
 MODLUA_DEFAULT_VERSION =   5.1
 
-# If a port already has flavors, append our lua flavors to it, unless it
-# requests specific versions of lua. Otherwise set the FLAVORS list to
-# just the lua flavors.
-_MODLUA_FLAVORS =  lua52 lua53
-.if !defined(MODLUA_VERSION)
-.  if !defined(FLAVORS)
-FLAVORS ?= ${_MODLUA_FLAVORS}
-.  elif !${FLAVORS:M${_MODLUA_FLAVORS}}
-FLAVORS += ${_MODLUA_FLAVORS}
-.  endif
-.endif
-
 FLAVOR ?=  # empty
 
 # without a flavor, assume ${MODLUA_DEFAULT_VERSION}

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Re: luajit,lua52 uses the wrong lua abi

2016-10-17 Thread Jonathan Gray 
On Tue, Apr 26, 2016 at 03:15:53PM +1000, Jonathan Gray wrote:
> If the bit32 compat lua module is built against lua 5.2 and used with
> luajit52 it fails with:
> 
> $ luajit52  
> LuaJIT 2.0.4 -- Copyright (C) 2005-2015 Mike Pall. http://luajit.org/
> JIT: ON CMOV SSE2 SSE3 SSE4.1 fold cse dce fwd dse narrow loop abc sink fuse
> > bit32 = require "bit32"
> luajit52:/usr/local/lib/lua/5.2/bit32.so: undefined symbol 
> 'luaL_checkunsigned'
> luajit52:/usr/local/lib/lua/5.2/bit32.so: undefined symbol 'lua_pushunsigned'
> luajit52:/usr/local/lib/lua/5.2/bit32.so: undefined symbol 'luaL_setfuncs'
> error loading module 'bit32' from file '/usr/local/lib/lua/5.2/bit32.so':
> Cannot load specified object
> stack traceback:
> [C]: at 0x160e11850290
> [C]: in function 'require'
> stdin:1: in main chunk
> [C]: at 0x160e11807d90
> 
> Building against the luajit headers instead of the lua 5.2 headers seems
> to fix this.
> 
> Building against lua 5.1 headers and using luajit51 seems to work.
> 
> But the real problem seems to be that luajit with the minimal 5.2 compat
> flag enabled is abi compatible with lua 5.1 not lua 5.2.  The port
> incorrectly changes this so it can use lua.port.mk with the FLAVOR.
> 
> http://luajit.org/extensions.html
> 
> "Note: this provides only partial compatibility with Lua 5.2 at the
> language and Lua library level. LuaJIT is API+ABI-compatible with
> Lua 5.1, which prevents implementing features that would otherwise break
> the Lua/C API and ABI (e.g. _ENV)."
> 

with lua52 flavour of luaposix

$ luajit52 
LuaJIT 2.0.4 -- Copyright (C) 2005-2015 Mike Pall. http://luajit.org/
JIT: ON CMOV SSE2 SSE3 SSE4.1 fold cse dce fwd dse narrow loop abc sink fuse
> errno = require "posix.errno"
luajit52:/usr/local/lib/lua/5.2/posix.so: undefined symbol 'lua_pcallk'
luajit52:/usr/local/lib/lua/5.2/posix.so: undefined symbol 'lua_tointegerx'
luajit52:/usr/local/lib/lua/5.2/posix.so: undefined symbol 'lua_tonumberx'
luajit52:/usr/local/lib/lua/5.2/posix.so: undefined symbol 'lua_rawlen'
luajit52:/usr/local/lib/lua/5.2/posix.so: undefined symbol 'luaL_setfuncs'
error loading module 'posix.errno' from file '/usr/local/lib/lua/5.2/posix.so':
Cannot load specified object
stack traceback:
[C]: at 0x0795feb501c0
[C]: in function 'require'
stdin:1: in main chunk
[C]: at 0x0795feb07d90
>

$ lua52
Lua 5.2.4  Copyright (C) 1994-2015 Lua.org, PUC-Rio
> errno = require "posix.errno"
>

with luaposix without a flavour

$ luajit51 
LuaJIT 2.0.4 -- Copyright (C) 2005-2015 Mike Pall. http://luajit.org/
JIT: ON CMOV SSE2 SSE3 SSE4.1 fold cse dce fwd dse narrow loop abc sink fuse
> errno = require "posix.errno"
>

CVS: cvs.openbsd.org: ports

2016-10-17 Thread Jeremie Courreges-Anglas 
CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2016/10/17 15:40:22

Modified files:
devel  : Makefile 

Log message:
+luaposix,lua52
+luaposix,lua53

CVS: cvs.openbsd.org: ports

2016-10-17 Thread Jeremie Courreges-Anglas 
CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2016/10/17 15:39:23

Modified files:
devel/luaposix : Makefile 
devel/luaposix/pkg: PLIST 

Log message:
Add explicit support for lua52 and lua53 FLAVORS

and move the documentation so that several flavors can be installed
concurrently.

ok awolk@ (maintainer)

CVS: cvs.openbsd.org: ports

2016-10-17 Thread Jeremie Courreges-Anglas 
CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2016/10/17 15:37:16

Modified files:
devel/luaposix : Makefile 

Log message:
Fix the RUN_DEPENDS on lua-bit32

ok awolk@ (maintainer)

Re: UPDATE: benchmarks/netpipe

2016-10-17 Thread Jeremie Courreges-Anglas 
Rafael Sadowski  writes:

> Hi ports@,
>
> simple update to the last stable release (found by unreachable
> homepage).
>
> - HOMEPAGE / MASTER_SITES update
> - cleanup
> - remove unnecessary patch
>
> OK? Comments?

Here's an updated diff.
- fix PKGNAME (duplicated DISTNAME lines)
- unneeded EXTRACT_SUFX & WRKSRC
- -DHAVE_GETRUSAGE now useless in CFLAGS
- use MAKE_FILE instead of renameing makefile
- also build and install the IPv6 version

Sadly NPtcp now shows erratic behavior, most of the time the client
doesn't get a proper handshake from the server.  Tested with NPtcp -r
and NPtcp -h 127.0.0.1.


Index: Makefile
===
RCS file: /d/cvs/ports/benchmarks/netpipe/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- Makefile22 Jan 2015 17:47:50 -  1.27
+++ Makefile17 Oct 2016 20:59:52 -
@@ -2,26 +2,29 @@
 
 COMMENT=   self-scaling network benchmark
 
-DISTNAME=  netpipe-2.4
-DISTFILES= NetPIPE_2.4.tar.gz
-REVISION=  0
+DISTNAME=  NetPIPE-3.7.2
+PKGNAME=   netpipe-3.7.2
 CATEGORIES=benchmarks net
 
-HOMEPAGE=  http://www.scl.ameslab.gov/netpipe/
+HOMEPAGE=  http://bitspjoule.org/netpipe/
 
 PERMIT_PACKAGE_CDROM=  Yes
 WANTLIB=   c
 
 MASTER_SITES=  ${HOMEPAGE}/code/
 
-MAKE_FLAGS=CC="${CC}" CFLAGS="${CFLAGS} -DHAVE_GETRUSAGE"
-ALL_TARGET=NPtcp
+MAKE_FLAGS=CC="${CC}" CFLAGS="${CFLAGS}"
 
 NO_TEST=   Yes
 
+MAKE_FILE= makefile
+
+ALL_TARGET=tcp tcp6
+
 do-install:
${INSTALL_PROGRAM} ${WRKBUILD}/NPtcp ${PREFIX}/bin
-   ${INSTALL_MAN} ${WRKBUILD}/netpipe.1 ${PREFIX}/man/man1
cd ${PREFIX}/bin && ln -sf NPtcp netpipe
-   
+   ${INSTALL_PROGRAM} ${WRKBUILD}/NPtcp6 ${PREFIX}/bin
+   ${INSTALL_MAN} ${WRKBUILD}/dox/netpipe.1 ${PREFIX}/man/man1
+
 .include 
Index: distinfo
===
RCS file: /d/cvs/ports/benchmarks/netpipe/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo18 Jan 2015 03:12:51 -  1.5
+++ distinfo17 Oct 2016 19:49:54 -
@@ -1,2 +1,2 @@
-SHA256 (NetPIPE_2.4.tar.gz) = LUYjlHvxj0Qd6Dd+EOC76pTLN2RgcrssQ0qN8V30/nE=
-SIZE (NetPIPE_2.4.tar.gz) = 23009
+SHA256 (NetPIPE-3.7.2.tar.gz) = E9rIhP9SlRY29lHEIfX/SoUyGKlaoopKhSQC7jhaKrg=
+SIZE (NetPIPE-3.7.2.tar.gz) = 400248
Index: patches/patch-netpipe_h
===
RCS file: /d/cvs/ports/benchmarks/netpipe/patches/patch-netpipe_h,v
retrieving revision 1.1
diff -u -p -r1.1 patch-netpipe_h
--- patches/patch-netpipe_h 8 Jul 2011 09:33:25 -   1.1
+++ patches/patch-netpipe_h 17 Oct 2016 19:49:54 -
@@ -1,24 +0,0 @@
-$OpenBSD: patch-netpipe_h,v 1.1 2011/07/08 09:33:25 jasper Exp $
 netpipe.h.orig Tue Apr 27 22:55:57 1999
-+++ netpipe.h  Fri Jul  8 11:32:28 2011
-@@ -20,6 +20,7 @@
- #include  /* malloc(3) */
- #include 
- #include 
-+#include 
- #include/* struct timeval */
- #ifdef HAVE_GETRUSAGE
- #include 
-@@ -38,8 +39,12 @@
- #define  MAXINT 2147483647
- 
- #define ABS(x) (((x) < 0)?(-(x)):(x))
-+#ifndef MIN
- #define MIN(x,y)   (((x) < (y))?(x):(y))
-+#endif
-+#ifndef MAX
- #define MAX(x,y)   (((x) > (y))?(x):(y))
-+#endif
- 
- /* Need to include the protocol structure header file.   
*/
- /* Change this to reflect the protocol   
*/
Index: pkg/PLIST
===
RCS file: /d/cvs/ports/benchmarks/netpipe/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST   6 Aug 2004 14:37:29 -   1.3
+++ pkg/PLIST   17 Oct 2016 20:59:30 -
@@ -1,4 +1,4 @@
 @comment $OpenBSD: PLIST,v 1.3 2004/08/06 14:37:29 espie Exp $
-bin/NPtcp
-bin/netpipe
+@bin bin/NPtcp
+@bin bin/NPtcp6
 @man man/man1/netpipe.1


-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

CVS: cvs.openbsd.org: ports

2016-10-17 Thread Jeremie Courreges-Anglas 
CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2016/10/17 13:33:38

Modified files:
devel  : Makefile 
devel/lualdoc  : Makefile 
devel/lualdoc/pkg: PLIST 
x11/awesome: Makefile 
x11/awesome/patches: patch-awesomeConfig_cmake 

Log message:
Stop packaging lualdoc as a library that supports lua FLAVORS.

It is a standalone tool so no need to have several versions of it.
Make it depend on lua52, since this is what x11/awesome uses.  Adapt
x11/awesome while here.

ok dcoppa@ (maintainer)

Re: UPDATE: devel/libconfuse

2016-10-17 Thread Jeremie Courreges-Anglas 
Jeremie Courreges-Anglas  writes:

> Hi,
>
> Davide Gerhard  writes:
>
>> =- To ports@openbsd.org wrote on Sat  8.Oct'16 at 11:54:48 +0200 -=
>>
>>> Hello ports@,
>>> 
>>> This update devel/libconfuse to 3.0
>>> Tested on amd64.
>>> 
>>> It also update HOMEPAGE and MASTER_SITES because
>>> the project moves to github.
>>
>> thanks to Rafael Sadowski, I update the patch.
>>
>> changes:
>> - use V to bump version quickly 
>> - homepage with https
>> - removed REVISION
>>
>> I don't use GH_* because otherwise it needs autoconf and,
>> I think, this should be avoided. Wrong?
>
> If a project makes proper releases then yeah, let's use proper releases.
>
> One issue with the diff as is:
> -SHARED_LIBS= confuse 1.0 # .0.0
> +SHARED_LIBS= confuse 1.0
>
> caught my eye.  When upgrading a library, one should verify that no
> changes are due wrt the library version.  See
> http://www.openbsd.org/faq/ports/specialtopics.html#SharedLibs for more
> information.  Here, several functions have been added (that would warrant
> a minor bump) and at least struct cfg_opt_t has evolved in an
> incompatible way -> major bump. Please bump the library version to 2.0,
> and keep a note, after the comment you removed, that upstream is now at
> 1.0.
>
> Also, libconfuse is not only used by x11/tilda, did you test the other
> consumers?

Meanwhile, I looked at the layout of the documentation, and I think we
can do better.  Upstream now installs stuff in share/doc/confuse, so it
looks weird that we keep on installing stuff in share/doc/libconfuse.
Also, putting the tutorial in a subdirectory of the API docs doesn't
make the former very visible.

Here's an updated diff that fixes a spacing nit, bumps the shlib
version, and moves documentation to share/doc/confuse/{manual,tutorial}.

Thoughts?


Index: Makefile
===
RCS file: /d/cvs/ports/devel/libconfuse/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile12 Apr 2016 15:19:40 -  1.13
+++ Makefile17 Oct 2016 19:12:45 -
@@ -1,20 +1,20 @@
 # $OpenBSD: Makefile,v 1.13 2016/04/12 15:19:40 naddy Exp $
 
 COMMENT=   configuration file parser library
-DISTNAME=  confuse-2.7
+V= 3.0
+DISTNAME=  confuse-${V}
 PKGNAME=   lib${DISTNAME}
-REVISION=  3
-SHARED_LIBS=   confuse 1.0 # .0.0
+SHARED_LIBS=   confuse 2.0 # 1.0
 CATEGORIES=devel
 
-HOMEPAGE=  http://www.nongnu.org/confuse/
+HOMEPAGE=  https://github.com/martinh/libconfuse
 
 # ISC
 PERMIT_PACKAGE_CDROM=  Yes
 
 WANTLIB=   iconv intl
 
-MASTER_SITES=  ${MASTER_SITE_SAVANNAH:=confuse/}
+MASTER_SITES=  
https://github.com/martinh/libconfuse/releases/download/v${V}/
 
 LIB_DEPENDS=   devel/gettext
 
@@ -22,11 +22,14 @@ CONFIGURE_STYLE=gnu
 CONFIGURE_ENV+=LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ENV+=CPPFLAGS="-I${LOCALBASE}/include"
 
-
 post-install:
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libconfuse/tutorial/
-   ${INSTALL_DATA} ${WRKSRC}/doc/html/* ${PREFIX}/share/doc/libconfuse
+   ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/confuse/manual/search
+   ${INSTALL_DATA} ${WRKSRC}/doc/html/search/* \
+   ${PREFIX}/share/doc/confuse/manual/search
+   ${INSTALL_DATA} ${WRKSRC}/doc/html/{*html,*png,*css,*js} \
+   ${PREFIX}/share/doc/confuse/manual/
+   ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/confuse/tutorial
${INSTALL_DATA} ${WRKSRC}/doc/tutorial-html/* \
-   ${PREFIX}/share/doc/libconfuse/tutorial
+   ${PREFIX}/share/doc/confuse/tutorial
 
 .include 
Index: distinfo
===
RCS file: /d/cvs/ports/devel/libconfuse/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo18 Jan 2015 03:13:15 -  1.5
+++ distinfo17 Oct 2016 18:03:57 -
@@ -1,2 +1,2 @@
-SHA256 (confuse-2.7.tar.gz) = 4yV0/YN+lQd42set5AeH3SJZ744orNbt5oR8qJXIh3g=
-SIZE (confuse-2.7.tar.gz) = 517272
+SHA256 (confuse-3.0.tar.gz) = 8fMm2UQxAwNtGcMtPz7+w6hcOwgdmVNEY2aNKZksRkg=
+SIZE (confuse-3.0.tar.gz) = 725452
Index: pkg/PLIST
===
RCS file: /d/cvs/ports/devel/libconfuse/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST   16 Mar 2015 18:07:41 -  1.4
+++ pkg/PLIST   17 Oct 2016 19:10:42 -
@@ -4,45 +4,143 @@ lib/libconfuse.a
 lib/libconfuse.la
 @lib lib/libconfuse.so.${LIBconfuse_VERSION}
 lib/pkgconfig/libconfuse.pc
-share/doc/libconfuse/
-share/doc/libconfuse/annotated.html
-share/doc/libconfuse/classes.html
-share/doc/libconfuse/confuse_8h-source.html
-share/doc/libconfuse/confuse_8h.html
-share/doc/libconfuse/doxygen.png
-share/doc/libconfuse/examples.html

Re: lualdoc & awesome

2016-10-17 Thread David Coppa 
On Mon, Oct 17, 2016 at 8:26 PM, Jeremie Courreges-Anglas
 wrote:
> David Coppa  writes:
>
>> On Mon, Oct 17, 2016 at 7:51 PM, Jeremie Courreges-Anglas
>>  wrote:
>>>
>>> The switch to explicit FLAVORS is almost complete, there are two
>>> remaining ports, luaposix and lualdoc.
>>>
>>> lualdoc is packaged as a library that supports flavors, but afaik it is
>>> a standalone tool.  Debian for example packages it as "lua-ldoc", not
>>> "lua5.1-ldoc".
>>>
>>> Here's a diff to switch it to a standalone tool.  Since x11/awesome is
>>> its only consumer, I used MODLUA_VERSION = 5.2 so that people that build
>>> from source don't need to install two lua versions (well, that's
>>> cheap...).
>>>
>>> I added a @pkgpath so that people who have lua52ldoc installed can
>>> transparently upgrade, but should I also add bin/lua51 and bin/lua52
>>> symlinks?  I'd prefer not...
>>>
>>> Bonus: x11/awesome/patches loses weight.
>>>
>>> Thoughts?
>>
>> Reads ok to me, but why have you removed doxygen too?
>
> Oops, because I temporarily disabled it to do my tests.  Downloading Qt
> over crappy public wifi is painful.  :)
>
> Fixed diff below.

Just tested it, and it works as intended.

OK dcoppa@

Thanks,
David

Re: UPDATE: security/hydra

2016-10-17 Thread Rafael Sadowski 
On Sun Oct 09, 2016 at 03:55:27PM +0200, Remi Pointel wrote:
> On 10/09/16 10:29, Rafael Sadowski wrote:
> > Index: pkg/PLIST-main
> > ===
> > RCS file: /cvs/ports/security/hydra/pkg/PLIST-main,v
> > retrieving revision 1.3
> > diff -u -p -u -p -r1.3 PLIST-main
> > --- pkg/PLIST-main  5 Nov 2011 15:24:39 -   1.3
> > +++ pkg/PLIST-main  9 Oct 2016 08:17:22 -
> > @@ -1,8 +1,15 @@
> >  @comment $OpenBSD: PLIST-main,v 1.3 2011/11/05 15:24:39 nigel Exp $
> >  @pkgpath security/hydra
> > +bin/dpl4hydra.sh
> >  @bin bin/hydra
> > +bin/hydra-wizard.sh
> >  @bin bin/pw-inspector
> > +hydra/
> > +hydra/etc/
> > +hydra/etc/dpl4hydra_full.csv
> > +hydra/etc/dpl4hydra_local.csv
> >  @man man/man1/hydra.1
> >  @man man/man1/pw-inspector.1
> >  share/doc/hydra/
> > +share/doc/hydra/LICENSE
> >  share/doc/hydra/README
> > 
> 
> Hi,
> 
> I quickly tested and it sounds good for me.
> However, I would install dpl4hydra_full.csv and dpl4hydra_local.csv in
> another path (maybe share/doc/hydra/, but not in ${LOCALBASE}/hydra/etc/.
> 
> Cheers,
> 
> Remi.

Updated diff with dpl4hydra_* in "share/doc/hydra/":


Index: Makefile
===
RCS file: /cvs/ports/security/hydra/Makefile,v
retrieving revision 1.56
diff -u -p -u -p -r1.56 Makefile
--- Makefile17 Jan 2016 17:29:10 -  1.56
+++ Makefile17 Oct 2016 19:10:41 -
@@ -3,50 +3,43 @@
 COMMENT-main=  parallelized network logon cracker
 COMMENT-gui=   GTK frontend for hydra
 
-VERSION=   8.1
-REVISION-main= 0
-DISTNAME=  hydra-${VERSION}
+VERSION=   8.3
 PKGNAME-main=  hydra-${VERSION}
 PKGNAME-gui=   hydra-gui-${VERSION}
-CATEGORIES=security
+CATEGORIES=security
 
-HOMEPAGE=  http://thc.org/thc-hydra/
+GH_ACCOUNT =   vanhauser-thc
+GH_PROJECT =   thc-hydra
+GH_TAGNAME =   8.3
 
-#GNU AFFERO GENERAL PUBLIC LICENSE Version 3
-PERMIT_PACKAGE_CDROM=  Yes
+HOMEPAGE=  https://thc.org/thc-hydra/
 
-WANTLIB=   c m
+# AGPLv3 (GNU Affero Public License)
+PERMIT_PACKAGE_CDROM=  Yes
 
-MASTER_SITES =  http://www.thc.org/releases/
-MASTER_SITES +=${MASTER_SITE_PACKETSTORM:=groups/thc/}
+WANTLIB=   c z
 
 PSEUDO_FLAVORS=no_x11
 FLAVOR?=
 
 MULTI_PACKAGES=-main
 
-CONFIGURE_STYLE=gnu dest
+CONFIGURE_STYLE=gnu
 
 USE_GMAKE= Yes
 NO_TEST=   Yes
 MAKE_FLAGS=CC=${CC}
-CFLAGS +=  -I${LOCALBASE}/include
+
+CONFIGURE_ARGS =   --with-ssl=prefix="/usr/include" \
+   --with-ssl-lib=prefix="/usr/lib" \
+   --prefix=${LOCALBASE}
 
 .if ${FLAVOR:Mno_x11}
 ALL_TARGET=hydra pw-inspector
-
-do-install:
-   cd ${WRKBUILD}; $(INSTALL_PROGRAM) hydra pw-inspector $(PREFIX)/bin
 .else
-
+MODULES=   devel/gettext
 MULTI_PACKAGES+=-gui
-
 ALL_TARGET=all
-
-MODULES=   devel/gettext
-
-post-configure:
-   cd ${WRKSRC}/hydra-gtk && ./configure
 .endif
 
 LIB_DEPENDS-main=  databases/mariadb,-main \
@@ -55,24 +48,24 @@ LIB_DEPENDS-main=   databases/mariadb,-mai
devel/pcre \
security/libssh
 RUN_DEPENDS-main=
-WANTLIB-main=  ${WANTLIB} curses crypto idn mysqlclient pcre pq pthread ssh ssl
+
+WANTLIB-main=  ${WANTLIB} m crypto curses idn mysqlclient pcre pq ssh ssl
+
 LIB_DEPENDS-gui=x11/gtk+2 \
${MODGETTEXT_LIB_DEPENDS}
+
 RUN_DEPENDS-gui=hydra-${VERSION}:security/hydra,-main \
${MODGETTEXT_RUN_DEPENDS}
-WANTLIB-gui=   ${WANTLIB} GL X11 Xcomposite Xcursor Xdamage Xfixes \
-   Xext Xi Xinerama Xrandr Xrender atk-1.0 freetype fontconfig \
-   gdk-x11-2.0 gdk_pixbuf-2.0 gtk-x11-2.0 \
-   gio-2.0 gmodule-2.0 gobject-2.0 glib-2.0 gthread-2.0 png \
-   pango-1.0 pangocairo-1.0 pixman-1 cairo z expat \
-   pangoft2-1.0 pthread pthread-stubs xcb xcb-render \
-   xcb-shm
 
-post-extract:
-   chmod -R u+w ${WRKDIST}
+WANTLIB-gui=   X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama \
+   Xrandr Xrender atk-1.0 cairo fontconfig freetype gdk-x11-2.0 \
+   gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gtk-x11-2.0 \
+   pango-1.0 pangocairo-1.0 pangoft2-1.0 intl ${WANTLIB}
 
 post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/hydra
-   ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/hydra
+   ${INSTALL_DATA} ${WRKSRC}/{README,LICENSE} ${PREFIX}/share/doc/hydra
+   ${INSTALL_DATA} ${WRKSRC}/{README,LICENSE} ${PREFIX}/share/doc/hydra
+   mv ${PREFIX}/etc/* ${PREFIX}/share/doc/hydra/ && rm -r ${PREFIX}/etc
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/security/hydra/distinfo,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 distinfo
--- distinfo21 Nov 2015 14:16:33 -  1.14
+++ distinfo17 Oct 2016 19:10:41 -
@@ -1,2 +1,2 @@

Re: ansible: openbsd_pkg fails to run when just specifying the package name

2016-10-17 Thread Patrik Lundin 
On Mon, Oct 17, 2016 at 06:58:26PM +0200, Jasper Lievisse Adriaanse wrote:
> On Mon, Oct 17, 2016 at 02:59:43PM +0200, Sebastien Marie wrote:
> > Hi,
> > 
> > With the latest update of ansible (ansible-2.1.2.0->2.1.2.0p3), I
> > experiment failure in the use of `openbsd_pkg' module.
> > 
> > The exception occurs when specifying a package name without version or
> > branch (like juste "sysclean"). The code will assume branch syntax and
> > will fail at extracting branch information after '%'.
> > 
> 
> Does this also happen when you remove the two '-z' parts of the local patch we
> carry for ansible? I don't have a CVS tree around right now to provide you 
> with
> a patch to apply.
> 

Removing -z will not be enough. The openbsd_pkg.py file from the
extracted tar ball is missing a lot of branch related changes from
upstream.

This particular problem is a result of adding the last iteration of
branch-syntax fixes without the previous plumbing.

Doing a diff -u between a "make extract" version of openbsd_pkg.py and
an upstream version from git shows quite a bit of changes that are
missing.

-- 
Patrik Lundin

CVS: cvs.openbsd.org: ports

2016-10-17 Thread Ingo Schwarze 
CVSROOT:/cvs
Module name:ports
Changes by: schwa...@cvs.openbsd.org2016/10/17 12:32:34

Modified files:
textproc/groff : Makefile 
textproc/groff/patches: patch-tmac_doc_tmac 
Added files:
textproc/groff/patches: patch-tmac_groff_mdoc_man 

Log message:
Pull in a patch committed upstream:
Make the behaviour of .Bl -tag without -width comprehensible
and the same as in mandoc(1).
No opposition when shown on ports@.

Re: lualdoc & awesome

2016-10-17 Thread Jeremie Courreges-Anglas 
David Coppa  writes:

> On Mon, Oct 17, 2016 at 7:51 PM, Jeremie Courreges-Anglas
>  wrote:
>>
>> The switch to explicit FLAVORS is almost complete, there are two
>> remaining ports, luaposix and lualdoc.
>>
>> lualdoc is packaged as a library that supports flavors, but afaik it is
>> a standalone tool.  Debian for example packages it as "lua-ldoc", not
>> "lua5.1-ldoc".
>>
>> Here's a diff to switch it to a standalone tool.  Since x11/awesome is
>> its only consumer, I used MODLUA_VERSION = 5.2 so that people that build
>> from source don't need to install two lua versions (well, that's
>> cheap...).
>>
>> I added a @pkgpath so that people who have lua52ldoc installed can
>> transparently upgrade, but should I also add bin/lua51 and bin/lua52
>> symlinks?  I'd prefer not...
>>
>> Bonus: x11/awesome/patches loses weight.
>>
>> Thoughts?
>
> Reads ok to me, but why have you removed doxygen too?

Oops, because I temporarily disabled it to do my tests.  Downloading Qt
over crappy public wifi is painful.  :)

Fixed diff below.


Index: devel/Makefile
===
RCS file: /d/cvs/ports/devel/Makefile,v
retrieving revision 1.1551
diff -u -p -r1.1551 Makefile
--- devel/Makefile  16 Oct 2016 23:52:31 -  1.1551
+++ devel/Makefile  17 Oct 2016 17:25:36 -
@@ -434,7 +434,6 @@
  SUBDIR += luafs,lua52
  SUBDIR += luafs,lua53
  SUBDIR += lualdoc
- SUBDIR += lualdoc,lua52
  SUBDIR += luapack
  SUBDIR += luapack,lua52
  SUBDIR += luaposix
Index: devel/lualdoc/Makefile
===
RCS file: /d/cvs/ports/devel/lualdoc/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- devel/lualdoc/Makefile  26 Aug 2016 07:51:49 -  1.16
+++ devel/lualdoc/Makefile  17 Oct 2016 17:47:30 -
@@ -7,6 +7,7 @@ GH_PROJECT =LDoc
 GH_TAGNAME =   1.4.5
 PKGNAME =  lualdoc-${GH_TAGNAME}
 CATEGORIES =   devel
+REVISION = 0
 
 HOMEPAGE = http://stevedonovan.github.io/ldoc/
 
@@ -18,9 +19,10 @@ PERMIT_PACKAGE_CDROM =Yes
 MODULES =  lang/lua
 
 MODLUA_RUN_DEPENDS =   devel/lua-penlight
+MODLUA_SA =Yes
+MODLUA_VERSION = 5.2
 
 NO_BUILD = Yes
-
 NO_TEST =  Yes
 
 do-install:
@@ -35,7 +37,6 @@ do-install:
${MODLUA_DATADIR}/ldoc/html/
${INSTALL_DATA} ${WRKSRC}/doc/*.md ${MODLUA_DOCDIR}
${INSTALL_DATA} ${WRKSRC}/readme.md ${MODLUA_DOCDIR}
-   ${SUBST_PROGRAM} \
-   ${WRKSRC}/ldoc.lua ${PREFIX}/bin/ldoc${MODLUA_DEP_VERSION}
+   ${SUBST_PROGRAM} ${WRKSRC}/ldoc.lua ${PREFIX}/bin/ldoc
 
 .include 
Index: devel/lualdoc/pkg/PLIST
===
RCS file: /d/cvs/ports/devel/lualdoc/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- devel/lualdoc/pkg/PLIST 26 Aug 2016 07:51:49 -  1.4
+++ devel/lualdoc/pkg/PLIST 17 Oct 2016 17:23:15 -
@@ -1,5 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.4 2016/08/26 07:51:49 dcoppa Exp $
-bin/ldoc${MODLUA_DEP_VERSION}
+@pkgpath devel/lualdoc,lua52
+bin/ldoc
 share/doc/${FULLPKGNAME}/
 share/doc/${FULLPKGNAME}/doc.md
 share/doc/${FULLPKGNAME}/readme.md
Index: x11/awesome/Makefile
===
RCS file: /d/cvs/ports/x11/awesome/Makefile,v
retrieving revision 1.102
diff -u -p -r1.102 Makefile
--- x11/awesome/Makefile22 Aug 2016 13:45:09 -  1.102
+++ x11/awesome/Makefile17 Oct 2016 18:23:22 -
@@ -38,10 +38,10 @@ LIB_DEPENDS=devel/libexecinfo \
x11/dbus \
x11/libxdg-basedir
 
-MODLUA_BUILD_DEPENDS=  devel/lua-lgi \
-   devel/lualdoc
+MODLUA_BUILD_DEPENDS=  devel/lua-lgi
 
-BUILD_DEPENDS= textproc/asciidoc>=8.4.5 \
+BUILD_DEPENDS= devel/lualdoc \
+   textproc/asciidoc>=8.4.5 \
textproc/xmlto \
graphics/ImageMagick \
devel/doxygen
Index: x11/awesome/patches/patch-awesomeConfig_cmake
===
RCS file: /d/cvs/ports/x11/awesome/patches/patch-awesomeConfig_cmake,v
retrieving revision 1.18
diff -u -p -r1.18 patch-awesomeConfig_cmake
--- x11/awesome/patches/patch-awesomeConfig_cmake   22 Aug 2016 13:45:09 
-  1.18
+++ x11/awesome/patches/patch-awesomeConfig_cmake   17 Oct 2016 17:27:57 
-
@@ -1,6 +1,6 @@
 $OpenBSD: patch-awesomeConfig_cmake,v 1.18 2016/08/22 13:45:09 dcoppa Exp $
 --- awesomeConfig.cmake.orig   Sun Mar  6 15:05:54 2016
-+++ awesomeConfig.cmakeMon Aug 22 15:33:26 2016
 awesomeConfig.cmakeMon Oct 17 19:27:40 2016
 @@ -16,12 +16,11 @@ option(COMPRESS_MANPAGES "compress manpages" ON)
  option(GENERATE_DOC "generate API documentation" ON)
  
@@ -19,7 +19,7 @@ $OpenBSD:

Re: UPDATE: devel/libconfuse

2016-10-17 Thread Jeremie Courreges-Anglas 

Hi,

Davide Gerhard  writes:

> =- To ports@openbsd.org wrote on Sat  8.Oct'16 at 11:54:48 +0200 -=
>
>> Hello ports@,
>> 
>> This update devel/libconfuse to 3.0
>> Tested on amd64.
>> 
>> It also update HOMEPAGE and MASTER_SITES because
>> the project moves to github.
>
> thanks to Rafael Sadowski, I update the patch.
>
> changes:
> - use V to bump version quickly 
> - homepage with https
> - removed REVISION
>
> I don't use GH_* because otherwise it needs autoconf and,
> I think, this should be avoided. Wrong?

If a project makes proper releases then yeah, let's use proper releases.

One issue with the diff as is:
-SHARED_LIBS=   confuse 1.0 # .0.0
+SHARED_LIBS=   confuse 1.0

caught my eye.  When upgrading a library, one should verify that no
changes are due wrt the library version.  See
http://www.openbsd.org/faq/ports/specialtopics.html#SharedLibs for more
information.  Here, several functions have been added (that would warrant
a minor bump) and at least struct cfg_opt_t has evolved in an
incompatible way -> major bump. Please bump the library version to 2.0,
and keep a note, after the comment you removed, that upstream is now at
1.0.

Also, libconfuse is not only used by x11/tilda, did you test the other
consumers?

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Re: lualdoc & awesome (was: Re: lua ports: versions/flavors handling)

2016-10-17 Thread David Coppa 
On Mon, Oct 17, 2016 at 7:51 PM, Jeremie Courreges-Anglas
 wrote:
>
> The switch to explicit FLAVORS is almost complete, there are two
> remaining ports, luaposix and lualdoc.
>
> lualdoc is packaged as a library that supports flavors, but afaik it is
> a standalone tool.  Debian for example packages it as "lua-ldoc", not
> "lua5.1-ldoc".
>
> Here's a diff to switch it to a standalone tool.  Since x11/awesome is
> its only consumer, I used MODLUA_VERSION = 5.2 so that people that build
> from source don't need to install two lua versions (well, that's
> cheap...).
>
> I added a @pkgpath so that people who have lua52ldoc installed can
> transparently upgrade, but should I also add bin/lua51 and bin/lua52
> symlinks?  I'd prefer not...
>
> Bonus: x11/awesome/patches loses weight.
>
> Thoughts?

Reads ok to me, but why have you removed doxygen too?

Re: patch libcares on -stable (was: Re: Update to libcares-1.12.0)

2016-10-17 Thread Daniel Jakots 
On Tue, 11 Oct 2016 22:26:51 +0200, Daniel Jakots 
wrote:

> On Mon, 10 Oct 2016 21:46:54 +0200, Daniel Jakots 
> wrote:
> 
> > Hi,
> > 
> > This fixes CVE-2016-5180.  

ping
 
> I had a look for -stable. The patch use a function that doesn't exist
> in 1.10.0:
> 
> > +  buf = ares_malloc(len);  
> 
> I guess it appears in 1.11.0 because in the ChangeLog there is 
> 
> > Allow library-wide override of malloc/free   
> 
> So just backporting the diff doesn't work. Debian just
> uses malloc in their backport (thanks olasd!):
> https://sources.debian.net/src/c-ares/1.10.0-2%2Bdeb8u1/debian/patches/CVE-2016-5180.diff/
> 
> Doing the same thing and make package works.
> 
> Comments? OK?
> 
> Cheers,
> Daniel
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/libcares/Makefile,v
> retrieving revision 1.16
> diff -u -p -r1.16 Makefile
> --- Makefile  11 Mar 2016 19:59:15 -  1.16
> +++ Makefile  11 Oct 2016 20:26:07 -
> @@ -7,7 +7,7 @@ DISTNAME= c-ares-${V}
>  PKGNAME= libcares-${V}
>  CATEGORIES=  net devel
>  MASTER_SITES=${HOMEPAGE}download/
> -REVISION=0
> +REVISION=1
>  
>  SHARED_LIBS= cares   2.5
>  
> Index: patches/patch-ares_create_query_c
> ===
> RCS file: patches/patch-ares_create_query_c
> diff -N patches/patch-ares_create_query_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-ares_create_query_c 11 Oct 2016 20:26:07
> - @@ -0,0 +1,136 @@
> +$OpenBSD$
> +
> +Patch for CVE-2016-5180 https://c-ares.haxx.se/adv_20160929.html
> +
> +--- ares_create_query.c.orig Wed Feb 13 11:01:50 2013
>  ares_create_query.c  Tue Oct 11 22:15:41 2016
> +@@ -85,57 +85,31 @@
> +  */
> + 
> + int ares_create_query(const char *name, int dnsclass, int type,
> +-  unsigned short id, int rd, unsigned char
> **buf, +-  int *buflen, int max_udp_size)
> ++  unsigned short id, int rd, unsigned char
> **bufp, ++  int *buflenp, int max_udp_size)
> + {
> +-  int len;
> ++  size_t len;
> +   unsigned char *q;
> +   const char *p;
> ++  size_t buflen;
> ++  unsigned char *buf;
> + 
> +   /* Set our results early, in case we bail out early with an
> error. */ +-  *buflen = 0;
> +-  *buf = NULL;
> ++  *buflenp = 0;
> ++  *bufp = NULL;
> + 
> +-  /* Compute the length of the encoded name so we can check buflen.
> +-   * Start counting at 1 for the zero-length label at the end. */
> +-  len = 1;
> +-  for (p = name; *p; p++)
> +-{
> +-  if (*p == '\\' && *(p + 1) != 0)
> +-p++;
> +-  len++;
> +-}
> +-  /* If there are n periods in the name, there are n + 1 labels, and
> +-   * thus n + 1 length fields, unless the name is empty or ends
> with a +-   * period.  So add 1 unless name is empty or ends with a
> period. ++  /* Allocate a memory area for the maximum size this
> packet might need. +2 ++   * is for the length byte and zero
> termination if no dots or ecscaping is ++   * used.
> +*/
> +-  if (*name && *(p - 1) != '.')
> +-len++;
> ++  len = strlen(name) + 2 + HFIXEDSZ + QFIXEDSZ +
> ++(max_udp_size ? EDNSFIXEDSZ : 0);
> ++  buf = malloc(len);
> ++  if (!buf)
> ++return ARES_ENOMEM;
> + 
> +-  /* Immediately reject names that are longer than the maximum of
> 255 +-   * bytes that's specified in RFC 1035 ("To simplify
> implementations, +-   * the total length of a domain name (i.e.,
> label octets and label +-   * length octets) is restricted to 255
> octets or less."). We aren't +-   * doing this just to be a stickler
> about RFCs. For names that are +-   * too long, 'dnscache' closes its
> TCP connection to us immediately +-   * (when using TCP) and ignores
> the request when using UDP, and +-   * BIND's named returns ServFail
> (TCP or UDP). Sending a request +-   * that we know will cause
> 'dnscache' to close the TCP connection is +-   * painful, since that
> makes any other outstanding requests on that +-   * connection fail.
> And sending a UDP request that we know +-   * 'dnscache' will ignore
> is bad because resources will be tied up +-   * until we time-out the
> request. +-   */
> +-  if (len > MAXCDNAME)
> +-return ARES_EBADNAME;
> +-
> +-  *buflen = len + HFIXEDSZ + QFIXEDSZ + (max_udp_size ?
> EDNSFIXEDSZ : 0); +-  *buf = malloc(*buflen);
> +-  if (!*buf)
> +-  return ARES_ENOMEM;
> +-
> +   /* Set up the header. */
> +-  q = *buf;
> ++  q = buf;
> +   memset(q, 0, HFIXEDSZ);
> +   DNS_HEADER_SET_QID(q, id);
> +   DNS_HEADER_SET_OPCODE(q, QUERY);
> +@@ -159,8 +133,10 @@ int ares_create_query(const char *name, int
> dnsclass, 
> +   q += HFIXEDSZ;
> +   while (*name)
> + {
> +-  if (*name == '.')
> ++  if (*name == '.') {
> ++free (buf);
> + return ARES_EBADNAME;
> ++  }
> + 
> +   /* Count the number of bytes in this label. */
> +

lualdoc & awesome (was: Re: lua ports: versions/flavors handling)

2016-10-17 Thread Jeremie Courreges-Anglas 

The switch to explicit FLAVORS is almost complete, there are two
remaining ports, luaposix and lualdoc.

lualdoc is packaged as a library that supports flavors, but afaik it is
a standalone tool.  Debian for example packages it as "lua-ldoc", not
"lua5.1-ldoc".

Here's a diff to switch it to a standalone tool.  Since x11/awesome is
its only consumer, I used MODLUA_VERSION = 5.2 so that people that build
from source don't need to install two lua versions (well, that's
cheap...).

I added a @pkgpath so that people who have lua52ldoc installed can
transparently upgrade, but should I also add bin/lua51 and bin/lua52
symlinks?  I'd prefer not...

Bonus: x11/awesome/patches loses weight.

Thoughts?


Index: devel/Makefile
===
RCS file: /d/cvs/ports/devel/Makefile,v
retrieving revision 1.1551
diff -u -p -r1.1551 Makefile
--- devel/Makefile  16 Oct 2016 23:52:31 -  1.1551
+++ devel/Makefile  17 Oct 2016 17:25:36 -
@@ -434,7 +434,6 @@
  SUBDIR += luafs,lua52
  SUBDIR += luafs,lua53
  SUBDIR += lualdoc
- SUBDIR += lualdoc,lua52
  SUBDIR += luapack
  SUBDIR += luapack,lua52
  SUBDIR += luaposix
Index: devel/lualdoc/Makefile
===
RCS file: /d/cvs/ports/devel/lualdoc/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- devel/lualdoc/Makefile  26 Aug 2016 07:51:49 -  1.16
+++ devel/lualdoc/Makefile  17 Oct 2016 17:29:17 -
@@ -7,6 +7,7 @@ GH_PROJECT =LDoc
 GH_TAGNAME =   1.4.5
 PKGNAME =  lualdoc-${GH_TAGNAME}
 CATEGORIES =   devel
+REVISION = 0
 
 HOMEPAGE = http://stevedonovan.github.io/ldoc/
 
@@ -18,9 +19,10 @@ PERMIT_PACKAGE_CDROM =Yes
 MODULES =  lang/lua
 
 MODLUA_RUN_DEPENDS =   devel/lua-penlight
+MODLUA_SA =Yes
+MODLUA_VERSION = 5.2
 
 NO_BUILD = Yes
-
 NO_TEST =  Yes
 
 do-install:
@@ -35,7 +37,6 @@ do-install:
${MODLUA_DATADIR}/ldoc/html/
${INSTALL_DATA} ${WRKSRC}/doc/*.md ${MODLUA_DOCDIR}
${INSTALL_DATA} ${WRKSRC}/readme.md ${MODLUA_DOCDIR}
-   ${SUBST_PROGRAM} \
-   ${WRKSRC}/ldoc.lua ${PREFIX}/bin/ldoc${MODLUA_DEP_VERSION}
+   ${SUBST_PROGRAM} ${WRKSRC}/ldoc.lua ${PREFIX}/bin/ldoc
 
 .include 
Index: devel/lualdoc/pkg/PLIST
===
RCS file: /d/cvs/ports/devel/lualdoc/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- devel/lualdoc/pkg/PLIST 26 Aug 2016 07:51:49 -  1.4
+++ devel/lualdoc/pkg/PLIST 17 Oct 2016 17:23:15 -
@@ -1,5 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.4 2016/08/26 07:51:49 dcoppa Exp $
-bin/ldoc${MODLUA_DEP_VERSION}
+@pkgpath devel/lualdoc,lua52
+bin/ldoc
 share/doc/${FULLPKGNAME}/
 share/doc/${FULLPKGNAME}/doc.md
 share/doc/${FULLPKGNAME}/readme.md
Index: x11/awesome/Makefile
===
RCS file: /d/cvs/ports/x11/awesome/Makefile,v
retrieving revision 1.102
diff -u -p -r1.102 Makefile
--- x11/awesome/Makefile22 Aug 2016 13:45:09 -  1.102
+++ x11/awesome/Makefile17 Oct 2016 14:18:37 -
@@ -38,13 +38,12 @@ LIB_DEPENDS=devel/libexecinfo \
x11/dbus \
x11/libxdg-basedir
 
-MODLUA_BUILD_DEPENDS=  devel/lua-lgi \
-   devel/lualdoc
+MODLUA_BUILD_DEPENDS=  devel/lua-lgi
 
-BUILD_DEPENDS= textproc/asciidoc>=8.4.5 \
+BUILD_DEPENDS= devel/lualdoc \
+   textproc/asciidoc>=8.4.5 \
textproc/xmlto \
-   graphics/ImageMagick \
-   devel/doxygen
+   graphics/ImageMagick
 
 MODLUA_RUN_DEPENDS=devel/lua-lgi
 
Index: x11/awesome/patches/patch-awesomeConfig_cmake
===
RCS file: /d/cvs/ports/x11/awesome/patches/patch-awesomeConfig_cmake,v
retrieving revision 1.18
diff -u -p -r1.18 patch-awesomeConfig_cmake
--- x11/awesome/patches/patch-awesomeConfig_cmake   22 Aug 2016 13:45:09 
-  1.18
+++ x11/awesome/patches/patch-awesomeConfig_cmake   17 Oct 2016 17:27:57 
-
@@ -1,6 +1,6 @@
 $OpenBSD: patch-awesomeConfig_cmake,v 1.18 2016/08/22 13:45:09 dcoppa Exp $
 --- awesomeConfig.cmake.orig   Sun Mar  6 15:05:54 2016
-+++ awesomeConfig.cmakeMon Aug 22 15:33:26 2016
 awesomeConfig.cmakeMon Oct 17 19:27:40 2016
 @@ -16,12 +16,11 @@ option(COMPRESS_MANPAGES "compress manpages" ON)
  option(GENERATE_DOC "generate API documentation" ON)
  
@@ -19,7 +19,7 @@ $OpenBSD: patch-awesomeConfig_cmake,v 1.
  # }}}
  
  # {{{ Endianness
-@@ -43,29 +42,21 @@ macro(a_find_program var prg req)
+@@ -43,11 +42,7 @@ macro(a_find_program var prg req)
  endif()
  endmacro()
  
@@ -31,17 +31,7 @@ $OpenBSD: patch-awesomeConfig_cmake,v 1.
  # programs needed for man pages

Re: ansible: openbsd_pkg fails to run when just specifying the package name

2016-10-17 Thread Jasper Lievisse Adriaanse 
On Mon, Oct 17, 2016 at 02:59:43PM +0200, Sebastien Marie wrote:
> Hi,
> 
> With the latest update of ansible (ansible-2.1.2.0->2.1.2.0p3), I
> experiment failure in the use of `openbsd_pkg' module.
> 
> The exception occurs when specifying a package name without version or
> branch (like juste "sysclean"). The code will assume branch syntax and
> will fail at extracting branch information after '%'.
> 
> As workaround it works with explicitly specifying the version-less name
> (like "sysclean--").
> 
> 
> $ doas ansible -vvv localhost -m openbsd_pkg -a 'name=sysclean state=present'
> Using /etc/ansible/ansible.cfg as config file
>  [WARNING]: provided hosts list is empty, only localhost is available
> 
> <127.0.0.1> ESTABLISH LOCAL CONNECTION FOR USER: semarie
> <127.0.0.1> EXEC /bin/sh -c '( umask 77 && mkdir -p "` echo 
> $HOME/.ansible/tmp/ansible-tmp-1476708883.67-184353742364685 `" && echo 
> ansible-tmp-1476708883.67-184353742364685="` echo 
> $HOME/.ansible/tmp/ansible-tmp-1476708883.67-184353742364685 `" ) && sleep 0'
> <127.0.0.1> PUT /tmp/tmp8ykgP0 TO 
> /home/semarie/.ansible/tmp/ansible-tmp-1476708883.67-184353742364685/openbsd_pkg
> <127.0.0.1> EXEC /bin/sh -c 'chmod u+x 
> /home/semarie/.ansible/tmp/ansible-tmp-1476708883.67-184353742364685/ 
> /home/semarie/.ansible/tmp/ansible-tmp-1476708883.67-184353742364685/openbsd_pkg
>  && sleep 0'
> <127.0.0.1> EXEC /bin/sh -c 'LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 
> LC_MESSAGES=en_US.UTF-8 /usr/local/bin/python2.7 
> /home/semarie/.ansible/tmp/ansible-tmp-1476708883.67-184353742364685/openbsd_pkg;
>  rm -rf 
> "/home/semarie/.ansible/tmp/ansible-tmp-1476708883.67-184353742364685/" > 
> /dev/null 2>&1 && sleep 0'
> An exception occurred during task execution. The full traceback is:
> Traceback (most recent call last):
>   File "/tmp/ansible_t2obkK/ansible_module_openbsd_pkg.py", line 512, in 
> 
> main()
>   File "/tmp/ansible_t2obkK/ansible_module_openbsd_pkg.py", line 487, in main
> parse_package_name(name, pkg_spec, module)
>   File "/tmp/ansible_t2obkK/ansible_module_openbsd_pkg.py", line 358, in 
> parse_package_name
> pkg_spec['branch'] = pkg_spec['stem'].split('%')[1]
> IndexError: list index out of range
> 
> localhost | FAILED! => {
> "changed": false, 
> "failed": true, 
> "invocation": {
> "module_name": "openbsd_pkg"
> }, 
> "module_stderr": "Traceback (most recent call last):\n  File 
> \"/tmp/ansible_t2obkK/ansible_module_openbsd_pkg.py\", line 512, in 
> \nmain()\n  File 
> \"/tmp/ansible_t2obkK/ansible_module_openbsd_pkg.py\", line 487, in main\n
> parse_package_name(name, pkg_spec, module)\n  File 
> \"/tmp/ansible_t2obkK/ansible_module_openbsd_pkg.py\", line 358, in 
> parse_package_name\npkg_spec['branch'] = 
> pkg_spec['stem'].split('%')[1]\nIndexError: list index out of range\n", 
> "module_stdout": "", 
> "msg": "MODULE FAILURE"
> }
> 
> -- 
> Sebastien Marie

Does this also happen when you remove the two '-z' parts of the local patch we
carry for ansible? I don't have a CVS tree around right now to provide you with
a patch to apply.

-- 
jasper

CVS: cvs.openbsd.org: ports

2016-10-17 Thread Daniel Jakots 
CVSROOT:/cvs
Module name:ports
Changes by: d...@cvs.openbsd.org2016/10/17 10:26:52

Modified files:
.  : README 

Log message:
Mention bulk(8)
ok espie@

Re: poison gettext-tools

2016-10-17 Thread Antoine Jacoutot 
On Mon, Oct 17, 2016 at 04:03:16PM +0100, Stuart Henderson wrote:
> On 2016/10/17 16:41, Antoine Jacoutot wrote:
> > On Mon, Oct 17, 2016 at 03:20:37PM +0100, Stuart Henderson wrote:
> > > On 2016/10/17 13:49, Jeremie Courreges-Anglas wrote:
> > > > Stuart Henderson  writes:
> > > > 
> > > > > I'm going to do a bulk build with this to see if it shakes anything 
> > > > > out.
> > > > > Any comments on whether it's worth committing?
> > > > 
> > > > I like the idea, but it currently doesn't behave as one would expect.
> > > > See for example x11/xpad, which has
> > > > 
> > > >   MODULES=textproc/intltool
> > > > 
> > > > The patch shouldn't change anything since intltool brings in
> > > > gettext-tools, but:
> > > 
> > > Thanks - Antoine pointed out that this will apply to GNOME as well.
> > > 
> > > We could check for multiple alternative ports in BUILD_DEPENDS, but
> > > this wouldn't fit nicely with Marc's suggestion to make the framework
> > > more general, so how about adding gettext-tools to intltool.port.mk?
> > 
> > If there is no other way...
> 
> The two options are
> 
> +.if !defined(BUILD_DEPENDS) || !${BUILD_DEPENDS:Mdevel/gettext-tools} && \
> + !${BUILD_DEPENDS:Mtextproc/intltool}

This has my vote.
Less magic imho.

> or adding to BUILD_DEPENDS in intltool.port.mk.
> 
> Who has which preferences? :)
> 

-- 
Antoine

CVS: cvs.openbsd.org: ports

2016-10-17 Thread Jeremie Courreges-Anglas 
CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2016/10/17 09:17:12

Modified files:
devel/lua-cliargs: Makefile 

Log message:
Add a basic test target, reusing the port's examples

ok Florian Stinglmayr (maintainer)

CVS: cvs.openbsd.org: ports

2016-10-17 Thread Jeremie Courreges-Anglas 
CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2016/10/17 09:15:53

Modified files:
devel/lua-cliargs: Makefile 
devel/lua-cliargs/pkg: DESCR 

Log message:
Add a link to the online documentation.

ok Florian Stinglmayr (maintainer)

Re: poison gettext-tools

2016-10-17 Thread Stuart Henderson 
On 2016/10/17 16:41, Antoine Jacoutot wrote:
> On Mon, Oct 17, 2016 at 03:20:37PM +0100, Stuart Henderson wrote:
> > On 2016/10/17 13:49, Jeremie Courreges-Anglas wrote:
> > > Stuart Henderson  writes:
> > > 
> > > > I'm going to do a bulk build with this to see if it shakes anything out.
> > > > Any comments on whether it's worth committing?
> > > 
> > > I like the idea, but it currently doesn't behave as one would expect.
> > > See for example x11/xpad, which has
> > > 
> > >   MODULES=textproc/intltool
> > > 
> > > The patch shouldn't change anything since intltool brings in
> > > gettext-tools, but:
> > 
> > Thanks - Antoine pointed out that this will apply to GNOME as well.
> > 
> > We could check for multiple alternative ports in BUILD_DEPENDS, but
> > this wouldn't fit nicely with Marc's suggestion to make the framework
> > more general, so how about adding gettext-tools to intltool.port.mk?
> 
> If there is no other way...

The two options are

+.if !defined(BUILD_DEPENDS) || !${BUILD_DEPENDS:Mdevel/gettext-tools} && \
+   !${BUILD_DEPENDS:Mtextproc/intltool}

or adding to BUILD_DEPENDS in intltool.port.mk.

Who has which preferences? :)

Re: poison gettext-tools

2016-10-17 Thread Antoine Jacoutot 
On Mon, Oct 17, 2016 at 03:20:37PM +0100, Stuart Henderson wrote:
> On 2016/10/17 13:49, Jeremie Courreges-Anglas wrote:
> > Stuart Henderson  writes:
> > 
> > > I'm going to do a bulk build with this to see if it shakes anything out.
> > > Any comments on whether it's worth committing?
> > 
> > I like the idea, but it currently doesn't behave as one would expect.
> > See for example x11/xpad, which has
> > 
> >   MODULES=textproc/intltool
> > 
> > The patch shouldn't change anything since intltool brings in
> > gettext-tools, but:
> 
> Thanks - Antoine pointed out that this will apply to GNOME as well.
> 
> We could check for multiple alternative ports in BUILD_DEPENDS, but
> this wouldn't fit nicely with Marc's suggestion to make the framework
> more general, so how about adding gettext-tools to intltool.port.mk?

If there is no other way...

-- 
Antoine

Re: poison gettext-tools

2016-10-17 Thread Stuart Henderson 
On 2016/10/17 13:49, Jeremie Courreges-Anglas wrote:
> Stuart Henderson  writes:
> 
> > I'm going to do a bulk build with this to see if it shakes anything out.
> > Any comments on whether it's worth committing?
> 
> I like the idea, but it currently doesn't behave as one would expect.
> See for example x11/xpad, which has
> 
>   MODULES=textproc/intltool
> 
> The patch shouldn't change anything since intltool brings in
> gettext-tools, but:

Thanks - Antoine pointed out that this will apply to GNOME as well.

We could check for multiple alternative ports in BUILD_DEPENDS, but
this wouldn't fit nicely with Marc's suggestion to make the framework
more general, so how about adding gettext-tools to intltool.port.mk?

Re: UPDATE: net/py-curl 7.43.0

2016-10-17 Thread Jeremie Courreges-Anglas 
Alexandr Shadchin  writes:

> Hi,
>
> This diff updates py-curl to the latest release.
> Tested on amd64.
>
> Comments ? OK ?

ok jca@

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

ansible: openbsd_pkg fails to run when just specifying the package name

2016-10-17 Thread Sebastien Marie 
Hi,

With the latest update of ansible (ansible-2.1.2.0->2.1.2.0p3), I
experiment failure in the use of `openbsd_pkg' module.

The exception occurs when specifying a package name without version or
branch (like juste "sysclean"). The code will assume branch syntax and
will fail at extracting branch information after '%'.

As workaround it works with explicitly specifying the version-less name
(like "sysclean--").


$ doas ansible -vvv localhost -m openbsd_pkg -a 'name=sysclean state=present'
Using /etc/ansible/ansible.cfg as config file
 [WARNING]: provided hosts list is empty, only localhost is available

<127.0.0.1> ESTABLISH LOCAL CONNECTION FOR USER: semarie
<127.0.0.1> EXEC /bin/sh -c '( umask 77 && mkdir -p "` echo 
$HOME/.ansible/tmp/ansible-tmp-1476708883.67-184353742364685 `" && echo 
ansible-tmp-1476708883.67-184353742364685="` echo 
$HOME/.ansible/tmp/ansible-tmp-1476708883.67-184353742364685 `" ) && sleep 0'
<127.0.0.1> PUT /tmp/tmp8ykgP0 TO 
/home/semarie/.ansible/tmp/ansible-tmp-1476708883.67-184353742364685/openbsd_pkg
<127.0.0.1> EXEC /bin/sh -c 'chmod u+x 
/home/semarie/.ansible/tmp/ansible-tmp-1476708883.67-184353742364685/ 
/home/semarie/.ansible/tmp/ansible-tmp-1476708883.67-184353742364685/openbsd_pkg
 && sleep 0'
<127.0.0.1> EXEC /bin/sh -c 'LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 
LC_MESSAGES=en_US.UTF-8 /usr/local/bin/python2.7 
/home/semarie/.ansible/tmp/ansible-tmp-1476708883.67-184353742364685/openbsd_pkg;
 rm -rf "/home/semarie/.ansible/tmp/ansible-tmp-1476708883.67-184353742364685/" 
> /dev/null 2>&1 && sleep 0'
An exception occurred during task execution. The full traceback is:
Traceback (most recent call last):
  File "/tmp/ansible_t2obkK/ansible_module_openbsd_pkg.py", line 512, in 

main()
  File "/tmp/ansible_t2obkK/ansible_module_openbsd_pkg.py", line 487, in main
parse_package_name(name, pkg_spec, module)
  File "/tmp/ansible_t2obkK/ansible_module_openbsd_pkg.py", line 358, in 
parse_package_name
pkg_spec['branch'] = pkg_spec['stem'].split('%')[1]
IndexError: list index out of range

localhost | FAILED! => {
"changed": false, 
"failed": true, 
"invocation": {
"module_name": "openbsd_pkg"
}, 
"module_stderr": "Traceback (most recent call last):\n  File 
\"/tmp/ansible_t2obkK/ansible_module_openbsd_pkg.py\", line 512, in \n  
  main()\n  File \"/tmp/ansible_t2obkK/ansible_module_openbsd_pkg.py\", line 
487, in main\nparse_package_name(name, pkg_spec, module)\n  File 
\"/tmp/ansible_t2obkK/ansible_module_openbsd_pkg.py\", line 358, in 
parse_package_name\npkg_spec['branch'] = 
pkg_spec['stem'].split('%')[1]\nIndexError: list index out of range\n", 
"module_stdout": "", 
"msg": "MODULE FAILURE"
}

-- 
Sebastien Marie

CVS: cvs.openbsd.org: ports

2016-10-17 Thread Jeremie Courreges-Anglas 
CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2016/10/17 05:56:26

Modified files:
audio/mp3info  : Makefile 
audio/mp3info/pkg: PFRAG.no-no_x11 PLIST 

Log message:
Drop the gettext module and add @bin annotations.

Re: poison gettext-tools

2016-10-17 Thread Jeremie Courreges-Anglas 
Stuart Henderson  writes:

> I'm going to do a bulk build with this to see if it shakes anything out.
> Any comments on whether it's worth committing?

I like the idea, but it currently doesn't behave as one would expect.
See for example x11/xpad, which has

  MODULES=textproc/intltool

The patch shouldn't change anything since intltool brings in
gettext-tools, but:

ritchie /usr/ports/x11/xpad$ make
printf '#!/bin/sh\n echo "*** $0 was called without gettext-tools dependency 
***" >&2\n exit 1\n' > /usr/ports/pobj/xpad-4.0/bin/msgfmt
chmod 555 /usr/ports/pobj/xpad-4.0/bin/msgfmt
===> xpad-4.0p8 depends on: intltool->=0.41.1p0 -> intltool-0.51.0p1
===> xpad-4.0p8 depends on: gmake-* -> gmake-4.2.1
===> xpad-4.0p8 depends on: bzip2-* -> bzip2-1.0.6p8
===> xpad-4.0p8 depends on: gettext-* -> gettext-0.19.8.1
===> xpad-4.0p8 depends on: gtk+2-* -> gtk+2-2.24.31
===>  Verifying specs:  ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi 
Xinerama Xrandr Xrender atk-1.0 c cairo fontconfig freetype gdk-x11-2.0 
gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gtk-x11-2.0 intl pango-1.0 
pangocairo-1.0 pangoft2-1.0 pthread z
===>  found ICE.10.0 SM.9.0 X11.16.1 Xcomposite.4.0 Xcursor.5.0 Xdamage.4.0 
Xext.13.0 Xfixes.6.0 Xi.12.1 Xinerama.6.0 Xrandr.7.1 Xrender.6.0 
atk-1.0.21809.1 c.89.2 cairo.12.3 fontconfig.11.0 freetype.26.0 
gdk-x11-2.0.2400.0 gdk_pixbuf-2.0.3200.0 gio-2.0.4200.3 glib-2.0.4200.3 
gobject-2.0.4200.3 gtk-x11-2.0.2400.0 intl.6.0 pango-1.0.3800.0 
pangocairo-1.0.3800.0 pangoft2-1.0.3800.0 pthread.23.0 z.5.0
===>  Checking files for xpad-4.0p8
`/d/distfiles/xpad-4.0.tar.bz2' is up to date.
>> (SHA256) xpad-4.0.tar.bz2: OK
===>  Extracting for xpad-4.0p8
===>  Patching for xpad-4.0p8
===>   Applying OpenBSD patch patch-src_xpad-pad_c
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--
|$OpenBSD: patch-src_xpad-pad_c,v 1.1 2010/05/13 14:14:49 sthen Exp $
|
|unbreak with gtk+2.20
|
|--- src/xpad-pad.c.origThu May 13 14:23:55 2010
|+++ src/xpad-pad.c Thu May 13 14:38:28 2010
--
Patching file src/xpad-pad.c using Plan A...
Hunk #1 succeeded at 275.
done
===>  Configuring for xpad-4.0p8
Using /usr/ports/pobj/xpad-4.0/config.site (generated)
configure: WARNING: unrecognized options: --disable-silent-rules, 
--disable-gtk-doc
configure: loading site script /usr/ports/pobj/xpad-4.0/config.site
checking for a BSD-compatible install... /usr/ports/pobj/xpad-4.0/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... mkdir -p
checking for gawk... (cached) awk
checking whether gmake sets $(MAKE)... yes
checking for style of include used by gmake... GNU
checking for gcc... cc
checking for C compiler default output file name... a.out
checking whether the C compiler works... yes
checking whether we are cross compiling... no
checking for suffix of executables...
checking for suffix of object files... (cached) o
checking whether we are using the GNU C compiler... (cached) yes
checking whether cc accepts -g... (cached) yes
checking for cc option to accept ISO C89... none needed
checking dependency style of cc... gcc3
checking for /proc/self/maps... no
checking whether everything is installed to the same prefix... no
checking whether binary relocation support should be enabled... no
checking for gcc... (cached) cc
checking whether we are using the GNU C compiler... (cached) yes
checking whether cc accepts -g... (cached) yes
checking for cc option to accept ISO C89... (cached) none needed
checking dependency style of cc... (cached) gcc3
checking for a BSD-compatible install... /usr/ports/pobj/xpad-4.0/bin/install -c
checking whether gmake sets $(MAKE)... (cached) yes
checking whether NLS is requested... yes
checking for intltool >= 0.31... 0.51.0 found
checking for intltool-update... /usr/local/bin/intltool-update
checking for intltool-merge... /usr/local/bin/intltool-merge
checking for intltool-extract... /usr/local/bin/intltool-extract
checking for xgettext... /usr/local/bin/xgettext
checking for msgmerge... /usr/local/bin/msgmerge
checking for msgfmt... /usr/ports/pobj/xpad-4.0/bin/msgfmt
checking for gmsgfmt... /usr/ports/pobj/xpad-4.0/bin/msgfmt
*** /usr/ports/pobj/xpad-4.0/bin/msgfmt was called without gettext-tools 
dependency ***
configure: error: GNU gettext tools not found; required for intltool
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2659 
'/usr/ports/pobj/xpad-4.0/.configure_done')
*** Error 1 in /usr/ports/x11/xpad 
(/usr/ports/infrastructure/mk/bsd.port.mk:2390 'all')
ritchie /usr/ports/x11/xpad$ vi Makefile


-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Re: "pkg_info -S" can't get update signature, "unsigned package"

2016-10-17 Thread Andreas Kusalananda Kähäri 
On Mon, Oct 17, 2016 at 12:05:50PM +0200, Marc Espie wrote:
> On Mon, Oct 17, 2016 at 08:49:43AM +0200, Andreas Kusalananda Kähäri wrote:
> > On Sun, Oct 16, 2016 at 09:37:50AM +0100, Stuart Henderson wrote:
> > > On 2016/10/16 10:27, Andreas Kusalananda Kähäri wrote:
> > > > Hi,
> > > > 
> > > > "pkg_info -S" used to show the "update signature" for a package, i.e.
> > > > the "unique tag showing the package name, and the version number of
> > > > every run time dependency and shared library used to build this
> > > > package".
> > > > 
> > > > Since recently, this gives me an error due to the packages not being
> > > > signed:
> > > > 
> > > > $ pkg_info -S /usr/ports/packages/amd64/all/ccache-3.3.2.tgz
> > > > Error from file:/usr/ports/packages/amd64/all/
> > > > unsigned package
> > > > 
> > > > This is regardless of the whether the package is built recently or a
> > > > long time ago.
> > > > 
> > > > Do I need to sign my own packages to be able to get the update signature
> > > > out of them?!
> > > 
> > > No, you can use "-D unsigned".
> > > 
> > 
> > 
> > Ah! Good! That was documented for pkg_add, but not for pkg_info AFAIK,
> > but it works. Thanks.
> > 
> This is documented in current.html though. Should be your first source of
> information when stuff doesn't work in current.

You mean "2016/09/27 - more secure package and firmware signatures"? I
didn't think it would affect "pkg_info -S package.tgz" as it doesn't
install anything.


> 
> Documentation is somewhat in flux.  There's still duplicated information
> throughout pkg_add(1)/pkg_info(1)/pkg_sign(1)...
> 
> I've tried making /usr/ports/packages/amd64/all a "trusted" 
> source automatically, but it's surprisingly difficult (I have ports a
> symlink elsewhere, and figuring out where we live is somewhat annoying)
> 

I'm aware that things are in flux.  I'm happy that my little script is
working again, and I'm sure all the docs will be updated in due time.

Thanks,
Andreas


-- 
Andreas Kusalananda Kähäri
Bioinformatics Developer
NBIS, Uppsala University
http://www.nbis.se/

CVS: cvs.openbsd.org: ports

2016-10-17 Thread Jeremie Courreges-Anglas 
CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2016/10/17 05:15:35

Modified files:
net/nbtscan: Makefile distinfo 
net/nbtscan/patches: patch-statusq_h 

Log message:
Update HOMEPAGE & MASTER_SITES, and use new tarballs.

- same tarball content
- regen a patch while here

from Rafael Sadowski

Re: neomutt

2016-10-17 Thread Stefan Sperling 
On Sun, Oct 16, 2016 at 11:23:28PM +0200, Stefan Sperling wrote:
> On Mon, Sep 26, 2016 at 01:07:30PM +0100, Stuart Henderson wrote:
> > People who were seeing crashes with neomutt, please test this, and get
> > me backtraces if you still see them (the port Makefile here is setup to
> > build with symbols so you don't need to set DEBUG in this case).
> > 
> 
> I've been running this with no issues.

Ugh. Apparently, I spoke too soon.

GDB is free software, covered by the GNU General Public License, and you are
welcome to change it and/or distribute copies of it under certain conditions.
Type "show copying" to see the conditions.
There is absolutely no warranty for GDB.  Type "show warranty" for details.
This GDB was configured as "amd64-unknown-openbsd6.0"...
Core was generated by `mutt'.
Program terminated with signal 11, Segmentation fault.
Reading symbols from /usr/lib/libpthread.so.23.0...done.
Loaded symbols for /usr/lib/libpthread.so.23.0
Loaded symbols for /usr/local/bin/mutt
Reading symbols from /usr/lib/libncurses.so.14.0...done.
Loaded symbols for /usr/lib/libncurses.so.14.0
Reading symbols from /usr/lib/libssl.so.39.1...done.
Loaded symbols for /usr/lib/libssl.so.39.1
Reading symbols from /usr/lib/libcrypto.so.38.1...done.
Loaded symbols for /usr/lib/libcrypto.so.38.1
Reading symbols from /usr/lib/libz.so.5.0...done.
Loaded symbols for /usr/lib/libz.so.5.0
Reading symbols from /usr/local/lib/libkyotocabinet.so.0.0...done.
Loaded symbols for /usr/local/lib/libkyotocabinet.so.0.0
Reading symbols from /usr/local/lib/libidn.so.17.2...done.
Loaded symbols for /usr/local/lib/libidn.so.17.2
Reading symbols from /usr/local/lib/libintl.so.6.0...done.
Loaded symbols for /usr/local/lib/libintl.so.6.0
Reading symbols from /usr/local/lib/libiconv.so.6.0...done.
Loaded symbols for /usr/local/lib/libiconv.so.6.0
Reading symbols from /usr/lib/libc.so.89.2...done.
Loaded symbols for /usr/lib/libc.so.89.2
Symbols already loaded for /usr/lib/libpthread.so.23.0
Reading symbols from /usr/lib/libstdc++.so.57.0...done.
Loaded symbols for /usr/lib/libstdc++.so.57.0
Reading symbols from /usr/lib/libm.so.10.0...done.
Loaded symbols for /usr/lib/libm.so.10.0
Reading symbols from /usr/libexec/ld.so...done.
oaded symbols for /usr/libexec/ld.so
#0  0x09f79e71bde2 in index_color (index_no=0) at curs_main.c:269
269   HEADER *h = Context->hdrs[Context->v2r[index_no]];
(gdb) bt
#0  0x09f79e71bde2 in index_color (index_no=0) at curs_main.c:269
#1  0x09f79e7409ac in menu_redraw_index (menu=0x9fa696e0800) at menu.c:324
#2  0x09f79e74d97c in mutt_pager (banner=0x0, fname=Variable "fname" is not 
available.
) at pager.c:1857
#3  0x09f79e7122e9 in mutt_display_message (cur=0x9fa696e0200) at 
commands.c:225
#4  0x09f79e71dc4d in mutt_index_menu () at curs_main.c:1911
#5  0x09f79e73c973 in main (argc=1, argv=0x7f7f9b38) at main.c:906
(gdb) p Context
$1 = (CONTEXT *) 0x0
(gdb)

Re: [PATCH] Update HOMEPAGE for audio/xmms2

2016-10-17 Thread Jeremie Courreges-Anglas 
Frederic Cambus  writes:

> Hi ports@,
>
> Here is a patch to update HOMEPAGE for audio/xmms2.
>
> OK?

Sure.

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

CVS: cvs.openbsd.org: ports

2016-10-17 Thread Jeremie Courreges-Anglas 
CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2016/10/17 04:13:56

Modified files:
devel/lutok: Makefile 
devel/kyua-cli : Makefile 

Log message:
Stop handling lua FLAVORS that aren't hooked to the build.

No objection from Sergey Bronnikov (maintainer)

Re: poison gettext-tools

2016-10-17 Thread Marc Espie 
On Mon, Oct 17, 2016 at 09:34:49AM +0100, Stuart Henderson wrote:
> I'm going to do a bulk build with this to see if it shakes anything out.
> Any comments on whether it's worth committing?
> 
> Index: bsd.port.mk
> ===
> RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
> retrieving revision 1.1322
> diff -u -p -r1.1322 bsd.port.mk
> --- bsd.port.mk   6 Sep 2016 10:31:12 -   1.1322
> +++ bsd.port.mk   17 Oct 2016 08:34:27 -
> @@ -2469,6 +2469,16 @@ ${_WRKDIR_COOKIE}:
>  .if !empty(WRKDIR_LINKNAME)
>   @ln -sf ${WRKDIR} ${.CURDIR}/${WRKDIR_LINKNAME}
>  .endif
> +# poison some common gettext-tools binaries
> +.if !defined(BUILD_DEPENDS) || !${BUILD_DEPENDS:Mdevel/gettext-tools}
> + printf '#!/bin/sh\n\
> + echo "*** $$0 was called without gettext-tools dependency ***" 
> >&2\n\
> + exit 1\n' > ${WRKDIR}/bin/msgfmt
> + chmod 555 ${WRKDIR}/bin/msgfmt
> +.  for name in msgcat msginit
> + @ln -sf msgfmt ${WRKDIR}/bin/${name}
> +.  endfor
> +.endif
>   @${_MAKE_COOKIE} $@
>  
>  ${_EXTRACT_COOKIE}: ${_WRKDIR_COOKIE}
Good idea.  Maybe we'll make that more independent in the future, but
for one tool, it's good.

I would probably prefer a pattern like
.for tool dep in msgfmt devel/gettext-tools msgcat devel/gettext-tools msginit 
devel/gettext-tools
...
.endfor

but it's trivial to change later

Re: "pkg_info -S" can't get update signature, "unsigned package"

2016-10-17 Thread Marc Espie 
On Mon, Oct 17, 2016 at 08:49:43AM +0200, Andreas Kusalananda Kähäri wrote:
> On Sun, Oct 16, 2016 at 09:37:50AM +0100, Stuart Henderson wrote:
> > On 2016/10/16 10:27, Andreas Kusalananda Kähäri wrote:
> > > Hi,
> > > 
> > > "pkg_info -S" used to show the "update signature" for a package, i.e.
> > > the "unique tag showing the package name, and the version number of
> > > every run time dependency and shared library used to build this
> > > package".
> > > 
> > > Since recently, this gives me an error due to the packages not being
> > > signed:
> > > 
> > > $ pkg_info -S /usr/ports/packages/amd64/all/ccache-3.3.2.tgz
> > > Error from file:/usr/ports/packages/amd64/all/
> > > unsigned package
> > > 
> > > This is regardless of the whether the package is built recently or a
> > > long time ago.
> > > 
> > > Do I need to sign my own packages to be able to get the update signature
> > > out of them?!
> > 
> > No, you can use "-D unsigned".
> > 
> 
> 
> Ah! Good! That was documented for pkg_add, but not for pkg_info AFAIK,
> but it works. Thanks.
> 
This is documented in current.html though. Should be your first source of
information when stuff doesn't work in current.

Documentation is somewhat in flux.  There's still duplicated information
throughout pkg_add(1)/pkg_info(1)/pkg_sign(1)...

I've tried making /usr/ports/packages/amd64/all a "trusted" 
source automatically, but it's surprisingly difficult (I have ports a
symlink elsewhere, and figuring out where we live is somewhat annoying)

CVS: cvs.openbsd.org: ports

2016-10-17 Thread Kirill Bychkov 
CVSROOT:/cvs
Module name:ports
Changes by: ki...@cvs.openbsd.org   2016/10/17 03:51:20

Modified files:
net/seafile: Makefile.inc 
net/seafile/ccnet: distinfo 
net/seafile/client: distinfo 
net/seafile/client/patches: patch-src_seafile-applet_cpp 
net/seafile/seafile: distinfo 

Log message:
bugfix update to seafile-6.0.0

CVS: cvs.openbsd.org: ports

2016-10-17 Thread Stuart Henderson 
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/10/17 02:37:44

Modified files:
textproc/zathura/core: Makefile 

Log message:
remove devel/gettext MODULES

poison gettext-tools

2016-10-17 Thread Stuart Henderson 
I'm going to do a bulk build with this to see if it shakes anything out.
Any comments on whether it's worth committing?

Index: bsd.port.mk
===
RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
retrieving revision 1.1322
diff -u -p -r1.1322 bsd.port.mk
--- bsd.port.mk 6 Sep 2016 10:31:12 -   1.1322
+++ bsd.port.mk 17 Oct 2016 08:34:27 -
@@ -2469,6 +2469,16 @@ ${_WRKDIR_COOKIE}:
 .if !empty(WRKDIR_LINKNAME)
@ln -sf ${WRKDIR} ${.CURDIR}/${WRKDIR_LINKNAME}
 .endif
+# poison some common gettext-tools binaries
+.if !defined(BUILD_DEPENDS) || !${BUILD_DEPENDS:Mdevel/gettext-tools}
+   printf '#!/bin/sh\n\
+   echo "*** $$0 was called without gettext-tools dependency ***" 
>&2\n\
+   exit 1\n' > ${WRKDIR}/bin/msgfmt
+   chmod 555 ${WRKDIR}/bin/msgfmt
+.  for name in msgcat msginit
+   @ln -sf msgfmt ${WRKDIR}/bin/${name}
+.  endfor
+.endif
@${_MAKE_COOKIE} $@
 
 ${_EXTRACT_COOKIE}: ${_WRKDIR_COOKIE}

CVS: cvs.openbsd.org: ports

2016-10-17 Thread Antoine Jacoutot 
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/10/17 01:55:08

Modified files:
graphics/shotwell: Makefile distinfo 

Log message:
Update to shotwell-0.24.1.

powerpc bulk build report

2016-10-17 Thread landry 
bulk build on macppc-1.ports.openbsd.org
started on  Tue Oct 4 12:09:06 MDT 2016
finished at Mon Oct 17 01:52:55 MDT 2016
lasted 13D06h43m
done with kern.version=OpenBSD 6.0-current (GENERIC.MP) #1301: Tue Oct  4 
01:17:24 MDT 2016

built packages:7745
Oct 4:393
Oct 5:1022
Oct 6:353
Oct 7:185
Oct 8:308
Oct 9:331
Oct 10:305
Oct 11:352
Oct 12:466
Oct 13:375
Oct 14:462
Oct 15:483
Oct 16:2108
Oct 17:601



build failures: 10
http://build-failures.rhaalovely.net//powerpc/2016-10-04/audio/moc.log
http://build-failures.rhaalovely.net//powerpc/2016-10-04/devel/llvm.log
http://build-failures.rhaalovely.net//powerpc/2016-10-04/devel/reposurgeon.log
http://build-failures.rhaalovely.net//powerpc/2016-10-04/editors/emacs21.log
http://build-failures.rhaalovely.net//powerpc/2016-10-04/graphics/openimageio.log
http://build-failures.rhaalovely.net//powerpc/2016-10-04/lang/node.log
http://build-failures.rhaalovely.net//powerpc/2016-10-04/plan9/drawterm.log
http://build-failures.rhaalovely.net//powerpc/2016-10-04/sysutils/u-boot.log
http://build-failures.rhaalovely.net//powerpc/2016-10-04/www/gnash.log
http://build-failures.rhaalovely.net//powerpc/2016-10-04/www/pear.log

recurrent failures
 failures/audio/moc.log
 failures/devel/llvm.log
 failures/devel/reposurgeon.log
 failures/editors/emacs21.log
 failures/graphics/openimageio.log
 failures/lang/node.log
 failures/sysutils/u-boot.log
 failures/www/gnash.log
new failures
+++ ls-failures Mon Oct 17 01:53:20 2016
+failures/plan9/drawterm.log
+failures/www/pear.log
resolved failures
--- ../old/powerpc/last//ls-failuresThu Sep 22 02:41:30 2016
-failures/devel/ocaml-extlib.log
-failures/lang/guile2.log
-failures/lang/squeak/vm.log
Base libs:
curses.14.0 edit.5.2 event.4.1 expat.11.0 form.6.0 formw.6.0 fuse.1.1
iberty.12.0 menu.6.0 menuw.6.0 ncurses.14.0 ncursesw.14.0 objc.6.0
ossaudio.4.0 panel.6.0 panelw.6.0 perl.17.1 readline.4.0 rpcsvc.2.0
skey.6.0 radius.1.0 sndio.6.1 stdc++.57.0 termcap.14.0 .14.0 z.5.0
usbhid.7.0 util.12.1 pcap.8.1 crypto.38.1 pthread.23.0 ssl.39.1 tls.11.4
c.89.2 c.89.2.a kvm.16.2 m.10.0

X libs:
EGL.1.0 FS.10.0 GLESv1_CM.1.0 GLU.9.0 GLw.6.0 ICE.10.0 SM.9.0
X11-xcb.2.0 X11.16.1 XRes.5.0 Xau.10.0 Xaw.15.0 Xaw7.15.0 Xcomposite.4.0
Xcursor.5.0 Xdamage.4.0 Xdmcp.11.0 Xext.13.0 Xfixes.6.0 Xfontcache.5.0
Xi.12.1 Xinerama.6.0 Xmu.11.0 Xmuu.6.0 Xpm.9.0 Xrender.6.0 Xss.6.0
Xt.11.0 Xtst.11.0 Xv.6.0 XvMC.6.0 XvMCW.2.0 Xxf86dga.6.0 dmx.2.0
Xxf86misc.6.0 Xxf86vm.6.0 drm.7.1 fontenc.4.0 epoxy.2.0 gbm.0.0
pciaccess.2.0 pixman-1.32.6 pthread-stubs.2.0 txc_dxtn.0.0
xcb-composite.1.0 xcb-damage.1.0 xcb-dpms.1.0 xcb-dri2.1.1 xcb-dri3.0.0
xcb-ewmh.2.0 xcb-cursor.0.0 xcb-icccm.4.0 xcb-image.2.0 xcb-res.1.1
xcb-keysyms.3.0 xkbui.5.0 xcb-shm.1.1 xcb-xevie.1.0 xcb-xf86dri.2.0
xcb-util.0.0 xcb-xinerama.1.0 xcb-xtest.1.0 xcb-xvmc.1.0 xkbfile.6.0
Xrandr.7.1 XvMCr600.1.0 xcb-render-util.2.0 drm_amdgpu.1.1
drm_nouveau.3.0 drm_radeon.4.0 GL.17.0 GLESv2.1.1 OSMesa.10.0 Xfont.13.0
Xft.10.0 glapi.0.2 fontconfig.11.0 freetype.26.0 xcb-glx.1.1
xcb-randr.2.2 xcb-present.0.1 xcb-record.1.1 xcb-render.1.1
xcb-screensaver.1.1 xcb-shape.1.1 xcb-sync.1.2 xcb-xfixes.1.2
xcb-xkb.0.1 xcb-xprint.3.0 xcb-xv.1.1 xcb.4.0

CVS: cvs.openbsd.org: ports

2016-10-17 Thread Antoine Jacoutot 
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/10/17 01:51:00

Modified files:
graphics/ffmpeg: Makefile 
graphics/ffmpeg/patches: patch-libavcodec_aaccoder_c 
 patch-libavcodec_aacenc_c 
 patch-libavcodec_aacenc_h 
 patch-libavcodec_aacenc_utils_h 

Log message:
Some more AAC fixes.

from Brad (maintainer)

CVS: cvs.openbsd.org: ports

2016-10-17 Thread Antoine Jacoutot 
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/10/17 01:47:11

Modified files:
sysutils/awscli: Makefile distinfo 

Log message:
Update to awscli-1.11.5.

Re: [NEW] cbmc - Bounded Model Checker for C and C++

2016-10-17 Thread Simon Mages 
Hi,

2016-10-16 19:17 GMT+02:00, Jeremie Courreges-Anglas :
> Simon Mages  writes:
>
>> Hi,
>>
>> 2016-10-16 12:14 GMT+02:00, Stuart Henderson :
>>> On 2016/10/16 12:09, Simon Mages wrote:
 Ok, thanks for the feedback.

 But i really don't get the llvm dependency.
 I used the llvm in base on current to build
 this port. Why shouldi suddenly use this
 one?
>>>
>>> LLVM is not enabled in base. Anyway, setting MODULES=lang/clang will
>>> add the dep automatically.
>> Finally i got it, i was working with wrong assumptions, sorry for that.
>>
>> Attached the new port.
>>
>> # tar zcvf /tmp/cbmc.tar.gz devel/cbmc
>> devel/cbmc
>> devel/cbmc/Makefile
>> devel/cbmc/patches
>> devel/cbmc/patches/patch-src_big-int_bigint-test_cc
>> devel/cbmc/patches/patch-src_common~
>> devel/cbmc/patches/patch-src_big-int_bigint_cc
>> devel/cbmc/patches/patch-src_common
>> devel/cbmc/patches/patch-minisat-2_2_1_minisat_core_Solver_cc
>> devel/cbmc/patches/patch-minisat-2_2_1_minisat_core_SolverTypes_h
>> devel/cbmc/patches/patch-minisat-2_2_1_minisat_mtl_IntTypes_h
>> devel/cbmc/patches/patch-minisat-2_2_1_minisat_mtl_Vec_h
>> devel/cbmc/patches/patch-minisat-2_2_1_minisat_simp_SimpSolver_cc
>> devel/cbmc/patches/patch-minisat-2_2_1_minisat_utils_Options_h
>> devel/cbmc/patches/patch-minisat-2_2_1_minisat_utils_ParseUtils_h
>> devel/cbmc/distinfo
>> devel/cbmc/pkg
>> devel/cbmc/pkg/PLIST
>> devel/cbmc/pkg/DESCR
>>
>> Lets see if now everything is alright :)
>
> Looks nicer, here are a few improvements:
> - some spacing nits
> - use MASTER_SITE_DEBIAN
> - as Stuart pointed out, no need for p5-libwww any more
> - respect CFLAGS, CXXFLAGS and LDFLAGS, using MAKE_FLAGS; this helps
>   a lot for debug builds
> - instead of putting the minisat2 patches in the port patches/
>   directory, we could also just use upstream's patch in post-extract.
>   From my POV those patches aren't my concern, so I don't care about
>   them being tracked by CVS.
> - patch the include file that provides the "compatibility" goo for
>   alloca, instead of patching consumers.
>
> Updated tarball below.
>From my point of view we can just take the version you send.
Its very interesting to see what the ports framework can do, thanks a lot @all
people who replied so far :)

> Note:  you create a dedicated section where to set CP_CXXFLAGS, LINKLIB,
> etc on OpenBSD, an alternative could be to just amend the FreeBSD
> section:
>
> -else ifeq ($(filter-out FreeBSD,$(BUILD_ENV_)),)
> +else ifeq ($(filter-out FreeBSD OpenBSD,$(BUILD_ENV_)),)
>
> I doubt that it matters much, upstream may have an opinion already.
The problem here is that the version of 'ar' we are using does not
support the -T flag.
Thats why i created the OpenBSD section in the first place.

BR
Simon

Re: "pkg_info -S" can't get update signature, "unsigned package"

2016-10-17 Thread Andreas Kusalananda Kähäri 
On Sun, Oct 16, 2016 at 09:37:50AM +0100, Stuart Henderson wrote:
> On 2016/10/16 10:27, Andreas Kusalananda Kähäri wrote:
> > Hi,
> > 
> > "pkg_info -S" used to show the "update signature" for a package, i.e.
> > the "unique tag showing the package name, and the version number of
> > every run time dependency and shared library used to build this
> > package".
> > 
> > Since recently, this gives me an error due to the packages not being
> > signed:
> > 
> > $ pkg_info -S /usr/ports/packages/amd64/all/ccache-3.3.2.tgz
> > Error from file:/usr/ports/packages/amd64/all/
> > unsigned package
> > 
> > This is regardless of the whether the package is built recently or a
> > long time ago.
> > 
> > Do I need to sign my own packages to be able to get the update signature
> > out of them?!
> 
> No, you can use "-D unsigned".
> 


Ah! Good! That was documented for pkg_add, but not for pkg_info AFAIK,
but it works. Thanks.


-- 
Andreas Kusalananda Kähäri
Bioinformatics Developer
NBIS, Uppsala University
http://www.nbis.se/


signature.asc
Description: PGP signature

CVS: cvs.openbsd.org: ports

2016-10-17 Thread Anthony J . Bentley 
CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2016/10/17 00:43:32

Modified files:
emulators  : Makefile 

Log message:
+libretro-genesis-plus-gx

Re: NEW: p5-Mojolicious-Plugin-AccessLog and p5-Mojolicious-Plugin-Thumbnail

2016-10-17 Thread Olivier Cherrier 

Hi Alexander,

On Mon, Oct 10, 2016 at 01:07:14AM +0200, alexander.bl...@gmx.net wrote:
> > Description:
> > easily generate an access log.
> 
> A sentence should start with a upper case letter.
>
> OK bluhm@ for p5-Mojolicious-Plugin-AccessLog
 
I fixed it. Thank you. 

> > p5-Mojolicious-Plugin-Thumbnail.
> 
> There is no license or copyright file in this module.  Please ask
> the author to provide one, otherwise this is not free software.

For this one, I am sending emails to the author for one week but I didn't
get any answer yet ... will try again.


And here is another one: Mojolicious-Plugin-TextDomain.
Description: Mojolicious plugin for a gettext localization.
This one is correctly licensed:
Copyright (C) 2010 Anatoliy Lapitskiy
This program is free software; you can redistribute it and/or modify it
under the terms of either: the GNU General Public License as published
by the Free Software Foundation; or the Artistic License.


Thanks a lot,
Best
oc


p5-Mojolicious-Plugin-AccessLog.tgz
Description: application/tar-gz


p5-Mojolicious-Plugin-TextDomain.tgz
Description: application/tar-gz

CVS: cvs.openbsd.org: ports

2016-10-17 Thread Anthony J . Bentley 
CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2016/10/17 00:30:01

Log message:
Import libretro-genesis-plus-gx-1.7.4.

Genesis Plus GX is an open-source Sega 8/16 bit emulator focused on accuracy
and portability.

The source code, initially based on Genesis Plus 1.2a by Charles MacDonald
has been heavily modified & enhanced, with respect to original goals and
design, in order to improve emulation accuracy as well as adding support for
new peripherals, cartridge or console hardware and many other exciting
features.

The result is that Genesis Plus GX is now more a continuation of the
original project than a simple port, providing very accurate emulation and
100% compatibility with Genesis / Mega Drive, Sega/Mega CD, Master System,
Game Gear & SG-1000 released software (including all unlicensed or pirate
known dumps), also emulating backwards compatibility modes when available.

ok fcambus@

Status:

Vendor Tag: bentley
Release Tags:   bentley_20161017

N ports/emulators/libretro-genesis-plus-gx/Makefile
N ports/emulators/libretro-genesis-plus-gx/distinfo
N ports/emulators/libretro-genesis-plus-gx/patches/patch-Makefile_libretro
N ports/emulators/libretro-genesis-plus-gx/patches/patch-core_loadrom_c
N ports/emulators/libretro-genesis-plus-gx/pkg/DESCR
N ports/emulators/libretro-genesis-plus-gx/pkg/PLIST

No conflicts created by this import