Re: UPDATE: devel/cmake
On Mon Feb 03, 2020 at 06:56:17AM +0100, Rafael Sadowski wrote:
> Simple bugfix update. Change log:
>
> https://blog.kitware.com/cmake-3-16-3-available-for-download/
>
> I see nothing with impact for us.
>
Next bug-fix update:
https://blog.kitware.com/cmake-3-16-4-available-for-download/
Index: Makefile
===
RCS file: /cvs/ports/devel/cmake/Makefile,v
retrieving revision 1.179
diff -u -p -u -p -r1.179 Makefile
--- Makefile11 Jan 2020 08:01:09 - 1.179
+++ Makefile12 Feb 2020 07:15:02 -
@@ -4,7 +4,7 @@ DPB_PROPERTIES =parallel
COMMENT = portable build system
-VER = 3.16.2
+VER = 3.16.4
EPOCH =0
DISTNAME = cmake-${VER}
CATEGORIES = devel
Index: distinfo
===
RCS file: /cvs/ports/devel/cmake/distinfo,v
retrieving revision 1.56
diff -u -p -u -p -r1.56 distinfo
--- distinfo11 Jan 2020 08:01:09 - 1.56
+++ distinfo12 Feb 2020 07:15:02 -
@@ -1,2 +1,2 @@
-SHA256 (cmake-3.16.2.tar.gz) = jAl4bsYMor41TCmCkHLDgRPekYTymSjrnahEal8s5qk=
-SIZE (cmake-3.16.2.tar.gz) = 9109837
+SHA256 (cmake-3.16.4.tar.gz) = m8yMEU2dpgOvlRIIPtfUo5kR0WEFRmvroWW6j+k5rCw=
+SIZE (cmake-3.16.4.tar.gz) = 9113021
Index: patches/patch-Modules_FindPythonLibs_cmake
===
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindPythonLibs_cmake,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 patch-Modules_FindPythonLibs_cmake
--- patches/patch-Modules_FindPythonLibs_cmake 11 Jan 2020 08:01:09 -
1.19
+++ patches/patch-Modules_FindPythonLibs_cmake 12 Feb 2020 07:15:02 -
@@ -11,7 +11,7 @@ Index: Modules/FindPythonLibs.cmake
+
set(_PYTHON1_VERSIONS 1.6 1.5)
set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
- set(_PYTHON3_VERSIONS 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
+ set(_PYTHON3_VERSIONS 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
@@ -111,11 +114,15 @@ endif()
# If FindPythonInterp has already found the major and minor version,
# insert that version between the user supplied versions and the stock
Re: UPDATE www/jupyter-notebook-6.0.3
On Tue 11/02/2020 16:21, Kurt Mosiejczuk wrote: > On Fri, Feb 07, 2020 at 09:36:30PM +0100, Björn Ketelaars wrote: > > Diff below updates jupyter-notebook to 6.0.3. Changelog can be found at > > https://jupyter-notebook.readthedocs.io/en/stable/changelog.html. > > Noticeable change is that upstream dropped support for python 2. > > > Changes to the port: > > - Drop FLAVOR and set MODPY_VERSION > > - Update dependencies > > - Drop post-install bits as it is no longer necessary to add a suffix to > > jupyter-notebook and its tools > > - Set @conflict- and @pkgpath-marker in PLIST > > > Testing: > > - 'make test' runs successfully > > - Run tested on amd64 in an existing jupyter-notebook environment > > > Comments/OK? > > Patch looks good to me. Will folks notice the python2 version going > away? I suppose they might since the files going into bin/ are losing > their -3 suffix. > > If we don't think that will cause any problems, ok kmos Upgrading jupyter-notebook to this newer version is transparent, which could cause two problems: - Users of the python2 flavor will be presented with a python3 environment, which could cause their workbooks to 'fail'; - Users of the python3 flavor python will wonder why 'jupyter-notebook-3' isn't working any more, and will notice that 'jupyter-notebook' does work. Although I no not think the latter is bad, we could help users by informing them about this update. My proposal would be to add something to current.html. The first problem is kind of a bad one as some notebooks will need to be converted to pyhton3 code. Users will have to invest time and effort to update their code. Least thing I should do is inform them of this. Also here I propose to inform users via current.html. Is this update important enough to possibly break people's work? Probably not. Reason for wanting to move forward is that it does not make sense to maintain ports of tools that are not fully supported by their upstream. In the case of jupyter-notebook support for python2 has been dropped. Not moving past this small hurdle will, sooner or later, cause an issue somewhere (else). My proposal is to do it now. Additional comments/OK's to commit this update? Opinions on the above?
Re: WIP: Tor Browser 9.0.4
On Tue, Feb 11, 2020 at 10:12:20PM +0100, Caspar Schutijser wrote: > On Tue, Feb 11, 2020 at 03:23:03PM +0100, Landry Breuil wrote: > > On Sat, Jan 11, 2020 at 03:43:06PM +0100, Caspar Schutijser wrote: > > > On Fri, Jan 10, 2020 at 10:31:15AM +, Stuart Henderson wrote: > > > > On 2019/12/28 09:07, Caspar Schutijser wrote: > > > > That seems built on top of a release candidate tarball > > (src-firefox-tor-browser-68.4.1esr-9.0-1-build1) is it expected ? > > To the best of my knowledge, it is not a release candidate tarball. > It is the only file in that directory of their mirror > (https://dist.torproject.org/torbrowser/9.0.4/) which contains source > code for the Tor Browser, I think. But I may be wrong. What makes you > think the tarball contains a release candidate? The structure of the > name of the distfile is definitely a little unusual. That's a good question, I will try to ask upstream see how to identify release candidate, but as per the release note, Tb-browser 9.0.4 was to update Firefox to 68.4.1esr. > > Would > > be good to get that commited so that this port is not left rotting > > in-tree, can anyone give it a testbuild with rust 1.41 that just got > > updated ? > > I can probably do this during the weekend but if someone beats me to it > that's fine of course. gdb-7.12.1p9 rust-1.41.0 tb-browser-9.0.4 tb-noscript-11.0.11 tb-https-everywhere-2019.11.7 build/package/install OK on amd64 with rust-1.41.0 Just ran it a bit this morning and it's working as expected. Well, seems like 9.0.5 is in the pipe [1] Tor Browser 9.0.5 -- February 11 2020 * All Platforms * Update Firefox to 68.5.0esr * Bump NoScript to 11.0.13 * Bug 32053: Fix LLVM reproducibility issues * Bug 32255: Missing ORIGIN header breaks CORS * Bug 32891: Add new default bridges [1] https://gitweb.torproject.org/builders/tor-browser-build.git/plain/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt?h=maint-9.0 Hope this help. Cheers, -- clematis (0x7e96fd2400fe7b59)
Re: postgresql readme
> Sent: Tuesday, February 11, 2020 at 9:02 PM
> From: "Stuart Henderson"
> To: ports , "Pierre-Emmanuel André"
> Subject: postgresql readme
>
> It's always annoying to look through postgresql.conf to figure out which
> things you've changed and which are default settings.
>
> Fortunately with postgresql-previous we have a default postgresql.conf
> that's likely to be close to the one in the old version, so we can diff it
> to give a better picture. It's not perfect because it may have changed
> slightly in a minor release, and initdb makes some locale-related
> changes when it copies the file to /var/postgresql/data, but it beats
> going through 700+ lines by eye.
>
> OK to add that to the pkg-readme?
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/databases/postgresql/Makefile,v
> retrieving revision 1.259
> diff -u -p -r1.259 Makefile
> --- Makefile 9 Feb 2020 09:38:45 - 1.259
> +++ Makefile 11 Feb 2020 20:57:45 -
> @@ -16,7 +16,7 @@ PKGNAME-docs= postgresql-docs-${VERSION}
> PKGNAME-contrib=postgresql-contrib-${VERSION}
> PKGNAME-plpython=postgresql-plpython-${VERSION}
> PKGNAME-pg_upgrade=postgresql-pg_upgrade-${VERSION}
> -REVISION-server=0
> +REVISION-server= 1
Namaste Stuart,
Thank you for the patch.
Would it be preferable to remove the extra space after the equal sign in
the REVISION-server line above?
>
> CATEGORIES= databases
> SHARED_LIBS= ecpg7.10 \
> Index: pkg/README-server
> ===
> RCS file: /cvs/ports/databases/postgresql/pkg/README-server,v
> retrieving revision 1.28
> diff -u -p -r1.28 README-server
> --- pkg/README-server 9 Feb 2020 09:38:45 - 1.28
> +++ pkg/README-server 11 Feb 2020 20:57:45 -
> @@ -131,7 +131,12 @@ to the current version.
> "cp /var/postgresql/data-${PREV_MAJOR}/server.{crt,key}
> /var/postgresql/data/"
>
> Some postgresql.conf settings changed or disappeared in this version.
> -Examine your old file for local changes and apply them to the new version.
> +Examine your old file for local changes and apply them to the new version
> +(/var/postgresql/data/postgresql.conf). The following command may help
> +identify them:
> +
> +# diff -wu
> ${LOCALBASE}/share/postgresql-${PREV_MAJOR}/postgresql.conf.sample \
> +/var/postgresql/data-${PREV_MAJOR}/postgresql.conf
>
> 7) Start PostgreSQL:
> # rcctl start postgresql
Dhanyavaad,
ab
-|-|-|-|-|-|-|--
Re: new: devel/git-crypt
On Tue, Feb 11 2020, Paco Esteban wrote: > On Sat, 25 Jan 2020, Paco Esteban wrote: > >> Hi ports@, >> >> Here's a new port for git-crypt, which is a tool for transparently >> encrypt files on git repositories (so one can have sensitive information >> on remote repositories). You can find more info here: >> >> https://www.agwa.name/projects/git-crypt/ >> >> I decided not to include gnupg as a dependency. The software can use >> pgp keys (for asymetric) or openssl (for symetric) encryption. The >> build clearly depends on openssl (it seems to work fine with libressl as >> far as I can see), but for pgp it calls the gpg binary, so it does not >> depend on it for building. Please correct me if this is wrong. This makes sense. Note that security/gnupg provides a gpg executable, security/gnupg2 does not. Let's hope that git-crypt doesn't require a more recent gpg version. >> Another thing is that the man page generation leaves the resulting >> man page file on WRKSRC/git-crypt.1 but it should leave it on >> WRKSRC/man/man1/git-crypt.1 and I do not know why (when doing things >> manually outside of the ports infrastructure it works as expected), >> that's why I added the pre-fake hack. If anyone knows a better way to >> deal with this, please tell me. Ah ha. No idea what's happening. > ping ? > > (port attached for convenience) New tarball attached: - merge V and DISTNAME - zap CONFIGURE_STYLE - move WANTLIB above MASTER_SITES (Makefile.template order) - use ports-gcc on gcc archs like other C++ ports (here a C++11 compiler is required) Looks good. git-crypt.tgz Description: Binary data -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: postgresql readme
On Tue, Feb 11, 2020 at 1:03 PM Stuart Henderson
wrote:
> It's always annoying to look through postgresql.conf to figure out which
> things you've changed and which are default settings.
>
> Fortunately with postgresql-previous we have a default postgresql.conf
> that's likely to be close to the one in the old version, so we can diff it
> to give a better picture. It's not perfect because it may have changed
> slightly in a minor release, and initdb makes some locale-related
> changes when it copies the file to /var/postgresql/data, but it beats
> going through 700+ lines by eye.
>
> OK to add that to the pkg-readme?
>
OK jeremy@
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/databases/postgresql/Makefile,v
> retrieving revision 1.259
> diff -u -p -r1.259 Makefile
> --- Makefile9 Feb 2020 09:38:45 - 1.259
> +++ Makefile11 Feb 2020 20:57:45 -
> @@ -16,7 +16,7 @@ PKGNAME-docs= postgresql-docs-${VERSION}
> PKGNAME-contrib=postgresql-contrib-${VERSION}
> PKGNAME-plpython=postgresql-plpython-${VERSION}
> PKGNAME-pg_upgrade=postgresql-pg_upgrade-${VERSION}
> -REVISION-server=0
> +REVISION-server= 1
>
> CATEGORIES=databases
> SHARED_LIBS= ecpg7.10 \
> Index: pkg/README-server
> ===
> RCS file: /cvs/ports/databases/postgresql/pkg/README-server,v
> retrieving revision 1.28
> diff -u -p -r1.28 README-server
> --- pkg/README-server 9 Feb 2020 09:38:45 - 1.28
> +++ pkg/README-server 11 Feb 2020 20:57:45 -
> @@ -131,7 +131,12 @@ to the current version.
> "cp /var/postgresql/data-${PREV_MAJOR}/server.{crt,key}
> /var/postgresql/data/"
>
> Some postgresql.conf settings changed or disappeared in this version.
> -Examine your old file for local changes and apply them to the new version.
> +Examine your old file for local changes and apply them to the new version
> +(/var/postgresql/data/postgresql.conf). The following command may help
> +identify them:
> +
> +# diff -wu
> ${LOCALBASE}/share/postgresql-${PREV_MAJOR}/postgresql.conf.sample \
> +/var/postgresql/data-${PREV_MAJOR}/postgresql.conf
>
> 7) Start PostgreSQL:
> # rcctl start postgresql
>
>
Re: NEW: devel/py-minidump
On Tue, Feb 11, 2020 at 10:41:29PM +0100, Klemens Nanni wrote: > New RDEP for devel/angr/py-cle, Python 3 only > Information for inst:py3-minidump-0.0.12 > Comment: > library to parse Windows minidump file format > Description: > Python library to parse Windows minidump file format > Maintainer: The OpenBSD ports mailing-list > WWW: https://github.com/skelsec/minidump > This makes cle and therefore angr happy. OK? ok kmos --Kurt
enhance README for games/gemrb
Hi, honestly I never remember how to use gemrb and I never have any internet connection when I want to play with it... I propose to explain how to start a game with it, but I'm not sure my wording is really good. Index: Makefile === RCS file: /data/cvs/ports/games/gemrb/Makefile,v retrieving revision 1.15 diff -u -p -r1.15 Makefile --- Makefile13 Dec 2019 08:24:26 - 1.15 +++ Makefile11 Feb 2020 22:09:07 - @@ -5,6 +5,7 @@ SHARED_LIBS += gemrb_core 0.0 COMMENT = open-source implementation of Bioware's Infinity Engine DISTNAME = gemrb-0.8.6 +REVISION = 0 CATEGORIES = games emulators x11 Index: pkg/README === RCS file: /data/cvs/ports/games/gemrb/pkg/README,v retrieving revision 1.1 diff -u -p -r1.1 README --- pkg/README 31 Jul 2019 07:55:32 - 1.1 +++ pkg/README 11 Feb 2020 22:08:47 - @@ -16,3 +16,14 @@ Extracting innoextract from packages can be used to extract the GOG.com version. $ innoextract -g -m setup_baldurs_gate_2.0.0.20.exe + +Configuration += + +1. Copy the file GemRB.cfg.sample from this package and name it + like bg2.cfg under a repertory of your choice + +2. Modify bg2.cfg to change the paths to the folder having the file + CHITIN.KEY in the variables: GamePath, CD1, CD2, CD3, CD4 and CD5 + +3. Start with gemrb -c bg2.cfg
NEW: devel/py-minidump
New RDEP for devel/angr/py-cle, Python 3 only Information for inst:py3-minidump-0.0.12 Comment: library to parse Windows minidump file format Description: Python library to parse Windows minidump file format Maintainer: The OpenBSD ports mailing-list WWW: https://github.com/skelsec/minidump This makes cle and therefore angr happy. OK? py-minidump.tgz Description: Binary data
angr, angrop: update to 8.20.1.7
Lots of fixes and new backends such as windows' minidump as well, but
there's no changelog I can point to.
devel/angr/py-cle now requires devel/py-minidump for which I'll send a
new submission now.
Keeps working for me on amd64 in light usage.
OK?
Index: security/angrop/Makefile
===
RCS file: /cvs/ports/security/angrop/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- security/angrop/Makefile10 Nov 2019 09:29:32 - 1.4
+++ security/angrop/Makefile9 Feb 2020 18:12:37 -
@@ -19,7 +19,7 @@ PERMIT_PACKAGE = Yes
MODULES = lang/python
MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
-MODPY_EGG_VERSION =8.19.10.30
+MODPY_EGG_VERSION =8.20.1.7
MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
Index: security/angrop/distinfo
===
RCS file: /cvs/ports/security/angrop/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- security/angrop/distinfo10 Nov 2019 09:29:32 - 1.3
+++ security/angrop/distinfo9 Feb 2020 18:12:52 -
@@ -1,2 +1,2 @@
-SHA256 (angrop-8.19.10.30.tar.gz) =
/Bjhoh3KlpHh0C3NuLizmrtG16e7K9drZXGkivBTBCM=
-SIZE (angrop-8.19.10.30.tar.gz) = 27016
+SHA256 (angrop-8.20.1.7.tar.gz) = 1SprGe1KEkDxklzb+sPnPXH439km3ia862/EPgl362I=
+SIZE (angrop-8.20.1.7.tar.gz) = 27057
Index: devel/angr/Makefile.inc
===
RCS file: /cvs/ports/devel/angr/Makefile.inc,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile.inc
--- devel/angr/Makefile.inc 10 Nov 2019 10:01:56 - 1.5
+++ devel/angr/Makefile.inc 9 Feb 2020 18:08:34 -
@@ -21,7 +21,7 @@ MODPY_PI ?= Yes
MODPY_SETUPTOOLS ?=Yes
MODPY_VERSION ?= ${MODPY_DEFAULT_VERSION_3}
-MODPY_EGG_VERSION ?= 8.19.10.30
+MODPY_EGG_VERSION ?= 8.20.1.7
DISTNAME ?=${ANGR_PYTHON_MODULE}-${MODPY_EGG_VERSION}
PKGNAME = ${MODPY_PY_PREFIX}${DISTNAME}
.endif
Index: devel/angr/py-ailment/distinfo
===
RCS file: /cvs/ports/devel/angr/py-ailment/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- devel/angr/py-ailment/distinfo 10 Nov 2019 09:29:32 - 1.3
+++ devel/angr/py-ailment/distinfo 9 Feb 2020 18:08:43 -
@@ -1,2 +1,2 @@
-SHA256 (ailment-8.19.10.30.tar.gz) =
Vxxx4TdNDViLAI3xuAqGLYSpf81b3XQsu+H7EADIRZ0=
-SIZE (ailment-8.19.10.30.tar.gz) = 10574
+SHA256 (ailment-8.20.1.7.tar.gz) = H8EQcF+d0c/spmh2+9h/vs6gBaHTVVRJLEUFKi1aplI=
+SIZE (ailment-8.20.1.7.tar.gz) = 10548
Index: devel/angr/py-angr/Makefile
===
RCS file: /cvs/ports/devel/angr/py-angr/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- devel/angr/py-angr/Makefile 11 Feb 2020 13:13:58 - 1.6
+++ devel/angr/py-angr/Makefile 11 Feb 2020 20:52:43 -
@@ -3,7 +3,6 @@
COMMENT = multi-architecture binary analysis toolkit
ANGR_PYTHON_MODULE = angr
-REVISION = 1
HOMEPAGE = https://angr.io/
Index: devel/angr/py-angr/distinfo
===
RCS file: /cvs/ports/devel/angr/py-angr/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- devel/angr/py-angr/distinfo 10 Nov 2019 09:29:32 - 1.3
+++ devel/angr/py-angr/distinfo 9 Feb 2020 18:08:44 -
@@ -1,2 +1,2 @@
-SHA256 (angr-8.19.10.30.tar.gz) = KP//UAHNoiQJlQVXGmuQopXRgrhEEerDqOmrmbxTvSU=
-SIZE (angr-8.19.10.30.tar.gz) = 885334
+SHA256 (angr-8.20.1.7.tar.gz) = 9sZ4BiQLXuXjCex1Ze91YQevsR9i1UJOR04LDMBjfOo=
+SIZE (angr-8.20.1.7.tar.gz) = 894100
Index: devel/angr/py-angr/pkg/PLIST
===
RCS file: /cvs/ports/devel/angr/py-angr/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- devel/angr/py-angr/pkg/PLIST10 Nov 2019 09:29:32 - 1.3
+++ devel/angr/py-angr/pkg/PLIST9 Feb 2020 18:42:32 -
@@ -136,9 +136,17 @@ lib/python${MODPY_VERSION}/site-packages
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/angr/analyses/decompiler/optimization_passes/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/angr/analyses/decompiler/optimization_passes/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/angr/analyses/decompiler/optimization_passes/${MODPY_PYCACHE}base_ptr_save_simplifier.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/angr/analyses/decompiler/optimization_passes/${MODPY_PYCACHE}div_simplifier.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/angr/analyses/decompiler/optimization_passes/${MODPY_PYCACHE}engine_base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/angr/analyses/decompiler/optimization_passes/${MODPY_PYCACHE}mod_simplifier.${MODPY_P
Re: UPDATE www/jupyter-notebook-6.0.3
On Fri, Feb 07, 2020 at 09:36:30PM +0100, Björn Ketelaars wrote:
> Diff below updates jupyter-notebook to 6.0.3. Changelog can be found at
> https://jupyter-notebook.readthedocs.io/en/stable/changelog.html.
> Noticeable change is that upstream dropped support for python 2.
> Changes to the port:
> - Drop FLAVOR and set MODPY_VERSION
> - Update dependencies
> - Drop post-install bits as it is no longer necessary to add a suffix to
> jupyter-notebook and its tools
> - Set @conflict- and @pkgpath-marker in PLIST
> Testing:
> - 'make test' runs successfully
> - Run tested on amd64 in an existing jupyter-notebook environment
> Comments/OK?
Patch looks good to me. Will folks notice the python2 version going
away? I suppose they might since the files going into bin/ are losing
their -3 suffix.
If we don't think that will cause any problems, ok kmos
--Kurt
> diff --git Makefile Makefile
> index ad0314ebf9e..80b5d16b0c7 100644
> --- Makefile
> +++ Makefile
> @@ -2,10 +2,9 @@
>
> COMMENT =web-based notebook for interactive computing
>
> -MODPY_EGG_VERSION = 5.7.8
> +MODPY_EGG_VERSION = 6.0.3
> DISTNAME = notebook-${MODPY_EGG_VERSION}
> PKGNAME =jupyter-notebook-${MODPY_EGG_VERSION}
> -REVISION = 0
>
> CATEGORIES = www devel
>
> @@ -18,14 +17,12 @@ MODULES = lang/python
>
> MODPY_PI = Yes
> MODPY_SETUPTOOLS = Yes
> -
> -FLAVORS =python3
> -FLAVOR ?=
> +MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
>
> RUN_DEPENDS =devel/py-ipykernel${MODPY_FLAVOR} \
> devel/py-ipython_genutils${MODPY_FLAVOR} \
> - devel/py-jupyter_client${MODPY_FLAVOR}>=5.2.0 \
> - devel/py-jupyter_core${MODPY_FLAVOR}>=4.4.0 \
> + devel/py-jupyter_client${MODPY_FLAVOR}>=5.3.4 \
> + devel/py-jupyter_core${MODPY_FLAVOR}>=4.6.1 \
> devel/py-nbconvert${MODPY_FLAVOR} \
> devel/py-nbformat${MODPY_FLAVOR} \
> devel/py-send2trash${MODPY_FLAVOR} \
> @@ -34,7 +31,7 @@ RUN_DEPENDS =
> devel/py-ipykernel${MODPY_FLAVOR} \
> sysutils/py-prometheus_client${MODPY_FLAVOR} \
> www/py-jinja2${MODPY_FLAVOR} \
> www/py-terminado${MODPY_FLAVOR}>=0.8.1 \
> - www/py-tornado${MODPY_FLAVOR}>=4.1,<7
> + www/py-tornado${MODPY_FLAVOR}>=5.0
>
> TEST_DEPENDS = devel/py-coverage${MODPY_FLAVOR} \
> devel/py-nose${MODPY_FLAVOR} \
> @@ -45,20 +42,6 @@ TEST_DEPENDS =
> devel/py-coverage${MODPY_FLAVOR} \
>
> # XXX once we have a port of pandoc, we can make docs.
>
> -.if !${FLAVOR:Mpython3}
> -RUN_DEPENDS += devel/py-futures \
> - net/py-ipaddress
> -TEST_DEPENDS += devel/py-mock
> -.else
> -PKGNAME =
> jupyter-notebook${MODPY_MAJOR_VERSION}-${MODPY_EGG_VERSION}
> -.endif
> -
> -post-install:
> - mv ${PREFIX}/bin/jupyter-bundlerextension{,${MODPY_BIN_SUFFIX}}
> - mv ${PREFIX}/bin/jupyter-nbextension{,${MODPY_BIN_SUFFIX}}
> - mv ${PREFIX}/bin/jupyter-notebook{,${MODPY_BIN_SUFFIX}}
> - mv ${PREFIX}/bin/jupyter-serverextension{,${MODPY_BIN_SUFFIX}}
> -
> # XXX exclude selenium tests as recommended, and exclude tests that use
> # send2trash as they error out with "Trashing on system internal mounts is
> not
> # supported".
> diff --git distinfo distinfo
> index bf6347fa525..995e6fb7c94 100644
> --- distinfo
> +++ distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (notebook-5.7.8.tar.gz) = Vz4K5lDF12sYtuVkum0hvzIdAIR94dIVtBistk8Fbrg=
> -SIZE (notebook-5.7.8.tar.gz) = 13371684
> +SHA256 (notebook-6.0.3.tar.gz) = R6kJKXXJ55Za2gC5og8M9jfQAdtg0kHUefU8C+EXrUg=
> +SIZE (notebook-6.0.3.tar.gz) = 14048151
> diff --git pkg/PLIST pkg/PLIST
> index 3cb8f27e809..21cb03ef3e0 100644
> --- pkg/PLIST
> +++ pkg/PLIST
> @@ -1,8 +1,10 @@
> @comment $OpenBSD: PLIST,v 1.6 2019/05/10 11:36:55 bket Exp $
> -bin/jupyter-bundlerextension${MODPY_BIN_SUFFIX}
> -bin/jupyter-nbextension${MODPY_BIN_SUFFIX}
> -bin/jupyter-notebook${MODPY_BIN_SUFFIX}
> -bin/jupyter-serverextension${MODPY_BIN_SUFFIX}
> +@conflict jupyter-notebook3-*
> +@pkgpath www/jupyter-notebook,python3
> +bin/jupyter-bundlerextension
> +bin/jupyter-nbextension
> +bin/jupyter-notebook
> +bin/jupyter-serverextension
> lib/python${MODPY_VERSION}/site-packages/notebook/
>
> lib/python${MODPY_VERSION}/site-packages/notebook-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
>
> lib/python${MODPY_VERSION}/site-packages/notebook-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
> @@ -24,7 +26,6 @@
> lib/python${MODPY_VERSION}/site-packages/notebook/${MODPY_PYCACHE}config_manager
>
> lib/python${MODPY_VERSION}/site-packages/notebook/${MODPY_PYCACHE}extensions.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MO
Re: postgresql readme
On Tue, Feb 11, 2020 at 09:02:48PM +, Stuart Henderson wrote: > It's always annoying to look through postgresql.conf to figure out which > things you've changed and which are default settings. > Fortunately with postgresql-previous we have a default postgresql.conf > that's likely to be close to the one in the old version, so we can diff it > to give a better picture. It's not perfect because it may have changed > slightly in a minor release, and initdb makes some locale-related > changes when it copies the file to /var/postgresql/data, but it beats > going through 700+ lines by eye. > OK to add that to the pkg-readme? Yes please. ok kmos --Kurt
Re: WIP: Tor Browser 9.0.4
On Tue, Feb 11, 2020 at 03:23:03PM +0100, Landry Breuil wrote: > On Sat, Jan 11, 2020 at 03:43:06PM +0100, Caspar Schutijser wrote: > > On Fri, Jan 10, 2020 at 10:31:15AM +, Stuart Henderson wrote: > > > On 2019/12/28 09:07, Caspar Schutijser wrote: > > > > During the configure stage, I got the following error: > > > > mozbuild.configure.options.InvalidOptionError: --disable-eme is not > > > > available in this configuration > > > > In interest of getting as far as I could I patched away that flag (for > > > > now; see patch-_mozconfig) but that is not a proper solution. I'm still > > > > looking for a solution (hints are appreciated, of course). > > > > > > > > I think it is necessary to first address the --disable-eme problem > > > > before we can even think about committing this. > > > > > > I'm no expert on firefox/tor browser, but it looks like this is for DRM > > > plugins which we won't have anyway. > > > > I think you are right. I put a comment in patch-_mozconfig and I left > > the --disable-eme line commented out, like in my previous diff. > > > > > > Did I use the @conflict and @pkgpath markers in PLIST correctly? I want > > > > to express the fact that tor-launcher conflicts with tb-browser because > > > > share/tor-browser/torrc-defaults used to be shipped with tor-launcher > > > > but it now shipped with tb-browser. > > > > > > > @@ -1,4 +1,6 @@ > > > > @comment $OpenBSD: PLIST,v 1.6 2018/09/28 14:54:26 sthen Exp $ > > > > +@conflict tor-launcher-* > > > > +@pkgpath www/tor-browser/tor-launcher > > > > > > Add > > > > > > @conflict torbutton-* > > > @pkgpath www/tor-browser/torbutton > > > > > > and drop the quirks change, it is not needed when you merge into another > > > package this way. > > > > Thank you, I incorporated your feedback in the diff below. > > > > Major changes besides that: > > * Update to Tor Browser 9.0.4. > > * Sync with www/firefox-esr: drop patches fixing build with rust 1.39. > > * Add a second site to MASTER_SITES. Upstream removes distfiles of old > > versions once they release a new version of their software. The second > > site in MASTER_SITES then acts as a fallback. > > That seems built on top of a release candidate tarball > (src-firefox-tor-browser-68.4.1esr-9.0-1-build1) is it expected ? To the best of my knowledge, it is not a release candidate tarball. It is the only file in that directory of their mirror (https://dist.torproject.org/torbrowser/9.0.4/) which contains source code for the Tor Browser, I think. But I may be wrong. What makes you think the tarball contains a release candidate? The structure of the name of the distfile is definitely a little unusual. > Would > be good to get that commited so that this port is not left rotting > in-tree, can anyone give it a testbuild with rust 1.41 that just got > updated ? I can probably do this during the weekend but if someone beats me to it that's fine of course. Thanks and best regards, Caspar Schutijser
Re: UPDATE devel/py-jupyter_client-5.3.4
On Fri, Feb 07, 2020 at 09:31:17PM +0100, Björn Ketelaars wrote:
> Enclosed diff brings py-jupyer_client to 5.3.4, which is needed for a
> pending update of jupyter-notebook. Changelog can be found at
> https://github.com/jupyter/jupyter_client/blob/5.3.4/docs/changelog.rst.
> Changes to the port:
> - Follow Makefile.template
> - Update dependencies
> Testing:
> - 'make test' fails TestKernelManager.test_signal_kernel_subprocesses
> for both python2 and python3. I do not understand why this test fails.
> On python3 all other tests are OK. Python2 fails one other tests
> because of 'too many open files'
> - Run tested on amd64 with jupyter-notebook from ports and an update
> hereof
> Comments/OK?
I'd like to see a comment somewhere in there that the tests need an
increase of openfiles for _pbuild in there somewhere. I had to increase
it to 768 for the tests to work properly. (I tried 256, then 512, then 768).
Otherwise, ok kmos@
--Kurt
> diff --git Makefile Makefile
> index 824719ebdc3..39baa98de92 100644
> --- Makefile
> +++ Makefile
> @@ -2,10 +2,9 @@
>
> COMMENT =Jupyter protocol implementation and client libraries
>
> -MODPY_EGG_VERSION = 5.2.4
> +MODPY_EGG_VERSION = 5.3.4
> DISTNAME = jupyter_client-${MODPY_EGG_VERSION}
> PKGNAME =py-${DISTNAME}
> -REVISION = 1
>
> CATEGORIES = devel
>
> @@ -20,24 +19,25 @@ MODPY_PI =Yes
> MODPY_SETUPTOOLS = Yes
> MODPY_PYTEST = Yes
> MODPY_PYTEST_ARGS = jupyter_client
> -PORTHOME = ${WRKDIR}
>
> -FLAVORS =python3
> -FLAVOR ?=
> -
> -RUN_DEPENDS =devel/py-dateutil${MODPY_FLAVOR} \
> - devel/py-jupyter_core${MODPY_FLAVOR}>=4.3.0 \
> +RUN_DEPENDS =devel/py-dateutil${MODPY_FLAVOR}>=2.1 \
> + devel/py-jupyter_core${MODPY_FLAVOR}>=4.6.0 \
> devel/py-traitlets${MODPY_FLAVOR} \
> - net/py-zmq${MODPY_FLAVOR} \
> - www/py-tornado${MODPY_FLAVOR}
> -TEST_DEPENDS = devel/ipython${MODPY_FLAVOR}>=5.1.0 \
> - devel/py-ipykernel${MODPY_FLAVOR}>=4.5.2 \
> + net/py-zmq${MODPY_FLAVOR}>=13 \
> + www/py-tornado${MODPY_FLAVOR}>=4.1
> +TEST_DEPENDS = devel/ipython${MODPY_FLAVOR} \
> + devel/py-ipykernel${MODPY_FLAVOR} \
> shells/bash
>
> +FLAVORS =python3
> +FLAVOR ?=
> +
> .if !${FLAVOR:Mpython3}
> TEST_DEPENDS += devel/py-mock
> .endif
>
> +PORTHOME = ${WRKDIR}
> +
> post-install:
> mv ${PREFIX}/bin/jupyter-kernel{,${MODPY_BIN_SUFFIX}}
> mv ${PREFIX}/bin/jupyter-kernelspec{,${MODPY_BIN_SUFFIX}}
> diff --git distinfo distinfo
> index 8763b398bf6..6d67b9dab73 100644
> --- distinfo
> +++ distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (jupyter_client-5.2.4.tar.gz) =
> tfnLBhBcHS0wcZ21/7PqZ9pgkZ+2jervpYPezNiBNVE=
> -SIZE (jupyter_client-5.2.4.tar.gz) = 273397
> +SHA256 (jupyter_client-5.3.4.tar.gz) =
> YOb67BAx1j31fxzGce1nPc7Q7UIPQ3fqM9s3scGIuRA=
> +SIZE (jupyter_client-5.3.4.tar.gz) = 275850
> diff --git patches/patch-jupyter_client_connect_py
> patches/patch-jupyter_client_connect_py
> index 3f522511b9f..84d90a98954 100644
> --- patches/patch-jupyter_client_connect_py
> +++ patches/patch-jupyter_client_connect_py
> @@ -9,10 +9,10 @@ Index: jupyter_client/connect.py
> import warnings
> +import sys
> from getpass import getpass
> + from contextlib import contextmanager
>
> - import zmq
> -@@ -137,7 +138,7 @@ def write_connection_file(fname=None, shell_port=0, io
> - with open(fname, 'w') as f:
> +@@ -141,7 +142,7 @@ def write_connection_file(fname=None, shell_port=0, io
> + with secure_write(fname) as f:
> f.write(json.dumps(cfg, indent=2))
>
> -if hasattr(stat, 'S_ISVTX'):
>
Re: postgresql readme
On Tue, Feb 11, 2020 at 09:02:48PM +, Stuart Henderson wrote: > OK to add that to the pkg-readme? Sure, that's definitely a helpful addition.
postgresql readme
It's always annoying to look through postgresql.conf to figure out which
things you've changed and which are default settings.
Fortunately with postgresql-previous we have a default postgresql.conf
that's likely to be close to the one in the old version, so we can diff it
to give a better picture. It's not perfect because it may have changed
slightly in a minor release, and initdb makes some locale-related
changes when it copies the file to /var/postgresql/data, but it beats
going through 700+ lines by eye.
OK to add that to the pkg-readme?
Index: Makefile
===
RCS file: /cvs/ports/databases/postgresql/Makefile,v
retrieving revision 1.259
diff -u -p -r1.259 Makefile
--- Makefile9 Feb 2020 09:38:45 - 1.259
+++ Makefile11 Feb 2020 20:57:45 -
@@ -16,7 +16,7 @@ PKGNAME-docs= postgresql-docs-${VERSION}
PKGNAME-contrib=postgresql-contrib-${VERSION}
PKGNAME-plpython=postgresql-plpython-${VERSION}
PKGNAME-pg_upgrade=postgresql-pg_upgrade-${VERSION}
-REVISION-server=0
+REVISION-server= 1
CATEGORIES=databases
SHARED_LIBS= ecpg7.10 \
Index: pkg/README-server
===
RCS file: /cvs/ports/databases/postgresql/pkg/README-server,v
retrieving revision 1.28
diff -u -p -r1.28 README-server
--- pkg/README-server 9 Feb 2020 09:38:45 - 1.28
+++ pkg/README-server 11 Feb 2020 20:57:45 -
@@ -131,7 +131,12 @@ to the current version.
"cp /var/postgresql/data-${PREV_MAJOR}/server.{crt,key}
/var/postgresql/data/"
Some postgresql.conf settings changed or disappeared in this version.
-Examine your old file for local changes and apply them to the new version.
+Examine your old file for local changes and apply them to the new version
+(/var/postgresql/data/postgresql.conf). The following command may help
+identify them:
+
+# diff -wu ${LOCALBASE}/share/postgresql-${PREV_MAJOR}/postgresql.conf.sample \
+/var/postgresql/data-${PREV_MAJOR}/postgresql.conf
7) Start PostgreSQL:
# rcctl start postgresql
Re: PATCH: Collision /usr/local/bin/gsutil between google-cloud-sdk-279.0.0 and gsutil-3.1
On 2020/02/10 16:45, Mikolaj Kucharski wrote:
> Hi,
>
> I found that /usr/local/bin/gsutil is present in two packages which
> don't have conflict makrker in their PLIST.
>
> Part of output when google-cloud-sdk is installed and pkg_add gsutil is
> executed:
>
> Collision in gsutil-3.1: the following files already exist
> /usr/local/bin/gsutil (google-cloud-sdk-279.0.0 and gsutil-3.1)
> Couldn't install gsutil-3.1
Diff is clearly correct; committed.
>
> After the patch pkg_add output looks as follows:
>
> # env TRUSTED_PKG_PATH=... pkg_add -ni gsutil
> quirks-3.230 signed on 2020-02-09T15:05:31Z
> gsutil-3.1p0:p5-HTML-Form-6.03: ok
> Can't install gsutil-3.1p0 because of conflicts (google-cloud-sdk-279.0.0p0)
> --- gsutil-3.1p0 ---
> Can't install gsutil-3.1p0: conflicts
> Couldn't install gsutil-3.1p0
>
>
> Index: telephony/gsutil/Makefile
> ===
> RCS file: /cvs/ports/telephony/gsutil/Makefile,v
> retrieving revision 1.5
> diff -u -p -u -r1.5 Makefile
> --- telephony/gsutil/Makefile 12 Jul 2019 20:49:55 - 1.5
> +++ telephony/gsutil/Makefile 10 Feb 2020 16:18:22 -
> @@ -3,6 +3,7 @@
> COMMENT =dump/restore Grandstream device configurations
>
> DISTNAME = gsutil-3.1
> +REVISION = 0
>
> CATEGORIES = telephony
>
> Index: telephony/gsutil/pkg/PLIST
> ===
> RCS file: /cvs/ports/telephony/gsutil/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -p -u -r1.1.1.1 PLIST
> --- telephony/gsutil/pkg/PLIST20 Mar 2008 18:59:15 - 1.1.1.1
> +++ telephony/gsutil/pkg/PLIST10 Feb 2020 16:18:22 -
> @@ -1,4 +1,5 @@
> @comment $OpenBSD: PLIST,v 1.1.1.1 2008/03/20 18:59:15 ian Exp $
> +@conflict google-cloud-sdk-*
> bin/gsutil
> share/doc/gsutil/
> share/doc/gsutil/README
> Index: sysutils/google-cloud-sdk/Makefile
> ===
> RCS file: /cvs/ports/sysutils/google-cloud-sdk/Makefile,v
> retrieving revision 1.152
> diff -u -p -u -r1.152 Makefile
> --- sysutils/google-cloud-sdk/Makefile8 Feb 2020 12:07:25 -
> 1.152
> +++ sysutils/google-cloud-sdk/Makefile10 Feb 2020 16:18:30 -
> @@ -6,6 +6,7 @@ V=279.0.0
> DISTNAME=google-cloud-sdk-${V}-linux-x86
> PKGNAME= google-cloud-sdk-${V}
> WRKDIST= ${WRKDIR}/google-cloud-sdk
> +REVISION = 0
>
> CATEGORIES= sysutils
>
> Index: sysutils/google-cloud-sdk/pkg/PLIST
> ===
> RCS file: /cvs/ports/sysutils/google-cloud-sdk/pkg/PLIST,v
> retrieving revision 1.139
> diff -u -p -u -r1.139 PLIST
> --- sysutils/google-cloud-sdk/pkg/PLIST 8 Feb 2020 12:07:25 -
> 1.139
> +++ sysutils/google-cloud-sdk/pkg/PLIST 10 Feb 2020 16:18:31 -
> @@ -1,4 +1,5 @@
> @comment $OpenBSD: PLIST,v 1.139 2020/02/08 12:07:25 ajacoutot Exp $
> +@conflict gsutil-*
> bin/bq
> bin/gcloud
> bin/git-credential-gcloud.sh
>
> --
> Regards,
> Mikolaj
>
Re: [ports-gcc] Unbreak devel/ddd
Charlene Wendling: > > http://build-failures.rhaalovely.net/sparc64/2020-02-05/devel/ddd.log > (not yet on powerpc) > > This is happening since the libXt update and the subsequent fix of ddd. > Putting _X_NORETURN as a declaration identifier [0] fixes the issue on > powerpc [1] and does not break the build with clang on amd64. ok naddy@ I'll note that when you grep over xenocara/app, you'll find all permutations: static void foo() _X_NORETURN static void _X_NORETURN foo() _X_NORETURN static void foo() And the declaration in is this: typedef void (*XtErrorHandler)( String/* msg */ ); extern XtErrorHandler XtAppSetErrorHandler( XtAppContext/* app_context */, XtErrorHandler /* handler */ _X_NORETURN ); -- Christian "naddy" Weisgerber na...@mips.inka.de
Re: [big endian] fix games/openttd
On Tue, Feb 11, 2020 at 08:15:06PM +0100, Charlene Wendling wrote: > Hi, > > solene@ reported to me that OpenTTD's colors were off on her powerpc > machine. I've found out that endianness was not properly detected, > so i fixed it and upstreamed [0] the changes needed. > > It builds and works as expected on powerpc and amd64. > > Comments/feedback are welcome, > > Charlène. > > > [0] https://github.com/OpenTTD/OpenTTD/pull/7996 > > works fine ok solene@ :)
[big endian] fix games/openttd
Hi, solene@ reported to me that OpenTTD's colors were off on her powerpc machine. I've found out that endianness was not properly detected, so i fixed it and upstreamed [0] the changes needed. It builds and works as expected on powerpc and amd64. Comments/feedback are welcome, Charlène. [0] https://github.com/OpenTTD/OpenTTD/pull/7996 Index: Makefile === RCS file: /cvs/ports/games/openttd/Makefile,v retrieving revision 1.65 diff -u -p -u -p -r1.65 Makefile --- Makefile15 Nov 2019 22:55:15 - 1.65 +++ Makefile11 Feb 2020 11:31:52 - @@ -5,7 +5,7 @@ COMMENT=open source clone of the game T V =1.9.3 DISTNAME = openttd-$V-source PKGNAME = openttd-$V -REVISION = 0 +REVISION = 1 CATEGORIES=games Index: patches/patch-src_core_endian_type_hpp === RCS file: patches/patch-src_core_endian_type_hpp diff -N patches/patch-src_core_endian_type_hpp --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-src_core_endian_type_hpp 11 Feb 2020 11:31:52 - @@ -0,0 +1,21 @@ +$OpenBSD$ + +Fix endianness detection + +Index: src/core/endian_type.hpp +--- src/core/endian_type.hpp.orig src/core/endian_type.hpp +@@ -35,6 +35,13 @@ + # else + # define TTD_ENDIAN TTD_BIG_ENDIAN + # endif ++#elif defined(__OpenBSD__) ++# include ++# if BYTE_ORDER == LITTLE_ENDIAN ++# define TTD_ENDIAN TTD_LITTLE_ENDIAN ++# else ++# define TTD_ENDIAN TTD_BIG_ENDIAN ++# endif + #elif !defined(TESTING) + # include + # if __BYTE_ORDER == __LITTLE_ENDIAN
Re: NEW: devel/esptool-ck 0.4.13
On Thu, Jan 30, 2020 at 08:15:21AM +0100, Martin Reindl wrote: > On Tue, Jan 28, 2020 at 09:19:05AM -0700, Tracey Emery wrote: > > On Tue, Jan 28, 2020 at 07:33:41AM -0700, Tracey Emery wrote: > > > On Tue, Jan 28, 2020 at 07:42:04AM +0100, Martin Reindl wrote: > > > > On Mon, Jan 27, 2020 at 04:06:03PM -0700, Tracey Emery wrote: > > > > > Hello ports, > > > > > > > > > > Attached is a new port to work with firmware for ESP8266 chips. It's > > > > > an > > > > > updated and slightly revised version of a previous submission. > > > > > > > > > > devel/esptool-ck: Esptool is a tool to create firmware files for the > > > > > ESP8266 > > > > > chip and flash the firmware to the chip over serial port. > > > > > > > > > > Anyone willing to Ok and commit? > > > > > > > > Hello Tracey, > > > > > > > > No hardware here to test, but did you notice in the Makefile it trys to > > > > run > > > > 'git' twice? IMHO this should be added to BUILD_DEPENDS or patched out. > > > > I think the attached fixes the version problem and adds a slight tweak > > to the Makefile. > > Indeed. Port-wise with no hardware to test on (yet) OK martin@. Ping. Anyone willing to import? Thanks. -- Tracey Emery esptool-ck-0.4.13.tgz Description: Binary data
Re: UPDATE devel/py-jupyter_core-4.6.1
On Fri, Feb 07, 2020 at 09:28:20PM +0100, Björn Ketelaars wrote: > Diff below brings py-jupyter_core to 4.6.1, which is needed for a > pending update of www/jupyter-notebook. Changelog can be found at > https://github.com/jupyter/jupyter_core/blob/4.6.1/docs/changelog.rst > Changes to the port: > - Follow Makefile.template > - Remove ipython as TDEP, which is not needed > - Add py-nose as TDEP > Testing: > - 'make test' runs successfully for both python2 and python3 > - Run tested on amd64 with jupyter-notebook from ports and an update > hereof > Comments/OK? All consumers pass tests same as before the update. ok kmos --Kurt
Re: new: devel/git-crypt
On Sat, 25 Jan 2020, Paco Esteban wrote: > Hi ports@, > > Here's a new port for git-crypt, which is a tool for transparently > encrypt files on git repositories (so one can have sensitive information > on remote repositories). You can find more info here: > > https://www.agwa.name/projects/git-crypt/ > > I decided not to include gnupg as a dependency. The software can use > pgp keys (for asymetric) or openssl (for symetric) encryption. The > build clearly depends on openssl (it seems to work fine with libressl as > far as I can see), but for pgp it calls the gpg binary, so it does not > depend on it for building. Please correct me if this is wrong. > > Another thing is that the man page generation leaves the resulting > man page file on WRKSRC/git-crypt.1 but it should leave it on > WRKSRC/man/man1/git-crypt.1 and I do not know why (when doing things > manually outside of the ports infrastructure it works as expected), > that's why I added the pre-fake hack. If anyone knows a better way to > deal with this, please tell me. ping ? (port attached for convenience) -- Paco Esteban. 5818130B8A6DBC03 git-crypt.tar.gz Description: Binary data
Re: unbreak www/newsboat on sparc64
On Tue, Feb 11, 2020 at 06:07:12PM +0100, Sebastien Marie wrote: > On Tue, Feb 11, 2020 at 03:41:55PM +, Stuart Henderson wrote: > > On 2020/02/11 14:06, Sebastien Marie wrote: > > > Hi, > > > > > > It seems the latest update of www/newsboat removed an explicit version on > > > libc > > > to fallback to the one defined by the upstream. The problem is upstream > > > is using > > > an old version which doesn't support OpenBSD sparc64. > > > > > > The following diff restore it, and should make www/newsboat to build on > > > sparc64. > > > > > > Comments or OK ? > > > > Maybe like this instead? Then it is more obvious that the output from > > modcargo-gen-crates-licenses was modified. > > yes. I prefer your version. ok semarie@ Looks good to me as well, OK fcambus@
Re: update: audio/py-musicbrainzngs
On Tue, Feb 04, 2020 at 11:54:01AM +0100, Paco Esteban wrote: > Hi Stuart, > On Tue, 04 Feb 2020, Stuart Henderson wrote: > > Please update HOMEPAGE to https://python-musicbrainzngs.readthedocs.io/ > > to use https and avoid redirects, > Did not catch that one. > > It will need an @pkgpath marker to allow updates to work. To be honest > > since it still supports py2 I would leave that enabled until someone > > has figured out the best way to move an existing py2+3 port to py3-only... > I did it this way because it has only one consumer that is already > py3 only. It would be good indeed to have a clear path to go to from > py2+py3 to py3 only, as this will happen to many ports. > Anyway, this is the updated diff, which makes my other email about > audio/beets unnecessary. Thank you Stuart. > -MODULES =lang/python > -FLAVORS =python3 > +MODULES =lang/python > +MODPY_SETUPTOOLS = Yes > +MODPY_PYTEST = Yes > +FLAVORS =python3 > FLAVOR ?= > TEST_ENV = LC_CTYPE=en_US.UTF-8 With the move to MODPY_PYTEST, LC_ALL gets set, so this isn't needed. I removed that line, and committed the diff. Thanks! --Kurt
Re: Remove: devel/beediff
mmm, no...
On Tue, Feb 11, 2020 at 06:32:25AM +0100, Rafael Sadowski wrote:
> On Tue Feb 04, 2020 at 08:07:09PM +0100, Rafael Sadowski wrote:
> > We certainly have many GUI diff tools in the tree. kompare is almost the
> > same as beediff, but is actively under development upstream and under
> > the hood of KDE. OK to remove Qt4 beediff?
>
> If anyone wants to save this, the deadline is weekend.
>
> >
> >
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/devel/quirks/Makefile,v
> > retrieving revision 1.839
> > diff -u -p -u -p -r1.839 Makefile
> > --- Makefile4 Feb 2020 06:29:37 - 1.839
> > +++ Makefile4 Feb 2020 19:04:28 -
> > @@ -5,7 +5,7 @@ CATEGORIES =devel databases
> > DISTFILES =
> >
> > # API.rev
> > -PKGNAME = quirks-3.230
> > +PKGNAME = quirks-3.231
> > PKG_ARCH = *
> > MAINTAINER = Marc Espie
> >
> > Index: files/Quirks.pm
> > ===
> > RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
> > retrieving revision 1.857
> > diff -u -p -u -p -r1.857 Quirks.pm
> > --- files/Quirks.pm 4 Feb 2020 06:29:37 - 1.857
> > +++ files/Quirks.pm 4 Feb 2020 19:04:28 -
> > @@ -1369,6 +1369,7 @@ my $obsolete_reason = {
> > 'dclib' => 3,
> > 'luma' => 3,
> > 'qhacc' => 15,
> > + 'beediff' => 16,
> > };
> >
> > # reasons for obsolete packages
> > @@ -1389,6 +1390,7 @@ my @msg = (
> > "has a dependency on obsolete software", #13
> > "python2 port superseded by python3 version", #14
> > "no longer maintained upstream, suggest homebank, gnucash, kmymoney",
> > #15
> > + "no longer maintained upstream, suggest kompare", #16
> > );
> >
> > # ->is_base_system($handle, $state):
> >
>
Re: unbreak www/newsboat on sparc64
On Tue, Feb 11, 2020 at 03:41:55PM +, Stuart Henderson wrote: > On 2020/02/11 14:06, Sebastien Marie wrote: > > Hi, > > > > It seems the latest update of www/newsboat removed an explicit version on > > libc > > to fallback to the one defined by the upstream. The problem is upstream is > > using > > an old version which doesn't support OpenBSD sparc64. > > > > The following diff restore it, and should make www/newsboat to build on > > sparc64. > > > > Comments or OK ? > > Maybe like this instead? Then it is more obvious that the output from > modcargo-gen-crates-licenses was modified. yes. I prefer your version. ok semarie@ Thanks > Index: Makefile > === > RCS file: /cvs/ports/www/newsboat/Makefile,v > retrieving revision 1.15 > diff -u -p -r1.15 Makefile > --- Makefile 23 Dec 2019 13:26:34 - 1.15 > +++ Makefile 11 Feb 2020 15:40:39 - > @@ -4,6 +4,7 @@ COMMENT = RSS/Atom feed reader for text > > V = 2.18 > DISTNAME = newsboat-$V > +REVISION = 0 > > CATEGORIES = www > > @@ -30,7 +31,9 @@ MODCARGO_BUILD =No > MODCARGO_INSTALL = No > MODCARGO_TEST = No > > +# keep libc >=0.2.63 for sparc64 support > MODCARGO_CRATES_UPDATE +=libc > +MODCARGO_CRATES += libc0.2.63 # MIT OR Apache-2.0 > > MODCARGO_CRATES += aho-corasick0.6.9 # Unlicense/MIT > MODCARGO_CRATES += argon2rs0.2.5 # MIT > @@ -60,7 +63,7 @@ MODCARGO_CRATES += idna0.1.5 # MIT/Apac > MODCARGO_CRATES += kernel32-sys0.2.2 # MIT > MODCARGO_CRATES += lazy_static 0.2.11 # MIT/Apache-2.0 > MODCARGO_CRATES += lazy_static 1.2.0 # MIT/Apache-2.0 > -MODCARGO_CRATES += libc0.2.48 # MIT OR Apache-2.0 > +#MODCARGO_CRATES += libc0.2.48 # MIT OR Apache-2.0 > MODCARGO_CRATES += libz-sys1.0.17 # MIT/Apache-2.0 > MODCARGO_CRATES += locale_config 0.2.2 # MIT > MODCARGO_CRATES += lock_api0.1.5 # Apache-2.0/MIT > Index: distinfo > === > RCS file: /cvs/ports/www/newsboat/distinfo,v > retrieving revision 1.11 > diff -u -p -r1.11 distinfo > --- distinfo 23 Dec 2019 13:26:34 - 1.11 > +++ distinfo 11 Feb 2020 15:40:39 - > @@ -26,7 +26,7 @@ SHA256 (cargo/idna-0.1.5.tar.gz) = OPCeD > SHA256 (cargo/kernel32-sys-0.2.2.tar.gz) = > dQdiSylINDHAui2Crs6Mps26k4K/9N3Q90kFYMBWCY0= > SHA256 (cargo/lazy_static-0.2.11.tar.gz) = > dvAzx61hRFxbNHxzgt0SN4R+sbzlkP5QNl3LM9VGvnM= > SHA256 (cargo/lazy_static-1.2.0.tar.gz) = > o3TIm521WJVFOnTB44hh2d7sCwG0BaglFunV3kgg3qE= > -SHA256 (cargo/libc-0.2.48.tar.gz) = > 6WLHZBAIrAEPpgp9/cFxJEnynETvLUcCOUrqlD7nUEc= > +SHA256 (cargo/libc-0.2.63.tar.gz) = > 15WDUCv/BSPhB8pE3TZv+AfGRCtKlMzvBDLH6E+FZYM= > SHA256 (cargo/libz-sys-1.0.17.tar.gz) = > ROu8dg/S0vTZPeCaDhPZfgV2EgUuhx2pmFzty0Uea9U= > SHA256 (cargo/locale_config-0.2.2.tar.gz) = > FPvuDjm8LdaiQnxP3qZumCbMH9CbCgt1UDWfX27+Has= > SHA256 (cargo/lock_api-0.1.5.tar.gz) = > YuvxOR9qytYOXItDcG3eRYLfdcBmmKtEUR0VAWvCRCw= > @@ -129,7 +129,7 @@ SIZE (cargo/idna-0.1.5.tar.gz) = 258735 > SIZE (cargo/kernel32-sys-0.2.2.tar.gz) = 24537 > SIZE (cargo/lazy_static-0.2.11.tar.gz) = 12361 > SIZE (cargo/lazy_static-1.2.0.tar.gz) = 10840 > -SIZE (cargo/libc-0.2.48.tar.gz) = 353045 > +SIZE (cargo/libc-0.2.63.tar.gz) = 437880 > SIZE (cargo/libz-sys-1.0.17.tar.gz) = 632674 > SIZE (cargo/locale_config-0.2.2.tar.gz) = 20975 > SIZE (cargo/lock_api-0.1.5.tar.gz) = 16967 -- Sebastien Marie
Re: unbreak www/newsboat on sparc64
On Tue, Feb 11 2020, Stuart Henderson wrote: > On 2020/02/11 14:06, Sebastien Marie wrote: >> Hi, >> >> It seems the latest update of www/newsboat removed an explicit version on >> libc >> to fallback to the one defined by the upstream. The problem is upstream is >> using >> an old version which doesn't support OpenBSD sparc64. >> >> The following diff restore it, and should make www/newsboat to build on >> sparc64. >> >> Comments or OK ? >> -- >> Sebastien Marie >> >> >> diff 07b38a519612fa82bbc016498a210424b43b0eab >> /data/semarie/repos/openbsd/ports >> blob - efa346af0b7511878e13ae6050bbc728d1b85ac3 >> file + www/newsboat/Makefile >> --- www/newsboat/Makefile >> +++ www/newsboat/Makefile >> @@ -30,6 +30,7 @@ MODCARGO_BUILD = No >> MODCARGO_INSTALL = No >> MODCARGO_TEST = No >> >> +# keep libc >=0.2.63 for sparc64 support >> MODCARGO_CRATES_UPDATE += libc >> >> MODCARGO_CRATES += aho-corasick0.6.9 # Unlicense/MIT >> @@ -60,7 +61,7 @@ MODCARGO_CRATES += idna0.1.5 # MIT/Apache-2.0 >> MODCARGO_CRATES += kernel32-sys0.2.2 # MIT >> MODCARGO_CRATES += lazy_static 0.2.11 # MIT/Apache-2.0 >> MODCARGO_CRATES += lazy_static 1.2.0 # MIT/Apache-2.0 >> -MODCARGO_CRATES += libc0.2.48 # MIT OR Apache-2.0 >> +MODCARGO_CRATES += libc0.2.63 # MIT OR Apache-2.0 >> MODCARGO_CRATES += libz-sys1.0.17 # MIT/Apache-2.0 >> MODCARGO_CRATES += locale_config 0.2.2 # MIT >> MODCARGO_CRATES += lock_api0.1.5 # Apache-2.0/MIT > > Maybe like this instead? Then it is more obvious that the output from > modcargo-gen-crates-licenses was modified. Makes sense. My first diff used libc 0.2.66 but newsboat also works here on sparc64 with 0.2.63. ok jca@ > Index: Makefile > === > RCS file: /cvs/ports/www/newsboat/Makefile,v > retrieving revision 1.15 > diff -u -p -r1.15 Makefile > --- Makefile 23 Dec 2019 13:26:34 - 1.15 > +++ Makefile 11 Feb 2020 15:40:39 - > @@ -4,6 +4,7 @@ COMMENT = RSS/Atom feed reader for text > > V = 2.18 > DISTNAME = newsboat-$V > +REVISION = 0 > > CATEGORIES = www > > @@ -30,7 +31,9 @@ MODCARGO_BUILD =No > MODCARGO_INSTALL = No > MODCARGO_TEST = No > > +# keep libc >=0.2.63 for sparc64 support > MODCARGO_CRATES_UPDATE +=libc > +MODCARGO_CRATES += libc0.2.63 # MIT OR Apache-2.0 > > MODCARGO_CRATES += aho-corasick0.6.9 # Unlicense/MIT > MODCARGO_CRATES += argon2rs0.2.5 # MIT > @@ -60,7 +63,7 @@ MODCARGO_CRATES += idna0.1.5 # MIT/Apac > MODCARGO_CRATES += kernel32-sys0.2.2 # MIT > MODCARGO_CRATES += lazy_static 0.2.11 # MIT/Apache-2.0 > MODCARGO_CRATES += lazy_static 1.2.0 # MIT/Apache-2.0 > -MODCARGO_CRATES += libc0.2.48 # MIT OR Apache-2.0 > +#MODCARGO_CRATES += libc0.2.48 # MIT OR Apache-2.0 > MODCARGO_CRATES += libz-sys1.0.17 # MIT/Apache-2.0 > MODCARGO_CRATES += locale_config 0.2.2 # MIT > MODCARGO_CRATES += lock_api0.1.5 # Apache-2.0/MIT > Index: distinfo > === > RCS file: /cvs/ports/www/newsboat/distinfo,v > retrieving revision 1.11 > diff -u -p -r1.11 distinfo > --- distinfo 23 Dec 2019 13:26:34 - 1.11 > +++ distinfo 11 Feb 2020 15:40:39 - > @@ -26,7 +26,7 @@ SHA256 (cargo/idna-0.1.5.tar.gz) = OPCeD > SHA256 (cargo/kernel32-sys-0.2.2.tar.gz) = > dQdiSylINDHAui2Crs6Mps26k4K/9N3Q90kFYMBWCY0= > SHA256 (cargo/lazy_static-0.2.11.tar.gz) = > dvAzx61hRFxbNHxzgt0SN4R+sbzlkP5QNl3LM9VGvnM= > SHA256 (cargo/lazy_static-1.2.0.tar.gz) = > o3TIm521WJVFOnTB44hh2d7sCwG0BaglFunV3kgg3qE= > -SHA256 (cargo/libc-0.2.48.tar.gz) = > 6WLHZBAIrAEPpgp9/cFxJEnynETvLUcCOUrqlD7nUEc= > +SHA256 (cargo/libc-0.2.63.tar.gz) = > 15WDUCv/BSPhB8pE3TZv+AfGRCtKlMzvBDLH6E+FZYM= > SHA256 (cargo/libz-sys-1.0.17.tar.gz) = > ROu8dg/S0vTZPeCaDhPZfgV2EgUuhx2pmFzty0Uea9U= > SHA256 (cargo/locale_config-0.2.2.tar.gz) = > FPvuDjm8LdaiQnxP3qZumCbMH9CbCgt1UDWfX27+Has= > SHA256 (cargo/lock_api-0.1.5.tar.gz) = > YuvxOR9qytYOXItDcG3eRYLfdcBmmKtEUR0VAWvCRCw= > @@ -129,7 +129,7 @@ SIZE (cargo/idna-0.1.5.tar.gz) = 258735 > SIZE (cargo/kernel32-sys-0.2.2.tar.gz) = 24537 > SIZE (cargo/lazy_static-0.2.11.tar.gz) = 12361 > SIZE (cargo/lazy_static-1.2.0.tar.gz) = 10840 > -SIZE (cargo/libc-0.2.48.tar.gz) = 353045 > +SIZE (cargo/libc-0.2.63.tar.gz) = 437880 > SIZE (cargo/libz-sys-1.0.17.tar.gz) = 632674 > SIZE (cargo/locale_config-0.2.2.tar.gz) = 20975 > SIZE (cargo/lock_api-0.1.5.tar.gz) = 16967 > -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
arm bulk build report
bulk build on armv7.ports.openbsd.org started on Wed Jan 1 14:40:48 MST 2020 finished at Tue Feb 11 09:31:41 MST 2020 lasted 10D11h50m done with kern.version=OpenBSD 6.6-current (GENERIC) #247: Sat Dec 28 12:59:46 MST 2019 built packages:9049 Jan 1:2425 Jan 2:1240 Jan 3:634 Jan 4:420 Jan 5:284 Jan 6:114 Jan 7:101 Jan 8:141 Jan 9:201 Jan 10:448 Jan 11:55 Jan 12:58 Jan 13:157 Jan 14:166 Jan 15:123 Jan 16:224 Jan 17:271 Jan 18:282 Jan 19:335 Jan 20:335 Jan 22:1 Jan 26:9 Jan 27:98 Jan 28:219 Jan 29:205 Jan 30:208 Jan 31:162 Feb 1:302 Feb 2:268 Feb 3:159 Feb 4:56 Feb 5:185 Feb 6:494 Feb 7:2024 critical path missing pkgs: http://build-failures.rhaalovely.net/arm/2020-01-01/summary.log build failures: 48 http://build-failures.rhaalovely.net/arm/2020-01-01/audio/pithos.log http://build-failures.rhaalovely.net/arm/2020-01-01/audio/rgain.log http://build-failures.rhaalovely.net/arm/2020-01-01/audio/solfege.log http://build-failures.rhaalovely.net/arm/2020-01-01/cad/yosys.log http://build-failures.rhaalovely.net/arm/2020-01-01/chinese/libpinyin.log http://build-failures.rhaalovely.net/arm/2020-01-01/devel/arm-none-eabi/gcc-linaro,aarch64.log http://build-failures.rhaalovely.net/arm/2020-01-01/devel/llvm,,-main.log http://build-failures.rhaalovely.net/arm/2020-01-01/devel/spyder/spyder,python3.log http://build-failures.rhaalovely.net/arm/2020-01-01/devel/srecord.log http://build-failures.rhaalovely.net/arm/2020-01-01/emulators/dgen-sdl,debugger.log http://build-failures.rhaalovely.net/arm/2020-01-01/emulators/ppsspp.log http://build-failures.rhaalovely.net/arm/2020-01-01/games/barony.log http://build-failures.rhaalovely.net/arm/2020-01-01/games/fifengine.log http://build-failures.rhaalovely.net/arm/2020-01-01/games/frozen-bubble,-main.log http://build-failures.rhaalovely.net/arm/2020-01-01/games/stone-soup,no_x11.log http://build-failures.rhaalovely.net/arm/2020-01-01/games/vacuum.log http://build-failures.rhaalovely.net/arm/2020-01-01/graphics/gprof2dot.log http://build-failures.rhaalovely.net/arm/2020-01-01/graphics/libmpeg2.log http://build-failures.rhaalovely.net/arm/2020-01-01/graphics/xdot.log http://build-failures.rhaalovely.net/arm/2020-01-01/graphics/xfig.log http://build-failures.rhaalovely.net/arm/2020-01-01/lang/STk.log http://build-failures.rhaalovely.net/arm/2020-01-01/lang/erlang/21.log http://build-failures.rhaalovely.net/arm/2020-01-01/lang/parrot.log http://build-failures.rhaalovely.net/arm/2020-01-01/lang/pfe.log http://build-failures.rhaalovely.net/arm/2020-01-01/lang/racket-minimal,no_jit.log http://build-failures.rhaalovely.net/arm/2020-01-01/lang/swi-prolog.log http://build-failures.rhaalovely.net/arm/2020-01-01/mail/bogofilter,db4.log http://build-failures.rhaalovely.net/arm/2020-01-01/mail/courier-unicode.log http://build-failures.rhaalovely.net/arm/2020-01-01/math/dieharder.log http://build-failures.rhaalovely.net/arm/2020-01-01/math/mathomatic.log http://build-failures.rhaalovely.net/arm/2020-01-01/math/mlpack,,-main.log http://build-failures.rhaalovely.net/arm/2020-01-01/multimedia/gstreamer-0.10/plugins-ffmpeg.log http://build-failures.rhaalovely.net/arm/2020-01-01/net/utox.log http://build-failures.rhaalovely.net/arm/2020-01-01/print/cups-pdf.log http://build-failures.rhaalovely.net/arm/2020-01-01/print/pdfshuffler.log http://build-failures.rhaalovely.net/arm/2020-01-01/shells/py-qtconsole,python3.log http://build-failures.rhaalovely.net/arm/2020-01-01/sysutils/fzf.log http://build-failures.rhaalovely.net/arm/2020-01-01/sysutils/nomad.log http://build-failures.rhaalovely.net/arm/2020-01-01/sysutils/telegraf.log http://build-failures.rhaalovely.net/arm/2020-01-01/sysutils/terraform/provider-alicloud.log http://build-failures.rhaalovely.net/arm/2020-01-01/sysutils/terraform/provider-aws.log http://build-failures.rhaalovely.net/arm/2020-01-01/sysutils/terraform/provider-azurerm.log http://build-failures.rhaalovely.net/arm/2020-01-01/sysutils/terragrunt.log http://build-failures.rhaalovely.net/arm/2020-01-01/sysutils/virt-manager.log http://build-failures.rhaalovely.net/arm/2020-01-01/textproc/podofo.log http://build-failures.rhaalovely.net/arm/2020-01-01/x11/gnome/eog.log http://build-failures.rhaalovely.net/arm/2020-01-01/x11/gnustep/libobjc2.log http://build-failures.rhaalovely.net/arm/2020-01-01/x11/gtk+4,-cloudprint.log
Re: UPDATE www/e2guardian-5.3.4
On Tue 11/02/2020 10:26, Jeremie Courreges-Anglas wrote:
> On Mon, Feb 10 2020, Björn Ketelaars wrote:
> > Diff below brings e2guardian to 5.3.4, which is a bug fix release. From
> > changelog [0]:
> > - Fix #565 segfault when no write permission on generated certs
> > directory
> > - Fix #493 referexception not working
> > - Fix #549 - Url in CGI and bypass wrong in MITM
> > - Bug fix sigwait code for OpenBSD
> >
> > Changes to the port:
> > - Upstream has fixed sigwait code, as such remove relevant bits from
> > patch-src_FatController_cpp
>
> It's sad that upstream has to emulate sigtimedwait using sigwait and
> SIGALRM. I hope the emulation is as correct as what our patch did.
>
> > Testing:
> > - Lightly run tested on amd64. Note that I only played a bit with this
> > port, nothing serious.
> >
> > Comments/OK?
>
> The new files in PLIST should probably be @sampled.
Yes, you are right, the new lists should be @sampled. New diff:
diff --git Makefile Makefile
index 6ed036472e1..188a525976b 100644
--- Makefile
+++ Makefile
@@ -2,7 +2,7 @@
GH_ACCOUNT = e2guardian
GH_PROJECT = e2guardian
-GH_TAGNAME = 5.3.3
+GH_TAGNAME = v5.3.4
COMMENT = content scanning web filter
CATEGORIES = www net
diff --git distinfo distinfo
index b8064b9d2a3..bc0d2e23fad 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (e2guardian-5.3.3.tar.gz) = nYj30sM54BWG0mfyWjAYaC0RW4qq3Bi+2uke+rUchbQ=
-SIZE (e2guardian-5.3.3.tar.gz) = 2009254
+SHA256 (e2guardian-5.3.4.tar.gz) = CaEH/Xkb6S7csIN7j9ytYmkoFi0F4xrlP6j+Ott9VlI=
+SIZE (e2guardian-5.3.4.tar.gz) = 2083057
diff --git patches/patch-configs_e2guardian_conf_in
patches/patch-configs_e2guardian_conf_in
index f5554370e95..21b191f1cc9 100644
--- patches/patch-configs_e2guardian_conf_in
+++ patches/patch-configs_e2guardian_conf_in
@@ -3,10 +3,10 @@ $OpenBSD: patch-configs_e2guardian_conf_in,v 1.1.1.1
2019/09/18 16:34:03 sthen E
Index: configs/e2guardian.conf.in
--- configs/e2guardian.conf.in.orig
+++ configs/e2guardian.conf.in
-@@ -568,7 +568,7 @@ logconnectionhandlingerrors = on
- # This figure is the maximum number of concurrent connections.
- # If more connections are made, connections will queue until a worker thread
is free.
- # On large site you might want to try 5000 (max value 2)
+@@ -577,7 +577,7 @@ logconnectionhandlingerrors = on
+ # On 32-bit systems reduce this to 300 to avoid exceeding the <4GB
+ # virtual memory limit and on Linux decrease the thread stack size from
+ # 10MB to 2MB (ulimit -s 2048)
-httpworkers = 500
+httpworkers = 50
diff --git patches/patch-configs_e2guardianf1_conf_in
patches/patch-configs_e2guardianf1_conf_in
index 2d1623471ba..b68ad4f9c7c 100644
--- patches/patch-configs_e2guardianf1_conf_in
+++ patches/patch-configs_e2guardianf1_conf_in
@@ -3,7 +3,7 @@ $OpenBSD: patch-configs_e2guardianf1_conf_in,v 1.1.1.1
2019/09/18 16:34:03 sthen
Index: configs/e2guardianf1.conf.in
--- configs/e2guardianf1.conf.in.orig
+++ configs/e2guardianf1.conf.in
-@@ -303,7 +303,7 @@ bypasskey = ''
+@@ -308,7 +308,7 @@ bypasskey = ''
#cgikey = 'you must change this text in order to be secure'
# Users will not be able to bypass sites/urls in these lists
diff --git patches/patch-src_FatController_cpp
patches/patch-src_FatController_cpp
index cbbe878a4e5..8b44d503ef4 100644
--- patches/patch-src_FatController_cpp
+++ patches/patch-src_FatController_cpp
@@ -3,18 +3,7 @@ $OpenBSD: patch-src_FatController_cpp,v 1.1.1.1 2019/09/18
16:34:03 sthen Exp $
Index: src/FatController.cpp
--- src/FatController.cpp.orig
+++ src/FatController.cpp
-@@ -46,6 +46,10 @@
- #include
- #endif //__SSLMITM
-
-+#if defined(__OpenBSD__)
-+#include
-+#endif
-+
- #include "FatController.hpp"
- #include "ConnectionHandler.hpp"
- #include "DynamicURLList.hpp"
-@@ -194,7 +198,7 @@ void stat_rec::reset()
+@@ -194,7 +194,7 @@ void stat_rec::reset()
fprintf(fs, "%s %d %d %d %d %ld %ld %ld
%ld%d %d\n", buffer, o.http_workers,
bc, o.http_worker_Q.size(), o.log_Q->size(), cnx, cps, rqx, rqs, mfd,
LC);
} else {
@@ -23,15 +12,3 @@ Index: src/FatController.cpp
bc, o.http_worker_Q.size(), o.log_Q->size(), cnx, cps, rqx, rqs, mfd,
LC);
}
-@@ -1696,7 +1700,11 @@ int fc_controlit() //
- }
- timeout.tv_sec = 5;
- timeout.tv_nsec = (long) 0;
-+#if defined(__OpenBSD__)
-+rc = syscall(SYS___thrsigdivert, signal_set, NULL, &timeout);
-+#else
- rc = sigtimedwait(&signal_set, NULL, &timeout);
-+#endif
- if (rc < 0) {
- if (errno != EAGAIN) {
- syslog(LOG_INFO, "%sUnexpected error from sigtimedwait() %d
%s", thread_id.c_str(), errno, strerror(errno));
diff --git pkg/PLIST pkg/PLIST
index 969d2736f05..67c9911ff69 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -253,6 +253,8 @@
share/examples/e2guardian/lists/contentscanners/exceptionvirussitelist
@sample ${SYSCONFDIR}/e2guardian/li
Re: [UPDATE] net/gpodder-3.10.11 -> 3.10.13
On 11/02/2020 02:39, TronDD wrote: On Mon Feb 3, 2020 at 9:11 PM, TronDD wrote: Simple update to gPodder 3.10.13 Improvements #684 added subtitle to the tagging extension #704 save position and size for preferences and editcfg windows #724 Save episode column sorting and position #717 quieter youtube-dl #718 Add episode menu option to download with youtube-dl extension #723 get duration for youtube episodes #725 Fix youtube live stream detection macOS: switch to gpodder-osx-bundle base-5.0.1 (pipenv based) Bug fixes #681 "Change delete lock" only unlocks an episode #702 on_podcast_delete method is passed incorrect object #703 The GtkNotebook in the preferences dialog doesn't resize #716 Possible channel tooltip coordinate bug #715 use box instead of table to fix size of channel tooltips #686 add YouTube channel not working with YouTube DL extension activated on Windows #714 Youtube download fail when preferred formats aren't available #711 [youtube] support player_response.streamingData.formats #728 Fix icon for deleted episode fix #737 tagging extension broken in 3.10.12 Tim. (Sending with the mail/aerc port, so we'll see how it goes.) Poke. Committed, thanks ! Index: Makefile === RCS file: /cvs/ports/net/gpodder/Makefile,v retrieving revision 1.22 diff -u -p -r1.22 Makefile --- Makefile 6 Nov 2019 12:04:52 - 1.22 +++ Makefile 4 Feb 2020 01:54:14 - @@ -2,7 +2,7 @@ COMMENT= media aggregator and podcast client -MODPY_EGG_VERSION= 3.10.11 +MODPY_EGG_VERSION= 3.10.13 GH_ACCOUNT= gpodder GH_PROJECT= gpodder Index: distinfo === RCS file: /cvs/ports/net/gpodder/distinfo,v retrieving revision 1.10 diff -u -p -r1.10 distinfo --- distinfo 6 Nov 2019 12:04:52 - 1.10 +++ distinfo 4 Feb 2020 01:54:14 - @@ -1,2 +1,2 @@ -SHA256 (gpodder-3.10.11.tar.gz) = 6qWwt0ugBpk0Lb8xfVLxxOUtd7cxP8kUTNAe6mizFMw= -SIZE (gpodder-3.10.11.tar.gz) = 1040876 +SHA256 (gpodder-3.10.13.tar.gz) = r7jdKxec+KoddXUdSlNMfUXmUuWi0ZVAVRrI0RUM0CA= +SIZE (gpodder-3.10.13.tar.gz) = 1044074
Re: unbreak www/newsboat on sparc64
On 2020/02/11 14:06, Sebastien Marie wrote: > Hi, > > It seems the latest update of www/newsboat removed an explicit version on libc > to fallback to the one defined by the upstream. The problem is upstream is > using > an old version which doesn't support OpenBSD sparc64. > > The following diff restore it, and should make www/newsboat to build on > sparc64. > > Comments or OK ? > -- > Sebastien Marie > > > diff 07b38a519612fa82bbc016498a210424b43b0eab > /data/semarie/repos/openbsd/ports > blob - efa346af0b7511878e13ae6050bbc728d1b85ac3 > file + www/newsboat/Makefile > --- www/newsboat/Makefile > +++ www/newsboat/Makefile > @@ -30,6 +30,7 @@ MODCARGO_BUILD =No > MODCARGO_INSTALL = No > MODCARGO_TEST = No > > +# keep libc >=0.2.63 for sparc64 support > MODCARGO_CRATES_UPDATE +=libc > > MODCARGO_CRATES += aho-corasick0.6.9 # Unlicense/MIT > @@ -60,7 +61,7 @@ MODCARGO_CRATES += idna0.1.5 # MIT/Apache-2.0 > MODCARGO_CRATES += kernel32-sys0.2.2 # MIT > MODCARGO_CRATES += lazy_static 0.2.11 # MIT/Apache-2.0 > MODCARGO_CRATES += lazy_static 1.2.0 # MIT/Apache-2.0 > -MODCARGO_CRATES += libc0.2.48 # MIT OR Apache-2.0 > +MODCARGO_CRATES += libc0.2.63 # MIT OR Apache-2.0 > MODCARGO_CRATES += libz-sys1.0.17 # MIT/Apache-2.0 > MODCARGO_CRATES += locale_config 0.2.2 # MIT > MODCARGO_CRATES += lock_api0.1.5 # Apache-2.0/MIT Maybe like this instead? Then it is more obvious that the output from modcargo-gen-crates-licenses was modified. Index: Makefile === RCS file: /cvs/ports/www/newsboat/Makefile,v retrieving revision 1.15 diff -u -p -r1.15 Makefile --- Makefile23 Dec 2019 13:26:34 - 1.15 +++ Makefile11 Feb 2020 15:40:39 - @@ -4,6 +4,7 @@ COMMENT = RSS/Atom feed reader for text V =2.18 DISTNAME = newsboat-$V +REVISION = 0 CATEGORIES = www @@ -30,7 +31,9 @@ MODCARGO_BUILD = No MODCARGO_INSTALL = No MODCARGO_TEST =No +# keep libc >=0.2.63 for sparc64 support MODCARGO_CRATES_UPDATE += libc +MODCARGO_CRATES += libc0.2.63 # MIT OR Apache-2.0 MODCARGO_CRATES += aho-corasick0.6.9 # Unlicense/MIT MODCARGO_CRATES += argon2rs0.2.5 # MIT @@ -60,7 +63,7 @@ MODCARGO_CRATES +=idna0.1.5 # MIT/Apac MODCARGO_CRATES += kernel32-sys0.2.2 # MIT MODCARGO_CRATES += lazy_static 0.2.11 # MIT/Apache-2.0 MODCARGO_CRATES += lazy_static 1.2.0 # MIT/Apache-2.0 -MODCARGO_CRATES += libc0.2.48 # MIT OR Apache-2.0 +#MODCARGO_CRATES +=libc0.2.48 # MIT OR Apache-2.0 MODCARGO_CRATES += libz-sys1.0.17 # MIT/Apache-2.0 MODCARGO_CRATES += locale_config 0.2.2 # MIT MODCARGO_CRATES += lock_api0.1.5 # Apache-2.0/MIT Index: distinfo === RCS file: /cvs/ports/www/newsboat/distinfo,v retrieving revision 1.11 diff -u -p -r1.11 distinfo --- distinfo23 Dec 2019 13:26:34 - 1.11 +++ distinfo11 Feb 2020 15:40:39 - @@ -26,7 +26,7 @@ SHA256 (cargo/idna-0.1.5.tar.gz) = OPCeD SHA256 (cargo/kernel32-sys-0.2.2.tar.gz) = dQdiSylINDHAui2Crs6Mps26k4K/9N3Q90kFYMBWCY0= SHA256 (cargo/lazy_static-0.2.11.tar.gz) = dvAzx61hRFxbNHxzgt0SN4R+sbzlkP5QNl3LM9VGvnM= SHA256 (cargo/lazy_static-1.2.0.tar.gz) = o3TIm521WJVFOnTB44hh2d7sCwG0BaglFunV3kgg3qE= -SHA256 (cargo/libc-0.2.48.tar.gz) = 6WLHZBAIrAEPpgp9/cFxJEnynETvLUcCOUrqlD7nUEc= +SHA256 (cargo/libc-0.2.63.tar.gz) = 15WDUCv/BSPhB8pE3TZv+AfGRCtKlMzvBDLH6E+FZYM= SHA256 (cargo/libz-sys-1.0.17.tar.gz) = ROu8dg/S0vTZPeCaDhPZfgV2EgUuhx2pmFzty0Uea9U= SHA256 (cargo/locale_config-0.2.2.tar.gz) = FPvuDjm8LdaiQnxP3qZumCbMH9CbCgt1UDWfX27+Has= SHA256 (cargo/lock_api-0.1.5.tar.gz) = YuvxOR9qytYOXItDcG3eRYLfdcBmmKtEUR0VAWvCRCw= @@ -129,7 +129,7 @@ SIZE (cargo/idna-0.1.5.tar.gz) = 258735 SIZE (cargo/kernel32-sys-0.2.2.tar.gz) = 24537 SIZE (cargo/lazy_static-0.2.11.tar.gz) = 12361 SIZE (cargo/lazy_static-1.2.0.tar.gz) = 10840 -SIZE (cargo/libc-0.2.48.tar.gz) = 353045 +SIZE (cargo/libc-0.2.63.tar.gz) = 437880 SIZE (cargo/libz-sys-1.0.17.tar.gz) = 632674 SIZE (cargo/locale_config-0.2.2.tar.gz) = 20975 SIZE (cargo/lock_api-0.1.5.tar.gz) = 16967
Re: Mark lang/janet BROKEN-sparc64?
On Mon, Feb 10, 2020 at 10:46:22PM -0500, Kurt Mosiejczuk wrote: > lang/janet has never built on sparc64. It fails trying to make a > bootstrap. > > ok to mark BROKEN-sparc64? > > (cc maintainer) > > --Kurt ok jturner@ > > Index: Makefile > === > RCS file: /cvs/ports/lang/janet/Makefile,v > retrieving revision 1.17 > diff -u -p -r1.17 Makefile > --- Makefile 4 Feb 2020 23:15:01 - 1.17 > +++ Makefile 11 Feb 2020 03:44:56 - > @@ -1,5 +1,6 @@ > # $OpenBSD: Makefile,v 1.17 2020/02/04 23:15:01 jturner Exp $ > > +BROKEN-sparc64 = compile error in boot.janet > COMMENT =functional and imperative programming language > CATEGORIES = lang >
Re: WIP: Tor Browser 9.0.4
On Sat, Jan 11, 2020 at 03:43:06PM +0100, Caspar Schutijser wrote: > On Fri, Jan 10, 2020 at 10:31:15AM +, Stuart Henderson wrote: > > On 2019/12/28 09:07, Caspar Schutijser wrote: > > > During the configure stage, I got the following error: > > > mozbuild.configure.options.InvalidOptionError: --disable-eme is not > > > available in this configuration > > > In interest of getting as far as I could I patched away that flag (for > > > now; see patch-_mozconfig) but that is not a proper solution. I'm still > > > looking for a solution (hints are appreciated, of course). > > > > > > I think it is necessary to first address the --disable-eme problem > > > before we can even think about committing this. > > > > I'm no expert on firefox/tor browser, but it looks like this is for DRM > > plugins which we won't have anyway. > > I think you are right. I put a comment in patch-_mozconfig and I left > the --disable-eme line commented out, like in my previous diff. > > > > Did I use the @conflict and @pkgpath markers in PLIST correctly? I want > > > to express the fact that tor-launcher conflicts with tb-browser because > > > share/tor-browser/torrc-defaults used to be shipped with tor-launcher > > > but it now shipped with tb-browser. > > > > > @@ -1,4 +1,6 @@ > > > @comment $OpenBSD: PLIST,v 1.6 2018/09/28 14:54:26 sthen Exp $ > > > +@conflict tor-launcher-* > > > +@pkgpath www/tor-browser/tor-launcher > > > > Add > > > > @conflict torbutton-* > > @pkgpath www/tor-browser/torbutton > > > > and drop the quirks change, it is not needed when you merge into another > > package this way. > > Thank you, I incorporated your feedback in the diff below. > > Major changes besides that: > * Update to Tor Browser 9.0.4. > * Sync with www/firefox-esr: drop patches fixing build with rust 1.39. > * Add a second site to MASTER_SITES. Upstream removes distfiles of old > versions once they release a new version of their software. The second > site in MASTER_SITES then acts as a fallback. That seems built on top of a release candidate tarball (src-firefox-tor-browser-68.4.1esr-9.0-1-build1) is it expected ? Would be good to get that commited so that this port is not left rotting in-tree, can anyone give it a testbuild with rust 1.41 that just got updated ? Sean, are you planning to look at it, or do you want to relinquish maintainership and/or give it to Caspar if he wants it ? (note that i havent looked at the diff itself nor built-tested it) Landry
unbreak www/newsboat on sparc64
Hi, It seems the latest update of www/newsboat removed an explicit version on libc to fallback to the one defined by the upstream. The problem is upstream is using an old version which doesn't support OpenBSD sparc64. The following diff restore it, and should make www/newsboat to build on sparc64. Comments or OK ? -- Sebastien Marie diff 07b38a519612fa82bbc016498a210424b43b0eab /data/semarie/repos/openbsd/ports blob - efa346af0b7511878e13ae6050bbc728d1b85ac3 file + www/newsboat/Makefile --- www/newsboat/Makefile +++ www/newsboat/Makefile @@ -30,6 +30,7 @@ MODCARGO_BUILD = No MODCARGO_INSTALL = No MODCARGO_TEST =No +# keep libc >=0.2.63 for sparc64 support MODCARGO_CRATES_UPDATE += libc MODCARGO_CRATES += aho-corasick0.6.9 # Unlicense/MIT @@ -60,7 +61,7 @@ MODCARGO_CRATES +=idna0.1.5 # MIT/Apache-2.0 MODCARGO_CRATES += kernel32-sys0.2.2 # MIT MODCARGO_CRATES += lazy_static 0.2.11 # MIT/Apache-2.0 MODCARGO_CRATES += lazy_static 1.2.0 # MIT/Apache-2.0 -MODCARGO_CRATES += libc0.2.48 # MIT OR Apache-2.0 +MODCARGO_CRATES += libc0.2.63 # MIT OR Apache-2.0 MODCARGO_CRATES += libz-sys1.0.17 # MIT/Apache-2.0 MODCARGO_CRATES += locale_config 0.2.2 # MIT MODCARGO_CRATES += lock_api0.1.5 # Apache-2.0/MIT blob - e429cc4219e470d7f79f6fbd997d160804f134ef file + www/newsboat/distinfo --- www/newsboat/distinfo +++ www/newsboat/distinfo @@ -26,7 +26,7 @@ SHA256 (cargo/idna-0.1.5.tar.gz) = OPCeDwsftV/e4fF0cK2 SHA256 (cargo/kernel32-sys-0.2.2.tar.gz) = dQdiSylINDHAui2Crs6Mps26k4K/9N3Q90kFYMBWCY0= SHA256 (cargo/lazy_static-0.2.11.tar.gz) = dvAzx61hRFxbNHxzgt0SN4R+sbzlkP5QNl3LM9VGvnM= SHA256 (cargo/lazy_static-1.2.0.tar.gz) = o3TIm521WJVFOnTB44hh2d7sCwG0BaglFunV3kgg3qE= -SHA256 (cargo/libc-0.2.48.tar.gz) = 6WLHZBAIrAEPpgp9/cFxJEnynETvLUcCOUrqlD7nUEc= +SHA256 (cargo/libc-0.2.63.tar.gz) = 15WDUCv/BSPhB8pE3TZv+AfGRCtKlMzvBDLH6E+FZYM= SHA256 (cargo/libz-sys-1.0.17.tar.gz) = ROu8dg/S0vTZPeCaDhPZfgV2EgUuhx2pmFzty0Uea9U= SHA256 (cargo/locale_config-0.2.2.tar.gz) = FPvuDjm8LdaiQnxP3qZumCbMH9CbCgt1UDWfX27+Has= SHA256 (cargo/lock_api-0.1.5.tar.gz) = YuvxOR9qytYOXItDcG3eRYLfdcBmmKtEUR0VAWvCRCw= @@ -129,7 +129,7 @@ SIZE (cargo/idna-0.1.5.tar.gz) = 258735 SIZE (cargo/kernel32-sys-0.2.2.tar.gz) = 24537 SIZE (cargo/lazy_static-0.2.11.tar.gz) = 12361 SIZE (cargo/lazy_static-1.2.0.tar.gz) = 10840 -SIZE (cargo/libc-0.2.48.tar.gz) = 353045 +SIZE (cargo/libc-0.2.63.tar.gz) = 437880 SIZE (cargo/libz-sys-1.0.17.tar.gz) = 632674 SIZE (cargo/locale_config-0.2.2.tar.gz) = 20975 SIZE (cargo/lock_api-0.1.5.tar.gz) = 16967
[update patch] bogofilter 1.2.4 -> 1.2.5
This patch updates bogofilter from 1.2.4 to 1.2.5.
Tested the new version on three amd64 systems in the db4-flavor.
Index: Makefile
===
RCS file: /cvs/ports/mail/bogofilter/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- Makefile12 Jul 2019 20:47:25 - 1.31
+++ Makefile11 Feb 2020 11:20:23 -
@@ -2,14 +2,14 @@
COMMENT = bayesian spam filter
-DISTNAME = bogofilter-1.2.4
+DISTNAME = bogofilter-1.2.5
CATEGORIES = mail
-REVISION = 2
MAINTAINER = Marc Espie
HOMEPAGE = http://bogofilter.sourceforge.net/
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=bogofilter/}
+EXTRACT_SUFX= .tar.xz
# GPLv2/GPLv3
PERMIT_PACKAGE = Yes
Index: distinfo
===
RCS file: /cvs/ports/mail/bogofilter/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo20 Oct 2014 08:38:54 - 1.8
+++ distinfo11 Feb 2020 11:20:23 -
@@ -1,2 +1,2 @@
-SHA256 (bogofilter-1.2.4.tar.gz) = 0vJZjRMAMHIJt7GQXMBjfS0FPApHAajUQ4OGcplXhHE=
-SIZE (bogofilter-1.2.4.tar.gz) = 1083344
+SHA256 (bogofilter-1.2.5.tar.xz) = MkihNzv/VSxQCDStvqS2yu4EIkUWrlgfslpMam3uieo=
+SIZE (bogofilter-1.2.5.tar.xz) = 801240
Re: patch: lang/rust 1.41.0
On Sun, Feb 09 2020, Sebastien Marie wrote: > Hi, > > Now the llvm bug is fixed (see > https://marc.info/?l=openbsd-ports-cvs&m=158122886608568&w=2), > all archs I tested are green (amd64, i386, aarch64). > > The following diff update lang/rust to 1.41.0 > > Announce: https://blog.rust-lang.org/2020/01/30/Rust-1.41.0.html > ChangeLog: > https://github.com/rust-lang/rust/blob/master/RELEASES.md#version-1410-2020-01-30 > > Tested fully on amd64 (testsuite, all ports using lang/rust including all > firefox versions), a bit less on i386 (firefox and ncspot), and just the build > on aarch64. > > For people which would test it, specially on i386, please ensuring you are > using llvm-8.0.1p6: else it will build (my bootstrap is using new llvm) but > might fail at runtime (the package will use the bugged llvm). > > Comments or OK ? This packaged on sparc64, and successfully built sysutils/exa, x11/gnome/librsvg and www/zola. I had also started a build of www/newsboat and this one failed, I have since restarted it with MAKE_JOBS=1 just in case, build result still pending. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: pledge net/ngircd
Hello Matthias,
On Mon, Feb 10, 2020 at 02:43:05PM +0100, Matthias Schmidt wrote:
> Hi Michael,
>
> On 10.02.2020 14:31, Michael wrote:
> > On Fri, Feb 07, 2020 at 03:27:33PM +0100, Michael wrote:
> > > Hello ports@,
> > >
> > > this patch adds pledge() to net/ngircd. Tested on amd64 with ngircd
> > > running with TLS. Unfortunately the promises can't be further reduced
> > > since this would break /rehash (i.e. reloading the config) later. But
> > > this is better than nothing.
> > >
> > > [...]
> >
> > solene@ pointed out that if the option "PidFile" is being used
> > unlink()ing the file later fails. However I personally don't like adding
> > another promise just for that. I can't see any sensible use case for
> > ngircds PID file; the Option itself is not set by default.
> >
> > So my idea would be to either skip or remove the PidFile code, or just
> > ignore the issue. The abort happens after shutting everything else down
> > and starting ngircd again works even if the old PID file is still in
> > place. Both variants mean changing or breaking functionality but that
> > would be bearable given the low impact IMHO. Using unveil() might also
> > be an option.
> >
> > Any thoughts on this?
>
> Active ngircd user here. I personally use the PID file with my monitoring
> system
> for process supervision (monit in my case). Although I could use process
> name
> matching, getting the PID from the PIDFile seems more natural.
>
> Cheers
>
> Matthias
>
> PS: I would appreciate a pledged ngircd very much.
>
Yes, pledge() for ngircd is long overdue :) Below is an updated patch
that handles having PidFile configured. I am unsure if details like
having PidFile set enables the "cpath" promise should be documented or
not.
Index: Makefile
===
RCS file: /cvs/ports/net/ngircd/Makefile,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 Makefile
--- Makefile12 Jul 2019 20:48:34 - 1.18
+++ Makefile11 Feb 2020 10:24:57 -
@@ -4,6 +4,8 @@ COMMENT = lightweight irc server
DISTNAME = ngircd-25
+REVISION = 0
+
CATEGORIES = net
HOMEPAGE = https://ngircd.barton.de/
Index: patches/patch-src_ngircd_ngircd_c
===
RCS file: /cvs/ports/net/ngircd/patches/patch-src_ngircd_ngircd_c,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-src_ngircd_ngircd_c
--- patches/patch-src_ngircd_ngircd_c 3 Dec 2014 10:32:18 - 1.4
+++ patches/patch-src_ngircd_ngircd_c 11 Feb 2020 10:24:57 -
@@ -1,7 +1,25 @@
$OpenBSD: patch-src_ngircd_ngircd_c,v 1.4 2014/12/03 10:32:18 jasper Exp $
src/ngircd/ngircd.c.orig Mon Jul 14 13:26:07 2014
-+++ src/ngircd/ngircd.cTue Dec 2 20:05:31 2014
-@@ -563,7 +563,7 @@ Setup_FDStreams(int fd)
+Index: src/ngircd/ngircd.c
+--- src/ngircd/ngircd.c.orig
src/ngircd/ngircd.c
+@@ -259,6 +259,16 @@ main(int argc, const char *argv[])
+ exit(1);
+ }
+
++ /* XXX using a PID file needs cpath to unlink() later */
++ if(Conf_PidFile[0]) {
++ if ( pledge("stdio inet dns rpath proc getpw cpath",
NULL) == -1)
++ err(1, "pledge");
++ }
++ else {
++ if ( pledge("stdio inet dns rpath proc getpw", NULL) ==
-1)
++ err(1, "pledge");
++ }
++
+ /* Initialize modules, part II: these functions are eventually
+* called with already dropped privileges ... */
+ Channel_Init();
+@@ -563,7 +573,7 @@ Setup_FDStreams(int fd)
#if !defined(SINGLE_USER_OS)
/**
@@ -10,7 +28,7 @@ $OpenBSD: patch-src_ngircd_ngircd_c,v 1.
*
* @param uid User ID
* @param gid Group ID
-@@ -587,7 +587,7 @@ NGIRCd_getNobodyID(uid_t *uid, gid_t *gid )
+@@ -587,7 +597,7 @@ NGIRCd_getNobodyID(uid_t *uid, gid_t *gid )
}
#endif
@@ -19,7 +37,7 @@ $OpenBSD: patch-src_ngircd_ngircd_c,v 1.
if (!pwd)
return false;
-@@ -703,11 +703,11 @@ NGIRCd_Init(bool NGIRCd_NoDaemon)
+@@ -703,11 +713,11 @@ NGIRCd_Init(bool NGIRCd_NoDaemon)
if (Conf_UID == 0) {
pwd = getpwuid(0);
Log(LOG_INFO,
Index: patches/patch-src_ngircd_proc_c
===
RCS file: patches/patch-src_ngircd_proc_c
diff -N patches/patch-src_ngircd_proc_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_ngircd_proc_c 11 Feb 2020 10:24:57 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Index: src/ngircd/proc.c
+--- src/ngircd/proc.c.orig
src/ngircd/proc.c
+@@ -76,6 +76,9 @@ Proc_Fork(PROC_STAT *proc, int *pipefds, void (*cbfunc
+ return -1;
+ case 0:
+ /* New child process: */
++ /* XXX no PAM, fork only for DNS */
++ if (pledge("stdio dns",
Re: UPDATE www/e2guardian-5.3.4
On Mon, Feb 10 2020, Björn Ketelaars wrote:
> Diff below brings e2guardian to 5.3.4, which is a bug fix release. From
> changelog [0]:
> - Fix #565 segfault when no write permission on generated certs
> directory
> - Fix #493 referexception not working
> - Fix #549 - Url in CGI and bypass wrong in MITM
> - Bug fix sigwait code for OpenBSD
>
> Changes to the port:
> - Upstream has fixed sigwait code, as such remove relevant bits from
> patch-src_FatController_cpp
It's sad that upstream has to emulate sigtimedwait using sigwait and
SIGALRM. I hope the emulation is as correct as what our patch did.
> Testing:
> - Lightly run tested on amd64. Note that I only played a bit with this
> port, nothing serious.
>
> Comments/OK?
The new files in PLIST should probably be @sampled.
> [0] https://github.com/e2guardian/e2guardian/blob/v5.3.4/ChangeLog
>
>
> diff --git Makefile Makefile
> index 6ed036472e1..188a525976b 100644
> --- Makefile
> +++ Makefile
> @@ -2,7 +2,7 @@
>
> GH_ACCOUNT = e2guardian
> GH_PROJECT = e2guardian
> -GH_TAGNAME = 5.3.3
> +GH_TAGNAME = v5.3.4
>
> COMMENT =content scanning web filter
> CATEGORIES = www net
> diff --git distinfo distinfo
> index b8064b9d2a3..bc0d2e23fad 100644
> --- distinfo
> +++ distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (e2guardian-5.3.3.tar.gz) =
> nYj30sM54BWG0mfyWjAYaC0RW4qq3Bi+2uke+rUchbQ=
> -SIZE (e2guardian-5.3.3.tar.gz) = 2009254
> +SHA256 (e2guardian-5.3.4.tar.gz) =
> CaEH/Xkb6S7csIN7j9ytYmkoFi0F4xrlP6j+Ott9VlI=
> +SIZE (e2guardian-5.3.4.tar.gz) = 2083057
> diff --git patches/patch-configs_e2guardian_conf_in
> patches/patch-configs_e2guardian_conf_in
> index f5554370e95..21b191f1cc9 100644
> --- patches/patch-configs_e2guardian_conf_in
> +++ patches/patch-configs_e2guardian_conf_in
> @@ -3,10 +3,10 @@ $OpenBSD: patch-configs_e2guardian_conf_in,v 1.1.1.1
> 2019/09/18 16:34:03 sthen E
> Index: configs/e2guardian.conf.in
> --- configs/e2guardian.conf.in.orig
> +++ configs/e2guardian.conf.in
> -@@ -568,7 +568,7 @@ logconnectionhandlingerrors = on
> - # This figure is the maximum number of concurrent connections.
> - # If more connections are made, connections will queue until a worker
> thread is free.
> - # On large site you might want to try 5000 (max value 2)
> +@@ -577,7 +577,7 @@ logconnectionhandlingerrors = on
> + # On 32-bit systems reduce this to 300 to avoid exceeding the <4GB
> + # virtual memory limit and on Linux decrease the thread stack size from
> + # 10MB to 2MB (ulimit -s 2048)
> -httpworkers = 500
> +httpworkers = 50
>
> diff --git patches/patch-configs_e2guardianf1_conf_in
> patches/patch-configs_e2guardianf1_conf_in
> index 2d1623471ba..b68ad4f9c7c 100644
> --- patches/patch-configs_e2guardianf1_conf_in
> +++ patches/patch-configs_e2guardianf1_conf_in
> @@ -3,7 +3,7 @@ $OpenBSD: patch-configs_e2guardianf1_conf_in,v 1.1.1.1
> 2019/09/18 16:34:03 sthen
> Index: configs/e2guardianf1.conf.in
> --- configs/e2guardianf1.conf.in.orig
> +++ configs/e2guardianf1.conf.in
> -@@ -303,7 +303,7 @@ bypasskey = ''
> +@@ -308,7 +308,7 @@ bypasskey = ''
> #cgikey = 'you must change this text in order to be secure'
>
> # Users will not be able to bypass sites/urls in these lists
> diff --git patches/patch-src_FatController_cpp
> patches/patch-src_FatController_cpp
> index cbbe878a4e5..8b44d503ef4 100644
> --- patches/patch-src_FatController_cpp
> +++ patches/patch-src_FatController_cpp
> @@ -3,18 +3,7 @@ $OpenBSD: patch-src_FatController_cpp,v 1.1.1.1 2019/09/18
> 16:34:03 sthen Exp $
> Index: src/FatController.cpp
> --- src/FatController.cpp.orig
> +++ src/FatController.cpp
> -@@ -46,6 +46,10 @@
> - #include
> - #endif //__SSLMITM
> -
> -+#if defined(__OpenBSD__)
> -+#include
> -+#endif
> -+
> - #include "FatController.hpp"
> - #include "ConnectionHandler.hpp"
> - #include "DynamicURLList.hpp"
> -@@ -194,7 +198,7 @@ void stat_rec::reset()
> +@@ -194,7 +194,7 @@ void stat_rec::reset()
> fprintf(fs, "%s %d %d %d %d %ld %ld
> %ld %ld%d %d\n", buffer, o.http_workers,
> bc, o.http_worker_Q.size(), o.log_Q->size(), cnx, cps, rqx, rqs,
> mfd, LC);
> } else {
> @@ -23,15 +12,3 @@ Index: src/FatController.cpp
> bc, o.http_worker_Q.size(), o.log_Q->size(), cnx, cps, rqx, rqs,
> mfd, LC);
> }
>
> -@@ -1696,7 +1700,11 @@ int fc_controlit() //
> - }
> - timeout.tv_sec = 5;
> - timeout.tv_nsec = (long) 0;
> -+#if defined(__OpenBSD__)
> -+rc = syscall(SYS___thrsigdivert, signal_set, NULL, &timeout);
> -+#else
> - rc = sigtimedwait(&signal_set, NULL, &timeout);
> -+#endif
> - if (rc < 0) {
> - if (errno != EAGAIN) {
> - syslog(LOG_INFO, "%sUnexpected error from sigtimedwait() %d
> %s", thread_id.c_str(), errno, strerror(errno));
> diff --git pkg/PLIST pkg/PLIST
> index 969d2736f05..97401f52af8 100644
> --- pkg/PLIST
> +++ pkg/PLIST
> @@ -
