Update 3.6.2 --> 3.6.3

PR:		196439
Submitted by:	skreuzer
This commit is contained in:
Cy Schubert 2015-01-14 03:54:06 +00:00
parent 8eda03674b
commit 569c91ba0c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=376994
3 changed files with 59 additions and 3 deletions

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= cfengine
PORTVERSION= 3.6.2
PORTVERSION= 3.6.3
PORTEPOCH= 1
CATEGORIES= sysutils
MASTER_SITES= https://s3.amazonaws.com/cfengine.package-repos/tarballs/

View file

@ -1,2 +1,2 @@
SHA256 (cfengine-3.6.2.tar.gz) = 0e0195c1998fc261d4ef2e47e9cc50b273d204bc8b221d469bb83071933c4a09
SIZE (cfengine-3.6.2.tar.gz) = 1966966
SHA256 (cfengine-3.6.3.tar.gz) = 511517311198edeb4bfd1de753643c0e87bc40790bd5be6d533b0aa0f28ba000
SIZE (cfengine-3.6.3.tar.gz) = 1981479

View file

@ -0,0 +1,56 @@
Index: m4/strndup.m4
===================================================================
--- /dev/null 2014-07-29 08:00:54.000000000 -0700
+++ m4/strndup.m4 2014-07-29 08:01:42.499328796 -0700
@@ -0,0 +1,51 @@
+# strndup.m4 serial 21
+dnl Copyright (C) 2002-2003, 2005-2013 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([cf3_FUNC_STRNDUP],
+[
+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+ AC_CHECK_DECLS([strndup])
+ AC_REPLACE_FUNCS([strndup])
+ if test $ac_cv_have_decl_strndup = no; then
+ HAVE_DECL_STRNDUP=0
+ fi
+
+ if test $ac_cv_func_strndup = yes; then
+ HAVE_STRNDUP=1
+ # AIX 5.3 has a function that tries to copy the entire range specified
+ # by n, instead of just the length of src.
+ AC_CACHE_CHECK([for working strndup], [cf3_cv_func_strndup_works],
+ [AC_RUN_IFELSE([
+ AC_LANG_PROGRAM([[#include <string.h>
+ #include <stdlib.h>]], [[
+#if !HAVE_DECL_STRNDUP
+ extern
+ #ifdef __cplusplus
+ "C"
+ #endif
+ char *strndup (const char *, size_t);
+#endif
+ char *s;
+ // Will crash if strndup tries to traverse all 2GB.
+ s = strndup ("string", 2000000000);
+ return 0;]])],
+ [cf3_cv_func_strndup_works=yes],
+ [cf3_cv_func_strndup_works=no],
+ [
+changequote(,)dnl
+ case $host_os in
+ aix | aix[3-6]*) cf3_cv_func_strndup_works="guessing no";;
+ *) cf3_cv_func_strndup_works="guessing yes";;
+ esac
+changequote([,])dnl
+ ])])
+ case $cf3_cv_func_strndup_works in
+ *no) AC_LIBOBJ([strndup]) ;;
+ esac
+ else
+ HAVE_STRNDUP=0
+ fi
+])