CVS: cvs.openbsd.org: ports

[Steven Mestdagh]

CVSROOT:/cvs
Module name:ports
Changes by: ste...@cvs.openbsd.org  2018/04/26 23:35:15

Modified files:
graphics/pstoedit: Makefile distinfo 
graphics/pstoedit/patches: patch-src_Makefile_in 

Log message:
update to 3.71

Re: NEW: godot - a 2D and 3D game engine and game development framework

[Stuart Henderson]

On 2018/04/26 18:00, Thomas Frohwein wrote:
> Thanks Stuart for identifying the problem with zstd and pointing me in
> in the right direction. I added a patch that reverts upstream's commit
> from October 26, 2017 that introduces the long-range matching which
> uses experimental/private APIs of zstd. Those APIs are not (yet?)
> exposed publicly in stable releases of zstd (see github issue #17374
> that Stuart pointed out to me).

These changes are all good and I didn't have any other concerns, OK
sthen@ if somebody would like to import.

samba-4.8.x (was: Re: [update] samba-4.7.7)

[Jeremie Courreges-Anglas]

On Mon, Apr 23 2018, Jeremie Courreges-Anglas  wrote:
> Here's an update to the latest samba-4.7.x release.  The plan is to
> update to 4.8.1 iff the database corruption problems seen with 4.8.0 are
> fixed.

Regarding this, the bug in 4.8.0 was not fixed in 4.8.1:

  https://lists.samba.org/archive/samba-technical/2018-April/127380.html
  https://bugzilla.samba.org/show_bug.cgi?id=13335
  https://attachments.samba.org/attachment.cgi?id=14114

samba-4.8.2 is planned for June 13:

  https://lists.samba.org/archive/samba-technical/2018-April/127368.html

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

Re: math/py-numpy depends on gcc 4.9

[Brian Callahan]

On 04/27/18 00:21, Jeremie Courreges-Anglas wrote:

On Thu, Apr 26 2018,  wrote:

I am building php on arm and trying to get rid of gcc 4.9 dependencies.
Py-numpy wants to build gcc 4.9.

lang/gcc/4.9 builds on arm now, you may stop your rampage. ;)


Can the build be modified to change to
clang equivalents?

lang/flang doesn't support arm, upstream numpy advises using gcc 4+



flang only supports aarch64, not armv7. flang devs have also fucked up 
their build process so it's still marked BROKEN anyway.

math/py-numpy depends on gcc 4.9

[s_graf]

I am building php on arm and trying to get rid of gcc 4.9 dependencies.
Py-numpy wants to build gcc 4.9.  Can the build be modified to change to
clang equivalents?

Re: New port: arx-libertatis

[Thomas Frohwein]

ping

same port as 1.5 months ago, except that I also set -DUSE_QT5=OFF.
Still compiles and runs.

On Sat, Mar 10, 2018 at 10:50:03AM -0800, Thomas Frohwein wrote:
> Thanks Stuart and Marc - I adjusted the port based on your comments.
> pl0 -> pl1, CONFIGURE_ARGS+= -DUSE_QT4=OFF, @cwd is gone
> 
> New version attached.
> 
> On Mon, Mar 05, 2018 at 08:53:05AM +, Stuart Henderson wrote:
> > On 2018/03/04 11:05, Thomas Frohwein wrote:
> > > On Sun, Mar 04, 2018 at 05:31:31PM +1100, Jonathan Gray wrote:
> > > > 1.1.2-r1 may map to 1.1.2pl1 (1.1.2 patch level 1) if I read
> > > > packages-specs(7) correctly as there was a 1.1.2 release prior to r1.
> > > 
> > > I looked through packages. There are a few packages with pl0 (apvlv,
> > > inotify-tools, and xarchiver) and since we also start with v0 and p0, I 
> > > set this
> > > to arx-libertatis-1.1.2pl0.
> > 
> > the number after pl usually maps directly to something from upstream,
> > I'd go for:
> > 
> > GH_ACCOUNT =arx
> > GH_PROJECT =ArxLibertatis
> > GH_TAGNAME =1.1.2-r1
> > PKGNAME =   arx-libertatis-${GH_TAGNAME:S/-r/pl/}
> > 
> > > I updated PLIST again because update-desktop-database should really be in
> > > there AFAIU. Not sure if the @cwd /usr/local is needed, but it seemed 
> > > safer to
> > > put it in there. Built it again and ran it without any issues.
> > 
> > @cwd does nothing here. It's used for rare cases where you have some
> > files under one PREFIX and other files under another directory in the same
> > package (most common for files installed to /var/www where there's also
> > a pkg-readme file).
> > 
> > : -option(USE_QT4 "Use Qt 4 if available" ON)
> > : +option(USE_QT4 "Use Qt 4 if available" OFF)
> > 
> > CONFIGURE_ARGS= -DUSE_QT4=OFF
> > 




arx-libertatis.tgz
Description: Binary data

Re: NEW: godot - a 2D and 3D game engine and game development framework

[Thomas Frohwein]

Thanks Stuart for identifying the problem with zstd and pointing me in
in the right direction. I added a patch that reverts upstream's commit
from October 26, 2017 that introduces the long-range matching which
uses experimental/private APIs of zstd. Those APIs are not (yet?)
exposed publicly in stable releases of zstd (see github issue #17374
that Stuart pointed out to me).

On Mon, Apr 23, 2018 at 09:29:51AM +0100, Stuart Henderson wrote:

> SUBST_CMD in this case. But however it's done, it should use PREFIX
> ("files from this port") not LOCALBASE ("already installed files").

Sure, I changed it to PREFIX.

> 
> It ought to honour CC/CXX from the environment but life's too short and
> the benefit is too little to be worth wrangling the stupid build tool
> for this. :)

Found SCONS flags that can set the proper CC/CXX. Same for CFLAGS, CXXFLAGS,
and LINKFLAGS/LDFLAGS.

> 
> The main thing I don't like about this is the .if after including bsd.port.mk,

The whole spiel with PROPERTIES and use_llvm isn't needed anymore after
setting CC/CXX.

Besides zstd, I disabled all the other built-in dependencies that I could.

Ran the 3D Martinique demo again to confirm it still works.
Updated version attached.


godot.tgz
Description: Binary data

Re: NEW: Spyder + UPDATE: py-rope

[Elias M. Mariani]

Great!
About NEW: devel/spyder could you assist me ? Or should I send the
port to openbsd-wip on github to see if someone else can give the OK
and send it to de CVS?
Best Regards.

2018-04-26 17:34 GMT-03:00 Daniel Jakots :
> On Thu, 26 Apr 2018 19:09:39 +, "Elias M. Mariani"
>  wrote:
>
>> Sure, no problem, thanks to you for the help!
>
> Thanks! I committed a tweak version of your py-rope diff and added the
> missing bits for the ports infrastructure. The overall quality of your
> diff was pretty good ;)
>
> Cheers,
> Daniel

Re: Remove emulators/sdlmame and emulators/sdlmess?

[Jeremie Courreges-Anglas]

On Thu, Apr 26 2018, Marc Espie  wrote:
> On Thu, Apr 26, 2018 at 05:19:39PM +0200, Jeremie Courreges-Anglas wrote:
>> On Wed, Apr 25 2018, Frederic Cambus  wrote:
>> > Hi ports@,
>> >
>> > We now have an up-to-date emulators/mame port for which we can build
>> > and distribute binary packages for amd64 and i386. More information
>> > here: https://marc.info/?l=openbsd-ports=151514926004836=2
>> >
>> > I think it's time to remove emulators/sdlmame and emulators/sdlmess.
>> > MAME and MESS merged in 2015 so emulators/mame contains both.
>> >
>> > Diff to add @pkgpath markers to emulators/mame and quirks entry below.
>> >
>> > Comments? OK to remove?
>> 
>> Looks like you can't upgrade to mame if you have both sdlmame and
>> sdlmess installed:
>> 
>>   env TRUSTED_PKG_PATH=/usr/ports/packages/amd64/all/ pkg_add -u
>>   [sdlmame-0.160p5]sdlmess-0.160p3->mame-0.197: internal conflict between 
>> mame-0.197 and sdlmame-0.160p5
>> 
>> After removing sdlmame:
>> 
>>   env TRUSTED_PKG_PATH=/usr/ports/packages/amd64/all/ pkg_add -u
>>   sdlmess-0.160p3->mame-0.197: ok
>> 
>> Dunno if that's a limitation in pkg_add or if some annotations/quirks
>> are missing.  Maybe espie knows better?
>> 
>> I'm tempted to ok this anyway...
>> 
> Oh, and does it perform the same if you keep sdlmame, and remove sdlmess
> instead ?

Not directly answering this question because Marc has since pointed me
in the right direction: I had not spotted that sdlmame used subpackages,
so the @pkgpath annotations were slightly off.  Also we ought to provide
a quirks entry for sdlmame-tools, and the obvious REVISION bump for
mame.

Sample pkg_add -u run:

--8<--
# env TRUSTED_PKG_PATH=/tmp/mame/ pkg_add -nu
Ambiguous: choose package for sdlmame-0.160p5
a   0: 
1: mame-0.197p0
2: sdlmame-0.160p5
Your choice: 0
Ambiguous: choose package for sdlmame-tools-0.160p5
a   0: 
1: mame-0.197p0
2: sdlmame-tools-0.160p5
Your choice: 0
Ambiguous: choose package for sdlmess-0.160p3
a   0: 
1: mame-0.197p0
2: sdlmess-0.160p3
Your choice: 0
Couldn't find updates for [snip]
# env TRUSTED_PKG_PATH=/tmp/mame-only/ pkg_add -nu
sdlmame-0.160p5+sdlmame-tools-0.160p5+sdlmess-0.160p3->mame-0.197p0: ok
Couldn't find updates for [snip]
# ls /tmp/mame-only /tmp/mame
/tmp/mame:
mame-0.197p0.tgzsdlmame-0.160p5.tgz 
sdlmame-tools-0.160p5.tgz   sdlmess-0.160p3.tgz

/tmp/mame-only:
mame-0.197p0.tgz
-->8--

So with the updated diff below along with the removal of sdlmame and
sdlmess, the upgrade path is fully automatic.  naddy is right about the
@pkgpath lines for xmame in sdlmame and sdlmess, but since xmame was
removed in 2010 I don't feel too strongly about it -> not my call.

ok jca@


Index: devel/quirks/Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.592
diff -u -p -r1.592 Makefile
--- devel/quirks/Makefile   26 Apr 2018 20:30:23 -  1.592
+++ devel/quirks/Makefile   26 Apr 2018 23:43:19 -
@@ -5,7 +5,7 @@ CATEGORIES =devel databases
 DISTFILES =
 
 # API.rev
-PKGNAME =  quirks-2.436
+PKGNAME =  quirks-2.437
 PKG_ARCH = *
 MAINTAINER =   Marc Espie 
 
Index: devel/quirks/files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.605
diff -u -p -r1.605 Quirks.pm
--- devel/quirks/files/Quirks.pm26 Apr 2018 20:30:23 -  1.605
+++ devel/quirks/files/Quirks.pm26 Apr 2018 23:43:09 -
@@ -526,6 +526,9 @@ my $stem_extensions = {
'pecl-swish' => 'pecl56-swish',
'pecl-uploadprogress' => 'pecl56-uploadprogress',
'rope' => 'py-rope',
+   'sdlmame' => 'mame',
+   'sdlmame-tools' => 'mame',
+   'sdlmess' => 'mame',
 };
 
 my $obsolete_reason = {
Index: emulators/mame/Makefile
===
RCS file: /cvs/ports/emulators/mame/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- emulators/mame/Makefile 25 Apr 2018 10:22:37 -  1.8
+++ emulators/mame/Makefile 26 Apr 2018 17:58:53 -
@@ -9,6 +9,7 @@ COMMENT =   Multiple Arcade Machine Emulat
 V =197
 DISTNAME = mame0${V}s
 PKGNAME =  mame-0.${V}
+REVISION = 0
 
 CATEGORIES =   emulators
 
Index: emulators/mame/pkg/PLIST
===
RCS file: /cvs/ports/emulators/mame/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- emulators/mame/pkg/PLIST24 Jan 2018 20:56:12 -  1.1.1.1
+++ emulators/mame/pkg/PLIST26 Apr 2018 17:55:56 -
@@ -2,6 +2,9 @@
 @conflict sdlmame-*
 @conflict sdlmame-tools-*
 @conflict sdlmess-*
+@pkgpath emulators/sdlmame,-main
+@pkgpath emulators/sdlmame,-tools
+@pkgpath emulators/sdlmess
 @bin bin/castool

[UPDATE] games/cataclysm-dda to 20180421

[trondd]

Update to a recent commit with lots of updates.
Some highlights include:

Updatse to the ChestHole tileset
New 'seeds' category
Cash cards are finally displayed in dollars instead of cents.
Removed prepper house as a starting location so you don't step on a landmine 
and die on your first move
Cars now have dashboards
Fix to low level mutations
Translations updates
NPCs more intelligently run from explosives
Replaced loose pickels with jars of pickels
Speedloaders
More reasonable nutrition from mustard and mayonnaise
Morale crafting speed penalty
Play Now! mode
Railroads
Scope recipes

Tim.

Index: Makefile
===
RCS file: /cvs/ports/games/cataclysm-dda/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile5 Mar 2018 09:44:06 -   1.4
+++ Makefile26 Apr 2018 23:32:40 -
@@ -1,12 +1,12 @@
 # $OpenBSD: Makefile,v 1.4 2018/03/05 09:44:06 sthen Exp $
 
 COMMENT=   rogue-like zombie survival game
-DISTNAME=  cataclysm-dda-2018.02.01
+DISTNAME=  cataclysm-dda-2018.04.21
 CATEGORIES=games
 
 GH_ACCOUNT=CleverRaven
 GH_PROJECT=Cataclysm-DDA
-GH_COMMIT= cf64a8836391ba742ce1eca500e1e0409a654d83
+GH_COMMIT= 4f7da1ef4d04be66a9b81dec3e5470c15772bef0
 
 HOMEPAGE=  http://en.cataclysmdda.com
 MAINTAINER=Tim Meunier 
Index: distinfo
===
RCS file: /cvs/ports/games/cataclysm-dda/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo5 Mar 2018 09:44:06 -   1.3
+++ distinfo26 Apr 2018 23:32:40 -
@@ -1,2 +1,2 @@
-SHA256 (cataclysm-dda-2018.02.01-cf64a883.tar.gz) = 
PqoXPbvHznM8ezzgbiejZZ7xuyzhI+iyWlBB7bXgHTk=
-SIZE (cataclysm-dda-2018.02.01-cf64a883.tar.gz) = 60095165
+SHA256 (cataclysm-dda-2018.04.21-4f7da1ef.tar.gz) = 
inUlKkXT01yZQPNk72rLYyeXYn+c9xEs4tS915L/j60=
+SIZE (cataclysm-dda-2018.04.21-4f7da1ef.tar.gz) = 60672877
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/games/cataclysm-dda/patches/patch-Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 patch-Makefile
--- patches/patch-Makefile  5 Mar 2018 09:44:06 -   1.4
+++ patches/patch-Makefile  26 Apr 2018 23:32:40 -
@@ -37,7 +37,7 @@ Index: Makefile
  endif
  
  CXXFLAGS += $(WARNINGS) $(DEBUG) $(DEBUGSYMS) $(PROFILE) $(OTHERS) -MMD -MP
-@@ -407,11 +405,6 @@ ifdef MAPSIZE
+@@ -409,11 +407,6 @@ ifdef MAPSIZE
  CXXFLAGS += -DMAPSIZE=$(MAPSIZE)
  endif
  
@@ -49,7 +49,7 @@ Index: Makefile
  PKG_CONFIG = $(CROSS)pkg-config
  SDL2_CONFIG = $(CROSS)sdl2-config
  
-@@ -716,7 +709,6 @@ $(BUILD_PREFIX)$(TARGET_NAME).a: $(ODIR) $(OBJS)
+@@ -718,7 +711,6 @@ $(BUILD_PREFIX)$(TARGET_NAME).a: $(ODIR) $(OBJS)
  .PHONY: version json-verify
  version:
@( VERSION_STRING=$(VERSION) ; \
@@ -57,7 +57,7 @@ Index: Makefile
  [ -e "$(SRC_DIR)/version.h" ] && OLDVERSION=$$(grep VERSION 
$(SRC_DIR)/version.h|cut -d '"' -f2) ; \
  if [ "x$$VERSION_STRING" != "x$$OLDVERSION" ]; then echo "#define 
VERSION \"$$VERSION_STRING\"" | tee $(SRC_DIR)/version.h ; fi \
   )
-@@ -770,35 +762,35 @@ distclean:
+@@ -772,35 +764,35 @@ distclean:
  bindist: $(BINDIST)
  
  ifeq ($(TARGETSYSTEM), LINUX)
@@ -112,7 +112,7 @@ Index: Makefile
mkdir -p $(LOCALE_DIR)
  ifdef LANGUAGES
LOCALE_DIR=$(LOCALE_DIR) lang/compile_mo.sh $(LANGUAGES)
-@@ -966,11 +958,6 @@ astyle: $(ASTYLED_WHITELIST)
+@@ -968,11 +960,6 @@ astyle: $(ASTYLED_WHITELIST)
  astyle-all: $(SOURCES) $(HEADERS) $(TESTSRC) $(TESTHDR) $(TOOLSRC)
$(ASTYLE_BINARY) --options=.astylerc -n $(SOURCES) $(HEADERS)
$(ASTYLE_BINARY) --options=.astylerc -n $(TESTSRC) $(TESTHDR)
Index: pkg/PFRAG.no-no_x11
===
RCS file: /cvs/ports/games/cataclysm-dda/pkg/PFRAG.no-no_x11,v
retrieving revision 1.2
diff -u -p -r1.2 PFRAG.no-no_x11
--- pkg/PFRAG.no-no_x11 5 Mar 2018 09:44:06 -   1.2
+++ pkg/PFRAG.no-no_x11 26 Apr 2018 23:32:40 -
@@ -12,13 +12,13 @@ share/cataclysm-dda/gfx/ChestHole16Tiles
 share/cataclysm-dda/gfx/ChestHole16Tileset/tiles.png
 share/cataclysm-dda/gfx/ChestHole16Tileset/tiles24.png
 share/cataclysm-dda/gfx/ChestHole16Tileset/tileset.txt
+share/cataclysm-dda/gfx/ChestHole16Tileset/tree.png
 share/cataclysm-dda/gfx/ChestHole32Tileset/
 share/cataclysm-dda/gfx/ChestHole32Tileset/fallback.png
 share/cataclysm-dda/gfx/ChestHole32Tileset/tile_config.json
 share/cataclysm-dda/gfx/ChestHole32Tileset/tiles.png
 share/cataclysm-dda/gfx/ChestHole32Tileset/tiles48.png
 share/cataclysm-dda/gfx/ChestHole32Tileset/tileset.txt
-share/cataclysm-dda/gfx/ChestHole32Tileset/tilesold.png
 share/cataclysm-dda/gfx/ChestHole32Tileset/tree.png
 share/cataclysm-dda/gfx/ChestHole32Tileset_iso/
 

multimedia/libtheorafile - update to use stable release binary

[Thomas Frohwein]

Hi,

Here is a patch that changes the distfiles source to a stable zip of the
distfiles. Those stable files only come packaged with the rest of FNA. The
download is not large and I think the benefit of having stable distfiles
outweighs pulling in a larger set. Upstream doesn't want to provide separate
release package for libtheorafile - we are likely the only platform that uses
it without the rest of the FNA package (which is a game developer-facing tool
to turn XNA games into somewhat platform-independent games).

I bumped the major because of a change to an enum in the commit from March
22nd.

Index: Makefile
===
RCS file: /cvs/ports/multimedia/libtheorafile/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile22 Feb 2018 07:54:51 -  1.1.1.1
+++ Makefile26 Apr 2018 23:34:50 -
@@ -2,18 +2,17 @@
 
 COMMENT =  Ogg Theora Video Decoder Library
 
-V =20170905
+# stable release binary packages are only available as part of FNA
+# Note that not every update of FNA releases necessarily updates libtheorafile
+V =20180401
+FNA =  18.04
+DISTNAME = libtheorafile-${V}{FNA-${FNA:S/.//}}
+PKGNAME =  libtheorafile-${V}
 
-DISTNAME = libtheorafile-${V}
-
-GH_ACCOUNT =   FNA-XNA
-GH_PROJECT =   Theorafile
-GH_COMMIT =eb65cf7d4881dd3ca0bfd71e8ec2c54c71ffe4d2
-
-SHARED_LIBS =  theorafile  0.0 # commit from 2017-09-05
+SHARED_LIBS =  theorafile  1.0 # from FNA 18.04
 
 CATEGORIES =   multimedia
-
+HOMEPAGE = https://github.com/FNA-XNA/Theorafile
 MAINTAINER =   Thomas Frohwein 
 
 # zlib
@@ -21,6 +20,9 @@ PERMIT_PACKAGE_CDROM =Yes
 
 WANTLIB += ogg theoradec vorbis
 
+MASTER_SITES = https://github.com/FNA-XNA/FNA/releases/download/${FNA}/
+EXTRACT_SUFX = .zip
+
 LIB_DEPENDS =  audio/libogg \
audio/libvorbis \
multimedia/libtheora
@@ -31,6 +33,8 @@ MAKE_FLAGS =  TARGET=so.${LIBtheorafile_V
 # Comes with target 'test' to build binary 'theorafile-test' that can play an
 # Ogg Theora (.ogv) file. Doesn't come with an example video file, however.
 NO_TEST =  Yes
+
+WRKDIST =  ${WRKDIR}/FNA/lib/Theorafile
 
 do-install:
${INSTALL_DATA} ${WRKSRC}/theorafile.h ${PREFIX}/include
Index: distinfo
===
RCS file: /cvs/ports/multimedia/libtheorafile/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo22 Feb 2018 07:54:51 -  1.1.1.1
+++ distinfo26 Apr 2018 23:34:50 -
@@ -1,2 +1,2 @@
-SHA256 (libtheorafile-20170905-eb65cf7d.tar.gz) = 
sLCLAUNFUgPBNrTB2XLrl/dXWLVzviiHnK4hJ0AedJw=
-SIZE (libtheorafile-20170905-eb65cf7d.tar.gz) = 13151
+SHA256 (libtheorafile-20180401.zip) = 
BK/n2us0pUmniHojBxlvRsGXv8vC4+bLPw1vGj1CsKI=
+SIZE (libtheorafile-20180401.zip) = 652380
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/multimedia/libtheorafile/patches/patch-Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-Makefile
--- patches/patch-Makefile  22 Feb 2018 07:54:51 -  1.1.1.1
+++ patches/patch-Makefile  26 Apr 2018 23:34:50 -
@@ -37,5 +37,5 @@ Index: Makefile
rm -f libtheorafile.$(TARGET)
  
  test:
--  $(CC) -g sdl2test/sdl2test.c theorafile.c -I. `sdl2-config --cflags 
--libs` $(DEPS) -Wall
+-  $(CC) -g -o theorafile-test sdl2test/sdl2test.c theorafile.c -I. 
`sdl2-config --cflags --libs` $(DEPS) -Wall
 +  $(CC) ${CFLAGS} ${LDFLAGS} -g -o theorafile-test sdl2test/sdl2test.c 
theorafile.c -I. -I${LOCALBASE}/include `sdl2-config --cflags --libs` 
-L${LOCALBASE}/lib $(DEPS) -Wall

update lang/sbcl

[Solene Rapenne]

bump sbcl 1.4.5 -> 1.4.6

including  is mandatory in this new version, patch
provided. patch on x86-64-arch.c fix the build for amd64. I also patched
x64-arch.c for i386 but I didn't test it (don't have an i386 system)

Index: Makefile
===
RCS file: /cvs/ports/lang/sbcl/Makefile,v
retrieving revision 1.36
diff -u -p -u -r1.36 Makefile
--- Makefile8 Mar 2018 15:17:39 -   1.36
+++ Makefile26 Apr 2018 23:18:35 -
@@ -6,7 +6,7 @@ USE_WXNEEDED =  Yes

 COMMENT=   compiler and runtime system for ANSI Common Lisp

-V =1.4.5
+V =1.4.6
 DISTNAME=  sbcl-${V}-source
 PKGNAME=   sbcl-${V}
 WRKDIST=   ${WRKDIR}/sbcl-${V}
Index: distinfo
===
RCS file: /cvs/ports/lang/sbcl/distinfo,v
retrieving revision 1.14
diff -u -p -u -r1.14 distinfo
--- distinfo8 Mar 2018 15:17:39 -   1.14
+++ distinfo26 Apr 2018 23:18:35 -
@@ -1,2 +1,2 @@
-SHA256 (sbcl-1.4.5-source.tar.bz2) = 
lhku/9F/PkV/d7z/Bhl4TObnKT4n4ObBVGpUKz2KxUA=
-SIZE (sbcl-1.4.5-source.tar.bz2) = 5998856
+SHA256 (sbcl-1.4.6-source.tar.bz2) = 
RBGwEynU3VMcigy0A2Ri+0/V9uer4tUhxqoqOt77hng=
+SIZE (sbcl-1.4.6-source.tar.bz2) = 6025790
cvs server: Diffing patches
Index: patches/patch-src_runtime_x86-64-arch_c
===
RCS file: patches/patch-src_runtime_x86-64-arch_c
diff -N patches/patch-src_runtime_x86-64-arch_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_runtime_x86-64-arch_c 26 Apr 2018 23:18:35 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: src/runtime/x86-64-arch.c
+--- src/runtime/x86-64-arch.c.orig
 src/runtime/x86-64-arch.c
+@@ -10,6 +10,7 @@
+  */
+
+ #include 
++#include 
+
+ #include "sbcl.h"
+ #include "runtime.h"
Index: patches/patch-src_runtime_x86-arch_c
===
RCS file: patches/patch-src_runtime_x86-arch_c
diff -N patches/patch-src_runtime_x86-arch_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_runtime_x86-arch_c26 Apr 2018 23:18:35 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: src/runtime/x86-arch.c
+--- src/runtime/x86-arch.c.orig
 src/runtime/x86-arch.c
+@@ -10,6 +10,7 @@
+  */
+
+ #include 
++#include 
+
+ #include "sbcl.h"
+ #include "runtime.h"

Re: Fix libtorrent-rasterbar for gcc 4.9 on -rOPENBSD_6_3 (tested on OpenBSD/Loongson)

[manphiz]

Hi,

Emergent fix below.

On 4/26/18 4:17 AM, manp...@gmail.com wrote:

Hi,

On 4/23/18 10:32 PM, manp...@gmail.com wrote:

Hi Stuart,

On 4/23/18 10:48 AM, Stuart Henderson wrote:

On 2018/04/22 15:54, manp...@gmail.com wrote:

On 4/22/18 4:39 AM, manp...@gmail.com wrote:

On 4/15/18 1:25 PM, manp...@gmail.com wrote:

The patch attached fixes building libtorrent-rasterbar on
OpenBSD/Loongson for -rOPENBSD_6_3. It added several missing
includes, added "-std=gnu++14" to CXXFLAGS as it is now default for
newer compiler and the code uses those new features, and another
patch from -current. I'm not sure whether this is the correct way to
update ports for a -stable branch so let me know.

Thanks.


It seems that there is another problem with the setup.py of python
binding that relies on existence of environment variable CXX to be
defined, otherwise it will use "cc" instead of "c++" to build the
binding, which then lead to another problem: the main library would be
built using C++14 that enabled using std::chrono, while the bindings
would not and used boost::chrono instead, and the bindings will 
fail to

load due to missing symbols (actually symbol mismatch). The fix is to
define CXX=c++ in Makefile.am of python binding.

The revised patch against -rOPENBSD_6_3 is attached.


And it turns out it's a bad idea to patch configure.ac and 
Makefile.am which
will require "autoreconf". Attaching the patch dropping those parts. 
1.1.7
on -current has similar issue and I'll provide a separate patch and 
also try

to incorporate upstream.


No loongson here so I can't test any of this, but a few things:

- we work on -current primarily, sometimes things can be backported 
but if

this is broken on -current at the moment, that needs fixing first



Agreed.

- compilers should come from the environment rather than hardcoded, 
maybe

try something like:

MAKE_ENV =  CC="${CC}" CXX="${CXX}"
CXXFLAGS += --std=gnu++14



I'm currently working with upstream to incorporate those patches as 
well. Once the patches are incorporated I'll backport them to -current 
and then -stable.


This is the corresponding patch for -stable similar to the one against 
-current in my other mail[1].


[1] https://marc.info/?l=openbsd-ports=152474002010011=2


Sorry my previous patch was missing a line. This revised patch should 
work and attached.
diff -Naur Makefile Makefile
--- MakefileWed Feb  7 22:30:34 2018
+++ MakefileThu Apr 26 03:58:27 2018
@@ -3,6 +3,7 @@
 COMMENT =  C++ library implementing a BitTorrent client
 
 MODPY_EGG_VERSION =1.1.6
+REVISION = 0
 DISTNAME = libtorrent-rasterbar-${MODPY_EGG_VERSION}
 
 SHARED_LIBS += torrent-rasterbar 0.0   # 9.0.0
@@ -36,7 +37,9 @@
--with-libiconv
 CONFIGURE_ENV +=   CPPFLAGS="-Wno-deprecated-declarations \
  -Wno-macro-redefined \
- -pthread"
+ -pthread" \
+   PYTHON_CXXFLAGS="${PYTHON_CXXFLAGS} -std=gnu++14"
+MAKE_ENV = CC=${CC} CXX=${CXX}
+CXXFLAGS +=-std=gnu++14
 
 .ifdef DEBUG
 CONFIGURE_ARGS +=  --enable-debug
diff -Naur patches/patch-include_libtorrent_aux__session_interface_hpp 
patches/patch-include_libtorrent_aux__session_interface_hpp
--- patches/patch-include_libtorrent_aux__session_interface_hpp Wed Dec 31 
16:00:00 1969
+++ patches/patch-include_libtorrent_aux__session_interface_hpp Thu Apr 26 
03:56:01 2018
@@ -0,0 +1,14 @@
+$OpenBSD$
+https://github.com/arvidn/libtorrent/pull/2965
+
+--- include/libtorrent/aux_/session_interface.hpp.orig
 include/libtorrent/aux_/session_interface.hpp
+@@ -52,6 +52,7 @@ POSSIBILITY OF SUCH DAMAGE.
+ 
+ #ifndef TORRENT_DISABLE_LOGGING
+ #include 
++#include  // for va_list
+ #endif
+ 
+ #ifdef TORRENT_USE_OPENSSL
+
diff -Naur patches/patch-src_disk_io_thread_cpp 
patches/patch-src_disk_io_thread_cpp
--- patches/patch-src_disk_io_thread_cppWed Dec 31 16:00:00 1969
+++ patches/patch-src_disk_io_thread_cppThu Apr 26 03:56:01 2018
@@ -0,0 +1,13 @@
+$OpenBSD$
+https://github.com/arvidn/libtorrent/pull/2965
+
+--- src/disk_io_thread.cpp.orig
 src/disk_io_thread.cpp
+@@ -62,6 +62,7 @@ POSSIBILITY OF SUCH DAMAGE.
+ #if __cplusplus >= 201103L || defined __clang__
+ 
+ #if DEBUG_DISK_THREAD
++#include  // for va_list
+ #define DLOG(...) debug_log(__VA_ARGS__)
+ #else
+ #define DLOG(...) do {} while(false)
diff -Naur patches/patch-src_kademlia_dht_tracker_cpp 
patches/patch-src_kademlia_dht_tracker_cpp
--- patches/patch-src_kademlia_dht_tracker_cpp  Wed Dec 31 16:00:00 1969
+++ patches/patch-src_kademlia_dht_tracker_cpp  Thu Apr 26 03:56:01 2018
@@ -0,0 +1,18 @@
+$OpenBSD: patch-src_kademlia_dht_tracker_cpp,v 1.1 2018/04/12 04:40:41 bentley 
Exp $
+
+https://github.com/arvidn/libtorrent/pull/2931
+
+Index: src/kademlia/dht_tracker.cpp
+--- src/kademlia/dht_tracker.cpp.orig
 

update graphics/xfig

[Solene Rapenne]

bump graphics/xfig from 3.2.6 to 3.2.7

a few patches aren't needed anymore

Index: Makefile
===
RCS file: /cvs/ports/graphics/xfig/Makefile,v
retrieving revision 1.53
diff -u -p -u -r1.53 Makefile
--- Makefile1 Feb 2017 10:09:58 -   1.53
+++ Makefile26 Apr 2018 22:42:27 -
@@ -2,7 +2,7 @@
 
 COMMENT=   CAD drawing program for X11
 
-DISTNAME=  xfig-3.2.6
+DISTNAME=  xfig-3.2.7
 CATEGORIES=graphics x11
 
 HOMEPAGE=  http://mcj.sourceforge.net/
Index: distinfo
===
RCS file: /cvs/ports/graphics/xfig/distinfo,v
retrieving revision 1.9
diff -u -p -u -r1.9 distinfo
--- distinfo1 Feb 2017 10:09:58 -   1.9
+++ distinfo26 Apr 2018 22:42:27 -
@@ -1,2 +1,2 @@
-SHA256 (xfig-3.2.6.tar.xz) = FEXsjdphpPs13HVpu93EEtMS3tjAodUp3WM/DtqPVgk=
-SIZE (xfig-3.2.6.tar.xz) = 5057024
+SHA256 (xfig-3.2.7.tar.xz) = X+gc5BMrE5Zn+/qs3wSgJvAxOjTTnH9kACTbiUzO1Co=
+SIZE (xfig-3.2.7.tar.xz) = 5056232
cvs server: Diffing patches
Index: patches/patch-e_chop_c
===
RCS file: patches/patch-e_chop_c
diff -N patches/patch-e_chop_c
--- patches/patch-e_chop_c  1 Feb 2017 10:09:58 -   1.4
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-e_chop_c,v 1.4 2017/02/01 10:09:58 kirby Exp $
 src/e_chop.c.orig  Tue Jun  9 15:09:30 2009
-+++ src/e_chop.c   Tue Jun  9 15:11:06 2009
-@@ -19,7 +19,7 @@
- /* >>> fixme -- don't forget undo !  */
- 
- #include 
--#ifndef __FreeBSD__
-+#if !defined(__FreeBSD__) && !defined(__OpenBSD__)
- #include 
- #endif
- #include 
Index: patches/patch-w_intersect_c
===
RCS file: patches/patch-w_intersect_c
diff -N patches/patch-w_intersect_c
--- patches/patch-w_intersect_c 1 Feb 2017 10:09:58 -   1.4
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,13 +0,0 @@
-$OpenBSD: patch-w_intersect_c,v 1.4 2017/02/01 10:09:58 kirby Exp $
 src/w_intersect.c.orig Sun Jul 24 00:10:28 2016
-+++ src/w_intersect.c  Thu Dec 22 12:22:20 2016
-@@ -26,7 +26,9 @@
- #include "w_msgpanel.h"
- #include "f_util.h"
- #include "u_quartic.h"
-+#if !defined(__FreeBSD__) && !defined(__OpenBSD__)
- #include 
-+#endif
- #include 
- #undef I
- 
Index: patches/patch-w_keyboard_c
===
RCS file: /cvs/ports/graphics/xfig/patches/patch-w_keyboard_c,v
retrieving revision 1.4
diff -u -p -u -r1.4 patch-w_keyboard_c
--- patches/patch-w_keyboard_c  1 Feb 2017 10:09:58 -   1.4
+++ patches/patch-w_keyboard_c  26 Apr 2018 22:42:27 -
@@ -1,14 +1,12 @@
 $OpenBSD: patch-w_keyboard_c,v 1.4 2017/02/01 10:09:58 kirby Exp $
 src/w_keyboard.c.orig  Sun Jul 24 00:10:28 2016
-+++ src/w_keyboard.c   Thu Dec 22 12:22:20 2016
-@@ -17,8 +17,9 @@
-  */
- 
+Index: src/w_keyboard.c
+--- src/w_keyboard.c.orig
 src/w_keyboard.c
+@@ -19,6 +19,7 @@
  #include 
-+#include 
  #include 
--#ifndef __FreeBSD__
-+#if !defined(__FreeBSD__) && !defined(__OpenBSD__)
- #include 
- #endif
  #include 
++#include 
+ 
+ #include "fig.h"
+ #include "figx.h"
Index: patches/patch-w_snap_c
===
RCS file: patches/patch-w_snap_c
diff -N patches/patch-w_snap_c
--- patches/patch-w_snap_c  1 Feb 2017 10:09:58 -   1.4
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-w_snap_c,v 1.4 2017/02/01 10:09:58 kirby Exp $
 src/w_snap.c.orig  Mon Mar 30 17:52:10 2009
-+++ src/w_snap.c   Sun Dec 27 23:07:04 2009
-@@ -32,7 +32,7 @@
- #include "u_search.h"
- #include "f_util.h"
- #include 
--#ifndef __FreeBSD__
-+#if !defined(__FreeBSD__) && !defined(__OpenBSD__)
- #include 
- #endif
- 

Upt: automagically package software from PyPI/CPAN/etc. to OpenBSD

[Cyril Roelandt]

Hello,

(tl;dr: I wrote a modular tool that helps people package software from
PyPI/CPAN/etc. to OpenBSD/GNU Guix/etc. and would like some feedback.)

For the past few weeks, I have been working on upt[1], a tool allowing
package maintainers to turn a package available in a language-specific
package archive (such as PyPI or CPAN) into a package for their OS (a
BSD-based system or a GNU/Linux distribution)

Similar tools have been used by various distributions for a long time:
OpenBSD has PortGen. Debian has tools such as cpan2deb, pypi2deb, etc.
RPM-based distributions have {cpan,gem,npm,pyp}2rpm. GNU Guix uses "guix
import".

There are a few issues related to these tools:
- all the tools that parse a given language-specific package archive
  (say, PyPI) reimplement the same code;
- most of the tools that output a package definition for a given OS
  reimplement the same code (OpenBSD's PortGen does not seem to do that,
  though);
- there is usually no unified CLI, which means that package maintainers
  have to learn and remember a different syntax for every tool they use
  (again, OpenBSD's PortGen has a common CLI for all upstream package
  archives);
- there is no unified behaviour: some tools may build the package, some
  may not, some tools may download the source tarball, some may not,
  etc.

The universal packaging tool (upt) comes as a small core project (upt
itself) that provides a unified CLI allowing package maintainers to use
two types of modules: frontends and backends. Frontends parse
language-specific package archives (PyPI, CPAN, Rubygems...) and
generate a package definition using an internal representation; backends
parse this internal representation and generate a package definition for
a particular package manager. Think of it as some sort of a compiler.

This solves the issues I mentioned above:
- a given language-specific package manager only needs to be parsed by a
  single tool; all improvements to this tool will benefit all
  distributions;
- a given package manager/OS has only one implementation of the code
  required to generate a package: improvements to this tool will be
  useful to all the maintainers;
- the CLI is unified;
- the behaviour is simple and similar across all frontends/backends, as
  upt does not build the package, does not try to do anything fancy: it
  only generates a package definition.

Furthermore, all frontends/backends live in their own git repositories,
so it is especially easy to add one.

You may install upt by running:

$ pip install upt[frontends] upt-openbsd

My dear friend Daniel Jakots is also working on a port for upt.

Upt can package itself:

$ mkdir /tmp/test-upt
$ PORTSDIR=/tmp/test-upt upt package -b openbsd -f pypi upt
[INFO] [Backend] Creating the directory structure in 
/tmp/test-upt/mystuff/pypi/py-upt
[INFO] [Backend] Creating the Makefile
[INFO] [Backend] Creating pkg/DESCR
[INFO] [Backend] You still need to create 
/tmp/test-upt/mystuff/pypi/py-upt/distinfo
[INFO] [Backend] You still need to create 
/tmp/test-upt/mystuff/pypi/py-upt/pkg/PLIST

$ find /tmp/test-upt/mystuff/pypi/py-upt/
/tmp/test-upt/mystuff/pypi/py-upt/
/tmp/test-upt/mystuff/pypi/py-upt/Makefile
/tmp/test-upt/mystuff/pypi/py-upt/pkg
/tmp/test-upt/mystuff/pypi/py-upt/pkg/DESCR

A CPAN and a RubyGems frontends are also available : you may try them
out by using "-f cpan" and "-f rubygems".

The tool is not perfect: it may not find all the required depencencies,
it may not always guess the license(s) used by the project. It should do
most of the tedious tasks required to add a port to OpenBSD.

Would you be interested in using such a tool? Any feedback would be
appreciated!

Regards,
Cyril Roelandt.



[1] https://framagit.org/upt/upt

Re: productivity/timewarrior - WIP

[Erling Westenvik]

On Thu, Apr 26, 2018 at 10:13:02PM +0200, Matthieu Guegan wrote:
> On Wed, Apr 25, 2018 at 09:44:22PM +0200, Erling Westenvik wrote:
> > Compiles and installs without problems here on my current/amd64. Hope it
> > gets ok'ed.
>
> May I ask you to try with my last patch please ?
> https://marc.info/?l=openbsd-ports=152438482714081=2

Done. No problems.

Regards,
Erling

CVS: cvs.openbsd.org: ports

[Bjorn Ketelaars]

CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2018/04/26 15:34:23

Modified files:
net/unison : Makefile 
Added files:
net/unison : Makefile.inc 
net/unison/2.4x: Makefile distinfo 
net/unison/2.4x/patches: patch-bytearray_stubs_c patch-test_ml 
net/unison/2.4x/pkg: DESCR PLIST README 
net/unison/2.5x: Makefile distinfo 
net/unison/2.5x/patches: patch-uicommon_ml 
net/unison/2.5x/pkg: DESCR PLIST README 
Removed files:
net/unison : distinfo 
net/unison/patches: patch-bytearray_stubs_c patch-test_ml 
net/unison/pkg : DESCR PLIST README 

Log message:
Update to unison-2.51.2.

This version is not compatible with older versions, so retain 2.48.15 by
splitting into 2.4x and 2.5x subdirectories and using "@option
is-branch".

Initial diff has been looked at by kn@ (looks OK port- and build-wise on
amd64) and giovanni@ (OK). Issues found by sthen@ (thanks!) and fixed by
me.

Take MAINTAINER (as discussed with giovanni@).

OK sthen@

CVS: cvs.openbsd.org: ports

[Bjorn Ketelaars]

CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2018/04/26 15:30:28

ports/net/unison/2.5x/patches

Update of /cvs/ports/net/unison/2.5x/patches
In directory cvs.openbsd.org:/tmp/cvs-serv35017/2.5x/patches

Log Message:
Directory /cvs/ports/net/unison/2.5x/patches added to the repository

CVS: cvs.openbsd.org: ports

[Bjorn Ketelaars]

CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2018/04/26 15:30:35

ports/net/unison/2.5x/pkg

Update of /cvs/ports/net/unison/2.5x/pkg
In directory cvs.openbsd.org:/tmp/cvs-serv23482/2.5x/pkg

Log Message:
Directory /cvs/ports/net/unison/2.5x/pkg added to the repository

CVS: cvs.openbsd.org: ports

[Bjorn Ketelaars]

CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2018/04/26 15:30:19

ports/net/unison/2.5x

Update of /cvs/ports/net/unison/2.5x
In directory cvs.openbsd.org:/tmp/cvs-serv66166/2.5x

Log Message:
Directory /cvs/ports/net/unison/2.5x added to the repository

CVS: cvs.openbsd.org: ports

[Bjorn Ketelaars]

CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2018/04/26 15:30:12

ports/net/unison/2.4x/pkg

Update of /cvs/ports/net/unison/2.4x/pkg
In directory cvs.openbsd.org:/tmp/cvs-serv10546/2.4x/pkg

Log Message:
Directory /cvs/ports/net/unison/2.4x/pkg added to the repository

CVS: cvs.openbsd.org: ports

[Bjorn Ketelaars]

CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2018/04/26 15:30:05

ports/net/unison/2.4x/patches

Update of /cvs/ports/net/unison/2.4x/patches
In directory cvs.openbsd.org:/tmp/cvs-serv8484/2.4x/patches

Log Message:
Directory /cvs/ports/net/unison/2.4x/patches added to the repository

CVS: cvs.openbsd.org: ports

[Bjorn Ketelaars]

CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2018/04/26 15:29:57

ports/net/unison/2.4x

Update of /cvs/ports/net/unison/2.4x
In directory cvs.openbsd.org:/tmp/cvs-serv90097/2.4x

Log Message:
Directory /cvs/ports/net/unison/2.4x added to the repository

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/04/26 15:03:29

Modified files:
x11/wxSVG  : Makefile distinfo 

Log message:
Update to wxsvg-1.5.13.

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/04/26 14:57:51

Modified files:
textproc/calibre: Makefile 

Log message:
drop maintainer, is anyone interested in picking this up?

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/04/26 14:55:43

Modified files:
net/icinga/core2: Makefile distinfo 

Log message:
update to icinga2-2.8.4

[UPDATE] devel/pycharm

[Remi Pointel]

Hi,

attached is the diff to update pycharm to latest release.

Ok?

Cheers,

Remi.
Index: Makefile
===
RCS file: /cvs/ports/devel/pycharm/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 Makefile
--- Makefile	16 Mar 2018 14:07:12 -	1.1.1.1
+++ Makefile	26 Apr 2018 20:46:33 -
@@ -2,7 +2,7 @@
 
 COMMENT=		Python IDE based on IntelliJ IDEA
 
-V=			2017.3.4
+V=			2018.1.2
 DISTNAME=		pycharm-community-${V}
 PKGNAME=		pycharm-${V}
 CATEGORIES=		devel
Index: distinfo
===
RCS file: /cvs/ports/devel/pycharm/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo	16 Mar 2018 14:07:12 -	1.1.1.1
+++ distinfo	26 Apr 2018 20:46:33 -
@@ -1,2 +1,2 @@
-SHA256 (pycharm-community-2017.3.4.tar.gz) = BIgQIoKTxBN3vOBp66SQXh4MEup6yDYFrerInPE4/Ag=
-SIZE (pycharm-community-2017.3.4.tar.gz) = 279847033
+SHA256 (pycharm-community-2018.1.2.tar.gz) = w39lcfc8p5LfpWEiU1c+U5Hep3yasTnBAtNbLL7+Hd4=
+SIZE (pycharm-community-2018.1.2.tar.gz) = 265765003
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/pycharm/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- pkg/PLIST	18 Mar 2018 20:46:43 -	1.2
+++ pkg/PLIST	26 Apr 2018 20:46:33 -
@@ -307,7 +307,6 @@ pycharm/helpers/extra_syspath.py
 pycharm/helpers/generator3.py
 pycharm/helpers/icon-robots.txt
 pycharm/helpers/packaging_tool.py
-pycharm/helpers/pip-1.1.tar.gz
 pycharm/helpers/pip-9.0.1.tar.gz
 pycharm/helpers/pockets/
 pycharm/helpers/pockets/__init__.py
@@ -800,6 +799,7 @@ pycharm/helpers/pycharm/__jb.for_twisted
 pycharm/helpers/pycharm/__jb.for_twisted/twisted/plugins/teamcity_plugin.py
 pycharm/helpers/pycharm/_bdd_utils.py
 pycharm/helpers/pycharm/_jb_create_folder.py
+pycharm/helpers/pycharm/_jb_django_behave.py
 pycharm/helpers/pycharm/_jb_django_project_creator.py
 pycharm/helpers/pycharm/_jb_find_best_place.py
 pycharm/helpers/pycharm/_jb_manage_tasks_provider.py
@@ -866,6 +866,7 @@ pycharm/helpers/pycharm/teamcity/django.
 pycharm/helpers/pycharm/teamcity/flake8_plugin.py
 pycharm/helpers/pycharm/teamcity/flake8_v2_plugin.py
 pycharm/helpers/pycharm/teamcity/flake8_v3_plugin.py
+pycharm/helpers/pycharm/teamcity/jb_behave_formatter.py
 pycharm/helpers/pycharm/teamcity/messages.py
 pycharm/helpers/pycharm/teamcity/nose_report.py
 pycharm/helpers/pycharm/teamcity/pytest_plugin.py
@@ -951,6 +952,7 @@ pycharm/helpers/pydev/_pydevd_bundle/pyd
 pycharm/helpers/pydev/_pydevd_bundle/pydevd_cython_darwin_34_64.so
 pycharm/helpers/pydev/_pydevd_bundle/pydevd_cython_darwin_35_64.cpython-35m-darwin.so
 pycharm/helpers/pydev/_pydevd_bundle/pydevd_cython_darwin_36_64.cpython-36m-darwin.so
+pycharm/helpers/pydev/_pydevd_bundle/pydevd_cython_darwin_37_64.cpython-37m-darwin.so
 pycharm/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_26_32.pyd
 pycharm/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_26_64.pyd
 pycharm/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_27_32.pyd
@@ -961,6 +963,8 @@ pycharm/helpers/pydev/_pydevd_bundle/pyd
 pycharm/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_35_64.cp35-win_amd64.pyd
 pycharm/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_36_32.cp36-win32.pyd
 pycharm/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_36_64.cp36-win_amd64.pyd
+pycharm/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_37_32.cp37-win32.pyd
+pycharm/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_37_64.cp37-win_amd64.pyd
 pycharm/helpers/pydev/_pydevd_bundle/pydevd_cython_wrapper.py
 pycharm/helpers/pydev/_pydevd_bundle/pydevd_dont_trace.py
 pycharm/helpers/pydev/_pydevd_bundle/pydevd_dont_trace_files.py
@@ -998,8 +1002,11 @@ pycharm/helpers/pydev/_pydevd_frame_eval
 pycharm/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator.pxd
 pycharm/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator.pyx
 pycharm/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_darwin_36_64.cpython-36m-darwin.so
+pycharm/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_darwin_37_64.cpython-37m-darwin.so
 pycharm/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_win32_36_32.cp36-win32.pyd
 pycharm/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_win32_36_64.cp36-win_amd64.pyd
+pycharm/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_win32_37_32.cp37-win32.pyd
+pycharm/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_win32_37_64.cp37-win_amd64.pyd
 pycharm/helpers/pydev/_pydevd_frame_eval/pydevd_frame_tracing.py
 pycharm/helpers/pydev/_pydevd_frame_eval/pydevd_modify_bytecode.py
 pycharm/helpers/pydev/build_tools/
@@ -1408,7 +1415,6 @@ pycharm/helpers/python-skeletons/django/
 pycharm/helpers/python-skeletons/django/views/generic/
 pycharm/helpers/python-skeletons/django/views/generic/__init__.py
 pycharm/helpers/python-skeletons/django/views/generic/base.py

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/04/26 14:41:29

Modified files:
net/py-ripe.atlas.cousteau: Makefile distinfo 
net/py-ripe.atlas.cousteau/pkg: PLIST 

Log message:
update to py-ripe.atlas.cousteau-1.4.2

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/04/26 14:41:07

Modified files:
net/icinga/web2: Makefile distinfo 
net/icinga/web2/pkg: PLIST 

Log message:
update to icingaweb2-2.5.2

Re: NEW: Spyder + UPDATE: py-rope

[Daniel Jakots]

On Thu, 26 Apr 2018 19:09:39 +, "Elias M. Mariani"
 wrote:

> Sure, no problem, thanks to you for the help!

Thanks! I committed a tweak version of your py-rope diff and added the
missing bits for the ports infrastructure. The overall quality of your
diff was pretty good ;)

Cheers,
Daniel

Re: fix net/tor configure on armv7 (-fasynchronous-unwind-tables)

[Mark Kettenis]

> Date: Wed, 25 Apr 2018 13:48:12 +0200
> From: Stefan Sperling 
> 
> tor's configure script is failing on armv7:
> 
> checking size of short... (cached) 2
> checking size of int... configure: error: in 
> `/usr/ports/pobj/tor-0.3.2.10/tor-0.3.2.10':
> configure: error: cannot compute sizeof (int)
> See `config.log' for more details
> 
> The underlying error shows up at mulitple places in config.log,
> and looks like:
> 
> configure:12618: cc -o conftest -O2 -pipe -fasynchronous-unwind-tables  
> -I${top_srcdir}/src/common  -z relro -z now -rdynamic conftest.c
>  -lpthread  >&5
> /tmp/conftest-9c413e.o:(.ARM.exidx+0x0): undefined reference to 
> `__aeabi_unwind_cpp_pr1'
> cc: error: linker command failed with exit code 1 (use -v to see invocation)
> configure:12618: $? = 1
> configure: program exited with status 1
> 
> Note that the error shows up during other tests in the configure
> script as well, not just this 'size of int' check. It seems we
> are lucky that we didn't get silent failures only.
> 
> I am not sure what __aeabi_unwind_cpp_pr1 is about, and whether there is
> a deeper issue to fix. This seems related to -fasynchronous-unwind-table
> which according to the tor changelog has something to do with backtrace
> support:
> 
>   o Minor bugfixes (backtrace support):
> - Support automatic backtraces on more platforms by using the
>   "-fasynchronous-unwind-tables" compiler option. This option is
>   needed for platforms like 32-bit Intel where "-fomit-frame-pointer"
>   is on by default and table generation is not. This doesn't yet
>   add Windows support; only Linux, OSX, and some BSDs are affected.
>   Reported by 'cypherpunks'; fixes bug 11047; bugfix on 0.2.5.2-alpha.
> 
> If I simply remove this compiler flag the configure script finishes fine.
> 
> Is this a good fix?

ARM is "special".  For the 32-bit ABI they designed their own variant
of the the unwinder ABI.  When generating exception handling
information for this ABI, references to __aeabi_unwind_cpp_pr1 may
occur.  GCC will resolve these by linking against libgcc_eh.a.  For
Clang with compiler-rt I'm still not sure what the best approach is.

Anyway, do we actually support the backtrace functionality?  As far as
I can tell tor needs glibc-compatible backtrace functionality which we
don't provide.  So tis diff should be harmless in that respect.

> Index: Makefile
> ===
> RCS file: /cvs/ports/net/tor/Makefile,v
> retrieving revision 1.111
> diff -u -p -r1.111 Makefile
> --- Makefile  4 Mar 2018 14:05:06 -   1.111
> +++ Makefile  25 Apr 2018 11:45:57 -
> @@ -15,7 +15,8 @@ WANTLIB += c crypto event_core event_ext
>  
>  MASTER_SITES=https://www.torproject.org/dist/
>  
> -CONFIGURE_STYLE=gnu
> +AUTOCONF_VERSION=2.69
> +CONFIGURE_STYLE=gnu autoconf
>  # PIE is already taken care of on a per-arch basis, and we have stack 
> protection
>  # anyway on FRAME_GROWS_DOWN archs.
>  CONFIGURE_ARGS=  --with-ssl-dir=/usr \
> Index: patches/patch-configure_ac
> ===
> RCS file: patches/patch-configure_ac
> diff -N patches/patch-configure_ac
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-configure_ac25 Apr 2018 11:46:27 -
> @@ -0,0 +1,19 @@
> +$OpenBSD$
> +disable -fasynchronous-unwind-tables as it breaks build on armv7
> +Index: configure.ac
> +--- configure.ac.orig
>  configure.ac
> +@@ -1081,13 +1081,6 @@ fi
> + CFLAGS="$saved_CFLAGS"
> + AC_SUBST(F_OMIT_FRAME_POINTER)
> + 
> +-dnl --
> +-dnl If we are adding -fomit-frame-pointer (or if the compiler's doing it
> +-dnl for us, as GCC 4.6 and later do at many optimization levels), then
> +-dnl we should try to add -fasynchronous-unwind-tables so that our backtrace
> +-dnl code will work.
> +-TOR_CHECK_CFLAGS(-fasynchronous-unwind-tables)
> +-
> + dnl 
> + dnl Check for libseccomp
> + 
> Index: patches/patch-src_config_torrc_sample_in
> ===
> RCS file: /cvs/ports/net/tor/patches/patch-src_config_torrc_sample_in,v
> retrieving revision 1.19
> diff -u -p -r1.19 patch-src_config_torrc_sample_in
> --- patches/patch-src_config_torrc_sample_in  10 Jan 2018 14:35:49 -  
> 1.19
> +++ patches/patch-src_config_torrc_sample_in  25 Apr 2018 11:10:43 -
> @@ -37,7 +37,7 @@ Index: src/config/torrc.sample.in
>   #HiddenServicePort 80 127.0.0.1:80
>   #HiddenServicePort 22 127.0.0.1:22
>   
> -@@ -198,6 +198,8 @@
> +@@ -204,6 +204,8 @@
>   ## and any public IPv4 and IPv6 addresses on any interface on the relay.
>   ## See the man page entry for ExitPolicyRejectPrivate if you want to allow
>   ## "exit enclaving".
> 

CVS: cvs.openbsd.org: ports

[Daniel Jakots]

CVSROOT:/cvs
Module name:ports
Changes by: d...@cvs.openbsd.org2018/04/26 14:31:10

Modified files:
devel  : Makefile 

Log message:
+ py-rope,python3

CVS: cvs.openbsd.org: ports

[Daniel Jakots]

CVSROOT:/cvs
Module name:ports
Changes by: d...@cvs.openbsd.org2018/04/26 14:30:23

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

Log message:
register rope -> py-rope

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2018/04/26 14:31:06

Modified files:
www/drupal7/core7: Tag: OPENBSD_6_3 Makefile distinfo 
www/drupal7/core7/files: Tag: OPENBSD_6_3 drupal.conf 
www/drupal7/core7/pkg: Tag: OPENBSD_6_3 PLIST 

Log message:
update stable to 7.59, matching current
there have been two large vulnerabilities in drupal7, the first
one just after 6.3, and the second one today ;(

okay sthen@

Re: initial pledge() wip for firefox

[Klemens Nanni]

Your firefox-60.0beta15 with today's snapshot on my X230 gets killed
almost immediately:

699328  51384 firefox  CALL  shmget(0,0x47000,IPC_CREAT|SEM_R|SEM_A)
699329  51384 firefox  PLDG  shmget, "", errno 1 Operation not permitted
699330  51384 firefox  PSIG  SIGABRT SIG_DFL

So shmget(2) needs to be hoised.

CVS: cvs.openbsd.org: ports

[Daniel Jakots]

CVSROOT:/cvs
Module name:ports
Changes by: d...@cvs.openbsd.org2018/04/26 14:29:26

Modified files:
devel/py-rope  : Makefile distinfo 
devel/py-rope/pkg: PLIST 

Log message:
Update to py-rope-0.10.7 and add a py3 flavour

>From Elias M. Mariani with tweaks by me

CVS: cvs.openbsd.org: ports

[Solene Rapenne]

CVSROOT:/cvs
Module name:ports
Changes by: sol...@cvs.openbsd.org  2018/04/26 14:21:41

Modified files:
mail   : Makefile 

Log message:
+ mailpile

CVS: cvs.openbsd.org: ports

[Solene Rapenne]

CVSROOT:/cvs
Module name:ports
Changes by: sol...@cvs.openbsd.org  2018/04/26 14:20:08

Log message:
Import mailpile 1.0.0rc2

Mailpile is an e-mail client, a search engine and a personal webmail
server. Mailpile is an easy way to encrypt your e-mail. Mailpile is
software you run yourself, on your own computer.

Mailpile is an effort to reclaim private communication on the
Internet. A project to rescue our personal lives from the proprietary
cloud and prevent our conversations from being strip-mined for
corporate profit and government surveillance. Mailpile is taking
e-mail back.

Advices and help from landry@ jca@

ok landry@ jca@

Status:

Vendor Tag: solene
Release Tags:   solene_20180426

N ports/mail/mailpile/Makefile
N ports/mail/mailpile/distinfo
N ports/mail/mailpile/pkg/PLIST
N ports/mail/mailpile/pkg/DESCR
N ports/mail/mailpile/patches/patch-scripts_mailpile-test_py
N ports/mail/mailpile/patches/patch-scripts_test-sendmail_sh

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Peter Hessler]

CVSROOT:/cvs
Module name:ports
Changes by: phess...@cvs.openbsd.org2018/04/26 14:19:58

Modified files:
www/libwebsockets: Makefile distinfo 

Log message:
bugfix update to 2.4.2

tested and OK awok@ (MAINTAINER)

Re: Nethack removed from ports question

[Stuart Henderson]

On 2018/04/26 14:49, lea.chesco...@tutanota.com wrote:
> ah great! amazing news! i was sad when i saw it here:
> http://openports.se/games/nethack 

openports.se is broken, I recommend not using it.

Re: x11/freerdp updates?

[Landry Breuil]

On Thu, Apr 26, 2018 at 03:06:26PM -0500, Alex Talaran wrote:
> Hello,
> 
> My skills with C and porting are not that strong yet but I am looking to see
> if anyone is able to help update the freerdp port to version 2.x? I have
> some niche purposes I need this for and version 1 is not supported, the
> current port is 1.2.

An update to 2 was sent a while ago on ports@, but for some reason iirc
some stuff wasnt working with it and it was considered having both in
parallel.

Landry

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/04/26 14:13:04

Modified files:
x11/xscreensaver: Makefile distinfo 
x11/xscreensaver/pkg: PLIST 

Log message:
Update to xscreensaver-5.39.

Re: productivity/timewarrior - WIP

[Matthieu Guegan]

On Wed, Apr 25, 2018 at 09:44:22PM +0200, Erling Westenvik wrote:
Compiles and installs without problems here on my current/amd64. Hope 
it

gets ok'ed.

Erling


Thanks for the test !
May I ask you to try with my last patch please ?

https://marc.info/?l=openbsd-ports=152438482714081=2

Matthieu

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/04/26 14:08:23

Modified files:
games/cgames   : Makefile 

Log message:
Tweak PORTROACH annotation.

x11/freerdp updates?

[Alex Talaran]

Hello,

My skills with C and porting are not that strong yet but I am looking to 
see if anyone is able to help update the freerdp port to version 2.x? I 
have some niche purposes I need this for and version 1 is not supported, 
the current port is 1.2.


Thank you

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/04/26 13:59:04

Modified files:
audio/mp3info  : Makefile 

Log message:
Tweak PORTROACH annotation.

Re: Query regarding on porting things

[Brian Callahan]

On 04/26/18 15:45, Neeraj Pal wrote:

Thank you for the quick response.

So, this is the list of packages that need to be ported to OpenBSD, right?


It is a list of everything in the ports tree without a MAINTAINER. The 
default is to only show ports that need updating but there's a box you 
can click to get a full list.



On Fri, Apr 27, 2018 at 1:11 AM, Brian Callahan  wrote:

On 04/26/18 15:39, Neeraj Pal wrote:

Hello all,

I just want to ask if any ports need to be maintained or are there
anything needs porting?


Thank you

Neeraj Pal


http://portroach.openbsd.org/the%20openbsd%20ports%20mailing-list%20%3cpo...@openbsd.org%3E.html

Re: Query regarding on porting things

[Neeraj Pal]

Thank you for the quick response.

So, this is the list of packages that need to be ported to OpenBSD, right?

On Fri, Apr 27, 2018 at 1:11 AM, Brian Callahan  wrote:
>
> On 04/26/18 15:39, Neeraj Pal wrote:
>>
>> Hello all,
>>
>> I just want to ask if any ports need to be maintained or are there
>> anything needs porting?
>>
>>
>> Thank you
>>
>> Neeraj Pal
>>
>
> http://portroach.openbsd.org/the%20openbsd%20ports%20mailing-list%20%3cpo...@openbsd.org%3E.html

Re: NEW: x11/kde-applications/ktouch

[Vadim Zhukov]

2018-04-26 21:58 GMT+03:00 Rafael Sadowski :
> Please find attached next new KDE4 replacement.
>
> Conflict bits are set:
>
> @conflict ktouch-<17.12.3
> @conflict kdebase-*
> @pkgpath x11/kde4/ktouch
>
> $ cat x11/kde-applications/ktouch/pkg/DESCR
> KTouch is a typing learning tool for KDE.
>
> It is a part of KDE Edu project.
>
> Ok? Commenst?

Well, ktouch conflicts with ktouch by definition, so the first
@conflict shouldn't be needed. :) IIRC, I've added such markers to
stuff under x11/kde-applications initially, thinking about
co-installation of KDE4 and KDE5 ones. But later I realized that they
co-exist more or less fine anyway, and dropped kde5- prefix idea, but
forgot about @conflict markers.

Sorry for missing similar thing in kate port as well.

--
  WBR,
  Vadim Zhukov

CVS: cvs.openbsd.org: ports

[Robert Nagy]

CVSROOT:/cvs
Module name:ports
Changes by: rob...@cvs.openbsd.org  2018/04/26 13:41:38

Modified files:
www/chromium   : Makefile 
www/chromium/patches: patch-build_gn_run_binary_py 
  patch-content_gpu_gpu_sandbox_hook_linux_cc 
  patch-content_zygote_zygote_main_linux_cc 
www/chromium/pkg: PLIST 
Added files:
www/chromium/patches: 
  
patch-content_browser_zygote_host_zygote_host_impl_linux_cc 
  patch-content_common_sandbox_init_linux_cc 
  patch-content_zygote_zygote_linux_cc 
  
patch-services_network_network_sandbox_hook_linux_cc 
  patch-v8_tools_run_py 
www/chromium/pkg: PFRAG.component 

Log message:
add a flavor called component to allow chromium to be built as a non-static
binary to ease development

Re: Query regarding on porting things

[Brian Callahan]

On 04/26/18 15:39, Neeraj Pal wrote:

Hello all,

I just want to ask if any ports need to be maintained or are there
anything needs porting?


Thank you

Neeraj Pal



http://portroach.openbsd.org/the%20openbsd%20ports%20mailing-list%20%3cpo...@openbsd.org%3E.html

Query regarding on porting things

[Neeraj Pal]

Hello all,

I just want to ask if any ports need to be maintained or are there
anything needs porting?


Thank you

Neeraj Pal

Re: NEW: Spyder + UPDATE: py-rope

[Elias M. Mariani]

Sure, no problem, thanks to you for the help!

On Thu, Apr 26, 2018, 10:38 AM Daniel Jakots  wrote:

> On Thu, 26 Apr 2018 00:39:15 -0300, "Elias M. Mariani"
>  wrote:
>
> > [UPDATE] py-rope
> > Updated version.
> > Added FLAVOR=python3.
> > Added regression tests.
> > I did not see any forward dependency on py-rope apart from spyder, so
> > the should be no problem at all (and... well... the regression tests
> > are OK...).
>
> Can you send a diff rather than a tgz please?
> The relevant FAQ section is https://www.openbsd.org/faq/faq5.html#Diff
>
> Thanks,
> Daniel
>


py-rope.diff
Description: Binary data

gtk libtool issue

[s_graf]

I am builing gtk on arm and libtool is very slow.  Is this an issue.

 

Many links like the following take up to 15 minutes, all cpu, no io.

 

libtool: link: cc -o .libs/testactions -pthread -O2 -pipe -g
-Wno-expansion-to-defined -Wall -Wl,-rpath-link -Wl,/usr/X11R6/lib
testactions.o -L.libs -lgdk-x11-2.0 -lpangocairo-1.0 -lpango-1.0
-lgobject-2.0 -lglib-2.0 -liconv -lpcre -lintl -lffi -lc++abi -lgthread-2.0
-lfribidi -lm -lcairo -lpthread -lpixman-1 -lfontconfig -lfreetype -lz
-lexpat -lpng -lxcb-shm -lxcb -lxcb-render -lXrender -lX11 -lXext
-lpangoft2-1.0 -lharfbuzz -lgraphite2 -lgio-2.0 -lgmodule-2.0 -lXinerama
-lXi -lXrandr -lXcursor -lXfixes -lXcomposite -lXdamage -lgdk_pixbuf-2.0
-lgtk-x11-2.0 -latk-1.0
-Wl,-rpath-link,/usr/local/lib,-rpath-link,/usr/X11R6/lib

 

 

top

 

70 processes: 1 running, 68 idle, 1 on processor   up 3 days,
20:21

CPU states: 99.8% user,  0.0% nice,  0.2% system,  0.0% interrupt,  0.0%
idle

Memory: Real: 71M/253M act/tot Free: 241M Cache: 98M Swap: 0K/516M

 

  PID USERNAME PRI NICE  SIZE   RES STATE WAIT  TIMECPU COMMAND

95493 root  640   23M   24M run   -10:11 99.27% ld

63653 sysadmin   20  976K 1784K idle  select2:48  0.00% sshd

37169 root  280  800K 1720K onproc- 0:26  0.00% top

85314 _pflogd40  720K  284K sleep bpf   0:21  0.00% pflogd

81972 _ntp   2  -20  852K 1088K sleep poll  0:17  0.00% ntpd

99954 root   20  640K  872K idle  poll  0:02  0.00% cron

60491 root  100 3228K 5512K idle  wait  0:01  0.00% perl

7659 root   20  960K 1432K idle  poll  0:01  0.00% sshd

1 root  100  372K   80K idle  wait  0:01  0.00% init

73888 root  100 1028K 1888K idle  wait  0:01  0.00% gmake

  402 root  180  976K  864K idle  pause 0:01  0.00% ksh

85270 _syslogd   20  952K 1028K sleep kqread0:01  0.00% syslogd

99069 root   2  -20  708K 1176K idle  poll  0:01  0.00% ntpd

48687 root  180  976K  732K idle  pause 0:01  0.00% ksh

30770 root  180 1568K 2324K idle  pause 0:01  0.00% make

93143 root  180 1552K 2312K idle  pause 0:00  0.00% make

66622 root  180 1564K 2320K idle  pause 0:00  0.00% make

NEW: x11/kde-applications/ktouch

[Rafael Sadowski]

Please find attached next new KDE4 replacement.

Conflict bits are set:

@conflict ktouch-<17.12.3
@conflict kdebase-*
@pkgpath x11/kde4/ktouch

$ cat x11/kde-applications/ktouch/pkg/DESCR
KTouch is a typing learning tool for KDE.

It is a part of KDE Edu project.

Ok? Commenst?

Rafael Sadowski


ktouch-17.12.3.tar.gz
Description: Binary data

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2018/04/26 12:48:19

Modified files:
x11/kde-applications: Makefile 

Log message:
hook kate

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2018/04/26 12:47:14

Log message:
Import kate-17.12.3

Kate is a multi-document, multi-view text editor by KDE. It features stuff 
like
codefolding, syntaxhighlighting, dynamic word wrap, an embedded console, an
extensive plugin interface and some prelimentary scripting support.

Features:
- MDI, window splitting, window tabbing
- Spell checking
- CR, CRLF, LF newline support
- Encoding support (utf-8, utf-16, ascii etc.)
- Encoding conversion
- Regular expression based find & replace
- Powerful syntax highlighting and bracket matching
- Code and text folding
- Infinite undo/redo support
- Block selection mode
- Auto indentation
- Auto completion support
- Shell integration
- Wide protocol support (http, ftp, ssh, webdav etc.) using kioslaves
- Plugin architecture for the application and editor component
- Customizable shortcuts
- Integrated command line
- Scriptable using JavaScript

tweaks from zhuk@ and landry; ok landry@ Big Thanks!

Status:

Vendor Tag: rsadowski
Release Tags:   rsadowski_20180426

N ports/x11/kde-applications/kate/Makefile
N ports/x11/kde-applications/kate/distinfo
N ports/x11/kde-applications/kate/pkg/DESCR
N ports/x11/kde-applications/kate/pkg/PLIST

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2018/04/26 12:28:58

Modified files:
infrastructure/bin: update-plist 

Log message:
comments are not your usual annotations

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2018/04/26 12:24:14

Modified files:
infrastructure/bin: update-plist 

Log message:
so we started up :)

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2018/04/26 12:22:43

Modified files:
infrastructure/bin: update-plist 

Log message:
copy simple annotations

Re: update devel/json-c

[Jeremie Courreges-Anglas]

On Thu, Apr 26 2018, Peter Hessler  wrote:
> ...
> 0.13.1 (up to commit 0f814e5, 2018/03/04)
> =
>
> * Bump the major version of the .so library generated up to 4.0 to avoid 
>   conflicts because some downstream packagers of json-c had already done
>   their own bump to ".so.3" for a much older 0.12 release.
> * Add const size_t json_c_object_sizeof()
> * Avoid invalid free (and thus a segfault) when ref_count gets < 0
> * PR#394: fix handling of custom double formats that include a ".0"
> * Avoid uninitialized variable warnings in json_object_object_foreach
> * Issue #396: fix build for certain uClibc based systems.
> * Add a top level fuzz directory for fuzzers run by OSS-Fuzz
> ...
>
> ...
> $ make regress
> Testsuite summary for json-c 0.13.1
> 
> # TOTAL: 21
> # PASS:  21
> ...
>
> OK?

Not ok unless you add a minor bump (updated diff below), since upstream
added a symbol, as spotted by /usr/src/lib/check_sym:

--8<--
russell /usr/ports/devel/json-c$ /usr/src/lib/check_sym 
/usr/local/lib/libjson-c.so.1.0 
/usr/ports/pobj/json-c-0.13.1/fake-amd64/usr/local/lib/libjson-c.so.1.0
/usr/local/lib/libjson-c.so.1.0 --> 
/usr/ports/pobj/json-c-0.13.1/fake-amd64/usr/local/lib/libjson-c.so.1.0
Dynamic export changes:
added:
json_c_object_sizeof

External reference changes:
removed:
modf

-->8--

Hopefully this will help consumers which are now hardcoding the size of
those objects depending on the json-c version, and help us with more
maintainable patches.

The update looks pretty safe/good overall.


Index: Makefile
===
RCS file: /cvs/ports/devel/json-c/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile18 Feb 2018 19:55:05 -  1.18
+++ Makefile26 Apr 2018 18:10:03 -
@@ -2,10 +2,10 @@
 
 COMMENT=   JSON implementation in C
 
-DISTNAME=  json-c-0.13
+DISTNAME=  json-c-0.13.1
 CATEGORIES=devel
 
-SHARED_LIBS=   json-c  1.0 # 3.1
+SHARED_LIBS=   json-c  1.1 # 4.0
 
 HOMEPAGE=  https://github.com/json-c/json-c/wiki
 
Index: distinfo
===
RCS file: /cvs/ports/devel/json-c/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo18 Feb 2018 19:55:05 -  1.5
+++ distinfo26 Apr 2018 18:03:37 -
@@ -1,2 +1,2 @@
-SHA256 (json-c-0.13.tar.gz) = AxZ4C+mtFsQtfCawFaeE/V30sJCf7wq6Uc+xPkkqwk0=
-SIZE (json-c-0.13.tar.gz) = 634720
+SHA256 (json-c-0.13.1.tar.gz) = uH5gjU0/e/3TbveNVtU8dOZqsnjTGLceYAKjadNvSHM=
+SIZE (json-c-0.13.1.tar.gz) = 639425

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

Re: UPDATE: Nextcloud-13.0.2

[Stefan Sperling]

On Thu, Apr 26, 2018 at 11:24:43AM +0200, Gonzalo L. Rodriguez wrote:
> Hallo,
> 
> Update for Nextcloud to 13.0.2:
> 
> https://nextcloud.com/changelog/
> 
> OK? Comments?

Works as expected on a 6.3 sparc64 system (didn't test on -current).

OK

> Index: Makefile
> ===
> RCS file: /cvs/ports/www/nextcloud/Makefile,v
> retrieving revision 1.10
> diff -u -p -r1.10 Makefile
> --- Makefile  16 Mar 2018 08:22:38 -  1.10
> +++ Makefile  26 Apr 2018 09:23:16 -
> @@ -2,7 +2,7 @@
>  
>  COMMENT= easy and universal access to shared and/or personal 
> files
>  
> -V=   13.0.1
> +V=   13.0.2
>  DISTNAME=nextcloud-${V}
>  EXTRACT_SUFX=.tar.bz2
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/www/nextcloud/distinfo,v
> retrieving revision 1.9
> diff -u -p -r1.9 distinfo
> --- distinfo  16 Mar 2018 08:22:38 -  1.9
> +++ distinfo  26 Apr 2018 09:23:16 -
> @@ -1,2 +1,2 @@
> -SHA256 (nextcloud-13.0.1.tar.bz2) = 
> V0MxSnHpcq5GoUs2s3OU1FRZFapfMtnhK6eG0EwfHRE=
> -SIZE (nextcloud-13.0.1.tar.bz2) = 44183890
> +SHA256 (nextcloud-13.0.2.tar.bz2) = 
> c5b5ihpTqfSxRPVTYNh8ictu6Jn+7xz78ppzYhn5xH0=
> +SIZE (nextcloud-13.0.2.tar.bz2) = 44842305
> Index: patches/patch-version_php
> ===
> RCS file: /cvs/ports/www/nextcloud/patches/patch-version_php,v
> retrieving revision 1.8
> diff -u -p -r1.8 patch-version_php
> --- patches/patch-version_php 16 Mar 2018 08:22:38 -  1.8
> +++ patches/patch-version_php 26 Apr 2018 09:23:16 -
> @@ -3,8 +3,8 @@ Index: version.php
>  --- version.php.orig
>  +++ version.php
>  @@ -2,7 +2,7 @@
> - $OC_Version = array(13,0,1,1);
> - $OC_VersionString = '13.0.1';
> + $OC_Version = array(13,0,2,1);
> + $OC_VersionString = '13.0.2';
>   $OC_Edition = '';
>  -$OC_Channel = 'stable';
>  +$OC_Channel = 'OpenBSD ports';
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/www/nextcloud/pkg/PLIST,v
> retrieving revision 1.10
> diff -u -p -r1.10 PLIST
> --- pkg/PLIST 16 Mar 2018 08:22:38 -  1.10
> +++ pkg/PLIST 26 Apr 2018 09:23:18 -
> @@ -5290,6 +5290,8 @@ nextcloud/apps/activity/l10n/mk.js
>  nextcloud/apps/activity/l10n/mk.json
>  nextcloud/apps/activity/l10n/mn.js
>  nextcloud/apps/activity/l10n/mn.json
> +nextcloud/apps/activity/l10n/ms_MY.js
> +nextcloud/apps/activity/l10n/ms_MY.json
>  nextcloud/apps/activity/l10n/nb.js
>  nextcloud/apps/activity/l10n/nb.json
>  nextcloud/apps/activity/l10n/ne.js
> @@ -5795,6 +5797,8 @@ nextcloud/apps/dav/l10n/fr.js
>  nextcloud/apps/dav/l10n/fr.json
>  nextcloud/apps/dav/l10n/gl.js
>  nextcloud/apps/dav/l10n/gl.json
> +nextcloud/apps/dav/l10n/he.js
> +nextcloud/apps/dav/l10n/he.json
>  nextcloud/apps/dav/l10n/hu.js
>  nextcloud/apps/dav/l10n/hu.json
>  nextcloud/apps/dav/l10n/hu_HU.js
> @@ -6740,6 +6744,8 @@ nextcloud/apps/files/l10n/ach.js
>  nextcloud/apps/files/l10n/ach.json
>  nextcloud/apps/files/l10n/ady.js
>  nextcloud/apps/files/l10n/ady.json
> +nextcloud/apps/files/l10n/af.js
> +nextcloud/apps/files/l10n/af.json
>  nextcloud/apps/files/l10n/af_ZA.js
>  nextcloud/apps/files/l10n/af_ZA.json
>  nextcloud/apps/files/l10n/ak.js
> @@ -7069,6 +7075,7 @@ nextcloud/apps/files_external/3rdparty/i
>  
> nextcloud/apps/files_external/3rdparty/icewind/smb/src/Exception/FileInUseException.php
>  
> nextcloud/apps/files_external/3rdparty/icewind/smb/src/Exception/ForbiddenException.php
>  
> nextcloud/apps/files_external/3rdparty/icewind/smb/src/Exception/HostDownException.php
> +nextcloud/apps/files_external/3rdparty/icewind/smb/src/Exception/InvalidArgumentException.php
>  
> nextcloud/apps/files_external/3rdparty/icewind/smb/src/Exception/InvalidHostException.php
>  
> nextcloud/apps/files_external/3rdparty/icewind/smb/src/Exception/InvalidParameterException.php
>  
> nextcloud/apps/files_external/3rdparty/icewind/smb/src/Exception/InvalidPathException.php
> @@ -7471,6 +7478,7 @@ nextcloud/apps/files_pdfviewer/
>  nextcloud/apps/files_pdfviewer/.github/
>  nextcloud/apps/files_pdfviewer/.github/contributing.md
>  nextcloud/apps/files_pdfviewer/.github/issue_template.md
> +nextcloud/apps/files_pdfviewer/Makefile
>  nextcloud/apps/files_pdfviewer/appinfo/
>  nextcloud/apps/files_pdfviewer/appinfo/app.php
>  nextcloud/apps/files_pdfviewer/appinfo/info.xml
> @@ -8746,8 +8754,6 @@ nextcloud/apps/files_texteditor/l10n/nb.
>  nextcloud/apps/files_texteditor/l10n/nb.json
>  nextcloud/apps/files_texteditor/l10n/nl.js
>  nextcloud/apps/files_texteditor/l10n/nl.json
> -nextcloud/apps/files_texteditor/l10n/nn_NO.js
> -nextcloud/apps/files_texteditor/l10n/nn_NO.json
>  nextcloud/apps/files_texteditor/l10n/oc.js
>  nextcloud/apps/files_texteditor/l10n/oc.json
>  nextcloud/apps/files_texteditor/l10n/pa.php
> @@ -9360,8 

Re: UPATE: devel/py-astroid 1.4.9 -> 1.6.1

[Klemens Nanni]

On Sat, Feb 03, 2018 at 11:10:20AM +0100, Klemens Nanni wrote:
> Here's an update for astroid, the only consumer is devel/pylint which
> is in need for an update as well.
> 
> Committing astroid without pylint will break things but I'd like to get
> my diff out... maybe someone beats me to updating pylint?
> 
> astroid.org is for sale so remove HOMEPAGE.
> 
> Test results seem ok here on amd64:
> 
>   Ran 765 tests in 10.948s
>   
>   FAILED (errors=2, skipped=64, expected failures=9)
>   *** Error 1 in . (Makefile:30 'do-test')
Updated diff with some minor nit I already forgot, pylint update follows
so I'm looking for Feedback/OKs now.

Index: Makefile
===
RCS file: /cvs/ports/devel/py-astroid/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile3 Jan 2017 19:19:48 -   1.6
+++ Makefile26 Apr 2018 15:55:28 -
@@ -1,14 +1,11 @@
 # $OpenBSD: Makefile,v 1.6 2017/01/03 19:19:48 landry Exp $
 
-COMMENT =  common base representation of Python source code
+COMMENT =  abstract syntax tree for Python with inference support
 
-MODPY_EGG_VERSION =1.4.9
+MODPY_EGG_VERSION =1.6.1
 DISTNAME = astroid-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
 CATEGORIES =   devel
-REVISION = 0
-
-HOMEPAGE = http://www.astroid.org/
 
 MAINTAINER =   Alexandr Shadchin 
 
Index: distinfo
===
RCS file: /cvs/ports/devel/py-astroid/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo19 Dec 2016 09:17:58 -  1.4
+++ distinfo26 Apr 2018 15:55:28 -
@@ -1,2 +1,2 @@
-SHA256 (astroid-1.4.9.tar.gz) = pIPniRzjoG2t/Gy5CVsJOKyliUDUNXbXLkUCtIDAhdc=
-SIZE (astroid-1.4.9.tar.gz) = 189315
+SHA256 (astroid-1.6.1.tar.gz) = 8KDjhtvKn5Pqnz6m8ys3okcgUCt7qpyxfDl2poDUOgY=
+SIZE (astroid-1.6.1.tar.gz) = 251639
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-astroid/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST   13 Jun 2016 10:59:57 -  1.2
+++ pkg/PLIST   26 Apr 2018 15:55:28 -
@@ -20,6 +20,7 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/astroid/${MODPY_PYCACHE}context.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/astroid/${MODPY_PYCACHE}decorators.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/astroid/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/astroid/${MODPY_PYCACHE}helpers.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/astroid/${MODPY_PYCACHE}inference.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/astroid/${MODPY_PYCACHE}manager.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/astroid/${MODPY_PYCACHE}mixins.${MODPY_PYC_MAGIC_TAG}pyc
@@ -40,33 +41,78 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/astroid/bases.py
 lib/python${MODPY_VERSION}/site-packages/astroid/brain/
 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/astroid/brain/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/astroid/brain/${MODPY_PYCACHE}brain_attrs.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/astroid/brain/${MODPY_PYCACHE}brain_builtin_inference.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/astroid/brain/${MODPY_PYCACHE}brain_collections.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/astroid/brain/${MODPY_PYCACHE}brain_curses.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/astroid/brain/${MODPY_PYCACHE}brain_dateutil.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/astroid/brain/${MODPY_PYCACHE}brain_fstrings.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/astroid/brain/${MODPY_PYCACHE}brain_functools.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/astroid/brain/${MODPY_PYCACHE}brain_gi.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/astroid/brain/${MODPY_PYCACHE}brain_hashlib.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/astroid/brain/${MODPY_PYCACHE}brain_io.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/astroid/brain/${MODPY_PYCACHE}brain_mechanize.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/astroid/brain/${MODPY_PYCACHE}brain_multiprocessing.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/astroid/brain/${MODPY_PYCACHE}brain_namedtuple_enum.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/astroid/brain/${MODPY_PYCACHE}brain_nose.${MODPY_PYC_MAGIC_TAG}pyc
 

CVS: cvs.openbsd.org: ports

[Peter Hessler]

CVSROOT:/cvs
Module name:ports
Changes by: phess...@cvs.openbsd.org2018/04/26 12:05:59

Modified files:
www/ttyd   : Makefile distinfo 

Log message:
Simple update to 1.4.0

OK bcallah@ kn@

Re: Nethack removed from ports question

[Marc Espie]

On Thu, Apr 26, 2018 at 02:49:10PM +0200, lea.chesco...@tutanota.com wrote:
> ah great! amazing news! i was sad when i saw it here:
> http://openports.se/games/nethack 
> 
> But if thats the case, i am very happy!
> 
> Thank you so much!

lol

Nothing got removed actually.

I moved the nethack 3.4.3 port around so you could install both 3.4.3
and 3.6.0, in case you still have characters to ascend

The move was necessary in order for nethack%3.4 and nethack%3.6
to work in pkg_add if you want to specify WHICH branch you need :)

update devel/json-c

[Peter Hessler]

...
0.13.1 (up to commit 0f814e5, 2018/03/04)
=

* Bump the major version of the .so library generated up to 4.0 to avoid 
  conflicts because some downstream packagers of json-c had already done
  their own bump to ".so.3" for a much older 0.12 release.
* Add const size_t json_c_object_sizeof()
* Avoid invalid free (and thus a segfault) when ref_count gets < 0
* PR#394: fix handling of custom double formats that include a ".0"
* Avoid uninitialized variable warnings in json_object_object_foreach
* Issue #396: fix build for certain uClibc based systems.
* Add a top level fuzz directory for fuzzers run by OSS-Fuzz
...

...
$ make regress
Testsuite summary for json-c 0.13.1

# TOTAL: 21
# PASS:  21
...

OK?


Index: devel/json-c/Makefile
===
RCS file: /cvs/openbsd/ports/devel/json-c/Makefile,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 Makefile
--- devel/json-c/Makefile   18 Feb 2018 19:55:05 -  1.18
+++ devel/json-c/Makefile   26 Apr 2018 17:39:58 -
@@ -2,7 +2,7 @@
 
 COMMENT=   JSON implementation in C
 
-DISTNAME=  json-c-0.13
+DISTNAME=  json-c-0.13.1
 CATEGORIES=devel
 
 SHARED_LIBS=   json-c  1.0 # 3.1
Index: devel/json-c/distinfo
===
RCS file: /cvs/openbsd/ports/devel/json-c/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- devel/json-c/distinfo   18 Feb 2018 19:55:05 -  1.5
+++ devel/json-c/distinfo   26 Apr 2018 17:40:11 -
@@ -1,2 +1,2 @@
-SHA256 (json-c-0.13.tar.gz) = AxZ4C+mtFsQtfCawFaeE/V30sJCf7wq6Uc+xPkkqwk0=
-SIZE (json-c-0.13.tar.gz) = 634720
+SHA256 (json-c-0.13.1.tar.gz) = uH5gjU0/e/3TbveNVtU8dOZqsnjTGLceYAKjadNvSHM=
+SIZE (json-c-0.13.1.tar.gz) = 639425


-- 
Rule of Defactualization:
Information deteriorates upward through bureaucracies.

CVS: cvs.openbsd.org: ports

[Solene Rapenne]

CVSROOT:/cvs
Module name:ports
Changes by: sol...@cvs.openbsd.org  2018/04/26 11:34:59

Modified files:
sysutils   : Makefile 

Log message:
+ boar

CVS: cvs.openbsd.org: ports

[Solene Rapenne]

CVSROOT:/cvs
Module name:ports
Changes by: sol...@cvs.openbsd.org  2018/04/26 11:32:48

Log message:
Import boar 20170509

Boar is a version control system for handling large binary files,
something that most other VCSs doesn't handle very well. This makes it
possible to version control your music, images, videos, and other
valuable binary data.

With help from espie@ jca@ danj@ sthen@

ok jca@ sthen@ danj@

Status:

Vendor Tag: solene
Release Tags:   solene_20180426

N ports/sysutils/boar/distinfo
N ports/sysutils/boar/Makefile
N ports/sysutils/boar/pkg/PLIST
N ports/sysutils/boar/pkg/DESCR

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Solene Rapenne]

CVSROOT:/cvs
Module name:ports
Changes by: sol...@cvs.openbsd.org  2018/04/26 11:25:40

Modified files:
games/tome4: Makefile distinfo 
games/tome4/pkg: PLIST-main 
Added files:
games/tome4/pkg: README-main 

Log message:
Update to tome4-1.5.7

Added README asked by schwarze@
WANTLIB c++abi required spotted by jca@, solution provided by sthen@

ok jca@ schwarze@ bcallah@

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2018/04/26 11:23:18

Modified files:
infrastructure/bin: update-plist 

Log message:
actually recognize comments

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2018/04/26 11:13:14

Modified files:
infrastructure/lib/OpenBSD: FS2.pm 

Log message:
bleh, having to run objdump for each possible binary sucks... oh well.

NEW devel/py-urwid_utils

[Peter Hessler]

I need a bunch of dependencies for a new MLB player.


urwid_utils provides some light wrappers and object-oriented interfaces
to some parts of urwid that are otherwise less-so.
...

OK?


-- 
Accident, n.:
A condition in which presence of mind is good, but absence of
body is better.
-- Foolish Dictionary


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

NEW devel/py-panwid

[Peter Hessler]

I need a bunch of dependencies for a new MLB player.


collection of widgets for urwid
...

OK?


-- 
Accident, n.:
A condition in which presence of mind is good, but absence of
body is better.
-- Foolish Dictionary


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

NEW devel/py-palette

[Peter Hessler]

I need a bunch of dependencies for a new MLB player.


Palette makes it easy to perform simple operations on colors and to
convert between different color systems and representations.
...

OK?


-- 
Accident, n.:
A condition in which presence of mind is good, but absence of
body is better.
-- Foolish Dictionary


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

NEW devel/py-orderedattrdict

[Peter Hessler]

I need a bunch of dependencies for a new MLB player.


An ordered dictionary with attribute-style access.
...

OK?


-- 
Accident, n.:
A condition in which presence of mind is good, but absence of
body is better.
-- Foolish Dictionary


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

Re: update www/ttyd

[Klemens Nanni]

On Thu, Apr 26, 2018 at 06:25:06PM +0200, Peter Hessler wrote:
> Tested at my BGP tutorial last month.
> 
> OK?
OK

NEW devel/py-memoize

[Peter Hessler]

I need a bunch of dependencies for a new MLB player.


This is a (relatively) simple Python memoizing module (ie. a function
cache), in which any dict-like can be used as the actual storage object.
...

OK?


-- 
Accident, n.:
A condition in which presence of mind is good, but absence of
body is better.
-- Foolish Dictionary


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

[armv7 fix] net/echoping

[Markus Hennecke]

The configure test for mandatory -lm is broken, because the single 
pow(a,b) call is optimized away. Fix this by forcing the call to be 
compiled in via return statement.
This compiles without a change on amd64 and fixes the build on armv7.

Index: patches/patch-configure
===
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-configure 26 Apr 2018 16:47:22 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Index: configure
+--- configure.orig
 configure
+@@ -4432,9 +4432,8 @@ cat >>conftest.$ac_ext <<_ACEOF
+ int
+ main ()
+ {
+-pow(a,b)
++return pow(a,b)
+   ;
+-  return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext

CVS: cvs.openbsd.org: ports

[Brian Callahan]

CVSROOT:/cvs
Module name:ports
Changes by: bcal...@cvs.openbsd.org 2018/04/26 10:43:56

Modified files:
sysutils/bchunk: Tag: OPENBSD_6_3 Makefile distinfo 
sysutils/bchunk/patches: Tag: OPENBSD_6_3 patch-bchunk_1 
sysutils/bchunk/pkg: Tag: OPENBSD_6_3 PLIST 

Log message:
Backport update of bchunk-1.2.2 to -stable -- fixes a trio of CVEs:
CVE-2017-15953, CVE-2017-15954, and CVE-2017-15955
ok jca@, who also asked for a small tweak to MAKE_FLAGS which is included.

CVS: cvs.openbsd.org: ports

[Brian Callahan]

CVSROOT:/cvs
Module name:ports
Changes by: bcal...@cvs.openbsd.org 2018/04/26 10:42:42

Modified files:
sysutils/bchunk: Makefile distinfo 
sysutils/bchunk/patches: patch-bchunk_1 
sysutils/bchunk/pkg: PLIST 

Log message:
Update to bchunk-1.2.2 -- fixes a trio of CVEs:
CVE-2017-15953, CVE-2017-15954, and CVE-2017-15955
ok jca@, who also asked for a small tweak to MAKE_FLAGS which is included.

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2018/04/26 10:40:56

Modified files:
infrastructure/lib/OpenBSD: FS2.pm 

Log message:
not going to come back

Re: Remove emulators/sdlmame and emulators/sdlmess?

[Marc Espie]

On Thu, Apr 26, 2018 at 05:19:39PM +0200, Jeremie Courreges-Anglas wrote:
> On Wed, Apr 25 2018, Frederic Cambus  wrote:
> > Hi ports@,
> >
> > We now have an up-to-date emulators/mame port for which we can build
> > and distribute binary packages for amd64 and i386. More information
> > here: https://marc.info/?l=openbsd-ports=151514926004836=2
> >
> > I think it's time to remove emulators/sdlmame and emulators/sdlmess.
> > MAME and MESS merged in 2015 so emulators/mame contains both.
> >
> > Diff to add @pkgpath markers to emulators/mame and quirks entry below.
> >
> > Comments? OK to remove?
> 
> Looks like you can't upgrade to mame if you have both sdlmame and
> sdlmess installed:
> 
>   env TRUSTED_PKG_PATH=/usr/ports/packages/amd64/all/ pkg_add -u
>   [sdlmame-0.160p5]sdlmess-0.160p3->mame-0.197: internal conflict between 
> mame-0.197 and sdlmame-0.160p5
> 
> After removing sdlmame:
> 
>   env TRUSTED_PKG_PATH=/usr/ports/packages/amd64/all/ pkg_add -u
>   sdlmess-0.160p3->mame-0.197: ok
> 
> Dunno if that's a limitation in pkg_add or if some annotations/quirks
> are missing.  Maybe espie knows better?
> 
> I'm tempted to ok this anyway...
> 
Oh, and does it perform the same if you keep sdlmame, and remove sdlmess
instead ?

Re: Remove emulators/sdlmame and emulators/sdlmess?

[Marc Espie]

On Thu, Apr 26, 2018 at 05:19:39PM +0200, Jeremie Courreges-Anglas wrote:
> On Wed, Apr 25 2018, Frederic Cambus  wrote:
> > Hi ports@,
> >
> > We now have an up-to-date emulators/mame port for which we can build
> > and distribute binary packages for amd64 and i386. More information
> > here: https://marc.info/?l=openbsd-ports=151514926004836=2
> >
> > I think it's time to remove emulators/sdlmame and emulators/sdlmess.
> > MAME and MESS merged in 2015 so emulators/mame contains both.
> >
> > Diff to add @pkgpath markers to emulators/mame and quirks entry below.
> >
> > Comments? OK to remove?
> 
> Looks like you can't upgrade to mame if you have both sdlmame and
> sdlmess installed:
> 
>   env TRUSTED_PKG_PATH=/usr/ports/packages/amd64/all/ pkg_add -u
>   [sdlmame-0.160p5]sdlmess-0.160p3->mame-0.197: internal conflict between 
> mame-0.197 and sdlmame-0.160p5
> 
> After removing sdlmame:
> 
>   env TRUSTED_PKG_PATH=/usr/ports/packages/amd64/all/ pkg_add -u
>   sdlmess-0.160p3->mame-0.197: ok
> 
> Dunno if that's a limitation in pkg_add or if some annotations/quirks
> are missing.  Maybe espie knows better?
> 
> I'm tempted to ok this anyway...

Looks like a limitation, it should figure out to update sdlmame instead of
keeping it. That's quite strange.

What does it say with -v 

not going to rebuild this just to check.

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/04/26 10:25:42

Modified files:
sysutils/rundeck: Makefile 

Log message:
drop maintainership

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/04/26 10:25:15

Modified files:
devel/distcc   : Makefile distinfo 
devel/distcc/patches: patch-Makefile_in patch-src_setuid_c 
devel/distcc/pkg: PLIST-main README-main distccd.rc 
Removed files:
devel/distcc/patches: patch-src_access_c patch-src_compile_c 
  patch-src_exec_c patch-src_lsdistcc_c 

Log message:
update to distcc-3.3

Re: initial pledge() wip for firefox

[Landry Breuil]

On Thu, Apr 26, 2018 at 04:01:43PM +, David CARLIER wrote:
> Interesting, quick question out of curiosity, when the user configure the
> pledge permissions, is there any "minimum permissions" handling in case or
> it s all user responsibility to make it correct ?

It's here for debugging, not to provide knobs to users who love to push
knobs, so very little handling of special cases is done. If you read the
diff, you'll see that if your pledge promises list is invalid, pledge()
will error out, tell you so on stdout, and continue.

If you fuck it up and end up in a situation where the browser doesnt
start at all, edit ~/.mozilla/firefox/*.default/prefs.js and remove the
security.sandbox related lines so that it goes back to the defaults
(which are installed in 
/usr/local/lib/firefox/browser/defaults/preferences/all-openbsd.js)

Landry

update www/ttyd

[Peter Hessler]

Tested at my BGP tutorial last month.

OK?

Index: www/ttyd/Makefile
===
RCS file: /cvs/openbsd/ports/www/ttyd/Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 Makefile
--- www/ttyd/Makefile   22 Sep 2017 21:30:32 -  1.2
+++ www/ttyd/Makefile   10 Mar 2018 14:07:59 -
@@ -4,8 +4,7 @@ COMMENT =   share your terminal over the w
 
 GH_ACCOUNT =   tsl0922
 GH_PROJECT =   ttyd
-GH_TAGNAME =   1.3.3
-REVISION = 0
+GH_TAGNAME =   1.4.0
 
 CATEGORIES =   www
 
@@ -19,7 +18,5 @@ MODULES = devel/cmake
 BUILD_DEPENDS =editors/vim,-main
 LIB_DEPENDS =  www/libwebsockets \
devel/json-c
-
-NO_TEST =  Yes
 
 .include 
Index: www/ttyd/distinfo
===
RCS file: /cvs/openbsd/ports/www/ttyd/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- www/ttyd/distinfo   19 Sep 2017 07:49:09 -  1.1.1.1
+++ www/ttyd/distinfo   10 Mar 2018 14:06:16 -
@@ -1,2 +1,2 @@
-SHA256 (ttyd-1.3.3.tar.gz) = bu2CiV2hNZU4Rxy8yCV2xKIaTGhU4fEl/FUhX3xR2lI=
-SIZE (ttyd-1.3.3.tar.gz) = 194715
+SHA256 (ttyd-1.4.0.tar.gz) = dXqbW13T3oAdfbj6tgNdl+oUSwKlHHi9qyio4HvPBdY=
+SIZE (ttyd-1.4.0.tar.gz) = 275006



-- 
The best book on programming for the layman is "Alice in Wonderland";
but that's because it's the best book on anything for the layman.

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2018/04/26 10:17:18

Added files:
net/weechat/patches: patch-src_gui_curses_normal_CMakeLists_txt 
Removed files:
net/weechat/patches: patch-src_gui_curses_CMakeLists_txt 

Log message:
Forgot patches; spotted by kn@

Re: [new] exa, an ls replacement written in rust

[Landry Breuil]

On Thu, Apr 26, 2018 at 04:35:49PM +0200, Klemens Nanni wrote:
> On Thu, Apr 26, 2018 at 02:28:37PM +0200, Landry Breuil wrote:
> > quick'n'fast port for exa, cf https://github.com/ogham/exa
> > 
> > I'm not sure if we really need 'an ls replacement' but it builds fine,
> > and that makes it one more rust port to exercise the compiler when
> > testing updates, so im looking for okays to import it :)
> We certainly don't need it, but exa has stuff like Git integration and
> all that some users might find helpful.
> 
> Looks good, but you're missing the manual page... (contrib/man/exa.1)

Nice catch, installs it & the shell completions while here, and patch
out opt-level=3 from semarie@. New version attached ( ihad the same set
of tests failing)

Landry


exa-0.8.0_2.tgz
Description: application/tar-gz

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2018/04/26 10:11:11

Modified files:
x11/kde-applications: Makefile 

Log message:
hook kqtquickcharts

[armv7 fix] shell/ksh93

[Markus Hennecke]

The patch below adds explicit -lm when libshell.a is used to link an 
executable. This unbreaks the build on armv7. Building on amd64 succeeded 
as well, with no change in ldd output for ksh or shcomp.

Index: patches/patch-src_cmd_ksh93_Mamfile
===
RCS file: patches/patch-src_cmd_ksh93_Mamfile
diff -N patches/patch-src_cmd_ksh93_Mamfile
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_cmd_ksh93_Mamfile 26 Apr 2018 14:48:11 -
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: src/cmd/ksh93/Mamfile
+--- src/cmd/ksh93/Mamfile.orig
 src/cmd/ksh93/Mamfile
+@@ -1337,7 +1337,7 @@ prev +ljobs
+ prev +li
+ prev ${mam_libsocket}
+ prev ${mam_libsecdb}
+-exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${CCFLAGS} ${LDFLAGS} 
${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o ksh pmain.o ${mam_libshell} 
${mam_libnsl} ${mam_libast}
++exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${CCFLAGS} ${LDFLAGS} 
${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o ksh pmain.o ${mam_libshell} 
${mam_libnsl} ${mam_libast} -lm
+ done ksh generated
+ make shcomp
+ make shcomp.o
+@@ -1361,7 +1361,7 @@ prev ${mam_libsocket}
+ prev ${mam_libsecdb}
+ setv CC.DLL -UCC.DLL
+ setv SH_DICT -DSH_DICT="\"libshell\""
+-exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${CCFLAGS} ${LDFLAGS} 
${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o shcomp shcomp.o 
${mam_libshell} ${mam_libnsl} ${mam_libast}
++exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${CCFLAGS} ${LDFLAGS} 
${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o shcomp shcomp.o 
${mam_libshell} ${mam_libnsl} ${mam_libast} -lm
+ done shcomp generated
+ make suid_exec
+ make suid_exec.o

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2018/04/26 10:08:45

Log message:
Import kqtquickcharts-17.12.3

A QtQuick plugin to render beautiful and interactive charts.

ok landry@ Thanks!

Status:

Vendor Tag: rsadowski
Release Tags:   rsadowski_20180426

N ports/x11/kde-applications/kqtquickcharts/Makefile
N ports/x11/kde-applications/kqtquickcharts/distinfo
N ports/x11/kde-applications/kqtquickcharts/pkg/DESCR
N ports/x11/kde-applications/kqtquickcharts/pkg/PLIST

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

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

Modified files:
sysutils   : Makefile 

Log message:
+fprintd

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

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

Log message:
Import fprintd-0.8.0.

fprintd is a daemon to offer libfprint functionality over D-Bus.
<...>

ok jasper@

Status:

Vendor Tag: ajacoutot
Release Tags:   ajacoutot_20180426

N ports/sysutils/fprintd/distinfo
N ports/sysutils/fprintd/Makefile
N ports/sysutils/fprintd/pkg/DESCR
N ports/sysutils/fprintd/pkg/PLIST

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2018/04/26 10:06:09

Modified files:
net/weechat: Makefile distinfo 
net/weechat/patches: patch-src_plugins_CMakeLists_txt 
net/weechat/pkg: PLIST-main 

Log message:
Update weechat to 2.1

- Etepetete Makefile tweaks from kn@
- take MAINTAINER (requested by old maintainer danj@)
- Tested by bket@ Thanks!

ok danj@

Re: NEW: godot - a 2D and 3D game engine and game development framework

[tfrohw...@fastmail.com]

I agree. I'm working on fixing zstd - not as straightforward as I hoped, need a 
few more days I think.

On April 26, 2018 3:18:31 PM UTC, Stuart Henderson  wrote:
>IMHO/IME it's a waste of time trying to force scons into handling
>niceties, it's tricky enough getting the damn thing to build correctly
>in the first place.
>
>If you have a version with zstd fixed let's get it in and move on?
>
>On 2018/04/26 07:41, tfrohwein wrote:
>> Hi Brian,
>> 
>> These are the key points regarding scons:
>> 
>> > On 04/22/18 18:29, tfrohwein wrote:
>> > > > > >
>http://docs.godotengine.org/en/latest/development/compiling/compiling_for_x11.html
>> > > > > > says "Python 2.7+ (Python 3 only supported as of SCons
>3.0)", our
>> > > > > > devel/scons is at 2.5.1, so you should set MODPY_VERSION
>accordingly.
>> > > > > scons does use python2.7 during the build. Would it make
>sense to rather add
>> > > > > this to the devel/scons module? (cc'ing Maintainer)
>> > > > > It's only used a build time.
>> > > > This might be because Python 3 is not installed on your system.
>> > > python3 *is* installed on my system.
>> > > 
>> > > > Explicitly setting the required version makes intention clear
>and avoids
>> > > > errors when building with autodetected versions.
>> > > > 
>> > > > If devel/scons<=2.5.1 is limited to Python 2 this should
>obviously be
>> > > > set there instead of every port using it.
>> > > Just going by existing ports, of 12 using scons module, only one
>sets
>> > > MODPY_VERSION (databases/mongodb). Here the list:
>> > > 
>> > > audio/hydrogen
>> > > databases/mongodb
>> > > emulators/fceux
>> > > games/boswars
>> > > games/dangerdeep
>> > > games/dxx-rebirth
>> > > games/pingus
>> > > graphics/mapnik
>> > > multimedia/ffmpeg2theora
>> > > net/serf
>> > > x11/gaia
>> > > x11/xsettingsd
>> > > 
>> > > While I acknowledge that pre-existing practice doesn't equal best
>approach,
>> > > whatever *would* break with the godot draft *should* already have
>broken the
>> > > 11 scons ports above that also don't set MODPY_VERSION. The fact
>that there
>> > > don't seem to be such reports indicates to me that this might
>ultimately be a
>> > > non-issue.
>> > > 
>> > > I think this should be in the discussion of the scons port, not
>this port. I'm
>> > > happy to adjust my ports if needed.
>> 
>> 1. Do ports using MODULE devel/scons need MODPY_VERSION to be set?
>(not current
>>practice based on above review)
>> 2. If so, would adding MODPY_VERSION to the scons module be a
>possibility?
>> 
>> > > > > > scons has full support for out-of-tree builds and ports as
>big as Godot
>> > > > > > will benefit from it, can you look into enabling
>SEPARATE_BUILD? See
>> > > > > > http://www.scons.org/doc/2.5.0/HTML/scons-user/ch15.html .
>> > > > > Enabling SEPARATE_BUILD alone doesn't achieve anything and
>the binary is still
>> > > > > built in WRKSRC.
>> > > > Yes, I noticed that.
>> > > > 
>> > > > > thfr@e5570:/usr/ports$ fgrep -iR variant_dir *
>> > > > > thfr@e5570:/usr/ports$
>> > > > > 
>> > > > > There isn't a single example of using scons' variant
>directory tree in our
>> > > > > ports tree and the use is far from intuitive.
>> > > > > 
>> > > > > The example in your link uses a modification to a single
>SConscript file to
>> > > > > achieve this. godot doesn't have an SConscript file, but
>several SCsub files.
>> > > > > If someone more familiar with scons knows how to set this up
>with variant_dir
>> > > > > (including platform names in the build directory names)
>scenario I'd be happy
>> > > > > to test.
>> 
>> 3. Do you know of a way setting separate build directory with scons?
>The above
>>link describes a way with variant_dir, but this port has several
>SCsub
>>files, so this is at best trickier and neither of kn@ and me knows
>scons
>>well enough to set this up correctly. There are no examples of
>variant_dir
>>use in the ports tree...
>> 
>> > Scons needs an update too, version 3 was released some time ago. I
>couldn't
>> > get all the scons ports to build with the new version though and
>haven't had
>> > time to track things down. But I haven't been too worried since no
>one has
>> > proposed a port that requires the new scons...
>> 
>> This one also doesn't require version 3, so I don't think the update
>is a
>> pressing issue.
>> 

-- 
tfrohw...@fastmail.com


Other (more secure) messaging options:
t...@protonmail.com
t...@bitmessage.ch
bm-2ct3tfztzmp7g7wikr1t1fiosboc8wo...@bitmessage.ch
PGP Public Key:
https://pgp.mit.edu/pks/lookup?op=get=0xE1A22D58D20C6D22

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

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

Modified files:
security/libfprint: Makefile distinfo 
Removed files:
security/libfprint/patches: patch-configure_ac 
patch-libfprint_Makefile_in 
patch-libfprint_imgdev_c 

Log message:
Update to libfprint-0.6.0.

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

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

Modified files:
www/pecl56-pecl_http: distinfo 

Log message:
oops, regen pecl56-pecl_http distinfo, it was bad from a trial of updating
to 2.6.0. spotted by naddy, thanks

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

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

Modified files:
sysutils/login_fingerprint: Makefile 
sysutils/login_fingerprint/patches: patch-Makefile 

Log message:
Cope with recent libfprint update.

ok robert@

initial pledge() wip for firefox

[Landry Breuil]

Hi,

a bit rough around the edges, but works so far in light testing here
with 60.0b15.

There are two pledge() calls so far, more or less at the places where
upstream starts/initiates sandboxing for the tier1 platforms, and after
a bit of testing this is the subset i've come up with to have it working
more than 5mn, youtube playing a video being the heavier test i did:

- main process : "stdio rpath wpath cpath inet proc exec prot_exec flock ps 
sendfd recvfd dns vminfo tty"
- content processes : "stdio rpath wpath cpath inet recvfd sendfd prot_exec 
unix"

Some code had to be short-circuited to not die upon KERN_PROC_PID
sysctls, and debugging info is printed to stdout:

ComputeProcessUptime called when pledged, noop
pledged main process (pid=20061) with promises: 'stdio rpath wpath cpath inet 
proc exec prot_exec flock ps sendfd recvfd dns vminfo tty'
GetIsDebuggerAttached called when pledged, noop
pledged content process (pid=72708) with promises: 'stdio rpath wpath cpath 
inet recvfd sendfd prot_exec unix'

For debugging purposes, the pledge strings are user-configurable via
about:config tweaks ('security.sandbox.pledge.main' and
'security.sandbox.pledge.content', this way one doesnt need to rebuild
the whole thing to change a pledge.
On top of this, 'security.sandbox.content.level' (used upstream across
all platforms) defaults to 1 so that the content processes get pledged
by default.
In the 'final' version, of course all this will be hardcoded because
security is not a knob, right ?

I've opened https://bugzilla.mozilla.org/show_bug.cgi?id=1457092
upstream to start a discussion on how to properly integrate it.

Now, for the testing, either checkout the pledge branch in my git repo:
git clone -b pledge https://rhaalovely.net/git/mozilla-firefox/

and build the port (it will be 60.0b15), or use the resulting pkg from
my repo:
doas env PKG_PATH=https://packages.rhaalovely.net/%m pkg_add firefox

Or you can try building 59.0.2 (in ports now) with the attached diff
below, applies but totally untested.
Of course if you test it, be prepared to watch dmesg for pledge messages
for various aborts, and report me what you were doing at that time, with
the corresponding message, so that i can try reproducing it.

Landry
diff --git a/Makefile b/Makefile
index 98e4e38..abae30f 100644
--- a/Makefile
+++ b/Makefile
@@ -69,6 +67,7 @@ MAKE_ENV +=   RUSTFLAGS="-C target-cpu=pentium4 --cfg 
target_feature=\"sse2\""
 DPB_PROPERTIES =   lonesome
 .endif
 #CONFIGURE_ARGS += --enable-linker=lld
+CONFIGURE_ARGS +=  --enable-sandbox --enable-content-sandbox
 
 SUBST_VARS +=  LOCALBASE X11BASE
 
diff --git a/files/all-openbsd.js b/files/all-openbsd.js
index 17e84f1..95185c0 100644
--- a/files/all-openbsd.js
+++ b/files/all-openbsd.js
@@ -4,3 +4,7 @@ pref("app.shield.optoutstudies.enabled", false);
 pref("browser.safebrowsing.enabled", false);
 pref("browser.safebrowsing.malware.enabled", false);
 pref("spellchecker.dictionary_path", "${LOCALBASE}/share/mozilla-dicts/");
+// enable pledging the content process
+pref("security.sandbox.content.level", 1);
+pref("security.sandbox.pledge.main","stdio rpath wpath cpath inet proc exec 
prot_exec flock ps sendfd recvfd dns vminfo tty");
+pref("security.sandbox.pledge.content","stdio rpath wpath cpath inet recvfd 
sendfd prot_exec unix");
diff --git a/patches/patch-dom_ipc_ContentChild_cpp 
b/patches/patch-dom_ipc_ContentChild_cpp
new file mode 100644
index 000..fd7344c
--- /dev/null
+++ b/patches/patch-dom_ipc_ContentChild_cpp
@@ -0,0 +1,32 @@
+$OpenBSD$
+
+Index: dom/ipc/ContentChild.cpp
+--- dom/ipc/ContentChild.cpp.orig
 dom/ipc/ContentChild.cpp
+@@ -97,6 +97,8 @@
+ #include "CubebUtils.h"
+ #elif defined(XP_MACOSX)
+ #include "mozilla/Sandbox.h"
++#elif defined(__OpenBSD__)
++#include 
+ #endif
+ #endif
+ 
+@@ -1719,6 +1721,17 @@ ContentChild::RecvSetProcessSandbox(const MaybeFileDes
+   mozilla::SandboxTarget::Instance()->StartSandbox();
+ #elif defined(XP_MACOSX)
+   sandboxEnabled = StartMacOSContentSandbox();
++#elif defined(__OpenBSD__)
++  nsAutoCString promisesString;
++  Preferences::GetCString("security.sandbox.pledge.content",
++  promisesString);
++  if (pledge(promisesString.get(), NULL) == -1) {
++if (errno == EINVAL)
++printf_stderr("pledge promises for content process is a malformed 
string: '%s'\n", promisesString.get());
++if (errno == EPERM)
++printf_stderr("pledge promises for content process cant elevate 
priviledges: '%s'\n", promisesString.get());
++  } else
++  printf_stderr("pledged content process (pid=%d) with promises: '%s'\n", 
getpid() promisesString.get());
+ #endif
+ 
+   CrashReporter::AnnotateCrashReport(
diff --git a/patches/patch-gfx_thebes_gfxFcPlatformFontList_cpp 
b/patches/patch-gfx_thebes_gfxFcPlatformFontList_cpp
new file mode 100644
index 000..32586c5
--- /dev/null
+++ b/patches/patch-gfx_thebes_gfxFcPlatformFontList_cpp
@@ -0,0 +1,32 @@
+$OpenBSD$
+