summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--security/gcr/Makefile4
-rw-r--r--security/gcr/distinfo3
-rw-r--r--security/gcr/patches/patch-gcr_test-secure-memory.c25
3 files changed, 29 insertions, 3 deletions
diff --git a/security/gcr/Makefile b/security/gcr/Makefile
index e0b45b7ef6a..7112efd716e 100644
--- a/security/gcr/Makefile
+++ b/security/gcr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2020/11/07 07:17:07 mef Exp $
+# $NetBSD: Makefile,v 1.13 2020/11/17 12:25:16 nia Exp $
DISTNAME= gcr-3.38.0
CATEGORIES= security
@@ -35,7 +35,7 @@ PKGCONFIG_OVERRIDE+= gcr-3.pc.in
TEST_TARGET= check
pre-configure:
- cd ${WRKSRC}; \
+ cd ${WRKSRC}; NOCONFIGURE=1 \
./autogen.sh
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.38
diff --git a/security/gcr/distinfo b/security/gcr/distinfo
index 9be06710cf7..679533f8646 100644
--- a/security/gcr/distinfo
+++ b/security/gcr/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2020/11/07 07:17:07 mef Exp $
+$NetBSD: distinfo,v 1.3 2020/11/17 12:25:16 nia Exp $
SHA1 (gcr-3.38.0.tar.xz) = ec77b51962010555445c84981f30a32f6426323e
RMD160 (gcr-3.38.0.tar.xz) = bfe464c4e7135a1ae753c9c2c93f6b53635f4416
SHA512 (gcr-3.38.0.tar.xz) = 24c35ac514a67a1dee6a5738e829b55921a490b060ffa597421cea0abac3ddc62695370d2c7b3504c0adfd55b1ade878ad3ca5e6cb869428b4a19f4a11563bc6
Size (gcr-3.38.0.tar.xz) = 1029784 bytes
+SHA1 (patch-gcr_test-secure-memory.c) = e8002f64467d001e06c8af28f16b0c1ffe7211ad
diff --git a/security/gcr/patches/patch-gcr_test-secure-memory.c b/security/gcr/patches/patch-gcr_test-secure-memory.c
new file mode 100644
index 00000000000..c5a262c535f
--- /dev/null
+++ b/security/gcr/patches/patch-gcr_test-secure-memory.c
@@ -0,0 +1,25 @@
+$NetBSD: patch-gcr_test-secure-memory.c,v 1.1 2020/11/17 12:25:16 nia Exp $
+
+Skip test on platforms without RLIMIT_MEMLOCK (illumos).
+
+--- gcr/test-secure-memory.c.orig 2020-09-28 05:33:20.870133200 +0000
++++ gcr/test-secure-memory.c
+@@ -66,6 +66,7 @@ get_rlimit_memlock (void)
+ return 0;
+ }
+
++#ifdef RLIMIT_MEMLOCK
+ if (getrlimit (RLIMIT_MEMLOCK, &memlock) != 0)
+ g_error ("getrlimit() failed: %s", strerror (errno));
+
+@@ -83,6 +84,10 @@ get_rlimit_memlock (void)
+ }
+
+ return memlock.rlim_cur;
++#else
++ g_test_skip ("platform lacks RLIMIT_MEMLOCK");
++ return 0;
++#endif
+ }
+
+ static void