UPDATE audio/audacious-4.0.2
Diff below brings audacious to 4.0.2, which fixes a couple of bugs. From
NEWS [0]:
- Fixed a regression where the Enter key did not work in the playlist
- Fixed the seek bar changing width as the time counter increments
- Fixed the title bar getting stuck showing "Buffering"
- Added a workaround to ensure that the toolbar is not hidden on startup
- Fixed the Composer field not being saved when updating ID3v2 tags
Note that this diff touches meta/audacious and audio/audacious.
sthen@ noticed that there is no WANTLIB to match dbus-glib so the
runtime dependency isn't registered. Conclusion, after a bit of digging,
is that dbus-glib is not needed as dependency.
Run tested on amd64.
Comments/OK?
[0] https://audacious-media-player.org/news/47-audacious-4-0-2-released
diff --git audio/audacious/Makefile.inc audio/audacious/Makefile.inc
index 0cbd6654d63..62fbb9619ad 100644
--- audio/audacious/Makefile.inc
+++ audio/audacious/Makefile.inc
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile.inc,v 1.1 2020/04/15 15:50:15 bket Exp $
-VERSION = 4.0.1
+VERSION = 4.0.2
CATEGORIES = audio multimedia
diff --git audio/audacious/player/distinfo audio/audacious/player/distinfo
index 648cfb23110..3df2559bb75 100644
--- audio/audacious/player/distinfo
+++ audio/audacious/player/distinfo
@@ -1,2 +1,2 @@
-SHA256 (audacious-4.0.1.tar.bz2) = rhPfaIeD8u6WSc9IhwOt48Czdvtc1rD7XtFLxD4qXLY=
-SIZE (audacious-4.0.1.tar.bz2) = 572314
+SHA256 (audacious-4.0.2.tar.bz2) = GKUr2fH5bRe/da1tQLBgL8KYme8szZ0qZynfpfx/Wmc=
+SIZE (audacious-4.0.2.tar.bz2) = 576407
diff --git audio/audacious/plugins/Makefile audio/audacious/plugins/Makefile
index 4033a6a4636..26287345caa 100644
--- audio/audacious/plugins/Makefile
+++ audio/audacious/plugins/Makefile
@@ -43,8 +43,7 @@ LIB_DEPENDS = audio/faad>=2.7 \
net/curl \
net/neon \
textproc/libxml \
- x11/gtk+2 \
- x11/dbus-glib
+ x11/gtk+2
USE_GMAKE =Yes
diff --git audio/audacious/plugins/distinfo audio/audacious/plugins/distinfo
index 866e666810f..0b508f23c5c 100644
--- audio/audacious/plugins/distinfo
+++ audio/audacious/plugins/distinfo
@@ -1,2 +1,2 @@
-SHA256 (audacious-plugins-4.0.1.tar.bz2) =
TEOd74muvxCmp1ayEVy00kk+zAPLYzuJiupaxvEOZaw=
-SIZE (audacious-plugins-4.0.1.tar.bz2) = 1742259
+SHA256 (audacious-plugins-4.0.2.tar.bz2) =
WeQy7p/4+QvDxWN4lD6nMHJCE1D3GyDVjuJWjM1K+SA=
+SIZE (audacious-plugins-4.0.2.tar.bz2) = 1752042
diff --git meta/audacious/Makefile meta/audacious/Makefile
index d0ed635e391..f01d0e3af2d 100644
--- meta/audacious/Makefile
+++ meta/audacious/Makefile
@@ -2,7 +2,7 @@
COMMENT = audacious meta-package
-VERSION = 4.0.1
+VERSION = 4.0.2
PKGNAME = audacious-${VERSION}
RUN_DEPENDS= audio/audacious/player>=${VERSION} \
UPDATE: lang/gawk 5.0.1 => 5.1.0
Hi ports --
Here is an update to GNU awk, released yesterday.
The announcement, including the major changes, is here:
https://lists.gnu.org/archive/html/info-gnu/2020-04/msg7.html
All tests pass on amd64 and I don't anticipate any breakage in any ports
that depend on gawk based on my limited testing. A big endian check
would be appreciated.
I would like to move to the .tar.xz tarball; it's about half the size of
the .tar.gz tarball.
OK?
~Brian
Index: Makefile
===
RCS file: /cvs/ports/lang/gawk/Makefile,v
retrieving revision 1.39
diff -u -p -r1.39 Makefile
--- Makefile 18 Dec 2019 00:36:46 - 1.39
+++ Makefile 16 Apr 2020 02:10:08 -
@@ -2,8 +2,9 @@
COMMENT= GNU awk
-V= 5.0.1
+V= 5.1.0
DISTNAME= gawk-$V
+EXTRACT_SUFX= .tar.xz
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_GNU:=gawk/}
Index: distinfo
===
RCS file: /cvs/ports/lang/gawk/distinfo,v
retrieving revision 1.19
diff -u -p -r1.19 distinfo
--- distinfo 18 Dec 2019 00:36:46 - 1.19
+++ distinfo 16 Apr 2020 02:10:08 -
@@ -1,2 +1,2 @@
-SHA256 (gawk-5.0.1.tar.gz) = YlvzcY4lqE3ESGE11ctTiBdGgjYscBB/0T8hVy9WA7s=
-SIZE (gawk-5.0.1.tar.gz) = 5981609
+SHA256 (gawk-5.1.0.tar.xz) = z1/qSsVmX9UXGvRxa6qy7/x2MGqVcpiNW6EHjxljgr0=
+SIZE (gawk-5.1.0.tar.xz) = 3154564
[Update] textproc/p5-ack : Update to 3.3.1
Hi, ports@: Here is a simple patch for textproc/p5-ack to update to 3.3.1, it build well and pass all tests. No other ports depends on it. Cheers ! wen Index: Makefile === RCS file: /cvs/ports/textproc/p5-ack/Makefile,v retrieving revision 1.28 diff -u -p -r1.28 Makefile --- Makefile7 Jan 2020 09:19:23 - 1.28 +++ Makefile16 Apr 2020 01:43:05 - @@ -4,7 +4,7 @@ COMMENT=grep like tool, aimed at progr MODULES= cpan PKG_ARCH= * -V= 3.3.0 +V= 3.3.1 DISTNAME= ack-v$V PKGNAME= p5-ack-$V CPAN_AUTHOR= PETDANCE Index: distinfo === RCS file: /cvs/ports/textproc/p5-ack/distinfo,v retrieving revision 1.17 diff -u -p -r1.17 distinfo --- distinfo7 Jan 2020 09:19:23 - 1.17 +++ distinfo16 Apr 2020 01:43:05 - @@ -1,2 +1,2 @@ -SHA256 (ack-v3.3.0.tar.gz) = tLBUDQTj1c0kF1btXLfw5gLOX7fM9iZkk7tlxUp0p0A= -SIZE (ack-v3.3.0.tar.gz) = 249989 +SHA256 (ack-v3.3.1.tar.gz) = rjtiBJ8EYTlHCTPkYPJDT4gfUitrLCtKlM1iT+9P1Yk= +SIZE (ack-v3.3.1.tar.gz) = 250024
Re: multimedia/gstreamer-0.10/plugins-good: Use /dev/null instead of /dev/mixer
On Sat, 11 Apr 2020 20:20:45 +0200
Alexandre Ratchov wrote:
> We switched libossaudio to sndio, but programs keep opening /dev/mixer
> but don't use it; so it could be replaced by /dev/null. It would be
> even better, to not use descriptors at all, but that's more difficult
> for gstreamer.
Your gstreamer diff works with xfce4-mixer on amd64. I can use
xfce4-mixer to set "Volume" (sndioctl output.level),
"In-gain" (hw/input.level), or "Out-gain" (hw/output.level).
There is another reference to "/dev/mixer" in gstosssrc.c, which you
are not patching. It would open /dev/mixer for recording audio, but
xfce4-mixer doesn't record (nor play) audio, so I'm not asking for
gsttosrc.c patch. I saw in ktrace(1) that xfce4-mixer opened /dev/null
and not /dev/mixer.
ok gkoehler@
> Index: Makefile
> ===
> RCS file: /cvs/ports/multimedia/gstreamer-0.10/plugins-good/Makefile,v
> retrieving revision 1.113
> diff -u -p -u -p -r1.113 Makefile
> --- Makefile 1 Feb 2020 15:04:26 - 1.113
> +++ Makefile 11 Apr 2020 16:54:59 -
> @@ -18,7 +18,7 @@ PKGNAME-dv= gstreamer-dv-${V}
> PKGNAME-caca=gstreamer-libcaca-${V}
> EPOCH-main= 0
>
> -REVISION-main= 25
> +REVISION-main= 26
> REVISION-aalib= 13
> REVISION-caca= 13
> REVISION-dv= 12
> Index: patches/patch-sys_oss_gstossmixerelement_c
> ===
> RCS file: patches/patch-sys_oss_gstossmixerelement_c
> diff -N patches/patch-sys_oss_gstossmixerelement_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-sys_oss_gstossmixerelement_c11 Apr 2020 16:54:59
> -
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +
> +Index: sys/oss/gstossmixerelement.c
> +--- sys/oss/gstossmixerelement.c.orig
> sys/oss/gstossmixerelement.c
> +@@ -42,7 +42,7 @@
> + GST_DEBUG_CATEGORY_EXTERN (oss_debug);
> + #define GST_CAT_DEFAULT oss_debug
> +
> +-#define DEFAULT_DEVICE "/dev/mixer"
> ++#define DEFAULT_DEVICE "/dev/null"
> + #define DEFAULT_DEVICE_NAME NULL
> +
> + enum
>
--
George Koehler
[Update] devel/p5-IO-Tty : Update to 1.14
Hi, ports@:
Here is a simple patch for devel/p5-IO-Tty to update to 1.14.
It build well and pass all tests.
4 ports depends on devel/p5-IO-Tty:
i) devel/p5-Expect : build well and pass all tests
ii) devel/p5-IPC-Run, textproc/p5-ack, devel/p5-POE
these three ports all build well but have 1 fails in tests, not caused by
this patch.
Cheers !
wen
Index: Makefile
===
RCS file: /cvs/ports/devel/p5-IO-Tty/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- Makefile12 Jul 2019 20:44:57 - 1.23
+++ Makefile16 Apr 2020 00:44:26 -
@@ -3,9 +3,9 @@
COMMENT= provide an interface to create pseudo ttys
MODULES= cpan
-DISTNAME= IO-Tty-1.12
+DISTNAME= IO-Tty-1.14
CATEGORIES=devel
-REVISION= 0
+
FIX_EXTRACT_PERMISSIONS = Yes
# Perl
Index: distinfo
===
RCS file: /cvs/ports/devel/p5-IO-Tty/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo17 Nov 2014 14:57:40 - 1.7
+++ distinfo16 Apr 2020 00:44:26 -
@@ -1,2 +1,2 @@
-SHA256 (IO-Tty-1.12.tar.gz) = ou+HcNMwkXggP4yKwl5iPmPPdul4MP074oCt4aVVKQ0=
-SIZE (IO-Tty-1.12.tar.gz) = 24564
+SHA256 (IO-Tty-1.14.tar.gz) = UfPk4xESi9ssahXwLFE3bLhSzPnfm+vo37tflWHrlbU=
+SIZE (IO-Tty-1.14.tar.gz) = 27756
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/p5-IO-Tty/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- pkg/PLIST 16 Jul 2015 23:57:22 - 1.6
+++ pkg/PLIST 16 Apr 2020 00:44:26 -
@@ -8,7 +8,7 @@ ${P5ARCH}/IO/Tty/Constant.pm
${P5ARCH}/auto/
${P5ARCH}/auto/IO/
${P5ARCH}/auto/IO/Tty/
-${P5ARCH}/auto/IO/Tty/Tty.so
+@so ${P5ARCH}/auto/IO/Tty/Tty.so
@man man/man3p/IO::Pty.3p
@man man/man3p/IO::Tty.3p
@man man/man3p/IO::Tty::Constant.3p
Re: Go and portgen(1)
On Mon, 06 Apr 2020 at 17:15:17 -0600, Aaron Bieber wrote:
> Round two! This time with espie@'s bsd.port.mk fix:
> https://marc.info/?l=openbsd-ports-cvs&m=158618354824687&w=2
>
> This resolves the issue with the conversion of [A-Z] letters to ![a-z] in the
> package path.
>
> With this diff I can generate ports for the following without issue:
>
> github.com/jrick/domain
> github.com/jrick/ss
> github.com/junegunn/fzf
> github.com/qbit/gavin
> golang.zx2c4.com/wireguard
> humungus.tedunangst.com/r/honk
> suah.dev/ogvt
>
> There are still some issues with things like github.com/restic/restic and
> github.com/gohugoio/hugo . For some reason the build looks for some files that
> 'go mod graph' doesn't list.
>
> For most go apps that follow the module guidelines:
> https://github.com/golang/go/wiki/Modules
>
> This method of building things should work pretty well. One will have to go in
> and add a "do-install" to grab other files like man pages, etc.
>
OK, this fixes some issues with determining the latest version of a given port.
With this, I can build a port for restic! (it still needs
'ALL_TARGET=github.com/restic/restic/...' set manually)
hugo still results in some missing mod/zip files.
diff --git a/infrastructure/bin/portgen b/infrastructure/bin/portgen
index ad5ab17f3cf..b7316d42b64 100755
--- a/infrastructure/bin/portgen
+++ b/infrastructure/bin/portgen
@@ -32,6 +32,7 @@ use lib ( "$portdir/infrastructure/lib",
"$FindBin::Bin/../lib" );
use OpenBSD::PortGen::Port::CPAN;
use OpenBSD::PortGen::Port::PyPI;
use OpenBSD::PortGen::Port::Ruby;
+use OpenBSD::PortGen::Port::Go;
my ( $type, $module ) = @ARGV;
@@ -44,6 +45,8 @@ if ( $type eq 'p5' ) {
$o = OpenBSD::PortGen::Port::PyPI->new();
} elsif ( $type eq 'ruby' ) {
$o = OpenBSD::PortGen::Port::Ruby->new();
+} elsif ( $type eq 'go' ) {
+ $o = OpenBSD::PortGen::Port::Go->new();
} else {
die "unknown module type\n";
}
diff --git a/infrastructure/lib/OpenBSD/PortGen/Port/Go.pm
b/infrastructure/lib/OpenBSD/PortGen/Port/Go.pm
new file mode 100644
index 000..75d5bf33244
--- /dev/null
+++ b/infrastructure/lib/OpenBSD/PortGen/Port/Go.pm
@@ -0,0 +1,251 @@
+# $OpenBSD: Go.pm,v 1.16 2019/05/16 16:01:10 afresh1 Exp $
+#
+# Copyright (c) 2019 Aaron Bieber
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+package OpenBSD::PortGen::Port::Go;
+
+use 5.028;
+use utf8;
+use warnings;
+use strict;
+use warnings qw(FATAL utf8);# fatalize encoding glitches
+use open qw(:std :encoding(UTF-8)); # undeclared streams in UTF-8
+use OpenBSD::PackageName;
+
+use parent 'OpenBSD::PortGen::Port';
+
+use Carp;
+use Cwd;
+use File::Temp qw/ tempdir /;
+use Data::Dumper;
+
+use OpenBSD::PortGen::Dependency;
+
+sub ecosystem_prefix
+{
+ my $self = shift;
+ return '';
+}
+
+sub base_url
+{
+ my $self = shift;
+ return 'https://proxy.golang.org/';
+}
+
+sub get_dist_info
+{
+ my ( $self, $module ) = @_;
+
+ my $json = {};
+ if ($module =~ m/@/) {
+ my @parts = split("@", $module);
+ $json->{Name}= ( split '/', $parts[0] )[-1];
+ $json->{Module} = $parts[0];
+ $json->{Version} = $parts[1];
+ } else {
+ $json = $self->get_json( $module . '/@latest' );
+ $json->{Name} = ( split '/', $module )[-1];
+ $json->{Module} = $module;
+ }
+
+ my %mods;
+ for ( $self->_go_mod_graph($json) ) {
+ my ($direct, $ephemeral) = @{$_};
+
+ for my $d ( $direct, $ephemeral ) {
+ next unless $d->{Version};
+ $mods{ $d->{Module} }{ $d->{Version} } ||= $d;
+ }
+ }
+
+ # Filter dependencies to the one with the highest version
+ foreach my $mod ( sort keys %mods ) {
+ # Sort semver numerically then the rest alphanumeric.
+ # This is overkill for sorting, but I already wrote it
+ my @versions =
+ map { $_->[0] }
+ sort {
+ $a->[1] <=> $b->[1]
+|| $a->[2] <=> $b->[2]
+|| $a->[3] <=> $b->[3]
+|| $a->[4] cmp $b->[4]
+ }
+
UPDATE: www/ap2-mod_wsgi 4.6.5 to 4.7.1
Changelogs:
https://github.com/GrahamDumpleton/mod_wsgi/blob/4.7.1/docs/release-notes/version-4.6.6.rst
https://github.com/GrahamDumpleton/mod_wsgi/blob/4.7.1/docs/release-notes/version-4.6.7.rst
https://github.com/GrahamDumpleton/mod_wsgi/blob/4.7.1/docs/release-notes/version-4.6.8.rst
https://github.com/GrahamDumpleton/mod_wsgi/blob/4.7.1/docs/release-notes/version-4.7.0.rst
https://github.com/GrahamDumpleton/mod_wsgi/blob/4.7.1/docs/release-notes/version-4.7.1.rst
Nothing of impact as we only compile the module, we are not using the python
utilities.
But I did notice that several (all) the compilation warnings have disappeared.
Moved from py2 to py3.
I could make a flavor, but I think that is better to just drop the py2 version.
It has no consumers in our tree.
The only "WHAT-IF" would be if someone is using this port to run a py2 app...
When they update in 6.7 (or snapshots) it might cease to function properly.
I think that: "py2 is deprecated" is a nice answer, but I let you decide with
your OKs. :)
WANTLIB += iconv intl added from port-lib-depends-check.
+ Tested with py3-flask on amd64.
I only used it (with py3) to test some flask apps for my personal work.
jca@ (If I remember correctly) give me the idea to send it to ports@.
OKs?
Cheers.
Elias.
Index: Makefile
===
RCS file: /cvs/ports/www/ap2-mod_wsgi/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile12 Jul 2019 20:50:17 - 1.10
+++ Makefile15 Apr 2020 16:07:48 -
@@ -3,22 +3,23 @@
COMMENT= Python WSGI compliant interface module for Apache2
PKGNAME= ap2-mod_wsgi-${GH_TAGNAME}
-REVISION= 0
CATEGORIES=www
GH_ACCOUNT=GrahamDumpleton
GH_PROJECT=mod_wsgi
-GH_TAGNAME=4.6.5
+GH_TAGNAME=4.7.1
HOMEPAGE= https://modwsgi.readthedocs.io/
# Apache License 2.0
PERMIT_PACKAGE=Yes
-WANTLIB += m pthread ${MODPY_WANTLIB} util
+WANTLIB += iconv intl m pthread ${MODPY_WANTLIB} util
MODULES= lang/python
+
+MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
LIB_DEPENDS= ${MODPY_LIB_DEPENDS}
Index: distinfo
===
RCS file: /cvs/ports/www/ap2-mod_wsgi/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo24 Oct 2018 13:13:32 - 1.3
+++ distinfo15 Apr 2020 16:07:48 -
@@ -1,2 +1,2 @@
-SHA256 (mod_wsgi-4.6.5.tar.gz) = XL4F+LmyGp5A1dcib0l2ZDse5eI6LRFLzq402ZSL5eA=
-SIZE (mod_wsgi-4.6.5.tar.gz) = 693825
+SHA256 (mod_wsgi-4.7.1.tar.gz) = JnTlBnGa/mD7wFR8gy6JSNbKouBU1A0zYwmZPm6GfTU=
+SIZE (mod_wsgi-4.7.1.tar.gz) = 696111
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/ap2-mod_wsgi/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 4 Sep 2018 12:46:24 - 1.2
+++ pkg/PLIST 15 Apr 2020 16:07:48 -
@@ -1,3 +1,3 @@
@comment $OpenBSD: PLIST,v 1.2 2018/09/04 12:46:24 espie Exp $
-lib/apache2/mod_wsgi.so
+@so lib/apache2/mod_wsgi.so
share/doc/pkg-readmes/${PKGSTEM}
Re: fix: www/apache-httpd
On 2020/04/15 19:20, Giovanni Bechis wrote:
> -BEGIN PGP SIGNED MESSAGE-
> Hash: SHA512
>
> Hi,
> memory leak in mod_ssl fixed and take maintainership, ok ?
>
> Cheers
> Giovanni
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/www/apache-httpd/Makefile,v
> retrieving revision 1.102
> diff -u -p -r1.102 Makefile
> - --- Makefile31 Mar 2020 14:30:33 - 1.102
> +++ Makefile 15 Apr 2020 17:06:22 -
> @@ -5,8 +5,11 @@ COMMENT= apache HTTP server
> V= 2.4.43
> DISTNAME=httpd-${V}
> PKGNAME= apache-httpd-${V}
> +REVISION=0
>
> CATEGORIES= www net
> +
> +MAINTAINER= Giovanni Bechis
>
> HOMEPAGE=https://httpd.apache.org/
>
> Index: patches/patch-modules_ssl_ssl_util_stapling_c
> ===
> RCS file: patches/patch-modules_ssl_ssl_util_stapling_c
> diff -N patches/patch-modules_ssl_ssl_util_stapling_c
> - --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-modules_ssl_ssl_util_stapling_c 15 Apr 2020 17:06:22
> -
> @@ -0,0 +1,84 @@
> +$OpenBSD$
> +
> +# Memory leak in mod_ssl
> (https://bz.apache.org/bugzilla/show_bug.cgi?id=63687)
icing's version was already committed upstream, it's probably better to use
that I think?
https://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_util_stapling.c?view=log
> +--- modules/ssl/ssl_util_stapling.c.orig
> modules/ssl/ssl_util_stapling.c
> +@@ -134,6 +134,7 @@ int ssl_stapling_init_cert(server_rec *s, apr_pool_t *
> + X509 *issuer = NULL;
> + OCSP_CERTID *cid = NULL;
> + STACK_OF(OPENSSL_STRING) *aia = NULL;
> ++int rv = 1; /* until further notice */
> +
> + if (x == NULL)
> + return 0;
> +@@ -158,16 +159,18 @@ int ssl_stapling_init_cert(server_rec *s, apr_pool_t *
> + SSL_CTX_set_tlsext_status_cb(mctx->ssl_ctx, stapling_cb);
> + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(10177)
> "OCSP stapling added via hook");
> + }
> +-return 1;
> ++goto cleanup;
> + }
> +
> + if (mctx->stapling_enabled != TRUE) {
> + /* mod_ssl's own implementation is not enabled */
> +-return 1;
> ++goto cleanup;
> + }
> +
> +-if (X509_digest(x, EVP_sha1(), idx, NULL) != 1)
> +-return 0;
> ++if (X509_digest(x, EVP_sha1(), idx, NULL) != 1) {
> ++rv = 0;
> ++goto cleanup;
> ++}
> +
> + cinf = apr_hash_get(stapling_certinfo, idx, sizeof(idx));
> + if (cinf) {
> +@@ -181,18 +184,18 @@ int ssl_stapling_init_cert(server_rec *s, apr_pool_t *
> +APLOGNO(02814) "ssl_stapling_init_cert: no OCSP
> URI "
> +"in certificate and no SSLStaplingForceURL "
> +"configured for server %s", mctx->sc->vhost_id);
> +-return 0;
> ++rv = 0;
> + }
> +-return 1;
> ++goto cleanup;
> + }
> +
> + cid = OCSP_cert_to_id(NULL, x, issuer);
> +-X509_free(issuer);
> + if (!cid) {
> + ssl_log_xerror(SSLLOG_MARK, APLOG_ERR, 0, ptemp, s, x,
> APLOGNO(02815)
> +"ssl_stapling_init_cert: can't create CertID "
> +"for OCSP request");
> +-return 0;
> ++rv = 0;
> ++goto cleanup;
> + }
> +
> + aia = X509_get1_ocsp(x);
> +@@ -201,7 +204,8 @@ int ssl_stapling_init_cert(server_rec *s, apr_pool_t *
> + ssl_log_xerror(SSLLOG_MARK, APLOG_ERR, 0, ptemp, s, x,
> +APLOGNO(02218) "ssl_stapling_init_cert: no OCSP URI "
> +"in certificate and no SSLStaplingForceURL set");
> +-return 0;
> ++rv = 0;
> ++goto cleanup;
> + }
> +
> + /* At this point, we have determined that there's something to store */
> +@@ -222,8 +226,10 @@ int ssl_stapling_init_cert(server_rec *s, apr_pool_t *
> +mctx->sc->vhost_id);
> +
> + apr_hash_set(stapling_certinfo, cinf->idx, sizeof(cinf->idx), cinf);
> +-
> +-return 1;
> ++
> ++cleanup:
> ++X509_free(issuer);
> ++return rv;
> + }
> +
> + static certinfo *stapling_get_certinfo(server_rec *s, X509 *x, modssl_ctx_t
> *mctx,
>
> -BEGIN PGP SIGNATURE-
>
> iQIzBAEBCgAdFiEEqg3TnG6R3qYMxl94+r7qCYlyWOUFAl6XQkUACgkQ+r7qCYly
> WOXJ1Q/+PGkrfKUjhHW1jhJEltrtXHvLGna+QfOsX9+JyCnTIq1qBeIeWmQRgwYB
> seiDHupE2Mi2+ytwwzilV7f88GiHL6i+hd00kQiMHsOGkowr7x86hRWZc1kfNrcT
> iQTUOKj38Ri78Xjyx/9kj1+vKDGtplD+eyuo9pVFH6HWDXKIV0Q7k7Jl7IffDmdY
> 9NeKGhwxvrnscjUliMOLBCyucsB04XcbtRyQZlxjsGnBLyyOWCeJR7o0CKUy3jE0
> JZ3dQ5mdig+ZYbUsDnd5uMmBcWJV5uqu4lGMezCfhSf+fBQ6nO9L3J9NhPWRUcFu
> EH01l/rBggE50bfL59tNCbutaEGIpesDSbN5nI54ugSb7FVm9vKO26WPsDgufr3s
> fSZOY01qNi4Tyevik9Q8NTO4MSdcevlkSvh9InX/bKP3udX0Rj96X/qLMiwPlkYy
> ffHzibnu3Fg4
fix: www/apache-httpd
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA512
Hi,
memory leak in mod_ssl fixed and take maintainership, ok ?
Cheers
Giovanni
Index: Makefile
===
RCS file: /cvs/ports/www/apache-httpd/Makefile,v
retrieving revision 1.102
diff -u -p -r1.102 Makefile
- --- Makefile 31 Mar 2020 14:30:33 - 1.102
+++ Makefile15 Apr 2020 17:06:22 -
@@ -5,8 +5,11 @@ COMMENT= apache HTTP server
V= 2.4.43
DISTNAME= httpd-${V}
PKGNAME= apache-httpd-${V}
+REVISION= 0
CATEGORIES=www net
+
+MAINTAINER=Giovanni Bechis
HOMEPAGE= https://httpd.apache.org/
Index: patches/patch-modules_ssl_ssl_util_stapling_c
===
RCS file: patches/patch-modules_ssl_ssl_util_stapling_c
diff -N patches/patch-modules_ssl_ssl_util_stapling_c
- --- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-modules_ssl_ssl_util_stapling_c 15 Apr 2020 17:06:22
-
@@ -0,0 +1,84 @@
+$OpenBSD$
+
+# Memory leak in mod_ssl (https://bz.apache.org/bugzilla/show_bug.cgi?id=63687)
+
+Index: modules/ssl/ssl_util_stapling.c
+--- modules/ssl/ssl_util_stapling.c.orig
modules/ssl/ssl_util_stapling.c
+@@ -134,6 +134,7 @@ int ssl_stapling_init_cert(server_rec *s, apr_pool_t *
+ X509 *issuer = NULL;
+ OCSP_CERTID *cid = NULL;
+ STACK_OF(OPENSSL_STRING) *aia = NULL;
++int rv = 1; /* until further notice */
+
+ if (x == NULL)
+ return 0;
+@@ -158,16 +159,18 @@ int ssl_stapling_init_cert(server_rec *s, apr_pool_t *
+ SSL_CTX_set_tlsext_status_cb(mctx->ssl_ctx, stapling_cb);
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(10177) "OCSP
stapling added via hook");
+ }
+-return 1;
++goto cleanup;
+ }
+
+ if (mctx->stapling_enabled != TRUE) {
+ /* mod_ssl's own implementation is not enabled */
+-return 1;
++goto cleanup;
+ }
+
+-if (X509_digest(x, EVP_sha1(), idx, NULL) != 1)
+-return 0;
++if (X509_digest(x, EVP_sha1(), idx, NULL) != 1) {
++rv = 0;
++goto cleanup;
++}
+
+ cinf = apr_hash_get(stapling_certinfo, idx, sizeof(idx));
+ if (cinf) {
+@@ -181,18 +184,18 @@ int ssl_stapling_init_cert(server_rec *s, apr_pool_t *
+APLOGNO(02814) "ssl_stapling_init_cert: no OCSP
URI "
+"in certificate and no SSLStaplingForceURL "
+"configured for server %s", mctx->sc->vhost_id);
+-return 0;
++rv = 0;
+ }
+-return 1;
++goto cleanup;
+ }
+
+ cid = OCSP_cert_to_id(NULL, x, issuer);
+-X509_free(issuer);
+ if (!cid) {
+ ssl_log_xerror(SSLLOG_MARK, APLOG_ERR, 0, ptemp, s, x, APLOGNO(02815)
+"ssl_stapling_init_cert: can't create CertID "
+"for OCSP request");
+-return 0;
++rv = 0;
++goto cleanup;
+ }
+
+ aia = X509_get1_ocsp(x);
+@@ -201,7 +204,8 @@ int ssl_stapling_init_cert(server_rec *s, apr_pool_t *
+ ssl_log_xerror(SSLLOG_MARK, APLOG_ERR, 0, ptemp, s, x,
+APLOGNO(02218) "ssl_stapling_init_cert: no OCSP URI "
+"in certificate and no SSLStaplingForceURL set");
+-return 0;
++rv = 0;
++goto cleanup;
+ }
+
+ /* At this point, we have determined that there's something to store */
+@@ -222,8 +226,10 @@ int ssl_stapling_init_cert(server_rec *s, apr_pool_t *
+mctx->sc->vhost_id);
+
+ apr_hash_set(stapling_certinfo, cinf->idx, sizeof(cinf->idx), cinf);
+-
+-return 1;
++
++cleanup:
++X509_free(issuer);
++return rv;
+ }
+
+ static certinfo *stapling_get_certinfo(server_rec *s, X509 *x, modssl_ctx_t
*mctx,
-BEGIN PGP SIGNATURE-
iQIzBAEBCgAdFiEEqg3TnG6R3qYMxl94+r7qCYlyWOUFAl6XQkUACgkQ+r7qCYly
WOXJ1Q/+PGkrfKUjhHW1jhJEltrtXHvLGna+QfOsX9+JyCnTIq1qBeIeWmQRgwYB
seiDHupE2Mi2+ytwwzilV7f88GiHL6i+hd00kQiMHsOGkowr7x86hRWZc1kfNrcT
iQTUOKj38Ri78Xjyx/9kj1+vKDGtplD+eyuo9pVFH6HWDXKIV0Q7k7Jl7IffDmdY
9NeKGhwxvrnscjUliMOLBCyucsB04XcbtRyQZlxjsGnBLyyOWCeJR7o0CKUy3jE0
JZ3dQ5mdig+ZYbUsDnd5uMmBcWJV5uqu4lGMezCfhSf+fBQ6nO9L3J9NhPWRUcFu
EH01l/rBggE50bfL59tNCbutaEGIpesDSbN5nI54ugSb7FVm9vKO26WPsDgufr3s
fSZOY01qNi4Tyevik9Q8NTO4MSdcevlkSvh9InX/bKP3udX0Rj96X/qLMiwPlkYy
ffHzibnu3Fg4Z9EPWRe19PZ0QjBViQ7Z8iWGIgZd44aIj5AP42ZFbK8ptVAKqsd9
M0VwpDooUv8UDzFiBtu3M1NCatA/2I4CVXRdwQgAdXoe5OnaJGB11Z1Yfvgjxgr2
p39mSNZAAKIlLpzUVFFAyrv4QjvkphWLbeTLJ2yghpeQbRwfcLnW/wEXxA0d4Ehg
CUpq4IPNf/QUCnUQHHBscnd8NyWZ0T+tocHxtCRdoGalac1pCJg=
=nsHV
-END PGP SIGNATURE-
Re: wip: mail/notmuch
Olivier Taïbi writes: > Here is further progress on this port, following versions by Enric > Morales and Stuart Henderson. I hope that this does not duplicate your > efforts. builds and installs on amd64 -current.
Re: Slight grafana file permissions improvement
On Wed Apr 15, 2020 at 04:18:56PM +0200, Eric Elena wrote:
> On Wed, 15 Apr 2020 08:51:35 +0200 Landry Breuil wrote:
> > On Wed, Apr 15, 2020 at 08:11:09AM +0200, Martin Reindl wrote:
> > > On Tue, Apr 14, 2020 at 04:51:38PM +0200, Martin Reindl wrote:
> > > > Am 14.04.20 um 16:21 schrieb Stuart Henderson:
> > > > > On 2020/04/14 15:59, Eric Elena wrote:
> > > > >> On Tue, 14 Apr 2020 14:38:37 +0100 Stuart Henderson wrote:
> > > > >>> On 2020/04/14 14:28, Kevin Chadwick wrote:
> > > > On 2020-04-14 14:15, Stuart Henderson wrote:
> > > > > my 2p: setting the directory 750 is a pain for tab completion,
> > > > > so if this is changed I think it would be better to set
> > > > > permissions on
> > > > > the sensitive files only.
> > > >
> > > > AFAIK /etc/grafana/config.ini is the only sensitive config file.
> > > > Though I have
> > > > seen various other names for the configuration file in
> > > > documentation. The db dir
> > > > is already secured.
> > > >
> > > > >>>
> > > > >>> ldap.toml too.
> > > > >>
> > > > >> I have a diff with stricter permissions for the directories and the
> > > > >> files. I wanted to send it with an update of loki that is taking
> > > > >> more time than expected. Note that for people who have modified
> > > > >> their config.ini: they will have to adjust the permissions.
> > > > >
> > > > > my 2p: setting the directory 750 is a pain for tab completion,
> > > > > so if this is changed I think it would be better to set permissions on
> > > > > the sensitive files only.
> > > > >
> > > >
> > > > I agree with Stuart here. So with my previous diff, it should be enough
> > > > to move the config.ini line to the end of the PLIST.
> > >
> > > Like this, OK?
> >
> > Im not sure this will achieve what you want..
> >
> >
> > > share/examples/grafana/sample.ini
> > > -@sample ${SYSCONFDIR}/grafana/config.ini
> >
> >
> >
> > > @group _grafana
> > > @sample /var/grafana/
> > > @sample /var/log/grafana/
> > > +@sample ${SYSCONFDIR}/grafana/config.ini
> >
> > from my experience and understanding, @sample works in conjunction with
> > the previous entry for files:
> >
> > @sample filename
> > Last preceding @file item is a sample configuration file, to be
> > copied to filename at pkg_add(1) time and to be removed at
> > pkg_delete(1) time.
> >
> > adding the @sample at the end of PLIST, i dunno what it will refer to,
> > but surely not share/examples/grafana/sample.ini
> >
> > so if you want the change perms/ownership on the sample.ini file, i
> > think you need something like
> >
> > share/examples/grafana/sample.ini
> > @mode 0640
> > @owner _grafana
> > @group _grafana
> > @sample ${SYSCONFDIR}/grafana/config.ini
> > @mode
> > @owner
> > @group
>
> I'm not sure why my mail didn't reach the list yesterday. Anyway here
> is a diff that sets permissions to 0755 on directories and 0640 on
> configuration files.
This version works for me. OK rsadowski@
Re: Slight grafana file permissions improvement
On Wed, 15 Apr 2020 08:51:35 +0200 Landry Breuil wrote:
> On Wed, Apr 15, 2020 at 08:11:09AM +0200, Martin Reindl wrote:
> > On Tue, Apr 14, 2020 at 04:51:38PM +0200, Martin Reindl wrote:
> > > Am 14.04.20 um 16:21 schrieb Stuart Henderson:
> > > > On 2020/04/14 15:59, Eric Elena wrote:
> > > >> On Tue, 14 Apr 2020 14:38:37 +0100 Stuart Henderson wrote:
> > > >>> On 2020/04/14 14:28, Kevin Chadwick wrote:
> > > On 2020-04-14 14:15, Stuart Henderson wrote:
> > > > my 2p: setting the directory 750 is a pain for tab completion,
> > > > so if this is changed I think it would be better to set permissions
> > > > on
> > > > the sensitive files only.
> > >
> > > AFAIK /etc/grafana/config.ini is the only sensitive config file.
> > > Though I have
> > > seen various other names for the configuration file in
> > > documentation. The db dir
> > > is already secured.
> > >
> > > >>>
> > > >>> ldap.toml too.
> > > >>
> > > >> I have a diff with stricter permissions for the directories and the
> > > >> files. I wanted to send it with an update of loki that is taking more
> > > >> time than expected. Note that for people who have modified their
> > > >> config.ini: they will have to adjust the permissions.
> > > >
> > > > my 2p: setting the directory 750 is a pain for tab completion,
> > > > so if this is changed I think it would be better to set permissions on
> > > > the sensitive files only.
> > > >
> > >
> > > I agree with Stuart here. So with my previous diff, it should be enough
> > > to move the config.ini line to the end of the PLIST.
> >
> > Like this, OK?
>
> Im not sure this will achieve what you want..
>
>
> > share/examples/grafana/sample.ini
> > -@sample ${SYSCONFDIR}/grafana/config.ini
>
>
>
> > @group _grafana
> > @sample /var/grafana/
> > @sample /var/log/grafana/
> > +@sample ${SYSCONFDIR}/grafana/config.ini
>
> from my experience and understanding, @sample works in conjunction with
> the previous entry for files:
>
> @sample filename
> Last preceding @file item is a sample configuration file, to be
> copied to filename at pkg_add(1) time and to be removed at
> pkg_delete(1) time.
>
> adding the @sample at the end of PLIST, i dunno what it will refer to,
> but surely not share/examples/grafana/sample.ini
>
> so if you want the change perms/ownership on the sample.ini file, i
> think you need something like
>
> share/examples/grafana/sample.ini
> @mode 0640
> @owner _grafana
> @group _grafana
> @sample ${SYSCONFDIR}/grafana/config.ini
> @mode
> @owner
> @group
I'm not sure why my mail didn't reach the list yesterday. Anyway here
is a diff that sets permissions to 0755 on directories and 0640 on
configuration files.
grafana-6.7.2
Description: Unix manual page
Re: aarch64 old binaries and "Trace/BPT trap (core dumped)"
On 2020/04/15 13:16, Stuart Henderson wrote: > Looks like we should have bumped _SYSTEM_VERSION-aarch64 when this > was changed - binaries from before this die with "Trace/BPT trap (core > dumped)" > and there's nothing triggering an automatic update from pkg_add -u. > > OK to do that now? + same for arm. > - > Date: 2020/02/16 09:33:47 > Author: kettenis > Branch: HEAD > Tag: (none) > Log: > Change arm64 system call ABI to skip two instructions. This allows us to > insert a barrier after each system call to address a speculative execution > issue discovered by Anthony Steinhauser. > > A change to insert two nop instructions after each system call instruction > in crt0.o/libc/ld.so has been committed a few weeks ago, so the transition > should go smoothly. However, old static binaries and binaries that roll > their own syscalls (like go) will no longer work. Snapshot packages > that work with the new syscall ABI are available (including a fixed go). > > Together with deraadt@ and guenther@ > ok deraadt@ > > Members: > arm64/locore.S:1.28->1.29 > arm64/syscall.c:1.4->1.5 > - > > Index: arch-defines.mk > === > RCS file: /cvs/ports/infrastructure/mk/arch-defines.mk,v > retrieving revision 1.71 > diff -u -p -r1.71 arch-defines.mk > --- arch-defines.mk 4 Apr 2020 19:35:44 - 1.71 > +++ arch-defines.mk 15 Apr 2020 12:15:36 - > @@ -85,7 +85,7 @@ LLD_EMUL = > > # system version wide specifics > _SYSTEM_VERSION = 1 > -_SYSTEM_VERSION-aarch64 = 3 > +_SYSTEM_VERSION-aarch64 = 4 > _SYSTEM_VERSION-amd64 = 4 > _SYSTEM_VERSION-arm = 3 > _SYSTEM_VERSION-i386 = 2 >
aarch64 old binaries and "Trace/BPT trap (core dumped)"
Looks like we should have bumped _SYSTEM_VERSION-aarch64 when this was changed - binaries from before this die with "Trace/BPT trap (core dumped)" and there's nothing triggering an automatic update from pkg_add -u. OK to do that now? - Date: 2020/02/16 09:33:47 Author: kettenis Branch: HEAD Tag: (none) Log: Change arm64 system call ABI to skip two instructions. This allows us to insert a barrier after each system call to address a speculative execution issue discovered by Anthony Steinhauser. A change to insert two nop instructions after each system call instruction in crt0.o/libc/ld.so has been committed a few weeks ago, so the transition should go smoothly. However, old static binaries and binaries that roll their own syscalls (like go) will no longer work. Snapshot packages that work with the new syscall ABI are available (including a fixed go). Together with deraadt@ and guenther@ ok deraadt@ Members: arm64/locore.S:1.28->1.29 arm64/syscall.c:1.4->1.5 - Index: arch-defines.mk === RCS file: /cvs/ports/infrastructure/mk/arch-defines.mk,v retrieving revision 1.71 diff -u -p -r1.71 arch-defines.mk --- arch-defines.mk 4 Apr 2020 19:35:44 - 1.71 +++ arch-defines.mk 15 Apr 2020 12:15:36 - @@ -85,7 +85,7 @@ LLD_EMUL = # system version wide specifics _SYSTEM_VERSION = 1 -_SYSTEM_VERSION-aarch64 = 3 +_SYSTEM_VERSION-aarch64 = 4 _SYSTEM_VERSION-amd64 = 4 _SYSTEM_VERSION-arm = 3 _SYSTEM_VERSION-i386 = 2
Re: [macppc] Unbreak x11/kde/arts3
On Wed, Apr 15 2020, Charlene Wendling wrote: > On Mon, 13 Apr 2020 21:27:17 +0200 > Charlene Wendling wrote: > >> Hi, >> >> arts3 is broken in the current macppc bulk: >> >> > /usr/obj/ports/arts-1.5.10/arts-1.5.10/mcop/debug.cc:797:3: error: >> > array type 'va_list' (aka '__builtin_va_list') is not assignable >> > G_VA_COPY (args2, args1); >> (there has been another occurrence later) >> >> This is happening because _CALL_SYSV is not defined by clang, it >> looks like it's a GCC-ism [0]. >> >> The below diff simplifies impacted conditionals so the proper >> definition of G_VA_COPY is used, and allows building arts3 on >> powerpc [1]. > > [...] > >> [0] >> https://reviews.llvm.org/rG22d2435a00c9c288bf9bdd2d7f3e15557c3f4e06 >> [1] https://bin.charlenew.xyz/macppc/paths/x11/kde/arts3.log > > I had a chat with jca@ about that, and he proposed to just use > va_copy(3) instead. It builds fine on powerpc and amd64. > > OK? Looks like your MUA wrapped lines here, ok jca@ for the initial diff and yes, please bump REVISION. > Charlène. > > Index: Makefile > === > RCS file: /cvs/ports/x11/kde/arts3/Makefile,v > retrieving revision 1.89 > diff -u -p -u -p -r1.89 Makefile > --- Makefile 8 Jun 2019 15:25:57 - 1.89 > +++ Makefile 15 Apr 2020 01:17:12 - > @@ -3,7 +3,7 @@ > COMMENT =K Desktop Environment, aRTs > CATEGORIES = x11 x11/kde > VERSION =3.5.10 > -REVISION = 16 > +REVISION = 17 > DISTNAME = arts-1.5.10 > MODKDE_VERSION = 3.5.8 > > Index: patches/patch-flow_gsl_gslglib_h > === > RCS file: patches/patch-flow_gsl_gslglib_h > diff -N patches/patch-flow_gsl_gslglib_h > --- /dev/null 1 Jan 1970 00:00:00 - > +++ patches/patch-flow_gsl_gslglib_h 15 Apr 2020 01:17:12 - > @@ -0,0 +1,23 @@ > +$OpenBSD$ > + > +Pointless #ifdef hell that breaks with clang on powerpc, > +va_copy was introduced in C99 > + > +Index: flow/gsl/gslglib.h > +--- flow/gsl/gslglib.h.orig > flow/gsl/gslglib.h > +@@ -505,13 +505,7 @@ gboolean g_path_is_absolute (const gchar *file_name); > + * glibconfig.h may have already defined G_VA_COPY as va_copy or __va_copy. > + */ > + #if !defined (G_VA_COPY) > +-# if defined (__GNUC__) && ( defined (__PPC__) || defined (__s390__) ) > && (defined (_CALL_SYSV) || defined (_WIN32) || defined (__s390__) ) > +-#define G_VA_COPY(ap1, ap2) (*(ap1) = *(ap2)) > +-# elif defined (G_VA_COPY_AS_ARRAY) > +-#define G_VA_COPY(ap1, ap2) g_memmove ((ap1), (ap2), sizeof (va_list)) > +-# else /* va_list is a pointer */ > +-#define G_VA_COPY(ap1, ap2) ((ap1) = (ap2)) > +-# endif /* va_list is a pointer */ > ++# define G_VA_COPY va_copy > + #endif /* !G_VA_COPY */ > + > + > Index: patches/patch-mcop_debug_cc > === > RCS file: patches/patch-mcop_debug_cc > diff -N patches/patch-mcop_debug_cc > --- /dev/null 1 Jan 1970 00:00:00 - > +++ patches/patch-mcop_debug_cc 15 Apr 2020 01:17:12 - > @@ -0,0 +1,23 @@ > +$OpenBSD$ > + > +Pointless #ifdef hell that breaks with clang on powerpc, > +va_copy was introduced in C99 > + > +Index: mcop/debug.cc > +--- mcop/debug.cc.orig > mcop/debug.cc > +@@ -381,13 +381,7 @@ typedef struct _GString GString; > + * glibconfig.h may have already defined G_VA_COPY as va_copy or __va_copy. > + */ > + #if !defined (G_VA_COPY) > +-# if defined (__GNUC__) && defined (__PPC__) && (defined (_CALL_SYSV) > || defined (_WIN32) || defined(WIN32)) || defined(__s390__) || > defined(__x86_64__) > +-#define G_VA_COPY(ap1, ap2) (*(ap1) = *(ap2)) > +-# elif defined (G_VA_COPY_AS_ARRAY) > +-#define G_VA_COPY(ap1, ap2) g_memmove ((ap1), (ap2), sizeof (va_list)) > +-# else /* va_list is a pointer */ > +-#define G_VA_COPY(ap1, ap2) ((ap1) = (ap2)) > +-# endif /* va_list is a pointer */ > ++# define G_VA_COPY va_copy > + #endif /* !G_VA_COPY */ > + > + /* --- glib macros --- */ <#secure method=pgpmime mode=sign> -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: aarch64 bulk build report
On 2020/04/15 10:25, Christian Weisgerber wrote: > On 2020-04-14, phess...@openbsd.org wrote: > > > http://build-failures.rhaalovely.net/aarch64/2020-04-11/games/burgerspace.log > > Cannot read > /usr/obj/ports/sdl-mixer-1.2.12/fake-aarch64/usr/local/lib/libSDL_mixer.la: > No such file or directory > > This looks odd. Did something go wrong on the build machine? > I can't reproduce it. > > -- > Christian "naddy" Weisgerber na...@mips.inka.de > This happens randomly. I have seen it on i386 too.
Re: aarch64 bulk build report
On Wed Apr 15, 2020 at 10:25:43AM -, Christian Weisgerber wrote: > On 2020-04-14, phess...@openbsd.org wrote: > > > http://build-failures.rhaalovely.net/aarch64/2020-04-11/games/burgerspace.log > > Cannot read > /usr/obj/ports/sdl-mixer-1.2.12/fake-aarch64/usr/local/lib/libSDL_mixer.la: > No such file or directory > > This looks odd. Did something go wrong on the build machine? > I can't reproduce it. Maybe it's the lack of memory >From >http://build-failures.rhaalovely.net/aarch64/2020-04-11/cad/kicad-share/packages3D.log CMake Error at cmake_install.cmake:126 (file): file INSTALL cannot copy file "/usr/obj/ports/kicad-packages3D-5.1.5/kicad-packages3D-5.1.5/Package_SO.3dshapes/TSOP-II-54_22.2x10.16mm_P0.8mm.step" to "/usr/obj/ports/kicad-packages3D-5.1.5/fake-aarch64/usr/local/share/kicad/modules/packages3d/Package_SO.3dshapes/TSOP-II-54_22.2x10.16mm_P0.8mm.step": No space left on device. > > -- > Christian "naddy" Weisgerber na...@mips.inka.de >
Re: aarch64 bulk build report
On 2020-04-14, phess...@openbsd.org wrote: > http://build-failures.rhaalovely.net/aarch64/2020-04-11/games/burgerspace.log Cannot read /usr/obj/ports/sdl-mixer-1.2.12/fake-aarch64/usr/local/lib/libSDL_mixer.la: No such file or directory This looks odd. Did something go wrong on the build machine? I can't reproduce it. -- Christian "naddy" Weisgerber na...@mips.inka.de
回复: [Maintainer Update] mail/p5-Mail-AuthenticationResults : Update to 1.20200331.1
Yes, you are right, I missed p5-JSON as RUN_DEPENDS. wen 发件人: Giovanni Bechis 已发送: 2020 年 4 月 15 日 星期三 17:46 收件人: wen heping 抄送: ports@openbsd.org 主题: Re: [Maintainer Update] mail/p5-Mail-AuthenticationResults : Update to 1.20200331.1 On Sun, Apr 12, 2020 at 08:30:34AM +, wen heping wrote: > Hi, ports@: > > Here is a simple patch for mail/p5-Mail-AuthenticationResults to > update to 1.20200331.1. It is required by the update of > p5-Mail-Milter-Authentication. > > It build well and pass all tests. > updated diff with a missing dependency, ok ? Giovanni Index: Makefile === RCS file: /cvs/ports/mail/p5-Mail-AuthenticationResults/Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 Makefile --- Makefile15 Sep 2019 17:23:23 - 1.1.1.1 +++ Makefile15 Apr 2020 09:44:57 - @@ -2,7 +2,7 @@ COMMENT = object oriented Authentication-Results headers -DISTNAME = Mail-AuthenticationResults-1.20180923 +DISTNAME = Mail-AuthenticationResults-1.20200331.1 CATEGORIES =mail @@ -12,6 +12,8 @@ MAINTAINER = Wen Heping
Re: UPDATE: productivity/homebank
On Wed, Apr 15, 2020 at 07:50:11AM +0200, Rafael Sadowski wrote: > Update homebank to 5.4. Changelog: > > http://homebank.free.fr/ChangeLog > > Rafael > ok pea@ Thank you. > Index: Makefile > === > RCS file: /cvs/ports/productivity/homebank/Makefile,v > retrieving revision 1.45 > diff -u -p -u -p -r1.45 Makefile > --- Makefile 8 Mar 2020 07:24:12 - 1.45 > +++ Makefile 15 Apr 2020 05:47:47 - > @@ -2,7 +2,7 @@ > > COMMENT =personal accounting application > > -DISTNAME = homebank-5.3.2 > +DISTNAME = homebank-5.4 > > CATEGORIES = productivity x11 > > Index: distinfo > === > RCS file: /cvs/ports/productivity/homebank/distinfo,v > retrieving revision 1.26 > diff -u -p -u -p -r1.26 distinfo > --- distinfo 8 Mar 2020 07:24:12 - 1.26 > +++ distinfo 15 Apr 2020 05:47:47 - > @@ -1,2 +1,2 @@ > -SHA256 (homebank-5.3.2.tar.gz) = S8i4AVgv4c2qQS0hedcUHuXtqov7+oaSV5FR7IEBJLs= > -SIZE (homebank-5.3.2.tar.gz) = 2906468 > +SHA256 (homebank-5.4.tar.gz) = MRCweeyufvv0bArpgAKeY1XuMgRAtxtMbwx+ZvTNmqc= > +SIZE (homebank-5.4.tar.gz) = 2966487 > Index: patches/patch-po_POTFILES_in > === > RCS file: /cvs/ports/productivity/homebank/patches/patch-po_POTFILES_in,v > retrieving revision 1.8 > diff -u -p -u -p -r1.8 patch-po_POTFILES_in > --- patches/patch-po_POTFILES_in 27 Jan 2020 07:10:01 - 1.8 > +++ patches/patch-po_POTFILES_in 15 Apr 2020 05:47:47 - > @@ -2,7 +2,7 @@ $OpenBSD: patch-po_POTFILES_in,v 1.8 202 > Index: po/POTFILES.in > --- po/POTFILES.in.orig > +++ po/POTFILES.in > -@@ -37,6 +37,7 @@ src/ui-budget.c > +@@ -38,6 +38,7 @@ src/ui-budget.c > src/ui-budget-tabview.c > src/ui-category.c > src/ui-currency.c > Index: pkg/PLIST > === > RCS file: /cvs/ports/productivity/homebank/pkg/PLIST,v > retrieving revision 1.23 > diff -u -p -u -p -r1.23 PLIST > --- pkg/PLIST 8 Mar 2020 07:24:12 - 1.23 > +++ pkg/PLIST 15 Apr 2020 05:47:47 - > @@ -271,8 +271,11 @@ share/homebank/icons/hicolor/scalable/ac > share/homebank/icons/hicolor/scalable/actions/list-collapse-all-symbolic.svg > share/homebank/icons/hicolor/scalable/actions/list-expand-all-symbolic.svg > share/homebank/icons/hicolor/scalable/actions/list-merge-symbolic.svg > +share/homebank/icons/hicolor/scalable/actions/text-casesensitive-symbolic.svg > +share/homebank/icons/hicolor/scalable/actions/text-regularexpression-symbolic.svg > share/homebank/icons/hicolor/scalable/actions/toggle-sign-symbolic.svg > share/homebank/images/ > +share/homebank/images/homebank-icon.svg > share/homebank/images/splash.png > share/icons/hicolor/16x16/apps/homebank.png > share/icons/hicolor/22x22/apps/homebank.png
