CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: r...@cvs.openbsd.org2023/05/23 14:34:08 Modified files: devel/libfastjson: Makefile distinfo Log message: update libfastjson to 1.2304.0 This update changes to a new versioning schema and contains a fix for CVE-2020-12762. OK tb@
[update] libfastjson 1.2304.0
Hi, This update for libfasjson has few changes compared to version 0.99.9: - new versioning schema (rsyslog) - fix for CVE-2020-12762 According to the ChangeLog the CVE did not affect rsyslog. Since there are no dynamic export changes I did not crank SHARED_LIBS. OK? Remi Index: Makefile === RCS file: /cvs/ports/devel/libfastjson/Makefile,v retrieving revision 1.4 diff -u -p -r1.4 Makefile --- Makefile11 Mar 2022 18:50:31 - 1.4 +++ Makefile21 May 2023 15:09:06 - @@ -1,6 +1,6 @@ COMMENT = performance-focused JSON library for C -DISTNAME = libfastjson-0.99.9 +DISTNAME = libfastjson-1.2304.0 CATEGORIES = devel Index: distinfo === RCS file: /cvs/ports/devel/libfastjson/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo27 Jan 2021 15:51:01 - 1.2 +++ distinfo21 May 2023 15:09:13 - @@ -1,2 +1,2 @@ -SHA256 (libfastjson-0.99.9.tar.gz) = ozDhve8wlrfq1TtLrRphWPGbqcnsfDbtpX3ncp2Equ4= -SIZE (libfastjson-0.99.9.tar.gz) = 436502 +SHA256 (libfastjson-1.2304.0.tar.gz) = 7zDR5XoY7HcPkAVqqsdzACcMYgO75Hb0GBzIOi1dyAw= +SIZE (libfastjson-1.2304.0.tar.gz) = 436726
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: r...@cvs.openbsd.org2023/04/10 03:01:56 Modified files: sysutils/librelp: Makefile distinfo Log message: update librelp to version 1.10.0 ok tb
Re: [update] librelp version 1.10.0
On Sun, Mar 12, 2023 at 11:23:20PM +0100, Remi Locherer wrote: > Hi, > > This is an update for librelp to version 1.10.0. > > The changelog lists "TLS handling bugfix" for version 1.10.0: > https://github.com/rsyslog/librelp/blob/master/ChangeLog > > All tests pass but the ones using LibreSSL. It is the same issue as > last time: The test certs include errors. Nevertheless, GnuTLS and > OpenSSL validate them successful. > Details from last update: > https://marc.info/?l=openbsd-ports=16129288212=2 > > I verified with rsyslogd that imrelp and omrelp with and without TLS > are working. > > According to nm and also check_sym the SHARED_LIBS can stay as it is. > > I intend to commit this after the release of 7.3. > > OK? > > Remi > ping Index: Makefile === RCS file: /cvs/ports/sysutils/librelp/Makefile,v retrieving revision 1.23 diff -u -p -r1.23 Makefile --- Makefile31 Mar 2022 13:37:03 - 1.23 +++ Makefile4 Mar 2023 21:26:43 - @@ -1,7 +1,6 @@ COMMENT = reliable event logging protocol library -DISTNAME = librelp-1.9.0 -REVISION = 1 +DISTNAME = librelp-1.10.0 SHARED_LIBS += relp 5.0 # 5.0 Index: distinfo === RCS file: /cvs/ports/sysutils/librelp/distinfo,v retrieving revision 1.10 diff -u -p -r1.10 distinfo --- distinfo10 Feb 2021 21:26:44 - 1.10 +++ distinfo27 Feb 2023 09:08:56 - @@ -1,2 +1,2 @@ -SHA256 (librelp-1.9.0.tar.gz) = JO6ehDlg0UAKRP+u2wseyRRj34+KzKhpzAJ+0l7mvzM= -SIZE (librelp-1.9.0.tar.gz) = 540477 +SHA256 (librelp-1.10.0.tar.gz) = FI205NGiPoE26ewIgQkppV+vXUXiTC4xhtWrNDVdqzE= +SIZE (librelp-1.10.0.tar.gz) = 543414
[update] librelp version 1.10.0
Hi, This is an update for librelp to version 1.10.0. The changelog lists "TLS handling bugfix" for version 1.10.0: https://github.com/rsyslog/librelp/blob/master/ChangeLog All tests pass but the ones using LibreSSL. It is the same issue as last time: The test certs include errors. Nevertheless, GnuTLS and OpenSSL validate them successful. Details from last update: https://marc.info/?l=openbsd-ports=16129288212=2 I verified with rsyslogd that imrelp and omrelp with and without TLS are working. According to nm and also check_sym the SHARED_LIBS can stay as it is. I intend to commit this after the release of 7.3. OK? Remi Index: Makefile === RCS file: /cvs/ports/sysutils/librelp/Makefile,v retrieving revision 1.23 diff -u -p -r1.23 Makefile --- Makefile31 Mar 2022 13:37:03 - 1.23 +++ Makefile4 Mar 2023 21:26:43 - @@ -1,7 +1,6 @@ COMMENT = reliable event logging protocol library -DISTNAME = librelp-1.9.0 -REVISION = 1 +DISTNAME = librelp-1.10.0 SHARED_LIBS += relp 5.0 # 5.0 Index: distinfo === RCS file: /cvs/ports/sysutils/librelp/distinfo,v retrieving revision 1.10 diff -u -p -r1.10 distinfo --- distinfo10 Feb 2021 21:26:44 - 1.10 +++ distinfo27 Feb 2023 09:08:56 - @@ -1,2 +1,2 @@ -SHA256 (librelp-1.9.0.tar.gz) = JO6ehDlg0UAKRP+u2wseyRRj34+KzKhpzAJ+0l7mvzM= -SIZE (librelp-1.9.0.tar.gz) = 540477 +SHA256 (librelp-1.10.0.tar.gz) = FI205NGiPoE26ewIgQkppV+vXUXiTC4xhtWrNDVdqzE= +SIZE (librelp-1.10.0.tar.gz) = 543414
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: r...@cvs.openbsd.org2023/03/02 13:38:29 Modified files: devel : Makefile Log message: add py-aiostream and py-test-httpserver
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: r...@cvs.openbsd.org2023/03/02 13:33:18 Log message: py-aiostream: generator-based operators for asynchronous iteration this is a dependency of an upcomming vdirsyncer update OK sthen@ Status: Vendor Tag: remi Release Tags: remi_20230302 N ports/devel/py-aiostream/Makefile N ports/devel/py-aiostream/distinfo N ports/devel/py-aiostream/pkg/DESCR N ports/devel/py-aiostream/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: r...@cvs.openbsd.org2023/03/02 13:31:02 Log message: py-test-httpserver: HTTP server for pytes this a test dependency of an upcomming vdirsyncer update input and OK sthen@ Status: Vendor Tag: remi Release Tags: remi_20230302 N ports/devel/py-test-httpserver/Makefile N ports/devel/py-test-httpserver/distinfo N ports/devel/py-test-httpserver/pkg/DESCR N ports/devel/py-test-httpserver/pkg/PLIST No conflicts created by this import
Re: prep for vdirsyncer update: new deps
On Thu, Mar 02, 2023 at 02:06:43PM +, Stuart Henderson wrote:
> On 2023/03/02 10:37, Remi Locherer wrote:
> > On Mon, Feb 27, 2023 at 11:08:04AM +, Stuart Henderson wrote:
> > > It would be easier to review a single egz for all the ports, avoiding
> > > the need to save each tgz separately, figure out the category, untar.
> > >
> >
> > Attached to this email the two remaining ports for review.
>
> Thanks.
>
> py-test-httpserver needs this;
>
> TEST_DEPENDS =${BUILD_PKGPATH} \
> textproc/py-toml${MODPY_FLAVOR}
>
> otherwise OK for both.
>
Ups ... thanks for noticing it!
Re: prep for vdirsyncer update: new deps
On Mon, Feb 27, 2023 at 11:08:04AM +, Stuart Henderson wrote: > On 2023/02/26 21:56, Remi Locherer wrote: > > Hi, > > > > I worked on updating vdirsyncer but figured out, that the new version > > does not support digest auth yet. > > --> https://github.com/pimutils/vdirsyncer/issues/1015 > > > > The major change is the move to an asyncio backend which results in > > new deps. Some of the new deps require new ports. > > > > I send these new ports now hoping digest auth gets fixed in the > > near future and the update is then easier since all deps will be > > available as port. > > OK for > > py-aiohttp-oauthlib > py-aioresponses > py-ddt Thank you! I just commited these. > > I didn't look at the others yet. > > > These are the new ports I'd like to import: > > - devel/py-aiostream > > - devel/py-test-httpserver > > The test suite would require approx 7 additional new ports ... > > - www/py-aiohttp-oauthlib > > - devel/py-aioresponses > > - devel/py-ddt > > This is a test dep of py-aioresponses > > > > All ports are attached to this email as tgz. I can also send them > > individually if that makes the review simpler. > > It would be easier to review a single egz for all the ports, avoiding > the need to save each tgz separately, figure out the category, untar. > Attached to this email the two remaining ports for review. Remi py-aiostream_py-test-httpserver.tgz Description: application/tar-gz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: r...@cvs.openbsd.org2023/03/02 02:31:32 Modified files: devel : Makefile Log message: add devel/py-aioresponses and devel/py-ddt
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: r...@cvs.openbsd.org2023/03/02 02:28:24 Modified files: www: Makefile Log message: add www/py-aiohttp-oauthlib
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: r...@cvs.openbsd.org2023/03/02 02:24:19 Log message: py-ddt: multiply test cases this is a test dependency of the just imported py-aioresponses OK sthen@ Status: Vendor Tag: remi Release Tags: remi_20230302 N ports/devel/py-ddt/Makefile N ports/devel/py-ddt/distinfo N ports/devel/py-ddt/pkg/DESCR N ports/devel/py-ddt/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: r...@cvs.openbsd.org2023/03/02 02:21:50 Log message: py-aioresponses: mock out requests made by ClientSession from aiohttp this is a dependency of an upcomming vdirsyncher update OK sthen@ Status: Vendor Tag: remi Release Tags: remi_20230302 N ports/devel/py-aioresponses/Makefile N ports/devel/py-aioresponses/distinfo N ports/devel/py-aioresponses/pkg/DESCR N ports/devel/py-aioresponses/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: r...@cvs.openbsd.org2023/03/02 02:18:02 Log message: py-aiohttp-oauthlib: oauthlib for aiohttp clients this is a dependency of an upcomming vdirsyncher update OK sthen@ Status: Vendor Tag: remi Release Tags: remi_20230302 N ports/www/py-aiohttp-oauthlib/Makefile N ports/www/py-aiohttp-oauthlib/distinfo N ports/www/py-aiohttp-oauthlib/pkg/DESCR N ports/www/py-aiohttp-oauthlib/pkg/PLIST No conflicts created by this import
prep for vdirsyncer update: new deps
Hi, I worked on updating vdirsyncer but figured out, that the new version does not support digest auth yet. --> https://github.com/pimutils/vdirsyncer/issues/1015 The major change is the move to an asyncio backend which results in new deps. Some of the new deps require new ports. I send these new ports now hoping digest auth gets fixed in the near future and the update is then easier since all deps will be available as port. These are the new ports I'd like to import: - devel/py-aiostream - devel/py-test-httpserver The test suite would require approx 7 additional new ports ... - www/py-aiohttp-oauthlib - devel/py-aioresponses - devel/py-ddt This is a test dep of py-aioresponses All ports are attached to this email as tgz. I can also send them individually if that makes the review simpler. Remi py-aiostream.tgz Description: application/tar-gz py-test-httpserver.tgz Description: application/tar-gz py-aiohttp-oauthlib.tgz Description: application/tar-gz py-aioresponses.tgz Description: application/tar-gz py-ddt.tgz Description: application/tar-gz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: r...@cvs.openbsd.org2022/10/06 14:34:55 Modified files: sysutils/rsyslog: Makefile distinfo Removed files: sysutils/rsyslog/patches: patch-runtime_nsd_ossl_c Log message: Update rsyslog to v8.2208.0. The patch because of SSL_get_shared_curve is not needed anymore. ok tb
[update] rsyslog v8.2208.0
Hi,
this updates the rsyslog port to version 8.2208.0. The changelog is
available here: https://github.com/rsyslog/rsyslog/blob/master/ChangeLog
tb@ let me know that the patch for SSL_get_shared_curve is not
needed anymore.
I verified that the four enabled rsyslog related tests in the syslogd
regress suite work. In addition I tested the following modules:
imfile, omfile, imudp, ommysql
OK?
Remi
Index: Makefile
===
RCS file: /cvs/ports/sysutils/rsyslog/Makefile,v
retrieving revision 1.54
diff -u -p -r1.54 Makefile
--- Makefile24 May 2022 21:55:44 - 1.54
+++ Makefile25 Aug 2022 06:50:08 -
@@ -6,7 +6,7 @@ COMMENT-elasticsearch = Elasticsearch pl
MULTI_PACKAGES = -main -mysql -normalize -pgsql -elasticsearch
-V =8.2204.1
+V =8.2208.0
DISTNAME = rsyslog-$V
PKGNAME-main = rsyslog-$V
PKGNAME-mysql =rsyslog-mysql-$V
Index: distinfo
===
RCS file: /cvs/ports/sysutils/rsyslog/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo24 May 2022 21:55:44 - 1.12
+++ distinfo25 Aug 2022 06:50:27 -
@@ -1,2 +1,2 @@
-SHA256 (rsyslog-8.2204.1.tar.gz) = ptcx5GrT1k9q1LGbvxv1bKR2CkSiS7loIxidwucfcCg=
-SIZE (rsyslog-8.2204.1.tar.gz) = 3243183
+SHA256 (rsyslog-8.2208.0.tar.gz) = FN5o57jlqwxdc0+C4tyf/yLNf0cQrWkHJ+sQp7mz314=
+SIZE (rsyslog-8.2208.0.tar.gz) = 3262298
Index: patches/patch-runtime_nsd_ossl_c
===
RCS file: patches/patch-runtime_nsd_ossl_c
diff -N patches/patch-runtime_nsd_ossl_c
--- patches/patch-runtime_nsd_ossl_c24 May 2022 21:55:45 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,13 +0,0 @@
-Index: runtime/nsd_ossl.c
runtime/nsd_ossl.c.orig
-+++ runtime/nsd_ossl.c
-@@ -1415,7 +1415,8 @@ osslPostHandshakeCheck(nsd_ossl_t *pNsd)
- if (SSL_get_shared_ciphers(pNsd->ssl,szDbg, sizeof szDbg) != NULL)
- dbgprintf("osslPostHandshakeCheck: Debug Shared ciphers =
%s\n", szDbg);
-
-- #if OPENSSL_VERSION_NUMBER >= 0x10002000L
-+ #if OPENSSL_VERSION_NUMBER >= 0x10002000L \
-+ && !defined(LIBRESSL_VERSION_NUMBER)
- if(SSL_get_shared_curve(pNsd->ssl, -1) == 0) {
- // This is not a failure
- LogMsg(0, RS_RET_NO_ERRCODE, LOG_INFO, "nsd_ossl: "
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: r...@cvs.openbsd.org2022/05/24 16:19:36 Modified files: sysutils/rsyslog: Tag: OPENBSD_7_1 Makefile distinfo sysutils/rsyslog/files: Tag: OPENBSD_7_1 rsyslog.conf Log message: update rsyslog to version 8.2204.1 This includes a fix for CVE-2022-24903. @sthen OKed the update to -current and suggested I also update -stable. (for -current I enabled openssl support which I left out for -stable)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: r...@cvs.openbsd.org2022/05/24 15:55:45 Modified files: sysutils/rsyslog: Makefile distinfo sysutils/rsyslog/files: rsyslog.conf sysutils/rsyslog/pkg: PLIST-main Added files: sysutils/rsyslog/patches: patch-runtime_nsd_ossl_c Log message: update rsyslog to version 8.2204.1 This includes a fix for CVE-2022-24903. Additionally enable openssl support. OK stehn@
[update] rsyslog version 8.2204.1
Hi,
this is a long overdue update for rsyslog. The changelog can be found here:
https://github.com/rsyslog/rsyslog/blob/v8.2204.1/ChangeLog
The last change included is a fix for CVE-2022-24903 which is a heap buffer
overflow in modules that receive messages via TCP.
I added a small patch which allows to compile rsyslog with openssl support.
I tested with the regress tests from syslogd (4 enabled tests). Additionally
I verified that these modules work: omfile, ommysql, imtcp (gtls and ossl).
OK?
Remi
Index: Makefile
===
RCS file: /cvs/ports/sysutils/rsyslog/Makefile,v
retrieving revision 1.53
diff -u -p -r1.53 Makefile
--- Makefile31 Mar 2022 13:37:04 - 1.53
+++ Makefile22 May 2022 10:48:28 -
@@ -6,7 +6,7 @@ COMMENT-elasticsearch = Elasticsearch pl
MULTI_PACKAGES = -main -mysql -normalize -pgsql -elasticsearch
-V =8.2102.0
+V =8.2204.1
DISTNAME = rsyslog-$V
PKGNAME-main = rsyslog-$V
PKGNAME-mysql =rsyslog-mysql-$V
@@ -15,8 +15,6 @@ PKGNAME-pgsql = rsyslog-pgsql-$V
PKGNAME-elasticsearch =rsyslog-elasticsearch-$V
CATEGORIES = sysutils
-REVISION-main =0
-
HOMEPAGE = https://www.rsyslog.com/
MAINTAINER = Remi Locherer
@@ -27,11 +25,10 @@ PERMIT_PACKAGE =Yes
COMPILER = base-clang ports-gcc base-gcc
WANTLIB-main +=c crypto curl estr fastjson gcrypt gmp gnutls
-WANTLIB-main +=gpg-error hogweed iconv idn2 intl nettle nghttp2
+WANTLIB-main +=gpg-error hogweed iconv idn2 intl m nettle
nghttp2
WANTLIB-main +=p11-kit pthread relp ssl tasn1 unistring uuid z
WANTLIB-main +=brotlidec brotlienc execinfo zstd
-
WANTLIB-mysql += crypto m mariadb pthread ssl z
WANTLIB-normalize += estr fastjson lognorm pthread
@@ -65,6 +62,7 @@ CONFIGURE_ARGS += --enable-pgsql \
--enable-mail \
--enable-mmnormalize \
--enable-gnutls \
+ --enable-openssl \
--enable-relp \
--enable-elasticsearch \
--enable-imfile
Index: distinfo
===
RCS file: /cvs/ports/sysutils/rsyslog/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo7 Mar 2021 09:28:36 - 1.11
+++ distinfo7 May 2022 09:25:18 -
@@ -1,2 +1,2 @@
-SHA256 (rsyslog-8.2102.0.tar.gz) = lO4NAxLC7epzdmVZTL5KlHXk47WT4StbiuOnQ6yccqc=
-SIZE (rsyslog-8.2102.0.tar.gz) = 3123684
+SHA256 (rsyslog-8.2204.1.tar.gz) = ptcx5GrT1k9q1LGbvxv1bKR2CkSiS7loIxidwucfcCg=
+SIZE (rsyslog-8.2204.1.tar.gz) = 3243183
Index: files/rsyslog.conf
===
RCS file: /cvs/ports/sysutils/rsyslog/files/rsyslog.conf,v
retrieving revision 1.3
diff -u -p -r1.3 rsyslog.conf
--- files/rsyslog.conf 11 Mar 2022 19:57:57 - 1.3
+++ files/rsyslog.conf 23 May 2022 19:38:59 -
@@ -4,8 +4,10 @@
# like we have with the default config. For more advanced
# things, RainerScript configuration is suggested.
#
-# For more information see http://www.rsyslog.com/doc/rsyslog_conf.html
-# If you experience problems, see http://www.rsyslog.com/doc/troubleshoot.html
+# For more information see
+# https://www.rsyslog.com/doc/v8-stable/configuration/index.html
+# If you experience problems, see
+# https://www.rsyslog.com/doc/v8-stable/troubleshooting/index.html
MODULES
Index: patches/patch-runtime_nsd_ossl_c
===
RCS file: patches/patch-runtime_nsd_ossl_c
diff -N patches/patch-runtime_nsd_ossl_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-runtime_nsd_ossl_c7 Mar 2022 09:35:49 -
@@ -0,0 +1,13 @@
+Index: runtime/nsd_ossl.c
+--- runtime/nsd_ossl.c.orig
runtime/nsd_ossl.c
+@@ -1415,7 +1415,8 @@ osslPostHandshakeCheck(nsd_ossl_t *pNsd)
+ if (SSL_get_shared_ciphers(pNsd->ssl,szDbg, sizeof szDbg) != NULL)
+ dbgprintf("osslPostHandshakeCheck: Debug Shared ciphers =
%s\n", szDbg);
+
+- #if OPENSSL_VERSION_NUMBER >= 0x10002000L
++ #if OPENSSL_VERSION_NUMBER >= 0x10002000L \
++ && !defined(LIBRESSL_VERSION_NUMBER)
+ if(SSL_get_shared_curve(pNsd->ssl, -1) == 0) {
+ // This is not a failure
+ LogMsg(0, RS_RET_NO_ERRCODE, LOG_INFO, "nsd_ossl: "
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/sysutils/rsyslog/pkg/PLIST-main,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST-main
--- pkg/PLIST-main 11 Mar 2022 19:57:57 - 1.8
+++ pkg/PLIST-main 8 May 2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: r...@cvs.openbsd.org2022/01/23 10:10:08 Modified files: sysutils : Makefile devel/quirks : Makefile devel/quirks/files: Quirks.pm infrastructure/db: user.list Removed files: sysutils/netshot: Makefile distinfo sysutils/netshot/patches: patch-netshot_conf sysutils/netshot/pkg: DESCR PLIST README netshot.rc Log message: removal of sysutils/netshot Since version 0.16.0 released in February 2021, Netshot requires the GraalVM JRE in order to run JavaScript and Python. GraalVM is not available in ports. It is better to delete Netshot from ports than to ship an outdated version with old Java libraries. OK sthen
Re: removal of sysutils/netshot
On Sun, Jan 02, 2022 at 07:38:18PM +0100, Remi Locherer wrote: > Hi, > > Since version 0.16.0 release in February 2021, Netshot requires the > GraalVM JRE in order to run JavaScript and Python. GraalVM [1] is > not in ports an I guess it would be a lot of work. I think it is > better to delete Netshot from ports than to ship an old version > with old Java libraries. > > For quirks I thought to flag it with '11 => "no longer packageable"'. > > Opinions?, OKs? > > Remi > > [1] https://www.graalvm.org/ > Any opinions or OKs for this? Remi
removal of sysutils/netshot
Hi, Since version 0.16.0 release in February 2021, Netshot requires the GraalVM JRE in order to run JavaScript and Python. GraalVM [1] is not in ports an I guess it would be a lot of work. I think it is better to delete Netshot from ports than to ship an old version with old Java libraries. For quirks I thought to flag it with '11 => "no longer packageable"'. Opinions?, OKs? Remi [1] https://www.graalvm.org/
update rsyslog to version 8.2102.0
This is an update for rsyslog to version 8.2102.0. The changelog is rather long and can be found here: https://github.com/rsyslog/rsyslog/blob/master/ChangeLog I verified that the modules imfile, omfile and ommysql still work. In addition I tested with the 6 syslogd regress tests that involve rsyslog. With the exception of run-args-rsyslog-tls.pl they succeed. This failing test also fails with the version that is already in ports. Last time I updated the rsyslog port all 6 tests worked fine. Maybe it is related to something GnuTLS? When trying with "openssl s_client -connect ..." I only get the "connect" output line. This is also the same when I try with eopenssl11. I propose to update rsyslog even with this test failing since it is not different from what we have in ports now. Remi Index: Makefile === RCS file: /cvs/ports/sysutils/rsyslog/Makefile,v retrieving revision 1.51 diff -u -p -r1.51 Makefile --- Makefile7 Mar 2021 09:28:36 - 1.51 +++ Makefile27 Dec 2021 20:46:47 - @@ -8,7 +8,7 @@ COMMENT-elasticsearch = Elasticsearch pl MULTI_PACKAGES = -main -mysql -normalize -pgsql -elasticsearch -V =8.2102.0 +V =8.2112.0 DISTNAME = rsyslog-$V PKGNAME-main = rsyslog-$V PKGNAME-mysql =rsyslog-mysql-$V @@ -26,9 +26,10 @@ PERMIT_PACKAGE = Yes COMPILER = base-clang ports-gcc base-gcc -WANTLIB-main +=c crypto curl estr fastjson gcrypt gmp gnutls -WANTLIB-main +=gpg-error hogweed iconv idn2 intl nettle nghttp2 -WANTLIB-main +=p11-kit pthread relp ssl tasn1 unistring uuid z +WANTLIB-main +=c crypto curl estr execinfo fastjson gcrypt gmp +WANTLIB-main +=gnutls gpg-error hogweed iconv idn2 intl m nettle +WANTLIB-main +=nghttp2 p11-kit pthread relp ssl tasn1 unistring +WANTLIB-main +=uuid z WANTLIB-mysql += crypto m mariadb pthread ssl z Index: distinfo === RCS file: /cvs/ports/sysutils/rsyslog/distinfo,v retrieving revision 1.11 diff -u -p -r1.11 distinfo --- distinfo7 Mar 2021 09:28:36 - 1.11 +++ distinfo26 Dec 2021 11:21:34 - @@ -1,2 +1,2 @@ -SHA256 (rsyslog-8.2102.0.tar.gz) = lO4NAxLC7epzdmVZTL5KlHXk47WT4StbiuOnQ6yccqc= -SIZE (rsyslog-8.2102.0.tar.gz) = 3123684 +SHA256 (rsyslog-8.2112.0.tar.gz) = aiqXOGHpJm2ze9K3ufZytrlwv810Ojl7ju5rDcSFLEE= +SIZE (rsyslog-8.2112.0.tar.gz) = 3230105
Re: unbreak (and update) productivity/vdirsyncer.
On Sat, Oct 30, 2021 at 03:53:20PM +0200, Paco Esteban wrote: > On Sat, 30 Oct 2021, Remi Locherer wrote: > > > Hi Paco, > > > > On Sat, Oct 30, 2021 at 01:52:04PM +0200, Paco Esteban wrote: > > > Hi ports@, > > > > > > I just found out that productivity/vdirsyncer was not working because > > > one of its dependencies (devel/py-click-threading) was broken. > > > > > > Here's a patch that updates deve/py-click-threading to its latest > > > version (0.5.0), which fixes the bug and another one that updates > > > productivity/vdirsyncer to 0.18.0. It seems that 0.19.0 exists for the > > > latter, but is not on pypi, only on their github repo. > > > > I see 0.19.0 in Changelog.rst but it is not tagged yet on GitHub. > > I guess that's it. I'll take a look when they put it on pypi. > > > > > > Both build and work for me on amd64. vdirsyncer also has tests, which > > > all but one pass. That one is trying to make a network connection which > > > we do not allow when using PORTS_PRIVSEP. > > > > > > Maintainer of vdirsyncer in CC > > > > > > OK to commit ? > > > > I have the same diff and vdirsyncer runs fine with it. OK to commit. > > > > Test do not run because a newer py-coverage is required. And that needs > > a newer py-test. But the required py-test version is python3 only > > what do you mean ? > Tests run ok for me just adding devel/py-test-cov to TEST_DEPENDS. You're right, the tests run fine. I don't remember what made me belief a new version of py-coverage is required Remi
Re: khal update 0.10.2 to 0.10.4
On Mon, Sep 13, 2021 at 07:24:39PM +0200, Marcus MERIGHI wrote:
> Hello!
>
> This updates khal from 0.10.2 to 0.10.4.
>
> Only quickly tested, but running with from now on.
> (The "CHANGE for tab" helps a lot...)
>
> Changes:
>
> https://github.com/pimutils/khal/releases/tag/v0.10.4
> DROPPED support for Python 3.5
> CHANGE ikhal: tab (and shift tab) jump from the events back to the calendar
> NEW Add symbol for events with at least one alarm
> FIX URL can now be set/updated from ikhal
> FIX Imported events without an end or duration will now last one day if
> DTSTART is a date (as per RFC) or one hour if it is a datetime.
>
> https://github.com/pimutils/khal/releases/tag/v0.10.3
> DROPPED support for Python 3.4
> FIX khal interactive now accepts -a/-d options (as documented)
> FIX Strip whitespace when loading displayname and color files
> FIX Warn when loading events with a recurrence that finishes before it starts
> FIX Warn when loading events with a recurrence that never occurs
> FIX Alarms without descriptions no longer crash ikhal
> FIX Display all-day events at the top of the day in ikhal
> FIX Keybindings in empty search results no longer crash ikhal
> NEW Possibility to add a blank line before day in khal with
> blank_line_before_day option
> FIX new keybinding in search no longer crash ikhal
> NEW Improved sorting of events. Sort by DTSTART, DTEND then SUMMARY.
> NEW Add url input and {url} template option
>
> Marcus
Works fine for me.
4 tests fail. They are related to different localized UTF-8 outputs.
The tests have special cases for FreeBSD and NetBSD. I would say
this is nothing that stops updating our port.
ok remi
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/productivity/khal/Makefile,v
> retrieving revision 1.15
> diff -u -p -u -r1.15 Makefile
> --- Makefile 23 Feb 2021 19:39:37 - 1.15
> +++ Makefile 13 Sep 2021 17:16:54 -
> @@ -2,7 +2,7 @@
>
> COMMENT =standards based terminal calendar
>
> -MODPY_EGG_VERSION = 0.10.2
> +MODPY_EGG_VERSION = 0.10.4
> DISTNAME = khal-${MODPY_EGG_VERSION}
>
> CATEGORIES = productivity
> Index: distinfo
> ===
> RCS file: /cvs/ports/productivity/khal/distinfo,v
> retrieving revision 1.7
> diff -u -p -u -r1.7 distinfo
> --- distinfo 19 Oct 2020 13:01:10 - 1.7
> +++ distinfo 13 Sep 2021 17:16:54 -
> @@ -1,2 +1,3 @@
> -SHA256 (khal-0.10.2.tar.gz) = SU8hXD0ct6H411a0QICdJVvSDik3+YvQtdROQtTLEIc=
> -SIZE (khal-0.10.2.tar.gz) = 182534
> +SHA256 (khal-0.10.4.tar.gz) = P9uYCpphwCBteoKxb3e0CKTzQaK4ZrnJ/PamQYUNEp8=
> +SIZE (khal-0.10.4.tar.gz) = 185736
> +
>
Re: mail/isync: update to 1.4.1
On Tue, Mar 09, 2021 at 10:14:26PM +0100, Klemens Nanni wrote:
> The isync package finally drops the isync wrapper and only ships with
> mbsync(1); here's the relevant part from ${WRKSRC}/NEWS for the 1.4.x
> release branch:
>
> [1.4.0]
>
> The 'isync' compatibility wrapper was removed.
>
> Added support for disabling TLS v1.3 - adjust SSLVersions if you set it.
> Removed support for obsolete/insecure SSL v3.
>
> The IMAP '$Forwarded' / Maildir 'P' (passed) flag is supported now.
>
> Support for configuring a TLS cipher string was added.
>
> IMAP mailbox subscriptions are supported now.
>
> The IMAP user query can be scripted now.
>
> Added built-in support for macOS Keychain.
>
> Messages excluded by MaxSize will now result in placeholders.
>
> The use of Master/Slave terminology has been deprecated.
>
> I've been running this update without problems so far and will commit in
> a few days.
Works fine for my setup.
OK remi@
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/mail/isync/Makefile,v
> retrieving revision 1.46
> diff -u -p -r1.46 Makefile
> --- Makefile 22 Feb 2021 18:50:53 - 1.46
> +++ Makefile 9 Mar 2021 21:03:50 -
> @@ -2,7 +2,7 @@
>
> COMMENT= synchronize IMAP4 and maildir mailboxes
>
> -DISTNAME=isync-1.3.5
> +DISTNAME=isync-1.4.1
>
> CATEGORIES= mail
> MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=isync/}
> Index: distinfo
> ===
> RCS file: /cvs/ports/mail/isync/distinfo,v
> retrieving revision 1.17
> diff -u -p -r1.17 distinfo
> --- distinfo 22 Feb 2021 18:50:53 - 1.17
> +++ distinfo 22 Feb 2021 19:11:37 -
> @@ -1,2 +1,2 @@
> -SHA256 (isync-1.3.5.tar.gz) = aPUy5dzUNLArhz2SAyPryain2H8Rn3zAUDZdwBTPdlU=
> -SIZE (isync-1.3.5.tar.gz) = 316671
> +SHA256 (isync-1.4.1.tar.gz) = DTbbtXuwbIu+ELtm9ArlQwlbFDRDIJtwNxZ75gBCAVA=
> +SIZE (isync-1.4.1.tar.gz) = 336281
> Index: patches/patch-src_drv_imap_c
> ===
> RCS file: /cvs/ports/mail/isync/patches/patch-src_drv_imap_c,v
> retrieving revision 1.6
> diff -u -p -r1.6 patch-src_drv_imap_c
> --- patches/patch-src_drv_imap_c 22 Feb 2021 18:50:53 - 1.6
> +++ patches/patch-src_drv_imap_c 22 Feb 2021 19:26:20 -
> @@ -5,8 +5,8 @@ Use pledge.
> Index: src/drv_imap.c
> --- src/drv_imap.c.orig
> +++ src/drv_imap.c
> -@@ -41,6 +41,8 @@
> - # include
> +@@ -45,6 +45,8 @@
> + # include
> #endif
>
> +extern int needs_proc_exec;
> @@ -14,12 +14,12 @@ Index: src/drv_imap.c
> #ifdef HAVE_LIBSSL
> enum { SSL_None, SSL_STARTTLS, SSL_IMAPS };
> #endif
> -@@ -3388,6 +3390,8 @@ imap_parse_store( conffile_t *cfg, store_conf_t **stor
> - }
> - acc_opt = 1;
> +@@ -3718,6 +3720,8 @@ imap_parse_store( conffile_t *cfg, store_conf_t **stor
> + #endif
> + 143;
> }
> +if (server->sconf.tunnel || server->pass_cmd)
> +needs_proc_exec = 1;
> - if (store)
> - type = "IMAP store", name = store->gen.name;
> - else
> + if (store) {
> + if (!store->server) {
> + store->server = nfmalloc( sizeof(sserver) );
> Index: patches/patch-src_main_c
> ===
> RCS file: /cvs/ports/mail/isync/patches/patch-src_main_c,v
> retrieving revision 1.8
> diff -u -p -r1.8 patch-src_main_c
> --- patches/patch-src_main_c 13 Jul 2020 00:08:10 - 1.8
> +++ patches/patch-src_main_c 22 Feb 2021 19:11:29 -
> @@ -14,9 +14,9 @@ Index: src/main.c
> static void ATTR_PRINTFLIKE(1, 2)
> debug( const char *msg, ... )
> {
> -@@ -738,6 +740,36 @@ main( int argc, char **argv )
> +@@ -754,6 +756,36 @@ main( int argc, char **argv )
>
> - if (load_config( config, pseudo ))
> + if (merge_ops( cops, ops ))
> return 1;
> +
> +if (mvars->list) {
> @@ -49,5 +49,5 @@ Index: src/main.c
> +}
> +}
>
> - if (!channels) {
> - fputs( "No channels defined. Try 'man " EXE "'\n", stderr );
> + if (load_config( config ))
> + return 1;
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/mail/isync/pkg/PLIST,v
> retrieving revision 1.8
> diff -u -p -r1.8 PLIST
> --- pkg/PLIST 17 Oct 2017 17:24:14 - 1.8
> +++ pkg/PLIST 9 Mar 2021 21:04:46 -
> @@ -1,9 +1,7 @@
> @comment $OpenBSD: PLIST,v 1.8 2017/10/17 17:24:14 danj Exp $
> -@bin bin/isync
> @bin bin/mbsync
> bin/mbsync-get-cert
> @bin bin/mdconvert
> -@man man/man1/isync.1
> @man man/man1/mbsync.1
> @man man/man1/mdconvert.1
> share/doc/isync/
> @@ -13,5 +11,4 @@ share/doc/isync/NEWS
> share/doc/isync/README
> share/doc/isync/TODO
> share/examples/isync/
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: r...@cvs.openbsd.org2021/03/08 14:07:18 Modified files: games/childsplay: Makefile distinfo games/childsplay/pkg: PLIST Log message: Update to version 3.3. With this the dependency to py-numpy is not required anymore. OK sthen@ A similar diff to update to 3.3 was sent by Timo Myyra in 2018. That diff was OK solene@.
Re: childsplay needs py-numpy
On Sun, Mar 07, 2021 at 02:34:51PM +, Stuart Henderson wrote:
> On 2021/03/07 13:12, Remi Locherer wrote:
> > Without numpy childsplay fails to start (see cairoimage.py).
> >
> > OK?
>
> ok. I wonder if we should split off a py2-numpy..
Actually, there is a version 3.3 from 2018 that does not need numpy.
It still depends on Python 2 though ...
Changelog:
https://git.savannah.nongnu.org/cgit/childsplay.git/tree/Changelog
OK?
Index: Makefile
===
RCS file: /cvs/ports/games/childsplay/Makefile,v
retrieving revision 1.32
diff -u -p -r1.32 Makefile
--- Makefile7 Mar 2021 15:26:03 - 1.32
+++ Makefile7 Mar 2021 16:45:33 -
@@ -2,9 +2,8 @@
COMMENT= collection of educational activities for young children
-DISTNAME= childsplay-2.6.5
+DISTNAME= childsplay-3.3
EXTRACT_SUFX= .tgz
-REVISION = 4
CATEGORIES=games education
@@ -23,7 +22,6 @@ BUILD_DEPENDS=${_MODPY_BUILD_DEPENDS}
RUN_DEPENDS= databases/py-sqlalchemy \
devel/pygame \
- math/py-numpy \
x11/py-gtk2
NO_TEST= Yes
@@ -32,7 +30,6 @@ NO_BUILD= Yes
MODPY_ADJ_FILES=childsplay.py
pre-configure:
- perl -pi -e 's,/usr/local,${PREFIX},' ${WRKSRC}/pangofont.py
echo '#!/bin/sh' >${WRKSRC}/childsplay.sh
echo >>${WRKSRC}/childsplay.sh
echo 'cd ${MODPY_SITEPKG}/childsplay' >>${WRKSRC}/childsplay.sh
@@ -46,7 +43,7 @@ do-install:
cp -Rp ${WRKSRC}/locale ${PREFIX}/share
${INSTALL_DATA} ${WRKSRC}/sp_content.db \
${WRKINST}/${MODPY_SITEPKG}/childsplay
-.for i in SPWidgets alphabetsounds lib
+.for i in SPWidgets alphabet-sounds lib
cp -Rp ${WRKSRC}/$i ${WRKINST}/${MODPY_SITEPKG}/childsplay
.endfor
${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
Index: distinfo
===
RCS file: /cvs/ports/games/childsplay/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo12 Sep 2014 06:37:12 - 1.7
+++ distinfo7 Mar 2021 16:45:33 -
@@ -1,2 +1,2 @@
-SHA256 (childsplay-2.6.5.tgz) = FrIy2z4YBuN3SOz1Y1I8/X2nj+a4amJcY+WJk7c8qIo=
-SIZE (childsplay-2.6.5.tgz) = 24091891
+SHA256 (childsplay-3.3.tgz) = Pcve+HIVBa3VqBH1BKZVk0upHUvIWgtt7ZMPRH68Ogc=
+SIZE (childsplay-3.3.tgz) = 33297165
Index: pkg/PLIST
===
RCS file: /cvs/ports/games/childsplay/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 6 Jul 2014 09:09:10 - 1.4
+++ pkg/PLIST 7 Mar 2021 16:45:34 -
@@ -62,8 +62,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/childsplay/SPWidgets/dialogs.pyc
lib/python${MODPY_VERSION}/site-packages/childsplay/SPWidgets/funcs.py
lib/python${MODPY_VERSION}/site-packages/childsplay/SPWidgets/funcs.pyc
-lib/python${MODPY_VERSION}/site-packages/childsplay/SPWidgets/gtk_widgets.py
-lib/python${MODPY_VERSION}/site-packages/childsplay/SPWidgets/gtk_widgets.pyc
lib/python${MODPY_VERSION}/site-packages/childsplay/SPWidgets/test.py
lib/python${MODPY_VERSION}/site-packages/childsplay/SPWidgets/test.pyc
lib/python${MODPY_VERSION}/site-packages/childsplay/SPWidgets/text.py
@@ -80,59 +78,1039 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/childsplay/Version.pyc
lib/python${MODPY_VERSION}/site-packages/childsplay/__init__.py
lib/python${MODPY_VERSION}/site-packages/childsplay/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/en/
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/en/10.ogg
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/en/11.ogg
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/en/12.ogg
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/en/13.ogg
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/en/14.ogg
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/en/15.ogg
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/en/16.ogg
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/en/17.ogg
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/en/18.ogg
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/en/19.ogg
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/en/20.ogg
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/en/U0030.ogg
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/en/U0031.ogg
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/en/U0032.ogg
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/en/U0033.ogg
-lib/python${MODPY_VERSION}/site-packages/c
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: r...@cvs.openbsd.org2021/03/07 08:26:03 Modified files: games/childsplay: Makefile Log message: games/childsplay requires numpy to run (see cairoimage.py). OK sthen@
childsplay needs py-numpy
Without numpy childsplay fails to start (see cairoimage.py).
OK?
Index: Makefile
===
RCS file: /cvs/ports/games/childsplay/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- Makefile23 Feb 2021 19:39:22 - 1.31
+++ Makefile7 Mar 2021 11:41:22 -
@@ -4,7 +4,7 @@ COMMENT=collection of educational activ
DISTNAME= childsplay-2.6.5
EXTRACT_SUFX= .tgz
-REVISION = 3
+REVISION = 4
CATEGORIES=games education
@@ -23,6 +23,7 @@ BUILD_DEPENDS=${_MODPY_BUILD_DEPENDS}
RUN_DEPENDS= databases/py-sqlalchemy \
devel/pygame \
+ math/py-numpy \
x11/py-gtk2
NO_TEST= Yes
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: r...@cvs.openbsd.org2021/03/07 02:28:36 Modified files: sysutils/rsyslog: Makefile distinfo Log message: Update rsyslog to version 8.2102.0 OK sthen@
Re: [update] rsyslog 8.2102.0
On Sun, Feb 28, 2021 at 09:56:55PM +0100, Remi Locherer wrote: > Hi, > > this updates rsyslog to version 8.2102.0 released in February 2021. > The changes are listed here: > https://github.com/rsyslog/rsyslog/blob/master/ChangeLog > > I verified that the 6 rsyslog tests in the regress test suite from syslogd > all succeed. In addition I also tested the modules imfile, ommysql and > omrelp (all on amd64). > > portcheck notified me that iconv in WANTLIB-mysql is masked by iconv > in -main. I removed the one in -mysql. > > port-lib-depends-check told me that libffi is not required. > > OK? > > Remi ping ... Index: Makefile === RCS file: /cvs/ports/sysutils/rsyslog/Makefile,v retrieving revision 1.50 diff -u -p -r1.50 Makefile --- Makefile22 Nov 2020 17:05:59 - 1.50 +++ Makefile28 Feb 2021 20:40:17 - @@ -8,7 +8,7 @@ COMMENT-elasticsearch = Elasticsearch pl MULTI_PACKAGES = -main -mysql -normalize -pgsql -elasticsearch -V =8.2008.0 +V =8.2102.0 DISTNAME = rsyslog-$V PKGNAME-main = rsyslog-$V PKGNAME-mysql =rsyslog-mysql-$V @@ -16,7 +16,6 @@ PKGNAME-normalize = rsyslog-normalize-$V PKGNAME-pgsql =rsyslog-pgsql-$V PKGNAME-elasticsearch =rsyslog-elasticsearch-$V CATEGORIES = sysutils -REVISION-main =0 HOMEPAGE = https://www.rsyslog.com/ @@ -27,11 +26,11 @@ PERMIT_PACKAGE =Yes COMPILER = base-clang ports-gcc base-gcc -WANTLIB-main +=c crypto curl estr fastjson ffi gcrypt gmp gnutls +WANTLIB-main +=c crypto curl estr fastjson gcrypt gmp gnutls WANTLIB-main +=gpg-error hogweed iconv idn2 intl nettle nghttp2 WANTLIB-main +=p11-kit pthread relp ssl tasn1 unistring uuid z -WANTLIB-mysql += crypto iconv m mariadb pthread ssl z +WANTLIB-mysql += crypto m mariadb pthread ssl z WANTLIB-normalize += estr fastjson lognorm pthread Index: distinfo === RCS file: /cvs/ports/sysutils/rsyslog/distinfo,v retrieving revision 1.10 diff -u -p -r1.10 distinfo --- distinfo8 Sep 2020 20:57:48 - 1.10 +++ distinfo28 Feb 2021 13:32:45 - @@ -1,2 +1,2 @@ -SHA256 (rsyslog-8.2008.0.tar.gz) = CdK2yLwvAWWYrtK7cZ4D+CK7Adcgxh5NbnJeANyhtlA= -SIZE (rsyslog-8.2008.0.tar.gz) = 3051049 +SHA256 (rsyslog-8.2102.0.tar.gz) = lO4NAxLC7epzdmVZTL5KlHXk47WT4StbiuOnQ6yccqc= +SIZE (rsyslog-8.2102.0.tar.gz) = 3123684
Re: move py-click and rdeps to py3
On Mon, Mar 01, 2021 at 09:56:22AM -0600, Lucas Raab wrote:
> Hello,
>
> Following up on the py3 conversion for flask, here's a similar diff for
> devel/py-click. py-flask was the last py2 consumer of click (outside of
> the other click-related packages anyway). Now that flask is clear, onto
> click itself.
>
> * py-click reverse deps
> * devel/py-click-log
> * devel/py-click-plugins
> * devel/py-click-threading
> * devel/py-spark-parser
> * devel/py-xdis
>
> devel/py-uncompyle6 has run depends on:
> * devel/py-spark-parser
> * devel/py-xdis
>
> Look okay?
>
> cc: py-click-log maintainer
makes sense to me. OK
py3-click-log is used by productivity/vdirsyncer which is py3.
Remi
>
> Lucas
> diff adb2f64673ba41fa09f2a8be93386abe3acf033c /usr/ports
> blob - a6648d555c278ecae9a91fa5ab05045b5bb95966
> file + devel/Makefile
> --- devel/Makefile
> +++ devel/Makefile
> @@ -1405,13 +1405,9 @@
> SUBDIR += py-characteristic,python3
> SUBDIR += py-cheetah
> SUBDIR += py-cheetah,python3
> - SUBDIR += py-click
> SUBDIR += py-click,python3
> - SUBDIR += py-click-log
> SUBDIR += py-click-log,python3
> - SUBDIR += py-click-plugins
> SUBDIR += py-click-plugins,python3
> - SUBDIR += py-click-threading
> SUBDIR += py-click-threading,python3
> SUBDIR += py-clint
> SUBDIR += py-clint,python3
> @@ -1689,7 +1685,6 @@
> SUBDIR += py-smmap,python3
> SUBDIR += py-sortedcontainers
> SUBDIR += py-sortedcontainers,python3
> - SUBDIR += py-spark-parser
> SUBDIR += py-spark-parser,python3
> SUBDIR += py-stdnum
> SUBDIR += py-stdnum,python3
> @@ -1746,7 +1741,6 @@
> SUBDIR += py-tz
> SUBDIR += py-tz,python3
> SUBDIR += py-tzlocal,python3
> - SUBDIR += py-uncompyle6
> SUBDIR += py-uncompyle6,python3
> SUBDIR += py-unicorn,python3
> SUBDIR += py-unittest2
> blob - 1159acf174dd19d9006854a91d198a9c1de49a5e
> file + devel/py-click/Makefile
> --- devel/py-click/Makefile
> +++ devel/py-click/Makefile
> @@ -5,7 +5,7 @@ COMMENT= command line library for Python
> MODPY_EGG_VERSION=6.7
> DISTNAME=click-${MODPY_EGG_VERSION}
> PKGNAME= py-click-${MODPY_EGG_VERSION}
> -REVISION=2
> +REVISION=3
>
> CATEGORIES= devel
>
> @@ -22,6 +22,6 @@ MODPY_SETUPTOOLS= Yes
> MODPY_PYTEST=Yes
>
> FLAVORS= python3
> -FLAVOR?=
> +FLAVOR= python3
>
> .include
> blob - b820a1c41288d81a5aed81e898779dd379f6e10e
> file + devel/py-click/pkg/PLIST
> --- devel/py-click/pkg/PLIST
> +++ devel/py-click/pkg/PLIST
> @@ -1,4 +1,5 @@
> @comment $OpenBSD: PLIST,v 1.2 2016/06/08 17:16:46 danj Exp $
> +@pkgpath devel/py-click
> lib/python${MODPY_VERSION}/site-packages/click/
>
> lib/python${MODPY_VERSION}/site-packages/click-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
>
> lib/python${MODPY_VERSION}/site-packages/click-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
> blob - 4e65056f8877304cab1cdf904714d47f99820c2d
> file + devel/py-click-log/Makefile
> --- devel/py-click-log/Makefile
> +++ devel/py-click-log/Makefile
> @@ -5,7 +5,7 @@ COMMENT = logging integration for Python click
> MODPY_EGG_VERSION = 0.3.2
> DISTNAME = click-log-${MODPY_EGG_VERSION}
> PKGNAME =py-${DISTNAME}
> -REVISION = 1
> +REVISION = 2
>
> CATEGORIES = devel
>
> @@ -25,6 +25,6 @@ MODPY_SETUPTOOLS = Yes
> MODPY_PYTEST = Yes
>
> FLAVORS =python3
> -FLAVOR ?=
> +FLAVOR = python3
>
> .include
> blob - 1961da69b7c5c7fee180a285abc2b96ccc4e4afb
> file + devel/py-click-log/pkg/PLIST
> --- devel/py-click-log/pkg/PLIST
> +++ devel/py-click-log/pkg/PLIST
> @@ -1,4 +1,5 @@
> @comment $OpenBSD: PLIST,v 1.2 2018/08/11 09:26:32 remi Exp $
> +@pkgpath devel/py-click-log
> lib/python${MODPY_VERSION}/site-packages/click_log/
>
> lib/python${MODPY_VERSION}/site-packages/click_log-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
>
> lib/python${MODPY_VERSION}/site-packages/click_log-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
> @@ -9,7 +10,7 @@ lib/python${MODPY_VERSION}/site-packages/click_log-${M
> lib/python${MODPY_VERSION}/site-packages/click_log/__init__.py
>
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/click_log/${MODPY_PYCACHE}/
>
> lib/python${MODPY_VERSION}/site-packages/click_log/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/click_log/core.py
>
> lib/python${MODPY_VERSION}/site-packages/click_log/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/click_log/options.py
>
> lib/python${MODPY_VERSION}/site-packages/click_log/${MODPY_PYCACHE}options.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/click_log/core.py
> +lib/python${MODPY_VERSION}/site-packages/click_log/options.py
> blob -
[update] rsyslog 8.2102.0
Hi, this updates rsyslog to version 8.2102.0 released in February 2021. The changes are listed here: https://github.com/rsyslog/rsyslog/blob/master/ChangeLog I verified that the 6 rsyslog tests in the regress test suite from syslogd all succeed. In addition I also tested the modules imfile, ommysql and omrelp (all on amd64). portcheck notified me that iconv in WANTLIB-mysql is masked by iconv in -main. I removed the one in -mysql. port-lib-depends-check told me that libffi is not required. OK? Remi Index: Makefile === RCS file: /cvs/ports/sysutils/rsyslog/Makefile,v retrieving revision 1.50 diff -u -p -r1.50 Makefile --- Makefile22 Nov 2020 17:05:59 - 1.50 +++ Makefile28 Feb 2021 20:40:17 - @@ -8,7 +8,7 @@ COMMENT-elasticsearch = Elasticsearch pl MULTI_PACKAGES = -main -mysql -normalize -pgsql -elasticsearch -V =8.2008.0 +V =8.2102.0 DISTNAME = rsyslog-$V PKGNAME-main = rsyslog-$V PKGNAME-mysql =rsyslog-mysql-$V @@ -16,7 +16,6 @@ PKGNAME-normalize = rsyslog-normalize-$V PKGNAME-pgsql =rsyslog-pgsql-$V PKGNAME-elasticsearch =rsyslog-elasticsearch-$V CATEGORIES = sysutils -REVISION-main =0 HOMEPAGE = https://www.rsyslog.com/ @@ -27,11 +26,11 @@ PERMIT_PACKAGE =Yes COMPILER = base-clang ports-gcc base-gcc -WANTLIB-main +=c crypto curl estr fastjson ffi gcrypt gmp gnutls +WANTLIB-main +=c crypto curl estr fastjson gcrypt gmp gnutls WANTLIB-main +=gpg-error hogweed iconv idn2 intl nettle nghttp2 WANTLIB-main +=p11-kit pthread relp ssl tasn1 unistring uuid z -WANTLIB-mysql += crypto iconv m mariadb pthread ssl z +WANTLIB-mysql += crypto m mariadb pthread ssl z WANTLIB-normalize += estr fastjson lognorm pthread Index: distinfo === RCS file: /cvs/ports/sysutils/rsyslog/distinfo,v retrieving revision 1.10 diff -u -p -r1.10 distinfo --- distinfo8 Sep 2020 20:57:48 - 1.10 +++ distinfo28 Feb 2021 13:32:45 - @@ -1,2 +1,2 @@ -SHA256 (rsyslog-8.2008.0.tar.gz) = CdK2yLwvAWWYrtK7cZ4D+CK7Adcgxh5NbnJeANyhtlA= -SIZE (rsyslog-8.2008.0.tar.gz) = 3051049 +SHA256 (rsyslog-8.2102.0.tar.gz) = lO4NAxLC7epzdmVZTL5KlHXk47WT4StbiuOnQ6yccqc= +SIZE (rsyslog-8.2102.0.tar.gz) = 3123684
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: r...@cvs.openbsd.org2021/02/10 14:26:44 Modified files: sysutils/librelp: Makefile distinfo Added files: sysutils/librelp/patches: patch-src_tcp_c Log message: update librelp to version 1.9.0 The TLS tests currently fail when executed with libressl. Partly because of bogus information in the certificates used by the tests. GnuTLS and OpenSSL apparently accept that. Our rsyslog which uses librelp is linked with GnuTLS. ok tb
[update] librelp version 1.9.0
Hi
This updates librelp to version 1.9.0. The changelog can be found here:
https://github.com/rsyslog/librelp/blob/master/ChangeLog
Many changes are related to TLS and openssl. I had to add a patch to make
it compile with libressl.
Running the tests shows that librelp does not work with libressl. Most TLS
tests run twice: once with gnutls and once with openssl. The runs with
openssl fail.
Most of the failures look like this:
send: authentication error 'Certificate error in verify_callback at depth: 1
issuer = /CN=rsyslog ca/OU=Adiscon/O=Adiscon
GmbH/L=Grossrinderfeld/ST=BW/C=DE/DC=rsyslog
subject = /CN=rsyslog ca/OU=Adiscon/O=Adiscon
GmbH/L=Grossrinderfeld/ST=BW/C=DE/DC=rsyslog
err 53:unsupported or invalid name syntax
', object 'unsupported or invalid name syntax'
The certificate used by the test with the above error is this one:
https://github.com/rsyslog/librelp/tree/master/tests/tls-certs/cert.pm
rsyslogd is the user of librelp and our package is linked against gnutls
and therefor not directly affected by these failures with libressl.
I verified that rsyslogd in ports can still send messages with omrelp and
tls=on. The rsyslogd package needs to be rebuilt (library version).
Comments, hints, OKs?
Remi
Index: Makefile
===
RCS file: /cvs/ports/sysutils/librelp/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile25 Aug 2020 05:48:54 - 1.17
+++ Makefile7 Feb 2021 10:42:03 -
@@ -2,9 +2,9 @@
COMMENT = reliable event logging protocol library
-DISTNAME = librelp-1.6.0
+DISTNAME = librelp-1.9.0
-SHARED_LIBS += relp 4.0 # 5.0
+SHARED_LIBS += relp 5.0 # 5.0
CATEGORIES = sysutils
@@ -15,7 +15,7 @@ MAINTAINER = Remi Locherer http://download.rsyslog.com/librelp/
Index: distinfo
===
RCS file: /cvs/ports/sysutils/librelp/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo25 Aug 2020 05:48:54 - 1.9
+++ distinfo7 Feb 2021 10:42:24 -
@@ -1,2 +1,2 @@
-SHA256 (librelp-1.6.0.tar.gz) = z2zJSKWz0eVrMlFYXBG+6hxbKF/L+OKa1olVx+t1+Mo=
-SIZE (librelp-1.6.0.tar.gz) = 522827
+SHA256 (librelp-1.9.0.tar.gz) = JO6ehDlg0UAKRP+u2wseyRRj34+KzKhpzAJ+0l7mvzM=
+SIZE (librelp-1.9.0.tar.gz) = 540477
Index: patches/patch-src_tcp_c
===
RCS file: patches/patch-src_tcp_c
diff -N patches/patch-src_tcp_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_tcp_c 10 Jan 2021 23:44:08 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/tcp.c
+--- src/tcp.c.orig
src/tcp.c
+@@ -1494,7 +1494,7 @@ relpTcpSslInitCerts(relpTcp_t *const pThis, char *ownC
+ ENTER_RELPFUNC;
+
+ if( ownCertFile!= NULL ) {
+- #if OPENSSL_VERSION_NUMBER >= 0x1010L
++ #if OPENSSL_VERSION_NUMBER >= 0x1010L &&
!defined(LIBRESSL_VERSION_NUMBER)
+ if (SSL_use_certificate_chain_file(pThis->ssl, ownCertFile) !=
1) {
+ #else
+ if (SSL_use_certificate_file(pThis->ssl, ownCertFile,
SSL_FILETYPE_PEM) != 1) {
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: r...@cvs.openbsd.org2021/01/14 14:10:23 Modified files: productivity/baikal: Makefile Log message: baikal requires now php-curl OK martin@ kn@
baikal needs curl
Hi
After updating the baikal package I was greeted with this message:
Composer detected issues in your platform: Your Composer dependencies
require the following PHP extensions to be installed: curl
OK for below diff?
Remi
Index: Makefile
===
RCS file: /cvs/ports/productivity/baikal/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile2 Nov 2020 19:46:44 - 1.24
+++ Makefile11 Jan 2021 22:51:52 -
@@ -7,6 +7,7 @@ DISTNAME= baikal-${VERSION}
MASTER_SITES= https://github.com/sabre-io/Baikal/releases/download/${VERSION}/
DISTFILES= ${DISTNAME}.zip
CATEGORIES=productivity www
+REVISION= 0
HOMEPAGE= http://sabre.io/baikal/
@@ -16,6 +17,8 @@ MAINTAINER = Martin Reindl
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: r...@cvs.openbsd.org2020/11/22 10:06:00 Modified files: sysutils/rsyslog: Makefile sysutils/rsyslog/pkg: PLIST-main Log message: Enable imfile. ok sthen@
rsyslogd: enable imfile
Hi,
I got two request for enabling of the imfile module.
In my own little testing it works fine. The "inotify" mode does not work
for obvious reasons. Even if it is configured rsyslog falls back to
polling mode.
OK?
Remi
Index: Makefile
===
RCS file: /cvs/ports/sysutils/rsyslog/Makefile,v
retrieving revision 1.49
diff -u -p -r1.49 Makefile
--- Makefile8 Sep 2020 20:57:48 - 1.49
+++ Makefile23 Sep 2020 12:44:44 -
@@ -16,6 +16,7 @@ PKGNAME-normalize = rsyslog-normalize-$V
PKGNAME-pgsql =rsyslog-pgsql-$V
PKGNAME-elasticsearch =rsyslog-elasticsearch-$V
CATEGORIES = sysutils
+REVISION-main =0
HOMEPAGE = https://www.rsyslog.com/
@@ -64,7 +65,8 @@ CONFIGURE_ARGS += --enable-pgsql \
--enable-mmnormalize \
--enable-gnutls \
--enable-relp \
- --enable-elasticsearch
+ --enable-elasticsearch \
+ --enable-imfile
CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include"
post-install:
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/sysutils/rsyslog/pkg/PLIST-main,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST-main
--- pkg/PLIST-main 8 Sep 2020 20:57:48 - 1.6
+++ pkg/PLIST-main 23 Sep 2020 12:46:49 -
@@ -5,6 +5,7 @@
lib/rsyslog/
@so lib/rsyslog/fmhash.so
@so lib/rsyslog/fmhttp.so
+@so lib/rsyslog/imfile.so
@so lib/rsyslog/imklog.so
@so lib/rsyslog/immark.so
@so lib/rsyslog/imrelp.so
Re: [UPDATE] www/snownews-1.5.12 -> 1.6.10
On Sat, Nov 07, 2020 at 07:30:25PM -0500, trondd wrote:
> Once more?
>
> :D
>
> Tim.
I re-tested and it still works. So it is still OK remi@.
>
> trondd wrote:
>
> > Post release poke. Made sure it still builds and runs in -current. Been
> > using it on amd64 for a month.
> >
> > Tim.
> >
> > trondd wrote:
> >
> > > Remi Locherer wrote:
> > >
> > > > On Fri, Sep 18, 2020 at 06:47:44PM -0400, trondd wrote:
> > > > > Looking around at RSS readers and thought I'd update snownews. Jumps
> > > > > us
> > > > > ahead by like 10 years. Some significant changes to the configure
> > > > > process
> > > > > I hope I worked around right. Moved to GitHub. They also dropped
> > > > > native
> > > > > SSL support so I added a MESSAGE to notify any users.
> > > > >
> > > > > Tim.
> > > >
> > > > It works fine for the 2 feed I tested with. I think the message
> > > > regarding
> > > > HTTPS support makes sense.
> > > >
> > > > port-check says pkg/MESSAGE should not contain $OpenBSD$ tag.
> > > >
> > > > With that addressed OK remi.
> > >
> > > Oops. Thanks. Thought of adding the MESSAGE at the last minute and
> > > didn't
> > > think to rerun portcheck. Here is the fixed diff.
> > >
> > > Tim.
> > >
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/www/snownews/Makefile,v
> retrieving revision 1.39
> diff -u -p -r1.39 Makefile
> --- Makefile 12 Jul 2019 20:51:05 - 1.39
> +++ Makefile 19 Oct 2020 00:58:28 -
> @@ -1,19 +1,22 @@
> # $OpenBSD: Makefile,v 1.39 2019/07/12 20:51:05 sthen Exp $
>
> COMMENT= text mode rss newsreader
> -DISTNAME=snownews-1.5.12
> -REVISION=6
> +DISTNAME=snownews-1.6.10
> CATEGORIES= www
> -MASTER_SITES=${HOMEPAGE}download/
>
> -HOMEPAGE=http://kiza.kcore.de/software/snownews/
> +GH_ACCOUNT= kouya
> +GH_PROJECT= snownews
> +GH_TAGNAME= 1.6.10
> +
> +HOMEPAGE=https://github.com/kouya/snownews
>
> # GPL
> PERMIT_PACKAGE= Yes
>
> -WANTLIB += c crypto curses iconv intl m lzma pthread xml2 z
> +WANTLIB += c curses iconv intl xml2 z
>
> NO_TEST= Yes
> +
> USE_GMAKE= Yes
>
> BUILD_DEPENDS= devel/gettext,-tools
> @@ -21,11 +24,11 @@ RUN_DEPENDS= textproc/p5-XML-LibXML
> LIB_DEPENDS= devel/gettext,-runtime \
> textproc/libxml
>
> -MAKE_ENV+= EXTRA_CFLAGS="${CFLAGS}"
> -MAKE_FLAGS+= CC="${CC}"
> +CONFIGURE_STYLE= simple
> +CONFIGURE_ARGS= --prefix="\$${PREFIX}" --mandir="\$${PREFIX}/man" \
> + --builddir=${WRKDIR}
>
> -CONFIGURE_STYLE= simple
> -CONFIGURE_ARGS= --prefix=${PREFIX}
> +MESSAGE= ${PKGDIR}/MESSAGE
>
> post-install:
> ln -f ${PREFIX}/bin/opml2snow ${PREFIX}/bin/snow2opml
> Index: distinfo
> ===
> RCS file: /cvs/ports/www/snownews/distinfo,v
> retrieving revision 1.16
> diff -u -p -r1.16 distinfo
> --- distinfo 18 Jan 2015 03:15:50 - 1.16
> +++ distinfo 19 Oct 2020 00:58:28 -
> @@ -1,2 +1,2 @@
> -SHA256 (snownews-1.5.12.tar.gz) =
> Jt2W6TRdnLwcDJRwQXCA3Qw+sx5+qUT3jzMC1wYOy5A=
> -SIZE (snownews-1.5.12.tar.gz) = 167944
> +SHA256 (snownews-1.6.10.tar.gz) =
> jHgGeu914oPfSzzKHJZlh7ZlTp6Eo+bl64vdWCl5kkI=
> +SIZE (snownews-1.6.10.tar.gz) = 189715
> Index: patches/patch-Config_mk_in
> ===
> RCS file: patches/patch-Config_mk_in
> diff -N patches/patch-Config_mk_in
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-Config_mk_in19 Oct 2020 00:58:28 -
> @@ -0,0 +1,23 @@
> +$OpenBSD$
> +
> +Index: Config.mk.in
> +--- Config.mk.in.orig
> Config.mk.in
> +@@ -21,7 +21,7 @@ PREFIX := @prefix@
> + BINDIR := @bindir@
> + LOCALEPATH := @localedir@
> + MANPATH := @mandir@
> +-BUILDDIR:= @builddir@/${NAME}
> ++BUILDDIR:= @builddir@/build
> + PKGDIR := @pkgdir@
> + O := .o/
> +
> +@@ -29,7 +29,7 @@ O := .o/
> +
> + CFLAGS := -Wall -Wextra -Wredundant-decls -Wshadow \
> +-std=c11 -I/usr/include/libxml2
> +-LDFLAGS := -liconv -lintl -lxml2 -lncurses -lz
> ++LDFLAGS
Re: [update] rsyslog version 8.2008.0
On Tue, Sep 08, 2020 at 01:58:09PM +0200, Theo Buehler wrote:
> On Tue, Sep 08, 2020 at 10:33:41AM +0200, Remi Locherer wrote:
> > On Tue, Sep 01, 2020 at 05:59:03PM +0200, Remi Locherer wrote:
> > > This updates rsyslog to version 8.2008.0. The extensive changelog can be
> > > found here: https://github.com/rsyslog/rsyslog/blob/v8.2008.0/ChangeLog
> > >
> > > One notable change is improved support for OpenSSL and also LibreSSL. But
> > > I did not test that yet. Our port is still using GnuTLS.
> > >
> > > I'm not sure if I should switch rsyslogd from GnuTLS to LibreSSL. I see
> > > the main purpose of rsyslogd on OpenBSD in iterop testing of our
> > > syslogd. For this the use of GnuTLS might be beneficial (except the
> > > slow startup on bluhm's test machine ;-) ). Another usage is writing
> > > messages to different databases or mangling logs.
> > >
> > > Are there any users of this port? If so: how are you using it?
> > >
> > > I tested this update on amd64 with the regress test from rsyslogd.
> > > In addition I verified that the following modules work:
> > > imudp, omrelp (with tls=on), imrelp (with tls=on), ommysql
> > >
> > > OK for the port update?
> >
> > I understand that probably nobody is using rsyslog on OpenBSD. ;-)
> > Nevertheless, can I get an OK?
>
> It would be much nicer to inline the diff rather than quoting it :)
>
> It looks ok portswise and builds fine on amd64 and sparc64. I think
> it'll have better chances of seeing tests if you put this in now rather
> than waiting longer.
>
> ok tb.
>
> There is one somewhat scary warning during the build but it's not new:
>
> imuxsock.c:1112:44: warning: cast from 'char *' to 'struct cmsghdr *'
> increases required
> alignment from 1 to 4 [-Wcast-align]
> for(cm = CMSG_FIRSTHDR(); cm; cm =
> CMSG_NXTHDR(, cm)) {
>
> ^~
> /usr/include/sys/socket.h:499:6: note: expanded from macro 'CMSG_NXTHDR'
> (struct cmsghdr *)((char *)(cmsg) + _ALIGN((cmsg)->cmsg_len)))
> ^
I now looked into this one. It is actually not a warning for imuxsock.c but
for OpenBSD's socket.h.
When adding -Wcast-align to CFLAGS for programs in base, I see many warnings
(checked rad and ospfd). I think this is not something we need to worry
about. But I might be wrong since I'm not an expert. ;-)
Remi
Re: [UPDATE] www/snownews-1.5.12 -> 1.6.10
On Fri, Sep 18, 2020 at 06:47:44PM -0400, trondd wrote: > Looking around at RSS readers and thought I'd update snownews. Jumps us > ahead by like 10 years. Some significant changes to the configure process > I hope I worked around right. Moved to GitHub. They also dropped native > SSL support so I added a MESSAGE to notify any users. > > Tim. It works fine for the 2 feed I tested with. I think the message regarding HTTPS support makes sense. port-check says pkg/MESSAGE should not contain $OpenBSD$ tag. With that addressed OK remi.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: r...@cvs.openbsd.org2020/09/19 04:12:52 Modified files: sysutils/netshot: Makefile distinfo sysutils/netshot/patches: patch-netshot_conf sysutils/netshot/pkg: PLIST Log message: update to version 0.15.2. input and ok tb@
Re: [update] netshot version 0.15.2
ping.
On Tue, Sep 08, 2020 at 10:31:41AM +0200, Remi Locherer wrote:
> Netshot is now at version 0.15.2. Libraries have been upgraded and the
> UI has been refreshed. The changes are listed here:
>
> https://github.com/netfishers-onl/Netshot/blob/master/dist/README.txt
>
> OK?
>
> Remi
Index: Makefile
===
RCS file: /cvs/ports/sysutils/netshot/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile28 Feb 2020 07:45:04 - 1.8
+++ Makefile5 Sep 2020 19:47:14 -
@@ -2,7 +2,7 @@
COMMENT = config backup and policy check for network devices
-V =0.14.1
+V =0.15.2
DISTNAME = netshot_${V}
PKGNAME = ${DISTNAME:S/_/-/}
WRKDIST = ${WRKDIR}
Index: distinfo
===
RCS file: /cvs/ports/sysutils/netshot/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo28 Feb 2020 07:45:04 - 1.4
+++ distinfo5 Sep 2020 19:54:03 -
@@ -1,2 +1,2 @@
-SHA256 (netshot_0.14.1.zip) = MpKMvBCtsvuEu1SyFxOYGHBO0Xzf4GRszy2DiH6pGUE=
-SIZE (netshot_0.14.1.zip) = 45722115
+SHA256 (netshot_0.15.2.zip) = VGU2QeRA3iFtnaww+hOakIOc2gehRpY+flKOmCAn234=
+SIZE (netshot_0.15.2.zip) = 57957862
Index: patches/patch-netshot_conf
===
RCS file: /cvs/ports/sysutils/netshot/patches/patch-netshot_conf,v
retrieving revision 1.4
diff -u -p -r1.4 patch-netshot_conf
--- patches/patch-netshot_conf 28 Feb 2020 07:45:04 - 1.4
+++ patches/patch-netshot_conf 5 Sep 2020 20:00:37 -
@@ -3,8 +3,8 @@ $OpenBSD: patch-netshot_conf,v 1.4 2020/
Index: netshot.conf
--- netshot.conf.orig
+++ netshot.conf
-@@ -1,9 +1,9 @@
- # Netshot Configuration File
+@@ -2,9 +2,9 @@
+ # See
https://github.com/netfishers-onl/Netshot/wiki/Config-file-(netshot.conf)-reference
# Log file and level
-netshot.log.file = /var/log/netshot/netshot.log
@@ -15,7 +15,7 @@ Index: netshot.conf
netshot.log.audit.level = INFO
#netshot.log.syslog1.host = 10.0.16.16
-@@ -19,7 +19,7 @@ netshot.db.password = netshot
+@@ -20,7 +20,7 @@ netshot.db.password = netshot
netshot.db.encryptionpassword = netshot
# REST
@@ -24,7 +24,7 @@ Index: netshot.conf
netshot.http.ssl.keystore.pass = password
#netshot.http.baseurl = https://localhost
netshot.http.baseurl = https://0.0.0.0
-@@ -38,12 +38,12 @@ netshot.snapshots.auto.interval = 15
+@@ -39,12 +39,12 @@ netshot.snapshots.auto.interval = 15
# Allow a trap received from any IP of a device to trigger an automatic
snapshot
netshot.snapshots.auto.anyip = true
# After a snapshot, dump the last configuration to a file in this directory
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: r...@cvs.openbsd.org2020/09/08 14:57:48 Modified files: sysutils/rsyslog: Makefile distinfo sysutils/rsyslog/pkg: PLIST-elasticsearch PLIST-main PLIST-mysql PLIST-normalize PLIST-pgsql Log message: Update to rsyslog version 8.2008.0. tb@ verified that it now builds on powerpc. gkoehler@ fixed the problem in clang. ok tb@ sthen@
Re: [update] rsyslog version 8.2008.0
On Tue, Sep 08, 2020 at 01:58:09PM +0200, Theo Buehler wrote:
> On Tue, Sep 08, 2020 at 10:33:41AM +0200, Remi Locherer wrote:
> > On Tue, Sep 01, 2020 at 05:59:03PM +0200, Remi Locherer wrote:
> > > This updates rsyslog to version 8.2008.0. The extensive changelog can be
> > > found here: https://github.com/rsyslog/rsyslog/blob/v8.2008.0/ChangeLog
> > >
> > > One notable change is improved support for OpenSSL and also LibreSSL. But
> > > I did not test that yet. Our port is still using GnuTLS.
> > >
> > > I'm not sure if I should switch rsyslogd from GnuTLS to LibreSSL. I see
> > > the main purpose of rsyslogd on OpenBSD in iterop testing of our
> > > syslogd. For this the use of GnuTLS might be beneficial (except the
> > > slow startup on bluhm's test machine ;-) ). Another usage is writing
> > > messages to different databases or mangling logs.
> > >
> > > Are there any users of this port? If so: how are you using it?
> > >
> > > I tested this update on amd64 with the regress test from rsyslogd.
> > > In addition I verified that the following modules work:
> > > imudp, omrelp (with tls=on), imrelp (with tls=on), ommysql
> > >
> > > OK for the port update?
> >
> > I understand that probably nobody is using rsyslog on OpenBSD. ;-)
> > Nevertheless, can I get an OK?
>
> It would be much nicer to inline the diff rather than quoting it :)
yes, of course ;-)
>
> It looks ok portswise and builds fine on amd64 and sparc64. I think
> it'll have better chances of seeing tests if you put this in now rather
> than waiting longer.
>
> ok tb.
>
> There is one somewhat scary warning during the build but it's not new:
>
I'll add this to my todo list and inform upstream about it.
> imuxsock.c:1112:44: warning: cast from 'char *' to 'struct cmsghdr *'
> increases required
> alignment from 1 to 4 [-Wcast-align]
> for(cm = CMSG_FIRSTHDR(); cm; cm =
> CMSG_NXTHDR(, cm)) {
>
> ^~
> /usr/include/sys/socket.h:499:6: note: expanded from macro 'CMSG_NXTHDR'
> (struct cmsghdr *)((char *)(cmsg) + _ALIGN((cmsg)->cmsg_len)))
> ^
Re: [update] rsyslog version 8.2008.0
On Tue, Sep 01, 2020 at 05:59:03PM +0200, Remi Locherer wrote:
> This updates rsyslog to version 8.2008.0. The extensive changelog can be
> found here: https://github.com/rsyslog/rsyslog/blob/v8.2008.0/ChangeLog
>
> One notable change is improved support for OpenSSL and also LibreSSL. But
> I did not test that yet. Our port is still using GnuTLS.
>
> I'm not sure if I should switch rsyslogd from GnuTLS to LibreSSL. I see
> the main purpose of rsyslogd on OpenBSD in iterop testing of our
> syslogd. For this the use of GnuTLS might be beneficial (except the
> slow startup on bluhm's test machine ;-) ). Another usage is writing
> messages to different databases or mangling logs.
>
> Are there any users of this port? If so: how are you using it?
>
> I tested this update on amd64 with the regress test from rsyslogd.
> In addition I verified that the following modules work:
> imudp, omrelp (with tls=on), imrelp (with tls=on), ommysql
>
> OK for the port update?
I understand that probably nobody is using rsyslog on OpenBSD. ;-)
Nevertheless, can I get an OK?
>
> Remi
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/sysutils/rsyslog/Makefile,v
> retrieving revision 1.48
> diff -u -p -r1.48 Makefile
> --- Makefile 5 Mar 2020 21:06:17 - 1.48
> +++ Makefile 30 Aug 2020 16:45:28 -
> @@ -10,7 +10,7 @@ COMMENT-elasticsearch = Elasticsearch pl
>
> MULTI_PACKAGES = -main -mysql -normalize -pgsql -elasticsearch
>
> -V = 8.2002.0
> +V = 8.2008.0
> DISTNAME = rsyslog-$V
> PKGNAME-main = rsyslog-$V
> PKGNAME-mysql = rsyslog-mysql-$V
> Index: distinfo
> ===
> RCS file: /cvs/ports/sysutils/rsyslog/distinfo,v
> retrieving revision 1.9
> diff -u -p -r1.9 distinfo
> --- distinfo 5 Mar 2020 21:06:17 - 1.9
> +++ distinfo 30 Aug 2020 16:45:36 -
> @@ -1,2 +1,2 @@
> -SHA256 (rsyslog-8.2002.0.tar.gz) =
> /obBTYYNoSAsdmFv6sBTnqWkCkrRgtdLfW0kGcwjgfg=
> -SIZE (rsyslog-8.2002.0.tar.gz) = 3000861
> +SHA256 (rsyslog-8.2008.0.tar.gz) =
> CdK2yLwvAWWYrtK7cZ4D+CK7Adcgxh5NbnJeANyhtlA=
> +SIZE (rsyslog-8.2008.0.tar.gz) = 3051049
> Index: pkg/PLIST-elasticsearch
> ===
> RCS file: /cvs/ports/sysutils/rsyslog/pkg/PLIST-elasticsearch,v
> retrieving revision 1.1
> diff -u -p -r1.1 PLIST-elasticsearch
> --- pkg/PLIST-elasticsearch 12 Mar 2018 17:42:08 - 1.1
> +++ pkg/PLIST-elasticsearch 30 Aug 2020 19:20:08 -
> @@ -1,2 +1,2 @@
> @comment $OpenBSD: PLIST-elasticsearch,v 1.1 2018/03/12 17:42:08 remi Exp $
> -lib/rsyslog/omelasticsearch.so
> +@so lib/rsyslog/omelasticsearch.so
> Index: pkg/PLIST-main
> ===
> RCS file: /cvs/ports/sysutils/rsyslog/pkg/PLIST-main,v
> retrieving revision 1.5
> diff -u -p -r1.5 PLIST-main
> --- pkg/PLIST-main14 Jun 2019 04:12:33 - 1.5
> +++ pkg/PLIST-main30 Aug 2020 19:20:08 -
> @@ -3,27 +3,27 @@
> @newuser _rsyslogd:803:_rsyslogd:daemon:Rsyslog
> Daemon:/nonexistent:/sbin/nologin
> @rcscript ${RCDIR}/rsyslogd
> lib/rsyslog/
> -lib/rsyslog/fmhash.so
> -lib/rsyslog/fmhttp.so
> -lib/rsyslog/imklog.so
> -lib/rsyslog/immark.so
> -lib/rsyslog/imrelp.so
> -lib/rsyslog/imtcp.so
> -lib/rsyslog/imudp.so
> -lib/rsyslog/imuxsock.so
> -lib/rsyslog/lmcry_gcry.so
> -lib/rsyslog/lmnet.so
> -lib/rsyslog/lmnetstrms.so
> -lib/rsyslog/lmnsd_gtls.so
> -lib/rsyslog/lmnsd_ptcp.so
> -lib/rsyslog/lmregexp.so
> -lib/rsyslog/lmtcpclt.so
> -lib/rsyslog/lmtcpsrv.so
> -lib/rsyslog/lmzlibw.so
> -lib/rsyslog/mmexternal.so
> -lib/rsyslog/ommail.so
> -lib/rsyslog/omrelp.so
> -lib/rsyslog/omtesting.so
> +@so lib/rsyslog/fmhash.so
> +@so lib/rsyslog/fmhttp.so
> +@so lib/rsyslog/imklog.so
> +@so lib/rsyslog/immark.so
> +@so lib/rsyslog/imrelp.so
> +@so lib/rsyslog/imtcp.so
> +@so lib/rsyslog/imudp.so
> +@so lib/rsyslog/imuxsock.so
> +@so lib/rsyslog/lmcry_gcry.so
> +@so lib/rsyslog/lmnet.so
> +@so lib/rsyslog/lmnetstrms.so
> +@so lib/rsyslog/lmnsd_gtls.so
> +@so lib/rsyslog/lmnsd_ptcp.so
> +@so lib/rsyslog/lmregexp.so
> +@so lib/rsyslog/lmtcpclt.so
> +@so lib/rsyslog/lmtcpsrv.so
> +@so lib/rsyslog/lmzlibw.so
> +@so lib/rsyslog/mmexternal.so
> +@so lib/rsyslog/ommail.so
> +@so lib/rsyslog/omrelp.so
> +@so lib/rsyslog/omtesting.so
> @man man/man5/rsyslog.conf.5
> @man man/man8/rsyslogd.8
> @bin sbin/rsyslogd
> Index: pkg/PLIST-mysql
>
[update] netshot version 0.15.2
Netshot is now at version 0.15.2. Libraries have been upgraded and the
UI has been refreshed. The changes are listed here:
https://github.com/netfishers-onl/Netshot/blob/master/dist/README.txt
OK?
Remi
Index: Makefile
===
RCS file: /cvs/ports/sysutils/netshot/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile28 Feb 2020 07:45:04 - 1.8
+++ Makefile5 Sep 2020 19:47:14 -
@@ -2,7 +2,7 @@
COMMENT = config backup and policy check for network devices
-V =0.14.1
+V =0.15.2
DISTNAME = netshot_${V}
PKGNAME = ${DISTNAME:S/_/-/}
WRKDIST = ${WRKDIR}
Index: distinfo
===
RCS file: /cvs/ports/sysutils/netshot/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo28 Feb 2020 07:45:04 - 1.4
+++ distinfo5 Sep 2020 19:54:03 -
@@ -1,2 +1,2 @@
-SHA256 (netshot_0.14.1.zip) = MpKMvBCtsvuEu1SyFxOYGHBO0Xzf4GRszy2DiH6pGUE=
-SIZE (netshot_0.14.1.zip) = 45722115
+SHA256 (netshot_0.15.2.zip) = VGU2QeRA3iFtnaww+hOakIOc2gehRpY+flKOmCAn234=
+SIZE (netshot_0.15.2.zip) = 57957862
Index: patches/patch-netshot_conf
===
RCS file: /cvs/ports/sysutils/netshot/patches/patch-netshot_conf,v
retrieving revision 1.4
diff -u -p -r1.4 patch-netshot_conf
--- patches/patch-netshot_conf 28 Feb 2020 07:45:04 - 1.4
+++ patches/patch-netshot_conf 5 Sep 2020 20:00:37 -
@@ -3,8 +3,8 @@ $OpenBSD: patch-netshot_conf,v 1.4 2020/
Index: netshot.conf
--- netshot.conf.orig
+++ netshot.conf
-@@ -1,9 +1,9 @@
- # Netshot Configuration File
+@@ -2,9 +2,9 @@
+ # See
https://github.com/netfishers-onl/Netshot/wiki/Config-file-(netshot.conf)-reference
# Log file and level
-netshot.log.file = /var/log/netshot/netshot.log
@@ -15,7 +15,7 @@ Index: netshot.conf
netshot.log.audit.level = INFO
#netshot.log.syslog1.host = 10.0.16.16
-@@ -19,7 +19,7 @@ netshot.db.password = netshot
+@@ -20,7 +20,7 @@ netshot.db.password = netshot
netshot.db.encryptionpassword = netshot
# REST
@@ -24,7 +24,7 @@ Index: netshot.conf
netshot.http.ssl.keystore.pass = password
#netshot.http.baseurl = https://localhost
netshot.http.baseurl = https://0.0.0.0
-@@ -38,12 +38,12 @@ netshot.snapshots.auto.interval = 15
+@@ -39,12 +39,12 @@ netshot.snapshots.auto.interval = 15
# Allow a trap received from any IP of a device to trigger an automatic
snapshot
netshot.snapshots.auto.anyip = true
# After a snapshot, dump the last configuration to a file in this directory
[update] rsyslog version 8.2008.0
This updates rsyslog to version 8.2008.0. The extensive changelog can be
found here: https://github.com/rsyslog/rsyslog/blob/v8.2008.0/ChangeLog
One notable change is improved support for OpenSSL and also LibreSSL. But
I did not test that yet. Our port is still using GnuTLS.
I'm not sure if I should switch rsyslogd from GnuTLS to LibreSSL. I see
the main purpose of rsyslogd on OpenBSD in iterop testing of our
syslogd. For this the use of GnuTLS might be beneficial (except the
slow startup on bluhm's test machine ;-) ). Another usage is writing
messages to different databases or mangling logs.
Are there any users of this port? If so: how are you using it?
I tested this update on amd64 with the regress test from rsyslogd.
In addition I verified that the following modules work:
imudp, omrelp (with tls=on), imrelp (with tls=on), ommysql
OK for the port update?
Remi
Index: Makefile
===
RCS file: /cvs/ports/sysutils/rsyslog/Makefile,v
retrieving revision 1.48
diff -u -p -r1.48 Makefile
--- Makefile5 Mar 2020 21:06:17 - 1.48
+++ Makefile30 Aug 2020 16:45:28 -
@@ -10,7 +10,7 @@ COMMENT-elasticsearch = Elasticsearch pl
MULTI_PACKAGES = -main -mysql -normalize -pgsql -elasticsearch
-V =8.2002.0
+V =8.2008.0
DISTNAME = rsyslog-$V
PKGNAME-main = rsyslog-$V
PKGNAME-mysql =rsyslog-mysql-$V
Index: distinfo
===
RCS file: /cvs/ports/sysutils/rsyslog/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo5 Mar 2020 21:06:17 - 1.9
+++ distinfo30 Aug 2020 16:45:36 -
@@ -1,2 +1,2 @@
-SHA256 (rsyslog-8.2002.0.tar.gz) = /obBTYYNoSAsdmFv6sBTnqWkCkrRgtdLfW0kGcwjgfg=
-SIZE (rsyslog-8.2002.0.tar.gz) = 3000861
+SHA256 (rsyslog-8.2008.0.tar.gz) = CdK2yLwvAWWYrtK7cZ4D+CK7Adcgxh5NbnJeANyhtlA=
+SIZE (rsyslog-8.2008.0.tar.gz) = 3051049
Index: pkg/PLIST-elasticsearch
===
RCS file: /cvs/ports/sysutils/rsyslog/pkg/PLIST-elasticsearch,v
retrieving revision 1.1
diff -u -p -r1.1 PLIST-elasticsearch
--- pkg/PLIST-elasticsearch 12 Mar 2018 17:42:08 - 1.1
+++ pkg/PLIST-elasticsearch 30 Aug 2020 19:20:08 -
@@ -1,2 +1,2 @@
@comment $OpenBSD: PLIST-elasticsearch,v 1.1 2018/03/12 17:42:08 remi Exp $
-lib/rsyslog/omelasticsearch.so
+@so lib/rsyslog/omelasticsearch.so
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/sysutils/rsyslog/pkg/PLIST-main,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST-main
--- pkg/PLIST-main 14 Jun 2019 04:12:33 - 1.5
+++ pkg/PLIST-main 30 Aug 2020 19:20:08 -
@@ -3,27 +3,27 @@
@newuser _rsyslogd:803:_rsyslogd:daemon:Rsyslog
Daemon:/nonexistent:/sbin/nologin
@rcscript ${RCDIR}/rsyslogd
lib/rsyslog/
-lib/rsyslog/fmhash.so
-lib/rsyslog/fmhttp.so
-lib/rsyslog/imklog.so
-lib/rsyslog/immark.so
-lib/rsyslog/imrelp.so
-lib/rsyslog/imtcp.so
-lib/rsyslog/imudp.so
-lib/rsyslog/imuxsock.so
-lib/rsyslog/lmcry_gcry.so
-lib/rsyslog/lmnet.so
-lib/rsyslog/lmnetstrms.so
-lib/rsyslog/lmnsd_gtls.so
-lib/rsyslog/lmnsd_ptcp.so
-lib/rsyslog/lmregexp.so
-lib/rsyslog/lmtcpclt.so
-lib/rsyslog/lmtcpsrv.so
-lib/rsyslog/lmzlibw.so
-lib/rsyslog/mmexternal.so
-lib/rsyslog/ommail.so
-lib/rsyslog/omrelp.so
-lib/rsyslog/omtesting.so
+@so lib/rsyslog/fmhash.so
+@so lib/rsyslog/fmhttp.so
+@so lib/rsyslog/imklog.so
+@so lib/rsyslog/immark.so
+@so lib/rsyslog/imrelp.so
+@so lib/rsyslog/imtcp.so
+@so lib/rsyslog/imudp.so
+@so lib/rsyslog/imuxsock.so
+@so lib/rsyslog/lmcry_gcry.so
+@so lib/rsyslog/lmnet.so
+@so lib/rsyslog/lmnetstrms.so
+@so lib/rsyslog/lmnsd_gtls.so
+@so lib/rsyslog/lmnsd_ptcp.so
+@so lib/rsyslog/lmregexp.so
+@so lib/rsyslog/lmtcpclt.so
+@so lib/rsyslog/lmtcpsrv.so
+@so lib/rsyslog/lmzlibw.so
+@so lib/rsyslog/mmexternal.so
+@so lib/rsyslog/ommail.so
+@so lib/rsyslog/omrelp.so
+@so lib/rsyslog/omtesting.so
@man man/man5/rsyslog.conf.5
@man man/man8/rsyslogd.8
@bin sbin/rsyslogd
Index: pkg/PLIST-mysql
===
RCS file: /cvs/ports/sysutils/rsyslog/pkg/PLIST-mysql,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-mysql
--- pkg/PLIST-mysql 15 Mar 2016 23:25:51 - 1.2
+++ pkg/PLIST-mysql 30 Aug 2020 19:20:08 -
@@ -1,3 +1,3 @@
@comment $OpenBSD: PLIST-mysql,v 1.2 2016/03/15 23:25:51 sthen Exp $
-lib/rsyslog/ommysql.so
+@so lib/rsyslog/ommysql.so
share/examples/rsyslog/createDB_mysql.sql
Index: pkg/PLIST-normalize
===
RCS file: /cvs/ports/sysutils/rsyslog/pkg/PLIST-normalize,v
retrieving revision 1.1
diff -u -p -r1.1 PLIST-normalize
--- pkg/PLIST-normalize 12 Mar 2018 17:42:08 - 1.1
+++ pkg/PLIST-normalize 30 Aug 2020 19:20:08 -
@@ -1,2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: r...@cvs.openbsd.org2020/08/24 23:48:54 Modified files: sysutils/librelp: Makefile distinfo sysutils/librelp/pkg: PLIST Removed files: sysutils/librelp/patches: patch-src_tcp_c Log message: Update to librelp 1.6.0 ok sthen@
update librelp to 1.6.0
This is an update for librelp to version 1.6.0 which was released
4 months ago. The local patches to make it build with LibreSSL are
now incorporated into upstream and can be dropped.
There are two tests that fail (tls-basic-anon.sh and
tls-wrong-signedcert.sh). Both are related to verifying (or not in
the anon case) certificates. It also fails with the librelp
version 1.5.0. Both failures are for tests with LibreSSL. rsyslogd
(consumer of librelp) is linked against gnutls. I do not remember
what the state was when I last updated librelp.
I verified that rsyslogd can still send and receive RELP messages
with and without TLS.
OK?
Remi
Index: Makefile
===
RCS file: /cvs/ports/sysutils/librelp/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile2 Mar 2020 16:41:50 - 1.16
+++ Makefile23 Aug 2020 14:25:48 -
@@ -2,9 +2,9 @@
COMMENT = reliable event logging protocol library
-DISTNAME = librelp-1.5.0
+DISTNAME = librelp-1.6.0
-SHARED_LIBS += relp 3.1 # 5.0
+SHARED_LIBS += relp 4.0 # 5.0
CATEGORIES = sysutils
Index: distinfo
===
RCS file: /cvs/ports/sysutils/librelp/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo2 Mar 2020 16:41:50 - 1.8
+++ distinfo11 Aug 2020 15:23:25 -
@@ -1,2 +1,2 @@
-SHA256 (librelp-1.5.0.tar.gz) = aShO8aBRqywvd2WVjoR77x/POPR+sbA3LGX2PwPIOV4=
-SIZE (librelp-1.5.0.tar.gz) = 521793
+SHA256 (librelp-1.6.0.tar.gz) = z2zJSKWz0eVrMlFYXBG+6hxbKF/L+OKa1olVx+t1+Mo=
+SIZE (librelp-1.6.0.tar.gz) = 522827
Index: patches/patch-src_tcp_c
===
RCS file: patches/patch-src_tcp_c
diff -N patches/patch-src_tcp_c
--- patches/patch-src_tcp_c 2 Mar 2020 16:41:50 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,26 +0,0 @@
-$OpenBSD: patch-src_tcp_c,v 1.2 2020/03/02 16:41:50 remi Exp $
-
-LibreSSL has no support for @SECLEVEL and SSL_CONF_CTX_set_flags().
-
-Index: src/tcp.c
src/tcp.c.orig
-+++ src/tcp.c
-@@ -1200,7 +1200,8 @@ relpTcpTLSSetPrio_ossl(relpTcp_t *const pThis)
- /* Compute priority string (in simple cases where the user does not
care...) */
- if(pThis->pristring == NULL) {
- if (pThis->authmode == eRelpAuthMode_None) {
-- #if OPENSSL_VERSION_NUMBER >= 0x1010L
-+ #if OPENSSL_VERSION_NUMBER >= 0x1010L \
-+ && !defined(LIBRESSL_VERSION_NUMBER)
-/* NOTE: do never use: +eNULL, it DISABLES encryption!
*/
- strncpy(pristringBuf,
"ALL:+COMPLEMENTOFDEFAULT:+ADH:+ECDH:+aNULL@SECLEVEL=0",
- sizeof(pristringBuf));
-@@ -1578,7 +1579,7 @@ relpTcpSetSslConfCmd_ossl(relpTcp_t *const pThis, char
- } else {
- pThis->pEngine->dbgprint("relpTcpSetSslConfCmd_ossl: set to
'%s'\n", tlsConfigCmd);
- char errmsg[1424];
--#if OPENSSL_VERSION_NUMBER >= 0x1002L
-+#if OPENSSL_VERSION_NUMBER >= 0x1002L && !defined(LIBRESSL_VERSION_NUMBER)
- char *pCurrentPos;
- char *pNextPos;
- char *pszCmd;
Index: pkg/PLIST
===
RCS file: /cvs/ports/sysutils/librelp/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 16 Mar 2015 18:07:55 - 1.2
+++ pkg/PLIST 11 Aug 2020 15:26:36 -
@@ -1,6 +1,6 @@
@comment $OpenBSD: PLIST,v 1.2 2015/03/16 18:07:55 naddy Exp $
include/librelp.h
-lib/librelp.a
+@static-lib lib/librelp.a
lib/librelp.la
@lib lib/librelp.so.${LIBrelp_VERSION}
lib/pkgconfig/relp.pc
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: r...@cvs.openbsd.org2020/08/12 13:48:29 Modified files: productivity/vdirsyncer: Makefile distinfo Added files: productivity/vdirsyncer/patches: patch-setup_py patch-tests_system_cli_test_sync_py Removed files: productivity/vdirsyncer/patches: patch-docs_conf_py Log message: Update vdirsyncer to version 0.16.8. The patch "patch-docs_conf_py" is now included and not needed anymore. Backport two simple patches from master. They are needed for vdirsyncer to work with newer click versions. ok sthen@
update vdirsyncer to 0.16.8
The changelog for vdirsyncer 0.16.8 lists one item:
"Support Python 3. and 3.8"
The patch kmos@ added to this port is now also included in upstream and
can be removed.
The two new patches are needed for vdirsyncer to work with new versions of
click. They are in upstream's master branch but not in a release yet.
I verified that productivity/khal which has a dependency on vdirsyncer works.
OK?
Remi
Index: Makefile
===
RCS file: /cvs/ports/productivity/vdirsyncer/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile3 Jul 2020 21:13:04 - 1.13
+++ Makefile11 Aug 2020 14:46:03 -
@@ -2,9 +2,8 @@
COMMENT = synchronize calendars and contacts
-MODPY_EGG_VERSION =0.16.7
+MODPY_EGG_VERSION =0.16.8
DISTNAME = vdirsyncer-${MODPY_EGG_VERSION}
-REVISION = 3
CATEGORIES = productivity
Index: distinfo
===
RCS file: /cvs/ports/productivity/vdirsyncer/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo11 Aug 2018 09:28:30 - 1.5
+++ distinfo11 Aug 2020 14:56:21 -
@@ -1,2 +1,2 @@
-SHA256 (vdirsyncer-0.16.7.tar.gz) =
bJvPubywEkbIO6b4VRz1TFivMyMhB1VIX8I7t4SFEu8=
-SIZE (vdirsyncer-0.16.7.tar.gz) = 112786
+SHA256 (vdirsyncer-0.16.8.tar.gz) =
v9tCL1Lh1NYL0GNdID+1n6f2Ezl9B5Zh60jnlGS6E8U=
+SIZE (vdirsyncer-0.16.8.tar.gz) = 115819
Index: patches/patch-docs_conf_py
===
RCS file: patches/patch-docs_conf_py
diff -N patches/patch-docs_conf_py
--- patches/patch-docs_conf_py 3 Aug 2019 17:08:45 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,25 +0,0 @@
-$OpenBSD: patch-docs_conf_py,v 1.1 2019/08/03 17:08:45 kmos Exp $
-
-From https://github.com/pimutils/vdirsyncer/pull/799/
-
-Index: docs/conf.py
docs/conf.py.orig
-+++ docs/conf.py
-@@ -3,7 +3,7 @@
- import datetime
- import os
-
--import setuptools_scm
-+from pkg_resources import get_distribution
-
- extensions = ['sphinx.ext.autodoc']
-
-@@ -16,7 +16,7 @@ project = u'vdirsyncer'
- copyright = (u'2014-{}, Markus Unterwaditzer & contributors'
- .format(datetime.date.today().strftime('%Y')))
-
--release = setuptools_scm.get_version(root='..', relative_to=__file__)
-+release = get_distribution('vdirsyncer').version
- version = '.'.join(release.split('.')[:2]) # The short X.Y version.
-
- rst_epilog = '.. |vdirsyncer_version| replace:: %s' % release
Index: patches/patch-setup_py
===
RCS file: patches/patch-setup_py
diff -N patches/patch-setup_py
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-setup_py 11 Aug 2020 18:54:35 -
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Compatibility with latest click
+https://github.com/pimutils/vdirsyncer/commit/3eb9ce5ae4320d52e6c876874511ff96a8a45f51
+
+Index: setup.py
+--- setup.py.orig
setup.py
+@@ -11,7 +11,7 @@ from setuptools import Command, find_packages, setup
+
+ requirements = [
+ # https://github.com/mitsuhiko/click/issues/200
+-'click>=5.0,<6.0',
++'click>=5.0',
+ 'click-log>=0.3.0, <0.4.0',
+
+ # https://github.com/pimutils/vdirsyncer/issues/478
Index: patches/patch-tests_system_cli_test_sync_py
===
RCS file: patches/patch-tests_system_cli_test_sync_py
diff -N patches/patch-tests_system_cli_test_sync_py
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-tests_system_cli_test_sync_py 11 Aug 2020 18:53:57 -
@@ -0,0 +1,20 @@
+$OpenBSD$
+
+Compatibility with latest click
+https://github.com/pimutils/vdirsyncer/commit/3eb9ce5ae4320d52e6c876874511ff96a8a45f51
+
+Index: tests/system/cli/test_sync.py
+--- tests/system/cli/test_sync.py.orig
tests/system/cli/test_sync.py
+@@ -123,7 +123,10 @@ def test_verbosity(tmpdir, runner):
+ runner.write_with_general('')
+ result = runner.invoke(['--verbosity=HAHA', 'sync'])
+ assert result.exception
+-assert 'invalid value for "--verbosity"' in result.output.lower()
++assert {
++'invalid value for "--verbosity"' in result.output.lower()
++or "invalid value for '--verbosity'" in result.output.lower()
++}
+
+
+ def test_collections_cache_invalidation(tmpdir, runner):
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: r...@cvs.openbsd.org2020/06/03 05:00:51 Modified files: mail/offlineimap: Makefile distinfo Log message: Update OfflineIMAP to version 7.3.3 Removing myself as maintaier since I'm not using it anymore. OK tb@
[update] OfflineIMAP version 7.3.3
Hi,
here is an update for OfflineIMAP. It's only a small update.
https://github.com/OfflineIMAP/offlineimap/blob/v7.3.3/Changelog.md
I'm removing myself as maintainer since I switched to mbsync.
OK?
Remi
Index: Makefile
===
RCS file: /cvs/ports/mail/offlineimap/Makefile,v
retrieving revision 1.57
diff -u -p -r1.57 Makefile
--- Makefile26 Dec 2019 16:58:33 - 1.57
+++ Makefile30 May 2020 09:03:18 -
@@ -2,15 +2,13 @@
COMMENT= powerful IMAP/Maildir synchronization and reader support
-MODPY_EGG_VERSION = 7.3.2
+MODPY_EGG_VERSION = 7.3.3
DISTNAME = offlineimap-v${MODPY_EGG_VERSION}
PKGNAME = offlineimap-${MODPY_EGG_VERSION}
CATEGORIES=mail
HOMEPAGE= https://www.offlineimap.org/
-
-MAINTAINER=Remi Locherer
# GPLv2+
PERMIT_PACKAGE=Yes
Index: distinfo
===
RCS file: /cvs/ports/mail/offlineimap/distinfo,v
retrieving revision 1.43
diff -u -p -r1.43 distinfo
--- distinfo26 Dec 2019 16:58:33 - 1.43
+++ distinfo30 May 2020 09:03:31 -
@@ -1,2 +1,2 @@
-SHA256 (offlineimap-v7.3.2.tar.gz) =
ZyCh2l04+24PKzwnvOdPzgv3FLXHDS8PC6xlT0uilCM=
-SIZE (offlineimap-v7.3.2.tar.gz) = 740338
+SHA256 (offlineimap-v7.3.3.tar.gz) =
/BOu0FkBFzbrWbTF/tW06kph2guSz83VVe90VKjqy04=
+SIZE (offlineimap-v7.3.3.tar.gz) = 739666
Re: UPDATE: sysutils/lookat 1.4.4 => 2.0.0
On Mon, Mar 02, 2020 at 05:39:51PM -0500, Brian Callahan wrote:
> Hi ports --
>
> After more than 4 years, lookat received a new update.
> The changelog is short, the important items are:
> * utf8 support
> * change in the default color scheme
> * improved error handling
>
> Port-wise, I removed the do-install routine in favor of letting the Makefile
> do in the installation. I am not sure why I made the do-install routine all
> those years ago.
>
> Small patch to keep the example color schemes in the same directory as
> before, which I think is a better fit for our directory scheme than what
> upstream does.
>
> Also take MAINTAINER. I imported this many years ago, so I will maintain
> this again.
>
> OK?
>
> ~Brian
>
ok remi@
> Index: Makefile
> ===
> RCS file: /cvs/ports/sysutils/lookat/Makefile,v
> retrieving revision 1.5
> diff -u -p -r1.5 Makefile
> --- Makefile 12 Jul 2019 20:49:46 - 1.5
> +++ Makefile 2 Mar 2020 22:32:39 -
> @@ -1,32 +1,23 @@
> # $OpenBSD: Makefile,v 1.5 2019/07/12 20:49:46 sthen Exp $
>
> -V = 1.4.4
> +V = 2.0.0
> COMMENT =user-friendly text pager
> DISTNAME = lookat_bekijk-${V}
> PKGNAME =lookat-${V}
> CATEGORIES = sysutils textproc
> -REVISION = 0
>
> HOMEPAGE = http://www.wagemakers.be/english/programs/lookat
> +MAINTAINER = Brian Callahan
>
> # GPLv2+
> PERMIT_PACKAGE = Yes
>
> WANTLIB += c curses
>
> -MASTER_SITES = http://www.wagemakers.be/downloads/lookat/
> +MASTER_SITES = ${MASTER_SITE_SAVANNAH:=lookat/}
>
> CONFIGURE_STYLE =gnu
>
> -do-install:
> - ${INSTALL_PROGRAM} ${WRKSRC}/lookat ${PREFIX}/bin
> - ${INSTALL_MAN} ${WRKSRC}/lookat.1 ${PREFIX}/man/man1
> - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/lookat
> - ${INSTALL_DATA} ${WRKSRC}/lookat.conf.default \
> - ${PREFIX}/share/examples/lookat
> - ${INSTALL_DATA} ${WRKSRC}/examples/blue_config.cfg \
> - ${PREFIX}/share/examples/lookat
> - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/lookat
> - ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/lookat
> +FAKE_FLAGS = sysconfdir="${PREFIX}/share/examples/lookat"
>
> .include
> Index: distinfo
> ===
> RCS file: /cvs/ports/sysutils/lookat/distinfo,v
> retrieving revision 1.2
> diff -u -p -r1.2 distinfo
> --- distinfo 30 Dec 2015 10:46:47 - 1.2
> +++ distinfo 2 Mar 2020 22:32:39 -
> @@ -1,2 +1,2 @@
> -SHA256 (lookat_bekijk-1.4.4.tar.gz) =
> hlE+yQrRPEvEoVEPueF3/Vz1gbPUFBWWTLBzZXHK2cI=
> -SIZE (lookat_bekijk-1.4.4.tar.gz) = 279634
> +SHA256 (lookat_bekijk-2.0.0.tar.gz) =
> yVFaS6GnjatdTQKOBhzaOVpbRMLRBAWjPkyAOMRScmk=
> +SIZE (lookat_bekijk-2.0.0.tar.gz) = 300881
> Index: patches/patch-Makefile_in
> ===
> RCS file: patches/patch-Makefile_in
> diff -N patches/patch-Makefile_in
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-Makefile_in 2 Mar 2020 22:32:39 -
> @@ -0,0 +1,19 @@
> +$OpenBSD$
> +
> +Put example configs in examples rather than doc.
> +
> +Index: Makefile.in
> +--- Makefile.in.orig
> Makefile.in
> +@@ -970,9 +970,8 @@ bekijk.o: bekijk.c
> + $(COMPILE) -D_NED -DCONFIGFILE=\"$(CONFIGFILE)\"
> -DDOCFILE=\"$(NED_DOCFILE)\" -o bekijk.o -c bekijk.c
> +
> + install-data-local:
> +-$(mkinstalldirs) $(DESTDIR)$(docdir)examples
> +-$(INSTALL_DATA) $(srcdir)/examples/blue_and_black.cfg
> $(DESTDIR)$(docdir)examples/blue_and_black.cfg
> +-$(INSTALL_DATA) $(srcdir)/examples/cyan_and_blue.cfg
> $(DESTDIR)$(docdir)examples/cyan_and_blue.cfg
> ++$(INSTALL_DATA) $(srcdir)/examples/blue_and_black.cfg
> $(DESTDIR)$(datadir)/examples/lookat/blue_and_black.cfg
> ++$(INSTALL_DATA) $(srcdir)/examples/cyan_and_blue.cfg
> $(DESTDIR)$(datadir)/examples/lookat/cyan_and_blue.cfg
> +
> + @if test -f $(DESTDIR)$(CONFIGFILE); then \
> + echo ;\
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/sysutils/lookat/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 PLIST
> --- pkg/PLIST 20 Oct 2014 02:41:04 - 1.1.1.1
> +++ pkg/PLIST 2 Mar 2020 22:32:39 -
> @@ -1,9 +1,14 @@
> @comment $OpenBSD: PLIST,v 1.1.1.1 2014/10/20 02:41:04 bcallah Exp $
> +@bin bin/bekijk
> @bin bin/lookat
> +@man man/man1/bekijk.1
> @man man/man1/lookat.1
> share/doc/lookat/
> +share/doc/lookat/LEESMIJ
> share/doc/lookat/README
> share/examples/lookat/
> -share/examples/lookat/blue_config.cfg
> +share/examples/lookat/blue_and_black.cfg
> +share/examples/lookat/cyan_and_blue.cfg
> +share/examples/lookat/lookat.conf
> share/examples/lookat/lookat.conf.default
> @sample ${SYSCONFDIR}/lookat.conf
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: r...@cvs.openbsd.org2020/03/05 14:06:17 Modified files: sysutils/rsyslog: Makefile distinfo Log message: Update rsyslog to version 8.2002.0 OK sthen@
[update] rsyslog 8.2002.0
Hi, this updates the rsyslog port to version 8.2002.0. The change log is long and can be checked here: https://github.com/rsyslog/rsyslog/blob/v8.2002.0/ChangeLog I tested that the 6 tests from our syslog regress tests work and that rsyslog can write to mariadb. I did all the testing on amd64. OK? Remi Index: Makefile === RCS file: /cvs/ports/sysutils/rsyslog/Makefile,v retrieving revision 1.47 diff -u -p -r1.47 Makefile --- Makefile12 Sep 2019 21:13:05 - 1.47 +++ Makefile2 Mar 2020 16:44:52 - @@ -10,7 +10,7 @@ COMMENT-elasticsearch = Elasticsearch pl MULTI_PACKAGES = -main -mysql -normalize -pgsql -elasticsearch -V =8.1908.0 +V =8.2002.0 DISTNAME = rsyslog-$V PKGNAME-main = rsyslog-$V PKGNAME-mysql =rsyslog-mysql-$V @@ -36,7 +36,7 @@ WANTLIB-mysql += crypto iconv m mariadb WANTLIB-normalize += estr fastjson lognorm pthread -WANTLIB-pgsql += crypto pq pthread ssl +WANTLIB-pgsql += crypto m pq pthread ssl WANTLIB-elasticsearch += crypto curl m nghttp2 pthread ssl z Index: distinfo === RCS file: /cvs/ports/sysutils/rsyslog/distinfo,v retrieving revision 1.8 diff -u -p -r1.8 distinfo --- distinfo12 Sep 2019 21:13:05 - 1.8 +++ distinfo2 Mar 2020 16:45:02 - @@ -1,2 +1,2 @@ -SHA256 (rsyslog-8.1908.0.tar.gz) = +MjlO2UeA6ARZnxgvS1Nunp8tuwEskfI6oUUEVUnhjs= -SIZE (rsyslog-8.1908.0.tar.gz) = 2952939 +SHA256 (rsyslog-8.2002.0.tar.gz) = /obBTYYNoSAsdmFv6sBTnqWkCkrRgtdLfW0kGcwjgfg= +SIZE (rsyslog-8.2002.0.tar.gz) = 3000861
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: r...@cvs.openbsd.org2020/03/02 09:41:50 Modified files: sysutils/librelp: Makefile distinfo sysutils/librelp/patches: patch-src_tcp_c Log message: Update to version 1.5.0. This version starts using SSL_CONF_CTX_set_flags() which is not supported by LibreSSL. Inpuit and OK stehn@.
Re: [update] librelp version 1.5.0
On Sat, Feb 29, 2020 at 10:44:31PM +, Stuart Henderson wrote:
> On 2020/02/29 22:04, Remi Locherer wrote:
> > librelp version 1.5.0 was released in January 2020. According to the
> > changelog it contains mostly bug fixes.
> > --> https://github.com/rsyslog/librelp/blob/master/ChangeLog
> >
> > This release also introduces the usage of OpenSSL's SSL_CONF_cmd API.
> > --> https://github.com/rsyslog/librelp/blob/master/ChangeLog
> > This is a bit problematic since LibreSSL is not providing this API.
> > Are there better approaches for this issue than my patch?
> >
> > I verified on amd64 that rsyslog from ports can send and receive messages
> > via imrelp and omrelp with librelp 1.5.0.
> >
> > Comments? OKs?
>
> The common (and more easily greppable) way to do this is to use
> "&& !defined(LIBRESSL_VERSION_NUMBER)" in the patch rather than replacing
> with #if 0.
>
Ah yes, that looks better. Updated diff below.
Index: Makefile
===
RCS file: /cvs/ports/sysutils/librelp/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile12 Jul 2019 20:49:45 - 1.15
+++ Makefile29 Feb 2020 18:52:48 -
@@ -2,9 +2,9 @@
COMMENT = reliable event logging protocol library
-DISTNAME = librelp-1.4.0
+DISTNAME = librelp-1.5.0
-SHARED_LIBS += relp 3.0 # 5.0
+SHARED_LIBS += relp 3.1 # 5.0
CATEGORIES = sysutils
Index: distinfo
===
RCS file: /cvs/ports/sysutils/librelp/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo4 May 2019 20:16:42 - 1.7
+++ distinfo29 Feb 2020 13:47:21 -
@@ -1,2 +1,2 @@
-SHA256 (librelp-1.4.0.tar.gz) = XNAs5+3i/qA35lzFOJ5B3embabHfmEtCwUAp5gu53QU=
-SIZE (librelp-1.4.0.tar.gz) = 519235
+SHA256 (librelp-1.5.0.tar.gz) = aShO8aBRqywvd2WVjoR77x/POPR+sbA3LGX2PwPIOV4=
+SIZE (librelp-1.5.0.tar.gz) = 521793
Index: patches/patch-src_tcp_c
===
RCS file: /cvs/ports/sysutils/librelp/patches/patch-src_tcp_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_tcp_c
--- patches/patch-src_tcp_c 4 May 2019 20:16:42 - 1.1
+++ patches/patch-src_tcp_c 1 Mar 2020 13:50:02 -
@@ -1,22 +1,26 @@
$OpenBSD: patch-src_tcp_c,v 1.1 2019/05/04 20:16:42 remi Exp $
-LibreSSL has no support for @SECLEVEL
+LibreSSL has no support for @SECLEVEL and SSL_CONF_CTX_set_flags().
Index: src/tcp.c
--- src/tcp.c.orig
+++ src/tcp.c
-@@ -1183,14 +1183,8 @@ relpTcpTLSSetPrio_ossl(relpTcp_t *const pThis)
+@@ -1200,7 +1200,8 @@ relpTcpTLSSetPrio_ossl(relpTcp_t *const pThis)
/* Compute priority string (in simple cases where the user does not
care...) */
if(pThis->pristring == NULL) {
if (pThis->authmode == eRelpAuthMode_None) {
- #if OPENSSL_VERSION_NUMBER >= 0x1010L
-- /* NOTE: do never use: +eNULL, it DISABLES encryption!
*/
-- strncpy(pristringBuf,
"ALL:+COMPLEMENTOFDEFAULT:+ADH:+ECDH:+aNULL@SECLEVEL=0",
-- sizeof(pristringBuf));
-- #else
- strncpy(pristringBuf,
"ALL:+COMPLEMENTOFDEFAULT:+ADH:+ECDH:+aNULL",
++ #if OPENSSL_VERSION_NUMBER >= 0x1010L \
++ && !defined(LIBRESSL_VERSION_NUMBER)
+/* NOTE: do never use: +eNULL, it DISABLES encryption!
*/
+ strncpy(pristringBuf,
"ALL:+COMPLEMENTOFDEFAULT:+ADH:+ECDH:+aNULL@SECLEVEL=0",
sizeof(pristringBuf));
-- #endif
- } else {
- strncpy(pristringBuf, "DEFAULT", sizeof(pristringBuf));
- }
+@@ -1578,7 +1579,7 @@ relpTcpSetSslConfCmd_ossl(relpTcp_t *const pThis, char
+ } else {
+ pThis->pEngine->dbgprint("relpTcpSetSslConfCmd_ossl: set to
'%s'\n", tlsConfigCmd);
+ char errmsg[1424];
+-#if OPENSSL_VERSION_NUMBER >= 0x1002L
++#if OPENSSL_VERSION_NUMBER >= 0x1002L && !defined(LIBRESSL_VERSION_NUMBER)
+ char *pCurrentPos;
+ char *pNextPos;
+ char *pszCmd;
[update] librelp version 1.5.0
librelp version 1.5.0 was released in January 2020. According to the
changelog it contains mostly bug fixes.
--> https://github.com/rsyslog/librelp/blob/master/ChangeLog
This release also introduces the usage of OpenSSL's SSL_CONF_cmd API.
--> https://github.com/rsyslog/librelp/blob/master/ChangeLog
This is a bit problematic since LibreSSL is not providing this API.
Are there better approaches for this issue than my patch?
I verified on amd64 that rsyslog from ports can send and receive messages
via imrelp and omrelp with librelp 1.5.0.
Comments? OKs?
Remi
Index: Makefile
===
RCS file: /cvs/ports/sysutils/librelp/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile12 Jul 2019 20:49:45 - 1.15
+++ Makefile29 Feb 2020 18:52:48 -
@@ -2,9 +2,9 @@
COMMENT = reliable event logging protocol library
-DISTNAME = librelp-1.4.0
+DISTNAME = librelp-1.5.0
-SHARED_LIBS += relp 3.0 # 5.0
+SHARED_LIBS += relp 3.1 # 5.0
CATEGORIES = sysutils
Index: distinfo
===
RCS file: /cvs/ports/sysutils/librelp/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo4 May 2019 20:16:42 - 1.7
+++ distinfo29 Feb 2020 13:47:21 -
@@ -1,2 +1,2 @@
-SHA256 (librelp-1.4.0.tar.gz) = XNAs5+3i/qA35lzFOJ5B3embabHfmEtCwUAp5gu53QU=
-SIZE (librelp-1.4.0.tar.gz) = 519235
+SHA256 (librelp-1.5.0.tar.gz) = aShO8aBRqywvd2WVjoR77x/POPR+sbA3LGX2PwPIOV4=
+SIZE (librelp-1.5.0.tar.gz) = 521793
Index: patches/patch-src_tcp_c
===
RCS file: /cvs/ports/sysutils/librelp/patches/patch-src_tcp_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_tcp_c
--- patches/patch-src_tcp_c 4 May 2019 20:16:42 - 1.1
+++ patches/patch-src_tcp_c 29 Feb 2020 15:29:22 -
@@ -1,11 +1,11 @@
$OpenBSD: patch-src_tcp_c,v 1.1 2019/05/04 20:16:42 remi Exp $
-LibreSSL has no support for @SECLEVEL
+LibreSSL has no support for @SECLEVEL and SSL_CONF_CTX_set_flags().
Index: src/tcp.c
--- src/tcp.c.orig
+++ src/tcp.c
-@@ -1183,14 +1183,8 @@ relpTcpTLSSetPrio_ossl(relpTcp_t *const pThis)
+@@ -1200,14 +1200,8 @@ relpTcpTLSSetPrio_ossl(relpTcp_t *const pThis)
/* Compute priority string (in simple cases where the user does not
care...) */
if(pThis->pristring == NULL) {
if (pThis->authmode == eRelpAuthMode_None) {
@@ -20,3 +20,12 @@ Index: src/tcp.c
} else {
strncpy(pristringBuf, "DEFAULT", sizeof(pristringBuf));
}
+@@ -1578,7 +1572,7 @@ relpTcpSetSslConfCmd_ossl(relpTcp_t *const pThis, char
+ } else {
+ pThis->pEngine->dbgprint("relpTcpSetSslConfCmd_ossl: set to
'%s'\n", tlsConfigCmd);
+ char errmsg[1424];
+-#if OPENSSL_VERSION_NUMBER >= 0x1002L
++#if 0
+ char *pCurrentPos;
+ char *pNextPos;
+ char *pszCmd;
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: r...@cvs.openbsd.org2020/02/28 00:45:04 Modified files: sysutils/netshot: Makefile distinfo sysutils/netshot/patches: patch-netshot_conf sysutils/netshot/pkg: PLIST README Log message: Update netshot to version 0.14.1. - Library update (vulnerability fix) - Fix an error which could prevent the removal of credential sets - Add support for PKCS12 keystores (default now) Looks good to jca@. Input from stehn@.
Re: [update] netshot 0.14.1
anyone?
On Sat, Feb 15, 2020 at 10:54:40PM +0100, Remi Locherer wrote:
> ping
>
> On Tue, Feb 04, 2020 at 05:32:24PM +0100, Remi Locherer wrote:
> > Hi,
> >
> > Netshot 0.14.1 was released a while ago. The release notes list these items:
> >
> > - Library update (vulnerability fix)
> > - Fix an error which could prevent the removal of credential sets
> > - Add support for PKCS12 keystores (default now)
> >
> > I verified that after "pkg_add -u" netshot still works with an existing
> > Java key store file (*.jks).
> >
> > I think it makes sense to keep the "@extra ${SYSCONFDIR}/netshot.jks" in
> > PLIST since that is what the example config suggested till now.
> > But I'm not sure on this one.
> >
> > Comments, OKs?
> >
> > Remi
> >
> >
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/sysutils/netshot/Makefile,v
> > retrieving revision 1.7
> > diff -u -p -r1.7 Makefile
> > --- Makefile12 Sep 2019 21:21:25 - 1.7
> > +++ Makefile27 Oct 2019 20:46:40 -
> > @@ -2,7 +2,7 @@
> >
> > COMMENT = config backup and policy check for network devices
> >
> > -V =0.14.0
> > +V =0.14.1
> > DISTNAME = netshot_${V}
> > PKGNAME = ${DISTNAME:S/_/-/}
> > WRKDIST = ${WRKDIR}
> > Index: distinfo
> > ===
> > RCS file: /cvs/ports/sysutils/netshot/distinfo,v
> > retrieving revision 1.3
> > diff -u -p -r1.3 distinfo
> > --- distinfo12 Sep 2019 21:21:25 - 1.3
> > +++ distinfo27 Oct 2019 20:52:12 -
> > @@ -1,2 +1,2 @@
> > -SHA256 (netshot_0.14.0.zip) = 7HX9oTy/mWagcSvTPsgekNX7WTelHS7eu1lNUbNdOO8=
> > -SIZE (netshot_0.14.0.zip) = 45721309
> > +SHA256 (netshot_0.14.1.zip) = MpKMvBCtsvuEu1SyFxOYGHBO0Xzf4GRszy2DiH6pGUE=
> > +SIZE (netshot_0.14.1.zip) = 45722115
> > Index: patches/patch-netshot_conf
> > ===
> > RCS file: /cvs/ports/sysutils/netshot/patches/patch-netshot_conf,v
> > retrieving revision 1.3
> > diff -u -p -r1.3 patch-netshot_conf
> > --- patches/patch-netshot_conf 12 Sep 2019 21:21:25 - 1.3
> > +++ patches/patch-netshot_conf 27 Oct 2019 21:06:03 -
> > @@ -19,8 +19,8 @@ Index: netshot.conf
> > netshot.db.encryptionpassword = netshot
> >
> > # REST
> > --netshot.http.ssl.keystore.file = /usr/local/netshot/netshot.jks
> > -+netshot.http.ssl.keystore.file = ${SYSCONFDIR}/netshot.jks
> > +-netshot.http.ssl.keystore.file = /usr/local/netshot/netshot.pfx
> > ++netshot.http.ssl.keystore.file = ${SYSCONFDIR}/netshot.pfx
> > netshot.http.ssl.keystore.pass = password
> > #netshot.http.baseurl = https://localhost
> > netshot.http.baseurl = https://0.0.0.0
> > Index: pkg/PLIST
> > ===
> > RCS file: /cvs/ports/sysutils/netshot/pkg/PLIST,v
> > retrieving revision 1.2
> > diff -u -p -r1.2 PLIST
> > --- pkg/PLIST 12 Sep 2019 21:21:25 - 1.2
> > +++ pkg/PLIST 27 Oct 2019 21:15:46 -
> > @@ -18,6 +18,7 @@ share/examples/netshot/netshot.conf
> > @group _netshot
> > @sample ${SYSCONFDIR}/netshot.conf
> > @extra ${SYSCONFDIR}/netshot.jks
> > +@extra ${SYSCONFDIR}/netshot.pfx
> > @mode 0750
> > @owner _netshot
> > @sample ${VARBASE}/log/netshot/
> > Index: pkg/README
> > ===
> > RCS file: /cvs/ports/sysutils/netshot/pkg/README,v
> > retrieving revision 1.1
> > diff -u -p -r1.1 README
> > --- pkg/README 12 Sep 2019 21:21:25 - 1.1
> > +++ pkg/README 4 Feb 2020 16:14:35 -
> > @@ -26,12 +26,18 @@ MariaDB on the same host.
> >might be modified to look like this:
> >netshot.db.url = jdbc:mysql://localhost/netshot01?serverTimezone=UTC
> >
> > -- Create a TLS certificate in a Java keystore:
> > - # ${LOCALBASE}/jdk-1.8.0/bin/keytool -genkey -keyalg RSA -alias
> > selfsigned \
> > --keystore ${SYSCONFDIR}/netshot.jks -storepass password -validity 3600
> > \
> > --keysize 4096
> > - # chmod 640 ${SYSCONFDIR}/netshot.jks
> > - # chgrp _netshot ${SYSCONFDIR}/netshot.jks
> > +- Create a TLS key and certificate and put it in a keystore for Java:
> >
Re: [update] netshot 0.14.1
ping
On Tue, Feb 04, 2020 at 05:32:24PM +0100, Remi Locherer wrote:
> Hi,
>
> Netshot 0.14.1 was released a while ago. The release notes list these items:
>
> - Library update (vulnerability fix)
> - Fix an error which could prevent the removal of credential sets
> - Add support for PKCS12 keystores (default now)
>
> I verified that after "pkg_add -u" netshot still works with an existing
> Java key store file (*.jks).
>
> I think it makes sense to keep the "@extra ${SYSCONFDIR}/netshot.jks" in
> PLIST since that is what the example config suggested till now.
> But I'm not sure on this one.
>
> Comments, OKs?
>
> Remi
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/sysutils/netshot/Makefile,v
> retrieving revision 1.7
> diff -u -p -r1.7 Makefile
> --- Makefile 12 Sep 2019 21:21:25 - 1.7
> +++ Makefile 27 Oct 2019 20:46:40 -
> @@ -2,7 +2,7 @@
>
> COMMENT =config backup and policy check for network devices
>
> -V = 0.14.0
> +V = 0.14.1
> DISTNAME = netshot_${V}
> PKGNAME =${DISTNAME:S/_/-/}
> WRKDIST =${WRKDIR}
> Index: distinfo
> ===
> RCS file: /cvs/ports/sysutils/netshot/distinfo,v
> retrieving revision 1.3
> diff -u -p -r1.3 distinfo
> --- distinfo 12 Sep 2019 21:21:25 - 1.3
> +++ distinfo 27 Oct 2019 20:52:12 -
> @@ -1,2 +1,2 @@
> -SHA256 (netshot_0.14.0.zip) = 7HX9oTy/mWagcSvTPsgekNX7WTelHS7eu1lNUbNdOO8=
> -SIZE (netshot_0.14.0.zip) = 45721309
> +SHA256 (netshot_0.14.1.zip) = MpKMvBCtsvuEu1SyFxOYGHBO0Xzf4GRszy2DiH6pGUE=
> +SIZE (netshot_0.14.1.zip) = 45722115
> Index: patches/patch-netshot_conf
> ===
> RCS file: /cvs/ports/sysutils/netshot/patches/patch-netshot_conf,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-netshot_conf
> --- patches/patch-netshot_conf12 Sep 2019 21:21:25 - 1.3
> +++ patches/patch-netshot_conf27 Oct 2019 21:06:03 -
> @@ -19,8 +19,8 @@ Index: netshot.conf
> netshot.db.encryptionpassword = netshot
>
> # REST
> --netshot.http.ssl.keystore.file = /usr/local/netshot/netshot.jks
> -+netshot.http.ssl.keystore.file = ${SYSCONFDIR}/netshot.jks
> +-netshot.http.ssl.keystore.file = /usr/local/netshot/netshot.pfx
> ++netshot.http.ssl.keystore.file = ${SYSCONFDIR}/netshot.pfx
> netshot.http.ssl.keystore.pass = password
> #netshot.http.baseurl = https://localhost
> netshot.http.baseurl = https://0.0.0.0
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/sysutils/netshot/pkg/PLIST,v
> retrieving revision 1.2
> diff -u -p -r1.2 PLIST
> --- pkg/PLIST 12 Sep 2019 21:21:25 - 1.2
> +++ pkg/PLIST 27 Oct 2019 21:15:46 -
> @@ -18,6 +18,7 @@ share/examples/netshot/netshot.conf
> @group _netshot
> @sample ${SYSCONFDIR}/netshot.conf
> @extra ${SYSCONFDIR}/netshot.jks
> +@extra ${SYSCONFDIR}/netshot.pfx
> @mode 0750
> @owner _netshot
> @sample ${VARBASE}/log/netshot/
> Index: pkg/README
> ===
> RCS file: /cvs/ports/sysutils/netshot/pkg/README,v
> retrieving revision 1.1
> diff -u -p -r1.1 README
> --- pkg/README12 Sep 2019 21:21:25 - 1.1
> +++ pkg/README4 Feb 2020 16:14:35 -
> @@ -26,12 +26,18 @@ MariaDB on the same host.
>might be modified to look like this:
>netshot.db.url = jdbc:mysql://localhost/netshot01?serverTimezone=UTC
>
> -- Create a TLS certificate in a Java keystore:
> - # ${LOCALBASE}/jdk-1.8.0/bin/keytool -genkey -keyalg RSA -alias selfsigned
> \
> --keystore ${SYSCONFDIR}/netshot.jks -storepass password -validity 3600 \
> --keysize 4096
> - # chmod 640 ${SYSCONFDIR}/netshot.jks
> - # chgrp _netshot ${SYSCONFDIR}/netshot.jks
> +- Create a TLS key and certificate and put it in a keystore for Java:
> + # openssl req -new -x509 -days 825 \
> +-subj '/CN=netshot.example.com' \
> +-addext 'subjectAltName = DNS:netshot.example.com' \
> +-keyout ${SYSCONFDIR}/ssl/private/netshot.key \
> +-out ${SYSCONFDIR}/ssl/netshot.crt
> + # openssl pkcs12 -export -name netshot \
> +-in ${SYSCONFDIR}/ssl/netshot.crt \
> +-inkey ${SYSCONFDIR}/ssl/private/netshot.key \
> +-out ${SYSCONFDIR}/netshot.pfx
> + # chmod 640 ${SYSCONFDIR}/netshot.pfx
> + # chgrp _netshot ${SYSCONFDIR}/netshot.pfx
>
> - Enable and start Netshot to create the database tables.
># rcctl enable netshot; rcctl start netshot
>
[update] netshot 0.14.1
Hi,
Netshot 0.14.1 was released a while ago. The release notes list these items:
- Library update (vulnerability fix)
- Fix an error which could prevent the removal of credential sets
- Add support for PKCS12 keystores (default now)
I verified that after "pkg_add -u" netshot still works with an existing
Java key store file (*.jks).
I think it makes sense to keep the "@extra ${SYSCONFDIR}/netshot.jks" in
PLIST since that is what the example config suggested till now.
But I'm not sure on this one.
Comments, OKs?
Remi
Index: Makefile
===
RCS file: /cvs/ports/sysutils/netshot/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile12 Sep 2019 21:21:25 - 1.7
+++ Makefile27 Oct 2019 20:46:40 -
@@ -2,7 +2,7 @@
COMMENT = config backup and policy check for network devices
-V =0.14.0
+V =0.14.1
DISTNAME = netshot_${V}
PKGNAME = ${DISTNAME:S/_/-/}
WRKDIST = ${WRKDIR}
Index: distinfo
===
RCS file: /cvs/ports/sysutils/netshot/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo12 Sep 2019 21:21:25 - 1.3
+++ distinfo27 Oct 2019 20:52:12 -
@@ -1,2 +1,2 @@
-SHA256 (netshot_0.14.0.zip) = 7HX9oTy/mWagcSvTPsgekNX7WTelHS7eu1lNUbNdOO8=
-SIZE (netshot_0.14.0.zip) = 45721309
+SHA256 (netshot_0.14.1.zip) = MpKMvBCtsvuEu1SyFxOYGHBO0Xzf4GRszy2DiH6pGUE=
+SIZE (netshot_0.14.1.zip) = 45722115
Index: patches/patch-netshot_conf
===
RCS file: /cvs/ports/sysutils/netshot/patches/patch-netshot_conf,v
retrieving revision 1.3
diff -u -p -r1.3 patch-netshot_conf
--- patches/patch-netshot_conf 12 Sep 2019 21:21:25 - 1.3
+++ patches/patch-netshot_conf 27 Oct 2019 21:06:03 -
@@ -19,8 +19,8 @@ Index: netshot.conf
netshot.db.encryptionpassword = netshot
# REST
--netshot.http.ssl.keystore.file = /usr/local/netshot/netshot.jks
-+netshot.http.ssl.keystore.file = ${SYSCONFDIR}/netshot.jks
+-netshot.http.ssl.keystore.file = /usr/local/netshot/netshot.pfx
++netshot.http.ssl.keystore.file = ${SYSCONFDIR}/netshot.pfx
netshot.http.ssl.keystore.pass = password
#netshot.http.baseurl = https://localhost
netshot.http.baseurl = https://0.0.0.0
Index: pkg/PLIST
===
RCS file: /cvs/ports/sysutils/netshot/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 12 Sep 2019 21:21:25 - 1.2
+++ pkg/PLIST 27 Oct 2019 21:15:46 -
@@ -18,6 +18,7 @@ share/examples/netshot/netshot.conf
@group _netshot
@sample ${SYSCONFDIR}/netshot.conf
@extra ${SYSCONFDIR}/netshot.jks
+@extra ${SYSCONFDIR}/netshot.pfx
@mode 0750
@owner _netshot
@sample ${VARBASE}/log/netshot/
Index: pkg/README
===
RCS file: /cvs/ports/sysutils/netshot/pkg/README,v
retrieving revision 1.1
diff -u -p -r1.1 README
--- pkg/README 12 Sep 2019 21:21:25 - 1.1
+++ pkg/README 4 Feb 2020 16:14:35 -
@@ -26,12 +26,18 @@ MariaDB on the same host.
might be modified to look like this:
netshot.db.url = jdbc:mysql://localhost/netshot01?serverTimezone=UTC
-- Create a TLS certificate in a Java keystore:
- # ${LOCALBASE}/jdk-1.8.0/bin/keytool -genkey -keyalg RSA -alias selfsigned \
--keystore ${SYSCONFDIR}/netshot.jks -storepass password -validity 3600 \
--keysize 4096
- # chmod 640 ${SYSCONFDIR}/netshot.jks
- # chgrp _netshot ${SYSCONFDIR}/netshot.jks
+- Create a TLS key and certificate and put it in a keystore for Java:
+ # openssl req -new -x509 -days 825 \
+-subj '/CN=netshot.example.com' \
+-addext 'subjectAltName = DNS:netshot.example.com' \
+-keyout ${SYSCONFDIR}/ssl/private/netshot.key \
+-out ${SYSCONFDIR}/ssl/netshot.crt
+ # openssl pkcs12 -export -name netshot \
+-in ${SYSCONFDIR}/ssl/netshot.crt \
+-inkey ${SYSCONFDIR}/ssl/private/netshot.key \
+-out ${SYSCONFDIR}/netshot.pfx
+ # chmod 640 ${SYSCONFDIR}/netshot.pfx
+ # chgrp _netshot ${SYSCONFDIR}/netshot.pfx
- Enable and start Netshot to create the database tables.
# rcctl enable netshot; rcctl start netshot
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: r...@cvs.openbsd.org2019/12/26 09:58:33 Modified files: mail/offlineimap: Makefile distinfo Log message: Update to OfflineIMAP v7.3.2 and switch homepage/master_sites to https. ok gsoares@
[update] OfflineIMAP version 7.3.2
Hi,
this updates our OfflineIMAP package to version 7.3.2.
This release doesn't contain many changes.
Changelog can be found here:
https://github.com/OfflineIMAP/offlineimap/blob/v7.3.2/Changelog.md
(see changes for 7.3.1 and 7.3.2)
OK?
Remi
Index: Makefile
===
RCS file: /cvs/ports/mail/offlineimap/Makefile,v
retrieving revision 1.56
diff -u -p -r1.56 Makefile
--- Makefile5 Sep 2019 20:22:41 - 1.56
+++ Makefile26 Dec 2019 09:58:53 -
@@ -2,7 +2,7 @@
COMMENT= powerful IMAP/Maildir synchronization and reader support
-MODPY_EGG_VERSION = 7.3.0
+MODPY_EGG_VERSION = 7.3.2
DISTNAME = offlineimap-v${MODPY_EGG_VERSION}
PKGNAME = offlineimap-${MODPY_EGG_VERSION}
Index: distinfo
===
RCS file: /cvs/ports/mail/offlineimap/distinfo,v
retrieving revision 1.42
diff -u -p -r1.42 distinfo
--- distinfo5 Sep 2019 20:22:41 - 1.42
+++ distinfo26 Dec 2019 09:59:02 -
@@ -1,2 +1,2 @@
-SHA256 (offlineimap-v7.3.0.tar.gz) =
MKX+O9UkiW6u/pzTojQa2gUuzEnjN9dQ9Rla+YUjO28=
-SIZE (offlineimap-v7.3.0.tar.gz) = 739413
+SHA256 (offlineimap-v7.3.2.tar.gz) =
ZyCh2l04+24PKzwnvOdPzgv3FLXHDS8PC6xlT0uilCM=
+SIZE (offlineimap-v7.3.2.tar.gz) = 740338
Re: sysutils/pftop maintainership and development
On Tue, Nov 19, 2019 at 09:24:31PM +0100, Matthieu Herrb wrote: > Hi, > > I use pftop to monitor firewalls at work and find it quite useful. > > Unfortunatly it seems that canacar@ has lost interest in it. > > I'd like to take over maintaining it and offering it a new home. Ie > making a new release that would integrate existing patches first. > > I've one feature I'd like to add : the ability to use 'ifname' as a > keyword in the state filter options (-f). > > Any thoughts? Am I missing a better tool for efficient text-based > exploration of the pf state table? I don't know if systat is better for this task but it's in base. systat states systat rules Remi
Re: [update] baikal 0.6.1
On Tue, Nov 19, 2019 at 03:45:44PM +0100, Martin Reindl wrote:
> Hello ports@
>
> baikal 0.6.1 is out and fixes sync issues with Thunderbird.
> I'd pleased to take over maintainer.
>
> -m
This reads OK to me. I prepared the same diff but didn't test it yet.
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/productivity/baikal/Makefile,v
> retrieving revision 1.21
> diff -u -p -u -p -r1.21 Makefile
> --- Makefile 16 Oct 2019 20:17:27 - 1.21
> +++ Makefile 19 Nov 2019 14:33:22 -
> @@ -2,13 +2,14 @@
>
> COMMENT= lightweight CalDAV and CardDAV server
>
> -VERSION= 0.6.0
> +VERSION= 0.6.1
> DISTNAME=baikal-${VERSION}
> MASTER_SITES=
> https://github.com/sabre-io/Baikal/releases/download/${VERSION}/
> DISTFILES= ${DISTNAME}.zip
> CATEGORIES= productivity www
>
> HOMEPAGE=http://sabre.io/baikal/
I'd prefer an empty line here.
> +MAINTAINER = Martin Reindl
>
> # GPLv3
> PERMIT_PACKAGE= Yes
> Index: distinfo
> ===
> RCS file: /cvs/ports/productivity/baikal/distinfo,v
> retrieving revision 1.5
> diff -u -p -u -p -r1.5 distinfo
> --- distinfo 16 Oct 2019 20:17:27 - 1.5
> +++ distinfo 19 Nov 2019 14:33:22 -
> @@ -1,2 +1,2 @@
> -SHA256 (baikal-0.6.0.zip) = 7rX0Pt9rebCMQydNvjjCnAdutKkjAL46ILApKcEwiOg=
> -SIZE (baikal-0.6.0.zip) = 3432758
> +SHA256 (baikal-0.6.1.zip) = s6VTWRqE9CYqYzPPeaFiTl1CTVLEBxx3k0txkfcU11c=
> +SIZE (baikal-0.6.1.zip) = 3437686
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/productivity/baikal/pkg/PLIST,v
> retrieving revision 1.8
> diff -u -p -u -p -r1.8 PLIST
> --- pkg/PLIST 16 Oct 2019 20:17:28 - 1.8
> +++ pkg/PLIST 19 Nov 2019 14:33:22 -
> @@ -1068,6 +1068,7 @@ baikal/vendor/sabre/event/lib/coroutine.
> baikal/vendor/sabre/event/phpunit.xml.dist
> baikal/vendor/sabre/http/
> baikal/vendor/sabre/http/.gitignore
> +baikal/vendor/sabre/http/.php_cs.dist
> baikal/vendor/sabre/http/.travis.yml
> baikal/vendor/sabre/http/CHANGELOG.md
> baikal/vendor/sabre/http/LICENSE
> @@ -1105,6 +1106,7 @@ baikal/vendor/sabre/http/lib/ResponseInt
> baikal/vendor/sabre/http/lib/Sapi.php
> baikal/vendor/sabre/http/lib/Version.php
> baikal/vendor/sabre/http/lib/functions.php
> +baikal/vendor/sabre/http/phpstan.neon
> baikal/vendor/sabre/http/tests/
> baikal/vendor/sabre/http/tests/HTTP/
> baikal/vendor/sabre/http/tests/HTTP/Auth/
> @@ -1127,6 +1129,10 @@ baikal/vendor/sabre/http/tests/bootstrap
> baikal/vendor/sabre/http/tests/phpcs/
> baikal/vendor/sabre/http/tests/phpcs/ruleset.xml
> baikal/vendor/sabre/http/tests/phpunit.xml
> +baikal/vendor/sabre/http/tests/www/
> +baikal/vendor/sabre/http/tests/www/bar.php
> +baikal/vendor/sabre/http/tests/www/foo
> +baikal/vendor/sabre/http/tests/www/large.php
> baikal/vendor/sabre/uri/
> baikal/vendor/sabre/uri/.gitattributes
> baikal/vendor/sabre/uri/.gitignore
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: r...@cvs.openbsd.org2019/10/16 14:17:28 Modified files: productivity/baikal: Makefile distinfo productivity/baikal/pkg: PLIST README Log message: update Baikal to version 0.6.0 Important changes: - Compatability with PHP 7.3 (0.6.0) - Fix of an authentication bypass (0.5.1) ok and readme improvement sthen@
[update] baikal version 0.6.0
Hi,
it looks like there is again some development happening with the Baikal
project. Since version 0.6.0 it can be used with with PHP 7.3. In
version 0.5.1 an authentication bypass was fixed.
Tested with my phone.
OK?
Remi
Index: Makefile
===
RCS file: /cvs/ports/productivity/baikal/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile26 Sep 2019 21:59:30 - 1.20
+++ Makefile10 Oct 2019 09:52:26 -
@@ -2,12 +2,11 @@
COMMENT= lightweight CalDAV and CardDAV server
-VERSION= 0.4.6
+VERSION= 0.6.0
DISTNAME= baikal-${VERSION}
-MASTER_SITES= https://github.com/fruux/Baikal/releases/download/${VERSION}/
+MASTER_SITES= https://github.com/sabre-io/Baikal/releases/download/${VERSION}/
DISTFILES= ${DISTNAME}.zip
CATEGORIES=productivity www
-REVISION= 5
HOMEPAGE= http://sabre.io/baikal/
Index: distinfo
===
RCS file: /cvs/ports/productivity/baikal/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo2 Dec 2016 15:01:21 - 1.4
+++ distinfo10 Oct 2019 09:51:21 -
@@ -1,2 +1,2 @@
-SHA256 (baikal-0.4.6.zip) = lG6OQWH374S+QkMLbp07t91Lu+JBtAm+IIwURH16p6Y=
-SIZE (baikal-0.4.6.zip) = 3288478
+SHA256 (baikal-0.6.0.zip) = 7rX0Pt9rebCMQydNvjjCnAdutKkjAL46ILApKcEwiOg=
+SIZE (baikal-0.6.0.zip) = 3432758
Index: pkg/PLIST
===
RCS file: /cvs/ports/productivity/baikal/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST 4 Sep 2018 12:46:20 - 1.7
+++ pkg/PLIST 15 Oct 2019 18:51:41 -
@@ -5,10 +5,16 @@ baikal/Core/
baikal/Core/Distrib.php
baikal/Core/Frameworks/
baikal/Core/Frameworks/Baikal/
+baikal/Core/Frameworks/Baikal/Controller/
+baikal/Core/Frameworks/Baikal/Controller/Main.php
+baikal/Core/Frameworks/Baikal/Controller/Navigation/
+baikal/Core/Frameworks/Baikal/Controller/Navigation/Topbar/
+baikal/Core/Frameworks/Baikal/Controller/Navigation/Topbar/Anonymous.php
baikal/Core/Frameworks/Baikal/Core/
baikal/Core/Frameworks/Baikal/Core/PDOBasicAuth.php
baikal/Core/Frameworks/Baikal/Core/Server.php
baikal/Core/Frameworks/Baikal/Core/Tools.php
+baikal/Core/Frameworks/Baikal/Core/View.php
baikal/Core/Frameworks/Baikal/Framework.php
baikal/Core/Frameworks/Baikal/Model/
baikal/Core/Frameworks/Baikal/Model/AddressBook/
@@ -16,6 +22,7 @@ baikal/Core/Frameworks/Baikal/Model/Addr
baikal/Core/Frameworks/Baikal/Model/AddressBook/Contact.php
baikal/Core/Frameworks/Baikal/Model/Calendar/
baikal/Core/Frameworks/Baikal/Model/Calendar.php
+baikal/Core/Frameworks/Baikal/Model/Calendar/Calendar.php
baikal/Core/Frameworks/Baikal/Model/Calendar/Event.php
baikal/Core/Frameworks/Baikal/Model/Config/
baikal/Core/Frameworks/Baikal/Model/Config.php
@@ -25,6 +32,21 @@ baikal/Core/Frameworks/Baikal/Model/Conf
baikal/Core/Frameworks/Baikal/Model/Config/System.php
baikal/Core/Frameworks/Baikal/Model/Principal.php
baikal/Core/Frameworks/Baikal/Model/User.php
+baikal/Core/Frameworks/Baikal/Resources/
+baikal/Core/Frameworks/Baikal/Resources/Images/
+baikal/Core/Frameworks/Baikal/Resources/Images/logo-baikal.png
+baikal/Core/Frameworks/Baikal/Resources/Templates/
+baikal/Core/Frameworks/Baikal/Resources/Templates/Main.html
+baikal/Core/Frameworks/Baikal/Resources/Templates/Navigation/
+baikal/Core/Frameworks/Baikal/Resources/Templates/Navigation/Topbar/
+baikal/Core/Frameworks/Baikal/Resources/Templates/Navigation/Topbar/Anonymous.html
+baikal/Core/Frameworks/Baikal/Resources/Templates/Page/
+baikal/Core/Frameworks/Baikal/Resources/Templates/Page/index.html
+baikal/Core/Frameworks/Baikal/View/
+baikal/Core/Frameworks/Baikal/View/Main.php
+baikal/Core/Frameworks/Baikal/View/Navigation/
+baikal/Core/Frameworks/Baikal/View/Navigation/Topbar/
+baikal/Core/Frameworks/Baikal/View/Navigation/Topbar/Anonymous.php
baikal/Core/Frameworks/Baikal/WWWRoot/
baikal/Core/Frameworks/Baikal/WWWRoot/index.php
baikal/Core/Frameworks/BaikalAdmin/
@@ -33,6 +55,7 @@ baikal/Core/Frameworks/BaikalAdmin/Contr
baikal/Core/Frameworks/BaikalAdmin/Controller/Install/
baikal/Core/Frameworks/BaikalAdmin/Controller/Install/Database.php
baikal/Core/Frameworks/BaikalAdmin/Controller/Install/Initialize.php
+baikal/Core/Frameworks/BaikalAdmin/Controller/Install/UpgradeConfirmation.php
baikal/Core/Frameworks/BaikalAdmin/Controller/Install/VersionUpgrade.php
baikal/Core/Frameworks/BaikalAdmin/Controller/Login.php
baikal/Core/Frameworks/BaikalAdmin/Controller/Logout.php
@@ -70,6 +93,7 @@ baikal/Core/Frameworks/BaikalAdmin/Resou
baikal/Core/Frameworks/BaikalAdmin/Resources/Templates/Install/
baikal/Core/Frameworks/BaikalAdmin/Resources/Templates/Install/Database.html
baikal/Core/Frameworks/BaikalAdmin/Resources/Templates/Install/Initialize.html
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: r...@cvs.openbsd.org2019/09/12 15:21:25 Modified files: sysutils/netshot: Makefile distinfo sysutils/netshot/patches: patch-netshot_conf sysutils/netshot/pkg: PLIST Added files: sysutils/netshot/pkg: README Log message: Update netshot to version 0.14.0. The port now depends exclusively on Java 1.8. Netshot uses nashorn which was deprecated after Java 1.8. It might work with later Java versions but this has not been tested yet. inputs and OK stehn@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: r...@cvs.openbsd.org2019/09/12 15:13:05 Modified files: sysutils/rsyslog: Makefile distinfo Log message: update to version 8.1908.0 ok sthen@
Re: NEW: sysutils/py-distro
On Wed, Sep 11, 2019 at 09:37:55PM +0100, Stuart Henderson wrote: > On 2019/09/11 21:37, Stuart Henderson wrote: > > This is needed for newer certbot (the function it was using before > > will be removed in Python 3.8). > > > > --- > > distro provides information about the OS distribution it runs on, such > > as a reliable machine-readable ID, or version information. > > > > It is the recommended replacement for Python's original > > platform.linux_distribution function (which will be removed in Python > > 3.8). It also provides much more functionality which isn't necessarily > > Python bound, like a command-line interface. > > --- > > > > OK to import? > > > > There is a python 2 version in a separate tree upstream, but I don't > > propose adding that to ports unless something we want in ports actually > > starts depending on it. > > > > Now with attachment. > Looks good to me. OK remi@. Fun fact: 172 out of 173 tests are skipped. Reason for most cases: "not IS_LINUX" ;-)
Re: [update] netshot 0.14.0
On Wed, Sep 11, 2019 at 01:38:06AM +0100, Stuart Henderson wrote:
> On 2019/09/09 07:53, Remi Locherer wrote:
> > ping
> >
> > > retrieving revision 1.2
> > > diff -u -p -r1.2 patch-netshot_conf
> > > --- patches/patch-netshot_conf8 Feb 2019 21:33:40 - 1.2
> > > +++ patches/patch-netshot_conf25 Aug 2019 21:27:25 -
> > > @@ -20,16 +20,23 @@ Index: netshot.conf
> > >
> > > # REST
> > > -netshot.http.ssl.keystore.file = /usr/local/netshot/netshot.jks
> > > -+netshot.http.ssl.keystore.file = ${PREFIX}/netshot/netshot.jks
> > > ++netshot.http.ssl.keystore.file = ${SYSCONFDIR}/netshot.jks
>
> this wants an @extra entry in PLIST
>
> > > + # Allow a trap received from any IP of a device to trigger an automatic
> > > snapshot
> > > netshot.snapshots.auto.anyip = true
> > > + # After a snapshot, dump the last configuration to a file in this
> > > directory
> > > +-#netshot.snapshots.dump = /usr/local/netshot/dumps
> > > ++#netshot.snapshots.dump = ${VARBASE}/netshot/dumps
> > > + # Where to store the binary snapshot files
> > > +-netshot.snapshots.binary.path = /var/local/netshot
> > > ++netshot.snapshots.binary.path = ${VARBASE}/netshot
> > > +
> > > + # Where to look for additional drivers
> > > -netshot.drivers.path = /usr/local/netshot/drivers
> > > +netshot.drivers.path = ${PREFIX}/netshot/drivers
> > >
> > > +
> > > # Authentication
> > > - netshot.aaa.maxidletime = 1800
> > > Index: pkg/PLIST
> > > ===
> > > RCS file: /cvs/ports/sysutils/netshot/pkg/PLIST,v
> > > retrieving revision 1.1.1.1
> > > diff -u -p -r1.1.1.1 PLIST
> > > --- pkg/PLIST 28 Aug 2018 11:25:53 - 1.1.1.1
> > > +++ pkg/PLIST 27 Aug 2019 21:08:42 -
> > > @@ -7,12 +7,11 @@ netshot/
> > > netshot/netshot.jar
> > > share/doc/netshot/
> > > share/doc/netshot/COPYING
> > > -share/doc/netshot/INSTALL.Debian-Ubuntu-Mint.txt
> > > -share/doc/netshot/INSTALL.Redhat-CentOS.txt
> > > share/doc/netshot/LICENSE.txt
> > > share/doc/netshot/README.txt
> > > share/doc/netshot/UPDATE.txt
> > > share/doc/netshot/VERSION.txt
> > > +share/doc/pkg-readmes/${PKGSTEM}
> > > share/examples/netshot/
> > > share/examples/netshot/netshot.conf
> > > @mode 0640
> > > @@ -21,3 +20,5 @@ share/examples/netshot/netshot.conf
> > > @mode 0750
> > > @owner _netshot
> > > @sample ${VARBASE}/log/netshot/
> > > +@sample ${VARBASE}/netshot/
> > > +@sample ${VARBASE}/netshot/dumps
>
> no trailing / so this copies the previously installed file to
> ${VARBASE}/netshot/dumps which I think is not what you want?
>
> should have @extra or @extraunexec lines to remove the files which might be
> created in those directories for pkg_delete -c.
>
> > > Index: pkg/README
> > > ===
> > > RCS file: pkg/README
> > > diff -N pkg/README
> > > --- /dev/null 1 Jan 1970 00:00:00 -
> > > +++ pkg/README1 Sep 2019 16:15:57 -
> > > @@ -0,0 +1,46 @@
> > > +$OpenBSD$
> > > +
> > > ++---
> > > +| Running ${PKGSTEM} on OpenBSD
> > > ++---
> > > +
> > > +Netshot requires a database which might be on the same server as Netshot
> > > +or remote. It supports PostgreSQL and MySQL/MariaDB. Below example uses
> > > +MariaDB on the same host.
> > > +
> > > +- Install the package mariadb-server.
> > > + See ${LOCALBASE}/share/doc/pkg-readmes/mariadb-server for the first
> > > + steps after the installation.
> > > +
> > > +- Create a database and a database user (change the password!):
> > > + $ mysql -u root
> > > + > CREATE DATABASE netshot01 CHARACTER SET utf8
> > > +DEFAULT COLLATE utf8_general_ci;
> > > + > GRANT ALL PRIVILEGES ON netshot01.*
> > > +TO 'netshot'@'localhost' IDENTIFIED BY 'netshot';
>
> think I'd use "IDENTIFIED BY 'password'" to make it more obvious
> where the password goes, for people who aren't so familiar with sql
> ops.
>
> > > + > quit
> > > +
> > > +- Check the database connection config in /
[update] rsyslog 8.1908.0
Hi, this updates rsyslogd to version 8.1908.0. It contains mostly bug fixes. Changelog: https://github.com/rsyslog/rsyslog/blob/master/ChangeLog I successfully tested the following: - rsyslogd related tests in syslogd regress suite (amd64) - imudp (amd64, i386) - omfile (amd64, i386) - ommysql (amd64) OK? Remi Index: Makefile === RCS file: /cvs/ports/sysutils/rsyslog/Makefile,v retrieving revision 1.46 diff -u -p -r1.46 Makefile --- Makefile12 Jul 2019 20:49:50 - 1.46 +++ Makefile5 Sep 2019 20:43:04 - @@ -10,7 +10,7 @@ COMMENT-elasticsearch = Elasticsearch pl MULTI_PACKAGES = -main -mysql -normalize -pgsql -elasticsearch -V =8.1905.0 +V =8.1908.0 DISTNAME = rsyslog-$V PKGNAME-main = rsyslog-$V PKGNAME-mysql =rsyslog-mysql-$V Index: distinfo === RCS file: /cvs/ports/sysutils/rsyslog/distinfo,v retrieving revision 1.7 diff -u -p -r1.7 distinfo --- distinfo14 Jun 2019 04:12:33 - 1.7 +++ distinfo5 Sep 2019 20:43:11 - @@ -1,2 +1,2 @@ -SHA256 (rsyslog-8.1905.0.tar.gz) = lr1Pq412j9atItReELg+FZuT35uvzeHVguEiT2RxFuQ= -SIZE (rsyslog-8.1905.0.tar.gz) = 2911703 +SHA256 (rsyslog-8.1908.0.tar.gz) = +MjlO2UeA6ARZnxgvS1Nunp8tuwEskfI6oUUEVUnhjs= +SIZE (rsyslog-8.1908.0.tar.gz) = 2952939
Re: [update] netshot 0.14.0
ping
On Sun, Sep 01, 2019 at 06:20:41PM +0200, Remi Locherer wrote:
> Hi,
>
> this is a long overdue update for netshot from version 0.11.0 to 0.14.0.
>
> It now contains improved and additional drivers, general improvements and
> updated libraries (vulnerabilities!).
> Release history: https://github.com/netfishers-onl/Netshot/tree/master/dist
>
> The install instructions for Debian and CentoOS have been moved to the
> wiki and are not part of the port anymore. Instead I added a pkg-readme
> with detailed instructions.
>
> I changed the port to depend exclusively on Java 1.8. Netshot depends on
> nashorn which was deprecated after Java 1.8. It might work with later Java
> versions but I did not test it yet.
>
> OK?
>
> Remi
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/sysutils/netshot/Makefile,v
> retrieving revision 1.6
> diff -u -p -r1.6 Makefile
> --- Makefile 12 Jul 2019 21:15:36 - 1.6
> +++ Makefile 27 Aug 2019 21:10:34 -
> @@ -2,8 +2,7 @@
>
> COMMENT =config backup and policy check for network devices
>
> -V = 0.11.0
> -REVISION = 1
> +V = 0.14.0
> DISTNAME = netshot_${V}
> PKGNAME =${DISTNAME:S/_/-/}
> WRKDIST =${WRKDIR}
> @@ -22,7 +21,7 @@ MASTER_SITES = https://github.com/netfi
> EXTRACT_SUFX = .zip
>
> MODULES =java
> -MODJAVA_VER =1.8+
> +MODJAVA_VER =1.8
>
> RUN_DEPENDS =java/javaPathHelper
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/sysutils/netshot/distinfo,v
> retrieving revision 1.2
> diff -u -p -r1.2 distinfo
> --- distinfo 8 Feb 2019 21:33:40 - 1.2
> +++ distinfo 13 Aug 2019 08:13:55 -
> @@ -1,2 +1,2 @@
> -SHA256 (netshot_0.11.0.zip) = 00N9CByc4inEaWctvmG6IRBZKf95vJrhTJ0Gu5NDfhY=
> -SIZE (netshot_0.11.0.zip) = 4732
> +SHA256 (netshot_0.14.0.zip) = 7HX9oTy/mWagcSvTPsgekNX7WTelHS7eu1lNUbNdOO8=
> +SIZE (netshot_0.14.0.zip) = 45721309
> Index: patches/patch-netshot_conf
> ===
> RCS file: /cvs/ports/sysutils/netshot/patches/patch-netshot_conf,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-netshot_conf
> --- patches/patch-netshot_conf8 Feb 2019 21:33:40 - 1.2
> +++ patches/patch-netshot_conf25 Aug 2019 21:27:25 -
> @@ -20,16 +20,23 @@ Index: netshot.conf
>
> # REST
> -netshot.http.ssl.keystore.file = /usr/local/netshot/netshot.jks
> -+netshot.http.ssl.keystore.file = ${PREFIX}/netshot/netshot.jks
> ++netshot.http.ssl.keystore.file = ${SYSCONFDIR}/netshot.jks
> netshot.http.ssl.keystore.pass = password
> #netshot.http.baseurl = https://localhost
> netshot.http.baseurl = https://0.0.0.0
> -@@ -35,7 +35,7 @@ netshot.snmptrap.community = Netsh01
> - # General settings
> - netshot.snapshots.auto.interval = 15
> +@@ -38,12 +38,12 @@ netshot.snapshots.auto.interval = 15
> + # Allow a trap received from any IP of a device to trigger an automatic
> snapshot
> netshot.snapshots.auto.anyip = true
> + # After a snapshot, dump the last configuration to a file in this directory
> +-#netshot.snapshots.dump = /usr/local/netshot/dumps
> ++#netshot.snapshots.dump = ${VARBASE}/netshot/dumps
> + # Where to store the binary snapshot files
> +-netshot.snapshots.binary.path = /var/local/netshot
> ++netshot.snapshots.binary.path = ${VARBASE}/netshot
> +
> + # Where to look for additional drivers
> -netshot.drivers.path = /usr/local/netshot/drivers
> +netshot.drivers.path = ${PREFIX}/netshot/drivers
>
> +
> # Authentication
> - netshot.aaa.maxidletime = 1800
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/sysutils/netshot/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 PLIST
> --- pkg/PLIST 28 Aug 2018 11:25:53 - 1.1.1.1
> +++ pkg/PLIST 27 Aug 2019 21:08:42 -
> @@ -7,12 +7,11 @@ netshot/
> netshot/netshot.jar
> share/doc/netshot/
> share/doc/netshot/COPYING
> -share/doc/netshot/INSTALL.Debian-Ubuntu-Mint.txt
> -share/doc/netshot/INSTALL.Redhat-CentOS.txt
> share/doc/netshot/LICENSE.txt
> share/doc/netshot/README.txt
> share/doc/netshot/UPDATE.txt
> share/doc/netshot/VERSION.txt
> +share/doc/pkg-readmes/${PKGSTEM}
> share/examples/netshot/
> share/examples/netshot/netshot.conf
> @mode 0640
> @@ -21,3 +20,5 @@ share/examples/netshot/netshot.conf
> @mode 0750
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: r...@cvs.openbsd.org2019/09/05 14:22:41 Modified files: mail/offlineimap: Makefile distinfo Log message: Update OfflineIMAP to version 7.3.0. reads OK to sthen@
[update] netshot 0.14.0
Hi,
this is a long overdue update for netshot from version 0.11.0 to 0.14.0.
It now contains improved and additional drivers, general improvements and
updated libraries (vulnerabilities!).
Release history: https://github.com/netfishers-onl/Netshot/tree/master/dist
The install instructions for Debian and CentoOS have been moved to the
wiki and are not part of the port anymore. Instead I added a pkg-readme
with detailed instructions.
I changed the port to depend exclusively on Java 1.8. Netshot depends on
nashorn which was deprecated after Java 1.8. It might work with later Java
versions but I did not test it yet.
OK?
Remi
Index: Makefile
===
RCS file: /cvs/ports/sysutils/netshot/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile12 Jul 2019 21:15:36 - 1.6
+++ Makefile27 Aug 2019 21:10:34 -
@@ -2,8 +2,7 @@
COMMENT = config backup and policy check for network devices
-V =0.11.0
-REVISION = 1
+V =0.14.0
DISTNAME = netshot_${V}
PKGNAME = ${DISTNAME:S/_/-/}
WRKDIST = ${WRKDIR}
@@ -22,7 +21,7 @@ MASTER_SITES =https://github.com/netfi
EXTRACT_SUFX = .zip
MODULES = java
-MODJAVA_VER = 1.8+
+MODJAVA_VER = 1.8
RUN_DEPENDS = java/javaPathHelper
Index: distinfo
===
RCS file: /cvs/ports/sysutils/netshot/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo8 Feb 2019 21:33:40 - 1.2
+++ distinfo13 Aug 2019 08:13:55 -
@@ -1,2 +1,2 @@
-SHA256 (netshot_0.11.0.zip) = 00N9CByc4inEaWctvmG6IRBZKf95vJrhTJ0Gu5NDfhY=
-SIZE (netshot_0.11.0.zip) = 4732
+SHA256 (netshot_0.14.0.zip) = 7HX9oTy/mWagcSvTPsgekNX7WTelHS7eu1lNUbNdOO8=
+SIZE (netshot_0.14.0.zip) = 45721309
Index: patches/patch-netshot_conf
===
RCS file: /cvs/ports/sysutils/netshot/patches/patch-netshot_conf,v
retrieving revision 1.2
diff -u -p -r1.2 patch-netshot_conf
--- patches/patch-netshot_conf 8 Feb 2019 21:33:40 - 1.2
+++ patches/patch-netshot_conf 25 Aug 2019 21:27:25 -
@@ -20,16 +20,23 @@ Index: netshot.conf
# REST
-netshot.http.ssl.keystore.file = /usr/local/netshot/netshot.jks
-+netshot.http.ssl.keystore.file = ${PREFIX}/netshot/netshot.jks
++netshot.http.ssl.keystore.file = ${SYSCONFDIR}/netshot.jks
netshot.http.ssl.keystore.pass = password
#netshot.http.baseurl = https://localhost
netshot.http.baseurl = https://0.0.0.0
-@@ -35,7 +35,7 @@ netshot.snmptrap.community = Netsh01
- # General settings
- netshot.snapshots.auto.interval = 15
+@@ -38,12 +38,12 @@ netshot.snapshots.auto.interval = 15
+ # Allow a trap received from any IP of a device to trigger an automatic
snapshot
netshot.snapshots.auto.anyip = true
+ # After a snapshot, dump the last configuration to a file in this directory
+-#netshot.snapshots.dump = /usr/local/netshot/dumps
++#netshot.snapshots.dump = ${VARBASE}/netshot/dumps
+ # Where to store the binary snapshot files
+-netshot.snapshots.binary.path = /var/local/netshot
++netshot.snapshots.binary.path = ${VARBASE}/netshot
+
+ # Where to look for additional drivers
-netshot.drivers.path = /usr/local/netshot/drivers
+netshot.drivers.path = ${PREFIX}/netshot/drivers
+
# Authentication
- netshot.aaa.maxidletime = 1800
Index: pkg/PLIST
===
RCS file: /cvs/ports/sysutils/netshot/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 28 Aug 2018 11:25:53 - 1.1.1.1
+++ pkg/PLIST 27 Aug 2019 21:08:42 -
@@ -7,12 +7,11 @@ netshot/
netshot/netshot.jar
share/doc/netshot/
share/doc/netshot/COPYING
-share/doc/netshot/INSTALL.Debian-Ubuntu-Mint.txt
-share/doc/netshot/INSTALL.Redhat-CentOS.txt
share/doc/netshot/LICENSE.txt
share/doc/netshot/README.txt
share/doc/netshot/UPDATE.txt
share/doc/netshot/VERSION.txt
+share/doc/pkg-readmes/${PKGSTEM}
share/examples/netshot/
share/examples/netshot/netshot.conf
@mode 0640
@@ -21,3 +20,5 @@ share/examples/netshot/netshot.conf
@mode 0750
@owner _netshot
@sample ${VARBASE}/log/netshot/
+@sample ${VARBASE}/netshot/
+@sample ${VARBASE}/netshot/dumps
Index: pkg/README
===
RCS file: pkg/README
diff -N pkg/README
--- /dev/null 1 Jan 1970 00:00:00 -
+++ pkg/README 1 Sep 2019 16:15:57 -
@@ -0,0 +1,46 @@
+$OpenBSD$
+
++---
+| Running ${PKGSTEM} on OpenBSD
++---
+
+Netshot requires a database which might be on the same server as Netshot
+or remote. It supports PostgreSQL and MySQL/MariaDB. Below example uses
Re: [update] OfflineIMAP v7.3.0
ping
On Sat, Aug 24, 2019 at 10:51:30PM +0200, Remi Locherer wrote:
>
> Hi,
>
> The OfflineIMAP project released version 7.3.0 a few days ago. The main
> changes are:
> - Because the imalib2 project is discontinued OfflineIMAP started maintaining
> its own version.
> - Support for Happy Eyeballs was added (RFC 6555)
>
> Changelog:
> http://www.offlineimap.org/doc/Changelog.html#offlineimap-v730-2019-08-19
>
> OK?
>
> Remi
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/mail/offlineimap/Makefile,v
> retrieving revision 1.55
> diff -u -p -r1.55 Makefile
> --- Makefile 12 Jul 2019 20:47:31 - 1.55
> +++ Makefile 24 Aug 2019 20:29:37 -
> @@ -2,7 +2,7 @@
>
> COMMENT= powerful IMAP/Maildir synchronization and reader support
>
> -MODPY_EGG_VERSION = 7.2.4
> +MODPY_EGG_VERSION = 7.3.0
> DISTNAME = offlineimap-v${MODPY_EGG_VERSION}
> PKGNAME =offlineimap-${MODPY_EGG_VERSION}
>
> @@ -20,9 +20,11 @@ NO_TEST= Yes
> MODULES= lang/python
>
> BUILD_DEPENDS= textproc/asciidoc \
> + devel/py-rfc6555 \
> devel/py-six
>
> -RUN_DEPENDS= devel/py-six
> +RUN_DEPENDS= devel/py-rfc6555 \
> + devel/py-six
>
> MASTER_SITES=http://www.offlineimap.org/uploads/
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/mail/offlineimap/distinfo,v
> retrieving revision 1.41
> diff -u -p -r1.41 distinfo
> --- distinfo 18 Jun 2019 20:32:37 - 1.41
> +++ distinfo 20 Aug 2019 07:07:39 -
> @@ -1,2 +1,2 @@
> -SHA256 (offlineimap-v7.2.4.tar.gz) =
> bO2R4Mlcsy2GbWe7FdTsV1uvVL765PUT3P7E84ivNzQ=
> -SIZE (offlineimap-v7.2.4.tar.gz) = 737300
> +SHA256 (offlineimap-v7.3.0.tar.gz) =
> MKX+O9UkiW6u/pzTojQa2gUuzEnjN9dQ9Rla+YUjO28=
> +SIZE (offlineimap-v7.3.0.tar.gz) = 739413
>
[update] OfflineIMAP v7.3.0
Hi,
The OfflineIMAP project released version 7.3.0 a few days ago. The main
changes are:
- Because the imalib2 project is discontinued OfflineIMAP started maintaining
its own version.
- Support for Happy Eyeballs was added (RFC 6555)
Changelog:
http://www.offlineimap.org/doc/Changelog.html#offlineimap-v730-2019-08-19
OK?
Remi
Index: Makefile
===
RCS file: /cvs/ports/mail/offlineimap/Makefile,v
retrieving revision 1.55
diff -u -p -r1.55 Makefile
--- Makefile12 Jul 2019 20:47:31 - 1.55
+++ Makefile24 Aug 2019 20:29:37 -
@@ -2,7 +2,7 @@
COMMENT= powerful IMAP/Maildir synchronization and reader support
-MODPY_EGG_VERSION = 7.2.4
+MODPY_EGG_VERSION = 7.3.0
DISTNAME = offlineimap-v${MODPY_EGG_VERSION}
PKGNAME = offlineimap-${MODPY_EGG_VERSION}
@@ -20,9 +20,11 @@ NO_TEST= Yes
MODULES= lang/python
BUILD_DEPENDS= textproc/asciidoc \
+ devel/py-rfc6555 \
devel/py-six
-RUN_DEPENDS= devel/py-six
+RUN_DEPENDS= devel/py-rfc6555 \
+ devel/py-six
MASTER_SITES= http://www.offlineimap.org/uploads/
Index: distinfo
===
RCS file: /cvs/ports/mail/offlineimap/distinfo,v
retrieving revision 1.41
diff -u -p -r1.41 distinfo
--- distinfo18 Jun 2019 20:32:37 - 1.41
+++ distinfo20 Aug 2019 07:07:39 -
@@ -1,2 +1,2 @@
-SHA256 (offlineimap-v7.2.4.tar.gz) =
bO2R4Mlcsy2GbWe7FdTsV1uvVL765PUT3P7E84ivNzQ=
-SIZE (offlineimap-v7.2.4.tar.gz) = 737300
+SHA256 (offlineimap-v7.3.0.tar.gz) =
MKX+O9UkiW6u/pzTojQa2gUuzEnjN9dQ9Rla+YUjO28=
+SIZE (offlineimap-v7.3.0.tar.gz) = 739413
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: r...@cvs.openbsd.org2019/08/24 14:40:05 Modified files: devel : Makefile Log message: put py-rfc6555 where it belogs
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: r...@cvs.openbsd.org2019/08/24 14:18:18 Modified files: devel : Makefile Log message: +py-rfc6555
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: r...@cvs.openbsd.org2019/08/24 14:13:01 Log message: py-rfc6555 implements the Happy Eyeballs algorithm inputs and patches from kmos@ OK kmos@ sthen@ Status: Vendor Tag: remi Release Tags: remi_20190824 N ports/devel/py-rfc6555/Makefile N ports/devel/py-rfc6555/distinfo N ports/devel/py-rfc6555/pkg/DESCR N ports/devel/py-rfc6555/pkg/PLIST N ports/devel/py-rfc6555/patches/patch-rfc6555_py N ports/devel/py-rfc6555/patches/patch-setup_py No conflicts created by this import
Re: [new] py-rfc6555
On Thu, Aug 22, 2019 at 06:31:28PM -0400, Kurt Mosiejczuk wrote: > On Thu, Aug 22, 2019 at 11:14:01PM +0200, Remi Locherer wrote: > > Hi, > > > py-rfc6555 is a Python library that implements the "Happy Eyeballs" > > algorithm described in RFC 6555. It's a new dependency for the latest > > version of OfflineIMAP. > > > I was a bit unsure whether I should provide a python3 flavor. The only > > consumer (OfflineIMAP) is python2 only. py-rfc6555 depends on py-selector2 > > which is also python2 only. The description of the later sounds like it > > provides functionality backported from modern python. > > > OK to import? > > Here's a different version with a python3 flavor. Hopefully OfflineIMAP > will finish their move to python 3 eventually. > > selectors2 is only needed for python versions < 3.4. > > I've included a couple patches to fix that. I've submitted a pull > request upstream for those changes. > > I tweaked the comment to drop mention of Python since we know py-rfc6555 > is for Python. I made the py-selectors2 RUN_DEPENDS only for python 2 > and tacked the needs MODPY_FLAVOR onto the end of py-mock. > Somehow your patches did not made it my to mailbox. Do you mind resending them? ;-) Initially I also had a python3 flavor. The tests failed because selectors2 is not available. With your pull request for py-rfc6555 this sould be fixed. > With these changes, OK > > --Kurt >
[new] py-rfc6555
Hi, py-rfc6555 is a Python library that implements the "Happy Eyeballs" algorithm described in RFC 6555. It's a new dependency for the latest version of OfflineIMAP. I was a bit unsure whether I should provide a python3 flavor. The only consumer (OfflineIMAP) is python2 only. py-rfc6555 depends on py-selector2 which is also python2 only. The description of the later sounds like it provides functionality backported from modern python. OK to import? Remi py-rfc6555.tar.gz Description: application/tar-gz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: r...@cvs.openbsd.org2019/06/18 14:32:37 Modified files: mail/offlineimap: Makefile distinfo Log message: Update OfflineIMAP to version 7.2.4. OK kn@
Re: [update] OfflineIMAP version 7.2.4
On June 8, 2019 8:26:18 PM UTC, Remi Locherer wrote:
>Hi porters,
>
>This is an update for OfflineIMAP to version 7.2.4 which was released
>today.
>
>From the announcement mail:
>"This release introduces mkdir -p alike folder creation and fixes
>cygwin
>support in Windows."
>
>OK?
>
>Remi
>
>
>Index: Makefile
>===
>RCS file: /cvs/ports/mail/offlineimap/Makefile,v
>retrieving revision 1.53
>diff -u -p -r1.53 Makefile
>--- Makefile 24 Feb 2019 21:09:19 - 1.53
>+++ Makefile 8 Jun 2019 09:46:31 -
>@@ -2,7 +2,7 @@
>
> COMMENT= powerful IMAP/Maildir synchronization and reader support
>
>-MODPY_EGG_VERSION = 7.2.3
>+MODPY_EGG_VERSION = 7.2.4
> DISTNAME =offlineimap-v${MODPY_EGG_VERSION}
> PKGNAME = offlineimap-${MODPY_EGG_VERSION}
>
>Index: distinfo
>===
>RCS file: /cvs/ports/mail/offlineimap/distinfo,v
>retrieving revision 1.40
>diff -u -p -r1.40 distinfo
>--- distinfo 24 Feb 2019 21:09:19 - 1.40
>+++ distinfo 8 Jun 2019 15:15:37 -
>@@ -1,2 +1,2 @@
>-SHA256 (offlineimap-v7.2.3.tar.gz) =
>5euYgg3EZv1Er42Ns9yctZgX1nuFp7gzULO1ER0evfc=
>-SIZE (offlineimap-v7.2.3.tar.gz) = 736843
>+SHA256 (offlineimap-v7.2.4.tar.gz) =
>bO2R4Mlcsy2GbWe7FdTsV1uvVL765PUT3P7E84ivNzQ=
>+SIZE (offlineimap-v7.2.4.tar.gz) = 737300
ping
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: r...@cvs.openbsd.org2019/06/13 22:12:33 Modified files: sysutils/rsyslog: Makefile distinfo sysutils/rsyslog/pkg: PLIST-main Log message: Update to rsyslog 8.1905.0. OK sthen@
Re: isync: update to 1.3.1
On Wed, Jun 12, 2019 at 09:20:45PM +0200, Klemens Nanni wrote:
> This is a long overdue maintenance release:
> - SSL now uses SNI, which for example GMail requires
> - fixed fallbacks for missing UIDPLUS extension (with e.g. DavMail)
> - fixed UIDVALIDITY recovery with really long Message-id headers
> - fixed GSSAPI authentication with Kerberos
> - fixed support for IMAP servers which do not sort search results (e.g.,
> poczta.o2.pl)
> - fixed CopyArrivalDate on platforms without glibc
> - fixed useless SASL warnings with certain plugins
> - the perl 5.14 requirement is now made explicit
> - improved OpenBSD support
> - fixed a bunch of compiler warnings
>
> All patches except pledge support have been merged upstream.
>
> Keeps working fine in daily usage on amd64.
> OK?
works fine on amd64.
OK remi@
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/mail/isync/Makefile,v
> retrieving revision 1.39
> diff -u -p -r1.39 Makefile
> --- Makefile 21 Feb 2019 19:22:27 - 1.39
> +++ Makefile 12 Jun 2019 19:09:33 -
> @@ -2,8 +2,7 @@
>
> COMMENT= synchronize IMAP4 and maildir mailboxes
>
> -DISTNAME=isync-1.3.0
> -REVISION=5
> +DISTNAME=isync-1.3.1
>
> CATEGORIES= mail
> MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=isync/}
> Index: distinfo
> ===
> RCS file: /cvs/ports/mail/isync/distinfo,v
> retrieving revision 1.13
> diff -u -p -r1.13 distinfo
> --- distinfo 17 Oct 2017 17:24:14 - 1.13
> +++ distinfo 12 Jun 2019 19:09:38 -
> @@ -1,2 +1,2 @@
> -SHA256 (isync-1.3.0.tar.gz) = jV9YOXbjEZcFvbon+k/JYugH/1mW8k81SVcXj/ppfJw=
> -SIZE (isync-1.3.0.tar.gz) = 309459
> +SHA256 (isync-1.3.1.tar.gz) = aMtGQ9WBUgl/Acmzq+rX19TJVjGD1y88KjHSK8Fo8Oo=
> +SIZE (isync-1.3.1.tar.gz) = 311868
> Index: patches/patch-src_drv_imap_c
> ===
> RCS file: /cvs/ports/mail/isync/patches/patch-src_drv_imap_c,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-src_drv_imap_c
> --- patches/patch-src_drv_imap_c 21 Feb 2019 19:22:27 - 1.2
> +++ patches/patch-src_drv_imap_c 12 Jun 2019 19:16:07 -
> @@ -1,7 +1,6 @@
> $OpenBSD: patch-src_drv_imap_c,v 1.2 2019/02/21 19:22:27 kn Exp $
>
> -f85e2ae770169227e95168a11aff17372efaa192
> -"Fix CopyArrivalDate on platforms without glibc"
> +Use pledge.
>
> Index: src/drv_imap.c
> --- src/drv_imap.c.orig
> @@ -15,16 +14,7 @@ Index: src/drv_imap.c
> #ifdef HAVE_LIBSSL
> enum { SSL_None, SSL_STARTTLS, SSL_IMAPS };
> #endif
> -@@ -948,7 +950,7 @@ parse_date( const char *str )
> - struct tm datetime;
> -
> - memset( , 0, sizeof(datetime) );
> --if (!(end = strptime( str, "%d-%b-%Y %H:%M:%S ", )))
> -+if (!(end = strptime( str, "%e-%b-%Y %H:%M:%S ", )))
> - return -1;
> - if ((date = timegm( )) == -1)
> - return -1;
> -@@ -3267,6 +3269,8 @@ imap_parse_store( conffile_t *cfg, store_conf_t **stor
> +@@ -3317,6 +3319,8 @@ imap_parse_store( conffile_t *cfg, store_conf_t **stor
> }
> acc_opt = 1;
> }
> Index: patches/patch-src_drv_maildir_c
> ===
> RCS file: patches/patch-src_drv_maildir_c
> diff -N patches/patch-src_drv_maildir_c
> --- patches/patch-src_drv_maildir_c 12 May 2018 14:33:50 - 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,27 +0,0 @@
> -$OpenBSD: patch-src_drv_maildir_c,v 1.3 2018/05/12 14:33:50 jca Exp $
> -
> -Print time_t appropriately.
> -
> -Index: src/drv_maildir.c
> src/drv_maildir.c.orig
> -+++ src/drv_maildir.c
> -@@ -1569,7 +1569,7 @@ maildir_store_msg( store_t *gctx, msg_data_t *data, in
> - uint uid;
> - char buf[_POSIX_PATH_MAX], nbuf[_POSIX_PATH_MAX], fbuf[NUM_FLAGS + 3],
> base[128];
> -
> --bl = nfsnprintf( base, sizeof(base), "%ld.%d_%d.%s", (long)time( 0 ),
> Pid, ++MaildirCount, Hostname );
> -+bl = nfsnprintf( base, sizeof(base), "%lld.%d_%d.%s", (long long)time(
> 0 ), Pid, ++MaildirCount, Hostname );
> - if (!to_trash) {
> - #ifdef USE_DB
> - if (ctx->usedb) {
> -@@ -1750,8 +1750,8 @@ maildir_trash_msg( store_t *gctx, message_t *gmsg,
> - for (;;) {
> - nfsnprintf( buf, sizeof(buf), "%s/%s/%s", ctx->path,
> subdirs[gmsg->status & M_RECENT], msg->base );
> - s = strstr( msg->base, ((maildir_store_conf_t
> *)gctx->conf)->info_prefix );
> --nfsnprintf( nbuf, sizeof(nbuf), "%s/%s/%ld.%d_%d.%s%s",
> ctx->trash,
> --subdirs[gmsg->status & M_RECENT], (long)time( 0 ),
> Pid, ++MaildirCount, Hostname, s ? s : "" );
> -+nfsnprintf( nbuf, sizeof(nbuf), "%s/%s/%lld.%d_%d.%s%s",
> ctx->trash,
> -+subdirs[gmsg->status & M_RECENT], (long long)time(
> 0 ), Pid, ++MaildirCount, Hostname, s ? s : "" );
> -
Re: [update] rsyslog 8.1905.0
ping
On Sun, Jun 02, 2019 at 09:53:03PM +0200, Remi Locherer wrote:
> Hi porters,
>
> this is an update for our rsyslog port. The most obvious change is the
> new versioning schema (8.monthyear.x). The many changes are listed in the
> changelog: https://github.com/rsyslog/rsyslog/blob/master/ChangeLog
>
> I tested with the regress tests from our syslogd on amd64 and i386 and
> verified that the module ommysql works on amd64.
>
> OK?
>
> Remi
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/sysutils/rsyslog/Makefile,v
> retrieving revision 1.44
> diff -u -p -r1.44 Makefile
> --- Makefile 24 Oct 2018 14:28:10 - 1.44
> +++ Makefile 30 May 2019 14:47:20 -
> @@ -10,7 +10,7 @@ COMMENT-elasticsearch = Elasticsearch pl
>
> MULTI_PACKAGES = -main -mysql -normalize -pgsql -elasticsearch
>
> -V = 8.37.0
> +V = 8.1905.0
> DISTNAME = rsyslog-$V
> PKGNAME-main = rsyslog-$V
> PKGNAME-mysql = rsyslog-mysql-$V
> @@ -18,11 +18,6 @@ PKGNAME-normalize =rsyslog-normalize-$V
> PKGNAME-pgsql = rsyslog-pgsql-$V
> PKGNAME-elasticsearch = rsyslog-elasticsearch-$V
> CATEGORIES = sysutils
> -REVISION-elasticsearch =0
> -REVISION-main = 0
> -REVISION-mysql = 0
> -REVISION-normalize = 0
> -REVISION-pgsql = 0
>
> HOMEPAGE = https://www.rsyslog.com/
>
> @@ -37,7 +32,7 @@ WANTLIB-main += c crypto curl estr fast
> WANTLIB-main += gpg-error hogweed iconv idn2 intl nettle nghttp2
> WANTLIB-main += p11-kit pthread relp ssl tasn1 unistring uuid z
>
> -WANTLIB-mysql += crypto m mysqlclient pthread ssl ${COMPILER_LIBCXX} z
> +WANTLIB-mysql += crypto iconv m mariadb pthread ssl z
>
> WANTLIB-normalize += estr fastjson lognorm pthread
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/sysutils/rsyslog/distinfo,v
> retrieving revision 1.6
> diff -u -p -r1.6 distinfo
> --- distinfo 13 Sep 2018 21:38:05 - 1.6
> +++ distinfo 28 May 2019 19:40:25 -
> @@ -1,2 +1,2 @@
> -SHA256 (rsyslog-8.37.0.tar.gz) = KVwom0yKvY+PP+NagySbc5ztq+gnIXArkQJV+frxR+c=
> -SIZE (rsyslog-8.37.0.tar.gz) = 2697435
> +SHA256 (rsyslog-8.1905.0.tar.gz) =
> lr1Pq412j9atItReELg+FZuT35uvzeHVguEiT2RxFuQ=
> +SIZE (rsyslog-8.1905.0.tar.gz) = 2911703
> Index: pkg/PLIST-main
> ===
> RCS file: /cvs/ports/sysutils/rsyslog/pkg/PLIST-main,v
> retrieving revision 1.4
> diff -u -p -r1.4 PLIST-main
> --- pkg/PLIST-main13 Sep 2018 21:38:05 - 1.4
> +++ pkg/PLIST-main5 May 2019 20:22:56 -
> @@ -17,7 +17,6 @@ lib/rsyslog/lmnetstrms.so
> lib/rsyslog/lmnsd_gtls.so
> lib/rsyslog/lmnsd_ptcp.so
> lib/rsyslog/lmregexp.so
> -lib/rsyslog/lmstrmsrv.so
> lib/rsyslog/lmtcpclt.so
> lib/rsyslog/lmtcpsrv.so
> lib/rsyslog/lmzlibw.so
>
Re: UPDATE: x11/icewm 1.5.4 => 1.5.5
On Fri, Jun 07, 2019 at 10:25:40AM -0400, Brian Callahan wrote:
> Hi ports --
>
> Attached is a small update to icewm-1.5.5
> Changelog is here: https://github.com/ice-wm/icewm/releases/tag/1.5.5
>
> Works well on amd64; big endian testing appreciated.
>
Builds and runs fine on my amd64 notebook. Except "logout" does not work
for me. It's the same with version 1.5.4.
> OK?
ok remi@
>
> ~Brian
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/icewm/Makefile,v
> retrieving revision 1.67
> diff -u -p -r1.67 Makefile
> --- Makefile 29 Apr 2019 16:12:28 - 1.67
> +++ Makefile 7 Jun 2019 14:23:06 -
> @@ -1,6 +1,6 @@
> # $OpenBSD: Makefile,v 1.67 2019/04/29 16:12:28 bcallah Exp $
>
> -V= 1.5.4
> +V= 1.5.5
> COMMENT= small and fast window manager
> DISTNAME=icewm-${V}
> EXTRACT_SUFX=.tar.xz
> @@ -10,7 +10,7 @@ HOMEPAGE= https://www.ice-wm.org/
> MAINTAINER= Brian Callahan
>
> # LGPLv2 only
> -PERMIT_PACKAGE_CDROM=Yes
> +PERMIT_PACKAGE= Yes
>
> WANTLIB += ${COMPILER_LIBCXX} FLAC ICE SM X11 Xext Xft Xinerama
> WANTLIB += Xrandr Xrender ao c expat ffi fontconfig freetype fribidi
> Index: distinfo
> ===
> RCS file: /cvs/ports/x11/icewm/distinfo,v
> retrieving revision 1.19
> diff -u -p -r1.19 distinfo
> --- distinfo 29 Apr 2019 16:12:28 - 1.19
> +++ distinfo 7 Jun 2019 14:23:06 -
> @@ -1,2 +1,2 @@
> -SHA256 (icewm-1.5.4.tar.xz) = iVyB1mcqPqqRx2oIB+qP6meJuKPIYmY18cEdfFygWeo=
> -SIZE (icewm-1.5.4.tar.xz) = 1689668
> +SHA256 (icewm-1.5.5.tar.xz) = 8cE0SyCp6GNRQ/cO4nkwtV+BPBXKYfhNd1hNMRtqwCc=
> +SIZE (icewm-1.5.5.tar.xz) = 1707656
> Index: patches/patch-lib_Makefile_in
> ===
> RCS file: /cvs/ports/x11/icewm/patches/patch-lib_Makefile_in,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-lib_Makefile_in
> --- patches/patch-lib_Makefile_in 30 Mar 2019 13:42:35 - 1.2
> +++ patches/patch-lib_Makefile_in 7 Jun 2019 14:23:06 -
> @@ -3,7 +3,7 @@ $OpenBSD: patch-lib_Makefile_in,v 1.2 20
> Index: lib/Makefile.in
> --- lib/Makefile.in.orig
> +++ lib/Makefile.in
> -@@ -362,7 +362,7 @@ target_vendor = @target_vendor@
> +@@ -360,7 +360,7 @@ target_vendor = @target_vendor@
> top_build_prefix = @top_build_prefix@
> top_builddir = @top_builddir@
> top_srcdir = @top_srcdir@
> Index: patches/patch-src_icesh_cc
> ===
> RCS file: /cvs/ports/x11/icewm/patches/patch-src_icesh_cc,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-src_icesh_cc
> --- patches/patch-src_icesh_cc29 Apr 2019 16:12:28 - 1.2
> +++ patches/patch-src_icesh_cc7 Jun 2019 14:23:06 -
> @@ -5,16 +5,16 @@ Don't do this GNU extension stuff.
> Index: src/icesh.cc
> --- src/icesh.cc.orig
> +++ src/icesh.cc
> -@@ -726,6 +726,8 @@ bool IceSh::wmcheck()
> +@@ -1315,6 +1315,8 @@ bool IceSh::change()
>
> bool IceSh::colormaps()
> {
> +void (*previous)(int);
> +
> - if (strcmp(*argp, "colormaps"))
> + if ( !isAction("colormaps", 0))
> return false;
> - ++argp;
> -@@ -735,7 +737,7 @@ bool IceSh::colormaps()
> +
> +@@ -1323,7 +1325,7 @@ bool IceSh::colormaps()
>
> tlog("colormaps");
> running = true;
> @@ -23,15 +23,14 @@ Index: src/icesh.cc
> while (running) {
> int n = 0;
> Colormap* map = XListInstalledColormaps(display, root, );
> -@@ -769,12 +771,14 @@ bool IceSh::colormaps()
> +@@ -1350,11 +1352,13 @@ bool IceSh::colormaps()
>
> bool IceSh::guiEvents()
> {
> +void (*previous)(int);
> +
> - if (strcmp(*argp, "guievents"))
> + if ( !isAction("guievents", 0))
> return false;
> - ++argp;
>
> running = true;
> -sighandler_t previous = signal(SIGINT, catcher);
[update] OfflineIMAP version 7.2.4
Hi porters,
This is an update for OfflineIMAP to version 7.2.4 which was released today.
>From the announcement mail:
"This release introduces mkdir -p alike folder creation and fixes cygwin
support in Windows."
OK?
Remi
Index: Makefile
===
RCS file: /cvs/ports/mail/offlineimap/Makefile,v
retrieving revision 1.53
diff -u -p -r1.53 Makefile
--- Makefile24 Feb 2019 21:09:19 - 1.53
+++ Makefile8 Jun 2019 09:46:31 -
@@ -2,7 +2,7 @@
COMMENT= powerful IMAP/Maildir synchronization and reader support
-MODPY_EGG_VERSION = 7.2.3
+MODPY_EGG_VERSION = 7.2.4
DISTNAME = offlineimap-v${MODPY_EGG_VERSION}
PKGNAME = offlineimap-${MODPY_EGG_VERSION}
Index: distinfo
===
RCS file: /cvs/ports/mail/offlineimap/distinfo,v
retrieving revision 1.40
diff -u -p -r1.40 distinfo
--- distinfo24 Feb 2019 21:09:19 - 1.40
+++ distinfo8 Jun 2019 15:15:37 -
@@ -1,2 +1,2 @@
-SHA256 (offlineimap-v7.2.3.tar.gz) =
5euYgg3EZv1Er42Ns9yctZgX1nuFp7gzULO1ER0evfc=
-SIZE (offlineimap-v7.2.3.tar.gz) = 736843
+SHA256 (offlineimap-v7.2.4.tar.gz) =
bO2R4Mlcsy2GbWe7FdTsV1uvVL765PUT3P7E84ivNzQ=
+SIZE (offlineimap-v7.2.4.tar.gz) = 737300
[update] rsyslog 8.1905.0
Hi porters,
this is an update for our rsyslog port. The most obvious change is the
new versioning schema (8.monthyear.x). The many changes are listed in the
changelog: https://github.com/rsyslog/rsyslog/blob/master/ChangeLog
I tested with the regress tests from our syslogd on amd64 and i386 and
verified that the module ommysql works on amd64.
OK?
Remi
Index: Makefile
===
RCS file: /cvs/ports/sysutils/rsyslog/Makefile,v
retrieving revision 1.44
diff -u -p -r1.44 Makefile
--- Makefile24 Oct 2018 14:28:10 - 1.44
+++ Makefile30 May 2019 14:47:20 -
@@ -10,7 +10,7 @@ COMMENT-elasticsearch = Elasticsearch pl
MULTI_PACKAGES = -main -mysql -normalize -pgsql -elasticsearch
-V =8.37.0
+V =8.1905.0
DISTNAME = rsyslog-$V
PKGNAME-main = rsyslog-$V
PKGNAME-mysql =rsyslog-mysql-$V
@@ -18,11 +18,6 @@ PKGNAME-normalize = rsyslog-normalize-$V
PKGNAME-pgsql =rsyslog-pgsql-$V
PKGNAME-elasticsearch =rsyslog-elasticsearch-$V
CATEGORIES = sysutils
-REVISION-elasticsearch =0
-REVISION-main =0
-REVISION-mysql = 0
-REVISION-normalize = 0
-REVISION-pgsql = 0
HOMEPAGE = https://www.rsyslog.com/
@@ -37,7 +32,7 @@ WANTLIB-main += c crypto curl estr fast
WANTLIB-main +=gpg-error hogweed iconv idn2 intl nettle nghttp2
WANTLIB-main +=p11-kit pthread relp ssl tasn1 unistring uuid z
-WANTLIB-mysql += crypto m mysqlclient pthread ssl ${COMPILER_LIBCXX} z
+WANTLIB-mysql += crypto iconv m mariadb pthread ssl z
WANTLIB-normalize += estr fastjson lognorm pthread
Index: distinfo
===
RCS file: /cvs/ports/sysutils/rsyslog/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo13 Sep 2018 21:38:05 - 1.6
+++ distinfo28 May 2019 19:40:25 -
@@ -1,2 +1,2 @@
-SHA256 (rsyslog-8.37.0.tar.gz) = KVwom0yKvY+PP+NagySbc5ztq+gnIXArkQJV+frxR+c=
-SIZE (rsyslog-8.37.0.tar.gz) = 2697435
+SHA256 (rsyslog-8.1905.0.tar.gz) = lr1Pq412j9atItReELg+FZuT35uvzeHVguEiT2RxFuQ=
+SIZE (rsyslog-8.1905.0.tar.gz) = 2911703
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/sysutils/rsyslog/pkg/PLIST-main,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST-main
--- pkg/PLIST-main 13 Sep 2018 21:38:05 - 1.4
+++ pkg/PLIST-main 5 May 2019 20:22:56 -
@@ -17,7 +17,6 @@ lib/rsyslog/lmnetstrms.so
lib/rsyslog/lmnsd_gtls.so
lib/rsyslog/lmnsd_ptcp.so
lib/rsyslog/lmregexp.so
-lib/rsyslog/lmstrmsrv.so
lib/rsyslog/lmtcpclt.so
lib/rsyslog/lmtcpsrv.so
lib/rsyslog/lmzlibw.so
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: r...@cvs.openbsd.org2019/05/05 10:35:59 Modified files: devel/liblognorm: Makefile distinfo Log message: update to liblognorm 2.0.6 while here change URLs to https. ok jca@
Re: [update] liblognorm 2.0.6
On Sun, May 05, 2019 at 01:17:55PM +0200, Jeremie Courreges-Anglas wrote: > On Sat, May 04 2019, Remi Locherer wrote: > > Hi porters, > > > > This updates liblognorm to version 2.0.6. > > > > Release notes can be found here: > > https://www.liblognorm.com/news/liblognorm-2-0-6-released/ > > > > The tests changed and added now #!/bin/bash. With fixed shebangs > > and a TEST_DEPENDS shells/bash all tests pass. > > > > check_sym says: > > > > /usr/local/lib/liblognorm.so.0.0 --> > > /usr/ports/pobj/liblognorm-2.0.6/build-amd64/src/.libs/liblognorm.so.0.0 > > Dynamic export changes: > > added: > > ln_constructCheckpointLEA > > ln_destructCheckpointLEA > > > > External reference changes: > > removed: > > __stack_smash_handler > > > > > > Is my bump for SHARED_LIBS enough or should it be 1.0? > > Looks like it's enough: no symbol removal and no change in the only > header we install, liblognorm.h. IIUC the newly exported functions are > internal. > > Looks good ports-wise, ok jca@. I'd suggest to move HOMEPAGE and > MASTER_SITES to https while here. sure! > PS: upstream should clear up the situation wrt the headers they install > by default. Either those .h shouldn't be installed, or they should be > installed in an include/liblognorm subdirectory, as their name is too > generic. I sent a mail to the project when importing the port. This time I opened a pull request on GitHub.
[update] liblognorm 2.0.6
Hi porters,
This updates liblognorm to version 2.0.6.
Release notes can be found here:
https://www.liblognorm.com/news/liblognorm-2-0-6-released/
The tests changed and added now #!/bin/bash. With fixed shebangs
and a TEST_DEPENDS shells/bash all tests pass.
check_sym says:
/usr/local/lib/liblognorm.so.0.0 -->
/usr/ports/pobj/liblognorm-2.0.6/build-amd64/src/.libs/liblognorm.so.0.0
Dynamic export changes:
added:
ln_constructCheckpointLEA
ln_destructCheckpointLEA
External reference changes:
removed:
__stack_smash_handler
Is my bump for SHARED_LIBS enough or should it be 1.0?
Remi
Index: Makefile
===
RCS file: /cvs/ports/devel/liblognorm/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile28 Apr 2018 13:04:21 - 1.2
+++ Makefile4 May 2019 20:44:43 -
@@ -2,9 +2,9 @@
COMMENT = fast-samples based normalization library
-DISTNAME = liblognorm-2.0.5
+DISTNAME = liblognorm-2.0.6
-SHARED_LIBS += lognorm 0.0 # 0.0
+SHARED_LIBS += lognorm 0.1 # 6.0
CATEGORIES = devel
@@ -15,6 +15,8 @@ PERMIT_PACKAGE_CDROM =Yes
WANTLIB += c estr fastjson
+MASTER_SITES = http://www.liblognorm.com/files/download/
+
AUTOCONF_VERSION = 2.69
AUTOMAKE_VERSION = 1.15
@@ -25,10 +27,15 @@ BUILD_DEPENDS = ${MODGNU_AUTOCONF_DEPEND
LIB_DEPENDS = devel/libestr \
devel/libfastjson
-MASTER_SITES = http://www.liblognorm.com/files/download/
+TEST_DEPENDS = shells/bash
+
+SEPARATE_BUILD = Yes
CONFIGURE_STYLE = gnu
CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}/include"
+
+post-extract:
+ sed -i s,#!/bin/bash,#!${LOCALBASE}/bin/bash, ${WRKSRC}/tests/*.sh
post-patch:
cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} \
Index: distinfo
===
RCS file: /cvs/ports/devel/liblognorm/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo28 Apr 2018 13:04:21 - 1.2
+++ distinfo4 May 2019 20:19:58 -
@@ -1,2 +1,2 @@
-SHA256 (liblognorm-2.0.5.tar.gz) = yBUdqDshAx8Ii7Ko6mdOT37lhVGCnphQKCRYQTMNsZA=
-SIZE (liblognorm-2.0.5.tar.gz) = 667709
+SHA256 (liblognorm-2.0.6.tar.gz) = z/BX6FwiA4mS+e0S641OY8Ra31OlpR+qoyefYFgJ9vI=
+SIZE (liblognorm-2.0.6.tar.gz) = 666712
