I'm not particularly happy with the new patch-bsdauth_c patch to get the explicit_bzero() prototype visible. Any better suggestion ? ok ?
Index: Makefile =================================================================== RCS file: /local/cvs/ports/wayland/swaylock/Makefile,v diff -u -p -u -r1.3 Makefile --- Makefile 14 Sep 2024 06:25:15 -0000 1.3 +++ Makefile 23 Mar 2025 19:28:32 -0000 @@ -1,7 +1,8 @@ COMMENT = screen locker for Wayland -DISTNAME = swaylock-1.8.0 -SITES = https://github.com/swaywm/swaylock/releases/download/v1.8.0/ +V = 1.8.2 +DISTNAME = swaylock-${V} +SITES = https://github.com/swaywm/swaylock/releases/download/v${V}/ CATEGORIES = wayland Index: distinfo =================================================================== RCS file: /local/cvs/ports/wayland/swaylock/distinfo,v diff -u -p -u -r1.2 distinfo --- distinfo 14 Sep 2024 06:25:15 -0000 1.2 +++ distinfo 23 Mar 2025 19:28:32 -0000 @@ -1,2 +1,2 @@ -SHA256 (swaylock-1.8.0.tar.gz) = ahF1RCOAuHstKGjEpTZu41khYxWNAuOn+/Ogv+B9iwA= -SIZE (swaylock-1.8.0.tar.gz) = 33213 +SHA256 (swaylock-1.8.2.tar.gz) = zyNjVjUa8iZ5/fvhBxh6FJrKFUkVc3/bw8pWae813KM= +SIZE (swaylock-1.8.2.tar.gz) = 33588 Index: patches/patch-bsdauth_c =================================================================== RCS file: patches/patch-bsdauth_c diff -N patches/patch-bsdauth_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-bsdauth_c 23 Mar 2025 19:28:32 -0000 @@ -0,0 +1,15 @@ +Prototype for explicit_bzero() + +Index: bsdauth.c +--- bsdauth.c.orig ++++ bsdauth.c +@@ -6,6 +6,9 @@ + #include <login_cap.h> + #include <bsd_auth.h> + #include <grp.h> ++#undef __BSD_VISIBLE ++#define __BSD_VISIBLE 1 ++#include <string.h> + + #include "comm.h" + #include "log.h" Index: patches/patch-main_c =================================================================== RCS file: /local/cvs/ports/wayland/swaylock/patches/patch-main_c,v diff -u -p -u -r1.2 patch-main_c --- patches/patch-main_c 14 Sep 2024 06:25:15 -0000 1.2 +++ patches/patch-main_c 23 Mar 2025 19:28:32 -0000 @@ -3,7 +3,7 @@ https://github.com/swaywm/swaylock/pull/ Index: main.c --- main.c.orig +++ main.c -@@ -15,7 +15,6 @@ +@@ -14,7 +14,6 @@ #include <time.h> #include <unistd.h> #include <wayland-client.h> @@ -11,7 +11,7 @@ Index: main.c #include "background-image.h" #include "cairo.h" #include "comm.h" -@@ -358,23 +357,6 @@ static cairo_surface_t *select_image(struct swaylock_s +@@ -319,23 +318,6 @@ static cairo_surface_t *select_image(struct swaylock_s return default_image; } @@ -35,7 +35,7 @@ Index: main.c static void load_image(char *arg, struct swaylock_state *state) { // [[<output>]:]<path> struct swaylock_image *image = calloc(1, sizeof(struct swaylock_image)); -@@ -408,21 +390,12 @@ static void load_image(char *arg, struct swaylock_stat +@@ -369,21 +351,12 @@ static void load_image(char *arg, struct swaylock_stat } } @@ -57,7 +57,7 @@ Index: main.c // Load the actual image image->cairo_surface = load_background_image(image->path); -@@ -992,32 +965,57 @@ static bool file_exists(const char *path) { +@@ -953,32 +926,57 @@ static bool file_exists(const char *path) { return path && access(path, R_OK) != -1; } Index: patches/patch-meson_build =================================================================== RCS file: /local/cvs/ports/wayland/swaylock/patches/patch-meson_build,v diff -u -p -u -r1.2 patch-meson_build --- patches/patch-meson_build 14 Sep 2024 06:25:15 -0000 1.2 +++ patches/patch-meson_build 23 Mar 2025 19:28:32 -0000 @@ -1,15 +1,15 @@ Index: meson.build --- meson.build.orig +++ meson.build -@@ -24,6 +24,7 @@ add_project_arguments( - cc = meson.get_compiler('c') +@@ -23,6 +23,7 @@ add_project_arguments(cc.get_supported_arguments([ + ]), language: 'c') is_freebsd = host_machine.system().startswith('freebsd') +is_openbsd = host_machine.system().startswith('openbsd') - if is_freebsd add_project_arguments('-D_C11_SOURCE', language: 'c') -@@ -36,9 +37,9 @@ xkbcommon = dependency('xkbcommon') + endif +@@ -34,9 +35,9 @@ xkbcommon = dependency('xkbcommon') cairo = dependency('cairo') gdk_pixbuf = dependency('gdk-pixbuf-2.0', required: get_option('gdk-pixbuf')) libpam = cc.find_library('pam', required: get_option('pam')) @@ -21,7 +21,7 @@ Index: meson.build git = find_program('git', required: false) scdoc = find_program('scdoc', required: get_option('man-pages')) -@@ -88,7 +89,6 @@ dependencies = [ +@@ -86,7 +87,6 @@ dependencies = [ cairo, gdk_pixbuf, math, @@ -29,7 +29,7 @@ Index: meson.build xkbcommon, wayland_client, ] -@@ -110,12 +110,16 @@ sources = [ +@@ -108,12 +108,16 @@ sources = [ if libpam.found() sources += ['pam.c'] -- Matthieu Herrb
