# HG changeset patch # User David Demelier # Date 1675848171 -3600 # Node ID ce4ef586c7871c52c8848cb4566df1ab2eb348d6 # Parent 1845a0509a93b954193a7b1936ce391478a0bf50# Parent 120febbe6495bc6cd1534768c5a59763e60a5e68 misc: merge from stable-4 diff -r 1845a0509a93 -r ce4ef586c787 .hgsigs --- a/.hgsigs Wed Feb 01 12:43:11 2023 +0100 +++ b/.hgsigs Wed Feb 08 10:22:51 2023 +0100 @@ -16,3 +16,4 @@ 51d5579f76234fb277d0e8d616e22d4f1c3768f7 0 iQEzBAABCAAdFiEEvr8S/JLqYAXrLA5Xodr5uEAj8x8FAmH7x2oACgkQodr5uEAj8x+LDQf/aA8EbsfL0yX/+NIJAAS1e9lysT2YocukbvFAUqc+W/DCpb0PDnexUu59NhMFunHNXXGMBUeYjqfujbC/VQX8EOdb74sQGWRiU3cuwbAvT6PWZg36DSRaDwEnXh7BJVVaLd1UNCQ/qCFPy+d7FHF9g1Cl6sn10CkyqbpvDZbySdlAeXAXHtNCKSKZB1CIEyrOArCENJgCGFVIKlikagIJU+W/ihIJ128VLQzY9+YyruVmHQeRzdaZ8P9/so02YCpm765mlmOJDY9jlUfW+vfD4wX+AgIeY8Js92pFa7ylmpiV5H0yANGLH/D7ypqnAJsidlwN72rVBK8BkiXfmpzGNw== 822afa84648929dc0f6088a1759be441804070cf 0 iQEzBAABCAAdFiEEvr8S/JLqYAXrLA5Xodr5uEAj8x8FAmIAzREACgkQodr5uEAj8x/t9AgAnXY6/7rmMim/ARIV1a5el4HWFqnxS/zqogZ3VnfEpNYxC+ZM0X0AIp+HUXFgsc7ARR6EziDUV0KoR5vPpVQTxVaYM5BwirP0naLNWZTxbNOpDwRJ3C/x9sSzngCWbLUB1GncY2KykeTVqmg6mFDBZ9A9vjtGFFC/QI2mtTgUBED0SuV6804CsclQLXpBI3mSfXl3j3xIyXvaNzBp8917asHUAAciAAYiXeIi6e9MMlj8kMNtTC4pUK7Zf00i1N/OyUzKbBdP8NM9nJIcdR6KpIHENI93nYpVc6WcAWxjnwNKReFsOKIarq6zH1USZfIb0ABbFkHh+Pz4azl6JajiYA== b4b0cbdb7607a195006d4ce58c737120acfcc773 0 iQEzBAABCAAdFiEEvr8S/JLqYAXrLA5Xodr5uEAj8x8FAmPISPUACgkQodr5uEAj8x9Oagf+OjxLL1r4sPaffF/bZau4QprSalF4rut0qaszeqYT4Jrd61H5CSc996h2sekHi8FM90gG435SK/q7dupV9cNo0EPP0ulsD2IwBWSuYQ5XEN1QZr+NGfABrUiouBq7okyDEuvZxWjamVPTlnb1hSOGD2xnig+VpYscso/d7CjU0A3eytfOliNCdQ3QTM105yFMhNu0yaqmqKHcnU95TRPmSUVhCO/74WjSpXBby8i6qmACOTS6EuB1DW/6+032XfXY29bYgap5obd+/6vlrVqjrBGiEKlinU1RXsuYjUiyUG+zEaSWXGJ4CL3Odjcb6hGfbEalI6mhegvdBkQO4Wdslg== +b710e59d5225c82d9a03c82ec479d8cf869ee5e1 0 iQEzBAABCAAdFiEEvr8S/JLqYAXrLA5Xodr5uEAj8x8FAmPjZtEACgkQodr5uEAj8x/fowgAq315SzEa8sRfFhFy8owyftkZKosqzxWwL90rDvChC+fRwX7wrAPMK/aBPBr5wiPJ1Sg8QlOD+GUd+C4VpHBL/88RicBt+YxlXnT6LKbqzKpKEpURW+JPtq7Yqif64AWSeepmx5jMXtyooH0Ae/8TJNf/mN26uEpw2cxHaeK2/KnIKq4QfgvAyh0QfNnuv6tHoUB0KmNlxk1b9ss5m/QQi6W5hF/+yzwhQjvgJVYlQ3aSWIBb6QgSmTTO97MM+UtShjovU/B+73+mW7vIk55iJFwYasra8kwEJcPC0y7b6qIX5AxxBr/4j0P9vLyrF4wS8y9bS8SlFgR88TqA63K1XA== diff -r 1845a0509a93 -r ce4ef586c787 .hgtags --- a/.hgtags Wed Feb 01 12:43:11 2023 +0100 +++ b/.hgtags Wed Feb 08 10:22:51 2023 +0100 @@ -16,3 +16,4 @@ c421701054d4755ffab6662d26de46bbe1a024a9 4.0.0 a362f8de153806d28b0c64730bc0233e1365dc00 4.0.1 55885e9cfbd622b0000eb217699833ffed7ea3e0 4.0.2 +3f0e7dbad326e57d391ab9a7514598ecff0ae273 4.0.3 diff -r 1845a0509a93 -r ce4ef586c787 CHANGES.md --- a/CHANGES.md Wed Feb 01 12:43:11 2023 +0100 +++ b/CHANGES.md Wed Feb 08 10:22:51 2023 +0100 @@ -22,6 +22,11 @@ - links: rewritten in Javascript using the brand new `Irccd.Http` API. +irccd 4.0.3 2023-02-08 +====================== + +- Fix build on NetBSD 9.3. + irccd 4.0.2 2023-01-18 ====================== diff -r 1845a0509a93 -r ce4ef586c787 CMakeLists.txt diff -r 1845a0509a93 -r ce4ef586c787 irccd/jsapi-system.c --- a/irccd/jsapi-system.c Wed Feb 01 12:43:11 2023 +0100 +++ b/irccd/jsapi-system.c Wed Feb 08 10:22:51 2023 +0100 @@ -27,7 +27,7 @@ # include #elif defined(__linux__) # include -#elif defined(__APPLE__) +#elif defined(__APPLE__) || defined(__NetBSD__) # include # include #endif @@ -168,7 +168,7 @@ jsapi_system_raise(ctx); duk_push_uint(ctx, info.uptime); -#elif defined(__APPLE__) +#elif defined(__APPLE__) || defined(__NetBSD__) struct timeval boottime; size_t length = sizeof (boottime); int mib[2] = { CTL_KERN, KERN_BOOTTIME };