devel/cabal-install 3.4.0.0 upgrade
Now that 3.4 is properly out I can upgrade it and to my surprise the old
framework can be left untouched for cabal-install upgrade. So, as a
first (backward compatible) step here's something we can submit ASAP.
Matthias, if you don't feel like looking at this at the moment, could
you let me know so I can corral another reviewer?
OK?
Thanks
Greg
diff --git a/devel/cabal-install/Makefile b/devel/cabal-install/Makefile
index 6f4c559ea84..2c92d1ff78a 100644
--- a/devel/cabal-install/Makefile
+++ b/devel/cabal-install/Makefile
@@ -2,10 +2,14 @@
COMMENT = command-line interface for Cabal and Hackage
-DISTNAME = cabal-install-2.4.0.0
+DISTNAME = cabal-install-3.4.0.0
CATEGORIES = devel
-HOMEPAGE = http://www.haskell.org/cabal/
+GH_ACCOUNT = haskell
+GH_TAGNAME = ${DISTNAME}
+GH_PROJECT = cabal
+
+HOMEPAGE = https://github.com/haskell/cabal
MAINTAINER = Matthias Kilian
@@ -14,35 +18,68 @@ PERMIT_PACKAGE =Yes
WANTLIB = c charset ffi gmp iconv m pthread util z
-MODULES = lang/ghc
MODGHC_BUILD = cabal hackage nort
LIB_DEPENDS = converters/libiconv \
devel/gmp \
devel/libffi
-# Avoids the dependency on resolve.
-MODGHC_SETUP_CONF_ARGS += -f-native-dns
-
-BUILD_DEPENDS += archivers/hs-zlib>=0.5.3,<0.7 \
- archivers/hs-zip-archive>=0.3.2.5,<0.5 \
- devel/hs-async>=2.0,<3 \
- devel/hs-base16-bytestring>=0.1.1,<0.2 \
- devel/hs-echo>=0.1.3,<0.2 \
- devel/hs-edit-distance>=0.2.2,<0.3 \
- devel/hs-hashable>=1.0,<2 \
- devel/hs-network>=2.6,<2.7 \
- devel/hs-network-uri>=2.6,<2.7 \
- devel/hs-random>=1,<1.2 \
- devel/hs-tar>=0.5.0.3,<0.6 \
- net/hs-HTTP>=4000.1.5,<4000.4 \
- security/hs-cryptohash-sha256>=0.11,<0.12 \
- security/hs-hackage-security>=0.5.2.2,<0.6
-
-# Cabal (part of lang/ghc) would have patched for a correct mandir,
-# but this is for now the only haskell program using Cabal to install a
-# man page.
-post-install:
- mv ${PREFIX}/share/man/man1/cabal.1 ${PREFIX}/man/man1/cabal.1
+# bootstrap.py handles the extraction of the rest of files.
+EXTRACT_ONLY = ${DISTNAME}.tar.gz
+DISTFILES =${EXTRACT_ONLY}
+DIST_SUBDIR = hackage
+MASTER_SITES0 =https://hackage.haskell.org/package/
+
+# Produced by:
+# cabal v2-run -w /usr/local/bin/ghc exe:cabal-bundler -- \
+# --openbsd cabal -w /usr/local/bin/ghc -p
cabal/dist-newstyle/cache/plan.json
+_MANIFEST = \
+ HTTP4000.3.14 1 \
+ async 2.2.2 1 \
+ base16-bytestring 0.1.1.7 0 \
+ base64-bytestring 1.1.0.0 0 \
+ cryptohash-sha256 0.11.101.0 4 \
+ echo0.1.3 1 \
+ ed25519 0.0.5.0 3 \
+ edit-distance 0.2.2.1 1 \
+ hackage-security0.6.0.1 2 \
+ hashable1.3.0.0 1 \
+ lukko 0.1.1.2 0 \
+ network 3.1.1.1 0 \
+ network-uri 2.6.3.0 0 \
+ random 1.2.0 0 \
+ regex-base 0.94.0.01 \
+ regex-posix 0.96.0.01 \
+ resolv 0.1.2.0 0 \
+ splitmix0.1 0 \
+ tar 0.5.1.1 2 \
+ zlib0.6.2.1 1 \
+
+.for _package _version _revision in ${_MANIFEST}
+DISTFILES += {${_package}-${_version}/}${_package}-${_version}.tar.gz:0
+DISTFILES +=
${_package}-${_version}_${_revision}{${_package}-${_version}/revision/${_revision}}.cabal:0
+.endfor
+
+BUILD_DEPENDS += lang/ghc>=8.6.4
+
+MODULES = lang/python
+
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
+
+post-extract:
+ @mkdir -p ${WRKBUILD}/_build/tarballs
+.for _package _version _revision in ${_MANIFEST}
+ @ln -s ${FULLDISTDIR}/${_package}-${_version}.tar.gz
${WRKBUILD}/_build/tarballs
+ @ln -s ${FULLDISTDIR}/${_package}-${_version}_${_revision}.cabal
${WRKBUILD}/_build/tarballs/${_package}.cabal
+.endfor
+
+# Uses the same fixed versions of packages as in _MANIFEST. The
+# distributed package currently doesn't have a 8.10.3 variant. The
+# json file is generated by following cabal bootstrap instructions.
+do-build:
+ @cd ${WRKBUILD} && ${MODPY_BIN} bootstrap/bootstrap.py -d
${FILESDIR}/openbsd-8.6.4.json
+
+do-install:
+ @install -m755 ${WRKBUILD}/_build/bin/cabal ${PREFIX}/bin
.include
diff --git a/devel/cabal-install/distinfo b/devel/cabal-install/distinfo
index ed70ae5f09c..b1f98a02fad 100644
--- a/devel/cabal-install/distinfo
+++ b/devel/cabal-install/distinfo
@@ -1,2 +1,82 @@
-SHA256 (ghc/cabal-install-2.4.0.0.tar.gz) =
Re: [MAINTAINER UPDATE] graphics/openimageio -> 2.2.11.1
On Mon, 22 Feb 2021, Rafael Sadowski wrote: > > > > Bump for a new release. > > Still OK for me but we need to import robin-map first. A second OK is > needed. > Where is the port for robin-map? Can someone resend it?
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dan...@cvs.openbsd.org 2021/02/21 23:16:37 Modified files: sysutils/libstatgrab: Makefile Log message: I'm unfamiliar with the fhttp protocol; reported by repology
update: matplotlib 3.0.3 -> 3.1.3
Here's an update of matplotlib to 3.1.3 for a few new features.
py-cairo is now preferred over py-cairocffi, and py-six doesn't seem to be
needed so adjust RDEPs accordingly.
ok?
Index: Makefile
===
RCS file: /cvs/ports/graphics/py-matplotlib/Makefile,v
retrieving revision 1.85
diff -u -p -u -r1.85 Makefile
--- Makefile4 Jan 2021 14:06:32 - 1.85
+++ Makefile20 Feb 2021 00:52:58 -
@@ -2,10 +2,9 @@
COMMENT= Python charting and plotting API
-MODPY_EGG_VERSION =3.0.3
+MODPY_EGG_VERSION =3.1.3
DISTNAME = matplotlib-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
-REVISION = 0
CATEGORIES = graphics devel math
@@ -31,7 +30,6 @@ COMMON_DEPENDS= devel/py-tz${MODPY_FLAVO
devel/py-dateutil${MODPY_FLAVOR} \
devel/py-kiwisolver${MODPY_FLAVOR} \
devel/py-parsing${MODPY_FLAVOR} \
- devel/py-six${MODPY_FLAVOR} \
math/py-numpy${MODPY_FLAVOR} \
graphics/py-Pillow${MODPY_FLAVOR} \
graphics/py-cycler${MODPY_FLAVOR} \
@@ -44,7 +42,7 @@ LIB_DEPENDS= graphics/png
TEST_DEPENDS = devel/py-test${MODPY_FLAVOR}
-COMMON_DEPENDS += devel/py-cairocffi${MODPY_FLAVOR} \
+COMMON_DEPENDS += graphics/py-cairo${MODPY_FLAVOR} \
devel/py-gobject3${MODPY_FLAVOR}
# pygobject GTK3 introspection (not provided by indirect dependencies)
COMMON_DEPENDS += x11/gtk+3
Index: distinfo
===
RCS file: /cvs/ports/graphics/py-matplotlib/distinfo,v
retrieving revision 1.16
diff -u -p -u -r1.16 distinfo
--- distinfo8 Oct 2020 12:03:49 - 1.16
+++ distinfo20 Feb 2021 00:52:58 -
@@ -1,2 +1,2 @@
-SHA256 (matplotlib-3.0.3.tar.gz) = 4dM1ieMvSC0KfRlXv0c9QzQRFdQNM/V42tREMuR997c=
-SIZE (matplotlib-3.0.3.tar.gz) = 36640137
+SHA256 (matplotlib-3.1.3.tar.gz) = 2zEh8S+5uZ8QXRQTPZQ/Jp89JitFWG0Sdlhm8MY=
+SIZE (matplotlib-3.1.3.tar.gz) = 40923864
Index: patches/patch-setup_cfg_template
===
RCS file: /cvs/ports/graphics/py-matplotlib/patches/patch-setup_cfg_template,v
retrieving revision 1.1
diff -u -p -u -r1.1 patch-setup_cfg_template
--- patches/patch-setup_cfg_template29 Oct 2018 00:28:50 - 1.1
+++ patches/patch-setup_cfg_template20 Feb 2021 00:52:58 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-setup_cfg_template,v 1.1
Index: setup.cfg.template
--- setup.cfg.template.orig
+++ setup.cfg.template
-@@ -13,7 +13,7 @@
+@@ -8,7 +8,7 @@
# set this to True. It will download and build a specific version of
# FreeType, and then use that to build the ft2font extension. This
# ensures that test images are exactly reproducible.
@@ -12,20 +12,14 @@ Index: setup.cfg.template
[status]
# To suppress display of the dependencies and their versions
-@@ -25,12 +25,12 @@
+@@ -20,8 +20,8 @@
# optional. All except tests are installed by default, but that can
# be changed here.
#
-#tests = False
-#sample_data = True
--#toolkits = True
+tests = True
+sample_data = True
-+toolkits = True
- # Tests for the toolkits are only automatically installed
- # if the tests and toolkits packages are also getting installed.
--#toolkits_tests = auto
-+toolkits_tests = auto
[gui_support]
# Matplotlib supports multiple GUI toolkits, including
Index: patches/patch-setup_py
===
RCS file: /cvs/ports/graphics/py-matplotlib/patches/patch-setup_py,v
retrieving revision 1.10
diff -u -p -u -r1.10 patch-setup_py
--- patches/patch-setup_py 8 Oct 2020 12:03:49 - 1.10
+++ patches/patch-setup_py 20 Feb 2021 00:52:58 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-setup_py,v 1.10 2020/10/
Index: setup.py
--- setup.py.orig
+++ setup.py
-@@ -161,7 +161,7 @@ class develop_with_jquery(DevelopCommand):
+@@ -174,7 +174,7 @@ class develop_with_jquery(DevelopCommand):
cmdclass['sdist'] = sdist_with_jquery
Index: patches/patch-setupext_py
===
RCS file: /cvs/ports/graphics/py-matplotlib/patches/patch-setupext_py,v
retrieving revision 1.19
diff -u -p -u -r1.19 patch-setupext_py
--- patches/patch-setupext_py 8 Oct 2020 12:03:49 - 1.19
+++ patches/patch-setupext_py 20 Feb 2021 00:52:58 -
@@ -2,10 +2,10 @@ $OpenBSD: patch-setupext_py,v 1.19 2020/
Index: setupext.py
--- setupext.py.orig
+++ setupext.py
-@@ -1455,6 +1455,7 @@ class BackendTkAgg(OptionalBackendPackage):
+@@ -969,6 +969,7 @@ class BackendTkAgg(OptionalBackendPackage):
]
- ext = make_extension('matplotlib.backends._tkagg', sources)
+ ext = Extension('matplotlib.backends._tkagg', sources)
+ext.include_dirs.extend(['${X11BASE}/include'])
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dan...@cvs.openbsd.org 2021/02/21 22:31:10 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: add mdbook and python to cve list and resort list while here
Re: NEW: www/py-html5-parser
On Wed Feb 17, 2021 at 06:35:53AM +0100, Rafael Sadowski wrote:
> On Tue Feb 16, 2021 at 05:13:15PM -0500, Daniel Dickman wrote:
> >
> >
> > > On Feb 16, 2021, at 4:57 PM, Stuart Henderson
> > > wrote:
> > >
> > > On 2021/02/16 21:50, Rafael Sadowski wrote:
> > >>> On Tue Feb 16, 2021 at 04:42:07PM +, Stuart Henderson wrote:
> > >>> On 2021/02/15 14:02, Daniel Dickman wrote:
> >
> >
> > On Mon, 15 Feb 2021, Rafael Sadowski wrote:
> >
> > > Please find attached a new dependency for an possible calibre update.
> > >
> >
> > I think it needs dependencies on at least:
> > - py-lxml
> > - py-chardet
> > - py-beautifulsoup4
> > >>>
> > >>> beautifulsoup4 is optional. I wonder why portgen doesn't notice
> > >>> lxml/chardet.
> > >>>
> > maybe more things too, but that's as far as I got.
> > >>>
> > >>> there are forced -O3 in the C compiles.
> > >>>
> > >>
> > >> Thanks for your feedback. New attempt attached with the following
> > >> changes:
> > >>
> > >> - Remove 03 opts
> > >> - Added HOMEPAGE
> > >> - Added the following depends:
> > >>
> > >> BUILD_DEPENDS =textproc/py-chardet${MODPY_FLAVOR} \
> > >>textproc/py-lxml${MODPY_FLAVOR} \
> > >>www/py-beautifulsoup4${MODPY_FLAVOR}
> > >>
> > >> RUN_DEPENDS =www/py-beautifulsoup4${MODPY_FLAVOR}
> > >
> > > beautifulsoup4 is an optional run dependency.
> > > py-lxml and py-chardet are required run depencies.
> > > None of them are needed at build time.
> >
> > bs4 should be a TDEP.
> >
> >
> > >
>
> Thanks. I'm not familiar with extras_require,install_requires and the
> whole python setup. OK with this dependencies?
>
> LIB_DEPENDS = textproc/libxml
>
> RUN_DEPENDS = textproc/py-chardet${MODPY_FLAVOR} \
> textproc/py-lxml${MODPY_FLAVOR}
>
> TEST_DEPENDS =www/py-beautifulsoup4${MODPY_FLAVOR}
>
ping, latest tarball attached for convenience.
py3-html5-parser-0.4.9p0.tar.gz
Description: Binary data
Re: [MAINTAINER UPDATE] graphics/openimageio -> 2.2.11.1
On Sun Feb 21, 2021 at 05:36:13AM +, Dimitri Karamazov wrote:
> On Wed, Feb 17, 2021 at 05:32:19AM +, Dimitri Karamazov wrote:
> > Ping
> >
> > On Wed, Feb 10, 2021 at 12:06:29PM +, Dimitri Karamazov wrote:
> > > On Wed, Feb 10, 2021 at 06:01:03AM +0100, Rafael Sadowski wrote:
> > > > On Tue Feb 09, 2021 at 07:34:29AM +, Dimitri Karamazov wrote:
> > > > > Ping
> > > > >
> > > > > A new dependency is required only during build.
> > > > > All tests pass for robin-map
> > > > >
> > > > > Information for inst:robin-map-0.6.3
> > > > >
> > > > > Comment:
> > > > > fast hash map and hash set
> > > > >
> > > > > Description:
> > > > > A C++ implementation of a fast hash map and hash set using
> > > > > open-addressing and linear robin hood hashing with backward
> > > > > shift deletion to resolve collisions.
> > > > >
> > > > > Maintainer: Dimitri Karamazov
> > > > >
> > > > > WWW: https://github.com/Tessil/robin-map
> > > > >
> > > > With TEST_DEPENDS = devel/boost, OK rsadowski to import robin-map-0.6.3.
> > >
> > > Reattached with necessary changes
> > >
> > > regards,
> > > Dimitri
>
> Bump for a new release.
Still OK for me but we need to import robin-map first. A second OK is
needed.
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/graphics/openimageio/Makefile,v
> retrieving revision 1.50
> diff -u -p -r1.50 Makefile
> --- Makefile 23 Jan 2021 12:46:26 - 1.50
> +++ Makefile 15 Feb 2021 02:51:07 -
> @@ -8,13 +8,11 @@ COMMENT = library for reading and writi
> GH_ACCOUNT = OpenImageIO
> GH_PROJECT = oiio
> GH_TAGNAME = Release-$V
> -V = 2.2.10.0
> -ROBIN_VER = 0.6.2
> +V = 2.2.11.1
> DISTNAME = openimageio-${V}
> -REVISION = 0
>
> -SHARED_LIBS += OpenImageIO 8.0 # 2.2.10
> -SHARED_LIBS += OpenImageIO_Util4.0 # 2.2.10
> +SHARED_LIBS += OpenImageIO 9.0 # 2.2.11
> +SHARED_LIBS += OpenImageIO_Util5.0 # 2.2.11
>
> CATEGORIES = graphics devel
>
> @@ -34,11 +32,6 @@ WANTLIB += boost_filesystem-mt boost_sys
> WANTLIB += bz2 c freetype gif intl jpeg m openjp2 png pugixml
> WANTLIB += raw_r swscale tiff util webp webpdemux z
>
> -MASTER_SITES0 = https://github.com/Tessil/robin-map/
> -
> -DISTFILES = ${DISTNAME}.tar.gz \
> - robin-map-{archive/v}${ROBIN_VER}.tar.gz:0
> -
> MODULES =devel/cmake \
> lang/python \
> x11/qt5
> @@ -48,8 +41,9 @@ MODPY_VERSION = ${MODPY_DEFAULT_VERSION
> COMPILER = base-clang ports-gcc
>
> BUILD_DEPENDS = devel/fmt \
> - textproc/txt2man \
> - devel/py-pybind11${MODPY_FLAVOR}
> + devel/py-pybind11${MODPY_FLAVOR} \
> + devel/robin-map \
> + textproc/txt2man
>
> LIB_DEPENDS =devel/boost \
> graphics/ffmpeg \
> @@ -66,9 +60,10 @@ LIB_DEPENDS = devel/boost \
> CONFIGURE_ARGS +=-DCMAKE_INSTALL_MANDIR="man/man1" \
> -DSTOP_ON_WARNING=OFF \
> -DUSE_CCACHE=OFF \
> - -DUSE_DICOM=OFF \
> + -DDCMTK_FOUND=OFF \
> -DUSE_EXTERNAL_PUGIXML=ON \
> -DUSE_OPENCV=OFF \
> + -DUSE_OPENVDB=OFF \
> -DUSE_HDF5=OFF \
> -DUSE_LIBHEIF=OFF \
>
> -Dpybind11_DIR=${MODPY_SITEPKG}/pybind11/share/cmake/pybind11/
> @@ -78,10 +73,6 @@ CONFIGURE_ARGS += -DCMAKE_INSTALL_MANDIR
> CONFIGURE_ENV += LDFLAGS="${LDFLAGS} -latomic"
> WANTLIB += atomic
> .endif
> -
> -post-extract:
> - mkdir ${WRKSRC}/ext
> - cp -r ${WRKDIR}/robin-map-${ROBIN_VER} ${WRKSRC}/ext/robin-map
>
> post-install:
> find ${PREFIX} -name '*.orig' -delete
> Index: distinfo
> ===
> RCS file: /cvs/ports/graphics/openimageio/distinfo,v
> retrieving revision 1.10
> diff -u -p -r1.10 distinfo
> --- distinfo 5 Jan 2021 20:53:18 - 1.10
> +++ distinfo 15 Feb 2021 02:51:07 -
> @@ -1,4 +1,2 @@
> -SHA256 (openimageio-2.2.10.0.tar.gz) =
> 28Dj6XGEl9n3HqAfsd6Lh0SXda2dvOpNJTjZxSu+HVo=
> -SHA256 (robin-map-0.6.2.tar.gz) =
> wI7Esb8chesNZDIkSmqJhiIp2hy4NPP5D7qNw12MjvE=
> -SIZE (openimageio-2.2.10.0.tar.gz) = 29215970
> -SIZE (robin-map-0.6.2.tar.gz) = 63782
> +SHA256 (openimageio-2.2.11.1.tar.gz) =
> EgFw6FF9iRH1Kw+1bxTrVqrYjt1yzJ5LLjXHQCUpO30=
> +SIZE (openimageio-2.2.11.1.tar.gz) = 29250377
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/graphics/openimageio/pkg/PLIST,v
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dan...@cvs.openbsd.org 2021/02/21 22:03:58 Modified files: textproc/mdbook: Makefile distinfo Log message: update mdbook to 0.4.6 fixing cve-2020-26297 ok edd@ (MAINTAINER)
Fix x11/uwm to compile with -fno-common
I confirmed that uwm still launches and managed to exercise the Exit
item in the menu.
Happy to either apply the patch or remove the port as it looks pretty
dead upstream.
OK to either option?
Subject: [PATCH] Fix x11/uwm to compile with -fno-common
---
x11/uwm/Makefile | 2 +-
x11/uwm/patches/patch-uwm_workspaces_h | 24
2 files changed, 25 insertions(+), 1 deletion(-)
create mode 100644 x11/uwm/patches/patch-uwm_workspaces_h
diff --git a/x11/uwm/Makefile b/x11/uwm/Makefile
index 0ea71eb2935..ab230d1ac96 100644
--- a/x11/uwm/Makefile
+++ b/x11/uwm/Makefile
@@ -3,7 +3,7 @@
COMMENT = lightweight WM with an original look and feel
DISTNAME = uwm-0.2.11
CATEGORIES = x11
-REVISION = 2
+REVISION = 3
HOMEPAGE = http://udeproject.sourceforge.net/
diff --git a/x11/uwm/patches/patch-uwm_workspaces_h
b/x11/uwm/patches/patch-uwm_workspaces_h
new file mode 100644
index 000..e2241a4ba25
--- /dev/null
+++ b/x11/uwm/patches/patch-uwm_workspaces_h
@@ -0,0 +1,24 @@
+Avoids duplicate symbol complaints surfaced by -fno-common.
+
+The defined values are never used in the code.
+
+$OpenBSD$
+
+Index: uwm/workspaces.h
+--- uwm/workspaces.h.orig
uwm/workspaces.h
+@@ -92,14 +92,6 @@ typedef struct {
+ long intflags;
+ } UDE_LWS_Layer;
+
+-// These three lists will be declared in workspaces.c, and declared static
+-// so that no other module has direct access to them
+-NodeList Workspaces;
+-NodeList Layers;
+-NodeList WS_Layer_Defaults; // This will be the list which handles setting up
+- // defaults for where
windows will be mapped to.
+-// End three listings
+-
+ void UDE_LWS_InitializeWSL(void);
+ void UDE_LWS_FinalizeWSL(void);
+ UDE_LWS_Workspace *UDE_LWS_AllocWorkspace(void);
--
2.30.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2021/02/21 21:22:42
Modified files:
audio/audacious: Makefile.inc
Log message:
Bump audio/audacious/{player,plugins}
audio/audacious/player failed to package in naddy@'s latest bulk build due a
missing bump. The addition of the qt5 flavor also involves a change in the
PLIST of audio/audacious/plugins, so bump this one as well.
Re: Update or remove mail/avenger
Klemens Nanni writes: > On Wed, Feb 10, 2021 at 09:42:09AM +0100, Klemens Nanni wrote: >> We package 0.8.3 05-Apr-2012 but 0.8.4 in 13-Jul-2013 and 0.8.5 in >> 08-Oct-2018 were released; the NEWS file in the latest tarball says: >> >> * Changes in release 0.8.5 >> >> Various changes to make it compile with newer g++ and libcrypto. >> >> Manually parse /etc/resolv.conf, rather than attempting to make use of >> the res data structure (which at least on OpenBSD no longer actually >> contains the addresses of resolvers). >> >> * Changes in release 0.8.4 >> >> Switch to new resolver library interface, as previous way of reloading >> resolv.conf is no longer compatible with glibc. >> >> Set IP_FREEBIND option if available. >> >> Added systemd avenger.service file. >> >> >> Does anyone still use this "highly-configurable, MTA-independent SMTP >> server daemon" on OpenBSD? I'm inclined to assume the answer is "no", >> especially if the latest release from over two years ago contains >> DNS and crypto relevant specifically for OpenBSD. >> >> Does anyone want to look at updating and testing this port or shall we >> send it to the attic? I vote for the attic. smtpd should be enough for everybody :) >> >> PS: http://www.mailavenger.org/NEWS is sitll missing 0.8.5 changes, so >> best look at the actual tarball. > > Ping.
Re: ipv6-toolkit: fix for -fno-common
On Mon, Feb 22, 2021 at 01:07:05AM +0100, Jeremie Courreges-Anglas wrote:
> I've never used those tools on OpenBSD before, do they actually work?
> scan6 -i iwm0 -L doesn't print anything here for example.
scan6 -i em0 -L works for me. These tools are not production
quality. Fernando Gont asked me to integrate the port on OpenBSD
some years ago. They may help him testing and debugging IPv6.
> ok?
OK bluhm@
> Index: Makefile
> ===
> RCS file: /d/cvs/ports/net/ipv6-toolkit/Makefile,v
> retrieving revision 1.5
> diff -u -p -r1.5 Makefile
> --- Makefile 12 Jul 2019 20:48:29 - 1.5
> +++ Makefile 21 Feb 2021 23:42:50 -
> @@ -5,7 +5,7 @@ COMMENT = SI6 networks IPv6 toolkit
> VERSION =2.0
> DISTNAME = ipv6toolkit-v${VERSION}
> PKGNAME =ipv6toolkit-${VERSION}
> -REVISION = 0
> +REVISION = 1
>
> CATEGORIES = net
>
> Index: patches/patch-tools_libipv6_c
> ===
> RCS file: /d/cvs/ports/net/ipv6-toolkit/patches/patch-tools_libipv6_c,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-tools_libipv6_c
> --- patches/patch-tools_libipv6_c 4 Apr 2019 19:18:18 - 1.1
> +++ patches/patch-tools_libipv6_c 21 Feb 2021 23:40:56 -
> @@ -1,11 +1,38 @@
> $OpenBSD: patch-tools_libipv6_c,v 1.1 2019/04/04 19:18:18 bluhm Exp $
>
> -https://github.com/fgont/ipv6toolkit/pull/52
> +RTA_IFP removal: https://github.com/fgont/ipv6toolkit/pull/52
> +
> +Other chunks: fix with -fno-common
> +https://github.com/fgont/ipv6toolkit/commit/2bde90f3845234490549640dc6ed5712d84969ba
>
> Index: tools/libipv6.c
> --- tools/libipv6.c.orig
> +++ tools/libipv6.c
> -@@ -2815,7 +2815,7 @@ int sel_next_hop(struct iface_data *idata){
> +@@ -66,13 +66,9 @@
> +
> +
> + /* IPv6 Address Resolution */
> +-sigjmp_buf env;
> +-unsigned intcanjump;
> ++static sigjmp_buf env;
> ++static unsigned int canjump;
> +
> +-/* pcap variables */
> +-charerrbuf[PCAP_ERRBUF_SIZE];
> +-struct bpf_program pcap_filter;
> +-
> + #ifdef __linux__
> + /* Netlink requests */
> + struct nlrequest{
> +@@ -517,6 +513,7 @@ int ether_pton(const char *ascii, struct ether_addr *e
> +
> + int find_ipv6_router_full(pcap_t *pfd, struct iface_data *idata){
> + struct pcap_pkthdr *pkthdr;
> ++struct bpf_program pcap_filter;
> + const u_char*pktdata;
> + struct ether_header *pkt_ether;
> + struct ip6_hdr *pkt_ipv6;
> +@@ -2815,7 +2812,7 @@ int sel_next_hop(struct iface_data *idata){
> rtm->rtm_msglen= sizeof(struct rt_msghdr) + sizeof(struct
> sockaddr_in6);
> rtm->rtm_version= RTM_VERSION;
> rtm->rtm_type= RTM_GET;
> @@ -14,3 +41,11 @@ Index: tools/libipv6.c
> rtm->rtm_pid= pid= getpid();
> rtm->rtm_seq= seq= random();
>
> +@@ -4233,6 +4230,7 @@ int find_ipv6_router(pcap_t *pfd, struct ether_addr *h
> + struct ether_addr *result_ether, struct
> in6_addr *result_ipv6){
> +
> + struct pcap_pkthdr *pkthdr;
> ++struct bpf_program pcap_filter;
> + const u_char*pktdata;
> + struct ether_header *pkt_ether;
> + struct ip6_hdr *pkt_ipv6;
> Index: patches/patch-tools_scan6_c
> ===
> RCS file: patches/patch-tools_scan6_c
> diff -N patches/patch-tools_scan6_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-tools_scan6_c 21 Feb 2021 23:41:28 -
> @@ -0,0 +1,19 @@
> +$OpenBSD$
> +
> +Fix with -fno-common
> +https://github.com/fgont/ipv6toolkit/commit/2bde90f3845234490549640dc6ed5712d84969ba
> +
> +Index: tools/scan6.c
> +--- tools/scan6.c.orig
> tools/scan6.c
> +@@ -251,8 +251,8 @@ uint16_t
> service_ports_dec[]={21, 22, 23, 25, 49, 5
> +
> +
> + /* IPv6 Address Resolution */
> +-sigjmp_buf env;
> +-unsigned intcanjump;
> ++static sigjmp_buf env;
> ++static unsigned int canjump;
> +
> + int main(int argc, char **argv){
> + extern char *optarg;
>
>
> --
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
ipv6-toolkit: fix for -fno-common
As reported by naddy@ this fails to build after clang switched
to -fno-common.
--8<--
===> Building for ipv6toolkit-2.0p0
cc -O2 -pipe -Wall -c -o libipv6.o tools/libipv6.c
cc -O2 -pipe -Wall -o addr6 tools/addr6.c libipv6.o -lpcap -lm
cp tools/blackhole6 ./
cc -O2 -pipe -Wall -o flow6 tools/flow6.c libipv6.o -lpcap -lm
ld: error: duplicate symbol: errbuf
>>> defined at flow6.c
>>>/tmp/flow6-b85880.o:(errbuf)
>>> defined at libipv6.c
>>>libipv6.o:(.bss+0x80)
ld: error: duplicate symbol: pcap_filter
>>> defined at flow6.c
>>>/tmp/flow6-b85880.o:(pcap_filter)
>>> defined at libipv6.c
>>>libipv6.o:(.bss+0x0)
cc: error: linker command failed with exit code 1 (use -v to see invocation)
*** Error 1 in /usr/ports/pobj/ipv6toolkit-2.0/ipv6toolkit-v2.0 (Makefile:58
'flow6')
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2935
'/usr/ports/pobj/ipv6toolkit-2.0/.build_done': @cd /usr/ports/pobj/ipv6toolk...)
*** Error 2 in /usr/ports/net/ipv6-toolkit
(/usr/ports/infrastructure/mk/bsd.port.mk:2594 'all': @lock=ipv6toolkit-2.0p0;
export _LOCKS_HEL...)
-->8--
This has already been fixed in an upstream commit.
I've never used those tools on OpenBSD before, do they actually work?
scan6 -i iwm0 -L doesn't print anything here for example.
ok?
Index: Makefile
===
RCS file: /d/cvs/ports/net/ipv6-toolkit/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile12 Jul 2019 20:48:29 - 1.5
+++ Makefile21 Feb 2021 23:42:50 -
@@ -5,7 +5,7 @@ COMMENT = SI6 networks IPv6 toolkit
VERSION = 2.0
DISTNAME = ipv6toolkit-v${VERSION}
PKGNAME = ipv6toolkit-${VERSION}
-REVISION = 0
+REVISION = 1
CATEGORIES = net
Index: patches/patch-tools_libipv6_c
===
RCS file: /d/cvs/ports/net/ipv6-toolkit/patches/patch-tools_libipv6_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-tools_libipv6_c
--- patches/patch-tools_libipv6_c 4 Apr 2019 19:18:18 - 1.1
+++ patches/patch-tools_libipv6_c 21 Feb 2021 23:40:56 -
@@ -1,11 +1,38 @@
$OpenBSD: patch-tools_libipv6_c,v 1.1 2019/04/04 19:18:18 bluhm Exp $
-https://github.com/fgont/ipv6toolkit/pull/52
+RTA_IFP removal: https://github.com/fgont/ipv6toolkit/pull/52
+
+Other chunks: fix with -fno-common
+https://github.com/fgont/ipv6toolkit/commit/2bde90f3845234490549640dc6ed5712d84969ba
Index: tools/libipv6.c
--- tools/libipv6.c.orig
+++ tools/libipv6.c
-@@ -2815,7 +2815,7 @@ int sel_next_hop(struct iface_data *idata){
+@@ -66,13 +66,9 @@
+
+
+ /* IPv6 Address Resolution */
+-sigjmp_bufenv;
+-unsigned int canjump;
++static sigjmp_buf env;
++static unsigned int canjump;
+
+-/* pcap variables */
+-char errbuf[PCAP_ERRBUF_SIZE];
+-struct bpf_programpcap_filter;
+-
+ #ifdef __linux__
+ /* Netlink requests */
+ struct nlrequest{
+@@ -517,6 +513,7 @@ int ether_pton(const char *ascii, struct ether_addr *e
+
+ int find_ipv6_router_full(pcap_t *pfd, struct iface_data *idata){
+ struct pcap_pkthdr *pkthdr;
++ struct bpf_program pcap_filter;
+ const u_char*pktdata;
+ struct ether_header *pkt_ether;
+ struct ip6_hdr *pkt_ipv6;
+@@ -2815,7 +2812,7 @@ int sel_next_hop(struct iface_data *idata){
rtm->rtm_msglen= sizeof(struct rt_msghdr) + sizeof(struct
sockaddr_in6);
rtm->rtm_version= RTM_VERSION;
rtm->rtm_type= RTM_GET;
@@ -14,3 +41,11 @@ Index: tools/libipv6.c
rtm->rtm_pid= pid= getpid();
rtm->rtm_seq= seq= random();
+@@ -4233,6 +4230,7 @@ int find_ipv6_router(pcap_t *pfd, struct ether_addr *h
+ struct ether_addr *result_ether, struct
in6_addr *result_ipv6){
+
+ struct pcap_pkthdr *pkthdr;
++ struct bpf_program pcap_filter;
+ const u_char*pktdata;
+ struct ether_header *pkt_ether;
+ struct ip6_hdr *pkt_ipv6;
Index: patches/patch-tools_scan6_c
===
RCS file: patches/patch-tools_scan6_c
diff -N patches/patch-tools_scan6_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-tools_scan6_c 21 Feb 2021 23:41:28 -
@@ -0,0 +1,19 @@
+$OpenBSD$
+
+Fix with -fno-common
+https://github.com/fgont/ipv6toolkit/commit/2bde90f3845234490549640dc6ed5712d84969ba
+
+Index: tools/scan6.c
+--- tools/scan6.c.orig
tools/scan6.c
+@@ -251,8 +251,8 @@ uint16_t
service_ports_dec[]={21, 22, 23, 25,
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/21 14:36:30 Modified files: net/dhcpcd : Makefile net/dhcpcd/pkg : README Log message: remind the user that DHCPv6 (and NDP) require PF rules to pass the traffic as is not generally the case with v4. pointed out by stsp@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/21 14:24:06 Modified files: emulators/qemu : Makefile Log message: fix typo, from Brad
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/21 14:22:09 Modified files: games/mysticmine: Makefile Log message: mysticmine: add missing RDEP on py-numpy
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/21 14:12:11 Modified files: devel/reposurgeon: Makefile Log message: use py3 version of cython
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/21 14:10:41 Modified files: audio/picard : Makefile distinfo audio/picard/pkg: PLIST Log message: update to picard-2.5.6
Build failures from -fno-common (2021-02-21)
Here is the updated list of ports that now fail to build due to the new -fno-common compiler default. (It looks like portroach now fails to show available updates for master site Sourceforge.) audio/gtkpod- ports@openbsd.org audio/nspmod- ports@openbsd.org audio/wmtune- ports@openbsd.org comms/birda - ports@openbsd.org comms/efax - i...@openbsd.org comms/scmxx - ports@openbsd.org comms/seyon - ports@openbsd.org comms/xdx - ports@openbsd.org devel/mingw - p...@irofti.net devel/mk- ports@openbsd.org devel/remake- ports@openbsd.org editors/tea UPDATEports@openbsd.org emulators/libretro-genesis-plus-gx - ports@openbsd.org emulators/pcsxr - ports@openbsd.org games/corewars - ports@openbsd.org games/egoboo- ports@openbsd.org games/freedroidrpg - ports@openbsd.org games/mirrormagic - ports@openbsd.org games/oolite- n...@openbsd.org games/sdlpop- rob...@openbsd.org games/vms-empire- ports@openbsd.org graphics/dpic - ports@openbsd.org graphics/gimp/liquid-rescale- ports@openbsd.org inputmethods/cellwriter - vas...@lxmx.com.au lang/moarvm UPDATEpas...@stumpf.co mail/avengerUPDATEports@openbsd.org mail/sma- ports@openbsd.org mail/wmmultipop3- ports@openbsd.org mail/wmpop3 - ports@openbsd.org misc/logjam - ports@openbsd.org misc/wmmand - ports@openbsd.org multimedia/audiopreview - ports@openbsd.org multimedia/lives- ports@openbsd.org net/angst - ports@openbsd.org net/argus - ste...@openbsd.org net/argus-clients - ste...@openbsd.org net/dicoUPDATEports@openbsd.org net/ekg - ports@openbsd.org net/ettercap- ports@openbsd.org net/ipv6-toolkit- bl...@openbsd.org net/jftpgw - ports@openbsd.org net/nagios/nagios - ports@openbsd.org net/tcpreplay - ni...@openbsd.org net/weex- ports@openbsd.org net/yersinia- ste...@openbsd.org security/bsd-airtools - ports@openbsd.org security/foremost - ports@openbsd.org security/gringotts - p...@openbsd.org security/ossec-hids UPDATEp...@irofti.net security/tempwatch - ports@openbsd.org sysutils/radmind- ports@openbsd.org sysutils/wmmon - ports@openbsd.org sysutils/wmwlmon- mar...@nazgul.ch www/sarg- ports@openbsd.org x11/agar/test UPDATEports@openbsd.org x11/gnustep/corebase- sebas...@openbsd.org x11/gnustep/gworkspace - sebas...@openbsd.org x11/gnustep/terminal- sebas...@openbsd.org x11/golem - ports@openbsd.org x11/uwm - ports@openbsd.org x11/wind- ports@openbsd.org x11/wmii- ports@openbsd.org x11/wminfo - ports@openbsd.org -- Christian "naddy" Weisgerber na...@mips.inka.de
Re: powerpc bulk build report
Hi, On Sun, 21 Feb 2021 13:29:53 -0700 (MST) c...@openbsd.org wrote: > Bulk build on macppc-0.ports.openbsd.org > > Started : Thu Feb 4 17:42:22 MST 2021 > Finished: Sun Feb 21 13:29:25 MST 2021 > Duration: 16 Days 19 hours 47 minutes > http://build-failures.rhaalovely.net/powerpc/2021-02-04/graphics/openvdb.log This new port won't be built on powerpc, see https://marc.info/?l=openbsd-ports-cvs=161387035817473=2 > http://build-failures.rhaalovely.net/powerpc/2021-02-04/shells/ksh93.log Marked BROKEN, as seen on powerpc64.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/21 13:32:08 Modified files: games/pygame_sdl2: Makefile Log message: switch pygame_sdl2 to py3 cython, it just runs the script so doesn't need the py2 version
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: matth...@cvs.openbsd.org2021/02/21 13:30:26 Modified files: x11/wmii : Makefile Added files: x11/wmii/patches: patch-cmd_util_c patch-cmd_wmii_dat_h patch-cmd_wmii_main_c patch-cmd_wmii_x11_c patch-cmd_wmii_x11_h patch-include_util_h Log message: Fix build with -fno-common. ok tb@
powerpc bulk build report
Bulk build on macppc-0.ports.openbsd.org Started : Thu Feb 4 17:42:22 MST 2021 Finished: Sun Feb 21 13:29:25 MST 2021 Duration: 16 Days 19 hours 47 minutes Built using OpenBSD 6.8-current (GENERIC) #838: Tue Feb 2 08:24:45 MST 2021 Built 9595 packages Number of packages built each day: Feb 4: 500 Feb 5: 305 Feb 6: 137 Feb 7: 784 Feb 8: 516 Feb 9: 340 Feb 10: 319 Feb 11: 302 Feb 12: 429 Feb 13: 222 Feb 14: 397 Feb 15: 383 Feb 16: 333 Feb 17: 330 Feb 18: 690 Feb 19: 440 Feb 20: 546 Feb 21: 2622 Critical path missing pkgs: http://build-failures.rhaalovely.net/powerpc/2021-02-04/summary.log Build failures: 6 http://build-failures.rhaalovely.net/powerpc/2021-02-04/emulators/higan.log http://build-failures.rhaalovely.net/powerpc/2021-02-04/games/hyperrogue.log http://build-failures.rhaalovely.net/powerpc/2021-02-04/graphics/openvdb.log http://build-failures.rhaalovely.net/powerpc/2021-02-04/lang/gforth.log http://build-failures.rhaalovely.net/powerpc/2021-02-04/productivity/gnucash.log http://build-failures.rhaalovely.net/powerpc/2021-02-04/shells/ksh93.log Recurrent failures: failures/emulators/higan.log failures/games/hyperrogue.log failures/lang/gforth.log failures/productivity/gnucash.log failures/shells/ksh93.log failures/summary.log New failures: +failures/graphics/openvdb.log Resolved failures: -failures/games/valyriatear.log -failures/net/ntopng.log -failures/net/pmacct,postgresql.log -failures/sysutils/libvirt.log -failures/x11/e17/elementary.log Packages newly built: +audio/ruby-taglib,ruby30 +audio/ruby-vorbis_comment,ruby30 +databases/ruby-amalgalite,ruby30 +databases/ruby-ldap,ruby30 +databases/ruby-mysql,ruby30 +databases/ruby-mysql2,ruby30 +databases/ruby-pg,ruby30 +databases/ruby-sequel,ruby30 +databases/ruby-sequel_pg,ruby30 +databases/ruby-sqlite3,ruby30 +databases/ruby-tiny_tds,ruby30 +databases/tdb, +databases/tdb,,-main +databases/tdb,,-python +databases/tdb,-main +databases/tdb,-python +devel/libvirt-glib +devel/py-lief,python3 +devel/ruby-arrayfields,ruby30 +devel/ruby-cicphash,ruby30 +devel/ruby-daemons,ruby30 +devel/ruby-ffi,ruby30 +devel/ruby-ffi-compiler +devel/ruby-ffi-compiler,ruby26 +devel/ruby-ffi-compiler,ruby27 +devel/ruby-ffi-compiler,ruby30 +devel/ruby-kgio,ruby30 +devel/ruby-narray,ruby30 +devel/ruby-ncurses,ruby30 +devel/ruby-nio4r,ruby30 +devel/ruby-prof,ruby30 +devel/ruby-racc,ruby30 +devel/ruby-rb-gsl,ruby30 +devel/ruby-ref,ruby30 +devel/ruby-regexp_parser,ruby30 +devel/ruby-subset_sum,ruby30 +devel/ruby-yajl,ruby30 +graphics/alembic +graphics/kcolorpicker +graphics/kimageannotator +graphics/ksnip +graphics/libspiro +graphics/opensubdiv +graphics/ruby-rmagick,ruby30 +mail/ruby-mini_mime,ruby30 +net/ntopng +net/pmacct +net/pmacct,mysql +net/pmacct,postgresql +net/ruby-cbor,ruby30 +net/ruby-eventmachine,ruby30 +net/ruby-msgpack,ruby30 +net/ruby-public_suffix,ruby30 +security/py-argon2-cffi,python3 +security/ruby-argon2,ruby26 +security/ruby-argon2,ruby27 +security/ruby-argon2,ruby30 +security/ruby-bcrypt,ruby30 +security/ruby-gpgme,ruby30 +security/ruby-pledge,ruby30 +security/stegseek +sysutils/collectd +sysutils/collectd,-main +sysutils/collectd,-memcachec +sysutils/collectd,-mqtt +sysutils/collectd,-mysql +sysutils/collectd,-nut +sysutils/collectd,-pgsql +sysutils/collectd,-ping +sysutils/collectd,-prometheus +sysutils/collectd,-python +sysutils/collectd,-redis +sysutils/collectd,-riemann +sysutils/collectd,-rrdtool +sysutils/collectd,-snmp +sysutils/collectd,-virt +sysutils/libvirt +sysutils/libvirt-python +sysutils/libvirt-python,python3 +sysutils/p5-Sys-Virt +sysutils/ruby-augeas,ruby30 +sysutils/ruby-libvirt,ruby26 +sysutils/ruby-libvirt,ruby27 +sysutils/ruby-libvirt,ruby30 +sysutils/ruby-posix-spawn,ruby30 +sysutils/ruby-shadow,ruby30 +textproc/ruby-fast-stemmer,ruby30 +textproc/ruby-fast_xs,ruby30 +textproc/ruby-hpricot,ruby30 +textproc/ruby-hyperestraier,ruby30 +textproc/ruby-nokogiri,ruby30 +textproc/ruby-rdiscount,ruby30 +textproc/ruby-redcarpet,ruby30 +textproc/ruby-redcloth,ruby30 +www/p5-Test-LWP-UserAgent +www/py-requests-unixsocket,python3 +www/ruby-addressable,ruby30 +www/ruby-capybara,ruby30 +www/ruby-capybara-webkit,ruby30 +www/ruby-fcgi,ruby30 +www/ruby-ntlm,ruby30 +www/ruby-puma,ruby30 +www/ruby-rack,ruby30 +www/ruby-rack-test,ruby30 +www/ruby-raindrops,ruby30 +www/ruby-sassc,ruby30 +www/ruby-thin,ruby30 +www/ruby-unicorn,ruby30 +www/ruby-websocket-driver,ruby30 +www/ruby-websocket-extensions,ruby30 +www/ruby-xpath,ruby30 +x11/ruby-tk,ruby30 Packages not built this time: -astro/sattrack -audio/libgpod, -audio/libgpod,,-main -audio/libgpod,,-python -audio/libgpod,-main -audio/libgpod,-python -audio/puddletag -audio/py-mutagen -audio/py-ogg -audio/py-vorbis -audio/soundtracker -biology/nutdb -databases/py-ldap3 -devel/p5-Regexp-Copy -devel/ruby-thread_safe,ruby27 -editors/vim,gtk2 -editors/vim,gtk2,-lang -editors/vim,gtk2,-main -editors/vim,gtk2,lua -editors/vim,gtk2,lua,-lang -editors/vim,gtk2,lua,-main
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2021/02/21 13:19:40 Modified files: games/gnurobbo : Makefile games/gnurobbo/patches: patch-gnurobbo_Makefile Log message: games/gnurobbo: fix build for -fno-common This defines globals in header files throughout. Permit this practice by adding -fcommon to CFLAGS.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/21 13:16:13 Modified files: textproc/py-sphinx_rtd_theme: Makefile Log message: fix distfile source, github vs pypi
Re: Question about lang/ghc module (trying to port git-annex)
> > A few notes / questions: > > > > * I fixed a couple of typos in > > > > https://github.com/falsifian/ports/commit/98111e702634842865a3d27675b6848e3fb2b7ca > > > > * I added example usage for cabal-bundler. I hope I got it right: > > > > https://github.com/falsifian/ports/commit/f21cb097f215831b1d08443f9074073895a13731 > > Neat. I'll pick these up. > > > * If I find more time to work on this, should I polish my git-annex > > port, or is there something more useful I could be doing with your > > Cabal infrastructure? (I installed darcs and it seems to work.) > > Great! I don't think there's much else to do besides waiting for > cabal-install 3.4.0.0 to be pushed to Hackage. Depending on how this > aligns with 6.9 release we may or may not ship it then. > > You could try to build your own port of a Haskell binary you use that we > don't have yet. Your experience will likely tell us something about the > level of maturity of this infra. The only unported Haskell binaries I use are personal projects that are not on Hackage. I could try locally porting one of those as an experiment. > > * I tried to enable tests, partly because Darcs has a comprehensive > > test suite. I ran into some trouble. My WIP is here: > > > > https://github.com/falsifian/ports/commit/99cb0e33e2263cf15979a19bf068d345630c > > One problem is that cabal-bundler doesn't seem to be outputting test > > dependencies. > > I keep track of this issue in https://github.com/blackgnezdo/ports/issues/13. > See if you agree with my assessment there. Thanks, I commented there. > > * It's a pity that your approach doesn't allow Cabal-based ports to > > share dependencies. > > I chose to trade-off compute to gain simlpicity and flexibility: > https://github.com/blackgnezdo/ports/issues/3#issuecomment-650823377 > > Until this choice turns to be expensive enough to cause port builders to > complain I'm inclined to keep this approach. Okay, that's reasonable. My only concern: later on if people do complain and it's decided it's a real problem, is there a path forward that builds on what you've already got? Or would you have to start from scratch to address it? (I could complain already, but for me at least your solution is a definite improvement over the status quo. The build times aren't the end of the world.) > > Some thoughts on mitigating or solving this, in decreasing order of > > plausability: > > * Is it possible to hand-pick some particularly slow ones, make > > packages for them, and then tell Cabal to use those packages? E.g. > > aeson takes a while to build. > > Sadly this will move towards tree-wide configuration management which > was a very non-fun thing to do as you experienced first-hand trying to > deal with a ton of ports when you tried to add git-annex. Maybe there could be a rule of thumb, like adding a reusable port is only worth it if it reduces the total time to build all ports by at least X hours? I don't know if there are any libraries that meet that definition for an appropriate value of X. > > I guess it would be ugly to fill the ports tree with hundreds(?) of > > directories each with an auto-generated package. I'm not sure if > > there's a way to smoosh it all into one big file. E.g. I see > > there's something called "multi-packages", but I'm guessing that's > > not designed to handle hundreds of subpackages. > > I've seen how these things play out in much bigger code bases with many > people over time. We don't have enough people working on ports@ to > manage this. That makes sense. I imagine your approach will keep things easier for maintainers: e.g. I'm not going to accidentally break darcs by updating the dependencies of git-annex. > > * Is it possible to cheat, by having all the Cabal-based ports share > > their Cabal directory? So if I build darcs then git-annex, Cabal > > has access to all the build products from darcs when it builds > > git-annex. I guess one problem is this might make the build output > > depend on the order in which you build things, if Cabal > > opportunistically uses whatever versions are there. > > The root of the problem is GHC compilation speed. My preferred and > universally useful optimizations would be: > > * Use/build something like ccache for ghc > * Speed up ghc itself Those would be cool! > > * Are you planning to commit these changes all at once? Or is there > > some way to have an intermediate state where both old-style and > > new-style packages work? > > I don't see how it would be possible to have the old and new coexist. > ghc-8.10 is incompatible with the haskell ports in the tree. My plan is > to land this as a bundle. I wrote it up in an email to ports@ before. I didn't know about the incompatibility. Maybe there could be two separate ghc versions for a while, but I guess that's more trouble than it's worth. > Thanks > Greg -- James
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dan...@cvs.openbsd.org 2021/02/21 12:29:22 Modified files: www/py-aiohttp : Makefile distinfo Log message: update py-aiohttp to 3.7.3 for python 3.8 compatibility
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dan...@cvs.openbsd.org 2021/02/21 12:24:26 Modified files: lang/python/3.8: Makefile distinfo lang/python/3.8/files: CHANGES.OpenBSD lang/python/3.8/pkg: PLIST-idle PLIST-main PLIST-tests Removed files: lang/python/3.8/patches: patch-2021-01-18-09-27-31_bpo-42938_4Zn4Mp_rst patch-Lib_ctypes_test_test_parameters_py patch-Modules__ctypes_callproc_c Log message: update to python 3.8.8 ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dan...@cvs.openbsd.org 2021/02/21 12:23:21 Modified files: lang/python/3.9: Makefile distinfo lang/python/3.9/files: CHANGES.OpenBSD lang/python/3.9/pkg: PLIST-gdbm PLIST-idle PLIST-main PLIST-tests PLIST-tkinter Removed files: lang/python/3.9/patches: patch-2021-01-18-09-27-31_bpo-42938_4Zn4Mp_rst patch-Lib_ctypes_test_test_parameters_py patch-Modules__ctypes_callproc_c Log message: update to python 3.9.2 ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: abie...@cvs.openbsd.org 2021/02/21 12:00:24 Modified files: net/miniflux : Makefile distinfo Log message: Update miniflux to 2.0.28
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: abie...@cvs.openbsd.org 2021/02/21 11:59:02 Modified files: sysutils/restic: Makefile distinfo Log message: Update restic to 0.12.0 - add trimpath as a reminder to myself to try and get the reproducable build working.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: abie...@cvs.openbsd.org 2021/02/21 11:56:19 Modified files: net/dendrite : Makefile distinfo Log message: Update dendrite to 0.3.10.
Re: games/renpy build failure
On 2021/02/21 19:21, Christian Weisgerber wrote: > The latest flurry of python changes appears to have triggered this > build failure of games/renpy in my latest bulk build: I think I got "lucky" that py3-cython happened to be installed when this was built in my test build. The tools from py3-cython are ok to build these. It's possible there are others, either they can be patched/symlinked so they can find cython-2, or just change the dep to lang/cython,python3. I'm changing my current build to comment-out the "nojunk" for setuptools hopefully this will help shake out any remaining ones. (I already fixed some in my test bulk).
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/21 11:46:21 Modified files: games/renpy: Makefile Log message: use lang/cython,python3 to build renpy. following MODPY_BIN_SUFFIX switch the "cython" command is renamed to cython-2 for the py2 version - the py3 build of cython is happy to work with code from a py2 port.
[MAINTAINER UPDATE] net/i2p -> 0.9.49
Simple update for net/i2p to 0.9.49
*Fetch from github henceworth.
*Most of doc/* files have been compressed
into *.wars of their respective webapps.
*Some empty *{.jar,.wars} have been removed.
The given commit contains fixes to the themes
bug which they missed while making the
0.9.49 release.
Build & Run tested on amd64
Index: Makefile
===
RCS file: /cvs/ports/net/i2p/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile5 Dec 2020 17:21:55 - 1.6
+++ Makefile20 Feb 2021 13:32:39 -
@@ -7,16 +7,16 @@ ONLY_FOR_ARCHS= amd64 i386
COMMENT= i2p routing protocol
-V= 0.9.48
-DISTNAME= i2psource_${V}
-EXTRACT_SUFX= .tar.bz2
-PKGNAME= i2p-${V}
+GH_ACCOUNT=i2p
+GH_PROJECT=i2p.i2p
+GH_TAGNAME=5d5e6fa3c2365f6c9956d3691d620eb5797091f8
+PKGNAME= i2p-0.9.49
CATEGORIES=net
HOMEPAGE= https://geti2p.net/en/
-MAINTAINER=Dimitri karamazov
+MAINTAINER=Dimitri Karamazov
# Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0
# EPLv1.0 GPLv2 GPLv3 LGPLv2.1 LGPLv3 MIT public-domain WTFPLv2
@@ -24,9 +24,6 @@ PERMIT_PACKAGE= Yes
WANTLIB += gmp
-MASTER_SITES= https://download.i2p2.de/releases/$V/ \
- https://launchpad.net/i2p/trunk/$V/+download/
-
MODULES= java
MODJAVA_VER= 1.8
MODJAVA_BUILD= ant
@@ -49,8 +46,6 @@ DB_DIR= ${LOCALSTATEDIR}/i2p
SUBST_VARS=DB_DIR JAVA_HOME
MAKE_ENV= CC=${CC} BITS=${BITS}
-
-WRKDIST= ${WRKDIR}/${PKGNAME}
# test requires addition dependencies (atleast: junit, hamcrest, jmockfit)
NO_TEST= Yes
Index: distinfo
===
RCS file: /cvs/ports/net/i2p/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo5 Dec 2020 17:21:55 - 1.2
+++ distinfo20 Feb 2021 13:32:39 -
@@ -1,2 +1,2 @@
-SHA256 (i2psource_0.9.48.tar.bz2) =
6MVbF7IGbY6rgrxAcSjx8DZlMMVCmhQT6gy/QPki1TI=
-SIZE (i2psource_0.9.48.tar.bz2) = 33029295
+SHA256 (i2p.i2p-5d5e6fa3c2365f6c9956d3691d620eb5797091f8.tar.gz) =
/RaibIT2QhBb67tEMNqjm8CbDbFNOA+N8RTwh9lb90Y=
+SIZE (i2p.i2p-5d5e6fa3c2365f6c9956d3691d620eb5797091f8.tar.gz) = 37885005
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/i2p/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 5 Dec 2020 17:21:55 - 1.3
+++ pkg/PLIST 20 Feb 2021 13:32:40 -
@@ -23,13 +23,10 @@ share/i2p/certificates/family/gostcoin.c
share/i2p/certificates/family/i2p-dev.crt
share/i2p/certificates/family/i2pd-dev.crt
share/i2p/certificates/family/volatile.crt
-share/i2p/certificates/i2cp/
-share/i2p/certificates/i2ptunnel/
share/i2p/certificates/news/
share/i2p/certificates/news/ampernand_at_gmail.com.crt
share/i2p/certificates/news/echelon_at_mail.i2p.crt
share/i2p/certificates/news/hankhill19580_at_gmail.com.crt
-share/i2p/certificates/news/str4d_at_mail.i2p.crt
share/i2p/certificates/news/zzz_at_mail.i2p.crt
share/i2p/certificates/plugin/
share/i2p/certificates/plugin/backup_at_mail.i2p.crt
@@ -45,10 +42,9 @@ share/i2p/certificates/reseed/hottuna_at
share/i2p/certificates/reseed/igor_at_novg.net.crt
share/i2p/certificates/reseed/lazygravy_at_mail.i2p.crt
share/i2p/certificates/reseed/reseed_at_diva.exchange.crt
-share/i2p/certificates/revocations/
share/i2p/certificates/router/
share/i2p/certificates/router/echelon_at_mail.i2p.crt
-share/i2p/certificates/router/str4d_at_mail.i2p.crt
+share/i2p/certificates/router/hankhill19580_at_gmail.com.crt
share/i2p/certificates/router/zzz_at_mail.i2p.crt
share/i2p/certificates/ssl/
share/i2p/certificates/ssl/echelon.reseed2017.crt
@@ -56,21 +52,7 @@ share/i2p/certificates/ssl/i2pseed.creat
share/i2p/certificates/ssl/isrgrootx1.crt
share/i2p/clients.config
share/i2p/docs/
-share/i2p/docs/ahelper-conflict-header.ht
-share/i2p/docs/ahelper-new-header.ht
-share/i2p/docs/ahelper-notfound-header.ht
-share/i2p/docs/auth-header.ht
-share/i2p/docs/b32-auth-header.ht
-share/i2p/docs/b32-header.ht
-share/i2p/docs/baduri-header.ht
share/i2p/docs/console.ico
-share/i2p/docs/denied-header.ht
-share/i2p/docs/dnf-header.ht
-share/i2p/docs/dnfb-header.ht
-share/i2p/docs/dnfh-header.ht
-share/i2p/docs/dnfp-header.ht
-share/i2p/docs/enc-header.ht
-share/i2p/docs/encp-header.ht
share/i2p/docs/icons/
share/i2p/docs/icons/flags/
share/i2p/docs/icons/flags/ad.png
@@ -312,665 +294,8 @@ share/i2p/docs/icons/flags/yt.png
share/i2p/docs/icons/flags/za.png
share/i2p/docs/icons/flags/zm.png
share/i2p/docs/icons/flags/zw.png
-share/i2p/docs/icons/flags16x11/
-share/i2p/docs/icons/flags16x11/a0.png
-share/i2p/docs/icons/flags16x11/a1.png
-share/i2p/docs/icons/flags16x11/a2.png
-share/i2p/docs/icons/flags16x11/ap.png
-share/i2p/docs/icons/flags16x11/bl.png
-share/i2p/docs/icons/flags16x11/bq.png
games/renpy build failure
The latest flurry of python changes appears to have triggered this
build failure of games/renpy in my latest bulk build:
>>> Building on localhost under games/renpy
BDEPENDS =
[lang/cython;archivers/bzip2;graphics/glew;graphics/ffmpeg;lang/python/2.7;devel/pygame;games/pygame_sdl2]
DIST = [games/renpy:renpy-7.3.5-source.tar.bz2]
FULLPKGNAME = renpy-7.3.5
RDEPENDS =
[graphics/glew;graphics/ffmpeg;lang/python/2.7;games/pygame_sdl2;x11/gnome/zenity]
(Junk lock obtained for localhost at 1613929733.93)
>>> Running depends in games/renpy at 1613929734.01
last junk was in net/filezilla
/usr/sbin/pkg_add -aI -Drepair ffmpeg-4.3.1p0v1 glew-2.2.0 py-cython-0.29.21p1
py-game-2.0.1p0 pygame_sdl2-7.3.5.606 python-2.7.18p0
was: /usr/sbin/pkg_add -aI -Drepair bzip2-1.0.8p0 ffmpeg-4.3.1p0v1 glew-2.2.0
py-cython-0.29.21p1 py-game-2.0.1p0 pygame_sdl2-7.3.5.606 python-2.7.18p0
/usr/sbin/pkg_add -aI -Drepair ffmpeg-4.3.1p0v1 glew-2.2.0 py-cython-0.29.21p1
py-game-2.0.1p0 pygame_sdl2-7.3.5.606 python-2.7.18p0
>>> Running show-prepare-results in games/renpy at 1613929741.27
===> games/renpy
===> renpy-7.3.5 depends on: py-game-* -> py-game-2.0.1p0
===> renpy-7.3.5 depends on: pygame_sdl2-* -> pygame_sdl2-7.3.5.606
===> renpy-7.3.5 depends on: py-cython-* -> py-cython-0.29.21p1
===> renpy-7.3.5 depends on: python->=2.7,<2.8 -> python-2.7.18p0
===> renpy-7.3.5 depends on: bzip2-* -> bzip2-1.0.8p0
===> renpy-7.3.5 depends on: ffmpeg-* -> ffmpeg-4.3.1p0v1
===> renpy-7.3.5 depends on: glew-* -> glew-2.2.0
===> Verifying specs: GLEW SDL2 avcodec avformat avresample avutil freetype m
png pthread swresample swscale z python2.7
===> found GLEW.9.0 SDL2.0.9 avcodec.24.0 avformat.21.0 avresample.2.0
avutil.14.0 freetype.30.0 m.10.1 png.18.0 pthread.26.1 swresample.3.0
swscale.7.0 z.5.0 python2.7.0.0
bzip2-1.0.8p0
ffmpeg-4.3.1p0v1
glew-2.2.0
py-cython-0.29.21p1
py-game-2.0.1p0
pygame_sdl2-7.3.5.606
python-2.7.18p0
(Junk lock released for localhost at 1613929742.26)
distfiles size=68211972
>>> Running patch in games/renpy at 1613929742.32
===> games/renpy
===> Checking files for renpy-7.3.5
`/usr/ports/distfiles/renpy-7.3.5-source.tar.bz2' is up to date.
>> (SHA256) renpy-7.3.5-source.tar.bz2: OK
===> Extracting for renpy-7.3.5
===> Patching for renpy-7.3.5
===> Compiler link: clang -> /usr/bin/clang
===> Compiler link: clang++ -> /usr/bin/clang++
===> Compiler link: cc -> /usr/bin/cc
===> Compiler link: c++ -> /usr/bin/c++
>>> Running configure in games/renpy at 1613929752.27
===> games/renpy
===> Generating configure for renpy-7.3.5
===> Configuring for renpy-7.3.5
>>> Running build in games/renpy at 1613929752.51
===> games/renpy
===> Building for renpy-7.3.5
_renpysteam is out of date.
Traceback (most recent call last):
File "./setup.py", line 148, in
cython("_renpysteam", language="c++", compile_if=steam_sdk,
libs=["steam_api"])
File "/usr/obj/ports/renpy-7.3.5/renpy-7.3.5-source/module/setuplib.py", line
326, in cython
c_fn])
File "/usr/local/lib/python2.7/subprocess.py", line 185, in check_call
retcode = call(*popenargs, **kwargs)
File "/usr/local/lib/python2.7/subprocess.py", line 172, in call
return Popen(*popenargs, **kwargs).wait()
File "/usr/local/lib/python2.7/subprocess.py", line 394, in __init__
errread, errwrite)
File "/usr/local/lib/python2.7/subprocess.py", line 1047, in _execute_child
raise child_exception
OSError: [Errno 2] No such file or directory
*** Error 1 in games/renpy (/usr/ports/lang/python/python.port.mk:248
'do-build': @: ;mkdir -p /usr/obj/ports/renpy-7.3.5/lib/python2.7/site...)
*** Error 2 in games/renpy (/usr/ports/infrastructure/mk/bsd.port.mk:2931
'/usr/obj/ports/renpy-7.3.5/.build_done': @cd /usr/ports/games/ren...)
*** Error 2 in games/renpy (/usr/ports/infrastructure/mk/bsd.port.mk:2594
'build': @lock=renpy-7.3.5; export _LOCKS_HELD=" renpy-7.3.5"; ...)
===> Exiting games/renpy with an error
*** Error 1 in /usr/ports (infrastructure/mk/bsd.port.subdir.mk:137 'build': @:
${echo_msg:=echo}; : ${target:=build}; for i in ; do eval...)
>>> Ended at 1613929752.83
Error: job failed with 512 on localhost at 1613929752
--
Christian "naddy" Weisgerber na...@mips.inka.de
Re: [MAINTAINER UPDATE] graphics/openimageio -> 2.2.11.1
On Wed, Feb 17, 2021 at 05:32:19AM +, Dimitri Karamazov wrote:
> Ping
>
> On Wed, Feb 10, 2021 at 12:06:29PM +, Dimitri Karamazov wrote:
> > On Wed, Feb 10, 2021 at 06:01:03AM +0100, Rafael Sadowski wrote:
> > > On Tue Feb 09, 2021 at 07:34:29AM +, Dimitri Karamazov wrote:
> > > > Ping
> > > >
> > > > A new dependency is required only during build.
> > > > All tests pass for robin-map
> > > >
> > > > Information for inst:robin-map-0.6.3
> > > >
> > > > Comment:
> > > > fast hash map and hash set
> > > >
> > > > Description:
> > > > A C++ implementation of a fast hash map and hash set using
> > > > open-addressing and linear robin hood hashing with backward
> > > > shift deletion to resolve collisions.
> > > >
> > > > Maintainer: Dimitri Karamazov
> > > >
> > > > WWW: https://github.com/Tessil/robin-map
> > > >
> > > With TEST_DEPENDS = devel/boost, OK rsadowski to import robin-map-0.6.3.
> >
> > Reattached with necessary changes
> >
> > regards,
> > Dimitri
Bump for a new release.
Index: Makefile
===
RCS file: /cvs/ports/graphics/openimageio/Makefile,v
retrieving revision 1.50
diff -u -p -r1.50 Makefile
--- Makefile23 Jan 2021 12:46:26 - 1.50
+++ Makefile15 Feb 2021 02:51:07 -
@@ -8,13 +8,11 @@ COMMENT = library for reading and writi
GH_ACCOUNT = OpenImageIO
GH_PROJECT = oiio
GH_TAGNAME = Release-$V
-V =2.2.10.0
-ROBIN_VER =0.6.2
+V =2.2.11.1
DISTNAME = openimageio-${V}
-REVISION = 0
-SHARED_LIBS += OpenImageIO 8.0 # 2.2.10
-SHARED_LIBS += OpenImageIO_Util4.0 # 2.2.10
+SHARED_LIBS += OpenImageIO 9.0 # 2.2.11
+SHARED_LIBS += OpenImageIO_Util5.0 # 2.2.11
CATEGORIES = graphics devel
@@ -34,11 +32,6 @@ WANTLIB += boost_filesystem-mt boost_sys
WANTLIB += bz2 c freetype gif intl jpeg m openjp2 png pugixml
WANTLIB += raw_r swscale tiff util webp webpdemux z
-MASTER_SITES0 =https://github.com/Tessil/robin-map/
-
-DISTFILES =${DISTNAME}.tar.gz \
- robin-map-{archive/v}${ROBIN_VER}.tar.gz:0
-
MODULES = devel/cmake \
lang/python \
x11/qt5
@@ -48,8 +41,9 @@ MODPY_VERSION = ${MODPY_DEFAULT_VERSION
COMPILER = base-clang ports-gcc
BUILD_DEPENDS =devel/fmt \
- textproc/txt2man \
- devel/py-pybind11${MODPY_FLAVOR}
+ devel/py-pybind11${MODPY_FLAVOR} \
+ devel/robin-map \
+ textproc/txt2man
LIB_DEPENDS = devel/boost \
graphics/ffmpeg \
@@ -66,9 +60,10 @@ LIB_DEPENDS =devel/boost \
CONFIGURE_ARGS += -DCMAKE_INSTALL_MANDIR="man/man1" \
-DSTOP_ON_WARNING=OFF \
-DUSE_CCACHE=OFF \
- -DUSE_DICOM=OFF \
+ -DDCMTK_FOUND=OFF \
-DUSE_EXTERNAL_PUGIXML=ON \
-DUSE_OPENCV=OFF \
+ -DUSE_OPENVDB=OFF \
-DUSE_HDF5=OFF \
-DUSE_LIBHEIF=OFF \
-Dpybind11_DIR=${MODPY_SITEPKG}/pybind11/share/cmake/pybind11/
@@ -78,10 +73,6 @@ CONFIGURE_ARGS +=-DCMAKE_INSTALL_MANDIR
CONFIGURE_ENV += LDFLAGS="${LDFLAGS} -latomic"
WANTLIB += atomic
.endif
-
-post-extract:
- mkdir ${WRKSRC}/ext
- cp -r ${WRKDIR}/robin-map-${ROBIN_VER} ${WRKSRC}/ext/robin-map
post-install:
find ${PREFIX} -name '*.orig' -delete
Index: distinfo
===
RCS file: /cvs/ports/graphics/openimageio/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo5 Jan 2021 20:53:18 - 1.10
+++ distinfo15 Feb 2021 02:51:07 -
@@ -1,4 +1,2 @@
-SHA256 (openimageio-2.2.10.0.tar.gz) =
28Dj6XGEl9n3HqAfsd6Lh0SXda2dvOpNJTjZxSu+HVo=
-SHA256 (robin-map-0.6.2.tar.gz) = wI7Esb8chesNZDIkSmqJhiIp2hy4NPP5D7qNw12MjvE=
-SIZE (openimageio-2.2.10.0.tar.gz) = 29215970
-SIZE (robin-map-0.6.2.tar.gz) = 63782
+SHA256 (openimageio-2.2.11.1.tar.gz) =
EgFw6FF9iRH1Kw+1bxTrVqrYjt1yzJ5LLjXHQCUpO30=
+SIZE (openimageio-2.2.11.1.tar.gz) = 29250377
Index: pkg/PLIST
===
RCS file: /cvs/ports/graphics/openimageio/pkg/PLIST,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST
--- pkg/PLIST 5 Jan 2021 20:53:18 - 1.11
+++ pkg/PLIST 15 Feb 2021 02:51:07 -
@@ -70,7 +70,7 @@ lib/cmake/OpenImageIO/OpenImageIOTargets
@lib lib/libOpenImageIO.so.${LIBOpenImageIO_VERSION}
@lib lib/libOpenImageIO_Util.so.${LIBOpenImageIO_Util_VERSION}
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/21 10:42:21 Modified files: textproc/py-sphinx: Makefile textproc/py-sphinx/pkg: PLIST Log message: drop building sphinx's own docs in post-build and thus the dependency on graphviz; naddy points out that the graphviz has a large set of dependencies (which end up causing a loop; cmake -> sphinx -> graphviz -> jpeg -> cmake)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/21 10:27:21 Modified files: textproc/py-semver: Makefile distinfo textproc/py-semver/pkg: PLIST Log message: update to py3-semver-2.13.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/21 10:26:47 Modified files: databases/citus: Makefile distinfo Log message: update to citus-9.5.4
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: js...@cvs.openbsd.org 2021/02/21 10:21:42 Modified files: lang/go: Makefile distinfo Log message: Add binary bootstrap for mips64/octeon.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/21 10:19:59 Modified files: databases/repmgr: Makefile distinfo databases/repmgr/pkg: PLIST Removed files: databases/repmgr/patches: patch-config_c Log message: update to repmgr-5.2.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/21 09:51:25 Modified files: telephony/stuntman: Makefile distinfo telephony/stuntman/pkg: PLIST Log message: update to stuntman-1.2.16
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/21 09:49:50 Modified files: telephony/iaxmodem: Makefile distinfo telephony/iaxmodem/patches: patch-Makefile_in patch-configure patch-iaxmodem-cfg_ttyIAX patch-iaxmodem_c Removed files: telephony/iaxmodem/patches: patch-lib_spandsp_configure Log message: update to iaxmodem-1.3.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: js...@cvs.openbsd.org 2021/02/21 09:49:11 Modified files: lang/go: Makefile distinfo Log message: Bump lang/go binary bootstraps to Go 1.16.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/21 09:46:29 Modified files: sysutils/lockfile: Makefile Log message: remove dead HOMEPAGE and MASTER_SITES
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/21 09:30:45 Modified files: productivity/vdirsyncer: Makefile productivity/vdirsyncer/pkg: PLIST devel/py-virtualenv: Makefile devel/py-virtualenv/pkg: PLIST devel/luacheck : Makefile devel/luacheck/pkg: PLIST Log message: sync plists following py-sphinx_rtd_theme update
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/21 09:30:23 Modified files: textproc/py-sphinx_rtd_theme: Makefile distinfo textproc/py-sphinx_rtd_theme/pkg: PLIST Log message: update to py-sphinx_rtd_theme-0.5.1. the upstream distfiles require npm at build time to fetch dependencies; fetches during build aren't permitted so work around this by using the files that Debian have generated for their packaging and use their packaging patches directly.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/21 09:01:05 Modified files: textproc/py-snowballstemmer: Makefile distinfo textproc/py-snowballstemmer/pkg: PLIST Log message: update to py3-snowballstemmer-2.1.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/21 09:00:25 Modified files: math/calc : Makefile distinfo Log message: update to calc-2.12.8.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: d...@cvs.openbsd.org2021/02/21 08:05:21 Modified files: net/haproxy: Makefile Log message: Enable TLSv1.3 This mimics what has been done in www/nginx. Lack of TLSv1.3 pointed out by Brandon (theriverlethe at gmail). >From and ok tb@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2021/02/21 07:55:09 Modified files: math/bc-gh : Makefile distinfo Log message: Update to bc-gh-3.3.0 Changelog: https://github.com/gavinhoward/bc/releases/tag/3.3.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2021/02/21 07:51:21 Modified files: www/ephemetoot : Makefile Log message: fix runtime dependency for www/ephemetoot. Spotted by Felix Maschek. Thank you !
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/21 06:43:10 Modified files: textproc/py-sphinx: Makefile textproc/py-sphinx/pkg: PLIST Log message: add a dependency on graphviz; some extensions included in sphinx use it (including one used to generate sphinx's own docs). while many uses of sphinx work without this, package builds that change depending on what is installed at build time are problematic, so just force the dependency.. regen PLIST, extra files are built when this is present (used in file:///usr/local/share/doc/py3-sphinx/usage/extensions/inheritance.html).
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2021/02/21 06:30:39 Modified files: geo/spatialite/tools: Makefile distinfo geo/spatialite/tools/pkg: PLIST Log message: geo/spatialite/tools: update to 5.0.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2021/02/21 06:29:58 Modified files: geo/spatialite/libspatialite: Makefile distinfo geo/spatialite/libspatialite/pkg: PLIST Removed files: geo/spatialite/libspatialite/patches: patch-src_spatialite_spatialite_c Log message: geo/spatialite/libspatialite: update to 5.0.1. See https://groups.google.com/g/spatialite-users/c/ve9ujm4DkdY
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2021/02/21 06:15:18 Modified files: security/nss : Makefile distinfo Log message: security/nss: update to 3.62. Will be required by gecko 87. Relnotes will be at https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_3.62_release_notes
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2021/02/21 05:56:38 Modified files: editors/py-qscintilla: Makefile Log message: editors/py-qscintilla: add missing BDEP on py-qt-builder should fix a build failure reported by naddy@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2021/02/21 05:47:44 Modified files: devel/cbindgen : Makefile distinfo Log message: devel/cbindgen: update to 0.17.0. See https://github.com/eqrion/cbindgen/releases/tag/v0.17.0 Built firefox-esr-78.8.0rc1 without issues.
[nnn] proposal: add icons flavor
Hi,
nnn can render mime icons next to the file and directory names if you
use an "icon fonts" (like powerline or nerd-fonts).
The attached patch provides flavor so that people can choose to use
those rendering features.
I built and ran the "nerd" flavor on 6.8-STABLE and 6.8-CURRENT, both
/amd64. No issue were encountered ; with default xterm(1).
Regards,
Jo
Index: Makefile
===
RCS file: /cvs/ports/sysutils/nnn/Makefile,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 Makefile
--- Makefile 17 Nov 2020 06:11:28 - 1.12
+++ Makefile 21 Feb 2021 12:32:28 -
@@ -27,6 +27,17 @@ MAKE_FLAGS = CFLAGS_OPTIMIZATION=
FAKE_FLAGS = MANPREFIX="$(PREFIX)/man" \
PREFIX="${PREFIX}"
+FLAVORS= icons nerd
+FLAVOR?=
+
+.if ${FLAVOR:Micons}
+MAKE_FLAGS+=O_ICONS=1
+.endif
+
+.if ${FLAVOR:Mnerd}
+MAKE_FLAGS+=O_NERD=1
+.endif
+
USE_GMAKE = Yes
NO_TEST = Yes
[update] graphics/openjp2 2.4.0
Hi,
here's the update to openjp2 2.4.0, from the 1303 tests only two fail:
884 - NR-DEC-issue226.j2k-74-decode (Failed)
885 - NR-DEC-issue226.j2k-74-decode-md5 (Failed)
changelog at http://www.openjpeg.org/2020/12/28/OpenJPEG-2.4.0-released
will have a look shortly at consumers, since ofc the include path
changes as usual.. those using pkg-config should just work (tm)
sending this early for testing in a bulk.
Landry
? openjp2-2.3.1-libopenjp2.so.3.1
? openjp2-2.4.0-libopenjp2.so.3.1
Index: Makefile
===
RCS file: /cvs/ports/graphics/openjp2/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- Makefile29 Nov 2020 20:08:49 - 1.16
+++ Makefile21 Feb 2021 11:38:00 -
@@ -4,11 +4,10 @@
GH_ACCOUNT=uclouvain
GH_PROJECT=openjpeg
-GH_TAGNAME=v2.3.1
+GH_TAGNAME=v2.4.0
DISTNAME= openjp2-${GH_TAGNAME:S/v//}
-REVISION= 1
-SHARED_LIBS += openjp2 3.1
+SHARED_LIBS += openjp2 4.0
CATEGORIES=graphics
Index: distinfo
===
RCS file: /cvs/ports/graphics/openjp2/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo19 Apr 2019 13:29:52 - 1.7
+++ distinfo21 Feb 2021 11:38:00 -
@@ -1,2 +1,2 @@
-SHA256 (openjp2-2.3.1.tar.gz) = Y/WkcT7K/IbeUb+ticwHu3iOm7ok678MTKY3Yhqttqk=
-SIZE (openjp2-2.3.1.tar.gz) = 2214401
+SHA256 (openjp2-2.4.0.tar.gz) = hwK6aLRCZX8RqusrM4RDyo1fuVsNhFdXlop74x738W0=
+SIZE (openjp2-2.4.0.tar.gz) = 2233229
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/graphics/openjp2/patches/patch-CMakeLists_txt,v
retrieving revision 1.7
diff -u -r1.7 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt19 Apr 2019 13:29:52 - 1.7
+++ patches/patch-CMakeLists_txt21 Feb 2021 11:38:00 -
@@ -2,7 +2,7 @@
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -107,7 +107,10 @@ endif()
+@@ -108,7 +108,10 @@ endif()
option(BUILD_DOC "Build the HTML documentation (with doxygen if available)."
OFF)
string(TOLOWER ${PROJECT_NAME} projectname)
Index: pkg/PLIST
===
RCS file: /cvs/ports/graphics/openjp2/pkg/PLIST,v
retrieving revision 1.7
diff -u -r1.7 PLIST
--- pkg/PLIST 29 Nov 2020 20:08:49 - 1.7
+++ pkg/PLIST 21 Feb 2021 11:38:00 -
@@ -3,16 +3,16 @@
@bin bin/opj_compress
@bin bin/opj_decompress
@bin bin/opj_dump
-include/openjpeg-2.3/
-include/openjpeg-2.3/openjpeg.h
-include/openjpeg-2.3/opj_config.h
-include/openjpeg-2.3/opj_stdint.h
-lib/libopenjp2.a
+include/openjpeg-2.4/
+include/openjpeg-2.4/openjpeg.h
+include/openjpeg-2.4/opj_config.h
+include/openjpeg-2.4/opj_stdint.h
+@static-lib lib/libopenjp2.a
@lib lib/libopenjp2.so.${LIBopenjp2_VERSION}
-lib/openjpeg-2.3/
-lib/openjpeg-2.3/OpenJPEGConfig.cmake
-lib/openjpeg-2.3/OpenJPEGTargets${MODCMAKE_BUILD_SUFFIX}
-lib/openjpeg-2.3/OpenJPEGTargets.cmake
+lib/openjpeg-2.4/
+lib/openjpeg-2.4/OpenJPEGConfig.cmake
+lib/openjpeg-2.4/OpenJPEGTargets${MODCMAKE_BUILD_SUFFIX}
+lib/openjpeg-2.4/OpenJPEGTargets.cmake
lib/pkgconfig/libopenjp2.pc
@man man/man1/opj_compress.1
@man man/man1/opj_decompress.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/21 03:50:58 Modified files: emulators/qemu : Makefile Removed files: emulators/qemu/patches: patch-docs_conf_py Log message: qemu: remove hack for old sphinx, from Brad.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/02/21 03:49:53 Modified files: sysutils/consul-template: Makefile distinfo Log message: Update to consul-template-0.25.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/21 03:48:04 Modified files: infrastructure/lib/DPB/Job: Port.pm Log message: Record timings at the bottom of the individual build log (it's just the same information as in summary.log but I find it useful to have here too0. ok espie@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/21 03:39:47 Modified files: net/dnscontrol : Makefile Log message: Repair COMMENT, thanks portgen. Pointed out by Karlis Mikelson.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org 2021/02/21 03:29:44
Modified files:
security/suricata: Makefile
Log message:
remove unneeded sphinx-build${MODPY_BIN_SUFFIX} symlink
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/21 03:23:32 Modified files: devel/py-pexpect/pkg: PLIST Log message: regen plist (I forgot to do that for py-pexpect-4.7.0 after I gave up trying to get 4.8.0 tests to work reliably)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2021/02/21 03:17:02 Modified files: geo/spatialite/virtualpg: Makefile distinfo Log message: geo/spatialite/virtualpg: update to 2.0.1. an update to spatialite 5.0.1 is in the pipe..
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2021/02/21 03:16:07 Modified files: x11/girara : Makefile distinfo x11/girara/pkg : PLIST Log message: x11/girara: update to 0.3.5.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/21 03:04:45 Modified files: textproc/py-sphinx: Makefile Added files: textproc/py-sphinx/patches: patch-doc_conf_py Log message: disable intersphinx_mapping to prevent going online while building sphinx's own docs. spotted by aja@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org 2021/02/21 03:02:41
Modified files:
net/gajim : Makefile
Log message:
textproc/py-precis_i18n -> textproc/py-precis_i18n${MODPY_FLAVOR}
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/02/21 03:02:05 Modified files: textproc/py-precis_i18n: Makefile textproc/py-precis_i18n/pkg: PLIST Log message: Use FLAVOR instead of MODPY_DEFAULT_VERSION_3.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2021/02/21 02:54:55 Modified files: security/ipguard: Makefile security/ipguard/patches: patch-ipguard_c patch-ipguard_h Log message: security/ipguard: fix build with -fno-common
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/21 02:52:31 Modified files: textproc/py-sphinx: Makefile Log message: move websupport from BDEP to RDEP, some ports geneeate extra files if this is present (e.g. luacheck, spotted by aja@)
Re: [-fno-common] remove x11/wmii or patch it ?
On Sun, Feb 21, 2021 at 10:08:15AM +0100, Matthieu Herrb wrote: > Hi, > > wmii doesnt build with -fno-common > > suckless.org has decomissionned wmii in 2012 (its main author and > maintainer died in 2010) > > https://git.suckless.org/sites/commit/b3f0a378e7d2dab6213be07e8f2b21fb637d6776.html > > I'd suggest to delete it. > > Alternatively the patches below fix the build (only very ligtly tested > that it still starts) The patches look good to me. I think it would make sense to commit them as it might save someone some work. ok for that. I have no objection to removing wmii, but that can be done in a second step.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2021/02/21 02:31:48 Modified files: geo/geos : Makefile distinfo Log message: geo/geos: update to 3.9.1. See https://lists.osgeo.org/pipermail/geos-devel/2021-February/010138.html Face reality & take maintainership while here.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2021/02/21 02:25:25 Modified files: net/honeyd : Makefile net/honeyd/pkg : PLIST Added files: net/honeyd/patches: patch-personality_c patch-personality_h patch-stats_h patch-tagging_h Log message: net/honeyd: fix -fno-common build failure Simplified version of bket's port of FreeBSD's fix. ok bket
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sema...@cvs.openbsd.org 2021/02/21 02:19:08 Modified files: devel/cargo: cargo.port.mk net/dog: Makefile net/dog/pkg: PLIST net/routinator : Makefile net/routinator/pkg: PLIST security/rbw : Makefile security/rbw/pkg: PLIST www/castor : Makefile www/castor/pkg : PLIST x11/gnome/tour : Makefile x11/gnome/tour/pkg: PLIST x11/xcolor : Makefile Log message: devel/cargo: remove .crates2.json file after installing with cargo we are managing installed files with different mecanism. it is the v2 for tracking crates installation, and we already remove v1 (.crates.toml). take care of cleaning ports which are already seen it problem spotted by landry@ ok landry@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2021/02/21 02:14:05 Modified files: databases/sqlports: Makefile databases/sqlports/files/man: sqlports.5 Log message: document DEBUG_* tables and views
Re: FIX net/honeyd -fno-common build error
On Sat, Feb 20, 2021 at 06:52:15PM +0100, Bjorn Ketelaars wrote:
> Fix taken from FreeBSD.
This pattern typedef enum + extern doesn't make all that much sense to
me, as the externed variables don't actually exist.
How about this? Seems simpler and should be functionally equivalent.
Index: Makefile
===
RCS file: /cvs/ports/net/honeyd/Makefile,v
retrieving revision 1.43
diff -u -p -r1.43 Makefile
--- Makefile12 Jul 2019 20:48:27 - 1.43
+++ Makefile20 Feb 2021 20:38:02 -
@@ -2,7 +2,7 @@
COMMENT= utility to create virtual hosts on a network
DISTNAME= honeyd-1.5c
-REVISION= 12
+REVISION= 13
CATEGORIES=net
MASTER_SITES= http://www.citi.umich.edu/u/provos/honeyd/ \
http://niels.xtdnet.nl/honeyd/
Index: patches/patch-personality_c
===
RCS file: patches/patch-personality_c
diff -N patches/patch-personality_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-personality_c 21 Feb 2021 09:09:54 -
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Fix -fno-common build error.
+
+Index: personality.c
+--- personality.c.orig
personality.c
+@@ -65,6 +65,9 @@
+ #include "template.h"
+ #include "debug.h"
+
++struct perstree personalities;
++struct xp_fprint_tree xp_fprints;
++
+ /* ET - Moved SPLAY_HEAD to personality.h so xprobe_assoc.c could use it. */
+ int npersons;
+
Index: patches/patch-personality_h
===
RCS file: patches/patch-personality_h
diff -N patches/patch-personality_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-personality_h 21 Feb 2021 09:10:03 -
@@ -0,0 +1,27 @@
+$OpenBSD$
+
+Fix -fno-common build error.
+
+Index: personality.h
+--- personality.h.orig
personality.h
+@@ -179,7 +179,8 @@ void xprobe_personality_init(void);
+ void print_perstree(void);
+
+ /* Splay stuff here so other modules can use it */
+-SPLAY_HEAD(perstree, personality) personalities;
++SPLAY_HEAD(perstree, personality);
++extern struct perstree personalities;
+ static int
+ perscompare(struct personality *a, struct personality *b)
+ {
+@@ -187,7 +188,8 @@ perscompare(struct personality *a, struct personality
+ }
+ SPLAY_PROTOTYPE(perstree, personality, node, perscompare);
+
+-SPLAY_HEAD(xp_fprint_tree, xp_fingerprint) xp_fprints;
++SPLAY_HEAD(xp_fprint_tree, xp_fingerprint);
++extern struct xp_fprint_tree xp_fprints;
+ static int
+ xp_fprint_compare(struct xp_fingerprint *a, struct xp_fingerprint *b)
+ {
Index: patches/patch-stats_h
===
RCS file: patches/patch-stats_h
diff -N patches/patch-stats_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-stats_h 21 Feb 2021 09:10:10 -
@@ -0,0 +1,25 @@
+$OpenBSD$
+
+Fix -fno-common build error.
+
+Index: stats.h
+--- stats.h.orig
stats.h
+@@ -91,7 +91,7 @@ struct stats {
+
+ enum {
+ M_COUNTER, M_TV_START, M_TV_END, M_RECORD, M_MAX
+-} measurement_tags;
++};
+
+ struct measurement {
+ uint32_t counter;
+@@ -105,7 +105,7 @@ struct measurement {
+
+ enum {
+ SIG_NAME, SIG_DIGEST, SIG_DATA, SIG_COMPRESSED_DATA, SIG_MAX
+-} signature_tags;
++};
+
+ struct signature {
+ char *name;
Index: patches/patch-tagging_h
===
RCS file: patches/patch-tagging_h
diff -N patches/patch-tagging_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-tagging_h 21 Feb 2021 09:10:15 -
@@ -0,0 +1,25 @@
+$OpenBSD$
+
+Fix -fno-common build error.
+
+Index: tagging.h
+--- tagging.h.orig
tagging.h
+@@ -48,7 +48,7 @@ enum {
+ REC_TV_START, REC_TV_END, REC_SRC, REC_DST, REC_SRC_PORT, REC_DST_PORT,
+ REC_PROTO, REC_STATE, REC_OS_FP, REC_HASH, REC_BYTES, REC_FLAGS,
+ REC_MAX_TAGS
+-} record_tags;
++};
+
+ #define RECORD_STATE_NEW 0x01
+
+@@ -71,7 +71,7 @@ struct record {
+
+ enum {
+ ADDR_TYPE, ADDR_BITS, ADDR_ADDR, ADDR_MAX_TAGS
+-} address_tags;
++};
+
+ void record_marshal(struct evbuffer *, struct record *);
+
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/honeyd/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST
--- pkg/PLIST 21 Apr 2010 23:42:18 - 1.9
+++ pkg/PLIST 20 Feb 2021 20:38:02 -
@@ -11,7 +11,7 @@ include/honeyd/hooks.h
include/honeyd/plugins.h
include/honeyd/plugins_config.h
lib/honeyd/
-lib/honeyd/libhoneyd.so
+@so lib/honeyd/libhoneyd.so
@man man/man1/honeydctl.1
@man man/man8/honeyd.8
share/honeyd/
[-fno-common] remove x11/wmii or patch it ?
Hi,
wmii doesnt build with -fno-common
suckless.org has decomissionned wmii in 2012 (its main author and
maintainer died in 2010)
https://git.suckless.org/sites/commit/b3f0a378e7d2dab6213be07e8f2b21fb637d6776.html
I'd suggest to delete it.
Alternatively the patches below fix the build (only very ligtly tested
that it still starts)
Index: Makefile
===
RCS file: /cvs/OpenBSD/ports/x11/wmii/Makefile,v
retrieving revision 1.23
diff -u -p -u -r1.23 Makefile
--- Makefile12 Jul 2019 20:51:24 - 1.23
+++ Makefile21 Feb 2021 08:56:50 -
@@ -3,7 +3,7 @@
COMMENT= dynamic window manager
DISTNAME= wmii-3.6
-REVISION= 6
+REVISION= 7
CATEGORIES=x11
HOMEPAGE= http://wmii.suckless.org/
Index: patches/patch-cmd_util_c
===
RCS file: patches/patch-cmd_util_c
diff -N patches/patch-cmd_util_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-cmd_util_c21 Feb 2021 08:56:50 -
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+fix for -fno-common
+
+Index: cmd/util.c
+--- cmd/util.c.orig
cmd/util.c
+@@ -9,6 +9,10 @@
+ #include
+ #include
+
++char *argv0;
++void *__p;
++int __i;
++
+ typedef struct VFmt VFmt;
+ struct VFmt {
+ const char *fmt;
Index: patches/patch-cmd_wmii_dat_h
===
RCS file: patches/patch-cmd_wmii_dat_h
diff -N patches/patch-cmd_wmii_dat_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-cmd_wmii_dat_h21 Feb 2021 08:56:50 -
@@ -0,0 +1,94 @@
+$OpenBSD$
+
+fix for -fno-common
+
+Index: cmd/wmii/dat.h
+--- cmd/wmii/dat.h.orig
cmd/wmii/dat.h
+@@ -194,7 +194,7 @@ struct Ruleset {
+ };
+
+ /* global variables */
+-struct {
++struct Def {
+ CTuple focuscolor;
+ CTuple normcolor;
+ Font *font;
+@@ -207,8 +207,10 @@ struct {
+ char grabmod[5];
+ ulong mod;
+ int colmode;
+-} def;
++};
+
++extern struct Def def;
++
+ enum {
+ BarLeft, BarRight
+ };
+@@ -223,40 +225,42 @@ struct WMScreen {
+
+ Rectangle r;
+ Rectangle brect;
+-} *screens, *screen;
++};
+
+-Client *client;
+-View *view;
+-Key *key;
+-Divide *divs;
+-Client c_magic;
+-Client c_root;
++extern struct WMScreen *screens, *screen;
+
+-Handlers framehandler;
++extern Client *client;
++extern View *view;
++extern Key *key;
++extern Divide *divs;
++extern Client c_magic;
++extern Client c_root;
+
+-char buffer[8092];
++extern Handlers framehandler;
+
++extern char buffer[8192];
++
+ /* IXP */
+-IxpServer srv;
+-Ixp9Srv p9srv;
++extern IxpServer srv;
++extern Ixp9Srv p9srv;
+
+ /* X11 */
+-uint num_screens;
+-uint valid_mask;
+-uint num_lock_mask;
+-Bool sel_screen;
++extern uint num_screens;
++extern uint valid_mask;
++extern uint num_lock_mask;
++extern Bool sel_screen;
+
+-Image xor;
++extern Image xor;
+
+-Cursor cursor[CurLast];
+-void (*handler[LASTEvent]) (XEvent *);
++extern Cursor cursor[CurLast];
++extern void (*handler[LASTEvent]) (XEvent *);
+
+ /* Misc */
+-Image *broken;
+-Bool starting;
+-Bool verbose;
+-char *user;
+-char *execstr;
++extern Image *broken;
++extern Bool starting;
++extern Bool verbose;
++extern char *user;
++extern char *execstr;
+
+ #define Debug if(verbose)
+ #define Dprint(...) do{ Debug fprint(2, __VA_ARGS__); }while(0)
Index: patches/patch-cmd_wmii_main_c
===
RCS file: patches/patch-cmd_wmii_main_c
diff -N patches/patch-cmd_wmii_main_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-cmd_wmii_main_c 21 Feb 2021 08:56:50 -
@@ -0,0 +1,44 @@
+$OpenBSD$
+
+fix for -fno-common
+
+Index: cmd/wmii/main.c
+--- cmd/wmii/main.c.orig
cmd/wmii/main.c
+@@ -17,6 +17,36 @@
+ #include
+ #include "fns.h"
+
++
++struct Def def;
++
++struct WMScreen *screens, *screen;
++
++Client *client;
++View *view;
++Key *key;
++Divide *divs;
++Client c_magic;
++Client c_root;
++
++char buffer[8192];
++
++IxpServer srv;
++
++uint num_screens;
++uint valid_mask;
++uint num_lock_mask;
++Bool sel_screen;
++
++Image xor;
++
++Cursor cursor[CurLast];
++
++Bool starting;
++Bool verbose;
++char *user;
++char *execstr;
++
+ static const char
+ version[] = "wmii-"VERSION", ©2007 Kris Maglione\n";
+
Index: patches/patch-cmd_wmii_x11_c
===
RCS file: patches/patch-cmd_wmii_x11_c
diff -N patches/patch-cmd_wmii_x11_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-cmd_wmii_x11_c21 Feb 2021 08:56:50 -
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+fix for -f no-common
+
+Index: cmd/wmii/x11.c
+--- cmd/wmii/x11.c.orig
cmd/wmii/x11.c
+@@ -11,6 +11,9 @@
+ #include
+ #include "fns.h"
+
++Display *display;
++Screen scr;
++
+ Point ZP = {0, 0};
+ Rectangle ZR = {{0, 0}, {0, 0}};
+
Index: patches/patch-cmd_wmii_x11_h
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/02/21 01:56:25 Modified files: devel/luacheck : Makefile devel/luacheck/pkg: PLIST Log message: Update PLIST after the move to py3-sphinx.
Re: CVS: cvs.openbsd.org: ports
On Sun, Feb 21, 2021 at 01:42:50AM -0700, Antoine Jacoutot wrote: > CVSROOT: /cvs > Module name: ports > Changes by: ajacou...@cvs.openbsd.org 2021/02/21 01:42:50 > > Modified files: > textproc/py-sphinx: Makefile > textproc/py-sphinx/pkg: PLIST > > Log message: > Add missing dependency on gmake and py-imagesize. Should read py-packaging. -- Antoine
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/02/21 01:42:50 Modified files: textproc/py-sphinx: Makefile textproc/py-sphinx/pkg: PLIST Log message: Add missing dependency on gmake and py-imagesize. Regen PLIST.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2021/02/21 01:09:19 Modified files: geo/py-owslib : Makefile distinfo Log message: geo/py-owslib: update to 0.23.0.
