Re: pledge in ports: textproc/mupdf

[Sebastien Marie]

On Mon, Jan 18, 2016 at 01:50:01PM +, Stuart Henderson wrote:
> 
> These seem fine in my tests so far (tried a few files with various
> image formats etc and some with passwords).
> 
> >   - mupdf-x11-curl
> 
> I ran into a problem with mupdf-x11-curl fetching from http getting
> killed on the first file I tried: as luck would have it I haven't been
> able to repeat it with another file, but http://dmtx.uk/ugh.pdf
> if you'd like to try it. Works ok from disk. It fails to display
> in the unpledged version too (sits burning cpu), so there's an
> upstream bug anyway.
> 

I am able to reproduce it.

The problem is in mupdf-1.8-source/platform/x11/x11_main.c (but
mupdf-x11 isn't impacted).

The function winreloadpage() calls XOpenDisplay() in the middle of the
program (whereas xdpy contains the already opened display ? I dunno why
it tries to open it again).

void winreloadpage(pdfapp_t *app)
{
XEvent xev;
Display *dpy = XOpenDisplay(NULL);

But as we tries to open display, it is depending of DISPLAY env for how
xcb will contact the Xserver. In your backtrace (and mine) it is :0, so
it tries unix sockets... and pledge don't let it to pass.

This function seems to be called only from HAVE_CURL code (it is why
mupdf-x11 isn't impacted), and seems to be used to "emulate" a reload
command for http (as the pdf stream arrived by chunks). It downloads a
block of octets, try to display a page (reload), if fails downloads more
octets... and loop.

The following diff adds removing of the extra XOpenDisplay() and reuse
xdpy variable. It makes your uri to have same behaviour than unpledged
version... (still bugged).

-- 
Sebastien Marie

Index: Makefile
===
RCS file: /cvs/ports/textproc/mupdf/Makefile,v
retrieving revision 1.59
diff -u -p -r1.59 Makefile
--- Makefile12 Nov 2015 17:26:54 -  1.59
+++ Makefile18 Jan 2016 14:23:32 -
@@ -8,6 +8,7 @@ COMMENT =   graphic library, pdf parser, v
 V =1.8
 DISTNAME = mupdf-$V-source
 PKGNAME =  mupdf-$V
+REVISION = 0
 
 CATEGORIES =   textproc x11
 
@@ -23,6 +24,7 @@ PERMIT_PACKAGE_CDROM =Yes
 FLAVORS=   js
 FLAVOR?=
 
+# uses pledge(2)
 WANTLIB += GL X11 Xcursor Xext Xinerama Xrandr c crypto curl freetype
 WANTLIB += idn jbig2dec jpeg m nghttp2 openjp2 pthread ssl z
 
Index: patches/patch-platform_gl_gl-main_c
===
RCS file: patches/patch-platform_gl_gl-main_c
diff -N patches/patch-platform_gl_gl-main_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-platform_gl_gl-main_c 18 Jan 2016 14:23:32 -
@@ -0,0 +1,21 @@
+$OpenBSD$
+
+add pledge(2) to mupdf-gl:
+  - drm : opengl stuff
+  - proc exec : opening a external browser on uri link
+
+--- platform/gl/gl-main.c.orig Tue Nov 10 17:19:51 2015
 platform/gl/gl-main.c  Sun Jan 17 10:21:44 2016
+@@ -1361,6 +1361,12 @@ int main(int argc, char **argv)
+ 
+   glfwMakeContextCurrent(window);
+ 
++  if (pledge("stdio rpath drm proc exec", NULL) == -1)
++  {
++  fprintf(stderr, "pledge: %s\n", strerror(errno));
++  exit(1);
++  }
++
+   ctx = fz_new_context(NULL, NULL, 0);
+   fz_register_document_handlers(ctx);
+ 
Index: patches/patch-platform_x11_jstest_main_c
===
RCS file: patches/patch-platform_x11_jstest_main_c
diff -N patches/patch-platform_x11_jstest_main_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-platform_x11_jstest_main_c18 Jan 2016 14:23:32 -
@@ -0,0 +1,21 @@
+$OpenBSD$
+
+add pledge(2) to mujstest
+  - rpath : OPEN command
+  - wpath cpath : SCREENSHOT command
+
+--- platform/x11/jstest_main.c.origSun Jan 17 13:50:58 2016
 platform/x11/jstest_main.c Sun Jan 17 13:52:29 2016
+@@ -310,6 +310,12 @@ main(int argc, char *argv[])
+   if (fz_optind == argc)
+   usage();
+ 
++  if (pledge("stdio rpath wpath cpath", NULL) == -1)
++  {
++  fprintf(stderr, "pledge: %s\n", strerror(errno));
++  exit(1);
++  }
++
+   ctx = fz_new_context(NULL, NULL, FZ_STORE_DEFAULT);
+   if (!ctx)
+   {
Index: patches/patch-platform_x11_x11_main_c
===
RCS file: patches/patch-platform_x11_x11_main_c
diff -N patches/patch-platform_x11_x11_main_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-platform_x11_x11_main_c   18 Jan 2016 14:23:32 -
@@ -0,0 +1,47 @@
+$OpenBSD$
+
+add pledge(2) to mupdf-x11 and mupdf-x11-curl:
+  - inet dns : with HAVE_CURL only
+  - proc exec : opening an external browser on uri link
+
+--- platform/x11/x11_main.c.orig   Tue Nov 10 17:19:51 2015
 platform/x11/x11_main.cMon Jan 18 15:20:56 2016
+@@ -698,7 +698,6 @@ void onselreq(Window requestor, Atom selection, Atom t
+ void winreloadpage(pdfapp_t *app)
+ {
+

[RFC] add pledge to archivers/p7zip

[Josh Grosse]

My first pledge(2) attempt is below, posted for comments.

This promises "stdio rpath wpath cpath fattr" for the 7za and 7zr
executables.  7z loads codecs through ld.so, and I'm working on 
determining if I can add this same promise after codecs are loaded,
but it is not pledged in this early attempt.  

With this patch, make test (upstream's all_test target) 
successfully completes.
 
Comments and recommendations are welcome.  


Index: Makefile
===
RCS file: /systems/cvs/ports/archivers/p7zip/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- Makefile16 Nov 2015 22:52:08 -  1.26
+++ Makefile18 Jan 2016 14:04:31 -
@@ -6,7 +6,7 @@ COMMENT-main=   file archiver with high co
 COMMENT-rar=   rar modules for p7zip
 
 V= 15.09
-REVISION=  0
+REVISION=  1
 DISTNAME=  p7zip_${V}_src_all
 PKGNAME=   p7zip-${V}
 PKGNAME-main=  p7zip-${V}
Index: patches/patch-CPP_7zip_UI_Console_Main_cpp
===
RCS file: patches/patch-CPP_7zip_UI_Console_Main_cpp
diff -N patches/patch-CPP_7zip_UI_Console_Main_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-CPP_7zip_UI_Console_Main_cpp  18 Jan 2016 14:08:19 -
@@ -0,0 +1,25 @@
+$OpenBSD$
+
+Pledge archivers/p7zip binaries: 7za and 7zr
+
+--- CPP/7zip/UI/Console/Main.cpp.orig  Sat Oct 17 11:20:22 2015
 CPP/7zip/UI/Console/Main.cpp   Mon Jan 18 08:58:40 2016
+@@ -484,6 +484,18 @@ int Main2(
+   #endif
+ )
+ {
++
++// pledge 7za and 7zr.  7z uses dlopen(3), and defines EXTERNAL_CODECS. 
++
++#ifndef EXTERNAL_CODECS
++
++  if (pledge("stdio rpath wpath cpath fattr", NULL) == -1) {
++perror("pledge");
++exit(1);
++  }
++
++#endif
++
+   #if defined(_WIN32) && !defined(UNDER_CE)
+   SetFileApisToOEM();
+   #endif

Re: [NEW] games/typespeed

[n . reusse]

> Hi,
> 
> attached you find a port for the typing game 'typespeed' [1].  Someone
> tried to get this imported in 2004, but did not succeed:
> http://marc.info/?l=openbsd-ports=2=1=typespeed=b
> 
> The last release is from 2008, but i've filled myself in as the
> maintainer
> nonetheless.
> 
> Successfully tested on amd64.
> 
> Comments?
> 
> 
> [1] http://typespeed.sourceforge.net/

ping

Re: pledge in ports: textproc/mupdf

[Stuart Henderson]

On 2016/01/17 15:22, Sebastien Marie wrote:
> Hi,
> 
> Here a diff for adding pledge(2) to textproc/mupdf. I added ports@ in Cc
> in order to get wider reviewing.
> 
> I pledged all programs inside textproc/mupdf:
>   - mupdf-x11
>   - mupdf-gl
>   - mutool draw,clean,extract,info,pages,poster,show
>   - mujstest

These seem fine in my tests so far (tried a few files with various
image formats etc and some with passwords).

>   - mupdf-x11-curl

I ran into a problem with mupdf-x11-curl fetching from http getting
killed on the first file I tried: as luck would have it I haven't been
able to repeat it with another file, but http://dmtx.uk/ugh.pdf
if you'd like to try it. Works ok from disk. It fails to display
in the unpledged version too (sits burning cpu), so there's an
upstream bug anyway.

I've run out of time to dig for now but here's what I have so far:

mupdf: warning: not enough data to open yet
error: read of a block we don't have (E) (offset=0)
error: cannot load document from stream
[...lots of the above...]
mupdf: warning: not enough data to open yet
error: cannot find object in xref (8150 0 R) - not loaded yet?
error: cannot find object in xref (8150 0 R) - not loaded yet?
error: cannot find object in xref (18 0 R) - not loaded yet?
Pledged version - Abort trap (core dumped) 
Unpledged version - warning: Background fetch complete!

Core was generated by `mupdf-x11-curl'.
Program terminated with signal SIGABRT, Aborted.
#0  0x0dc8f939e4da in socket () at :2
2   : No such file or directory.
[Current thread is 1 (process 6470)]
(gdb) bt
#0  0x0dc8f939e4da in socket () at :2
#1  0x0dc852af5bbb in _xcb_socket (family=1, type=1, proto=0)
at /usr/xenocara/lib/libxcb/libxcb/../../../dist/libxcb/src/xcb_util.c:315
#2  0x0dc852af5f7a in _xcb_open_unix (file=, protocol=0x0)
at /usr/xenocara/lib/libxcb/libxcb/../../../dist/libxcb/src/xcb_util.c:440
#3  _xcb_open (display=0, protocol=, host=0xdc89f4ded90 "")
at /usr/xenocara/lib/libxcb/libxcb/../../../dist/libxcb/src/xcb_util.c:297
#4  xcb_connect_to_display_with_auth_info (displayname=, 
auth=0x0, 
screenp=0x0)
at /usr/xenocara/lib/libxcb/libxcb/../../../dist/libxcb/src/xcb_util.c:506
#5  0x0dc85d15060b in _XConnectXCB () from /usr/X11R6/lib/libX11.so.16.1
#6  0x0dc85d1414fb in XOpenDisplay () from /usr/X11R6/lib/libX11.so.16.1
#7  0x0dc60370f4e0 in winreloadpage (app=)
at platform/x11/x11_main.c:701
#8  0x0dc603717f8b in fetch_chunk (state=)
at platform/x11/curl_stream.c:287
#9  fetcher_thread (state=) at platform/x11/curl_stream.c:318
#10 pthread_thread (arg=0xdc8fb4de000) at platform/x11/curl_stream.c:102
#11 0x0dc8fed8477e in _rthread_start (v=0x1) at 
/usr/src/lib/librthread/rthread.c:145
#12 0x0dc8f933252b in __tfork_thread ()
at /usr/src/lib/libc/arch/amd64/sys/tfork_thread.S:75
#13 0x in ?? ()
(gdb) frame 1
#1  0x0dc852af5bbb in _xcb_socket (family=1, type=1, proto=0)
at /usr/xenocara/lib/libxcb/libxcb/../../../dist/libxcb/src/xcb_util.c:315
315 fd = socket(family, type | SOCK_CLOEXEC, proto);
(gdb) frame 7
#7  0x0dc60370f4e0 in winreloadpage (app=)
at platform/x11/x11_main.c:701
701 Display *dpy = XOpenDisplay(NULL);

mupdf-x11-curl(1655): syscall 97 "unix"-- socket
mupdf-x11-curl(12083): syscall 48 "stdio"  -- sigprocmask

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/01/18 07:01:36

Modified files:
games/love : Makefile 

Log message:
unbreak; typo in wantlib sync

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2016/01/18 06:29:04

Modified files:
security/pwgen : Makefile 
Added files:
security/pwgen/patches: patch-pwgen_c 

Log message:
pledge pwgen

ok robert@ (MAINTAINER, sthen@

Re: pledge in ports

[Carlin Bingham]

On Sun, 17 Jan 2016, at 04:13 AM, Jiri B wrote:
> 
> Could you consider Tor please?
> 
> j.
> 

tor's pledge will looking something like:

  pledge("stdio rpath cpath wpath ps id dns inet unix flock getpw
  proc exec pf", NULL)


None of these can be dropped later or made conditional on the
configuration, as tor's config can be changed and reloaded while it's
running and it needs them all to handle that.

Is a wide pledge like this still beneficial?


Explanation for these:

stdio - is obvious
rpath, cpath, wpath - reading/creating/writing cached descriptors etc.
(also logging without syslog)
ps - uses sysctl to decide resource limits if they're not defined in
torrc
id - sets rlimits
dns - obvious
inet - tor needs sockets
unix - unix sockets can be used for the socks and control ports
flock - locking file to prevent multiple instances writing the data dir
getpw - to drop privs, chown unix sockets, answer GETINFO commands to
control port
proc - daemonising
exec - daemonising and pluggable transports
pf - this could be ifdef'd, only needed if transparent proxying to pf is
enabled when tor is built

--
Carlin

Re: [maintainer update] update to Openfire 4.0.0

[Ian Darwin]

On 2016-01-16 12:30 PM, Marc Peters wrote:

Hi list,

here's an update to Openfire 4.0.0. The changelog can be found here:
http://www.igniterealtime.org/builds/openfire/docs/latest/changelog.html

Attached as patch to avoid mangling.

Openfire pulls now jdk-1.8 and dependencies.

Tested on amd64. Comments/OKs?



Installed cleanly, lightly tested and ok.

CVS: cvs.openbsd.org: ports

[David Coppa]

CVSROOT:/cvs
Module name:ports
Changes by: dco...@cvs.openbsd.org  2016/01/18 08:13:54

Modified files:
audio/mumble   : Makefile distinfo 

Log message:
maintenance update to mumble-1.2.13

Re: [RFC] add pledge to archivers/p7zip

[Josh Grosse]

On Mon, Jan 18, 2016 at 09:20:01AM -0500, Josh Grosse wrote:
> My first pledge(2) attempt is below, posted for comments.
> 
> This promises "stdio rpath wpath cpath fattr" for the 7za and 7zr
> executables.  7z loads codecs through ld.so, and I'm working on 
> determining if I can add this same promise after codecs are loaded,
> but it is not pledged in this early attempt.  

The patch below now includes the same promise string for 7z, inserted
after codecs are loaded.

If there are no comments, I believe this is ready for testing on
other archs.  It passes the test suite (make test) on amd64.

Index: Makefile
===
RCS file: /systems/cvs/ports/archivers/p7zip/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- Makefile16 Nov 2015 22:52:08 -  1.26
+++ Makefile18 Jan 2016 14:04:31 -
@@ -6,7 +6,7 @@ COMMENT-main=   file archiver with high co
 COMMENT-rar=   rar modules for p7zip
 
 V= 15.09
-REVISION=  0
+REVISION=  1
 DISTNAME=  p7zip_${V}_src_all
 PKGNAME=   p7zip-${V}
 PKGNAME-main=  p7zip-${V}
Index: patches/patch-CPP_7zip_UI_Console_Main_cpp
===
RCS file: patches/patch-CPP_7zip_UI_Console_Main_cpp
diff -N patches/patch-CPP_7zip_UI_Console_Main_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-CPP_7zip_UI_Console_Main_cpp  18 Jan 2016 15:05:44 -
@@ -0,0 +1,43 @@
+$OpenBSD$
+
+Pledge archivers/p7zip binaries
+
+--- CPP/7zip/UI/Console/Main.cpp.orig  Sat Oct 17 11:20:22 2015
 CPP/7zip/UI/Console/Main.cpp   Mon Jan 18 10:05:31 2016
+@@ -484,6 +484,18 @@ int Main2(
+   #endif
+ )
+ {
++
++// pledge 7za and 7zr at this point, they take different paths than 7z.  
++
++#ifndef EXTERNAL_CODECS
++
++  if (pledge("stdio rpath wpath cpath fattr", NULL) == -1) {
++perror("pledge");
++exit(1);
++  }
++
++#endif
++
+   #if defined(_WIN32) && !defined(UNDER_CE)
+   SetFileApisToOEM();
+   #endif
+@@ -579,6 +591,17 @@ int Main2(
+   codecs->CaseSensitiveChange = options.CaseSensitiveChange;
+   codecs->CaseSensitive = options.CaseSensitive;
+   ThrowException_if_Error(codecs->Load());
++
++// pledge 7z here
++
++#ifdef EXTERNAL_CODECS
++
++  if (pledge("stdio rpath wpath cpath fattr", NULL) == -1) {
++perror("pledge");
++exit(1);
++  }
++
++#endif
+ 
+   bool isExtractGroupCommand = options.Command.IsFromExtractGroup();
+ 

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/01/18 08:34:45

Modified files:
graphics/ffmpeg: Makefile 
graphics/ffmpeg/patches: patch-libavcodec_aaccoder_c 
 patch-libavcodec_aacenc_c 
 patch-libavcodec_aacenc_is_c 
 patch-libavcodec_aacenc_tns_c 
 patch-libavcodec_aacenc_utils_h 
 patch-tests_fate_aac_mak 

Log message:
Moar AAC.

from Brad (maintainer)

CVS: cvs.openbsd.org: ports

[Benoit Lecocq]

CVSROOT:/cvs
Module name:ports
Changes by: ben...@cvs.openbsd.org  2016/01/18 02:31:42

Modified files:
sysutils/grive2: Makefile distinfo 

Log message:
Update to grive2-0.5.0.

from Rafael Sadowski (maintainer)

CVS: cvs.openbsd.org: ports

[David Coppa]

CVSROOT:/cvs
Module name:ports
Changes by: dco...@cvs.openbsd.org  2016/01/18 03:40:46

Modified files:
audio/ncmpcpp  : Makefile distinfo 

Log message:
Bugfixing update to ncmpcpp-0.7.2

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/01/18 03:47:52

Modified files:
www/squidclamav: Makefile distinfo 
Removed files:
www/squidclamav/patches: patch-src_squidclamav_c 

Log message:
update to squidclamav-6.15

Re: NEW: textproc/py-sphinx_rtd_theme 0.1.9

[Alexandr Shadchin]

On Mon, Jan 18, 2016 at 09:28:47AM +0500, Alexandr Shadchin wrote:
> Hi,
> 
> ok to import textproc/py-sphinx_rtd_theme ?
> 
> Need for update py-sphinx.
> 
> DESCR:
> This is a mobile-friendly sphinx theme I made for readthedocs.org. It's
> currently in development there and includes some rtd variable checks that
> can be ignored if you're just trying to use it on your project outside of
> that site.
> 

Attach tarball (Thanks Daniel Jakots (: )

-- 
Alexandr Shadchin



py-sphinx_rtd_theme.tgz
Description: application/tar-gz

Re: UPDATE: devel/ipython 4.0.2

[Alexandr Shadchin]

On Sun, Jan 17, 2016 at 12:57:28PM +0500, Alexandr Shadchin wrote:
> Hi,
> 
> This diff updates ipython to the latest release.
> Tested on amd64. Add python3 flavor.
> 
> Also update and add py3 flavor for related ports.
> 
> Comments ? OK ?
> 

Correct diff for py-jupyter_core (I forgot add patches)

-- 
Alexandr Shadchin

Index: Makefile
===
RCS file: /cvs/ports/devel/py-jupyter_core/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile1 Dec 2015 22:34:59 -   1.1.1.1
+++ Makefile18 Jan 2016 08:35:16 -
@@ -5,16 +5,18 @@ COMMENT = Jupyter core package
 MODPY_EGG_VERSION =4.0.6
 DISTNAME = jupyter_core-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
+REVISION = 0
 
 CATEGORIES =   devel
 
 HOMEPAGE = http://jupyter.org/
 
-RUN_DEPENDS =  devel/py-traitlets
+MAINTAINER =   Alexandr Shadchin 
+
+RUN_DEPENDS =  devel/py-traitlets${MODPY_FLAVOR}
 TEST_DEPENDS = ${RUN_DEPENDS} \
-   devel/py-test \
-   devel/py-mock \
-   devel/ipython>=4.0.0
+   devel/ipython${MODPY_FLAVOR}>=4.0.0 \
+   devel/py-test${MODPY_FLAVOR}
 
 # BSD
 PERMIT_PACKAGE_CDROM = Yes
@@ -22,7 +24,21 @@ PERMIT_PACKAGE_CDROM =   Yes
 MODULES =  lang/python
 MODPY_PI = Yes
 
+FLAVORS =  python3
+FLAVOR ?=
+
+.if !${FLAVOR:Mpython3}
+TEST_DEPENDS +=devel/py-mock
+.endif
+
+.if ${FLAVOR:Mpython3}
+post-install:
+   mv ${PREFIX}/bin/jupyter ${PREFIX}/bin/jupyter${MODPY_BIN_SUFFIX}
+   mv ${PREFIX}/bin/jupyter-migrate 
${PREFIX}/bin/jupyter-migrate${MODPY_BIN_SUFFIX}
+.endif
+
+# test_subcommand_list fail on python3
 do-test:
-   cd ${WRKSRC} && ${LOCALBASE}/bin/py.test jupyter_core
+   cd ${WRKSRC} && ${MODPY_BIN} -m pytest jupyter_core
 
 .include 
Index: patches/patch-jupyter_core_command_py
===
RCS file: patches/patch-jupyter_core_command_py
diff -N patches/patch-jupyter_core_command_py
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-jupyter_core_command_py   18 Jan 2016 08:35:16 -
@@ -0,0 +1,27 @@
+$OpenBSD$
+--- jupyter_core/command.py.orig   Thu Sep 17 12:28:33 2015
 jupyter_core/command.pyWed Jan 13 15:41:56 2016
+@@ -77,7 +77,13 @@ def list_subcommands():
+ if sys.platform.startswith('win'):
+ # remove file-extension on Windows
+ name = os.path.splitext(name)[0]
+-subcommand_tuples.add(tuple(name.split('-')[1:]))
++if name == 'jupyter-3':
++continue
++if sys.version_info.major == 3 and name.endswith('-3'):
++name = name.replace('-3', '')
++subcommand_tuples.add(tuple(name.split('-')[1:]))
++elif sys.version_info.major == 2 and not name.endswith('-3'):
++subcommand_tuples.add(tuple(name.split('-')[1:]))
+ # build a set of subcommand strings, excluding subcommands whose parents 
are defined
+ subcommands = set()
+ # Only include `jupyter-foo-bar` if `jupyter-foo` is not already present
+@@ -147,6 +153,8 @@ def main():
+ sys.exit("subcommand is required")
+ 
+ command = 'jupyter-' + subcommand
++if sys.version_info.major == 3 and not command.endswith('-3'):
++command += '-3'
+ try:
+ _execvp(command, sys.argv[1:])
+ except OSError as e:
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-jupyter_core/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   1 Dec 2015 22:34:59 -   1.1.1.1
+++ pkg/PLIST   18 Jan 2016 08:35:16 -
@@ -1,71 +1,76 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2015/12/01 22:34:59 edd Exp $
-bin/jupyter
-bin/jupyter-migrate
+bin/jupyter${MODPY_BIN_SUFFIX}
+bin/jupyter-migrate${MODPY_BIN_SUFFIX}
 lib/python${MODPY_VERSION}/site-packages/jupyter_core/
 
lib/python${MODPY_VERSION}/site-packages/jupyter_core-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
 lib/python${MODPY_VERSION}/site-packages/jupyter_core/__init__.py
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/jupyter_core/__main__.py
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/__main__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jupyter_core/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/jupyter_core/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jupyter_core/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc

CVS: cvs.openbsd.org: ports

[David Coppa]

CVSROOT:/cvs
Module name:ports
Changes by: dco...@cvs.openbsd.org  2016/01/18 02:50:09

Modified files:
x11/awesome: Makefile distinfo 
x11/awesome/patches: patch-awesomeConfig_cmake patch-awesome_c 
 patch-xwindow_c 
Removed files:
x11/awesome/patches: patch-common_atoms_list 
 patch-common_luaclass_c patch-common_util_h 
 patch-dbus_c patch-event_c 
 patch-globalconf_h 
 patch-lib_awful_menu_lua_in 
 patch-lib_awful_tag_lua_in patch-luaa_c 
 patch-objects_client_c 
 patch-objects_window_c 
 patch-objects_window_h patch-screen_c 
 patch-spawn_c patch-systray_c 

Log message:
Update to awesome-3.5.7

CVS: cvs.openbsd.org: ports

[Theo Buehler]

CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2016/01/18 03:04:29

Modified files:
x11/i3 : Makefile 
x11/i3/patches : patch-src_log_c patch-src_main_c 

Log message:
Backport semarie@'s improvement of the pledge patch which is now
upstream.  i3 is now pledged unconditionally and the shmlog can
again be enabled at runtime.

ok dcoppa@

CVS: cvs.openbsd.org: ports

[David Coppa]

CVSROOT:/cvs
Module name:ports
Changes by: dco...@cvs.openbsd.org  2016/01/18 03:12:54

Modified files:
x11/hs-dbus: Makefile distinfo 

Log message:
Update to hs-dbus-0.10.12

Re: pledge(2) for the i3 window manager

[David Coppa]

On Sun, Jan 17, 2016 at 11:37 PM, Theo Buehler  wrote:
> With the help of semarie@ we managed to get an improved version of these
> patches upstream:
>
> https://github.com/i3/i3/pull/2161
>
> Many thanks also to bcook@ and landry@ for their handholding while I was
> fighting a hopeless battle with git.
>
> The current version of the patches has the flaw that
>
> $ i3-msg 'shmlog on'
>
> will trigger a pledge abort of i3.  The attached patch is semarie@'s fix
> for that problem.
>
> ok?

This is upstream now
(https://github.com/i3/i3/commit/a1d1f456a1fbf44bfa5c6a9d041023ac498b0c46)
Isn't it?
So, ok for me to commit to our port.

Thanks a lot for improving this and doing all the leg-work to have it
upstreamed!

Ciao,
David

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/01/18 10:55:09

Modified files:
mail   : Makefile 

Log message:
+rcube-dovecot_ident

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/01/18 10:54:44

Log message:
import ports/mail/rcube-dovecot_ident, ok aja

This plugin adds support to Roundcube to send the user's original IP (from
REMOTE_ADDR) to the mail server using the IMAP ID extension. Some mail 
servers
can log this instead of the web server's address. To use with Dovecot, just
enable the plugin in Roundcube's config.inc.php and add the web server's
address to "login_trusted_networks" in /etc/dovecot/dovecot.conf.

Status:

Vendor Tag: sthen
Release Tags:   sthen_20160118

N ports/mail/rcube-dovecot_ident/Makefile
N ports/mail/rcube-dovecot_ident/distinfo
N ports/mail/rcube-dovecot_ident/pkg/DESCR
N ports/mail/rcube-dovecot_ident/pkg/PLIST

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/01/18 11:09:23

Modified files:
mail/evolution : Makefile distinfo 

Log message:
Update to evolution-3.18.4.

CVS: cvs.openbsd.org: ports

[Giannis Tsaraias]

CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2016/01/18 11:08:20

Log message:
Import portgen.

OK many

Status:

Vendor Tag: tsg
Release Tags:   tsg_2016-Jan-18

N ports/infrastructure/lib/OpenBSD/PortGen/Dependency.pm
N ports/infrastructure/lib/OpenBSD/PortGen/License.pm
N ports/infrastructure/lib/OpenBSD/PortGen/Port.pm
N ports/infrastructure/lib/OpenBSD/PortGen/Utils.pm
N ports/infrastructure/lib/OpenBSD/PortGen/Port/CPAN.pm
N ports/infrastructure/lib/OpenBSD/PortGen/Port/PyPI.pm
N ports/infrastructure/lib/OpenBSD/PortGen/Port/Ruby.pm

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/01/18 11:09:45

Modified files:
mail/evolution-ews: Makefile distinfo 

Log message:
Update to evolution-ews-3.18.4.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/01/18 11:08:58

Modified files:
databases/evolution-data-server: Makefile distinfo 

Log message:
Update to evolution-data-server-3.18.4.

Re: CVS: cvs.openbsd.org: ports

[Stuart Henderson]

If you run into problems with 'edit' (or anything else failing
with syscall 200), update your kernel.

On 2016/01/17 07:13, Stuart Henderson wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   st...@cvs.openbsd.org   2016/01/17 07:13:41
> 
> Modified files:
>   mail/mutt  : Makefile 
> Added files:
>   mail/mutt/patches: patch-main_c patch-mutt_sasl_c 
>  patch-mutt_sasl_h 
> 
> Log message:
> Add an initial pledge to mutt, from tb@. Tested so far with slang/normal,
> gpgme/normal, sasl/normal, headercache on/off, and with imap/mbox/maildir.
> 
> As you'd expect with a program like this that has many configuration
> options, including at runtime, the pledge is rather wide. But even so,
> a wide pledge still prevents many system calls, and restricts use of
> others.
> 
> Committing early to make it easier for people to test. Please do so,
> especially if you have an unusual configuration. If you run into problems,
> please obtain a ktrace and report back to tb@ and myself with a description,
> the last page or so of kdump output, and preferably a backtrace. Thanks!

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/01/18 05:10:51

Modified files:
net/samba  : Makefile 

Log message:
bump tevent

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/01/18 04:43:26

Modified files:
x11/kde/admin3 : Makefile 

Log message:
properly bump

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/01/18 05:50:52

Modified files:
x11/gnome/latexila: Makefile 
x11/gnome/latexila/patches: patch-configure_ac 
patch-src_document_view_vala 
patch-src_preferences_dialog_vala 
Added files:
x11/gnome/latexila/patches: patch-src_main_window_tools_vala 

Log message:
Unbreak after recent gspell update.

reported by sthen@

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/01/18 04:41:50

Modified files:
www/iridium: Makefile 

Log message:
properly bump

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/01/18 09:35:54

Modified files:
cad/fritzing   : Makefile 

Log message:
obviously I didn't have enough coffee yesterday -
WANTLIB should be lib/qt4/QtSerialPort not just QtSerialPort.

NEW: mail/rcube-dovecot_ident

[Stuart Henderson]

Any OKs to import this simple plugin?  Thanks.


Information for inst:rcube-dovecot_ident-2.2

Comment:
roundcube plugin: log end-user IP in Dovecot using IMAP ID

Description:
This plugin adds support to Roundcube to send the user's original IP (from
REMOTE_ADDR) to the mail server using the IMAP ID extension. Some mail servers
can log this instead of the web server's address. To use with Dovecot, just
enable the plugin in Roundcube's config.inc.php and add the web server's
address to "login_trusted_networks" in /etc/dovecot/dovecot.conf.

Maintainer: Stuart Henderson 

WWW: https://github.com/corbosman/dovecot_ident




rcube-dovecot_ident.tgz
Description: application/tar-gz

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/01/18 09:49:38

Modified files:
cad/fritzing   : Makefile 

Log message:
third time lucky: comms/qtserialport should be an LDEP not a BDEP

CVS: cvs.openbsd.org: ports

[Michael McConville]

CVSROOT:/cvs
Module name:ports
Changes by: m...@cvs.openbsd.org2016/01/18 10:03:39

Modified files:
www/sthttpd: Makefile 

Log message:
add myself as maintainer

ok sthen@

UPDATE: sysutils/bacula

[Stuart Henderson]

This looks like it should be a fairly straightforward update, but it's
nice to have extra confirmation for something like this, so any more
test reports would be welcome.

So far I've tested with 7.4.0 SD/DIR with manually triggered backup
and restore with 7.2.0 and 7.4.0 FDs (connecting using TLS) with a
postgresql db.

Selected excerpts from the changelog:

- Add "Expires in" to list and llist volumes
- Implement a more efficient Volume selection algorithm between DIR and SD
- Implement MaxVirtualFullInterval
- Implement VirtualFullPool override
- Pool overrides work better
- Automatic selection of catalog from client where possible.



Index: Makefile
===
RCS file: /cvs/ports/sysutils/bacula/Makefile,v
retrieving revision 1.93
diff -u -p -r1.93 Makefile
--- Makefile29 Nov 2015 15:50:20 -  1.93
+++ Makefile18 Jan 2016 16:52:54 -
@@ -12,7 +12,7 @@ COMMENT-mysql=Bacula libbaccats suppor
 COMMENT-pgsql= Bacula libbaccats support for PostgreSQL
 COMMENT-sqlite3=   Bacula libbaccats support for SQLite3
 
-V= 7.2.0
+V= 7.4.0
 DISTNAME=  bacula-$V
 PKGNAME-main=  bacula-client-$V
 PKGNAME-server=bacula-server-$V
@@ -20,8 +20,6 @@ PKGNAME-bat=  bacula-bat-$V
 PKGNAME-mysql= bacula-mysql-$V
 PKGNAME-pgsql= bacula-pgsql-$V
 PKGNAME-sqlite3=   bacula-sqlite3-$V
-
-REVISION=  1
 
 CATEGORIES=sysutils
 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/bacula/distinfo,v
retrieving revision 1.21
diff -u -p -r1.21 distinfo
--- distinfo15 Aug 2015 07:50:02 -  1.21
+++ distinfo18 Jan 2016 16:52:54 -
@@ -1,2 +1,2 @@
-SHA256 (bacula-7.2.0.tar.gz) = gYYG/mnFDDyiG5HmCdSsbKCOQYlBm4nT7C6ByMA4nhw=
-SIZE (bacula-7.2.0.tar.gz) = 3301720
+SHA256 (bacula-7.4.0.tar.gz) = /oULeDUj7bGftNv6jER1LSCVUSG3GlKwdAqedlv9c8s=
+SIZE (bacula-7.4.0.tar.gz) = 3314218
Index: patches/patch-configure
===
RCS file: /cvs/ports/sysutils/bacula/patches/patch-configure,v
retrieving revision 1.17
diff -u -p -r1.17 patch-configure
--- patches/patch-configure 15 Aug 2015 07:50:02 -  1.17
+++ patches/patch-configure 18 Jan 2016 16:52:54 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-configure,v 1.17 2015/08/15 07:50:02 ajacoutot Exp $
 configure.orig Thu Aug 13 15:52:24 2015
-+++ configure  Fri Aug 14 10:16:41 2015
-@@ -4802,7 +4802,7 @@ $as_echo "no" >&6; }
+--- configure.orig Fri Jan 15 16:57:18 2016
 configure  Mon Jan 18 13:07:24 2016
+@@ -4808,7 +4808,7 @@ $as_echo "no" >&6; }
  fi
  
  
@@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.17 2015/08
 as_fn_error $? "Unable to find C++ compiler" "$LINENO" 5
  fi
  
-@@ -16693,7 +16693,7 @@ if test x$use_libtool != xno; then
+@@ -16699,7 +16699,7 @@ if test x$use_libtool != xno; then
 LIBTOOL_INSTALL_TARGET="libtool-install"
 LIBTOOL_UNINSTALL_TARGET="libtool-uninstall"
 LIBTOOL_CLEAN_TARGET="libtool-clean"
@@ -19,7 +19,7 @@ $OpenBSD: patch-configure,v 1.17 2015/08
 FD_PLUGIN_DIR="src/plugins/fd"
 have_plugins=yes
  else
-@@ -22331,7 +22331,7 @@ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+@@ -22362,7 +22362,7 @@ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
  
  $as_echo "#define HAVE_READLINE 1" >>confdefs.h
  
@@ -28,7 +28,7 @@ $OpenBSD: patch-configure,v 1.17 2015/08
got_readline="yes"
  
  else
-@@ -22370,7 +22370,7 @@ $as_echo "#define HAVE_READLINE 1" >>confdefs.h
+@@ -22401,7 +22401,7 @@ $as_echo "#define HAVE_READLINE 1" >>confdefs.h
  
got_readline="yes"
CONS_INC="-I${TOP_DIR}/depkgs/readline"
@@ -37,7 +37,7 @@ $OpenBSD: patch-configure,v 1.17 2015/08
CONS_LDFLAGS="-L${TOP_DIR}/depkgs/readline"
PRTREADLINE_SRC="${TOP_DIR}/depkgs/readline"
  
-@@ -30669,6 +30669,7 @@ netbsd)
+@@ -30714,6 +30714,7 @@ netbsd)
 DISTVER=`uname -a |awk '{print $3}'`
 lld="qd"
 llu="qu"
@@ -45,7 +45,7 @@ $OpenBSD: patch-configure,v 1.17 2015/08
 TAPEDRIVE="/dev/nrst0"
 PSCMD="ps -ax -o pid,command"
 PTHREAD_LIB="-pthread"
-@@ -30687,6 +30688,7 @@ openbsd)
+@@ -30732,6 +30733,7 @@ openbsd)
 platforms/openbsd/bacula-fd \
 platforms/openbsd/bacula-sd \
 platforms/openbsd/bacula-dir"
Index: patches/patch-src_dird_bacula-dir_conf_in
===
RCS file: /cvs/ports/sysutils/bacula/patches/patch-src_dird_bacula-dir_conf_in,v
retrieving revision 1.10
diff -u -p -r1.10 patch-src_dird_bacula-dir_conf_in
--- patches/patch-src_dird_bacula-dir_conf_in   14 Aug 2014 06:52:59 -  
1.10
+++ patches/patch-src_dird_bacula-dir_conf_in   18 Jan 2016 16:52:54 -
@@ -1,7 

CVS: cvs.openbsd.org: ports

[Giannis Tsaraias]

CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2016/01/18 12:01:02

Added files:
infrastructure/man/man1: portgen.1 
infrastructure/bin: portgen 

Log message:
Import portgen.

OK many

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/01/18 17:20:59

Modified files:
multimedia/get_iplayer: Makefile distinfo 
multimedia/get_iplayer/patches: patch-get_iplayer 

Log message:
update to newer get_iplayer snapshot

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/01/18 18:14:51

Modified files:
mail/rspamd: Makefile distinfo 
mail/rspamd/patches: patch-CMakeLists_txt 
 patch-src_CMakeLists_txt 
 patch-src_client_CMakeLists_txt 
 patch-src_rspamadm_CMakeLists_txt 
mail/rspamd/pkg: PLIST 

Log message:
update to rspamd 1.1.0, from Brad.

CVS: cvs.openbsd.org: ports

[Anthony J . Bentley]

CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2016/01/18 18:50:47

Log message:
Import apertium-cat-0.1.1.

ok jasper@

Status:

Vendor Tag: bentley
Release Tags:   bentley_20160118

N ports/textproc/apertium-dicts/cat/Makefile
N ports/textproc/apertium-dicts/cat/distinfo
N ports/textproc/apertium-dicts/cat/pkg/DESCR
N ports/textproc/apertium-dicts/cat/pkg/PLIST

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Anthony J . Bentley]

CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2016/01/18 18:51:59

Log message:
Import apertium-spa-0.1.0.

ok jasper@

Status:

Vendor Tag: bentley
Release Tags:   bentley_20160118

N ports/textproc/apertium-dicts/spa/Makefile
N ports/textproc/apertium-dicts/spa/distinfo
N ports/textproc/apertium-dicts/spa/pkg/DESCR
N ports/textproc/apertium-dicts/spa/pkg/PLIST

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Anthony J . Bentley]

CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2016/01/18 18:53:04

Log message:
Import apertium-arg-cat-0.1.0.

ok jasper@

Status:

Vendor Tag: bentley
Release Tags:   bentley_20160118

N ports/textproc/apertium-dicts/arg-cat/Makefile
N ports/textproc/apertium-dicts/arg-cat/distinfo
N ports/textproc/apertium-dicts/arg-cat/pkg/DESCR
N ports/textproc/apertium-dicts/arg-cat/pkg/PLIST

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Anthony J . Bentley]

CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2016/01/18 19:03:40

Removed files:
textproc/apertium-dicts/es-an: Makefile distinfo 
textproc/apertium-dicts/es-an/pkg: DESCR PLIST 
textproc/apertium-dicts/nn-nb: Makefile distinfo 
textproc/apertium-dicts/nn-nb/pkg: DESCR PLIST 

Log message:
Remove superseded ports apertium-es-an and apertium-nn-nb.

CVS: cvs.openbsd.org: ports

[Anthony J . Bentley]

CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2016/01/18 18:49:38

Log message:
Import apertium-arg-0.1.1.

ok jasper@

Status:

Vendor Tag: bentley
Release Tags:   bentley_20160118

N ports/textproc/apertium-dicts/arg/Makefile
N ports/textproc/apertium-dicts/arg/distinfo
N ports/textproc/apertium-dicts/arg/pkg/DESCR
N ports/textproc/apertium-dicts/arg/pkg/PLIST

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Anthony J . Bentley]

CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2016/01/18 18:54:39

Log message:
Import apertium-spa-arg-0.4.0.

ok jasper@

Status:

Vendor Tag: bentley
Release Tags:   bentley_20160118

N ports/textproc/apertium-dicts/spa-arg/Makefile
N ports/textproc/apertium-dicts/spa-arg/distinfo
N ports/textproc/apertium-dicts/spa-arg/pkg/DESCR
N ports/textproc/apertium-dicts/spa-arg/pkg/PLIST

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Anthony J . Bentley]

CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2016/01/18 18:56:29

Log message:
Import apertium-nno-nob-1.0.1.

ok jasper@

Status:

Vendor Tag: bentley
Release Tags:   bentley_20160118

N ports/textproc/apertium-dicts/nno-nob/Makefile
N ports/textproc/apertium-dicts/nno-nob/distinfo
N ports/textproc/apertium-dicts/nno-nob/pkg/DESCR
N ports/textproc/apertium-dicts/nno-nob/pkg/PLIST

No conflicts created by this import

update: sysutils/cfengine

[Rodrigo Mosconi]

Hi!

This updates sysutils/cfengine to 3.7.3.

The users promise is not enabled, because it require some PAM interface. I
didn`t looked what need, and if has a "PAM wrapper"

Comments, OK?


cfengine.tgz
Description: GNU Zip compressed data

CVS: cvs.openbsd.org: ports

[Anthony J . Bentley]

CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2016/01/18 19:00:21

Modified files:
devel/quirks   : Makefile 
devel/quirks/files: Quirks.pm 

Log message:
apertium-nn-nb -> apertium-nno-nob, apertium-es-an -> apertium-spa-arg

corrections + ok jasper@

CVS: cvs.openbsd.org: ports

[Anthony J . Bentley]

CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2016/01/18 18:59:13

Modified files:
textproc/apertium-dicts: Makefile 

Log message:
Hook up new dictionaries.

New port: graphics/scour

[Dmitrij D. Czarkoff]

Hi!

Scour is an open-source Python script that aggressively cleans SVG files,
removing a lot of 'cruft' that certain tools or authors embed into their
documents. The goal of scour is to provide an identically rendered image
(i.e. a scoured document should have no discernable visible differences
from the original file).

I made this port because I needed a tool for making a set of SVGs files
from Inkscape and Illustrator open in both programs identically.  So far
results were good, and I even saved some space, so I'd love to keep it
around, just in case.

Comments?  OKs?

-- 
Dmitrij D. Czarkoff


scour-0.32.tgz
Description: application/tar-gz

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/01/18 16:42:53

Modified files:
x11/kde/base3  : Makefile 

Log message:
typo; Iexmath->IexMath

CVS: cvs.openbsd.org: ports

[Anthony J . Bentley]

CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2016/01/18 20:41:18

Modified files:
textproc/apertium-dicts/en-gl: Makefile distinfo 
textproc/apertium-dicts/en-gl/patches: patch-Makefile_in 

Log message:
Update to apertium-en-gl-0.5.2.

CVS: cvs.openbsd.org: ports

[Anthony J . Bentley]

CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2016/01/18 20:41:34

Modified files:
textproc/apertium-dicts/es-gl: Makefile distinfo 
textproc/apertium-dicts/es-gl/patches: patch-Makefile_in 

Log message:
Update to apertium-es-gl-1.0.8.

CVS: cvs.openbsd.org: ports

[Anthony J . Bentley]

CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2016/01/18 20:41:50

Modified files:
textproc/apertium-dicts/fr-ca: Makefile distinfo 
textproc/apertium-dicts/fr-ca/patches: patch-Makefile_in 

Log message:
Update to apertium-fr-ca-1.0.3.

CVS: cvs.openbsd.org: ports

[Anthony J . Bentley]

CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2016/01/18 20:42:06

Modified files:
textproc/apertium-dicts/sv-da: Makefile distinfo 

Log message:
Update to apertium-sv-da-0.5.1.

Re: CVS: cvs.openbsd.org: ports

[Nigel Taylor]

On 01/18/16 22:48, Nigel Taylor wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   ni...@cvs.openbsd.org   2016/01/18 15:48:06
> 
> Modified files:
>   www/p5-Plack   : Makefile distinfo 
>   www/p5-Plack/pkg: PLIST 
> 
> Log message:
> Maintainer update p5-Plack to 1.0039
> 
> Ok sthen@
> 
> 
sthen@ didn't ok this, included in error. I had built
and tested and Ok'd the maintainer's update.

This was holding up making updates to p5-Dancer2 which
requires version 1.0035 or later.

CVS: cvs.openbsd.org: ports

[Anthony J . Bentley]

CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2016/01/18 19:47:14

Modified files:
textproc/apertium-dicts: Makefile 

Log message:
+apertium-cat

CVS: cvs.openbsd.org: ports

[Anthony J . Bentley]

CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2016/01/18 20:03:21

Modified files:
textproc/apertium: Makefile 
textproc/apertium-lex-tools: Makefile 
textproc/apertium-dicts: Makefile.inc 
textproc/apertium-dicts/af-nl: Makefile 
textproc/apertium-dicts/br-fr: Makefile 
textproc/apertium-dicts/ca-it: Makefile 
textproc/apertium-dicts/cy-en: Makefile 
textproc/apertium-dicts/dan: Makefile 
textproc/apertium-dicts/dan-nor: Makefile 
textproc/apertium-dicts/en-ca: Makefile 
textproc/apertium-dicts/en-es: Makefile 
textproc/apertium-dicts/en-gl: Makefile 
textproc/apertium-dicts/eo-ca: Makefile 
textproc/apertium-dicts/eo-en: Makefile 
textproc/apertium-dicts/eo-es: Makefile 
textproc/apertium-dicts/eo-fr: Makefile 
textproc/apertium-dicts/es-ast: Makefile 
textproc/apertium-dicts/es-ca: Makefile 
textproc/apertium-dicts/es-gl: Makefile 
textproc/apertium-dicts/es-pt: Makefile 
textproc/apertium-dicts/es-ro: Makefile 
textproc/apertium-dicts/eu-en: Makefile 
textproc/apertium-dicts/eu-es: Makefile 
textproc/apertium-dicts/fr-ca: Makefile 
textproc/apertium-dicts/fr-es: Makefile 
textproc/apertium-dicts/hbs: Makefile 
textproc/apertium-dicts/hbs-eng: Makefile 
textproc/apertium-dicts/hbs-slv: Makefile 
textproc/apertium-dicts/hin: Makefile 
textproc/apertium-dicts/ht-en: Makefile 
textproc/apertium-dicts/id-ms: Makefile 
textproc/apertium-dicts/is-en: Makefile 
textproc/apertium-dicts/is-sv: Makefile 
textproc/apertium-dicts/mk-bg: Makefile 
textproc/apertium-dicts/mk-en: Makefile 
textproc/apertium-dicts/mlt-ara: Makefile 
textproc/apertium-dicts/nno: Makefile 
textproc/apertium-dicts/nob: Makefile 
textproc/apertium-dicts/nob/pkg: DESCR 
textproc/apertium-dicts/oc-ca: Makefile 
textproc/apertium-dicts/oc-es: Makefile 
textproc/apertium-dicts/pt-ca: Makefile 
textproc/apertium-dicts/pt-gl: Makefile 
textproc/apertium-dicts/sv-da: Makefile 
textproc/apertium-dicts/urd: Makefile 
textproc/apertium-dicts/urd-hin: Makefile 
textproc/lttoolbox: Makefile 

Log message:
Take maintainership.

CVS: cvs.openbsd.org: ports

[Sebastien Marie]

CVSROOT:/cvs
Module name:ports
Changes by: sema...@cvs.openbsd.org 2016/01/18 22:20:51

Modified files:
textproc/mupdf : Makefile 
Added files:
textproc/mupdf/patches: patch-platform_gl_gl-main_c 
patch-platform_x11_jstest_main_c 
patch-platform_x11_x11_main_c 
patch-source_tools_mudraw_c 
patch-source_tools_pdfclean_c 
patch-source_tools_pdfextract_c 
patch-source_tools_pdfinfo_c 
patch-source_tools_pdfpages_c 
patch-source_tools_pdfposter_c 
patch-source_tools_pdfshow_c 

Log message:
add pledge(2) to textproc/mupdf

OK sthen@

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/01/18 23:54:59

Modified files:
print/cups-filters: Makefile distinfo 

Log message:
Update to cups-filters-1.7.0.

Re: UPDATE: devel/doxygen 1.8.2 -> 1.8.10

[Rafael Sadowski]

On Thu Dec 10, 2015 at 10:24:35PM +, Stuart Henderson wrote:
> On 2015/12/10 22:39, Rafael Sadowski wrote:
> > On Thu Dec 10, 2015 at 10:01:46AM +, Stuart Henderson wrote:
> > > On 2015/12/09 19:09, Jérémie Courrèges-Anglas wrote:
> > > > >> - Don't use own libmd5 but base md5
> > > > >> - Use MD5Data() instead of MD5Buffer+MD5SigToString
> > > > 
> > > > What is the point with those two items?  This adds clutter to this
> > > > update and possible problems for the following ones.
> > > 
> > > These changes are exactly why I, for one, didn't dig into the update yet.
> > 
> > Of course I understand you but I don't like to use doxygen own libmd5.
> > md5(3) is in base and MD5Data is doing the same as MD5Buffer+MD5SigToString.
> > 
> > I've learned[1] to use base and ports libs and not own shipped libs if it
> > is possible.
> > 
> > [1]: https://www.marc.info/?l=openbsd-ports=142177625024026=4
> 
> That's a different situation, in that case they are bundling entire
> libraries which we already have in ports. That's usually bad because
> when some bug is fixed in the library, it doesn't then get fixed in
> the embedded versions of that library.
> 
> > It's okay for me to remove the patches and test agine.
> > 
> > Cheers,
> > 
> > Rafael
> > 

A little bit late but this monster needs time to test.

Changes between the old diff:

- direct update to the last stable version 1.8.11 (not 1.8.10)
- without libmd5 changes

My 1.8.11 ninja patches accepted and committed upstream.

I hope it's okay, now.

Best regards,

Rafael Sadowski


Index: audio/libnjb/Makefile
===
RCS file: /cvs/ports/audio/libnjb/Makefile,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 Makefile
--- audio/libnjb/Makefile   2 May 2015 20:53:18 -   1.12
+++ audio/libnjb/Makefile   18 Jan 2016 19:40:29 -
@@ -3,6 +3,7 @@
 COMMENT=   communicate with some Creative and Dell audio players
 
 DISTNAME=  libnjb-2.2.7
+REVISION=  0
 CATEGORIES=audio devel
 
 SHARED_LIBS +=  njb  0.0  # 6.1
Index: audio/libnjb/pkg/PLIST
===
RCS file: /cvs/ports/audio/libnjb/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- audio/libnjb/pkg/PLIST  2 May 2015 20:53:18 -   1.3
+++ audio/libnjb/pkg/PLIST  18 Jan 2016 19:40:29 -
@@ -29,6 +29,8 @@ lib/pkgconfig/libnjb.pc
 share/doc/libnjb/
 share/doc/libnjb/html/
 share/doc/libnjb/html/annotated.html
+share/doc/libnjb/html/arrowdown.png
+share/doc/libnjb/html/arrowright.png
 share/doc/libnjb/html/base_8c.html
 share/doc/libnjb/html/base_8h_source.html
 share/doc/libnjb/html/bc_s.png
@@ -44,6 +46,7 @@ share/doc/libnjb/html/defs_8h_source.htm
 share/doc/libnjb/html/delfile_8c-example.html
 share/doc/libnjb/html/deltr_8c-example.html
 share/doc/libnjb/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html
+share/doc/libnjb/html/doc.png
 share/doc/libnjb/html/doxygen.css
 share/doc/libnjb/html/doxygen.png
 share/doc/libnjb/html/dumpeax_8c-example.html
@@ -55,22 +58,8 @@ share/doc/libnjb/html/examples.html
 share/doc/libnjb/html/examples_8h_source.html
 share/doc/libnjb/html/files.html
 share/doc/libnjb/html/files_8c-example.html
-share/doc/libnjb/html/ftv2blank.png
-share/doc/libnjb/html/ftv2cl.png
-share/doc/libnjb/html/ftv2doc.png
-share/doc/libnjb/html/ftv2folderclosed.png
-share/doc/libnjb/html/ftv2folderopen.png
-share/doc/libnjb/html/ftv2lastnode.png
-share/doc/libnjb/html/ftv2link.png
-share/doc/libnjb/html/ftv2mlastnode.png
-share/doc/libnjb/html/ftv2mnode.png
-share/doc/libnjb/html/ftv2mo.png
-share/doc/libnjb/html/ftv2node.png
-share/doc/libnjb/html/ftv2ns.png
-share/doc/libnjb/html/ftv2plastnode.png
-share/doc/libnjb/html/ftv2pnode.png
-share/doc/libnjb/html/ftv2splitbar.png
-share/doc/libnjb/html/ftv2vertline.png
+share/doc/libnjb/html/folderclosed.png
+share/doc/libnjb/html/folderopen.png
 share/doc/libnjb/html/functions.html
 share/doc/libnjb/html/functions_vars.html
 share/doc/libnjb/html/fwupgrade_8c-example.html
@@ -79,32 +68,32 @@ share/doc/libnjb/html/getowner_8c-exampl
 share/doc/libnjb/html/gettr_8c-example.html
 share/doc/libnjb/html/getusage_8c-example.html
 share/doc/libnjb/html/globals.html
-share/doc/libnjb/html/globals_0x64.html
-share/doc/libnjb/html/globals_0x65.html
-share/doc/libnjb/html/globals_0x66.html
-share/doc/libnjb/html/globals_0x67.html
-share/doc/libnjb/html/globals_0x6c.html
-share/doc/libnjb/html/globals_0x6d.html
-share/doc/libnjb/html/globals_0x6e.html
-share/doc/libnjb/html/globals_0x6f.html
-share/doc/libnjb/html/globals_0x70.html
-share/doc/libnjb/html/globals_0x73.html
-share/doc/libnjb/html/globals_0x74.html
-share/doc/libnjb/html/globals_0x75.html
+share/doc/libnjb/html/globals_d.html
 share/doc/libnjb/html/globals_defs.html
+share/doc/libnjb/html/globals_e.html
 share/doc/libnjb/html/globals_enum.html

Re: NEW: sysutils/duply

[viq]

On Sun, 2016-01-17 at 13:50 +0100, Adam Wolk wrote:
> On Sat, 09 Jan 2016 23:36:25 +0100
> viq  wrote:
> 
> > $ cat duply/pkg/DESCR 
> > Duply is a shell front end for the duplicity backup tool.
> > It greatly simplifies its usage by implementing backup
> > job profiles, batch commands and more. Who says secure
> > backups on non-trusted spaces are no child's play.
> > 
> > WWW: http://duply.net
> > 
> > I've been using it on other systems, now time to have it on OpenBSD
> > as
> > well ;) Works fine for me, though I really tested only with
> > duplicity
> > 0.7.x
> > 
> 
> I'm not a duplicity user (yet?) but decided to at least test your
> port
> since you already pinged 2 times and seems no one noticed yet :)

Thank you :)

> > Should I patch
> > #!/usr/bin/env bash
> > to use absolute path, or is it OK to leave as is?
> 
> I think /usr/bin/env bash is completely fine. That's a proper
> portable
> way to find an interpreter.
> 
> Why is the port using the lang/python module? I don't see any build
> systems or .egg files being produced here. Just being dependant on
> sysutils/duplicity should get you the interpreter used by duplicity.
> The port itself is a bash program calling a python program - not a
> python program.
> 
> In my opinion you can drop both:
>  - MODULES =  lang/python
>  - SUBST_VARS +=  MODPY_VERSION

Good catch. An earlier version was doing some python version detection,
so I was putting python${MODPY_VERSION} in there, but the way it's
currently there is no need for this. Removed.

> I tried the master site you mentioned in the Makefile, indeed it
> doesn't
> work with the spaces.
> 
> Tested the port on amd64 snapshot from Jan 15th. It builds and
> installs
> cleanly.

Thank you.
-- 
viq 


duply.tgz
Description: application/compressed-tar

CVS: cvs.openbsd.org: ports

[Nigel Taylor]

CVSROOT:/cvs
Module name:ports
Changes by: ni...@cvs.openbsd.org   2016/01/18 15:37:16

Log message:
New port required by p5-Plack update.

ok sthen@

Status:

Vendor Tag: nigel
Release Tags:   nigel_20160118

N ports/www/p5-Cookie-Baker/Makefile
N ports/www/p5-Cookie-Baker/distinfo
N ports/www/p5-Cookie-Baker/pkg/DESCR
N ports/www/p5-Cookie-Baker/pkg/PLIST

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Nigel Taylor]

CVSROOT:/cvs
Module name:ports
Changes by: ni...@cvs.openbsd.org   2016/01/18 15:48:06

Modified files:
www/p5-Plack   : Makefile distinfo 
www/p5-Plack/pkg: PLIST 

Log message:
Maintainer update p5-Plack to 1.0039

Ok sthen@

CVS: cvs.openbsd.org: ports

[Nigel Taylor]

CVSROOT:/cvs
Module name:ports
Changes by: ni...@cvs.openbsd.org   2016/01/18 15:19:27

Log message:
New port require by p5-Plack update.

Ok sthen@

Status:

Vendor Tag: nigel
Release Tags:   nigel_20160118

U ports/devel/p5-Test-Time/Makefile
U ports/devel/p5-Test-Time/distinfo
U ports/devel/p5-Test-Time/pkg/DESCR
U ports/devel/p5-Test-Time/pkg/PLIST

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Nigel Taylor]

CVSROOT:/cvs
Module name:ports
Changes by: ni...@cvs.openbsd.org   2016/01/18 15:42:12

Modified files:
www: Makefile 

Log message:
link in p5-Cookie-Baker

CVS: cvs.openbsd.org: ports

[Nigel Taylor]

CVSROOT:/cvs
Module name:ports
Changes by: ni...@cvs.openbsd.org   2016/01/18 15:15:21

Log message:
New port required by p5-Plack

Ok sthen@

Status:

Vendor Tag: nigel
Release Tags:   nigel_20160118

N ports/devel/p5-Test-Time/Makefile
N ports/devel/p5-Test-Time/distinfo
N ports/devel/p5-Test-Time/pkg/DESCR
N ports/devel/p5-Test-Time/pkg/PLIST

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Dmitrij Czarkoff]

CVSROOT:/cvs
Module name:ports
Changes by: czark...@cvs.openbsd.org2016/01/18 14:58:52

Modified files:
devel/py-hg-git: Makefile distinfo 
Removed files:
devel/py-hg-git/patches: patch-hggit__ssh_py 

Log message:
update to py-hg-git-0.8.4

Also, update website and change workaround for weird auto-generated directory
name in archives from bitbucket.

OK sthen@

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/01/18 15:00:10

Modified files:
x11/gnome/dictionary: Makefile distinfo 
x11/gnome/dictionary/pkg: PLIST 

Log message:
Update to gnome-dictionary-3.18.1.

Re: UPDATE: www/p5-Plack to 1.0039

[Abel Abraham Camarillo Ojeda]

On Thu, Jan 14, 2016 at 8:41 AM, Cesare Gargano  wrote:
> Attached updated diff.
>
> On Wed, Jan 13, 2016 at 2:04 PM, Stuart Henderson  wrote:
>>
>> On 2016/01/13 06:57, Abel Abraham Camarillo Ojeda wrote:
>> > I think you should get dependencies commited independently, so
>> > this would go in easier
>>
>> OK for p5-Test-Time.
>>
>> p5-Cookie-Baker should have p5-URI in TEST_DEPENDS as well shouldn't it?
>>
>

Anyone can help committing p5-Test-Time?

so we can move forward with the p5-plack update?

thanks

CVS: cvs.openbsd.org: ports

[Dmitrij Czarkoff]

CVSROOT:/cvs
Module name:ports
Changes by: czark...@cvs.openbsd.org2016/01/18 15:32:12

Modified files:
www/surf2  : Makefile distinfo 
www/surf2/patches: patch-config_def_h patch-surf_1 

Log message:
update to surf2 as of 2015-12-01

* use my own github mirror instead of spacehopper.org
* download to ${XDG_DOWNLOAD_DIR} instead of current directory
* some minor fixes

OK sthen@

Fix: www/wml build segfault

[Christian Weisgerber]

Package builders know that www/wml occasionally fails to build
because...

Making all in doc
../src/mp4h -X 0 -I . -D srcdir="." -D format=pod ./mp4h.mp4h  | sed -e 
's/_LT_//g' > mp4h.pod
Segmentation fault (core dumped) 

I've finally tracked this down.  mp4h includes a 15-year-old copy
of ltdl.c (from GNU ltdl, part of libtool).  According to the
authors, "realloc is not entirely portable" and they provide a
replacement function that uses malloc() and free() as primitives.
This can't possibly work.  Something like

new = realloc(old, size);

results in an internal call

memcpy(new, old, size);

If realloc() is used to enlarge an object, memcpy() will read memory
outside the old object and sometimes step on a mine.

Fix: Skip the broken replacement function and just use libc realloc().


Index: Makefile
===
RCS file: /cvs/ports/www/wml/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- Makefile24 Mar 2014 07:47:23 -  1.19
+++ Makefile18 Jan 2016 22:07:53 -
@@ -3,7 +3,7 @@
 COMMENT=   Website META Language: off-line HTML generation toolkit
 
 DISTNAME=  wml-2.0.11
-REVISION=  7
+REVISION=  8
 CATEGORIES=www
 
 HOMEPAGE=  http://www.thewml.org/
Index: patches/patch-wml_backend_p2_mp4h_src_ltdl_c
===
RCS file: patches/patch-wml_backend_p2_mp4h_src_ltdl_c
diff -N patches/patch-wml_backend_p2_mp4h_src_ltdl_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-wml_backend_p2_mp4h_src_ltdl_c18 Jan 2016 22:07:53 
-
@@ -0,0 +1,25 @@
+$OpenBSD$
+
+Use libc realloc() because rpl_realloc() is broken: It tries to copy
+new size number of bytes.
+
+--- wml_backend/p2_mp4h/src/ltdl.c.origThu Dec  1 18:50:13 2005
 wml_backend/p2_mp4h/src/ltdl.c Mon Jan 18 22:47:05 2016
+@@ -164,7 +164,7 @@ static lt_ptr rpl_realloc  LT_PARAMS((lt_ptr ptr, size_
+ LT_GLOBAL_DATA lt_ptr (*lt_dlmalloc)  LT_PARAMS((size_t size))
+   = (lt_ptr (*) LT_PARAMS((size_t))) malloc;
+ LT_GLOBAL_DATA lt_ptr (*lt_dlrealloc) LT_PARAMS((lt_ptr ptr, size_t size))
+-  = (lt_ptr (*) LT_PARAMS((lt_ptr, size_t))) rpl_realloc;
++  = (lt_ptr (*) LT_PARAMS((lt_ptr, size_t))) realloc;
+ LT_GLOBAL_DATA void   (*lt_dlfree)LT_PARAMS((lt_ptr ptr))
+   = (void (*) LT_PARAMS((lt_ptr))) free;
+ 
+@@ -183,7 +183,7 @@ LT_GLOBAL_DATA void   (*lt_dlfree) LT_PARAMS((lt_ptr p
+ #else
+ 
+ #define LT_DLMALLOC(tp, n)((tp *) lt_dlmalloc ((n) * sizeof(tp)))
+-#define LT_DLREALLOC(tp, p, n)((tp *) rpl_realloc ((p), (n) * 
sizeof(tp)))
++#define LT_DLREALLOC(tp, p, n)((tp *) lt_dlrealloc ((p), (n) * 
sizeof(tp)))
+ #define LT_DLFREE(p)  \
+   LT_STMT_START { if (p) (p) = (lt_dlfree (p), (lt_ptr) 0); } LT_STMT_END
+ 
-- 
Christian "naddy" Weisgerber  na...@mips.inka.de

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/01/18 15:30:44

Modified files:
net/netatalk3  : Makefile 
Added files:
net/netatalk3/patches: patch-libatalk_dsi_dsi_tcp_c 

Log message:
In the last update netatalk3 changed behaviour to listening on :: rather
than 0.0.0.0 by default. This isn't good on OpenBSD which deliberately
doesn't allow IPv4 connections on an IPv6 socket so revert that change.

Failure reported and fix tested by Johan Huldtgren, ok aja@

CVS: cvs.openbsd.org: ports

[Nigel Taylor]

CVSROOT:/cvs
Module name:ports
Changes by: ni...@cvs.openbsd.org   2016/01/18 15:32:25

Modified files:
devel  : Makefile 

Log message:
Link p5-Test-Time