Re: libxml2 - patches for several CVEs

[Matthias Pitzl]

On 02.06.2017 - 12:26:46, Paul Irofti wrote:
> On Thu, Jun 01, 2017 at 09:09:48AM +0200, Matthias Pitzl wrote:
> > Hi,
> > 
> > On the oss-security mailing list where reports about several CVEs concerning
> > libxml2.
> > These patches fixes CVE-2017-9047, CVE-2017-9048, CVE-2017-9049 and
> > CVE-2017-9050.
> 
> OK?

Looks good for me :)
Sorry for not making a complete diff against the port itself.

-- Matthias

> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/textproc/libxml/Makefile,v
> retrieving revision 1.168
> diff -u -p -u -p -r1.168 Makefile
> --- Makefile  30 Dec 2016 15:54:57 -  1.168
> +++ Makefile  2 Jun 2017 09:26:07 -
> @@ -4,7 +4,7 @@ COMMENT-main= XML parsing library
>  COMMENT-python=  Python bindings for libxml
>  
>  VERSION= 2.9.4
> -REVISION-main=   0
> +REVISION-main=   1
>  DISTNAME=libxml2-${VERSION}
>  PKGNAME-main=libxml-${VERSION}
>  PKGNAME-python=  py-libxml-${VERSION}
> Index: patches/patch-parser_c
> ===
> RCS file: patches/patch-parser_c
> diff -N patches/patch-parser_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-parser_c2 Jun 2017 09:26:07 -
> @@ -0,0 +1,38 @@
> +$OpenBSD$
> +
> +Fix CVE-2017-9049 and CVE-2017-9050.
> +
> +Index: parser.c
> +--- parser.c.orig
>  parser.c
> +@@ -3312,6 +3312,7 @@ xmlParseNameComplex(xmlParserCtxtPtr ctxt) {
> + int len = 0, l;
> + int c;
> + int count = 0;
> ++size_t startPosition = 0;
> + 
> + #ifdef DEBUG
> + nbParseNameComplex++;
> +@@ -3323,6 +3324,7 @@ xmlParseNameComplex(xmlParserCtxtPtr ctxt) {
> + GROW;
> + if (ctxt->instate == XML_PARSER_EOF)
> + return(NULL);
> ++startPosition = CUR_PTR - BASE_PTR;
> + c = CUR_CHAR(l);
> + if ((ctxt->options & XML_PARSE_OLD10) == 0) {
> + /*
> +@@ -3420,9 +3422,11 @@ xmlParseNameComplex(xmlParserCtxtPtr ctxt) {
> + xmlFatalErr(ctxt, XML_ERR_NAME_TOO_LONG, "Name");
> + return(NULL);
> + }
> +-if ((*ctxt->input->cur == '\n') && (ctxt->input->cur[-1] == '\r'))
> +-return(xmlDictLookup(ctxt->dict, ctxt->input->cur - (len + 1), 
> len));
> +-return(xmlDictLookup(ctxt->dict, ctxt->input->cur - len, len));
> ++
> ++if (BASE_PTR + startPosition + len > ctxt->input->end)
> ++return(NULL);
> ++
> ++return(xmlDictLookup(ctxt->dict, BASE_PTR + startPosition, len));
> + }
> + 
> + /**
> Index: patches/patch-valid_c
> ===
> RCS file: patches/patch-valid_c
> diff -N patches/patch-valid_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-valid_c 2 Jun 2017 09:26:07 -
> @@ -0,0 +1,23 @@
> +$OpenBSD$
> +
> +Fix CVE-2017-9047 and CVE-2017-9048.
> +
> +Index: valid.c
> +--- valid.c.orig
>  valid.c
> +@@ -1270,6 +1270,7 @@ xmlSnprintfElementContent(char *buf, int size, xmlElem
> + }
> + strcat(buf, (char *) content->prefix);
> + strcat(buf, ":");
> ++len += xmlStrlen(content->prefix);
> + }
> + if (size - len < xmlStrlen(content->name) + 10) {
> + strcat(buf, " ...");
> +@@ -1319,6 +1320,7 @@ xmlSnprintfElementContent(char *buf, int size, xmlElem
> + xmlSnprintfElementContent(buf, size, content->c2, 0);
> + break;
> + }
> ++if (size - strlen(buf) <= 2) return;
> + if (englob)
> + strcat(buf, ")");
> + switch (content->ocur) {

CVS: cvs.openbsd.org: ports

[Jeremy Evans]

CVSROOT:/cvs
Module name:ports
Changes by: jer...@cvs.openbsd.org  2017/06/05 17:55:19

Modified files:
www/ruby-capybara-webkit/patches: patch-src_webkit_server_pro 
www/ruby-capybara-webkit: Makefile 

Log message:
Unbreak by switching to gcc4 module, which supports -std=gnu++0x

Additionally, patch out support to precompile headers.

UPDATE: audio/mp3blaster 3.2.5 => 3.2.6

[Brian Callahan]

Hi ports --

Attached is a minor update to audio/mp3blaster. It contains bugfixes
from the last 8 years. Lets us get rid of some patches too. Still plays
my music just fine on my laptop.

~Brian

Index: Makefile
===
RCS file: /cvs/ports/audio/mp3blaster/Makefile,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 Makefile
--- Makefile26 Apr 2017 14:58:38 -  1.20
+++ Makefile5 Jun 2017 22:56:46 -
@@ -2,12 +2,12 @@
 
 COMMENT=   text console audio player with an interactive interface
 
-DISTNAME=  mp3blaster-3.2.5
-REVISION=  2
+DISTNAME=  mp3blaster-3.2.6
 CATEGORIES=audio
 HOMEPAGE=  http://mp3blaster.sourceforge.net/
+MAINTAINER=Brian Callahan 
 
-# GPLv2
+# GPLv2+
 PERMIT_PACKAGE_CDROM=  Yes
 
 WANTLIB=   c m ncurses ogg pthread sidplay sndio ${LIBCXX} vorbis 
vorbisfile
Index: distinfo
===
RCS file: /cvs/ports/audio/mp3blaster/distinfo,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 distinfo
--- distinfo18 Jan 2015 03:12:44 -  1.9
+++ distinfo5 Jun 2017 22:56:46 -
@@ -1,2 +1,2 @@
-SHA256 (mp3blaster-3.2.5.tar.gz) = EpEVdCx3NizDUI63eCcCz7RK8kY6VFPo0Z6mirzO3Ck=
-SIZE (mp3blaster-3.2.5.tar.gz) = 329407
+SHA256 (mp3blaster-3.2.6.tar.gz) = Q9n2VjZ9FqqsFj+T3DI+mEPD3VZUAVZ+3vPh5yueHuA=
+SIZE (mp3blaster-3.2.6.tar.gz) = 354019
Index: patches/patch-mp3blaster_1
===
RCS file: /cvs/ports/audio/mp3blaster/patches/patch-mp3blaster_1,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-mp3blaster_1
--- patches/patch-mp3blaster_1  18 Feb 2015 16:15:37 -  1.1
+++ patches/patch-mp3blaster_1  5 Jun 2017 22:56:46 -
@@ -1,13 +1,14 @@
 $OpenBSD: patch-mp3blaster_1,v 1.1 2015/02/18 16:15:37 naddy Exp $
 mp3blaster.1.orig  Sat Jan 24 16:25:12 2009
-+++ mp3blaster.1   Wed Feb 18 17:12:45 2015
+Index: mp3blaster.1
+--- mp3blaster.1.orig
 mp3blaster.1
 @@ -281,8 +281,8 @@ Some keywords can have multiple values, in that case i
  .TP
  \fBKeyword\fR = \fBValue1\fR, \fBValue2\fR
  .PP
--Escape comma's in a value with a backslash (\,). If you want a litteral
+-Escape comma's in a value with a backslash (\,). If you want a literal
 -backslash, escape it with another backslash (\\). Keywords are case-sensitive.
-+Escape commas in a value with a backslash (\e,). If you want a litteral
++Escape commas in a value with a backslash (\e,). If you want a literal
 +backslash, escape it with another backslash (\e\e). Keywords are 
case-sensitive.
  .PP
  There are a few types of values: numbers, booleans, keybindings, colours,
Index: patches/patch-mpegsound_mpegsound_h
===
RCS file: /cvs/ports/audio/mp3blaster/patches/patch-mpegsound_mpegsound_h,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-mpegsound_mpegsound_h
--- patches/patch-mpegsound_mpegsound_h 11 Jan 2010 07:51:26 -  1.1
+++ patches/patch-mpegsound_mpegsound_h 5 Jun 2017 22:56:46 -
@@ -1,7 +1,8 @@
 $OpenBSD: patch-mpegsound_mpegsound_h,v 1.1 2010/01/11 07:51:26 jakemsr Exp $
 mpegsound/mpegsound.h.orig Sat Jan 24 07:25:11 2009
-+++ mpegsound/mpegsound.h  Sun Dec 27 16:39:14 2009
-@@ -433,6 +433,36 @@ class Rawplayer : public Soundplayer (private)
+Index: mpegsound/mpegsound.h
+--- mpegsound/mpegsound.h.orig
 mpegsound/mpegsound.h
+@@ -430,6 +430,36 @@ class Rawplayer : public Soundplayer (private)
  
  #endif /* WANT_OSS */
  
@@ -38,7 +39,7 @@ $OpenBSD: patch-mpegsound_mpegsound_h,v 
  #ifdef WANT_ESD
  // Class for playing raw data via Enlightened Sound Daemon
  class EsdPlayer : public Soundplayer
-@@ -957,7 +987,7 @@ class Fileplayer
+@@ -954,7 +984,7 @@ class Fileplayer
  {
  public:
enum audiodriver_t {
Index: patches/patch-mpegsound_oggplayer_cc
===
RCS file: /cvs/ports/audio/mp3blaster/patches/patch-mpegsound_oggplayer_cc,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-mpegsound_oggplayer_cc
--- patches/patch-mpegsound_oggplayer_cc11 Jan 2010 07:51:26 -  
1.2
+++ patches/patch-mpegsound_oggplayer_cc5 Jun 2017 22:56:46 -
@@ -3,30 +3,19 @@ $OpenBSD: patch-mpegsound_oggplayer_cc,v
 ov_read() can return less than asked for.  get the full 4096 bytes
 before continuing to save cycles and avoid confusion elsewhere.
 
 mpegsound/oggplayer.cc.origTue Dec 22 05:08:01 2009
-+++ mpegsound/oggplayer.cc Thu Dec 24 14:20:44 2009
-@@ -18,7 +18,11 @@ Oggplayer::Oggplayer(audiodriver_t driver)
- {
-   of = NULL;
-   wordsize = 2; //2 bytes
-+#ifdef WORDS_BIGENDIAN
-+  bigendian = 1;
-+#else
-   bigendian = 0;
-+#endif
-   signeddata = 1;
-   mono = 0;
-   downfreq = 0;
-@@ -156,15 +160,23 @@ bool Oggplayer::playing()
+Index: mpegsound/oggplayer.cc

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2017/06/05 15:53:12

Modified files:
infrastructure/mk: bsd.port.mk 

Log message:
support for overriding CC/CXX was accidentally lost with the COMPILER_LINKS
changes, reinstate it. feedback/ok espie@

Re: [NEW] net/google-compute-engine

[Stuart Henderson]

On 2017/06/05 13:33, Helen Koike wrote:
> > > 
> > > ok, I'll check openntpd
> > 
> > /etc/rc.d/ntpd is for openntpd, which is in the base OS.
> > net/ntpd in ports is the ntp.org software and only used for special
> > cases on OpenBSD, it's not a good choice for general-purpose ntp here.
> > 
> 
> The problem is that openntpd doesn't provide ntpdate, is there another way
> to force openntp to update the time? Just restarting the service doesn't
> work

openntp in normal operation avoids "jumping" the time. It makes gradual
adjustments with adjtime(2) until the clock is in sync, then skews the
clock frequency. If the -s flag is used, it jumps the time at startup.

Alternatively "rdate -n $host" is similar to ntpdate.

> The available tests are just mock tests that verifies if the software calls
> the right functions in the right order, it doesn't really check if it works
> or not and it can be biased as it was derivated directly from the code.
> To enable the tests I'll also need to port each test, increasing the number
> of patches and the maintenance complexity.
> As I believe the mock tests are more important to the developer then to
> OpenBSD (as it is implemented in the project), I don't think we need to
> bother to port them.

Agreed.

> Could you re-check if it is ok now? Thanks
> 
> Here is a list of changes the attached version:
> - upstream version update to 2.3.7 (and update distinfo)
> - remove HOMEPAGE from Makefile (already set in GH)
> - remove bash as dependency (use ksh instead)
> - remove sudo (use doas instead)
> - use SUBST_CMD in pre-configure
> - normalize patches
> - fix bug in network_setup.py in sed command (wrong syntax)
> - add readme in PLIST
> - add meta rc script called google_compute_engine
> - update README

Thanks, that sounds good, I'll try to find time to look it over
tomorrow.

UPDATE: editors/ne 3.0.1 => 3.1.1

[Brian Callahan]

Hi ports --

Attached is a trivial update to editors/ne.

~Brian

Index: Makefile
===
RCS file: /cvs/ports/editors/ne/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- Makefile25 Aug 2015 13:18:25 -  1.6
+++ Makefile5 Jun 2017 21:06:19 -
@@ -1,11 +1,11 @@
 # $OpenBSD: Makefile,v 1.6 2015/08/25 13:18:25 sthen Exp $
 
 COMMENT =  nice console editor
-DISTNAME = ne-3.0.1
+DISTNAME = ne-3.1.1
 CATEGORIES =   editors
-REVISION = 0
 
 HOMEPAGE = http://ne.di.unimi.it/
+MAINTAINER =   Brian Callahan 
 
 # GPLv3+
 PERMIT_PACKAGE_CDROM = Yes
@@ -14,6 +14,7 @@ WANTLIB += c curses m
 
 MASTER_SITES = http://ne.di.unimi.it/
 
+USE_GMAKE =Yes
 MAKE_FILE =makefile
 MAKE_FLAGS =   CC="${CC}" OPTS="${CFLAGS}"
 ALL_TARGET =   build
Index: distinfo
===
RCS file: /cvs/ports/editors/ne/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- distinfo22 Jun 2015 22:38:56 -  1.5
+++ distinfo5 Jun 2017 21:06:19 -
@@ -1,2 +1,2 @@
-SHA256 (ne-3.0.1.tar.gz) = krZG3SumQFLmLeqkI5NzghBQoD4bfQnSA84E8q370OQ=
-SIZE (ne-3.0.1.tar.gz) = 1193311
+SHA256 (ne-3.1.1.tar.gz) = 7E9dkZw4saWTi2Caci0NiKaMQEtFZOO7ZUuWswWCrdk=
+SIZE (ne-3.1.1.tar.gz) = 1219488
Index: patches/patch-src_makefile
===
RCS file: /cvs/ports/editors/ne/patches/patch-src_makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-src_makefile
--- patches/patch-src_makefile  22 Jun 2015 22:38:56 -  1.3
+++ patches/patch-src_makefile  5 Jun 2017 21:06:19 -
@@ -19,7 +19,7 @@ $OpenBSD: patch-src_makefile,v 1.3 2015/
 -  $(if $(NE_DEBUG),   -g,-O3 -DNDEBUG) \
 -  $(if $(NE_TERMCAP), -DTERMCAP,) \
 -  $(if $(NE_ANSI),-DTERMCAP -DANSI,)
-+  -D_REGEX_LARGE_OFFSETS -D_GNU_SOURCE -DSTDC_HEADERS -Dinline=__inline__
++  -D_REGEX_LARGE_OFFSETS -D_GNU_SOURCE -DSTDC_HEADERS -Dinline=__inline__ 
-DNDEBUG
  
 -
  LIBS=$(if $(NE_TERMCAP)$(NE_ANSI),,-lcurses)

Re: NEW: geo/py-planet

[Sebastian Reitenbach]

On Sunday, June 4, 2017 01:04 CEST, Daniel Jakots  wrote:

> On Sat, 03 Jun 2017 01:09:22 +0200, "Sebastian Reitenbach"
>  wrote:
>
> > Find updated versions attached.
> > Anything more I can/should tweak?
>
> For py-planet:
>
> --- pkg/PLIST.orig  Sat Jun  3 18:50:38 2017 
> +++ pkg/PLIST   Sat Jun  3 18:53:41 2017
> @@ -1,6 +1,6 @@
>  @comment $OpenBSD$
>  bin/planet${MODPY_BIN_SUFFIX}
> -${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/planet/
> +lib/python${MODPY_VERSION}/site-packages/planet/
>  
> lib/python${MODPY_VERSION}/site-packages/planet-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
>  
> lib/python${MODPY_VERSION}/site-packages/planet-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
>  
> lib/python${MODPY_VERSION}/site-packages/planet-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
> @@ -10,7 +10,7 @@ lib/python${MODPY_VERSION}/site-packages/planet-${MODP
>  
> lib/python${MODPY_VERSION}/site-packages/planet-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
>  
> lib/python${MODPY_VERSION}/site-packages/planet-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
>  lib/python${MODPY_VERSION}/site-packages/planet/__init__.py
> -lib/python${MODPY_VERSION}/site-packages/planet/${MODPY_PYCACHE}/
> +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/planet/${MODPY_PYCACHE}/
>  
> lib/python${MODPY_VERSION}/site-packages/planet/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
>  lib/python${MODPY_VERSION}/site-packages/planet/api/
>  lib/python${MODPY_VERSION}/site-packages/planet/api/__init__.py
>
>
> I have a handy command, if you want to alias it:
> FLAVOR=python3 make REVISION=999 plist && \
>   sed -i /PYCACHE}.$/s,lib,\${MODPY_COMMENT}lib, pkg/PLIST

this is indeed handy

>
> With that small change both ports are ok danj@
>

imported with the change, thanks a lot!

Sebastian

> > Those python ports with the flavours are not my favourites ;)
>
> You're doing fine!
>

CVS: cvs.openbsd.org: ports

[Sebastian Reitenbach]

CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2017/06/05 14:46:51

Modified files:
geo: Makefile 

Log message:
hook up py-planet

CVS: cvs.openbsd.org: ports

[Sebastian Reitenbach]

CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2017/06/05 14:44:47

Log message:
import py-planet

This library provides a command-line-interface (CLI) and Python library
to make access to Planet's public Data API easy to use.

The Data API is a REST HTTP API interface to Planet's imagery archive.
The API supports the following tasks: quick-searching assets and viewing
thumbnails of imagery; filtering imagery by location, date, satellite
source, cloud cover, and many other attributes; and downloading imagery
and metadata in several formats.

Feedback sthen@, danj@

OK danj@

Status:

Vendor Tag: sebastia
Release Tags:   sebastia_20170605

N ports/geo/py-planet/distinfo
N ports/geo/py-planet/Makefile
N ports/geo/py-planet/pkg/DESCR
N ports/geo/py-planet/pkg/PLIST

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Sebastian Reitenbach]

CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2017/06/05 14:43:38

Modified files:
www: Makefile 

Log message:
hook up py-requests-futures

CVS: cvs.openbsd.org: ports

[Sebastian Reitenbach]

CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2017/06/05 14:41:53

Log message:
Small add-on for the python requests http library. Makes use of python
3.2's concurrent.futures or the backport for prior versions of python.

The additional API and changes are minimal and strives to avoid
surprises.

Feedback sthen@ danj@

OK danj@

Status:

Vendor Tag: sebastia
Release Tags:   sebastia_20170605

N ports/www/py-requests-futures/distinfo
N ports/www/py-requests-futures/Makefile
N ports/www/py-requests-futures/pkg/DESCR
N ports/www/py-requests-futures/pkg/PLIST

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/06/05 14:20:49

Modified files:
lang/ghc   : Makefile 

Log message:
Set USE_WXNEEDED=special; don't use the wrapper script, but do record
USE_WXNEEDED in sqlports.

CVS: cvs.openbsd.org: ports

[Ingo Schwarze]

CVSROOT:/cvs
Module name:ports
Changes by: schwa...@cvs.openbsd.org2017/06/05 13:44:26

Modified files:
devel/grcs : Makefile 

Log message:
BUILD_DEPENDS += textproc/groff
because soelim(1) is used at build time.
No bump needed because *if* it built, the package was correct.
Problem reported and patch OK'ed by naddy@.

Re: [BACKPORT] Tor Browser 6.5.2 for 6.1-stable

[attila]

attila  writes:

> Hi ports@,
>
> Attached is a patch for the -stable ports tree to bring Tor Browser up
> to 6.5.2.  I have not been able to test the packages myself so I could
> really use some testing.  I cooked some packages for testing if anyone
> cares: https://bits.haqistan.net/~tdp/amd64/stable/
>
> Feedback most welcome.
>
> Pax, -A

Ping.

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

Index: meta/tor-browser/Makefile
===
RCS file: /cvs/ports/meta/tor-browser/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- meta/tor-browser/Makefile	31 Jan 2017 13:48:18 -	1.4
+++ meta/tor-browser/Makefile	24 May 2017 12:46:35 -
@@ -4,7 +4,7 @@ COMMENT=	Tor Browser meta package
 
 MAINTAINER=	Sean Levy 
 
-PKGNAME=	tor-browser-6.5
+PKGNAME=	tor-browser-6.5.2
 
 RUN_DEPENDS=	www/tor-browser/browser \
 		www/tor-browser/torbutton \
Index: www/tor-browser/Makefile.inc
===
RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile.inc
--- www/tor-browser/Makefile.inc	31 Jan 2017 13:48:18 -	1.4
+++ www/tor-browser/Makefile.inc	24 May 2017 12:46:35 -
@@ -5,8 +5,9 @@ HOMEPAGE ?=		https://www.torproject.org
 GH_ACCOUNT ?=		torbsd
 PERMIT_PACKAGE_CDROM ?= Yes
 CATEGORIES =		www
+# XXX If updating, bump REVISION of any extensions which did not get updated.
 BROWSER_NAME =		tor-browser
-TB_VERSION =		6.5
+TB_VERSION =		6.5.2
 TB_PREFIX =		tb
 
 SUBST_VARS +=		BROWSER_NAME TB_VERSION
Index: www/tor-browser/browser/Makefile
===
RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- www/tor-browser/browser/Makefile	18 Feb 2017 16:22:54 -	1.6
+++ www/tor-browser/browser/Makefile	24 May 2017 12:46:35 -
@@ -15,7 +15,7 @@ DIST_SUBDIR = 		${BROWSER_NAME}
 WRKDIST = 		${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME:C/^v//}
 
 GH_PROJECT =		torb
-GH_TAGNAME =		v${TB_VERSION}-esr45.7.0
+GH_TAGNAME =		v${TB_VERSION}-esr45.9.0
 
 PKGNAME =		${TB_PREFIX}-browser-${TB_VERSION}
 DISTNAME =		${GH_TAGNAME}
@@ -75,7 +75,7 @@ CONFIGURE_ARGS +=	--disable-webrtc
 
 CONFIGURE_ARGS +=	--disable-gstreamer
 
-RUN_DEPENDS +=		net/tor>=0.2.9.9p0
+RUN_DEPENDS +=		net/tor>=0.2.9.10
 
 # bug 857628
 CONFIGURE_ARGS +=	--enable-pie
Index: www/tor-browser/browser/distinfo
===
RCS file: /cvs/ports/www/tor-browser/browser/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- www/tor-browser/browser/distinfo	31 Jan 2017 13:48:18 -	1.4
+++ www/tor-browser/browser/distinfo	24 May 2017 12:46:35 -
@@ -1,2 +1,2 @@
-SHA256 (tor-browser/v6.5-esr45.7.0.tar.gz) = RIKh9Ura08i7pYMfz1mjNZn50kAetrnpmOBppzGvXcM=
-SIZE (tor-browser/v6.5-esr45.7.0.tar.gz) = 256763405
+SHA256 (tor-browser/v6.5.2-esr45.9.0.tar.gz) = WZFZ4ullzb1Ox9oEmwC8tvl+gQgkwtobZ5k+hKj5Bd0=
+SIZE (tor-browser/v6.5.2-esr45.9.0.tar.gz) = 256788819
Index: www/tor-browser/browser/files/extension-overrides.js
===
RCS file: /cvs/ports/www/tor-browser/browser/files/extension-overrides.js,v
retrieving revision 1.3
diff -u -p -r1.3 extension-overrides.js
--- www/tor-browser/browser/files/extension-overrides.js	24 Dec 2016 20:15:06 -	1.3
+++ www/tor-browser/browser/files/extension-overrides.js	24 May 2017 12:46:35 -
@@ -2,15 +2,6 @@
 # Tor Browser Bundle
 # Do not edit this file.
 
-# Torbutton Preferences:
-pref("extensions.torbutton.fresh_install", false);
-pref("extensions.torbutton.tor_enabled", true);
-pref("extensions.torbutton.proxies_applied", true);
-pref("extensions.torbutton.settings_applied", true);
-pref("extensions.torbutton.socks_host", "127.0.0.1");
-pref("extensions.torbutton.socks_port", 9150);
-pref("extensions.torbutton.tz_string", "UTC+00:00");
-
 # HTTPS Everywhere Preferences:
 pref("extensions.https_everywhere._observatory.popup_shown", true);
 pref("extensions.https_everywhere.toolbar_hint_shown", true);
@@ -79,8 +70,6 @@ pref("extensions.torlauncher.default_bri
 pref("extensions.torlauncher.default_bridge.fte.3", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D");
 pref("extensions.torlauncher.default_bridge.fte.4", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9");
 
-pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH");
-
 pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 154.35.22.10:15937 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ 

Re: [NEW] net/google-compute-engine

[Helen Koike]

Hi Stuart,

Thanks for your review. Please, check my comments below.
I also attached a new version with most of the suggested changes (and 
upstream version 2.3.7 instead of 2.3.6), I would appreciate if you 
could take a look if it is ok now.


On 2017-06-02 05:46 AM, Stuart Henderson wrote:

On 2017/06/01 23:58, Helen Koike wrote:

1. $ portcheck
patches/patch-google__compute__engine_accounts_accounts__daemon.py does not 
have $OpenBSD$ RCS tag at the top
[...]

I guess you don't know about make update-patches' do you? :)


no, I don't :(
(yet) I am in the process of "s/don't/do" in this phrase


Patch filenames shouldn't have "." either. I suggest this to normalize
them all:

make clean
make patch
mv patches patches.old (or just rm patches/*)
make update-patches


This works great, thanks.



If you patch any other files, "cp somefile somefile.orig", edit somefile,
"make update-patches" to pick it up.


6. does it really need net/ntp as a dependency?
google_compute_engine/clock_skew/clock_skew_daemon.py:ntpd_inactive = 
subprocess.call(['/etc/rc.d/ntpd', 'check'])
That rather smells like openntpd should be enough :)


ok, I'll check openntpd


/etc/rc.d/ntpd is for openntpd, which is in the base OS.
net/ntpd in ports is the ntp.org software and only used for special
cases on OpenBSD, it's not a good choice for general-purpose ntp here.



The problem is that openntpd doesn't provide ntpdate, is there another 
way to force openntp to update the time? Just restarting the service 
doesn't work



6bis. How did you choose the actual list of dependencies?


I checked which programs and python libs the code was using and I added
in the list basically. But I think I missed some libs, I'll check/test
again.


I haven't looked but hopefully there will be a list in setup.py
that will help.


In setup.py there is only "install_requires=['boto', 'setuptools']" :(




7. Any reason to not to enable tests?


no (I just didn't know I had this option), I'll check that


You can do this as a do-test target in the port's Makefile.


The available tests are just mock tests that verifies if the software 
calls the right functions in the right order, it doesn't really check if 
it works or not and it can be biased as it was derivated directly from 
the code.
To enable the tests I'll also need to port each test, increasing the 
number of patches and the maintenance complexity.
As I believe the mock tests are more important to the developer then to 
OpenBSD (as it is implemented in the project), I don't think we need to 
bother to port them.





9. What's the point of patching stuff like
-  '/usr/bin/google_instance_setup.')
+  '%%PREFIX%%/bin/google_instance_setup.')
and then sed'ding it in pre-configure?


Because I saw other ports doing this, and this allows different
installation PREFIX to be used no?


The usual method is to patch to use ${LOCALBASE} and use something like
"${SUBST_CMD} ${WRKSRC}/dir/file" in the port's Makefile. Ones with %%
etc are often old or there's some special reason.

This used to be a bit annoying and undid the ${..} changes if you ran
"update-patches" after a build, workaround is to clean/patch/edit/update
without building, but this has been improved after the 6.1 release.


10. LOCALBASE wouldn't be better than PREFIX?


maybe, I didn't know about it, I'll check, thanks


PREFIX is correct for that one. (PREFIX is "file from this port being
installed", LOCALBASE is "file from another port that we're referencing")


done




11. Don't you need a RDEP on net/py-netifaces?


Yes, It is there already:

RUN_DEPENDS =   shells/bash \
security/sudo \


Prefer to use doas (in the base OS) rather than sudo if possible.


done



Also prefer to use ksh from base rather than bash if the scripts work
with it without excessive changes.


done



For the rc scripts, I suggest a "meta" script (google_compute_engine.rc?)
which calls the others and refer to that in the README, so users only have
to make one entry in pkg_scripts and don't need to worry about ordering.
sysutils/bacula/pkg/bacula.rc would be a good model.


awesome suggestion, thanks for that



nit: the === underlining in pkg/README is too short, make sure you edit
it with a fixed-width font.



Could you re-check if it is ok now? Thanks


Here is a list of changes the attached version:
- upstream version update to 2.3.7 (and update distinfo)
- remove HOMEPAGE from Makefile (already set in GH)
- remove bash as dependency (use ksh instead)
- remove sudo (use doas instead)
- use SUBST_CMD in pre-configure
- normalize patches
- fix bug in network_setup.py in sed command (wrong syntax)
- add readme in PLIST
- add meta rc script called google_compute_engine
- update README


Thanks a lot
LN Koike


google-compute-engine.tar.gz
Description: application/gzip

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2017/06/05 10:03:32

Modified files:
print/hplip: Makefile 
print/hplip/pkg: PLIST-hpaio README-common 

Log message:
Automatically enable hpaio in sane using:
/etc/sane.d/dll.d/hpaio
One less manual thing to do...

Re: PATCH: Fix SSP on amd64 for ports gcc 4.9

[Bryan Steele]

On Sun, Jun 04, 2017 at 04:40:17AM -0400, Bryan Steele wrote:
> "As Shmuel reported in
> ,
> on x86-64 small structures in automatic storage are aligned to 16 bytes.
> This seems to be because of a mix-up between bits and bytes in the i386
> target code.
> 
> * config/i386/i386.c (ix86_local_alignment): Align most aggregates
> of 16 bytes and more to 16 bytes, not those of 16 bits and more."
> 
> https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=b44e9be23d38be8997ae64d7509ac22cb4c556d6
> 
> It might be worth fixing this in ports gcc 4.9, found by tedu@ in 2014
> and committed by martynas@ to base gcc4 shortly later.
> 
> http://www.tedunangst.com/flak/post/my-stack-protector-wasnt-working
> http://marc.info/?l=openbsd-cvs=139895377300712=2
> http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/gnu/gcc/gcc/config/i386/i386.c.diff?r1=1.3=1.4=h
> 
> -Bryan.
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/lang/gcc/4.9/Makefile,v
> retrieving revision 1.47
> diff -u -p -u -r1.47 Makefile
> --- Makefile  4 Mar 2017 21:59:55 -   1.47
> +++ Makefile  4 Jun 2017 08:36:12 -
> @@ -4,7 +4,7 @@ ONLY_FOR_ARCHS = amd64 arm hppa i386 mip
>  DPB_PROPERTIES = parallel
>  
>  V = 4.9.4
> -REVISION = 4
> +REVISION = 5
>  FULL_VERSION = $V
>  FULL_PKGVERSION = $V
>  
> Index: patches/patch-gcc_config_i386_i386_c
> ===
> RCS file: /cvs/ports/lang/gcc/4.9/patches/patch-gcc_config_i386_i386_c,v
> retrieving revision 1.4
> diff -u -p -u -r1.4 patch-gcc_config_i386_i386_c
> --- patches/patch-gcc_config_i386_i386_c  1 Sep 2016 17:30:33 -   
> 1.4
> +++ patches/patch-gcc_config_i386_i386_c  4 Jun 2017 08:36:12 -
> @@ -1,6 +1,6 @@
>  $OpenBSD: patch-gcc_config_i386_i386_c,v 1.4 2016/09/01 17:30:33 pascal Exp $
>  gcc/config/i386/i386.c.orig  Mon Aug  1 18:03:41 2016
> -+++ gcc/config/i386/i386.c   Sat Aug  6 19:19:04 2016
> +--- gcc/config/i386/i386.c.orig  Mon Aug  1 12:03:41 2016
>  gcc/config/i386/i386.c   Sun Jun  4 04:30:01 2017
>  @@ -2307,6 +2307,8 @@ struct ix86_frame
> HOST_WIDE_INT reg_save_offset;
> HOST_WIDE_INT sse_reg_save_offset;
> @@ -18,13 +18,22 @@ $OpenBSD: patch-gcc_config_i386_i386_c,v
> frame->nregs = ix86_nsaved_regs ();
> frame->nsseregs = ix86_nsaved_sseregs ();
>   
> -@@ -10903,6 +10906,9 @@ ix86_expand_prologue (void)
> -   m->fs.sp_offset = INCOMING_FRAME_SP_OFFSET;
> +@@ -10904,6 +10907,9 @@ ix86_expand_prologue (void)
> m->fs.realigned = true;
>   }
> -+
> + 
>  +  if (warn_stack_larger_than && frame.local_size > stack_larger_than_size)
>  +warning (OPT_Wstack_larger_than_, "stack usage is %ld bytes", 
> frame.local_size);
> - 
> ++
> int_registers_saved = (frame.nregs == 0);
> sse_registers_saved = (frame.nsseregs == 0);
> + 
> +@@ -26860,7 +26866,7 @@ ix86_local_alignment (tree exp, enum machine_mode 
> mode
> +!= TYPE_MAIN_VARIANT (va_list_type_node)))
> +&& TYPE_SIZE (type)
> +&& TREE_CODE (TYPE_SIZE (type)) == INTEGER_CST
> +-   && (TREE_INT_CST_LOW (TYPE_SIZE (type)) >= 16
> ++   && (TREE_INT_CST_LOW (TYPE_SIZE (type)) >= 128
> +|| TREE_INT_CST_HIGH (TYPE_SIZE (type))) && align < 128)
> + return 128;
> + }

This will probably require library and ports bumps, but here is
an example to better demonstrate the issue:

#include 
#include 

int main()
{
char buf[15];
strcpy(buf, "1234567890abcdef");
printf("%s", buf);
}

# base gcc 4.2.1

$ gcc ssp-test.c -o ssp-test
/tmp//cc6vEhU3.o: In function `main':
ssp-test.c:(.text+0x21): warning: warning: strcpy() is almost always misused, 
please use strlcpy()
$ ./ssp-test
Abort trap

# base clang 4.0.0

$ /usr/bin/clang ssp-test.c -o ssp-test-clang1
/tmp/ssp-test-3faff4.o: In function `main':
ssp-test.c:(.text+0x31): warning: warning: strcpy() is almost always misused, pl
ease use strlcpy()
$ ./ssp-test-clang1
Abort trap

# ports clang 4.0.0

$ /usr/local/bin/clang ssp-test.c -o ssp-test-clang2
/tmp/ssp-test-f372af.o: In function `main':
ssp-test.c:(.text+0x31): warning: warning: strcpy() is almost always misused, pl
ease use strlcpy()
$ ./ssp-test-clang2
Abort trap

# ports egcc 4.9.4

$ egcc ssp-test.c -o ssp-test-egcc # ???
$ ./ssp-test-egcc
1234567890abcdef $
$ egcc -fno-builtin-strcpy ssp-test.c -o ssp-test-egcc
/tmp//ccU4UBvd.o: In function `main':
ssp-test.c:(.text+0x24): warning: warning: strcpy() is almost always misused, 
please use strlcpy()
$ ./ssp-test-egcc
1234567890abcdef $
$ readelf -a ssp-test-egcc | grep smash
00200fc8  000f0007 R_X86_64_JUMP_SLO  
__stack_smash_handler + 0
15:    281 FUNCGLOBAL DEFAULT  UND __stack_smash_handler
30:    281 FUNCGLOBAL DEFAULT  UND 
__stack_smash_handler$

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2017/06/05 09:26:32

Modified files:
mail/dovecot   : Makefile distinfo 
mail/dovecot/pkg: PLIST-server 

Log message:
update to dovecot-2.2.30.1, from Brad

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2017/06/05 08:48:09

Modified files:
databases/sqlports: Makefile 
databases/sqlports/files: Info.pm Var.pm 
databases/sqlports/pkg: DESCR-compact DESCR-main 

Log message:
add COMPILER_LINKS. Tweak USE_WXNEEDED to support a 3rd option (special)

UPDATE: misc/dvtm

[Klemens Nanni]

No need to manually include ,  does that. This
was probably done because -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700
would cause __BSD_VISIBLE to be undefined which in turn would prevent
SIGWINCH from being defined.

-D_XOPEN_SOURCE_EXTENDED is needed, otherwise the compiler will warn
about implicitly defined addnwstr(3).

When unhiding ${CC} in Makefile, remove the corresponding @echo line
to avoid duplicate output such as

CC dvtm.c
cc -c -O2 -pipe ... dvtm.c

Feedback/OK?

Index: patches/patch-Makefile
===
RCS file: /cvs/ports/misc/dvtm/patches/patch-Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile
--- patches/patch-Makefile  28 Dec 2015 16:18:53 -  1.2
+++ patches/patch-Makefile  5 Jun 2017 14:41:03 -
@@ -1,20 +1,17 @@
-$OpenBSD: patch-Makefile,v 1.2 2015/12/28 16:18:53 jasper Exp $
-
-- Don't hide the compile commands.
-
 Makefile.orig  Thu Feb 19 17:51:23 2015
-+++ Makefile   Mon Dec 28 17:10:19 2015
-@@ -16,13 +16,13 @@ config.h:
+--- Makefile.orig  Sun Jun  4 15:30:02 2017
 Makefile   Sun Jun  4 15:30:30 2017
+@@ -15,14 +15,12 @@ config.h:
+   cp config.def.h config.h
 
 .c.o:

-   @echo CC $<
+-  @echo CC $<
-   @${CC} -c ${CFLAGS} $<
+   ${CC} -c ${CFLAGS} $<
 
 ${OBJ}: config.h config.mk
 
 dvtm: ${OBJ}

-   @echo CC -o $@
+-  @echo CC -o $@
-   @${CC} -o $@ ${OBJ} ${LDFLAGS}
+   ${CC} -o $@ ${OBJ} ${LDFLAGS}
 
Index: patches/patch-config_mk

===
RCS file: /cvs/ports/misc/dvtm/patches/patch-config_mk,v
retrieving revision 1.8
diff -u -p -r1.8 patch-config_mk
--- patches/patch-config_mk 28 Dec 2015 16:18:53 -  1.8
+++ patches/patch-config_mk 5 Jun 2017 14:41:03 -
@@ -1,14 +1,11 @@
-$OpenBSD: patch-config_mk,v 1.8 2015/12/28 16:18:53 jasper Exp $
 config.mk.orig Thu Feb 19 17:51:23 2015
-+++ config.mk  Mon Dec 28 16:58:31 2015
-@@ -3,15 +3,14 @@ VERSION = 0.14
+--- config.mk.orig Mon Jun  5 02:23:44 2017
 config.mk  Mon Jun  5 02:24:41 2017
+@@ -3,15 +3,13 @@ VERSION = 0.15
 
 # Customize below to fit your system
 
-PREFIX ?= /usr/local

-MANPREFIX = ${PREFIX}/share/man
-+#PREFIX ?= /usr/local
-+#MANPREFIX = ${PREFIX}/share/man
 # specify your systems terminfo directory
 # leave empty to install into your home folder
 TERMINFO := ${DESTDIR}${PREFIX}/share/terminfo
@@ -16,6 +13,7 @@ $OpenBSD: patch-config_mk,v 1.8 2015/12/
 INCS = -I.
 LIBS = -lc -lutil -lncursesw
-CPPFLAGS = -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 
-D_XOPEN_SOURCE_EXTENDED
++CPPFLAGS = -D_XOPEN_SOURCE_EXTENDED
 CFLAGS += -std=c99 ${INCS} -DVERSION=\"${VERSION}\" -DNDEBUG ${CPPFLAGS}
 LDFLAGS += ${LIBS}
 
Index: patches/patch-dvtm_c

===
RCS file: /cvs/ports/misc/dvtm/patches/patch-dvtm_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-dvtm_c
--- patches/patch-dvtm_c28 Dec 2015 16:18:53 -  1.3
+++ patches/patch-dvtm_c5 Jun 2017 14:41:03 -
@@ -1,22 +1,6 @@
-$OpenBSD: patch-dvtm_c,v 1.3 2015/12/28 16:18:53 jasper Exp $
-
-Add sys/signal.h for SIGWINCH
-
 dvtm.c.origMon Dec 28 16:40:33 2015
-+++ dvtm.c Mon Dec 28 16:57:53 2015
-@@ -36,6 +36,11 @@
- #endif
- #include "vt.h"
- 
-+/* Needed for SIGWINCH */

-+#ifdef __OpenBSD__
-+#include 
-+#endif
-+
- #ifdef PDCURSES
- int ESCDELAY;
- #endif
-@@ -164,8 +169,12 @@ typedef struct {
+--- dvtm.c.origSun Jun  4 15:30:02 2017
 dvtm.c Sun Jun  4 15:30:30 2017
+@@ -165,8 +165,12 @@ typedef struct {
 } Editor;
 
 #define LENGTH(arr) (sizeof(arr) / sizeof((arr)[0]))

Re: New: net/wireless

[Bryan C. Everly]

On Sun, Jun 4, 2017 at 9:33 PM Josh Grosse  wrote:

> On Sun, Jun 04, 2017 at 09:52:57PM +0200, Gregor Best wrote:
> > So yeah, does it make sense to have in the ports tree?
>
> As a user of it for the last year, I'd appreciate it.  It
> was last posted to ports@ for consideration in September.
>
> https://www.mail-archive.com/ports@openbsd.org/msg66389.html
>
> I'm happy to be the maintainer for this still.
-- 

Thanks,
Bryan

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2017/06/05 04:17:41

Modified files:
lang/libv8 : Makefile 
lang/mono  : Makefile 

Log message:
Revert wxneeded hack; USE_WXNEEDED does the right thing with clang now.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2017/06/05 04:10:33

Modified files:
devel/spidermonkey38: Makefile 

Log message:
Fix path in comment.

CVS: cvs.openbsd.org: ports

[Benoit Lecocq]

CVSROOT:/cvs
Module name:ports
Changes by: ben...@cvs.openbsd.org  2017/06/05 03:23:25

Modified files:
textproc/p5-Pod-Spell: Makefile distinfo 
textproc/p5-Pod-Spell/pkg: PLIST 

Log message:
Update to p5-Pod-Spell-1.20.

UPDATE: ldns 1.7.0

[Stuart Henderson]

Here's a slightly overdue update to ldns-utils 1.7.0.

I've tested the bits I use, is there anyone using dnssec who wants
to test those parts?


Index: Makefile.inc
===
RCS file: /cvs/ports/net/ldns/Makefile.inc,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile.inc
--- Makefile.inc15 Jun 2014 20:20:34 -  1.30
+++ Makefile.inc5 Jun 2017 08:59:31 -
@@ -1,6 +1,6 @@
 # $OpenBSD: Makefile.inc,v 1.30 2014/06/15 20:20:34 sthen Exp $
 
-VERSION=   1.6.17
+VERSION=   1.7.0
 
 DISTNAME=  ldns-${VERSION}
 
Index: distinfo
===
RCS file: /cvs/ports/net/ldns/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo22 Jan 2014 00:15:36 -  1.7
+++ distinfo5 Jun 2017 08:59:31 -
@@ -1,2 +1,2 @@
-SHA256 (ldns-1.6.17.tar.gz) = i4jgWUUhGOiUmidSpVzlm8cfpbxBQQPhf1trBvm8yM0=
-SIZE (ldns-1.6.17.tar.gz) = 1315403
+SHA256 (ldns-1.7.0.tar.gz) = wZ9bG0+zdM/jT0hF6hGx4FUd3GeAO9bd1dKiDwmXpsw=
+SIZE (ldns-1.7.0.tar.gz) = 1304424
Index: libldns/Makefile
===
RCS file: /cvs/ports/net/ldns/libldns/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- libldns/Makefile11 May 2015 16:24:38 -  1.30
+++ libldns/Makefile5 Jun 2017 08:59:31 -
@@ -3,11 +3,15 @@
 COMMENT=   DNS library modelled after Net::DNS
 
 PKGNAME=   libldns-${VERSION}
-REVISION=  1
 
-SHARED_LIBS += ldns 6.1
+SHARED_LIBS += ldns 7.0  # 2.0
 
 # ssl included as ssl.h has been used.
 WANTLIB=   crypto ssl
+
+# "OpenSSL does not support offline DANE verification (Needed for the
+# DANE-TA usage type). Please upgrade OpenSSL to version >= 1.1.0 or rerun
+# with --disable-dane-verify or --disable-dane-ta-usage"
+CONFIGURE_ARGS=--disable-dane-ta-usage
 
 .include 
Index: libldns/patches/patch-Makefile_in
===
RCS file: /cvs/ports/net/ldns/libldns/patches/patch-Makefile_in,v
retrieving revision 1.15
diff -u -p -r1.15 patch-Makefile_in
--- libldns/patches/patch-Makefile_in   22 Jan 2014 00:15:36 -  1.15
+++ libldns/patches/patch-Makefile_in   5 Jun 2017 08:59:31 -
@@ -1,16 +1,17 @@
 $OpenBSD: patch-Makefile_in,v 1.15 2014/01/22 00:15:36 brad Exp $
 Makefile.in.orig   Fri Jan 10 16:04:41 2014
-+++ Makefile.inFri Jan 10 17:42:38 2014
-@@ -12,7 +12,7 @@ datarootdir  = @datarootdir@
- datadir   = @datadir@
+Index: Makefile.in
+--- Makefile.in.orig
 Makefile.in
+@@ -13,7 +13,7 @@ datadir  = @datadir@
  libdir= @libdir@
  includedir= @includedir@
+ sysconfdir  = @sysconfdir@
 -doxygen   = @doxygen@
 +#doxygen  = @doxygen@
  pywrapdir   = $(srcdir)/contrib/python
  pyldnsxwrapdir  = $(srcdir)/contrib/ldnsx
  p5_dns_ldns_dir = $(srcdir)/contrib/DNS-LDNS
-@@ -320,7 +320,6 @@ uninstall-h:
+@@ -358,7 +358,6 @@ uninstall-h:
  install-lib: lib
$(INSTALL) -m 755 -d $(DESTDIR)$(libdir)
$(LIBTOOL) --mode=install cp libldns.la $(DESTDIR)$(libdir)
Index: libldns/patches/patch-doc_doxyparse_pl
===
RCS file: libldns/patches/patch-doc_doxyparse_pl
diff -N libldns/patches/patch-doc_doxyparse_pl
--- libldns/patches/patch-doc_doxyparse_pl  14 Apr 2016 23:02:27 -  
1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-doc_doxyparse_pl,v 1.1 2016/04/14 23:02:27 sthen Exp $
 doc/doxyparse.pl.orig  Thu Apr 14 17:00:36 2016
-+++ doc/doxyparse.pl   Thu Apr 14 17:00:51 2016
-@@ -273,7 +273,7 @@ foreach (keys %manpages) {
- 
-   print MAN $MAN_MIDDLE;
- 
--  if (defined(@$also)) {
-+  if (@$also) {
-   print MAN "\n.SH SEE ALSO\n\\fI";
-   print MAN join "\\fR, \\fI", @$also;
-   print MAN "\\fR.\nAnd ";
Index: libldns/pkg/PLIST
===
RCS file: /cvs/ports/net/ldns/libldns/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST
--- libldns/pkg/PLIST   22 Jan 2014 00:15:36 -  1.9
+++ libldns/pkg/PLIST   5 Jun 2017 08:59:31 -
@@ -38,20 +38,34 @@ lib/libldns.a
 lib/libldns.la
 @lib lib/libldns.so.${LIBldns_VERSION}
 @man man/man1/ldns-config.1
+@man man/man3/ldns_algorithm.3
+@man man/man3/ldns_axfr_abort.3
+@man man/man3/ldns_axfr_complete.3
+@man man/man3/ldns_axfr_last_pkt.3
+@man man/man3/ldns_axfr_next.3
+@man man/man3/ldns_axfr_start.3
+@man man/man3/ldns_b32_ntop_calculate_size.3
+@man man/man3/ldns_b32_pton_calculate_size.3
+@man man/man3/ldns_b64_ntop_calculate_size.3
+@man man/man3/ldns_b64_pton_calculate_size.3
 @man man/man3/ldns_bget_token.3
 @man man/man3/ldns_bgetc.3
 @man man/man3/ldns_bskipcs.3
+@man man/man3/ldns_bubblebabble.3
 @man 

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2017/06/05 02:01:39

Modified files:
sysutils/py-augeas: Makefile distinfo 
sysutils/py-augeas/pkg: PLIST 

Log message:
- update to py-augeas-1.0.2
- re-space

CVS: cvs.openbsd.org: ports

[Frederic Cambus]

CVSROOT:/cvs
Module name:ports
Changes by: fcam...@cvs.openbsd.org 2017/06/05 01:57:11

Modified files:
emulators/advancemess: Makefile distinfo 

Log message:
Update advancemess to 3.5.

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2017/06/05 01:52:34

Modified files:
sysutils/fleetctl: Makefile distinfo 
sysutils/fleetctl/pkg: PLIST 

Log message:
update to fleet-1.0.0

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2017/06/05 01:34:12

Modified files:
security/libgcrypt: Makefile distinfo 

Log message:
Update to libgcrypt-1.7.7.

CVS: cvs.openbsd.org: ports

[Frederic Cambus]

CVSROOT:/cvs
Module name:ports
Changes by: fcam...@cvs.openbsd.org 2017/06/05 01:26:30

Modified files:
emulators/advancemame: Makefile distinfo 

Log message:
Update advancemame to 3.5.

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2017/06/05 01:10:06

Modified files:
infrastructure/mk: bsd.port.mk 

Log message:
thinko. breaks devel/llvm on a clang arch