Re: possibly fix print/texlive/base (was: sparc64 bulk build report)

[Matthias Kilian]

On Wed, Feb 14, 2018 at 09:42:17PM +0100, Matthias Kilian wrote:
> > http://build-failures.rhaalovely.net//sparc64/2018-02-02/print/texlive/base.log
> 
> This is probably related to my switch to use the bundled poppler
> (rev.  1.95 of Makefile), which also removed the COMPILER setting,
> and print/texlive/base now appears to *require* c++-11.

Bah! Updated version, with CXXFLAGS = -std=c++11 commented out,
because a patch for fixing luatex with -stdc=c++11 was lost during
the update to texlive-2017. I don't want to add that patch again
now, because the diff below is only for fixing texlive on archs
with a non-c++11 compiler in base.

Builds without errors on amd64.

Ciao,
Kili

Index: Makefile
===
RCS file: /cvs/ports/print/texlive/base/Makefile,v
retrieving revision 1.97
diff -u -p -r1.97 Makefile
--- Makefile30 Jan 2018 20:35:34 -  1.97
+++ Makefile16 Feb 2018 23:39:21 -
@@ -5,6 +5,7 @@ COMMENT =   base binaries for TeXLive typ
 DISTNAME = texlive-${DIST_V}-source
 PKGNAME =  texlive_base-${V}
 WRKDIST =  ${WRKDIR}/texlive-${DIST_V}-source
+REVISION = 0
 
 DISTFILES =${DISTNAME}${EXTRACT_SUFX} \
texlive-${DIST_V}-extra${EXTRACT_SUFX}
@@ -45,11 +46,18 @@ LIB_DEPENDS =   converters/libiconv \
 
 MODULES =  textproc/intltool perl
 
+# c++-11 required for some subprojects
+COMPILER = base-clang ports-gcc
+
 # Never set SEPARATE_BUILD
 CONFIGURE_STYLE =  gnu
 
 CPPFLAGS = -I${X11BASE}/include \
-I${LOCALBASE}/include
+
+# Not yet. Some parts (like luatex) will need patches to build with
+# this:
+# CXXFLAGS +=  -std=c++11
 
 LDFLAGS =  -L${LOCALBASE}/lib \
-L${X11BASE}/lib

Re: UPDATE devel/git-cola

[Björn Ketelaars]

On Thu 15/02/2018 12:43, Rafael Sadowski wrote:
> On Tue Feb 13, 2018 at 07:28:54PM +0100, Björn Ketelaars wrote:
> > git-cola received an update, which fixes some bugs and adds some
> > features. Changelog can be found at
> > https://github.com/git-cola/git-cola/blob/master/share/doc/git-cola/relnotes.rst
> >
> > Lightly tested on my laptop.
> >
> > OK?
> 
> Looks good but test section needs love or NO_TEST=Yes

Yes...test section needed some love. Output 'make test':

Ran 137 tests in 12.860s

OK?


Index: Makefile
===
RCS file: /cvs/ports/devel/git-cola/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile28 May 2017 08:27:35 -  1.20
+++ Makefile16 Feb 2018 12:17:13 -
@@ -2,7 +2,7 @@
 
 COMMENT =  python powered git gui
 
-MODPY_EGG_VERSION= 2.11
+MODPY_EGG_VERSION= 3.0
 DISTNAME = ${GH_PROJECT}-${MODPY_EGG_VERSION}
 
 GH_ACCOUNT =   git-cola
@@ -11,7 +11,7 @@ GH_TAGNAME =  v${MODPY_EGG_VERSION}
 
 CATEGORIES =   devel x11
 
-HOMEPAGE = http://cola.tuxfamily.org/
+HOMEPAGE = https://git-cola.github.io/
 
 # GPLv2 only
 PERMIT_PACKAGE_CDROM=  Yes
@@ -28,14 +28,16 @@ RUN_DEPENDS =   devel/desktop-file-utils \
textproc/xxdiff \
x11/py-qt4
 
+TEST_DEPENDS = devel/py-mock \
+   devel/py-nose
+
 MODPY_ADJ_FILES= share/git-cola/bin/git-xbase
 
 pre-configure:
${SUBST_CMD} ${WRKSRC}/cola/app.py
 
-pre-test:
-   ln -sf ${MODPY_BIN} ${WRKDIR}/bin/python
-   # needs an X server
-   rm -f ${WRKSRC}/test/qtutils_test.py
+do-test:
+   ${SUBST_CMD} ${WRKSRC}/test/git_test.py
+   cd ${WRKSRC} && nosetests --exclude=sphinxtogithub --verbose
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/devel/git-cola/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo28 May 2017 08:27:35 -  1.7
+++ distinfo16 Feb 2018 12:17:13 -
@@ -1,2 +1,2 @@
-SHA256 (git-cola-2.11.tar.gz) = vEAH4NnIB2PvWNYwsDO/29hAavd7vSkqbGR+08plW1s=
-SIZE (git-cola-2.11.tar.gz) = 1179769
+SHA256 (git-cola-3.0.tar.gz) = YZWPmY1GGOCc4N1HNBGSGBjRPfg48yEC713tmEoNGlA=
+SIZE (git-cola-3.0.tar.gz) = 1218820
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/devel/git-cola/patches/patch-Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile
--- patches/patch-Makefile  8 Nov 2015 19:33:06 -   1.2
+++ patches/patch-Makefile  16 Feb 2018 12:17:13 -
@@ -2,9 +2,10 @@ $OpenBSD: patch-Makefile,v 1.2 2015/11/0
 
 Avoid dep on gnu make
 
 Makefile.orig  Mon Oct 12 21:03:45 2015
-+++ Makefile   Sun Nov  8 20:17:51 2015
-@@ -44,11 +44,7 @@ setup_args += --force
+Index: Makefile
+--- Makefile.orig
 Makefile
+@@ -59,11 +59,7 @@ setup_args += --force
  setup_args += --install-scripts=$(bindir)
  setup_args += --record=build/MANIFEST
  setup_args += --install-lib=$(coladir)
@@ -15,5 +16,5 @@ Avoid dep on gnu make
 -export prefix
 +setup_args += --root=$(DESTDIR)
  
- PYTHON_DIRS = test
- PYTHON_DIRS += cola
+ # If NO_VENDOR_LIBS is specified on the command line then pass it to setup.py
+ ifdef NO_VENDOR_LIBS
Index: patches/patch-cola_app_py
===
RCS file: /cvs/ports/devel/git-cola/patches/patch-cola_app_py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-cola_app_py
--- patches/patch-cola_app_py   8 Nov 2015 19:33:06 -   1.2
+++ patches/patch-cola_app_py   16 Feb 2018 12:17:13 -
@@ -2,9 +2,10 @@ $OpenBSD: patch-cola_app_py,v 1.2 2015/1
 
 Use ssh-askpass implementation from xenocara.
 
 cola/app.py.orig   Mon Oct 12 21:03:45 2015
-+++ cola/app.pySun Nov  8 20:17:51 2015
-@@ -118,7 +118,7 @@ def setup_environment():
+Index: cola/app.py
+--- cola/app.py.orig
 cola/app.py
+@@ -81,7 +81,7 @@ def setup_environment():
  elif sys.platform == 'darwin':
  askpass = resources.share('bin', 'ssh-askpass-darwin')
  else:
Index: patches/patch-test_git_test_py
===
RCS file: patches/patch-test_git_test_py
diff -N patches/patch-test_git_test_py
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-test_git_test_py  16 Feb 2018 12:17:13 -
@@ -0,0 +1,63 @@
+$OpenBSD$
+
+test_tag and test_show assume that source has been fetched using git, and that
+full history is availabe. These tests fail as we are using a release tarball.
+
+Index: test/git_test.py
+--- test/git_test.py.orig
 test/git_test.py
+@@ -219,26 +219,13 @@ class GitCommandTest(unittest.TestCase):
+ version = self.git.version()[STDOUT]
+ self.failUnless(version.startswith('git version'))
+ 
+-def test_tag(self):
+-"""Test running 'git tag'"""
+-tags = self.git.tag()[STDOUT].splitlines()
+-if 

Re: UPDATE devel/msgpack

[Björn Ketelaars]

On Thu 15/02/2018 23:14, Brian Callahan wrote:
> 
> On 02/15/18 23:01, Björn Ketelaars wrote:
> > On Fri 09/02/2018 18:29, Björn Ketelaars wrote:
> > > On Fri 09/02/2018 17:09, Stuart Henderson wrote:
> > > > On 2018/02/09 07:55, Björn Ketelaars wrote:
> > > > > Included a diff for bringing devel/msgpack to 2.1.5. From CHANGELOG:
> > > > > 
> > > > > - Improve cross platform configuration
> > > > > - Add boost asio examples (including zlib)
> > > > > - Remove some warnings
> > > > > - Fix unpack visitor to treat float32/64 correctly
> > > > > - Improve documents
> > > > > - Fix alignment problem on some platform
> > > > > - Fix conflict std::tuple, std::pair, and boost::fusion::sequence 
> > > > > problem
> > > > > 
> > > > > While here drop GH_ in favour of MASTER_SITES, and switch HOMEPAGE to
> > > > > https. No need to bump SHARED_LIBS.
> > > > GH_* is correct here.
> > > > 
> > > > /archive  -> GH_*
> > > > /releases -> MASTER_SITES
> > New diff, which includes sthen@'s comment, and excludes the reordering of
> > Makefile. Output make test:
> > 
> > 100% tests passed, 0 tests failed out of 30
> > 
> > Build tested both consumers (editors/neovim and sysutils/tmate). Run
> > tested with editors/neovim.
> > 
> > OK?
> 
> Sorry to make you do more work, but:
> 1. Could you eliminate -Werror in all the patches? It's in one but not the
> other.
> 
> 2. There are some more -O3 floating around. For example:

Thanks for reviewing!

I missed the remaining -O3, and didn't think that using -Werror is not
preferred. Output 'make test' after removing these flags:

100% tests passed, 0 tests failed out of 30 

Instead of patching 4 files I'm using sed.


OK?


Index: Makefile
===
RCS file: /cvs/ports/devel/msgpack/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile20 Jan 2018 14:03:39 -  1.8
+++ Makefile16 Feb 2018 11:31:08 -
@@ -2,13 +2,13 @@
 
 COMMENT =  MessagePack implementation for C and C++
 
-V =2.1.4
+V =2.1.5
 DISTNAME = msgpack-${V}
 SHARED_LIBS += msgpackc  1.0 # 2.0
 
 CATEGORIES =   devel
 
-HOMEPAGE = http://msgpack.org/
+HOMEPAGE = https://msgpack.org/
 
 # Boost license
 PERMIT_PACKAGE_CDROM = Yes
@@ -21,5 +21,11 @@ MODULES =devel/cmake
 
 BUILD_DEPENDS =devel/gtest
 TEST_DEPENDS = devel/gtest
+
+pre-configure:
+   cd ${WRKSRC} && sed -i 's,-Werror -g -O3,,' CMakeLists.txt \
+   example/c/CMakeLists.txt \
+   example/cpp03/CMakeLists.txt \
+   test/CMakeLists.txt
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/devel/msgpack/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo9 Aug 2017 23:02:22 -   1.4
+++ distinfo16 Feb 2018 11:31:08 -
@@ -1,2 +1,2 @@
-SHA256 (msgpack-2.1.4.tar.gz) = DjufGzKWf4m0FuAor+LH98wI4middd4i8HrZtNsU9a4=
-SIZE (msgpack-2.1.4.tar.gz) = 460891
+SHA256 (msgpack-2.1.5.tar.gz) = nIf4D8ZRuQB3LervCrFUtjFgx00pJSm1vm0G1khdRkA=
+SIZE (msgpack-2.1.5.tar.gz) = 461179
Index: patches/patch-CMakeLists_txt
===
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt16 Jun 2017 18:55:07 -  1.3
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,19 +0,0 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.3 2017/06/16 18:55:07 jasper Exp $
-
-Kill -g -O3.
-
-Index: CMakeLists.txt
 CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -237,9 +237,9 @@ ENDIF ()
- 
- IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" 
STREQUAL "GNU")
- IF (MSGPACK_ENABLE_SHARED)
--SET_PROPERTY (TARGET msgpackc APPEND_STRING PROPERTY COMPILE_FLAGS 
"-Wall -Wextra -Werror -g -O3 -DPIC")
-+SET_PROPERTY (TARGET msgpackc APPEND_STRING PROPERTY COMPILE_FLAGS 
"-Wall -Wextra -Werror -DPIC")
- ENDIF ()
--SET_PROPERTY (TARGET msgpackc-static APPEND_STRING PROPERTY COMPILE_FLAGS 
"-Wall -Wextra -Werror -g -O3" )
-+SET_PROPERTY (TARGET msgpackc-static APPEND_STRING PROPERTY COMPILE_FLAGS 
"-Wall -Wextra -Werror" )
- ENDIF ()
- 
- IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
Index: patches/patch-test_CMakeLists_txt
===
RCS file: patches/patch-test_CMakeLists_txt
diff -N patches/patch-test_CMakeLists_txt
--- patches/patch-test_CMakeLists_txt   16 Jun 2017 18:55:07 -  1.3
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-test_CMakeLists_txt,v 1.3 2017/06/16 18:55:07 jasper Exp $
-
-Kill -g -O3. Kill -Werror, as gtest header makes warnings.
-
-Index: test/CMakeLists.txt
 test/CMakeLists.txt.orig
-+++ test/CMakeLists.txt
-@@ -86,7 +86,7 @@ FOREACH (source_file 

Re: NEW: security/qgpgme; Update security/gpgme, mail/trojita; remove: x11/kde-applications/gpgmepp

[Stuart Henderson]

On 2018/02/16 07:33, Rafael Sadowski wrote:
> Hi All,
> 
> tl;dr: x11/kde-applications/gpgmepp is dead upstream. Long live
> security/qgpgme.
> 
> Since Sep. 2016[1] the C++ bindings for GnuPG's GPGME library and
> the Qt Job API for GpgME++ (QGpgME) is part of the GPGME repository.
> 
> It wasn't a good idea to make an FLAVOR in security/gpgme; discussed here[2].

That thread isn't about adding a FLAVOR but a PSEUDO_FLAVOR mechanism
(and defaults can be set as appropriate for arches which can't build qt5
- though I don't see why qt5 would need to be disabled by default on
arches which do support it unless there's a cyclical dependency;
otherwise just having the no_qt pseudo-flavour available should be
good enough there).

The part in there which is an actual problem for this is qt5.port.mk
changing the compiler. One way around that would be to use "base-clang
ports-clang ports-gcc" explicitly for gpgme. But gpgme is C not C++
anyway so just setting MODQT5_USE_CXX11=No might do the trick too.

jca said, "And I agree with you that requiring Qt5 to build gpgme in
bulk builds is not reasonable, as said in my previous mail." - but
that doesn't matter for full bulks (which will have qgpgme anyway)
only partial ones - and those are already a special enough case that
adding extra complexity to cope with them doesn't seem worthwhile
(especially when the builder can use ,no_qt in their build list entry).

> For this reason, you will find attached the diffs/tarball with the
> following content:
> 
> 1.) gpgme.1.10.diff
> Simple update to the latest stable version 1.10.0. Tested with neomutt
> and trojita ond amd64.

Looks sane and independent of the other parts, but I would like to know
that at least builds have been done with more of the ports depending on
it especially if enough changed to need a major bump.

> 2.) trojita_qgpgme.diff
> Patch trojita to play with qgpgme from GPGME based on the idea from
> archlinux[3]. Tested on amd64. All tests are green.

Is there any chance of upstream adopting these patches? (not a show
stopper but they're complex enough it would be nice not to have to
keep carrying and updating them).

> 3.) qgpgme.tar.gz
> Based on security/gpgme with the following changes:
> - Add --enable-languages='cpp qt'
> - remove all duplicated stuff with gpgme in post-install.
> - QGpgME is GPLv2 and not LGPL
> - Add security/gpgme=${VERSION} so keep in snyc with gpgme.

I'd be happier with this being part of a single gpgme port if the
compiler settings thing can be fixed as above. Apart from anything
else these fixed-version dependencies make it a pain to test updates
(also see irssi, dovecot) because you have to uninstall existing
packages to get the new ones built.

Re: UPDATE devel/msgpack

[Stuart Henderson]

> > Sorry to make you do more work, but:
> > 1. Could you eliminate -Werror in all the patches? It's in one but not the
> > other.
> > 
> > 2. There are some more -O3 floating around. For example:
> 
> Thanks for reviewing!
> 
> I missed the remaining -O3, and didn't think that using -Werror is not
> preferred. Output 'make test' after removing these flags:
> 
> 100% tests passed, 0 tests failed out of 30 
> 
> Instead of patching 4 files I'm using sed.

I think it's fair enough to use sed for this. OK with me

The main problem with -Werror is that some of the older compilers warn
on things which newer ones find acceptable, so you're at risk of builds
failing needlessly on the very arches where it's harder to get tests
done.

Re: py-test and friends

[Daniel Jakots]

On Sat, 10 Feb 2018 23:51:04 +, Stuart Henderson
 wrote:

> can anyone help testing / getting these in please? i don't have time
> to test the wider dep chain at the moment.

py-pluggy needs a newer py-py for its test suite. I can get them in if
you don't want to deal with them (I need to review them a bit more
carefully though) or we can proceed differently.

Index: Makefile
===
RCS file: /cvs/ports/devel/py-py/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- Makefile28 Jun 2017 17:49:51 -  1.30
+++ Makefile16 Feb 2018 16:22:51 -
@@ -2,7 +2,7 @@
 
 COMMENT=   cross-python path, ini-parsing, io, code, log facilities
 
-MODPY_EGG_VERSION =1.4.34
+MODPY_EGG_VERSION =1.5.2
 DISTNAME=  py-${MODPY_EGG_VERSION}
 PKGNAME=   py-${DISTNAME}
 
Index: distinfo
===
RCS file: /cvs/ports/devel/py-py/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo28 Jun 2017 17:49:51 -  1.9
+++ distinfo16 Feb 2018 16:22:51 -
@@ -1,2 +1,2 @@
-SHA256 (py-1.4.34.tar.gz) = Dy1YXSIFDpDH0pO2RRyD2wl993hxl02Q79WjDcEvzeM=
-SIZE (py-1.4.34.tar.gz) = 194450
+SHA256 (py-1.5.2.tar.gz) = yhiUPigjVBd1Yxa/rabNlrI85g3VMmQmkNz9q6mIp20=
+SIZE (py-1.5.2.tar.gz) = 189542
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-py/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST
--- pkg/PLIST   26 Dec 2015 07:36:24 -  1.10
+++ pkg/PLIST   16 Feb 2018 16:22:51 -
@@ -11,14 +11,11 @@ lib/python${MODPY_VERSION}/site-packages
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}__metainfo.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_apipkg.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_builtin.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_error.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_iniconfig.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_std.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}_xmlgen.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/py/${MODPY_PYCACHE}test.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/py/_apipkg.py
 lib/python${MODPY_VERSION}/site-packages/py/_builtin.py
 lib/python${MODPY_VERSION}/site-packages/py/_code/
 lib/python${MODPY_VERSION}/site-packages/py/_code/__init__.py
@@ -37,7 +34,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/py/_code/code.py
 lib/python${MODPY_VERSION}/site-packages/py/_code/source.py
 lib/python${MODPY_VERSION}/site-packages/py/_error.py
-lib/python${MODPY_VERSION}/site-packages/py/_iniconfig.py
 lib/python${MODPY_VERSION}/site-packages/py/_io/
 lib/python${MODPY_VERSION}/site-packages/py/_io/__init__.py
 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/py/_io/${MODPY_PYCACHE}/
@@ -81,5 +77,13 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/py/_process/forkedfunc.py
 lib/python${MODPY_VERSION}/site-packages/py/_process/killproc.py
 lib/python${MODPY_VERSION}/site-packages/py/_std.py
+lib/python${MODPY_VERSION}/site-packages/py/_vendored_packages/
+lib/python${MODPY_VERSION}/site-packages/py/_vendored_packages/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/py/_vendored_packages/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/py/_vendored_packages/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/py/_vendored_packages/${MODPY_PYCACHE}apipkg.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/py/_vendored_packages/${MODPY_PYCACHE}iniconfig.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/py/_vendored_packages/apipkg.py
+lib/python${MODPY_VERSION}/site-packages/py/_vendored_packages/iniconfig.py
 lib/python${MODPY_VERSION}/site-packages/py/_xmlgen.py
 lib/python${MODPY_VERSION}/site-packages/py/test.py

UPDATE: net/geomyidae 0.26.3 -> 0.31

[Hiltjo Posthuma]

Hi,

This patch updates geomyidae from 0.26.3 to 0.31.
There are many improvements and fixes to mention briefly.

Patch below:


diff --git a/net/geomyidae/Makefile b/net/geomyidae/Makefile
index 9e67872684f..dd7e07232e1 100644
--- a/net/geomyidae/Makefile
+++ b/net/geomyidae/Makefile
@@ -2,12 +2,15 @@
 
 COMMENT =  Gopher protocol daemon
 
-DISTNAME = geomyidae-0.26.3
-REVISION = 1
+V =0.31
+DISTNAME = geomyidae-v${V}
+PKGNAME =  geomyidae-${V}
 
 CATEGORIES =   net
 
-HOMEPAGE = http://www.r-36.net/src/geomyidae/
+HOMEPAGE = http://git.r-36.net/geomyidae/
+
+DISTFILES =geomyidae-v${V}.tgz
 
 MAINTAINER =   Joerg Jung 
 
@@ -16,7 +19,7 @@ PERMIT_PACKAGE_CDROM =Yes
 
 WANTLIB =  c
 
-MASTER_SITES = ${HOMEPAGE}
+MASTER_SITES = ftp://bitreich.org/releases/geomyidae/
 
 MAKE_FLAGS =   CC="${CC}"
 MAKE_ENV = LDFLAGS="${LDFLAGS}"
diff --git a/net/geomyidae/distinfo b/net/geomyidae/distinfo
index 89e1e7358fb..6a372f66c87 100644
--- a/net/geomyidae/distinfo
+++ b/net/geomyidae/distinfo
@@ -1,2 +1,2 @@
-SHA256 (geomyidae-0.26.3.tar.gz) = Fi9VqwWasKm+joQEl3lSk7vVHDSx9FZNzfPw3dXA2zE=
-SIZE (geomyidae-0.26.3.tar.gz) = 15556
+SHA256 (geomyidae-v0.31.tgz) = ZLCVznLpnaY6SPT3BD0a8BAd7DMz/Hoetz13WGtNZfA=
+SIZE (geomyidae-v0.31.tgz) = 20267
diff --git a/net/geomyidae/patches/patch-Makefile 
b/net/geomyidae/patches/patch-Makefile
index 9c70333cdf9..ce694280dc9 100644
--- a/net/geomyidae/patches/patch-Makefile
+++ b/net/geomyidae/patches/patch-Makefile
@@ -1,29 +1,28 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2015/06/22 15:53:45 jung Exp $
 Makefile.orig  Sat Apr 13 21:28:27 2013
-+++ Makefile   Mon Jun 22 13:31:30 2015
-@@ -7,7 +7,7 @@ PREFIX ?= /usr
- BINDIR ?= $(PREFIX)/bin
- MANDIR ?= $(PREFIX)/man/man8
+--- Makefile.orig  Fri Feb 16 18:54:41 2018
 Makefile   Fri Feb 16 18:55:25 2018
+@@ -9,7 +9,7 @@
+ BINDIR = ${PREFIX}/bin
+ MANDIR = ${PREFIX}/share/man/man8
  
--CFLAGS += -O2 -Wall -I. -I/usr/include 
-+CFLAGS += -Wall -I. -I/usr/include 
- LDFLAGS += -L/usr/lib -L. -lc
- : CC = cc
+-CFLAGS = -O2 -Wall
++CFLAGS = -Wall
+ GEOM_CFLAGS = -D_DEFAULT_SOURCE -I. -I/usr/include ${CFLAGS}
+ GEOM_LDFLAGS = -L/usr/lib -L. ${LDFLAGS}
  
-@@ -23,14 +23,12 @@ options:
+@@ -25,14 +25,12 @@
@echo "CC   = ${CC}"
  
  .c.o:
 -  @echo CC $<
--  @${CC} ${CFLAGS} -c $<
-+  ${CC} ${CFLAGS} -c $<
+-  @${CC} ${GEOM_CFLAGS} -c $<
++  ${CC} ${GEOM_CFLAGS} -c $<
  
  ${OBJ}:
  
  ${NAME}: ${OBJ}
 -  @echo CC -o $@
--  @${CC} -o $@ ${OBJ} ${LDFLAGS}
-+  ${CC} -o $@ ${OBJ} ${LDFLAGS}
+-  @${CC} -o $@ ${OBJ} ${GEOM_LDFLAGS}
++  ${CC} -o $@ ${OBJ} ${GEOM_LDFLAGS}
  
  clean:
@echo cleaning


-- 
Kind regards,
Hiltjo

Re: [update] dunst-1.3.1

[Klemens Nanni]

On Fri, Feb 09, 2018 at 05:57:17PM +0100, Klemens Nanni wrote:
> On Sat, Jan 27, 2018 at 08:51:58AM +0200, Timo Myyrä wrote:
> > Klemens Nanni  writes:
> > 
> > > On Fri, Jan 26, 2018 at 09:13:17AM +0200, Timo Myyrä wrote:
> > >> > Klemens Nanni  writes:
> > >> >> Paths in the example dunst.rc need to be adjusted so copying it over
> > >> >> will work without manually fixing them.
> > > Yuck, I forgot to include those in my earlier diff, sorry.
> > >
> > >> Here is an updated diff to include patching the dunstrc file and pod doc.
> > > Except for a few nits below this diff looks good to me.
> > >
> > >> Index: Makefile
> > >> ===
> > >> RCS file: /cvs/ports/x11/dunst/Makefile,v
> > >> retrieving revision 1.3
> > >> diff -u -p -r1.3 Makefile
> > >> --- Makefile 31 Aug 2017 20:57:00 -  1.3
> > >> +++ Makefile 26 Jan 2018 07:11:14 -
> > >> @@ -29,11 +27,13 @@ LIB_DEPENDS +=  devel/gettext \
> > > There are two spaces after += instead of a tab.
> > >
> > >>  devel/pango \
> > >>  graphics/cairo \
> > >>  graphics/gdk-pixbuf2 \
> > >> -x11/gtk+2 \
> > >>  x11/libxdg-basedir \
> > >>  x11/dbus
> > > I'd still move dbus up to sort them alphabetically as done in my earlier
> > > diff.
> > >
> > >>  MAKE_FLAGS =V=1 PREFIX="${PREFIX}" MANPREFIX="${PREFIX}/man"
> > > Not a big fan of those squashed ones, they're better readable across
> > > multiple lines as done for *_DEPENDS (also makes future diffs easier).
> > 
> > Ok, here's revised diff:
> Updated below for 1.3.1 from 30.01.2018:
> 
>   Version 1.3.1 addresses a race condition that can cause the
>   service file to be empty upon installation.
>   It contains no other changes, [...]
> 
> Feedback? Any takers?
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/dunst/Makefile,v
> retrieving revision 1.3
> diff -u -p -r1.3 Makefile
> --- Makefile  31 Aug 2017 20:57:00 -  1.3
> +++ Makefile  9 Feb 2018 16:54:29 -
> @@ -4,36 +4,38 @@ COMMENT=customizable and lightweight no
>  
>  GH_ACCOUNT = dunst-project
>  GH_PROJECT = dunst
> -GH_TAGNAME = v1.2.0
> +GH_TAGNAME = v1.3.1
>  
>  CATEGORIES = x11
>  
>  HOMEPAGE=https://dunst-project.org/
>  
> -MAINTAINER = Timo Myyra 
> +MAINTAINER = Timo Myyra 
>  
>  # BSD
>  PERMIT_PACKAGE_CDROM=Yes
>  
>  # uses pledge()
> -WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
> -WANTLIB += Xrandr Xrender Xss c cairo dbus-1 fontconfig freetype
> -WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
> -WANTLIB += intl m pango-1.0 pangocairo-1.0 pthread xdg-basedir
> -WANTLIB += z
> +WANTLIB += X11 Xinerama Xrandr Xss c cairo dbus-1 gdk_pixbuf-2.0
> +WANTLIB += gio-2.0 glib-2.0 gobject-2.0 intl m pango-1.0 pangocairo-1.0
> +WANTLIB += pthread xdg-basedir
>  
>  USE_GMAKE =  Yes
>  
> -LIB_DEPENDS +=  devel/gettext \
> +LIB_DEPENDS +=   devel/gettext \
>   devel/glib2 \
>   devel/pango \
>   graphics/cairo \
>   graphics/gdk-pixbuf2 \
> - x11/gtk+2 \
> - x11/libxdg-basedir \
> - x11/dbus
> + x11/dbus \
> + x11/libxdg-basedir
>  
> -MAKE_FLAGS = V=1 PREFIX="${PREFIX}" MANPREFIX="${PREFIX}/man"
> +MAKE_FLAGS = V=1 \
> + PREFIX="${PREFIX}" \
> + MANPREFIX="${PREFIX}/man"
> +
> +pre-configure:
> + ${SUBST_CMD} ${WRKSRC}/docs/dunst.pod ${WRKSRC}/dunstrc
>  
>  post-install:
>   mv ${PREFIX}/share/dunst ${PREFIX}/share/examples/dunst
> Index: distinfo
> ===
> RCS file: /cvs/ports/x11/dunst/distinfo,v
> retrieving revision 1.2
> diff -u -p -r1.2 distinfo
> --- distinfo  31 Aug 2017 20:57:00 -  1.2
> +++ distinfo  9 Feb 2018 16:54:29 -
> @@ -1,2 +1,2 @@
> -SHA256 (dunst-1.2.0.tar.gz) = o8BbXvh+iHBKYgcjbkJ3PfvPUMsjx89R5JSnI2t1xa0=
> -SIZE (dunst-1.2.0.tar.gz) = 110628
> +SHA256 (dunst-1.3.1.tar.gz) = 6iluHTJEZBmGyFlsiKRIL2AJDki6VE4Z+uYMhne4bdY=
> +SIZE (dunst-1.3.1.tar.gz) = 121539
> Index: patches/patch-config_mk
> ===
> RCS file: /cvs/ports/x11/dunst/patches/patch-config_mk,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-config_mk
> --- patches/patch-config_mk   31 Aug 2017 20:57:00 -  1.2
> +++ patches/patch-config_mk   9 Feb 2018 16:54:29 -
> @@ -2,12 +2,12 @@ $OpenBSD: patch-config_mk,v 1.2 2017/08/
>  Index: config.mk
>  --- config.mk.orig
>  +++ config.mk
> -@@ -28,7 +28,7 @@ endif
> +@@ -12,7 +12,7 @@ MANPREFIX = ${PREFIX}/share/man
>   
>   # flags
>   CPPFLAGS += -D_DEFAULT_SOURCE -DVERSION=\"${VERSION}\"
>  -CFLAGS   += -g --std=gnu99 

UPDATE: net/quagga-1.2.3

[Gleydson Soares]

Here's an update for quagga-1.2.3. this release includes security fixes.

https://www.quagga.net/security/Quagga-2018-0543.txt
https://www.quagga.net/security/Quagga-2018-1114.txt
https://www.quagga.net/security/Quagga-2018-1550.txt
https://www.quagga.net/security/Quagga-2018-1975.txt

full changelog at:
https://savannah.nongnu.org/forum/forum.php?forum_id=9095

OK?

Index: Makefile
===
RCS file: /cvs/ports/net/quagga/Makefile,v
retrieving revision 1.56
diff -u -p -r1.56 Makefile
--- Makefile11 Jan 2018 19:27:07 -  1.56
+++ Makefile16 Feb 2018 20:39:11 -
@@ -2,8 +2,7 @@
 
 COMMENT=   multi-threaded routing daemon
 
-DISTNAME=  quagga-1.2.2
-REVISION=  1
+DISTNAME=  quagga-1.2.3
 CATEGORIES=net
 MASTER_SITES=  http://download.savannah.gnu.org/releases/quagga/
 
Index: distinfo
===
RCS file: /cvs/ports/net/quagga/distinfo,v
retrieving revision 1.22
diff -u -p -r1.22 distinfo
--- distinfo3 Nov 2017 14:28:43 -   1.22
+++ distinfo16 Feb 2018 20:39:11 -
@@ -1,2 +1,2 @@
-SHA256 (quagga-1.2.2.tar.gz) = Ui4i8r7uZOPwws3j0BVfO4ED9Pb8ir75LLQLw6TMKTE=
-SIZE (quagga-1.2.2.tar.gz) = 2986142
+SHA256 (quagga-1.2.3.tar.gz) = 7iwJB6EGkCq73K9jtPKMZyQcTzOWmJ7VTae0l27srTE=
+SIZE (quagga-1.2.3.tar.gz) = 2925444
Index: patches/patch-configure_ac
===
RCS file: /cvs/ports/net/quagga/patches/patch-configure_ac,v
retrieving revision 1.6
diff -u -p -r1.6 patch-configure_ac
--- patches/patch-configure_ac  3 Nov 2017 14:28:43 -   1.6
+++ patches/patch-configure_ac  16 Feb 2018 20:39:11 -
@@ -6,7 +6,7 @@ ip_mreq.imr_interface.
 Index: configure.ac
 --- configure.ac.orig
 +++ configure.ac
-@@ -1053,7 +1053,7 @@ AC_CHECK_HEADERS([linux/mroute.h], [], [],
+@@ -1054,7 +1054,7 @@ AC_CHECK_HEADERS([linux/mroute.h], [], [],
  AC_MSG_CHECKING([for BSD struct ip_mreq hack])
  AC_TRY_COMPILE([#ifdef HAVE_SYS_PARAM_H
  #include 

Re: UPDATE: net/quagga-1.2.3

[Stuart Henderson]

On 2018/02/16 17:48, Gleydson Soares wrote:
> Here's an update for quagga-1.2.3. this release includes security fixes.

yep, one of these is particularly nasty: use-after-free in a transitive
BGP attribute. this is one of those "one update message can kill all
quaggas on the internet" bugs.

> OK?

please remove termcap from WANTLIB, then ok with me.

reminder to readers: I am still looking for positive or negative
reports about OSPF and RIP following simplification of the diff
to multicast that went in with the previous update.

Re: UPDATE: net/geomyidae 0.26.3 -> 0.31

[Joerg Jung]

On Fri, Feb 16, 2018 at 07:51:16PM +0100, Hiltjo Posthuma wrote:
> Hi,
> 
> This patch updates geomyidae from 0.26.3 to 0.31.
> There are many improvements and fixes to mention briefly.
> 
> Patch below:


Thanks! I committed a slightly tweaked version.


> diff --git a/net/geomyidae/Makefile b/net/geomyidae/Makefile
> index 9e67872684f..dd7e07232e1 100644
> --- a/net/geomyidae/Makefile
> +++ b/net/geomyidae/Makefile
> @@ -2,12 +2,15 @@
>  
>  COMMENT =Gopher protocol daemon
>  
> -DISTNAME =   geomyidae-0.26.3
> -REVISION =   1
> +V =  0.31
> +DISTNAME =   geomyidae-v${V}
> +PKGNAME =geomyidae-${V}
>  
>  CATEGORIES = net
>  
> -HOMEPAGE =   http://www.r-36.net/src/geomyidae/
> +HOMEPAGE =   http://git.r-36.net/geomyidae/
> +
> +DISTFILES =  geomyidae-v${V}.tgz
>  
>  MAINTAINER = Joerg Jung 
>  
> @@ -16,7 +19,7 @@ PERMIT_PACKAGE_CDROM =  Yes
>  
>  WANTLIB =c
>  
> -MASTER_SITES =   ${HOMEPAGE}
> +MASTER_SITES =   ftp://bitreich.org/releases/geomyidae/
>  
>  MAKE_FLAGS = CC="${CC}"
>  MAKE_ENV =   LDFLAGS="${LDFLAGS}"
> diff --git a/net/geomyidae/distinfo b/net/geomyidae/distinfo
> index 89e1e7358fb..6a372f66c87 100644
> --- a/net/geomyidae/distinfo
> +++ b/net/geomyidae/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (geomyidae-0.26.3.tar.gz) = 
> Fi9VqwWasKm+joQEl3lSk7vVHDSx9FZNzfPw3dXA2zE=
> -SIZE (geomyidae-0.26.3.tar.gz) = 15556
> +SHA256 (geomyidae-v0.31.tgz) = ZLCVznLpnaY6SPT3BD0a8BAd7DMz/Hoetz13WGtNZfA=
> +SIZE (geomyidae-v0.31.tgz) = 20267
> diff --git a/net/geomyidae/patches/patch-Makefile 
> b/net/geomyidae/patches/patch-Makefile
> index 9c70333cdf9..ce694280dc9 100644
> --- a/net/geomyidae/patches/patch-Makefile
> +++ b/net/geomyidae/patches/patch-Makefile
> @@ -1,29 +1,28 @@
> -$OpenBSD: patch-Makefile,v 1.1.1.1 2015/06/22 15:53:45 jung Exp $
>  Makefile.origSat Apr 13 21:28:27 2013
> -+++ Makefile Mon Jun 22 13:31:30 2015
> -@@ -7,7 +7,7 @@ PREFIX ?= /usr
> - BINDIR ?= $(PREFIX)/bin
> - MANDIR ?= $(PREFIX)/man/man8
> +--- Makefile.origFri Feb 16 18:54:41 2018
>  Makefile Fri Feb 16 18:55:25 2018
> +@@ -9,7 +9,7 @@
> + BINDIR = ${PREFIX}/bin
> + MANDIR = ${PREFIX}/share/man/man8
>   
> --CFLAGS += -O2 -Wall -I. -I/usr/include 
> -+CFLAGS += -Wall -I. -I/usr/include 
> - LDFLAGS += -L/usr/lib -L. -lc
> - : CC = cc
> +-CFLAGS = -O2 -Wall
> ++CFLAGS = -Wall
> + GEOM_CFLAGS = -D_DEFAULT_SOURCE -I. -I/usr/include ${CFLAGS}
> + GEOM_LDFLAGS = -L/usr/lib -L. ${LDFLAGS}
>   
> -@@ -23,14 +23,12 @@ options:
> +@@ -25,14 +25,12 @@
>   @echo "CC   = ${CC}"
>   
>   .c.o:
>  -@echo CC $<
> --@${CC} ${CFLAGS} -c $<
> -+${CC} ${CFLAGS} -c $<
> +-@${CC} ${GEOM_CFLAGS} -c $<
> ++${CC} ${GEOM_CFLAGS} -c $<
>   
>   ${OBJ}:
>   
>   ${NAME}: ${OBJ}
>  -@echo CC -o $@
> --@${CC} -o $@ ${OBJ} ${LDFLAGS}
> -+${CC} -o $@ ${OBJ} ${LDFLAGS}
> +-@${CC} -o $@ ${OBJ} ${GEOM_LDFLAGS}
> ++${CC} -o $@ ${OBJ} ${GEOM_LDFLAGS}
>   
>   clean:
>   @echo cleaning
> 
> 
> -- 
> Kind regards,
> Hiltjo

Re: UPDATE: net/quagga-1.2.3

[Stuart Henderson]

On 2018/02/16 19:11, Gleydson Soares wrote:
> > yep, one of these is particularly nasty: use-after-free in a transitive
> > BGP attribute. this is one of those "one update message can kill all
> > quaggas on the internet" bugs.
> 
> i've backported the security patches to -stable

ah sorry for the dup work, I just committed Quagga-2018-1114 fix
to stable before I saw this ..

> potentially severe:
> "bgpd/security: Fix double free of unknown attribute"
> https://www.quagga.net/security/Quagga-2018-1114.txt
> 
> also fixes:
> https://www.quagga.net/security/Quagga-2018-1550.txt
> https://www.quagga.net/security/Quagga-2018-1975.txt 

I skipped those, could pull them across but they're relatively minor.

> the following is not needed for -stable, only affects >1.1.x
> https://www.quagga.net/security/Quagga-2018-0543.txt
> 
> OK?

> Index: Makefile
> ===
> RCS file: /cvs/ports/net/quagga/Makefile,v
> retrieving revision 1.52
> diff -u -p -r1.52 Makefile
> --- Makefile  27 Jun 2016 19:55:48 -  1.52
> +++ Makefile  16 Feb 2018 22:07:00 -
> @@ -3,7 +3,7 @@
>  COMMENT= multi-threaded routing daemon
>  
>  DISTNAME=quagga-1.0.20160315
> -REVISION=1
> +REVISION=2
>  CATEGORIES=  net
>  MASTER_SITES=http://download.savannah.gnu.org/releases/quagga/
>  EXTRACT_SUFX=.tar.xz
> Index: patches/patch-bgpd_bgp_attr_c
> ===
> RCS file: patches/patch-bgpd_bgp_attr_c
> diff -N patches/patch-bgpd_bgp_attr_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-bgpd_bgp_attr_c 16 Feb 2018 22:07:00 -
> @@ -0,0 +1,71 @@
> +$OpenBSD$
> +
> +Security issue: Quagga-2018-1114
> +See: https://www.quagga.net/security/Quagga-2018-1114.txt
> +
> +Index: bgpd/bgp_attr.c
> +--- bgpd/bgp_attr.c.orig
>  bgpd/bgp_attr.c
> +@@ -186,15 +186,17 @@ cluster_intern (struct cluster_list *cluster)
> + }
> + 
> + void
> +-cluster_unintern (struct cluster_list *cluster)
> ++cluster_unintern (struct cluster_list **cluster)
> + {
> +-  if (cluster->refcnt)
> +-cluster->refcnt--;
> ++  struct cluster_list *c = *cluster;
> ++  if (c->refcnt)
> ++c->refcnt--;
> + 
> +-  if (cluster->refcnt == 0)
> ++  if (c->refcnt == 0)
> + {
> +-  hash_release (cluster_hash, cluster);
> +-  cluster_free (cluster);
> ++  hash_release (cluster_hash, c);
> ++  cluster_free (c);
> ++  *cluster = NULL;
> + }
> + }
> + 
> +@@ -344,15 +346,18 @@ transit_intern (struct transit *transit)
> + }
> + 
> + void
> +-transit_unintern (struct transit *transit)
> ++transit_unintern (struct transit **transit)
> + {
> +-  if (transit->refcnt)
> +-transit->refcnt--;
> ++  struct transit *t = *transit;
> ++  
> ++  if (t->refcnt)
> ++t->refcnt--;
> + 
> +-  if (transit->refcnt == 0)
> ++  if (t->refcnt == 0)
> + {
> +-  hash_release (transit_hash, transit);
> +-  transit_free (transit);
> ++  hash_release (transit_hash, t);
> ++  transit_free (t);
> ++  *transit = NULL;
> + }
> + }
> + 
> +@@ -788,11 +793,11 @@ bgp_attr_unintern_sub (struct attr *attr)
> +   UNSET_FLAG(attr->flag, ATTR_FLAG_BIT (BGP_ATTR_EXT_COMMUNITIES));
> +   
> +   if (attr->extra->cluster)
> +-cluster_unintern (attr->extra->cluster);
> ++cluster_unintern (>extra->cluster);
> +   UNSET_FLAG(attr->flag, ATTR_FLAG_BIT (BGP_ATTR_CLUSTER_LIST));
> +   
> +   if (attr->extra->transit)
> +-transit_unintern (attr->extra->transit);
> ++transit_unintern (>extra->transit);
> + }
> + }
> + 
> Index: patches/patch-bgpd_bgp_attr_h
> ===
> RCS file: patches/patch-bgpd_bgp_attr_h
> diff -N patches/patch-bgpd_bgp_attr_h
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-bgpd_bgp_attr_h 16 Feb 2018 22:07:00 -
> @@ -0,0 +1,21 @@
> +$OpenBSD$
> +
> +Security issue: Quagga-2018-1114
> +See: https://www.quagga.net/security/Quagga-2018-1114.txt
> +
> +Index: bgpd/bgp_attr.h
> +--- bgpd/bgp_attr.h.orig
>  bgpd/bgp_attr.h
> +@@ -182,10 +182,10 @@ extern unsigned long int attr_unknown_count (void);
> + 
> + /* Cluster list prototypes. */
> + extern int cluster_loop_check (struct cluster_list *, struct in_addr);
> +-extern void cluster_unintern (struct cluster_list *);
> ++extern void cluster_unintern (struct cluster_list **);
> + 
> + /* Transit attribute prototypes. */
> +-void transit_unintern (struct transit *);
> ++void transit_unintern (struct transit **);
> + 
> + /* Below exported for unit-test purposes only */
> + struct bgp_attr_parser_args {
> Index: patches/patch-bgpd_bgp_debug_c
> ===
> RCS file: patches/patch-bgpd_bgp_debug_c
> diff -N patches/patch-bgpd_bgp_debug_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-bgpd_bgp_debug_c16 Feb 2018 22:07:00 

Re: UPDATE: net/quagga-1.2.3

[Gleydson Soares]

> yep, one of these is particularly nasty: use-after-free in a transitive
> BGP attribute. this is one of those "one update message can kill all
> quaggas on the internet" bugs.

i've backported the security patches to -stable

potentially severe:
"bgpd/security: Fix double free of unknown attribute"
https://www.quagga.net/security/Quagga-2018-1114.txt

also fixes:
https://www.quagga.net/security/Quagga-2018-1550.txt
https://www.quagga.net/security/Quagga-2018-1975.txt 

the following is not needed for -stable, only affects >1.1.x
https://www.quagga.net/security/Quagga-2018-0543.txt

OK?
Index: Makefile
===
RCS file: /cvs/ports/net/quagga/Makefile,v
retrieving revision 1.52
diff -u -p -r1.52 Makefile
--- Makefile27 Jun 2016 19:55:48 -  1.52
+++ Makefile16 Feb 2018 22:07:00 -
@@ -3,7 +3,7 @@
 COMMENT=   multi-threaded routing daemon
 
 DISTNAME=  quagga-1.0.20160315
-REVISION=  1
+REVISION=  2
 CATEGORIES=net
 MASTER_SITES=  http://download.savannah.gnu.org/releases/quagga/
 EXTRACT_SUFX=  .tar.xz
Index: patches/patch-bgpd_bgp_attr_c
===
RCS file: patches/patch-bgpd_bgp_attr_c
diff -N patches/patch-bgpd_bgp_attr_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-bgpd_bgp_attr_c   16 Feb 2018 22:07:00 -
@@ -0,0 +1,71 @@
+$OpenBSD$
+
+Security issue: Quagga-2018-1114
+See: https://www.quagga.net/security/Quagga-2018-1114.txt
+
+Index: bgpd/bgp_attr.c
+--- bgpd/bgp_attr.c.orig
 bgpd/bgp_attr.c
+@@ -186,15 +186,17 @@ cluster_intern (struct cluster_list *cluster)
+ }
+ 
+ void
+-cluster_unintern (struct cluster_list *cluster)
++cluster_unintern (struct cluster_list **cluster)
+ {
+-  if (cluster->refcnt)
+-cluster->refcnt--;
++  struct cluster_list *c = *cluster;
++  if (c->refcnt)
++c->refcnt--;
+ 
+-  if (cluster->refcnt == 0)
++  if (c->refcnt == 0)
+ {
+-  hash_release (cluster_hash, cluster);
+-  cluster_free (cluster);
++  hash_release (cluster_hash, c);
++  cluster_free (c);
++  *cluster = NULL;
+ }
+ }
+ 
+@@ -344,15 +346,18 @@ transit_intern (struct transit *transit)
+ }
+ 
+ void
+-transit_unintern (struct transit *transit)
++transit_unintern (struct transit **transit)
+ {
+-  if (transit->refcnt)
+-transit->refcnt--;
++  struct transit *t = *transit;
++  
++  if (t->refcnt)
++t->refcnt--;
+ 
+-  if (transit->refcnt == 0)
++  if (t->refcnt == 0)
+ {
+-  hash_release (transit_hash, transit);
+-  transit_free (transit);
++  hash_release (transit_hash, t);
++  transit_free (t);
++  *transit = NULL;
+ }
+ }
+ 
+@@ -788,11 +793,11 @@ bgp_attr_unintern_sub (struct attr *attr)
+   UNSET_FLAG(attr->flag, ATTR_FLAG_BIT (BGP_ATTR_EXT_COMMUNITIES));
+   
+   if (attr->extra->cluster)
+-cluster_unintern (attr->extra->cluster);
++cluster_unintern (>extra->cluster);
+   UNSET_FLAG(attr->flag, ATTR_FLAG_BIT (BGP_ATTR_CLUSTER_LIST));
+   
+   if (attr->extra->transit)
+-transit_unintern (attr->extra->transit);
++transit_unintern (>extra->transit);
+ }
+ }
+ 
Index: patches/patch-bgpd_bgp_attr_h
===
RCS file: patches/patch-bgpd_bgp_attr_h
diff -N patches/patch-bgpd_bgp_attr_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-bgpd_bgp_attr_h   16 Feb 2018 22:07:00 -
@@ -0,0 +1,21 @@
+$OpenBSD$
+
+Security issue: Quagga-2018-1114
+See: https://www.quagga.net/security/Quagga-2018-1114.txt
+
+Index: bgpd/bgp_attr.h
+--- bgpd/bgp_attr.h.orig
 bgpd/bgp_attr.h
+@@ -182,10 +182,10 @@ extern unsigned long int attr_unknown_count (void);
+ 
+ /* Cluster list prototypes. */
+ extern int cluster_loop_check (struct cluster_list *, struct in_addr);
+-extern void cluster_unintern (struct cluster_list *);
++extern void cluster_unintern (struct cluster_list **);
+ 
+ /* Transit attribute prototypes. */
+-void transit_unintern (struct transit *);
++void transit_unintern (struct transit **);
+ 
+ /* Below exported for unit-test purposes only */
+ struct bgp_attr_parser_args {
Index: patches/patch-bgpd_bgp_debug_c
===
RCS file: patches/patch-bgpd_bgp_debug_c
diff -N patches/patch-bgpd_bgp_debug_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-bgpd_bgp_debug_c  16 Feb 2018 22:07:00 -
@@ -0,0 +1,91 @@
+$OpenBSD$
+
+Security issue: Quagga-2018-1550
+See: https://www.quagga.net/security/Quagga-2018-1550.txt
+
+Index: bgpd/bgp_debug.c
+--- bgpd/bgp_debug.c.orig
 bgpd/bgp_debug.c
+@@ -29,6 +29,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330
+ #include "log.h"
+ #include "sockunion.h"
+ #include "filter.h"
++#include "memory.h"
+ 
+ #include "bgpd/bgpd.h"
+ #include "bgpd/bgp_aspath.h"
+@@ -69,7 +70,8 @@ const struct message bgp_status_msg[] = 

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/02/17 00:46:31

Modified files:
security/py-paramiko: Makefile 

Log message:
add missing RDEP

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/02/17 00:44:38

Modified files:
lang/vala  : Makefile distinfo 

Log message:
update to vala-0.38.8

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/02/16 05:20:47

Modified files:
security/opensc: Makefile 
Added files:
security/opensc/patches: patch-src_libopensc_sc-ossl-compat_h 

Log message:
handle EVP_PKEY_up_ref() addition

CVS: cvs.openbsd.org: ports

[Kirill Bychkov]

CVSROOT:/cvs
Module name:ports
Changes by: ki...@cvs.openbsd.org   2018/02/16 04:39:51

Log message:
Import fs2open.

The FreeSpace 2 Source Code Project is the project of a group of
programmers currently maintaining and enhancing the game engine for the
space combat simulator FreeSpace 2, developed by Volition. The source
code was released in 2002, and is used by several projects. Most
prominent among these are games based on the Babylon 5 and 2004
Battlestar Galactica universes.

From Thomas Frohwein, thanks!

Works fine for me. ok sthen@

Status:

Vendor Tag: kirby
Release Tags:   kirby_20180216

N ports/games/fs2open/Makefile
N ports/games/fs2open/distinfo
N ports/games/fs2open/files/fs2open
N ports/games/fs2open/patches/patch-freespace2_CMakeLists_txt
N ports/games/fs2open/patches/patch-CMakeLists_txt
N ports/games/fs2open/patches/patch-cmake_toolchain-clang_cmake
N ports/games/fs2open/patches/patch-cmake_toolchain-gcc_cmake
N ports/games/fs2open/patches/patch-lib_mongoose_Makefile_am
N ports/games/fs2open/pkg/DESCR
N ports/games/fs2open/pkg/README
N ports/games/fs2open/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   2018/02/16 05:13:04

Modified files:
x11/spice-gtk  : Makefile 
x11/spice-gtk/patches: patch-spice-common_common_ssl_verify_c 

Log message:
handle ASN1_STRING_get0_data() addition

CVS: cvs.openbsd.org: ports

[Kirill Bychkov]

CVSROOT:/cvs
Module name:ports
Changes by: ki...@cvs.openbsd.org   2018/02/16 04:42:24

Modified files:
games  : Makefile 

Log message:
add fs2open

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/02/16 05:37:23

Modified files:
lang/php/7.0   : Makefile 
Added files:
lang/php/7.0/patches: patch-ext_openssl_openssl_c 

Log message:
handle ASN1_STRING_get0_data(), X509_get_signature_nid() addition in LibreSSL

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/02/16 05:12:26

Modified files:
sysutils/bacula: Makefile 
sysutils/bacula/patches: patch-src_lib_openssl-compat_h 

Log message:
handle ASN1_STRING_get0_data() addition; from jsing

CVS: cvs.openbsd.org: ports

[Bjorn Ketelaars]

CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2018/02/16 09:16:14

Modified files:
devel/msgpack  : Makefile distinfo 
Removed files:
devel/msgpack/patches: patch-CMakeLists_txt 
   patch-test_CMakeLists_txt 

Log message:
update to msgpack-2.1.5

OK sthen@ bcallah@

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/02/16 09:47:15

Modified files:
net/unifi  : Makefile distinfo 
net/unifi/pkg  : PLIST 

Log message:
update to unifi-5.7.19 stable candidate

note, this is a major update to the 5.7 branch, now that it is showing
on the regular unifi updates blog rather than the beta one, i've been
running this branch in production for ages.

CVS: cvs.openbsd.org: ports

[Daniel Jakots]

CVSROOT:/cvs
Module name:ports
Changes by: d...@cvs.openbsd.org2018/02/16 07:35:00

Modified files:
textproc   : Makefile 

Log message:
+ py-toml
+ py-toml,python3

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/02/16 07:46:50

Modified files:
multimedia/libvpx: Makefile distinfo 
multimedia/libvpx/patches: patch-build_make_Makefile 
   patch-configure patch-libs_mk 

Log message:
Revert to version 1.6.1: newer versions require __atomic builtins

from Brad (maintainer)

CVS: cvs.openbsd.org: ports

[Klemens Nanni]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2018/02/16 07:22:08

Modified files:
net/irssi  : Makefile distinfo 

Log message:
Update irssi to 1.1.1 and take over MAINTAINER as discussed with Wiktor.

OK sthen@

CVS: cvs.openbsd.org: ports

[Daniel Jakots]

CVSROOT:/cvs
Module name:ports
Changes by: d...@cvs.openbsd.org2018/02/16 07:32:17

Log message:
Import py-toml-0.9.4, tweaks and ok sthen@

TOML aims to be a minimal configuration file format that's easy to read
due to obvious semantics. TOML is designed to map unambiguously to a
hash table. TOML should be easy to parse into data structures in a wide
variety of languages.

This is a Python library for parsing and creating TOML.

Status:

Vendor Tag: danj
Release Tags:   danj_20180216

N ports/textproc/py-toml/Makefile
N ports/textproc/py-toml/distinfo
N ports/textproc/py-toml/pkg/DESCR
N ports/textproc/py-toml/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   2018/02/16 07:37:43

Modified files:
mail/rspamd: Makefile distinfo 

Log message:
update to rspamd-1.6.6

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/02/16 07:48:14

Modified files:
emulators/qemu : Makefile distinfo 

Log message:
Update to qemu-2.11.1.

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/02/16 08:29:52

Modified files:
security/py-paramiko: Makefile distinfo 
security/py-paramiko/pkg: PLIST 

Log message:
update to paramiko-2.4.0

ok benoit@ (MAINTAINER)

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/02/16 08:29:35

Modified files:
security   : Makefile 

Log message:
+py-PyNaCl

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/02/16 08:28:42

Log message:
import PyNaCl-1.2.1

Python binding to the Networking and Cryptography (NaCl) library.

ok benoit@

Status:

Vendor Tag: jasper
Release Tags:   jasper_20181602

N ports/security/py-PyNaCl/Makefile
N ports/security/py-PyNaCl/distinfo
N ports/security/py-PyNaCl/pkg/DESCR
N ports/security/py-PyNaCl/pkg/PLIST
N ports/security/py-PyNaCl/patches/patch-src_bindings_build_py

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/02/16 07:27:54

Added files:
multimedia/xine-lib/patches: patch-include_config_h 

Log message:
Fix X32 build-time sanity check that was broken on clang/i386. From Brad.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/02/16 07:44:50

Modified files:
sysutils/awscli: Makefile distinfo 

Log message:
Update to awscli-1.14.40.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/02/16 07:44:37

Modified files:
net/py-boto3   : Makefile distinfo 

Log message:
Update to py-boto3-1.5.30.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/02/16 07:44:24

Modified files:
net/py-botocore: Makefile distinfo 

Log message:
Update to py-botocore-1.8.44.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/02/16 07:51:35

Modified files:
sysutils/terraform/provider-github: Makefile distinfo 

Log message:
Update to terraform-provider-github-0.1.2.

CVS: cvs.openbsd.org: ports

[Steven Mestdagh]

CVSROOT:/cvs
Module name:ports
Changes by: ste...@cvs.openbsd.org  2018/02/16 12:36:55

Modified files:
security/zaproxy: Makefile distinfo 
security/zaproxy/pkg: PLIST 

Log message:
update to 2.7.0

maintainer timeout

CVS: cvs.openbsd.org: ports

[Gleydson Soares]

CVSROOT:/cvs
Module name:ports
Changes by: gsoa...@cvs.openbsd.org 2018/02/16 14:20:05

Modified files:
net/quagga : Makefile distinfo 
net/quagga/patches: patch-configure_ac 

Log message:
update to 1.2.3
(this release contains a number of fixes, including potentially important BGP 
security fixes)

https://www.quagga.net/security/Quagga-2018-0543.txt
https://www.quagga.net/security/Quagga-2018-1114.txt
https://www.quagga.net/security/Quagga-2018-1550.txt
https://www.quagga.net/security/Quagga-2018-1975.txt

full changelog at:
https://savannah.nongnu.org/forum/forum.php?forum_id=9095

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/02/16 14:32:45

Modified files:
security/clamav: Makefile distinfo 
security/clamav/patches: patch-clamd_Makefile_in 
 patch-database_Makefile_in 
 patch-libclamav_Makefile_in 
 patch-unit_tests_Makefile_in 

Log message:
update to clamav-0.99.3

CVS: cvs.openbsd.org: ports

[Joerg Jung]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2018/02/16 14:11:27

Modified files:
net/geomyidae  : Makefile distinfo 
net/geomyidae/patches: patch-Makefile 
Removed files:
net/geomyidae/patches: patch-geomyidae_8 

Log message:
update to geomyidae to 0.31

from Hiltjo Posthuma with tweaks by me

Re: CVS: cvs.openbsd.org: ports

[Gleydson Soares]

OK sthen@

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/02/16 15:11:41

Modified files:
net/quagga : Tag: OPENBSD_6_2 Makefile 
Added files:
net/quagga/patches: Tag: OPENBSD_6_2 patch-bgpd_bgp_attr_c 
patch-bgpd_bgp_attr_h 

Log message:
backport the fix for the worst of the recent Quagga bugs,
https://www.quagga.net/security/Quagga-2018-1114.txt

Double-free (crash, possible code execution) when processing a BGP update.

<<
The issue is a double-free in bgp_attr_flush called from
bgp_packet.c:bgp_update_receive. This can be triggered by a variety of
BGP UPDATE messages, containing either a "CLUSTER_LIST" attribute (used
in iBGP route-reflection) or an unknown attribute.

An unrecognised optional/transitive UPDATE attribute should be passed along
by conforming BGP speakers, if the attribute is otherwise well-formed.
Therefore this issue potentially can be triggered across a number of Quagga
bgpd speakers, over a wide area of a network, by one BGP speaker sending an
UPDATE.
>>

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2018/02/16 15:57:20

Modified files:
security/py-paramiko: Makefile 

Log message:
refer to PyNaCl by the name under which is was imported