CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2018/01/27 00:53:50

Modified files:
www/mozilla-firefox: Makefile 

Log message:
Pass --disable-debug-symbols to CONFIGURE_ARGS on i386, removes -C
debuginfo=2 from rust build flags and allows me to build firefox on i386
with recent rust. Somehow i had it locally but never commited it..

Re: [update] lang/rust 1.23

[Landry Breuil]

On Fri, Jan 26, 2018 at 06:10:43AM +0100, Landry Breuil wrote:
> On Thu, Jan 25, 2018 at 05:27:16PM +0100, Sebastien Marie wrote:
> > Hi,
> > 
> > The following diff updates lang/rust to 1.23 (released since approx 3
> > weeks).
> > 
> > I was still able to build it on i386 (but with effort), so I keep it
> > BROKEN-i386.
> > 
> > The diff was tested on amd64:
> >   - lang/rust build+testsuite
> >   - textproc/ripgrep build+testsuite
> >   - www/mozilla-firefox build
> > 
> > I only built it on i386.
> 
> Thanks for working on this. Rust itself builds on amd64 (with ulimit -d
> 4G, 3G wasnt enough) and i386 (with ulimit -d to the max)
> 
> < Extended { stage: 2, host: "x86_64-unknown-openbsd", target: 
> "x86_64-unknown-openbsd" }
> Build completed successfully in 2:22:46
> < Extended { stage: 2, host: "i686-unknown-openbsd", target: 
> "i686-unknown-openbsd" }
> Build completed successfully in 5:47:02
> 
> firefox 59.0beta3 built fine on amd64 with that version. Will try i386
> next.

firefox 59.0beta4 built fine with this new rust on i386, once i added
--disable-debug-symbols to CONFIGURE_ARGS.

Landry

Re: [update] dunst-1.3.0

[Timo Myyrä]

Klemens Nanni  writes:

> On Fri, Jan 26, 2018 at 09:13:17AM +0200, Timo Myyrä wrote:
>> > Klemens Nanni  writes:
>> >> Paths in the example dunst.rc need to be adjusted so copying it over
>> >> will work without manually fixing them.
> Yuck, I forgot to include those in my earlier diff, sorry.
>
>> Here is an updated diff to include patching the dunstrc file and pod doc.
> Except for a few nits below this diff looks good to me.
>
>> Index: Makefile
>> ===
>> RCS file: /cvs/ports/x11/dunst/Makefile,v
>> retrieving revision 1.3
>> diff -u -p -r1.3 Makefile
>> --- Makefile 31 Aug 2017 20:57:00 -  1.3
>> +++ Makefile 26 Jan 2018 07:11:14 -
>> @@ -29,11 +27,13 @@ LIB_DEPENDS +=  devel/gettext \
> There are two spaces after += instead of a tab.
>
>>  devel/pango \
>>  graphics/cairo \
>>  graphics/gdk-pixbuf2 \
>> -x11/gtk+2 \
>>  x11/libxdg-basedir \
>>  x11/dbus
> I'd still move dbus up to sort them alphabetically as done in my earlier
> diff.
>
>>  MAKE_FLAGS =V=1 PREFIX="${PREFIX}" MANPREFIX="${PREFIX}/man"
> Not a big fan of those squashed ones, they're better readable across
> multiple lines as done for *_DEPENDS (also makes future diffs easier).

Ok, here's revised diff:

Index: Makefile
===
RCS file: /cvs/ports/x11/dunst/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile31 Aug 2017 20:57:00 -  1.3
+++ Makefile27 Jan 2018 06:53:05 -
@@ -4,36 +4,38 @@ COMMENT=  customizable and lightweight no
 
 GH_ACCOUNT =   dunst-project
 GH_PROJECT =   dunst
-GH_TAGNAME =   v1.2.0
+GH_TAGNAME =   v1.3.0
 
 CATEGORIES =   x11
 
 HOMEPAGE=  https://dunst-project.org/
 
-MAINTAINER =   Timo Myyra 
+MAINTAINER =   Timo Myyra 
 
 # BSD
 PERMIT_PACKAGE_CDROM=  Yes
 
 # uses pledge()
-WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
-WANTLIB += Xrandr Xrender Xss c cairo dbus-1 fontconfig freetype
-WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
-WANTLIB += intl m pango-1.0 pangocairo-1.0 pthread xdg-basedir
-WANTLIB += z
+WANTLIB += X11 Xinerama Xrandr Xss c cairo dbus-1 gdk_pixbuf-2.0
+WANTLIB += gio-2.0 glib-2.0 gobject-2.0 intl m pango-1.0 pangocairo-1.0
+WANTLIB += pthread xdg-basedir
 
 USE_GMAKE =Yes
 
-LIB_DEPENDS +=  devel/gettext \
+LIB_DEPENDS += devel/gettext \
devel/glib2 \
devel/pango \
graphics/cairo \
graphics/gdk-pixbuf2 \
-   x11/gtk+2 \
-   x11/libxdg-basedir \
-   x11/dbus
+   x11/dbus \
+   x11/libxdg-basedir
 
-MAKE_FLAGS =   V=1 PREFIX="${PREFIX}" MANPREFIX="${PREFIX}/man"
+MAKE_FLAGS =   V=1 \
+   PREFIX="${PREFIX}" \
+   MANPREFIX="${PREFIX}/man"
+
+pre-configure:
+   ${SUBST_CMD} ${WRKSRC}/docs/dunst.pod ${WRKSRC}/dunstrc
 
 post-install:
mv ${PREFIX}/share/dunst ${PREFIX}/share/examples/dunst
Index: distinfo
===
RCS file: /cvs/ports/x11/dunst/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo31 Aug 2017 20:57:00 -  1.2
+++ distinfo27 Jan 2018 06:53:05 -
@@ -1,2 +1,2 @@
-SHA256 (dunst-1.2.0.tar.gz) = o8BbXvh+iHBKYgcjbkJ3PfvPUMsjx89R5JSnI2t1xa0=
-SIZE (dunst-1.2.0.tar.gz) = 110628
+SHA256 (dunst-1.3.0.tar.gz) = dMCxFlz3qccfVivZdpeXBSjq5iXTTIcU+LmVG9XKW+Y=
+SIZE (dunst-1.3.0.tar.gz) = 121499
Index: patches/patch-config_mk
===
RCS file: /cvs/ports/x11/dunst/patches/patch-config_mk,v
retrieving revision 1.2
diff -u -p -r1.2 patch-config_mk
--- patches/patch-config_mk 31 Aug 2017 20:57:00 -  1.2
+++ patches/patch-config_mk 27 Jan 2018 06:53:05 -
@@ -2,12 +2,12 @@ $OpenBSD: patch-config_mk,v 1.2 2017/08/
 Index: config.mk
 --- config.mk.orig
 +++ config.mk
-@@ -28,7 +28,7 @@ endif
+@@ -12,7 +12,7 @@ MANPREFIX = ${PREFIX}/share/man
  
  # flags
  CPPFLAGS += -D_DEFAULT_SOURCE -DVERSION=\"${VERSION}\"
 -CFLAGS   += -g --std=gnu99 -pedantic -Wall -Wno-overlength-strings -Os 
${STATIC} ${CPPFLAGS}
 +CFLAGS   += -g --std=gnu99 -pedantic -Wall -Wno-overlength-strings ${STATIC} 
${CPPFLAGS}
+ LDFLAGS  += -lm -L${X11LIB}
  
- pkg_config_packs := dbus-1 x11 xscrnsaver \
- "glib-2.0 >= 2.36" gio-2.0 \
+ CPPFLAGS_DEBUG := -DDEBUG_BUILD
Index: patches/patch-docs_dunst_pod
===
RCS file: patches/patch-docs_dunst_pod
diff -N patches/patch-docs_dunst_pod
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-docs_dunst_pod27 Jan 2018 06:53:05 -
@@ -0,0 +1,38 @@
+$OpenBSD$
+
+Index: 

CVS: cvs.openbsd.org: ports

[Brian Callahan]

CVSROOT:/cvs
Module name:ports
Changes by: bcal...@cvs.openbsd.org 2018/01/26 21:42:03

Modified files:
games/freeserf : Makefile distinfo 

Log message:
Update to freeserf-0.1.1.20180120

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2018/01/26 18:19:45

Modified files:
net/curl   : Tag: OPENBSD_6_2 Makefile 
Added files:
net/curl/patches: Tag: OPENBSD_6_2 patch-lib_http2_c 
  patch-lib_http_c patch-lib_url_c 
  patch-lib_urldata_h 

Log message:
Security fixes:
CVE-2018-105: HTTP/2 trailer out-of-bounds read
CVE-2018-107: HTTP authentication leak in redirects

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2018/01/26 17:10:59

Modified files:
net/curl   : Makefile distinfo 
net/curl/pkg   : PLIST 

Log message:
Security update to 7.58.0.  Fixes:
CVE-2018-105: HTTP/2 trailer out-of-bounds read
CVE-2018-107: HTTP authentication leak in redirects

Re: NEW: news/nzbget

[Klemens Nanni]

On Wed, Jan 24, 2018 at 07:48:50AM +0100, Björn Ketelaars wrote:
> Enclosed a new tarball which addresses, amongst others, the comments above.
Forgot in my earlier mail: Makefile is marked exectuable in both your
tarballs.

Re: NEW: news/nzbget

[Klemens Nanni]

On Wed, Jan 24, 2018 at 07:48:50AM +0100, Björn Ketelaars wrote:
> On Sat 20/01/2018 21:39, Klemens Nanni wrote:
> > On Sat, Jan 20, 2018 at 08:05:04PM +0100, Björn Ketelaars wrote:
> > > New port for NZBGet
> > > 
> > > pkg/DESCR:
> > > NZBGet is a binary newsgrabber, which downloads files from usenet based on
> > > information given in nzb-files. NZBGet is written in C++ and is known for 
> > > its
> > > extraordinary performance and efficiency.
> > > 
> > > 
> > > This port does the same thing as news/sabnzbd but is faster, lighter on
> > > resources, and has less dependencies.
> > > 
> > > I used the first free id from infrastructure/db/user.list.
> > > 
> > > Comments?
> > Looks good to me portwise except for:
> > 
> > DISTNAME is not needed as it's generated by GH_* already. But since
> > upstream provides proper release tarballs, please use DISTNAME and
> > MASTER_SITES without GH_* here.
> > 
> > HOMEPAGE has HTTPS.
> > 
> > The example nzbget.conf should probably be installed under
> > share/examples/nzget/ instead of share/nzget/ as per our porting guide.
> 
> Enclosed a new tarball which addresses, amongst others, the comments above.
> I only tested on amd64 as this platform is available to me. Is there someone
> interested in this port, and could give it a spin on a different platform?
Almost there:

PKGNAME and DISTNAME can be simplified.

Moved COMPILER up in place and added a comment for clarity.

Substituting variables should generally be done before configure to
avoid inconsistencies when configuring A but building B.

When using LOCALSTATEDIR in the example configuration, PLIST should be
tweaked accordingly for consistency reasons.

Their test target really just builds the source, so disable tests:

$ grep -C1 ^check: `mk show=WRKSRC`/Makefile.in
check-am: all-am
check: check-am
all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA) config.h

Diff ontop of your latest tarball below.

--- Makefile.orig
+++ Makefile
@@ -3,8 +3,8 @@
 COMMENT =  binary newsreader supporting NZB files
 
 VERSION =  19.1
-DISTNAME = nzbget-${VERSION}-src
-PKGNAME =  ${DISTNAME:S/-src//}
+PKGNAME =  nzbget-${VERSION}
+DISTNAME = ${PKGNAME}-src
 
 CATEGORIES =   news
 
@@ -19,6 +19,9 @@ WANTLIB = ${COMPILER_LIBCXX} c crypto curses m ssl xml
 
 MASTER_SITES = https://github.com/nzbget/nzbget/releases/download/v${VERSION}/
 
+# C++14
+COMPILER = base-clang ports-clang ports-gcc
+
 RUN_DEPENDS =  archivers/unrar \
archivers/p7zip
 LIB_DEPENDS =  textproc/libxml
@@ -31,11 +34,11 @@ CONFIGURE_STYLE =   gnu
 CONFIGURE_ARGS =   --with-libcurses-includes=/usr/include \
--with-libcurses-libraries=/usr/lib
 
+NO_TEST =  Yes
+
 WRKDIST =  ${WRKDIR}/${PKGNAME}
 
-COMPILER = base-clang ports-clang ports-gcc
-
-pre-build:
+pre-configure:
${SUBST_CMD} ${WRKSRC}/nzbget.conf
 
 .include 
--- pkg/PLIST.orig
+++ pkg/PLIST
@@ -1,6 +1,6 @@
 @comment $OpenBSD$
 @newgroup _nzbget:800
-@newuser _nzbget:800:800:daemon:NZBGet Account:/var/nzbget:/sbin/nologin
+@newuser _nzbget:800:800:daemon:NZBGet 
Account:${LOCALSTATEDIR}/nzbget:/sbin/nologin
 @bin bin/nzbget
 share/doc/nzbget/
 share/doc/nzbget/COPYING
@@ -54,4 +54,4 @@ share/nzbget/webui/util.js
 @mode 750
 @owner _nzbget
 @group _nzbget
-@sample /var/nzbget/
+@sample ${LOCALSTATEDIR}/nzbget/

Re: [Patch] Python for non wxallowed /usr/local

[Landry Breuil]

On Fri, Jan 26, 2018 at 05:36:00PM +0200, mazocomp wrote:
> Landry, if I install unpatched port, it refuses to run with "permission
> denied" error. In this case I have to forget about binary updating and
> compile this port manually.

Then you get a real reason to help fixing the actual issue, instead of
hiding it under the carpet :)

Re: [UPDATE] devel/py-xdis

[Klemens Nanni]

On Thu, Jan 25, 2018 at 11:18:38AM +0100, Remi Pointel wrote:
> this is the diff to update py-xdis to latest release.
> 
> I enabled regress tests because it works fine with python3 FLAVOR.
On amd64 py3 tests run fine but py2 throw an error, see attached log.

You're missing TEST_DEPENDS as well as py-click as RUN_DEPENDS, see
upstream's __pkginfo__.py.

Updated diff below for the dependencies, haven't dealt with the test
error yet.

Index: Makefile
===
RCS file: /cvs/ports/devel/py-xdis/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile21 May 2017 17:54:10 -  1.11
+++ Makefile26 Jan 2018 21:19:31 -
@@ -2,7 +2,7 @@
 
 COMMENT =  cross-version byte-code disassembler and marshal 
routines
 
-MODPY_EGG_VERSION =3.3.1
+MODPY_EGG_VERSION =3.6.7
 DISTNAME = xdis-${MODPY_EGG_VERSION}
 PKGNAME =  py-xdis-${MODPY_EGG_VERSION}
 CATEGORIES =   devel
@@ -19,13 +19,14 @@ MODULES =   lang/python
 MODPY_PI = Yes
 MODPY_SETUPTOOLS = Yes
 
-RUN_DEPENDS =  devel/py-six${MODPY_FLAVOR}
+RUN_DEPENDS =  devel/py-click${MODPY_FLAVOR} \
+   devel/py-six${MODPY_FLAVOR}
 BUILD_DEPENDS =devel/py-test-runner${MODPY_FLAVOR}
+TEST_DEPENDS = devel/py-six${MODPY_FLAVOR} \
+   devel/py-test${MODPY_FLAVOR}
 
 FLAVORS =  python3
 FLAVOR ?=
-
-NO_TEST =  Yes
 
 post-install:
mv ${PREFIX}/bin/pydisasm{,${MODPY_BIN_SUFFIX}}
Index: distinfo
===
RCS file: /cvs/ports/devel/py-xdis/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo21 May 2017 17:54:10 -  1.9
+++ distinfo26 Jan 2018 21:19:31 -
@@ -1,2 +1,2 @@
-SHA256 (xdis-3.3.1.tar.gz) = 1uVDkmmiq+H6caxMtnCsbfyeGKCeDErLL2RX8FQtU4M=
-SIZE (xdis-3.3.1.tar.gz) = 154152
+SHA256 (xdis-3.6.7.tar.gz) = VWfzHOT+Ap/DOfS9nIw7FkgL/TkgcxJvOby1/E9X/Fc=
+SIZE (xdis-3.6.7.tar.gz) = 169114
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-xdis/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- pkg/PLIST   26 Mar 2017 11:17:22 -  1.6
+++ pkg/PLIST   26 Jan 2018 21:19:31 -
@@ -16,6 +16,7 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/xdis/${MODPY_PYCACHE}magics.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/xdis/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/xdis/${MODPY_PYCACHE}marsh.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/xdis/${MODPY_PYCACHE}op_imports.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/xdis/${MODPY_PYCACHE}std.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/xdis/${MODPY_PYCACHE}unmarshal.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/xdis/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
@@ -34,11 +35,13 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/xdis/magics.py
 lib/python${MODPY_VERSION}/site-packages/xdis/main.py
 lib/python${MODPY_VERSION}/site-packages/xdis/marsh.py
+lib/python${MODPY_VERSION}/site-packages/xdis/op_imports.py
 lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/
 lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/__init__.py
 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/${MODPY_PYCACHE}check-stackeffect.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/${MODPY_PYCACHE}opcode_15.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/${MODPY_PYCACHE}opcode_20.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/${MODPY_PYCACHE}opcode_21.${MODPY_PYC_MAGIC_TAG}pyc
@@ -47,20 +50,27 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/${MODPY_PYCACHE}opcode_24.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/${MODPY_PYCACHE}opcode_25.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/${MODPY_PYCACHE}opcode_26.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/${MODPY_PYCACHE}opcode_26pypy.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/${MODPY_PYCACHE}opcode_27.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/${MODPY_PYCACHE}opcode_27pypy.${MODPY_PYC_MAGIC_TAG}pyc
 

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/01/26 13:50:07

Modified files:
net/unifi  : Makefile distinfo 

Log message:
update to unifi-5.6.30

Re: python.port.mk: Respect SEPARATE_BUILD in MODPY_DISTUTILS_BUILD

[Stuart Henderson]

On 2018/01/26 19:46, Landry Breuil wrote:
> On Fri, Jan 26, 2018 at 05:56:04PM +0100, Remi Pointel wrote:
> > Le 26-01-2018 12:13, Marc Espie a écrit :
> > > On Thu, Jan 25, 2018 at 11:22:30PM +0100, Klemens Nanni wrote:
> > > > Out-of-tree builds for simple python ports are currently built in
> > > > WRKSRC
> > > > even when SEPARATE_BUILD is set.
> > > > 
> > > > Simple example:
> > > > 
> > > > $ cd /usr/ports/www/linkchecker
> > > > $ make build
> > > > [...]
> > > > $ make show='SEPARATE_BUILD WRKSRC WRKBUILD'
> > > > SEPARATE_BUILD=Yes
> > > > 
> > > > WRKSRC=skins/larry/usr/obj/ports/linkchecker-9.3/linkchecker-upstream-9.3
> > > > WRKBUILD=/usr/obj/ports/linkchecker-9.3/build-amd64
> > > > $ ls `make show=WRKBUILD`
> > > > $
> > > > 
> > > > That's because MODPY_DISTUTILS_BUILD hardcodes WRKSRC, the following
> > > > diff changes that to WRKBUILD which defaults to WRKSRC if
> > > > SEPARATE_BUILD
> > > > set to "no".
> > > > 
> > > > Tested successfully with ports like www/linkchecker and
> > > > sysutils/ranger.
> > > > 
> > > > Feedback?
> > > > 
> > > > Index: lang/python/python.port.mk
> > > > ===
> > > > RCS file: /cvs/ports/lang/python/python.port.mk,v
> > > > retrieving revision 1.95
> > > > diff -u -p -r1.95 python.port.mk
> > > > --- lang/python/python.port.mk  8 Jul 2017 08:28:00 -   1.95
> > > > +++ lang/python/python.port.mk  25 Jan 2018 21:49:23 -
> > > > @@ -128,7 +128,7 @@ MODPY_SITEPKG = ${MODPY_LIBDIR}/site-pa
> > > >  MODPY_SETUP ?= setup.py
> > > > 
> > > >  # build or build_ext are commonly used
> > > > -MODPY_DISTUTILS_BUILD ?=   build --build-base=${WRKSRC}
> > > > +MODPY_DISTUTILS_BUILD ?=   build --build-base=${WRKBUILD}
> > > > 
> > > >  .if ${MODPY_SETUPUTILS:L} == "yes"
> > > >  MODPY_DISTUTILS_INSTALL ?= install --prefix=${LOCALBASE} \
> > > The main person to ask is the current python maintainer... not me.
> > > 
> > > Especially for stuff that's not really bsd.port.mk-dependent, but
> > > obviously
> > > python-land.
> > > 
> > > Remi ?
> > 
> > Hi,
> > 
> > could someone test this diff in a bulk build please?
> 
> Will put it in the next.
> 

Diff is ok with me, but would be best to wait for build results
before committing. (I tested "make package" on a selection of ports
from "select ports.fullpkgpath from modules join ports on
ports.fullpkgpath=modules.fullpkgpath where value='lang/python'
and separate_build='Yes'" but didn't try some of the larger
annoying things that use it.

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2018/01/26 13:29:08

Modified files:
devel  : Makefile 

Log message:
hook catch2

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2018/01/26 13:28:08

Log message:
import catch 2.1.0

Catch2 stands for C++ Automated Test Cases in a Header and is a 
multi-paradigm
test framework for C++ which also supports Objective-C (and maybe C). It is
primarily distributed as a single header file, although certain extensions 
may
require additional headers.

ok jca@ Thanks!

Status:

Vendor Tag: rsadowski
Release Tags:   rsadowski_20180126

N ports/devel/catch2/Makefile
N ports/devel/catch2/distinfo
N ports/devel/catch2/pkg/PLIST
N ports/devel/catch2/pkg/DESCR

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/01/26 12:41:54

Modified files:
lang/vala  : Makefile distinfo 
lang/vala/pkg  : PLIST-main 

Log message:
update to vala-0.38.5

Re: [PATCH] for rebar16, rebar17, rebar18 and rebar19

[Bill Karh]

On 01/24/18 11:58, William Karh wrote:

Hey ports,

After install, the rebar1[6789] package complains about an undefined 
main function. For example:


$ doas pkg_add rebar16
quirks-2.406 signed on 2018-01-23T00:21:31Z
rebar16-2.6.2: ok
$ rebar16
escript: exception error: undefined function rebar16:main/1
in function escript:run/2 (escript.erl, line 747)
in call from escript:start/1 (escript.erl, line 277)
in call from init:start_it /1
in call from init:start_em /1

Since the package changes the name of the program based on the version 
of underlying installation of erlang, escript(1) is confused and can't 
find the main function.


 From the escript(1) man page, "By default the main/1 function in the 
module with the same name as the basename of the escript file will be 
invoked. This behavior can be overridden by setting the flag -escript 
main Module as one of the emulator flags."


The following patch fixes this problem on rebar16, rebar17, rebar18 and 
rebar19.


Index: patches/patch-src_rebar _escripter _erl
|=|
RCS file: /depot/cvs/openbsd/ports/devel/rebar/patches/patch-src_rebar 
_escripter _erl,v

retrieving revision 1.1
diff -u -p -u -r1.1 patch-src_rebar _escripter _erl
— patches/patch-src_rebar _escripter _erl 25 Jun 2015 13:18:41 - 1.1
+ patches/patch-src_rebar _escripter _erl 24 Jan 2018 19:35:26 -
@@ -1,12 +1,16 @@
$OpenBSD: patch-src_rebar _escripter _erl,v 1.1 2015/06/25 13:18:41 
jasper Exp $

-— src/rebar_escripter.erl.orig Thu Jun 25 10:54:14 2015
-+ src/rebar_escripter.erl Thu Jun 25 10:54:35 2015
-@@ -71,7 +71,7 @@ escriptize(Config0, AppFile) ->
+Index: src/rebar_escripter.erl
— src/rebar_escripter.erl.orig
+ src/rebar_escripter.erl
+@@ -71,9 +71,9 @@ escriptize(Config0, AppFile) ->
%% Archive was successfully created. Prefix that binary with our
%% header and write to our escript file
Shebang = rebar_config :get(Config, escript_shebang ,

  * "#!/usr/bin/env escript\n"),
  * "#!/usr/bin/env escript${ERL_VERSION }\n"),
Comment = rebar_config :get(Config, escript_comment , "%%\n"),

  * DefaultEmuArgs = ?FMT("%%! -pa ~s/~s/ebin\n",

- DefaultEmuArgs = ?FMT("%%! -pa ~s/~s/ebin\n",
+ DefaultEmuArgs = ?FMT("%%! -escript main rebar -pa ~s/~s/ebin\n",
[AppNameStr, AppNameStr]),

  * EmuArgs = rebar_config :get(Config, escript_emu _args ,
  * DefaultEmuArgs),

Thanks,
Bill


In-line patch was mangled by email client.  Trying again with patch as 
attachment.


Thanks,
Bill

Index: patches/patch-src_rebar_escripter_erl
===
RCS file: /depot/cvs/openbsd/ports/devel/rebar/patches/patch-src_rebar_escripter_erl,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_rebar_escripter_erl
--- patches/patch-src_rebar_escripter_erl	25 Jun 2015 13:18:41 -	1.1
+++ patches/patch-src_rebar_escripter_erl	24 Jan 2018 19:35:26 -
@@ -1,12 +1,16 @@
 $OpenBSD: patch-src_rebar_escripter_erl,v 1.1 2015/06/25 13:18:41 jasper Exp $
 src/rebar_escripter.erl.orig	Thu Jun 25 10:54:14 2015
-+++ src/rebar_escripter.erl	Thu Jun 25 10:54:35 2015
-@@ -71,7 +71,7 @@ escriptize(Config0, AppFile) ->
+Index: src/rebar_escripter.erl
+--- src/rebar_escripter.erl.orig
 src/rebar_escripter.erl
+@@ -71,9 +71,9 @@ escriptize(Config0, AppFile) ->
  %% Archive was successfully created. Prefix that binary with our
  %% header and write to our escript file
  Shebang = rebar_config:get(Config, escript_shebang,
 -   "#!/usr/bin/env escript\n"),
 +   "#!/usr/bin/env escript${ERL_VERSION}\n"),
  Comment = rebar_config:get(Config, escript_comment, "%%\n"),
- DefaultEmuArgs = ?FMT("%%! -pa ~s/~s/ebin\n",
+-DefaultEmuArgs = ?FMT("%%! -pa ~s/~s/ebin\n",
++DefaultEmuArgs = ?FMT("%%! -escript main rebar -pa ~s/~s/ebin\n",
[AppNameStr, AppNameStr]),
+ EmuArgs = rebar_config:get(Config, escript_emu_args,
+DefaultEmuArgs),

Re: UPDATE: TeX Live 2017

[Matthias Kilian]

Hi,

On Thu, Jan 25, 2018 at 10:41:04PM +0100, Matthias Kilian wrote:
> However, I only had texlive_base and texlive_texmf-buildset installed,
> so that update test wasn't complete. I'll retest this with the
> complete set (texlive_texmf-minimal and texlive_texmf-full) on my
> work desktop tomorrow.

No problems there, either.

So ok for me.

Ciao,
Kili

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/01/26 12:02:25

Modified files:
x11/gnome/contacts: Makefile distinfo 

Log message:
update to gnome-contacts-3.26.1

Re: python.port.mk: Respect SEPARATE_BUILD in MODPY_DISTUTILS_BUILD

[Landry Breuil]

On Fri, Jan 26, 2018 at 05:56:04PM +0100, Remi Pointel wrote:
> Le 26-01-2018 12:13, Marc Espie a écrit :
> > On Thu, Jan 25, 2018 at 11:22:30PM +0100, Klemens Nanni wrote:
> > > Out-of-tree builds for simple python ports are currently built in
> > > WRKSRC
> > > even when SEPARATE_BUILD is set.
> > > 
> > > Simple example:
> > > 
> > >   $ cd /usr/ports/www/linkchecker
> > >   $ make build
> > >   [...]
> > >   $ make show='SEPARATE_BUILD WRKSRC WRKBUILD'
> > >   SEPARATE_BUILD=Yes
> > >   
> > > WRKSRC=skins/larry/usr/obj/ports/linkchecker-9.3/linkchecker-upstream-9.3
> > >   WRKBUILD=/usr/obj/ports/linkchecker-9.3/build-amd64
> > >   $ ls `make show=WRKBUILD`
> > >   $
> > > 
> > > That's because MODPY_DISTUTILS_BUILD hardcodes WRKSRC, the following
> > > diff changes that to WRKBUILD which defaults to WRKSRC if
> > > SEPARATE_BUILD
> > > set to "no".
> > > 
> > > Tested successfully with ports like www/linkchecker and
> > > sysutils/ranger.
> > > 
> > > Feedback?
> > > 
> > > Index: lang/python/python.port.mk
> > > ===
> > > RCS file: /cvs/ports/lang/python/python.port.mk,v
> > > retrieving revision 1.95
> > > diff -u -p -r1.95 python.port.mk
> > > --- lang/python/python.port.mk8 Jul 2017 08:28:00 -   1.95
> > > +++ lang/python/python.port.mk25 Jan 2018 21:49:23 -
> > > @@ -128,7 +128,7 @@ MODPY_SITEPKG =   ${MODPY_LIBDIR}/site-pa
> > >  MODPY_SETUP ?=   setup.py
> > > 
> > >  # build or build_ext are commonly used
> > > -MODPY_DISTUTILS_BUILD ?= build --build-base=${WRKSRC}
> > > +MODPY_DISTUTILS_BUILD ?= build --build-base=${WRKBUILD}
> > > 
> > >  .if ${MODPY_SETUPUTILS:L} == "yes"
> > >  MODPY_DISTUTILS_INSTALL ?=   install --prefix=${LOCALBASE} \
> > The main person to ask is the current python maintainer... not me.
> > 
> > Especially for stuff that's not really bsd.port.mk-dependent, but
> > obviously
> > python-land.
> > 
> > Remi ?
> 
> Hi,
> 
> could someone test this diff in a bulk build please?

Will put it in the next.

Re: [Patch] Python for non wxallowed /usr/local

[mazocomp]

Landry, if I install unpatched port, it refuses to run with "permission
denied" error. In this case I have to forget about binary updating and
compile this port manually.

Re: sysutils/logfmon moved to github

[Stuart Henderson]

On 2018/01/26 18:12, Klemens Nanni wrote:
> On Fri, Jan 26, 2018 at 04:15:06PM +0100, Marcus MERIGHI wrote:
> > Anything *I* can/need/should do? 
> > This is sort of a ping...
> Since sthen only build tested it, you can run the test suite (I take
> there is one since NO_TEST=yes is gone).

I removed NO_TEST because it no longer errors out, there isn't a test
suite though.

Re: sysutils/logfmon moved to github

[Klemens Nanni]

On Fri, Jan 26, 2018 at 04:15:06PM +0100, Marcus MERIGHI wrote:
> Anything *I* can/need/should do? 
> This is sort of a ping...
Since sthen only build tested it, you can run the test suite (I take
there is one since NO_TEST=yes is gone).

> It runs, but I'm only in a rather slow move to get it cumstomized, no
> real world testing atm...
Running things in production is good for testing real world examples,
so that's another thing you can do :)

Re: python.port.mk: Respect SEPARATE_BUILD in MODPY_DISTUTILS_BUILD

[Remi Pointel]

Le 26-01-2018 12:13, Marc Espie a écrit :

On Thu, Jan 25, 2018 at 11:22:30PM +0100, Klemens Nanni wrote:
Out-of-tree builds for simple python ports are currently built in 
WRKSRC

even when SEPARATE_BUILD is set.

Simple example:

$ cd /usr/ports/www/linkchecker
$ make build
[...]
$ make show='SEPARATE_BUILD WRKSRC WRKBUILD'
SEPARATE_BUILD=Yes

WRKSRC=skins/larry/usr/obj/ports/linkchecker-9.3/linkchecker-upstream-9.3
WRKBUILD=/usr/obj/ports/linkchecker-9.3/build-amd64
$ ls `make show=WRKBUILD`
$

That's because MODPY_DISTUTILS_BUILD hardcodes WRKSRC, the following
diff changes that to WRKBUILD which defaults to WRKSRC if 
SEPARATE_BUILD

set to "no".

Tested successfully with ports like www/linkchecker and 
sysutils/ranger.


Feedback?

Index: lang/python/python.port.mk
===
RCS file: /cvs/ports/lang/python/python.port.mk,v
retrieving revision 1.95
diff -u -p -r1.95 python.port.mk
--- lang/python/python.port.mk  8 Jul 2017 08:28:00 -   1.95
+++ lang/python/python.port.mk  25 Jan 2018 21:49:23 -
@@ -128,7 +128,7 @@ MODPY_SITEPKG = ${MODPY_LIBDIR}/site-pa
 MODPY_SETUP ?= setup.py

 # build or build_ext are commonly used
-MODPY_DISTUTILS_BUILD ?=   build --build-base=${WRKSRC}
+MODPY_DISTUTILS_BUILD ?=   build --build-base=${WRKBUILD}

 .if ${MODPY_SETUPUTILS:L} == "yes"
 MODPY_DISTUTILS_INSTALL ?= install --prefix=${LOCALBASE} \

The main person to ask is the current python maintainer... not me.

Especially for stuff that's not really bsd.port.mk-dependent, but 
obviously

python-land.

Remi ?


Hi,

could someone test this diff in a bulk build please?

Thanks in advance,

Remi.

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2018/01/26 09:17:17

Modified files:
devel/dlib : Makefile distinfo 
devel/dlib/pkg : PLIST 

Log message:
Update Dlib to 19.9

Changelog: http://dlib.net/release_notes.html

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2018/01/26 09:02:18

Modified files:
graphics/libraw: Makefile distinfo 

Log message:
Update LibRaw to 0.18.7

ok jca@

Re: [Patch] Python for non wxallowed /usr/local

[Stuart Henderson]

On 2018/01/26 17:17, mazocomp wrote:
> On Fri, Jan 26, 2018 at 02:56:11PM +, Stuart Henderson wrote:
> > On 2018/01/26 16:36, mazocomp wrote:
> > > +Flavor wx  - build with W|X reliance.
> > 
> > Of course we have thought about this before! But it's not as simple as
> > you propose. Done in the way you suggest as a simple either/or flavour
> > is going to cause too many problems and confusion with dependent ports
> > and isn't acceptable.
> > 
> > Maybe we could consider something that produces two binaries, one with
> > wxneeded as "/usr/local/bin/pythonX.Y-wx" that we can use for things that
> > need webkit modules etc, and one without wxneeded as the standard
> > "pythonX.Y".
> > 
> 
> Hm, every port which relies on W|X will be patched to use python*-wx
> binary, won't it? Sounds great.

Yes, that's part of the work that somebody wanting this would need to do.
(Actually patching shouldn't be too bad, identifying the ports which need it
is the trickier part).

Looking back at my notes, it was needed for things that use certain things
with py-cryptography as well as the webkit things (when I had a local diff to
disable W+X mappings in CFFI, trying to use https with py-requests broke -
https://marc.info/?l=openbsd-ports=147566712513359=2 /
https://marc.info/?l=openbsd-ports=147618177012319=2).

Re: UPDATE: graphics/libraw

[Jeremie Courreges-Anglas]

On Thu, Jan 25 2018, Rafael Sadowski  wrote:
> Simple update to the latest stable version.
>
> Changlog:
>
> https://github.com/LibRaw/LibRaw/compare/0.18.7...master
>
> ok? I don't want to build all consumers. It is worthwhile to push it
> into a bulk?

Not worth it IMO, the tarball diff is trivial.  ok jca@

> Index: Makefile
> ===
> RCS file: /cvs/ports/graphics/libraw/Makefile,v
> retrieving revision 1.33
> diff -u -p -u -p -r1.33 Makefile
> --- Makefile  20 Jan 2018 14:03:39 -  1.33
> +++ Makefile  25 Jan 2018 20:18:37 -
> @@ -2,7 +2,7 @@
>  
>  COMMENT =library for reading RAW files
>  
> -DISTNAME =   LibRaw-0.18.6
> +DISTNAME =   LibRaw-0.18.7
>  PKGNAME =${DISTNAME:L}
>  CATEGORIES = graphics
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/graphics/libraw/distinfo,v
> retrieving revision 1.9
> diff -u -p -u -p -r1.9 distinfo
> --- distinfo  21 Dec 2017 07:55:47 -  1.9
> +++ distinfo  25 Jan 2018 20:18:37 -
> @@ -1,2 +1,2 @@
> -SHA256 (LibRaw-0.18.6.tar.gz) = 5bisylWKpFe8khSAIAQyDFYQ0UNMKtsfPqNn8CavpTs=
> -SIZE (LibRaw-0.18.6.tar.gz) = 1282212
> +SHA256 (LibRaw-0.18.7.tar.gz) = h+NHwmGo6Hk12aI6/XUNJ2drmfVA6FUjFNQNsOoxV3E=
> +SIZE (LibRaw-0.18.7.tar.gz) = 1280935
>

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

Re: [Patch] Python for non wxallowed /usr/local

[mazocomp]

On Fri, Jan 26, 2018 at 02:56:11PM +, Stuart Henderson wrote:
> On 2018/01/26 16:36, mazocomp wrote:
> > +Flavor wx  - build with W|X reliance.
> 
> Of course we have thought about this before! But it's not as simple as
> you propose. Done in the way you suggest as a simple either/or flavour
> is going to cause too many problems and confusion with dependent ports
> and isn't acceptable.
> 
> Maybe we could consider something that produces two binaries, one with
> wxneeded as "/usr/local/bin/pythonX.Y-wx" that we can use for things that
> need webkit modules etc, and one without wxneeded as the standard
> "pythonX.Y".
> 

Hm, every port which relies on W|X will be patched to use python*-wx
binary, won't it? Sounds great.

Re: [Patch] Python for non wxallowed /usr/local

[Landry Breuil]

On Fri, Jan 26, 2018 at 04:59:40PM +0200, mazocomp wrote:
> On Fri, Jan 26, 2018 at 03:49:48PM +0100, Solène Rapenne wrote:
> > Le 2018-01-26 15:36, mazocomp a écrit :
> > >  # Python itself is clean, but some extensions e.g. py-cryptography
> > >  # and QtWebKit require W|X mappings.
> > > +.if ${FLAVOR} == "wx"
> > >  USE_WXNEEDED = Yes
> > > +.endif
> > > 
> > >  .if ${VERSION} == "3.6"
> > >  ALL_TARGET =   all
> > 
> > IIRC python doesn't have W^X issue but some python libraries will load
> > shared libraries requiring W^X so python has to be compiled with wxneeded
> > to load those libraries.
> 
> The comment in Makefile says that clearly. But I prefer using Python
> without wxallowed /usr/local, I run software which doesn't rely on W|X.

Then remove wxallowed from the mount options for usr/local. Case closed.

Landry

Re: sysutils/logfmon moved to github

[Marcus MERIGHI]

Thanks for looking at it!

Anything *I* can/need/should do? 
This is sort of a ping...

It runs, but I'm only in a rather slow move to get it cumstomized, no
real world testing atm...

Marcus

s...@spacehopper.org (Stuart Henderson), 2018.01.17 (Wed) 12:40 (CET):
> On 2018/01/17 12:31, Marcus MERIGHI wrote:
> > Hello, 
> > 
> > after talking to $MAINTAINER (Tom Doherty) privately I'm doing what he
> > told me to...
> > 
> > Notes: 
> > - I have no idea what I'm doing
> > - I just copied the GH_* stuff from other software in sysutils/
> > - I just copied autohell stuff from other software in sysutils/
> > - I just copied CONFIGURE_* stuff from - well, guess it.
> > - I just adjusted PLIST to match nicms layout change
> > (sbin/logfmon -> bin/logfmon)
> > - I removed patches/patch-Makefile which contained:
> > +++ Makefile
> > -INCDIRS= -I- -I. -I/usr/local/include
> > +INCDIRS= -iquote -I. -I/usr/local/include
> > This patch caused an error because Makefile isn't there at the time
> > of patching and it only removes an "obsolete" warning with the hint
> > to use "-iquote".
> > Please advise on how to get the Makefile patch right!
> > 
> > Thanks for your time, Marcus
> 
> This is how it should look. Build-tested only.
> 
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/sysutils/logfmon/Makefile,v
> retrieving revision 1.4
> diff -u -p -r1.4 Makefile
> --- Makefile  11 Jan 2018 19:27:10 -  1.4
> +++ Makefile  17 Jan 2018 11:39:16 -
> @@ -2,22 +2,22 @@
>  
>  COMMENT= log file monitoring daemon
>  
> -DISTNAME=logfmon-1.1
> -REVISION=1
> +V=   1.2
> +DISTNAME=logfmon-$V
>  CATEGORIES=  sysutils
>  
> -HOMEPAGE=http://sourceforge.net/projects/logfmon/
> +HOMEPAGE=https://github.com/nicm/logfmon
>  
>  MAINTAINER=  Tom Doherty 
>  
>  # ISC
>  PERMIT_PACKAGE_CDROM=Yes
>  
> -WANTLIB= c m pthread
> +WANTLIB= c pthread
>  
> -MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=logfmon/}
> +MASTER_SITES=
> https://github.com/nicm/logfmon/releases/download/$V/
>  
> -NO_TEST= Yes
> +CONFIGURE_STYLE= gnu
>  
>  post-install:
>   ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/logfmon
> Index: distinfo
> ===
> RCS file: /cvs/ports/sysutils/logfmon/distinfo,v
> retrieving revision 1.2
> diff -u -p -r1.2 distinfo
> --- distinfo  18 Jan 2015 03:15:12 -  1.2
> +++ distinfo  17 Jan 2018 11:39:16 -
> @@ -1,2 +1,2 @@
> -SHA256 (logfmon-1.1.tar.gz) = FVuURXcM3O4rQtmaVH74fTfBDvUHsiug81G9eaiOGzg=
> -SIZE (logfmon-1.1.tar.gz) = 49705
> +SHA256 (logfmon-1.2.tar.gz) = r5geqSav7O3rs2oCr2E69AeCEE1oJmfvrcvEkkqy6cc=
> +SIZE (logfmon-1.2.tar.gz) = 149108
> Index: patches/patch-Makefile
> ===
> RCS file: patches/patch-Makefile
> diff -N patches/patch-Makefile
> --- patches/patch-Makefile16 May 2012 06:10:18 -  1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,16 +0,0 @@
> -$OpenBSD: patch-Makefile,v 1.1.1.1 2012/05/16 06:10:18 jasper Exp $
> -
> -cc1: note: obsolete option -I- used, please use -iquote instead
> -NB: The hardcoded /usr/local in this Makefile does not affect OpenBSD's 
> build.
> -
>  Makefile.origMon May 14 09:53:28 2012
> -+++ Makefile Mon May 14 09:53:57 2012
> -@@ -34,7 +34,7 @@ PREFIX?= /usr/local
> - INSTALLBIN= install -g bin -o root -m 555
> - INSTALLMAN= install -g bin -o root -m 444
> - 
> --INCDIRS= -I- -I. -I/usr/local/include
> -+INCDIRS= -iquote -I. -I/usr/local/include
> - LDFLAGS+= -L/usr/local/lib
> - LIBS= -lm
> - .if ${OS} == "OpenBSD" || ${OS} == "FreeBSD"
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/sysutils/logfmon/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 PLIST
> --- pkg/PLIST 16 May 2012 06:10:18 -  1.1.1.1
> +++ pkg/PLIST 17 Jan 2018 11:39:16 -
> @@ -1,7 +1,7 @@
>  @comment $OpenBSD: PLIST,v 1.1.1.1 2012/05/16 06:10:18 jasper Exp $
> +@bin bin/logfmon
>  @man man/man5/logfmon.conf.5
>  @man man/man8/logfmon.8
> -@bin sbin/logfmon
>  share/examples/logfmon/
>  share/examples/logfmon/brandini.conf
>  share/examples/logfmon/logfmon-freebsd.conf
> Index: pkg/logfmon.rc
> ===
> RCS file: /cvs/ports/sysutils/logfmon/pkg/logfmon.rc,v
> retrieving revision 1.2
> diff -u -p -r1.2 logfmon.rc
> --- pkg/logfmon.rc11 Jan 2018 19:27:10 -  1.2
> +++ pkg/logfmon.rc17 Jan 2018 11:39:16 -
> @@ -2,7 +2,7 @@
>  #
>  # $OpenBSD: logfmon.rc,v 1.2 2018/01/11 19:27:10 rpe Exp $
>  
> -daemon="${TRUEPREFIX}/sbin/logfmon"
> 

Re: [Patch] Python for non wxallowed /usr/local

[mazocomp]

On Fri, Jan 26, 2018 at 03:49:48PM +0100, Solène Rapenne wrote:
> Le 2018-01-26 15:36, mazocomp a écrit :
> >  # Python itself is clean, but some extensions e.g. py-cryptography
> >  # and QtWebKit require W|X mappings.
> > +.if ${FLAVOR} == "wx"
> >  USE_WXNEEDED = Yes
> > +.endif
> > 
> >  .if ${VERSION} == "3.6"
> >  ALL_TARGET =   all
> 
> IIRC python doesn't have W^X issue but some python libraries will load
> shared libraries requiring W^X so python has to be compiled with wxneeded
> to load those libraries.

The comment in Makefile says that clearly. But I prefer using Python
without wxallowed /usr/local, I run software which doesn't rely on W|X.

Re: [Patch] Python for non wxallowed /usr/local

[Stuart Henderson]

On 2018/01/26 16:36, mazocomp wrote:
> +Flavor wx  - build with W|X reliance.

Of course we have thought about this before! But it's not as simple as
you propose. Done in the way you suggest as a simple either/or flavour
is going to cause too many problems and confusion with dependent ports
and isn't acceptable.

Maybe we could consider something that produces two binaries, one with
wxneeded as "/usr/local/bin/pythonX.Y-wx" that we can use for things that
need webkit modules etc, and one without wxneeded as the standard
"pythonX.Y".

Re: [Patch] Python for non wxallowed /usr/local

[Jeremie Courreges-Anglas]

If you don't like wxallowed/wxneeded, great, that's the point!

But the way forward is to fix offenders, not to pretend you can sweep
the problem under the rug with untested diffs.

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

Re: [Patch] Python for non wxallowed /usr/local

[Solène Rapenne]

Le 2018-01-26 15:36, mazocomp a écrit :

 # Python itself is clean, but some extensions e.g. py-cryptography
 # and QtWebKit require W|X mappings.
+.if ${FLAVOR} == "wx"
 USE_WXNEEDED = Yes
+.endif

 .if ${VERSION} == "3.6"
 ALL_TARGET =   all


IIRC python doesn't have W^X issue but some python libraries will load
shared libraries requiring W^X so python has to be compiled with 
wxneeded

to load those libraries.

[Patch] Python for non wxallowed /usr/local

[mazocomp]

diff --git lang/python/2.7/pkg/DESCR-main lang/python/2.7/pkg/DESCR-main
index adfd63f9840..9d7c54a9e93 100644
--- lang/python/2.7/pkg/DESCR-main
+++ lang/python/2.7/pkg/DESCR-main
@@ -12,3 +12,5 @@ written in C or C++.  On most systems such modules may be
 dynamically loaded. Python is also adaptable as an
 extension language for existing applications. See the
 internal documentation for hints.
+
+Flavor wx  - build with W|X reliance.
diff --git lang/python/3.6/pkg/DESCR-main lang/python/3.6/pkg/DESCR-main
index adfd63f9840..9d7c54a9e93 100644
--- lang/python/3.6/pkg/DESCR-main
+++ lang/python/3.6/pkg/DESCR-main
@@ -12,3 +12,5 @@ written in C or C++.  On most systems such modules may be
 dynamically loaded. Python is also adaptable as an
 extension language for existing applications. See the
 internal documentation for hints.
+
+Flavor wx  - build with W|X reliance.
diff --git lang/python/Makefile.inc lang/python/Makefile.inc
index f66fda7e47f..7f317e4b6e2 100644
--- lang/python/Makefile.inc
+++ lang/python/Makefile.inc
@@ -43,6 +43,9 @@ MAINTAINER =  Remi Pointel 
 # A summary of changes to Python is required to be distributed
 PERMIT_PACKAGE_CDROM = Yes

+FLAVORS=   wx
+FLAVOR?=   wx
+
 .if ${VERSION} == "2.7"
 LIB_SUFX =
 MULTI_PACKAGES =   -main -tests -tools -gdbm -idle -tkinter -bsddb
@@ -124,7 +127,9 @@ FAKE_FLAGS +=   RANLIB=:

 # Python itself is clean, but some extensions e.g. py-cryptography
 # and QtWebKit require W|X mappings.
+.if ${FLAVOR} == "wx"
 USE_WXNEEDED = Yes
+.endif

 .if ${VERSION} == "3.6"
 ALL_TARGET =   all

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/01/26 07:37:34

Modified files:
net/py-botocore: Makefile distinfo 

Log message:
Update to py-botocore-1.8.35.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/01/26 07:37:50

Modified files:
sysutils/awscli: Makefile distinfo 

Log message:
Update to awscli-1.14.31.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/01/26 07:37:18

Modified files:
net/py-boto3   : Makefile distinfo 

Log message:
Update to py-boto3-1.5.21.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/01/26 06:47:10

Modified files:
graphics/gegl03: Makefile distinfo 

Log message:
Update to gegl03-0.3.28.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/01/26 06:46:57

Modified files:
graphics/babl  : Makefile distinfo 

Log message:
Update to babl-0.1.42.

UPDATE: devel/boost

[Rafael Sadowski]

Hi All!

This time easier than last time and a relative easy update to the
current boost.

Changelog: http://www.boost.org/users/history/version_1_66_0.html

I did not build all consumers. Bulk feedback wanted.

Best regards,

Rafael Sadowski


Index: Makefile
===
RCS file: /cvs/ports/devel/boost/Makefile,v
retrieving revision 1.72
diff -u -p -u -p -r1.72 Makefile
--- Makefile26 Dec 2017 19:18:49 -  1.72
+++ Makefile26 Jan 2018 08:46:45 -
@@ -2,7 +2,7 @@
 
 COMMENT=   free peer-reviewed portable C++ source libraries
 
-VERSION=   1.65.1
+VERSION=   1.66.0
 DISTNAME=  boost_${VERSION:S/./_/g}
 PKGNAME=   boost-${VERSION}
 CATEGORIES=devel
@@ -52,7 +52,7 @@ HOMEPAGE= http://www.boost.org/
 
 MAINTAINER=Brad Smith 
 
-# MIT-like
+# Boost
 PERMIT_PACKAGE_CDROM=  Yes
 
 WANTLIB += ${COMPILER_LIBCXX} bz2 c iconv m z
Index: distinfo
===
RCS file: /cvs/ports/devel/boost/distinfo,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 distinfo
--- distinfo26 Dec 2017 19:18:49 -  1.9
+++ distinfo26 Jan 2018 08:46:45 -
@@ -1,2 +1,2 @@
-SHA256 (boost_1_65_1.tar.bz2) = mAel0WVmxX/XT7Uidk4LE0qLvmtuiWe4Ov79MNzTvoE=
-SIZE (boost_1_65_1.tar.bz2) = 82594767
+SHA256 (boost_1_66_0.tar.bz2) = VyGBglPmoJiVgxkvlngsSpjrYgSWUxbfn1rXWBkiXKk=
+SIZE (boost_1_66_0.tar.bz2) = 85995778
Index: patches/patch-Jamroot
===
RCS file: /cvs/ports/devel/boost/patches/patch-Jamroot,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-Jamroot
--- patches/patch-Jamroot   26 Dec 2017 19:18:49 -  1.5
+++ patches/patch-Jamroot   26 Jan 2018 08:46:45 -
@@ -2,9 +2,9 @@ $OpenBSD: patch-Jamroot,v 1.5 2017/12/26
 Index: Jamroot
 --- Jamroot.orig
 +++ Jamroot
-@@ -133,8 +133,9 @@ import link ;
+@@ -134,8 +134,9 @@ import threadapi-feature ;
  path-constant BOOST_ROOT : . ;
- constant BOOST_VERSION : 1.65.1 ;
+ constant BOOST_VERSION : 1.66.0 ;
  constant BOOST_JAMROOT_MODULE : $(__name__) ;
 +constant SO_VERSION : ${SO_VERSION} ;
  
Index: patches/patch-boost_asio_ssl_old_detail_openssl_context_service_hpp
===
RCS file: patches/patch-boost_asio_ssl_old_detail_openssl_context_service_hpp
diff -N patches/patch-boost_asio_ssl_old_detail_openssl_context_service_hpp
--- patches/patch-boost_asio_ssl_old_detail_openssl_context_service_hpp 26 Dec 
2017 19:18:49 -  1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,27 +0,0 @@
-$OpenBSD: patch-boost_asio_ssl_old_detail_openssl_context_service_hpp,v 1.2 
2017/12/26 19:18:49 rsadowski Exp $
-Index: boost/asio/ssl/old/detail/openssl_context_service.hpp
 boost/asio/ssl/old/detail/openssl_context_service.hpp.orig
-+++ boost/asio/ssl/old/detail/openssl_context_service.hpp
-@@ -85,14 +85,7 @@ class openssl_context_service (public)
-   impl = ::SSL_CTX_new(::SSLv2_server_method());
-   break;
- #endif // defined(OPENSSL_NO_SSL2)
--#if defined(OPENSSL_NO_SSL3)
- case context_base::sslv3:
--case context_base::sslv3_client:
--case context_base::sslv3_server:
--  boost::asio::detail::throw_error(boost::asio::error::invalid_argument);
--  break;
--#else // defined(OPENSSL_NO_SSL3)
--case context_base::sslv3:
-   impl = ::SSL_CTX_new(::SSLv3_method());
-   break;
- case context_base::sslv3_client:
-@@ -101,7 +94,6 @@ class openssl_context_service (public)
- case context_base::sslv3_server:
-   impl = ::SSL_CTX_new(::SSLv3_server_method());
-   break;
--#endif // defined(OPENSSL_NO_SSL3)
- case context_base::tlsv1:
-   impl = ::SSL_CTX_new(::TLSv1_method());
-   break;
Index: patches/patch-boost_config_compiler_clang_hpp
===
RCS file: /cvs/ports/devel/boost/patches/patch-boost_config_compiler_clang_hpp,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-boost_config_compiler_clang_hpp
--- patches/patch-boost_config_compiler_clang_hpp   26 Dec 2017 19:18:49 
-  1.3
+++ patches/patch-boost_config_compiler_clang_hpp   26 Jan 2018 08:46:45 
-
@@ -42,5 +42,5 @@ Index: boost/config/compiler/clang.hpp
  #define BOOST_ATTRIBUTE_UNUSED __attribute__((__unused__))
 +#endif
  
- #ifndef BOOST_COMPILER
- #  define BOOST_COMPILER "Clang version " __clang_version__
+ // Type aliasing hint.
+ #if __has_attribute(__may_alias__)
Index: patches/patch-tools_build_src_tools_gcc_jam
===
RCS file: /cvs/ports/devel/boost/patches/patch-tools_build_src_tools_gcc_jam,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-tools_build_src_tools_gcc_jam
--- patches/patch-tools_build_src_tools_gcc_jam 26 Dec 2017 19:18:49 -  
1.4
+++ 

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2018/01/26 06:11:14

Modified files:
devel/cmake: cmake.port.mk 

Log message:
Stop abusing DEBUG in cmake.port.mk

Setting DEBUG changed the cmake build type ("release" vs "debug"), which
had a bunch of undocumented and surprising consequences:
- changing CFLAGS/LDFLAGS etc, potentially to values unsupported on
OpenBSD, instead of just using what the user passed in DEBUG
- PLIST changes which break packaging when using PLIST_DB (default)

Leave DEBUG alone and introduce MODCMAKE_DEBUG as a documented feature
instead, as proposed by various folks.  Reluctant ok landry@ (thanks!)

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2018/01/26 06:10:08

Modified files:
infrastructure/mk: arch-defines.mk 

Log message:
add a hint how @version is derived; discussed with espie@ three months ago

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2018/01/26 06:06:41

Modified files:
net/gajim  : Makefile distinfo 

Log message:
Update gajim to 0.16.9

ok pea@ (maintainer)

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2018/01/26 06:03:15

Modified files:
x11/qt5/qtwebkit-examples: Makefile 

Log message:
missing bump after HOMEPAGE change

CVS: cvs.openbsd.org: ports

[Juan Francisco Cantero Hurtado]

CVSROOT:/cvs
Module name:ports
Changes by: juan...@cvs.openbsd.org 2018/01/26 05:43:17

Modified files:
lang/chibi-scheme: Makefile distinfo 
lang/chibi-scheme/patches: patch-Makefile 
lang/chibi-scheme/pkg: PLIST 

Log message:
Update to chibi-scheme 0.8.0.

CVS: cvs.openbsd.org: ports

[Juan Francisco Cantero Hurtado]

CVSROOT:/cvs
Module name:ports
Changes by: juan...@cvs.openbsd.org 2018/01/26 05:42:27

Modified files:
graphics/pdf2djvu: Makefile distinfo 

Log message:
Update to pdf2djvu 0.9.8.

Re: cmake.port.mk and DEBUG

[Landry Breuil]

On Fri, Jan 26, 2018 at 12:22:56PM +0100, Jeremie Courreges-Anglas wrote:
> On Sun, Jan 21 2018, Jeremie Courreges-Anglas  wrote:
> > On Sun, Jan 21 2018, Landry Breuil  wrote:
> >> On Sun, Jan 21, 2018 at 06:00:24PM +0100, Jeremie Courreges-Anglas wrote:
> >>> On Sat, Jan 20 2018, Stuart Henderson  wrote:
> >>> 
> >>> [...]
> >>> 
> >>> > How about making the cmake debug-build stuff dependent on a
> >>> > flavour (like "CMAKE_DEBUG") rather than making DEBUG do
> >>> > double-duty as a compiler flag option *and* a cmake knob?
> >>> >
> >>> > (We already removed some other cases where DEBUG turned on
> >>> > port-specific debug options..)
> >>> 
> >>> Looks like several people agree with this direction, so here's a diff
> >>> that adds MODCMAKE_DEBUG.
> >>> 
> >>> Comments/oks?
> >
> > [...]
> >
> >> missing verb ? And i think, since ppl wont understand what it means
> >
> > Yep, sorry.  Do you suggest deleting the whole sentence?
> 
> ping.

I feel uncomfortable with it, but okay :)

Re: cmake.port.mk and DEBUG

[Jeremie Courreges-Anglas]

On Sun, Jan 21 2018, Jeremie Courreges-Anglas  wrote:
> On Sun, Jan 21 2018, Landry Breuil  wrote:
>> On Sun, Jan 21, 2018 at 06:00:24PM +0100, Jeremie Courreges-Anglas wrote:
>>> On Sat, Jan 20 2018, Stuart Henderson  wrote:
>>> 
>>> [...]
>>> 
>>> > How about making the cmake debug-build stuff dependent on a
>>> > flavour (like "CMAKE_DEBUG") rather than making DEBUG do
>>> > double-duty as a compiler flag option *and* a cmake knob?
>>> >
>>> > (We already removed some other cases where DEBUG turned on
>>> > port-specific debug options..)
>>> 
>>> Looks like several people agree with this direction, so here's a diff
>>> that adds MODCMAKE_DEBUG.
>>> 
>>> Comments/oks?
>
> [...]
>
>> missing verb ? And i think, since ppl wont understand what it means
>
> Yep, sorry.  Do you suggest deleting the whole sentence?

ping.

> Index: share/man/man5/port-modules.5
> ===
> RCS file: /d/cvs/src/share/man/man5/port-modules.5,v
> retrieving revision 1.225
> diff -u -p -r1.225 port-modules.5
> --- share/man/man5/port-modules.5 2 Dec 2017 09:31:52 -   1.225
> +++ share/man/man5/port-modules.5 21 Jan 2018 17:33:29 -
> @@ -569,6 +569,12 @@ If set to `Yes', CMake will print detail
>  stages about exact command being run, etc.
>  Should not be used in ports Makefiles.
>  Default value is `Yes'.
> +.It MODCMAKE_DEBUG
> +If set to `Yes', CMake will produce a debug build instead of a release
> +build.
> +The exact effects on the build process depend on settings specified in
> +the CMake config files.
> +Default value is `No'.
>  .El
>  Also,
>  .Sq nojunk
> Index: devel/cmake/cmake.port.mk
> ===
> RCS file: /d/cvs/ports/devel/cmake/cmake.port.mk,v
> retrieving revision 1.62
> diff -u -p -r1.62 cmake.port.mk
> --- devel/cmake/cmake.port.mk 28 Nov 2017 10:26:00 -  1.62
> +++ devel/cmake/cmake.port.mk 21 Jan 2018 16:51:31 -
> @@ -65,6 +65,8 @@ CONFIGURE_ENV +=MODJAVA_VER=${MODJAVA_V
>   MODTCL_LIB=${MODTCL_LIB} \
>   MODTK_LIB=${MODTK_LIB}
>  
> +MODCMAKE_DEBUG ?=No
> +
>  .if empty(CONFIGURE_STYLE)
>  CONFIGURE_STYLE= cmake
>  .endif
> @@ -76,7 +78,7 @@ MODCMAKE_configure= cd ${WRKBUILD} && ${
>   -G ${_MODCMAKE_GEN} ${CONFIGURE_ARGS} ${WRKSRC}
>  
>  .if !defined(CONFIGURE_ARGS) || ! ${CONFIGURE_ARGS:M*CMAKE_BUILD_TYPE*}
> -.  if defined(DEBUG)
> +.  if ${MODCMAKE_DEBUG:L} == "yes"
>  CONFIGURE_ARGS += -DCMAKE_BUILD_TYPE:String=Debug
>  MODCMAKE_BUILD_SUFFIX =  -debug.cmake
>  .  else


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

Re: python.port.mk: Respect SEPARATE_BUILD in MODPY_DISTUTILS_BUILD

[Marc Espie]

On Thu, Jan 25, 2018 at 11:22:30PM +0100, Klemens Nanni wrote:
> Out-of-tree builds for simple python ports are currently built in WRKSRC
> even when SEPARATE_BUILD is set.
> 
> Simple example:
> 
>   $ cd /usr/ports/www/linkchecker
>   $ make build
>   [...]
>   $ make show='SEPARATE_BUILD WRKSRC WRKBUILD'
>   SEPARATE_BUILD=Yes
>   WRKSRC=/usr/obj/ports/linkchecker-9.3/linkchecker-upstream-9.3
>   WRKBUILD=/usr/obj/ports/linkchecker-9.3/build-amd64
>   $ ls `make show=WRKBUILD`
>   $
> 
> That's because MODPY_DISTUTILS_BUILD hardcodes WRKSRC, the following
> diff changes that to WRKBUILD which defaults to WRKSRC if SEPARATE_BUILD
> set to "no".
> 
> Tested successfully with ports like www/linkchecker and sysutils/ranger.
> 
> Feedback?
> 
> Index: lang/python/python.port.mk
> ===
> RCS file: /cvs/ports/lang/python/python.port.mk,v
> retrieving revision 1.95
> diff -u -p -r1.95 python.port.mk
> --- lang/python/python.port.mk8 Jul 2017 08:28:00 -   1.95
> +++ lang/python/python.port.mk25 Jan 2018 21:49:23 -
> @@ -128,7 +128,7 @@ MODPY_SITEPKG =   ${MODPY_LIBDIR}/site-pa
>  MODPY_SETUP ?=   setup.py
>  
>  # build or build_ext are commonly used
> -MODPY_DISTUTILS_BUILD ?= build --build-base=${WRKSRC}
> +MODPY_DISTUTILS_BUILD ?= build --build-base=${WRKBUILD}
>  
>  .if ${MODPY_SETUPUTILS:L} == "yes"
>  MODPY_DISTUTILS_INSTALL ?=   install --prefix=${LOCALBASE} \
The main person to ask is the current python maintainer... not me.

Especially for stuff that's not really bsd.port.mk-dependent, but obviously
python-land.

Remi ?

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/01/26 02:18:36

Modified files:
x11/qt5/qtwebkit: Makefile 

Log message:
Missed bump.

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2018/01/26 01:48:05

Modified files:
mail/mozilla-thunderbird: Makefile distinfo 
mail/thunderbird-i18n: Makefile.inc distinfo 

Log message:
Update to thunderbird 52.6.0 / lightning 5.4.6.

See https://www.mozilla.org/en-US/thunderbird/52.6.0/releasenotes/
Fixes https://www.mozilla.org/en-US/security/advisories/mfsa2018-04/