diff options
author | wiz <wiz@pkgsrc.org> | 2012-03-17 02:19:08 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2012-03-17 02:19:08 +0000 |
commit | d2a0b679d270d36ca57f0cb6417a401e11388716 (patch) | |
tree | c8764f0b6aeb2225023c45d53fd0d2db15406f36 /sysutils/gamin | |
parent | 4234a76abbcdbb05afdb2081577c3466524d5467 (diff) | |
download | pkgsrc-d2a0b679d270d36ca57f0cb6417a401e11388716.tar.gz |
Fix build after G_CONST_RETURN has been deprecated.
Based on PR 46210 by Francis GUDIN.
Diffstat (limited to 'sysutils/gamin')
-rw-r--r-- | sysutils/gamin/distinfo | 8 | ||||
-rw-r--r-- | sysutils/gamin/patches/patch-ae | 22 | ||||
-rw-r--r-- | sysutils/gamin/patches/patch-server_gam__node.c | 15 | ||||
-rw-r--r-- | sysutils/gamin/patches/patch-server_gam__node.h | 15 | ||||
-rw-r--r-- | sysutils/gamin/patches/patch-server_gam__subscription.c | 15 | ||||
-rw-r--r-- | sysutils/gamin/patches/patch-server_gam__subscription.h | 15 |
6 files changed, 77 insertions, 13 deletions
diff --git a/sysutils/gamin/distinfo b/sysutils/gamin/distinfo index 3bf44d917cf..0132b77c6bb 100644 --- a/sysutils/gamin/distinfo +++ b/sysutils/gamin/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2010/04/16 22:32:14 jmmv Exp $ +$NetBSD: distinfo,v 1.8 2012/03/17 02:19:08 wiz Exp $ SHA1 (gamin-0.1.10.tar.gz) = f4c6b9fe87757552ef58fef4abef9e42cd3142ac RMD160 (gamin-0.1.10.tar.gz) = fb6ba5ec2d2f49afacf10dda4095f02f5930d686 @@ -7,8 +7,12 @@ SHA1 (patch-aa) = 0d3700cf3e1abd4dab2f6e801d31e25e352474a0 SHA1 (patch-ab) = d0f280fc8b2cbedee2d2a38cd67e8eb6aecba66d SHA1 (patch-ac) = bc06c646288bf1f1fcf4aa73eb06da55e0620b1e SHA1 (patch-ad) = 0ed5da772a0afbce7abf01623c9aebdd67e68537 -SHA1 (patch-ae) = 954e0d2678193e0bedab7e87b80548a3eef71b0e +SHA1 (patch-ae) = 957f1bc0690b6c41b7724c9667387b7f1e03e014 SHA1 (patch-af) = 7cda705d59206a1fad0c91b56206630f01717adc SHA1 (patch-ag) = 59b35394c29d0cbbf7905df24ef4ba913ebfec46 SHA1 (patch-ah) = 79e132b615a6492587a10a550c421fcc91a27761 SHA1 (patch-ai) = 54c6d347eef37a97e16c6f00870953fbdba41182 +SHA1 (patch-server_gam__node.c) = 286655e55996523d4ce5ea3df0ce6f9e12cf4278 +SHA1 (patch-server_gam__node.h) = 49a0d381b4900564c4f0ba7a654eb22e294c0a16 +SHA1 (patch-server_gam__subscription.c) = 58f6c10e4e1e899d097662536ea31bf8a692b114 +SHA1 (patch-server_gam__subscription.h) = 6347865210aa0338bc8b0a81fc671824c786fd26 diff --git a/sysutils/gamin/patches/patch-ae b/sysutils/gamin/patches/patch-ae index a5d3852ba08..94f291a3bdc 100644 --- a/sysutils/gamin/patches/patch-ae +++ b/sysutils/gamin/patches/patch-ae @@ -1,6 +1,6 @@ -$NetBSD: patch-ae,v 1.2 2009/03/17 13:34:06 jmcneill Exp $ +$NetBSD: patch-ae,v 1.3 2012/03/17 02:19:08 wiz Exp $ ---- libgamin/gam_api.c.orig 2007-08-27 06:21:03.000000000 -0400 +--- libgamin/gam_api.c.orig 2007-08-27 10:21:03.000000000 +0000 +++ libgamin/gam_api.c @@ -7,6 +7,7 @@ #include <stdlib.h> @@ -96,14 +96,14 @@ $NetBSD: patch-ae,v 1.2 2009/03/17 13:34:06 jmcneill Exp $ + struct iovec iov; + pid_t pid = getpid(); + int written; -+ + +- iov.iov_base = &data[0]; +- iov.iov_len = 1; +#if defined(BSDCRED) && !defined(LOCAL_CREDS) + struct cmsghdr *cmsg; + char cmsgbuf[CMSG_SPACE(CRED_DATASIZE)]; +#endif - -- iov.iov_base = &data[0]; -- iov.iov_len = 1; ++ + iov.iov_base = &pid; + iov.iov_len = sizeof(pid_t); @@ -216,15 +216,15 @@ $NetBSD: patch-ae,v 1.2 2009/03/17 13:34:06 jmcneill Exp $ + if (msg.msg_controllen == 0) { + GAM_DEBUG(DEBUG_INFO, + "No control message received over recvmsg()\n"); ++ goto failed; ++ } ++ if ((msg.msg_flags & MSG_CTRUNC) != 0) { ++ GAM_DEBUG(DEBUG_INFO, ++ "Lost control message data over recvmsg()\n"); goto failed; } -#ifdef HAVE_CMSGCRED - if (cmsg.hdr.cmsg_len < sizeof(cmsg) || cmsg.hdr.cmsg_type != SCM_CREDS) { -+ if ((msg.msg_flags & MSG_CTRUNC) != 0) { -+ GAM_DEBUG(DEBUG_INFO, -+ "Lost control message data over recvmsg()\n"); -+ goto failed; -+ } + cmsg = CMSG_FIRSTHDR(&msg); + if (cmsg->cmsg_type != SCM_CREDS) { GAM_DEBUG(DEBUG_INFO, diff --git a/sysutils/gamin/patches/patch-server_gam__node.c b/sysutils/gamin/patches/patch-server_gam__node.c new file mode 100644 index 00000000000..48288318238 --- /dev/null +++ b/sysutils/gamin/patches/patch-server_gam__node.c @@ -0,0 +1,15 @@ +$NetBSD: patch-server_gam__node.c,v 1.1 2012/03/17 02:19:08 wiz Exp $ + +G_CONST_RETURN has been obsoleted. + +--- server/gam_node.c.orig 2007-07-04 13:36:49.000000000 +0000 ++++ server/gam_node.c +@@ -122,7 +122,7 @@ gam_node_set_is_dir(GamNode * node, gboo + * it has finished with the string. If it must keep it longer, it + * should makes its own copy. The returned string must not be freed. + */ +-G_CONST_RETURN char * ++const char * + gam_node_get_path(GamNode * node) + { + g_assert(node); diff --git a/sysutils/gamin/patches/patch-server_gam__node.h b/sysutils/gamin/patches/patch-server_gam__node.h new file mode 100644 index 00000000000..cc138e68e7b --- /dev/null +++ b/sysutils/gamin/patches/patch-server_gam__node.h @@ -0,0 +1,15 @@ +$NetBSD: patch-server_gam__node.h,v 1.1 2012/03/17 02:19:08 wiz Exp $ + +G_CONST_RETURN has been obsoleted. + +--- server/gam_node.h.orig 2007-07-04 13:36:49.000000000 +0000 ++++ server/gam_node.h +@@ -58,7 +58,7 @@ gboolean gam_node_is_dir + void gam_node_set_is_dir (GamNode *node, + gboolean is_dir); + +-G_CONST_RETURN char *gam_node_get_path (GamNode *node); ++const char *gam_node_get_path (GamNode *node); + + GList *gam_node_get_subscriptions (GamNode *node); + diff --git a/sysutils/gamin/patches/patch-server_gam__subscription.c b/sysutils/gamin/patches/patch-server_gam__subscription.c new file mode 100644 index 00000000000..aa46ec29182 --- /dev/null +++ b/sysutils/gamin/patches/patch-server_gam__subscription.c @@ -0,0 +1,15 @@ +$NetBSD: patch-server_gam__subscription.c,v 1.1 2012/03/17 02:19:08 wiz Exp $ + +G_CONST_RETURN has been obsoleted. + +--- server/gam_subscription.c.orig 2007-07-04 13:36:49.000000000 +0000 ++++ server/gam_subscription.c +@@ -141,7 +141,7 @@ gam_subscription_pathlen(GamSubscription + * @param sub the GamSubscription + * @returns The path being monitored. It should not be freed. + */ +-G_CONST_RETURN char * ++const char * + gam_subscription_get_path(GamSubscription * sub) + { + if (sub == NULL) diff --git a/sysutils/gamin/patches/patch-server_gam__subscription.h b/sysutils/gamin/patches/patch-server_gam__subscription.h new file mode 100644 index 00000000000..7d31c5bf759 --- /dev/null +++ b/sysutils/gamin/patches/patch-server_gam__subscription.h @@ -0,0 +1,15 @@ +$NetBSD: patch-server_gam__subscription.h,v 1.1 2012/03/17 02:19:08 wiz Exp $ + +G_CONST_RETURN has been obsoleted. + +--- server/gam_subscription.h.orig 2007-07-04 13:36:49.000000000 +0000 ++++ server/gam_subscription.h +@@ -21,7 +21,7 @@ int gam_subscription_pa + + int gam_subscription_get_reqno (GamSubscription *sub); + +-G_CONST_RETURN char *gam_subscription_get_path (GamSubscription *sub); ++const char *gam_subscription_get_path (GamSubscription *sub); + + GamListener *gam_subscription_get_listener (GamSubscription *sub); + |