CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2021/09/19 23:55:34 Modified files: x11/xfce4/xfce4-whiskermenu: Makefile distinfo x11/xfce4/xfce4-whiskermenu/pkg: PLIST Log message: x11/xfce4/xfce4-whiskermenu: update to 2.6.0
sparc64 bulk build report
Bulk build on sparc64-0a.ports.openbsd.org Started : Sat Sep 18 15:16:09 MDT 2021 Finished: Sun Sep 19 22:01:07 MDT 2021 Duration: 1 Days 6 hours 45 minutes Built using OpenBSD 7.0-beta (GENERIC.MP) #970: Sat Sep 11 23:30:13 MDT 2021 Built 7968 packages Number of packages built each day: Sep 18: 6113 Sep 19: 1855 Critical path missing pkgs: http://build-failures.rhaalovely.net/sparc64/2021-09-18/summary.log Build failures: 22 http://build-failures.rhaalovely.net/sparc64/2021-09-18/audio/ncmpcpp.log http://build-failures.rhaalovely.net/sparc64/2021-09-18/audio/pulseaudio.log http://build-failures.rhaalovely.net/sparc64/2021-09-18/databases/xapian-bindings,-main.log http://build-failures.rhaalovely.net/sparc64/2021-09-18/devel/avr/gcc.log http://build-failures.rhaalovely.net/sparc64/2021-09-18/devel/libidn2.log http://build-failures.rhaalovely.net/sparc64/2021-09-18/emulators/openmsx.log http://build-failures.rhaalovely.net/sparc64/2021-09-18/games/colobot/colobot.log http://build-failures.rhaalovely.net/sparc64/2021-09-18/games/egoboo.log http://build-failures.rhaalovely.net/sparc64/2021-09-18/games/godot.log http://build-failures.rhaalovely.net/sparc64/2021-09-18/games/goldberg_emulator.log http://build-failures.rhaalovely.net/sparc64/2021-09-18/games/ja2-stracciatella.log http://build-failures.rhaalovely.net/sparc64/2021-09-18/games/vkquake.log http://build-failures.rhaalovely.net/sparc64/2021-09-18/graphics/libexif.log http://build-failures.rhaalovely.net/sparc64/2021-09-18/graphics/openexr.log http://build-failures.rhaalovely.net/sparc64/2021-09-18/lang/clazy.log http://build-failures.rhaalovely.net/sparc64/2021-09-18/net/libstrophe.log http://build-failures.rhaalovely.net/sparc64/2021-09-18/net/pmacct,postgresql.log http://build-failures.rhaalovely.net/sparc64/2021-09-18/security/arirang.log http://build-failures.rhaalovely.net/sparc64/2021-09-18/textproc/docbook-utils.log http://build-failures.rhaalovely.net/sparc64/2021-09-18/textproc/redland-bindings,-main.log http://build-failures.rhaalovely.net/sparc64/2021-09-18/www/nextcloud_notify_push.log http://build-failures.rhaalovely.net/sparc64/2021-09-18/x11/gnome/gjs.log Recurrent failures: failures/audio/ncmpcpp.log failures/audio/pulseaudio.log failures/databases/xapian-bindings,-main.log failures/devel/avr/gcc.log failures/emulators/openmsx.log failures/games/colobot/colobot.log failures/games/egoboo.log failures/games/godot.log failures/games/goldberg_emulator.log failures/games/ja2-stracciatella.log failures/games/vkquake.log failures/graphics/openexr.log failures/lang/clazy.log failures/net/libstrophe.log failures/net/pmacct,postgresql.log failures/security/arirang.log failures/textproc/docbook-utils.log failures/textproc/redland-bindings,-main.log failures/www/nextcloud_notify_push.log failures/x11/gnome/gjs.log New failures: +failures/devel/libidn2.log +failures/graphics/libexif.log Resolved failures: -failures/audio/musikcube.log -failures/devel/kf5/kcalendarcore.log -failures/emulators/qemu,-ga.log -failures/games/openxcom.log -failures/graphics/birdfont.log -failures/graphics/enblend-enfuse.log -failures/graphics/gmic.log -failures/graphics/mapnik.log -failures/multimedia/mkvtoolnix,no_x11.log -failures/multimedia/mpv.log -failures/net/barrier.log -failures/net/ntopng.log -failures/net/weechat,-lua.log -failures/productivity/gnucash.log -failures/security/keepassxc,yubikey.log -failures/x11/mate/calc.log -failures/x11/mate/panel.log Packages newly built: +devel/cargo-audit +graphics/mapnik +mail/dovecot-fts-flatcurve +security/openssl/libretls Packages not built this time: -archivers/pecl-lzf,php73 -archivers/pecl-lzf,php74 -archivers/pecl-lzf,php80 -archivers/pecl-rar,php73 -archivers/pecl-rar,php74 -archivers/pecl-rar,php80 -archivers/quazip -astro/celestia -astro/gnuastro -audio/ario -audio/audacious/player -audio/audacious/plugins -audio/audacity -audio/calf -audio/deadbeef -audio/disc-cover -audio/easytag -audio/faudio -audio/gmpc -audio/gmpc-plugins -audio/gogglesmm -audio/gqmpeg -audio/gradio -audio/grip -audio/gsound -audio/hydrogen -audio/libcanberra -audio/libcanberra,-gtk -audio/libcanberra,-gtk3 -audio/libcanberra,-main -audio/liblastfm -audio/lilv -audio/lmms -audio/lv2 -audio/milkytracker -audio/mp3cddb -audio/mp3info -audio/mscore -audio/mumble -audio/mumble,-main -audio/mumble,-server -audio/p5-gnupod -audio/potamus -audio/pykaraoke -audio/qsynth -audio/solfege -audio/sonata -audio/sratom -audio/tagtool -audio/timidity,gtk2 -benchmarks/netperf-wrapper -benchmarks/netperf-wrapper,-main -benchmarks/tsung -books/tex-by-topic -cad/fritzing -cad/geda-gaf -cad/gerbv -cad/gtkwave -cad/librecad -cad/opensta -cad/pcb -cad/pcb2gcode -cad/qcad -cad/qelectrotech -cad/qflow -cad/xnecview -cad/yosys -chinese/libchewing -comms/amtterm -comms/amtterm,-main -comms/amtterm,-term -comms/chirp -comms/gammu -comms/gmfsk -comms/gpsk31 -comms/hylafax -comms/hylafax,a4 -comms/jpilot -comms/mgetty+sendfax -comms/pterm
Re: Only important updates now
"Theo de Raadt" wrote:
> I am unable (and unwilling) to run this in test. Is there anyone who
> can take this on?
Not the maintainer nor a user, but I can read a diff.
> --- ./exim-4.94.2/exim-4.94.2/src/transport.c.saveFri Apr 30 06:08:21 2021
> +++ ./exim-4.94.2/exim-4.94.2/src/transport.c Sun Sep 19 16:47:03 2021
> @@ -959,9 +959,9 @@
>if (tctx->options & topt_add_return_path)
> {
> int n;
> -uschar * s = string_sprintf("Return-path: <%.*s>\n%n",
> - EXIM_EMAILADDR_MAX, return_path, );
> -if (!write_chunk(tctx, s, n)) goto bad;
> +uschar * s = string_sprintf("Return-path: <%.*s>\n",
> + EXIM_EMAILADDR_MAX, return_path);
> +if (!write_chunk(tctx, s, strlen(s))) goto bad;
> }
>
>/* Add envelope-to: if requested */
Looks fine.
> --- ./exim-4.94.2/exim-4.94.2/src/rewrite.c.save Fri Apr 30 06:08:21 2021
> +++ ./exim-4.94.2/exim-4.94.2/src/rewrite.c Sun Sep 19 16:52:49 2021
> @@ -325,8 +325,9 @@
> else
>{
>subject = newparsed;
> - new = string_sprintf("%.*s%s%n%s",
> - yield_start, yield, subject, , yield + yield_end);
> + new = string_sprintf("%.*s%s%s",
> + yield_start, yield, subject, yield + yield_end);
> + end = strlen(new) - strlen(yield + yield_end);
>yield_end = end;
>yield = new;
>}
Looks fine.
> --- ./exim-4.94.2/exim-4.94.2/src/host.c.save Fri Apr 30 06:08:21 2021
> +++ ./exim-4.94.2/exim-4.94.2/src/host.c Sun Sep 19 16:56:15 2021
> @@ -2587,10 +2587,13 @@
>{
>gstring * g;
>uschar * temp_fully_qualified_name;
> + char *temp;
>int prefix_length;
>
> - g = string_fmt_append(NULL, "_%s._tcp.%n%.256s",
> - srv_service, _length, host->name);
> + prefix_length = asprintf(, "_%s._tcp.:", srv_service);
^
> + g = string_fmt_append(NULL, "%s%.256s",
> + temp, host->name);
> + free();
>temp_fully_qualified_name = string_from_gstring(g);
>ind_type = T_SRV;
>
Without the colon marked, looks fine.
> --- ./exim-4.94.2/exim-4.94.2/src/exim.c.save Fri Apr 30 06:08:21 2021
> +++ ./exim-4.94.2/exim-4.94.2/src/exim.c Sun Sep 19 16:57:41 2021
> @@ -4751,8 +4751,12 @@
> if (amp)
>{
>int loffset;
> - string_format(buffer, sizeof(buffer), "%.*s%n%s%s",
> -(int)(amp - name), name, , originator_login, amp + 1);
> + char *temp = NULL;
> +
> + loffset = asprintf(, "%.*s", (int)(amp - name), name);
> + string_format(buffer, sizeof(buffer), "%s%s%s", temp,
> +originator_login, amp + 1);
> + free(temp);
>buffer[loffset] = toupper(buffer[loffset]);
>name = buffer;
>}
Looks fine.
> --- ./exim-4.94.2/exim-4.94.2/src/spam.c.save Fri Apr 30 06:08:21 2021
> +++ ./exim-4.94.2/exim-4.94.2/src/spam.c Sun Sep 19 16:58:21 2021
> @@ -395,10 +395,10 @@
>{ /* spamassassin variant */
>int n;
>uschar * s = string_sprintf(
> - "REPORT SPAMC/1.2\r\nUser: %s\r\nContent-length: %ld\r\n\r\n%n",
> - user_name, mbox_size, );
> + "REPORT SPAMC/1.2\r\nUser: %s\r\nContent-length: %ld\r\n\r\n",
> + user_name, mbox_size);
>/* send our request */
> - wrote = send(spamd_cctx.sock, s, n, 0);
> + wrote = send(spamd_cctx.sock, s, strlen(n), 0);
>}
>
> if (wrote == -1)
Looks fine.
> --- ./exim-4.94.2/exim-4.94.2/src/acl.c.save Fri Apr 30 06:08:21 2021
> +++ ./exim-4.94.2/exim-4.94.2/src/acl.c Sun Sep 19 17:07:15 2021
> @@ -2907,9 +2907,11 @@
>HDEBUG(D_acl)
> {
> int lhswidth = 0;
> -debug_printf_indent("check %s%s %n",
> - (!conditions[cb->type].is_modifier && cb->u.negated)? "!":"",
> - conditions[cb->type].name, );
> +char *first = (!conditions[cb->type].is_modifier && cb->u.negated)?
> "!":"";
> +char *second = conditions[cb->type].name;
> +
> +debug_printf_indent("check %s%s ", first, second);
> +lhswidth = sizeof("check ") + strlen(first) + strlen(second);
I think you're missing a +1 here, for the last space. Rest looks fine.
>
> if (cb->type == ACLC_SET)
>{
-Lucas
Re: Only important updates now
Christian Weisgerber wrote:
> This includes the list of remaining ports with %n warnings:
>
> editors/cooledit
> mail/exim
> misc/brltty
> net/climm
climm s_sprintf() is a work of art, like an ochre cave painting of a stick
animal with a stick poking through it.
probably predates the better asprintf API, which returns pointer and length.
this one reallocates memory repeatedly to try to gather enough. then it throws
away the length, which we will need. strlen() cannot be used, because the
caller
has printed NUL characters into the string.
So, create a version of s_sprintf() which returns the length, and use
that.
again, someone take it on?
--- climm-0.7.1/climm-0.7.1/src/io/io_socks5.c Sun Sep 19 17:38:51 2021
+++ climm-0.7.1/climm-0.7.1/src/io/io_socks5.c~ Sat Mar 20 08:13:15 2010
@@ -178,7 +178,7 @@
if (!socks5name || !socks5pass)
return io_socks5_seterr (d, IO_RW, i18n (1599, "[SOCKS]
Authentication method incorrect"));
-send = s_sprintf_len (, "%c%c%s%c%s", 1, (char) strlen
(socks5name), socks5name, (char) strlen (socks5pass), socks5pass);
+send = s_sprintf ("%c%c%s%c%s%n", 1, (char) strlen (socks5name),
socks5name, (char) strlen (socks5pass), socks5pass, );
e = io_util_write (conn, d->next, send, len);
d->flags = FLAG_CRED_SENT;
d->read = 0;
@@ -231,24 +231,24 @@
if (d->funcs->f_accept)
{
if (d->flags == FLAG_SEND_REQ)
-send = s_sprintf_len (, "%c%c%c%c%c%c%c%c%c%c", 5, 2, 0,
1, 0, 0, 0, 0,
- (char)(conn->port >> 8), (char)(conn->port
& 255));
+send = s_sprintf ("%c%c%c%c%c%c%c%c%c%c%n", 5, 2, 0, 1, 0, 0,
0, 0,
+ (char)(conn->port >> 8), (char)(conn->port
& 255), );
else
{
-send = s_sprintf_len (, "%c%c%c%c%c%c%c%c%c%c", 5, 2, 0,
1, 0, 0, 0, 0, 0, 0);
+send = s_sprintf ("%c%c%c%c%c%c%c%c%c%c%n", 5, 2, 0, 1, 0, 0,
0, 0, 0, 0, );
d->flags = FLAG_REQ_NOPORT_SENT;
}
}
else
{
if (conn->server)
-send = s_sprintf_len (, "%c%c%c%c%c%s%c%c", 5, 1, 0, 3,
+send = s_sprintf ("%c%c%c%c%c%s%c%c%n", 5, 1, 0, 3,
(char)strlen (conn->server), conn->server,
- (char)(conn->port >> 8), (char)(conn->port
& 255));
+ (char)(conn->port >> 8), (char)(conn->port
& 255), );
else
-send = s_sprintf_len (, "%c%c%c%c%c%c%c%c%c%c", 5, 1, 0, 1,
+send = s_sprintf ("%c%c%c%c%c%c%c%c%c%c%n", 5, 1, 0, 1,
(char)(conn->ip >> 24), (char)(conn->ip >>
16), (char)(conn->ip >> 8), (char)conn->ip,
- (char)(conn->port >> 8), (char)(conn->port
& 255));
+ (char)(conn->port >> 8), (char)(conn->port
& 255), );
}
e = io_util_write (conn, d->next, send, len);
d->read = 0;
--- climm-0.7.1/climm-0.7.1/src/util_str.c Sun Sep 19 17:37:33 2021
+++ climm-0.7.1/climm-0.7.1/src/util_str.c~ Sat Mar 20 08:13:15 2010
@@ -303,42 +303,6 @@
}
/*
- * Return a static formatted string and length
- */
-const char *s_sprintf_len (int *lenp, const char *fmt, ...)
-{
-static char *buf = NULL;
-static int size = 0;
-va_list args;
-char *nbuf;
-int rc, nsize;
-
-if (!buf)
-buf = calloc (1, size = 1024);
-
-while (1)
-{
-buf[size - 2] = '\0';
-va_start (args, fmt);
-rc = vsnprintf (buf, size, fmt, args);
-va_end (args);
-
-if (rc >= 0 && rc < size && !buf[size - 2])
-break;
-
-nsize = (rc > 0 ? rc + 5 : size * 2);
-nbuf = malloc (nsize);
-if (!nbuf)
-break;
-free (buf);
-buf = nbuf;
-size = nsize;
-}
-*lenp = rc;
-return buf;
-}
-
-/*
* Return a static string consisting of the given IP.
*/
const char *s_ip (UDWORD ip)
--- climm-0.7.1/climm-0.7.1/include/util_str.h Sun Sep 19 17:40:12 2021
+++ climm-0.7.1/climm-0.7.1/include/util_str.h~ Sun Sep 19 17:36:59 2021
@@ -36,7 +36,7 @@
voids_done(str_t str);
const char *s_sprintf (const char *fmt, ...) __attribute__ ((format
(__printf__, 1, 2)));
-const char *s_sprintf_len (int *lenp, const char *fmt, ...) __attribute__
((format (__printf__, 2, 3)));
+const char *s_sprintf_len (int *lenp; const char *fmt, ...) __attribute__
((format (__printf__, 2, 3)));
const char *s_ip (UDWORD ip);
const char *s_status (status_t status, UDWORD nativestatus);
const char *s_status_short (status_t status);
Re: FIX BROKEN hiera plugins
On 09/19 11:33, Sebastian Reitenbach wrote:
> Hi,
>
> with updating the default ruby version to 3.0, puppet related ports stayed at
> 2.7, so did
> databases/ruby-hiera3. The hiera plugins were overlooked, they should also
> default to Ruby 2.7, otherwise they're unusable.
>
> I had to fiddle a little, as these plugins don't have FLAVOR set, and with
> the switch,
> to 3.0, something else seems to have changed as well. At least for
> ruby-hiera-eyaml,
> The GEM_BIN_SUFFIX in PLIST doesn't kick in, as well as for
> ruby-hiera-eyaml-gpg,
> had to remove the ${MODRUBY_FLAVOR} from the RUN_DEPENDS to ruby-hiera-eyaml.
> Below the version that got me to install them, and made them usable again.
I don't understand why you need to set this. Using ,${MODRUBY_FLAVOR}
in the RUN_DEPENDS should correctly set the dependency information.
This change looks wrong, since it looks like if you build it with a
ruby30 FLAVOR, it will build a package that has a ruby30 FLAVOR embedded
in it, but with ruby27 information.
You only need to specify a ruby version inside a port if the port
doesn't support ruby* FLAVORs. If the port supports ruby* FLAVORS,
then you do not need to specify a ruby version in the port, you just
need to build it with the correct FLAVOR.
Is the issue that ruby27 versions of ruby-hiera-eyaml-gpg and
ruby-hiera-eyaml aren't built by default? You can just change the
category Makefile to build ruby27 versions of the ports by default.
If that doesn't work, can you post the actual error you are
getting with -current puppet?
Thanks,
Jeremy
>
> OK?
>
> Sebastian
>
> Index: ruby-hiera-eyaml-gpg/Makefile
> ===
> RCS file: /cvs/ports/databases/ruby-hiera-eyaml-gpg/Makefile,v
> retrieving revision 1.4
> diff -u -r1.4 Makefile
> --- ruby-hiera-eyaml-gpg/Makefile 22 Oct 2019 13:54:39 - 1.4
> +++ ruby-hiera-eyaml-gpg/Makefile 19 Sep 2021 21:20:37 -
> @@ -3,6 +3,7 @@
> COMMENT =gpg encryptor for the hiera eyaml backend
>
> DISTNAME = hiera-eyaml-gpg-0.7.4
> +REVISION = 0
> CATEGORIES = databases
>
> HOMEPAGE = http://github.com/sihil/hiera-eyaml-gpg
> @@ -14,9 +15,10 @@
> MODULES =lang/ruby
>
> CONFIGURE_STYLE =ruby gem
> +MODRUBY_REV =2.7
>
> BUILD_DEPENDS = ${RUN_DEPENDS}
> -RUN_DEPENDS =databases/ruby-hiera-eyaml,${MODRUBY_FLAVOR} \
> +RUN_DEPENDS =databases/ruby-hiera-eyaml \
> security/ruby-gpgme,${MODRUBY_FLAVOR}
>
> .include
> Index: ruby-hiera-eyaml/Makefile
> ===
> RCS file: /cvs/ports/databases/ruby-hiera-eyaml/Makefile,v
> retrieving revision 1.15
> diff -u -r1.15 Makefile
> --- ruby-hiera-eyaml/Makefile 23 May 2021 18:36:40 - 1.15
> +++ ruby-hiera-eyaml/Makefile 19 Sep 2021 21:20:46 -
> @@ -3,6 +3,7 @@
> COMMENT =Hiera backend for decrypting encrypted yaml properties
>
> DISTNAME = hiera-eyaml-3.2.2
> +REVISION = 0
> CATEGORIES = databases
>
> MAINTAINER = Sebastian Reitenbach
> @@ -11,6 +12,7 @@
> PERMIT_PACKAGE = Yes
>
> MODULES =lang/ruby
> +MODRUBY_REV =2.7
>
> CONFIGURE_STYLE =ruby gem
>
> Index: ruby-hiera-eyaml/pkg/PLIST
> ===
> RCS file: /cvs/ports/databases/ruby-hiera-eyaml/pkg/PLIST,v
> retrieving revision 1.7
> diff -u -r1.7 PLIST
> --- ruby-hiera-eyaml/pkg/PLIST10 Mar 2021 22:05:08 - 1.7
> +++ ruby-hiera-eyaml/pkg/PLIST19 Sep 2021 21:20:46 -
> @@ -1,5 +1,5 @@
> @comment $OpenBSD: PLIST,v 1.7 2021/03/10 22:05:08 sebastia Exp $
> -${GEM_BIN}/eyaml${GEM_BIN_SUFFIX}
> +${GEM_BIN}/eyaml27
> ${GEM_LIB}/cache/${DISTNAME}.gem
> ${GEM_LIB}/gems/${DISTNAME}/
> ${GEM_LIB}/gems/${DISTNAME}/.github/
> Index: ruby-hiera-file/Makefile
> ===
> RCS file: /cvs/ports/databases/ruby-hiera-file/Makefile,v
> retrieving revision 1.9
> diff -u -r1.9 Makefile
> --- ruby-hiera-file/Makefile 12 Jul 2019 20:44:01 - 1.9
> +++ ruby-hiera-file/Makefile 19 Sep 2021 21:20:59 -
> @@ -3,7 +3,7 @@
> COMMENT =data backend for Hiera to return whole files
>
> DISTNAME = hiera-file-1.1.1
> -REVISION = 1
> +REVISION = 2
> CATEGORIES = databases
>
> MAINTAINER = Sebastian Reitenbach
> @@ -12,6 +12,7 @@
> PERMIT_PACKAGE = Yes
>
> MODULES =lang/ruby
> +MODRUBY_REV =2.7
>
> CONFIGURE_STYLE =ruby gem
>
Re: Only important updates now
Christian Weisgerber wrote:
> This includes the list of remaining ports with %n warnings:
>
> mail/exim
> net/climm
two left.
here is my brutish attempt to deal with exim, which has a set of
*printf-like functions which return pointer, and but discard the
length
in a few cases, %n is at the end, allowing use of strlen() to
recover the discarded length
in other cases, %n is embedded, and the operation must be split up.
I am unable (and unwilling) to run this in test. Is there anyone who
can take this on?
--- ./exim-4.94.2/exim-4.94.2/src/transport.c.save Fri Apr 30 06:08:21 2021
+++ ./exim-4.94.2/exim-4.94.2/src/transport.c Sun Sep 19 16:47:03 2021
@@ -959,9 +959,9 @@
if (tctx->options & topt_add_return_path)
{
int n;
-uschar * s = string_sprintf("Return-path: <%.*s>\n%n",
- EXIM_EMAILADDR_MAX, return_path, );
-if (!write_chunk(tctx, s, n)) goto bad;
+uschar * s = string_sprintf("Return-path: <%.*s>\n",
+ EXIM_EMAILADDR_MAX, return_path);
+if (!write_chunk(tctx, s, strlen(s))) goto bad;
}
/* Add envelope-to: if requested */
--- ./exim-4.94.2/exim-4.94.2/src/rewrite.c.saveFri Apr 30 06:08:21 2021
+++ ./exim-4.94.2/exim-4.94.2/src/rewrite.c Sun Sep 19 16:52:49 2021
@@ -325,8 +325,9 @@
else
{
subject = newparsed;
- new = string_sprintf("%.*s%s%n%s",
- yield_start, yield, subject, , yield + yield_end);
+ new = string_sprintf("%.*s%s%s",
+ yield_start, yield, subject, yield + yield_end);
+ end = strlen(new) - strlen(yield + yield_end);
yield_end = end;
yield = new;
}
--- ./exim-4.94.2/exim-4.94.2/src/host.c.save Fri Apr 30 06:08:21 2021
+++ ./exim-4.94.2/exim-4.94.2/src/host.cSun Sep 19 16:56:15 2021
@@ -2587,10 +2587,13 @@
{
gstring * g;
uschar * temp_fully_qualified_name;
+ char *temp;
int prefix_length;
- g = string_fmt_append(NULL, "_%s._tcp.%n%.256s",
- srv_service, _length, host->name);
+ prefix_length = asprintf(, "_%s._tcp.:", srv_service);
+ g = string_fmt_append(NULL, "%s%.256s",
+ temp, host->name);
+ free();
temp_fully_qualified_name = string_from_gstring(g);
ind_type = T_SRV;
--- ./exim-4.94.2/exim-4.94.2/src/exim.c.save Fri Apr 30 06:08:21 2021
+++ ./exim-4.94.2/exim-4.94.2/src/exim.cSun Sep 19 16:57:41 2021
@@ -4751,8 +4751,12 @@
if (amp)
{
int loffset;
- string_format(buffer, sizeof(buffer), "%.*s%n%s%s",
-(int)(amp - name), name, , originator_login, amp + 1);
+ char *temp = NULL;
+
+ loffset = asprintf(, "%.*s", (int)(amp - name), name);
+ string_format(buffer, sizeof(buffer), "%s%s%s", temp,
+originator_login, amp + 1);
+ free(temp);
buffer[loffset] = toupper(buffer[loffset]);
name = buffer;
}
--- ./exim-4.94.2/exim-4.94.2/src/spam.c.save Fri Apr 30 06:08:21 2021
+++ ./exim-4.94.2/exim-4.94.2/src/spam.cSun Sep 19 16:58:21 2021
@@ -395,10 +395,10 @@
{/* spamassassin variant */
int n;
uschar * s = string_sprintf(
- "REPORT SPAMC/1.2\r\nUser: %s\r\nContent-length: %ld\r\n\r\n%n",
- user_name, mbox_size, );
+ "REPORT SPAMC/1.2\r\nUser: %s\r\nContent-length: %ld\r\n\r\n",
+ user_name, mbox_size);
/* send our request */
- wrote = send(spamd_cctx.sock, s, n, 0);
+ wrote = send(spamd_cctx.sock, s, strlen(n), 0);
}
if (wrote == -1)
--- ./exim-4.94.2/exim-4.94.2/src/acl.c.saveFri Apr 30 06:08:21 2021
+++ ./exim-4.94.2/exim-4.94.2/src/acl.c Sun Sep 19 17:07:15 2021
@@ -2907,9 +2907,11 @@
HDEBUG(D_acl)
{
int lhswidth = 0;
-debug_printf_indent("check %s%s %n",
- (!conditions[cb->type].is_modifier && cb->u.negated)? "!":"",
- conditions[cb->type].name, );
+char *first = (!conditions[cb->type].is_modifier && cb->u.negated)? "!":"";
+char *second = conditions[cb->type].name;
+
+debug_printf_indent("check %s%s ", first, second);
+lhswidth = sizeof("check ") + strlen(first) + strlen(second);
if (cb->type == ACLC_SET)
{
missing run dep in textproc/catfish
it seems x11/xfce4/xfconf is missing in
the RUN_DEPENDS of textproc/catfish
Traceback (most recent call last):
File "/usr/local/bin/catfish", line 43, in
import catfish
File "/usr/local/lib/python3.8/site-packages/catfish/__init__.py", line 32,
in
from catfish import CatfishWindow
File "/usr/local/lib/python3.8/site-packages/catfish/CatfishWindow.py", line
52, in
from catfish.CatfishPrefsDialog import CatfishPrefsDialog
File "/usr/local/lib/python3.8/site-packages/catfish/CatfishPrefsDialog.py",
line 29, in
from catfish_lib.PrefsDialog import PrefsDialog
File "/usr/local/lib/python3.8/site-packages/catfish_lib/__init__.py", line
23, in
from . Window import Window # noqa
File "/usr/local/lib/python3.8/site-packages/catfish_lib/Window.py", line 27,
in
from catfish_lib import CatfishSettings
File "/usr/local/lib/python3.8/site-packages/catfish_lib/CatfishSettings.py",
line 23, in
gi.require_version('Xfconf', '0')
File "/usr/local/lib/python3.8/site-packages/gi/__init__.py", line 126, in
require_version
raise ValueError('Namespace %s not available' % namespace)
ValueError: Namespace Xfconf not available
Installing x11/xfce4/xfconf solves the issue
Index: Makefile
===
RCS file: /home/reposync/ports/textproc/catfish/Makefile,v
retrieving revision 1.46
diff -u -p -r1.46 Makefile
--- Makefile22 Aug 2021 18:27:21 - 1.46
+++ Makefile19 Sep 2021 18:17:26 -
@@ -4,7 +4,7 @@ COMMENT = versatile file searching tool
XFCE_GOODIE = catfish
XFCE_VERSION = 4.16.2
-REVISION = 0
+REVISION = 1
MODPY_EGG_VERSION =${XFCE_VERSION}
CATEGORIES = textproc
@@ -25,6 +25,7 @@ RUN_DEPENDS = devel/py-gobject3${MODPY_F
devel/xdg-utils \
devel/py-pexpect${MODPY_FLAVOR} \
x11/dbus-python${MODPY_FLAVOR} \
+ x11/xfce4/xfconf \
x11/gtk+3,-guic
BUILD_DEPENDS += ${_MODPY_BUILD_DEPENDS} \
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: schwa...@cvs.openbsd.org2021/09/19 15:54:18 Modified files: editors/cooledit: Makefile Added files: editors/cooledit/patches: patch-editor_editoptions_c patch-editor_options_c patch-editor_shell_c Log message: avoid sprintf(%n); OK both Theos (tb@ and deraadt@); committing quickly to stay away as far as possible from the upcoming lock
Re: cooledit printf(%n) fixes
On Sun, Sep 19, 2021 at 10:48:32PM +0200, Ingo Schwarze wrote: > Hi Marc, hi Naddy, > > Christian Weisgerber wrote on Sun, Sep 19, 2021 at 09:23:18PM +0200: > > [...] > > Let's focus on fixing bugs! > > This includes the list of remaining ports with %n warnings: > > > > editors/cooledit > [...] > > I think the patch appended below fixes those crashes in cooledit > that are directly related to printf(%n). > > OK? ok tb > There are many other places in the codebase where %n occurs, but i > failed to find any others related to printf(3). Same here. The other occurrences of %n are either fed into sscanf() or are part of commands that sent through some kind of homegrown percent substitution.
FIX BROKEN hiera plugins
Hi,
with updating the default ruby version to 3.0, puppet related ports stayed at
2.7, so did
databases/ruby-hiera3. The hiera plugins were overlooked, they should also
default to Ruby 2.7, otherwise they're unusable.
I had to fiddle a little, as these plugins don't have FLAVOR set, and with the
switch,
to 3.0, something else seems to have changed as well. At least for
ruby-hiera-eyaml,
The GEM_BIN_SUFFIX in PLIST doesn't kick in, as well as for
ruby-hiera-eyaml-gpg,
had to remove the ${MODRUBY_FLAVOR} from the RUN_DEPENDS to ruby-hiera-eyaml.
Below the version that got me to install them, and made them usable again.
OK?
Sebastian
Index: ruby-hiera-eyaml-gpg/Makefile
===
RCS file: /cvs/ports/databases/ruby-hiera-eyaml-gpg/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- ruby-hiera-eyaml-gpg/Makefile 22 Oct 2019 13:54:39 - 1.4
+++ ruby-hiera-eyaml-gpg/Makefile 19 Sep 2021 21:20:37 -
@@ -3,6 +3,7 @@
COMMENT = gpg encryptor for the hiera eyaml backend
DISTNAME = hiera-eyaml-gpg-0.7.4
+REVISION = 0
CATEGORIES = databases
HOMEPAGE = http://github.com/sihil/hiera-eyaml-gpg
@@ -14,9 +15,10 @@
MODULES = lang/ruby
CONFIGURE_STYLE = ruby gem
+MODRUBY_REV = 2.7
BUILD_DEPENDS =${RUN_DEPENDS}
-RUN_DEPENDS = databases/ruby-hiera-eyaml,${MODRUBY_FLAVOR} \
+RUN_DEPENDS = databases/ruby-hiera-eyaml \
security/ruby-gpgme,${MODRUBY_FLAVOR}
.include
Index: ruby-hiera-eyaml/Makefile
===
RCS file: /cvs/ports/databases/ruby-hiera-eyaml/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- ruby-hiera-eyaml/Makefile 23 May 2021 18:36:40 - 1.15
+++ ruby-hiera-eyaml/Makefile 19 Sep 2021 21:20:46 -
@@ -3,6 +3,7 @@
COMMENT = Hiera backend for decrypting encrypted yaml properties
DISTNAME = hiera-eyaml-3.2.2
+REVISION = 0
CATEGORIES = databases
MAINTAINER = Sebastian Reitenbach
@@ -11,6 +12,7 @@
PERMIT_PACKAGE = Yes
MODULES = lang/ruby
+MODRUBY_REV = 2.7
CONFIGURE_STYLE = ruby gem
Index: ruby-hiera-eyaml/pkg/PLIST
===
RCS file: /cvs/ports/databases/ruby-hiera-eyaml/pkg/PLIST,v
retrieving revision 1.7
diff -u -r1.7 PLIST
--- ruby-hiera-eyaml/pkg/PLIST 10 Mar 2021 22:05:08 - 1.7
+++ ruby-hiera-eyaml/pkg/PLIST 19 Sep 2021 21:20:46 -
@@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.7 2021/03/10 22:05:08 sebastia Exp $
-${GEM_BIN}/eyaml${GEM_BIN_SUFFIX}
+${GEM_BIN}/eyaml27
${GEM_LIB}/cache/${DISTNAME}.gem
${GEM_LIB}/gems/${DISTNAME}/
${GEM_LIB}/gems/${DISTNAME}/.github/
Index: ruby-hiera-file/Makefile
===
RCS file: /cvs/ports/databases/ruby-hiera-file/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- ruby-hiera-file/Makefile12 Jul 2019 20:44:01 - 1.9
+++ ruby-hiera-file/Makefile19 Sep 2021 21:20:59 -
@@ -3,7 +3,7 @@
COMMENT = data backend for Hiera to return whole files
DISTNAME = hiera-file-1.1.1
-REVISION = 1
+REVISION = 2
CATEGORIES = databases
MAINTAINER = Sebastian Reitenbach
@@ -12,6 +12,7 @@
PERMIT_PACKAGE = Yes
MODULES = lang/ruby
+MODRUBY_REV = 2.7
CONFIGURE_STYLE = ruby gem
Re: Only important updates now
> > misc/brltty
> > sysutils/cdrtools
> > x11/fvwm2
I have committed the three above.
> > security/gnupg
This one is really horrible. The part of the diff involving tty_fprintf
needed some fixing. The agent/protect.c looks correct to me. A careful
review by more than one person seems necessary.
Index: Makefile
===
RCS file: /cvs/ports/security/gnupg/Makefile,v
retrieving revision 1.121
diff -u -p -r1.121 Makefile
--- Makefile30 Aug 2021 17:04:45 - 1.121
+++ Makefile19 Sep 2021 20:23:50 -
@@ -4,6 +4,7 @@ COMMENT = GNU privacy guard - a free PGP
DISTNAME = gnupg-2.2.30
CATEGORIES = security
+REVISION = 0
MASTER_SITES = ${MASTER_SITE_GNUPG:=gnupg/}
Index: patches/patch-agent_protect_c
===
RCS file: patches/patch-agent_protect_c
diff -N patches/patch-agent_protect_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-agent_protect_c 19 Sep 2021 21:13:46 -
@@ -0,0 +1,72 @@
+$OpenBSD$
+
+Index: agent/protect.c
+--- agent/protect.c.orig
agent/protect.c
+@@ -563,24 +563,59 @@ do_encryption (const unsigned char *hashbegin, size_t
+ and dummy values as placeholders. */
+ {
+ char countbuf[35];
++char *p1 = NULL, *p2 = NULL, *p3 = NULL;
+
+-snprintf (countbuf, sizeof countbuf, "%lu",
+- s2k_count ? s2k_count : get_standard_s2k_count ());
++#define FMT1 "(9:protected%d:%s((4:sha18:"
++#define FMT2 "_8bytes_%u:%s)%d:"
++#define FMT3 "%*s)%d:"
++
++p1 = xtryasprintf
++ (FMT1,
++ (int)strlen (modestr), modestr);
++if (!p1)
++ goto fail;
++saltpos = strlen(p1);
++
++p2 = xtryasprintf
++ (FMT1 FMT2,
++ (int)strlen (modestr), modestr,
++ (unsigned int)strlen (countbuf), countbuf,
++ use_ocb? 12 : blklen);
++if (!p2)
++ goto fail;
++ivpos = strlen(p2);
++
++p3 = xtryasprintf
++ (FMT1 FMT2 FMT3,
++ (int)strlen (modestr), modestr,
++ (unsigned int)strlen (countbuf), countbuf,
++ use_ocb? 12 : blklen, use_ocb? 12 : blklen, "",
++ enclen);
++if (!p3)
++ goto fail;
++encpos = strlen(p3);
++
+ p = xtryasprintf
+- ("(9:protected%d:%s((4:sha18:%n_8bytes_%u:%s)%d:%n%*s)%d:%n%*s)",
++ (FMT1 FMT2 FMT3 "%*s)",
+(int)strlen (modestr), modestr,
+- ,
+(unsigned int)strlen (countbuf), countbuf,
+- use_ocb? 12 : blklen, , use_ocb? 12 : blklen, "",
+- enclen, , enclen, "");
++ use_ocb? 12 : blklen, use_ocb? 12 : blklen, "",
++ enclen, enclen, "");
++
+ if (!p)
+ {
++fail:
++free(p1);
++free(p2);
++free(p3);
+ gpg_error_t tmperr = out_of_core ();
+ xfree (iv);
+ xfree (outbuf);
+ return tmperr;
+ }
+-
++free(p1);
++free(p2);
++free(p3);
+ }
+ *resultlen = strlen (p);
+ *result = (unsigned char*)p;
Index: patches/patch-common_ttyio_c
===
RCS file: patches/patch-common_ttyio_c
diff -N patches/patch-common_ttyio_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-common_ttyio_c19 Sep 2021 20:35:51 -
@@ -0,0 +1,55 @@
+$OpenBSD$
+
+Index: common/ttyio.c
+--- common/ttyio.c.orig
common/ttyio.c
+@@ -293,21 +293,22 @@ tty_printf (const char *fmt, ... )
+
+ /* Same as tty_printf but if FP is not NULL, behave like a regular
+fprintf. */
+-void
++int
+ tty_fprintf (estream_t fp, const char *fmt, ... )
+ {
+ va_list arg_ptr;
++ int ret;
+
+ if (fp)
+ {
+ va_start (arg_ptr, fmt) ;
+- es_vfprintf (fp, fmt, arg_ptr );
++ ret = es_vfprintf (fp, fmt, arg_ptr );
+ va_end (arg_ptr);
+- return;
++ return ret;
+ }
+
+ if (no_terminal)
+-return;
++return 0;
+
+ if (!initialized)
+ init_ttyfp ();
+@@ -318,18 +319,20 @@ tty_fprintf (estream_t fp, const char *fmt, ... )
+ {
+ char *buf = NULL;
+
+-vasprintf (, fmt, arg_ptr);
++ret = vasprintf (, fmt, arg_ptr);
+ if (!buf)
+ log_bug ("vasprintf() failed\n");
+ w32_write_console (buf);
+ xfree (buf);
+ }
+ #else /* Unix */
+- last_prompt_len += vfprintf(ttyfp,fmt,arg_ptr) ;
++ ret = vfprintf(ttyfp,fmt,arg_ptr) ;
++ last_prompt_len += ret ;
+ fflush(ttyfp);
+ #endif /* Unix */
+
+ va_end(arg_ptr);
++ return ret;
+ }
+
+
Index: patches/patch-common_ttyio_h
===
RCS file: patches/patch-common_ttyio_h
diff -N patches/patch-common_ttyio_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-common_ttyio_h19 Sep 2021 20:34:40 -
@@ -0,0 +1,21 @@
+$OpenBSD$
+
+Index: common/ttyio.h
+--- common/ttyio.h.orig
common/ttyio.h
+@@ -38,13 +38,13 @@ int tty_batchmode (int onoff);
+ #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 5 )
+ void
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2021/09/19 15:11:55 Modified files: x11/fvwm2 : Makefile x11/fvwm2/patches: patch-bin_Makefile_in patch-configure patch-fvwm_Makefile_in Added files: x11/fvwm2/patches: patch-libs_ColorUtils_c patch-libs_Module_c Log message: x11/fvwm2: avoid *printf %n. from deraadt
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2021/09/19 14:58:45 Modified files: sysutils/cdrtools: Makefile Added files: sysutils/cdrtools/patches: patch-cdrecord_cdr_drv_c Log message: sysutils/cdrtools: avoid printf %n. from deraadt
Re: cooledit printf(%n) fixes
> Note that the port is very low quality in general. This is the ports tree: you sound like a broken record.
cooledit printf(%n) fixes
Hi Marc, hi Naddy,
Christian Weisgerber wrote on Sun, Sep 19, 2021 at 09:23:18PM +0200:
[...]
> Let's focus on fixing bugs!
> This includes the list of remaining ports with %n warnings:
>
> editors/cooledit
[...]
I think the patch appended below fixes those crashes in cooledit
that are directly related to printf(%n).
OK?
Note that the port is very low quality in general. The code is full
of insecure idioms and the program is full of bugs that make even
minimal testing rather painful. I don't think anybody can use this
port for serious work in its present state.
* It sometimes has outrageous startup times, up to around 20 seconds
on my notebook.
* Putting it into the background with Ctrl-Z does not work.
* Sometimes, it just freezes totally.
* When assigning keys, it sometimes closes the window that is
intended to capture the key combination when pressing a modifier
key, which means that binding keys sometimes does not work.
* Sometimes, it segfaults on exit (plain segfault, not SIGABRT).
* And that is merely what i stumbled across without even trying
to use it for real...
There are many other places in the codebase where %n occurs, but i
failed to find any others related to printf(3). It has large numbers
of its own printf-like wrapper functions and clearly sometimes assembles
format strings dynamically in temporary buffers, but i did not find
indications that %n might be put into such dynamically-built format
strings. Consequenly, i'm not completely sure that this patch resolves
all printf(%n) issues in the code base, but it does not seem unlikely
either. Even if were not 100% complete, committing this would seem
better than doing nothing.
Yours,
Ingo
Index: Makefile
===
RCS file: /cvs/ports/editors/cooledit/Makefile,v
retrieving revision 1.48
diff -u -p -r1.48 Makefile
--- Makefile23 Feb 2021 19:39:21 - 1.48
+++ Makefile19 Sep 2021 20:40:00 -
@@ -3,7 +3,7 @@
COMMENT = easy to use, graphical editor
DISTNAME = cooledit-3.17.17
-REVISION = 4
+REVISION = 5
CATEGORIES = editors
Index: patches/patch-editor_editoptions_c
===
RCS file: patches/patch-editor_editoptions_c
diff -N patches/patch-editor_editoptions_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-editor_editoptions_c 19 Sep 2021 20:40:00 -
@@ -0,0 +1,28 @@
+$OpenBSD$
+
+Do not use sprintf(3) %n.
+
+Index: editor/editoptions.c
+--- editor/editoptions.c.orig
editor/editoptions.c
+@@ -378,15 +378,15 @@ int save_user_defined_keys (struct key_list k_list[],
+
+ for (i = 0; k_list[i].key_name[0]; i++) {
+ if (k_list[i].keycode2) {
+- sprintf (p, "%s\t%x %x %x %x %x %x\n%n", k_list[i].key_name,
k_list[i].state0, k_list[i].keycode0,
+- k_list[i].state1, k_list[i].keycode1, k_list[i].state2,
k_list[i].keycode2, );
++ n = sprintf (p, "%s\t%x %x %x %x %x %x\n", k_list[i].key_name,
k_list[i].state0, k_list[i].keycode0,
++ k_list[i].state1, k_list[i].keycode1, k_list[i].state2,
k_list[i].keycode2);
+ p += n;
+ } else if (k_list[i].keycode1) {
+- sprintf (p, "%s\t%x %x %x %x\n%n", k_list[i].key_name,
k_list[i].state0, k_list[i].keycode0,
+- k_list[i].state1, k_list[i].keycode1, );
++ n = sprintf (p, "%s\t%x %x %x %x\n", k_list[i].key_name,
k_list[i].state0, k_list[i].keycode0,
++ k_list[i].state1, k_list[i].keycode1);
+ p += n;
+ } else if (k_list[i].keycode0) {
+- sprintf (p, "%s\t%x %x\n%n", k_list[i].key_name, k_list[i].state0,
k_list[i].keycode0, );
++ n = sprintf (p, "%s\t%x %x\n", k_list[i].key_name,
k_list[i].state0, k_list[i].keycode0);
+ p += n;
+ }
+ }
Index: patches/patch-editor_options_c
===
RCS file: patches/patch-editor_options_c
diff -N patches/patch-editor_options_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-editor_options_c 19 Sep 2021 20:40:00 -
@@ -0,0 +1,35 @@
+$OpenBSD$
+
+Do not use sprintf(3) %n.
+
+Index: editor/options.c
+--- editor/options.c.orig
editor/options.c
+@@ -405,22 +405,22 @@ int save_setup (const char *file)
+
+ for (i = 0; string_options[i].name; i++) {
+ if (*string_options[i].value) {
+- sprintf (p, "%s = %s\n%n", string_options[i].name,
*string_options[i].value, );
++ r = sprintf (p, "%s = %s\n", string_options[i].name,
*string_options[i].value);
+ p += r;
+ }
+ }
+ for (i = 0; integer_options[i].name; i++) {
+ if (integer_options[i].type == TYPE_HIDDEN_HEX_VALUE)
+- sprintf (p, "%s = 0x%X\n%n", integer_options[i].name,
*integer_options[i].value, );
++ r = sprintf (p, "%s = 0x%X\n", integer_options[i].name,
cant' run www/tootstream
It seems tootstream is lacking a dependency. I've not been able to
find which one.
I have this error on a clean amd64 install when I run tootstream.
Traceback (most recent call last):
File "/usr/local/bin/tootstream", line 33, in
sys.exit(load_entry_point('tootstream==0.3.8.1', 'console_scripts',
'tootstream')())
File "/usr/local/bin/tootstream", line 25, in importlib_load_entry_point
return next(matches).load()
File "/usr/local/lib/python3.8/importlib/metadata.py", line 77, in load
module = import_module(match.group('module'))
File "/usr/local/lib/python3.8/importlib/__init__.py", line 127, in
import_module
return _bootstrap._gcd_import(name[level:], package, level)
File "", line 1014, in _gcd_import
File "", line 991, in _find_and_load
File "", line 975, in _find_and_load_unlocked
File "", line 671, in _load_unlocked
File "", line 843, in exec_module
File "", line 219, in _call_with_frames_removed
File "/usr/local/lib/python3.8/site-packages/tootstream/toot.py", line 10, in
from tootstream.toot_parser import TootParser
File "/usr/local/lib/python3.8/site-packages/tootstream/toot_parser.py", line
1, in
import emoji
File "/usr/local/lib/python3.8/site-packages/emoji/__init__.py", line 18, in
from emoji.core import *
File "/usr/local/lib/python3.8/site-packages/emoji/core.py", line 16, in
from emoji import unicode_codes
File
"/usr/local/lib/python3.8/site-packages/emoji/unicode_codes/__init__.py", line
7, in
from emoji.unicode_codes.fr import *
ModuleNotFoundError: No module named 'emoji.unicode_codes.fr'
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2021/09/19 14:45:12 Modified files: misc/brltty: Makefile Added files: misc/brltty/patches: patch-Programs_cmd_c Log message: misc/brltty: fix printf %n, same diff was sent by deraadt
Re: Only important updates now
Christian Weisgerber wrote:
> This includes the list of remaining ports with %n warnings:
>
> editors/cooledit
> mail/exim
> misc/brltty
> net/climm
> security/gnupg
> sysutils/cdrtools
> x11/fvwm2
I don't want to do ports development, but I am the one making %n walk the
plank, so I should lift some fingers.
Here are some potential diffs for the above, I ask ports people to consider,
test, and shepard them forward if they are good enough.
I have ordered them from least offensive to most offensive. It gets kind
of dark towards the end, send your pets and children out of the room.
--- brltty-3.6/Programs/cmd.c.save Sun Sep 19 13:31:36 2021
+++ brltty-3.6/Programs/cmd.c Sun Sep 19 13:31:42 2021
@@ -87,8 +87,10 @@
candidate->name, number, candidate->description);
} else {
int offset;
-snprintf(buffer, size, "%s: %n%s",
- candidate->name, , candidate->description);
+offset = snprintf(buffer, size, "%s: ",
+ candidate->name);
+snprintf(buffer, size, "%s: %s",
+ candidate->name, candidate->description);
if ((blk == 0) && (command & BRL_FLG_TOGGLE_MASK)) {
char *description = buffer + offset;
--- cdrtools-3.00/cdrecord/cdr_drv.c~ Fri Jul 10 13:44:45 2009
+++ cdrtools-3.00/cdrecord/cdr_drv.cSun Sep 19 13:42:15 2021
@@ -283,8 +283,8 @@
error("Driver types:\n");
for (d = drivers; *d != (cdr_t *)NULL; d++) {
- error("%s%n",
- (*d)->cdr_drname, );
+ n = error("%s",
+ (*d)->cdr_drname);
error("%*s%s\n",
20-n, "",
(*d)->cdr_drtext);
--- fvwm-2.6.9/libs/Module.c.save Sun Sep 19 13:34:24 2021
+++ fvwm-2.6.9/libs/Module.cSun Sep 19 13:34:42 2021
@@ -497,7 +497,7 @@
return NULL;
}
/* print the number into the string */
- sprintf(dest, "%d%n", val, );
+ offset = sprintf(dest, "%d", val);
dest += offset;
}
else if (is_string)
@@ -512,7 +512,7 @@
/* print the colour name into the string */
if (string)
{
- sprintf(dest, "%s%n", string, );
+ offset = sprintf(dest, "%s", string);
dest += offset;
}
}
--- fvwm2-2.6.9/fvwm-2.6.9/libs/ColorUtils.c.save Sun Sep 19 13:49:04 2021
+++ fvwm2-2.6.9/fvwm-2.6.9/libs/ColorUtils.cSun Sep 19 13:49:19 2021
@@ -405,15 +405,15 @@
XQueryColor(dpy, cmap, );
if (!use_hash)
{
- sprintf(
- output, "rgb:%04x/%04x/%04x%n", (int)color.red,
- (int)color.green, (int)color.blue, );
+ n = sprintf(
+ output, "rgb:%04x/%04x/%04x", (int)color.red,
+ (int)color.green, (int)color.blue);
}
else
{
- sprintf(
- output, "#%04x%04x%04x%n", (int)color.red,
- (int)color.green, (int)color.blue, );
+ n = sprintf(
+ output, "#%04x%04x%04x", (int)color.red,
+ (int)color.green, (int)color.blue);
}
return n;
--- gnupg-2.2.30/g10/keylist.c~ Thu May 20 23:35:23 2021
+++ gnupg-2.2.30/g10/keylist.c Sun Sep 19 13:53:53 2021
@@ -255,12 +255,11 @@
else
s2k_char = '#'; /* Key not found. */
- tty_fprintf (fp, "%s%c %s/%s %n",
+ indent = tty_fprintf (fp, "%s%c %s/%s ",
node->pkt->pkttype == PKT_PUBLIC_KEY ? "sec" : "ssb",
s2k_char,
pubkey_string (pk, pkstrbuf, sizeof pkstrbuf),
- keystr_from_pk (pk),
- );
+ keystr_from_pk (pk));
tty_fprintf (fp, _("created: %s"), datestr_from_pk (pk));
tty_fprintf (fp, " ");
tty_fprintf (fp, _("expires: %s"), expirestr_from_pk (pk));
--- gnupg-2.2.30/common/ttyio.h~Thu May 20 23:35:23 2021
+++ gnupg-2.2.30/common/ttyio.h Sun Sep 19 13:53:11 2021
@@ -36,14 +36,14 @@
const char *tty_get_ttyname (void);
int tty_batchmode (int onoff);
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 5 )
-void tty_printf (const char *fmt, ... )
+int tty_printf (const char *fmt, ... )
__attribute__ ((format (printf,1,2)));
void tty_fprintf (estream_t fp, const char *fmt, ... )
__attribute__ ((format (printf,2,3)));
char *tty_getf (const char *promptfmt, ... )
__attribute__ ((format (printf,1,2)));
#else
-void tty_printf (const char *fmt, ... );
+int tty_printf (const char *fmt, ... );
Re: sysutils/pkg_mgr is broken
On Sun, 19 Sep 2021 17:23:53 +0200 Solene Rapenne : > On Sun, 19 Sep 2021 17:03:54 +0200 > Landry Breuil : > > > Le Sat, Sep 18, 2021 at 10:10:40AM +0200, Solene Rapenne a écrit : > > > It seems sysutils/pkg_mgr is broken. The UI displays fine but any > > > attempt to apply changes (install or deletion) or simulate changes > > > will exit pkg_mgr with no error message. > > > > > > Currently, its only use is to display packages installed and what > > > can be installed. > > > > nothing new here sadly, pkg_add API changed at some point some years > > ago, i told espie to help me look into it, but that never happened. > > > > Landry > > maybe we should mark it broken if it's known to be broken? > ok? Index: Makefile === RCS file: /home/reposync/ports/sysutils/pkg_mgr/Makefile,v retrieving revision 1.16 diff -u -p -r1.16 Makefile --- Makefile12 Jul 2019 20:49:48 - 1.16 +++ Makefile19 Sep 2021 15:30:14 - @@ -1,5 +1,6 @@ # $OpenBSD: Makefile,v 1.16 2019/07/12 20:49:48 sthen Exp $ +BROKEN=pkg tools API changed and pkg_mgr needs to be updated COMMENT= user-friendly package browser and manager DISTNAME= pkg_mgr-0.2.3
Only important updates now
The release is near. Please stop committing regular port updates. Updates are still okay if they are important, i.e., if they fix security or serious functionality problems. Let's focus on fixing bugs! This includes the list of remaining ports with %n warnings: editors/cooledit mail/exim misc/brltty net/climm security/gnupg sysutils/cdrtools x11/fvwm2 -- Christian "naddy" Weisgerber na...@mips.inka.de
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: c...@cvs.openbsd.org2021/09/19 13:09:39 Modified files: www/webkitgtk4 : Makefile Log message: webkitgtk4: use the "lonesome" DPB_PROPERTIES on macppc No objections from aja@ (maintainer)
Re: [UPDATE] profanity 0.11.0 & change to libstrophe
> > I think something is off in your certs. Running > > > > Maybe you aren't using the fullchain and instead present the cert > > for just your host? It doesn't show the "middle" cert from LE. This > > is the chain for a correctly verified (from `openssl s_client` > > point of view) cert issued by LE > > Darn, it was my stupidity. My script to renew the LE certificate > copied the single cert into the prosody directory instead of the full > chain. I fixed the script and now it works as expected. Thanks! Lucas, thank you for your investigation! > @Florian: Sorry for the noise! No problem, asking is good and welcome. -- greetings, Florian Viehweger
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2021/09/19 12:12:20 Modified files: textproc/py-emoji: Makefile textproc/py-emoji/pkg: PLIST Log message: textproc/py3-emoji: regen PLIST. Fixes broken www/tootstream runtime. reported, tested & ok solene
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2021/09/19 11:49:23 Modified files: devel/llvm : Makefile devel/llvm/patches: patch-tools_clang_include_clang_Basic_DiagnosticSemaKinds_td patch-tools_clang_lib_Driver_ToolChains_OpenBSD_cpp patch-tools_clang_lib_Sema_SemaChecking_cpp Added files: devel/llvm/patches: patch-lib_Target_X86_X86IndirectThunks_cpp Log message: Sync with base >From Brad
Re: cant' run www/tootstream
On Sun, Sep 19, 2021 at 06:47:43PM +0200, Solene Rapenne wrote:
> It seems tootstream is lacking a dependency. I've not been able to
> find which one.
>
[...]
> from emoji.unicode_codes.fr import *
> ModuleNotFoundError: No module named 'emoji.unicode_codes.fr'
Looks like update-plist was missed in the last py-emoji update.
Does this fix it?
(There's a release 1.5.0 available since 3 days, but since we're close
to lock, probably better wait until after release...)
Index: Makefile
===
RCS file: /cvs/ports/textproc/py-emoji/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile31 Jul 2021 19:41:06 - 1.9
+++ Makefile19 Sep 2021 16:54:45 -
@@ -5,6 +5,7 @@ COMMENT = emoji for Python
MODPY_EGG_VERSION =1.4.2
DISTNAME = emoji-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
+REVISION = 0
CATEGORIES = textproc
Index: pkg/PLIST
===
RCS file: /cvs/ports/textproc/py-emoji/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 13 Mar 2021 20:58:55 - 1.2
+++ pkg/PLIST 19 Sep 2021 16:54:33 -
@@ -1,6 +1,6 @@
@comment $OpenBSD: PLIST,v 1.2 2021/03/13 20:58:55 kmos Exp $
-@pkgpath textproc/py-emoji
@conflict py-emoji-*
+@pkgpath textproc/py-emoji
lib/python${MODPY_VERSION}/site-packages/emoji/
lib/python${MODPY_VERSION}/site-packages/emoji-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/emoji-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
@@ -18,11 +18,15 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/emoji/unicode_codes/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/emoji/unicode_codes/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/emoji/unicode_codes/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/emoji/unicode_codes/${MODPY_PYCACHE}de.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/emoji/unicode_codes/${MODPY_PYCACHE}en.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/emoji/unicode_codes/${MODPY_PYCACHE}es.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/emoji/unicode_codes/${MODPY_PYCACHE}fr.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/emoji/unicode_codes/${MODPY_PYCACHE}it.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/emoji/unicode_codes/${MODPY_PYCACHE}pt.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/emoji/unicode_codes/de.py
lib/python${MODPY_VERSION}/site-packages/emoji/unicode_codes/en.py
lib/python${MODPY_VERSION}/site-packages/emoji/unicode_codes/es.py
+lib/python${MODPY_VERSION}/site-packages/emoji/unicode_codes/fr.py
lib/python${MODPY_VERSION}/site-packages/emoji/unicode_codes/it.py
lib/python${MODPY_VERSION}/site-packages/emoji/unicode_codes/pt.py
Re: sysutils/pkg_mgr is broken
On Sun, 19 Sep 2021 17:23:53 +0200, Solene Rapenne wrote: > On Sun, 19 Sep 2021 17:03:54 +0200 > Landry Breuil : > > > Le Sat, Sep 18, 2021 at 10:10:40AM +0200, Solene Rapenne a écrit : > > > It seems sysutils/pkg_mgr is broken. The UI displays fine but any > > > attempt to apply changes (install or deletion) or simulate changes > > > will exit pkg_mgr with no error message. > > > > > > Currently, its only use is to display packages installed and what > > > can be installed. > > > > nothing new here sadly, pkg_add API changed at some point some years > > ago, i told espie to help me look into it, but that never happened. > > > > Landry > > maybe we should mark it broken if it's known to be broken? > If it's been broken for years, why don't we remove it? Is there any hope to get it fixed?
Re: sysutils/pkg_mgr is broken
On Sun Sep 19, 2021 at 05:31:06PM +0200, Solene Rapenne wrote: > On Sun, 19 Sep 2021 17:23:53 +0200 > Solene Rapenne : > > > On Sun, 19 Sep 2021 17:03:54 +0200 > > Landry Breuil : > > > > > Le Sat, Sep 18, 2021 at 10:10:40AM +0200, Solene Rapenne a écrit : > > > > It seems sysutils/pkg_mgr is broken. The UI displays fine but any > > > > attempt to apply changes (install or deletion) or simulate changes > > > > will exit pkg_mgr with no error message. > > > > > > > > Currently, its only use is to display packages installed and what > > > > can be installed. > > > > > > nothing new here sadly, pkg_add API changed at some point some years > > > ago, i told espie to help me look into it, but that never happened. > > > > > > Landry > > > > maybe we should mark it broken if it's known to be broken? > > > > ok? Like it! > > Index: Makefile > === > RCS file: /home/reposync/ports/sysutils/pkg_mgr/Makefile,v > retrieving revision 1.16 > diff -u -p -r1.16 Makefile > --- Makefile 12 Jul 2019 20:49:48 - 1.16 > +++ Makefile 19 Sep 2021 15:30:14 - > @@ -1,5 +1,6 @@ > # $OpenBSD: Makefile,v 1.16 2019/07/12 20:49:48 sthen Exp $ > > +BROKEN= pkg tools API changed and pkg_mgr needs to be updated > COMMENT= user-friendly package browser and manager > > DISTNAME=pkg_mgr-0.2.3 >
Re: [UPDATE] profanity 0.11.0 & change to libstrophe
Hi Lucas, * Lucas wrote: > Hi Matthias, > > Matthias Schmidt wrote: > > Maybe it's me and my stupidity but since this update I can no longer > > connect to a XMPP server with a LE certificate. Both client and server > > are running -current (server with prosody). The client reports "Login > > failed" and the debug log shows: > > > > 19/09/2021 11:16:17: prof: INF: Connecting using account: > > x...@jabber.xosc.org > > 19/09/2021 11:16:17: prof: INF: Connecting as > > x...@jabber.xosc.org/profanity.kTdJ > > 19/09/2021 11:16:17: prof: DBG: Connecting with flags (0x2): > > 19/09/2021 11:16:17: prof: DBG: XMPP_CONN_FLAG_MANDATORY_TLS > > 19/09/2021 11:16:17: xmpp: DBG: SRV lookup failed, connecting via domain. > > 19/09/2021 11:16:17: xmpp: DBG: sock_connect() to jabber.xosc.org:5222 > > returned 7 > > 19/09/2021 11:16:17: xmpp: DBG: Attempting to connect to jabber.xosc.org > > 19/09/2021 11:16:17: xmpp: DBG: connection successful > > 19/09/2021 11:16:17: conn: DBG: SENT: > to="jabber.xosc.org" xml:lang="en" version="1.0" xmlns="jabber:client" > > xmlns:stream="http://etherx.jabber.org/streams;> > > 19/09/2021 11:16:17: xmpp: DBG: RECV: > id="8c063ebf-77e7-4493-9ac3-79b6b0defa4d" lang="en" from="jabber.xosc.org"> > > 19/09/2021 11:16:17: xmpp: DBG: RECV: > xmlns="http://etherx.jabber.org/streams;> > xmlns="urn:ietf:params:xml:ns:xmpp-tls"> > > 19/09/2021 11:16:17: conn: DBG: SENT: > xmlns="urn:ietf:params:xml:ns:xmpp-tls"/> > > 19/09/2021 11:16:17: xmpp: DBG: RECV: > xmlns="urn:ietf:params:xml:ns:xmpp-tls"/> > > 19/09/2021 11:16:17: xmpp: DBG: handle proceedtls called for proceed > > 19/09/2021 11:16:17: xmpp: DBG: proceeding with TLS > > 19/09/2021 11:16:17: tls: DBG: Certificate verification FAILED, > > result=X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY(20) > > 19/09/2021 11:16:17: tls: DBG: Certificate was not presented by peer > > 19/09/2021 11:16:17: tls: DBG: error=SSL_ERROR_SSL(1) errno=0 > > 19/09/2021 11:16:17: tls: DBG: error:14FFF086:SSL > > routines:(UNKNOWN)SSL_internal:certificate verify failed > > 19/09/2021 11:16:17: conn: DBG: Couldn't start TLS! error -3 tls_error 1 > > 19/09/2021 11:16:17: conn: DBG: SENT: > > 19/09/2021 11:16:17: xmpp: DBG: Send error occurred, disconnecting. > > 19/09/2021 11:16:17: xmpp: DBG: Closing socket. > > 19/09/2021 11:16:17: prof: DBG: Connection handler: XMPP_CONN_DISCONNECT > > 19/09/2021 11:16:17: prof: DBG: Connection handler: Login failed > > 19/09/2021 11:16:17: prof: DBG: Connection handler: No reconnect timer > > 19/09/2021 11:16:17: prof: INF: Login failed > > > > The server simply logs: > > > > Sep 19 09:23:14 omega prosody[38808]: c2s87a60669340: Client connected > > Sep 19 09:23:16 omega prosody[38808]: c2s87a60669340: Client disconnected: > > ssl handshake error: tlsv1 alert unknown ca > > I think something is off in your certs. Running > > Maybe you aren't using the fullchain and instead present the cert for > just your host? It doesn't show the "middle" cert from LE. This is the > chain for a correctly verified (from `openssl s_client` point of view) > cert issued by LE Darn, it was my stupidity. My script to renew the LE certificate copied the single cert into the prosody directory instead of the full chain. I fixed the script and now it works as expected. Thanks! @Florian: Sorry for the noise! Cheers Matthias
Re: sysutils/pkg_mgr is broken
On Sun, 19 Sep 2021 17:03:54 +0200 Landry Breuil : > Le Sat, Sep 18, 2021 at 10:10:40AM +0200, Solene Rapenne a écrit : > > It seems sysutils/pkg_mgr is broken. The UI displays fine but any > > attempt to apply changes (install or deletion) or simulate changes > > will exit pkg_mgr with no error message. > > > > Currently, its only use is to display packages installed and what > > can be installed. > > nothing new here sadly, pkg_add API changed at some point some years > ago, i told espie to help me look into it, but that never happened. > > Landry maybe we should mark it broken if it's known to be broken?
Re: sysutils/pkg_mgr is broken
Le Sat, Sep 18, 2021 at 10:10:40AM +0200, Solene Rapenne a écrit : > It seems sysutils/pkg_mgr is broken. The UI displays fine but any > attempt to apply changes (install or deletion) or simulate changes > will exit pkg_mgr with no error message. > > Currently, its only use is to display packages installed and what > can be installed. nothing new here sadly, pkg_add API changed at some point some years ago, i told espie to help me look into it, but that never happened. Landry
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/09/19 08:09:51 Modified files: x11/gnome/user-docs: Makefile distinfo Log message: Update to gnome-user-docs-40.5.
Re: [UPDATE] profanity 0.11.0 & change to libstrophe
Hi Matthias, Matthias Schmidt wrote: > Maybe it's me and my stupidity but since this update I can no longer > connect to a XMPP server with a LE certificate. Both client and server > are running -current (server with prosody). The client reports "Login > failed" and the debug log shows: > > 19/09/2021 11:16:17: prof: INF: Connecting using account: x...@jabber.xosc.org > 19/09/2021 11:16:17: prof: INF: Connecting as > x...@jabber.xosc.org/profanity.kTdJ > 19/09/2021 11:16:17: prof: DBG: Connecting with flags (0x2): > 19/09/2021 11:16:17: prof: DBG: XMPP_CONN_FLAG_MANDATORY_TLS > 19/09/2021 11:16:17: xmpp: DBG: SRV lookup failed, connecting via domain. > 19/09/2021 11:16:17: xmpp: DBG: sock_connect() to jabber.xosc.org:5222 > returned 7 > 19/09/2021 11:16:17: xmpp: DBG: Attempting to connect to jabber.xosc.org > 19/09/2021 11:16:17: xmpp: DBG: connection successful > 19/09/2021 11:16:17: conn: DBG: SENT: to="jabber.xosc.org" xml:lang="en" version="1.0" xmlns="jabber:client" > xmlns:stream="http://etherx.jabber.org/streams;> > 19/09/2021 11:16:17: xmpp: DBG: RECV: id="8c063ebf-77e7-4493-9ac3-79b6b0defa4d" lang="en" from="jabber.xosc.org"> > 19/09/2021 11:16:17: xmpp: DBG: RECV: xmlns="http://etherx.jabber.org/streams;> xmlns="urn:ietf:params:xml:ns:xmpp-tls"> > 19/09/2021 11:16:17: conn: DBG: SENT: xmlns="urn:ietf:params:xml:ns:xmpp-tls"/> > 19/09/2021 11:16:17: xmpp: DBG: RECV: xmlns="urn:ietf:params:xml:ns:xmpp-tls"/> > 19/09/2021 11:16:17: xmpp: DBG: handle proceedtls called for proceed > 19/09/2021 11:16:17: xmpp: DBG: proceeding with TLS > 19/09/2021 11:16:17: tls: DBG: Certificate verification FAILED, > result=X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY(20) > 19/09/2021 11:16:17: tls: DBG: Certificate was not presented by peer > 19/09/2021 11:16:17: tls: DBG: error=SSL_ERROR_SSL(1) errno=0 > 19/09/2021 11:16:17: tls: DBG: error:14FFF086:SSL > routines:(UNKNOWN)SSL_internal:certificate verify failed > 19/09/2021 11:16:17: conn: DBG: Couldn't start TLS! error -3 tls_error 1 > 19/09/2021 11:16:17: conn: DBG: SENT: > 19/09/2021 11:16:17: xmpp: DBG: Send error occurred, disconnecting. > 19/09/2021 11:16:17: xmpp: DBG: Closing socket. > 19/09/2021 11:16:17: prof: DBG: Connection handler: XMPP_CONN_DISCONNECT > 19/09/2021 11:16:17: prof: DBG: Connection handler: Login failed > 19/09/2021 11:16:17: prof: DBG: Connection handler: No reconnect timer > 19/09/2021 11:16:17: prof: INF: Login failed > > The server simply logs: > > Sep 19 09:23:14 omega prosody[38808]: c2s87a60669340: Client connected > Sep 19 09:23:16 omega prosody[38808]: c2s87a60669340: Client disconnected: > ssl handshake error: tlsv1 alert unknown ca I think something is off in your certs. Running openssl s_client -connect jabber.xosc.org:xmpp-server -starttls xmpp -xmpphost jabber.xosc.org When I play around with the /tls settings, I mostly get the message > > 11:20:36 - Certificate path setting only supported when built with libmesode. > 11:20:47 - Certificate path setting only supported when built with libmesode. This is bound to profanity code. It has quite a few big chunks under `#ifdef HAVE_LIBMESODE` in `src/command/cmd_funcs.c`. -Lucas
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2021/09/19 07:51:31 Modified files: geo/qgis : Makefile distinfo geo/qgis/pkg : PLIST Log message: geo/qgis: update to 3.20.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/09/19 07:41:20 Modified files: sysutils/exoscale-cli: Makefile distinfo Log message: Update to exoscale-cli-1.44.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/09/19 07:39:45 Modified files: multimedia/py-chromecast: Makefile distinfo Log message: Update to py3-chromecast-9.2.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/09/19 07:38:51 Modified files: graphics/libgexiv2: Makefile distinfo Log message: Update to libgexiv2-0.14.0 which better copes with the exiv2 version we have in ports.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/09/19 07:36:24 Modified files: net/dleyna : Makefile.inc net/dleyna/core: Makefile net/dleyna/renderer: distinfo net/dleyna/server: distinfo Log message: Update to dleyna-server-0.7.1 & dleyna-renderer-0.7.1.
New port for www/goatcounter
GoatCounter is an open source web analytics platform that we could self-hosted. The home page could be found here: https://www.goatcounter.com/ and the Github repository: https://github.com/zgoat/goatcounter The intention of this port is: * Have a binary package for GoatCounter in OpenBSD. * Provide rc script to control the daemon. * Store sqlite database of GoatCounter to /var/goatcounter * User can configure GoatCounter via "goatcounter_flags" put into /etc/rc.conf.local Current status: * Build OK. * Package installed OK. * Can control GoatCounter via rc script. I'm very new in porting, please give me feedback if there is improvement I should make for this port. Attached the port in this email. You can extract it to /usr/ports Best Regards, Vinh. www-goatcounter_2021-09-19.tar.gz Description: GNU Zip compressed data
Re: New port for www/goatcounter
Vinh Nguyen writes: > GoatCounter is an open source web analytics platform that we could > self-hosted. The home page could be found here: > https://www.goatcounter.com/ and the Github repository: > https://github.com/zgoat/goatcounter > > > The intention of this port is: > * Have a binary package for GoatCounter in OpenBSD. > * Provide rc script to control the daemon. > * Store sqlite database of GoatCounter to /var/goatcounter > * User can configure GoatCounter via "goatcounter_flags" put into > /etc/rc.conf.local > > > Current status: > * Build OK. > * Package installed OK. > * Can control GoatCounter via rc script. > > I'm very new in porting, please give me feedback if there is > improvement I should make for this port. > > Attached the port in this email. You can extract it to > /usr/ports > > Best Regards, > Vinh. Hello, some quick comments on the makefile: - 1.4.2 is old, but there are problems fetching 2.0 (as you're probably aware, but other people here may not). See https://github.com/zgoat/goatcounter/issues/517 - please follow the order in Makefile.template. Comments like "Owner" or "Download and extract information" are usually absent. In particular, the comment before PERMIT_PACKAGE should be only the license name (EUPL in this case). - MODGO_MODFILES is usually in its own `modules.inc' file and included right before bsd.port.mk. The workflow should be something like make modgo-gen-modules > modules.inc see net/tailscale or net/headscale for example (just the first two go ports that comes to mind) - don't need to define PKGNAME, DISTNAME here is enough and the infrastructure already drops the `v' from the version number: make show=PKGNAME goatcounter-1.4.2 regarding the rc script: - are rc_stop, rc_restart and rc_check really needed? They look really similar to the default ones in rc.subr. In addition, I'd drop the second paragraph from DESCR. If the user has installed the package I guess it's not really interested of being reminded that they can use the hosted service at goatcounter.com, because then the package itself becomes useless. (I understand that this is opinable) I'm not attaching an updated tarball because I was trying (without success) to convince google' servers to let me download version 2.0.4 and I've added a couple of hacks ^^" Cheers, Omar Polo P.S.: the port tree is already locked for the 7.0 release.
mips64 bulk build report
bulk build on octeon.ports.openbsd.org started on Sat Sep 11 10:53:15 UTC 2021 finished at Sun Sep 19 10:07:01 UTC 2021 lasted 08D23h13m done with kern.version=OpenBSD 7.0-beta (GENERIC.MP) #681: Fri Sep 10 17:47:42 MDT 2021 built packages:9259 Sep 11:2366 Sep 12:779 Sep 13:352 Sep 14:672 Sep 15:928 Sep 16:489 Sep 17:848 Sep 18:683 Sep 19:2141 build failures: 74 http://build-failures.rhaalovely.net/mips64/2021-09-11/cad/kicad.log http://build-failures.rhaalovely.net/mips64/2021-09-11/chinese/libpinyin.log http://build-failures.rhaalovely.net/mips64/2021-09-11/databases/postgresql-pllua.log http://build-failures.rhaalovely.net/mips64/2021-09-11/devel/clang-tools-extra.log http://build-failures.rhaalovely.net/mips64/2021-09-11/devel/coccinelle.log http://build-failures.rhaalovely.net/mips64/2021-09-11/devel/go-sys.log http://build-failures.rhaalovely.net/mips64/2021-09-11/devel/promu.log http://build-failures.rhaalovely.net/mips64/2021-09-11/devel/py-unicorn,python3.log http://build-failures.rhaalovely.net/mips64/2021-09-11/devel/sdcc.log http://build-failures.rhaalovely.net/mips64/2021-09-11/editors/micro.log http://build-failures.rhaalovely.net/mips64/2021-09-11/emulators/openmsx.log http://build-failures.rhaalovely.net/mips64/2021-09-11/emulators/spike.log http://build-failures.rhaalovely.net/mips64/2021-09-11/games/astromenace.log http://build-failures.rhaalovely.net/mips64/2021-09-11/games/freeorion.log http://build-failures.rhaalovely.net/mips64/2021-09-11/games/godot.log http://build-failures.rhaalovely.net/mips64/2021-09-11/games/goldberg_emulator.log http://build-failures.rhaalovely.net/mips64/2021-09-11/games/hyperrogue.log http://build-failures.rhaalovely.net/mips64/2021-09-11/geo/gpstk.log http://build-failures.rhaalovely.net/mips64/2021-09-11/graphics/asymptote.log http://build-failures.rhaalovely.net/mips64/2021-09-11/graphics/enblend-enfuse.log http://build-failures.rhaalovely.net/mips64/2021-09-11/lang/STk.log http://build-failures.rhaalovely.net/mips64/2021-09-11/lang/gforth.log http://build-failures.rhaalovely.net/mips64/2021-09-11/lang/librep.log http://build-failures.rhaalovely.net/mips64/2021-09-11/lang/pfe.log http://build-failures.rhaalovely.net/mips64/2021-09-11/mail/opensmtpd-filters/rspamd.log http://build-failures.rhaalovely.net/mips64/2021-09-11/mail/perdition,-ldap.log http://build-failures.rhaalovely.net/mips64/2021-09-11/mail/postfix/stable,ldap.log http://build-failures.rhaalovely.net/mips64/2021-09-11/math/gbc.log http://build-failures.rhaalovely.net/mips64/2021-09-11/math/lean.log http://build-failures.rhaalovely.net/mips64/2021-09-11/math/lrs.log http://build-failures.rhaalovely.net/mips64/2021-09-11/math/mlpack,-main.log http://build-failures.rhaalovely.net/mips64/2021-09-11/math/ntl.log http://build-failures.rhaalovely.net/mips64/2021-09-11/multimedia/assimp.log http://build-failures.rhaalovely.net/mips64/2021-09-11/multimedia/frei0r-plugins.log http://build-failures.rhaalovely.net/mips64/2021-09-11/multimedia/get_iplayer.log http://build-failures.rhaalovely.net/mips64/2021-09-11/multimedia/mkvtoolnix,no_x11.log http://build-failures.rhaalovely.net/mips64/2021-09-11/net/barrier.log http://build-failures.rhaalovely.net/mips64/2021-09-11/net/gortr.log http://build-failures.rhaalovely.net/mips64/2021-09-11/net/gtk-gnutella.log http://build-failures.rhaalovely.net/mips64/2021-09-11/net/icinga/core2.log http://build-failures.rhaalovely.net/mips64/2021-09-11/net/minio/client.log http://build-failures.rhaalovely.net/mips64/2021-09-11/net/minio/server.log http://build-failures.rhaalovely.net/mips64/2021-09-11/net/powerdns_recursor.log http://build-failures.rhaalovely.net/mips64/2021-09-11/net/pure-ftpd,ldap.log http://build-failures.rhaalovely.net/mips64/2021-09-11/net/syncthing.log http://build-failures.rhaalovely.net/mips64/2021-09-11/net/tailscale.log http://build-failures.rhaalovely.net/mips64/2021-09-11/net/utox.log http://build-failures.rhaalovely.net/mips64/2021-09-11/plan9/drawterm.log http://build-failures.rhaalovely.net/mips64/2021-09-11/productivity/gnucash.log http://build-failures.rhaalovely.net/mips64/2021-09-11/security/botan2.log http://build-failures.rhaalovely.net/mips64/2021-09-11/security/go-siphash.log http://build-failures.rhaalovely.net/mips64/2021-09-11/security/gobuster.log http://build-failures.rhaalovely.net/mips64/2021-09-11/security/vault.log http://build-failures.rhaalovely.net/mips64/2021-09-11/shells/elvish.log http://build-failures.rhaalovely.net/mips64/2021-09-11/shells/ksh93.log http://build-failures.rhaalovely.net/mips64/2021-09-11/sysutils/amazon-ecs-cli.log http://build-failures.rhaalovely.net/mips64/2021-09-11/sysutils/beats/filebeat.log http://build-failures.rhaalovely.net/mips64/2021-09-11/sysutils/beats/heartbeat.log http://build-failures.rhaalovely.net/mips64/2021-09-11/sysutils/beats/metricbeat.log http://build-failures.rhaalovely.net/mips64/2021-09-11/sysutils/beats/packetbeat.log
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/09/19 04:19:31 Modified files: emulators/qemu : Makefile Log message: QEMU: the new gmodule dependency is only for plugins support (which is disabled on !LLD archs); move the WANTLIB entry to the right place. >From Brad.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/09/19 04:18:26 Modified files: net/snort : Makefile distinfo net/snort/patches: patch-src_dynamic-plugins_sf_engine_Makefile_in patch-src_dynamic-preprocessors_Makefile_in patch-src_dynamic-preprocessors_appid_Makefile_in patch-src_dynamic-preprocessors_dcerpc2_Makefile_in patch-src_dynamic-preprocessors_dnp3_Makefile_in patch-src_dynamic-preprocessors_dns_Makefile_in patch-src_dynamic-preprocessors_ftptelnet_Makefile_in patch-src_dynamic-preprocessors_gtp_Makefile_in patch-src_dynamic-preprocessors_imap_Makefile_in patch-src_dynamic-preprocessors_modbus_Makefile_in patch-src_dynamic-preprocessors_pop_Makefile_in patch-src_dynamic-preprocessors_reputation_Makefile_in patch-src_dynamic-preprocessors_s7commplus_Makefile_in patch-src_dynamic-preprocessors_sdf_Makefile_in patch-src_dynamic-preprocessors_sip_Makefile_in patch-src_dynamic-preprocessors_smtp_Makefile_in patch-src_dynamic-preprocessors_ssh_Makefile_in patch-src_dynamic-preprocessors_ssl_Makefile_in net/snort/pkg : PLIST Log message: update snort 2.9.18->2.9.18.1, and disable appid code on archs which don't have LuaJIT (rather than disabling the whole snort port) >From Markus Lude
Re: [UPDATE] profanity 0.11.0 & change to libstrophe
Hi everybody, * Florian Viehweger wrote: > Am Fri, 27 Aug 2021 08:32:26 +0100 > schrieb Stuart Henderson : > > > On 2021/08/26 23:26, Florian Viehweger wrote: > > > Hi, > > > > > > this updates profanity to 0.11.0. > > > > > > Changes are listed here [1] as they are too long to list in this > > > mail. > > > > > > This version fixes several issues regarding OMEMO. Additional the > > > XMPP library is changed to libstrophe, as libmesode is deprecated > > > upstream. Maybe it's me and my stupidity but since this update I can no longer connect to a XMPP server with a LE certificate. Both client and server are running -current (server with prosody). The client reports "Login failed" and the debug log shows: 19/09/2021 11:16:17: prof: INF: Connecting using account: x...@jabber.xosc.org 19/09/2021 11:16:17: prof: INF: Connecting as x...@jabber.xosc.org/profanity.kTdJ 19/09/2021 11:16:17: prof: DBG: Connecting with flags (0x2): 19/09/2021 11:16:17: prof: DBG: XMPP_CONN_FLAG_MANDATORY_TLS 19/09/2021 11:16:17: xmpp: DBG: SRV lookup failed, connecting via domain. 19/09/2021 11:16:17: xmpp: DBG: sock_connect() to jabber.xosc.org:5222 returned 7 19/09/2021 11:16:17: xmpp: DBG: Attempting to connect to jabber.xosc.org 19/09/2021 11:16:17: xmpp: DBG: connection successful 19/09/2021 11:16:17: conn: DBG: SENT: http://etherx.jabber.org/streams;> 19/09/2021 11:16:17: xmpp: DBG: RECV: 19/09/2021 11:16:17: xmpp: DBG: RECV: http://etherx.jabber.org/streams;> 19/09/2021 11:16:17: conn: DBG: SENT: 19/09/2021 11:16:17: xmpp: DBG: RECV: 19/09/2021 11:16:17: xmpp: DBG: handle proceedtls called for proceed 19/09/2021 11:16:17: xmpp: DBG: proceeding with TLS 19/09/2021 11:16:17: tls: DBG: Certificate verification FAILED, result=X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY(20) 19/09/2021 11:16:17: tls: DBG: Certificate was not presented by peer 19/09/2021 11:16:17: tls: DBG: error=SSL_ERROR_SSL(1) errno=0 19/09/2021 11:16:17: tls: DBG: error:14FFF086:SSL routines:(UNKNOWN)SSL_internal:certificate verify failed 19/09/2021 11:16:17: conn: DBG: Couldn't start TLS! error -3 tls_error 1 19/09/2021 11:16:17: conn: DBG: SENT: 19/09/2021 11:16:17: xmpp: DBG: Send error occurred, disconnecting. 19/09/2021 11:16:17: xmpp: DBG: Closing socket. 19/09/2021 11:16:17: prof: DBG: Connection handler: XMPP_CONN_DISCONNECT 19/09/2021 11:16:17: prof: DBG: Connection handler: Login failed 19/09/2021 11:16:17: prof: DBG: Connection handler: No reconnect timer 19/09/2021 11:16:17: prof: INF: Login failed The server simply logs: Sep 19 09:23:14 omega prosody[38808]: c2s87a60669340: Client connected Sep 19 09:23:16 omega prosody[38808]: c2s87a60669340: Client disconnected: ssl handshake error: tlsv1 alert unknown ca When I play around with the /tls settings, I mostly get the message 11:20:36 - Certificate path setting only supported when built with libmesode. 11:20:47 - Certificate path setting only supported when built with libmesode. I know that connections to the server with the password are working since my mobile client connects successfully. I removed all settings and started completely fresh, however, I still cannot connect. Any hints on how to debug this further? Cheers Matthias
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2021/09/19 03:00:52 Modified files: x11/kde-plasma : Makefile.inc x11/kde-plasma/breeze: distinfo x11/kde-plasma/breeze-grub: distinfo x11/kde-plasma/breeze-gtk: distinfo x11/kde-plasma/kdecoration: distinfo x11/kde-plasma/oxygen: distinfo Log message: Bump KDE Plasma to 5.22.5
Re: [BUG] net/qbittorrent and net/deluge not working
On 9/18/2021 4:37 AM, Rafael Sadowski wrote:
On Thu Sep 16, 2021 at 08:44:00AM +0100, Stuart Henderson wrote:
On 2021/09/15 23:15, Brad Smith wrote:
Interesting. I found rebuilding libtorrent-rasterbar with -O1 (or -O0 initially)
and it no longer was crashing on me. I started up qBittorrent and downloaded
a few well seeded torrents.
Unless we understand the mechanism for the failure and are sure it's a
libtorrent-rasterbar problem rather than a boost one, a backout would
seem a better idea. We are locking soon and can't add -O1 to ~170 ports
if the problem is in boost and an unknown number of others might be
affected.
Runtime tests on boost ports are problematic. Ports only using the
"header only library" as a BUILD_DEPENDS do *not* get updated for a
boost version bump so testers could easily be using the old code still.
I think Stuart is right. 7.0 is coming and we should play it safe.
OK?
OK.
Index: Makefile
===
RCS file: /cvs/ports/devel/boost/Makefile,v
retrieving revision 1.116
diff -u -p -u -p -r1.116 Makefile
--- Makefile3 Sep 2021 23:23:30 - 1.116
+++ Makefile18 Sep 2021 06:42:26 -
@@ -1,11 +1,12 @@
-# $OpenBSD: Makefile,v 1.116 2021/09/03 23:23:30 sthen Exp $
+# $OpenBSD: Makefile,v 1.115 2021/07/16 17:55:10 sthen Exp $
ONLY_FOR_ARCHS-md = aarch64 amd64 arm i386 mips64 mips64el powerpc powerpc64 riscv64
COMMENT-main= free peer-reviewed portable C++ source libraries
COMMENT-md= machine-dependent libraries for boost
-VERSION= 1.77.0
+VERSION= 1.76.0
+EPOCH =0
DISTNAME= boost_${VERSION:S/./_/g}
PKGNAME-main= boost-${VERSION}
PKGNAME-md= boost-md-${VERSION}
@@ -14,7 +15,7 @@ MASTER_SITES= https://boostorg.jfrog.io/
EXTRACT_SUFX= .tar.bz2
FIX_EXTRACT_PERMISSIONS = Yes
-SO_VERSION= 16.0
+SO_VERSION=17.0
BOOST_LIBS= boost_atomic-mt \
boost_chrono-mt boost_chrono \
boost_container-mt boost_container \
@@ -107,8 +108,8 @@ BJAM_CONFIG=-sICU_PATH=${LOCALBASE} \
-j${MAKE_JOBS} \
--layout=tagged-1.66 \
pch=off \
- cflags='${CFLAGS}' \
- cxxflags='${CXXFLAGS}' \
+ cflags='${CFLAGS} -pthread' \
+ cxxflags='${CXXFLAGS} -pthread' \
variant=release \
link=static,shared \
threading=single,multi \
Index: distinfo
===
RCS file: /cvs/ports/devel/boost/distinfo,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 distinfo
--- distinfo3 Sep 2021 23:23:30 - 1.16
+++ distinfo18 Sep 2021 06:42:26 -
@@ -1,2 +1,2 @@
-SHA256 (boost_1_77_0.tar.bz2) = /J+F/AMOIzFCkIJBr3qEbmBjCqc4jeml+vsfOiaECFQ=
-SIZE (boost_1_77_0.tar.bz2) = 110361537
+SHA256 (boost_1_76_0.tar.bz2) = 8Dl7pumCxEUPJ78yoqgykqugNbgnpWI6FGNupYMxjEE=
+SIZE (boost_1_76_0.tar.bz2) = 110073117
Index: patches/patch-Jamroot
===
RCS file: /cvs/ports/devel/boost/patches/patch-Jamroot,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 patch-Jamroot
--- patches/patch-Jamroot 3 Sep 2021 23:23:31 - 1.12
+++ patches/patch-Jamroot 18 Sep 2021 06:42:26 -
@@ -1,11 +1,11 @@
-$OpenBSD: patch-Jamroot,v 1.12 2021/09/03 23:23:31 sthen Exp $
+$OpenBSD: patch-Jamroot,v 1.11 2021/06/22 04:20:13 rsadowski Exp $
Index: Jamroot
--- Jamroot.orig
+++ Jamroot
@@ -146,11 +146,12 @@ import tools/boost\_install/boost-install ;
path-constant BOOST_ROOT : . ;
- constant BOOST_VERSION : 1.77.0 ;
+ constant BOOST_VERSION : 1.76.0 ;
constant BOOST_JAMROOT_MODULE : $(__name__) ;
+constant SO_VERSION : ${SO_VERSION} ;
Index: patches/patch-boost_asio_ssl_impl_context_ipp
===
RCS file: patches/patch-boost_asio_ssl_impl_context_ipp
diff -N patches/patch-boost_asio_ssl_impl_context_ipp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-boost_asio_ssl_impl_context_ipp 18 Sep 2021 06:42:26
-
@@ -0,0 +1,77 @@
+$OpenBSD: patch-boost_asio_ssl_impl_context_ipp,v 1.5 2021/07/16 17:55:10
sthen Exp $
+
+Fix compatibility with recent LibreSSL when OPENSSL_NO_SSL_INTERN is defined.
+
+Index: boost/asio/ssl/impl/context.ipp
+--- boost/asio/ssl/impl/context.ipp.orig
boost/asio/ssl/impl/context.ipp
+@@ -398,7 +398,8 @@ context::~context()
+ if (handle_)
+ {
+ #if ((OPENSSL_VERSION_NUMBER >= 0x1010L) \
+- && !defined(LIBRESSL_VERSION_NUMBER)) \
++ && (!defined(LIBRESSL_VERSION_NUMBER) \
++|| LIBRESSL_VERSION_NUMBER >= 0x207fL)) \
+ || defined(BOOST_ASIO_USE_WOLFSSL)
+ void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
+ #else // (OPENSSL_VERSION_NUMBER >= 0x1010L)
+@@ -411,7 +412,8 @@ context::~context()
+
NEW: x11/kde-applications/kopeninghours
Information for inst:kopeninghours-21.08.1 Comment: library for parsing and evaluating OSM data Description: A library for parsing and evaluating OSM opening hours expressions. OSM opening hours expressions are used to describe when a feature is open/available or closed. This format is not only used in OpenStreetMap itself, but in various other data sources or APIs needing such a description as well. Maintainer: Rafael Sadowski OK to import after the lock? kopeninghours-21.08.1.tar.gz Description: Binary data
