CVS commit: pkgsrc/devel/glib2

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Fri Jan 28 21:34:52 UTC 2022

Modified Files:
        pkgsrc/devel/glib2: distinfo
        pkgsrc/devel/glib2/patches: patch-gio_gcredentialsprivate.h

Log Message:
Sufficiently old Darwin (e.g., Snow Leopard) needs SOL_LOCAL defined.


To generate a diff of this commit:
cvs rdiff -u -r1.296 -r1.297 pkgsrc/devel/glib2/distinfo
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/devel/glib2/patches/patch-gio_gcredentialsprivate.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/glib2/distinfo
diff -u pkgsrc/devel/glib2/distinfo:1.296 pkgsrc/devel/glib2/distinfo:1.297
--- pkgsrc/devel/glib2/distinfo:1.296   Tue Dec  7 10:07:05 2021
+++ pkgsrc/devel/glib2/distinfo Fri Jan 28 21:34:51 2022
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.296 2021/12/07 10:07:05 adam Exp $
+$NetBSD: distinfo,v 1.297 2022/01/28 21:34:51 schmonz Exp $
 
 BLAKE2s (glib-2.70.2.tar.xz) = 3b46520dac3bc5f18a89eaa98a0cdb461df20c37e439b44451551fe8eb759aed
 SHA512 (glib-2.70.2.tar.xz) = 872e3f06f87f21a32446b41aac7454fd6bf4d665c753121f6e9772cddebc592b79d88713fc6b8d510636af9f9c4528a9d508d8c4225c6dfeb928390120fb4809
 Size (glib-2.70.2.tar.xz) = 4822356 bytes
-SHA1 (patch-gio_gcredentialsprivate.h) = 6547edb518a98c3aca53acc1f98bde83e71b14cb
+SHA1 (patch-gio_gcredentialsprivate.h) = f719ae41a9eb1d2f04d866b246fa5176543f2df9
 SHA1 (patch-gio_gdbus-2.0_codegen_meson.build) = ec8ce89da08059ebf953d84a1dca5a2b380349f4
 SHA1 (patch-gio_giomodule.c) = 68e612ac178c41aa0aae2bd66c3e4263910711ac
 SHA1 (patch-gio_glib-compile-schemas.c) = 4fc8e8ba62bef01762007ebf21569053374808d0

Index: pkgsrc/devel/glib2/patches/patch-gio_gcredentialsprivate.h
diff -u pkgsrc/devel/glib2/patches/patch-gio_gcredentialsprivate.h:1.4 pkgsrc/devel/glib2/patches/patch-gio_gcredentialsprivate.h:1.5
--- pkgsrc/devel/glib2/patches/patch-gio_gcredentialsprivate.h:1.4      Tue Sep 29 10:43:33 2020
+++ pkgsrc/devel/glib2/patches/patch-gio_gcredentialsprivate.h  Fri Jan 28 21:34:51 2022
@@ -1,8 +1,9 @@
-$NetBSD: patch-gio_gcredentialsprivate.h,v 1.4 2020/09/29 10:43:33 prlw1 Exp $
+$NetBSD: patch-gio_gcredentialsprivate.h,v 1.5 2022/01/28 21:34:51 schmonz Exp $
 
 NetBSD has G_CREDENTIALS_SOCKET_GET_CREDENTIALS_SUPPORTED.
+Sufficiently old Darwin (e.g., Snow Leopard) needs SOL_LOCAL defined.
 
---- gio/gcredentialsprivate.h.orig     2020-08-18 10:52:24.847177300 +0000
+--- gio/gcredentialsprivate.h.orig     2021-12-03 10:02:55.000000000 +0000
 +++ gio/gcredentialsprivate.h
 @@ -134,7 +134,7 @@
  #define G_CREDENTIALS_USE_NETBSD_UNPCBID 1
@@ -13,3 +14,13 @@ NetBSD has G_CREDENTIALS_SOCKET_GET_CRED
  #define G_CREDENTIALS_SPOOFING_SUPPORTED 1
  #define G_CREDENTIALS_HAS_PID 1
  
+@@ -159,6 +159,9 @@
+ 
+ #elif defined(__APPLE__)
+ #include <sys/ucred.h>
++#ifndef SOL_LOCAL
++#define SOL_LOCAL 0
++#endif
+ #define G_CREDENTIALS_SUPPORTED 1
+ #define G_CREDENTIALS_USE_APPLE_XUCRED 1
+ #define G_CREDENTIALS_NATIVE_TYPE G_CREDENTIALS_TYPE_APPLE_XUCRED