Re: [UPDATE] CMake-3.9.0

[David Coppa]

On Thu, 10 Aug 2017, Rafael Sadowski wrote:

> On Thu Aug 10, 2017 at 05:26:46PM +0200, David Coppa wrote:
> > 
> > Hi all,
> > 
> > Here's the update to the latest CMake.
> > 
> > As usual, I'd like to have the attached diff tested in a ports bulk
> > build...
> > 
> > Thanks!
> > David
> 
> $ make regress
> 100% tests passed, 0 tests failed out of 451
> 
> CMake tests are all green but it breaks my graphics/lensfun build:

...

> FAILED: tests/CMakeFiles/test_modifier.dir/test_modifier.cpp.o
> /usr/ports/pobj/lensfun-0.3.2/bin/c++   -I. 
> -I/usr/ports/pobj/lensfun-0.3.2/lensfun-0.3.2/include/lensfun -isystem 
> /usr/local/lib/glib-2.0/include -isystem /usr/local/include/glib-2.0 -O2 
> -pipe NOTFOUND -DNDEBUG -MD -MT 
> tests/CMakeFiles/test_modifier.dir/test_modifier.cpp.o -MF 
> tests/CMakeFiles/test_modifier.dir/test_modifier.cpp.o.d -o 
> tests/CMakeFiles/test_modifier.dir/test_modifier.cpp.o -c 
> /usr/ports/pobj/lensfun-0.3.2/lensfun-0.3.2/tests/test_modifier.cpp
> c++: error: no such file or directory: 'NOTFOUND'
> ninja: build stopped: subcommand failed.
> *** Error 1 in . (/usr/ports/devel/cmake/cmake.port.mk:31 'do-build': @cd 
> /usr/ports/pobj/lensfun-0.3.2/build-amd64 && exec /usr/bin/env -i ...)
> *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2701 
> '/usr/ports/pobj/lensfun-0.3.2/build-amd64/.build_done')
> *** Error 1 in /usr/ports/graphics/lensfun 
> (/usr/ports/infrastructure/mk/bsd.port.mk:2408 'all')

CMake-3.9 found a bug: "${OpenMP_CXX_FLAGS}" should not be used
unconditionally...

Index: patches/patch-tests_CMakeLists_txt
===
RCS file: patches/patch-tests_CMakeLists_txt
diff -N patches/patch-tests_CMakeLists_txt
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-tests_CMakeLists_txt  11 Aug 2017 05:00:09 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Index: tests/CMakeLists.txt
+--- tests/CMakeLists.txt.orig
 tests/CMakeLists.txt
+@@ -7,7 +7,9 @@ TARGET_LINK_LIBRARIES(test_modifier lensfun ${COMMON_L
+ ADD_TEST(Modifier test_modifier)
+ 
+ find_package(OpenMP)
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
++if(OpenMP_CXX_FOUND)
++  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
++endif()
+ 
+ ADD_EXECUTABLE(test_modifier_color test_modifier_color.cpp)
+ TARGET_LINK_LIBRARIES(test_modifier_color lensfun ${COMMON_LIBS})

git security update

[Daniel Jakots]

Hello && coucou Benoit,

Git's upstream released a couple of git releases to fix
CVE-2017-1000117. Here's diff that update old-stable, stable and
current.

I went the lazy way which is 'update to latest bugfix release' and not
just backporting patches. This was the easiest thing for me and it
"sounds like the correct approach to" sthen :)

Test, comments and ok?

Cheers,
Daniel
Index: Makefile
===
RCS file: /cvs/ports/devel/git/Makefile,v
retrieving revision 1.178
diff -u -p -r1.178 Makefile
--- Makefile	5 Aug 2017 19:09:05 -	1.178
+++ Makefile	11 Aug 2017 04:24:54 -
@@ -4,7 +4,7 @@ COMMENT-main =	GIT - Tree History Storag
 COMMENT-svn =	GIT - subversion interoperability tools
 COMMENT-x11 =	GIT - graphical tools
 
-V =		2.14.0
+V =		2.14.1
 DISTNAME =	git-${V}
 PKGNAME-main =	${DISTNAME}
 PKGNAME-svn =	git-svn-${V}
Index: distinfo
===
RCS file: /cvs/ports/devel/git/distinfo,v
retrieving revision 1.135
diff -u -p -r1.135 distinfo
--- distinfo	5 Aug 2017 19:09:05 -	1.135
+++ distinfo	11 Aug 2017 04:24:54 -
@@ -1,4 +1,4 @@
-SHA256 (git-2.14.0.tar.gz) = yaZmRdacZ6dCGDGa/j1sVQf7kdq4AUYF34luk58Gvkg=
-SHA256 (git-manpages-2.14.0.tar.gz) = riEZ/5I1BTlpHxOhHyqU5iVtzOY+CYMswWA2XdBQY2s=
-SIZE (git-2.14.0.tar.gz) = 6987666
-SIZE (git-manpages-2.14.0.tar.gz) = 665143
+SHA256 (git-2.14.1.tar.gz) = AZJTSbloOUDlOmIe5I3Z2aw/nlnAeYBrWDIcLPhaRGQ=
+SHA256 (git-manpages-2.14.1.tar.gz) = jFgQzmXUTNMzMn06EVxbRicSovgSJdFC4HvYia2NwOA=
+SIZE (git-2.14.1.tar.gz) = 6987933
+SIZE (git-manpages-2.14.1.tar.gz) = 665202
Index: Makefile
===
RCS file: /cvs/ports/devel/git/Makefile,v
retrieving revision 1.158
diff -u -p -r1.158 Makefile
--- Makefile	28 Jun 2016 07:27:14 -	1.158
+++ Makefile	11 Aug 2017 04:33:41 -
@@ -4,7 +4,7 @@ COMMENT-main =	GIT - Tree History Storag
 COMMENT-svn =	GIT - subversion interoperability tools
 COMMENT-x11 =	GIT - graphical tools
 
-V =		2.9.0
+V =		2.9.5
 DISTNAME =	git-${V}
 PKGNAME-main =	${DISTNAME}
 PKGNAME-svn =	git-svn-${V}
Index: distinfo
===
RCS file: /cvs/ports/devel/git/distinfo,v
retrieving revision 1.121
diff -u -p -r1.121 distinfo
--- distinfo	28 Jun 2016 07:27:14 -	1.121
+++ distinfo	11 Aug 2017 04:33:41 -
@@ -1,4 +1,4 @@
-SHA256 (git-2.9.0.tar.gz) = v/dWD1YC/Njjdmng9l7wjG7cmW5PMk5O1ruKhHZeML0=
-SHA256 (git-manpages-2.9.0.tar.gz) = NbppqFYFKaqDfjlabWyNQvTSm0CjwcxuPcabsfqtszI=
-SIZE (git-2.9.0.tar.gz) = 5903371
-SIZE (git-manpages-2.9.0.tar.gz) = 629249
+SHA256 (git-2.9.5.tar.gz) = j6V1M4E31thQtS0gfPcVXNH0AD69aY8Pt19l77hi738=
+SHA256 (git-manpages-2.9.5.tar.gz) = tRWULoGiv68bJDehV8Qig+lzHS2YaU4n9vItaZypKSw=
+SIZE (git-2.9.5.tar.gz) = 5928730
+SIZE (git-manpages-2.9.5.tar.gz) = 633471
Index: Makefile
===
RCS file: /cvs/ports/devel/git/Makefile,v
retrieving revision 1.168
diff -u -p -r1.168 Makefile
--- Makefile	26 Mar 2017 19:07:10 -	1.168
+++ Makefile	11 Aug 2017 04:27:51 -
@@ -4,7 +4,7 @@ COMMENT-main =	GIT - Tree History Storag
 COMMENT-svn =	GIT - subversion interoperability tools
 COMMENT-x11 =	GIT - graphical tools
 
-V =		2.12.2
+V =		2.12.4
 DISTNAME =	git-${V}
 PKGNAME-main =	${DISTNAME}
 PKGNAME-svn =	git-svn-${V}
Index: distinfo
===
RCS file: /cvs/ports/devel/git/distinfo,v
retrieving revision 1.129
diff -u -p -r1.129 distinfo
--- distinfo	26 Mar 2017 19:07:10 -	1.129
+++ distinfo	11 Aug 2017 04:27:51 -
@@ -1,4 +1,4 @@
-SHA256 (git-2.12.2.tar.gz) = 2cbXh6JGcNflEA2yNnwlCtl1bvgIT7FTpGuC8dGG+Ng=
-SHA256 (git-manpages-2.12.2.tar.gz) = bn7VA/EZBzTlfJQn3zVrQgIPEl+jarBHh3eWCmgq31A=
-SIZE (git-2.12.2.tar.gz) = 6389118
-SIZE (git-manpages-2.12.2.tar.gz) = 653673
+SHA256 (git-2.12.4.tar.gz) = sleG8KE+OalVjuylbADHWHA8gDvekPm8WrVPS+Lrsf8=
+SHA256 (git-manpages-2.12.4.tar.gz) = 4OashhshzmBHNnTYj48+GvbifVugzt3vL4z/Am8ux9I=
+SIZE (git-2.12.4.tar.gz) = 6407661
+SIZE (git-manpages-2.12.4.tar.gz) = 654944
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/devel/git/patches/patch-Makefile,v
retrieving revision 1.69
diff -u -p -r1.69 patch-Makefile
--- patches/patch-Makefile	26 Mar 2017 19:07:10 -	1.69
+++ patches/patch-Makefile	11 Aug 2017 04:27:51 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-Makefile,v 1.69 2017/03/26 19:07:10 benoit Exp $
 Makefile.orig	Fri Mar 24 21:50:52 2017
-+++ Makefile	Sun Mar 26 15:03:52 2017
-@@ -2287,7 +2287,7 @@ export TEST_NO_MALLOC_CHECK
+--- Makefile.orig	Wed Aug  9 15:52:01 2017
 Makefile	Fri Aug 11 00:19:11 2017
+@@ -2290,7 +2290,7 @@ export TEST_NO_MALLOC_CHECK
  
  ### Testing rules
  
Index: patches/patch-t_t9200-git-cvsexportcommit_sh

CVS: cvs.openbsd.org: ports

[Alexander Bluhm]

CVSROOT:/cvs
Module name:ports
Changes by: bl...@cvs.openbsd.org   2017/08/10 22:18:19

Modified files:
mail/fetchmail : Makefile 
mail/fetchmail/patches: patch-socket_c 

Log message:
Do not overrun plugin string when copying it.  Prevents sporadic
segmentation fault in fetchmail.  Fix reported to upstream.
OK jca@

coredump on podbeuter

[jungle boogie]

Hello,

I'm running amd64 -current snapshots and I'm getting a core dump when 
attempting to download a podcast. Any hints at what the problem are 
related to are appreciated.



$ cat .newsbeuter/urls 



http://feeds.feedburner.com/BsdNowMp3

$ cat .newsbeuter/queue 




http://www.podtrac.com/pts/redirect.mp3/traffic.libsyn.com/jnite/bsd-0206.mp3 
"/home/sean/bsd-0206.mp3"


$ cat .newsbeuter/config 




player "mpv"


Maybe this isn't too helpful:
$ gdb /usr/local/bin/podbeuter podbeuter.core 




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-openbsd6.1"...
Core was generated by `podbeuter'.
Program terminated with signal 10, Bus error.
Reading symbols from /usr/lib/libpthread.so.23.0...done.
Loaded symbols for /usr/lib/libpthread.so.23.0
Loaded symbols for /usr/local/bin/podbeuter
Symbols already loaded for /usr/lib/libpthread.so.23.0
Reading symbols from /usr/local/lib/libiconv.so.6.0...done.
Loaded symbols for /usr/local/lib/libiconv.so.6.0
Reading symbols from /usr/local/lib/libintl.so.6.0...done.
Loaded symbols for /usr/local/lib/libintl.so.6.0
Reading symbols from /usr/local/lib/libsqlite3.so.36.0...done.
Loaded symbols for /usr/local/lib/libsqlite3.so.36.0
Reading symbols from /usr/local/lib/libcurl.so.25.10...done.
Loaded symbols for /usr/local/lib/libcurl.so.25.10
Reading symbols from /usr/local/lib/libxml2.so.15.2...done.
Loaded symbols for /usr/local/lib/libxml2.so.15.2
Reading symbols from /usr/local/lib/libstfl.so.0.0...done.
Loaded symbols for /usr/local/lib/libstfl.so.0.0
Reading symbols from /usr/local/lib/libjson-c.so.0.0...done.
Loaded symbols for /usr/local/lib/libjson-c.so.0.0
Reading symbols from /usr/lib/libcrypto.so.41.2...done.
Loaded symbols for /usr/lib/libcrypto.so.41.2
Reading symbols from /usr/lib/libc++.so.0.0...done.
Loaded symbols for /usr/lib/libc++.so.0.0
Reading symbols from /usr/lib/libc++abi.so.0.0...done.
Loaded symbols for /usr/lib/libc++abi.so.0.0
Reading symbols from /usr/lib/libm.so.10.0...done.
Loaded symbols for /usr/lib/libm.so.10.0
Reading symbols from /usr/lib/libc.so.89.6...done.
Loaded symbols for /usr/lib/libc.so.89.6
Reading symbols from /usr/local/lib/libnghttp2.so.0.10...done.
Loaded symbols for /usr/local/lib/libnghttp2.so.0.10
Reading symbols from /usr/lib/libssl.so.43.3...done.
Loaded symbols for /usr/lib/libssl.so.43.3
Reading symbols from /usr/lib/libz.so.5.0...done.
Loaded symbols for /usr/lib/libz.so.5.0
Reading symbols from /usr/local/lib/liblzma.so.2.1...done.
Loaded symbols for /usr/local/lib/liblzma.so.2.1
Reading symbols from /usr/lib/libncursesw.so.14.0...done.
Loaded symbols for /usr/lib/libncursesw.so.14.0
Reading symbols from /usr/libexec/ld.so...done.
Loaded symbols for /usr/libexec/ld.so
Die: DW_TAG_ (abbrev = 86, offset = 246276)
has children: FALSE
attributes:
DW_AT_type (DW_FORM_ref4) constant ref: 237148 
(adjusted)
Dwarf Error: Cannot find type of die [in module 
/usr/local/bin/podbeuter] 


Die: DW_TAG_ (abbrev = 86, offset = 246276)
has children: FALSE
attributes:
DW_AT_type (DW_FORM_ref4) constant ref: 237148 
(adjusted)
Dwarf Error: Cannot find type of die [in module 
/usr/local/bin/podbeuter] 


(gdb) bt
Die: DW_TAG_ (abbrev = 86, offset = 246276)
has children: FALSE
attributes:
DW_AT_type (DW_FORM_ref4) constant ref: 237148 (adjusted)
Dwarf Error: Cannot find type of die [in module /usr/local/bin/podbeuter]



$ dmesg 




OpenBSD 6.1-current (GENERIC.MP) #51: Tue Aug  8 21:00:02 MDT 2017 





dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP 




real mem = 3194490880 (3046MB) 




avail mem = 3091374080 (2948MB)
mpath0 at root
scsibus0 at mpath0: 256 targets 


mainbus0 at root
bios0 at mainbus0: SMBIOS rev. 2.4 @ 0xf6e60 (62 entries)
bios0: vendor Dell Inc. version "A07" date 12/18/2006 


bios0: Dell Inc. Latitude D620
acpi0 at bios0: rev 0 

acpi0: TCPA checksum error 

acpi0: sleep states S0 S3 S4 S5 

acpi0: tables DSDT FACP HPET APIC ASF! MCFG SLIC TCPA SSDT 

acpi0: wakeup devices LID_(S3) PBTN(S4) PCI0(S5) USB0(S0) USB1(S0) 
USB2(S0) USB3(S0) EHCI(S0) AZAL(S3) PCIE(S4) RP01(S3) RP02(S4) NIC_(S5) 
RP04(S3) RP05(S3) RP06(S3) 


acpitimer0 at acpi0: 3579545 Hz, 24 bits
acpihpet0 at acpi0: 14318179 Hz 


acpimadt0 at acpi0 addr 0xfee0: PC-AT compat
cpu0 at mainbus0: apid 0 (boot processor)
cpu0: Intel(R) Core(TM)2 CPU T7200 @ 2.00GHz, 1997.63 MHz 

cpu0: 

Re: UPDATE x11/tint2-0.12.2 -> 0.14.6

[Heppler, J. Scott]

Jggimi reviewed the port and found an extra tab and line in the
Makefile.

Version 3 of the attached diff corrects.

Thanks

Scott
On Aug 10, 2017: 10:23, Brian Callahan wrote:

Hi Scott --

I'll take a look at this later today.

~Brian

On 08/09/17 20:01, Heppler, J. Scott wrote:

A revised diff to update x11/tint2 is attached.  Upstream has added 2
new features:  1)  Configurable "Buttons" that attach an icon to a
command.  2) Shell script "Executors" with examples for Network
monitoring and disk usage.

Changelog here:
https://github.com/o9000/tint2

I cvs add'd/rm;d the revised patches and portchecked.

Testers and feedback appreciated.





--
J. Scott Heppler
Index: Makefile
===
RCS file: /cvs/ports/x11/tint2/Makefile,v
retrieving revision 1.5
diff -u -p -u -r1.5 Makefile
--- Makefile26 Nov 2016 02:06:16 -  1.5
+++ Makefile11 Aug 2017 01:00:07 -
@@ -2,12 +2,11 @@
 
 COMMENT=freedesktop-compliant panel
 
-V= 0.12.2
-REVISION=  2
+V= 0.14.6
 CATEGORIES=x11
 DISTNAME=  tint2-$V
 DISTFILES= ${DISTNAME}${EXTRACT_SUFX}{archive${EXTRACT_SUFX}?ref=v$V}
-WRKDIST=   ${WRKDIR}/tint2-v$V-dc300c021531f47cca336e15b50adf3b4a9bc9ae
+WRKDIST=   ${WRKDIR}/tint2-v$V-8046600a552774253939b8a83bdd3fc0e60dacec
 INSTDIR=   ${PREFIX}/tint2
 
 HOMEPAGE=  https://gitlab.com/o9000/tint2/
@@ -25,30 +24,24 @@ WANTLIB += pangocairo-1.0 pangoft2-1.0 p
 WANTLIB += z
 
 BUILD_DEPENDS= devel/gettext-tools
-LIB_DEPENDS=   graphics/imlib2 \
-   devel/gettext \
+
+LIB_DEPENDS=   devel/gettext \
devel/pango \
devel/startup-notification \
+graphics/imlib2 \
x11/gnome/librsvg \
x11/gtk+2
-RUN_DEPENDS=   x11/py-gtk2 \
-   devel/desktop-file-utils
+
 
 MODULES=   devel/cmake \
-   lang/python \
x11/gnome
 
-MODGNOME_TOOLS+= gtk-update-icon-cache
+MODGNOME_TOOLS+= desktop-file-utils \
+   gtk-update-icon-cache \
+   shared-mime-info
 
 NO_TEST=   Yes
 
 CONFIGURE_ARGS= -DMANDIR="${PREFIX}/man"
-
-post-install:
-   cp -R ${WRKSRC}/sample/ ${PREFIX}/share/examples/tint2/
-   sed -i -e '/\/usr\/local\/share\/applications/d' -e \
-   's,/usr/share/applications,${LOCALBASE}/share/applications,g' \
-   ${PREFIX}/share/examples/tint2/*tint2rc
-   rm ${PREFIX}/share/tint2/*.tint2rc
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/x11/tint2/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 distinfo
--- distinfo11 Sep 2015 14:14:07 -  1.1.1.1
+++ distinfo11 Aug 2017 01:00:07 -
@@ -1,2 +1,2 @@
-SHA256 (tint2-0.12.2.tar.gz) = vanMkT1Ln9QTKF6jRGasFJVZ6emTjhKfRqZkwxEBM0U=
-SIZE (tint2-0.12.2.tar.gz) = 229320
+SHA256 (tint2-0.14.6.tar.gz) = F3Dio33IBmozr3OFuhu+dAUQG87Y6fx+6V1IzvU801E=
+SIZE (tint2-0.14.6.tar.gz) = 466533
Index: patches/patch-CMakeLists_txt
===
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-CMakeLists_txt11 Aug 2017 01:00:07 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
 CMakeLists.txt
+@@ -257,7 +257,6 @@ set_target_properties( tint2 PROPERTIES LINK_FLAGS "-p
+ install( TARGETS tint2 DESTINATION bin )
+ install( FILES tint2.svg DESTINATION 
${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps )
+ install( FILES tint2.desktop DESTINATION 
${CMAKE_INSTALL_DATADIR}/applications )
+-install( FILES themes/tint2rc DESTINATION /etc/xdg/tint2 )
+ install( FILES default_icon.png DESTINATION ${CMAKE_INSTALL_DATADIR}/tint2 )
+ install( FILES AUTHORS ChangeLog README.md doc/tint2.md DESTINATION ${docdir} 
)
+ install( FILES doc/manual.html doc/readme.html DESTINATION ${htmldir} )
Index: patches/patch-src_tint2conf_CMakeLists_txt
===
RCS file: patches/patch-src_tint2conf_CMakeLists_txt
diff -N patches/patch-src_tint2conf_CMakeLists_txt
--- patches/patch-src_tint2conf_CMakeLists_txt  11 Sep 2015 14:14:07 -  
1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,8 +0,0 @@
-$OpenBSD: patch-src_tint2conf_CMakeLists_txt,v 1.1.1.1 2015/09/11 14:14:07 
sthen Exp $
 src/tint2conf/CMakeLists.txt.orig  Tue Aug 11 09:26:49 2015
-+++ src/tint2conf/CMakeLists.txt   Fri Sep 11 15:30:10 2015
-@@ -71,4 +71,3 @@ add_subdirectory(po)
- install( TARGETS tint2conf DESTINATION bin )
- install( FILES tint2conf.svg DESTINATION 
${DATADIR}/icons/hicolor/scalable/apps )
- install( FILES tint2conf.desktop DESTINATION ${DATADIR}/applications )
--install( CODE "execute_process(COMMAND gtk-update-icon-cache -f -t 
${DATADIR}/icons/hicolor WORKING_DIRECTORY 

CVS: cvs.openbsd.org: ports

[Ingo Feinerer]

CVSROOT:/cvs
Module name:ports
Changes by: feine...@cvs.openbsd.org2017/08/10 14:37:45

Modified files:
www: Makefile 

Log message:
+buku

CVS: cvs.openbsd.org: ports

[Ingo Feinerer]

CVSROOT:/cvs
Module name:ports
Changes by: feine...@cvs.openbsd.org2017/08/10 14:34:58

Log message:
Import buku 3.2

buku is a command-line utility to store, tag, search and organize bookmarks.

* Lightweight, clean interface
* Text editor integration
* Fetch page title, add tags and comments
* Multiple search modes (e.g. deep, regex)
* Continuous search at prompt, on the fly mode switch
* Open bookmarks and search results in browser
* Import/export in HTML (FF, Chrome compatible) or Markdown
* Shorten and expand URLs
* Smart tag editing with >>, > or << symbols at prompt
* Password protection (manual)
* Portable, merge-able database to sync between systems
* Multithreaded full DB refresh
* Shell completion scripts, man page with examples

OK juanfra@

Status:

Vendor Tag: feinerer
Release Tags:   feinerer_20170810

N ports/www/buku/Makefile
N ports/www/buku/distinfo
N ports/www/buku/pkg/PLIST
N ports/www/buku/pkg/DESCR

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Joerg Jung]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2017/08/10 14:14:56

Modified files:
net/gdnsd  : Makefile 
net/gdnsd/patches: patch-configure 
net/gdnsd/pkg  : gdnsd.rc 

Log message:
remove reload and switch default state dir, also take maintainer

ok sthen

Re: Port bulk with

[Karel Gardas]

On Thu, Aug 10, 2017 at 9:45 PM, Karel Gardas  wrote:
> I updated my current to today snapshot and still with original full
> version of elf.h patch libelf builds fine -- see below. By quick
> comparison of configure outputs in Christian's and mine build it looks
> like he gets:
>
> checking if cc can compile elf.h... yes
>
> while I get:
>
> checking if cc can compile elf.h... no
>
> which is probably the reason (or one of) behind the failure for you
> and not failure for me...

config.log is clear about that:

configure:1231: checking if cc can compile elf.h
configure:1248: cc -c -O2 -pipe  conftest.c 1>&5
In file included from configure:1239:
In file included from /usr/include/elf.h:31:
/usr/include/sys/exec_elf.h:53:9: error: unknown type name
'__uint32_t'; did you mean '__uint128_t'?
typedef __uint32_t  Elf32_Addr; /* Unsigned program address */
^
note: '__uint128_t' declared here
/usr/include/sys/exec_elf.h:54:9: error: unknown type name
'__uint32_t'; did you mean '__uint128_t'?
typedef __uint32_t  Elf32_Off;  /* Unsigned file offset */
^
note: '__uint128_t' declared here
/usr/include/sys/exec_elf.h:55:9: error: unknown type name
'__uint16_t'; did you mean '__uint128_t'?
typedef __uint16_t  Elf32_Half; /* Unsigned medium integer */
^
[...]

probably the culprit here is my removal of  include from
sys/exec_elf.h which is presented in full patch version while missing
from current OpenBSD.

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2017/08/10 13:46:26

Modified files:
net/curl   : Makefile distinfo 
net/curl/pkg   : PLIST 
Added files:
net/curl/patches: patch-Makefile_in 

Log message:
Security update to 7.55.0:
* file: output the correct buffer to the user (CVE-2017-199)
* tftp: reject file name lengths that don't fit (CVE-2017-1000100)
* glob: do not parse after a strtoul() overflow range (CVE-2017-1000101)

Re: Port bulk with

[Karel Gardas]

I updated my current to today snapshot and still with original full
version of elf.h patch libelf builds fine -- see below. By quick
comparison of configure outputs in Christian's and mine build it looks
like he gets:

checking if cc can compile elf.h... yes

while I get:

checking if cc can compile elf.h... no

which is probably the reason (or one of) behind the failure for you
and not failure for me...

$ doas make
===> libelf-0.8.13p3 depends on: metaauto-* -> metaauto-1.0p1
===> libelf-0.8.13p3 depends on: autoconf-2.13 -> autoconf-2.13p4
===>  Checking files for libelf-0.8.13p3
`/usr/ports/distfiles/libelf-0.8.13.tar.gz' is up to date.
>> (SHA256) libelf-0.8.13.tar.gz: OK
===>  Extracting for libelf-0.8.13p3
===>  Patching for libelf-0.8.13p3
===>   Applying OpenBSD patch patch-aclocal_m4
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--
|$OpenBSD: patch-aclocal_m4,v 1.4 2012/05/19 08:24:50 sthen Exp $
|--- aclocal.m4.origFri May 23 04:17:56 2008
|+++ aclocal.m4 Fri May 18 22:53:37 2012
--
Patching file aclocal.m4 using Plan A...
Hunk #1 succeeded at 288.
done
===>  Compiler link: cc -> /usr/bin/cc
===>  Compiler link: c++ -> /usr/bin/c++
Running autoconf-2.13 in /usr/ports/pobj/libelf-0.8.13/libelf-0.8.13
Running autoheader-2.13 in /usr/ports/pobj/libelf-0.8.13/libelf-0.8.13
===>  Configuring for libelf-0.8.13p3
Using /usr/ports/pobj/libelf-0.8.13/config.site (generated)
loading site script /usr/ports/pobj/libelf-0.8.13/config.site
creating cache ./config.cache
checking whether make sets ${MAKE}... (cached) yes
checking for gcc... cc
checking whether the C compiler (cc -O2 -pipe ) works... yes
checking whether the C compiler (cc -O2 -pipe ) is a cross-compiler... no
checking whether we are using GNU C... (cached) yes
checking whether cc accepts -g... (cached) yes
checking how to run the C preprocessor... cc -E
checking for a BSD compatible install...
/usr/ports/pobj/libelf-0.8.13/bin/install -c
checking for ranlib... ranlib
checking whether ln -s works... yes
checking for ANSI C header files... (cached) yes
checking for unistd.h... (cached) yes
checking for stdint.h... (cached) yes
checking for fcntl.h... (cached) yes
checking for elf.h... yes
checking for sys/elf.h... no
checking for link.h... yes
checking for sys/link.h... no
checking if cc can compile elf.h... no
checking for ar.h... yes
checking for libelf.h... no
checking for nlist.h... (cached) yes
checking for gelf.h... no
checking whether to install ,  and ... no
checking for working const... (cached) yes
checking for off_t... (cached) yes
checking for size_t... (cached) yes
checking size of short... (cached) 2
checking size of int... 4
checking size of long... 8
checking size of long long... (cached) 8
checking size of __int64... 0
checking for 64-bit integer... long
checking for 32-bit integer... int
checking for 16-bit integer... short
checking for unistd.h... (cached) yes
checking for getpagesize... (cached) yes
checking for working mmap... (cached) yes
checking for ftruncate... (cached) yes
checking for memcmp... (cached) yes
checking for memcpy... (cached) yes
checking for memmove... (cached) yes
checking for memset... (cached) yes
checking whether overlapping arrays are copied correctly... yes
checking the coffee machine... empty - operator may not work as expected
checking whether 64-bit ELF support is sufficient... yes
checking whether to include 64-bit support... yes
checking whether versioning support is sufficient... yes
checking whether to include versioning support... yes
checking whether NLS is requested... no
checking for gettext in -lintl... no
checking host system type... x86_64-unknown-openbsd6.1
checking whether to build a shared library... yes
checking whether GNU naming conventions are requested... no
checking for ld... /usr/bin/ld
updating cache ./config.cache
creating ./config.status
creating Makefile
creating lib/Makefile
creating po/Makefile
creating libelf.pc
creating config.h
creating lib/sys_elf.h
===>  Building for libelf-0.8.13p3
making all in lib
if test -n "-fPIC -DPIC"; then  cc -c -DHAVE_CONFIG_H -I.. -I. -I.
-O2 -pipe  -fPIC -DPIC begin.c && mv -f begin.o begin.os;  else true;
fi
begin.c:110:20: warning: comparison of unsigned expression < 0 is
always false [-Wtautological-compare]
if (arf->e_off < 0 || arf->e_off > arf->e_size) {
~~ ^ ~
begin.c:142:14: warning: comparison of unsigned expression < 0 is
always false [-Wtautological-compare]
if (tmp < 0 || tmp >= arf->e_strlen) {
~~~ ^ ~
2 warnings generated.
cc -c -DHAVE_CONFIG_H -I.. -I. -I.  -O2 -pipe  begin.c
begin.c:110:20: warning: comparison of unsigned expression < 0 is
always false [-Wtautological-compare]
if (arf->e_off < 0 || arf->e_off > arf->e_size) {
~~ ^ ~
begin.c:142:14: warning: comparison of unsigned expression < 0 is
always false [-Wtautological-compare]
if (tmp < 0 || tmp >= 

Re: clang breakage: memtest86+

[Klemens Nanni]

On Thu, Aug 10, 2017 at 03:21:13PM -0400, Jeremie Courreges-Anglas wrote:
> 
> I've cooked a diff to allow building memtest86+ with clang.  Great.  The
> problem is that I just get a black screen on this x61 laptop (the only
> noticeable thing is that the cursor stays in the middle of the screen).
> 
> The only problem is, I get the same result with a build with base gcc.
> 
> Could people please apply the diff below, build and install memtest86+,
> and then test it?  Just type
> 
>   > boot memtest
> 
> at the boot(8) prompt.
> 
> Years ago I had tested this on an x240 machine, and I blamed the failure
> on my laptop being too recent.  But maybe that stuff is plain broken
> since years.
> 
> Both i386 and amd64 could be tested, btw.  Thanks in advance.
> 
> PS: earlier I had tried to update the port to the latest version but
> didn't get it to build.  Maybe this time...
> 
> 
> Index: Makefile
> ===
> RCS file: /d/cvs/ports/sysutils/memtest86+/Makefile,v
> retrieving revision 1.10
> diff -u -p -r1.10 Makefile
> --- Makefile  4 Feb 2014 10:14:52 -   1.10
> +++ Makefile  10 Aug 2017 07:37:10 -
> @@ -3,6 +3,9 @@
>  
>  ONLY_FOR_ARCHS=  amd64 i386
>  
> +# XXX base gcc
> +CC=  /usr/bin/gcc
> +
>  COMMENT= thorough, stand alone memory test
>  VERSION= 4.20
>  DISTNAME=memtest86+-${VERSION}
Works fine here with your patch on my amd64 X230.

Any particular reasons we're still at 4.20 instead of 5.01?

Re: fetchmail segfault fix

[Jeremie Courreges-Anglas]

On Thu, Aug 10 2017, Alexander Bluhm  wrote:
> Hi,
>
> I see sporadic crashes in fetchmail I would like to fix.
>
> ok?

Looks right, ok jca@

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

CVS: cvs.openbsd.org: ports

[Juan Francisco Cantero Hurtado]

CVSROOT:/cvs
Module name:ports
Changes by: juan...@cvs.openbsd.org 2017/08/10 13:40:58

Modified files:
devel/mercurial: Makefile distinfo 

Log message:
Update to mercurial 4.2.3.

https://www.mercurial-scm.org/pipermail/mercurial/2017-August/050522.html

CVE-2017-1000115:

Mercurial's symlink auditing was incomplete prior to 4.3, and could be abused
to write to files outside the repository.

CVE-2017-1000116:

Mercurial was not sanitizing hostnames passed to ssh, allowing shell injection
attacks by specifying a hostname starting with -oProxyCommand.

CVS: cvs.openbsd.org: ports

[Juan Francisco Cantero Hurtado]

CVSROOT:/cvs
Module name:ports
Changes by: juan...@cvs.openbsd.org 2017/08/10 13:40:01

Modified files:
devel/tortoisehg: Tag: OPENBSD_6_1 Makefile distinfo 
devel/tortoisehg/pkg: Tag: OPENBSD_6_1 PLIST 

Log message:
Update to tortoisehg 4.2.2. We need to update this package to keep in
sync it with the latest mercurial release, updated due to security bugs.

CVS: cvs.openbsd.org: ports

[Juan Francisco Cantero Hurtado]

CVSROOT:/cvs
Module name:ports
Changes by: juan...@cvs.openbsd.org 2017/08/10 13:36:59

Modified files:
devel/mercurial: Tag: OPENBSD_6_1 Makefile distinfo 
devel/mercurial/pkg: Tag: OPENBSD_6_1 DESCR-main PLIST-main 
Added files:
devel/mercurial/patches: Tag: OPENBSD_6_1 
 patch-tests_test-clonebundles_t 
Removed files:
devel/mercurial/patches: Tag: OPENBSD_6_1 patch-contrib_hg-ssh 
 patch-mercurial_dispatch_py 
 patch-tests_test-ssh_t 

Log message:
Update to mercurial 4.2.3.

https://www.mercurial-scm.org/pipermail/mercurial/2017-August/050522.html

CVE-2017-1000115:

Mercurial's symlink auditing was incomplete prior to 4.3, and could be abused
to write to files outside the repository.

CVE-2017-1000116:

Mercurial was not sanitizing hostnames passed to ssh, allowing shell injection
attacks by specifying a hostname starting with -oProxyCommand.

clang breakage: memtest86+

[Jeremie Courreges-Anglas]

I've cooked a diff to allow building memtest86+ with clang.  Great.  The
problem is that I just get a black screen on this x61 laptop (the only
noticeable thing is that the cursor stays in the middle of the screen).

The only problem is, I get the same result with a build with base gcc.

Could people please apply the diff below, build and install memtest86+,
and then test it?  Just type

  > boot memtest

at the boot(8) prompt.

Years ago I had tested this on an x240 machine, and I blamed the failure
on my laptop being too recent.  But maybe that stuff is plain broken
since years.

Both i386 and amd64 could be tested, btw.  Thanks in advance.

PS: earlier I had tried to update the port to the latest version but
didn't get it to build.  Maybe this time...


Index: Makefile
===
RCS file: /d/cvs/ports/sysutils/memtest86+/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile4 Feb 2014 10:14:52 -   1.10
+++ Makefile10 Aug 2017 07:37:10 -
@@ -3,6 +3,9 @@
 
 ONLY_FOR_ARCHS=amd64 i386
 
+# XXX base gcc
+CC=/usr/bin/gcc
+
 COMMENT=   thorough, stand alone memory test
 VERSION=   4.20
 DISTNAME=  memtest86+-${VERSION}

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

Re: Port bulk with

[Stuart Henderson]

On 2017/08/10 20:27, Karel Gardas wrote:
> On Thu, Aug 10, 2017 at 4:46 PM, Christian Weisgerber
>  wrote:
> > On 2017-08-09, Martin Pieuchot  wrote:
> >
> >> So here's a first step, introducing /usr/include/elf.h.  Could some of
> >> you run a bulk with it and report the possible breakages?
> >
> > This breaks devel/libelf, which indirectly takes out about a quarter
> > of the tree.
> 
> Interesting. It does not fail here. But I do have around 14 days old
> current and full version of the patch applied:
> https://www.mail-archive.com/tech@openbsd.org/msg40551.html
> 
> Will try to update and see if there is issue with full version. Thanks
> for testing!
> Karel
> 

Confirmed here on -current i386 too. Conflicting definition of elf_hash()
in libelf's libelf.h.

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2017/08/10 12:40:21

Added files:
telephony/kamailio/patches: 
patch-src_modules_app_jsdt_duk_config_h 

Log message:
Give this a chance to build on sparc64 (and maybe others)

Same duktape header fix as with textproc/calibre.
ok Roman Kravchuk (maintainer)

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2017/08/10 12:38:40

Modified files:
shells/zsh : Makefile distinfo 
shells/zsh/pkg : PLIST 

Log message:
Update ZSH to 5.4.1

ok pea@ juanfra@

CVS: cvs.openbsd.org: ports

[Stefan Sperling]

CVSROOT:/cvs
Module name:ports
Changes by: s...@cvs.openbsd.org2017/08/10 12:13:13

Modified files:
devel/subversion: Tag: OPENBSD_6_1 Makefile distinfo 

Log message:
For 6.1-stable:
Update to Subversion 1.9.7. Fixes CVE-2017-9800, "Arbitrary code execution on
clients through malicious svn+ssh URLs in svn:externals and svn:sync-from-url"
See https://subversion.apache.org/security/CVE-2017-9800-advisory.txt

CVS: cvs.openbsd.org: ports

[Stefan Sperling]

CVSROOT:/cvs
Module name:ports
Changes by: s...@cvs.openbsd.org2017/08/10 12:12:46

Modified files:
devel/subversion: Makefile distinfo 

Log message:
Update to Subversion 1.9.7. Fixes CVE-2017-9800, "Arbitrary code execution on
clients through malicious svn+ssh URLs in svn:externals and svn:sync-from-url"
See https://subversion.apache.org/security/CVE-2017-9800-advisory.txt

fetchmail segfault fix

[Alexander Bluhm]

Hi,

I see sporadic crashes in fetchmail I would like to fix.

ok?

bluhm

Index: mail/fetchmail/Makefile
===
RCS file: /data/mirror/openbsd/cvs/ports/mail/fetchmail/Makefile,v
retrieving revision 1.148
diff -u -p -r1.148 Makefile
--- mail/fetchmail/Makefile 2 Nov 2015 11:56:54 -   1.148
+++ mail/fetchmail/Makefile 10 Aug 2017 17:37:03 -
@@ -5,7 +5,7 @@ COMMENT=mail retrieval utility for POP2
 DISTNAME=  fetchmail-6.3.26
 CATEGORIES=mail
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=fetchmail/}
-REVISION=  0
+REVISION=  1
 
 HOMEPAGE=  http://www.fetchmail.info/
 
Index: mail/fetchmail/patches/patch-socket_c
===
RCS file: /data/mirror/openbsd/cvs/ports/mail/fetchmail/patches/patch-socket_c,v
retrieving revision 1.9
diff -u -p -r1.9 patch-socket_c
--- mail/fetchmail/patches/patch-socket_c   25 Aug 2015 17:44:09 -  
1.9
+++ mail/fetchmail/patches/patch-socket_c   10 Aug 2017 17:59:59 -
@@ -1,11 +1,23 @@
 $OpenBSD: patch-socket_c,v 1.9 2015/08/25 17:44:09 jca Exp $
 
-Fixed upstream
+Reported upstream
+  https://gitlab.com/fetchmail/fetchmail/merge_requests/5
 
+Fixed upstream
   
https://gitlab.com/fetchmail/fetchmail/commit/a2ae6f8d15d7caf815d7bdd13df833fd1b2af5cc
 
 socket.c.orig  Fri Jul 17 22:01:09 2015
-+++ socket.c   Fri Jul 17 22:19:47 2015
+Index: socket.c
+--- socket.c.orig
 socket.c
+@@ -111,7 +111,7 @@ static char *const *parse_plugin(const char *plugin, c
+   return NULL;
+   }
+ 
+-  while (plugin_copy_offset < plugin_copy_len)
++  while (plugin_offset < plugin_len && plugin_copy_offset < 
plugin_copy_len)
+   {   if ((plugin[plugin_offset] == '%') && (plugin[plugin_offset + 
1] == 'h'))
+   {   strcpy(plugin_copy + plugin_copy_offset, host);
+   plugin_offset += 2;
 @@ -914,7 +914,12 @@ int SSLOpen(int sock, char *mycert, char *mykey, const
return -1;
  #endif

Re: [UPDATE] CMake-3.9.0

[David Coppa]

On Thu, 10 Aug 2017, David Coppa wrote:

> 
> Hi all,
> 
> Here's the update to the latest CMake.
> 
> As usual, I'd like to have the attached diff tested in a ports bulk
> build...
> 
> Thanks!
> David

New revision of the diff fixing a problem with FindLua.cmake.

Please, trash the previous one.

Cheers!
David



cmake-3.9.0_rev2.diff.gz
Description: application/gunzip

Re: [fix] kamailio on sparc64

[Roman Kravchuk]

Hi,

If it works for you - maintainer ok.

2017-08-10 19:10 GMT+03:00 Jeremie Courreges-Anglas :

>
> Hi,
>
> kamailio doesn't build on sparc64, please see:
>
>   http://build-failures.rhaalovely.net//sparc64/2017-
> 07-24/telephony/kamailio.log
>
> I've already fixed this kind of issue in textproc/calibre earlier, the
> patch is patches/patch-src_duktape_duktape_duk_config_h.
>
> Test-built on amd64 only.  ok?
>
>
> Index: patches/patch-src_modules_app_jsdt_duk_config_h
> ===
> RCS file: patches/patch-src_modules_app_jsdt_duk_config_h
> diff -N patches/patch-src_modules_app_jsdt_duk_config_h
> --- /dev/null   1 Jan 1970 00:00:00 -
> +++ patches/patch-src_modules_app_jsdt_duk_config_h 10 Aug 2017
> 04:53:41 -
> @@ -0,0 +1,19 @@
> +$OpenBSD$
> +
> +We do have inttypes.h, but gcc-4.2.1 doesn't default to C99 and
> +thus doesn't #define __STDC_VERSION__ 199901L.
> +
> +Index: src/modules/app_jsdt/duk_config.h
> +--- src/modules/app_jsdt/duk_config.h.orig
>  src/modules/app_jsdt/duk_config.h
> +@@ -1557,6 +1557,10 @@
> + #define DUK_F_HAVE_INTTYPES
> + #endif
> +
> ++#ifndef DUK_F_HAVE_INTTYPES
> ++#define DUK_F_HAVE_INTTYPES
> ++#endif
> ++
> + /* Basic integer typedefs and limits, preferably from inttypes.h,
> otherwise
> +  * through automatic detection.
> +  */
>
>
>
> --
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE
>

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2017/08/10 11:27:34

Modified files:
databases/py-apsw: Makefile distinfo 
databases/py-apsw/patches: patch-tests_py 
Added files:
databases/py-apsw/patches: patch-setup_py 

Log message:
update to py-apsw 3.9.2-r1, fix hardcoded gcc in tests

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2017/08/10 10:54:31

Modified files:
www/py-mechanize: Makefile distinfo 
www/py-mechanize/pkg: PLIST 

Log message:
update to py-mechanize-0.3.5

Re: NEW: games/fifengine, games/fifechan

[Jan Klemkow]

Hi Anthony,

On Tue, Aug 08, 2017 at 02:12:16AM -0600, Anthony J. Bentley wrote:
> fifengine
> FIFE is a free, open-source cross-platform game engine. It features
> hardware-accelerated 2D graphics, integrated GUI, audio support, lighting,
> map editor supporting top-down and isometric maps, pathfinding, virtual
> filesystem and more!

I'm unable to build the fifengine because of a dependency conflict:

===> fifengine-0.4.0 depends on: swig->=3.0.12 - default swig-2.0.11p5
does not match

games/fifengine/Makefile: BUILD_DEPENDS = devel/swig>=3.0.12
devel/swig/Makefile: VERSION = 2.0.11

I think you have to update the devel/swig port first.

Bye,
Jan

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2017/08/10 10:41:22

Modified files:
net: Makefile 
net/py-dnspython: Makefile distinfo 
net/py-dnspython/pkg: PLIST 

Log message:
update to py-dnspython 1.15.0
upstream now have unified py2+py3 source, so use it and enable py3 build.

[fix] kamailio on sparc64

[Jeremie Courreges-Anglas]

Hi,

kamailio doesn't build on sparc64, please see:

  
http://build-failures.rhaalovely.net//sparc64/2017-07-24/telephony/kamailio.log

I've already fixed this kind of issue in textproc/calibre earlier, the
patch is patches/patch-src_duktape_duktape_duk_config_h.

Test-built on amd64 only.  ok?


Index: patches/patch-src_modules_app_jsdt_duk_config_h
===
RCS file: patches/patch-src_modules_app_jsdt_duk_config_h
diff -N patches/patch-src_modules_app_jsdt_duk_config_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_modules_app_jsdt_duk_config_h 10 Aug 2017 04:53:41 
-
@@ -0,0 +1,19 @@
+$OpenBSD$
+
+We do have inttypes.h, but gcc-4.2.1 doesn't default to C99 and
+thus doesn't #define __STDC_VERSION__ 199901L.
+
+Index: src/modules/app_jsdt/duk_config.h
+--- src/modules/app_jsdt/duk_config.h.orig
 src/modules/app_jsdt/duk_config.h
+@@ -1557,6 +1557,10 @@
+ #define DUK_F_HAVE_INTTYPES
+ #endif
+ 
++#ifndef DUK_F_HAVE_INTTYPES
++#define DUK_F_HAVE_INTTYPES
++#endif
++
+ /* Basic integer typedefs and limits, preferably from inttypes.h, otherwise
+  * through automatic detection.
+  */



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

Re: libreoffice i386: different fallout now

[Robert Nagy]

Oh this is completely new ... at least i did not know about it :)

So I guess this is i386 only so i am going to setup a VM to see what's up.

On (2017-08-10 16:55), Stuart Henderson wrote:
> I'm going to mark this broken for now, no point wasting cpu cycles
> during build.
> 
> This is now failing here, instead of segfault during build:
> 
> S=/usr/obj/ports/libreoffice-5.2.7.2/libreoffice-5.2.7.2 && I=$S/instdir && 
> W=$S/workdir &&  mkdir -p 
> $W/CxxObject/bridges/source/cpp_uno/gcc3_linux_intel/ 
> $W/Dep/CxxObject/bridges/source/cpp_uno/gcc3_linux_intel/ && cd 
> /usr/obj/ports/libreoffice-5.2.7.2/libreoffice-5.2.7.2 &&   c++ 
> -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED -DCPPU_ENV=gcc3 
> -DINTEL -DNDEBUG -DOPENBSD -DOPTIMIZE -DOSL_DEBUG_LEVEL=0 -DUNIX -DUNX -DX86 
> -D_PTHREADS -D_REENTRANT -D_THREAD_SAFE-DHAVE_GCC_VISIBILITY_FEATURE 
> -fvisibility=hidden   -Wall -Wno-missing-braces -Wnon-virtual-dtor 
> -Wendif-labels -Wextra -Wundef -Wunused-macros -fmessage-length=0 -fno-common 
> -fno-stack-protector -pipe  -Wimplicit-fallthrough  -fstack-protector-strong 
> -fPIC -Wshadow -Woverloaded-virtual -std=gnu++14   -DEXCEPTIONS_ON 
> -fexceptions -O2 -pipe  -fno-omit-frame-pointer -fno-strict-aliasing  
> -mno-avx  -DLIBO_INTERNAL_ONLY  -c 
> $S/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx -o 
> $W/CxxObject/bridges/source/cpp_uno/gcc3_linux_intel/except.o  
> -I$S/bridges/source/cpp_uno/gcc3_linux_intel/ -I$S/bridges/inc  -I$S/include  
> -I/usr/local/include -I/usr/local/jdk-1.8.0/include 
> -I/usr/local/jdk-1.8.0/include/openbsd -I$S/config_host  
> -I$W/UnoApiHeadersTarget/udkapi/comprehensive
> [build CXX] bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx
> /usr/obj/ports/libreoffice-5.2.7.2/libreoffice-5.2.7.2/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx:327:9:
>  warning: unannotated fall-through between switch labels 
> [-Wimplicit-fallthrough]
> default:
> ^
> /usr/obj/ports/libreoffice-5.2.7.2/libreoffice-5.2.7.2/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx:327:9:
>  note: insert 'SAL_FALLTHROUGH;' to silence this warning
> default:
> ^
> SAL_FALLTHROUGH;
> /usr/obj/ports/libreoffice-5.2.7.2/libreoffice-5.2.7.2/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx:327:9:
>  note: insert 'break;' to avoid fall-through
> default:
> ^
> break;
> /usr/obj/ports/libreoffice-5.2.7.2/libreoffice-5.2.7.2/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx:164:32:
>  error: unknown type name '__si_class_type_info'
> rtti = new __si_class_type_info(
>^
> /usr/obj/ports/libreoffice-5.2.7.2/libreoffice-5.2.7.2/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx:170:32:
>  error: unknown type name '__class_type_info'
> rtti = new __class_type_info( strdup( rttiName ) );
>^
> 1 warning generated.
> 2 errors generated.
> 

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2017/08/10 10:00:23

Modified files:
databases/sqlite3: Makefile distinfo 

Log message:
Update to sqlite3 3.20.0.

Fixes CVE-2017-10989 ('The getNodeSize function in ext/rtree/rtree.c in
SQLite through 3.19.3, as used in GDAL and other products, mishandles
undersized RTree blobs in a crafted database, leading to a heap-based
buffer over-read or possibly unspecified other impact.')

The standalone fix itself is at
https://sqlite.org/src/vpatch?from=0db20efe201736b3=66de6f4a9504ec26

Pass -DSQLITE_ENABLE_FTS3 via CFLAGS, as it apparently fixes build
issues with mozilla (from FreeBSD r447626 via naddy@)

libreoffice i386: different fallout now

[Stuart Henderson]

I'm going to mark this broken for now, no point wasting cpu cycles
during build.

This is now failing here, instead of segfault during build:

S=/usr/obj/ports/libreoffice-5.2.7.2/libreoffice-5.2.7.2 && I=$S/instdir && 
W=$S/workdir &&  mkdir -p $W/CxxObject/bridges/source/cpp_uno/gcc3_linux_intel/ 
$W/Dep/CxxObject/bridges/source/cpp_uno/gcc3_linux_intel/ && cd 
/usr/obj/ports/libreoffice-5.2.7.2/libreoffice-5.2.7.2 &&   c++ 
-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED -DCPPU_ENV=gcc3 
-DINTEL -DNDEBUG -DOPENBSD -DOPTIMIZE -DOSL_DEBUG_LEVEL=0 -DUNIX -DUNX -DX86 
-D_PTHREADS -D_REENTRANT -D_THREAD_SAFE-DHAVE_GCC_VISIBILITY_FEATURE 
-fvisibility=hidden   -Wall -Wno-missing-braces -Wnon-virtual-dtor 
-Wendif-labels -Wextra -Wundef -Wunused-macros -fmessage-length=0 -fno-common 
-fno-stack-protector -pipe  -Wimplicit-fallthrough  -fstack-protector-strong 
-fPIC -Wshadow -Woverloaded-virtual -std=gnu++14   -DEXCEPTIONS_ON -fexceptions 
-O2 -pipe  -fno-omit-frame-pointer -fno-strict-aliasing  -mno-avx  
-DLIBO_INTERNAL_ONLY  -c $S/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx 
-o $W/CxxObject/bridges/source/cpp_uno/gcc3_linux_intel/except.o  
-I$S/bridges/source/cpp_uno/gcc3_linux_intel/ -I$S/bridges/inc  -I$S/include  
-I/usr/local/include -I/usr/local/jdk-1.8.0/include 
-I/usr/local/jdk-1.8.0/include/openbsd -I$S/config_host  
-I$W/UnoApiHeadersTarget/udkapi/comprehensive
[build CXX] bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx
/usr/obj/ports/libreoffice-5.2.7.2/libreoffice-5.2.7.2/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx:327:9:
 warning: unannotated fall-through between switch labels 
[-Wimplicit-fallthrough]
default:
^
/usr/obj/ports/libreoffice-5.2.7.2/libreoffice-5.2.7.2/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx:327:9:
 note: insert 'SAL_FALLTHROUGH;' to silence this warning
default:
^
SAL_FALLTHROUGH;
/usr/obj/ports/libreoffice-5.2.7.2/libreoffice-5.2.7.2/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx:327:9:
 note: insert 'break;' to avoid fall-through
default:
^
break;
/usr/obj/ports/libreoffice-5.2.7.2/libreoffice-5.2.7.2/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx:164:32:
 error: unknown type name '__si_class_type_info'
rtti = new __si_class_type_info(
   ^
/usr/obj/ports/libreoffice-5.2.7.2/libreoffice-5.2.7.2/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx:170:32:
 error: unknown type name '__class_type_info'
rtti = new __class_type_info( strdup( rttiName ) );
   ^
1 warning generated.
2 errors generated.

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2017/08/10 09:55:03

Modified files:
editors/libreoffice: Makefile 

Log message:
mark BROKEN-i386 to save half an hour of build time. current failure:

/usr/obj/ports/libreoffice-5.2.7.2/libreoffice-5.2.7.2/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx:164:32:
 error: unknown type name '__si_class_type_info'
/usr/obj/ports/libreoffice-5.2.7.2/libreoffice-5.2.7.2/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx:170:32:
 error: unknown type name '__class_type_info'

previously failed with segfaults during build.

[UPDATE] CMake-3.9.0

[David Coppa]

Hi all,

Here's the update to the latest CMake.

As usual, I'd like to have the attached diff tested in a ports bulk
build...

Thanks!
David

Index: Makefile
===
RCS file: /cvs/ports/devel/cmake/Makefile,v
retrieving revision 1.161
diff -u -p -u -p -r1.161 Makefile
--- Makefile26 Jul 2017 22:45:17 -  1.161
+++ Makefile10 Aug 2017 15:21:38 -
@@ -4,10 +4,9 @@ DPB_PROPERTIES =parallel
 
 COMMENT =  portable build system
 
-VER =  3.7.2
+VER =  3.9.0
 DISTNAME = cmake-${VER}
 CATEGORIES =   devel
-REVISION = 4
 
 HOMEPAGE = https://www.cmake.org/
 
@@ -19,7 +18,7 @@ MASTER_SITES =${HOMEPAGE}files/v${VER:R
 PERMIT_PACKAGE_CDROM = Yes
 
 WANTLIB += archive c curl expat form jsoncpp m ncurses pthread
-WANTLIB += ${COMPILER_LIBCXX} z
+WANTLIB += rhash ${COMPILER_LIBCXX} z
 
 # XXX: Ninja is broken on m88k
 .if ${MACHINE_ARCH} != "m88k"
@@ -30,7 +29,8 @@ BUILD_DEPENDS +=  textproc/py-sphinx>=1.4
 
 LIB_DEPENDS =  archivers/libarchive \
devel/jsoncpp \
-   net/curl
+   net/curl \
+   security/rhash
 
 CONFIGURE_STYLE =  simple
 CONFIGURE_ARGS =   --prefix=${PREFIX} \
Index: distinfo
===
RCS file: /cvs/ports/devel/cmake/distinfo,v
retrieving revision 1.47
diff -u -p -u -p -r1.47 distinfo
--- distinfo16 Jan 2017 08:51:50 -  1.47
+++ distinfo10 Aug 2017 15:21:38 -
@@ -1,2 +1,2 @@
-SHA256 (cmake-3.7.2.tar.gz) = 3BJGxObRaOpNbgQs+6V3wazWX+6iflb1/zffkgwwyuA=
-SIZE (cmake-3.7.2.tar.gz) = 7361593
+SHA256 (cmake-3.9.0.tar.gz) = FncBUlGD27ciuf/mn7UlqiuBeYzxL1zhwCDJM5Tfrg8=
+SIZE (cmake-3.9.0.tar.gz) = 7691313
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/devel/cmake/patches/patch-CMakeLists_txt,v
retrieving revision 1.22
diff -u -p -u -p -r1.22 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt28 Nov 2016 09:15:13 -  1.22
+++ patches/patch-CMakeLists_txt10 Aug 2017 15:21:38 -
@@ -1,7 +1,8 @@
 $OpenBSD: patch-CMakeLists_txt,v 1.22 2016/11/28 09:15:13 dcoppa Exp $
 CMakeLists.txt.origFri Nov 11 15:37:13 2016
-+++ CMakeLists.txt Sat Nov 26 15:18:08 2016
-@@ -274,6 +274,15 @@ macro (CMAKE_BUILD_UTILITIES)
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
 CMakeLists.txt
+@@ -305,6 +305,15 @@ macro (CMAKE_BUILD_UTILITIES)
  CMAKE_SET_TARGET_FOLDER(${KWSYS_NAMESPACE}TestSharedForward 
"${kwsys_folder}")
endif()
  
@@ -17,7 +18,17 @@ $OpenBSD: patch-CMakeLists_txt,v 1.22 20
#-
# Setup third-party libraries.
# Everything in the tree should be able to include files from the
-@@ -453,7 +462,8 @@ macro (CMAKE_BUILD_UTILITIES)
+@@ -342,7 +351,8 @@ macro (CMAKE_BUILD_UTILITIES)
+   message(FATAL_ERROR
+ "CMAKE_USE_SYSTEM_LIBRHASH is ON but LibRHash is not found!")
+ endif()
+-set(CMAKE_LIBRHASH_LIBRARIES LibRHash::LibRHash)
++set(CMAKE_LIBRHASH_INCLUDES ${LibRHash_INCLUDE_DIRS})
++set(CMAKE_LIBRHASH_LIBRARIES ${LibRHash_LIBRARIES})
+   else()
+ set(CMAKE_LIBRHASH_LIBRARIES cmlibrhash)
+ add_subdirectory(Utilities/cmlibrhash)
+@@ -512,7 +522,8 @@ macro (CMAKE_BUILD_UTILITIES)
message(FATAL_ERROR
  "CMAKE_USE_SYSTEM_JSONCPP is ON but a JsonCpp is not found!")
  endif()
@@ -27,7 +38,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.22 20
else()
  set(CMAKE_JSONCPP_LIBRARIES cmjsoncpp)
  add_subdirectory(Utilities/cmjsoncpp)
-@@ -463,7 +473,7 @@ macro (CMAKE_BUILD_UTILITIES)
+@@ -522,7 +533,7 @@ macro (CMAKE_BUILD_UTILITIES)
#-
# Build libuv library.
if(NOT DEFINED CMAKE_USE_LIBUV)
@@ -36,7 +47,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.22 20
  if(APPLE)
include(CheckCSourceCompiles)
check_c_source_compiles("
-@@ -499,7 +509,8 @@ int main(void) { return 0; }
+@@ -552,7 +563,8 @@ int main(void) { return 0; }
  message(FATAL_ERROR
"CMAKE_USE_SYSTEM_LIBUV is ON but a libuv is not found!")
endif()
Index: patches/patch-Modules_CMakeCInformation_cmake
===
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_CMakeCInformation_cmake,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-Modules_CMakeCInformation_cmake
--- patches/patch-Modules_CMakeCInformation_cmake   28 Nov 2016 09:15:13 
-  1.5
+++ patches/patch-Modules_CMakeCInformation_cmake   10 Aug 2017 15:21:38 
-
@@ -1,7 +1,8 @@
 $OpenBSD: patch-Modules_CMakeCInformation_cmake,v 1.5 2016/11/28 09:15:13 
dcoppa Exp $
 Modules/CMakeCInformation.cmake.orig   Fri Nov 11 15:37:13 2016
-+++ 

Re: UPDATE: mail/isync 1.2.1 to 1.2.2

[Daniel Jakots]

On Thu, 10 Aug 2017 10:07:34 +0200, Klemens Nanni 
wrote:

> Does anyone want to commit this?

Thanks, committed!

[NEW] net/obfs4proxy

[attila]

Hi ports@,

The first Pluggable Transports port: net/obfs4proxy

$ cat pkg/DESCR
obfs4 (a.k.a. The Obfuscator) is a transport with the same features as
ScrambleSuit but utilizing Dan Bernstein's elligator2 technique for
public key obfuscation, and the ntor protocol for one-way
authentication. This results in a faster protocol.

Depends on the other three I just posted: devel/go-goptlib,
security/go-{ed25519,siphash}.

Port attached.

Pax, -A
--
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF


obfs4proxy.tgz
Description: net/obfs4proxy

CVS: cvs.openbsd.org: ports

[Daniel Jakots]

CVSROOT:/cvs
Module name:ports
Changes by: d...@cvs.openbsd.org2017/08/10 09:08:54

Modified files:
mail/isync : Makefile distinfo 
Added files:
mail/isync/patches: patch-src_socket_c 

Log message:
Update to isync-1.2.2

Based on a diff from Klemens Nanni, ok dcoppa@ jca@

[NEW] security/go-siphash

[attila]

Hi ports@,

Third dependency for net/obfs4proxy: security/go-siphash

$ cat pkg/DESCR
Go implementation of SipHash-2-4, a fast short-input PRF created by
Jean-Philippe Aumasson and Daniel J. Bernstein.

Pax, -A
--
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF


go-siphash.tgz
Description: SipHash in Golang

[NEW] security/go-ed25519

[attila]

Hi ports@,

Second of the dependencies for net/obfs4proxy: go-ed25519

Port attached.  Feedback welcome.

Pax, -A
--
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF


go-ed25519.tgz
Description: ed2551 in Go

[NEW] devel/go-goptlib

[attila]

Hi ports@,

This is the first of four new ports that are part of Pluggable
Transports, which are used in the Tor Browser Bundle but which can
also be used without it.  The main port is net/obfs4proxy, which needs
three others to support it: devel/go-goptlib, security/go-ed25519,
security/go-siphash.

This is devel/go-goptlib:

$ cat pkg/DESCR
goptlib is a library for writing Tor pluggable transports in Go.

https://spec.torproject.org/pt-spec
https://gitweb.torproject.org/torspec.git/tree/proposals/196-transport-control-ports.txt
https://gitweb.torproject.org/torspec.git/tree/proposals/217-ext-orport-auth.txt
https://gitweb.torproject.org/torspec.git/tree/proposals/232-pluggable-transports-through-proxy.txt

There is browseable documentation here:
https://godoc.org/git.torproject.org/pluggable-transports/goptlib.git

Report bugs to the tor-...@lists.torproject.org mailing list or to the
bug tracker at https://trac.torproject.org/projects/tor.

To the extent possible under law, the authors have dedicated all
copyright and related and neighboring rights to this software to the
public domain worldwide. This software is distributed without any
warranty. See COPYING.


Port attached.  Feedback most welcome.

Pax, -A
--
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF


go-goptlib.tgz
Description: new port: devel/go-goptlib

CVS: cvs.openbsd.org: ports

[Pierre-Emmanuel Andre]

CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2017/08/10 08:55:49

Modified files:
security/gnupg2: Makefile distinfo 

Log message:
Update to 2.1.23

ok abieber@

Re: Port bulk with

[Christian Weisgerber]

On 2017-08-09, Martin Pieuchot  wrote:

> So here's a first step, introducing /usr/include/elf.h.  Could some of
> you run a bulk with it and report the possible breakages?

This breaks devel/libelf, which indirectly takes out about a quarter
of the tree.


>>> Building on amd64-3 under devel/libelf
 BDEPENDS = [devel/metaauto;devel/autoconf/2.13]
 DIST = [devel/libelf:libelf-0.8.13.tar.gz]
 FULLPKGNAME = libelf-0.8.13p3
(Junk lock obtained for amd64-3 at 1502321695)
>>> Running depends in devel/libelf at 1502321695
/usr/sbin/pkg_add -aI -Dunsigned -Drepair autoconf-2.13p4 metaauto-1.0p1
was: /usr/sbin/pkg_add -aI -Dunsigned -Drepair autoconf-2.13p4 metaauto-1.0p1
/usr/sbin/pkg_add -aI -Dunsigned -Drepair autoconf-2.13p4 metaauto-1.0p1
>>> Running show-prepare-results in devel/libelf at 1502321695
===> devel/libelf
===> libelf-0.8.13p3 depends on: metaauto-* -> metaauto-1.0p1
===> libelf-0.8.13p3 depends on: autoconf-2.13 -> autoconf-2.13p4
autoconf-2.13p4
metaauto-1.0p1
(Junk lock released for amd64-3 at 1502321696)
distfiles size=148529
>>> Running build in devel/libelf at 1502321696
===> devel/libelf
===>  Checking files for libelf-0.8.13p3
`/usr/ports/distfiles/libelf-0.8.13.tar.gz' is up to date.
>> (SHA256) libelf-0.8.13.tar.gz: OK
===>  Extracting for libelf-0.8.13p3
===>  Patching for libelf-0.8.13p3
===>   Applying OpenBSD patch patch-aclocal_m4
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--
|$OpenBSD: patch-aclocal_m4,v 1.4 2012/05/19 08:24:50 sthen Exp $
|--- aclocal.m4.origFri May 23 04:17:56 2008
|+++ aclocal.m4 Fri May 18 22:53:37 2012
--
Patching file aclocal.m4 using Plan A...
Hunk #1 succeeded at 288.
done
===>  Compiler link: clang -> /usr/bin/clang
===>  Compiler link: clang++ -> /usr/bin/clang++
===>  Compiler link: cc -> /usr/bin/cc
===>  Compiler link: c++ -> /usr/bin/c++
Running autoconf-2.13 in /usr/obj/ports/libelf-0.8.13/libelf-0.8.13
Running autoheader-2.13 in /usr/obj/ports/libelf-0.8.13/libelf-0.8.13
===>  Configuring for libelf-0.8.13p3
Using /usr/obj/ports/libelf-0.8.13/config.site (generated)
loading site script /usr/obj/ports/libelf-0.8.13/config.site
creating cache ./config.cache
checking whether make sets ${MAKE}... (cached) yes
checking for gcc... cc
checking whether the C compiler (cc -O2 -pipe ) works... yes
checking whether the C compiler (cc -O2 -pipe ) is a cross-compiler... no
checking whether we are using GNU C... (cached) yes
checking whether cc accepts -g... (cached) yes
checking how to run the C preprocessor... cc -E
checking for a BSD compatible install... 
/usr/obj/ports/libelf-0.8.13/bin/install -c 
checking for ranlib... ranlib
checking whether ln -s works... yes
checking for ANSI C header files... (cached) yes
checking for unistd.h... (cached) yes
checking for stdint.h... (cached) yes
checking for fcntl.h... (cached) yes
checking for elf.h... yes
checking for sys/elf.h... no
checking for link.h... yes
checking for sys/link.h... no
checking if cc can compile elf.h... yes
checking for ar.h... yes
checking for libelf.h... no
checking for nlist.h... (cached) yes
checking for gelf.h... no
checking whether to install ,  and ... no
checking for working const... (cached) yes
checking for off_t... (cached) yes
checking for size_t... (cached) yes
checking size of short... (cached) 2
checking size of int... 4
checking size of long... 8
checking size of long long... (cached) 8
checking size of __int64... 0
checking for struct Elf32_Dyn... yes
checking for struct nlist in elf.h... no
checking for struct Elf64_Ehdr... yes
checking for Elf64_Addr... yes
checking for struct Elf64_Rel... yes
checking for Elf32_Verdef... no
checking for Elf64_Verdef... no
checking for SHT_SUNW_verdef... no
checking for SHT_GNU_verdef... no
checking for 64-bit integer... long
checking for 32-bit integer... int
checking for 16-bit integer... short
checking for unistd.h... (cached) yes
checking for getpagesize... (cached) yes
checking for working mmap... (cached) yes
checking for ftruncate... (cached) yes
checking for memcmp... (cached) yes
checking for memcpy... (cached) yes
checking for memmove... (cached) yes
checking for memset... (cached) yes
checking whether overlapping arrays are copied correctly... yes
checking the coffee machine... empty - operator may not work as expected
checking whether 64-bit ELF support is sufficient... yes
checking whether to include 64-bit support... yes
checking whether versioning support is sufficient... no
checking whether to include versioning support... no
checking whether NLS is requested... no
checking for gettext in -lintl... no
checking host system type... x86_64-unknown-openbsd6.1
checking whether to build a shared library... yes
checking whether GNU naming conventions are requested... no
checking for ld... /usr/bin/ld
updating cache ./config.cache
creating ./config.status
creating Makefile
creating 

Re: UPDATE x11/tint2-0.12.2 -> 0.14.6

[Brian Callahan]

Hi Scott --

I'll take a look at this later today.

~Brian

On 08/09/17 20:01, Heppler, J. Scott wrote:

A revised diff to update x11/tint2 is attached.  Upstream has added 2
new features:  1)  Configurable "Buttons" that attach an icon to a
command.  2) Shell script "Executors" with examples for Network
monitoring and disk usage.

Changelog here:
https://github.com/o9000/tint2

I cvs add'd/rm;d the revised patches and portchecked.

Testers and feedback appreciated.

CVS: cvs.openbsd.org: ports

[Alexander Bluhm]

CVSROOT:/cvs
Module name:ports
Changes by: bl...@cvs.openbsd.org   2017/08/10 08:07:34

Modified files:
telephony/p5-Net-SIP: Makefile distinfo 

Log message:
update p5-Net-SIP to 0.810

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2017/08/10 07:50:37

Modified files:
graphics/clutter/clutter-gtk: Makefile distinfo 
graphics/clutter/clutter-gtk/pkg: PLIST 

Log message:
update to clutter-gtk-1.8.4

Re: UPDATE: lang/swi-prolog

[Edd Barrett]

On Sun, Jul 16, 2017 at 10:09:18PM +0100, Edd Barrett wrote:
> Here is an updated diff with the SSL module back. I'd be happy to commit
> this if there is an OK.

In case anyone was planning to test this, hold off. The upcoming 7.5.x
stable releases of SWI will support OpenBSD much better.

I'll go straight to those.

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk

Re: newer boost?

[Landry Breuil]

On Thu, Aug 10, 2017 at 12:49:01PM +0200, Rafael Sadowski wrote:
> On Thu Aug 10, 2017 at 12:08:05PM +0200, Reyk Floeter wrote:
> > Hi,
> > 
> > I've only found the recent "devel/boost vs. clang" mail, so I have a
> > question: is there any attempt to update boost to the latest version
> > or is there a known problem with it?
> > 
> > I see that the port has been fixed for clang but boost 1.58.0 is quite
> > old while the latest stable version is 1.64.0.  I tried to compile
> > solidity but it fails with all kinds of boost-related errors and at
> > least a few of them have been fixed in newer releases.
> > 
> > Reyk
> 
> I've tried an boost update some months ago without without success but
> I'm sure after the COMPILER work from espie@ it should be possible.
> 
> I'll try it!

As long as you test/don't break the clang-impaired archs ( and im sure a
newer boost will come with funky requirements on language features not
provided by gcc 4.9...) .. right now we have boost on aarch64 alpha
amd64 arm hppa i386 mips64 powerpc sparc64 - just sayin' :)

Landry

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2017/08/10 07:32:55

Modified files:
sysutils/virt-what/patches: patch-virt-what_in 

Log message:
missing have_cpuinfo check merged upstream

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2017/08/10 07:32:25

Modified files:
x11: Makefile 

Log message:
+bspwm
+sxhkd

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2017/08/10 07:30:26

Log message:
import bspwm-0.9.3

bspwm is a tiling window manager that represents windows as the leaves
of a full binary tree.

ok jca@ sthen@

Status:

Vendor Tag: jasper
Release Tags:   jasper_20171008

N ports/x11/bspwm/Makefile
N ports/x11/bspwm/distinfo
N ports/x11/bspwm/pkg/PLIST
N ports/x11/bspwm/pkg/DESCR
N ports/x11/bspwm/patches/patch-Makefile
N ports/x11/bspwm/patches/patch-examples_bspwmrc

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2017/08/10 07:30:00

Log message:
import sxhkd-0.5.8

sxhkd is an X daemon that reacts to input events by executing commands.
Its configuration file is a series of bindings that define the
associations between the input events and the commands.

ok jca@ sthen@

Status:

Vendor Tag: jasper
Release Tags:   jasper_20171008

N ports/x11/sxhkd/distinfo
N ports/x11/sxhkd/Makefile
N ports/x11/sxhkd/pkg/PLIST
N ports/x11/sxhkd/pkg/DESCR
N ports/x11/sxhkd/patches/patch-Makefile

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2017/08/10 07:28:42

Modified files:
textproc/extract_url: Makefile distinfo 

Log message:
have DISTNAME match GH_PROJECT and drop unneeded VERSION

ok feinerer@ (MAINTAINER)

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2017/08/10 06:24:10

Modified files:
sysutils   : Makefile 

Log message:
+virt-what

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2017/08/10 06:23:28

Log message:
import virt-what-1.18

virt-what is a shell script which can be used to detect if the program
is running in a virtual machine.

virt-what supports a very large number of different hypervisor types,
including common open source hypervisors (KVM, Xen, QEMU, VirtualBox,
VMM), mainframe systems like IBM Systemz, LPAR, z/VM, hardware
partitioning schemes like Hitachi Virtage, proprietary hypervisors like
VMWare, Microsoft Hyper-V and much more.

patches to add support for detecting vmm were merged upstream already
ok landry@

Status:

Vendor Tag: jasper
Release Tags:   jasper_20171008

N ports/sysutils/virt-what/distinfo
N ports/sysutils/virt-what/Makefile
N ports/sysutils/virt-what/pkg/PLIST
N ports/sysutils/virt-what/pkg/DESCR
N ports/sysutils/virt-what/patches/patch-virt-what_in

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2017/08/10 06:01:20

Modified files:
multimedia/x264: Makefile distinfo 
multimedia/x264/patches: patch-Makefile patch-configure 

Log message:
update to x264-20170717, from Brad

Re: newer boost?

[Rafael Sadowski]

On Thu Aug 10, 2017 at 12:08:05PM +0200, Reyk Floeter wrote:
> Hi,
> 
> I've only found the recent "devel/boost vs. clang" mail, so I have a
> question: is there any attempt to update boost to the latest version
> or is there a known problem with it?
> 
> I see that the port has been fixed for clang but boost 1.58.0 is quite
> old while the latest stable version is 1.64.0.  I tried to compile
> solidity but it fails with all kinds of boost-related errors and at
> least a few of them have been fixed in newer releases.
> 
> Reyk

I've tried an boost update some months ago without without success but
I'm sure after the COMPILER work from espie@ it should be possible.

I'll try it!

Rafael

Re: UPDATE: mail/isync 1.2.1 to 1.2.2

[David Coppa]

On Thu, Aug 10, 2017 at 5:33 AM, Daniel Jakots  wrote:
> On Thu, 10 Aug 2017 02:53:59 +0200, Klemens Nanni 
> wrote:
>
>> > I'm not entirely sure yet whether the introduced patch to get
>> > X509_OBJECT_get0_X509() and X509_STORE_get0_objects() working is the
>> > way to go, maybe someone more knowledgable about OpenSSL internals
>> > can comment/fix this?
>
>> +-# if OPENSSL_VERSION_NUMBER < 0x1010L
>> ++/*# if OPENSSL_VERSION_NUMBER < 0x1010L*/
>
> That's not the best way to fix it. Here's an updated diff that also
> addresses the fact it doesn't build with gcc4.2:
>
> /usr/ports/pobj/isync-1.2.2/isync-1.2.2/src/util.c: In function 'map_name':
> /usr/ports/pobj/isync-1.2.2/isync-1.2.2/src/util.c:526: error: #pragma GCC 
> diagnostic not allowed inside functions
>
> Cheers,
> Daniel
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/mail/isync/Makefile,v
> retrieving revision 1.30
> diff -u -p -r1.30 Makefile
> --- Makefile20 Dec 2015 09:59:22 -  1.30
> +++ Makefile10 Aug 2017 03:26:41 -
> @@ -2,7 +2,7 @@
>
>  COMMENT=   synchronize IMAP4 and maildir mailboxes
>
> -DISTNAME=  isync-1.2.1
> +DISTNAME=  isync-1.2.2
>  CATEGORIES=mail
>  MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=isync/}
>
> @@ -12,6 +12,8 @@ HOMEPAGE= http://isync.sourceforge.net/
>  PERMIT_PACKAGE_CDROM=  Yes
>
>  WANTLIB= c crypto db sasl2 ssl z
> +
> +COMPILER=  clang gcc
>
>  LIB_DEPENDS=   databases/db/v4 \
> security/cyrus-sasl2
> Index: distinfo
> ===
> RCS file: /cvs/ports/mail/isync/distinfo,v
> retrieving revision 1.11
> diff -u -p -r1.11 distinfo
> --- distinfo20 Dec 2015 09:59:22 -  1.11
> +++ distinfo10 Aug 2017 03:26:41 -
> @@ -1,2 +1,2 @@
> -SHA256 (isync-1.2.1.tar.gz) = 5xbeKMmgjmJKA1yq45AvzztRFVO+XWFRehM+A6o1Mq4=
> -SIZE (isync-1.2.1.tar.gz) = 281990
> +SHA256 (isync-1.2.2.tar.gz) = 2Rl+J7/nfj2JcfT8sl7DeyUGgnxLyUObcjdsqgkc6Hc=
> +SIZE (isync-1.2.2.tar.gz) = 285745
> Index: patches/patch-src_socket_c
> ===
> RCS file: patches/patch-src_socket_c
> diff -N patches/patch-src_socket_c
> --- /dev/null   1 Jan 1970 00:00:00 -
> +++ patches/patch-src_socket_c  10 Aug 2017 03:26:45 -
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +
> +Index: src/socket.c
> +--- src/socket.c.orig
>  src/socket.c
> +@@ -40,7 +40,7 @@
> + # include 
> + # include 
> + # include 
> +-# if OPENSSL_VERSION_NUMBER < 0x1010L
> ++# if OPENSSL_VERSION_NUMBER < 0x1010L || 
> defined(LIBRESSL_VERSION_NUMBER)
> + #  define X509_OBJECT_get0_X509(o) ((o)->data.x509)
> + #  define X509_STORE_get0_objects(o) ((o)->objs)
> + # endif
>

ok dcoppa@

Ciao!
David

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2017/08/10 04:29:01

Modified files:
devel/llvm : Makefile 
devel/llvm/patches: patch-tools_clang_lib_Sema_SemaChecking_cpp 
Added files:
devel/llvm/patches: patch-include_llvm_CodeGen_AsmPrinter_h 
patch-lib_CodeGen_AsmPrinter_AsmPrinter_cpp 
patch-lib_Target_X86_X86AsmPrinter_h 
patch-lib_Target_X86_X86MCInstLower_cpp 
patch-tools_clang_include_clang_Basic_Builtins_def 

Log message:
Pull across more parts from base, from Brad:

- Use int3 trap padding between functions instead of trapsleds with a leading 
jump
- Declare lgamma library builtins as never being const
- Enable the kprintf format attribute

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2017/08/10 04:25:15

Modified files:
multimedia/mpv : Makefile 

Log message:
aarch64 has atomic ops; from Brad

newer boost?

[Reyk Floeter]

Hi,

I've only found the recent "devel/boost vs. clang" mail, so I have a
question: is there any attempt to update boost to the latest version
or is there a known problem with it?

I see that the port has been fixed for clang but boost 1.58.0 is quite
old while the latest stable version is 1.64.0.  I tried to compile
solidity but it fails with all kinds of boost-related errors and at
least a few of them have been fixed in newer releases.

Reyk

Re: UPDATE: shells/zsh

[Stuart Henderson]

On 2017/08/09 22:05, Matthew Martin wrote:
>   If anyone knows how to get a list of
> all packages (installed and not) preferably without having a ports tree,
> I could fix up the patch to push it upstream.

If sqlports is installed, you can do this:

$ sqlite3 /usr/local/share/sqlports 'select fullpkgname from ports'

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2017/08/10 03:34:41

Modified files:
misc/wordnet   : Makefile distinfo 
misc/wordnet/pkg: DESCR PLIST 

Log message:
Fix MASTER_SITES, and update to the 3.1 Princeton WordNet database.

CVS: cvs.openbsd.org: ports

[David Coppa]

CVSROOT:/cvs
Module name:ports
Changes by: dco...@cvs.openbsd.org  2017/08/10 03:11:07

Modified files:
devel/git/patches: patch-t_t0001-init_sh 
   patch-t_t4062-diff-pickaxe_sh 
   patch-t_t7004-tag_sh 

Log message:
Sync with upstream

Re: dhcpcd fix for netinet6/nd6.h r1.72

[Stuart Henderson]

On 2017/08/10 08:36, Florian Obser wrote:
> On Wed, Aug 09, 2017 at 09:34:58PM +0100, Stuart Henderson wrote:
> > On 2017/08/09 13:07, Jeremie Courreges-Anglas wrote:
> > > On Wed, Aug 09 2017, Florian Obser  wrote:
> > > > I just noticed that dhcpcd looks at flags in struct nd_ifinfo which I
> > > > removed in r1.72, this fixes the build.
> > > > Sorry about that.
> > > >
> > > > OK?
> > > 
> > > ok, but:
> > > - you may want sthen@ to take a look (maintainer)
> > > - please bump REVISION, 'cause in _if_checkipv6 this code would trigger
> > >   using an old package:
> > 
> > +1
> > 
> > Would you mind sending it upstream too? https://dev.marples.name/ is
> > probably the best option.
> 
> I was going to, that's why I came up with that particular diff, it looked
> like it could be fed upstream.
> Now I looked and version 7 currently in development / beta shuffled quite
> a lot of code around and I'm in some ifdef hell :( not sure if I can make
> this work.
> 
> If it were more than one port I would even consider bringing the flags
> member back and always have it 0.

Here's the ports diff for 7.0.0-rc1 with ifdefs in what I think are the
right place for this (it still works ok in my setup, but it's just a very
simple pppoe DHCPv6-PD config).

I'm grepping for other uses of ndi now (I think we should probably bump
REVISION on anything that uses it anyway due to the struct change).

Index: Makefile
===
RCS file: /cvs/ports/net/dhcpcd/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile10 Aug 2017 06:58:39 -  1.24
+++ Makefile10 Aug 2017 09:06:44 -
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.24 2017/08/10 06:58:39 florian Exp $
+# $OpenBSD: Makefile,v 1.22 2017/04/21 16:41:20 sthen Exp $
 
 COMMENT=   DHCPv4/IPv4LL/IPv6RS/DHCPv6 quad stack client
 
-DISTNAME=  dhcpcd-6.11.5
-REVISION=  2
+DISTNAME=  dhcpcd-7.0.0-rc1
+PKGNAME=   ${DISTNAME:S/-rc/rc/}
 
 CATEGORIES=net
 EXTRACT_SUFX=  .tar.xz
Index: distinfo
===
RCS file: /cvs/ports/net/dhcpcd/distinfo,v
retrieving revision 1.14
diff -u -p -r1.14 distinfo
--- distinfo11 Oct 2016 13:56:02 -  1.14
+++ distinfo10 Aug 2017 09:06:44 -
@@ -1,2 +1,2 @@
-SHA256 (dhcpcd-6.11.5.tar.xz) = b5Z03H4n6TbMeHF1QEphcWGGdez7aQOrmIextmqH1p4=
-SIZE (dhcpcd-6.11.5.tar.xz) = 198080
+SHA256 (dhcpcd-7.0.0-rc1.tar.xz) = jUE0WW8cimR9lCkf6g7W852tZIpIIkcrSB3+SEB7HNM=
+SIZE (dhcpcd-7.0.0-rc1.tar.xz) = 204496
Index: patches/patch-dhcpcd_conf
===
RCS file: patches/patch-dhcpcd_conf
diff -N patches/patch-dhcpcd_conf
--- patches/patch-dhcpcd_conf   8 Sep 2015 19:10:19 -   1.3
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,15 +0,0 @@
-$OpenBSD: patch-dhcpcd_conf,v 1.3 2015/09/08 19:10:19 sthen Exp $
-
-Disable NTP by default.
-
 dhcpcd.conf.orig   Fri Sep  4 13:41:18 2015
-+++ dhcpcd.confTue Sep  8 21:04:20 2015
-@@ -27,7 +27,7 @@ option rapid_commit
- option domain_name_servers, domain_name, domain_search, host_name
- option classless_static_routes
- # Most distributions have NTP support.
--option ntp_servers
-+#option ntp_servers
- # Respect the network MTU. This is applied to DHCP routes.
- option interface_mtu
- 
Index: patches/patch-if-bsd_c
===
RCS file: patches/patch-if-bsd_c
diff -N patches/patch-if-bsd_c
--- patches/patch-if-bsd_c  10 Aug 2017 06:58:39 -  1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,35 +0,0 @@
-$OpenBSD: patch-if-bsd_c,v 1.2 2017/08/10 06:58:39 florian Exp $
-
-Workaround for our old broken behaviour no longer needed.
-Fixed with netinet6/in6.c r1.202.
-
-netinet6/nd6.h r1.72 removed ND6_IFF_PERFORMNUD
-
-Index: if-bsd.c
 if-bsd.c.orig
-+++ if-bsd.c
-@@ -985,7 +985,7 @@ if_address6(unsigned char cmd, const struct ipv6_addr 
-   }
- #endif
- 
--#if defined(__OpenBSD__)
-+#if 0
-   /* BUT OpenBSD does not reset the address lifetime
-* for subsequent calls...
-* Luckily dhcpcd will remove the lease when it expires so
-@@ -1688,6 +1688,7 @@ ip6_temp_valid_lifetime(__unused const char *ifname)
- }
- #endif
- 
-+#if defined(ND6_IFF_AUTO_LINKLOCAL) || defined(ND6_IFF_PERFORMNUD) || 
defined(ND6_IFF_ACCEPT_RTADV) || defined(ND6_IFF_IFDISABLED)
- #define del_if_nd6_flag(s, ifname, flag) if_nd6_flag((s), (ifp), (flag), -1)
- #define get_if_nd6_flag(s, ifname, flag) if_nd6_flag((s), (ifp), (flag),  0)
- #define set_if_nd6_flag(s, ifname, flag) if_nd6_flag((s), (ifp), (flag),  1)
-@@ -1713,6 +1714,7 @@ if_nd6_flag(int s, const struct interface *ifp, unsign
-   return 0;
-   return ioctl(s, SIOCSIFINFO_FLAGS, );
- }
-+#endif
- 
- static int
- if_raflush(int s)
Index: 

Re: dhcpcd fix for netinet6/nd6.h r1.72

[Florian Obser]

On Thu, Aug 10, 2017 at 08:36:01AM +, Florian Obser wrote:
> On Wed, Aug 09, 2017 at 09:34:58PM +0100, Stuart Henderson wrote:
> > On 2017/08/09 13:07, Jeremie Courreges-Anglas wrote:
> > > On Wed, Aug 09 2017, Florian Obser  wrote:
> > > > I just noticed that dhcpcd looks at flags in struct nd_ifinfo which I
> > > > removed in r1.72, this fixes the build.
> > > > Sorry about that.
> > > >
> > > > OK?
> > > 
> > > ok, but:
> > > - you may want sthen@ to take a look (maintainer)
> > > - please bump REVISION, 'cause in _if_checkipv6 this code would trigger
> > >   using an old package:
> > 
> > +1
> > 
> > Would you mind sending it upstream too? https://dev.marples.name/ is
> > probably the best option.
> 
> I was going to, that's why I came up with that particular diff, it looked
> like it could be fed upstream.
> Now I looked and version 7 currently in development / beta shuffled quite
> a lot of code around and I'm in some ifdef hell :( not sure if I can make
> this work.
> 
> If it were more than one port I would even consider bringing the flags
> member back and always have it 0.

https://dev.marples.name/T132

> 
> >  
> > > #ifdef ND6_IFF_PERFORMNUD
> > >   if (set_if_nd6_flag(s, ifp, ND6_IFF_PERFORMNUD) == -1) {
> > >   logger(ifp->ctx, LOG_ERR,
> > >   "%s: set_if_nd6_flag: ND6_IFF_PERFORMNUD: %m",
> > >   ifp->name);
> > >   return -1;
> > >   }
> > > #endif
> > > 
> > > 
> > > > diff --git net/dhcpcd/patches/patch-if-bsd_c 
> > > > net/dhcpcd/patches/patch-if-bsd_c
> > > > index 0046ef8ca11..0b2ed02e562 100644
> > > > --- net/dhcpcd/patches/patch-if-bsd_c
> > > > +++ net/dhcpcd/patches/patch-if-bsd_c
> > > > @@ -3,8 +3,11 @@ $OpenBSD: patch-if-bsd_c,v 1.1 2017/04/21 16:41:20 
> > > > sthen Exp $
> > > >  Workaround for our old broken behaviour no longer needed.
> > > >  Fixed with netinet6/in6.c r1.202.
> > > >  
> > > >  if-bsd.c.orig  Fri Apr 21 13:38:38 2017
> > > > -+++ if-bsd.c   Fri Apr 21 13:39:38 2017
> > > > +netinet6/nd6.h r1.72 removed ND6_IFF_PERFORMNUD
> > > > +
> > > > +Index: if-bsd.c
> > > > +--- if-bsd.c.orig
> > > >  if-bsd.c
> > > >  @@ -985,7 +985,7 @@ if_address6(unsigned char cmd, const struct 
> > > > ipv6_addr 
> > > > }
> > > >   #endif
> > > > @@ -14,3 +17,19 @@ Fixed with netinet6/in6.c r1.202.
> > > > /* BUT OpenBSD does not reset the address lifetime
> > > >  * for subsequent calls...
> > > >  * Luckily dhcpcd will remove the lease when it expires so
> > > > +@@ -1688,6 +1688,7 @@ ip6_temp_valid_lifetime(__unused const char 
> > > > *ifname)
> > > > + }
> > > > + #endif
> > > > + 
> > > > ++#if defined(ND6_IFF_AUTO_LINKLOCAL) || defined(ND6_IFF_PERFORMNUD) || 
> > > > defined(ND6_IFF_ACCEPT_RTADV) || defined(ND6_IFF_IFDISABLED)
> > > > + #define del_if_nd6_flag(s, ifname, flag) if_nd6_flag((s), (ifp), 
> > > > (flag), -1)
> > > > + #define get_if_nd6_flag(s, ifname, flag) if_nd6_flag((s), (ifp), 
> > > > (flag),  0)
> > > > + #define set_if_nd6_flag(s, ifname, flag) if_nd6_flag((s), (ifp), 
> > > > (flag),  1)
> > > > +@@ -1713,6 +1714,7 @@ if_nd6_flag(int s, const struct interface *ifp, 
> > > > unsign
> > > > +   return 0;
> > > > +   return ioctl(s, SIOCSIFINFO_FLAGS, );
> > > > + }
> > > > ++#endif
> > > > + 
> > > > + static int
> > > > + if_raflush(int s)
> > > 
> > > -- 
> > > jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 
> > > E7EE
> > > 
> > 
> 
> -- 
> I'm not entirely sure you are real.
> 

-- 
I'm not entirely sure you are real.

Re: dhcpcd fix for netinet6/nd6.h r1.72

[Florian Obser]

On Wed, Aug 09, 2017 at 09:34:58PM +0100, Stuart Henderson wrote:
> On 2017/08/09 13:07, Jeremie Courreges-Anglas wrote:
> > On Wed, Aug 09 2017, Florian Obser  wrote:
> > > I just noticed that dhcpcd looks at flags in struct nd_ifinfo which I
> > > removed in r1.72, this fixes the build.
> > > Sorry about that.
> > >
> > > OK?
> > 
> > ok, but:
> > - you may want sthen@ to take a look (maintainer)
> > - please bump REVISION, 'cause in _if_checkipv6 this code would trigger
> >   using an old package:
> 
> +1
> 
> Would you mind sending it upstream too? https://dev.marples.name/ is
> probably the best option.

I was going to, that's why I came up with that particular diff, it looked
like it could be fed upstream.
Now I looked and version 7 currently in development / beta shuffled quite
a lot of code around and I'm in some ifdef hell :( not sure if I can make
this work.

If it were more than one port I would even consider bringing the flags
member back and always have it 0.

>  
> > #ifdef ND6_IFF_PERFORMNUD
> > if (set_if_nd6_flag(s, ifp, ND6_IFF_PERFORMNUD) == -1) {
> > logger(ifp->ctx, LOG_ERR,
> > "%s: set_if_nd6_flag: ND6_IFF_PERFORMNUD: %m",
> > ifp->name);
> > return -1;
> > }
> > #endif
> > 
> > 
> > > diff --git net/dhcpcd/patches/patch-if-bsd_c 
> > > net/dhcpcd/patches/patch-if-bsd_c
> > > index 0046ef8ca11..0b2ed02e562 100644
> > > --- net/dhcpcd/patches/patch-if-bsd_c
> > > +++ net/dhcpcd/patches/patch-if-bsd_c
> > > @@ -3,8 +3,11 @@ $OpenBSD: patch-if-bsd_c,v 1.1 2017/04/21 16:41:20 sthen 
> > > Exp $
> > >  Workaround for our old broken behaviour no longer needed.
> > >  Fixed with netinet6/in6.c r1.202.
> > >  
> > >  if-bsd.c.origFri Apr 21 13:38:38 2017
> > > -+++ if-bsd.c Fri Apr 21 13:39:38 2017
> > > +netinet6/nd6.h r1.72 removed ND6_IFF_PERFORMNUD
> > > +
> > > +Index: if-bsd.c
> > > +--- if-bsd.c.orig
> > >  if-bsd.c
> > >  @@ -985,7 +985,7 @@ if_address6(unsigned char cmd, const struct 
> > > ipv6_addr 
> > >   }
> > >   #endif
> > > @@ -14,3 +17,19 @@ Fixed with netinet6/in6.c r1.202.
> > >   /* BUT OpenBSD does not reset the address lifetime
> > >* for subsequent calls...
> > >* Luckily dhcpcd will remove the lease when it expires so
> > > +@@ -1688,6 +1688,7 @@ ip6_temp_valid_lifetime(__unused const char 
> > > *ifname)
> > > + }
> > > + #endif
> > > + 
> > > ++#if defined(ND6_IFF_AUTO_LINKLOCAL) || defined(ND6_IFF_PERFORMNUD) || 
> > > defined(ND6_IFF_ACCEPT_RTADV) || defined(ND6_IFF_IFDISABLED)
> > > + #define del_if_nd6_flag(s, ifname, flag) if_nd6_flag((s), (ifp), 
> > > (flag), -1)
> > > + #define get_if_nd6_flag(s, ifname, flag) if_nd6_flag((s), (ifp), 
> > > (flag),  0)
> > > + #define set_if_nd6_flag(s, ifname, flag) if_nd6_flag((s), (ifp), 
> > > (flag),  1)
> > > +@@ -1713,6 +1714,7 @@ if_nd6_flag(int s, const struct interface *ifp, 
> > > unsign
> > > + return 0;
> > > + return ioctl(s, SIOCSIFINFO_FLAGS, );
> > > + }
> > > ++#endif
> > > + 
> > > + static int
> > > + if_raflush(int s)
> > 
> > -- 
> > jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE
> > 
> 

-- 
I'm not entirely sure you are real.

Re: UPDATE: mail/isync 1.2.1 to 1.2.2

[Klemens Nanni]

On Wed, Aug 09, 2017 at 11:33:09PM -0400, Daniel Jakots wrote:
> On Thu, 10 Aug 2017 02:53:59 +0200, Klemens Nanni 
> wrote:
> 
> > > I'm not entirely sure yet whether the introduced patch to get
> > > X509_OBJECT_get0_X509() and X509_STORE_get0_objects() working is the
> > > way to go, maybe someone more knowledgable about OpenSSL internals
> > > can comment/fix this?
> 
> > +-# if OPENSSL_VERSION_NUMBER < 0x1010L
> > ++/*# if OPENSSL_VERSION_NUMBER < 0x1010L*/
> 
> That's not the best way to fix it. Here's an updated diff that also
> addresses the fact it doesn't build with gcc4.2:
> 
> /usr/ports/pobj/isync-1.2.2/isync-1.2.2/src/util.c: In function 'map_name':
> /usr/ports/pobj/isync-1.2.2/isync-1.2.2/src/util.c:526: error: #pragma GCC 
> diagnostic not allowed inside functions
> 
> Cheers,
> Daniel
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/mail/isync/Makefile,v
> retrieving revision 1.30
> diff -u -p -r1.30 Makefile
> --- Makefile  20 Dec 2015 09:59:22 -  1.30
> +++ Makefile  10 Aug 2017 03:26:41 -
> @@ -2,7 +2,7 @@
>  
>  COMMENT= synchronize IMAP4 and maildir mailboxes
>  
> -DISTNAME=isync-1.2.1
> +DISTNAME=isync-1.2.2
>  CATEGORIES=  mail
>  MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=isync/}
>  
> @@ -12,6 +12,8 @@ HOMEPAGE=   http://isync.sourceforge.net/
>  PERMIT_PACKAGE_CDROM=Yes
>  
>  WANTLIB= c crypto db sasl2 ssl z
> +
> +COMPILER=clang gcc
>  
>  LIB_DEPENDS= databases/db/v4 \
>   security/cyrus-sasl2
> Index: distinfo
> ===
> RCS file: /cvs/ports/mail/isync/distinfo,v
> retrieving revision 1.11
> diff -u -p -r1.11 distinfo
> --- distinfo  20 Dec 2015 09:59:22 -  1.11
> +++ distinfo  10 Aug 2017 03:26:41 -
> @@ -1,2 +1,2 @@
> -SHA256 (isync-1.2.1.tar.gz) = 5xbeKMmgjmJKA1yq45AvzztRFVO+XWFRehM+A6o1Mq4=
> -SIZE (isync-1.2.1.tar.gz) = 281990
> +SHA256 (isync-1.2.2.tar.gz) = 2Rl+J7/nfj2JcfT8sl7DeyUGgnxLyUObcjdsqgkc6Hc=
> +SIZE (isync-1.2.2.tar.gz) = 285745
> Index: patches/patch-src_socket_c
> ===
> RCS file: patches/patch-src_socket_c
> diff -N patches/patch-src_socket_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_socket_c10 Aug 2017 03:26:45 -
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +
> +Index: src/socket.c
> +--- src/socket.c.orig
>  src/socket.c
> +@@ -40,7 +40,7 @@
> + # include 
> + # include 
> + # include 
> +-# if OPENSSL_VERSION_NUMBER < 0x1010L
> ++# if OPENSSL_VERSION_NUMBER < 0x1010L || 
> defined(LIBRESSL_VERSION_NUMBER)
> + #  define X509_OBJECT_get0_X509(o) ((o)->data.x509)
> + #  define X509_STORE_get0_objects(o) ((o)->objs)
> + # endif
> 
Ah, I see. That's much better, thanks.

Does anyone want to commit this?

Re: UPDATE: shells/zsh

[Pierre-Emmanuel Andre]

On Wed, Aug 09, 2017 at 09:41:33PM +0200, Rafael Sadowski wrote:
> Please find below a quite simple patch to update zsh to 5.4.1.
> 
> Ok? Comments?
>


Hi,

I have the same diff in my tree ;)
ok pea@


> Rafael Sadowski
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/shells/zsh/Makefile,v
> retrieving revision 1.84
> diff -u -p -u -p -r1.84 Makefile
> --- Makefile  24 Mar 2017 14:30:14 -  1.84
> +++ Makefile  9 Aug 2017 19:39:32 -
> @@ -2,13 +2,13 @@
>  
>  COMMENT= Z shell, Bourne shell-compatible
>  
> -V=   5.3.1
> +V=   5.4.1
>  DISTNAME=zsh-$V
>  CATEGORIES=  shells
>  
>  MAINTAINER=  Pierre-Emmanuel Andre 
>  
> -HOMEPAGE=http://www.zsh.org/
> +HOMEPAGE=https://www.zsh.org/
>  
>  MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=zsh/}
>  MASTER_SITES+=   http://www.zsh.org/pub/
> Index: distinfo
> ===
> RCS file: /cvs/ports/shells/zsh/distinfo,v
> retrieving revision 1.24
> diff -u -p -u -p -r1.24 distinfo
> --- distinfo  24 Mar 2017 14:30:14 -  1.24
> +++ distinfo  9 Aug 2017 19:39:32 -
> @@ -1,2 +1,2 @@
> -SHA256 (zsh-5.3.1.tar.gz) = PZSlkP88Vi7POH2nisNW1r6nmwUKnvgePsufjuUTBA4=
> -SIZE (zsh-5.3.1.tar.gz) = 4404164
> +SHA256 (zsh-5.4.1.tar.gz) = xEe4MsroZvUEWh6WP5vrcjFQJScSIkLjMibbBzwAHOI=
> +SIZE (zsh-5.4.1.tar.gz) = 4468512
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/shells/zsh/pkg/PLIST,v
> retrieving revision 1.45
> diff -u -p -u -p -r1.45 PLIST
> --- pkg/PLIST 2 Feb 2017 03:41:12 -   1.45
> +++ pkg/PLIST 9 Aug 2017 19:39:32 -
> @@ -99,6 +99,7 @@ share/zsh/${V}/functions/VCS_INFO_quilt
>  share/zsh/${V}/functions/VCS_INFO_realpath
>  share/zsh/${V}/functions/VCS_INFO_reposub
>  share/zsh/${V}/functions/VCS_INFO_set
> +share/zsh/${V}/functions/VCS_INFO_set-patch-format
>  share/zsh/${V}/functions/_SUSEconfig
>  share/zsh/${V}/functions/_a2ps
>  share/zsh/${V}/functions/_a2utils
> @@ -141,6 +142,7 @@ share/zsh/${V}/functions/_auto-apt
>  share/zsh/${V}/functions/_autocd
>  share/zsh/${V}/functions/_awk
>  share/zsh/${V}/functions/_axi-cache
> +share/zsh/${V}/functions/_basename
>  share/zsh/${V}/functions/_bash_completions
>  share/zsh/${V}/functions/_baudrates
>  share/zsh/${V}/functions/_baz
> @@ -187,6 +189,7 @@ share/zsh/${V}/functions/_chown
>  share/zsh/${V}/functions/_chrt
>  share/zsh/${V}/functions/_chsh
>  share/zsh/${V}/functions/_clay
> +share/zsh/${V}/functions/_cmdambivalent
>  share/zsh/${V}/functions/_cmdstring
>  share/zsh/${V}/functions/_cmp
>  share/zsh/${V}/functions/_combination
> @@ -241,6 +244,7 @@ share/zsh/${V}/functions/_dcop
>  share/zsh/${V}/functions/_dcut
>  share/zsh/${V}/functions/_dd
>  share/zsh/${V}/functions/_deb_architectures
> +share/zsh/${V}/functions/_deb_codenames
>  share/zsh/${V}/functions/_deb_packages
>  share/zsh/${V}/functions/_debbugs_bugnumber
>  share/zsh/${V}/functions/_debchange
> @@ -302,6 +306,7 @@ share/zsh/${V}/functions/_email_addresse
>  share/zsh/${V}/functions/_emulate
>  share/zsh/${V}/functions/_enable
>  share/zsh/${V}/functions/_enscript
> +share/zsh/${V}/functions/_entr
>  share/zsh/${V}/functions/_env
>  share/zsh/${V}/functions/_equal
>  share/zsh/${V}/functions/_espeak
> @@ -333,6 +338,7 @@ share/zsh/${V}/functions/_flex
>  share/zsh/${V}/functions/_floppy
>  share/zsh/${V}/functions/_flowadm
>  share/zsh/${V}/functions/_fmadm
> +share/zsh/${V}/functions/_fmt
>  share/zsh/${V}/functions/_fortune
>  share/zsh/${V}/functions/_freebsd-update
>  share/zsh/${V}/functions/_fsh
> @@ -460,6 +466,7 @@ share/zsh/${V}/functions/_look
>  share/zsh/${V}/functions/_losetup
>  share/zsh/${V}/functions/_lp
>  share/zsh/${V}/functions/_ls
> +share/zsh/${V}/functions/_lsblk
>  share/zsh/${V}/functions/_lscfg
>  share/zsh/${V}/functions/_lsdev
>  share/zsh/${V}/functions/_lslv
> @@ -557,6 +564,7 @@ share/zsh/${V}/functions/_other_accounts
>  share/zsh/${V}/functions/_pack
>  share/zsh/${V}/functions/_parameter
>  share/zsh/${V}/functions/_parameters
> +share/zsh/${V}/functions/_paste
>  share/zsh/${V}/functions/_patch
>  share/zsh/${V}/functions/_patchutils
>  share/zsh/${V}/functions/_path_commands
> @@ -716,6 +724,8 @@ share/zsh/${V}/functions/_svcprop
>  share/zsh/${V}/functions/_svcs
>  share/zsh/${V}/functions/_svcs_fmri
>  share/zsh/${V}/functions/_svn-buildpackage
> +share/zsh/${V}/functions/_swaks
> +share/zsh/${V}/functions/_swift
>  share/zsh/${V}/functions/_sys_calls
>  share/zsh/${V}/functions/_sysctl
>  share/zsh/${V}/functions/_sysrc
> @@ -766,6 +776,7 @@ share/zsh/${V}/functions/_twisted
>  share/zsh/${V}/functions/_typeset
>  share/zsh/${V}/functions/_ulimit
>  share/zsh/${V}/functions/_uml
> +share/zsh/${V}/functions/_umountable
>  share/zsh/${V}/functions/_unace
>  share/zsh/${V}/functions/_uname
>  share/zsh/${V}/functions/_unexpand
> @@ -964,6 

CVS: cvs.openbsd.org: ports

[Florian Obser]

CVSROOT:/cvs
Module name:ports
Changes by: flor...@cvs.openbsd.org 2017/08/10 00:58:39

Modified files:
net/dhcpcd : Makefile 
net/dhcpcd/patches: patch-if-bsd_c 

Log message:
netinet6/nd6.h r1.72 removed "flags" in struct nd_ifinfo, make this
compile again.
Need for revision bump pointed out by jca.
OK jca, sthen

CVS: cvs.openbsd.org: ports

[Anthony J . Bentley]

CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2017/08/10 00:36:58

Modified files:
fonts  : Makefile 

Log message:
+migu,migmix

CVS: cvs.openbsd.org: ports

[Anthony J . Bentley]

CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2017/08/10 00:35:16

Log message:
Import migu-20150712.

Migu is a collection of synthesized fonts, with Japanese kanji from IPA
Gothic and modified character glyphs from M+.

ok rsadowski@

Status:

Vendor Tag: bentley
Release Tags:   bentley_20170809

N ports/fonts/migu/Makefile
N ports/fonts/migu/distinfo
N ports/fonts/migu/pkg/PLIST
N ports/fonts/migu/pkg/DESCR

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Anthony J . Bentley]

CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2017/08/10 00:34:17

Log message:
Import migmix-20150712.

Migmix is a collection of synthesized fonts, with Japanese kanji from IPA
Gothic and unmodified character glyphs from M+.

ok rsadowski@

Status:

Vendor Tag: bentley
Release Tags:   bentley_20170809

N ports/fonts/migmix/Makefile
N ports/fonts/migmix/distinfo
N ports/fonts/migmix/pkg/PLIST
N ports/fonts/migmix/pkg/DESCR

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Remi Pointel]

CVSROOT:/cvs
Module name:ports
Changes by: rpoin...@cvs.openbsd.org2017/08/10 00:25:18

Modified files:
lang/python/3.6: Makefile distinfo 
lang/python/3.6/pkg: PLIST-main PLIST-tests 

Log message:
update python to 3.6.2, tested in a bulk by sthen@.

Re: NEW: www/buku

[Ingo Feinerer]

Ping?
(tar.gz at https://marc.info/?l=openbsd-ports=150176984409725=2)

On Thu, Aug 03, 2017 at 04:16:33PM +0200, Ingo Feinerer wrote:
> please find attached a port for Buku, a powerful command-line bookmark manager
> (https://github.com/jarun/Buku).
> 
> $ cat pkg/DESCR
> buku is a command-line utility to store, tag, search and organize bookmarks.
> 
> * Lightweight, clean interface
> * Text editor integration
> * Fetch page title, add tags and comments
> * Multiple search modes (e.g. deep, regex)
> * Continuous search at prompt, on the fly mode switch
> * Open bookmarks and search results in browser
> * Import/export in HTML (FF, Chrome compatible) or Markdown
> * Shorten and expand URLs
> * Smart tag editing with >>, > or << symbols at prompt
> * Password protection (manual)
> * Portable, merge-able database to sync between systems
> * Multithreaded full DB refresh
> * Shell completion scripts, man page with examples
> 
> Minor remarks:
> 
> - I chose "www" as category but "productivity" might also be an option?
> - "make test" seems to work but downloads various dependencies. Should we set
>   NO_TEST?
> 
> OK to import?