NEW: games/openclonk

2018-06-15 Thread Brian Callahan

Hi ports --

Attached is a new port, games/openclonk. OpenClonk is a tactical action game 
focusing on controlling Clonks.

---
pkg/DESCR:
OpenClonk is a free multiplayer action game in which you control Clonks,
small but witty and nimble humanoid beings. The game is mainly about mining,
settling and fast-paced melees.

OpenClonk is not just a game but also a versatile 2D game engine that allows
the creation of mods. It is the successor of the shareware game series Clonk
and thus inherits many of its features.
---

Submitting this on behalf of bentley@, who submitted an older version of this 
some time ago, which I've used as the basis of this port. Hence, I did not put 
myself as MAINTAINER in case he wants it (but will add myself if he doesn't).

Works for me on amd64.

OK?

~Brian



openclonk.tgz
Description: Binary data


CVS: cvs.openbsd.org: ports

2018-06-15 Thread Brian Callahan
CVSROOT:/cvs
Module name:ports
Changes by: bcal...@cvs.openbsd.org 2018/06/15 17:33:43

Modified files:
games/hyperrogue: Makefile distinfo 
games/hyperrogue/pkg: PLIST 

Log message:
Update to hyperrogue-10.4b



CVS: cvs.openbsd.org: ports

2018-06-15 Thread YASUOKA Masahiko
CVSROOT:/cvs
Module name:ports
Changes by: yasu...@cvs.openbsd.org 2018/06/15 17:31:22

Modified files:
mail/mew   : Makefile distinfo 
mail/mew/pkg   : PLIST 

Log message:
Update to Mew 6.8



WANTLIB for x11/gnome/gdl

2018-06-15 Thread Matthias Kilian
Hi,

using dpb -R, I ran into build failures of textproc/gtranslator
after each of the recent updates of devel/harfbuzz, because dpb did
*not* rebuild gdl (no package signature change), so my gdl package
still refernced the previous libharfbuzz.so. Regenerating the WANTLIB
should fix this (for future updates of devel/harfbuzz).

Ok?

Ciao,
Kili

Index: Makefile
===
RCS file: /cvs/ports/x11/gnome/gdl/Makefile,v
retrieving revision 1.62
diff -u -p -r1.62 Makefile
--- Makefile23 Apr 2018 21:29:22 -  1.62
+++ Makefile15 Jun 2018 21:18:37 -
@@ -4,12 +4,20 @@ COMMENT=  GNOME Docking Library
 
 GNOME_PROJECT= gdl
 GNOME_VERSION= 3.28.0
+REVISION=  0
 
 SHARED_LIBS +=  gdl-33.1  # 5.9
 
 # LGPLv2.1+
 PERMIT_PACKAGE_CDROM=  Yes
 
+WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
+WANTLIB += Xrandr Xrender atk-1.0 atk-bridge-2.0 atspi cairo cairo-gobject
+WANTLIB += dbus-1 epoxy expat ffi fontconfig freetype fribidi
+WANTLIB += gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
+WANTLIB += graphite2 gthread-2.0 gtk-3 harfbuzz iconv intl lzma
+WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
+WANTLIB += png pthread xcb xcb-render xcb-shm xml2 z
 
 MODULES=   x11/gnome
 



Re: New: net/busybeed

2018-06-15 Thread Base Pr1me
Thanks Stuart.

New port attached with new release. I'll be quiet for the rest of the
weekend now and happy weekend to all!

T

On Fri, Jun 15, 2018 at 2:09 PM, Stuart Henderson 
wrote:

> On 2018/06/15 13:49, Base Pr1me wrote:
> > Hi Stuart,
> >
> > Is there a process to request a uid in user.list? I've introduced the
> > setuid code. (easy todo and I shouldn't have procrastinated).
> >
> > I can't seem to find the info in a man or the porter's handbook. Using
> > _busybeed:812 for now for testing.
>
> 812 is taken by mac-telnet now, you'll see it if you cvs up - please use
> 813.
> Generally just use the next one along and make sure that nothing else has
> taken it in the meantime if there's a long delay before committing.
>
>


port-busybeed-1.04.tar.gz
Description: application/gzip


Re: New: net/busybeed

2018-06-15 Thread Stuart Henderson
On 2018/06/15 13:49, Base Pr1me wrote:
> Hi Stuart,
> 
> Is there a process to request a uid in user.list? I've introduced the
> setuid code. (easy todo and I shouldn't have procrastinated).
> 
> I can't seem to find the info in a man or the porter's handbook. Using
> _busybeed:812 for now for testing.

812 is taken by mac-telnet now, you'll see it if you cvs up - please use 813.
Generally just use the next one along and make sure that nothing else has
taken it in the meantime if there's a long delay before committing.



Re: New: net/busybeed

2018-06-15 Thread Base Pr1me
Hi Stuart,

Is there a process to request a uid in user.list? I've introduced the
setuid code. (easy todo and I shouldn't have procrastinated).

I can't seem to find the info in a man or the porter's handbook. Using
_busybeed:812 for now for testing.

Thanks,

Tracey



On Fri, Jun 15, 2018 at 10:38 AM, Base Pr1me  wrote:

> Gratitude. In the todo queue.
>
> On Fri, Jun 15, 2018 at 10:31 AM, Stuart Henderson 
> wrote:
>
>> On 2018/06/15 10:19, Base Pr1me wrote:
>> > Thanks for the input, Stewart.
>> >
>> > I have knocked around the idea of chroot'ing in the future. It is at
>> least
>> > currently pledged. ... well, according to my current understanding of
>> the
>> > pledge system.
>>
>> It is pledged, but for the process which has access to internet
>> and rw access to the filesystem ("stdio tty rpath wpath inet proc")
>> pledge doesn't add a lot of safety  even without chroot things would
>> be a lot better if it dropped to an unprivileged uid.
>>
>>
>


CVS: cvs.openbsd.org: ports

2018-06-15 Thread Alexander Bluhm
CVSROOT:/cvs
Module name:ports
Changes by: bl...@cvs.openbsd.org   2018/06/15 13:02:51

Modified files:
devel/p5-Devel-NYTProf: Makefile distinfo 

Log message:
update p5-Devel-NYTProf to 6.06



CVS: cvs.openbsd.org: ports

2018-06-15 Thread Alexander Bluhm
CVSROOT:/cvs
Module name:ports
Changes by: bl...@cvs.openbsd.org   2018/06/15 12:52:42

Modified files:
devel/p5-Class-Date: Makefile distinfo 

Log message:
update p5-Class-Date to 1.1.17



CVS: cvs.openbsd.org: ports

2018-06-15 Thread Alexander Bluhm
CVSROOT:/cvs
Module name:ports
Changes by: bl...@cvs.openbsd.org   2018/06/15 12:36:20

Modified files:
net/p5-Net-DNS-SEC: Makefile distinfo 

Log message:
update p5-Net-DNS-SEC to 1.09



Re: [Update] GnuPG 2.2.8 for -stable

2018-06-15 Thread Jeremie Courreges-Anglas
On Fri, Jun 15 2018, Pierre-Emmanuel André  wrote:
> Hi,
>
> Small diff to update GnuPG 2 to it's latest version
> on OpenBSD -stable.
> Fix CVE-2018-12020
>
> Comments, ok ?

ok jca@

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



CVS: cvs.openbsd.org: ports

2018-06-15 Thread Rafael Sadowski
CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2018/06/15 11:50:46

Modified files:
x11/qt5/qtwebkit: Makefile 

Log message:
Unbreak qtwebkit consumers after retguard. set -fno-ret-protector

Not an optimal solution but working is important. Better solution comes but
that takes time.

No objection from mortimer@



CVS: cvs.openbsd.org: ports

2018-06-15 Thread Rafael Sadowski
CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2018/06/15 11:31:14

Modified files:
x11/qt5: qt5.port.mk 

Log message:
Respect CC/CXX



CVS: cvs.openbsd.org: ports

2018-06-15 Thread Rafael Sadowski
CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2018/06/15 11:30:01

Modified files:
productivity/homebank: Makefile distinfo 

Log message:
Update homebank-5.1.8

Maintainer timeout

ok ajacoutot@



Re: New: net/busybeed

2018-06-15 Thread Base Pr1me
Gratitude. In the todo queue.

On Fri, Jun 15, 2018 at 10:31 AM, Stuart Henderson 
wrote:

> On 2018/06/15 10:19, Base Pr1me wrote:
> > Thanks for the input, Stewart.
> >
> > I have knocked around the idea of chroot'ing in the future. It is at
> least
> > currently pledged. ... well, according to my current understanding of the
> > pledge system.
>
> It is pledged, but for the process which has access to internet
> and rw access to the filesystem ("stdio tty rpath wpath inet proc")
> pledge doesn't add a lot of safety  even without chroot things would
> be a lot better if it dropped to an unprivileged uid.
>
>


Re: New: net/busybeed

2018-06-15 Thread Stuart Henderson
On 2018/06/15 10:19, Base Pr1me wrote:
> Thanks for the input, Stewart.
> 
> I have knocked around the idea of chroot'ing in the future. It is at least
> currently pledged. ... well, according to my current understanding of the
> pledge system.

It is pledged, but for the process which has access to internet
and rw access to the filesystem ("stdio tty rpath wpath inet proc")
pledge doesn't add a lot of safety  even without chroot things would
be a lot better if it dropped to an unprivileged uid.



Re: New: net/busybeed

2018-06-15 Thread Base Pr1me
Thanks for the input, Stewart.

I have knocked around the idea of chroot'ing in the future. It is at least
currently pledged. ... well, according to my current understanding of the
pledge system.

Thanks again,

T

On Fri, Jun 15, 2018 at 10:12 AM, Stuart Henderson 
wrote:

> On 2018/06/15 08:52, Base Pr1me wrote:
> > On Wed, Jun 6, 2018 at 8:31 AM, Base Pr1me 
> wrote:
> >
> > > Thanks. New version of the port attached.
> > >
> > > Changed:
> > > - added pkg/busybeed.rc
> > > - PLIST changed to use @rcscript instead of @sample for busybeed.rc
> > >
> > > Ok?
> > >
> > > Tracey
> > >
> > > On 6/6/18 1:43 AM, Stuart Henderson wrote:
> > >
> > >> On 2018/06/05 19:41, Base Pr1me wrote:
> > >>
> > >>> Hello,
> > >>>
> > >>> Attached is a new port, net/busybeed. The utility daemon is written
> > >>> specifically for OpenBSD by me. The port was created with tweaks from
> > >>> Brian
> > >>> Callahan (thanks!). The release source is available at
> > >>> https://github.com/spoollord/busybeed, with control updates to come
> > >>> later, when
> > >>> I have time to extend the development.
> > >>>
> > >>> The daemon attaches to configured devices, i.e. serial devices, IoT
> > >>> devices,
> > >>> IP addresses, etc. Think of it as an IoT packet router of sorts. I
> use
> > >>> it for
> > >>> my XBee, ESP8266, and NRF24 devices. Clients connect to route and
> parse
> > >>> packets
> > >>> for database ingestion, etc.
> > >>>
> > >>> --
> > >>> pkg/DESCR:
> > >>> The busybeed OpenBSD daemon provides a mechanism for clients and
> client
> > >>> processes to communicate with an array of serial and IoT devices. At
> > >>> its core, busybeed is primarily a packet repeater in that it polls
> for
> > >>> packets to swap between subscriber clients and devices. However,
> > >>> busybeed also provides password control over those connections,
> > >>> including client limits.
> > >>> --
> > >>>
> > >>> I've only been able to compile and test on amd64.
> > >>>
> > >>> Ok?
> > >>>
> > >>> Tracey
> > >>>
> > >>> You're installing the rc script by @sample'ing from an installed
> file,
> > >> that should be switched to files/busybeed.rc in the port instead,
> using
> > >> the @rcscript annotation.
> > >>
> > >>
> > > Just an update to previous emails:
> >
> > I found a couple of errors in the previous port. New port attached with
> > fixes to properly install the example config file and work for i386.
> >
> > Currently testing on i386, and it appears to be running properly.
> >
> > If anyone would like to test it out with their own IoT/serial devices,
> I've
> > packaged for 6.3 and snapshots, amd64 and i386.
> >
> > Pub key: https://packages.traceyemery.net/emery-pkg.pub
> > doas env PKG_PATH=https://packages.traceyemery.net/%m/ pkg_add busybeed
> >
> > Thanks for your consideration.
>
>
>
> Diff on top cleans up a few things ports-wise, it does seem like the
> sort of thing that wants to run as a different uid than root though ..
>
>
> diff --git Makefile Makefile
> index 824d001..55c4ee4 100644
> --- Makefile
> +++ Makefile
> @@ -4,7 +4,6 @@ V = 1.03
>  COMMENT =  device packet subscription and routing for OpenBSD
>  DISTNAME = busybeed-${V}
>  CATEGORIES =   net
> -REVISION = 5
>
>  HOMEPAGE = https://github.com/spoollord/busybeed/
>  MAINTAINER =   Tracey Emery 
> @@ -16,15 +15,17 @@ WANTLIB += c pthread util event
>
>  MASTER_SITES = https://github.com/spoollord/
> busybeed/releases/download/v${V}/
>
> +MAKE_FLAGS =   CC="${CC}"
> +
>  NO_TEST =  Yes
>
> -EXAMPLESSRC =  /src/examples/etc
> +do-configure:
> +   sed -i 's,/etc/busybeed.conf,${SYSCONFDIR}/busybeed.conf,' \
> +   ${WRKSRC}/src/busybeed.{h,8,conf.5}
>
>  post-install:
> ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/busybeed
> -   cd ${WRKSRC}${EXAMPLESSRC} && ${INSTALL_DATA} busybeed.conf \
> -   ${PREFIX}/share/examples/busybeed
> -   cd ${WRKSRC}${EXAMPLESSRC}/rc.d && ${INSTALL_DATA} busybeed \
> +   ${INSTALL_DATA} ${WRKSRC}/src/examples/etc/busybeed.conf \
> ${PREFIX}/share/examples/busybeed
>
>  .include 
> diff --git pkg/PLIST pkg/PLIST
> index 6772011..a34b6a6 100644
> --- pkg/PLIST
> +++ pkg/PLIST
> @@ -1,12 +1,9 @@
>  @comment $OpenBSD: PLIST,v$
> -@mode
> +@rcscript ${RCDIR}/busybeed
>  @man man/man5/busybeed.conf.5
>  @man man/man8/busybeed.8
>  @bin sbin/busybeed
>  share/examples/busybeed/
> -share/examples/busybeed/busybeed
> -@mode 644
>  share/examples/busybeed/busybeed.conf
> -@sample ${SYSCONFDIR}/examples/busybeed.conf
> -@mode 755
> -@rcscript ${RCDIR}/busybeed
> +@mode 640
> +@sample ${SYSCONFDIR}/busybeed.conf
> diff --git pkg/busybeed.rc pkg/busybeed.rc
> index 8021d8d..a7ee036 100755
> --- pkg/busybeed.rc
> +++ pkg/busybeed.rc
> @@ -1,6 +1,7 @@
>  #!/bin/sh
>  #
> -# $OpenBSD: busybeed,v 1.02 2018/06/06 07:49:12 basepr1me Exp $
> +# $OpenBSD$
> +
>  daemon="${TRUEPREFIX}/sbin/busybeed"
>
>  . /etc/rc.d/rc.subr
>


Re: New: net/busybeed

2018-06-15 Thread Stuart Henderson
On 2018/06/15 08:52, Base Pr1me wrote:
> On Wed, Jun 6, 2018 at 8:31 AM, Base Pr1me  wrote:
> 
> > Thanks. New version of the port attached.
> >
> > Changed:
> > - added pkg/busybeed.rc
> > - PLIST changed to use @rcscript instead of @sample for busybeed.rc
> >
> > Ok?
> >
> > Tracey
> >
> > On 6/6/18 1:43 AM, Stuart Henderson wrote:
> >
> >> On 2018/06/05 19:41, Base Pr1me wrote:
> >>
> >>> Hello,
> >>>
> >>> Attached is a new port, net/busybeed. The utility daemon is written
> >>> specifically for OpenBSD by me. The port was created with tweaks from
> >>> Brian
> >>> Callahan (thanks!). The release source is available at
> >>> https://github.com/spoollord/busybeed, with control updates to come
> >>> later, when
> >>> I have time to extend the development.
> >>>
> >>> The daemon attaches to configured devices, i.e. serial devices, IoT
> >>> devices,
> >>> IP addresses, etc. Think of it as an IoT packet router of sorts. I use
> >>> it for
> >>> my XBee, ESP8266, and NRF24 devices. Clients connect to route and parse
> >>> packets
> >>> for database ingestion, etc.
> >>>
> >>> --
> >>> pkg/DESCR:
> >>> The busybeed OpenBSD daemon provides a mechanism for clients and client
> >>> processes to communicate with an array of serial and IoT devices. At
> >>> its core, busybeed is primarily a packet repeater in that it polls for
> >>> packets to swap between subscriber clients and devices. However,
> >>> busybeed also provides password control over those connections,
> >>> including client limits.
> >>> --
> >>>
> >>> I've only been able to compile and test on amd64.
> >>>
> >>> Ok?
> >>>
> >>> Tracey
> >>>
> >>> You're installing the rc script by @sample'ing from an installed file,
> >> that should be switched to files/busybeed.rc in the port instead, using
> >> the @rcscript annotation.
> >>
> >>
> > Just an update to previous emails:
> 
> I found a couple of errors in the previous port. New port attached with
> fixes to properly install the example config file and work for i386.
> 
> Currently testing on i386, and it appears to be running properly.
> 
> If anyone would like to test it out with their own IoT/serial devices, I've
> packaged for 6.3 and snapshots, amd64 and i386.
> 
> Pub key: https://packages.traceyemery.net/emery-pkg.pub
> doas env PKG_PATH=https://packages.traceyemery.net/%m/ pkg_add busybeed
> 
> Thanks for your consideration.



Diff on top cleans up a few things ports-wise, it does seem like the
sort of thing that wants to run as a different uid than root though ..


diff --git Makefile Makefile
index 824d001..55c4ee4 100644
--- Makefile
+++ Makefile
@@ -4,7 +4,6 @@ V = 1.03
 COMMENT =  device packet subscription and routing for OpenBSD
 DISTNAME = busybeed-${V}
 CATEGORIES =   net
-REVISION = 5
 
 HOMEPAGE = https://github.com/spoollord/busybeed/
 MAINTAINER =   Tracey Emery 
@@ -16,15 +15,17 @@ WANTLIB += c pthread util event
 
 MASTER_SITES = https://github.com/spoollord/busybeed/releases/download/v${V}/
 
+MAKE_FLAGS =   CC="${CC}"
+
 NO_TEST =  Yes
 
-EXAMPLESSRC =  /src/examples/etc
+do-configure:
+   sed -i 's,/etc/busybeed.conf,${SYSCONFDIR}/busybeed.conf,' \
+   ${WRKSRC}/src/busybeed.{h,8,conf.5}
 
 post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/busybeed
-   cd ${WRKSRC}${EXAMPLESSRC} && ${INSTALL_DATA} busybeed.conf \
-   ${PREFIX}/share/examples/busybeed
-   cd ${WRKSRC}${EXAMPLESSRC}/rc.d && ${INSTALL_DATA} busybeed \
+   ${INSTALL_DATA} ${WRKSRC}/src/examples/etc/busybeed.conf \
${PREFIX}/share/examples/busybeed
 
 .include 
diff --git pkg/PLIST pkg/PLIST
index 6772011..a34b6a6 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -1,12 +1,9 @@
 @comment $OpenBSD: PLIST,v$
-@mode
+@rcscript ${RCDIR}/busybeed
 @man man/man5/busybeed.conf.5
 @man man/man8/busybeed.8
 @bin sbin/busybeed
 share/examples/busybeed/
-share/examples/busybeed/busybeed
-@mode 644
 share/examples/busybeed/busybeed.conf
-@sample ${SYSCONFDIR}/examples/busybeed.conf
-@mode 755
-@rcscript ${RCDIR}/busybeed
+@mode 640
+@sample ${SYSCONFDIR}/busybeed.conf
diff --git pkg/busybeed.rc pkg/busybeed.rc
index 8021d8d..a7ee036 100755
--- pkg/busybeed.rc
+++ pkg/busybeed.rc
@@ -1,6 +1,7 @@
 #!/bin/sh
 #
-# $OpenBSD: busybeed,v 1.02 2018/06/06 07:49:12 basepr1me Exp $
+# $OpenBSD$
+
 daemon="${TRUEPREFIX}/sbin/busybeed"
 
 . /etc/rc.d/rc.subr



calligra picks up qca-qt?

2018-06-15 Thread Stuart Henderson
Full log attached, excerpt below (note the "warning: libqca-qt5.so.0.0 .. n=
ot found"),
and I have a copy of the build directory if needed (note to self: i386-2)

FAILED: libs/main/tests/testfindmatch
: && /usr/obj/ports/calligra-3.1.0/bin/c++  -O2 -pipe -std=3Dc++0x -fno-ope=
rator-names -fno-exceptions -Wno-gnu-zero-variadic-macro-arguments -Wall -W=
extra -Wcast-align -Wchar-subscripts -Wformat-security -Wno-long-long -Wpoi=
nter-arith -Wundef -Wnon-virtual-dtor -Woverloaded-virtual -Werror=3Dreturn=
-type -Wvla -Wdate-time -fdiagnostics-color=3Dalways -DNDEBUG  -Wl,--enable=
-new-dtags libs/main/tests/CMakeFiles/testfindmatch.dir/testfindmatch.cpp.o=
 libs/main/tests/CMakeFiles/testfindmatch.dir/testfindmatch_autogen/mocs_co=
mpilation.cpp.o  -o libs/main/tests/testfindmatch -L/usr/obj/ports/calligra=
-3.1.0/build-i386/libs/main  -L/usr/local/lib/qt5/.  -L/usr/obj/ports/calli=
gra-3.1.0/build-i386/libs/widgets  -L/usr/obj/ports/calligra-3.1.0/build-i3=
86/libs/textlayout  -L/usr/obj/ports/calligra-3.1.0/build-i386/libs/text  -=
L/usr/obj/ports/calligra-3.1.0/build-i386/libs/flake  -L/usr/obj/ports/call=
igra-3.1.0/build-i386/libs/pigment  -L/usr/local/lib  -L/usr/obj/ports/call=
igra-3.1.0/build-i386/libs/widgetutils  -L/usr/obj/ports/calligra-3.1.0/bui=
ld-i386/libs/odf  -L/usr/obj/ports/calligra-3.1.0/build-i386/libs/store  -L=
/usr/obj/ports/calligra-3.1.0/build-i386/libs/kundo2  -L/usr/obj/ports/call=
igra-3.1.0/build-i386/libs/version -Wl,-rpath,/usr/obj/ports/calligra-3.1.0=
/build-i386/libs/main:/usr/local/lib/qt5/.:/usr/obj/ports/calligra-3.1.0/bu=
ild-i386/libs/widgets:/usr/obj/ports/calligra-3.1.0/build-i386/libs/textlay=
out:/usr/obj/ports/calligra-3.1.0/build-i386/libs/text:/usr/obj/ports/calli=
gra-3.1.0/build-i386/libs/flake:/usr/obj/ports/calligra-3.1.0/build-i386/li=
bs/pigment:/usr/obj/ports/calligra-3.1.0/build-i386/libs/widgetutils:/usr/o=
bj/ports/calligra-3.1.0/build-i386/libs/odf:/usr/obj/ports/calligra-3.1.0/b=
uild-i386/libs/store:/usr/local/lib:/usr/obj/ports/calligra-3.1.0/build-i38=
6/libs/kundo2:/usr/obj/ports/calligra-3.1.0/build-i386/libs/version:/usr/ob=
j/ports/calligra-3.1.0/build-i386/libs/plugin:/usr/X11R6/lib -lkomain -lQt5=
Test -lkowidgets -lkotextlayout -lkotext -lflake -lpigmentcms -lImath -lIlm=
Imf -lIex -lHalf -lIlmThread -lkowidgetutils -lkoodf -lkostore -lkundo2 -lk=
oversion -lKF5KIOWidgets -lKF5KIOCore -lKF5JobWidgets -lQt5Concurrent -lKF5=
XmlGui -lKF5TextWidgets -lKF5Service -lKF5Completion -lKF5SonnetUi -lQt5Net=
work -lQt5PrintSupport -lKF5ConfigWidgets -lKF5I18n -lKF5WidgetsAddons -lKF=
5Codecs -lKF5ConfigGui -lQt5Xml -lKF5ConfigCore -lKF5Auth -lKF5CoreAddons -=
lQt5Widgets -lQt5Gui -lQt5DBus -lQt5Core -Wl,-rpath-link,/usr/local/lib/qt5=
/.:/usr/local/lib:/usr/obj/ports/calligra-3.1.0/build-i386/libs/plugin:/usr=
/X11R6/lib && :
/usr/local/lib/qt5/./libQt5Core.so.2.2: warning: rand_r() is not random, it=
 is deterministic.
/usr/local/lib/qt5/./libQt5Core.so.2.2: warning: rand() may return determin=
istic values, is that what you want?
/usr/local/lib/qt5/./libQt5Test.so.2.2: warning: strcpy() is almost always =
misused, please use strlcpy()
/usr/local/lib/libKF5KIOCore.so.5.1: warning: sprintf() is often misused, p=
lease use snprintf()
/usr/X11R6/lib/libICE.so.10.0: warning: strcat() is almost always misused, =
please use strlcat()
/usr/bin/ld: warning: libqca-qt5.so.0.0, needed by /usr/obj/ports/calligra-=
3.1.0/build-i386/libs/store/libkostore.so.16.0, not found (try using -rpath=
 or -rpath-link)
/usr/X11R6/lib/libGL.so.17.1: warning: random() may return deterministic va=
lues, is that what you want?
/usr/local/lib/libdbus-1.so.11.2: warning: vsprintf() is often misused, ple=
ase use vsnprintf()
/usr/local/lib/libglib-2.0.so.4200.7: warning: stpcpy() is dangerous; do no=
t use it
/usr/obj/ports/calligra-3.1.0/build-i386/libs/store/libkostore.so.16.0: und=
efined reference to `QCA::Filter::~Filter()'
/usr/obj/ports/calligra-3.1.0/build-i386/libs/store/libkostore.so.16.0: und=
efined reference to `QCA::Initializer::~Initializer()'
/usr/obj/ports/calligra-3.1.0/build-i386/libs/store/libkostore.so.16.0: und=
efined reference to `QCA::Random::~Random()'
[...snip...]



Re: New: net/busybeed

2018-06-15 Thread Base Pr1me
On Wed, Jun 6, 2018 at 8:31 AM, Base Pr1me  wrote:

> Thanks. New version of the port attached.
>
> Changed:
> - added pkg/busybeed.rc
> - PLIST changed to use @rcscript instead of @sample for busybeed.rc
>
> Ok?
>
> Tracey
>
> On 6/6/18 1:43 AM, Stuart Henderson wrote:
>
>> On 2018/06/05 19:41, Base Pr1me wrote:
>>
>>> Hello,
>>>
>>> Attached is a new port, net/busybeed. The utility daemon is written
>>> specifically for OpenBSD by me. The port was created with tweaks from
>>> Brian
>>> Callahan (thanks!). The release source is available at
>>> https://github.com/spoollord/busybeed, with control updates to come
>>> later, when
>>> I have time to extend the development.
>>>
>>> The daemon attaches to configured devices, i.e. serial devices, IoT
>>> devices,
>>> IP addresses, etc. Think of it as an IoT packet router of sorts. I use
>>> it for
>>> my XBee, ESP8266, and NRF24 devices. Clients connect to route and parse
>>> packets
>>> for database ingestion, etc.
>>>
>>> --
>>> pkg/DESCR:
>>> The busybeed OpenBSD daemon provides a mechanism for clients and client
>>> processes to communicate with an array of serial and IoT devices. At
>>> its core, busybeed is primarily a packet repeater in that it polls for
>>> packets to swap between subscriber clients and devices. However,
>>> busybeed also provides password control over those connections,
>>> including client limits.
>>> --
>>>
>>> I've only been able to compile and test on amd64.
>>>
>>> Ok?
>>>
>>> Tracey
>>>
>>> You're installing the rc script by @sample'ing from an installed file,
>> that should be switched to files/busybeed.rc in the port instead, using
>> the @rcscript annotation.
>>
>>
> Just an update to previous emails:

I found a couple of errors in the previous port. New port attached with
fixes to properly install the example config file and work for i386.

Currently testing on i386, and it appears to be running properly.

If anyone would like to test it out with their own IoT/serial devices, I've
packaged for 6.3 and snapshots, amd64 and i386.

Pub key: https://packages.traceyemery.net/emery-pkg.pub
doas env PKG_PATH=https://packages.traceyemery.net/%m/ pkg_add busybeed

Thanks for your consideration.


port-busybeed-1.03.tar.gz
Description: application/gzip


CVS: cvs.openbsd.org: ports

2018-06-15 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/06/15 08:28:27

Modified files:
sysutils/awscli: Makefile distinfo 

Log message:
Update to awscli-1.15.39.



CVS: cvs.openbsd.org: ports

2018-06-15 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/06/15 08:28:15

Modified files:
net/py-botocore: Makefile distinfo 

Log message:
Update to py-botocore-1.10.39.



Re: NEW: devel/libcoap [repost]

2018-06-15 Thread Elias M. Mariani
btw, Makefile didn't have whitespaces between all variables, but OK anyways.

2018-06-15 11:02 GMT-03:00 Elias M. Mariani :
> Makefile its OK.
> Build OK.
> Install OK.
> The server and client works.
> make port-lib-depends-check without errors.
>
> Can I give an OK ?
> OK by me if that's the case.
>
> Cheers.
> Elias.
>
>
> 2018-06-14 17:00 GMT-03:00 Stuart Henderson :
>> I'm not expecting many to be able to actually test this, but it
>> does work. Does anyone have time to review it ports-wise at least
>> please? OK to commit?
>>
>> Full message attached so you don't have to go digging for a 2-week
>> old mail with the tgz.
>>
>>
>>
>> -- Mensaje reenviado --
>> From: Stuart Henderson 
>> To: ports 
>> Cc:
>> Bcc:
>> Date: Sun, 3 Jun 2018 01:11:38 +0100
>> Subject: NEW: devel/libcoap
>> Thought I'd have a play with some controllable lights so I put this
>> port together. Some tests fail (it has some which want v4-mapped-in-v6)
>> but the main thing I'm interested in at the moment is coap-client which
>> works well enough.
>>
>> I had to use gnu libtool (I ran out of beer trying to get it to work
>> with libtool in base, now I just have a bottle which says Henri Bardouin
>> on it so I'm sending this while I can still type ;) so if anyone has
>> ideas how to fix that they would be welcome.
>>
>> Anyway it works well enough, so.. ok to import?
>>
>> (see https://chebe.dreamwidth.org/tag/lights if you want to get it
>> working with the Trådfri gateway, some of the older guides you might
>> find don't show how to do the DTLS identity setup which newer
>> firmware requires, I pieced it together then found that page,
>> which would have saved a bit of time if I'd found it earlier :)
>>
>>
>> --
>> libcoap implements a lightweight application-protocol for devices that
>> are constrained in their resources such as computing power, RF range,
>> memory, bandwith, or network packet sizes. This protocol, CoAP was
>> standardized in the IETF as RFC 7252.
>>
>> The library provides the core functionality for development of
>> resource-efficient CoAP servers and clients, including resource
>> observation and block-wise transfer.
>>
>> Example implementations show how these features can be used in
>> applications:
>>
>> coap-client is a wget-like tool to generate simple requests for
>> retrieval and modification of resources on a remote server.
>>
>> coap-server is a basic server application that illustrates various
>> server-side features of libcoap.
>>
>> coap-rd implements a simple CoAP Resource Directory.
>> --
>>



Re: NEW: devel/libcoap [repost]

2018-06-15 Thread Elias M. Mariani
Makefile its OK.
Build OK.
Install OK.
The server and client works.
make port-lib-depends-check without errors.

Can I give an OK ?
OK by me if that's the case.

Cheers.
Elias.


2018-06-14 17:00 GMT-03:00 Stuart Henderson :
> I'm not expecting many to be able to actually test this, but it
> does work. Does anyone have time to review it ports-wise at least
> please? OK to commit?
>
> Full message attached so you don't have to go digging for a 2-week
> old mail with the tgz.
>
>
>
> -- Mensaje reenviado --
> From: Stuart Henderson 
> To: ports 
> Cc:
> Bcc:
> Date: Sun, 3 Jun 2018 01:11:38 +0100
> Subject: NEW: devel/libcoap
> Thought I'd have a play with some controllable lights so I put this
> port together. Some tests fail (it has some which want v4-mapped-in-v6)
> but the main thing I'm interested in at the moment is coap-client which
> works well enough.
>
> I had to use gnu libtool (I ran out of beer trying to get it to work
> with libtool in base, now I just have a bottle which says Henri Bardouin
> on it so I'm sending this while I can still type ;) so if anyone has
> ideas how to fix that they would be welcome.
>
> Anyway it works well enough, so.. ok to import?
>
> (see https://chebe.dreamwidth.org/tag/lights if you want to get it
> working with the Trådfri gateway, some of the older guides you might
> find don't show how to do the DTLS identity setup which newer
> firmware requires, I pieced it together then found that page,
> which would have saved a bit of time if I'd found it earlier :)
>
>
> --
> libcoap implements a lightweight application-protocol for devices that
> are constrained in their resources such as computing power, RF range,
> memory, bandwith, or network packet sizes. This protocol, CoAP was
> standardized in the IETF as RFC 7252.
>
> The library provides the core functionality for development of
> resource-efficient CoAP servers and clients, including resource
> observation and block-wise transfer.
>
> Example implementations show how these features can be used in
> applications:
>
> coap-client is a wget-like tool to generate simple requests for
> retrieval and modification of resources on a remote server.
>
> coap-server is a basic server application that illustrates various
> server-side features of libcoap.
>
> coap-rd implements a simple CoAP Resource Directory.
> --
>



CVS: cvs.openbsd.org: ports

2018-06-15 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/06/15 07:43:14

Modified files:
net/py-boto3   : Makefile distinfo 

Log message:
Update to py-boto3-1.7.39.



CVS: cvs.openbsd.org: ports

2018-06-15 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/06/15 07:41:29

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

Log message:
Update to totem-3.26.1.



[Update] GnuPG 2.2.8 for -stable

2018-06-15 Thread Pierre-Emmanuel André
Hi,

Small diff to update GnuPG 2 to it's latest version
on OpenBSD -stable.
Fix CVE-2018-12020

Comments, ok ?
Regards,
Index: Makefile
===
RCS file: /cvs/ports/security/gnupg2/Makefile,v
retrieving revision 1.56
diff -u -p -u -p -r1.56 Makefile
--- Makefile	23 Jan 2018 13:57:02 -	1.56
+++ Makefile	15 Jun 2018 12:56:41 -
@@ -2,7 +2,7 @@
 
 COMMENT =	GNU privacy guard - a free PGP replacement
 
-DISTNAME =	gnupg-2.2.4
+DISTNAME =	gnupg-2.2.8
 CATEGORIES = 	security
 
 MASTER_SITES =	${MASTER_SITE_GNUPG:=gnupg/}
Index: distinfo
===
RCS file: /cvs/ports/security/gnupg2/distinfo,v
retrieving revision 1.26
diff -u -p -u -p -r1.26 distinfo
--- distinfo	23 Jan 2018 13:57:02 -	1.26
+++ distinfo	15 Jun 2018 12:56:41 -
@@ -1,2 +1,2 @@
-SHA256 (gnupg-2.2.4.tar.bz2) = QBo+ZHgP36bXZw3giAqlydWJs9t6cJiXnXYGzsVG8uw=
-SIZE (gnupg-2.2.4.tar.bz2) = 6571487
+SHA256 (gnupg-2.2.8.tar.bz2) = d3tMuM7SGWWlBT1Pog/hFITwpHjz0BHO9QihpJ21Dc0=
+SIZE (gnupg-2.2.8.tar.bz2) = 6632465


CVS: cvs.openbsd.org: ports

2018-06-15 Thread Giovanni Bechis
CVSROOT:/cvs
Module name:ports
Changes by: giova...@cvs.openbsd.org2018/06/15 06:09:22

Modified files:
mail/enigmail  : Makefile distinfo 
mail/enigmail/pkg: PLIST-main PLIST-seamonkey 

Log message:
update to 2.0.7
make it compatibile with Thundirbird 60.x
prodded, hints and ok landry@



Re: finally

2018-06-15 Thread Jeffrey Joshua Rollin
On 15 June 2018 at 11:32, Marc Espie  wrote:

> I've just committed a fix to the infamous
>
> Fatal error: can't parse OpenBSD::RequiredBy: writing
> /home/espie/cups-bugs/vardbpkg/cups-libs-2.2.7/+REQUIRED_BY: No such file
> or directory at /usr/libdata/perl5/OpenBSD/RequiredBy.pm line 30.
>
> bug.
>
> That bug was >3 years old at that point.
>
> It proved to be rather elusive, and I finally figured out ways to
> reproduce it
> a week ago.
>
> Even now, you won't see the code from the fix itself triggered too often,
> as it is dependent on quite a few rare conditions, including *a lot* of
> hash tables traversals.
>
> Elated it's finally fixed.
>

Mazel tov. Not one I've seen, but glad it's fixed for everyone. Thanks,

Jeff.


textproc/go-text usage issues

2018-06-15 Thread Anthony J. Bentley
Hi,

While prodding at wireguard-go, I hit the following error:

/usr/bin/env -i GOCACHE=off 
GOPATH="/usr/ports/pobj/wireguard-go-0.0.20180613/go:/usr/local/go-pkg:/usr/ports/pobj/wireguard-go-0.0.20180613/devel/go-tools/tools-*/"
 
PATH="/usr/ports/pobj/wireguard-go-0.0.20180613/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11R6/bin"
 go install -x all
/usr/local/go-pkg/src/golang.org/x/text/cmd/gotext/main.go:31:2: cannot find 
package "golang.org/x/tools/go/buildutil" in any of:
/usr/local/go/src/golang.org/x/tools/go/buildutil (from $GOROOT)

/usr/ports/pobj/wireguard-go-0.0.20180613/go/src/golang.org/x/tools/go/buildutil
 (from $GOPATH)
/usr/local/go-pkg/src/golang.org/x/tools/go/buildutil

/usr/ports/pobj/wireguard-go-0.0.20180613/devel/go-tools/tools-*/src/golang.org/x/tools/go/buildutil
/usr/local/go-pkg/src/golang.org/x/text/message/pipeline/extract.go:22:2: 
cannot find package "golang.org/x/tools/go/loader" in any of:
/usr/local/go/src/golang.org/x/tools/go/loader (from $GOROOT)

/usr/ports/pobj/wireguard-go-0.0.20180613/go/src/golang.org/x/tools/go/loader 
(from $GOPATH)
/usr/local/go-pkg/src/golang.org/x/tools/go/loader

/usr/ports/pobj/wireguard-go-0.0.20180613/devel/go-tools/tools-*/src/golang.org/x/tools/go/loader

I don't know anything about Go, but it seems that our textproc/go-text
package relies on some modules that should be in devel/go-tools, yet
aren't. My weak attempt to add them didn't seem to result in any PLIST
change:

Index: Makefile
===
RCS file: /cvs/ports/devel/go-tools/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile14 Apr 2018 22:53:54 -  1.17
+++ Makefile15 Jun 2018 10:35:10 -
@@ -7,7 +7,7 @@ GH_COMMIT = ce871d178848e3eea1e8795e5c
 DISTNAME = go-tools-1.10.20180216
 CATEGORIES =   devel
 HOMEPAGE = https://godoc.org/golang.org/x/tools
-REVISION = 0
+REVISION = 1
 
 MAINTAINER =   Dmitrij D. Czarkoff 
 
@@ -48,7 +48,8 @@ _SUBPKGS =benchcmp \
stringer \
toolstash
 
-ALL_TARGET =   ${_SUBPKGS:%=${_MAIN}/cmd/%}
+ALL_TARGET =   ${_SUBPKGS:%=${_MAIN}/cmd/%} \
+   ${_MAIN}/go/loader ${_MAIN}/go/buildutil
 WRKSRC =   ${MODGO_WORKSPACE}/src/${_MAIN}
 
 # godoc needs special handling - prior to Go 1.2, godoc was part of the base

I don't know what I'm missing here--any insights? The WIP wireguard port
is attached.

-- 
Anthony J. Bentley


wireguard-go.tar.gz
Description: wireguard-go.tar.gz


finally

2018-06-15 Thread Marc Espie
I've just committed a fix to the infamous 

Fatal error: can't parse OpenBSD::RequiredBy: writing 
/home/espie/cups-bugs/vardbpkg/cups-libs-2.2.7/+REQUIRED_BY: No such file or 
directory at /usr/libdata/perl5/OpenBSD/RequiredBy.pm line 30.

bug.

That bug was >3 years old at that point.

It proved to be rather elusive, and I finally figured out ways to reproduce it
a week ago.

Even now, you won't see the code from the fix itself triggered too often,
as it is dependent on quite a few rare conditions, including *a lot* of
hash tables traversals.

Elated it's finally fixed.



CVS: cvs.openbsd.org: ports

2018-06-15 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/06/15 04:20:53

Modified files:
lang/php   : Makefile.inc 
lang/php/5.6   : Makefile 
lang/php/5.6/pkg: PLIST-gd PLIST-main 
lang/php/7.0   : Makefile 
lang/php/7.0/pkg: PLIST-gd PLIST-main 

Log message:
unbreak packaging with some of the no_* pseudo-flavours



Re: PHP make phpize work a little nicer

2018-06-15 Thread Stuart Henderson
This makes the installed m4 file look like this

 dnl Find php-config script
 PHP_ARG_WITH(php-config,,
-[  --with-php-config=PATH  Path to php-config [php-config]], php-config, no)
+[  --with-php-config=PATH  Path to php-config [php-config]], php-config-{$PV}, 
no)

This doesn't seem right to me, how is PV going to get passed in?

(It won't affect ports anyway as the php module already sets --with-php-config).


On 2018/06/15 10:02, Martijn van Duren wrote:
> ping
> 
> On 06/05/18 12:00, Martijn van Duren wrote:
> > After running phpize inside a pecl directory the configure script will 
> > ask where to find php-config. The following patch will add the required
> > magic to make it find it itself.
> > 
> > OK?
> > 
> > martijn@
> > 
> > Index: 5.6/Makefile
> > ===
> > RCS file: /cvs/ports/lang/php/5.6/Makefile,v
> > retrieving revision 1.75
> > diff -u -p -r1.75 Makefile
> > --- 5.6/Makefile4 Jun 2018 15:22:36 -   1.75
> > +++ 5.6/Makefile5 Jun 2018 10:00:17 -
> > @@ -3,6 +3,7 @@
> >  PV=5.6
> >  V= ${PV}.36
> >  REVISION=  7
> > +REVISION-main= 8
> >  
> >  MASTER_SITES0= https://download.suhosin.org/
> >  
> > Index: 5.6/patches/patch-scripts_phpize_m4
> > ===
> > RCS file: 5.6/patches/patch-scripts_phpize_m4
> > diff -N 5.6/patches/patch-scripts_phpize_m4
> > --- /dev/null   1 Jan 1970 00:00:00 -
> > +++ 5.6/patches/patch-scripts_phpize_m4 5 Jun 2018 10:00:17 -
> > @@ -0,0 +1,12 @@
> > +$OpenBSD$
> > +--- scripts/phpize.m4.orig Thu Jul  6 00:25:00 2017
> >  scripts/phpize.m4  Wed Oct 11 14:13:26 2017
> > +@@ -36,7 +36,7 @@ PHP_SHLIB_SUFFIX_NAMES
> > + 
> > + dnl Find php-config script
> > + PHP_ARG_WITH(php-config,,
> > +-[  --with-php-config=PATH  Path to php-config [php-config]], php-config, 
> > no)
> > ++[  --with-php-config=PATH  Path to php-config [php-config]], 
> > php-config-{$PV}, no)
> > + 
> > + dnl For BC
> > + PHP_CONFIG=$PHP_PHP_CONFIG
> > Index: 7.0/Makefile
> > ===
> > RCS file: /cvs/ports/lang/php/7.0/Makefile,v
> > retrieving revision 1.58
> > diff -u -p -r1.58 Makefile
> > --- 7.0/Makefile4 Jun 2018 15:22:36 -   1.58
> > +++ 7.0/Makefile5 Jun 2018 10:00:17 -
> > @@ -3,6 +3,7 @@
> >  PV=7.0
> >  V= ${PV}.30
> >  REVISION=  7
> > +REVISION-main= 8
> >  
> >  BUILD_DEPENDS+=devel/bison
> >  
> > Index: 7.0/patches/patch-scripts_phpize_m4
> > ===
> > RCS file: 7.0/patches/patch-scripts_phpize_m4
> > diff -N 7.0/patches/patch-scripts_phpize_m4
> > --- /dev/null   1 Jan 1970 00:00:00 -
> > +++ 7.0/patches/patch-scripts_phpize_m4 5 Jun 2018 10:00:17 -
> > @@ -0,0 +1,12 @@
> > +$OpenBSD$
> > +--- scripts/phpize.m4.orig Tue Sep 26 10:55:54 2017
> >  scripts/phpize.m4  Wed Oct 11 09:23:37 2017
> > +@@ -36,7 +36,7 @@ PHP_SHLIB_SUFFIX_NAMES
> > + 
> > + dnl Find php-config script
> > + PHP_ARG_WITH(php-config,,
> > +-[  --with-php-config=PATH  Path to php-config [php-config]], php-config, 
> > no)
> > ++[  --with-php-config=PATH  Path to php-config [php-config]], 
> > php-config-${PV}, no)
> > + 
> > + dnl For BC
> > + PHP_CONFIG=$PHP_PHP_CONFIG
> > 
> 



Re: PHP fix correct linking with external libpcre

2018-06-15 Thread Stuart Henderson
On 2018/06/15 10:04, Martijn van Duren wrote:
> Any takers for this one?

There are some hardcoded /usr/local which should use a variable.
Also, what testing have you done?


> martijn@
> 
> On 06/05/18 21:56, Martijn van Duren wrote:
> > On 06/05/18 18:17, Stuart Henderson wrote:
> >> On 2018/06/05 14:25, Nigel Taylor wrote:
> >>> I had sent issue to sthen@ already. Got past this by
> >>
> >> Received your initial report about an hour after this mail, I'd recommend
> >> sending to this address rather than the openbsd.org one to avoid 
> >> greylisting
> >> on lists.openbsd.org which doesn't do too well with btinternet's mail 
> >> provider.
> >>
> >>> doas -u _pbuild env CFLAGS="-I /usr/local/include" make package
> >>>
> >>> works.
> >>>
> >>>
> >>> Default is to build with php5.6, but pear-utils builds/runs with php 7.0
> >>> so have two versions of PHP present when building if just install build
> >>> dependencies for this port - should really only ever be one or the other
> >>> PHP version, would need a pear/pear-utils for both php 5.6 and 7.0.
> >>> Needs sorting out cleaning up, if going to have both flavors. It should
> >>> be possible to build and run with just a single php version and never
> >>> require the other.
> >>
> >> I looked at this when I did the switchover and came to the conclusion
> >> that for the minimal number of ports using php 5.6 it's not worth
> >> splitting into "pear-utils with php-5.6 in the #! line" and "pear-utils
> >> with php-7.0 in the #! line" just to avoid a build dep.
> >>
> >>> I've built everything else with LDEP's or RDEP's providing all the
> >>> dependencies have been defined just waiting on libreoffice to complete -
> >>> I used sqlport to determine what dependencies needed rebuilding, there
> >>> are BDEPS only's which may not have been rebuilt (seems unlikely to a
> >>> BDEP on php and not a matching RDEP) checked and the only cases found
> >>> are where there are -php subpackages the other subpackages -main etc
> >>> have no php runtime requirement, I normally build all the subpackages.
> >>>
> >>> So it's looks like just the one port with an issue with the include, and
> >>> simple enough to fix.
> >>
> >> I think better initially to just backout the breakage (which I've done)
> >> then consider what needs doing to fix it.
> >>
> > My bad, I had this in my branch from a year ago.
> > 
> > With diff below OK to restore backout?
> > 
> Index: 5.6/patches/patch-scripts_php-config_in
> ===
> RCS file: /cvs/ports/lang/php/5.6/patches/patch-scripts_php-config_in,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-scripts_php-config_in
> --- 5.6/patches/patch-scripts_php-config_in   15 Nov 2014 13:43:01 -  
> 1.1
> +++ 5.6/patches/patch-scripts_php-config_in   5 Jun 2018 19:51:07 -
> @@ -1,7 +1,8 @@
>  $OpenBSD: patch-scripts_php-config_in,v 1.1 2014/11/15 13:43:01 robert Exp $
>  scripts/php-config.in.orig.port  Thu Jul 18 16:37:33 2013
> -+++ scripts/php-config.inSun Jul 28 11:30:20 2013
> -@@ -1,12 +1,12 @@
> +Index: scripts/php-config.in
> +--- scripts/php-config.in.orig
>  scripts/php-config.in
> +@@ -1,13 +1,13 @@
>   #! /bin/sh
>   
>   SED="@SED@"
> @@ -12,11 +13,13 @@ $OpenBSD: patch-scripts_php-config_in,v 
>   version="@PHP_VERSION@"
>   vernum="@PHP_VERSION_ID@"
>  -include_dir="@includedir@/php"
> +-includes="-I$include_dir -I$include_dir/main -I$include_dir/TSRM 
> -I$include_dir/Zend -I$include_dir/ext -I$include_dir/ext/date/lib"
>  +include_dir="@PEAR_INSTALLDIR@/include"
> - includes="-I$include_dir -I$include_dir/main -I$include_dir/TSRM 
> -I$include_dir/Zend -I$include_dir/ext -I$include_dir/ext/date/lib"
> ++includes="-I/usr/local/include -I$include_dir -I$include_dir/main 
> -I$include_dir/TSRM -I$include_dir/Zend -I$include_dir/ext 
> -I$include_dir/ext/date/lib"
>   ldflags="@PHP_LDFLAGS@"
>   libs="@EXTRA_LIBS@"
> -@@ -24,10 +24,11 @@ php_sapis="@PHP_INSTALLED_SAPIS@"
> + extension_dir='@EXTENSION_DIR@'
> +@@ -24,10 +24,10 @@ php_sapis="@PHP_INSTALLED_SAPIS@"
>   for sapi in $php_sapis; do
> case $sapi in
> cli)
> @@ -24,7 +27,7 @@ $OpenBSD: patch-scripts_php-config_in,v 
>  +php_cli_binary="/usr/local/bin/php${program_suffix}"
>   ;;
> cgi)
> - 
> php_cgi_binary="@bindir@/${program_prefix}php-cgi${program_suffix}${exe_extension}"
> +-
> php_cgi_binary="@bindir@/${program_prefix}php-cgi${program_suffix}${exe_extension}"
>  +php_cgi_binary="/usr/local/bin/php-cgi${program_suffix}"
>   ;;
> esac
> Index: 7.0/patches/patch-scripts_php-config_in
> ===
> RCS file: /cvs/ports/lang/php/7.0/patches/patch-scripts_php-config_in,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 patch-scripts_php-config_in
> --- 7.0/patches/patch-scripts_php-config_in   14 Dec 2015 17:58:46 -  
> 1.1.1.1
> +++ 7.0/patches/patch-scripts_php-config_in   5 Jun 2018 

CVS: cvs.openbsd.org: ports

2018-06-15 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/06/15 03:29:03

Modified files:
infrastructure/db: user.list 
net: Makefile 

Log message:
+mac-telnet



CVS: cvs.openbsd.org: ports

2018-06-15 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/06/15 03:28:12

Log message:
import ports/net/mac-telnet, ok benoit@

Console tools for locating and connecting to devices using
MikroTik RouterOS's MAC-Telnet protocol.

Status:

Vendor Tag: sthen
Release Tags:   sthen_20180615

N ports/net/mac-telnet/Makefile
N ports/net/mac-telnet/distinfo
N ports/net/mac-telnet/pkg/PLIST
N ports/net/mac-telnet/pkg/DESCR
N ports/net/mac-telnet/pkg/README
N ports/net/mac-telnet/patches/patch-src_mactelnet_c
N ports/net/mac-telnet/patches/patch-src_interfaces_c
N ports/net/mac-telnet/patches/patch-src_mndp_c
N ports/net/mac-telnet/patches/patch-src_protocol_c
N ports/net/mac-telnet/patches/patch-src_macping_c
N ports/net/mac-telnet/patches/patch-src_mactelnetd_c
N ports/net/mac-telnet/patches/patch-src_Makefile_am

No conflicts created by this import



CVS: cvs.openbsd.org: ports

2018-06-15 Thread Anthony J . Bentley
CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2018/06/15 02:12:31

Modified files:
emulators/ppsspp: Makefile distinfo 
emulators/ppsspp/pkg: PLIST 

Log message:
Update to ppsspp-1.6.3.

With some suggestions from Jan Beich (FreeBSD); thanks!



PHP fix correct linking with external libpcre

2018-06-15 Thread Martijn van Duren
Any takers for this one?

martijn@

On 06/05/18 21:56, Martijn van Duren wrote:
> On 06/05/18 18:17, Stuart Henderson wrote:
>> On 2018/06/05 14:25, Nigel Taylor wrote:
>>> I had sent issue to sthen@ already. Got past this by
>>
>> Received your initial report about an hour after this mail, I'd recommend
>> sending to this address rather than the openbsd.org one to avoid greylisting
>> on lists.openbsd.org which doesn't do too well with btinternet's mail 
>> provider.
>>
>>> doas -u _pbuild env CFLAGS="-I /usr/local/include" make package
>>>
>>> works.
>>>
>>>
>>> Default is to build with php5.6, but pear-utils builds/runs with php 7.0
>>> so have two versions of PHP present when building if just install build
>>> dependencies for this port - should really only ever be one or the other
>>> PHP version, would need a pear/pear-utils for both php 5.6 and 7.0.
>>> Needs sorting out cleaning up, if going to have both flavors. It should
>>> be possible to build and run with just a single php version and never
>>> require the other.
>>
>> I looked at this when I did the switchover and came to the conclusion
>> that for the minimal number of ports using php 5.6 it's not worth
>> splitting into "pear-utils with php-5.6 in the #! line" and "pear-utils
>> with php-7.0 in the #! line" just to avoid a build dep.
>>
>>> I've built everything else with LDEP's or RDEP's providing all the
>>> dependencies have been defined just waiting on libreoffice to complete -
>>> I used sqlport to determine what dependencies needed rebuilding, there
>>> are BDEPS only's which may not have been rebuilt (seems unlikely to a
>>> BDEP on php and not a matching RDEP) checked and the only cases found
>>> are where there are -php subpackages the other subpackages -main etc
>>> have no php runtime requirement, I normally build all the subpackages.
>>>
>>> So it's looks like just the one port with an issue with the include, and
>>> simple enough to fix.
>>
>> I think better initially to just backout the breakage (which I've done)
>> then consider what needs doing to fix it.
>>
> My bad, I had this in my branch from a year ago.
> 
> With diff below OK to restore backout?
> 
Index: 5.6/patches/patch-scripts_php-config_in
===
RCS file: /cvs/ports/lang/php/5.6/patches/patch-scripts_php-config_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-scripts_php-config_in
--- 5.6/patches/patch-scripts_php-config_in 15 Nov 2014 13:43:01 -  
1.1
+++ 5.6/patches/patch-scripts_php-config_in 5 Jun 2018 19:51:07 -
@@ -1,7 +1,8 @@
 $OpenBSD: patch-scripts_php-config_in,v 1.1 2014/11/15 13:43:01 robert Exp $
 scripts/php-config.in.orig.portThu Jul 18 16:37:33 2013
-+++ scripts/php-config.in  Sun Jul 28 11:30:20 2013
-@@ -1,12 +1,12 @@
+Index: scripts/php-config.in
+--- scripts/php-config.in.orig
 scripts/php-config.in
+@@ -1,13 +1,13 @@
  #! /bin/sh
  
  SED="@SED@"
@@ -12,11 +13,13 @@ $OpenBSD: patch-scripts_php-config_in,v 
  version="@PHP_VERSION@"
  vernum="@PHP_VERSION_ID@"
 -include_dir="@includedir@/php"
+-includes="-I$include_dir -I$include_dir/main -I$include_dir/TSRM 
-I$include_dir/Zend -I$include_dir/ext -I$include_dir/ext/date/lib"
 +include_dir="@PEAR_INSTALLDIR@/include"
- includes="-I$include_dir -I$include_dir/main -I$include_dir/TSRM 
-I$include_dir/Zend -I$include_dir/ext -I$include_dir/ext/date/lib"
++includes="-I/usr/local/include -I$include_dir -I$include_dir/main 
-I$include_dir/TSRM -I$include_dir/Zend -I$include_dir/ext 
-I$include_dir/ext/date/lib"
  ldflags="@PHP_LDFLAGS@"
  libs="@EXTRA_LIBS@"
-@@ -24,10 +24,11 @@ php_sapis="@PHP_INSTALLED_SAPIS@"
+ extension_dir='@EXTENSION_DIR@'
+@@ -24,10 +24,10 @@ php_sapis="@PHP_INSTALLED_SAPIS@"
  for sapi in $php_sapis; do
case $sapi in
cli)
@@ -24,7 +27,7 @@ $OpenBSD: patch-scripts_php-config_in,v 
 +php_cli_binary="/usr/local/bin/php${program_suffix}"
  ;;
cgi)
- 
php_cgi_binary="@bindir@/${program_prefix}php-cgi${program_suffix}${exe_extension}"
+-
php_cgi_binary="@bindir@/${program_prefix}php-cgi${program_suffix}${exe_extension}"
 +php_cgi_binary="/usr/local/bin/php-cgi${program_suffix}"
  ;;
esac
Index: 7.0/patches/patch-scripts_php-config_in
===
RCS file: /cvs/ports/lang/php/7.0/patches/patch-scripts_php-config_in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-scripts_php-config_in
--- 7.0/patches/patch-scripts_php-config_in 14 Dec 2015 17:58:46 -  
1.1.1.1
+++ 7.0/patches/patch-scripts_php-config_in 5 Jun 2018 19:51:07 -
@@ -1,7 +1,8 @@
 $OpenBSD: patch-scripts_php-config_in,v 1.1.1.1 2015/12/14 17:58:46 robert Exp 
$
 scripts/php-config.in.orig.portThu Jul 18 16:37:33 2013
-+++ scripts/php-config.in  Sun Jul 28 11:30:20 2013
-@@ -1,12 +1,12 @@
+Index: scripts/php-config.in
+--- scripts/php-config.in.orig
 scripts/php-config.in
+@@ -1,13 

Re: PHP make phpize work a little nicer

2018-06-15 Thread Martijn van Duren
ping

On 06/05/18 12:00, Martijn van Duren wrote:
> After running phpize inside a pecl directory the configure script will 
> ask where to find php-config. The following patch will add the required
> magic to make it find it itself.
> 
> OK?
> 
> martijn@
> 
> Index: 5.6/Makefile
> ===
> RCS file: /cvs/ports/lang/php/5.6/Makefile,v
> retrieving revision 1.75
> diff -u -p -r1.75 Makefile
> --- 5.6/Makefile  4 Jun 2018 15:22:36 -   1.75
> +++ 5.6/Makefile  5 Jun 2018 10:00:17 -
> @@ -3,6 +3,7 @@
>  PV=  5.6
>  V=   ${PV}.36
>  REVISION=7
> +REVISION-main=   8
>  
>  MASTER_SITES0=   https://download.suhosin.org/
>  
> Index: 5.6/patches/patch-scripts_phpize_m4
> ===
> RCS file: 5.6/patches/patch-scripts_phpize_m4
> diff -N 5.6/patches/patch-scripts_phpize_m4
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ 5.6/patches/patch-scripts_phpize_m4   5 Jun 2018 10:00:17 -
> @@ -0,0 +1,12 @@
> +$OpenBSD$
> +--- scripts/phpize.m4.orig   Thu Jul  6 00:25:00 2017
>  scripts/phpize.m4Wed Oct 11 14:13:26 2017
> +@@ -36,7 +36,7 @@ PHP_SHLIB_SUFFIX_NAMES
> + 
> + dnl Find php-config script
> + PHP_ARG_WITH(php-config,,
> +-[  --with-php-config=PATH  Path to php-config [php-config]], php-config, no)
> ++[  --with-php-config=PATH  Path to php-config [php-config]], 
> php-config-{$PV}, no)
> + 
> + dnl For BC
> + PHP_CONFIG=$PHP_PHP_CONFIG
> Index: 7.0/Makefile
> ===
> RCS file: /cvs/ports/lang/php/7.0/Makefile,v
> retrieving revision 1.58
> diff -u -p -r1.58 Makefile
> --- 7.0/Makefile  4 Jun 2018 15:22:36 -   1.58
> +++ 7.0/Makefile  5 Jun 2018 10:00:17 -
> @@ -3,6 +3,7 @@
>  PV=  7.0
>  V=   ${PV}.30
>  REVISION=7
> +REVISION-main=   8
>  
>  BUILD_DEPENDS+=  devel/bison
>  
> Index: 7.0/patches/patch-scripts_phpize_m4
> ===
> RCS file: 7.0/patches/patch-scripts_phpize_m4
> diff -N 7.0/patches/patch-scripts_phpize_m4
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ 7.0/patches/patch-scripts_phpize_m4   5 Jun 2018 10:00:17 -
> @@ -0,0 +1,12 @@
> +$OpenBSD$
> +--- scripts/phpize.m4.orig   Tue Sep 26 10:55:54 2017
>  scripts/phpize.m4Wed Oct 11 09:23:37 2017
> +@@ -36,7 +36,7 @@ PHP_SHLIB_SUFFIX_NAMES
> + 
> + dnl Find php-config script
> + PHP_ARG_WITH(php-config,,
> +-[  --with-php-config=PATH  Path to php-config [php-config]], php-config, no)
> ++[  --with-php-config=PATH  Path to php-config [php-config]], 
> php-config-${PV}, no)
> + 
> + dnl For BC
> + PHP_CONFIG=$PHP_PHP_CONFIG
> 



Re: UPDATE: productivity/homebank

2018-06-15 Thread Antoine Jacoutot
On Fri, Jun 15, 2018 at 08:13:46AM +0200, Rafael Sadowski wrote:
> On Sat Jun 09, 2018 at 10:24:31AM +0200, Antoine Jacoutot wrote:
> > On Sat, Jun 09, 2018 at 10:20:37AM +0200, Rafael Sadowski wrote:
> > > Simple update to the latest stable 5.1.x version.
> > > 
> > > Highlights:
> > > - New WANTLIB fribidi and new location as in Makefile.template
> > 
> > That's probably because of pango. It doesn't warrant an LDEP.
> > 
> 
> ok, new diff below

OK

> Index: Makefile
> ===
> RCS file: /cvs/ports/productivity/homebank/Makefile,v
> retrieving revision 1.32
> diff -u -p -u -p -r1.32 Makefile
> --- Makefile  15 Mar 2018 15:41:21 -  1.32
> +++ Makefile  15 Jun 2018 06:12:11 -
> @@ -2,7 +2,7 @@
>  
>  COMMENT =personal accounting application
>  
> -DISTNAME =   homebank-5.1.7
> +DISTNAME =   homebank-5.1.8
>  
>  CATEGORIES = productivity x11
>  
> @@ -13,14 +13,15 @@ MAINTAINER =  Pierre-Emmanuel Andre   # GPLv2+
>  PERMIT_PACKAGE_CDROM =   Yes
>  
> +WANTLIB += atk-1.0 c cairo cairo-gobject fribidi gdk-3 gdk_pixbuf-2.0
> +WANTLIB += gio-2.0 glib-2.0 gobject-2.0 gtk-3 intl m ofx osp pango-1.0
> +WANTLIB += pangocairo-1.0 soup-2.4
> +
>  MASTER_SITES =   ${HOMEPAGE}/public/ \
>   ${HOMEPAGE}/public/old/
>  
>  MODULES =textproc/intltool
>  
> -WANTLIB += atk-1.0 c cairo cairo-gobject gdk-3 gdk_pixbuf-2.0
> -WANTLIB += gio-2.0 glib-2.0 gobject-2.0 gtk-3 m ofx osp pango-1.0
> -WANTLIB += pangocairo-1.0 intl soup-2.4
>  
>  LIB_DEPENDS =x11/gtk+3 \
>   devel/libofx \
> @@ -37,8 +38,5 @@ NO_TEST =   Yes
>  CONFIGURE_STYLE =gnu
>  CONFIGURE_ENV =  LDFLAGS="-L${LOCALBASE}/lib" \
>   CPPFLAGS="-I${LOCALBASE}/include"
> -
> -post-extract:
> - @cd ${WRKSRC} && chmod +x install-sh
>  
>  .include 
> Index: distinfo
> ===
> RCS file: /cvs/ports/productivity/homebank/distinfo,v
> retrieving revision 1.17
> diff -u -p -u -p -r1.17 distinfo
> --- distinfo  15 Mar 2018 15:41:21 -  1.17
> +++ distinfo  15 Jun 2018 06:12:11 -
> @@ -1,2 +1,2 @@
> -SHA256 (homebank-5.1.7.tar.gz) = V55TwAdkt4156OOIuSAsdgqcnv2sqDsy2Uj5Lg36X6c=
> -SIZE (homebank-5.1.7.tar.gz) = 2730934
> +SHA256 (homebank-5.1.8.tar.gz) = EIP8vGCcvJgaQsY9hKCcx9w91A9X0p4ItyC+Kz6v8js=
> +SIZE (homebank-5.1.8.tar.gz) = 2745061

-- 
Antoine



CVS: cvs.openbsd.org: ports

2018-06-15 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/06/15 00:36:30

Modified files:
net/py-pf  : Makefile distinfo 
net/py-pf/patches: patch-pf_constants_py python3-pf_filter_py 
net/py-pf/pkg  : PLIST 
Removed files:
net/py-pf/patches: patch-pf__struct_py patch-pf_queue_py 
   patch-pf_status_py 

Log message:
update to py-pf-0.1.9



Re: UPDATE: productivity/homebank

2018-06-15 Thread Rafael Sadowski
On Sat Jun 09, 2018 at 10:24:31AM +0200, Antoine Jacoutot wrote:
> On Sat, Jun 09, 2018 at 10:20:37AM +0200, Rafael Sadowski wrote:
> > Simple update to the latest stable 5.1.x version.
> > 
> > Highlights:
> > - New WANTLIB fribidi and new location as in Makefile.template
> 
> That's probably because of pango. It doesn't warrant an LDEP.
> 

ok, new diff below

Index: Makefile
===
RCS file: /cvs/ports/productivity/homebank/Makefile,v
retrieving revision 1.32
diff -u -p -u -p -r1.32 Makefile
--- Makefile15 Mar 2018 15:41:21 -  1.32
+++ Makefile15 Jun 2018 06:12:11 -
@@ -2,7 +2,7 @@
 
 COMMENT =  personal accounting application
 
-DISTNAME = homebank-5.1.7
+DISTNAME = homebank-5.1.8
 
 CATEGORIES =   productivity x11
 
@@ -13,14 +13,15 @@ MAINTAINER =Pierre-Emmanuel Andre 
Index: distinfo
===
RCS file: /cvs/ports/productivity/homebank/distinfo,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 distinfo
--- distinfo15 Mar 2018 15:41:21 -  1.17
+++ distinfo15 Jun 2018 06:12:11 -
@@ -1,2 +1,2 @@
-SHA256 (homebank-5.1.7.tar.gz) = V55TwAdkt4156OOIuSAsdgqcnv2sqDsy2Uj5Lg36X6c=
-SIZE (homebank-5.1.7.tar.gz) = 2730934
+SHA256 (homebank-5.1.8.tar.gz) = EIP8vGCcvJgaQsY9hKCcx9w91A9X0p4ItyC+Kz6v8js=
+SIZE (homebank-5.1.8.tar.gz) = 2745061