Fri Jan 28 21:34:52 2022 UTC ()
Sufficiently old Darwin (e.g., Snow Leopard) needs SOL_LOCAL defined.


(schmonz)
diff -r1.296 -r1.297 pkgsrc/devel/glib2/distinfo
diff -r1.4 -r1.5 pkgsrc/devel/glib2/patches/patch-gio_gcredentialsprivate.h
cvs diff -r1.296 -r1.297 pkgsrc/devel/glib2/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/glib2/distinfo 2021/12/07 10:07:05 1.296
+++ pkgsrc/devel/glib2/distinfo 2022/01/28 21:34:51 1.297
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: distinfo,v 1.296 2021/12/07 10:07:05 adam Exp $ 1$NetBSD: distinfo,v 1.297 2022/01/28 21:34:51 schmonz Exp $
2 2
3BLAKE2s (glib-2.70.2.tar.xz) = 3b46520dac3bc5f18a89eaa98a0cdb461df20c37e439b44451551fe8eb759aed 3BLAKE2s (glib-2.70.2.tar.xz) = 3b46520dac3bc5f18a89eaa98a0cdb461df20c37e439b44451551fe8eb759aed
4SHA512 (glib-2.70.2.tar.xz) = 872e3f06f87f21a32446b41aac7454fd6bf4d665c753121f6e9772cddebc592b79d88713fc6b8d510636af9f9c4528a9d508d8c4225c6dfeb928390120fb4809 4SHA512 (glib-2.70.2.tar.xz) = 872e3f06f87f21a32446b41aac7454fd6bf4d665c753121f6e9772cddebc592b79d88713fc6b8d510636af9f9c4528a9d508d8c4225c6dfeb928390120fb4809
5Size (glib-2.70.2.tar.xz) = 4822356 bytes 5Size (glib-2.70.2.tar.xz) = 4822356 bytes
6SHA1 (patch-gio_gcredentialsprivate.h) = 6547edb518a98c3aca53acc1f98bde83e71b14cb 6SHA1 (patch-gio_gcredentialsprivate.h) = f719ae41a9eb1d2f04d866b246fa5176543f2df9
7SHA1 (patch-gio_gdbus-2.0_codegen_meson.build) = ec8ce89da08059ebf953d84a1dca5a2b380349f4 7SHA1 (patch-gio_gdbus-2.0_codegen_meson.build) = ec8ce89da08059ebf953d84a1dca5a2b380349f4
8SHA1 (patch-gio_giomodule.c) = 68e612ac178c41aa0aae2bd66c3e4263910711ac 8SHA1 (patch-gio_giomodule.c) = 68e612ac178c41aa0aae2bd66c3e4263910711ac
9SHA1 (patch-gio_glib-compile-schemas.c) = 4fc8e8ba62bef01762007ebf21569053374808d0 9SHA1 (patch-gio_glib-compile-schemas.c) = 4fc8e8ba62bef01762007ebf21569053374808d0
10SHA1 (patch-gio_gresource-tool.c) = ad0e59f48f5f98ea66be568dbe2e5a5d1ac602fc 10SHA1 (patch-gio_gresource-tool.c) = ad0e59f48f5f98ea66be568dbe2e5a5d1ac602fc
11SHA1 (patch-gio_gunixcredentialsmessage.c) = c13119ddd6262db7c03e53857e987f0c495d3312 11SHA1 (patch-gio_gunixcredentialsmessage.c) = c13119ddd6262db7c03e53857e987f0c495d3312
12SHA1 (patch-gio_gunixmounts.c) = 6213fb2d4cb52af0ebbe794832e37dd3de9fd27f 12SHA1 (patch-gio_gunixmounts.c) = 6213fb2d4cb52af0ebbe794832e37dd3de9fd27f
13SHA1 (patch-gio_inotify_inotify-kernel.c) = 78544b4c32ef3b44e8721b1c07407f46a9e8c8a4 13SHA1 (patch-gio_inotify_inotify-kernel.c) = 78544b4c32ef3b44e8721b1c07407f46a9e8c8a4
14SHA1 (patch-gio_meson.build) = 07c0fd5cc495b3bf3788cf77701a9ebc8df70115 14SHA1 (patch-gio_meson.build) = 07c0fd5cc495b3bf3788cf77701a9ebc8df70115
15SHA1 (patch-gio_tests_gdbus-export.c) = 59d85ca079d02b52e33153c7d2ac1cc48c26707a 15SHA1 (patch-gio_tests_gdbus-export.c) = 59d85ca079d02b52e33153c7d2ac1cc48c26707a
16SHA1 (patch-glib_gatomic.c) = deb2e74010523ad41ce141aa2f49b807ba2672e6 16SHA1 (patch-glib_gatomic.c) = deb2e74010523ad41ce141aa2f49b807ba2672e6
17SHA1 (patch-glib_gatomic.h) = d1c39c3594a5c89d196349e5eafb5512795f55f8 17SHA1 (patch-glib_gatomic.h) = d1c39c3594a5c89d196349e5eafb5512795f55f8
18SHA1 (patch-glib_genviron.c) = dd25be36536d56dfe933225d785eb65f753c4a97 18SHA1 (patch-glib_genviron.c) = dd25be36536d56dfe933225d785eb65f753c4a97
19SHA1 (patch-glib_gspawn.c) = 8f833edd594168fe62c5d0e161ebaafdebda2294 19SHA1 (patch-glib_gspawn.c) = 8f833edd594168fe62c5d0e161ebaafdebda2294
cvs diff -r1.4 -r1.5 pkgsrc/devel/glib2/patches/patch-gio_gcredentialsprivate.h (expand / switch to unified diff)

--- pkgsrc/devel/glib2/patches/patch-gio_gcredentialsprivate.h 2020/09/29 10:43:33 1.4
+++ pkgsrc/devel/glib2/patches/patch-gio_gcredentialsprivate.h 2022/01/28 21:34:51 1.5
@@ -1,15 +1,26 @@ @@ -1,15 +1,26 @@
1$NetBSD: patch-gio_gcredentialsprivate.h,v 1.4 2020/09/29 10:43:33 prlw1 Exp $ 1$NetBSD: patch-gio_gcredentialsprivate.h,v 1.5 2022/01/28 21:34:51 schmonz Exp $
2 2
3NetBSD has G_CREDENTIALS_SOCKET_GET_CREDENTIALS_SUPPORTED. 3NetBSD has G_CREDENTIALS_SOCKET_GET_CREDENTIALS_SUPPORTED.
 4Sufficiently old Darwin (e.g., Snow Leopard) needs SOL_LOCAL defined.
4 5
5--- gio/gcredentialsprivate.h.orig 2020-08-18 10:52:24.847177300 +0000 6--- gio/gcredentialsprivate.h.orig 2021-12-03 10:02:55.000000000 +0000
6+++ gio/gcredentialsprivate.h 7+++ gio/gcredentialsprivate.h
7@@ -134,7 +134,7 @@ 8@@ -134,7 +134,7 @@
8 #define G_CREDENTIALS_USE_NETBSD_UNPCBID 1 9 #define G_CREDENTIALS_USE_NETBSD_UNPCBID 1
9 #define G_CREDENTIALS_NATIVE_TYPE G_CREDENTIALS_TYPE_NETBSD_UNPCBID 10 #define G_CREDENTIALS_NATIVE_TYPE G_CREDENTIALS_TYPE_NETBSD_UNPCBID
10 #define G_CREDENTIALS_NATIVE_SIZE (sizeof (struct unpcbid)) 11 #define G_CREDENTIALS_NATIVE_SIZE (sizeof (struct unpcbid))
11-/* #undef G_CREDENTIALS_UNIX_CREDENTIALS_MESSAGE_SUPPORTED */ 12-/* #undef G_CREDENTIALS_UNIX_CREDENTIALS_MESSAGE_SUPPORTED */
12+#define G_CREDENTIALS_SOCKET_GET_CREDENTIALS_SUPPORTED 1 13+#define G_CREDENTIALS_SOCKET_GET_CREDENTIALS_SUPPORTED 1
13 #define G_CREDENTIALS_SPOOFING_SUPPORTED 1 14 #define G_CREDENTIALS_SPOOFING_SUPPORTED 1
14 #define G_CREDENTIALS_HAS_PID 1 15 #define G_CREDENTIALS_HAS_PID 1
15  16
 17@@ -159,6 +159,9 @@
 18
 19 #elif defined(__APPLE__)
 20 #include <sys/ucred.h>
 21+#ifndef SOL_LOCAL
 22+#define SOL_LOCAL 0
 23+#endif
 24 #define G_CREDENTIALS_SUPPORTED 1
 25 #define G_CREDENTIALS_USE_APPLE_XUCRED 1
 26 #define G_CREDENTIALS_NATIVE_TYPE G_CREDENTIALS_TYPE_APPLE_XUCRED