Date: Mon, 4 May 2015 17:26:31 +0000 (UTC) From: Johan van Selst <johans@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r385419 - in head/sysutils/rdate: . files Message-ID: <201505041726.t44HQVnC032378@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: johans Date: Mon May 4 17:26:30 2015 New Revision: 385419 URL: https://svnweb.freebsd.org/changeset/ports/385419 Log: - Update to 1 May version of OpenBSD's rdate - Add code for reallocarray.c (copied from CURRENT) Added: head/sysutils/rdate/files/ head/sysutils/rdate/files/reallocarray.c (contents, props changed) Modified: head/sysutils/rdate/Makefile head/sysutils/rdate/distinfo Modified: head/sysutils/rdate/Makefile ============================================================================== --- head/sysutils/rdate/Makefile Mon May 4 17:15:19 2015 (r385418) +++ head/sysutils/rdate/Makefile Mon May 4 17:26:30 2015 (r385419) @@ -2,9 +2,10 @@ # $FreeBSD$ PORTNAME= rdate -PORTVERSION= 20140220 +PORTVERSION= 20150501 CATEGORIES= sysutils -MASTER_SITES= ${MASTER_SITE_LOCAL} +MASTER_SITES= ftp://ftp.stack.nl/pub/users/%SUBDIR%/rdate/ \ + ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= johans MAINTAINER= johans@FreeBSD.org @@ -14,11 +15,19 @@ CFLAGS+= -DNO_UTIL -D__dead= -D'SA_LEN(x WRKSRC= ${WRKDIR}/${PORTNAME} PLIST_FILES= sbin/rdate man/man8/${PORTNAME}.8.gz +.include <bsd.port.pre.mk> + post-patch: ${REINPLACE_CMD} -e 's,/right,,' ${WRKSRC}/rdate.8 +.if ${OSVERSION} < 1100072 + ${REINPLACE_CMD} -e '/^SRCS/s/$$/ reallocarray.c/' ${WRKSRC}/Makefile + ${ECHO} 'void *reallocarray(void *optr, size_t nmemb, size_t size);' \ + >> ${WRKSRC}/ntpleaps.h + ${CP} ${FILESDIR}/*.c ${WRKSRC}/ +.endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/rdate ${STAGEDIR}${PREFIX}/sbin ${INSTALL_MAN} ${WRKSRC}/rdate.8 ${STAGEDIR}${PREFIX}/man/man8 -.include <bsd.port.mk> +.include <bsd.port.post.mk> Modified: head/sysutils/rdate/distinfo ============================================================================== --- head/sysutils/rdate/distinfo Mon May 4 17:15:19 2015 (r385418) +++ head/sysutils/rdate/distinfo Mon May 4 17:26:30 2015 (r385419) @@ -1,2 +1,2 @@ -SHA256 (rdate-20140220.tar.gz) = f019043fe12e6e731981e410c16d4dc916eebf570881ce74030c67c5a9b54883 -SIZE (rdate-20140220.tar.gz) = 9974 +SHA256 (rdate-20150501.tar.gz) = ac8b4bf88234c5c17640fcbb6004e73b069dcaf9b09fa4e372d3ee73a9de3111 +SIZE (rdate-20150501.tar.gz) = 9919 Added: head/sysutils/rdate/files/reallocarray.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/rdate/files/reallocarray.c Mon May 4 17:26:30 2015 (r385419) @@ -0,0 +1,42 @@ +/* $OpenBSD: reallocarray.c,v 1.2 2014/12/08 03:45:00 bcook Exp $ */ +/* + * Copyright (c) 2008 Otto Moerbeek <otto@drijf.net> + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + +#include <sys/types.h> +#include <errno.h> +#include <stdint.h> +#include <stdlib.h> + +/* + * This is sqrt(SIZE_MAX+1), as s1*s2 <= SIZE_MAX + * if both s1 < MUL_NO_OVERFLOW and s2 < MUL_NO_OVERFLOW + */ +#define MUL_NO_OVERFLOW ((size_t)1 << (sizeof(size_t) * 4)) + +void * +reallocarray(void *optr, size_t nmemb, size_t size) +{ + + if ((nmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) && + nmemb > 0 && SIZE_MAX / nmemb < size) { + errno = ENOMEM; + return (NULL); + } + return (realloc(optr, size * nmemb)); +}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505041726.t44HQVnC032378>