CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2023/09/29 23:32:24 Modified files: editors/nvi: Makefile distinfo editors/nvi/patches: patch-CMakeLists_txt Log message: Update to nvi-2.2.1. ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2023/09/29 23:29:00 Modified files: games/widelands: Makefile Added files: games/widelands/patches: patch-src_graphic_texture_cc Log message: Fix a crash by backporting an upstream commit. ok sthen@ volker@ thfr@
sparc64 bulk build report
Bulk build on sparc64-0a.ports.openbsd.org Started : Thu Sep 28 00:45:13 MDT 2023 Finished: Fri Sep 29 23:03:21 MDT 2023 Duration: 1 Days 22 hours 18 minutes Built using OpenBSD 7.4 (GENERIC.MP) #1885: Wed Sep 27 14:28:51 MDT 2023 Built 8547 packages Number of packages built each day: Sep 28: 7276 Sep 29: 1271 Critical path missing pkgs: http://build-failures.rhaalovely.net/sparc64/2023-09-28/summary.log Build failures: 46 http://build-failures.rhaalovely.net/sparc64/2023-09-28/archivers/snappy.log http://build-failures.rhaalovely.net/sparc64/2023-09-28/astro/py-astropy,python3.log http://build-failures.rhaalovely.net/sparc64/2023-09-28/audio/libcanberra.log http://build-failures.rhaalovely.net/sparc64/2023-09-28/audio/libsmackerdec.log http://build-failures.rhaalovely.net/sparc64/2023-09-28/audio/ncmpc.log http://build-failures.rhaalovely.net/sparc64/2023-09-28/audio/vgmstream.log http://build-failures.rhaalovely.net/sparc64/2023-09-28/databases/ruby-amalgalite,ruby31.log http://build-failures.rhaalovely.net/sparc64/2023-09-28/devel/acpica.log http://build-failures.rhaalovely.net/sparc64/2023-09-28/devel/avr/gcc.log http://build-failures.rhaalovely.net/sparc64/2023-09-28/devel/difftastic.log http://build-failures.rhaalovely.net/sparc64/2023-09-28/devel/liburcu.log http://build-failures.rhaalovely.net/sparc64/2023-09-28/devel/llvm/13.log http://build-failures.rhaalovely.net/sparc64/2023-09-28/devel/llvm/16,-lldb.log http://build-failures.rhaalovely.net/sparc64/2023-09-28/devel/mtxclient.log http://build-failures.rhaalovely.net/sparc64/2023-09-28/devel/orcania.log http://build-failures.rhaalovely.net/sparc64/2023-09-28/devel/py-thrift,python3.log http://build-failures.rhaalovely.net/sparc64/2023-09-28/devel/vim-command-t.log http://build-failures.rhaalovely.net/sparc64/2023-09-28/devel/xsd.log http://build-failures.rhaalovely.net/sparc64/2023-09-28/editors/hyx.log http://build-failures.rhaalovely.net/sparc64/2023-09-28/editors/litexl.log http://build-failures.rhaalovely.net/sparc64/2023-09-28/games/cataclysm-dda,no_x11.log http://build-failures.rhaalovely.net/sparc64/2023-09-28/games/crispy-doom.log http://build-failures.rhaalovely.net/sparc64/2023-09-28/games/fheroes2.log http://build-failures.rhaalovely.net/sparc64/2023-09-28/games/gnukem.log http://build-failures.rhaalovely.net/sparc64/2023-09-28/games/godot.log http://build-failures.rhaalovely.net/sparc64/2023-09-28/games/scid.log http://build-failures.rhaalovely.net/sparc64/2023-09-28/graphics/glslang.log http://build-failures.rhaalovely.net/sparc64/2023-09-28/graphics/libgexiv2.log http://build-failures.rhaalovely.net/sparc64/2023-09-28/graphics/rawstudio.log http://build-failures.rhaalovely.net/sparc64/2023-09-28/graphics/spirv-tools.log http://build-failures.rhaalovely.net/sparc64/2023-09-28/graphics/tesseract/tesseract.log http://build-failures.rhaalovely.net/sparc64/2023-09-28/inputmethods/ibus.log http://build-failures.rhaalovely.net/sparc64/2023-09-28/mail/rspamd,hyperscan.log http://build-failures.rhaalovely.net/sparc64/2023-09-28/math/gunits.log http://build-failures.rhaalovely.net/sparc64/2023-09-28/math/openfst.log http://build-failures.rhaalovely.net/sparc64/2023-09-28/security/ccid.log http://build-failures.rhaalovely.net/sparc64/2023-09-28/security/opensc.log http://build-failures.rhaalovely.net/sparc64/2023-09-28/security/xmlsec.log http://build-failures.rhaalovely.net/sparc64/2023-09-28/sysutils/firmware/bwfm.log http://build-failures.rhaalovely.net/sparc64/2023-09-28/sysutils/u-boot-asahi.log http://build-failures.rhaalovely.net/sparc64/2023-09-28/telephony/baresip/baresip,-gtk.log http://build-failures.rhaalovely.net/sparc64/2023-09-28/textproc/libmarisa,,-main.log http://build-failures.rhaalovely.net/sparc64/2023-09-28/www/havp.log http://build-failures.rhaalovely.net/sparc64/2023-09-28/www/webkitgtk4.log http://build-failures.rhaalovely.net/sparc64/2023-09-28/x11/gromit-mpx.log http://build-failures.rhaalovely.net/sparc64/2023-09-28/x11/xpad.log
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/09/29 17:54:24 Modified files: audio/milkytracker: Makefile Added files: audio/milkytracker/patches: patch-CMakeLists_txt Log message: port-gcc needs to use C++11 to use non-static initializers. Apparently LLVM doesn't care. Submitted upstream: https://github.com/milkytracker/MilkyTracker/pull/328 Fixes build on sparc64
Re: Bought a new Intel laptop? Test packages!
Lucas wrote: > Christian Weisgerber wrote: > > If you bought a new Intel laptop this year, chances are its hardware > > is capable of IBT (indirect branch tracking), and OpenBSD now enables > > this security feature by default. > > > > It is very likely that some packages are broken at runtime because > > they fail to handle IBT. This doesn't show up at build time, so > > people need to actually run their favorite packages from a snapshot > > _now_ and need to report SIGILL failures, or those problems will > > not be fixed in time for the release. > > I gave the ports that depend on boost-context a spin, after running into > issues trying out the Taisei Project update [0]. [0]: https://marc.info/?l=openbsd-ports=169502072928204=2 Thanks kn for pointing out that I forgot the link. > I used this command to hopefully find all the programs that potentially > consume boost-context: > > sqlite3 /usr/local/share/sqlports <<'_EOF' > SELECT FullPkgPath FROM PortsQ WHERE > (BUILD_DEPENDS LIKE '%devel/boost,-md%' OR > LIB_DEPENDS LIKE '%devel/boost,-md%' OR > WANTLIB LIKE '%boost_context-mt%') AND > USE_NOBTCFI IS NULL > ORDER BY FullPkgPath; > _EOF > > which returned > > - games/wesnoth: didn't find issues playing the campaign, nor I found > any clear usage of boost::context or boost::coroutine grepping the > code around. > - net/icinga/core2,-main: didn't find issues running it in foreground > nor any clear usage of boost::context or boost::coroutine grepping > the code, other than printing a backtrace (but I get the feeling it > can be hidden in boost::asio) > - net/powerdns_recursor: SIGILLs on start. otto@ in cc. > - sysutils/nix: tbh, I have no clue on how to test it. > > Lucas
Re: Bought a new Intel laptop? Test packages!
Christian Weisgerber wrote: > If you bought a new Intel laptop this year, chances are its hardware > is capable of IBT (indirect branch tracking), and OpenBSD now enables > this security feature by default. > > It is very likely that some packages are broken at runtime because > they fail to handle IBT. This doesn't show up at build time, so > people need to actually run their favorite packages from a snapshot > _now_ and need to report SIGILL failures, or those problems will > not be fixed in time for the release. I gave the ports that depend on boost-context a spin, after running into issues trying out the Taisei Project update [0]. I used this command to hopefully find all the programs that potentially consume boost-context: sqlite3 /usr/local/share/sqlports <<'_EOF' SELECT FullPkgPath FROM PortsQ WHERE (BUILD_DEPENDS LIKE '%devel/boost,-md%' OR LIB_DEPENDS LIKE '%devel/boost,-md%' OR WANTLIB LIKE '%boost_context-mt%') AND USE_NOBTCFI IS NULL ORDER BY FullPkgPath; _EOF which returned - games/wesnoth: didn't find issues playing the campaign, nor I found any clear usage of boost::context or boost::coroutine grepping the code around. - net/icinga/core2,-main: didn't find issues running it in foreground nor any clear usage of boost::context or boost::coroutine grepping the code, other than printing a backtrace (but I get the feeling it can be hidden in boost::asio) - net/powerdns_recursor: SIGILLs on start. otto@ in cc. - sysutils/nix: tbh, I have no clue on how to test it. Lucas
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2023/09/29 13:36:03 Modified files: security/boringssl/head: Makefile distinfo Log message: Update boringssl/head to 20230926
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bl...@cvs.openbsd.org 2023/09/29 13:32:16 Modified files: devel/p5-String-Tagged: Makefile distinfo Log message: update p5-String-Tagged to 0.21
Bought a new Intel laptop? Test packages!
If you bought a new Intel laptop this year, chances are its hardware is capable of IBT (indirect branch tracking), and OpenBSD now enables this security feature by default. It is very likely that some packages are broken at runtime because they fail to handle IBT. This doesn't show up at build time, so people need to actually run their favorite packages from a snapshot _now_ and need to report SIGILL failures, or those problems will not be fixed in time for the release. -- Christian "naddy" Weisgerber na...@mips.inka.de
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2023/09/29 13:19:50 Modified files: security/rust-openssl-tests: Makefile distinfo Log message: Update to rust-openssl-tests 20230929
Re: [NEW]mail/p5-Mail-Message
On Mon, Sep 25, 2023 at 08:48:51AM +, wen heping wrote:
> Hi, ports@:
>
>Here is a patch to create new port mail/p5-Mail-Message.
>It build and run well on amd64-current system, pass all tests.
>It is required by the update of p5-Mail-Box.
>
>Before commit this patch, the patch to update misc/p5-User-Identity
> should be committed.
There are some hidden dependencies in tests and Makefile.PL. Look
at BEGIN blocks in *.t files. I think they should be added as test
depends if the module exists in ports tree. Then tests always run
with the same environment.
${P5SITE}/Mail/Message.pm is in both mail/p5-Mail-Box and
mail/p5-Mail-Message. This conflict has to be resolved by updating
both modules, @conflict markers and quirks. Not sure how to do
that exactly.
But this cannot happen before release builds. Please ping after
ports unlock.
bluhm
No more imports for 7.4
We are approaching the release. No more imports of new ports, please. If there are special considerations, ask sthen@ or me for an exemption. Updates can still proceed at this time. -- Christian "naddy" Weisgerber na...@mips.inka.de
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2023/09/29 12:20:03 Removed files: productivity/kalendar: Makefile distinfo productivity/kalendar/pkg: DESCR PLIST Log message: Remove kalendar (replaced with x11/kde-applications/merkuro)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2023/09/29 12:19:01 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm productivity : Makefile x11/kde-applications: Makefile Log message: "KDE renamed Kalendar to Merkuro since the application not only lets you manage your events and tasks any more, but also your contacts." Replace productivity/kalendar with x11/kde-applications/merkuro OK kn
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2023/09/29 12:14:25 Log message: Import Merkuro, tweaks and ok, kn@ "KDE renamed Kalendar to Merkuro since the application not only lets you manage your events and tasks any more, but also your contacts." Information for inst:merkuro-23.08.0 Comment: calendar application Description: Merkuro is a calendar application that allows you to manage your tasks and events. Merkuro supports both local calendars as well as a multitude of online calendars: - CalDAV calendars (e.g. Nextcloud) - Google calendars - Exchange calendars - iCal calendar files (.ics) - iCal calendar folders - Kolab groupware servers - Open-Xchange groupware servers Maintainer: Rafael Sadowski WWW: https://apps.kde.org/merkuro.calendar/ Status: Vendor Tag: rsadowski Release Tags: rsadowski_20230929 N ports/x11/kde-applications/merkuro/Makefile N ports/x11/kde-applications/merkuro/distinfo N ports/x11/kde-applications/merkuro/pkg/DESCR N ports/x11/kde-applications/merkuro/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: cas...@cvs.openbsd.org 2023/09/29 12:01:18 Modified files: meta/tor-browser: Makefile www/tor-browser: Makefile.inc www/tor-browser/browser: Makefile distinfo Log message: Tor Browser: update to 12.5.6
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: cas...@cvs.openbsd.org 2023/09/29 12:00:17 Modified files: meta/tor-browser: Tag: OPENBSD_7_3 Makefile www/tor-browser: Tag: OPENBSD_7_3 Makefile.inc www/tor-browser/browser: Tag: OPENBSD_7_3 Makefile distinfo Log message: Tor Browser: update to 12.5.6
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2023/09/29 11:14:26 Modified files: mail/mozilla-thunderbird: Makefile distinfo mail/thunderbird-i18n: Makefile.inc distinfo Log message: mail/mozilla-thunderbird: update to 115.3.1 see https://www.thunderbird.net/en-US/thunderbird/115.3.1/releasenotes/ fixes https://www.mozilla.org/en-US/security/advisories/mfsa2023-44/ CVE-2023-5217: Heap buffer overflow in libvpx
mips64 bulk build report
bulk build on octeon.ports.openbsd.org started on Wed Sep 20 14:10:15 UTC 2023 finished at Thu Sep 28 15:15:20 UTC 2023 lasted 09D01h05m done with kern.version=OpenBSD 7.4-beta (GENERIC.MP) #1365: Tue Sep 19 16:59:40 MDT 2023 built packages:9046 Sep 20:1917 Sep 21:943 Sep 22:506 Sep 23:448 Sep 24:408 Sep 25:545 Sep 26:1230 Sep 27:1076 Sep 28:1972 build failures: 71 http://build-failures.rhaalovely.net/mips64/2023-09-20/databases/postgresql-pllua.log http://build-failures.rhaalovely.net/mips64/2023-09-20/devel/arm-none-eabi/gcc,aarch64.log http://build-failures.rhaalovely.net/mips64/2023-09-20/devel/clang-tools-extra.log http://build-failures.rhaalovely.net/mips64/2023-09-20/devel/llvm/16,-lldb.log http://build-failures.rhaalovely.net/mips64/2023-09-20/devel/objfw.log http://build-failures.rhaalovely.net/mips64/2023-09-20/devel/py-thrift,python3.log http://build-failures.rhaalovely.net/mips64/2023-09-20/devel/py-unicorn,python3.log http://build-failures.rhaalovely.net/mips64/2023-09-20/devel/sdcc.log http://build-failures.rhaalovely.net/mips64/2023-09-20/emulators/openmsx.log http://build-failures.rhaalovely.net/mips64/2023-09-20/emulators/spike.log http://build-failures.rhaalovely.net/mips64/2023-09-20/games/astromenace.log http://build-failures.rhaalovely.net/mips64/2023-09-20/games/cataclysm-dda.log http://build-failures.rhaalovely.net/mips64/2023-09-20/games/gnukem.log http://build-failures.rhaalovely.net/mips64/2023-09-20/games/goldberg_emulator.log http://build-failures.rhaalovely.net/mips64/2023-09-20/games/hyperrogue.log http://build-failures.rhaalovely.net/mips64/2023-09-20/games/wesnoth.log http://build-failures.rhaalovely.net/mips64/2023-09-20/games/witchblast.log http://build-failures.rhaalovely.net/mips64/2023-09-20/geo/gpstk.log http://build-failures.rhaalovely.net/mips64/2023-09-20/graphics/openvdb.log http://build-failures.rhaalovely.net/mips64/2023-09-20/inputmethods/ibus.log http://build-failures.rhaalovely.net/mips64/2023-09-20/lang/STk.log http://build-failures.rhaalovely.net/mips64/2023-09-20/lang/gambit.log http://build-failures.rhaalovely.net/mips64/2023-09-20/lang/gforth.log http://build-failures.rhaalovely.net/mips64/2023-09-20/lang/librep.log http://build-failures.rhaalovely.net/mips64/2023-09-20/lang/pfe.log http://build-failures.rhaalovely.net/mips64/2023-09-20/mail/opensmtpd-filters/rspamd.log http://build-failures.rhaalovely.net/mips64/2023-09-20/math/gbc.log http://build-failures.rhaalovely.net/mips64/2023-09-20/math/lean.log http://build-failures.rhaalovely.net/mips64/2023-09-20/math/lrs.log http://build-failures.rhaalovely.net/mips64/2023-09-20/math/mlpack,-main.log http://build-failures.rhaalovely.net/mips64/2023-09-20/math/ntl.log http://build-failures.rhaalovely.net/mips64/2023-09-20/misc/remind.log http://build-failures.rhaalovely.net/mips64/2023-09-20/multimedia/assimp.log http://build-failures.rhaalovely.net/mips64/2023-09-20/net/eduvpn/vpn-daemon.log http://build-failures.rhaalovely.net/mips64/2023-09-20/net/gtk-gnutella.log http://build-failures.rhaalovely.net/mips64/2023-09-20/net/icinga/core2.log http://build-failures.rhaalovely.net/mips64/2023-09-20/net/minio/client.log http://build-failures.rhaalovely.net/mips64/2023-09-20/net/minio/server.log http://build-failures.rhaalovely.net/mips64/2023-09-20/net/powerdns_recursor.log http://build-failures.rhaalovely.net/mips64/2023-09-20/net/syncthing.log http://build-failures.rhaalovely.net/mips64/2023-09-20/net/utox.log http://build-failures.rhaalovely.net/mips64/2023-09-20/plan9/drawterm.log http://build-failures.rhaalovely.net/mips64/2023-09-20/security/botan2.log http://build-failures.rhaalovely.net/mips64/2023-09-20/security/nuclei.log http://build-failures.rhaalovely.net/mips64/2023-09-20/security/step-cli.log http://build-failures.rhaalovely.net/mips64/2023-09-20/security/vault.log http://build-failures.rhaalovely.net/mips64/2023-09-20/shells/elvish.log http://build-failures.rhaalovely.net/mips64/2023-09-20/sysutils/amazon-ecs-cli.log http://build-failures.rhaalovely.net/mips64/2023-09-20/sysutils/beats/filebeat.log http://build-failures.rhaalovely.net/mips64/2023-09-20/sysutils/beats/heartbeat.log http://build-failures.rhaalovely.net/mips64/2023-09-20/sysutils/beats/metricbeat.log http://build-failures.rhaalovely.net/mips64/2023-09-20/sysutils/beats/packetbeat.log http://build-failures.rhaalovely.net/mips64/2023-09-20/sysutils/dep.log http://build-failures.rhaalovely.net/mips64/2023-09-20/sysutils/direnv.log http://build-failures.rhaalovely.net/mips64/2023-09-20/sysutils/gitlab-runner.log http://build-failures.rhaalovely.net/mips64/2023-09-20/sysutils/kubectl.log http://build-failures.rhaalovely.net/mips64/2023-09-20/sysutils/libvirt.log http://build-failures.rhaalovely.net/mips64/2023-09-20/sysutils/nix.log http://build-failures.rhaalovely.net/mips64/2023-09-20/sysutils/nomad.log http://build-failures.rhaalovely.net/mips64/2023-09-20/sysutils/rclone.log
Re: Widelands crash fix
On Fri, Sep 29, 2023 at 04:17:54AM -0600, Anthony J. Bentley wrote:
> volker's recent commit to widelands didn't fix the crash I'm seeing.
> That makes sense, because we compared backtraces and the crash he saw
> was totally different.
>
> Backporting this patch (labeled as "for Mesa 23.x") fixes my crash.
>
> ok?
Tested on my Intel Tigerlake iGPU system and still works, so ok thfr@
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/widelands/Makefile,v
> retrieving revision 1.38
> diff -u -p -r1.38 Makefile
> --- Makefile 28 Sep 2023 20:50:51 - 1.38
> +++ Makefile 29 Sep 2023 09:51:01 -
> @@ -3,7 +3,7 @@ COMMENT = economic and military simulati
> GH_ACCOUNT = widelands
> GH_PROJECT = widelands
> GH_TAGNAME = v1.0
> -REVISION = 2
> +REVISION = 3
>
> CATEGORIES = games
>
> Index: patches/patch-src_graphic_texture_cc
> ===
> RCS file: patches/patch-src_graphic_texture_cc
> diff -N patches/patch-src_graphic_texture_cc
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_graphic_texture_cc 29 Sep 2023 09:51:01 -
> @@ -0,0 +1,39 @@
> +Backport Mesa 23.x fix from upstream.
> +https://github.com/widelands/widelands/commit/48e5fd48c3f6418ebb53a145177d0417dc96451b
> +
> +Index: src/graphic/texture.cc
> +--- src/graphic/texture.cc.orig
> src/graphic/texture.cc
> +@@ -116,9 +116,11 @@ Texture::Texture(SDL_Surface* surface, bool intensity)
> + uint8_t bpp = surface->format->BytesPerPixel;
> +
> + if (surface->format->palette || width() != surface->w || height() !=
> surface->h ||
> +-(bpp != 3 && bpp != 4) || is_bgr_surface(*surface->format)) {
> ++(bpp != 4) || is_bgr_surface(*surface->format)) {
> + SDL_Surface* converted = empty_sdl_surface(width(), height());
> +-assert(converted);
> ++if (converted == nullptr) {
> ++throw wexception("Failed to create SDL_Surface");
> ++}
> + SDL_SetSurfaceAlphaMod(converted, SDL_ALPHA_OPAQUE);
> + SDL_SetSurfaceBlendMode(converted, SDL_BLENDMODE_NONE);
> + SDL_SetSurfaceAlphaMod(surface, SDL_ALPHA_OPAQUE);
> +@@ -127,16 +129,15 @@ Texture::Texture(SDL_Surface* surface, bool intensity)
> + SDL_FreeSurface(surface);
> + surface = converted;
> + bpp = surface->format->BytesPerPixel;
> ++assert(bpp == 4);
> + }
> +
> +-const GLenum pixels_format = bpp == 4 ? GL_RGBA : GL_RGB;
> +-
> + SDL_LockSurface(surface);
> +
> + Gl::swap_rows(width(), height(), surface->pitch, bpp,
> static_cast(surface->pixels));
> +
> + glTexImage2D(GL_TEXTURE_2D, 0, static_cast(intensity ?
> GL_INTENSITY : GL_RGBA), width(),
> +- height(), 0, pixels_format, GL_UNSIGNED_BYTE,
> surface->pixels);
> ++ height(), 0, GL_RGBA, GL_UNSIGNED_BYTE, surface->pixels);
> +
> + SDL_UnlockSurface(surface);
> + SDL_FreeSurface(surface);
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/09/29 06:56:03 Modified files: sysutils/cloud-sql-proxy: Makefile distinfo Log message: Update to cloud-sql-proxy-2.7.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/09/29 06:26:17 Modified files: sysutils/terragrunt: Makefile distinfo modules.inc Log message: Update to terragrunt-0.51.6.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/09/29 06:17:08 Modified files: shells/nsh : Makefile distinfo shells/nsh/pkg : PLIST Log message: update to nsh 1.2 ok sthen, Tom Smyth (MAINTAINER)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2023/09/29 06:01:24 Modified files: x11/xfce4/xfce4-clipman: Makefile distinfo Log message: x11/xfce4/xfce4-clipman: update to 1.6.5 see https://mail.xfce.org/pipermail/xfce-announce/2023-September/001329.html
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2023/09/29 05:51:26 Modified files: www/odoo : Makefile distinfo www/odoo/patches: patch-odoo_service_server_py www/odoo/pkg : PLIST Removed files: www/odoo/patches: patch-odoo_tools__vendor_sessions_py Log message: udpate to 16.0.20230929
Re: NEW: x11/kde-applications/merkuro (productivity/kalendar replacement)
On Thu, Sep 28, 2023 at 07:27:14PM +0200, Rafael Sadowski wrote:
> I would not like to leave kalendar broken for the 7.4 update. Could
> someone review the port please?
>
> On Mon Sep 25, 2023 at 05:59:38PM +0200, Rafael Sadowski wrote:
> > On Sat Sep 16, 2023 at 04:56:20PM +0200, Rafael Sadowski wrote:
> > > Ok to replace productivity/kalendar with x11/kde-applications/merkuro?
> > >
> > > "KDE renamed Kalendar to Merkuro since the application not only lets you
> > > manage your events and tasks any more, but also your contacts."
> > >
> > > Current productivity/kalendar is marked as BROKEN.
> > >
> > > Information for inst:merkuro-23.08.0
> > >
> > > Comment:
> > > calendar application
If it's more than calendars now, at least COMMENT could say so, no?
update-plist reports
LIB_DEPENDS devel/gettext,-runtime not needed for devel/kf5/ki18n ?
Otherwise OK with me, I'd say that's fine to unbreak/import before release.
> > >
> > > Description:
> > > Merkuro is a calendar application that allows you to manage your tasks and
> > > events. Merkuro supports both local calendars as well as a multitude of
> > > online
> > > calendars:
> > >
> > > - CalDAV calendars (e.g. Nextcloud)
> > > - Google calendars
> > > - Exchange calendars
> > > - iCal calendar files (.ics)
> > > - iCal calendar folders
> > > - Kolab groupware servers
> > > - Open-Xchange groupware servers
> > >
> > > Maintainer: Rafael Sadowski
> > >
> > > WWW: https://apps.kde.org/merkuro.calendar/
> > >
> > > The attached merkuro port includes "@conflict kalendar-*" and "@pkgpath
> > > productivity/kalendar". quirks bits below.
> > >
> > > OK?
> >
> > ping
> >
> > >
> > > Index: Makefile
> > > ===
> > > RCS file: /cvs/ports/devel/quirks/Makefile,v
> > > retrieving revision 1.1536
> > > diff -u -p -u -p -r1.1536 Makefile
> > > --- Makefile 16 Sep 2023 09:29:16 - 1.1536
> > > +++ Makefile 16 Sep 2023 14:45:15 -
> > > @@ -3,7 +3,7 @@ CATEGORIES = devel databases
> > > DISTFILES =
> > >
> > > # API.rev
> > > -PKGNAME =quirks-6.152
> > > +PKGNAME =quirks-6.153
> > > PKG_ARCH = *
> > > MAINTAINER = Marc Espie
> > >
> > > Index: files/Quirks.pm
> > > ===
> > > RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
> > > retrieving revision 1.1548
> > > diff -u -p -u -p -r1.1548 Quirks.pm
> > > --- files/Quirks.pm 16 Sep 2023 09:29:16 - 1.1548
> > > +++ files/Quirks.pm 16 Sep 2023 14:45:15 -
> > > @@ -784,6 +784,7 @@ my $stem_extensions = {
> > > 'qxlsx' => 'qt5-qxlsx',
> > > 'py-altgraph' => 'py3-altgraph',
> > > 'pymodbus' => 'py3-pymodbus',
> > > + 'kalendar' => 'merkuro',
> > > };
> > >
> > > my $obsolete_reason = {};
> >
> >
>
Re: update: nsh 1.2
Ok,
Tom ... builds fine on 7.3 & 7.4 Current ...
Im updating the changelog and will circulate on list... once completed,
but it is an exciting release (im well chuffed with the Work that
Chris, Stefan, (and somtimes me ) put in )
Thanks,
Tom Smyth
On Fri, 29 Sept 2023 at 12:22, Stefan Sperling wrote:
>
> Update NSH to version 1.2.
>
> This release ships about 6 months worth of fixes and enhancements.
> I hope there will be smaller releases on a more regular schedule in
> the future, timed less close to ports-lock.
>
> The main benefit of this upgrade is that nsh will now work fine as
> a login shell, making it worth being listed in /etc/shells.
> The 'enable' command will now re-exec to the root user, with authentication
> via /etc/doas.conf or the root password. There is no more need for wrapper
> scripts involving doas or sudo starting nsh as root.
> Thanks to claudio@ for suggesting this design change.
>
> New features:
>
> the "enable" command switches to the root user via doas.conf or root password
> add bgpnsh(8), a minimal version of nsh for use as a BGP looking-glass shell
> add umb(4) support
> allow nsh commands to be piped to standard input from another process
> allow empty configuration files to be filled with data from /etc/examples
> add "show pf" commands to display pf firewall status
> add "show crontab", "crontab edit", "crontab install" commands
> add "show environment", "setenv", "unsetenv", and 'saveenv' commands
>
> ok?
>
> ---
> diff ee7c68ff49b85bd3287aafeb87a37caf249dc14d
> 1a6361e5c0dfbb57d2717a0b887bb9f794c0d721
> commit - ee7c68ff49b85bd3287aafeb87a37caf249dc14d
> commit + 1a6361e5c0dfbb57d2717a0b887bb9f794c0d721
> blob - 0aaceefc96346a2389b06c8bfd669198766ad537
> blob + a04db8534b2234268a982f7b2a262d54834a9188
> --- shells/nsh/Makefile
> +++ shells/nsh/Makefile
> @@ -1,42 +1,47 @@
> COMMENT = network switch style shell
>
> -
> -GH_ACCOUNT = yellowman
> -GH_PROJECT = nsh
> -GH_TAGNAME = v1.1
> CATEGORIES = shells net
> HOMEPAGE = https://www.nmedia.net/nsh/
> +V =1.2
> +DISTNAME = nsh-${V}
> +SITES =
> https://github.com/yellowman/nsh/releases/download/v${V}/
>
> MAINTAINER = Tom Smyth
>
> # BSD
> PERMIT_PACKAGE = Yes
>
> +# uses pledge()
> WANTLIB += c curses edit sqlite3
>
> FLAVORS = static
> FLAVOR ?=
>
> -MAKE_FLAGS = CC="${CC}" \
> - CPPFLAGS="-I${LOCALBASE}/include" \
> +CPPFLAGS = -I${LOCALBASE}/include \
> + -DNSH_REXEC_PATH=${LOCALBASE}/bin/nsh
> +
> +MAKE_ENV = CC="${CC}" \
> + CPPFLAGS="${CPPFLAGS}" \
> LDFLAGS="-L${LOCALBASE}/lib"
> LIB_DEPENDS = databases/sqlite3
>
> +FAKE_FLAGS = PREFIX=${TRUEPREFIX}
> +
> .if ${FLAVOR:Mstatic}
> -MAKE_FLAGS += LDADD="-ledit -ltermcap -lsqlite3 -lm -lpthread -static"
> +MAKE_FLAGS += LDFLAGS="-L${LOCALBASE}/lib -ledit -ltermcap -lsqlite3 -lm
> -lpthread -static"
> .endif
>
> NO_TEST= Yes
>
> -do-install:
> - ${INSTALL_PROGRAM} ${WRKDIST}/nsh ${PREFIX}/bin
> - ${INSTALL_MAN} ${WRKDIST}/nsh.8 ${PREFIX}/man/man8/
> +post-configure:
> + ${MAKE} -C ${WRKDIST} obj
> +
> +post-install:
> .for i in save-ro.sh save-rw.sh
> ${INSTALL_SCRIPT} ${WRKDIST}/${i} ${PREFIX}/bin
> .endfor
> ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nsh
> - sed -i s,/usr/local,${LOCALBASE},g ${WRKDIST}/MANUAL
> -.for i in MANUAL README TODO COPYRIGHT
> +.for i in README.md COPYRIGHT
> ${INSTALL_DATA} ${WRKDIST}/${i} ${PREFIX}/share/doc/nsh/
> .endfor
>
> blob - 2492a4efdcc68c8b34cb856649bd213dd17527ae
> blob + 66553f4bfd591f6ca681c2ffd6208f44ff935571
> --- shells/nsh/distinfo
> +++ shells/nsh/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (nsh-1.1.tar.gz) = v0sHzQ2zEoAzbsaZVeVuhp2R0R37cZvNy/RvJ0Df2Pc=
> -SIZE (nsh-1.1.tar.gz) = 185700
> +SHA256 (nsh-1.2.tar.gz) = XFfUOMhVUCyn+5PhCoXafNIhXxi/GCPXYw2AskzoR/4=
> +SIZE (nsh-1.2.tar.gz) = 218922
> blob - 247187103b8ceb212dd73ae979309741337c333e
> blob + e0707c1e344d5c8f62297f52c1e9d651fd5ec15e
> --- shells/nsh/pkg/PLIST
> +++ shells/nsh/pkg/PLIST
> @@ -1,3 +1,4 @@
> +@shell bin/bgpnsh
> @shell bin/nsh
> bin/save-ro.sh
> bin/save-rw.sh
> @@ -8,9 +9,11 @@ bin/save-rw.sh
> @mode
> @owner
> @group
> +@mode 04555
> +@bin libexec/nshdoas
> +@mode
> +@man man/man8/bgpnsh.8
> @man man/man8/nsh.8
> share/doc/nsh/
> share/doc/nsh/COPYRIGHT
> -share/doc/nsh/MANUAL
> -share/doc/nsh/README
> -share/doc/nsh/TODO
> +share/doc/nsh/README.md
>
--
Kindest regards,
Tom Smyth.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2023/09/29 05:21:47 Modified files: x11/gigolo : Makefile distinfo x11/gigolo/pkg : PLIST Log message: x11/gigolo: update to 0.5.3. see https://mail.xfce.org/pipermail/xfce-announce/2023-September/001328.html
update: nsh 1.2
Update NSH to version 1.2.
This release ships about 6 months worth of fixes and enhancements.
I hope there will be smaller releases on a more regular schedule in
the future, timed less close to ports-lock.
The main benefit of this upgrade is that nsh will now work fine as
a login shell, making it worth being listed in /etc/shells.
The 'enable' command will now re-exec to the root user, with authentication
via /etc/doas.conf or the root password. There is no more need for wrapper
scripts involving doas or sudo starting nsh as root.
Thanks to claudio@ for suggesting this design change.
New features:
the "enable" command switches to the root user via doas.conf or root password
add bgpnsh(8), a minimal version of nsh for use as a BGP looking-glass shell
add umb(4) support
allow nsh commands to be piped to standard input from another process
allow empty configuration files to be filled with data from /etc/examples
add "show pf" commands to display pf firewall status
add "show crontab", "crontab edit", "crontab install" commands
add "show environment", "setenv", "unsetenv", and 'saveenv' commands
ok?
---
diff ee7c68ff49b85bd3287aafeb87a37caf249dc14d
1a6361e5c0dfbb57d2717a0b887bb9f794c0d721
commit - ee7c68ff49b85bd3287aafeb87a37caf249dc14d
commit + 1a6361e5c0dfbb57d2717a0b887bb9f794c0d721
blob - 0aaceefc96346a2389b06c8bfd669198766ad537
blob + a04db8534b2234268a982f7b2a262d54834a9188
--- shells/nsh/Makefile
+++ shells/nsh/Makefile
@@ -1,42 +1,47 @@
COMMENT = network switch style shell
-
-GH_ACCOUNT = yellowman
-GH_PROJECT = nsh
-GH_TAGNAME = v1.1
CATEGORIES = shells net
HOMEPAGE = https://www.nmedia.net/nsh/
+V =1.2
+DISTNAME = nsh-${V}
+SITES =
https://github.com/yellowman/nsh/releases/download/v${V}/
MAINTAINER = Tom Smyth
# BSD
PERMIT_PACKAGE = Yes
+# uses pledge()
WANTLIB += c curses edit sqlite3
FLAVORS = static
FLAVOR ?=
-MAKE_FLAGS = CC="${CC}" \
- CPPFLAGS="-I${LOCALBASE}/include" \
+CPPFLAGS = -I${LOCALBASE}/include \
+ -DNSH_REXEC_PATH=${LOCALBASE}/bin/nsh
+
+MAKE_ENV = CC="${CC}" \
+ CPPFLAGS="${CPPFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib"
LIB_DEPENDS = databases/sqlite3
+FAKE_FLAGS = PREFIX=${TRUEPREFIX}
+
.if ${FLAVOR:Mstatic}
-MAKE_FLAGS += LDADD="-ledit -ltermcap -lsqlite3 -lm -lpthread -static"
+MAKE_FLAGS += LDFLAGS="-L${LOCALBASE}/lib -ledit -ltermcap -lsqlite3 -lm
-lpthread -static"
.endif
NO_TEST= Yes
-do-install:
- ${INSTALL_PROGRAM} ${WRKDIST}/nsh ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKDIST}/nsh.8 ${PREFIX}/man/man8/
+post-configure:
+ ${MAKE} -C ${WRKDIST} obj
+
+post-install:
.for i in save-ro.sh save-rw.sh
${INSTALL_SCRIPT} ${WRKDIST}/${i} ${PREFIX}/bin
.endfor
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nsh
- sed -i s,/usr/local,${LOCALBASE},g ${WRKDIST}/MANUAL
-.for i in MANUAL README TODO COPYRIGHT
+.for i in README.md COPYRIGHT
${INSTALL_DATA} ${WRKDIST}/${i} ${PREFIX}/share/doc/nsh/
.endfor
blob - 2492a4efdcc68c8b34cb856649bd213dd17527ae
blob + 66553f4bfd591f6ca681c2ffd6208f44ff935571
--- shells/nsh/distinfo
+++ shells/nsh/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nsh-1.1.tar.gz) = v0sHzQ2zEoAzbsaZVeVuhp2R0R37cZvNy/RvJ0Df2Pc=
-SIZE (nsh-1.1.tar.gz) = 185700
+SHA256 (nsh-1.2.tar.gz) = XFfUOMhVUCyn+5PhCoXafNIhXxi/GCPXYw2AskzoR/4=
+SIZE (nsh-1.2.tar.gz) = 218922
blob - 247187103b8ceb212dd73ae979309741337c333e
blob + e0707c1e344d5c8f62297f52c1e9d651fd5ec15e
--- shells/nsh/pkg/PLIST
+++ shells/nsh/pkg/PLIST
@@ -1,3 +1,4 @@
+@shell bin/bgpnsh
@shell bin/nsh
bin/save-ro.sh
bin/save-rw.sh
@@ -8,9 +9,11 @@ bin/save-rw.sh
@mode
@owner
@group
+@mode 04555
+@bin libexec/nshdoas
+@mode
+@man man/man8/bgpnsh.8
@man man/man8/nsh.8
share/doc/nsh/
share/doc/nsh/COPYRIGHT
-share/doc/nsh/MANUAL
-share/doc/nsh/README
-share/doc/nsh/TODO
+share/doc/nsh/README.md
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/09/29 04:49:53 Modified files: devel/spidermonkey102: Makefile distinfo Log message: Update to spidermonkey102-102.15.0.
Re: Valgrind: Detect access outside the range of malloc.
I have fixed the bug you reported when symbols were not printed.
As shown below, if the lower 12 bits of Virtual Address are 0 and File
Size is 0, then the a.out symbol will not be printed.
$ readelf -l a.out
Program Headers:
Type Offset VirtAddr PhysAddr
FileSizMemSiz Flags Align
LOAD 0x1000 0x3000 0x3000
0x 0x0055 RW 1000
From: Otto Moerbeek
Date: Tue, 5 Sep 2023 07:40:18 +0200
> On Tue, Sep 05, 2023 at 09:38:40AM +0900, Masato Asou wrote:
>
>> hi,
>>
>> I have fixed a bug in Valgrind. The Valgrind could not detect access
>> outside the range of malloc.
>>
>> comments, ok?
>
> This works much better that before. Thanks for working on this!
>
> It now detects out of bounds read and writes correctly. A double
> free is detected.
> Also, the spurious reports for accesses to errno are gone.
>
> It does not report proper locations though, even if I compile my test
> program with -g:
>
> ==23912== Invalid read of size 1
> ==23912==at 0x109B5D: ??? (in ./a.out)
> ==23912==by 0x1098D1: ??? (in ./a.out)
> ==23912== Address 0x4a42840 is 0 bytes after a block of size 10,240 alloc'd
> ==23912==at 0x493A3A9: malloc (vg_replace_malloc.c:435)
> ==23912==by 0x109B32: ??? (in ./a.out)
> ==23912==by 0x1098D1: ??? (in ./a.out)
> ==23912==
> 0
The a.out symbol is now printed as shown below:
$ cat malloctest.c
#include
#include
int
main(int argc, char *argv[])
{
size_t sz = atoi(argv[1]);
unsigned char *p = malloc(sz);
printf("%p\n", p);
p[sz] = 0;
printf("%x\n", p[sz]);
free(p);
free(p);
return 0;
}
$ cc -g malloctest.c
$ valgrind ./a.out 128
==21074== Memcheck, a memory error detector
==21074== Copyright (C) 2002-2022, and GNU GPL'd, by Julian Seward et al.
==21074== Using Valgrind-3.21.0 and LibVEX; rerun with -h for copyright info
==21074== Command: ./a.out 128
==21074==
==21074== Use of uninitialised value of size 8
==21074==at 0x49C34CD: write (sys/w_write.c:26)
==21074==by 0x4A150D2: __sflush (stdio/fflush.c:80)
==21074==by 0x49B99C8: __sfvwrite (stdio/fvwrite.c:191)
==21074==by 0x4979E4D: __sprint (stdio/vfprintf.c:108)
==21074==by 0x4979E4D: __vfprintf (stdio/vfprintf.c:1064)
==21074==by 0x4976B05: vfprintf (stdio/vfprintf.c:263)
==21074==by 0x49D6434: printf (stdio/printf.c:44)
==21074==by 0x109B48: main (malloctest.c:9)
==21074==
==21074== Use of uninitialised value of size 8
==21074==at 0x49C34DE: write (sys/w_write.c:26)
==21074==by 0x4A150D2: __sflush (stdio/fflush.c:80)
==21074==by 0x49B99C8: __sfvwrite (stdio/fvwrite.c:191)
==21074==by 0x4979E4D: __sprint (stdio/vfprintf.c:108)
==21074==by 0x4979E4D: __vfprintf (stdio/vfprintf.c:1064)
==21074==by 0x4976B05: vfprintf (stdio/vfprintf.c:263)
==21074==by 0x49D6434: printf (stdio/printf.c:44)
==21074==by 0x109B48: main (malloctest.c:9)
> ==23912== Invalid free() / delete / delete[] / realloc()
> ==23912==at 0x493C981: free (vg_replace_malloc.c:978)
> ==23912==by 0x109B80: ??? (in ./a.out)
> ==23912==by 0x1098D1: ??? (in ./a.out)
> ==23912== Address 0x4a40040 is 0 bytes inside a block of size 10,240 free'd
> ==23912==at 0x493C981: free (vg_replace_malloc.c:978)
> ==23912==by 0x109B77: ??? (in ./a.out)
> ==23912==by 0x1098D1: ??? (in ./a.out)
> ==23912== Block was alloc'd at
> ==23912==at 0x493A3A9: malloc (vg_replace_malloc.c:435)
> ==23912==by 0x109B32: ??? (in ./a.out)
> ==23912==by 0x1098D1: ??? (in ./a.out)
>
> addr2line -e ./a.out 0x109B80 also does not succeed in translating the
> address.
Address reported by Valgrind cannot be used for addr2line. Because
the address is the address of the area where Valgrind mapped a.out
with mmap().
The Makefile and patch-coregrind_m_replacemalloc_vg_replace_malloc_c
in the following diff are the same as the first reported diff.
ok, comments?
--
ASOU Masato
Index: devel/valgrind/Makefile
===
RCS file: /cvs/ports/devel/valgrind/Makefile,v
retrieving revision 1.32
diff -u -p -r1.32 Makefile
--- devel/valgrind/Makefile 21 Sep 2023 09:50:07 - 1.32
+++ devel/valgrind/Makefile 29 Sep 2023 09:44:46 -
@@ -5,7 +5,7 @@ CATEGORIES =devel
V =3.21.0
DISTNAME = valgrind-${V}
-REVISION = 0
+REVISION = 1
EXTRACT_SUFX = .tar.bz2
SITES =https://sourceware.org/pub/valgrind/
Index: devel/valgrind/patches/patch-coregrind_m_aspacemgr_aspacemgr_linux_c
===
RCS file:
/cvs/ports/devel/valgrind/patches/patch-coregrind_m_aspacemgr_aspacemgr_linux_c,v
retrieving revision 1.1
diff -u -p -r1.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2023/09/29 04:25:42 Modified files: www/chromium : Makefile distinfo www/chromium/patches: patch-chrome_app_generated_resources_grd patch-chrome_browser_ui_views_frame_tab_strip_region_view_cc patch-components_password_manager_core_browser_login_database_cc patch-net_dns_address_info_cc www/ungoogled-chromium: Makefile distinfo www/ungoogled-chromium/patches: patch-chrome_app_generated_resources_grd patch-components_password_manager_core_browser_login_database_cc patch-net_dns_address_info_cc Added files: www/chromium/patches: patch-chrome_browser_extensions_api_runtime_chrome_runtime_api_delegate_cc www/ungoogled-chromium/patches: patch-chrome_browser_extensions_api_runtime_chrome_runtime_api_delegate_cc Log message: update to 117.0.5938.132
Widelands crash fix
volker's recent commit to widelands didn't fix the crash I'm seeing.
That makes sense, because we compared backtraces and the crash he saw
was totally different.
Backporting this patch (labeled as "for Mesa 23.x") fixes my crash.
ok?
Index: Makefile
===
RCS file: /cvs/ports/games/widelands/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- Makefile28 Sep 2023 20:50:51 - 1.38
+++ Makefile29 Sep 2023 09:51:01 -
@@ -3,7 +3,7 @@ COMMENT = economic and military simulati
GH_ACCOUNT = widelands
GH_PROJECT = widelands
GH_TAGNAME = v1.0
-REVISION = 2
+REVISION = 3
CATEGORIES = games
Index: patches/patch-src_graphic_texture_cc
===
RCS file: patches/patch-src_graphic_texture_cc
diff -N patches/patch-src_graphic_texture_cc
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_graphic_texture_cc29 Sep 2023 09:51:01 -
@@ -0,0 +1,39 @@
+Backport Mesa 23.x fix from upstream.
+https://github.com/widelands/widelands/commit/48e5fd48c3f6418ebb53a145177d0417dc96451b
+
+Index: src/graphic/texture.cc
+--- src/graphic/texture.cc.orig
src/graphic/texture.cc
+@@ -116,9 +116,11 @@ Texture::Texture(SDL_Surface* surface, bool intensity)
+ uint8_t bpp = surface->format->BytesPerPixel;
+
+ if (surface->format->palette || width() != surface->w || height() !=
surface->h ||
+- (bpp != 3 && bpp != 4) || is_bgr_surface(*surface->format)) {
++ (bpp != 4) || is_bgr_surface(*surface->format)) {
+ SDL_Surface* converted = empty_sdl_surface(width(), height());
+- assert(converted);
++ if (converted == nullptr) {
++ throw wexception("Failed to create SDL_Surface");
++ }
+ SDL_SetSurfaceAlphaMod(converted, SDL_ALPHA_OPAQUE);
+ SDL_SetSurfaceBlendMode(converted, SDL_BLENDMODE_NONE);
+ SDL_SetSurfaceAlphaMod(surface, SDL_ALPHA_OPAQUE);
+@@ -127,16 +129,15 @@ Texture::Texture(SDL_Surface* surface, bool intensity)
+ SDL_FreeSurface(surface);
+ surface = converted;
+ bpp = surface->format->BytesPerPixel;
++ assert(bpp == 4);
+ }
+
+- const GLenum pixels_format = bpp == 4 ? GL_RGBA : GL_RGB;
+-
+ SDL_LockSurface(surface);
+
+ Gl::swap_rows(width(), height(), surface->pitch, bpp,
static_cast(surface->pixels));
+
+ glTexImage2D(GL_TEXTURE_2D, 0, static_cast(intensity ?
GL_INTENSITY : GL_RGBA), width(),
+- height(), 0, pixels_format, GL_UNSIGNED_BYTE,
surface->pixels);
++ height(), 0, GL_RGBA, GL_UNSIGNED_BYTE, surface->pixels);
+
+ SDL_UnlockSurface(surface);
+ SDL_FreeSurface(surface);
Re: CVS: cvs.openbsd.org: ports
Thanks - fixed. On 2023/09/29 11:44, Solène Rapenne wrote: > Le 28/09/2023 à 23:37, Stuart Henderson a écrit : > > CVSROOT:/cvs > > Module name:ports > > Changes by: st...@cvs.openbsd.org 2023/09/28 15:37:21 > > > > Modified files: > > www/ap2-mod_jk : Tag: OPENBSD_7_3 Makefile > > www/ap2-mod_jk/patches: Tag: OPENBSD_7_3 patch-native_configure > > Added files: > > www/ap2-mod_jk/patches: Tag: OPENBSD_7_3 > > patch-native_apache-2_0_Makefile_in > > > > Log message: > > update to ap2-mod_jk-1.2.49, CVE-2023-41081: > > Unexpected use of first declared worker in mod_jk for unmapped request > > > > this fails to compile > > > amd64-stable$ make > ===> ap2-mod_jk-1.2.49 depends on: apache-httpd-* -> apache-httpd-2.4.56 > ===> ap2-mod_jk-1.2.49 depends on: gmake-* -> gmake-4.3 > ===> Verifying specs: pthread > ===> found pthread.27.0 > ===> Checking files for ap2-mod_jk-1.2.49 > `/mnt/distfiles/tomcat-connectors-1.2.49-src.tar.gz' is up to date. > !!! Extra file 'tomcat-connectors-1.2.48-src.tar.gz' in > /home/ports/www/ap2-mod_jk/distinfo > !!! Read up on SUPDISTFILES in bsd.port.mk(5) > *** Error 1 in . (/home/ports//infrastructure/mk/bsd.port.mk:2497 > '_internal-checksum': @grep 2>/dev/null ^SIZE /home/ports/www/ap2-mod_jk/d...) > *** Error 2 in . (/home/ports//infrastructure/mk/bsd.port.mk:2694 > '/build/tmp/pobj//ap2-mod_jk-1.2.49/.extract_done': @cd /home/ports/www/ap...) > *** Error 2 in /home/ports/www/ap2-mod_jk > (/home/ports//infrastructure/mk/bsd.port.mk:2600 'all': > @lock=ap2-mod_jk-1.2.49; export _LOCKS_HE...)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2023/09/29 04:12:31 Modified files: www/ap2-mod_jk : Tag: OPENBSD_7_3 distinfo Log message: missed in previous, reported by solene@
Re: CVS: cvs.openbsd.org: ports
Le 28/09/2023 à 23:37, Stuart Henderson a écrit : CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2023/09/28 15:37:21 Modified files: www/ap2-mod_jk : Tag: OPENBSD_7_3 Makefile www/ap2-mod_jk/patches: Tag: OPENBSD_7_3 patch-native_configure Added files: www/ap2-mod_jk/patches: Tag: OPENBSD_7_3 patch-native_apache-2_0_Makefile_in Log message: update to ap2-mod_jk-1.2.49, CVE-2023-41081: Unexpected use of first declared worker in mod_jk for unmapped request this fails to compile amd64-stable$ make ===> ap2-mod_jk-1.2.49 depends on: apache-httpd-* -> apache-httpd-2.4.56 ===> ap2-mod_jk-1.2.49 depends on: gmake-* -> gmake-4.3 ===> Verifying specs: pthread ===> found pthread.27.0 ===> Checking files for ap2-mod_jk-1.2.49 `/mnt/distfiles/tomcat-connectors-1.2.49-src.tar.gz' is up to date. !!! Extra file 'tomcat-connectors-1.2.48-src.tar.gz' in /home/ports/www/ap2-mod_jk/distinfo !!! Read up on SUPDISTFILES in bsd.port.mk(5) *** Error 1 in . (/home/ports//infrastructure/mk/bsd.port.mk:2497 '_internal-checksum': @grep 2>/dev/null ^SIZE /home/ports/www/ap2-mod_jk/d...) *** Error 2 in . (/home/ports//infrastructure/mk/bsd.port.mk:2694 '/build/tmp/pobj//ap2-mod_jk-1.2.49/.extract_done': @cd /home/ports/www/ap...) *** Error 2 in /home/ports/www/ap2-mod_jk (/home/ports//infrastructure/mk/bsd.port.mk:2600 'all': @lock=ap2-mod_jk-1.2.49; export _LOCKS_HE...)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2023/09/29 03:24:58 Modified files: infrastructure/templates: mk.conf.template Log message: poison MASTER_SITES
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2023/09/29 03:16:58 Modified files: tests/portbump/t2: Makefile.inc Log message: bye bye MASTER*, you served us well
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2023/09/29 03:12:15 Modified files: infrastructure/lib/DPB: Config.pm Log message: bye bye MASTER*, you served us well
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/09/29 03:00:17 Modified files: print/hplip: Makefile distinfo print/hplip/patches: patch-Makefile_in patch-base_utils_py patch-prnt_hpcups_ErnieFilter_cpp patch-scan_py print/hplip/pkg: PLIST-hpijs Log message: Update to hplip-3.23.8.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/09/29 02:51:47 Modified files: net/dleyna : Makefile distinfo Removed files: net/dleyna/patches: patch-subprojects_gssdp-1_6_wrap patch-subprojects_gupnp-1_6_wrap patch-subprojects_gupnp-av-1_0_wrap Log message: Update to dleyna-0.8.3.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/09/29 02:46:38 Modified files: x11/gnome/zenity: Makefile distinfo Log message: Update to zenity-3.99.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/09/29 02:40:33 Modified files: x11/gnome/secrets: Makefile distinfo x11/gnome/secrets/pkg: PLIST Log message: Update to secrets-8.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/09/29 02:35:06 Modified files: x11/gnome/gucharmap: Makefile distinfo Log message: Update to gucharmap-15.1.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/09/29 02:23:25 Modified files: x11/gnome/aisleriot: Makefile distinfo Log message: Update to aisleriot-3.22.30.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/09/29 01:24:14 Modified files: textproc/fstrcmp: Makefile Log message: MASTER_SITES -> SITES
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/09/29 00:39:01 Modified files: productivity/gnucash-docs: Makefile distinfo productivity/gnucash-docs/pkg: PLIST Log message: Update to gnucash-docs-5.4.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/09/29 00:38:46 Modified files: productivity/gnucash: Makefile distinfo Log message: Update to gnucash-5.4.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/09/29 00:20:54 Modified files: x11/gtk+4 : Makefile distinfo Log message: Update to gtk+4-4.12.3 (fixes a few crashers).
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/09/29 00:20:07 Modified files: sysutils/govmomi: Makefile distinfo Log message: Update to govc-0.32.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/09/29 00:18:22 Modified files: x11/gnome/tracker3-miners: Makefile distinfo Log message: Update to tracker3-miners-3.6.1.
