amd64-clang bulk build report (llvm 15)

[Jérémie Courrèges-Anglas]

Bulk build on pbuild-amd64.wxcvbn.org

Started : Tue Jan  3 02:26:11 CET 2023
Finished: Sat Jan  7 01:45:02 CET 2023
Duration: 3 Days 23 hours 19 minutes

Built using OpenBSD 7.2-current (GENERIC.MP) #2: Fri Dec 30 02:11:28 CET 2022

Built 10508 packages

Number of packages built each day:
Jan 3: 3984
Jan 4: 1693
Jan 5: 1731
Jan 6: 3094
Jan 7: 6


Critical path missing pkgs:
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/summary.txt

Build failures: 132
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/archivers/macutil.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/archivers/zziplib.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/audio/libmpd.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/audio/libworkman.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/audio/p5-Ogg-Vorbis-Header.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/benchmarks/randread.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/benchmarks/siege.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/cad/magic.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/comms/pilot-link.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/converters/ish.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/converters/mpack.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/converters/wv.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/databases/libdbi-drivers,-freetds.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/databases/p5-sybperl.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/devel/afl++.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/devel/arm-none-eabi/newlib.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/devel/avr32/gcc-bootstrap.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/devel/distcc,-gtk.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/devel/fnc.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/devel/include-what-you-use.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/devel/jdk/1.8.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/devel/jdk/17.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/devel/libgtop2.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/devel/p5-IO-Tty.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/devel/py-llvmlite,python3.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/devel/py-rcsparse.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/devel/qcoro.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/devel/ruby-rb-gsl,ruby31.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/devel/subversion.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/devel/ti-msp430gcc.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/editors/axe.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/emulators/BasiliskII.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/games/cdogs-sdl.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/games/clonekeen.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/games/dxx-rebirth.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/games/falconseye.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/games/lincity.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/games/spider.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/games/unknown-horizons.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/games/xjewel.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/games/xneko.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/games/zelda3-data.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/games/zelda3-rom.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/geo/spatialite/freexl.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/graphics/darktable.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/graphics/glm.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/graphics/gphoto2.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/graphics/piglit.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/graphics/ruby-rmagick,ruby31.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/graphics/vid.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/inputmethods/libskk.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/japanese/Wnn.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/japanese/canna.txt
https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/japanese/kanjips.txt

Re: [UPDATE] sysutils/udfclient to 0.8.6

[Jérémie Courrèges-Anglas]

Josh Grosse  writes:

> Previously posted: http://marc.info/?l=openbsd-ports=146763315829379=2
>
> Tested on amd64.

Committed, thanks.

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

samba-4.3.8 regressions (testers wanted)

[Jérémie Courrèges-Anglas]

Hi,

The last security update to samba-4.3.8 brought various regressions,
among them guest account access from various implementations. Upstream
is working on fixes as noted in this bug:

  https://bugzilla.samba.org/show_bug.cgi?id=11849

(See "Blocks:" for a list of bugs that might affect you.)

Testing early and making sure that the fixes end up in the next 4.3.x is
the way forward, but right now I can only deal with the latter part.
Reports welcome!


Index: Makefile
===
RCS file: /cvs/ports/net/samba/Makefile,v
retrieving revision 1.215.2.1
diff -u -p -r1.215.2.1 Makefile
--- Makefile17 Apr 2016 17:08:29 -  1.215.2.1
+++ Makefile29 Apr 2016 15:19:32 -
@@ -16,11 +16,17 @@ PKGNAME-tevent =tevent-${TEVENT_V}
 PKGNAME-util = samba-util-${VERSION}
 PKGNAME-docs = samba-docs-${VERSION}
 
+REVISION-main =0
+
 PKG_ARCH-docs =*
 
 LDB_V =1.1.21
 TEVENT_V = 0.9.25
 
+# From https://bugzilla.samba.org/show_bug.cgi?id=11849
+PATCHFILES =   samba-4.3.8-regressions0.diff:0
+PATCH_DIST_STRIP = -p1
+
 SHARED_LIBS =  asn1-samba4 0.0 \
dcerpc  0.0 \
dcerpc-atsvc0.0 \
@@ -102,6 +108,7 @@ WANTLIB-docs =
 
 MASTER_SITES = https://download.samba.org/pub/samba/stable/ \
https://download.samba.org/pub/samba/old-versions/
+MASTER_SITES0 =http://autogeree.net/~jca/tmp/
 
 MULTI_PACKAGES =   -main -ldb -tevent -util -docs
 
Index: distinfo
===
RCS file: /cvs/ports/net/samba/distinfo,v
retrieving revision 1.45.2.1
diff -u -p -r1.45.2.1 distinfo
--- distinfo17 Apr 2016 17:08:29 -  1.45.2.1
+++ distinfo29 Apr 2016 15:19:32 -
@@ -1,2 +1,4 @@
+SHA256 (samba-4.3.8-regressions0.diff) = 
oJVpOATZL9iQ1u4IMMoZQlb1Ds2V6/7T2OYZlhw0WlY=
 SHA256 (samba-4.3.8.tar.gz) = N53GbDoKSDv1vtN75uXRgpNNt8QQKyGSmmxGArMrKxA=
+SIZE (samba-4.3.8-regressions0.diff) = 63105
 SIZE (samba-4.3.8.tar.gz) = 20568773


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

archivers/lz4json for firefox bookmarks?

[Jérémie Courrèges-Anglas]

firefox uses a custom file format to write its bookmark backups.  It's
not very advanced, just... different from simple lz4-compressed json
files.  This is painful when you're trying to peek at the actual data.

Here's a port of lz4json, a simple decoder written by Andi Kleen.  It
assumed a little endian machine, but I guess we can do a bit better.

Thoughts?



lz4json.tgz
Description: Binary data

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

news/nn diff

[Jérémie Courrèges-Anglas]

Hi,

this is a diff I've had since years and I never went to try it.
Tests welcome.

Index: Makefile
===
RCS file: /cvs/ports/news/nn/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile24 Nov 2015 09:11:05 -  1.12
+++ Makefile11 Mar 2016 13:02:30 -
@@ -2,7 +2,7 @@
 
 COMMENT =  No News is Good News (Fast CLI Point & Read Newsreader)
 DISTNAME = nn-6.7.3
-REVISION = 1
+REVISION = 2
 CATEGORIES =   news
 HOMEPAGE = http://www.nndev.org
 
Index: files/s-openbsd.h
===
RCS file: /cvs/ports/news/nn/files/s-openbsd.h,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 s-openbsd.h
--- files/s-openbsd.h   17 Nov 2008 08:42:13 -  1.1.1.1
+++ files/s-openbsd.h   11 Mar 2016 13:02:30 -
@@ -59,7 +59,7 @@
  * Define if a signal handler has type void (see signal.h)
  */
 
-/* #define SIGNAL_HANDLERS_ARE_VOID/* */
+#defineSIGNAL_HANDLERS_ARE_VOID/* */
 
 /*
  * Define if signals must be set again after they are caught


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

Re: NEW: TeXmacs 1.99.4

[Jérémie Courrèges-Anglas]

Ray Lai  writes:

> Hi,

Hi Ray,

> GNU TeXmacs is a free wysiwyw (what you see is what you want) editing 
> platform with special features for scientists. The software aims to 
> provide a unified and user friendly framework for editing structured 
> documents with different types of content (text, graphics, mathematics, 
> interactive content, etc.). The rendering engine uses high-quality 
> typesetting algorithms so as to produce professionally looking documents, 
> which can either be printed out or presented from a laptop.
>
> The software includes a text editor with support for mathematical 
> formulas, a small technical picture editor and a tool for making 
> presentations from a laptop. Moreover, TeXmacs can be used as an interface 
> for many external systems for computer algebra, numerical analysis, 
> statistics, etc. New presentation styles can be written by the user and 
> new features can be added to the editor using the Scheme extension 
> language. A native spreadsheet and tools for collaborative authoring are 
> planned for later. 
>
> Please let me know if there's anything to improve.

Build with fail if ghostscript isn't installed:

c++ -ISystem -ISystem/Boot -ISystem/Classes -ISystem/Files -ISystem/Link 
-ISystem/Misc -ISystem/Language -IKernel/Abstractions -IKernel/Containers 
-IKernel/Types -IData/Convert -IData/Drd -IData/History -IData/Observers 
-IData/Document -IData/String -IData/Tmfs -IData/Tree -IScheme 
-IGraphics/Bitmap_fonts -IGraphics/Fonts -IGraphics/Gui -IGraphics/Mathematics 
-IGraphics/Renderer -IGraphics/Handwriting -IGraphics/Types -IGraphics/Pictures 
-IGraphics/Spacial -IGraphics/Colors -IPlugins -I.. -I/usr/X11R6/include 
-DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED 
-I/usr/local/lib/qt4/mkspecs/openbsd-g++4 -I. 
-I/usr/local/include/X11/qt4/QtCore -I/usr/local/include/X11/qt4/QtGui 
-I/usr/local/include/X11/qt4 -I. -I. -I/include -DQTTEXMACS -Wall 
-Wno-return-type -O2 -fno-rtti -c ./Plugins/Ispell/ispell.cpp -o 
Objects/ispell.o
c++ -ISystem -ISystem/Boot -ISystem/Classes -ISystem/Files -ISystem/Link 
-ISystem/Misc -ISystem/Language -IKernel/Abstractions -IKernel/Containers 
-IKernel/Types -IData/Convert -IData/Drd -IData/History -IData/Observers 
-IData/Document -IData/String -IData/Tmfs -IData/Tree -IScheme 
-IGraphics/Bitmap_fonts -IGraphics/Fonts -IGraphics/Gui -IGraphics/Mathematics 
-IGraphics/Renderer -IGraphics/Handwriting -IGraphics/Types -IGraphics/Pictures 
-IGraphics/Spacial -IGraphics/Colors -IPlugins -DQT_NO_DEBUG -DQT_GUI_LIB 
-DQT_CORE_LIB -DQT_SHARED -I/usr/local/lib/qt4/mkspecs/openbsd-g++4 -I. 
-I/usr/local/include/X11/qt4/QtCore -I/usr/local/include/X11/qt4/QtGui 
-I/usr/local/include/X11/qt4 -I. -I. -I/include -DQTTEXMACS -Wall 
-Wno-return-type -O2 -fno-rtti -c ./Kernel/Containers/iterator.cpp -o 
Objects/iterator.o
c++ -ISystem -ISystem/Boot -ISystem/Classes -ISystem/Files -ISystem/Link 
-ISystem/Misc -ISystem/Language -IKernel/Abstractions -IKernel/Containers 
-IKernel/Types -IData/Convert -IData/Drd -IData/History -IData/Observers 
-IData/Document -IData/String -IData/Tmfs -IData/Tree -IScheme 
-IGraphics/Bitmap_fonts -IGraphics/Fonts -IGraphics/Gui -IGraphics/Mathematics 
-IGraphics/Renderer -IGraphics/Handwriting -IGraphics/Types -IGraphics/Pictures 
-IGraphics/Spacial -IGraphics/Colors -IPlugins 
-I/usr/obj/pobj/TeXmacs-1.99.4/TeXmacs-1.99.4-src/TeXmacs/include -DQT_NO_DEBUG 
-DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED 
-I/usr/local/lib/qt4/mkspecs/openbsd-g++4 -I. 
-I/usr/local/include/X11/qt4/QtCore -I/usr/local/include/X11/qt4/QtGui 
-I/usr/local/include/X11/qt4 -I. -I. -I/include -DQTTEXMACS -Wall 
-Wno-return-type -O2 -fno-rtti -c ./System/Language/language.cpp -o 
Objects/language.o
c++ -ISystem -ISystem/Boot -ISystem/Classes -ISystem/Files -ISystem/Link 
-ISystem/Misc -ISystem/Language -IKernel/Abstractions -IKernel/Containers 
-IKernel/Types -IData/Convert -IData/Drd -IData/History -IData/Observers 
-IData/Document -IData/String -IData/Tmfs -IData/Tree -IScheme 
-IGraphics/Bitmap_fonts -IGraphics/Fonts -IGraphics/Gui -IGraphics/Mathematics 
-IGraphics/Renderer -IGraphics/Handwriting -IGraphics/Types -IGraphics/Pictures 
-IGraphics/Spacial -IGraphics/Colors -IPlugins -I.. -I/usr/X11R6/include 
-DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED 
-I/usr/local/lib/qt4/mkspecs/openbsd-g++4 -I. 
-I/usr/local/include/X11/qt4/QtCore -I/usr/local/include/X11/qt4/QtGui 
-I/usr/local/include/X11/qt4 -I. -I. -I/include -DQTTEXMACS -Wall 
-Wno-return-type -O2 -fno-rtti -c ./Plugins/LaTeX_Preview/latex_preview.cpp -o 
Objects/latex_preview.o
./Plugins/LaTeX_Preview/latex_preview.cpp: In function 'tree 
latex_load_image(url)':
./Plugins/LaTeX_Preview/latex_preview.cpp:140: error: 'gs_image_size' was not 
declared in this scope
makefile:335: recipe for target 'Objects/latex_preview.o' failed
gmake[1]: *** [Objects/latex_preview.o] Error 1
gmake[1]: Leaving directory 
'/usr/obj/pobj/TeXmacs-1.99.4/TeXmacs-1.99.4-src/src'

Re: [PATCH] Fix duplicity manpage

[Jérémie Courrèges-Anglas]

Daniel Jakots  writes:

> On Mon, 8 Feb 2016 17:51:00 -0500, "trondd" 
> wrote:
>
>> On Mon, February 8, 2016 7:59 am, Jérémie Courrèges-Anglas wrote:
>> > tro...@kagu-tsuchi.com writes:
>> >  
>> >> Seems that with the change to duplicity 0.7, the default sftp
>> >> backend changed.
>> >> The manpage was being patched to say the default was pexpect over
>> >> paramiko.
>> >> This is no longer true.  Remove the manpage changes.  
>> >
>> > Was there a rationale for changing the default again?
>> >
>> 
>> Ok, it looks like we used to patch the default in globals.py but that
>> variable isn't there anymore so the patch went away.
>> 
>> Would we rather change the default (however that would work in 0.7) to
>> pexpect again?  Paramiko doesn't work for me as it doesn't understand
>> ed25519 ssh keys but I don't know if that is a global problem for all
>> OpenBSD users.
>> 
>
> Sorry for the late answer.
>
> I think this patch (versus "duplicity restore pexpect as default ssh
> backend") is better as I think we should stay as close to upstream as
> possible and if paramiko doesn't fit one's needs, adding "+pexpect" to
> the scheme to change the back-end is easily done.
>
> The patch looks good to me, thanks Tim.

Committed, thanks.

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

Re: bbpager: bus error

[Jérémie Courrèges-Anglas]

Committed, thanks for the report.

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

Re: [patch] time_t printf in zsh

[Jérémie Courrèges-Anglas]

j...@wxcvbn.org (Jérémie Courrèges-Anglas) writes:

> Matthew Martin <phy1...@gmail.com> writes:
>
>> zsh printf's a time_t as a long.  The cast is so that I can send the
>> same patch upstream (assuming that casting to long long is the correct
>> fix). Bug found with clang.
>
> It looks like zsh does not assume long long and %lld support, so more
> work might be needed for an upstream patch.
>
> However, ok jca@ to commit the patch below in the ports tree.

Here's a modified patch:

Index: Makefile
===
RCS file: /cvs/ports/shells/zsh/Makefile,v
retrieving revision 1.79
diff -u -p -r1.79 Makefile
--- Makefile21 Dec 2015 19:13:17 -  1.79
+++ Makefile21 Feb 2016 20:28:53 -
@@ -5,7 +5,7 @@ COMMENT=Z shell, Bourne shell-compatibl
 V= 5.2
 DISTNAME=  zsh-$V
 CATEGORIES=shells
-REVISION=  2
+REVISION=  3
 
 MAINTAINER=Pierre-Emmanuel Andre <p...@openbsd.org>
 
Index: patches/patch-Src_Builtins_sched_c
===
RCS file: patches/patch-Src_Builtins_sched_c
diff -N patches/patch-Src_Builtins_sched_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-Src_Builtins_sched_c  21 Feb 2016 20:28:53 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+--- Src/Builtins/sched.c.orig  Thu Aug 20 21:59:47 2015
 Src/Builtins/sched.c   Sun Feb 21 21:03:19 2016
+@@ -353,7 +353,11 @@ schedgetfn(UNUSED(Param pm))
+   time_t t;
+ 
+   t = sch->time;
+-  sprintf(tbuf, "%ld", t);
++#if defined(PRINTF_HAS_LLD)
++  sprintf(tbuf, "%lld", (long long)t);
++#else
++  sprintf(tbuf, "%ld", (long)t);
++#endif
+   if (sch->flags & SCHEDFLAG_TRASH_ZLE)
+   flagstr = "-o";
+   else


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

Re: [patch] time_t printf in zsh

[Jérémie Courrèges-Anglas]

Matthew Martin  writes:

> zsh printf's a time_t as a long.  The cast is so that I can send the
> same patch upstream (assuming that casting to long long is the correct
> fix). Bug found with clang.

It looks like zsh does not assume long long and %lld support, so more
work might be needed for an upstream patch.

However, ok jca@ to commit the patch below in the ports tree.

> - Matthew Martin
>
>
> Index: patches/patch-Src_Builtins_sched_c
> ===
> RCS file: patches/patch-Src_Builtins_sched_c
> diff -N patches/patch-Src_Builtins_sched_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-Src_Builtins_sched_c21 Feb 2016 01:23:00 -
> @@ -0,0 +1,12 @@
> +$OpenBSD$
> +--- Src/Builtins/sched.c.origFri Feb 19 19:38:11 2016
>  Src/Builtins/sched.c Sat Feb 20 11:06:55 2016
> +@@ -353,7 +353,7 @@ schedgetfn(UNUSED(Param pm))
> + time_t t;
> + 
> + t = sch->time;
> +-sprintf(tbuf, "%ld", t);
> ++sprintf(tbuf, "%lld", (long long) t);
> + if (sch->flags & SCHEDFLAG_TRASH_ZLE)
> + flagstr = "-o";
> + else
>

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

Re: bbpager: bus error

[Jérémie Courrèges-Anglas]

(cc'ing ${MAINTAINER} this time...)

Ryan Freeman <r...@slipgate.org> writes:

> On Fri, Feb 19, 2016 at 07:24:22PM +0100, Jérémie Courrèges-Anglas wrote:
>> Alessandro DE LAURENZIS <just22@gmail.com> writes:
>> 
>> > Hello,
>> >
>> > bbpager systematically receives a SIGBUS when a window is closed:
>> >
>> > # gdb bbpager
>> > GNU gdb 6.3
>> > Copyright 2004 Free Software Foundation, Inc.
>> > GDB is free software, covered by the GNU General Public License, and you 
>> > are
>> > welcome to change it and/or distribute copies of it under certain 
>> > conditions.
>> > Type "show copying" to see the conditions.
>> > There is absolutely no warranty for GDB.  Type "show warranty" for details.
>> > This GDB was configured as "amd64-unknown-openbsd5.9"...(no debugging 
>> > symbols found)
>> >
>> > (gdb) run
>> > Starting program: /usr/local/bin/bbpager 
>> > (no debugging symbols found)
>> > (no debugging symbols found)
>> > (no debugging symbols found)
>> > (no debugging symbols found)
>> > (no debugging symbols found)
>> > (no debugging symbols found)
>> > (no debugging symbols found)
>> >
>> > Program received signal SIGBUS, Bus error.
>> > 0x14ea13f13c06 in __register_frame_info () from /usr/local/bin/bbpager
>> >
>> > The problem is 100% reproducible (I tried with different WM: fluxbox,
>> > Openbox, JWM): just launch the program, open anew window and then close
>> > it.
>> >
>> > Any further info needed? Hints?
>> 
>> Give this a try.  I don't understand the purpose of the -- though.
>> *shrug*
>
> This seems to fix the issue for me on amd64, thanks!

Thanks.  The problem is that the iterator is invalidated by erase(); the
diff ensures that after erase() returns, pit points at the previous item
in the list.

oks?

Index: Makefile
===
RCS file: /cvs/ports/x11/bbpager/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile28 Oct 2014 08:18:30 -  1.18
+++ Makefile19 Feb 2016 20:42:34 -
@@ -3,7 +3,7 @@
 COMMENT =  pager for the Blackbox window manager
 
 DISTNAME = bbpager-0.4.7
-REVISION=  1
+REVISION=  2
 
 CATEGORIES =   x11
 MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=bbtools/}
Index: patches/patch-src_wminterface_cxx
===
RCS file: patches/patch-src_wminterface_cxx
diff -N patches/patch-src_wminterface_cxx
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_wminterface_cxx   19 Feb 2016 20:42:34 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- src/wminterface.cxx.orig   Fri Feb 19 19:14:47 2016
 src/wminterface.cxxFri Feb 19 19:15:04 2016
+@@ -84,8 +84,7 @@ void WMInterface::updateWindowList(void)
+ for (; pit != pit_end; pit++) {
+ if (!(*pit)->isMarked()) {
+ delete (*pit);
+-bbtool->pagerWindowList().erase(pit);
+-pit--;
++bbtool->pagerWindowList().erase(pit--);
+ } else {
+ }
+ }


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

Re: bbpager: bus error

[Jérémie Courrèges-Anglas]

Alessandro DE LAURENZIS  writes:

> Hello,
>
> bbpager systematically receives a SIGBUS when a window is closed:
>
> # gdb bbpager
> GNU gdb 6.3
> Copyright 2004 Free Software Foundation, Inc.
> GDB is free software, covered by the GNU General Public License, and you are
> welcome to change it and/or distribute copies of it under certain conditions.
> Type "show copying" to see the conditions.
> There is absolutely no warranty for GDB.  Type "show warranty" for details.
> This GDB was configured as "amd64-unknown-openbsd5.9"...(no debugging symbols 
> found)
>
> (gdb) run
> Starting program: /usr/local/bin/bbpager 
> (no debugging symbols found)
> (no debugging symbols found)
> (no debugging symbols found)
> (no debugging symbols found)
> (no debugging symbols found)
> (no debugging symbols found)
> (no debugging symbols found)
>
> Program received signal SIGBUS, Bus error.
> 0x14ea13f13c06 in __register_frame_info () from /usr/local/bin/bbpager
>
> The problem is 100% reproducible (I tried with different WM: fluxbox,
> Openbox, JWM): just launch the program, open anew window and then close
> it.
>
> Any further info needed? Hints?

Give this a try.  I don't understand the purpose of the -- though.
*shrug*

Index: patches/patch-src_wminterface_cxx
===
RCS file: patches/patch-src_wminterface_cxx
diff -N patches/patch-src_wminterface_cxx
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_wminterface_cxx   19 Feb 2016 18:21:33 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- src/wminterface.cxx.orig   Fri Feb 19 19:14:47 2016
 src/wminterface.cxxFri Feb 19 19:15:04 2016
+@@ -84,8 +84,7 @@ void WMInterface::updateWindowList(void)
+ for (; pit != pit_end; pit++) {
+ if (!(*pit)->isMarked()) {
+ delete (*pit);
+-bbtool->pagerWindowList().erase(pit);
+-pit--;
++bbtool->pagerWindowList().erase(pit--);
+ } else {
+ }
+ }


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

Re: emacs-25.0.91 (pretest)

[Jérémie Courrèges-Anglas]

Stuart Henderson <s...@spacehopper.org> writes:

> On 2016/02/15 13:05, Jérémie Courrèges-Anglas wrote:
>> If someone knows what the hell the alien C syntax in
>> patches/patch-src_fns_c is about, cluebat welcome.
>
> it's C99:
>
> https://en.wikipedia.org/wiki/Restrict

I've heard about restrict, but I had indeed never seen it used within
the brackets of array parameters.  emacs is built with -std=gnu99:

cc -std=gnu99 -c -I/usr/local/include -Demacs  -I. -I. -I../lib -I../lib
 -I/usr/local/include/libxml2 -I/usr/local/include
 -MMD -MF deps/fns.d -MP -I/usr/local/include -I/usr/local/include/p11-kit-1
 -I/usr/include -O2 -pipe -fno-pie  fns.c
fns.c:36: error: static or type qualifiers in abstract declarator
fns.c:36: error: static or type qualifiers in abstract declarator
fns.c: In function 'sort_vector':
[...]

Sadly:
-> https://gcc.gnu.org/bugzilla/show_bug.cgi?id=14050
 -> https://gcc.gnu.org/viewcvs/gcc?view=revision=130362
  -> GPLv3

*shrug*

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

Re: [PATCH] duplicity restore pexpect as default ssh backend

[Jérémie Courrèges-Anglas]

"trondd"  writes:

> Bump to get this in for 5.9 so users aren't confused by the changed
> default and the resulting incorrect manpage.
>
> If no one thinks it should go in for 5.9, I'll wait for unlock to poke again.

Thanks for caring about this, Tim.

We should fix the current situation one way of the other.  duplicity
users on OpenBSD should speak up.  Does the default ssh backend,
paramiko, prevent you from easily using duplicity on OpenBSD-current?
Looks like paramiko can now use the default sshd config.

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

emacs-25.0.91 (pretest)

[Jérémie Courrèges-Anglas]

Hi,

emacs-25.1 will probably be out before the ports will be unlocked.
While we should focus on the current ports tree, I already experiment
breakage in my Gnus setup and I'd prefer to keep the number of new
issues low...

So here's a diff to update to last friday's pretest tarball.  Test
reports welcome, especially with the gtk3 flavor and on !(x86) archs.
Please send the reports in private to keep the noise on ports@ low.

If someone knows what the hell the alien C syntax in
patches/patch-src_fns_c is about, cluebat welcome.

Index: Makefile
===
RCS file: /cvs/ports/editors/emacs/Makefile,v
retrieving revision 1.58
diff -u -p -r1.58 Makefile
--- Makefile6 Nov 2015 20:37:34 -   1.58
+++ Makefile15 Feb 2016 11:51:23 -
@@ -2,8 +2,7 @@
 
 COMMENT=   GNU editor: extensible, customizable, self-documenting
 
-VERSION=   24.5
-REVISION=  2
+VERSION=   25.0.91
 DISTNAME=  emacs-${VERSION}
 
 CATEGORIES=editors
@@ -17,7 +16,8 @@ PERMIT_PACKAGE_CDROM= Yes
 
 WANTLIB=   c m ncurses pthread gnutls xml2 z
 
-MASTER_SITES=  ${MASTER_SITE_GNU:=emacs/}
+MASTER_SITES=  ftp://alpha.gnu.org/gnu/emacs/pretest/
+EXTRACT_SUFX=  .tar.xz
 
 USE_GMAKE= Yes
 
@@ -50,7 +50,7 @@ CONFIGURE_ARGS+=  --without-x \
--without-dbus \
--without-gconf \
--without-gsettings \
-   --without-file-notification
+   --without-jpeg
 .else
 LIB_DEPENDS+=  x11/dbus \
x11/gnome/librsvg \
@@ -66,27 +66,28 @@ RUN_DEPENDS+=   devel/desktop-file-utils 
 . if ${FLAVOR} == "athena"
 CONFIGURE_ARGS+=   --with-x-toolkit=athena
 LIB_DEPENDS+=  x11/Xaw3d
-WANTLIB += ICE MagickCore-6.Q16 MagickWand-6.Q16 SM X11 Xaw3d Xext Xft Xinerama
-WANTLIB += Xmu Xpm Xrandr Xrender Xt cairo dbus-1 fontconfig freetype
-WANTLIB += gconf-2 gdk_pixbuf-2.0 gif gio-2.0 glib-2.0 gobject-2.0
-WANTLIB += jpeg png rsvg-2 tiff
+WANTLIB += ICE MagickCore-6.Q16 MagickWand-6.Q16 SM X11 X11-xcb
+WANTLIB += Xaw3d Xext Xfixes Xft Xinerama Xmu Xpm Xrandr Xrender
+WANTLIB += Xt cairo dbus-1 fontconfig freetype gconf-2 gdk_pixbuf-2.0
+WANTLIB += gif gio-2.0 glib-2.0 gobject-2.0 jpeg png rsvg-2 tiff
+WANTLIB += xcb
 . elif ${FLAVOR} == "gtk2"
 CONFIGURE_ARGS+=   --with-x-toolkit=gtk2
 LIB_DEPENDS+=  x11/gtk+2
-WANTLIB += ICE MagickCore-6.Q16 MagickWand-6.Q16 SM X11 Xcomposite Xcursor
-WANTLIB += Xdamage Xext Xfixes Xft Xi Xinerama Xpm Xrandr Xrender
-WANTLIB += atk-1.0 cairo dbus-1 fontconfig freetype gconf-2 gdk-x11-2.0
-WANTLIB += gdk_pixbuf-2.0 gif gio-2.0 glib-2.0 gobject-2.0 gtk-x11-2.0
-WANTLIB += jpeg pango-1.0 pangocairo-1.0 pangoft2-1.0 png rsvg-2
-WANTLIB += tiff
+WANTLIB += ICE MagickCore-6.Q16 MagickWand-6.Q16 SM X11 X11-xcb
+WANTLIB += Xcomposite Xcursor Xdamage Xext Xfixes Xft Xi Xinerama
+WANTLIB += Xpm Xrandr Xrender atk-1.0 cairo dbus-1 fontconfig
+WANTLIB += freetype gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0 gif gio-2.0
+WANTLIB += glib-2.0 gobject-2.0 gtk-x11-2.0 jpeg pango-1.0 pangocairo-1.0
+WANTLIB += pangoft2-1.0 png rsvg-2 tiff xcb
 . elif ${FLAVOR} == "gtk3"
 CONFIGURE_ARGS+=   --with-x-toolkit=gtk3
 LIB_DEPENDS+=  x11/gtk+3
-WANTLIB += ICE MagickCore-6.Q16 MagickWand-6.Q16 SM X11 Xft Xinerama Xpm Xrandr
-WANTLIB += Xrender atk-1.0 cairo cairo-gobject dbus-1 fontconfig
-WANTLIB += freetype gconf-2 gdk-3 gdk_pixbuf-2.0 gif gio-2.0 glib-2.0
-WANTLIB += gobject-2.0 gtk-3 jpeg pango-1.0 pangocairo-1.0 pangoft2-1.0
-WANTLIB += png rsvg-2 tiff
+WANTLIB += ICE MagickCore-6.Q16 MagickWand-6.Q16 SM X11 X11-xcb
+WANTLIB += Xfixes Xft Xinerama Xpm Xrandr Xrender atk-1.0 cairo
+WANTLIB += cairo-gobject dbus-1 fontconfig freetype gconf-2 gdk-3
+WANTLIB += gdk_pixbuf-2.0 gif gio-2.0 glib-2.0 gobject-2.0 gtk-3
+WANTLIB += jpeg pango-1.0 pangocairo-1.0 png rsvg-2 tiff xcb
 . else
 ERRORS+=   "Fatal: Conflicting flavor: ${FLAVOR}"
 . endif
Index: distinfo
===
RCS file: /cvs/ports/editors/emacs/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo15 Apr 2015 11:35:06 -  1.7
+++ distinfo15 Feb 2016 11:51:23 -
@@ -1,2 +1,2 @@
-SHA256 (emacs-24.5.tar.gz) = JzemYi+y2ZgunEf7by+yl72kJnTgnbQPybzA20KXw7Y=
-SIZE (emacs-24.5.tar.gz) = 59216034
+SHA256 (emacs-25.0.91.tar.xz) = 1369MQ3YyXjhXymvMxhmRpiVNK5IOqisr+aWMkSTAZM=
+SIZE (emacs-25.0.91.tar.xz) = 42253076
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/editors/emacs/patches/patch-Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile_in
--- patches/patch-Makefile_in   15 Apr 2015 11:35:06 -  1.2
+++ patches/patch-Makefile_in   15 Feb 2016 11:51:23 

Re: [PATCH] Fix duplicity manpage

[Jérémie Courrèges-Anglas]

tro...@kagu-tsuchi.com writes:

> Seems that with the change to duplicity 0.7, the default sftp backend changed.
> The manpage was being patched to say the default was pexpect over paramiko.
> This is no longer true.  Remove the manpage changes.

Was there a rationale for changing the default again?

> Not sure if the REVISION needs to be bumped or not for this.

It would.

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

Re: update devel/frama-c

[Jérémie Courrèges-Anglas]

Michael McConville  writes:

[...]

> I also got this during make update-plist:
>
>> pkg/PFRAG.no-native empty fragment: NOT writing it
>
> Does that mean that pkg/PFRAG.no-native is no longer needed and should
> be removed? Or was it added manually?

It was added manually.  It is used on architectures where there is no
support for OCaml native code.  See bsd.port.arch.mk and ocaml.port.mk,
and please get some tests on one of those archs.

[...]

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

Re: NEW: py-httpbin and py-test-httpbin

[Jérémie Courrèges-Anglas]

Alexandr Shadchin  writes:

> Hi,
>
> this new ports is a requirement for an update of www/py-requests
> to 2.9.0.
>
> ok to import?

yup

> py-httpbin:
>
> Testing an HTTP Library can become difficult sometimes. RequestBin is
> fantastic for testing POST requests, but doesn't let you control the
> response. This exists to cover all kinds of HTTP scenarios. Additional
> endpoints are being considered.
>
> All endpoint responses are JSON-encoded.
>
> py-test-httpbin:
>
> httpbin is an amazing web service for testing HTTP libraries. It has
> several great endpoints that can test pretty much everything you need
> in a HTTP library. The only problem is: maybe you don't want to wait for
> your tests to travel across the Internet and back to make assertions
> against a remote web service.

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

Re: UPDATE: devel/py-pexpect 4.0.1

[Jérémie Courrèges-Anglas]

Alexandr Shadchin  writes:

> Hi,
>
> This diff updates py-pexpect to the latest release.
> Tested on amd64. Add python3 flavor.
>
> Comments ? OK ?

ok, please add the following tweak (else sphinx-build tries to reach out).



patch-doc_conf_py
Description: Binary data

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

Re: [UPDATE] audio/soundtouch to 1.9.2

[Jérémie Courrèges-Anglas]

Eric Lalonde  writes:

> On 12/27/15 1:02 PM, Eric Lalonde wrote:
>> Hello ports,
>>
>> Attach is a diff which updates Soundtouch from 1.9.0 to 1.9.2. Changes
>> include:
>>
>> - Redesigned quickseek algorithm for improved sound quality in quickseek
>> mode
>> - Adaptive integer divider scaling for improved sound quality when using
>> integer processing
>> - Fix in GNU package management issues.
>>
>> The libsoundtouch ABI has had multiple functions added and removed; the
>> major version has been bumped accordingly.
>>
>> - Eric
>>
>
> Ping.

Committed, thanks.

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

Re: UPDATE: textproc/py-chardet 2.3.0

[Jérémie Courrèges-Anglas]

Alexandr Shadchin  writes:

> Hi,
>
> This diff updates py-chardet to the latest release.
> Tested on amd64. Add python3 flavor.
>
> Comments ? OK ?

ok jca@

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

Re: add a py3 flavor to devel/py-ptyprocess

[Jérémie Courrèges-Anglas]

Alexandr Shadchin  writes:

> Add python3 flavor.

ok jca@

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

Re: UPDATE: security/py-paramiko 1.16.0

[Jérémie Courrèges-Anglas]

Alexandr Shadchin  writes:

> Hi,
>
> This diff updates py-paramiko to the latest release.
> Tested on amd64. Add python3 flavor.
>
> For python3 need new py-ecdsa (on ports@)
>
> Comments ? OK ?

ok jca@

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

Re: UPDATE: wwww/py-werkzeug 0.11.3

[Jérémie Courrèges-Anglas]

Alexandr Shadchin  writes:

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

ok jca@

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

Re: wip update: net/nmap

[Jérémie Courrèges-Anglas]

Giovanni Bechis  writes:

> On 12/29/15 21:21, Stuart Henderson wrote:
>> On 2015/12/29 11:23, Giovanni Bechis wrote:
>>> Hi,
>>> I do not use it anymore so I am dropping maintainership, anyway attached a 
>>> wip port to update it to latest version
>>> if someone wants to step over.
>> 
>> Here's a smaller diff for PLIST-zenmap for this.
>> 
> New diff with suggestions by jca@ and sthen@, new maintainer is David Carlier.
>  ok ?

ok jca@

>   Cheers
>Giovanni
>

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

Re: wip update: net/nmap

[Jérémie Courrèges-Anglas]

Giovanni Bechis  writes:

> Hi,

Hi,

> I do not use it anymore so I am dropping maintainership, anyway attached a 
> wip port to update it to latest version
> if someone wants to step over.
>  Cheers
>Giovanni

Works fine for basic usage on i386.  Note that NO_TEST should go away
(even though tests are failing right now).

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

Re: Update: zim version 0.65

[Jérémie Courrèges-Anglas]

Sebastian Benoit  writes:

> ok?

Looks fine ports-wise fwiw.  Note that there is a test suite, so
removing NO_TEST=Yes + hooking up the test suite + fixing potential
failures would be an improvement.

[...]

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

Re: NEW: math/py-statistics 1.0.3.5

[Jérémie Courrèges-Anglas]

Alexandr Shadchin <alexandr.shadc...@gmail.com> writes:

> On Mon, Dec 28, 2015 at 06:42:24PM +0100, Jérémie Courrèges-Anglas wrote:
>> Alexandr Shadchin <alexandr.shadc...@gmail.com> writes:
>> 
>> > Hi,
>> >
>> > This new ports is a requirement for new port devel/py-test-benchmark.
>> >
>> > ok to import?
>> >
>> > Description:
>> > Port of Python 3.4 statistics module to Python 2.
>> >
>> > This module provides functions for calculating mathematical statistics
>> > of numeric (Real-valued) data.
>> 
>> Looks good, but setup.py says this module requires docutils.  Not needed?
>> 
>> -- 
>> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE
>
> Yes, this package is not needed.
>
> I guess the author used it for documentation, but documentation is not 
> included
> in tarball. 

Ack, ok jca@ to import.

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

Re: fix icu4c build on arm

[Jérémie Courrèges-Anglas]

Jonathan Gray  writes:

> Trying to build icu4c on on armv7 reliably fails with
>
> gmake[1]: Entering directory '/usr/ports/pobj/icu4c-56.1/build-arm/data'
> Unpacking /usr/ports/pobj/icu4c-56.1/icu/source/data/in/icudt56l.dat and 
> generating out/tmp/icudata.lst (list of data files)
> LD_LIBRARY_PATH=../lib:../stubdata:../tools/ctestfw:$LD_LIBRARY_PATH  
> ../bin/icupkg -d ./out/build/icudt56l --list -x \* 
> /usr/ports/pobj/icu4c-56.1/icu/source/data/in/icudt56l.dat -o 
> out/tmp/icudata.lst
> Makefile:487: recipe for target 'out/tmp/icudata.lst' failed
> gmake[1]: *** [out/tmp/icudata.lst] Error 1
> gmake[1]: Leaving directory '/usr/ports/pobj/icu4c-56.1/build-arm/data'
> Makefile:143: recipe for target 'all-recursive' failed
> gmake: *** [all-recursive] Error 2
>
> It doesn't seem to be segfaulting, though it builds/installs with the
> following patch.

If it builds, ship it!  ok jca@

> Index: Makefile
> ===
> RCS file: /cvs/ports/textproc/icu4c/Makefile,v
> retrieving revision 1.51
> diff -u -p -r1.51 Makefile
> --- Makefile  26 Dec 2015 09:43:11 -  1.51
> +++ Makefile  29 Dec 2015 06:36:43 -
> @@ -51,6 +51,7 @@ MAKE_FLAGS= SO_TARGET_VERSION=${SO_VERS
>  # icupkg segfaults during the build
>  .if ${MACHINE_ARCH} == "arm"
>  CFLAGS +=-O1 -fno-stack-protector
> +CXXFLAGS +=  -O1 -fno-stack-protector
>  .endif
>  
>  .include 
>

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

Re: [new] devel/lazarus

[Jérémie Courrèges-Anglas]

Pascal Stumpf  writes:

> Lazarus is a Rapid Application Development Tool for Free Pascal.
> It comes with the LCL - Lazarus component library, which contains
> platform independent visual components like buttons, windows,
> checkbox, treeview and many, many more. The LCL is platform
> independent, so you can write an application once and then compile
> for various platforms without changing code.
>
> Looking for i386 tests/oks.

Builds and runs fine on i386, I haven't tested with projects at $WORK
yet.

Nitpicking:
- the COMMENT could mention that lazarus is an IDE, not just a set of
  classes.  Thoughts?
- '+' doesn't need to be escaped in "find ... -exec ... +"

ok jca@ nevertheless

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

Re: NEW: graphics/waffle

[Jérémie Courrèges-Anglas]

Jonathan Gray  writes:

> On Mon, Dec 28, 2015 at 01:27:50AM +0100, Jrmie Courrges-Anglas wrote:
>> Stuart Henderson  writes:
>> 
>> > On 2015/12/21 17:21, Jonathan Gray wrote:
>> >> Waffle is another library along the lines of GLUT that provides a way to
>> >> select a windowing system and api for OpenGL.
>> >> 
>> >> This is primarily of interest for using the piglit OpenGL tests as
>> >> Waffle is required for testing OpenGL ES.
>> >
>> > This fails on i386 (and presumably other 32-bit arch), ports/devel/cmocka
>> > already has a patch for this situation, but the file in the version of
>> > cmocka that is bundled with waffle is a bit different, I don't really
>> > have time to unpick it at the moment.
>> 
>> Here's a backport of the cmocka fix (modulo sys/stdin.h -> stdint.h).
>> Builds fine on i386.
>> 
>> (That cmocka header is damn ugly...)
>> 
>> $OpenBSD$
>> 
>> Avoid a conflicting typedef on 32-bit arch.
>> 
>> --- third_party/cmocka/include/cmocka.h.orig Mon Dec 28 01:20:04 2015
>> +++ third_party/cmocka/include/cmocka.h  Mon Dec 28 01:23:28 2015
>> @@ -81,6 +81,9 @@ int __stdcall IsDebuggerPresent();
>>  #define cast_to_largest_integral_type(value) \
>>  ((LargestIntegralType)((size_t)(value)))
>>  
>> +#if defined(__OpenBSD__)
>> +#include 
>> +#else
>>  /* Smallest integral type capable of holding a pointer. */
>>  #if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED)
>>  # if defined(_WIN32)
>> @@ -109,6 +112,7 @@ int __stdcall IsDebuggerPresent();
>>  # define _UINTPTR_T
>>  # define _UINTPTR_T_DEFINED
>>  #endif /* !defined(_UINTPTR_T) || !defined(_UINTPTR_T_DEFINED) */
>> +#endif /* !defined(__OpenBSD__) */
>>  
>>  /* Perform an unsigned cast to uintptr_t. */
>>  #define cast_to_pointer_integral_type(value) \
>
> I wonder if we should instead have a uintptr_t define in stdint.h
> and add !defined(_UINTPTR_T_DEFINED_) ?

Well, that may "solve" the cmocka problem and would be consistent with
its signed counterpart.  But "_UINTPTR_T_DEFINED_" doesn't seem to exist
anywhere outside of that cmocka.h header.

cmocka builds on glibc/solaris rely on implementation details.  IMHO an
ugly ifdef __OpenBSD__ in the ports tree is better than hiding problems
by relying on implementation details.  Maybe we can propose a better diff
upstream (eg rely on stdint.h); I'm volunteering.

In the meantime, I'd rather use the same patch as in devel/cmocka.


> Index: stdint.h
> ===
> RCS file: /cvs/src/sys/sys/stdint.h,v
> retrieving revision 1.10
> diff -u -p -U7 -r1.10 stdint.h
> --- stdint.h  30 Apr 2015 18:19:25 -  1.10
> +++ stdint.h  28 Dec 2015 02:26:09 -
> @@ -89,15 +89,18 @@ typedef   __uint_fast64_t uint_fast64_t;
>  
>  /* 7.18.1.4 Integer types capable of holding object pointers */
>  #ifndef  _INTPTR_T_DEFINED_
>  #define  _INTPTR_T_DEFINED_
>  typedef  __intptr_t  intptr_t;
>  #endif
>  
> +#ifndef  _UINTPTR_T_DEFINED_
> +#define  _UINTPTR_T_DEFINED_
>  typedef  __uintptr_t uintptr_t;
> +#endif
>  
>  /* 7.18.1.5 Greatest-width integer types */
>  typedef  __intmax_t  intmax_t;
>  typedef  __uintmax_t uintmax_t;
>  
>  /*
>   * 7.18.2 Limits of specified-width integer types.
>

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

Re: NEW: graphics/waffle

[Jérémie Courrèges-Anglas]

Jonathan Gray  writes:

> On Mon, Dec 28, 2015 at 02:02:00PM +0100, Jrmie Courrges-Anglas wrote:
>> Jonathan Gray  writes:
>> 
>> > On Mon, Dec 28, 2015 at 01:27:50AM +0100, Jrmie Courrges-Anglas wrote:
>> >> Stuart Henderson  writes:
>> >> 
>> >> > On 2015/12/21 17:21, Jonathan Gray wrote:
>> >> >> Waffle is another library along the lines of GLUT that provides a way 
>> >> >> to
>> >> >> select a windowing system and api for OpenGL.
>> >> >> 
>> >> >> This is primarily of interest for using the piglit OpenGL tests as
>> >> >> Waffle is required for testing OpenGL ES.
>> >> >
>> >> > This fails on i386 (and presumably other 32-bit arch), 
>> >> > ports/devel/cmocka
>> >> > already has a patch for this situation, but the file in the version of
>> >> > cmocka that is bundled with waffle is a bit different, I don't really
>> >> > have time to unpick it at the moment.
>> >> 
>> >> Here's a backport of the cmocka fix (modulo sys/stdin.h -> stdint.h).
>> >> Builds fine on i386.
>> >> 
>> >> (That cmocka header is damn ugly...)
>> >> 
>> >> $OpenBSD$
>> >> 
>> >> Avoid a conflicting typedef on 32-bit arch.
>> >> 
>> >> --- third_party/cmocka/include/cmocka.h.orig  Mon Dec 28 01:20:04 2015
>> >> +++ third_party/cmocka/include/cmocka.h   Mon Dec 28 01:23:28 2015
>> >> @@ -81,6 +81,9 @@ int __stdcall IsDebuggerPresent();
>> >>  #define cast_to_largest_integral_type(value) \
>> >>  ((LargestIntegralType)((size_t)(value)))
>> >>  
>> >> +#if defined(__OpenBSD__)
>> >> +#include 
>> >> +#else
>> >>  /* Smallest integral type capable of holding a pointer. */
>> >>  #if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED)
>> >>  # if defined(_WIN32)
>> >> @@ -109,6 +112,7 @@ int __stdcall IsDebuggerPresent();
>> >>  # define _UINTPTR_T
>> >>  # define _UINTPTR_T_DEFINED
>> >>  #endif /* !defined(_UINTPTR_T) || !defined(_UINTPTR_T_DEFINED) */
>> >> +#endif /* !defined(__OpenBSD__) */
>> >>  
>> >>  /* Perform an unsigned cast to uintptr_t. */
>> >>  #define cast_to_pointer_integral_type(value) \
>> >
>> > I wonder if we should instead have a uintptr_t define in stdint.h
>> > and add !defined(_UINTPTR_T_DEFINED_) ?
>> 
>> Well, that may "solve" the cmocka problem and would be consistent with
>> its signed counterpart.  But "_UINTPTR_T_DEFINED_" doesn't seem to exist
>> anywhere outside of that cmocka.h header.
>> 
>> cmocka builds on glibc/solaris rely on implementation details.  IMHO an
>> ugly ifdef __OpenBSD__ in the ports tree is better than hiding problems
>> by relying on implementation details.  Maybe we can propose a better diff
>> upstream (eg rely on stdint.h); I'm volunteering.
>> 
>> In the meantime, I'd rather use the same patch as in devel/cmocka.
>
> Yes, it makes sense to have the same fix in both places.  I'm ok with
> your diff. 

Great, fix committed.

(without REVISION bump, I doubt it changes anything on 64 bits archs.)

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

Re: UPDATE: devel/flake8

[Jérémie Courrèges-Anglas]

Bertrand Janin  writes:

> Here is a better version without the test suite patch.

Committed, thanks.

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

Re: UPDATE: devel/py-futures 3.0.3

[Jérémie Courrèges-Anglas]

Alexandr Shadchin  writes:

> Hi,
>
> This diff updates py-futures to the latest release.
> Tested on amd64.

One regress test fails on i386 (not the 'L' in "0x84fb436cL"), but
that's not a real problem.

==
FAIL: test_repr (__main__.FutureTests)
--
Traceback (most recent call last):
  File "test_futures.py", line 578, in test_repr
'')
AssertionError: Regexp didn't match: '' 
not found in ''

--
Ran 61 tests in 52.680s

FAILED (failures=1)
Traceback (most recent call last):
  File "test_futures.py", line 724, in 
test_main()
  File "test_futures.py", line 32, in decorator
return func(*args)
  File "test_futures.py", line 719, in test_main
ThreadPoolShutdownTest)
  File "/usr/local/lib/python2.7/test/test_support.py", line 1428, in 
run_unittest
_run_suite(suite)
  File "/usr/local/lib/python2.7/test/test_support.py", line 1411, in _run_suite
raise TestFailed(err)
test.test_support.TestFailed: Traceback (most recent call last):
  File "test_futures.py", line 578, in test_repr
'')
AssertionError: Regexp didn't match: '' 
not found in ''

> Comments ? OK ?

ok jca@

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

Re: NEW: math/py-statistics 1.0.3.5

[Jérémie Courrèges-Anglas]

Alexandr Shadchin  writes:

> Hi,
>
> This new ports is a requirement for new port devel/py-test-benchmark.
>
> ok to import?
>
> Description:
> Port of Python 3.4 statistics module to Python 2.
>
> This module provides functions for calculating mathematical statistics
> of numeric (Real-valued) data.

Looks good, but setup.py says this module requires docutils.  Not needed?

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

Re: UPDATE: devel/py-enum34 1.1.2

[Jérémie Courrèges-Anglas]

Alexandr Shadchin  writes:

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

ok jca@

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

Re: NEW: graphics/waffle

[Jérémie Courrèges-Anglas]

Stuart Henderson  writes:

> On 2015/12/21 17:21, Jonathan Gray wrote:
>> Waffle is another library along the lines of GLUT that provides a way to
>> select a windowing system and api for OpenGL.
>> 
>> This is primarily of interest for using the piglit OpenGL tests as
>> Waffle is required for testing OpenGL ES.
>
> This fails on i386 (and presumably other 32-bit arch), ports/devel/cmocka
> already has a patch for this situation, but the file in the version of
> cmocka that is bundled with waffle is a bit different, I don't really
> have time to unpick it at the moment.

Here's a backport of the cmocka fix (modulo sys/stdin.h -> stdint.h).
Builds fine on i386.

(That cmocka header is damn ugly...)

$OpenBSD$

Avoid a conflicting typedef on 32-bit arch.

--- third_party/cmocka/include/cmocka.h.origMon Dec 28 01:20:04 2015
+++ third_party/cmocka/include/cmocka.h Mon Dec 28 01:23:28 2015
@@ -81,6 +81,9 @@ int __stdcall IsDebuggerPresent();
 #define cast_to_largest_integral_type(value) \
 ((LargestIntegralType)((size_t)(value)))
 
+#if defined(__OpenBSD__)
+#include 
+#else
 /* Smallest integral type capable of holding a pointer. */
 #if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED)
 # if defined(_WIN32)
@@ -109,6 +112,7 @@ int __stdcall IsDebuggerPresent();
 # define _UINTPTR_T
 # define _UINTPTR_T_DEFINED
 #endif /* !defined(_UINTPTR_T) || !defined(_UINTPTR_T_DEFINED) */
+#endif /* !defined(__OpenBSD__) */
 
 /* Perform an unsigned cast to uintptr_t. */
 #define cast_to_pointer_integral_type(value) \


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

Re: UPDATE: devel/py-mock 1.3.0

[Jérémie Courrèges-Anglas]

Alexandr Shadchin <alexandr.shadc...@gmail.com> writes:

> On Wed, Dec 23, 2015 at 09:21:43PM +0100, Jérémie Courrèges-Anglas wrote:
>> Daniel Jakots <vigdis+o...@chown.me> writes:
>> 
>> > On Wed, 23 Dec 2015 23:49:11 +0500, Alexandr Shadchin
>> > <alexandr.shadc...@gmail.com> wrote:
>> >
>> >> Hi,
>> >> 
>> >> This diff updates py-mock to the latest release.
>> >> Add python3 flavor.
>> >> 
>> >> Comments ? OK ?
>> >> 
>> >
>> > I was working on it too (as I need it for another port) and I have
>> > quite the same diff. A comment inline, otherwise that's good :)
>> >
>> >> 
>> >> Index: Makefile
>> >> ===
>> >> RCS file: /cvs/ports/devel/py-mock/Makefile,v
>> >> retrieving revision 1.7
>> >> diff -u -p -r1.7 Makefile
>> >> --- Makefile  29 Sep 2015 10:51:54 -  1.7
>> >> +++ Makefile  23 Dec 2015 18:44:30 -
>> >> @@ -2,11 +2,10 @@
>> >
>> > [snip]
>> >
>> >> +NO_TEST =Yes
>> >
>> > Any reason for that? It looks like that test works.
>> 
>> The test suite isn't called.  Needs a test-dep on devel/py-unittest2 and
>> a custom do-test target, eg. cd ${WRKSRC} && unit2 discover.  There are
>> 6 errors that were not present before.
>>
>
> Errors due to the old py-unittest2. 

Ah.  ok jca@ for py-mock then.

>> Also devel/flake8's tests fail with this update, but I'm not sure
>> whether my-mock is to blame.
>>
>
> Fix flake8 attached (also works fine with py-mock 1.0.1)

Your patch is better than mine.  ok jca@ fwiw, cc'ing maintainer.

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

Re: update www/py-werkzeug

[Jérémie Courrèges-Anglas]

Daniel Jakots  writes:

> On Sat, 12 Dec 2015 20:23:36 +0100, Jasper Lievisse Adriaanse
>  wrote:
>
>> On Thu, Dec 10, 2015 at 09:48:41PM +0100, Daniel Jakots wrote:
>> > Hi,
>> > 
>> > Yet another python port who didn't receive any love for some time.
>> > 
>> > make test:
>> > before
>> > py2: == 3 failed, 404 passed, 11 skipped in 2.71 seconds ==
>> > py3: == 3 failed, 405 passed, 10 skipped in 2.48 seconds ==
>> > after
>> > py2: == 1 failed, 421 passed, 11 skipped in 5.09 seconds ==
>> > py3: == 3 failed, 420 passed, 10 skipped in 6.02 seconds ==
>> > 
>> > I only tested the new version on i386
>> > py2: == 1 failed, 421 passed, 11 skipped in 34.76 seconds ==
>> > 
>> > depends:
>> > py-flask runs regression test ok
>> > security/letsencrypt/py-acme same as before
>> > 
>> > Cheers,
>> > Daniel  
>> I don't know if this was the case before, but the build reaches out:
>> 
>> sphinx-build -b html -d _build/doctrees   . _build/html
>> Making output directory...
>> Running Sphinx v1.2.3
>> loading pickled environment... not yet created
>> loading intersphinx inventory from
>> http://docs.python.org/dev/objects.inv... loading intersphinx
>> inventory from http://www.sqlalchemy.org/docs/05/objects.inv...
>> 
>> Could you please address this?
>
> I could reproduce the issue both with and without the update. Though
> AFAICU the problem is with textproc/py-sphinx not py-werkzeug.
>
> I tried to update py-sphinx to see if it would be better but it needs
> alabaster (https://pypi.python.org/pypi/alabaster) first.
>
> CC'ing py-sphinx maintainer in case he can have a look :)

Committed, with a supplementary patch to disable intersphinx:

$OpenBSD: patch-docs_conf_py,v 1.1 2015/12/23 19:43:17 jca Exp $
--- docs/conf.py.orig   Thu Nov 12 10:23:01 2015
+++ docs/conf.pyWed Dec 23 20:32:59 2015
@@ -27,7 +27,7 @@ sys.path.append(os.path.abspath('_themes'))
 
 # Add any Sphinx extension module names here, as strings. They can be 
extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx',
+extensions = ['sphinx.ext.autodoc',
   'sphinx.ext.doctest', 'werkzeugext']
 
 # Add any paths that contain templates here, relative to this directory.


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

Re: [update] abcde 2.5.4 -> 2.7.1; take 3

[Jérémie Courrèges-Anglas]

Christopher Zimmermann  writes:

> On Mon, 23 Nov 2015 18:06:31 +0100 Marc Peters  wrote:
>
>> Am 11/22/15 um 22:11 schrieb Marc Peters:
>> > 
>> > Here an updated diff against -current ports.
>> > 
>> > Comments/OKs?
>> > 
>> > 
>> > Marc
>> >   
>> 
>> As spotted offlist, now without REVISION.
>
>
> Tested, works for mp3 (which is the difficult case on OpenBSD). The
> patch has been submitted upstream. OK chrisz@

Committed, thank you both.

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

Re: UPDATE: devel/doxygen 1.8.2 -> 1.8.10

[Jérémie Courrèges-Anglas]

Hi,

Stuart Henderson <st...@openbsd.org> writes:

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

And it's not like the API used in the port is exactly the same as the
one available in base.

>> It's okay for me to remove the patches and test agine.

Please do.  I don't think another full round of tests is needed.

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

Re: UPDATE: devel/py-mock 1.3.0

[Jérémie Courrèges-Anglas]

Daniel Jakots  writes:

> On Wed, 23 Dec 2015 23:49:11 +0500, Alexandr Shadchin
>  wrote:
>
>> Hi,
>> 
>> This diff updates py-mock to the latest release.
>> Add python3 flavor.
>> 
>> Comments ? OK ?
>> 
>
> I was working on it too (as I need it for another port) and I have
> quite the same diff. A comment inline, otherwise that's good :)
>
>> 
>> Index: Makefile
>> ===
>> RCS file: /cvs/ports/devel/py-mock/Makefile,v
>> retrieving revision 1.7
>> diff -u -p -r1.7 Makefile
>> --- Makefile 29 Sep 2015 10:51:54 -  1.7
>> +++ Makefile 23 Dec 2015 18:44:30 -
>> @@ -2,11 +2,10 @@
>
> [snip]
>
>> +NO_TEST =   Yes
>
> Any reason for that? It looks like that test works.

The test suite isn't called.  Needs a test-dep on devel/py-unittest2 and
a custom do-test target, eg. cd ${WRKSRC} && unit2 discover.  There are
6 errors that were not present before.

Also devel/flake8's tests fail with this update, but I'm not sure
whether my-mock is to blame.

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

Re: [UPDATE] audio/abcde 2.7.1

[Jérémie Courrèges-Anglas]

Christopher Zimmermann  writes:

> Hi,

Hi,

> here's an update of audio/abcde to 2.7.1. ok?

I don't use this, but note that Marc Peters (cc'd) has already submitted
an update to 2.7.1 one month ago, see below.  Maybe take the best from
both diffs?

? abcde-2.7.1.patch
Index: Makefile
===
RCS file: /cvs/ports/audio/abcde/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- Makefile24 Aug 2015 23:19:57 -  1.23
+++ Makefile23 Nov 2015 17:04:16 -
@@ -2,8 +2,7 @@
 
 COMMENT=   command-line utility to rip and encode audio cds
 
-DISTNAME=  abcde-2.5.4
-REVISION=  1
+DISTNAME=  abcde-2.7.1
 CATEGORIES=audio
 
 HOMEPAGE=  http://abcde.einval.com/
Index: distinfo
===
RCS file: /cvs/ports/audio/abcde/distinfo,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 distinfo
--- distinfo2 Mar 2013 13:03:17 -   1.9
+++ distinfo23 Nov 2015 17:04:16 -
@@ -1,2 +1,2 @@
-SHA256 (abcde-2.5.4.tar.gz) = hbZ5uXDnKKmGSHrcv/fFHrDnL5+hDERQUh+OAp+m5ZE=
-SIZE (abcde-2.5.4.tar.gz) = 104229
+SHA256 (abcde-2.7.1.tar.gz) = NAHjl4WyDt7oQ9TYdbR9K1WfdkaBxILESRqMi6YF8lA=
+SIZE (abcde-2.7.1.tar.gz) = 144302
Index: patches/patch-abcde
===
RCS file: /cvs/ports/audio/abcde/patches/patch-abcde,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 patch-abcde
--- patches/patch-abcde 21 Nov 2012 20:38:48 -  1.7
+++ patches/patch-abcde 23 Nov 2015 17:04:16 -
@@ -1,14 +1,13 @@
-$OpenBSD: patch-abcde,v 1.7 2012/11/21 20:38:48 sthen Exp $
 abcde.orig Tue Sep 18 15:09:31 2012
-+++ abcde  Sat Nov 17 16:09:52 2012
+--- abcde.orig Sun Oct  4 11:30:28 2015
 abcde  Thu Oct 22 15:51:49 2015
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!${LOCALBASE}/bin/bash
  # Copyright (c) 1998-2001 Robert Woodcock 
  # Copyright (c) 2003-2006 Jesus Climent 
  # Copyright (c) 2009-2012 Colin Tuckley 
-@@ -833,6 +833,16 @@ do_tag ()
-   
${TPE2:+--set-text-frame=TPE2:"$TPE2"} \
+@@ -839,6 +839,16 @@
+   ${TPE2:+--TPE2 "$TPE2"} \
"$ABCDETEMPDIR/track$1.$OUTPUT"
;;
 +  id3tag)
@@ -21,56 +20,55 @@ $OpenBSD: patch-abcde,v 1.7 2012/11/21 2
 +  ${TRACKNUM:+-T "$TRACKS"} \
 +  "$ABCDETEMPDIR/track$1.$OUTPUT"
 +  ;;
-   # FIXME # Still not activated...
-   id3ed)
-   run_command tagtrack-$OUTPUT-$1 nice 
$ENCNICE \
-@@ -3165,7 +3175,7 @@ VAPLAYLISTFORMAT='${ARTISTFILE}-${ALBUMFILE}.${OUTPUT}
+   eyed3*)
+   # FIXME # track numbers in mp3 come 
with 1/10, so we cannot
+   # happily substitute them with $TRACKNUM
+@@ -3471,7 +3481,7 @@
  VAPLAYLISTDATAPREFIX=''
  DOSPLAYLIST=n
  COMMENT=''
--ID3TAGV=2
+-ID3TAGV=id3v2.4
 +ID3TAGV=id3tag
  ENCNICE=10
  READNICE=10
  DISTMP3NICE=10
-@@ -3207,6 +3217,7 @@ AACENC=faac
- 
+@@ -3537,6 +3547,7 @@
  ID3=id3
  ID3V2=id3v2
+ MID3V2=mid3v2
 +ID3TAG=id3tag
  EYED3=eyeD3
  VORBISCOMMENT=vorbiscomment
  METAFLAC=metaflac
-@@ -3259,6 +3270,7 @@ AACENCOPTS=
+@@ -3621,6 +3632,7 @@
+ FFMPEGENCOPTS=
  
  ID3OPTS=
- ID3V2OPTS=
 +ID3TAGOPTS=
+ EYED3OPTS=""
+ ATOMICPARSLEYOPTS=
  CDPARANOIAOPTS=
- CDDA2WAVOPTS=
- DAGRABOPTS=
-@@ -3310,7 +3322,7 @@ elif [ X$(uname) = "XDarwin" ] ; then
-   NEEDDISKUTIL=y
-   CDROMREADERSYNTAX=cddafs
+@@ -3683,7 +3695,7 @@
+   # We won't find the eject program in OSX, and doing checkexec will fail 
further below...
+   unset EJECT
  elif [ X$(uname) = "XOpenBSD" ] ; then
 -  HTTPGET=wget
 +  HTTPGET=ftp
MD5SUM=md5
OSFLAVOUR=OBSD
  elif [ X$(uname) = "XNetBSD" ] ; then
-@@ -3875,11 +3887,15 @@ esac
- if [ "$ID3TAGV" = "1" ]; then
-   TAGGER="$ID3"
-   TAGGEROPTS="$ID3OPTS"
-+else if [ "$ID3TAGV" = "id3tag" ]; then
-+  TAGGER="$ID3TAG"
-+  TAGGEROPTS="$ID3TAGOPTS"
- else
-   TAGGER="$EYED3"
-   TAGGEROPTS="$ID3V2OPTS"
-   ID3SYNTAX=eyed3
-   TAGGEROPTS="--set-encoding=utf16-LE $ID3V2OPTS"
-+fi
- fi
- 
- # NOGAP is specific to lame. Other encoders fail ...
+@@ -4427,8 +4439,13 @@
+   TAGGEROPTS="--encoding utf16 $EYED3OPTS"
+   fi
+   ;;
++  id3tag)
++  TAGGER="$ID3TAG"
++  ID3SYNTAX=id3tag
++  TAGGEROPTS="$ID3TAGOPTS"
++  ;;
+   *)
+-  log error "Error: ID3TAGV must be 

Re: UPDATE: devel/py-test-cov 2.2.0

[Jérémie Courrèges-Anglas]

Alexandr Shadchin  writes:

> Hi,
>
> This diff updates py-test-cov to the latest release.
>
> * Take maintainer.
> * Add python3 flavor.
>
> Comments ? OK ?

ok jca@

Note that ''make test'' will try to download the rdeps from pypi, even
if no test suite is run in the end (we'd need tox).

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

Re: NEW: net/websockify

[Jérémie Courrèges-Anglas]

Stuart Henderson  writes:

> "Websockify (formerly named wsproxy) translates WebSockets traffic to
> normal socket traffic. It accepts the WebSockets handshake, parses it,
> and then begins forwarding traffic between the client and the target
> in both directions."
>
> Tested with noVNC. OK to import?

Needs numpy, as stated in setup.py.

There are two modes to run websocksify:
Usage:
websockify [options] [source_addr:]source_port [target_addr:target_port]
websockify [options] [source_addr:]source_port -- WRAP_COMMAND_LINE

The second one depends on a shared module, rebind.so, which isn't
built/installed right now.  Worthwhile?

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

Re: UPDATE: devel/py-py 1.4.31

[Jérémie Courrèges-Anglas]

Alexandr Shadchin  writes:

> Hi,

Hi,

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

ok jca@

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

Re: UPDATE: offlineimap 6.6.0

[Jérémie Courrèges-Anglas]

Remi Locherer  writes:

> ping

Committed, thanks,

> On 2015-12-05 07:50, Remi Locherer wrote:
>> Hi
>>
>> OfflineIMAP v6.6.0 was just released. From the announcement mail:
>>
>> -
>> # Features
>>
>> - Maildir learns to mimic Dovecot's format of lower-case letters
>> (a,b,c..) for
>>   "custom flags" or user keywords.
>>
>> # Fixes
>>
>> - Broken retry loop would break connection management.
>> - Replace rogue `print` statement by `self.ui.debug`.
>>
>> # Changes
>>
>> - Bump imaplib2 from v2.52 to v2.53.
>> - Code cleanups.
>> - Add a full stack of all thread dump upon EXIT or KILL signal in
>> thread debug
>>   mode.
>> -
>>
>> It works fine for me synchronizing between dovecot and Maildir.
>>
>> Remi
>>
>>
>> Index: Makefile
>> ===
>> RCS file: /cvs/ports/mail/offlineimap/Makefile,v
>> retrieving revision 1.29
>> diff -u -p -r1.29 Makefile
>> --- Makefile 30 Nov 2015 22:27:13 -  1.29
>> +++ Makefile 4 Dec 2015 23:53:17 -
>> @@ -2,7 +2,7 @@
>>
>>  COMMENT=powerful IMAP/Maildir synchronization and reader support
>>
>> -MODPY_EGG_VERSION = 6.5.7
>> +MODPY_EGG_VERSION = 6.6.0
>>  GH_ACCOUNT =OfflineIMAP
>>  GH_PROJECT =offlineimap
>>  GH_TAGNAME =v${MODPY_EGG_VERSION}
>> Index: distinfo
>> ===
>> RCS file: /cvs/ports/mail/offlineimap/distinfo,v
>> retrieving revision 1.18
>> diff -u -p -r1.18 distinfo
>> --- distinfo 30 Nov 2015 22:27:13 -  1.18
>> +++ distinfo 4 Dec 2015 23:56:33 -
>> @@ -1,2 +1,2 @@
>> -SHA256 (offlineimap-6.5.7.tar.gz) =
>> t95Sx9iZXgZXu1XaE1McjW+W2CghcVlHfGha5AjjkKM=
>> -SIZE (offlineimap-6.5.7.tar.gz) = 20
>> +SHA256 (offlineimap-6.6.0.tar.gz) =
>> xBJY5c5TGRW7iR1M4Qs6+IttdKbuabYoKVf4UWX/Y/Q=
>> +SIZE (offlineimap-6.6.0.tar.gz) = 674655
>


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

Re: UPDATE: devel/py-six 1.10.0

[Jérémie Courrèges-Anglas]

Alexandr Shadchin  writes:

> Hi,

Hi,

> This diff updates py-six to the latest release.
> Take maintainer.
>
> Comments ? OK ?

ok jca@

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

[SECURITY] samba-4.1.22

[Jérémie Courrèges-Anglas]

Hi,

this one has been published last week:
--8<--
This is a security release in order to address the following CVEs:

o  CVE-2015-7540 (Remote DoS in Samba (AD) LDAP server)
o  CVE-2015-3223 (Denial of service in Samba Active Directory
  server)
o  CVE-2015-5252 (Insufficient symlink verification in smbd)
o  CVE-2015-5299 (Missing access control check in shadow copy
  code)
o  CVE-2015-5296 (Samba client requesting encryption vulnerable
  to downgrade attack)
o  CVE-2015-8467 (Denial of service attack against Windows
  Active Directory server)
o  CVE-2015-5330 (Remote memory read in Samba LDAP server)

Please note that if building against a system libldb, the required
version has been bumped to ldb-1.1.24.  This is needed to ensure
we build against a system ldb library that contains the fixes
for CVE-2015-5330 and CVE-2015-3223.
-->8--

Full release notes:

  https://www.samba.org/samba/history/samba-4.1.22.html

I didn't have much time to test it last week, so let's publish this
early to get more feedback.  Basic tests in workgroup mode on i386 only
so far, I'll probably be able to test sparc64 soon.  Additional tests
reports are more than welcome, as usual. :)

If someone is using -stable and wants to test it, I can also update
net/samba4 to 4.1.22, but I'm not volunteering to backports the changes
into samba-4.1.19.  Note that on -stable samba4 is located at
net/samba4, and is not hooked to the build.

Comments / test reports / oks? (:

Index: Makefile
===
RCS file: /cvs/ports/net/samba/Makefile,v
retrieving revision 1.212
diff -u -p -r1.212 Makefile
--- Makefile29 Nov 2015 15:50:20 -  1.212
+++ Makefile21 Dec 2015 12:21:30 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.212 2015/11/29 15:50:20 ajacoutot Exp $
 
 SHARED_ONLY =  Yes
-VERSION =  4.1.21
+VERSION =  4.1.22
 DISTNAME = samba-${VERSION}
 DOCSVERSION =  v3-5-test-4c5a1b6b
 DISTFILES =${DISTNAME}${EXTRACT_SUFX} \
@@ -19,9 +19,8 @@ PKGNAME-tevent =  tevent-${TEVENT_V}
 PKGNAME-util = samba-util-${VERSION}
 PKGNAME-docs = samba-docs-${VERSION}
 
-REVISION-ldb = 5
-REVISION-tevent =  3
-REVISION-main =0
+REVISION-ldb = 6
+REVISION-tevent =  4
 
 PKG_ARCH-docs =*
 
Index: distinfo
===
RCS file: /cvs/ports/net/samba/distinfo,v
retrieving revision 1.44
diff -u -p -r1.44 distinfo
--- distinfo15 Oct 2015 16:57:19 -  1.44
+++ distinfo21 Dec 2015 12:21:30 -
@@ -1,4 +1,4 @@
-SHA256 (samba-4.1.21.tar.gz) = APHCbNMQgRr7L6Gj+3KiO9LlwvZGbm79y1MDBdfDzi4=
+SHA256 (samba-4.1.22.tar.gz) = VWOhyUotrIN8z/0fCCG7JeCXr/qnOJ/vGG+c+zSGz+U=
 SHA256 (samba-docs-v3-5-test-4c5a1b6b.tar.bz2) = 
bsF0WP1KT1M3jMx3Z88MbsEQ1QEq9catijXpnPm7hZA=
-SIZE (samba-4.1.21.tar.gz) = 19561830
+SIZE (samba-4.1.22.tar.gz) = 19557688
 SIZE (samba-docs-v3-5-test-4c5a1b6b.tar.bz2) = 8070761
Index: patches/patch-lib_ldb_wscript
===
RCS file: /cvs/ports/net/samba/patches/patch-lib_ldb_wscript,v
retrieving revision 1.2
diff -u -p -r1.2 patch-lib_ldb_wscript
--- patches/patch-lib_ldb_wscript   30 Sep 2015 18:14:07 -  1.2
+++ patches/patch-lib_ldb_wscript   21 Dec 2015 12:21:30 -
@@ -4,17 +4,17 @@ $OpenBSD: patch-lib_ldb_wscript,v 1.2 20
 
 2. Use -Wl,no-undefined as on other platforms.
 
 lib/ldb/wscript.orig   Tue Sep 29 23:55:21 2015
-+++ lib/ldb/wscriptTue Sep 29 23:55:56 2015
-@@ -44,6 +44,7 @@ def configure(conf):
+--- lib/ldb/wscript.orig   Fri Dec 18 19:20:42 2015
 lib/ldb/wscriptMon Dec 21 09:09:46 2015
+@@ -45,6 +45,7 @@ def configure(conf):
  conf.CONFIG_PATH('LDB_MODULESDIR', conf.SUBST_ENV_VAR('MODULESDIR') + 
'/ldb')
  
  conf.env.standalone_ldb = conf.IN_LAUNCH_DIR()
 +conf.env.standalone_ldb = True
  
  if not conf.env.standalone_ldb:
- if conf.CHECK_BUNDLED_SYSTEM_PKG('ldb', minversion=VERSION,
-@@ -64,8 +65,7 @@ def configure(conf):
+ if conf.CHECK_BUNDLED_SYSTEM_PKG('ldb', minversion=SYSTEM_VERSION,
+@@ -65,8 +66,7 @@ def configure(conf):
  
  # we don't want any libraries or modules to rely on runtime
  # resolution of symbols


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

Re: Please add ICU as dependency to Boost (i.e. change the "--without-icu" to "--with-icu") - thoughts?

[Jérémie Courrèges-Anglas]

Tinker  writes:

> On 2015-12-16 05:04, j...@wxcvbn.org wrote:
>> Tinker  writes:
>>
>>> What would the decision be based on?
>>
>> I think that those points should be enough.
>> - good reasons to use ICU in boost, not just "I need the ICU parts of
>>   Boost.".  What would be the benefit for the ports tree?
>
> I need normalize() to do Unicode normalization!

I'm glad to hear that you want to do Unicode normalization using ICU,
that is not a valid answer to what I said above.

We have one report here:

  http://marc.info/?l=openbsd-ports=144171504417490=2

jirib didn't confirm that ICU was the only thing needed to make his
aegisub port work, and to my knowledge no existing port requires ICU in
boost.  The only benefit I can see so far is to have a boost package
similar to other distros.

> E.g. within locale(BC_LOCALE_UTF8).
>
> http://www.boost.org/doc/libs/1_54_0/libs/locale/doc/html/group__convert.html
>
> Boost.Locale requires Boost to be compiled with --with-icu ,
> http://www.boost.org/doc/libs/1_59_0/libs/locale/doc/html/index.html
> says:
>
>  "In order to achieve this goal Boost.Locale uses
> the-state-of-the-art Unicode and Localization library: ICU - 
> International Components for Unicode.
>
>  Boost.Locale creates the natural glue between the C++ locales
> framework, iostreams, and the powerful ICU library."
>
>
>
> (Then it continues "Boost.Locale provides non-ICU based localization
> support as well. It is based on the operating system native API or on
> the standard C++ library support. Sacrificing some less important
> features, Boost.Locale becomes less powerful but lighter and easier to
> deploy and use library."  - but, there's an issue here that the
> C++/OS-bundled unicode normalization may be incomplete or broken so this
> is why you want ICU.)
>
>> - someone has to do the work, and that includes checking for potential
>>   breakage.
>
> Right, Kirill said you are looking into this already now

In this thread I see no mail from Kirill saying this.  Who is "you" in
this sentence?

Back to thumb twiddling,

[...]

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

Re: Please add ICU as dependency to Boost (i.e. change the "--without-icu" to "--with-icu") - thoughts?

[Jérémie Courrèges-Anglas]

Stuart Henderson <st...@openbsd.org> writes:

> On 2015/12/15 22:04, Jérémie Courrèges-Anglas wrote:
>> Tinker <ti...@openmailbox.org> writes:
>> 
>> > What would the decision be based on?
>> 
>> I think that those points should be enough.
>> - good reasons to use ICU in boost, not just "I need the ICU parts of
>>   Boost.".  What would be the benefit for the ports tree?
>> - someone has to do the work, and that includes checking for potential
>>   breakage.
>
> And updating WANTLIB :-)
>
>> > Everyone just rolling thumbs or is there any real tradeoff?
>> 
>> You tell us. ;)
>
> Also note that this port does have a maintainer.

Duh, indeed.  So please also discuss this with Brad.

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

Re: Please add ICU as dependency to Boost (i.e. change the "--without-icu" to "--with-icu") - thoughts?

[Jérémie Courrèges-Anglas]

Tinker  writes:

> What would the decision be based on?

I think that those points should be enough.
- good reasons to use ICU in boost, not just "I need the ICU parts of
  Boost.".  What would be the benefit for the ports tree?
- someone has to do the work, and that includes checking for potential
  breakage.

> Everyone just rolling thumbs or is there any real tradeoff?

You tell us. ;)

> I guess anyhow that it's fair to say that OpenBSD machines do process
> Unicode and not just Ascii and that the Unicode usecase only will grow
> with time.
>
>
>
> On 2015-12-16 01:04, Kirill Bychkov wrote:
>> On Tue, December 15, 2015 19:48, Tinker wrote:
>>> Hi,
>>>
>>> I need the ICU parts of Boost. And, I really guess internationalized
>>> stuff is becoming more and more popular.
>>>
>>> Currently:
>>>
>>>   /usr/ports/devel/boost$ grep -r icu *
>>>   Makefile:   --without-icu \
>>>
>>> Would you feel like changint that to --with-icu, and then adding
>>> "icu4c"
>>> as a dependency to boost as to provide for that?
>>>
>>> Thanks!
>>> Tinker
>>>
>>>
>> Hi.
>> There was a discussion and patches [0] but still no decision yet.
>>
>> [0] http://marc.info/?l=openbsd-ports=144120909505095=2
>


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

Re: add a py3 flavor to net/py-IP

[Jérémie Courrèges-Anglas]

Daniel Jakots  writes:

> Hi,
>
> I wanted to add a py3 flavor to net/py-ripe.atlas.tools which depends
> on net/py-ripe.atlas.sagan wich itself depends on py-IP, hence this
> diff.
>
> I only tried py-ripe.atlas.tools so please test it, thanks.

As I said the tests fail with python3.4 on i386:

  https://pbot.rmdir.de/3I3_OxgyBOqIqgR3KtBWLw

The reason is that IPy.IP() defines a __nonzero__() method, but python
3 tries to use __bool__() instead, falling back to __len__().  Adding
a __bool__ method fixes the regress tests, but the len() method
remains broken on 32 bits, using python2.7 or python3.4.

--- IPy.py.orig Mon Dec 14 13:28:56 2015
+++ IPy.py  Mon Dec 14 13:44:43 2015
@@ -558,6 +558,13 @@ class IPint(object):
 """
 return True
 
+def __bool__(self):
+"""All IPy objects should evaluate to true in boolean context.
+Ordinarily they do, but if handling a default route expressed as
+0.0.0.0/0, the __len__() of the object becomes 0, which is used
+as the boolean value of the object.
+"""
+return True
 
 def __len__(self):
 """


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

Re: add a py3 flavor to net/py-IP

[Jérémie Courrèges-Anglas]

j...@wxcvbn.org (Jérémie Courrèges-Anglas) writes:

> j...@wxcvbn.org (Jérémie Courrèges-Anglas) writes:
>
>> Daniel Jakots <vigdis+o...@chown.me> writes:
>>
>>> Hi,
>>>
>>> I wanted to add a py3 flavor to net/py-ripe.atlas.tools which depends
>>> on net/py-ripe.atlas.sagan wich itself depends on py-IP, hence this
>>> diff.
>>>
>>> I only tried py-ripe.atlas.tools so please test it, thanks.
>>
>> As I said the tests fail with python3.4 on i386:
>>
>>   https://pbot.rmdir.de/3I3_OxgyBOqIqgR3KtBWLw
>>
>> The reason is that IPy.IP() defines a __nonzero__() method, but python
>> 3 tries to use __bool__() instead, falling back to __len__().  Adding
>> a __bool__ method fixes the regress tests, but the len() method
>> remains broken on 32 bits, using python2.7 or python3.4.
>
> So here's a diff including the mentioned fix.  It should be reported
> upstream, mentioning the len() problem would be worth it too.

Just so that nobody wastes time on this, the problem about the len()
builtin function calling __len__() is normal and already known by
upstream:

def __len__(self):
"""
Return the length of a subnet.

Called to implement the built-in function len().
It will break with large IPv6 Networks.
Use the object's len() instead.
"""
return self.len()

It's just that it will also break with IPv4 networks 0.0.0.0/0,
0.0.0.0/1 and 128.0.0.0/1, which contain more than INT32_MAX addresses.

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

Re: add a py3 flavor to net/py-IP

[Jérémie Courrèges-Anglas]

j...@wxcvbn.org (Jérémie Courrèges-Anglas) writes:

> Daniel Jakots <vigdis+o...@chown.me> writes:
>
>> Hi,
>>
>> I wanted to add a py3 flavor to net/py-ripe.atlas.tools which depends
>> on net/py-ripe.atlas.sagan wich itself depends on py-IP, hence this
>> diff.
>>
>> I only tried py-ripe.atlas.tools so please test it, thanks.
>
> As I said the tests fail with python3.4 on i386:
>
>   https://pbot.rmdir.de/3I3_OxgyBOqIqgR3KtBWLw
>
> The reason is that IPy.IP() defines a __nonzero__() method, but python
> 3 tries to use __bool__() instead, falling back to __len__().  Adding
> a __bool__ method fixes the regress tests, but the len() method
> remains broken on 32 bits, using python2.7 or python3.4.

So here's a diff including the mentioned fix.  It should be reported
upstream, mentioning the len() problem would be worth it too.

Benoit, ok?

Index: Makefile
===
RCS file: /cvs/ports/net/py-IP/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- Makefile11 Apr 2015 11:54:05 -  1.30
+++ Makefile14 Dec 2015 19:18:31 -
@@ -6,6 +6,7 @@ MODPY_EGG_VERSION = 0.83
 DISTNAME = IPy-${MODPY_EGG_VERSION}
 PKGNAME =  py-IP-${MODPY_EGG_VERSION}
 CATEGORIES =   net
+REVISION = 0
 
 HOMEPAGE = https://github.com/haypo/python-ipy/wiki
 
@@ -17,6 +18,9 @@ PERMIT_PACKAGE_CDROM =Yes
 MODPY_PI = Yes
 
 MODULES =  lang/python
+
+FLAVORS =  python3
+FLAVOR ?=
 
 MODPY_DISTUTILS_INSTALLARGS =  -O2
 
Index: patches/patch-IPy_py
===
RCS file: patches/patch-IPy_py
diff -N patches/patch-IPy_py
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-IPy_py14 Dec 2015 19:18:31 -
@@ -0,0 +1,17 @@
+$OpenBSD$
+--- IPy.py.origMon Dec 14 13:28:56 2015
 IPy.py Mon Dec 14 13:44:43 2015
+@@ -558,6 +558,13 @@ class IPint(object):
+ """
+ return True
+ 
++def __bool__(self):
++"""All IPy objects should evaluate to true in boolean context.
++Ordinarily they do, but if handling a default route expressed as
++0.0.0.0/0, the __len__() of the object becomes 0, which is used
++as the boolean value of the object.
++"""
++return True
+ 
+ def __len__(self):
+ """
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/py-IP/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST   1 Oct 2009 20:13:11 -   1.4
+++ pkg/PLIST   14 Dec 2015 19:18:31 -
@@ -1,5 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.4 2009/10/01 20:13:11 benoit Exp $
 
lib/python${MODPY_VERSION}/site-packages/IPy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
 lib/python${MODPY_VERSION}/site-packages/IPy.py
-lib/python${MODPY_VERSION}/site-packages/IPy.pyc
-lib/python${MODPY_VERSION}/site-packages/IPy.pyo
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}IPy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}IPy.${MODPY_PYC_MAGIC_TAG}pyo


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

Re: UPDATE: devel/doxygen 1.8.2 -> 1.8.10

[Jérémie Courrèges-Anglas]

Stuart Henderson <st...@openbsd.org> writes:

> On 2015/12/09 19:09, Jérémie Courrèges-Anglas wrote:
>> >> - Don't use own libmd5 but base md5
>> >> - Use MD5Data() instead of MD5Buffer+MD5SigToString
>> 
>> What is the point with those two items?  This adds clutter to this
>> update and possible problems for the following ones.
>
> These changes are exactly why I, for one, didn't dig into the update yet.

The bulk build (thanks ajacoutot@) didn't show any problem.

Rafael, if the MD5 patches are actually not necessary please provide an
updated patch without those changes.

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

Re: NEW: sysutils/fwa

[Jérémie Courrèges-Anglas]

Peter Hajdu  writes:

> I've fixed a few things after a discussion with James Turner.

Looks fine.

James: ok jca@ to import

Peter: you may want to fix these:

shannon /usr/ports/pobj/fwa-0.1/fwa-ce8f590963fdf9e3f5986efb70d68c1918262d86$ 
mandoc -Tlint fwa.1
mandoc: fwa.1:44:2: ERROR: inserting missing end of block: Sh breaks Bl
mandoc: fwa.1:43:2: WARNING: moving paragraph macro out of list: Pp
mandoc: fwa.1:43:2: WARNING: skipping paragraph macro: Pp at the end of Sh
mandoc: fwa.1:48:2: WARNING: skipping paragraph macro: Pp at the end of Sh

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

Re: Add UTF-8 support to textproc/par

[Jérémie Courrèges-Anglas]

Gregor Best  writes:

> Hi people,

Hi,

> in line with the current "Add UTF-8 support to everything"-movement, I'd
> like to propose the attached patch  for the textproc/par port. I use par
> to  format my  email messages  (this one  included), and  I love  to use
> umlauts, which can be a bit  cumbersome with regular par. The patch adds
> the UTF-8 patch from [0].
>
> I've tested the patch  with the example from [0] and  a few emails, both
> with and without umlauts, and it seems to work fine.

Sounds fine but see below for an alternative patch.

> If it's okay with everyone, I'd also like to take MAINTAINER of the port
> since it currently looks orphaned.

Same here.

> [0]: 
> http://sysmic.org/dotclear/index.php?post/2006/06/22/55-add-multibyte-characters-support-in-par

bsd.port.mk can fetch and apply external patches as well.  What about
this version?

Index: Makefile
===
RCS file: /cvs/ports/textproc/par/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile16 Feb 2015 22:57:13 -  1.20
+++ Makefile9 Dec 2015 17:51:16 -
@@ -5,16 +5,21 @@ COMMENT=  paragraph reflow for email
 VERSION=   1.52
 DISTNAME=  Par${VERSION:S/.//}
 PKGNAME=   par-${VERSION}
-REVISION = 0
+REVISION = 1
 CATEGORIES=textproc
 
 HOMEPAGE=  http://www.nicemice.net/par/
 
+MAINTAINER=Gregor Best 
+
 # custom
 PERMIT_PACKAGE_CDROM=  Yes
 WANTLIB=   c 
 
 MASTER_SITES=   ${HOMEPAGE}
+
+PATCHFILES=par_1.52-i18n.3.diff.gz
+PATCH_DIST_STRIP=  -p1
 
 ALL_TARGET=
 
Index: distinfo
===
RCS file: /cvs/ports/textproc/par/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo18 Jan 2015 03:15:29 -  1.4
+++ distinfo9 Dec 2015 17:51:16 -
@@ -1,2 +1,4 @@
 SHA256 (Par152.tar.gz) = M9za6QX0tCZ7TcHz77Ay15cFyo0hIuF+/ez9gWIGcII=
+SHA256 (par_1.52-i18n.3.diff.gz) = zC4seUO3PZ6ok3F/Zp7H8WZRiN2L7dRa6soCfDCwVrs=
 SIZE (Par152.tar.gz) = 47999
+SIZE (par_1.52-i18n.3.diff.gz) = 24302


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

Re: update devel/py-test

[Jérémie Courrèges-Anglas]

Daniel Jakots  writes:

> Hi,
>
> This update needs the update of devel/py-py which is still on ports@. On
> HOMEPAGE they only talk about 2.8.2 but on [1] I saw 2.8.3 which is 2
> weeks old according to their GH page [2] so I went for it.

Committed, thanks!

> [1]: https://pypi.python.org/pypi/pytest
> [2]: https://github.com/pytest-dev/pytest/releases
>
> make test gives with py2
> 1258 passed, 43 skipped, 10 xfailed in 117.04 seconds
> and with py3
> 1242 passed, 59 skipped, 10 xfailed in 115.35 seconds
>
> I tried to follow sthen advice's so after doing FLAVOR=python3 make
> REVISION=999 plist I just did
> -${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}/
> +lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}/
> -${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/_pytest/assertion/${MODPY_PYCACHE}/
> +lib/python${MODPY_VERSION}/site-packages/_pytest/assertion/${MODPY_PYCACHE}/
> -${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/_pytest/vendored_package/${MODPY_PYCACHE}/
> +lib/python${MODPY_VERSION}/site-packages/_pytest/vendored_packages/${MODPY_PYCACHE}/
>
> Though, with some ports randomly make test'ed, the result isn't good
> but I don't know if the error comes from the ports or from py-test. For
> instance I tried devel/py-py: it failed, so does www/py-werkzeug (but
> not the same error) but www/py-flask returns "OK".

Those problems are in the respective ports, not in pytest.

> The whole diff 
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/py-test/Makefile,v
> retrieving revision 1.11
> diff -u -p -r1.11 Makefile
> --- Makefile  29 Sep 2015 10:52:12 -  1.11
> +++ Makefile  2 Dec 2015 22:24:59 -
> @@ -2,10 +2,9 @@
>  
>  COMMENT= cross-project testing tool for Python
>  
> -MODPY_EGG_VERSION=   2.6.1
> +MODPY_EGG_VERSION=   2.8.3
>  DISTNAME=pytest-${MODPY_EGG_VERSION}
>  PKGNAME= py-test-${MODPY_EGG_VERSION}
> -REVISION =   1
>  
>  CATEGORIES=  devel
>  
> @@ -23,7 +22,7 @@ MODPY_SETUPTOOLS=   Yes
>  FLAVORS= python3
>  FLAVOR?=
>  
> -RUN_DEPENDS= devel/py-py${MODPY_FLAVOR}>=1.4.23
> +RUN_DEPENDS= devel/py-py${MODPY_FLAVOR}>=1.4.30
>  TEST_DEPENDS=${RUN_DEPENDS} \
>   devel/py-test${MODPY_FLAVOR}>=${MODPY_EGG_VERSION} \
>   devel/py-nose${MODPY_FLAVOR} \
> Index: distinfo
> ===
> RCS file: /cvs/ports/devel/py-test/distinfo,v
> retrieving revision 1.3
> diff -u -p -r1.3 distinfo
> --- distinfo  15 Sep 2014 19:42:08 -  1.3
> +++ distinfo  2 Dec 2015 22:24:59 -
> @@ -1,2 +1,2 @@
> -SHA256 (pytest-2.6.1.tar.gz) = mU2ryzFJZZ0lmt0qp9Eb/00177fPTIIz+psLYsElXDw=
> -SIZE (pytest-2.6.1.tar.gz) = 627761
> +SHA256 (pytest-2.8.3.tar.gz) = N9lQ6Twf1+BNgWo8pKUibqJTHG1THIKErZuIhIQX5yA=
> +SIZE (pytest-2.8.3.tar.gz) = 880441
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/devel/py-test/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -r1.3 PLIST
> --- pkg/PLIST 15 Sep 2014 19:42:08 -  1.3
> +++ pkg/PLIST 2 Dec 2015 22:24:59 -
> @@ -1,74 +1,84 @@
>  @comment $OpenBSD: PLIST,v 1.3 2014/09/15 19:42:08 edd Exp $
>  @comment bin/py.test-${MODPY_VERSION}
>  bin/py.test${MODPY_BIN_SUFFIX}
> +bin/py.test-${MODPY_VERSION}
> +lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}pytest.${MODPY_PYC_MAGIC_TAG}pyc
>  lib/python${MODPY_VERSION}/site-packages/_pytest/
>  lib/python${MODPY_VERSION}/site-packages/_pytest/__init__.py
>  
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}/
>  
> lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/_pytest/_argcomplete.py
>  
> lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}_argcomplete.${MODPY_PYC_MAGIC_TAG}pyc
> -${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/_pytest/assertion/${MODPY_PYCACHE}/
> +lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}_pluggy.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}cacheprovider.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}capture.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}doctest.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}genscript.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}helpconfig.${MODPY_PYC_MAGIC_TAG}pyc
> 

Re: UPDATE: devel/doxygen 1.8.2 -> 1.8.10

[Jérémie Courrèges-Anglas]

Rafael Sadowski  writes:

> Hi @ports,

Hi Rafael,

> nobody cares *ping* harder ;-)

This is the correct method indeed. :)

> Cheers, Rafael
>
> On Sun Nov 22, 2015 at 04:51:14PM +0100, Rafael Sadowski wrote:
>> Hi ports@
>> 
>> after my first attempt here is the new diff to update doxygen.

Looks fine, thanks for your work on this.  A bulk build is currently
running with your patch applied, no visible fallout so far.

There's one thing that worries me though.

>> doxygen port highlights:
>> 
>> - switch to CMake


>> - Don't use own libmd5 but base md5
>> - Use MD5Data() instead of MD5Buffer+MD5SigToString

What is the point with those two items?  This adds clutter to this
update and possible problems for the following ones.

>> 
>> I checked all ports with doxygen usage.
>> 
>> - No changes with 1.8.10:
>> 
>> audio/liblo
>> database/soprano
>> devel/simulavr
>> devel/tclap
>> math/ginac
>> graphics/digikam-kde4
>> graphics/opencv
>> net/libktorrent
>> productivit/kmymoney
>> productivit/libalkimia
>> x11/awesome
>> x11/kde4/runtime
>> x11/kde4/nepomuk-core
>> 
>> 
>> - REVISION bump and update plist:
>> 
>> audio/libnjb
>> devel/libmtp
>> devel/qjson
>> geo/geos
>> graphics/lensfun
>> multimedia/libquicktime
>> x11/dbusmenu-qt
>> x11/ede/lib
>> 
>> I am looking forward about your feedback and I hope we will see 1.8.10
>> quickly in the tree.
>> 
>> Best regards, Rafael
>> 

[...]

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

Re: update devel/py-py

[Jérémie Courrèges-Anglas]

Daniel Jakots  writes:

> On Wed, 2 Dec 2015 20:55:27 +0100, Daniel Jakots 
> wrote:
>
> ping

Committed, thanks.

>> 
>> Index: Makefile
>> ===
>> RCS file: /cvs/ports/devel/py-py/Makefile,v
>> retrieving revision 1.26
>> diff -u -p -r1.26 Makefile
>> --- Makefile 29 Sep 2015 10:52:11 -  1.26
>> +++ Makefile 2 Dec 2015 19:43:27 -
>> @@ -2,14 +2,13 @@
>>  
>>  COMMENT=cross-python path, ini-parsing, io, code,
>> log facilities 
>> -MODPY_EGG_VERSION = 1.4.23
>> +MODPY_EGG_VERSION = 1.4.30
>>  DISTNAME=   py-${MODPY_EGG_VERSION}
>>  PKGNAME=py-${DISTNAME}
>> -REVISION =  1
>>  
>>  CATEGORIES= devel
>>  
>> -HOMEPAGE=   http://doc.pylib.org/en/latest/
>> +HOMEPAGE=   https://pylib.readthedocs.org/en/latest
>>  
>>  MAINTAINER= Eric Faurot 
>>  
>> Index: distinfo
>> ===
>> RCS file: /cvs/ports/devel/py-py/distinfo,v
>> retrieving revision 1.6
>> diff -u -p -r1.6 distinfo
>> --- distinfo 15 Sep 2014 19:41:03 -  1.6
>> +++ distinfo 2 Dec 2015 19:43:27 -
>> @@ -1,2 +1,2 @@
>> -SHA256 (py-1.4.23.tar.gz) =
>> uo8qOJTK8RIXmaKyOdZ4c6Vr0N+iThZz2SmQqK5zcMo= -SIZE (py-1.4.23.tar.gz)
>> = 189520 +SHA256 (py-1.4.30.tar.gz) =
>> twPldoXtfCgLGlHElqSYTYPYne8qkwtenl2lpsoVFRQ= +SIZE (py-1.4.30.tar.gz)
>> = 191796
>> 
>

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

Re: amd64 bulk report

[Jérémie Courrèges-Anglas]

Stuart Henderson  writes:

> On 2015/12/06 09:11, Antoine Jacoutot wrote:
>> * net/ifstat
>> * net/libdnet
>> * net/nmap
>> * net/ocserv
>> * security/aircrack-ng
>
> From my test build:
>
> None of the above actually need things from if_var.h, they're ok with the
> whole file wrapped in ifdef kernel.
>
>> * devel/libgtop2
>
> mpi's already taking care of libgtop2
>
>> * net/zabbix

The following patch is supposed to affect only OpenBSD and thus should
be easy to push upstream.  No need to read kernel mem to get if_data,
zabbix already had code in case kvm_read fails.

Robert, does the following work fine for you?

Index: Makefile
===
RCS file: /cvs/ports/net/zabbix/Makefile,v
retrieving revision 1.117
diff -u -p -r1.117 Makefile
--- Makefile30 Oct 2015 12:47:40 -  1.117
+++ Makefile7 Dec 2015 12:18:37 -
@@ -5,7 +5,7 @@ COMMENT-server =network and application
 COMMENT-web =  network and application monitoring - web frontend
 
 VERSION =  2.4.6
-REVISION-main =1
+REVISION-main =2
 REVISION-server =  0
 DISTNAME = zabbix-${VERSION}
 FULLPKGNAME-main = zabbix-agent-${VERSION}
Index: patches/patch-src_libs_zbxsysinfo_openbsd_net_c
===
RCS file: patches/patch-src_libs_zbxsysinfo_openbsd_net_c
diff -N patches/patch-src_libs_zbxsysinfo_openbsd_net_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_libs_zbxsysinfo_openbsd_net_c 7 Dec 2015 12:18:37 
-
@@ -0,0 +1,99 @@
+$OpenBSD$
+
+Stop using struct ifnet and libkvm for interface stats.
+
+--- src/libs/zbxsysinfo/openbsd/net.c.orig Sun Dec  6 15:59:59 2015
 src/libs/zbxsysinfo/openbsd/net.c  Sun Dec  6 16:19:21 2015
+@@ -24,13 +24,8 @@
+ 
+ #include 
+ 
+-#if OpenBSD >= 201405
+-# include   /* structs ifnet and ifnet_head are defined in 
this header since OpenBSD 5.5 */
+-#endif
+-
+ static struct nlist kernel_symbols[] =
+ {
+-  {"_ifnet", N_UNDF, 0, 0, 0},
+   {"_tcbtable", N_UNDF, 0, 0, 0},
+   {NULL, 0, 0, 0, 0}
+ };
+@@ -43,11 +38,6 @@ static int  get_ifdata(const char *if_name,
+   zbx_uint64_t *tbytes, zbx_uint64_t *tpackets, zbx_uint64_t 
*terrors,
+   zbx_uint64_t *icollisions, char **error)
+ {
+-  struct ifnet_head   head;
+-  struct ifnet*ifp;
+-
+-  kvm_t   *kp;
+-  int len = 0;
+   int ret = SYSINFO_RET_FAIL;
+ 
+   if (NULL == if_name || '\0' == *if_name)
+@@ -88,66 +78,7 @@ static int  get_ifdata(const char *if_name,
+   if (icollisions)
+   *icollisions = 0;
+ 
+-  if (NULL != (kp = kvm_open(NULL, NULL, NULL, O_RDONLY, NULL))) /* 
requires root privileges */
+   {
+-  struct ifnetv;
+-
+-  if (N_UNDF == kernel_symbols[IFNET_ID].n_type)
+-  if (0 != kvm_nlist(kp, _symbols[0]))
+-  kernel_symbols[IFNET_ID].n_type = N_UNDF;
+-
+-  if (N_UNDF != kernel_symbols[IFNET_ID].n_type)
+-  {
+-  len = sizeof(struct ifnet_head);
+-
+-  if (kvm_read(kp, kernel_symbols[IFNET_ID].n_value, 
, len) >= len)
+-  {
+-  len = sizeof(struct ifnet);
+-
+-  for (ifp = head.tqh_first; ifp; ifp = 
v.if_list.tqe_next)
+-  {
+-  if (kvm_read(kp, (u_long)ifp, , len) 
< len)
+-  break;
+-
+-  if (0 == strcmp(if_name, v.if_xname))
+-  {
+-  if (ibytes)
+-  *ibytes += v.if_ibytes;
+-  if (ipackets)
+-  *ipackets += 
v.if_ipackets;
+-  if (ierrors)
+-  *ierrors += 
v.if_ierrors;
+-  if (idropped)
+-  *idropped += 
v.if_iqdrops;
+-  if (obytes)
+-  *obytes += v.if_obytes;
+-  if (opackets)
+-  *opackets += 
v.if_opackets;
+-  if (oerrors)
+-  *oerrors += 
v.if_oerrors;
+-  if (tbytes)
+-  *tbytes += v.if_ibytes 
+ v.if_obytes;
+-  

Re: amd64 bulk report

[Jérémie Courrèges-Anglas]

Stuart Henderson  writes:

> On 2015/12/06 09:11, Antoine Jacoutot wrote:
>> * net/ifstat
>> * net/libdnet
>> * net/nmap
>> * net/ocserv
>> * security/aircrack-ng
>
> From my test build:
>
> None of the above actually need things from if_var.h, they're ok with the
> whole file wrapped in ifdef kernel.
>
>> * devel/libgtop2
>
> mpi's already taking care of libgtop2

>> * security/antisniff

Here's a diff that removes the need to look at if_var.h - use
getifaddrs(3) instead; the diff is a bit unreadable, but the resulting
intpr() function isn't.

Untested, is antisniff still relevant these days?

Index: Makefile
===
RCS file: /cvs/ports/security/antisniff/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile30 Aug 2014 21:54:08 -  1.25
+++ Makefile7 Dec 2015 12:11:10 -
@@ -3,6 +3,7 @@
 COMMENT=   promiscuous mode interface detector
 
 PKGNAME=   antisniff-1.1.2
+REVISION=  0
 CATEGORIES=security
 
 DISTNAME=  anti_sniff_researchv1-1-2
Index: patches/patch-bpf_getetheraddr_c
===
RCS file: patches/patch-bpf_getetheraddr_c
diff -N patches/patch-bpf_getetheraddr_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-bpf_getetheraddr_c7 Dec 2015 12:11:10 -
@@ -0,0 +1,112 @@
+$OpenBSD$
+--- bpf_getetheraddr.c.origSat Dec 12 21:40:00 1998
 bpf_getetheraddr.c Sun Dec  6 16:34:36 2015
+@@ -90,7 +90,7 @@ struct nlist nl[] = {
+ 
+ kvm_t *kvmd;  
+ 
+-void intpr(u_long ifnetaddr, char *, struct ether_addr *);
++void intpr(char *, struct ether_addr *);
+ int  kread(u_long addr, char *buf, int size);
+ 
+ 
+@@ -130,83 +130,40 @@ int getetheraddr(HDEV fd, struct ether_addr *eaddr){
+ 
+   strncpy(intname, ifr.ifr_name, sizeof(intname));
+ 
+-  if ((kvmd = kvm_openfiles(nlistf, memf, NULL, O_RDONLY,
+-  buf)) == NULL) {
+-fprintf(stderr, "kvm_open: %s\n", buf);
+-exit(1);
+-  }
+-
+-  if (kvm_nlist(kvmd, nl) < 0 || nl[0].n_type == 0) {
+-if (nlistf)
+-  fprintf(stderr, "%s: no namelist\n", nlistf);
+-else
+-  fprintf(stderr, "no namelist\n");
+-exit(1);
+-  }
+-
+-  intpr(nl[N_IFNET].n_value, intname, eaddr);
++  intpr(intname, eaddr);
+   return(TRUE);
+ }
+ 
++#include 
++
+ void
+-intpr(u_long ifnetaddr, char *intname, struct ether_addr *eaddr){
+-  struct ifnet ifnet;
+-  union {
+-struct ifaddr ifa;
+-struct in_ifaddr in;
+-  } ifaddr;
+-  u_long ifaddraddr;
+-  struct ifnet_head ifhead; /* TAILQ_HEAD */
+-  char name[IFNAMSIZ];
++intpr(char *intname, struct ether_addr *eaddr) {
++  struct ifaddrs *ifa0, *ifa;
+   struct sockaddr_dl *sdl;
+   struct sockaddr *sa;
+ 
+- if (ifnetaddr == 0) {
+-   printf("ifnet: symbol not defined\n");
+-   return;
+- }
++  if (getifaddrs() == -1)
++return;
+ 
+- /*
+-  * Find the pointer to the first ifnet structure.  Replace
+-  * the pointer to the TAILQ_HEAD with the actual pointer
+-  * to the first list element.
+-  */
+-  if (kread(ifnetaddr, (char *), sizeof ifhead))
+-return;
++  for (ifa = ifa0; ifa != NULL; ifa = ifa->ifa_next) {
+ 
+-  ifnetaddr = (u_long)ifhead.tqh_first;
+-  ifaddraddr = 0;
+-
+-  while (ifnetaddr){
+-register char *cp;
+-
+-if (kread(ifnetaddr, (char *), sizeof ifnet))
+-  return;
+-bcopy(ifnet.if_xname, name, IFNAMSIZ);
+-name[IFNAMSIZ - 1] = '\0';  /* sanity */
+-ifnetaddr = (u_long)ifnet.if_list.tqe_next;
+-ifaddraddr = (u_long)ifnet.if_addrlist.tqh_first;
+-
+-if (strcmp(name, intname) == 0) {
+-  if (ifaddraddr != 0){
+-if (kread(ifaddraddr, (char *), sizeof ifaddr)) {
+-  ifaddraddr = 0;
++if (strcmp(ifa->ifa_name, intname) == 0) {
++sa = (struct sockaddr *)ifa->ifa_addr;
++  if (sa == NULL)
+   continue;
+-}
+-#define CP(x) ((char *)(x))
+-cp = (CP(ifaddr.ifa.ifa_addr) - CP(ifaddraddr)) +
+-   CP(); 
+-sa = (struct sockaddr *)cp;
++  if (sa->sa_family != AF_LINK)
++  continue;
+ sdl = (struct sockaddr_dl *)sa;
+ /*
+ if (sdl->sdl_type == IFT_ETHER ||
+ sdl->sdl_type == IFT_FDDI)
+ */
+ /*  printf("%s\n", ether_ntoa((struct ether_addr *)LLADDR(sdl))); */
+-  memcpy((char *)eaddr, (char *)LLADDR(sdl), sizeof(struct 
ether_addr));
+-  }
++memcpy((char *)eaddr, (char *)LLADDR(sdl), sizeof(struct ether_addr));
+ }
+   }
++
++  freeifaddrs(ifa0);
+ }
+ 
+ 
Index: patches/patch-includes_h
===
RCS file: /cvs/ports/security/antisniff/patches/patch-includes_h,v
retrieving revision 1.4
diff -u -p -r1.4 patch-includes_h
--- patches/patch-includes_h6 Dec 2013 11:54:48 -   1.4
+++ patches/patch-includes_h7 Dec 2015 12:11:10 -
@@ -1,13 +1,11 @@
 $OpenBSD: patch-includes_h,v 1.4 2013/12/06 

Re: amd64 bulk report (net-snmp)

[Jérémie Courrèges-Anglas]

Stuart Henderson  writes:

> On 2015/12/06 09:11, Antoine Jacoutot wrote:
>> * net/ifstat
>> * net/libdnet
>> * net/nmap
>> * net/ocserv
>> * security/aircrack-ng
>
> From my test build:
>
> None of the above actually need things from if_var.h, they're ok with the
> whole file wrapped in ifdef kernel.
>
>> * devel/libgtop2
>
> mpi's already taking care of libgtop2
>
[...]

> the above, plus net-snmp, do need things from if_var.

I took a look at net-snmp, things are a bit a ugly but in the end we
should be able to use getifaddrs(3) instead of kvm/struct ifnet for
ipv6.c.

The following is wip, I'd like to further split the getifaddrs(3) and
ifnet implementations but it probably should be discussed with upstream
before going too far.

I've done basic tests this morning using snmpwalk localhost and netsnmpd
started as root.

Thoughts?

Index: Makefile
===
RCS file: /cvs/ports/net/net-snmp/Makefile,v
retrieving revision 1.84
diff -u -p -r1.84 Makefile
--- Makefile5 Nov 2015 23:43:46 -   1.84
+++ Makefile7 Dec 2015 12:32:43 -
@@ -6,7 +6,7 @@ COMMENT-main=   extendable SNMP implementa
 COMMENT-tkmib= graphical SNMP MIB browser
 
 V= 5.7.3
-REVISION-main= 4
+REVISION-main= 5
 
 DISTNAME=  net-snmp-$V
 MULTI_PACKAGES=-main -tkmib
@@ -58,6 +58,7 @@ CONFIGURE_ARGS=   ${CONFIGURE_SHARED} \
--with-temp-file-pattern=/tmp/snmpd \
--with-logfile="/var/log/snmpd" \
--with-persistent-directory="/var/net-snmp"
+CONFIGURE_ENV= ac_cv_IFNET_NEEDS_KERNEL=no
 TEST_TARGET=   test
 
 pre-configure:
Index: patches/patch-agent_mibgroup_mibII_ipv6_c
===
RCS file: /cvs/ports/net/net-snmp/patches/patch-agent_mibgroup_mibII_ipv6_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-agent_mibgroup_mibII_ipv6_c
--- patches/patch-agent_mibgroup_mibII_ipv6_c   20 Dec 2013 02:20:00 -  
1.1
+++ patches/patch-agent_mibgroup_mibII_ipv6_c   7 Dec 2015 12:32:43 -
@@ -1,7 +1,213 @@
 $OpenBSD: patch-agent_mibgroup_mibII_ipv6_c,v 1.1 2013/12/20 02:20:00 krw Exp $
 agent/mibgroup/mibII/ipv6.c.orig   Tue Oct  9 18:28:58 2012
-+++ agent/mibgroup/mibII/ipv6.cSat Nov 30 08:25:29 2013
-@@ -1336,9 +1336,13 @@ var_udp6(register struct variable * vp,
+--- agent/mibgroup/mibII/ipv6.c.orig   Mon Dec  8 21:23:22 2014
 agent/mibgroup/mibII/ipv6.cMon Dec  7 09:11:14 2015
+@@ -81,6 +81,7 @@
+ # include 
+ #endif
+ #if HAVE_NETINET6_IP6_VAR_H
++# include 
+ # include 
+ #endif
+ #include 
+@@ -597,7 +598,44 @@ if_getindex(const char *name)
+ 
+ /**/
+ #ifndef linux
++
++#ifdef __OpenBSD__
++
+ /*
++ * It is not possible to use struct ifnet anymore on OpenBSD, get
++ * interface flags and L2 address through getifaddrs(3).
++ */
++
++#include 
++
++static int
++if_getifflags(int ifindex, int *ifflags)
++{
++  const char  *ifname;
++  struct ifaddrs  *ifa0, *ifa;
++  int  ret = -1;
++
++  ifname = if_getname(ifindex);
++  if (ifname == NULL)
++  return ret;
++
++  if (getifaddrs() != -1) {
++  for (ifa = ifa0; ifa != NULL; ifa = ifa->ifa_next) {
++  if (strcmp(ifa->ifa_name, ifname) == 0) {
++  *ifflags = ifa->ifa_flags;
++  ret = 0;
++  break;
++  }
++  }
++  freeifaddrs(ifa0);
++  }
++
++  return ret;
++}
++
++#else
++
++/*
+  * KAME dependent part 
+  */
+ static int
+@@ -630,6 +668,8 @@ if_getifnet(int idx, struct ifnet *result)
+ return -1;
+ }
+ 
++#endif /* !__OpenBSD__ */
++
+ #if TRUST_IFLASTCHANGE /*untrustable value returned... */
+ #ifdef HAVE_NET_IF_MIB_H
+ #if defined(HAVE_SYS_SYSCTL_H) && defined(CTL_NET)
+@@ -844,86 +884,34 @@ var_ifv6Entry(register struct variable * vp,
+ #endif
+ case IPV6IFPHYSADDRESS:
+ {
+-struct ifnetifnet;
+-struct ifaddr   ifaddr;
+-#if defined(__DragonFly__) && __DragonFly_version >= 197700
+-struct ifaddr_container ifac;
+-struct ifaddrhead head;
+-#endif
+ static struct sockaddr_dl sdl;
+-caddr_t ifa;
++struct ifaddrs *ifa0, *ifa;
++char ifnam[IF_NAMESIZE];
+ 
+-if (if_getifnet(interface, ) < 0)
+-break;
+-#if defined(freebsd3) || defined(darwin)
+-# if defined(__DragonFly__) && __DragonFly_version >= 197700
+-/*
+- * Locate ifaddr head on CPU0
+- */
+-if (!NETSNMP_KLOOKUP(ifnet.if_addrheads, (char *), 
sizeof(head))) {
+-DEBUGMSGTL(("mibII/ipv6:var_ipv6", "klookup head failed\n"));
+-break;
++if (if_indextoname(interface, ifnam) == NULL) {
++

Re: kill net/mrtd?

[Jérémie Courrèges-Anglas]

Stuart Henderson  writes:

> Not updated since 2001, time_t problems on 32-bit arch, dozens of
> "cast from pointer to integer of different size" and "cast to pointer
> from integer of different size" suggesting that it's unlikely to work
> on 64-bit either, and missing license marker.
>
> Bye?

I took a look recently and came to the same conclusion.  ok to remove it.

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

Re: [update] fonts/hack-fonts 2.010 -> 2.018

[Jérémie Courrèges-Anglas]

Michael McConville  writes:

> And add myself as maintainer.
>
> ok?

ok jca@

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

Re: Delete security/ADMsmb?

[Jérémie Courrèges-Anglas]

Christian Weisgerber  writes:

> security/ADMsmb -- Samba security scanner
>
> I was going to fix a header include problem there but...
>
> The version we have is from 1998.
> (There is a newer release from 2003.)
>
> No license.
>
> Is this still useful or should we just delete it?

It's not IMO, please delete it.

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

Re: NEW: misc/ietf-cli

[Jérémie Courrèges-Anglas]

Stuart Henderson  writes:

> an alternative to packaging RFCs directly

I'd prefer this.  Looks fine ports-wise, ok if you want to import it.

> ... though the initial
> rsync mirroring is a bit of a weighty download.

eeek... indeed.

> -- -- --
> This package contains command-line tools to work with a locally rsync'ed
> copy of Internet Drafts and RFCs. See the README and help text for more
> information, but here are some examples:
>
> ietf: starts a command-line shell with command history
>
> ietf mirror: create or update local mirror of IETF repositories
>   (approx 1GB, by default in /var/db/ietf-mirrors)
>
> ietf rfc 3456 4567: open RFC 3456 and RFC 4567 in $EDITOR
>
> ietf rfcextra 3456: open RFC 3456 and any RFCs that update or
>   obsolete it in $EDITOR, and any errata on any of those in a browser
>
> ietf (tools|tracker) 3456 4567: opens RFC 3456 and RFC 4567 in the
>   IETF Tools or IETF Datatracker web interface
>
> ietf draft crocker: open all active drafts with "crocker" in their
>   filename, and lists all matching drafts that are expired, replaced
>   by other drafts, or have become RFCs
>
> ietf draftstatus crocker, ietf rfcstatus 3456: lists information
>   from the IETF and RFC Editor databases
> -- -- --
>
>

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

Re: mod_auth_bsd (circleq fallout)

[Jérémie Courrèges-Anglas]

Stuart Henderson  writes:

> can this just be switched to a TAILQ?

I think so, please see below,

> is anyone using this that can test?
>
>
> Index: patches/patch-authd_c
> ===
> RCS file: patches/patch-authd_c
> diff -N patches/patch-authd_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-authd_c 20 Nov 2015 11:18:12 -
> @@ -0,0 +1,123 @@
> +$OpenBSD$
> +--- authd.c.orig Fri Nov 20 11:16:51 2015
>  authd.c  Fri Nov 20 11:17:14 2015
> +@@ -174,7 +174,7 @@ struct auth_attempt {
> + } result;
> + 
> + SPLAY_ENTRY(auth_attempt) spe;
> +-CIRCLEQ_ENTRY(auth_attempt) cqe;
> ++TAILQ_ENTRY(auth_attempt) cqe;
> + }; /* struct auth_attempt */
> + 
> + 
> +@@ -196,7 +196,7 @@ static const struct auth_peer {
> + struct auth_attempt;
> + 
> + static SPLAY_HEAD(mod_auth_bsd_fail,auth_attempt) auth_failed_lookup;
> +-static CIRCLEQ_HEAD(,auth_attempt) auth_failed_cache;
> ++static TAILQ_HEAD(,auth_attempt) auth_failed_cache;
> + static size_t auth_failed_num;
> + 
> + static int auth_fail_cmp(struct auth_attempt *a, struct auth_attempt *b) {
> +@@ -212,7 +212,7 @@ SPLAY_GENERATE(mod_auth_bsd_fail,auth_attempt,spe,auth
> +  * Cache and lookup tree for successful authentications.
> +  */
> + static SPLAY_HEAD(mod_auth_bsd_okay,auth_attempt) auth_okayed_lookup;
> +-static CIRCLEQ_HEAD(,auth_attempt) auth_okayed_cache;
> ++static TAILQ_HEAD(,auth_attempt) auth_okayed_cache;
> + static size_t auth_okayed_num;
> + 
> + static int auth_okay_cmp(struct auth_attempt *a, struct auth_attempt *b) {
> +@@ -566,15 +566,15 @@ static struct auth_attempt *authd_userokay_cached(stru
> +  * Just setup it up for reallocation.
> +  */
> + if (now - a->timestamp > cache_ttl) {
> +-CIRCLEQ_REMOVE(_okayed_cache,a,cqe);
> +-CIRCLEQ_INSERT_HEAD(_okayed_cache,a,cqe);
> ++TAILQ_REMOVE(_okayed_cache,a,cqe);
> ++TAILQ_INSERT_HEAD(_okayed_cache,a,cqe);
> + 
> + a   = NULL;
> + } else {
> + a->timestamp= now;
> + 
> +-CIRCLEQ_REMOVE(_okayed_cache,a,cqe);
> +-CIRCLEQ_INSERT_TAIL(_okayed_cache,a,cqe);
> ++TAILQ_REMOVE(_okayed_cache,a,cqe);
> ++TAILQ_INSERT_TAIL(_okayed_cache,a,cqe);
> + }
> + }
> + 
> +@@ -592,11 +592,11 @@ static struct auth_attempt *authd_userokay_cache(struc
> + now = time(NULL);
> + 
> + if (okay) {
> +-if ((a = CIRCLEQ_FIRST(_okayed_cache)) != 
> CIRCLEQ_END(_okayed_cache)
> ++if ((a = TAILQ_FIRST(_okayed_cache)) != 
> TAILQ_END(_okayed_cache)

The _END macros are also deprecated.  I doubt that it would be a wise
move to delete them in base... (useless churn is useless)

Anyway, you can just replace TAILQ_END(...) with NULL here.

> + &&  (now - a->timestamp > cache_ttl || auth_okayed_num >= 
> cache_size)) {
> + 
> assert(SPLAY_REMOVE(mod_auth_bsd_okay,_okayed_lookup,a));
> + 
> +-CIRCLEQ_REMOVE(_okayed_cache,a,cqe);
> ++TAILQ_REMOVE(_okayed_cache,a,cqe);
> + auth_okayed_num--;
> + } else if (!(a = malloc(sizeof *a)))
> + return NULL;
> +@@ -609,7 +609,7 @@ static struct auth_attempt *authd_userokay_cache(struc
> + if ((e = 
> SPLAY_INSERT(mod_auth_bsd_okay,_okayed_lookup,a))) {
> + e->timestamp= now;
> + 
> +-CIRCLEQ_REMOVE(_okayed_cache,e,cqe);
> ++TAILQ_REMOVE(_okayed_cache,e,cqe);
> + auth_okayed_num--;
> + 
> + free(a);
> +@@ -617,23 +617,23 @@ static struct auth_attempt *authd_userokay_cache(struc
> + a   = e;
> + }
> + 
> +-CIRCLEQ_INSERT_TAIL(_okayed_cache,a,cqe);
> ++TAILQ_INSERT_TAIL(_okayed_cache,a,cqe);
> + auth_okayed_num++;
> + } else {
> + authd_hash_fail(k.key,pkt);
> + 
> + if ((a = SPLAY_FIND(mod_auth_bsd_fail,_failed_lookup,))) 
> {
> +-CIRCLEQ_REMOVE(_failed_cache,a,cqe);
> ++TAILQ_REMOVE(_failed_cache,a,cqe);
> + auth_failed_num--;
> + 
> + if (now - a->timestamp > cache_ttl)
> + a->result.failed.count  = 0;
> + } else {
> +-if ((a = CIRCLEQ_FIRST(_failed_cache)) != 
> CIRCLEQ_END(_failed_cache)
> ++if ((a = TAILQ_FIRST(_failed_cache)) != 
> TAILQ_END(_failed_cache)
> + &&  (now - a->timestamp > cache_ttl || auth_failed_num 
> >= cache_size)) {
> + 
> assert(SPLAY_REMOVE(mod_auth_bsd_fail,_failed_lookup,a));
> + 
> +-

Re: remove education/edict ?

[Jérémie Courrèges-Anglas]

Daniel Jakots  writes:

> Hi,
>
> I saw on portroach that education/edict was lagging. On their website
> [1] there's a message "NOTE: As of Mon, Aug 23, 2010, edictionary is
> broken. I'm actively working to fix it. Please check back in a few
> days."
>
> I tried the current version in the port (edict-2.2p0):
> $ edict dictionary
> edict - Your personal command line dictionary. Version 2.2.
> Looking up "dictionary" in Merriam Webster Online Dictionary...
> Don't understand Swahili words like dictionary ;)!!
>
> which message, according to the documentation [2] is when "you supply
> an invalid word to edictionary"
>
> So I guess it just doesn't work.
>
> I tried to update to latest version 2.6 (patch after) it's a not much
> better: in the result there are error messages like:
> Use of uninitialized value in numeric ge (>=) at /usr/local/bin/edict line 
> 528,  line 1.
> Use of uninitialized value $nsuggestions in concatenation (.) or string at 
> /usr/local/bin/edict line 575,  line 1.
>
> So I doubt there are any users.

Indeed.  I've just removed it.

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

Re: NEW: devel/autoconf-archive

[Jérémie Courrèges-Anglas]

"Anthony J. Bentley"  writes:

> Hi Nigel,

Hi folks,

> You've convinced me that this probably shouldn't go into the tree.
>
> Nigel Taylor writes:
>> If you look in git repositories like github, the tar ball created
>> automatically is not the same as the tar ball distributed, they have
>> some process for creating the distribution tar ball and including just
>> those autoconf archive macros required, so doing a git clone of github
>> project, and building within the clone you might need the autoconf
>> archive, this is not about building ports.
>
> Unfortunately, this is a common problem on Github: they tend *not* to
> provide dist tarballs, and they don't keep generated configure scripts
> in Git. So you have no choice but to fetch the autogenerated "tarballs"
> of the source using GH_*, and run autoconf yourself. Yet another example
> of bad upstream behavior that we have to push against to keep our
> sanity...

This doesn't prevent the inclusion of such a port.  Having this archive
at hand could be useful for reference, instead of having to browse the
website.  Hence why I proposed to install the macros in a directory not
searched by default by autotools.

I'll admit that this usefulness is limited; your call. :)
-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

wget-1.17

[Jérémie Courrèges-Anglas]

Hi,

a lightly tested update to latest wget.

Upstream announce (with NEWS entry):

  https://lists.gnu.org/archive/html/bug-wget/2015-11/msg00016.html

Index: Makefile
===
RCS file: /cvs/ports/net/wget/Makefile,v
retrieving revision 1.69
diff -u -p -r1.69 Makefile
--- Makefile9 Apr 2015 11:32:04 -   1.69
+++ Makefile16 Nov 2015 19:40:16 -
@@ -2,8 +2,7 @@
 
 COMMENT =  retrieve files from the web via HTTP, HTTPS and FTP
 
-DISTNAME = wget-1.16.3
-REVISION = 0
+DISTNAME = wget-1.17
 CATEGORIES =   net
 
 HOMEPAGE = https://www.gnu.org/software/wget/
Index: distinfo
===
RCS file: /cvs/ports/net/wget/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo19 Mar 2015 20:53:43 -  1.16
+++ distinfo16 Nov 2015 19:40:43 -
@@ -1,2 +1,2 @@
-SHA256 (wget-1.16.3.tar.xz) = Z/e3sPXBTbYz47GPUxcnhsAB4VPVRc/IXYJ1nFwv+zc=
-SIZE (wget-1.16.3.tar.xz) = 1794148
+SHA256 (wget-1.17.tar.xz) = vWnWOsvzKagobM675jzU/syZhxgTGg1LKrkjlULSu4c=
+SIZE (wget-1.17.tar.xz) = 1884628
Index: patches/patch-doc_wget_texi
===
RCS file: /cvs/ports/net/wget/patches/patch-doc_wget_texi,v
retrieving revision 1.9
diff -u -p -r1.9 patch-doc_wget_texi
--- patches/patch-doc_wget_texi 19 Mar 2015 20:53:43 -  1.9
+++ patches/patch-doc_wget_texi 16 Nov 2015 22:48:24 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-doc_wget_texi,v 1.9 2015/03/19 20:53:43 dcoppa Exp $
 doc/wget.texi.orig Fri Jan 30 17:25:57 2015
-+++ doc/wget.texi  Thu Mar 19 10:52:38 2015
-@@ -190,14 +190,14 @@ gauge can be customized to your preferences.
+--- doc/wget.texi.orig Mon Nov  9 16:24:17 2015
 doc/wget.texi  Mon Nov 16 23:48:24 2015
+@@ -191,14 +191,14 @@ gauge can be customized to your preferences.
  Most of the features are fully configurable, either through command line
  options, or via the initialization file @file{.wgetrc} (@pxref{Startup
  File}).  Wget allows you to define @dfn{global} startup files
@@ -18,7 +18,7 @@ $OpenBSD: patch-doc_wget_texi,v 1.9 2015
  Default location of the @dfn{global} startup file.
  
  @item .wgetrc
-@@ -2872,9 +2872,8 @@ commands.
+@@ -3030,9 +3030,8 @@ commands.
  @cindex location of wgetrc
  
  When initializing, Wget will look for a @dfn{global} startup file,
@@ -30,7 +30,7 @@ $OpenBSD: patch-doc_wget_texi,v 1.9 2015
  
  Then it will look for the user's file.  If the environmental variable
  @code{WGETRC} is set, Wget will try to load that file.  Failing that, no
-@@ -2884,7 +2883,7 @@ If @code{WGETRC} is not set, Wget will try to load @fi
+@@ -3042,7 +3041,7 @@ If @code{WGETRC} is not set, Wget will try to load @fi
  
  The fact that user's settings are loaded after the system-wide ones
  means that in case of collision user's wgetrc @emph{overrides} the


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

Re: Bison 3, again

[Jérémie Courrèges-Anglas]

Committed, thank you all who helped to unblock this situation.

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

Re: NEW: devel/autoconf-archive

[Jérémie Courrèges-Anglas]

"Anthony J. Bentley"  writes:

> Hi,

Hi,

> The GNU Autoconf Archive is a collection of more than 500 macros for GNU
> Autoconf that have been contributed as free software by friendly supporters
> of the cause from all over the Internet.
>
> I've encountered software in the wild (not yet in ports) that uses some
> of the C++11 macros.
>
> ok?

If we install those macros in share/aclocal, then they will be available
directly via autoreconf and friends, right?  I'm not sure whether it is
desirable, it's a lot of code and autotools are already ugly enough...
Do you know of other OSes which packages those macros in a directly
reachable directory?  What about installing them in another dir?

Maybe I'm being paranoid here, *shrug*.
-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Re: Bison 3, again

[Jérémie Courrèges-Anglas]

I'll commit this tomorrow unless I hear objections.

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

Re: Bison 3, again

[Jérémie Courrèges-Anglas]

Nigel Taylor  writes:

[...]

> Haven't looked at the most recent diff for the Makefile, so might have
> changed.
>
> Not easy to switch to m4 as implied. More is required than the
> CONFIGURE_ENV change. ac_cv_prog_gnu_m4_gnu gets forced to yes/no "-g"
> setting is ignored, as M4_GNU = "" or "--gnu" in configure, so I patched
> configure, also possible as an alternative to bring back/update the
> output.c patch. Patching configure causes gnu m4 problems, when tests
> fail, as the changed configure causes some regeneration, and wants
> autoconf or more (I just move the configure patch out the way).

Ah ha, indeed.  Since that makes the CONFIGURE_ENV parts irrelevant,
I'll drop them.

It might be a detail given the amount of work you mention below, but
maybe /usr/bin/m4 should lie better, and support long options --help
and --gnu?

> Did ask about fixing m4 long ago, no reply = nothing was done my me. Now
> stated have a look.

Nice to hear that, I wasn't aware.  Awesome. :)

> m4 - Think I'm down to about the last problem with m4.
>
> $ diff -u bison-3.0.4{.gm4,}/bison-3.0.4/examples/calc++/calc++-parser.cc
> --- bison-3.0.4.gm4/bison-3.0.4/examples/calc++/calc++-parser.cc Thu Nov
> 12 01:25:32 2015
> +++ bison-3.0.4/bison-3.0.4/examples/calc++/calc++-parser.cc Sat Nov 14
> 13:09:05 2015
> @@ -1010,7 +1010,7 @@
> // The symbols being reduced.
> for (int yyi = 0; yyi < yynrhs; yyi++)
> YY_SYMBOL_PRINT (" $" << yyi + 1 << " =",
> - yystack_[(yynrhs) - (yyi + 1)]);
> + yystack_[..]);
> }
> #endif // YYDEBUG
>
>
> This gets over that last problem with the first example, which compiles.
> But hit the same sort of issue on the second example, but not so easy to
> get around, looks like I need to fix properly.
>
> $ cat patches/patch-data_lalr1_cc
> $OpenBSD$
> --- data/lalr1.cc.orig  Fri Jan 23 06:52:50 2015
> +++ data/lalr1.cc   Sat Nov 14 22:44:24 2015
> @@ -1159,7 +1159,7 @@ b4_error_verbose_if([state_type yystate, const symbol_
>  // The symbols being reduced.
>  for (int yyi = 0; yyi < yynrhs; yyi++)
>YY_SYMBOL_PRINT ("   $" << yyi + 1 << " =",
> -   ]b4_rhs_data(yynrhs, yyi + 1)[);
> +   yystack_[(yynrhs) - (yyi + 1)]);
>}
>  #endif // ]b4_api_PREFIX[DEBUG
>
>
>
> The patch you want is this, for c++.m4, it works for both m4 and gnu
> m4 others don't.
>
> $ cat patches/patch-data_c++_m4
> $OpenBSD$
> --- data/c++.m4.orig Fri Jan 16 14:47:42 2015
> +++ data/c++.m4 Thu Nov 12 01:20:00 2015
> @@ -100,9 +100,9 @@ m4_define([b4_namespace_open],
> m4_define([b4_namespace_close],
> [b4_user_code([b4_percent_define_get_syncline([[api.namespace]])
> m4_bpatsubst(m4_dquote(m4_bpatsubst(m4_dquote(b4_namespace_ref[ ]),
> - [^\(.\)[ ]*\(::\)?\([^][:]\|:[^:]\)*],
> + [^\(.\)[ ]*\(::\)?\([   -9;-Z^-~]\|:[^:]\)*],
> [\1])),
> - [::\([^][:]\|:[^:]\)*], [} ])[} // ]b4_namespace_ref])])
> + [::\([  -9;-Z\^-~]\|:[^:]\)*], [} ])[} // ]b4_namespace_ref])])
>
>
> It's tab-9 not space-9 in the above Could scan the RE string, and
> convert [^[]:] into this.
>
>
> Next problem is m4 only supports a single digit macro arguments,
> I updated m4's eval.c to support multiple digits
>
> Bison tests with m4 go wrong on expanding this
>
> m4_pushdef(_m4_f,
> $1[$4]$2[]$1[$5]$2[]$1[$6]$2[]$1[$7]$2[]$1[$8]$2[]$1[$9]$2[]$1[$10]$2[]$1[$11]$2[]_m4_popdef([_m4_f]))
>
> where the number of arguments depends on the number of tokens defined.
> Instead of $10 you get $1 followed by 0 with m4 or m4 -g.
>
>
> m4_f comes from autoconf lib/m4sugar/foreach.m4, in versions 2.63b -
> 2.64 of autoconf and later. Just a rare case that m_f is used with more
> than 9 arguments. foreach.m4 from autoconf is duplicated in a few/lot of
> ports for building. Could be possible to change bison.m4 etc to avoid
> using m_f, other ports / autoconf could break at some point if using
> m_f, some may have switched to gnu m4.
>
>
>
>
> The next issue is with comments // appear on the line above,
> data/c-like.m4, RE patten matching, looks for non-empty lines to insert
> // in front, may have been simpler to put /* */ around the multi-line
> comments
>
> patsubst( , [
> \(.\), [
> // \1])
>
> But . also matches new line as next character, can replace with
>
> patsubst( , [
> \([^
> ]\), [
> // \1])
>
> and works, gnum4.c, putsubst has REG_NEWLINE added if not mimic_gnu,
> adding REG_NEWLINE for all cases fixes, but breaks something else.
> Needed an extra check, if the patten contains newline, need to switch to
> REG_NEWLINE if gnu_mimic, also patsubst and regexp not setting flags the
> same way could give different results for the same RE. (May need a
> closer look). gnum4.c fixed for this flag adjustment moved into the
> twiddle routine used by both patsubst and regexp when mimicking gnu m4.
>
>
>
> Still have these additional changes from previous fix in 2011
>
> http://marc.info/?l=openbsd-ports=130023382518651=2
>
> $ cvs -R -q up -Pd 

Re: p7zip: add support for more archs

[Jérémie Courrèges-Anglas]

Christian Weisgerber <na...@mips.inka.de> writes:

> On 2015-11-11, Jérémie Courrèges-Anglas <j...@wxcvbn.org> wrote:
>
>> Right now p7zip fails to build on several archs, because of the rather
>> lame approach to endianness taken by this port.  This patch should allow
>> to build p7zip on all archs supported by OpenBSD.
>
> Have you considered getting the information from endian.h?

Yup.  But that's something that I will propose upstream, not in the
ports tree.

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

Re: more deps for letsencrypt

[Jérémie Courrèges-Anglas]

Stuart Henderson  writes:

> Here are 3 more of the deps needed for letsencrypt, attached tgz
> unpacks in dump^H^H^H^Hdevel/.
>
> py-configargparse - argparse replacement, allows options to be set via 
> files/env
> py-parsedatetime - parse human-readable date/time text
> py-python2-pythondialog - Python interface to the UNIX dialog utility
>
> OK to import?

yup.

> It will also need some more py-zope* ports which I have but need
> cleaning up and need updating the existing ones in devel/, and
> py-psutil *waves at landry :)*.
>
> Why did they need to pull in so many crazy deps?!

'cause they can!

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

Re: p7zip: add support for more archs

[Jérémie Courrèges-Anglas]

Stuart Henderson  writes:

> On 2015/11/11 22:19, Josh Grosse wrote:
>> On Wed, Nov 11, 2015 at 09:45:22PM -0500, Josh Grosse wrote:
>> > Fixing the code may be the correct solution, but it is beyond me, as 
>> > I don't have the technical skills to deal with the portability issues 
>> > that were raised and to my understanding still exist.
>> 
>> I've had an out-of-band discussion with Theo.  Fixing the code is the
>> correct solution.  So I will invest the effort to obtain the skills 
>> and knowledge needed to fix the code.
>
> It seems that upstream would like to be portable - it's in the project
> name, and their list of unofficial packages includes Amiga and BeOS -
> it might well need little more work than reporting it upstream.
>
> And indeed they may have even already fixed it in the time since it
> was previously tested.
>
> Is there anyone with an alpha that can try regress tests with jca's
> diff and send a backtrace if it still segfaults?

Three successful regress tests runs on sparc64.  I doubt that we'll get
many alpha test reports, these days.

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

Re: Bison 3, again

[Jérémie Courrèges-Anglas]

j...@wxcvbn.org (Jérémie Courrèges-Anglas) writes:

> Nigel Taylor <njtaylor0...@btinternet.com> writes:
>
>> On 11/10/15 13:00, Jérémie Courrèges-Anglas wrote:
>>> 
>>> Hi,
>>> 
>>> it's been a few years that our bison port hasn't been updated, the main
>>> reason being that our m4 doesn't groke some of the constructs used by
>>> newer bison releases.  More and more packages out there require a recent
>>> bison version.  As an OpenBSD developer, I don't think that building
>>> parsers using a recent bison on another OS is a valid answer to that
>>> problem.
>>> 
>>> Yet, nobody found the time and motivation to implement the features /
>>> fix the bugs in m4.
>>> 
>>> Here's my proposal: update bison to the latest version and make it use
>>> devel/m4 (GNU m4).  *Then* *if* someone wants to make the efforts
>>> required for bison to use base m4, that would be awesome.
>>> 
>>> Sorry if this sounds blunt, but this is the only way forward I can see.
>>> 
>>> I'll be available later today to discuss this further if needed.
>>> 
>>> Diff below,
>>> 
>>
>> Failed to build for me...
>>
>> devel/help2man needs adding to BDEP.
>
> Thanks for spotting this!  Here's an updated patch, fixing the BDEP and
> incorporating sthen's comment for the CONFIGURE_ENV tweak.
>
> I got only positive feedback so far, I'm now asking for oks. ;)

I forgot to mention a "small" detail: the ports that needed a fix were
discovered by a bulk build, the diff below went into a second bulk with
no breakage.  Thanks Antoine for those bulks. :)

> Index: devel/bison/Makefile
> ===
> RCS file: /cvs/ports/devel/bison/Makefile,v
> retrieving revision 1.51
> diff -u -p -r1.51 Makefile
> --- devel/bison/Makefile  19 May 2015 09:54:53 -  1.51
> +++ devel/bison/Makefile  11 Nov 2015 17:41:46 -
> @@ -2,8 +2,7 @@
>  
>  COMMENT= GNU parser generator
>  
> -DISTNAME=bison-2.3
> -REVISION=2
> +DISTNAME=bison-3.0.4
>  CATEGORIES=  devel
>  MASTER_SITES=${MASTER_SITE_GNU:=bison/}
>  
> @@ -14,10 +13,17 @@ PERMIT_PACKAGE_CDROM= Yes
>  
>  WANTLIB= c
>  MODULES= devel/gettext
> -BUILD_DEPENDS=   devel/m4
> +BUILD_DEPENDS=   devel/help2man \
> + devel/m4
> +RUN_DEPENDS= devel/m4
>  
>  CONFIGURE_STYLE=gnu
>  CONFIGURE_ARGS=  --disable-yacc
> +# Set bison to use "m4 -g" instead of "m4 --gnu" to permit use with m4
> +# from the base OS by setting M4=/usr/bin/m4 in the environment. This is
> +# for development purposes; bison currently uses GNU regular expressions
> +# which are not compatible with base m4.
> +CONFIGURE_ENV+=  ac_cv_prog_gnu_m4_gnu="-g"
>  MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/build-aux
>  
>  .include 
> Index: devel/bison/distinfo
> ===
> RCS file: /cvs/ports/devel/bison/distinfo,v
> retrieving revision 1.9
> diff -u -p -r1.9 distinfo
> --- devel/bison/distinfo  18 Jan 2015 03:13:08 -  1.9
> +++ devel/bison/distinfo  11 Nov 2015 17:41:46 -
> @@ -1,2 +1,2 @@
> -SHA256 (bison-2.3.tar.gz) = UveKpHYadM63/fdw81VN2EMIw7k8QlXjpcF1WOzaKT4=
> -SIZE (bison-2.3.tar.gz) = 1386694
> +SHA256 (bison-3.0.4.tar.gz) = tn/S2q56ZLW6hixmwHwa3bnmsbBcXyBJOSz9iiFylS4=
> +SIZE (bison-3.0.4.tar.gz) = 3354179
> Index: devel/bison/patches/patch-configure
> ===
> RCS file: devel/bison/patches/patch-configure
> diff -N devel/bison/patches/patch-configure
> --- devel/bison/patches/patch-configure   8 Jul 2008 00:24:17 -   
> 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,16 +0,0 @@
> -$OpenBSD: patch-configure,v 1.3 2008/07/08 00:24:17 brad Exp $
>  configure.orig   Mon Jun  5 03:32:01 2006
> -+++ configureSun Jun 29 22:09:16 2008
> -@@ -16768,10 +16768,10 @@ s,@host_cpu@,$host_cpu,;t t
> - s,@host_vendor@,$host_vendor,;t t
> - s,@host_os@,$host_os,;t t
> - s,@INTL_MACOSX_LIBS@,$INTL_MACOSX_LIBS,;t t
> --s,@LIBICONV@,$LIBICONV,;t t
> -+s,@LIBICONV@,$LTLIBICONV,;t t
> - s,@LTLIBICONV@,$LTLIBICONV,;t t
> - s,@INTLLIBS@,$INTLLIBS,;t t
> --s,@LIBINTL@,$LIBINTL,;t t
> -+s,@LIBINTL@,$LTLIBINTL,;t t
> - s,@LTLIBINTL@,$LTLIBINTL,;t t
> - s,@POSUB@,$POSUB,;t t
> - s,@UNISTD_H@,$UNISTD_H,;t t
> Index: devel/bison/patches/patch-data_m4sugar_m4sugar_m4
> ===
> RCS file: /cvs/port

Re: NEW: net/freeradius3

[Jérémie Courrèges-Anglas]

Stuart Henderson <st...@openbsd.org> writes:

> On 2015/11/12 02:17, Jérémie Courrèges-Anglas wrote:
>> Stuart Henderson <st...@openbsd.org> writes:
>> 
>> > Here (after rather a lot of pain) is a port for FreeRADIUS 3.0.10.
>> > The config isn't directly compatible with 2.x (at least the files have
>> > moved around), and in addition future 3.x versions are going to require
>> > c++11 features *INCLUDING TLS* so I'd like to import it in parallel to
>> > the existing version as net/freeradius3, keeping 2.x around for those
>> > who want to continue using it, and in case there are arch issues.
>> >
>> > Are others alright with this approach? Any comments or OKs to import?
>> > Thanks!
>> 
>> I'm fine with this approach.  The port looks fine, except for two minor
>> nits:
>> - patch-doc_README hardcodes /usr/local
>
> It's subst'ed in post-configure - I hate it when I do 'make; make
> update-patches' and it changes the ${TRUEPREFIX} back to /usr/local,
> and given the PLISTs there is already enough work to do when updating
> this beast ;)

Oops, indeed. :-]

> (As req'd by gsoares I have changed this from perl to sed -i).
>
>> - patch-src_main_detail_c should use %lld, not %llu
>
> Fixed, thanks.
>
>> Wouldn't a FR2/FR3 conflict marker be needed?
>
> Correct - there are markers in this port already, diff for FR2 below.

ok jca@ for the import and the diff below.

> Index: Makefile
> ===
> RCS file: /cvs/ports/net/freeradius/Makefile,v
> retrieving revision 1.65
> diff -u -p -r1.65 Makefile
> --- Makefile  7 Nov 2015 14:51:08 -   1.65
> +++ Makefile  12 Nov 2015 09:55:23 -
> @@ -11,8 +11,7 @@ COMMENT-pgsql=  freeradius pgsql rlm addo
>  COMMENT-ldap=freeradius ldap rlm addon
>  
>  V=   2.2.9
> -REVISION-main=   1
> -REVISION-mysql=  0
> +REVISION=2
>  DISTNAME=freeradius-server-$V
>  EXTRACT_SUFX=.tar.bz2
>  
> Index: pkg/PLIST-iodbc
> ===
> RCS file: /cvs/ports/net/freeradius/pkg/PLIST-iodbc,v
> retrieving revision 1.4
> diff -u -p -r1.4 PLIST-iodbc
> --- pkg/PLIST-iodbc   17 Jul 2014 00:20:51 -  1.4
> +++ pkg/PLIST-iodbc   12 Nov 2015 09:55:23 -
> @@ -1,4 +1,5 @@
>  @comment $OpenBSD: PLIST-iodbc,v 1.4 2014/07/17 00:20:51 sthen Exp $
> +@conflict freeradius-iodbc-*
>  lib/freeradius/rlm_sql_iodbc.so
>  share/doc/freeradius/mssql
>  share/examples/freeradius/sql/mssql/
> Index: pkg/PLIST-ldap
> ===
> RCS file: /cvs/ports/net/freeradius/pkg/PLIST-ldap,v
> retrieving revision 1.5
> diff -u -p -r1.5 PLIST-ldap
> --- pkg/PLIST-ldap17 Jul 2014 00:20:51 -  1.5
> +++ pkg/PLIST-ldap12 Nov 2015 09:55:23 -
> @@ -1,4 +1,5 @@
>  @comment $OpenBSD: PLIST-ldap,v 1.5 2014/07/17 00:20:51 sthen Exp $
> +@conflict freeradius-ldap-*
>  @conflict freeradius-server-<2.1.8
>  lib/freeradius/rlm_ldap.so
>  share/doc/freeradius/examples/iplanet.ldif
> Index: pkg/PLIST-main
> ===
> RCS file: /cvs/ports/net/freeradius/pkg/PLIST-main,v
> retrieving revision 1.30
> diff -u -p -r1.30 PLIST-main
> --- pkg/PLIST-main7 Nov 2015 14:51:08 -   1.30
> +++ pkg/PLIST-main12 Nov 2015 09:55:23 -
> @@ -1,4 +1,5 @@
>  @comment $OpenBSD: PLIST-main,v 1.30 2015/11/07 14:51:08 sthen Exp $
> +@conflict freeradius-*
>  @conflict radiusd-cistron-*
>  @conflict radiusd-lucent-*
>  @pkgpath net/freeradius
> Index: pkg/PLIST-mysql
> ===
> RCS file: /cvs/ports/net/freeradius/pkg/PLIST-mysql,v
> retrieving revision 1.8
> diff -u -p -r1.8 PLIST-mysql
> --- pkg/PLIST-mysql   8 Nov 2015 11:04:48 -   1.8
> +++ pkg/PLIST-mysql   12 Nov 2015 09:55:23 -
> @@ -1,4 +1,5 @@
>  @comment $OpenBSD: PLIST-mysql,v 1.8 2015/11/08 11:04:48 sthen Exp $
> +@conflict freeradius-mysql-*
>  @conflict freeradius-server-<2.2.9p1
>  lib/freeradius/rlm_sql_mysql.so
>  @mode 640
> Index: pkg/PLIST-pgsql
> ===
> RCS file: /cvs/ports/net/freeradius/pkg/PLIST-pgsql,v
> retrieving revision 1.5
> diff -u -p -r1.5 PLIST-pgsql
> --- pkg/PLIST-pgsql   17 Jul 2014 00:20:51 -  1.5
> +++ pkg/PLIST-pgsql   12 Nov 2015 09:55:23 -
> @@ -1,4 +1,5 @@
>  @comment $OpenBSD: PLIST-pgsql,v 1.5 2014/07/17 00:20:51 sthen Exp $
> +@conflict freeradius-pgsql-*
>  @conflict freeradius-<2.1.8
>  lib/freeradius/rlm_sql_postgresql.so
>  share/doc/freeradius/examples/postgresql_update_radacct_group_trigger.sql


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

Re: Bison 3, again

[Jérémie Courrèges-Anglas]

Nigel Taylor <njtaylor0...@btinternet.com> writes:

> On 11/10/15 13:00, Jérémie Courrèges-Anglas wrote:
>> 
>> Hi,
>> 
>> it's been a few years that our bison port hasn't been updated, the main
>> reason being that our m4 doesn't groke some of the constructs used by
>> newer bison releases.  More and more packages out there require a recent
>> bison version.  As an OpenBSD developer, I don't think that building
>> parsers using a recent bison on another OS is a valid answer to that
>> problem.
>> 
>> Yet, nobody found the time and motivation to implement the features /
>> fix the bugs in m4.
>> 
>> Here's my proposal: update bison to the latest version and make it use
>> devel/m4 (GNU m4).  *Then* *if* someone wants to make the efforts
>> required for bison to use base m4, that would be awesome.
>> 
>> Sorry if this sounds blunt, but this is the only way forward I can see.
>> 
>> I'll be available later today to discuss this further if needed.
>> 
>> Diff below,
>> 
>
> Failed to build for me...
>
> devel/help2man needs adding to BDEP.

Thanks for spotting this!  Here's an updated patch, fixing the BDEP and
incorporating sthen's comment for the CONFIGURE_ENV tweak.

I got only positive feedback so far, I'm now asking for oks. ;)

Index: devel/bison/Makefile
===
RCS file: /cvs/ports/devel/bison/Makefile,v
retrieving revision 1.51
diff -u -p -r1.51 Makefile
--- devel/bison/Makefile19 May 2015 09:54:53 -  1.51
+++ devel/bison/Makefile11 Nov 2015 17:41:46 -
@@ -2,8 +2,7 @@
 
 COMMENT=   GNU parser generator
 
-DISTNAME=  bison-2.3
-REVISION=  2
+DISTNAME=  bison-3.0.4
 CATEGORIES=devel
 MASTER_SITES=  ${MASTER_SITE_GNU:=bison/}
 
@@ -14,10 +13,17 @@ PERMIT_PACKAGE_CDROM=   Yes
 
 WANTLIB=   c
 MODULES=   devel/gettext
-BUILD_DEPENDS= devel/m4
+BUILD_DEPENDS= devel/help2man \
+   devel/m4
+RUN_DEPENDS=   devel/m4
 
 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS=--disable-yacc
+# Set bison to use "m4 -g" instead of "m4 --gnu" to permit use with m4
+# from the base OS by setting M4=/usr/bin/m4 in the environment. This is
+# for development purposes; bison currently uses GNU regular expressions
+# which are not compatible with base m4.
+CONFIGURE_ENV+=ac_cv_prog_gnu_m4_gnu="-g"
 MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/build-aux
 
 .include 
Index: devel/bison/distinfo
===
RCS file: /cvs/ports/devel/bison/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- devel/bison/distinfo18 Jan 2015 03:13:08 -  1.9
+++ devel/bison/distinfo11 Nov 2015 17:41:46 -
@@ -1,2 +1,2 @@
-SHA256 (bison-2.3.tar.gz) = UveKpHYadM63/fdw81VN2EMIw7k8QlXjpcF1WOzaKT4=
-SIZE (bison-2.3.tar.gz) = 1386694
+SHA256 (bison-3.0.4.tar.gz) = tn/S2q56ZLW6hixmwHwa3bnmsbBcXyBJOSz9iiFylS4=
+SIZE (bison-3.0.4.tar.gz) = 3354179
Index: devel/bison/patches/patch-configure
===
RCS file: devel/bison/patches/patch-configure
diff -N devel/bison/patches/patch-configure
--- devel/bison/patches/patch-configure 8 Jul 2008 00:24:17 -   1.3
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-configure,v 1.3 2008/07/08 00:24:17 brad Exp $
 configure.orig Mon Jun  5 03:32:01 2006
-+++ configure  Sun Jun 29 22:09:16 2008
-@@ -16768,10 +16768,10 @@ s,@host_cpu@,$host_cpu,;t t
- s,@host_vendor@,$host_vendor,;t t
- s,@host_os@,$host_os,;t t
- s,@INTL_MACOSX_LIBS@,$INTL_MACOSX_LIBS,;t t
--s,@LIBICONV@,$LIBICONV,;t t
-+s,@LIBICONV@,$LTLIBICONV,;t t
- s,@LTLIBICONV@,$LTLIBICONV,;t t
- s,@INTLLIBS@,$INTLLIBS,;t t
--s,@LIBINTL@,$LIBINTL,;t t
-+s,@LIBINTL@,$LTLIBINTL,;t t
- s,@LTLIBINTL@,$LTLIBINTL,;t t
- s,@POSUB@,$POSUB,;t t
- s,@UNISTD_H@,$UNISTD_H,;t t
Index: devel/bison/patches/patch-data_m4sugar_m4sugar_m4
===
RCS file: /cvs/ports/devel/bison/patches/patch-data_m4sugar_m4sugar_m4,v
retrieving revision 1.2
diff -u -p -r1.2 patch-data_m4sugar_m4sugar_m4
--- devel/bison/patches/patch-data_m4sugar_m4sugar_m4   8 Jul 2008 00:24:17 
-   1.2
+++ devel/bison/patches/patch-data_m4sugar_m4sugar_m4   11 Nov 2015 17:41:46 
-
@@ -1,7 +1,7 @@
 $OpenBSD: patch-data_m4sugar_m4sugar_m4,v 1.2 2008/07/08 00:24:17 brad Exp $
 data/m4sugar/m4sugar.m4.orig   Mon Nov 14 03:13:07 2005
-+++ data/m4sugar/m4sugar.m4Sun Jun 29 22:09:16 2008
-@@ -55,13 +55,6 @@ divert(-1)#   
+--- data/m4sugar/m4sugar.m4.orig   Fri Aug  2 17:03:17 2013
 data/m4sugar/m4sugar.m4Fri Nov  6 20:39:48 2015
+@@ -31,13 +31,6 @@ divert(-1)#

Re: p7zip: add support for more archs

[Jérémie Courrèges-Anglas]

Josh Grosse  writes:

> On Thu, Nov 12, 2015 at 12:34:03AM +0100, J??r??mie Courr??ges-Anglas wrote:
>> 
>> Right now p7zip fails to build on several archs, because of the rather
>> lame approach to endianness taken by this port.  This patch should allow
>> to build p7zip on all archs supported by OpenBSD.
>> 
>> ok?
>
> jca@,
>
> I'm fine with the changes, once  the architectures can all be 
> tested.  Back in the spring of 2007, this was tested on many
> archs. And naddy@ had reported a failure on Alpha, which is included
> in the patch to C/CpuArch.h. 

IIUC this was a runtime failure, not a build failure.  Right now
p7zip doesn't *build* on those archs.

> I'm just a maintainer.  So I've added naddy in copy, as I'd like
> someone with *prior* anxiety about the quality of the application
> for portability to weigh in on this recommended revision.
>
> I'm fine with it, if it can be tested on these architectures. And I'm not
> sure a vax/simh test would pass naddy's sniff test. I've heard it time
> and again that real hardware may behave differently than an emulator.
>
> If this *can* run on vax, then the SHARED_ONLY can be dropped from the 
> Makefile, too.  

I didn't notice the SHARED_ONLY marker, but I'm tempted to keep the vax
addition in this patch.  It doesn't add maintenance burden, and perhaps
one day vax will have shared libs, and unicorns will fly.

Back to your concern: I don't think it's a reasonable approach to ask
for tests on all architectures before introducing a change in a port.
If we did that, the ports tree would be ridiculously small and lagging
behind upstream.

This fixes a *build* issue.  A package broken at runtime on one arch or
two is better than no package at all on ten architectures.

http://build-failures.rhaalovely.net/alpha/2015-10-30/archivers/p7zip.log
http://build-failures.rhaalovely.net/sparc64/2015-10-30/archivers/p7zip.log
http://build-failures.rhaalovely.net/hppa/2015-10-30/archivers/p7zip.log

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

Re: [NEW] devel/libwebsockets-1.5

[Jérémie Courrèges-Anglas]

Adam Wolk <adam.w...@tintagel.pl> writes:

> On Thu, 12 Nov 2015 00:12:21 +0100
> j...@wxcvbn.org (Jérémie Courrèges-Anglas) wrote:
>
>> Adam Wolk <adam.w...@tintagel.pl> writes:
>> 
>> > Hi ports@
>> >
>> > This is my first shared lib port so go nuts and have fun ;)
>> >
>> > Known issues/questions:
>> >  1. Had to patch out set(SOVERSION "5") as it overwrote what the
>> > port set in SHARED_LIBS.  
>> 
>> Actually the cmake port has support for automatically set the proper
>> version.  But you have to name stuff appropriately, see below.
>> 
>
> Nice, didn't know about that :)
>
>> >  2. The port is able to build a static library but I only need the
>> >  shared one so didn't bother delivering that one. If there's
>> > interest I might look into it.  
>> 
>> If there's no good reason to disable it, ship it.
>> 
>
> There was no reason in disabling the static lib except the fact that I
> don't intend to link against it.
>
>> >  3. I am not building sample server & client applications along the
>> >  port.  
>> 
>> Does that mean that they are useless?  Could they be used as
>> testcases? Right now this port ought to set NO_TEST=Yes
>> 
> They are sample client & servers using the library. They don't really
> match a 'test case' and are more like 'examples'. Don't think anyone
> would like them installed by default.
>
>> >  4. I am not installing upstream supplied CMake
>> > FindLibWebSockets.cmake script (should I?).  
>> 
>> No idea.

Hint: do you know what software packages out there use libwebsockets?  If
so, would they beneficiate from FindLibWebSockets.cmake?  Do you know
whether we should watch out for those packages automatically picking up
libwebsockets?

>> >  5. I name the port devel/libwebsockets because upstream examples
>> > all include  and that's also the domain they use
>> > for the port (libwebsockets.org).
>> >
>> > $ cat
>> > pkg/DESCR Libwebsockets is a lightweight pure C library built to use
>> > minimal CPU and memory resources, and provide fast throughput in
>> > both directions.  
>> 
>> Updated tarball attached, with the following changes:
>> - ship static lib ans remove SHARED_ONLY
>> - correctly name the entry in SHARED_LIBS, removing the need
>>   for -DSOVERSION and the patch
>> - add NO_TEST=Yes
>> 
>
> I tested your attached tarball and it's much nicer than my initial
> attempt. I'm OK with that shipping as the first port.
>
>> I'd prefer to put this port in the "www" category.
>> 
>
> I'm OK with the www category, devel does feel a bit overloaded - I
> picked it due to devel/jansson library shipping in that category.

Updated tarball.



libwebsockets.tgz
Description: Binary data


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

p7zip: add support for more archs

[Jérémie Courrèges-Anglas]

Right now p7zip fails to build on several archs, because of the rather
lame approach to endianness taken by this port.  This patch should allow
to build p7zip on all archs supported by OpenBSD.

ok?

Index: Makefile
===
RCS file: /cvs/ports/archivers/p7zip/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile21 Oct 2015 10:45:08 -  1.25
+++ Makefile11 Nov 2015 23:32:22 -
@@ -6,6 +6,7 @@ COMMENT-main=   file archiver with high co
 COMMENT-rar=   rar modules for p7zip
 
 V= 15.09
+REVISION=  0
 DISTNAME=  p7zip_${V}_src_all
 PKGNAME=   p7zip-${V}
 PKGNAME-main=  p7zip-${V}
Index: patches/patch-C_CpuArch_h
===
RCS file: patches/patch-C_CpuArch_h
diff -N patches/patch-C_CpuArch_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-C_CpuArch_h   11 Nov 2015 23:32:22 -
@@ -0,0 +1,31 @@
+$OpenBSD$
+
+Add support for more OpenBSD architectures.
+
+--- C/CpuArch.h.orig   Sun Sep 27 21:31:20 2015
 C/CpuArch.hThu Nov 12 00:28:15 2015
+@@ -65,7 +65,10 @@ If MY_CPU_LE_UNALIGN is not defined, we don't know abo
+ || defined(__AARCH64EL__) \
+ || defined(__MIPSEL__) \
+ || defined(__MIPSEL) \
+-|| defined(_MIPSEL)
++|| defined(_MIPSEL) \
++|| defined(__alpha__) \
++|| defined(__sh__) \
++|| defined(__vax__)
+   #define MY_CPU_LE
+ #endif
+ 
+@@ -77,7 +80,11 @@ If MY_CPU_LE_UNALIGN is not defined, we don't know abo
+ || defined(__MIPSEB) \
+ || defined(_MIPSEB) \
+ || defined(__m68k__) \
+-|| defined(__s390x__)
++|| defined(__m88k__) \
++|| defined(__s390x__) \
++|| defined(__hppa__) \
++|| defined(__mips64__) \
++|| defined(__sparc__)
+   #define MY_CPU_BE
+ #endif
+ 


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

Re: archivers/unace

[Jérémie Courrèges-Anglas]

I just removed archivers/unace from the tree, thanks for bringing this up.

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

Re: NEW: net/freeradius3

[Jérémie Courrèges-Anglas]

Stuart Henderson  writes:

> Here (after rather a lot of pain) is a port for FreeRADIUS 3.0.10.
> The config isn't directly compatible with 2.x (at least the files have
> moved around), and in addition future 3.x versions are going to require
> c++11 features *INCLUDING TLS* so I'd like to import it in parallel to
> the existing version as net/freeradius3, keeping 2.x around for those
> who want to continue using it, and in case there are arch issues.
>
> Are others alright with this approach? Any comments or OKs to import?
> Thanks!

I'm fine with this approach.  The port looks fine, except for two minor
nits:
- patch-doc_README hardcodes /usr/local
- patch-src_main_detail_c should use %lld, not %llu

Wouldn't a FR2/FR3 conflict marker be needed?

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

Re: [NEW] devel/libwebsockets-1.5

[Jérémie Courrèges-Anglas]

Adam Wolk  writes:

> Hi ports@
>
> This is my first shared lib port so go nuts and have fun ;)
>
> Known issues/questions:
>  1. Had to patch out set(SOVERSION "5") as it overwrote what the port
>  set in SHARED_LIBS.

Actually the cmake port has support for automatically set the proper
version.  But you have to name stuff appropriately, see below.

>  2. The port is able to build a static library but I only need the
>  shared one so didn't bother delivering that one. If there's interest I
>  might look into it.

If there's no good reason to disable it, ship it.

>  3. I am not building sample server & client applications along the
>  port.

Does that mean that they are useless?  Could they be used as testcases?
Right now this port ought to set NO_TEST=Yes

>  4. I am not installing upstream supplied CMake FindLibWebSockets.cmake
>  script (should I?).

No idea.

>  5. I name the port devel/libwebsockets because upstream examples all
>  include  and that's also the domain they use for the
>  port (libwebsockets.org).
>
> $ cat
> pkg/DESCR Libwebsockets is a lightweight pure C library built to use
> minimal CPU and memory resources, and provide fast throughput in both
> directions.

Updated tarball attached, with the following changes:
- ship static lib ans remove SHARED_ONLY
- correctly name the entry in SHARED_LIBS, removing the need
  for -DSOVERSION and the patch
- add NO_TEST=Yes

I'd prefer to put this port in the "www" category.

diff -pruN libwebsockets.orig/Makefile libwebsockets/Makefile
--- libwebsockets.orig/Makefile Wed Nov 11 21:47:41 2015
+++ libwebsockets/Makefile  Thu Nov 12 00:02:06 2015
@@ -1,13 +1,11 @@
-# $OpenBSD: $
+# $OpenBSD$
 
-SHARED_ONLY =  Yes
-
 COMMENT =  lightweight C library for fast bi-directional websockets
 
 DISTNAME = libwebsockets-1.5-chrome47-firefox41
 PKGNAME =  libwebsockets-1.5
 
-SHARED_LIBS =  libwebsockets 0.0 # 5
+SHARED_LIBS =  websockets 0.0 # 5
 
 CATEGORIES =   devel
 
@@ -22,12 +20,12 @@ MASTER_SITES =  
http://git.libwebsockets.org/cgi-bin/c
 
 WANTLIB += crypto m ssl z
 
-SEPARATE_BUILD =   yes
+SEPARATE_BUILD =   Yes
 
 MODULES =  devel/cmake
 
-CONFIGURE_ARGS +=  -DLWS_WITHOUT_TESTAPPS=ON \
-   -DLWS_WITH_STATIC=OFF \
-   -DSOVERSION=${LIBlibwebsockets_VERSION}
+CONFIGURE_ARGS +=  -DLWS_WITHOUT_TESTAPPS=ON
+
+NO_TEST =  Yes
 
 .include 
diff -pruN libwebsockets.orig/patches/patch-CMakeLists_txt 
libwebsockets/patches/patch-CMakeLists_txt
--- libwebsockets.orig/patches/patch-CMakeLists_txt Wed Nov 11 21:42:23 2015
+++ libwebsockets/patches/patch-CMakeLists_txt  Thu Jan  1 01:00:00 1970
@@ -1,11 +0,0 @@
-$OpenBSD$
 CMakeLists.txt.origWed Nov 11 21:37:49 2015
-+++ CMakeLists.txt Wed Nov 11 21:38:08 2015
-@@ -13,7 +13,6 @@ set(CPACK_PACKAGE_VERSION_MINOR "5")
- set(CPACK_PACKAGE_VERSION 
"${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
- set(CPACK_PACKAGE_VENDOR "a...@warmcat.com")
- set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PACKAGE} ${PACKAGE_VERSION}")
--set(SOVERSION "5")
- set(CPACK_SOURCE_GENERATOR "TGZ")
- set(CPACK_SOURCE_PACKAGE_FILE_NAME 
"${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
- set(VERSION "${CPACK_PACKAGE_VERSION}")
diff -pruN libwebsockets.orig/pkg/PLIST libwebsockets/pkg/PLIST
--- libwebsockets.orig/pkg/PLISTWed Nov 11 16:24:33 2015
+++ libwebsockets/pkg/PLIST Wed Nov 11 23:37:30 2015
@@ -1,5 +1,6 @@
 @comment $OpenBSD$
 include/libwebsockets.h
 include/lws_config.h
-@lib lib/libwebsockets.so.${LIBlibwebsockets_VERSION}
+lib/libwebsockets.a
+@lib lib/libwebsockets.so.${LIBwebsockets_VERSION}
 lib/pkgconfig/libwebsockets.pc



libwebsockets.tgz
Description: Binary data

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

Re: Bison 3, again

[Jérémie Courrèges-Anglas]

Stuart Henderson <st...@openbsd.org> writes:

> On 2015/11/10 14:00, Jérémie Courrèges-Anglas wrote:
>> --  char const *m4 = (p = getenv ("M4")) ? p : M4;
>> -+  char const *m4 = (p = getenv ("M4")) ? p : "/usr/bin/m4";
>
> Note to reviewers: upstream supports this themselves now, this diff
> doesn't lose the ability to point M4 at /usr/bin/m4 for testing.

Yup.  The comment I added in the port Makefile isn't very clear about
it.  Maybe the following one would be more helpful?

# m4 from base groks -g, not --gnu.  To use m4 from base instead of
# GNU m4, set M4=/usr/bin/m4 in the environment.
CONFIGURE_ENV+= ac_cv_prog_gnu_m4_gnu="-g"

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

Re: net/ntp update (was Re: Vulnerable packages in ports tree 10/11)

[Jérémie Courrèges-Anglas]

Daniel Jakots  writes:

> On Tue, 10 Nov 2015 01:30:12 +, Sevan / Venture37
>  wrote:
>
>> net/ntp
>> http://support.ntp.org/bin/view/Main/SecurityNotice#October_2015_NTP_Security_Vulner
>
> Hi,
>
> Here's an update quickly tested on -current and -stable (both amd64),
> it works fine.

Committed, thanks a lot.  Any objection to the following patch for the
5.8 branch?

Index: Makefile
===
RCS file: /cvs/ports/net/ntp/Makefile,v
retrieving revision 1.65
diff -u -p -r1.65 Makefile
--- Makefile1 Jul 2015 11:59:24 -   1.65
+++ Makefile10 Nov 2015 18:42:20 -
@@ -6,7 +6,7 @@ COMMENT=Network Time Protocol reference
 # to confuse with the ports system's 'pN' convention, so convert it to
 # 'pl' for local use.
 
-VERSION=   4.2.8p3
+VERSION=   4.2.8p4
 DISTNAME=  ntp-${VERSION}
 PKGNAME=   ntp-${VERSION:S/p/pl/}
 CATEGORIES=net
Index: distinfo
===
RCS file: /cvs/ports/net/ntp/distinfo,v
retrieving revision 1.18
diff -u -p -r1.18 distinfo
--- distinfo1 Jul 2015 10:35:29 -   1.18
+++ distinfo10 Nov 2015 18:42:20 -
@@ -1,2 +1,2 @@
-SHA256 (ntp-4.2.8p3.tar.gz) = gYyk8u1sqEWxxexD9eatkF6qD8CqstUJ7WuWKjf7848=
-SIZE (ntp-4.2.8p3.tar.gz) = 7099575
+SHA256 (ntp-4.2.8p4.tar.gz) = DWlhVyVI0sSvlvWPdj4irGIPWv73FzhN3DF6DjZc/bk=
+SIZE (ntp-4.2.8p4.tar.gz) = 7104852

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

Re: [maintainer update] update to haproxy 1.6.2

[Jérémie Courrèges-Anglas]

Daniel Jakots <vigdis+o...@chown.me> writes:

> On Mon, 09 Nov 2015 13:33:58 +0100, j...@wxcvbn.org (Jérémie
> Courrèges-Anglas) wrote:
>
>> > Upstream removed a bunch of documentation files including the
>> > haproxy.cfg. I created a very simple one so a new user can easily
>> > test haproxy (or even to check an update is still working).  
>> 
>> The config file looks good as is.  You could also add a bunch of
>> SSL-related stuff later, for the same reasons.
>
> Yes, I thought about that but it would require at least a certificate
> and so on, so it would be less simple. Maybe for the next release of
> haproxy 1.6 :)

Fine.  I've just committed the update.  Thanks! :)

>> A time_t related issue appeared in dumpstats.c; below you'll find an
>> additional patch, are you fine with it?
>
> I saw the error but I wasn't sure it was new so I didn't care about it.
> Patch is right, thanks!

I don't think this is not the way to go wrt time_t warnings.

Seriously folks, this kind of problem is synonymous with runtime
breakage on 32 bits archs.  *please* at least report the issue here,
even if you don't provide a patch.  Thanks.

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

Bison 3, again

[Jérémie Courrèges-Anglas]

Hi,

it's been a few years that our bison port hasn't been updated, the main
reason being that our m4 doesn't groke some of the constructs used by
newer bison releases.  More and more packages out there require a recent
bison version.  As an OpenBSD developer, I don't think that building
parsers using a recent bison on another OS is a valid answer to that
problem.

Yet, nobody found the time and motivation to implement the features /
fix the bugs in m4.

Here's my proposal: update bison to the latest version and make it use
devel/m4 (GNU m4).  *Then* *if* someone wants to make the efforts
required for bison to use base m4, that would be awesome.

Sorry if this sounds blunt, but this is the only way forward I can see.

I'll be available later today to discuss this further if needed.

Diff below,

Index: devel/bison/Makefile
===
RCS file: /cvs/ports/devel/bison/Makefile,v
retrieving revision 1.51
diff -u -p -r1.51 Makefile
--- devel/bison/Makefile19 May 2015 09:54:53 -  1.51
+++ devel/bison/Makefile10 Nov 2015 12:50:07 -
@@ -2,8 +2,7 @@
 
 COMMENT=   GNU parser generator
 
-DISTNAME=  bison-2.3
-REVISION=  2
+DISTNAME=  bison-3.0.4
 CATEGORIES=devel
 MASTER_SITES=  ${MASTER_SITE_GNU:=bison/}
 
@@ -15,9 +14,12 @@ PERMIT_PACKAGE_CDROM=Yes
 WANTLIB=   c
 MODULES=   devel/gettext
 BUILD_DEPENDS= devel/m4
+RUN_DEPENDS=   devel/m4
 
 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS=--disable-yacc
+# Instead of --gnu, not recognized by m4 from base
+CONFIGURE_ENV+=ac_cv_prog_gnu_m4_gnu="-g"
 MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/build-aux
 
 .include 
Index: devel/bison/distinfo
===
RCS file: /cvs/ports/devel/bison/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- devel/bison/distinfo18 Jan 2015 03:13:08 -  1.9
+++ devel/bison/distinfo10 Nov 2015 12:50:07 -
@@ -1,2 +1,2 @@
-SHA256 (bison-2.3.tar.gz) = UveKpHYadM63/fdw81VN2EMIw7k8QlXjpcF1WOzaKT4=
-SIZE (bison-2.3.tar.gz) = 1386694
+SHA256 (bison-3.0.4.tar.gz) = tn/S2q56ZLW6hixmwHwa3bnmsbBcXyBJOSz9iiFylS4=
+SIZE (bison-3.0.4.tar.gz) = 3354179
Index: devel/bison/patches/patch-configure
===
RCS file: devel/bison/patches/patch-configure
diff -N devel/bison/patches/patch-configure
--- devel/bison/patches/patch-configure 8 Jul 2008 00:24:17 -   1.3
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-configure,v 1.3 2008/07/08 00:24:17 brad Exp $
 configure.orig Mon Jun  5 03:32:01 2006
-+++ configure  Sun Jun 29 22:09:16 2008
-@@ -16768,10 +16768,10 @@ s,@host_cpu@,$host_cpu,;t t
- s,@host_vendor@,$host_vendor,;t t
- s,@host_os@,$host_os,;t t
- s,@INTL_MACOSX_LIBS@,$INTL_MACOSX_LIBS,;t t
--s,@LIBICONV@,$LIBICONV,;t t
-+s,@LIBICONV@,$LTLIBICONV,;t t
- s,@LTLIBICONV@,$LTLIBICONV,;t t
- s,@INTLLIBS@,$INTLLIBS,;t t
--s,@LIBINTL@,$LIBINTL,;t t
-+s,@LIBINTL@,$LTLIBINTL,;t t
- s,@LTLIBINTL@,$LTLIBINTL,;t t
- s,@POSUB@,$POSUB,;t t
- s,@UNISTD_H@,$UNISTD_H,;t t
Index: devel/bison/patches/patch-data_m4sugar_m4sugar_m4
===
RCS file: /cvs/ports/devel/bison/patches/patch-data_m4sugar_m4sugar_m4,v
retrieving revision 1.2
diff -u -p -r1.2 patch-data_m4sugar_m4sugar_m4
--- devel/bison/patches/patch-data_m4sugar_m4sugar_m4   8 Jul 2008 00:24:17 
-   1.2
+++ devel/bison/patches/patch-data_m4sugar_m4sugar_m4   10 Nov 2015 12:50:07 
-
@@ -1,7 +1,7 @@
 $OpenBSD: patch-data_m4sugar_m4sugar_m4,v 1.2 2008/07/08 00:24:17 brad Exp $
 data/m4sugar/m4sugar.m4.orig   Mon Nov 14 03:13:07 2005
-+++ data/m4sugar/m4sugar.m4Sun Jun 29 22:09:16 2008
-@@ -55,13 +55,6 @@ divert(-1)#   
+--- data/m4sugar/m4sugar.m4.orig   Fri Aug  2 17:03:17 2013
 data/m4sugar/m4sugar.m4Fri Nov  6 20:39:48 2015
+@@ -31,13 +31,6 @@ divert(-1)#   
  changequote()
  changequote([, ])
  
Index: devel/bison/patches/patch-data_yacc_c
===
RCS file: devel/bison/patches/patch-data_yacc_c
diff -N devel/bison/patches/patch-data_yacc_c
--- devel/bison/patches/patch-data_yacc_c   19 May 2015 09:54:53 -  
1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,46 +0,0 @@
-$OpenBSD: patch-data_yacc_c,v 1.1 2015/05/19 09:54:53 kettenis Exp $
 data/yacc.c.orig   Mon May 18 18:07:15 2015
-+++ data/yacc.cMon May 18 18:08:26 2015
-@@ -307,10 +307,10 @@ typedef short int yytype_int16;
- #define alloca _alloca
- #   else
- #define YYSTACK_ALLOC alloca
--#if ! defined _ALLOCA_H && ! defined _STDLIB_H && ]b4_c_modern[
-+#if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && ]b4_c_modern[
- # include  /* INFRINGES ON USER NAME SPACE */
--# 

Re: new port: net/rabbitmq-c

[Jérémie Courrèges-Anglas]

j...@wxcvbn.org (Jérémie Courrèges-Anglas) writes:

> Gregor Best <g...@unobtanium.de> writes:
>
>> On Mon, Oct 12, 2015 at 04:46:03PM +0200, Gregor Best wrote:
>>> On Mon, Oct 12, 2015 at 01:31:36AM +0300, Vadim Zhukov wrote:
>>> > [...]
>>> > This software changes default CMake variables depending on presence of
>>> > popt library and xmlto binary at least. So you have hidden
>>> > dependencies there. You'd either explicitly disable picking up those
>>> > by -DCMAKE_DISABLE_FIND_PACKAGE_Foo=True, or add what you think worths
>>> > it to BUILD/LIB/RUN_DEPENDS.
>>> > [...]
>>> 
>>> Whoops, fixed that. I've disabled API-doc generation because it pulls in
>>> devel/doxygen as a build dependency and explicitly added popt and xmlto
>>> to lib and build dependencies.
>>> 
>>> This one also installs the manual pages into the right place.
>>> [...]
>>
>> Ping.
>>
>> Is there something still missing about the port?
>
> A few tweaks:
> - please follow the ordering as show in
>   infrastructure/templates/Makefile.template, it helps a lot to have
>   consistency here
> - the shared library version in the OpenBSD ports tree does not follow
>   the one defined upstream, thus we start with 0.0 for a new port.  For
>   more about shared libs in ports, see
>   http://www.openbsd.org/faq/ports/specialtopics.html#SharedLibs
>
> I think it is ready to import, can I get other reviews / oks?

ping :)



rabbitmq-c.tgz
Description: Binary data

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

Re: [maintainer update] update to haproxy 1.6.2

[Jérémie Courrèges-Anglas]

Daniel Jakots  writes:

> Hi,

Hi,

> So I finally succeed in updating haproxy to 1.6 branch. Thanks to
> sthen@ and jca@ for their help.

yw :)

> Upstream removed a bunch of documentation files including the
> haproxy.cfg. I created a very simple one so a new user can easily test
> haproxy (or even to check an update is still working).

The config file looks good as is.  You could also add a bunch of
SSL-related stuff later, for the same reasons.

A time_t related issue appeared in dumpstats.c; below you'll find an
additional patch, are you fine with it?

Index: Makefile
===
RCS file: /cvs/ports/net/haproxy/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile5 Nov 2015 20:00:24 -   1.25
+++ Makefile9 Nov 2015 12:30:01 -
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.25 2015/11/05 20:00:24 jca Exp $
+# $OpenBSD: Makefile,v 1.20.4.1 2015/10/24 14:34:46 ajacoutot Exp $
 
 COMMENT =  reliable, high performance TCP/HTTP load balancer
 
-DISTNAME = haproxy-1.5.15
+DISTNAME = haproxy-1.6.2
 CATEGORIES =   net www
 HOMEPAGE = http://www.haproxy.org/
 MAINTAINER =   Daniel Jakots 
@@ -12,7 +12,7 @@ PERMIT_PACKAGE_CDROM =Yes
 
 WANTLIB =  c crypto pcre pcreposix ssl
 
-MASTER_SITES = ${HOMEPAGE}/download/1.5/src/
+MASTER_SITES = ${HOMEPAGE}/download/1.6/src/
 
 HAPROXYCONF =  ${SYSCONFDIR}/haproxy
 HAPROXYSTATE = /var/haproxy
@@ -35,16 +35,15 @@ MAKE_FLAGS +=   USE_PRIVATE_CACHE=1
 NO_TEST =  Yes
 LIB_DEPENDS =  devel/pcre
 
-DOCS = architecture configuration gpl haproxy-en haproxy-fr lgpl
-EXAMPLES = acl-content-sw content-sw-sample haproxy \
-   option-http_proxy tarpit url-switching
+DOCS = architecture configuration gpl lgpl
+EXAMPLES = acl-content-sw content-sw-sample option-http_proxy 
 
 DOCSDIR =  ${PREFIX}/share/doc/haproxy
 EXAMPLESDIR =  ${PREFIX}/share/examples/haproxy
 
 
 pre-install:
-   ${SUBST_CMD} ${WRKSRC}/doc/haproxy.1 ${WRKSRC}/examples/haproxy.cfg
+   ${SUBST_CMD} ${WRKSRC}/doc/haproxy.1
 
 do-install:
${INSTALL_PROGRAM} ${WRKSRC}/haproxy ${PREFIX}/sbin
@@ -57,6 +56,7 @@ do-install:
 .for file in ${EXAMPLES}
${INSTALL_DATA} ${WRKSRC}/examples/${file}.cfg ${EXAMPLESDIR}
 .endfor
+   ${INSTALL_DATA} ${FILESDIR}/haproxy.cfg ${EXAMPLESDIR}
 
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/net/haproxy/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo5 Nov 2015 20:00:24 -   1.13
+++ distinfo9 Nov 2015 12:30:01 -
@@ -1,2 +1,2 @@
-SHA256 (haproxy-1.5.15.tar.gz) = WvRuFDhgHQkZ9WKAgfZg+VMwh9iK89knTyRTlUdWY+E=
-SIZE (haproxy-1.5.15.tar.gz) = 1356790
+SHA256 (haproxy-1.6.2.tar.gz) = vUp+7nnhv9Ja9Z2Va7YOgqy7bxRvP7OzBjYDb0yVSNM=
+SIZE (haproxy-1.6.2.tar.gz) = 1538976
Index: files/haproxy.cfg
===
RCS file: files/haproxy.cfg
diff -N files/haproxy.cfg
--- /dev/null   1 Jan 1970 00:00:00 -
+++ files/haproxy.cfg   9 Nov 2015 12:30:01 -
@@ -0,0 +1,25 @@
+global
+   log 127.0.0.1   local0 debug
+   maxconn 1024
+   chroot /var/haproxy
+   uid 604
+   gid 604
+   daemon
+   pidfile /var/run/haproxy.pid
+
+defaults
+   log global
+   modehttp
+   option  httplog
+   option  dontlognull
+   option  redispatch
+   retries 3
+   maxconn 2000
+
+frontend haproxy
+   bind *:80
+   default_backend httpd
+
+backend httpd
+   option forwardfor
+   server www 127.0.0.1:8080 check
Index: patches/patch-examples_haproxy_cfg
===
RCS file: patches/patch-examples_haproxy_cfg
diff -N patches/patch-examples_haproxy_cfg
--- patches/patch-examples_haproxy_cfg  17 Jul 2008 04:31:45 -  1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,63 +0,0 @@
-$OpenBSD: patch-examples_haproxy_cfg,v 1.1.1.1 2008/07/17 04:31:45 jdixon Exp $
 examples/haproxy.cfg.orig  Sat Jun 21 15:59:05 2008
-+++ examples/haproxy.cfg   Sun Jul 13 20:13:01 2008
-@@ -1,28 +1,30 @@
--# this config needs haproxy-1.1.28 or haproxy-1.2.1
- 
- global
-   log 127.0.0.1   local0
-   log 127.0.0.1   local1 notice
-   #log loghostlocal0 info
--  maxconn 4096
--  chroot /usr/share/haproxy
--  uid 99
--  gid 99
-+  maxconn 1024
-+  chroot ${HAPROXYSTATE}
-+  uid ${HAPROXYUID}
-+  gid ${HAPROXYGID}
-   daemon
-   #debug
-   #quiet
-+  pidfile /var/run/haproxy.pid
- 
- defaults
-   log global
-   modehttp
-   option  httplog
-   option  dontlognull
-+  option  redispatch
-   retries 3
--  redispatch
-   maxconn 2000
-   contimeout  5000
-   clitimeout  5
-   

Re: update mail/mlmmj

[Jérémie Courrèges-Anglas]

Eric Lalonde  writes:

> On 11/5/15 11:36 PM, Daniel Jakots wrote:
>> Hi,
>>
>> Here's an update for mlmmj to the latest release.
>>
>> The short changelog is:
>> - Ensuring OpenSMTPD sends 8-bit mail so it works with non-ASCII mail
>> - Improved handling of non-ASCII mail and long headers
>> - Tunable for moderation request lifetime
>> - Fix relayhost and related tunables which didn't work in some
>>circumstances
>>
>> I don't use it, so please test it if you use it :)
>
> Applied and lightly tested so far. Seems to be working fine.

Committed, thanks!

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

Re: x11/pbrowser

[Jérémie Courrèges-Anglas]

Stuart Henderson  writes:

> x11/pbrowser "graphical ports system frontend": last real update 2005,
> broken on LP64 (nobody noticed), no idea if it even works with current
> ports/pkg tools.
>
> does anyone want to try and save it or shall I just rm?

Broken LP64 + no update in 10 years, when the ports tree is such a fast
moving target?  Those are convincing arguments to delete it.  ok jca@

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

Re: [UPDATE] devel/cmocka

[Jérémie Courrèges-Anglas]

Stuart Henderson  writes:

> On 2015/11/06 18:02, Remi Pointel wrote:
>> Hi,
>> 
>> this is the latest version of cmocka.
>
> This doesn't build on i386,

Woops...

> /usr/obj/ports/cmocka-1.0.1/cmocka-1.0.1/include/cmocka.h:113: error: 
> conflicting types for 'uintptr_t'
> /usr/include/sys/stdint.h:96: error: previous declaration of 'uintptr_t' was 
> here
>
> I think the current cmocka.h patch to add the ifdef OpenBSD is
> unnecessary, what would be better is to change the __WORDSIZE
> ifdef in line 59, but that still leaves us with problems with the
> uintptr_t typedef (they #define guards used in stdint.h on some
> platforms, _UINTPTR_T_DEFINED and _UINTPTR_T, to avoid this...
> but we don't have a specific guard for uintptr_t definition).

I didn't notice that patch at first.  This header file is quite
offending.

> This is a bit dirty but should do the trick for now. Maybe upstream
> can come up with something nicer.

Agreed.  ok jca@

> Index: patches/patch-include_cmocka_h
> ===
> RCS file: /cvs/ports/devel/cmocka/patches/patch-include_cmocka_h,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-include_cmocka_h
> --- patches/patch-include_cmocka_h6 Nov 2015 20:58:48 -   1.3
> +++ patches/patch-include_cmocka_h7 Nov 2015 14:45:44 -
> @@ -1,12 +1,33 @@
>  $OpenBSD: patch-include_cmocka_h,v 1.3 2015/11/06 20:58:48 rpointel Exp $
>  include/cmocka.h.origSun Mar  1 10:31:52 2015
> -+++ include/cmocka.h Fri Nov  6 17:32:22 2015
> -@@ -112,6 +112,8 @@ typedef uintmax_t LargestIntegralType;
> - #   else
> -   typedef unsigned int uintptr_t;
> - #   endif /* __WORDSIZE == 64 */
> -+#  elif defined(__OpenBSD__)
> -+ typedef unsigned long int uintptr_t;
> - #  else /* __WORDSIZE */
> - #   if defined(_LP64) || defined(_I32LPx)
> -   typedef unsigned long int uintptr_t;
> +--- include/cmocka.h.origSun Mar  1 02:31:52 2015
>  include/cmocka.h Sat Nov  7 07:44:28 2015
> +@@ -56,7 +56,7 @@ int __stdcall IsDebuggerPresent();
> + 
> + /* If __WORDSIZE is not set, try to figure it out and default to 32 bit. */
> + #ifndef __WORDSIZE
> +-# if defined(__x86_64__) && !defined(__ILP32__)
> ++# if defined(_LP64)
> + #  define __WORDSIZE 64
> + # else
> + #  define __WORDSIZE 32
> +@@ -96,8 +96,11 @@ typedef uintmax_t LargestIntegralType;
> + #define cast_to_largest_integral_type(value) \
> + ((LargestIntegralType)(value))
> + 
> ++#if defined(__OpenBSD__)
> ++#include 
> ++#else
> + /* Smallest integral type capable of holding a pointer. */
> +-#if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED)
> ++#if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED) && 
> !defined(_INTPTR_T_DEFINED)
> + # if defined(_WIN32)
> + /* WIN32 is an ILP32 platform */
> + typedef unsigned int uintptr_t;
> +@@ -124,6 +127,7 @@ typedef uintmax_t LargestIntegralType;
> + # define _UINTPTR_T
> + # define _UINTPTR_T_DEFINED
> + #endif /* !defined(_UINTPTR_T) || !defined(_UINTPTR_T_DEFINED) */
> ++#endif
> + 
> + /* Perform an unsigned cast to uintptr_t. */
> + #define cast_to_pointer_integral_type(value) \
>


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

Re: rcm 1.3.0

[Jérémie Courrèges-Anglas]

Mike Burns  writes:

> Upgrade rcm to 1.3.0.
>
> Changes: https://github.com/thoughtbot/rcm/blob/master/NEWS.md.in#L3-L19

Committed, thanks.

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

Re: [UPDATE] devel/cmocka

[Jérémie Courrèges-Anglas]

Remi Pointel  writes:

> Hi,

Hi,

> this is the latest version of cmocka.
>
> Ok?

ok jca@, however please install libcmocka.a (shown by make plist)

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

Re: new port: net/rabbitmq-c

[Jérémie Courrèges-Anglas]

Gregor Best  writes:

> On Mon, Oct 12, 2015 at 04:46:03PM +0200, Gregor Best wrote:
>> On Mon, Oct 12, 2015 at 01:31:36AM +0300, Vadim Zhukov wrote:
>> > [...]
>> > This software changes default CMake variables depending on presence of
>> > popt library and xmlto binary at least. So you have hidden
>> > dependencies there. You'd either explicitly disable picking up those
>> > by -DCMAKE_DISABLE_FIND_PACKAGE_Foo=True, or add what you think worths
>> > it to BUILD/LIB/RUN_DEPENDS.
>> > [...]
>> 
>> Whoops, fixed that. I've disabled API-doc generation because it pulls in
>> devel/doxygen as a build dependency and explicitly added popt and xmlto
>> to lib and build dependencies.
>> 
>> This one also installs the manual pages into the right place.
>> [...]
>
> Ping.
>
> Is there something still missing about the port?

A few tweaks:
- please follow the ordering as show in
  infrastructure/templates/Makefile.template, it helps a lot to have
  consistency here
- the shared library version in the OpenBSD ports tree does not follow
  the one defined upstream, thus we start with 0.0 for a new port.  For
  more about shared libs in ports, see
  http://www.openbsd.org/faq/ports/specialtopics.html#SharedLibs

I think it is ready to import, can I get other reviews / oks?

Updated tarball attached, diff of the changes I introduced below.

Cheers,

diff -pruN rabbitmq-c.orig/Makefile rabbitmq-c/Makefile
--- rabbitmq-c.orig/MakefileMon Oct 12 16:45:39 2015
+++ rabbitmq-c/Makefile Thu Nov  5 13:29:14 2015
@@ -1,3 +1,5 @@
+# $OpenBSD$
+
 COMMENT=   rabbitmq C library and commandline AMQP utilities
 
 V= 0.7.0
@@ -6,12 +8,17 @@ GH_PROJECT=   rabbitmq-c
 GH_TAGNAME=v${V}
 DISTNAME=  ${GH_PROJECT}-${V}
 
+SHARED_LIBS =  rabbitmq 0.0 # 4.1
+
 CATEGORIES=net
 
 HOMEPAGE=  https://github.com/${GH_ACCOUNT}/${GH_PROJECT}
 
 MAINTAINER=Gregor Best 
 
+# MIT
+PERMIT_PACKAGE_CDROM = Yes
+
 MODULES=   devel/cmake
 
 WANTLIB=   c crypto popt pthread ssl
@@ -22,10 +29,5 @@ BUILD_DEPENDS=   textproc/xmlto
 CONFIGURE_ARGS=-DBUILD_TOOLS_DOCS=ON \
-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=True \
-DBUILD_API_DOCS=OFF
-
-SHARED_LIBS =  rabbitmq 4.1
-
-# MIT
-PERMIT_PACKAGE_CDROM = Yes
 
 .include 



rabbitmq-c.tgz
Description: Binary data

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