Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1523053302297320"
MIME-Version: 1.0
Date: Fri, 6 Apr 2018 22:21:42 +0000
From: "Hubert Feyrer" <hubertf@netbsd.org>
Subject: CVS commit: pkgsrc/devel/openrcs
To: pkgsrc-changes@NetBSD.org
Reply-To: hubertf@netbsd.org
Message-Id: <20180406222142.D7CFBFBEC@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1523053302297320
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	hubertf
Date:		Fri Apr  6 22:21:42 UTC 2018

Modified Files:
	pkgsrc/devel/openrcs: distinfo
Added Files:
	pkgsrc/devel/openrcs/patches: patch-openbsd-compat_Makefile.am
	    patch-openbsd-compat_NOTES patch-openbsd-compat_memrchr.c

Log Message:
Make this build on Mac OS X, which has no memrchr()


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/openrcs/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/openrcs/patches/patch-openbsd-compat_Makefile.am \
    pkgsrc/devel/openrcs/patches/patch-openbsd-compat_NOTES \
    pkgsrc/devel/openrcs/patches/patch-openbsd-compat_memrchr.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1523053302297320
Content-Disposition: inline
Content-Length: 4338
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/devel/openrcs/distinfo
diff -u pkgsrc/devel/openrcs/distinfo:1.4 pkgsrc/devel/openrcs/distinfo:1.5
--- pkgsrc/devel/openrcs/distinfo:1.4	Tue Nov  3 03:27:53 2015
+++ pkgsrc/devel/openrcs/distinfo	Fri Apr  6 22:21:42 2018
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.4 2015/11/03 03:27:53 agc Exp $
+$NetBSD: distinfo,v 1.5 2018/04/06 22:21:42 hubertf Exp $
 
 SHA1 (openrcs-20110824192219.tar.gz) = 582ca78a9efcc193c18d82fae0617468bdc75b1d
 RMD160 (openrcs-20110824192219.tar.gz) = 266fd50d49da2fbacd2a7c05e2f545a3a19331ad
 SHA512 (openrcs-20110824192219.tar.gz) = 7dcc009f1c8ee0da37bc1d59ecbbf06c1338a136864358164125fa43be69ede73d47501745092266f98346cfcbb4e3d2bce6f27fe1a74b02f765872afbb85e74
 Size (openrcs-20110824192219.tar.gz) = 106878 bytes
+SHA1 (patch-openbsd-compat_Makefile.am) = f231553fb4f4fd8f6ee17cdd7c2422125869a161
+SHA1 (patch-openbsd-compat_NOTES) = bf80bdce4af14245255556434e94a420fcb39218
+SHA1 (patch-openbsd-compat_memrchr.c) = 24f52eb05159318261ebfdb8b703da909633c6f2

Added files:

Index: pkgsrc/devel/openrcs/patches/patch-openbsd-compat_Makefile.am
diff -u /dev/null pkgsrc/devel/openrcs/patches/patch-openbsd-compat_Makefile.am:1.1
--- /dev/null	Fri Apr  6 22:21:42 2018
+++ pkgsrc/devel/openrcs/patches/patch-openbsd-compat_Makefile.am	Fri Apr  6 22:21:42 2018
@@ -0,0 +1,12 @@
+$NetBSD: patch-openbsd-compat_Makefile.am,v 1.1 2018/04/06 22:21:42 hubertf Exp $
+
+--- openbsd-compat/Makefile.am.orig	2010-08-24 22:08:11.000000000 +0000
++++ openbsd-compat/Makefile.am
+@@ -1,6 +1,6 @@
+ noinst_LIBRARIES = libopenbsd-compat.a
+ 
+ libopenbsd_compat_a_SOURCES = \
+-		  strlcat.c strlcpy.c strtonum.c fgetln.c getlogin.c
++		  strlcat.c strlcpy.c strtonum.c fgetln.c getlogin.c memrchr.c
+ 
+ INCLUDES = -I$(top_srcdir)/src/
Index: pkgsrc/devel/openrcs/patches/patch-openbsd-compat_NOTES
diff -u /dev/null pkgsrc/devel/openrcs/patches/patch-openbsd-compat_NOTES:1.1
--- /dev/null	Fri Apr  6 22:21:42 2018
+++ pkgsrc/devel/openrcs/patches/patch-openbsd-compat_NOTES	Fri Apr  6 22:21:42 2018
@@ -0,0 +1,9 @@
+$NetBSD: patch-openbsd-compat_NOTES,v 1.1 2018/04/06 22:21:42 hubertf Exp $
+
+--- openbsd-compat/NOTES.orig	2010-08-24 22:08:11.000000000 +0000
++++ openbsd-compat/NOTES
+@@ -11,3 +11,4 @@ strtonum.c    portable openssh
+ sys-queue.h   portable openssh
+ utimes.c      http://www.sudo.ws/cgi-bin/cvsweb/~checkout~/sudo/utimes.c?rev=1.9
+ utime.h       http://www.sudo.ws/cgi-bin/cvsweb/~checkout~/sudo/emul/utime.h?rev=1.25
++memrchr.c     https://github.com/aosm/sudo/blob/master/src/memrchr.c
Index: pkgsrc/devel/openrcs/patches/patch-openbsd-compat_memrchr.c
diff -u /dev/null pkgsrc/devel/openrcs/patches/patch-openbsd-compat_memrchr.c:1.1
--- /dev/null	Fri Apr  6 22:21:42 2018
+++ pkgsrc/devel/openrcs/patches/patch-openbsd-compat_memrchr.c	Fri Apr  6 22:21:42 2018
@@ -0,0 +1,46 @@
+$NetBSD: patch-openbsd-compat_memrchr.c,v 1.1 2018/04/06 22:21:42 hubertf Exp $
+
+--- openbsd-compat/memrchr.c.orig	2018-04-05 19:37:00.000000000 +0000
++++ openbsd-compat/memrchr.c
+@@ -0,0 +1,41 @@
++/*
++ * Copyright (c) 2007 Todd C. Miller <Todd.Miller@courtesan.com>
++ *
++ * 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 <config.h>
++
++#include <sys/types.h>
++
++/*
++ * Reverse memchr()
++ * Find the last occurrence of 'c' in the buffer 's' of size 'n'.
++ */
++void *
++memrchr(s, c, n)
++    const void *s;
++    int c;
++    size_t n;
++{
++    const unsigned char *cp;
++
++    if (n != 0) {
++	cp = (unsigned char *)s + n;
++	do {
++	    if (*(--cp) == (unsigned char)c)
++		return (void *)cp;
++	} while (--n != 0);
++    }
++    return (void *)0;
++}


--_----------=_1523053302297320--