Pullup ticket #5231 - requested by sevan

devel/scmcvs: bug fix

Revisions pulled up:
- devel/scmcvs/Makefile                                         1.16
- devel/scmcvs/distinfo                                         1.16
- devel/scmcvs/patches/patch-src_error.c                        1.1

-------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   jakllsch
   Date:           Fri Mar 31 15:15:22 UTC 2017

   Modified Files:
           pkgsrc/devel/scmcvs: Makefile distinfo
   Added Files:
           pkgsrc/devel/scmcvs/patches: patch-src_error.c

   Log Message:
   Patch cvs with same patch as r1.2 of src/external/gpl2/xcvs/dist/src/error.c:

   "Use LOG_ERR instead of LOG_EMERG, as LOG_EMERG causes syslogd to tell all
   ttys."


   To generate a diff of this commit:
   cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/scmcvs/Makefile \
       pkgsrc/devel/scmcvs/distinfo
   cvs rdiff -u -r0 -r1.1 pkgsrc/devel/scmcvs/patches/patch-src_error.c

3 files changed, 44 insertions, 3 deletions

diff --git a/devel/scmcvs/Makefile b/devel/scmcvs/Makefile
index 5ef549a283a..1445e8504ad 100644
--- a/devel/scmcvs/Makefile
+++ b/devel/scmcvs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2016/02/25 12:12:49 jperkin Exp $
+# $NetBSD: Makefile,v 1.15.10.1 2017/04/03 16:29:13 spz Exp $
 
 DISTNAME=	cvs-1.12.13
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	devel scm
 MASTER_SITES=	http://ftp.gnu.org/non-gnu/cvs/source/feature/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/scmcvs/distinfo b/devel/scmcvs/distinfo
index 3a82f792df7..0e059b3ece8 100644
--- a/devel/scmcvs/distinfo
+++ b/devel/scmcvs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2015/11/03 03:29:32 agc Exp $
+$NetBSD: distinfo,v 1.15.12.1 2017/04/03 16:29:13 spz Exp $
 
 SHA1 (cvs-1.12.13.tar.bz2) = 93a8dacc6ff0e723a130835713235863f1f5ada9
 RMD160 (cvs-1.12.13.tar.bz2) = ba3048e3e2d99ae78f6a759889b615acf65dd487
@@ -28,5 +28,6 @@ SHA1 (patch-ba) = 7153e12e5da86effd4285e147f9f534011982e07
 SHA1 (patch-bb) = 09a607426b672f44c1882b82812e6ca81efdcf8e
 SHA1 (patch-lib_mktime.c) = 526a0e24c6399d527ae6a463ea91e993f9f7e920
 SHA1 (patch-lib_vasnprintf.c) = 6b078c16de6256e33fb86340fe39d663af1b0888
+SHA1 (patch-src_error.c) = 60aba581be95aebbb6fb16c888fd384d855fe56e
 SHA1 (patch-src_ignore.c) = 90ac25311c83bb5713b83b9cfb6b2c03790ee787
 SHA1 (patch-src_zlib.c) = fee3becf1cc2e45d1241a302ed65c5f11b477a0a
diff --git a/devel/scmcvs/patches/patch-src_error.c b/devel/scmcvs/patches/patch-src_error.c
new file mode 100644
index 00000000000..a132d9e5376
--- /dev/null
+++ b/devel/scmcvs/patches/patch-src_error.c
@@ -0,0 +1,40 @@
+$NetBSD: patch-src_error.c,v 1.1.2.2 2017/04/03 16:29:13 spz Exp $
+
+Use LOG_ERR instead of LOG_EMERG, as LOG_EMERG causes syslogd to tell all
+ttys.
+
+--- src/error.c.orig	2005-06-03 16:06:07.000000000 +0000
++++ src/error.c
+@@ -208,7 +208,7 @@ memerror:
+      *   with the message here.
+      */
+ #if HAVE_SYSLOG_H
+-    syslog (LOG_DAEMON | LOG_EMERG, "Memory exhausted.  Aborting.");
++    syslog (LOG_DAEMON | LOG_ERR, "Memory exhausted.  Aborting.");
+ #endif /* HAVE_SYSLOG_H */
+ 
+     goto sidestep_done;
+@@ -219,18 +219,18 @@ recursion_error:
+      * error while attempting to send the last error message to the client.
+      */
+ 
+-    syslog (LOG_DAEMON | LOG_EMERG,
++    syslog (LOG_DAEMON | LOG_ERR,
+ 	    "error (%d, %d) called recursively.  Original message was:",
+ 	    last_status, last_errnum);
+-    syslog (LOG_DAEMON | LOG_EMERG, "%s", last_message);
++    syslog (LOG_DAEMON | LOG_ERR, "%s", last_message);
+ 
+ 
+-    syslog (LOG_DAEMON | LOG_EMERG,
++    syslog (LOG_DAEMON | LOG_ERR,
+             "error (%d, %d) called recursively.  Second message was:",
+ 	    status, errnum);
+-    syslog (LOG_DAEMON | LOG_EMERG, "%s", buf2);
++    syslog (LOG_DAEMON | LOG_ERR, "%s", buf2);
+ 
+-    syslog (LOG_DAEMON | LOG_EMERG, "Aborting.");
++    syslog (LOG_DAEMON | LOG_ERR, "Aborting.");
+ #endif /* HAVE_SYSLOG_H */
+ 
+ sidestep_done: