[121184] trunk/dports/sysutils/daemon

[Ryan Schmidt]

On Jun 19, 2014, at 8:25 AM, khindenburg at macports.org wrote:

> Revision
> 121184
> Author
> khindenburg at macports.org
> Date
> 2014-06-19 06:25:56 -0700 (Thu, 19 Jun 2014)
> Log Message
> 
> daemon: add patch to build on mavericks - closes #42845

> Added Paths
> 	• trunk/dports/sysutils/daemon/files/
> 	• trunk/dports/sysutils/daemon/files/patch-ignore-strlcpy-strlcat.diff

> +diff -Naur daemon-0.6.4.old/daemon.c daemon-0.6.4/daemon.c
> +--- daemon-0.6.4.old/daemon.c	2010-06-12 06:37:00.000000000 -0700
> ++++ daemon-0.6.4/daemon.c	2014-03-15 08:25:15.000000000 -0700
> +@@ -651,6 +651,8 @@
> + #define _NETBSD_SOURCE /* For CEOF, chroot() on NetBSD-5.0.2 */
> + #endif
> + 
> ++#include <config.h>
> ++
> + #include <slack/std.h>
> + 
> + #include <pwd.h>
> +diff -Naur daemon-0.6.4.old/libslack/str.h daemon-0.6.4/libslack/str.h
> +--- daemon-0.6.4.old/libslack/str.h	2010-06-12 06:37:00.000000000 -0700
> ++++ daemon-0.6.4/libslack/str.h	2014-03-15 08:16:09.000000000 -0700
> +@@ -254,8 +254,15 @@
> + int oct(const char *str);
> + int strcasecmp(const char *s1, const char *s2);
> + int strncasecmp(const char *s1, const char *s2, size_t n);
> ++
> ++#ifndef HAVE_STRLCPY
> + size_t strlcpy(char *dst, const char *src, size_t size);
> ++#endif
> ++
> ++#ifndef HAVE_STRLCAT
> + size_t strlcat(char *dst, const char *src, size_t size);
> ++#endif
> ++
> + char *cstrcpy(char *dst, const char *src);
> + char *cstrcat(char *dst, const char *src);
> + char *cstrchr(const char *str, int c);

Wouldn't this patch be safe to use on all OS X versions? If so, that should be done. This will ensure that someone updating the port on a version of OS X earlier than Mavericks does not inadvertently forget to update the patch, if needed.